Moving 2.x contribs

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

6264 files changed, 0 insertions, 491668 deletions

diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/LICENSE b/java/sca-contrib/demos/alert-aggregator-webapp/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/NOTICE b/java/sca-contrib/demos/alert-aggregator-webapp/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/README b/java/sca-contrib/demos/alert-aggregator-webapp/README
deleted file mode 100644
index 3ec27ef65f..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/README
+++ /dev/null
@@ -1,82 +0,0 @@
-Apache Tuscany Alert Aggregator Demo
-====================================
-
-The alert aggregator demo provides an application, implemented using SCA, that 
-aggregates feeds together and exposes them using the following bindings. 
-
-binding.ws
-binding.jsonrpc
-binding.feed
-
-The easiest way to get going is to build the demo
-
-cd alert-aggregator-webapp
-ant package
-
-This will build a war file 
-
-demo-alert-aggregator-webapp.war
-
-This war can be deployed to you web application container and tested (the war
-has been tested with Tomcat 6.0.10). 
-
-The Web Application
--------------------
-
-Once deployed point your browser at 
-
-http://localhost:8080/demo-alert-aggregator-webapp
-
-Taking care to ensure the host name and port number match you local 
-configuration. 
-
-This launches a Javascript application in the browser that uses JSONRPC
-to contact the server and retrived a list of alert sources and alerts that
-these sources are providing.
-
-There default sources that you see are stored in a file in the following
-file
-
-demo-alert-aggregator-webapp/WEB-INF/classes/sources.xml
-
-This files has the following contents
-
-<ns0:Config xmlns:ns0="http://tuscany.apache.org/sca/demos/aggregator/types">
-<ns0:Source Id="0" FeedType="rss">
-  <ns0:Name>BBC News</ns0:Name>
-  <ns0:Address>http://news.bbc.co.uk/</ns0:Address>
-  <ns0:LastChecked>10-Jun-2007 16:34:03</ns0:LastChecked>
-  <ns0:FeedAddress>http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml</ns0:FeedAddress>
-</ns0:Source>
-<ns0:Source Id="1" FeedType="rss">
-  <ns0:Name>Engadget</ns0:Name>
-  <ns0:Address>http://www.engadget.com</ns0:Address>
-  <ns0:LastChecked>10-Jun-2007 16:34:03</ns0:LastChecked>
-  <ns0:FeedAddress>http://www.engadget.com/rss.xml</ns0:FeedAddress>
-</ns0:Source>
-</ns0:Config>
-
-You may want to adjust the "LastChecked" values to change the number of
-alerts that are displayed in the first instance
-
-Using A Feed Reader
--------------------
-
-As this SCA application also uses the binding.feed binding you can use your
-favourite feed reader to read the aggregated alerts. To do this point your
-feed reader at
-
-http://localhost:8080/demo-alert-aggregator-webapp/services/AlertsFeedServiceRSS
-
-Again taking care to ensure that the host name and port number match you 
-local configuration.
-
-Using Web Services
-------------------
-
-The SCA application also uses binding.ws to provide a SOAP/HTTP interface. 
-The demo client that uses this interface is not yet available. 
-
-
-
-
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/alert-aggregator.png b/java/sca-contrib/demos/alert-aggregator-webapp/alert-aggregator.png
deleted file mode 100644
index ae429cca94..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/alert-aggregator.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/alert-aggregator.svg b/java/sca-contrib/demos/alert-aggregator-webapp/alert-aggregator.svg
deleted file mode 100644
index 807416135e..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/alert-aggregator.svg
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\sandbox\slaws\feed-aggregator"
-   sodipodi:docname="aggregator.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\sandbox\slaws\feed-aggregator\aggregator.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="559.53502"
-     inkscape:cy="380.79143"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1231"
-     inkscape:window-height="883"
-     inkscape:window-x="24"
-     inkscape:window-y="13" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.493398,0,0,0.868873,32.49726,7.184761)">
-      <rect
-         rx="15.307091"
-         ry="11.608842"
-         y="192.00241"
-         x="258.31146"
-         height="274.39081"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:3.05459166;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="matrix(1.807362,0,0,1,-230.6612,-5.522464)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">DisplayComposite - PHP</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="155.56354"
-       x="224.91631"
-       y="240.73917"
-       rx="6.9961648"
-       ry="12.905249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(-42.67445,34.80051)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Display</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 207.76582,260.46421 L 241.10086,260.46421 L 247.16177,273.59619 L 240.09071,285.71803 L 207.76582,285.71803 L 215.34197,273.59619 L 207.76582,260.46421 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 321.01826,362.74776 L 354.3533,362.74776 L 360.41421,375.87974 L 353.34315,388.00158 L 321.01826,388.00158 L 328.59441,375.87974 L 321.01826,362.74776 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 132.44488,252.20297 L 176.05464,252.20297 L 183.98368,272.02067 L 174.73314,290.31394 L 132.44488,290.31394 L 142.35619,272.02067 L 132.44488,252.20297 z "
-       id="path1883" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 373.8733,354.18185 L 423.52701,354.18185 L 432.55495,376.97097 L 422.02236,398.0071 L 373.8733,398.0071 L 385.15824,376.97097 L 373.8733,354.18185 z "
-       id="path1885" />
-    <g
-       id="g1887"
-       transform="matrix(0.493398,0,0,1.065504,374.2831,-30.40982)">
-      <rect
-         rx="27.634869"
-         ry="18.594875"
-         y="192.0024"
-         x="258.31131"
-         height="439.5152"
-         width="894.9447"
-         id="rect1889"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.75837588;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot1891"
-         xml:space="preserve"
-         transform="matrix(1.807362,0,0,1,-224.5192,-5.522463)"><flowRegion
-           id="flowRegion1893"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect1895" /></flowRegion><flowPara
-           id="flowPara1897">AlerterComposite - Java</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000095;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1899"
-       width="115.66247"
-       height="190.91896"
-       x="566.70215"
-       y="313.4194"
-       rx="6.9961648"
-       ry="15.838266" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1901"
-       transform="translate(294.0606,125.6634)"><flowRegion
-         id="flowRegion1903"><rect
-           id="rect1905"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1907">AlertsService</flowPara><flowPara
-         id="flowPara2023" /></flowRoot>    <rect
-       style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1909"
-       width="21.718224"
-       height="20.708065"
-       x="611.65393"
-       y="302.81259"
-       rx="10.859112"
-       ry="0" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 548.54148,397.87026 L 581.87652,397.87026 L 587.93743,411.00224 L 580.86637,423.12408 L 548.54148,423.12408 L 556.11763,411.00224 L 548.54148,397.87026 z "
-       id="path1911" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 662.80407,336.35687 L 696.13911,336.35687 L 702.20002,349.48885 L 695.12896,361.61069 L 662.80407,361.61069 L 670.38022,349.48885 L 662.80407,336.35687 z "
-       id="path1913" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 474.23069,356.27399 L 517.84045,356.27399 L 525.76949,376.09169 L 516.51895,394.38496 L 474.23069,394.38496 L 484.142,376.09169 L 474.23069,356.27399 z "
-       id="path1915" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1919"
-       transform="translate(-136.1038,52.42486)"><flowRegion
-         id="flowRegion1921"><rect
-           id="rect1923"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1925">rest</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1927"
-       transform="translate(110.8013,157.3641)"><flowRegion
-         id="flowRegion1929"><rect
-           id="rect1931"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1933">soap</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 182.85715,271.25837 L 215,271.25837"
-       id="path1941" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 359.28572,375.3802 L 385,375.3802"
-       id="path1943" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 432.14286,376.80877 L 482.85715,376.09448"
-       id="path1945" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1921"
-       transform="translate(206.326,156.4433)"><flowRegion
-         id="flowRegion1923"><rect
-           id="rect1925"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1927">soap</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 663.16514,379.93449 L 696.50018,379.93449 L 702.56109,393.06647 L 695.49003,405.18831 L 663.16514,405.18831 L 670.74129,393.06647 L 663.16514,379.93449 z "
-       id="path1929" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.99999976;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1932"
-       width="115.66247"
-       height="79.802025"
-       x="746.18158"
-       y="348.62225"
-       rx="6.9961648"
-       ry="6.6202211" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1934"
-       transform="translate(478.5909,142.6837)"><flowRegion
-         id="flowRegion1936"><rect
-           id="rect1938"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1940">RSS</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 723.03101,380.46928 L 756.36605,380.46928 L 762.42696,393.60126 L 755.3559,405.7231 L 723.03101,405.7231 L 730.60716,393.60126 L 723.03101,380.46928 z "
-       id="path1944" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000119;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1950"
-       width="115.66247"
-       height="132.33011"
-       x="745.13855"
-       y="195.58192"
-       rx="6.9961648"
-       ry="10.977848" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 720.74384,253.66542 L 754.07888,253.66542 L 760.13979,266.7974 L 753.06873,278.91924 L 720.74384,278.91924 L 728.31999,266.7974 L 720.74384,253.66542 z "
-       id="path1952" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1954"
-       transform="translate(486.8998,-9.966938)"><flowRegion
-         id="flowRegion1956"><rect
-           id="rect1958"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1960">AlertsSources</flowPara><flowPara
-         id="flowPara2055">Service</flowPara></flowRoot>    <g
-       id="g1962"
-       transform="translate(-176.0137,-37.3322)">
-      <rect
-         ry="6.2971425"
-         rx="7.4499478"
-         y="442.66592"
-         x="221.42857"
-         height="44.285713"
-         width="48.57143"
-         id="rect1964"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#060000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:6, 1;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         id="path1966"
-         d="M 215,436.23734 L 276.42857,436.95163 L 276.42857,491.23734 L 213.57143,491.23734 L 215,436.23734 z "
-         style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path1968"
-         d="M 275.71429,491.23734 L 287.85714,504.80877 L 203.57143,504.09448 L 214.28571,491.95163"
-         style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 472.97164,431.20643 L 516.5814,431.20643 L 524.51044,451.02413 L 515.2599,469.3174 L 472.97164,469.3174 L 482.88295,451.02413 L 472.97164,431.20643 z "
-       id="path1973" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1977"
-       transform="translate(201.067,231.3759)"><flowRegion
-         id="flowRegion1979"><rect
-           id="rect1981"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1983">jsonrpc</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 703.12601,392.5614 C 729.14865,392.5614 730.28007,392.5614 730.28007,392.5614"
-       id="path2011" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 103.05071,450.26192 C 480.81768,450.26192 480.81768,450.26192 480.81768,450.26192"
-       id="path2021" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 321.88845,274.15881 L 355.22349,274.15881 L 361.2844,287.29079 L 354.21334,299.41263 L 321.88845,299.41263 L 329.4646,287.29079 L 321.88845,274.15881 z "
-       id="path2025" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 374.74349,265.5929 L 424.3972,265.5929 L 433.42514,288.38202 L 422.89255,309.41815 L 374.74349,309.41815 L 386.02843,288.38202 L 374.74349,265.5929 z "
-       id="path2027" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 475.10088,267.68504 L 518.71064,267.68504 L 526.63968,287.50274 L 517.38914,305.79601 L 475.10088,305.79601 L 485.01219,287.50274 L 475.10088,267.68504 z "
-       id="path2029" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2031"
-       transform="translate(111.6715,68.77515)"><flowRegion
-         id="flowRegion2033"><rect
-           id="rect2035"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2037">soap</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 360.15591,286.79125 L 385.87019,286.79125"
-       id="path2039" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 433.01305,288.21982 L 483.72734,287.50553"
-       id="path2041" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2043"
-       transform="translate(207.1962,67.85435)"><flowRegion
-         id="flowRegion2045"><rect
-           id="rect2047"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2049">soap</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 472.23581,584.46535 L 515.84557,584.46535 L 523.77461,604.28305 L 514.52407,622.57632 L 472.23581,622.57632 L 482.14712,604.28305 L 472.23581,584.46535 z "
-       id="path2077" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2079"
-       transform="translate(201.2595,384.6873)"><flowRegion
-         id="flowRegion2081"><rect
-           id="rect2083"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2085">atom</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 474.05184,212.89166 L 517.6616,212.89166 L 525.59064,232.70936 L 516.3401,251.00263 L 474.05184,251.00263 L 483.96315,232.70936 L 474.05184,212.89166 z "
-       id="path1995" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1997"
-       transform="translate(202.1472,13.06115)"><flowRegion
-         id="flowRegion1999"><rect
-           id="rect2001"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2003">jsonrpc</flowPara></flowRoot>    <g
-       id="g2019"
-       transform="translate(-178.034,112.9369)">
-      <rect
-         ry="6.2971425"
-         rx="7.4499478"
-         y="442.66592"
-         x="221.42857"
-         height="44.285713"
-         width="48.57143"
-         id="rect2021"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#060000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:6, 1;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         id="path2023"
-         d="M 215,436.23734 L 276.42857,436.95163 L 276.42857,491.23734 L 213.57143,491.23734 L 215,436.23734 z "
-         style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path2026"
-         d="M 275.71429,491.23734 L 287.85714,504.80877 L 203.57143,504.09448 L 214.28571,491.95163"
-         style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 663.04526,423.36857 L 696.3803,423.36857 L 702.44121,436.50055 L 695.37015,448.62239 L 663.04526,448.62239 L 670.62141,436.50055 L 663.04526,423.36857 z "
-       id="path2030" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.99999976;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:5.99999928, 1.99999976;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2032"
-       width="115.66247"
-       height="79.802025"
-       x="747.07184"
-       y="437.51321"
-       rx="6.9961648"
-       ry="6.6202211" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2034"
-       transform="translate(482.5116,231.5747)"><flowRegion
-         id="flowRegion2036"><rect
-           id="rect2038"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2040">POP - Not done</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 726.95174,469.36022 L 760.28678,469.36022 L 766.34769,482.4922 L 759.27663,494.61404 L 726.95174,494.61404 L 734.52789,482.4922 L 726.95174,469.36022 z "
-       id="path2042" />
-    <g
-       id="g2046"
-       transform="translate(-173.9935,-197.1597)">
-      <rect
-         ry="6.2971425"
-         rx="7.4499478"
-         y="442.66592"
-         x="221.42857"
-         height="44.285713"
-         width="48.57143"
-         id="rect2048"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#060000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:6, 1;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         id="path2050"
-         d="M 215,436.23734 L 276.42857,436.95163 L 276.42857,491.23734 L 213.57143,491.23734 L 215,436.23734 z "
-         style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path2052"
-         d="M 275.71429,491.23734 L 287.85714,504.80877 L 203.57143,504.09448 L 214.28571,491.95163"
-         style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 103.03556,270.33294 C 140.4112,270.33294 140.4112,270.33294 140.4112,270.33294"
-       id="path2054" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 102.02541,434.9878 L 449.51788,432.9675 L 450.52804,231.94714 L 482.85292,231.94714"
-       id="path2056" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 97.984797,603.52083 L 480.83262,601.50053"
-       id="path2058" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2060"
-       transform="translate(-226.8143,99.79398)"><flowRegion
-         id="flowRegion2062"><rect
-           id="rect2064"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2066">HTML</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2068"
-       transform="translate(-232.7737,258.6113)"><flowRegion
-         id="flowRegion2070"><rect
-           id="rect2072"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2074">Web2.0</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2076"
-       transform="translate(-248.6574,410.2362)"><flowRegion
-         id="flowRegion2078"><rect
-           id="rect2080"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2082">Thunderbird</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 663.10519,467.81527 L 696.44023,467.81527 L 702.50114,480.94725 L 695.43008,493.06909 L 663.10519,493.06909 L 670.68134,480.94725 L 663.10519,467.81527 z "
-       id="path2088" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.99999976;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:5.99999928, 1.99999976;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2090"
-       width="115.66247"
-       height="79.802025"
-       x="746.12164"
-       y="533.47766"
-       rx="6.9961648"
-       ry="6.6202211" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2092"
-       transform="translate(481.5614,327.5392)"><flowRegion
-         id="flowRegion2094"><rect
-           id="rect2096"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2098">NNTP - Not done</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 726.00152,565.3247 L 759.33656,565.3247 L 765.39747,578.45668 L 758.32641,590.57852 L 726.00152,590.57852 L 733.57767,578.45668 L 726.00152,565.3247 z "
-       id="path2100" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 472.48834,533.95773 L 516.0981,533.95773 L 524.02714,553.77543 L 514.7766,572.0687 L 472.48834,572.0687 L 482.39965,553.77543 L 472.48834,533.95773 z "
-       id="path2106" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2108"
-       transform="translate(201.512,334.1797)"><flowRegion
-         id="flowRegion2110"><rect
-           id="rect2112"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2114">rss</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 98.237332,557.01321 L 481.08515,554.99291"
-       id="path2120" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2022"
-       width="115.66247"
-       height="95.964485"
-       x="565.43286"
-       y="534.48798"
-       rx="6.9961648"
-       ry="7.9610276" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2024"
-       transform="translate(304.5289,349.5419)"><flowRegion
-         id="flowRegion2026"><rect
-           id="rect2028"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2030">AlertFeed</flowPara><flowPara
-         id="flowPara2032">Service</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 540.93669,563.74164 L 574.27173,563.74164 L 580.33264,576.87362 L 573.26158,588.99546 L 540.93669,588.99546 L 548.51284,576.87362 L 540.93669,563.74164 z "
-       id="path2073" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 657.10424,562.7721 L 690.43928,562.7721 L 696.50019,575.90408 L 689.42913,588.02592 L 657.10424,588.02592 L 664.68039,575.90408 L 657.10424,562.7721 z "
-       id="path2034" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 525.27933,230.93699 L 685.89358,229.92684 L 685.89358,259.22126 L 724.27938,259.22126"
-       id="path2038" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 525.27933,286.49538 L 671.75144,284.47507 L 671.75144,267.30248 L 726.29968,267.30248"
-       id="path2040" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 701.04587,349.12484 L 714.17785,348.11468 L 714.17785,275.3837 L 722.25907,275.3837"
-       id="path2043" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 525.27933,374.37865 L 538.41131,374.37865 L 538.41131,401.65277 L 550.53314,400.64262"
-       id="path2045" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 701.04587,437.00811 L 721.24892,437.00811 L 721.24892,480.44467 L 732.3606,480.44467"
-       id="path2049" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 701.04587,481.45482 L 714.17785,481.45482 L 714.17785,579.43962 L 733.37075,579.43962"
-       id="path2051" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 697.00526,575.39901 L 705.08648,575.39901 L 704.07633,518.83046 L 541.44177,518.83046 L 541.44177,415.7949 L 552.55344,415.7949"
-       id="path2053" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 522.24887,451.15024 L 533.36055,451.15024 L 533.36055,409.73399 L 554.57375,409.73399"
-       id="path2055" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 522.24887,552.1655 L 535.38085,552.1655 L 534.3707,574.38885 L 546.49253,574.38885"
-       id="path2057" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 522.24887,604.69343 L 535.38085,603.68328 L 535.38085,583.48023 L 542.45192,583.48023"
-       id="path2059" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/build-dojo.xml b/java/sca-contrib/demos/alert-aggregator-webapp/build-dojo.xml
deleted file mode 100644
index c31c9adee8..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/build-dojo.xml
+++ /dev/null
@@ -1,92 +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 name="DojoZipInstaller">
-    
-
-    <property name="dojo.version" value="1.0.0"/>
-    <property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/>
-    
-
-    <target name="check-dojo-installed">
-        <condition property="already.installed" >
-            <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-        </condition>
-        <condition property="maven.suffix" value="">
-            <os family="unix"/>
-        </condition>
-        <condition property="maven.suffix" value=".bat">
-            <os family="windows"/>
-        </condition>
-    </target>
-    
-
-    <target name="check-dojo-unpacked">
-        <condition property="already.unpacked" >
-            <available file="${unpack.location}"/>
-        </condition>
-    </target>
-
-    <target name="install-dojo" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
-            <arg line="install:install-file -DgroupId=dojo  -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"/>
-        </exec>
-    </target>
-
-    <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" 
-              tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-    </target>
-    
-
-    <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">
-        <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
-        <mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
-        <unzip src="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"
-               dest="${basedir}/target/dojo-unpack-temp/"
-               overwrite="false">
-            <patternset>
-                <include name="dojo-release-${dojo.version}/dojo/**"/>
-                <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/>
-                <include name="dojo-release-${dojo.version}/dijit/**"/>
-                <exclude name="dojo-release-${dojo.version}/dojox/**"/>
-                <exclude name="dojo-release-${dojo.version}/util/**"/>
-            </patternset>
-        </unzip>
-        <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}"
-              tofile="${unpack.location}"
-              verbose="true"/>
-        <delete dir="${basedir}/target/dojo-unpack-temp/"/>
-    </target>
-    
-
-    <target name="clean-dojo-files">
-        <delete dir="${unpack.location}"/>
-    </target>
-</project>
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/build.xml b/java/sca-contrib/demos/alert-aggregator-webapp/build.xml
deleted file mode 100644
index b75842d08c..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/build.xml
+++ /dev/null
@@ -1,148 +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.    
--->
-<!DOCTYPE project [
-<!ENTITY buildDependency SYSTEM "build-dependency.xml">
-]>
-
-<project name="helloworld-jsonrpc" default="package">
-	&buildDependency;
-	
-    <property name="settings.localRepository" value="./target/repo" />
-    <property name="artifactId" value="sample-feed-aggregator" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    	<mkdir dir="target/sdo-source"/>
-    </target>
-	
-    <target name="generate" depends="init">
-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator"
-              fork="true">
-        	<arg value="-targetDirectory"/>
-        	<arg value="target/sdo-source"/>
-        	<arg value="-javaPackage"/>
-        	<arg value="org.apache.tuscany.sca.demos.aggregator.service"/>
-        	<arg value="-schemaNamespace"/>
-        	<arg value="http://tuscany.apache.org/sca/demos/aggregator/service"/>
-        	<arg value="-noNotification"/>
-        	<arg value="-noContainment"/>
-        	<arg value="-noUnsettable"/>
-        	<arg value="src/main/resources/Alerts.wsdl"/>
-        	
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    	
-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator"
-              fork="true">
-        	<arg value="-targetDirectory"/>
-        	<arg value="target/sdo-source"/>
-        	<arg value="-javaPackage"/>
-        	<arg value="org.apache.tuscany.sca.demos.aggregator.sources"/>
-        	<arg value="-schemaNamespace"/>
-        	<arg value="http://tuscany.apache.org/sca/demos/aggregator/sources"/>
-        	<arg value="-noNotification"/>
-        	<arg value="-noContainment"/>
-        	<arg value="-noUnsettable"/>
-        	<arg value="src/main/resources/AlertsSources.wsdl"/>
-     	
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>   
-    	
-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator"
-              fork="true">
-        	<arg value="-targetDirectory"/>
-        	<arg value="target/sdo-source"/>
-        	<arg value="-javaPackage"/>
-        	<arg value="org.apache.tuscany.sca.demos.aggregator.types"/>
-        	<arg value="-schemaNamespace"/>
-        	<arg value="http://tuscany.apache.org/sca/demos/aggregator/types"/>
-        	<arg value="-noNotification"/>
-        	<arg value="-noContainment"/>
-        	<arg value="-noUnsettable"/>
-        	<arg value="src/main/resources/Alerts.xsd"/>
-     	
-            <classpath>
-                <pathelement path="target/sdo-source"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>     	
-    </target>
-	
-    <target name="compile" depends="generate">
-        <javac srcdir="target/sdo-source"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-    </target>	
-	
-    <target name="package" depends="compile">
-        <ant antfile="./build-dojo.xml" target="install-dojo-nomaven">
-          <property name="localRepository" value="${settings.localRepository}"/>
-        </ant>
-        
-        <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-          <property name="localRepository" value="${settings.localRepository}"/>
-          <property name="artifactId" value="${artifactId}"/>
-        </ant>   
-
-        <war destfile="target/demo-alert-aggregator-webapp.war" 
-             webxml="src/main/webapp/WEB-INF/web.xml">
-            <fileset dir="src/main/webapp"/>
-            <lib refid="tuscany.jars"/>
-            <lib refid="3rdparty.jars"/>
-            <classes dir="target/classes"/>
-        </war>
-
-        <ant antfile="./build-dojo.xml" target="clean-dojo-files">
-          <property name="localRepository" value="${settings.localRepository}"/>
-          <property name="artifactId" value="${artifactId}"/>
-        </ant> 
-     </target>
-		
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/pom.xml b/java/sca-contrib/demos/alert-aggregator-webapp/pom.xml
deleted file mode 100644
index 71139b0863..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/pom.xml
+++ /dev/null
@@ -1,345 +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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-demos</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.apache.tuscany.sca</groupId>
-    <artifactId>demo-alert-aggregator-webapp</artifactId>
-    <packaging>war</packaging>
-    <version>2.0-SNAPSHOT</version>
-    <name>Apache Tuscany SCA Alert Aggregator Demo</name>
-    <url>http://cwiki.apache.org/TUSCANY</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>httpunit</groupId>
-            <artifactId>httpunit</artifactId>
-            <version>1.6.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-api-r2.1</artifactId>
-            <version>1.1.1</version>
-        </dependency>         
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-        </dependency>  
-    </dependencies>
-
-    <build>
-        <finalName>demo-alert-aggregator-webapp</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFiles>
-                                <configuration>
-                                    <fileName>${basedir}/src/main/resources/Alerts.wsdl</fileName>
-                                    <javaPackage>org.apache.tuscany.sca.demos.aggregator.service</javaPackage>
-                                </configuration>
-                                <configuration>
-                                    <fileName>${basedir}/src/main/resources/AlertsSources.wsdl</fileName>
-                                    <javaPackage>org.apache.tuscany.sca.demos.aggregator.sources</javaPackage>
-                                </configuration>
-                                <configuration>
-                                    <fileName>${basedir}/src/main/resources/Alerts.xsd</fileName>
-                                    <javaPackage>org.apache.tuscany.sca.demos.aggregator.types</javaPackage>
-                                </configuration>
-                            </schemaFiles>
-                            <noNotification>true</noNotification>
-                            <noContainment>true</noContainment>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>install-dojo</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="install-dojo">
-                                    <property name="localRepository" value="${settings.localRepository}" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-dojo-files</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-                                    <property name="localRepository" value="${settings.localRepository}" />
-                                    <property name="artifactId" value="${artifactId}" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>clean-dojo-files</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="clean-dojo-files">
-                                    <property name="localRepository" value="${settings.localRepository}" />
-                                    <property name="artifactId" value="${artifactId}" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <!-- 
-                <configuration>
-                    <excludes>
-                        <exclude>**/AlertsTestCase.java</exclude>
-                    </excludes>
-                </configuration>
-                 -->
-                <executions>
-                    <execution>
-                        <id>surefire-it</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <includes>
-                                <include>**/*AlertsIntegrationTest.java</include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.cargo</groupId>
-                <artifactId>cargo-maven2-plugin</artifactId>
-                <version>1.0-alpha-5</version>
-                <executions>
-                    <execution>
-                        <id>start-container</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>stop-container</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <container>
-                        <containerId>jetty6x</containerId>
-                        <type>embedded</type>  
-                        <systemProperties>
-                            <org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
-                        </systemProperties>
-                    </container>
-                    <wait>false</wait>
-                    <configuration>
-                        <properties>
-                            <cargo.servlet.port>8085</cargo.servlet.port>
-                        </properties>
-                        <deployables>
-                            <deployable>
-                                <location>
-                                    ${project.build.directory}/${project.build.finalName}.${project.packaging}
-                                </location>
-                                <pingURL>http://localhost:8085/AlertsSourcesServiceJSONRPC</pingURL>
-                            </deployable>
-                        </deployables>
-                        <home>${project.build.directory}/cargo-jetty</home>
-                    </configuration>
-                </configuration>                
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>             
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
deleted file mode 100644
index 808374030c..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
+++ /dev/null
@@ -1,339 +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.demos.aggregator;
-
-import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
-
- 
-public class AlertTypeNonSDOImpl implements AlertType
-{
-    private static final long serialVersionUID = 670364038865656196L;
-
-/**
-   * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTitle()
-   * @generated
-   * @ordered
-   */
-  protected static final String TITLE_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTitle()
-   * @generated
-   * @ordered
-   */
-  protected String title = TITLE_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #getSummary() <em>Summary</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSummary()
-   * @generated
-   * @ordered
-   */
-  protected static final String SUMMARY_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getSummary() <em>Summary</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSummary()
-   * @generated
-   * @ordered
-   */
-  protected String summary = SUMMARY_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #getAddress() <em>Address</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAddress()
-   * @generated
-   * @ordered
-   */
-  protected static final String ADDRESS_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAddress()
-   * @generated
-   * @ordered
-   */
-  protected String address = ADDRESS_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #getDate() <em>Date</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getDate()
-   * @generated
-   * @ordered
-   */
-  protected static final String DATE_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getDate() <em>Date</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getDate()
-   * @generated
-   * @ordered
-   */
-  protected String date = DATE_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #getSourceId() <em>Source Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSourceId()
-   * @generated
-   * @ordered
-   */
-  protected static final String SOURCE_ID_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getSourceId() <em>Source Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSourceId()
-   * @generated
-   * @ordered
-   */
-  protected String sourceId = SOURCE_ID_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #isUnread() <em>Unread</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUnread()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean UNREAD_DEFAULT_ = false;
-
-  /**
-   * The cached value of the '{@link #isUnread() <em>Unread</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUnread()
-   * @generated
-   * @ordered
-   */
-  protected boolean unread = UNREAD_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_DEFAULT_;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public AlertTypeNonSDOImpl()
-  {
-    super();
-  }
-
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getTitle()
-  {
-    return title;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setTitle(String newTitle)
-  {
-    title = newTitle;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getSummary()
-  {
-    return summary;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setSummary(String newSummary)
-  {
-    summary = newSummary;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getAddress()
-  {
-    return address;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setAddress(String newAddress)
-  {
-    address = newAddress;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getDate()
-  {
-    return date;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setDate(String newDate)
-  {
-    date = newDate;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getSourceId()
-  {
-    return sourceId;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setSourceId(String newSourceId)
-  {
-    sourceId = newSourceId;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isUnread()
-  {
-    return unread;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUnread(boolean newUnread)
-  {
-    unread = newUnread;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    id = newId;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (Title: ");
-    result.append(title);
-    result.append(", Summary: ");
-    result.append(summary);
-    result.append(", Address: ");
-    result.append(address);
-    result.append(", Date: ");
-    result.append(date);
-    result.append(", SourceId: ");
-    result.append(sourceId);
-    result.append(", Unread: ");
-    result.append(unread);
-    result.append(", Id: ");
-    result.append(id);
-    result.append(')');
-    return result.toString();
-  }
-
-} //AlertTypeImpl
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
deleted file mode 100644
index cf2f906388..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
+++ /dev/null
@@ -1,106 +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.demos.aggregator;
-
-import java.text.DateFormat;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.factory.Factory;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.binding.atom.collection.NotFoundException;
-import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
-import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Read all new alerts from the specified sources
- *
- * @version $Rev$ $Date$
- */
-@Service(Collection.class)
-public class AlertsFeedServiceImpl implements Collection {
-  
-    private AlertsService alerts;
-    
-    @Reference
-    public void setAlerts(AlertsService alerts) {
-        this.alerts = alerts;
-    }    
-    
-    DateFormat dateFormatter = DateFormat.getDateTimeInstance();
-    
-    /**
-     * Return the alerts as a feed.
-     * 
-     * @return the structure containing alerts 
-     */    
-    public org.apache.abdera.model.Feed getFeed() {
-        
-        // Create a new Feed
-        Factory factory = Abdera.getNewFactory();
-        Feed feed = factory.newFeed();
-        feed.setTitle("Apache Tuscany Feed Aggregator");
-        feed.setSubtitle("A sample showing an SCA application to aggregate various types of feeds");
-        feed.addAuthor("Apache Tuscany");
-        feed.addLink("http://tuscany.apache.org");
- 
-        // Aggregate entries from feed1 and feed2
-        try {        
-            AlertsType alerts = this.alerts.getAllNewAlerts("");
-            
-            for( Object alertObject : alerts.getAlert() ){         
-                AlertType alert = ((AlertType)alertObject);
-                Entry entry = factory.newEntry();
-                entry.setTitle(alert.getTitle());
-                //entry.(alert.getSummary());                    
-                entry.addLink(alert.getAddress());
-                entry.setPublished(dateFormatter.parse(alert.getDate()));
-                        
-                feed.addEntry(entry);
-            }
-        } catch(Exception ex) {
-            System.err.println("Exception " + ex.toString());
-        }
-        
-        return feed;
-    }
-    
-    public Feed query(String queryString) {
-        return getFeed();
-    }
-
-    public void delete(String id) throws NotFoundException {
-    }
-
-    public Entry get(String id) throws NotFoundException {
-        return null;
-    }
-
-    public Entry post(Entry entry) {
-        return null;
-    }
-
-    public void put(String id, Entry entry) throws NotFoundException {
-    }
-
-}
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
deleted file mode 100644
index 8797349640..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
+++ /dev/null
@@ -1,40 +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.demos.aggregator;
-
-import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Retrieve and manage alerts
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface AlertsService {
-
-    /**
-     * Return a structure holding all of the new alerts that have been found
-     * 
-     * @return the structure containing alerts 
-     */
-    public AlertsType getAllNewAlerts(String id);
-    
-}
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
deleted file mode 100644
index 569d9b7f6f..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
+++ /dev/null
@@ -1,126 +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.demos.aggregator;
-
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
-import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
-import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
-import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Read all new alerts from the specified sources
- *
- * @version $Rev$ $Date$
- */
-@Service(AlertsService.class)
-public class AlertsServiceImpl implements AlertsService {
-
-    private RSSCheckerService    rssChecker;
-    
-    private AlertsSourcesService alertsSources;
-
-    @Reference
-    public void setRssChecker(RSSCheckerService rssChecker) {
-        this.rssChecker = rssChecker;
-    }
-    
-    @Reference
-    public void setAlertsSources(AlertsSourcesService alertsSources) {
-        this.alertsSources = alertsSources;
-    }    
-    
-    DateFormat dateFormatter = DateFormat.getDateTimeInstance();
-    
-    /**
-     * Return a structure holding all of the new alerts that have been found
-     * 
-     * @return the structure containing alerts 
-     */
-    public AlertsType getAllNewAlerts(String id)
-    {
-        System.err.println("getAllNewAlerts(" + id + ")");
-        
-        //TypesFactory factory    = TypesFactory.INSTANCE;
-        //AlertsType returnAlerts = factory.createAlertsType();
-        AlertsType returnAlerts = new AlertsTypeNonSDOImpl();
-        List returnAlertList    = returnAlerts.getAlert();
-        
-        // get the date/time now so that we can update the 
-        // alert source record so that next time we 
-        // only get the latest alerts
-        Date now = new Date();
-        String nowString = dateFormatter.format(now);
-              
-        try {
-            ConfigType alertSourceConfig = alertsSources.getAlertSources(id);
-            
-            for (Object source : alertSourceConfig.getSource()){
-                SourceType sourceType = (SourceType)source;
-                
-                AlertsType alerts = null;
-                
-                if ( sourceType.getFeedType().equals("rss")){
-                    alerts = rssChecker.getNewAlerts(sourceType.getFeedAddress(),
-                                                     sourceType.getLastChecked());
-                } else {
-                    
-                }
-                
-                // extend return list with any alerts we found
-                for( Object alert : alerts.getAlert() ){         
-
-                    // set the id on the alert so we know which source it
-                    // came from 
-                    ((AlertType)alert).setSourceId(sourceType.getId());
-                    
-                    // convert from SDO to POJO so that the 
-                    // JSONRPC binding will work. It can't currently
-                    // handle SDOs
-                    AlertType newAlert = new AlertTypeNonSDOImpl();
-    
-                    newAlert.setSourceId(((AlertType)alert).getSourceId());
-                    newAlert.setTitle(((AlertType)alert).getTitle());
-                    newAlert.setSummary(((AlertType)alert).getSummary());                    
-                    newAlert.setAddress(((AlertType)alert).getAddress());
-                    newAlert.setDate(((AlertType)alert).getDate());
-                    newAlert.setId(((AlertType)alert).getId());
-                    newAlert.setUnread(((AlertType)alert).isUnread());                
-                    
-                    returnAlertList.add(newAlert);
-                }
-                
-                // update the time last checked for this source
-                sourceType.setLastChecked(nowString);
-                //alertsSources.updateAlertSource(sourceType);
-            }
-        } catch(Exception ex) {
-            System.err.println("Exception " + ex.toString());
-        }
-        
-        return returnAlerts ;
-        
-    }
-}
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
deleted file mode 100644
index f61c307120..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
+++ /dev/null
@@ -1,69 +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.demos.aggregator;
-
-import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
-import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Retrieve and manage alert sources
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface AlertsSourcesService {
-
-    /**
-     * Return all of the configured alert sources.
-     *
-     * @return the list of alert sources
-     */
-    public ConfigType getAlertSources (String id);
-    
-    /**
-     * Return a single alert source.
-     * @param id not currently used
-     * @return the alert source
-     */
-    public SourceType getAlertSource (String id); 
-    
-    /**
-     * Update an alert source.
-     *
-     * @param updatedSource the alert source to update
-     */
-    public void updateAlertSource (SourceType updatedSource);    
-      
-    /**
-     * Add an alert source.
-     *
-     * @param newSource the alert source to add
-     */
-    public String addAlertSource (SourceType newSource);   
-
-    /**
-     * Remove an alert source.
-     *
-     * @param oldSource the alert source to remove
-     */
-    public void removeAlertSource (String id); 
-
-}
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
deleted file mode 100644
index 38e7ba31a6..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
+++ /dev/null
@@ -1,183 +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.demos.aggregator;
-
-import java.io.InputStream;
-import java.text.DateFormat;
-import java.util.Date;
-
-import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
-import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
-import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
-import org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * Retrieve and manage alert sources
- *
- * @version $Rev$ $Date$
- */
-@Service(AlertsSourcesService.class)
-@Scope("COMPOSITE")
-public class AlertsSourcesServiceImpl implements AlertsSourcesService {
-    
-    ConfigType alertSources;
-    
-    /**
-     * Constructor reads the configuration to provide
-     * the initial list of alert sources
-     */
-    public AlertsSourcesServiceImpl(){
-        System.err.println("AlertsSourcesServiceImpl()");
-        try {
-            // read the alerts config from an XML file
-            InputStream is = this.getClass().getClassLoader().getResourceAsStream("sources.xml");
-            
-            if (is == null) {
-                throw new Exception("Can;t find sources.xml");
-            } else {
-                HelperContext helperContext = HelperProvider.getDefaultContext();
-                TypesFactory.INSTANCE.register(helperContext);
-                 XMLDocument xmlDoc = helperContext.getXMLHelper().load(is);
-                alertSources = (ConfigType)xmlDoc.getRootObject();
-            }
-        } catch (Exception ex) {
-            System.err.println("Exception " + ex.toString());
-        }
-    }
-   
-    /**
-     * Return all of the configured alert sources.
-     *
-     * @return the list of alert sources
-     */
-    public ConfigType getAlertSources (String id)
-    {           
-        System.err.println("getAlertSources(" + id + ")");
-        
-        // convert alert sources to POJOs so that 
-        // the JSONRPC binding will work
-        ConfigTypeNonSDOImpl sources = new ConfigTypeNonSDOImpl();
-        
-        for (Object source : alertSources.getSource()) {
-            SourceTypeNonSDOImpl newSource = new SourceTypeNonSDOImpl();
-            newSource.setAddress(((SourceTypeImpl)source).getAddress());
-            newSource.setFeedAddress(((SourceTypeImpl)source).getFeedAddress());
-            newSource.setId(((SourceTypeImpl)source).getId());
-            newSource.setLastChecked(((SourceTypeImpl)source).getLastChecked());
-            newSource.setName(((SourceTypeImpl)source).getName());
-            newSource.setFeedType(((SourceTypeImpl)source).getFeedType());
-            sources.getSource().add(newSource);
-        }
-        
-        return sources;
-    }
-    
-    /**
-     * Return a single alert source.
-     * @param id the alert source id number
-     * @return the alert source
-     */
-    public SourceType getAlertSource (String id)
-    {           
-        System.err.println("getAlertSource(" + id + ")");
-        SourceType alertSource = null;
-        
-        for (Object source : alertSources.getSource()) {
-            if ( ((SourceType)source).getId().equals(id)) {
-                alertSource = (SourceType)source;
-            }
-        }
-        return alertSource;
-    } 
-    
-    /**
-     * Update an alert source.
-     *
-     * @param updatedSource the alert source to update
-     */
-    public void updateAlertSource (SourceType updatedSource)
-    {           
-        System.err.println("updateAlertSource()");
-            
-        Object originalSource = null;
-        
-        for (Object source : alertSources.getSource()) {
-            if ( ((SourceType)source).getId().equals(updatedSource.getId())) {
-                originalSource = source;
-                break;
-            }
-        }
-        
-        if (originalSource != null){
-            alertSources.getSource().add(updatedSource);
-            alertSources.getSource().remove(originalSource);
-        }
-    }    
-      
-    /**
-     * Add an alert source.
-     *
-     * @param newSource the alert source to add
-     */
-    public String addAlertSource (SourceType newSource)
-    {           
-        System.err.println("addAlertSource()");
-        // set the date to now less 2 hours so we 
-        // get some alerts straight away
-        DateFormat dateFormatter = DateFormat.getDateTimeInstance();
-        Date now = new Date();
-        now.setHours(now.getHours()-2);
-        String nowString = dateFormatter.format(now);        
-        newSource.setLastChecked(nowString); 
-        alertSources.getSource().add(newSource);  
-        return "Done";
-    }    
-
-    /**
-     * Remove an alert source.
-     *
-     * @param oldSource the alert source to remove
-     */
-    public void removeAlertSource (String id)
-    {           
-        System.err.println("removeAlertSource()");
-        
-        Object originalSource = null;
-        
-        for (Object source : alertSources.getSource()) {
-            if ( ((SourceType)source).getId().equals(id)) {
-                originalSource = source;
-                break;
-            }
-        }  
-        
-        if (originalSource != null) {
-            alertSources.getSource().remove(originalSource);
-        }
-
-    } 
- 
-}
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
deleted file mode 100644
index 2962defb25..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
+++ /dev/null
@@ -1,74 +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.demos.aggregator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Alerts Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sca.samples.aggregator.types.impl.AlertsTypeImpl#getAlert <em>Alert</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AlertsTypeNonSDOImpl implements AlertsType
-{
-    private static final long serialVersionUID = -3784576466148158776L;
-    
-/**
-   * The cached value of the '{@link #getAlert() <em>Alert</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAlert()
-   * @generated
-   * @ordered
-   */
-  
-  protected List alert = new ArrayList();
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public AlertsTypeNonSDOImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getAlert()
-  {
-    return alert;
-  }
-
-} //AlertsTypeImpl
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
deleted file mode 100644
index 75544294ce..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.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 org.apache.tuscany.sca.demos.aggregator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
-
-
-public class ConfigTypeNonSDOImpl implements ConfigType
-{
-    private static final long serialVersionUID = 2522843951360675364L;
-    
-    protected List source = new ArrayList();
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ConfigTypeNonSDOImpl()
-  {
-    super();
-  }
-
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getSource()
-  {
-    return source;
-  }
-
-
-} //ConfigTypeImpl
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
deleted file mode 100644
index 2a5775e9a9..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
+++ /dev/null
@@ -1,30 +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.demos.aggregator;
-
-import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
-
-/**
- * The interface for the rss checker service
- */
-public interface RSSCheckerService {
-
-    public AlertsType getNewAlerts(String rssaddress, String lastchecktimestamp);
-
-}
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
deleted file mode 100644
index 549abbf602..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
+++ /dev/null
@@ -1,91 +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.demos.aggregator;
-
-import java.net.URL;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
-import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
-import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
-
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.XmlReader;
-
-/**
- * The interface for the rss checker service
- */
-public class RSSCheckerServiceImpl implements RSSCheckerService {
-
-    public AlertsType getNewAlerts(String rssaddress, String lastchecktimestamp){
-        // Create the list of alerts to return
-        TypesFactory factory    = TypesFactory.INSTANCE;
-        AlertsType returnAlerts = factory.createAlertsType();
-        List returnAlertList    = returnAlerts.getAlert();
-        
-        try {
-        	// lastchecktimestamp comes from sources.xml configuration.
-        	// That origin requires ISO 8601 date input (yyyy-MM-dd hh:mm:ss).
-        	DateFormat configDateFormatter = new SimpleDateFormat( "yyyy-MM-dd hh:mm:ss"); 
-            Date timestamp = configDateFormatter.parse(lastchecktimestamp);
-            // Turn feed dates into something we can process. 
-            DateFormat feedDateFormatter = DateFormat.getDateTimeInstance();
-            
-            // get the feed data from the supplied address            
-            SyndFeedInput input = new SyndFeedInput();
-            SyndFeed feed = input.build(new XmlReader(new URL(rssaddress)));
-            //System.out.println(feed);
-            
-            // check all the items to see if we have seen them before
-            List entries = feed.getEntries();
-            for(Object entry: entries){
-                SyndEntry syndEntry = (SyndEntry)entry;             
-                
-                // System.err.println( "Entry pubdate=" + syndEntry.getPublishedDate() );
-                if (syndEntry.getPublishedDate().after(timestamp)){
-                    AlertType newAlert = factory.createAlertType();
-                    
-                    newAlert.setTitle(syndEntry.getTitle());
-                 //   newAlert.setSummary("<![CDATA[" + 
-                //                        syndEntry.getDescription().getValue() +
-                //                        "]]>");
-                    newAlert.setSummary("");                    
-                    newAlert.setAddress(syndEntry.getLink());
-                    newAlert.setDate(feedDateFormatter.format(syndEntry.getPublishedDate()));
-                    newAlert.setId(rssaddress);
-                    newAlert.setUnread(true);
-                    
-                    returnAlertList.add(newAlert);
-                }
-            }
-            
-        } catch(Exception ex) {
-        	ex.printStackTrace( System.err );
-            System.err.println("Exception " + ex.toString());
-        }
-
-        return returnAlerts;
-    }
-
-}
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
deleted file mode 100644
index 10575bf0dc..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
+++ /dev/null
@@ -1,536 +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.demos.aggregator;
-
-import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
-
-import commonj.sdo.Sequence;
-
-
-public class SourceTypeNonSDOImpl implements SourceType
-{
-  private static final long serialVersionUID = -4986294578888767793L;
-
-  public final static int NAME = 0;
-
-  public final static int ADDRESS = 1;
-
-  public final static int LAST_CHECKED = 2;
-
-  public final static int FEED_ADDRESS = 3;
-
-  public final static int POP_SERVER = 4;
-
-  public final static int POP_USERNAME = 5;
-
-  public final static int POP_PASSWORD = 6;
-
-  public final static int ANY = -1;
-
-  public final static int ID = 7;
-
-  public final static int TYPE = 8;
-
-  public final static int SDO_PROPERTY_COUNT = 9;
-
-  public final static int EXTENDED_PROPERTY_COUNT = -1;
-
-
-  /**
-   * The internal feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_NAME = 0;
-
-  /**
-   * The internal feature id for the '<em><b>Address</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ADDRESS = 1;
-
-  /**
-   * The internal feature id for the '<em><b>Last Checked</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_LAST_CHECKED = 2;
-
-  /**
-   * The internal feature id for the '<em><b>Feed Address</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_FEED_ADDRESS = 3;
-
-  /**
-   * The internal feature id for the '<em><b>Pop Server</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_POP_SERVER = 4;
-
-  /**
-   * The internal feature id for the '<em><b>Pop Username</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_POP_USERNAME = 5;
-
-  /**
-   * The internal feature id for the '<em><b>Pop Password</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_POP_PASSWORD = 6;
-
-  /**
-   * The internal feature id for the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ANY = 7;
-
-  /**
-   * The internal feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ID = 8;
-
-  /**
-   * The internal feature id for the '<em><b>Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_TYPE = 9;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 10;
-
-
-
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #getAddress() <em>Address</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAddress()
-   * @generated
-   * @ordered
-   */
-  protected static final String ADDRESS_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAddress()
-   * @generated
-   * @ordered
-   */
-  protected String address = ADDRESS_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #getLastChecked() <em>Last Checked</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLastChecked()
-   * @generated
-   * @ordered
-   */
-  protected static final String LAST_CHECKED_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getLastChecked() <em>Last Checked</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLastChecked()
-   * @generated
-   * @ordered
-   */
-  protected String lastChecked = LAST_CHECKED_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #getFeedAddress() <em>Feed Address</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFeedAddress()
-   * @generated
-   * @ordered
-   */
-  protected static final String FEED_ADDRESS_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getFeedAddress() <em>Feed Address</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFeedAddress()
-   * @generated
-   * @ordered
-   */
-  protected String feedAddress = FEED_ADDRESS_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #getPopServer() <em>Pop Server</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPopServer()
-   * @generated
-   * @ordered
-   */
-  protected static final String POP_SERVER_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getPopServer() <em>Pop Server</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPopServer()
-   * @generated
-   * @ordered
-   */
-  protected String popServer = POP_SERVER_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #getPopUsername() <em>Pop Username</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPopUsername()
-   * @generated
-   * @ordered
-   */
-  protected static final String POP_USERNAME_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getPopUsername() <em>Pop Username</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPopUsername()
-   * @generated
-   * @ordered
-   */
-  protected String popUsername = POP_USERNAME_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #getPopPassword() <em>Pop Password</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPopPassword()
-   * @generated
-   * @ordered
-   */
-  protected static final String POP_PASSWORD_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getPopPassword() <em>Pop Password</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPopPassword()
-   * @generated
-   * @ordered
-   */
-  protected String popPassword = POP_PASSWORD_DEFAULT_;
-
-  /**
-   * The cached value of the '{@link #getAny() <em>Any</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAny()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence any = null;
-  
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #getFeedType() <em>Feed Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFeedType()
-   * @generated
-   * @ordered
-   */
-  protected static final String FEED_TYPE_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getFeedType() <em>Feed Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFeedType()
-   * @generated
-   * @ordered
-   */
-  protected String feedType = FEED_TYPE_DEFAULT_;
-  
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public SourceTypeNonSDOImpl()
-  {
-    super();
-  }
-
-
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    name = newName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getAddress()
-  {
-    return address;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setAddress(String newAddress)
-  {
-    address = newAddress;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLastChecked()
-  {
-    return lastChecked;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setLastChecked(String newLastChecked)
-  {
-    lastChecked = newLastChecked;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getFeedAddress()
-  {
-    return feedAddress;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setFeedAddress(String newFeedAddress)
-  {
-    feedAddress = newFeedAddress;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getPopServer()
-  {
-    return popServer;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPopServer(String newPopServer)
-  {
-    popServer = newPopServer;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getPopUsername()
-  {
-    return popUsername;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPopUsername(String newPopUsername)
-  {
-    popUsername = newPopUsername;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getPopPassword()
-  {
-    return popPassword;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPopPassword(String newPopPassword)
-  {
-    popPassword = newPopPassword;
-  }
-
-   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    id = newId;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getFeedType()
-  {
-    return feedType;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setFeedType(String newType)
-  {
-    feedType = newType;
-  }
-  
-  public Sequence getAny(){
-      return null;
-  }
-
-} //SourceTypeImpl
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
deleted file mode 100644
index 8b376240c8..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
+++ /dev/null
@@ -1,88 +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://tuscany.apache.org/sca/demos/aggregator/service"
-                  xmlns:tns="http://tuscany.apache.org/sca/demos/aggregator/service" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                  name="Alerter">
-
-    <wsdl:types>
-        <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"   
-            targetNamespace="http://tuscany.apache.org/sca/demos/aggregator/service" 
-            xmlns:alerter="http://tuscany.apache.org/sca/demos/aggregator/types"
-            elementFormDefault="qualified">
-
-            <xsd:import namespace="http://tuscany.apache.org/sca/demos/aggregator/types" 
-                        schemaLocation="Alerts.xsd" />            
-
-            <element name="getAllNewAlerts">
-                <xsd:complexType>
-                    <sequence>
-                        <element name="parm" type="string" />
-                    </sequence>                
-                </xsd:complexType>
-            </element>
-            
-            <element name="getAllNewAlertsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="parm" type="alerter:AlertsType" />
-                    </sequence>
-                </complexType>
-            </element>
-
-        </xsd:schema>
-    </wsdl:types>
-
-    <wsdl:message name="GetAllNewAlertsRequest">
-        <wsdl:part element="tns:getAllNewAlerts" name="parameters" />
-    </wsdl:message>
-    <wsdl:message name="GetAllNewAlertsResponse">
-        <wsdl:part element="tns:getAllNewAlertsResponse" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:portType name="AlertsPortType">
-        <wsdl:operation name="getAllNewAlerts">
-            <wsdl:input message="tns:GetAllNewAlertsRequest" name="GetAllNewAlertsRequestMsg" />
-            <wsdl:output message="tns:GetAllNewAlertsResponse" name="GetAllNewAlertsResponseMsg" />
-        </wsdl:operation>
-   </wsdl:portType>
-
-    <wsdl:binding name="AlertsBinding" type="tns:AlertsPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="getAllNewAlerts">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="GetAllNewAlertsRequestMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="GetAllNewAlertsResponseMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>           
-    </wsdl:binding>
-
-    <wsdl:service name="AlertsService">
-        <wsdl:port name="AlertsPort" binding="tns:AlertsBinding">
-            <wsdlsoap:address location="http://localhost:8085/services/AlertsServiceWebServiceBinding" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
deleted file mode 100644
index f0ec561ad8..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
+++ /dev/null
@@ -1,80 +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://tuscany.apache.org/sca/demos/aggregator/types" 
-		xmlns="http://www.w3.org/2001/XMLSchema" 
-		xmlns:ns="http://tuscany.apache.org/sca/demos/aggregator/types">
-    <element name="Alerts" type="ns:AlertsType"/>
-
-    <complexType name="AlertType">
-    	<sequence>
-    		<element name="Title" type="string"/>
-    		<element name="Summary" type="string"/>
-    		<element name="Address" type="anyURI" maxOccurs="1" minOccurs="1"/>
-    		<element name="Date" type="string" maxOccurs="1" minOccurs="1"/>
-    	</sequence>
-        <attribute name="SourceId" type="string" use="optional"/>
-        <attribute name="Unread" type="boolean" use="optional"/>
-        <attribute name="Id" type="string" use="optional"/>
-    </complexType>
-
-    <complexType name="AlertsType">
-    	<sequence>
-    		<element name="Alert" type="ns:AlertType" maxOccurs="unbounded" minOccurs="0" />
-    	</sequence>        
-    </complexType>
-       
-    <complexType name="SourceType">
-    	<sequence>
-    		<element name="Name" type="string" maxOccurs="1" minOccurs="1"/>
-            <element name="Address" type="anyURI" maxOccurs="1" minOccurs="1"/>
-            <element name="LastChecked" type="string" maxOccurs="1" minOccurs="0"/>
-            <element name="FeedAddress" type="string" maxOccurs="1" minOccurs="0"/>
-            <element name="PopServer" type="string" maxOccurs="1" minOccurs="0"/>
-            <element name="PopUsername" type="string" maxOccurs="1" minOccurs="0"/>
-            <element name="PopPassword" type="string" maxOccurs="1" minOccurs="0"/>
-    		<any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    	</sequence>
-        <attribute name="Id" type="string" use="optional"/>
-    	<attribute name="FeedType" use="required">
-    		<simpleType>
-    			<restriction base="string">
-    				<enumeration value="rss"/>
-    				<enumeration value="pop"/>
-    				<enumeration value="nntp"/>
-    			</restriction>
-    		</simpleType>
-    	</attribute>
-    </complexType>
-
-    <complexType name="ConfigType">
-    	<sequence>
-    		<element name="Source" type="ns:SourceType" maxOccurs="unbounded" minOccurs="0"/>
-    	</sequence>
-    </complexType>
-    
-    <complexType name="SingleSourceType">
-    	<sequence>
-    		<element name="Source" type="ns:SourceType"/>
-    	</sequence>
-    </complexType>    
-    
-    <element name="Config" type="ns:ConfigType"/>
-    <element name="Source" type="ns:SourceType"/>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
deleted file mode 100644
index d5642a32d1..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
+++ /dev/null
@@ -1,124 +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://tuscany.apache.org/sca/demos/aggregator/sources"
-                  xmlns:tns="http://tuscany.apache.org/sca/demos/aggregator/sources" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                  name="Alerter">
-
-    <wsdl:types>
-        <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"   
-            targetNamespace="http://tuscany.apache.org/sca/demos/aggregator/sources" 
-            xmlns:alerter="http://tuscany.apache.org/sca/demos/aggregator/types"
-            elementFormDefault="qualified">
-
-            <xsd:import namespace="http://tuscany.apache.org/sca/demos/aggregator/types" 
-                        schemaLocation="Alerts.xsd" />            
-
-            <element name="getAlertSources">
-                <xsd:complexType>
-                    <sequence>
-                        <element name="parm" type="string" />
-                    </sequence>                
-                </xsd:complexType>
-            </element>
-            
-            <element name="getAlertSourcesResponse">
-                <complexType>
-                    <sequence>
-                        <element name="parm" type="alerter:ConfigType" />
-                    </sequence>
-                </complexType>
-            </element>
-            
-            <element name="addAlertSource">
-                <xsd:complexType>
-                    <sequence>
-                        <element name="parm" type="alerter:SourceType"/>                    
-                    </sequence>                
-                </xsd:complexType>
-            </element> 
-            
-            <element name="addAlertSourceResponse">
-                <complexType>
-                    <sequence>
-                        <element name="parm" type="string" />
-                    </sequence>
-                </complexType>
-            </element>                       
-
-        </xsd:schema>
-    </wsdl:types>
-
-    <wsdl:message name="GetAlertSourcesRequest">
-        <wsdl:part element="tns:getAlertSources" name="parameters" />
-    </wsdl:message>
-    <wsdl:message name="GetAlertSourcesResponse">
-        <wsdl:part element="tns:getAlertSourcesResponse" name="parameters" />
-    </wsdl:message>
-    
-    <wsdl:message name="AddAlertSourceRequest">
-        <wsdl:part element="tns:addAlertSource" name="parameters" />
-    </wsdl:message>
-    <wsdl:message name="AddAlertSourceResponse">
-        <wsdl:part element="tns:addAlertSourceResponse" name="parameters" />
-    </wsdl:message>    
-
-    <wsdl:portType name="AlertsSourcesPortType">
-        <wsdl:operation name="getAlertSources">
-            <wsdl:input message="tns:GetAlertSourcesRequest" name="GetAlertSourcesRequestMsg" />
-            <wsdl:output message="tns:GetAlertSourcesResponse" name="GetAlertSourcesResponseMsg" />
-        </wsdl:operation>
-        <wsdl:operation name="addAlertSource">
-            <wsdl:input message="tns:AddAlertSourceRequest" name="AddAlertSourceRequestMsg" />
-            <wsdl:output message="tns:AddAlertSourceResponse" name="AddAlertSourceResponseMsg" />
-        </wsdl:operation>        
-   </wsdl:portType>
-
-    <wsdl:binding name="AlertsSourcesBinding" type="tns:AlertsSourcesPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="getAlertSources">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="GetAlertSourcesRequestMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="GetAlertSourcesResponseMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>  
-        <wsdl:operation name="addAlertSource">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="AddAlertSourceRequestMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="AddAlertSourceResponseMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>                  
-    </wsdl:binding>
-
-    <wsdl:service name="AlertsSourcesService">
-        <wsdl:port name="AlertsSourcesPort" binding="tns:AlertsSourcesBinding">
-            <wsdlsoap:address location="http://localhost:8085/services/AlertsSourcesServiceWebServiceBinding" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
deleted file mode 100644
index 49f44f9da8..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
+++ /dev/null
@@ -1,49 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-    xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" targetNamespace="http://sample"

-    name="FeedAggregatorClient">

-

-    <!-- SDO factory classes -->

-    <!-- dbsdo:import.sdo factory="org.apache.tuscany.sca.demos.aggregator.service.ServiceFactory"/ -->

-    <!-- dbsdo:import.sdo factory="org.apache.tuscany.sca.demos.aggregator.types.TypesFactory"/ -->

-

-    <component name="AlertsFeedServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.demos.aggregator.AlertsFeedServiceImpl" />

-        <reference name="alerts" target="AlertsServiceComponent" />

-    </component>

-

-    <component name="AlertsServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.demos.aggregator.AlertsServiceImpl" />

-        <reference name="rssChecker" target="RSSCheckerComponent" />

-        <reference name="alertsSources" target="AlertsSourcesServiceComponent" />

-    </component>

-

-    <component name="AlertsSourcesServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.demos.aggregator.AlertsSourcesServiceImpl" />

-    </component>

-

-    <!-- The RSS reader -->

-    <component name="RSSCheckerComponent">

-        <implementation.java class="org.apache.tuscany.sca.demos.aggregator.RSSCheckerServiceImpl" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/alerts.composite b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
deleted file mode 100644
index c359b275be..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
+++ /dev/null
@@ -1,85 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-	xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"

-	targetNamespace="http://sample"

-    name="FeedAggregator">

-    

-    <!-- SDO factory classes -->    

-    <!-- dbsdo:import.sdo factory="org.apache.tuscany.sca.demos.aggregator.service.ServiceFactory"/ -->

-    <!-- dbsdo:import.sdo factory="org.apache.tuscany.sca.demos.aggregator.types.TypesFactory"/ --> 

-

-    <!-- The alerts rss service -->

-    <service name="AlertsFeedServiceRSS" promote="AlertsFeedServiceComponent/Collection">

-        <tuscany:binding.rss />

-    </service>    

-    

-    <!-- The alerts atom service -->

-    <service name="AlertsFeedServiceAtom" promote="AlertsFeedServiceComponent/Collection">

-        <tuscany:binding.atom />

-    </service> 

-    

-    <component name="AlertsFeedServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.demos.aggregator.AlertsFeedServiceImpl" />

-        <reference name="alerts" target="AlertsServiceComponent"/>

-    </component>    

-        

-    <!-- The alerts web service -->

-    <service name="AlertsService" promote="AlertsServiceComponent">

-        <interface.wsdl interface="http://tuscany.apache.org/sca/demos/aggregator/service#wsdl.interface(AlertsPortType)"/>

-        <binding.ws wsdlElement="http://tuscany.apache.org/sca/demos/aggregator/service#wsdl.port(AlertsService/AlertsPort)"/>

-    </service>

-

-    <!-- The alerts jsonrpc service -->

-    <service name="AlertsServiceJSONRPC" promote="AlertsServiceComponent/AlertsService">

-        <interface.java interface="org.apache.tuscany.sca.demos.aggregator.AlertsService" />

-        <tuscany:binding.jsonrpc />

-    </service>     

-

-    <component name="AlertsServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.demos.aggregator.AlertsServiceImpl" />

-        <reference name="rssChecker" target="RSSCheckerComponent"/>

-        <reference name="alertsSources" target="AlertsSourcesServiceComponent"/>

-    </component>

-    

-    <!-- The alerts sources web service -->

-    <service name="AlertsSourcesService" promote="AlertsSourcesServiceComponent">

-        <interface.wsdl interface="http://tuscany.apache.org/sca/demos/aggregator/sources#wsdl.interface(AlertsSourcesPortType)"/>

-        <binding.ws wsdlElement="http://tuscany.apache.org/sca/demos/aggregator/sources#wsdl.port(AlertsSourcesService/AlertsSourcesPort)"/>

-    </service>

-    

-    <!-- The alerts jsonrpc service -->

-    <service name="AlertsSourcesServiceJSONRPC" promote="AlertsSourcesServiceComponent/AlertsSourcesService">

-        <interface.java interface="org.apache.tuscany.sca.demos.aggregator.AlertsSourcesService" />

-        <tuscany:binding.jsonrpc />

-    </service>    

-        

-    <component name="AlertsSourcesServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.demos.aggregator.AlertsSourcesServiceImpl" />

-    </component>

-    

-    <!-- The RSS reader -->

-    <component name="RSSCheckerComponent">

-        <implementation.java class="org.apache.tuscany.sca.demos.aggregator.RSSCheckerServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/sources.xml b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/sources.xml
deleted file mode 100644
index e45250eddb..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/sources.xml
+++ /dev/null
@@ -1,34 +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.
--->
-<!--  Note: the demo expects LastChecked date in ISO 8601 format (yyyy-MM-dd hh:mm:ss). -->
-<ns0:Config xmlns:ns0="http://tuscany.apache.org/sca/demos/aggregator/types">
-<ns0:Source Id="0" FeedType="rss">
-  <ns0:Name>BBC News</ns0:Name>
-  <ns0:Address>http://news.bbc.co.uk/</ns0:Address>
-  <ns0:LastChecked>2008-06-20 12:00:00</ns0:LastChecked>
-  <ns0:FeedAddress>http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml</ns0:FeedAddress>
-</ns0:Source>
-<ns0:Source Id="1" FeedType="rss">
-  <ns0:Name>Engadget</ns0:Name>
-  <ns0:Address>http://www.engadget.com</ns0:Address>
-  <ns0:LastChecked>2008-06-20 12:00:00</ns0:LastChecked>
-  <ns0:FeedAddress>http://www.engadget.com/rss.xml</ns0:FeedAddress>
-</ns0:Source>
-</ns0:Config>
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
deleted file mode 100644
index 8b472fd0fa..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
+++ /dev/null
@@ -1,330 +0,0 @@
-<html>
-<!--
- * 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.    
- -->
-<head>
-<title>Apache Tuscany Alert Aggregator Sample</TITLE>
-
-<script type="text/javascript">
-        //var djConfig = {isDebug: true,debugContainerId: "dojoDebug" };
-        //djConfig.debugAtAllCosts = true;
-    </script>
-
-<script type="text/javascript" src="dojo/dojo/dojo.js"> 
-    </script>
-<script type="text/javascript" src="dojo/dijit/dijit.js"> 
-    </script>
-
-<script type="text/javascript">
-    	dojo.require("dijit.form.Button");
-    	dojo.require("dojo.rpc.JsonService");    	
-    </script>
-
-<link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-
-<body onload="getAlertSources()">
-
-<script type="text/javascript">
-    
-        // The proxy for the alert and alertsources services running in Tuscany
-        var alertsService       = new dojo.rpc.JsonService("AlertsServiceJSONRPC?smd");
-        var alertSourcesService = new dojo.rpc.JsonService("AlertsSourcesServiceJSONRPC?smd");
-
-        // If you want to put an HTTP sniffer in the way to look at the JSONROPC packets you'll
-        // need to edit the target address of the service in the smd. The only way to do this easily
-        // is to read an smd from disc rather than generate one. There are two smds provided for this
-	//var alertsService       = new dojo.rpc.JsonService("service.smd");
-        //var alertSourcesService = new dojo.rpc.JsonService("sources.smd");
-
-        // The global list of alerts sources
-        var alertSourceList = null;
-
-        // The global list of alerts 
-        var alertList       = null;
-
-        // the constructor for entries on the alert source list
-        function alertSourceType(name,id,address,feedAddress,feedType,popUsername,popPassword,popServer,lastChecked,javaClass) {
-          this.name        = name;
-          this.id          = id;
-          this.address     = address;
-          this.feedAddress = feedAddress;
-          this.feedType    = feedType;
-          this.lastChecked = lastChecked;
-          this.javaClass   = "org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl";
-
-        }
-
-        function errorCallback(result, error, id) {
-            var resultsNode = document.getElementById("errors");
-            // There seems to be a problem somewhere as I should be able to get the error
-            // details but all I can actually get is the Id from the error message
-            // resultsNode.innerHTML = "there was an error! message id = "  + " error code = " + result.error.code + " error message = " + result.error.msg ;
-           resultsNode.innerHTML = "An error was returned by the server. Message id = " +  result.id;
-        }
-
-        // Generate the alert sources table
-        function getAlertSources()
-        { 
-            response = alertSourcesService.getAlertSources("Dojo");
-            response.addCallbacks(getAlertSourcesCallback, errorCallback);
-
-            getAlerts();
-        }
-
-        function getAlertSourcesCallback(result) {
-            var resultsNode = document.getElementById("alertSourcesTable");
-            if ( result.error != null ) {
-                resultsNode.innerHTML = result.error;
-            } else {
-                // stash away the source list for when we come to edit it
-                alertSourceList = result.source.list;
-
-                // put out the html
-                var text = ""
-                var nextSourceId = 0
-                for (var i in result.source.list){
-                    var source = result.source.list[i];
-
-                    text = text + "<table>";
-                    text = text + "<TR CLASS='source_" + source.id + "' >";
-                    text = text + "  <TD CLASS='source_name clickable' ONCLICK=\"displayAlert('" + source.address + "')\">";
-                    text = text + "    <IMG SRC='rss.png'/>&nbsp;&nbsp;" + source.name;
-                    text = text + "  </TD>";
-                    text = text + "  <TD CLASS='clickable link' ONCLICK=\"showEditSource('" + source.id + "')\">Edit</TD>";
-                    text = text + "  <TD CLASS='clickable link' ONCLICK=\"deleteSource('" + source.id + "')\">Delete</TD>";
-                    text = text + "</TR>";
-                    text = text + "<TR ID='edit_source_" + source.id + "' CLASS='hidden source_" + source.id + "'>";
-                    text = text + "  <TD COLSPAN='3'>";
-                    text = text + "    <TABLE CLASS='sourceDetailsTable'>";
-                    text = text + "      <TR>";
-                    text = text + "        <TD>Source name:</TD>";
-                    text = text + "        <TD>";
-                    text = text + "          <INPUT ID='source_" + source.id + "_name' TYPE='TEXT' SIZE='50' VALUE='" + source.name + "'/>";
-                    text = text + "        </TD>";
-                    text = text + "      </TR>";
-                    text = text + "      <TR>";
-                    text = text + "       <TD>Source address:</TD>"
-                    text = text + "        <TD>";
-                    text = text + "          <INPUT ID='source_" + source.id + "_address' TYPE='TEXT' SIZE='50' VALUE='" + source.address + "'/>";
-                    text = text + "        </TD>";
-                    text = text + "      </TR>";
-                    text = text + "      <TR>";
-                    text = text + "        <TD>";
-                    text = text + "          <INPUT ID='source_" + source.id + "_type' TYPE='HIDDEN' VALUE='" + source.id + "'/>";
-                    text = text + "          <INPUT TYPE='BUTTON' VALUE='Update' ONCLICK=\"updateSource('" + source.id + "')\"/>";
-                    text = text + "          <INPUT TYPE='BUTTON' VALUE='Cancel' ONCLICK=\"hideEditSource('" + source.id + "')\"/>";
-                    text = text + "        </TD>";
-                    text = text + "      </TR>";
-                    text = text + "    </TABLE>";
-                    text = text + "  </TD>";
-                    text = text + "</TR>";
-               
-                    nextSourceId = eval(source.id);
-                }
-
-                nextSourceId = nextSourceId + 1;
-
-                text = text + "<TR CLASS='source_" + nextSourceId + "'>";
-                text = text + "  <TD COLSPAN='4' CLASS='clickable link' ONCLICK=\"showAddNewSource('" + nextSourceId + "')\">Add new Alert Source</TD>";
-                text = text + "</TR>";
-                text = text + "<TR ID='add_source_" + nextSourceId + "' CLASS='hidden source_" + nextSourceId + "'>";
-                text = text + "  <TD COLSPAN='4'>";
-                text = text + "    <TABLE CLASS='sourceDetailsTable'>";
-                text = text + "      <TR>";
-                text = text + "        <TD>Source name:</TD>";
-                text = text + "        <TD>";
-                text = text + "          <INPUT ID='source_" + nextSourceId + "_name' TYPE='TEXT' SIZE='50'>";
-                text = text + "        </TD>";
-                text = text + "      </TR>";
-                text = text + "      <TR>";
-                text = text + "        <TD>Source address:</TD>";
-                text = text + "        <TD>";
-                text = text + "          <INPUT ID='source_" + nextSourceId + "_address' TYPE='TEXT' SIZE='50'>";
-                text = text + "        </TD>";
-                text = text + "      </TR>";
-                text = text + "      <TR>";
-                text = text + "        <TD>Source type:</TD>";
-                text = text + "        <TD>";
-                text = text + "          <SELECT ID='source_" + nextSourceId + "_type' ONCHANGE=\"showSourceType('" + nextSourceId + "')\">";
-                text = text + "            <OPTION value='rss' selected='selected'>RSS/Atom feed</OPTION>";
-                text = text + "          </SELECT>";
-                text = text + "        </TD>";
-                text = text + "      </TR>";
-                text = text + "      <TR ID='add_rss_source'>";
-                text = text + "        <TD COLSPAN='2'>";
-                text = text + "          <TABLE CLASS='sourceDetailsTable'>";
-                text = text + "            <TR>";
-                text = text + "              <TD>Feed address:</TD>";
-                text = text + "              <TD>";
-                text = text + "                 <INPUT ID='source_" + nextSourceId + "_feedAddress' TYPE='TEXT' SIZE='50'/>";
-                text = text + "              </TD>";
-                text = text + "            </TR>";
-                text = text + "          </TABLE>";
-                text = text + "        </TD>";
-                text = text + "      </TR>";
-                text = text + "      <TR>";
-                text = text + "        <TD>";
-                text = text + "          <INPUT TYPE='BUTTON' VALUE='Add' ONCLICK=\"addSource('" + nextSourceId + "')\">";
-                text = text + "          <INPUT TYPE='BUTTON' VALUE='Cancel' ONCLICK=\"hideAddNewSource('" + nextSourceId + "')\">";
-                text = text + "        </TD>";
-                text = text + "      </TR>";
-                text = text + "    </TABLE>";
-                text = text + "  </TD>";
-                text = text + "</TR>";
-                text = text + "</table>";
-
-                resultsNode.innerHTML = text;  
-            }
-        }
-
-        function showEditSource(sourceid)
-        {
-            document.getElementById("edit_source_"+sourceid).className = "source_"+sourceid;
-        }
-
-        function hideEditSource(sourceid)
-        {
-             document.getElementById("edit_source_"+sourceid).className = "hidden source_"+sourceid;
-        }
- 
-        function updateSource(sourceid)
-        {
-            hideEditSource(sourceid);
-            var source = getSource(sourceId);
-            alertSourcesService.updateAlertSource(source);
-            getAlertSources();
-        }
- 
-        function deleteSource(sourceid)
-        {
-            alertSourcesService.removeAlertSource(sourceid);
-            getAlertSources();
-        }
-
-        function showAddNewSource(sourceid)
-        {
-            document.getElementById("add_source_"+sourceid).className = "source_"+sourceid;
-        }
-
-        function hideAddNewSource(sourceid)
-        {
-            document.getElementById("add_source_"+sourceid).className = "hidden source_"+sourceid;
-        }
-
-        function addSource(sourceid)
-        {
-            hideAddNewSource(sourceid);
-            var source = getSource(sourceid);
-            alertSourcesService.addAlertSource(source); 
-
-            // wait a little before getting the list back from the server
-            setTimeout("getAlertSources()",1250);       
-        }
-
-        function getSource(sourceid)
-        {
-            var source = alertSourceList[sourceid];
-
-            if ( source == null ){
-                source = new alertSourceType("name","id","address","feedAddress","feedType","popUsername","popPassword","popServer","lastChecked","javaClass");
-                alertSourceList[sourceid] = source;
-            }
-            
-            source.name     = document.getElementById("source_"+sourceid+"_name").value;
-            source.id       = sourceid;
-            source.address  = document.getElementById("source_"+sourceid+"_address").value;
-            var typeElem    = document.getElementById("source_"+sourceid+"_type");
-            source.feedType = typeElem.options[typeElem.selectedIndex].value; 
-
-            if(source.feedType=="rss")
-            {
-                source.feedAddress = document.getElementById("source_"+sourceid+"_feedAddress").value;
-                
-            }
-            else if(source.feedType=="pop")
-            {
-                source.popServer   = document.getElementById("source_"+sourceid+"_popServer").value;
-                source.popUsername = document.getElementById("source_"+sourceid+"_popUsername").value;
-                source.popPassword = document.getElementById("source_"+sourceid+"_popPassword").value;
-            } 
-            return source;     
-        }
-
-        // Generate the alerts table
-        function getAlerts()
-        { 
-            response = alertsService.getAllNewAlerts("Dojo");
-            response.addCallbacks(getAlertsCallback, errorCallback);
-        }
-
-        function getAlertsCallback(result) {
-            var resultsNode = document.getElementById("alertsTable");
-            if ( result.error != null ) {
-                resultsNode.innerHTML = result.error;
-            } else {
-                alertList = result.alert.list;
-                var text = ""
-                for (var i in result.alert.list){
-                    var alert = result.alert.list[i];
-
-                    text = text + "<table>";
-                    text = text + "<TR class='source_" + alert.sourceId + " clickable' onclick=\"displayAlert('" + alert.address + "')\">";
-                    text = text + " <TD class='alert_text'>";
-                    text = text + "   <SPAN id='" + alert.id + "' class='unread_title'>" + alert.title + "</SPAN>";
-                    text = text + "   <SPAN class='summary'> - " + alert.summary.substring(0, 80)  + "...</SPAN>";
-                    text = text + " </TD>";
-                    text = text + " <TD>";
-                    text = text +     alert.date;
-                    text = text + "  </TD>"
-                    text = text + "</TR>"
-                    text = text + "</table>";
-                }
-
-                resultsNode.innerHTML = text;  
-            }
-        }
-
-
-
-        function displayAlert(url)
-        {
-            document.getElementById("alertData").innerHTML="<IFRAME CLASS='alert_data' SRC='"+url+"'/>";
-            window.location="#data";
-            return;    
-        }
-
-
-    
-    </script>
-
-<h1 id="top">Apache Tuscany Alert Aggregator Demo</h1>
-<div id="errors"></div>
-<p>Alert Sources<span id="refreshSources"></span>:</p>
-<!--input type="button" value="getSources" onclick="getAlertSources()"/-->
-<div id="alertSourcesTable">Refreshing...</div>
-<p /><input type="button" value="Refresh" onclick="getAlerts()" />
-<p />
-<div id="alertsTable">Refreshing...</div>
-<p><a id="data" HREF="#top">Back to top</a></p>
-<div id="alertData"></div>
-<p />
-<div id="dojoDebug"></div>
-
-</body>
-</html>
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 0bc67c4c98..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-targetNamespace="http://sample"
-    xmlns:sample="http://sample">
-   <deployable composite="sample:FeedAggregator"/>
-</contribution>
-
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index bd31898e3b..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,37 +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.    
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
-    xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">
-    <d:environment>
-        <d:moduleId>
-            <d:groupId>org.apache.tuscany.sca</d:groupId>
-            <d:artifactId>demo-alert-aggregator-webapp</d:artifactId>
-            <d:version>2.0-SNAPSHOT</d:version>
-            <d:type>war</d:type>
-        </d:moduleId>
-        <!-- TUSCANY-2622 -->
-        <d:hidden-classes>
-	    <d:filter>org.apache.axiom</d:filter>
-	    <d:filter>org.apache.axis2</d:filter>
-            <d:filter>org.apache.commons</d:filter>
-	    <d:filter>org.jdom</d:filter>
-        </d:hidden-classes>    
-    </d:environment>
-</web-app>
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index a81165e1b4..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-    <display-name>Apache Tuscany Alert Aggregator Demo</display-name>
-    
-    <filter>
-        <filter-name>tuscany</filter-name>
-        <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
-    </filter>
- 
-    <filter-mapping>
-        <filter-name>tuscany</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    
-    <welcome-file-list id="WelcomeFileList">
-        <welcome-file>AlertAggregator.html</welcome-file>
-    </welcome-file-list>  
-
-</web-app>
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/pop.png b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/pop.png
deleted file mode 100644
index 1cf1df24a7..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/pop.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/rss.png b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/rss.png
deleted file mode 100644
index b3c949d224..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/rss.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/service.smd b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/service.smd
deleted file mode 100644
index 3c6b6c9b12..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/service.smd
+++ /dev/null
@@ -1 +0,0 @@
-{"SMDVersion":".1","objectName":"AlertsService","serviceType":"JSON-RPC","serviceURL":"http://localhost:8085/sample-feed-aggregator/services/AlertsServiceJSONRPC","methods":[{"name":"getAllNewAlerts","parameters":[{"name":"param0","type":"STRING"}]}]}
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/sources.smd b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
deleted file mode 100644
index b5f1824363..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
+++ /dev/null
@@ -1 +0,0 @@
-{"SMDVersion":".1","objectName":"AlertsSourcesService","serviceType":"JSON-RPC","serviceURL":"http://localhost:8081/sample-feed-aggregator/services/AlertsSourcesServiceJSONRPC","methods":[{"name":"getAlertSources","parameters":[{"name":"param0","type":"STRING"}]},{"name":"getAlertSource","parameters":[{"name":"param0","type":"STRING"}]},{"name":"updateAlertSource","parameters":[{"name":"param0","type":"STRING"}]},{"name":"addAlertSource","parameters":[{"name":"param0","type":"STRING"}]},{"name":"removeAlertSource","parameters":[{"name":"param0","type":"STRING"}]}]}
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/style.css b/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/style.css
deleted file mode 100644
index f5bbf23379..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/style.css
+++ /dev/null
@@ -1,176 +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.
- */
-
-p,table,li,h1,h2,h3
-{
-font-family: verdana, arial, 'sans serif'; 
-}
-
-p, h1, h2, h3, table, li, hr
-{
-margin-left: 10pt;
-}
-
-table
-{
-border-color: black;
-border-collapse: separate;
-border-spacing: 0px 1px;
-
-margin-right: 10pt;
-margin-left: 10pt;
-width: 800px;
-}
-
-.sourceDetailsTable
-{
-width: 600px;
-}
-
-tr, td
-{
-margin-left: 0pt;
-margin-right: 0pt;
-padding-left: 10pt;
-font-size: 90%;
-}
-
-p,li,th
-{
-font-size: 90%;
-margin-left: 10pt;
-}
-
-pre
-{
-margin-left: 10pt;
-}
-
-body
-{
-#ffffff;
-}
-
-h1,h2,h3,hr
-{
-color: firebrick;
-}
-
-a:link {COLOR: firebrick;}
-a:visited {COLOR: firebrick;}
-a:active {COLOR: navy;}
-
-.link
-{
-COLOR: firebrick;
-text-decoration: underline;
-}
-
-.clickable
-{
-cursor: pointer
-}
-
-.unread_title
-{
-font-weight: bold;
-}
-
-.read_title
-{
-font-weight: normal;
-}
-
-.summary
-{
-color: DimGrey;
-}
-
-.hidden
-{
-display: none;
-}
-
-.source_name
-{
-width: 600px;
-}
-
-.alert_text
-{
-width: 600px;
-}
-
-.alert_data
-{
-margin-left: 10px;
-width: 800px;
-height: 800px;
-}
-
-.source_0
-{
-background-color: LightGreen;
-}    
-
-.source_1
-{
-background-color: LightSkyBlue;
-}
-
-.source_2
-{
-background-color: Khaki;
-}
-
-.source_3
-{
-background-color: LightPink;
-}
-
-.source_4
-{
-background-color: Orange;
-}
-
-.source_5
-{
-background-color: LightCoral;
-}
-
-.source_6
-{
-background-color: Orchid;
-}
-
-.source_7
-{
-background-color: Peru;
-}
-
-.source_8
-{
-background-color: SpringGreen;
-}
-
-.source_9
-{
-background-color: LightGrey;
-}
-
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java b/java/sca-contrib/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
deleted file mode 100644
index f0cb9ecfcb..0000000000
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
+++ /dev/null
@@ -1,97 +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.demos.aggregator;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.Assert;
-
-import org.json.JSONObject;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.meterware.httpunit.PostMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-
-/**
- */
-public class AlertsIntegrationTest {
-    //private static SCADomain scaDomain;
-    
-    @BeforeClass
-    public static void setUp() throws Exception {
-        //scaDomain = SCADomain.newInstance("alerts.composite");
-    }
-
-    /**
-     * Runs after each test method
-     */
-    @AfterClass
-    public static void tearDown() {
-        //scaDomain.close();
-    }
-    
-/* Use this if you want to test locally without deploying to a web container
-    public void testWait() throws Exception { 
-        System.out.println("Feed aggregator server started (press enter to shutdown)");
-        System.in.read();
-        System.out.println("Feed aggregator server stopped");
-    }
-*/    
-
-    @Test
-    public void testGetAllNewAlerts() throws Exception {   
-        JSONObject jsonRequest = new JSONObject("{\"params\":[\"sometext\"],\"method\":\"getAllNewAlerts\",\"id\":2}");
-        JSONObject jsonResp    = callService ("http://localhost:8085/demo-alert-aggregator-webapp/AlertsServiceJSONRPC",
-                                              jsonRequest);
-        Assert.assertNotNull(jsonResp);
-    }   
-    
-    @Test
-    public void testAddAlertSources() throws Exception {   
-        JSONObject jsonRequest = new JSONObject("{\"params\":[{\"name\":\"news\",\"id\":\"2\",\"address\":\"www.news.com\",\"feedAddress\":\"http://news.com.com/2547-1_3-0-20.xml\",\"feedType\":\"rss\",\"lastChecked\":\"lastChecked\",\"javaClass\":\"org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl\"}],\"method\":\"addAlertSource\",\"id\":2}");
-        JSONObject jsonResp    = callService ("http://localhost:8085/demo-alert-aggregator-webapp/AlertsSourcesServiceJSONRPC",
-                                              jsonRequest);  
-        Assert.assertNotNull(jsonResp);
-    }
-  
-    @Test
-    public void testGetAlertSources() throws Exception {  
-        JSONObject jsonRequest = new JSONObject("{\"params\":[\"sometext\"],\"method\":\"getAlertSources\",\"id\":2}");
-        JSONObject jsonResp    = callService ("http://localhost:8085/demo-alert-aggregator-webapp/AlertsSourcesServiceJSONRPC",
-                                              jsonRequest);                                 
-        Assert.assertEquals("BBC News", jsonResp.getJSONObject("result").getJSONObject("source").optJSONArray("list").getJSONObject(0).getString("name")); 
-    }    
-  
-    public JSONObject callService(String url, JSONObject jsonRequest) throws Exception {
-        System.out.println("Request = " + jsonRequest.toString());
-        WebConversation wc   = new WebConversation();
-        WebRequest request   = new PostMethodWebRequest( url, 
-                                                         new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),"application/json");
-        WebResponse response = wc.getResource(request);
-        System.out.println("Response= " + response.getText());               
-        Assert.assertEquals(200, response.getResponseCode());
-        return new JSONObject(response.getText()); 
-    }
-}
diff --git a/java/sca-contrib/demos/bigbank-account/LICENSE b/java/sca-contrib/demos/bigbank-account/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/demos/bigbank-account/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/demos/bigbank-account/NOTICE b/java/sca-contrib/demos/bigbank-account/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/demos/bigbank-account/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/demos/bigbank-account/README b/java/sca-contrib/demos/bigbank-account/README
deleted file mode 100644
index 5c0d850c5e..0000000000
--- a/java/sca-contrib/demos/bigbank-account/README
+++ /dev/null
@@ -1,4 +0,0 @@
-bigbank-account is part of a larger demo called bigbank. 
-Please see the Readme file under bigbank to understand how bigbank-account fits into the overall demo.
- 
-
diff --git a/java/sca-contrib/demos/bigbank-account/bigbank.png b/java/sca-contrib/demos/bigbank-account/bigbank.png
deleted file mode 100644
index 985cc6bd05..0000000000
--- a/java/sca-contrib/demos/bigbank-account/bigbank.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/bigbank-account/bigbank.svg b/java/sca-contrib/demos/bigbank-account/bigbank.svg
deleted file mode 100644
index 0650075d48..0000000000
--- a/java/sca-contrib/demos/bigbank-account/bigbank.svg
+++ /dev/null
@@ -1,537 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-0.91\demos\bigbank-account"
-   sodipodi:docname="bigbank.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-0.91\demos\bigbank-account\bigbank.png"
-   inkscape:export-xdpi="105.68515"
-   inkscape:export-ydpi="105.68515">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="668.70076"
-     inkscape:cy="413.94086"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1138"
-     inkscape:window-height="772"
-     inkscape:window-x="94"
-     inkscape:window-y="129" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="translate(-61.2386,-72.73099)">
-      <rect
-         rx="7.8521242"
-         ry="17.265177"
-         y="192.00223"
-         x="258.31161"
-         height="334.34488"
-         width="257.31851"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">Composite</flowPara><flowPara
-           id="flowPara1883">BigBank</flowPara></flowRoot>      <flowRoot
-         id="flowRoot2315"
-         xml:space="preserve"
-         transform="translate(-185.101,71.92054)"><flowRegion
-           id="flowRegion2317"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2319" /></flowRegion><flowPara
-           id="flowPara2323">WebApp</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="126.26909"
-       x="269.58636"
-       y="190.53091"
-       rx="6.9961648"
-       ry="10.475038" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(1.99553,-15.40766)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="171.01015"
-           height="76.580856"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Component </flowPara><flowPara
-         id="flowPara1885">Account</flowPara><flowPara
-         id="flowPara1887" /><flowPara
-         id="flowPara1889" /><flowPara
-         id="flowPara1891">Java</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 252.43583,222.37787 L 285.77087,222.37787 L 291.83178,235.50985 L 284.76072,247.63169 L 252.43583,247.63169 L 260.01198,235.50985 L 252.43583,222.37787 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 365.68827,205.3873 L 399.02331,205.3873 L 405.08422,218.51928 L 398.01316,230.64112 L 365.68827,230.64112 L 373.26442,218.51928 L 365.68827,205.3873 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 152.40866,209.21877 L 214.80502,209.21877 L 226.1498,236.00801 L 212.91422,260.73656 L 152.40866,260.73656 L 166.58966,236.00801 L 152.40866,209.21877 z "
-       id="path1893" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1895"
-       width="115.66247"
-       height="85.862968"
-       x="272.53705"
-       y="351.65024"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1897"
-       transform="translate(4.94623,145.7117)"><flowRegion
-         id="flowRegion1899"><rect
-           id="rect1901"
-           width="171.01015"
-           height="76.580856"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1903">Component </flowPara><flowPara
-         id="flowPara1905">AccountData</flowPara><flowPara
-         id="flowPara1907" /><flowPara
-         id="flowPara1909" /><flowPara
-         id="flowPara1911">Java</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 255.38654,383.4972 L 288.72158,383.4972 L 294.78249,396.62918 L 287.71143,408.75102 L 255.38654,408.75102 L 262.96269,396.62918 L 255.38654,383.4972 z "
-       id="path1913" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1917"
-       transform="translate(-115.5876,5.278396)"><flowRegion
-         id="flowRegion1919"><rect
-           id="rect1921"
-           width="171.01015"
-           height="76.580856"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1931">binding.</flowPara><flowPara
-         id="flowPara1941">jsonrpc</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 426.15997,139.5181 L 490.26581,139.5181 L 501.9214,165.78205 L 488.32321,190.02572 L 426.15997,190.02572 L 440.72949,165.78205 L 426.15997,139.5181 z "
-       id="path1943" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1945"
-       transform="translate(161.03,-62.1275)"
-       inkscape:transform-center-y="51.51778"
-       inkscape:transform-center-x="-6.0609153"><flowRegion
-         id="flowRegion1947"><rect
-           id="rect1949"
-           width="171.01015"
-           height="76.580856"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1951">binding.</flowPara><flowPara
-         id="flowPara1953">ws</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 426.16,223.86592 L 490.26584,223.86592 L 501.92143,250.12987 L 488.32324,274.37354 L 426.16,274.37354 L 440.72952,250.12987 L 426.16,223.86592 z "
-       id="path1955" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1957"
-       transform="translate(161.03,22.22032)"
-       inkscape:transform-center-y="51.51778"
-       inkscape:transform-center-x="-6.0609153"><flowRegion
-         id="flowRegion1959"><rect
-           id="rect1961"
-           width="171.01015"
-           height="76.580856"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1963">binding.</flowPara><flowPara
-         id="flowPara1965">rmi</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 366.56099,240.53344 L 399.89603,240.53344 L 405.95694,253.66542 L 398.88588,265.78726 L 366.56099,265.78726 L 374.13714,253.66542 L 366.56099,240.53344 z "
-       id="path1967" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 365.55084,275.88877 L 398.88588,275.88877 L 404.94679,289.02075 L 397.87573,301.14259 L 365.55084,301.14259 L 373.12699,289.02075 L 365.55084,275.88877 z "
-       id="path1969" />
-    <g
-       id="g1971"
-       transform="translate(439.292,-139.3494)">
-      <rect
-         rx="7.8521242"
-         ry="7.8236527"
-         y="220.28642"
-         x="165.37758"
-         height="151.50719"
-         width="257.31851"
-         id="rect1973"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot1975"
-         xml:space="preserve"
-         transform="translate(-109.0965,17.17259)"><flowRegion
-           id="flowRegion1977"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect1979" /></flowRegion><flowPara
-           id="flowPara1981">Composite</flowPara><flowPara
-           id="flowPara1983">StockQuote</flowPara></flowRoot>      <g
-         id="g2067"
-         transform="translate(-98.99495,207.0814)">
-        <rect
-           rx="12.845777"
-           ry="17.265177"
-           y="192.00223"
-           x="258.31168"
-           height="334.34488"
-           width="420.96332"
-           id="rect2069"
-           style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-        <flowRoot
-           id="flowRoot2071"
-           xml:space="preserve"
-           transform="translate(-4.04061,-5.050763)"><flowRegion
-             id="flowRegion2073"><rect
-               y="212.66591"
-               x="281.42856"
-               height="61.42857"
-               width="170"
-               id="rect2075" /></flowRegion><flowPara
-             id="flowPara2077">Composite</flowPara><flowPara
-             id="flowPara2079">Calculator</flowPara></flowRoot>      </g>
-      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2081"
-         width="115.66247"
-         height="200.01021"
-         x="231.82996"
-         y="470.34314"
-         rx="6.9961648"
-         ry="16.592457" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2083"
-         transform="translate(-35.76085,264.4047)"><flowRegion
-           id="flowRegion2085"><rect
-             id="rect2087"
-             width="171.01015"
-             height="76.580856"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2089">Component </flowPara><flowPara
-           id="flowPara2091">Calculator</flowPara><flowPara
-           id="flowPara2093" /><flowPara
-           id="flowPara2095" /><flowPara
-           id="flowPara2097">Java</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 214.67944,502.19018 L 248.01448,502.19018 L 254.07539,515.32216 L 247.00433,527.444 L 214.67944,527.444 L 222.25559,515.32216 L 214.67944,502.19018 z "
-         id="path2099" />
-      <path
-         style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 327.93188,485.19961 L 361.26692,485.19961 L 367.32783,498.33159 L 360.25677,510.45343 L 327.93188,510.45343 L 335.50803,498.33159 L 327.93188,485.19961 z "
-         id="path2101" />
-      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 114.65227,489.03108 L 177.04863,489.03108 L 188.39341,515.82032 L 175.15784,540.54887 L 114.65227,540.54887 L 128.83327,515.82032 L 114.65227,489.03108 z "
-         id="path2103" />
-      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2105"
-         width="115.66247"
-         height="72.731003"
-         x="438.83148"
-         y="412.3407"
-         rx="6.9961648"
-         ry="6.0336223" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2107"
-         transform="translate(183.2407,206.4021)"><flowRegion
-           id="flowRegion2109"><rect
-             id="rect2111"
-             width="171.01015"
-             height="76.580856"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2113">Component </flowPara><flowPara
-           id="flowPara2115">Add</flowPara><flowPara
-           id="flowPara2119" /><flowPara
-           id="flowPara2121">Javascript</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 418.6505,435.09626 L 451.98554,435.09626 L 458.04645,448.22824 L 450.97539,460.35008 L 418.6505,460.35008 L 426.22665,448.22824 L 418.6505,435.09626 z "
-         id="path2123" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2125"
-         transform="translate(-153.344,285.0907)"><flowRegion
-           id="flowRegion2127"><rect
-             id="rect2129"
-             width="171.01015"
-             height="76.580856"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2131">binding.</flowPara><flowPara
-           id="flowPara2133">rmi</flowPara></flowRoot>      <path
-         style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 328.8046,531.45743 L 362.13964,531.45743 L 368.20055,544.58941 L 361.12949,556.71125 L 328.8046,556.71125 L 336.38075,544.58941 L 328.8046,531.45743 z "
-         id="path2159" />
-      <path
-         style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 329.81476,581.96505 L 363.1498,581.96505 L 369.21071,595.09703 L 362.13965,607.21887 L 329.81476,607.21887 L 337.39091,595.09703 L 329.81476,581.96505 z "
-         id="path2161" />
-      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2225"
-         width="115.66247"
-         height="72.731003"
-         x="438.39767"
-         y="491.58591"
-         rx="6.9961648"
-         ry="6.0336223" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2227"
-         transform="translate(182.8068,285.6473)"><flowRegion
-           id="flowRegion2229"><rect
-             id="rect2231"
-             width="171.01015"
-             height="76.580856"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2233">Component </flowPara><flowPara
-           id="flowPara2235">Subtract</flowPara><flowPara
-           id="flowPara2237" /><flowPara
-           id="flowPara2239">Ruby</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 418.21668,514.34147 L 451.55172,514.34147 L 457.61263,527.47345 L 450.54157,539.59529 L 418.21668,539.59529 L 425.79283,527.47345 L 418.21668,514.34147 z "
-         id="path2241" />
-      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2243"
-         width="115.66247"
-         height="72.731003"
-         x="438.39767"
-         y="569.36768"
-         rx="6.9961648"
-         ry="6.0336223" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2245"
-         transform="translate(182.8069,363.4291)"><flowRegion
-           id="flowRegion2247"><rect
-             id="rect2249"
-             width="171.01015"
-             height="76.580856"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2251">Component </flowPara><flowPara
-           id="flowPara2255">Multiply</flowPara><flowPara
-           id="flowPara2281" /><flowPara
-           id="flowPara2257">Python</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 418.21667,592.12321 L 451.55171,592.12321 L 457.61262,605.25519 L 450.54156,617.37703 L 418.21667,617.37703 L 425.79282,605.25519 L 418.21667,592.12321 z "
-         id="path2259" />
-      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2261"
-         width="115.66247"
-         height="72.731003"
-         x="439.40784"
-         y="647.14941"
-         rx="6.9961648"
-         ry="6.0336223" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2263"
-         transform="translate(183.817,441.2108)"><flowRegion
-           id="flowRegion2265"><rect
-             id="rect2267"
-             width="171.01015"
-             height="76.580856"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2269">Component </flowPara><flowPara
-           id="flowPara2271">Divide</flowPara><flowPara
-           id="flowPara2273" /><flowPara
-           id="flowPara2275">Groovy</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 419.22682,669.90496 L 452.56186,669.90496 L 458.62277,683.03694 L 451.55171,695.15878 L 419.22682,695.15878 L 426.80297,683.03694 L 419.22682,669.90496 z "
-         id="path2277" />
-      <path
-         style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 328.29952,628.38036 L 361.63456,628.38036 L 367.69547,641.51234 L 360.62441,653.63418 L 328.29952,653.63418 L 335.87567,641.51234 L 328.29952,628.38036 z "
-         id="path2283" />
-    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1985"
-       width="113.64217"
-       height="94.954361"
-       x="677.18286"
-       y="121.89223"
-       rx="6.9961648"
-       ry="10.475038" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1987"
-       transform="translate(409.5921,-84.04634)"><flowRegion
-         id="flowRegion1989"><rect
-           id="rect1991"
-           width="171.01015"
-           height="76.580856"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1993">Component </flowPara><flowPara
-         id="flowPara1995">StockQuote</flowPara><flowPara
-         id="flowPara1997" /><flowPara
-         id="flowPara1999" /><flowPara
-         id="flowPara2001">Java</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 660.03239,153.73919 L 693.36743,153.73919 L 699.42834,166.87117 L 692.35728,178.99301 L 660.03239,178.99301 L 667.60854,166.87117 L 660.03239,153.73919 z "
-       id="path2003" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 560.00522,140.58009 L 622.40158,140.58009 L 633.74636,167.36933 L 620.51078,192.09788 L 560.00522,192.09788 L 574.18622,167.36933 L 560.00522,140.58009 z "
-       id="path2007" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2029"
-       transform="translate(292.009,-63.36024)"><flowRegion
-         id="flowRegion2031"><rect
-           id="rect2033"
-           width="171.01015"
-           height="76.580856"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2035">binding.</flowPara><flowPara
-         id="flowPara2037">ws</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 501.41636,164.26692 C 575.1575,165.27707 575.1575,165.27707 575.1575,165.27707"
-       id="path2285" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 633.74634,167.29737 C 667.08138,167.29737 667.08138,167.29737 667.08138,167.29737"
-       id="path2287" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 224.63456,235.98775 C 259.9899,235.98775 259.9899,235.98775 259.9899,235.98775"
-       id="path2289" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 403.43156,218.81515 L 412.52294,218.81515 L 412.52294,164.26692 L 439.79706,165.27707"
-       id="path2293" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 405.45187,254.17049 L 420.60416,254.17049 L 420.60416,250.12988 L 440.80721,251.14004"
-       id="path2295" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 404.44172,288.51568 L 419.59401,288.51568 L 419.59401,332.96239 L 225.64471,334.9827 L 226.65486,395.59185 L 262.01021,395.59185"
-       id="path2297" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 501.41636,249.11973 L 520.60926,249.11973 L 518.58895,377.4091 L 567.07628,377.4091"
-       id="path2299" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 625.66512,376.39895 L 660.01031,376.39895"
-       id="path2301" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 806.48243,359.22636 L 834.7667,359.22636 L 835.77685,309.72888 L 864.06112,308.71873"
-       id="path2303" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 807.49258,404.68322 L 840.82762,404.68322 L 840.82762,388.52078 L 864.06112,388.52078"
-       id="path2307" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 807.49258,455.19085 L 837.79716,455.19085 L 837.79716,467.31268 L 864.06112,467.31268"
-       id="path2309" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 805.47228,502.66802 L 833.75655,502.66802 L 833.75655,545.09443 L 865.07128,545.09443"
-       id="path2311" />
-    <rect
-       style="opacity:0.35555558;fill:#9a8787;fill-opacity:1;stroke:#261c1c;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2313"
-       width="87.14286"
-       height="77.14286"
-       x="17.142859"
-       y="192.66591"
-       rx="10.859112" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 102.85714,235.52305 L 164.28571,235.52305"
-       id="path2327" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/demos/bigbank-account/build-dojo.xml b/java/sca-contrib/demos/bigbank-account/build-dojo.xml
deleted file mode 100644
index 0e029c6335..0000000000
--- a/java/sca-contrib/demos/bigbank-account/build-dojo.xml
+++ /dev/null
@@ -1,92 +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 name="DojoZipInstaller">

-	

-

-    <property name="dojo.version" value="1.0.0"/>

-    <property name="unpack.location" value="${basedir}/src/main/resources/web/dojo"/>

-	

-

-    <target name="check-dojo-installed">

-        <condition property="already.installed" >

-            <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>

-        </condition>

-        <condition property="maven.suffix" value="">

-            <os family="unix"/>

-        </condition>

-        <condition property="maven.suffix" value=".bat">

-            <os family="windows"/>

-        </condition>

-    </target>

-	

-

-    <target name="check-dojo-unpacked">

-        <condition property="already.unpacked" >

-            <available file="${unpack.location}"/>

-        </condition>

-    </target>

-

-    <target name="install-dojo" depends="check-dojo-installed" unless="already.installed">

-        <mkdir dir="${basedir}/target/dojo-download/"/>

-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"

-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"

-            verbose="true"

-            usetimestamp="true"/>

-        <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">

-            <arg line="install:install-file -DgroupId=dojo  -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"/>

-        </exec>

-    </target>

-

-    <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed">

-        <mkdir dir="${basedir}/target/dojo-download/"/>

-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"

-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"

-            verbose="true"

-            usetimestamp="true"/>

-        <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" 

-              tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>

-    </target>

-	

-

-    <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">

-        <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>

-        <mkdir dir="${basedir}/target/dojo-unpack-temp/"/>

-        <unzip src="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"

-               dest="${basedir}/target/dojo-unpack-temp/"

-               overwrite="false">

-            <patternset>

-                <include name="dojo-release-${dojo.version}/dojo/**"/>

-                <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/>

-                <include name="dojo-release-${dojo.version}/dijit/**"/>

-                <exclude name="dojo-release-${dojo.version}/dojox/**"/>

-                <exclude name="dojo-release-${dojo.version}/util/**"/>

-            </patternset>

-        </unzip>

-        <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}"

-              tofile="${unpack.location}"

-              verbose="true"/>

-        <delete dir="${basedir}/target/dojo-unpack-temp/"/>

-    </target>

-	

-

-    <target name="clean-dojo-files">

-        <delete dir="${unpack.location}"/>

-    </target>

-</project>

diff --git a/java/sca-contrib/demos/bigbank-account/build.xml b/java/sca-contrib/demos/bigbank-account/build.xml
deleted file mode 100644
index f7ebe32968..0000000000
--- a/java/sca-contrib/demos/bigbank-account/build.xml
+++ /dev/null
@@ -1,85 +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 name="bigbank-account" default="compile">
-    <property name="settings.localRepository" value="./target/repo" />
-    <property name="artifactId" value="demo-bigbank-account" />	
-    
-    <!--path id="test.classpath">
-    	<pathelement location="target/classes"/>
-        <pathelement location="../../modules/tuscany-host-jetty-1.4-SNAPSHOT.jar"/>
-        <pathelement location="../../modules/tuscany-binding-jsonrpc-1.4-SNAPSHOT.jar"/>
-        <pathelement location="../../modules/tuscany-binding-rmi-1.4-SNAPSHOT.jar"/>
-    	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>    	
-    	<pathelement location="target/demo-bigbank-account.jar"/>    
-    </path-->
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-        <mkdir dir="target/classes/web"/>
-    	<mkdir dir="target/repo"/>
-    </target>
-	
-    <!--target name="dojo" depends="init">
-        <ant antfile="./build-dojo.xml" target="install-dojo-nomaven">
-          <property name="localRepository" value="${settings.localRepository}"/>
-        </ant>
-        
-        <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-          <property name="localRepository" value="${settings.localRepository}"/>
-          <property name="artifactId" value="${artifactId}"/>
-        </ant>
-    </target-->
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/demo-bigbank-account.jar" basedir="target/classes">
-            <!--manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest-->
-        </jar>    	
-    </target>		
-	
-    <!--target name="run" depends="compile">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <path refid="test.classpath"/>
-            </classpath>
-        </java>    	
-    </target-->
-
-    <target name="clean">
-		<delete quiet="true" includeemptydirs="true">
-			<fileset dir="target" />
-		</delete>
-	</target>
-	
-</project>
diff --git a/java/sca-contrib/demos/bigbank-account/pom.xml b/java/sca-contrib/demos/bigbank-account/pom.xml
deleted file mode 100644
index 12421e3788..0000000000
--- a/java/sca-contrib/demos/bigbank-account/pom.xml
+++ /dev/null
@@ -1,76 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-demos</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>demo-bigbank-account</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA BigBank Account Demo</name>
-
-    <repositories>
-        <repository>
-            <id>apache.incubator</id>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-            <version>1.5.3</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>demo-bigbank-account</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
deleted file mode 100644
index 57c1adcba0..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
+++ /dev/null
@@ -1,50 +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 bigbank.account.checking;
-
-/**
- * @version $$Rev$$ $$Date: 2007-04-09 12:03:34 -0700 (Mon, 09 Apr
- *          2007) $$
- */
-
-public class CheckingAccountDetails {
-    private String accountNumber;
-    private double balance;
-
-    public String getAccountNumber() {
-        return accountNumber;
-    }
-
-    public void setAccountNumber(String n) {
-        this.accountNumber = n;
-    }
-
-    public double getBalance() {
-        return balance;
-    }
-
-    public void setBalance(double b) {
-        this.balance = b;
-    }
-
-    @Override
-    public String toString() {
-        return accountNumber + ", balance:" + balance;
-    }
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
deleted file mode 100644
index c984700efc..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.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 bigbank.account.checking;
-
-import org.oasisopen.sca.annotation.Remotable;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * @version $$Rev$$ $$Date$$
- */
-@Service
-@Remotable
-public interface CheckingAccountService {
-    
-    public CheckingAccountDetails getAccountDetails(String customerID);
-    
-    public double deposit(String accountNo, double depositAmt);
-    
-    public double withdraw(String accountNo, double withdrawalAmount);
-    
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
deleted file mode 100644
index d79cf373ee..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
+++ /dev/null
@@ -1,66 +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 bigbank.account.checking;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * 
- *  */
-
-@Service(CheckingAccountService.class)
-public class CheckingAccountServiceImpl implements CheckingAccountService {
-    private Map<String, String> custAcctMap = new HashMap<String, String>();
-    private Map<String, Double> checkingAccts = new HashMap<String, Double>();
-    
-    public CheckingAccountServiceImpl() {
-        custAcctMap.put("Customer_01", "CHA_Customer_01");
-        custAcctMap.put("Customer_02", "CHA_Customer_02");
-        custAcctMap.put("Customer_03", "CHA_Customer_03");
-        
-        checkingAccts.put("CHA_Customer_01", new Double(1000));
-        checkingAccts.put("CHA_Customer_02", new Double(1500));
-        checkingAccts.put("CHA_Customer_03", new Double(2000));
-    }
-    
-	public double deposit(String accountNo, double depositAmt) {
-        checkingAccts.put(accountNo, new Double(checkingAccts.get(accountNo).doubleValue() + depositAmt));
-        return checkingAccts.get(accountNo).doubleValue();
-    }
-
-    public CheckingAccountDetails getAccountDetails(String customerID) {
-        CheckingAccountDetails checkingAccount = new CheckingAccountDetails();
-        checkingAccount.setAccountNumber(custAcctMap.get(customerID));
-        checkingAccount.setBalance(checkingAccts.get(checkingAccount.getAccountNumber()).doubleValue());
-
-        return checkingAccount;
-    }
-
-    public double withdraw(String accountNo, double withdrawalAmount) {
-        double balance = checkingAccts.get(accountNo).doubleValue();
-        if ( balance - withdrawalAmount > 0 ) {
-            balance = balance - withdrawalAmount;
-            checkingAccts.put(accountNo, balance);
-        }
-        return balance;
-    }
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
deleted file mode 100644
index cc9023da60..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.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 bigbank.account.savings;
-
-import java.io.Serializable;
-
-/**
- * @version $$Rev$$ $$Date: 2007-04-09 12:03:34 -0700 (Mon, 09 Apr
- *          2007) $$
- */
-
-public class SavingsAccountDetails implements Serializable {
-    private String accountNumber;
-    private double balance;
-
-    public String getAccountNumber() {
-        return accountNumber;
-    }
-
-    public void setAccountNumber(String n) {
-        this.accountNumber = n;
-    }
-
-    public double getBalance() {
-        return balance;
-    }
-
-    public void setBalance(double b) {
-        this.balance = b;
-    }
-
-    @Override
-    public String toString() {
-        return accountNumber + ", balance:" + balance;
-    }
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
deleted file mode 100644
index 4a28b3f90b..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
+++ /dev/null
@@ -1,35 +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 bigbank.account.savings;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * @version $$Rev$$ $$Date$$
- */
-@Remotable
-public interface SavingsAccountService {
-    
-    public SavingsAccountDetails getAccountDetails(String customerID);
-    
-    public double deposit(String accountNo, double depositAmt);
-    
-    public double withdraw(String accountNo, double withdrawalAmount);
-    
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
deleted file mode 100644
index d93007279c..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
+++ /dev/null
@@ -1,66 +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 bigbank.account.savings;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * 
- *  */
-
-@Service(SavingsAccountService.class)
-public class SavingsAccountServiceImpl implements SavingsAccountService {
-    private Map<String, String> custAcctMap = new HashMap<String, String>();
-    private Map<String, Double> savingsAccts = new HashMap<String, Double>();
-    
-    public SavingsAccountServiceImpl() {
-        custAcctMap.put("Customer_01", "SVA_Customer_01");
-        custAcctMap.put("Customer_02", "SVA_Customer_02");
-        custAcctMap.put("Customer_03", "SVA_Customer_03");
-        
-        savingsAccts.put("SVA_Customer_01", new Double(1000));
-        savingsAccts.put("SVA_Customer_02", new Double(1500));
-        savingsAccts.put("SVA_Customer_03", new Double(2000));
-    }
-    
-	public double deposit(String accountNo, double depositAmt) {
-        savingsAccts.put(accountNo, new Double(savingsAccts.get(accountNo).doubleValue() + depositAmt));
-        return savingsAccts.get(accountNo).doubleValue();
-    }
-
-    public SavingsAccountDetails getAccountDetails(String customerID) {
-        SavingsAccountDetails savingsAccount = new SavingsAccountDetails();
-        savingsAccount.setAccountNumber(custAcctMap.get(customerID));
-        savingsAccount.setBalance(savingsAccts.get(savingsAccount.getAccountNumber()).doubleValue());
-
-        return savingsAccount;
-    }
-
-    public double withdraw(String accountNo, double withdrawalAmount) {
-        double balance = savingsAccts.get(accountNo).doubleValue();
-        if ( balance - withdrawalAmount > 0 ) {
-            balance = balance - withdrawalAmount;
-            savingsAccts.put(accountNo, balance);
-        }
-        return balance;
-    }
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
deleted file mode 100644
index 579b4ee64b..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
+++ /dev/null
@@ -1,54 +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 bigbank.account.security;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.apache.ws.security.WSPasswordCallback;
-
-/**
- * Sample userid passwd generation class 
- */
-public class AccountsDataPasswordCallbackHandler implements CallbackHandler {
-
-    public void handle(Callback[] callbacks) throws IOException,
-            UnsupportedCallbackException {
-        for (int i = 0; i < callbacks.length; i++) {
-            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
-            if ( pwcb.getUsage() == WSPasswordCallback.SIGNATURE ) {
-                System.out.println(" Usage is SIGNATURE ... ");
-                pwcb.setPassword("bbservice");
-            } else if ( pwcb.getUsage() == WSPasswordCallback.USERNAME_TOKEN_UNKNOWN ) {
-                System.out.println("*** Calling ACCOUNTS-DATA Passwd Handler for AUTHENTICATING userID = " 
-                                   + pwcb.getIdentifer() + " and password = " + pwcb.getPassword() );
-                if ( pwcb.getIdentifer().equals("bbaservice") && pwcb.getPassword().equals("bbaservice")) {
-                    System.out.println("AUTHENTICATION SUCCESSFUL!");
-                } else {
-                    System.out.println("AUTHENTICATION FAILED!");
-                    throw new UnsupportedCallbackException(pwcb, "UserId - Password Authentication Failed!");
-                }
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
deleted file mode 100644
index 5c64e11d10..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
+++ /dev/null
@@ -1,48 +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 bigbank.account.security;
-
-import java.security.Principal;
-import java.util.Hashtable;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BigbankCheckingsAcl {
-    private static Map<String, String>checkingsAcl = new Hashtable<String, String>();
-    
-    static {
-        checkingsAcl.put("bbaservice", "Customer_01");
-        checkingsAcl.put("bbUser01", "Customer_01");
-    }
-    
-    
-    public static void authorize(Principal principal, String resource) {
-        if ( checkingsAcl.get(principal.getName()) == null ||
-            !checkingsAcl.get(principal.getName()).equals(resource) ) {
-            throw new RuntimeException("User - " + principal.getName() + " not authorized to access account " +
-                                       resource);
-        } else {
-            System.out.println("Successfully Authorized '" + principal.getName() + " to access accounts of " + resource);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
deleted file mode 100644
index c98dcacbf3..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
+++ /dev/null
@@ -1,90 +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 bigbank.account.security;
-
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CheckingsDeptAuthImplementationPolicyProvider implements PolicyProvider {
-    private RuntimeComponent component;
-    private Implementation implementation;
-
-    public CheckingsDeptAuthImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) {
-        super();
-        this.component = component;
-        this.implementation = implementation;
-    }
-
-    private String getContext() {
-        return "component.implementation: " + component.getURI() + "(" + implementation.getClass().getName() + ")";
-    }
-
-    private PolicySet findPolicySet(Operation operation) {
-    	for (PolicySet ps : component.getPolicySets()) {
-            for (Object p : ps.getPolicies()) {
-                if (CheckingsDeptAuthPolicy.class.isInstance(p)) {
-                    return ps;
-                }
-            }
-        }
-        
-        if ( component instanceof OperationsConfigurator ) {
-        	for ( ConfiguredOperation confOp : ((OperationsConfigurator)component).getConfiguredOperations() ) {
-        		if ( confOp.getName().equals(operation.getName())) {
-        			for (PolicySet ps : confOp.getPolicySets()) {
-        	            for (Object p : ps.getPolicies()) {
-        	                if (CheckingsDeptAuthPolicy.class.isInstance(p)) {
-        	                    return ps;
-        	                }
-        	            }
-        	        }
-        		}
-        	}
-        }
-        
-        return null;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation)
-     */
-    public Interceptor createInterceptor(Operation operation) {
-        PolicySet ps = findPolicySet(operation);
-        return ps == null ? null : new CheckingsDeptAuthPolicyInterceptor(getContext(), operation, ps);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase()
-     */
-    public String getPhase() {
-        return Phase.IMPLEMENTATION_POLICY;
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
deleted file mode 100644
index 121ee9a3f8..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
+++ /dev/null
@@ -1,46 +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 bigbank.account.security;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.policy.Policy;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CheckingsDeptAuthPolicy implements Policy {
-
-    public QName getSchemaName() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public boolean isUnresolved() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // TODO Auto-generated method stub
-        
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
deleted file mode 100644
index 1d565f7ca1..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package bigbank.account.security;
-
-import java.security.Principal;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.SecurityUtil;
-
-/*
- * 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.    
- */
-
-/**
- * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
- */
-public class CheckingsDeptAuthPolicyInterceptor implements Interceptor {
-    private Invoker next;
-
-    public CheckingsDeptAuthPolicyInterceptor(String context, Operation operation, PolicySet policySet) {
-        super();
-        init();
-    }
-
-    private final void init() {
-    }
-
-    public Message invoke(Message msg) {
-        Object msgBody = msg.getBody();
-        if (msgBody instanceof Object[]) {
-        	Object args[] = (Object[])msg.getBody();
-        	Principal principal = SecurityUtil.getPrincipal(msg);
-        	if (principal != null){
-                BigbankCheckingsAcl.authorize(principal,
-                                             (String)args[0]);
-        	}
-        } 
-        
-        Message responseMsg = null;
-        try {
-            responseMsg = getNext().invoke(msg);
-            return responseMsg;
-        } catch (RuntimeException e) {
-            throw e;
-        } 
-    }
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
deleted file mode 100644
index 5fecef691e..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.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 bigbank.account.security;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CheckingsDeptAuthPolicyProviderFactory implements PolicyProviderFactory<CheckingsDeptAuthPolicy> {
-    private ExtensionPointRegistry registry;
-    
-    public CheckingsDeptAuthPolicyProviderFactory(ExtensionPointRegistry registry) {
-        super();
-        this.registry = registry;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createImplementationPolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.assembly.Implementation)
-     */
-    public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) {
-        return new CheckingsDeptAuthImplementationPolicyProvider(component, implementation);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createReferencePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentReference, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public PolicyProvider createReferencePolicyProvider(RuntimeComponent component,
-                                                        RuntimeComponentReference reference,
-                                                        Binding binding) {
-        return null;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createServicePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentService, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public PolicyProvider createServicePolicyProvider(RuntimeComponent component,
-                                                      RuntimeComponentService service,
-                                                      Binding binding) {
-        return null;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()
-     */
-    public Class getModelType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
deleted file mode 100644
index 6667a4ba53..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
+++ /dev/null
@@ -1,67 +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 bigbank.account.security;
-
-import java.security.Principal;
-
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.SecurityUtil;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CheckingsDeptAuthorizationPolicyHandler implements PolicyHandler {
-    private PolicySet applicablePolicySet = null;
-
-    public void afterInvoke(Object... context) {
-    }
-
-    public void beforeInvoke(Object... context) {
-        for ( int count = 0 ; count < context.length ; ++count ) {
-            if ( context[count] instanceof Message ) {
-                Message msg = (Message)context[count];
-                Object args[] = (Object[])msg.getBody();
-                Principal principal = SecurityUtil.getPrincipal(msg);
-                if (principal != null){
-                    BigbankCheckingsAcl.authorize(principal,
-                                                 (String)args[0]);
-                }                
-            }
-        }
-    }
-
-    public void cleanUp(Object... arg0) {
-    }
-
-    public PolicySet getApplicablePolicySet() {
-        return this.applicablePolicySet;
-    }
-
-    public void setApplicablePolicySet(PolicySet policySet) {
-        this.applicablePolicySet = policySet;
-    }
-
-    public void setUp(Object... arg0) {
-
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
deleted file mode 100644
index da1b6e1d06..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
+++ /dev/null
@@ -1,72 +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 bigbank.account.security;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-
-/**
- * Implementation of a Policy Processor 
- *
- */
-public class CheckingsDeptAuthorizationPolicyProcessor implements StAXArtifactProcessor<CheckingsDeptAuthPolicy> {
-    private static final QName CHECKINGS_DEPT_AUTHORIZATION_POLICY_QNAME = new QName("http://bigbank/checkings", "AuthPolicy");
-    public QName getArtifactType() {
-        return CHECKINGS_DEPT_AUTHORIZATION_POLICY_QNAME;
-    }
-    
-    public CheckingsDeptAuthorizationPolicyProcessor(ModelFactoryExtensionPoint modelFactories) {
-    }
-
-    
-    public CheckingsDeptAuthPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        CheckingsDeptAuthPolicy policy = new CheckingsDeptAuthPolicy();
-        return policy;
-    }
-
-    public void write(CheckingsDeptAuthPolicy policy, XMLStreamWriter writer) throws ContributionWriteException,
-                                                        XMLStreamException {
-        String prefix = "tuscany";
-        writer.writeStartElement(prefix, 
-                                 CHECKINGS_DEPT_AUTHORIZATION_POLICY_QNAME.getLocalPart(),
-                                 CHECKINGS_DEPT_AUTHORIZATION_POLICY_QNAME.getNamespaceURI());
-        writer.writeNamespace("chk", "http://bigbank/checkings");
-        
-       
-        writer.writeEndElement();
-    }
-
-    public Class<CheckingsDeptAuthPolicy> getModelType() {
-        return CheckingsDeptAuthPolicy.class;
-    }
-
-    public void resolve(CheckingsDeptAuthPolicy arg0, ModelResolver arg1) throws ContributionResolveException {
-
-    }
-    
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
deleted file mode 100644
index 1473436000..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.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 bigbank.account.stock;
-
-/**
- * @version $$Rev$$ $$Date: 2007-04-09 12:03:34 -0700 (Mon, 09 Apr
- *          2007) $$
- */
-
-public class StockAccountDetails {
-    private String accountNumber;
-    private String symbol;
-    private int quantity;
-    
-    public StockAccountDetails() {
-    }
-    
-    public StockAccountDetails(String acNo, String symbol, int qty) {
-        this.accountNumber = acNo;
-        this.symbol = symbol;
-        this.quantity = qty;
-    }
-    
-    public String getAccountNumber() {
-        return accountNumber;
-    }
-
-    public void setAccountNumber(String n) {
-        this.accountNumber = n;
-    }
-
-    public int getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(int a) {
-        this.quantity = a;
-    }
-
-    public String getSymbol() {
-        return symbol;
-    }
-
-    public void setSymbol(String s) {
-        this.symbol = s;
-    }
-
-    @Override
-    public String toString() {
-        return accountNumber + ", symbol:" + symbol + ", quantity:" + quantity;
-    }
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
deleted file mode 100644
index da2e7940ca..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.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 bigbank.account.stock;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * 
- */
-@Remotable
-public interface StockAccountService {
-    
-    public StockAccountDetails getAccountDetails(String customerID);
-    
-    public StockAccountDetails buy(String accountNo, String symbol, int quantity);
-    
-    public StockAccountDetails sell(String accountNo, String symbol, int quantity);
-    
-    
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
deleted file mode 100644
index c3474a554f..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
+++ /dev/null
@@ -1,60 +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 bigbank.account.stock;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * 
- *  */
-
-@Service(StockAccountService.class)
-public class StockAccountServiceImpl implements StockAccountService {
-    private Map<String, String> custAcctMap = new HashMap<String, String>();
-    private Map<String, StockAccountDetails> stockAccts = new HashMap<String, StockAccountDetails>();
-    
-    public StockAccountServiceImpl() {
-        custAcctMap.put("Customer_01", "STA_Customer_01");
-        custAcctMap.put("Customer_02", "STA_Customer_02");
-        custAcctMap.put("Customer_03", "STA_Customer_03");
-        
-        stockAccts.put("STA_Customer_01", new StockAccountDetails("STA_Customer_01", "IBM", 100));
-        stockAccts.put("STA_Customer_02", new StockAccountDetails("STA_Customer_02", "IBM", 200));
-        stockAccts.put("STA_Customer_03", new StockAccountDetails("STA_Customer_03", "SYM_3", 125));
-    }
-    
-    
-    public StockAccountDetails buy(String accountNo, String symbol, int quantity) {
-        return null;
-    }
-
-    public StockAccountDetails getAccountDetails(String customerID) {
-       return stockAccts.get(custAcctMap.get(customerID));
-    }
-
-    public StockAccountDetails sell(String accountNo, String symbol, int quantity) {
-        return null;
-    }
-    
-	
-    
-}
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/CheckingsAccount.composite b/java/sca-contrib/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
deleted file mode 100644
index cc76e30a75..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/CheckingsAccount.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://bigbank/checkings"
-	xmlns:bbck="http://bigbank/checkings"
-	xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:bba="http://bigbankAccount"
-	name="CheckingsAccountDept">
-	
-    <service name="CheckingsAccountService" promote="CheckingAccountServiceComponent" requires="authentication">
-        <interface.java interface="bigbank.account.checking.CheckingAccountService"/>
-        <binding.ws uri="http://localhost:8085/services/CheckingAcWebService"/>
-    </service>
-
-    <component name="CheckingAccountServiceComponent">
-        <implementation.java class="bigbank.account.checking.CheckingAccountServiceImpl" requires="bba:authorization"/>
-    </component>
-</composite>
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index c5532b879d..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,42 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bigbank"
-    xmlns:bb="http://bigbank"
-    xmlns:bbck="http://bigbank/checkings"
-    xmlns:bbsv="http://bigbank/savings"
-    xmlns:bbst="http://bigbank/stock">
-
-   <deployable composite="bbck:CheckingsAccountDept"/>
-   <deployable composite="bbsv:SavingsAccountDept"/>
-   <deployable composite="bbst:StockAccountDept"/>
-
-   <export namespace="http://bigbank/checkings"/>
-   <export namespace="http://bigbank/savings"/>
-   <export namespace="http://bigbank/stock"/>
-   
-   <export.java package="bigbank.account.checking"/>
-   <export.java package="bigbank.account.savings"/>
-   <export.java package="bigbank.account.stock"/>
-   <export.java package="bigbank.account.security"/>
-   
-   <export.resource uri="definitions.xml"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 6491a0d326..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-bigbank.account.security.CheckingsDeptAuthorizationPolicyProcessor;qname=http://bigbank/checkings#AuthPolicy,model=bigbank.account.security.CheckingsDeptAuthPolicy
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
deleted file mode 100644
index b1bce4339d..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ /dev/null
@@ -1,20 +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.

-# 

-# PolicyHandlerClasses to interpret specific PolicyModels against specific QoS infrastructures

-# handler classname;qname=<policy intent addressed>;model=<policy model class>

-bigbank.account.security.CheckingsDeptAuthorizationPolicyHandler;intent=http://bigbankAccount#authorization,model=bigbank.account.security.CheckingsDeptAuthPolicy

diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
deleted file mode 100644
index d6bfe2167e..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the policy extension

-bigbank.account.security.CheckingsDeptAuthPolicyProviderFactory;model=bigbank.account.security.CheckingsDeptAuthPolicy
\ No newline at end of file
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/SavingsAccount.composite b/java/sca-contrib/demos/bigbank-account/src/main/resources/SavingsAccount.composite
deleted file mode 100644
index 696b96d6e6..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/SavingsAccount.composite
+++ /dev/null
@@ -1,34 +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://bigbank/savings"
-	xmlns:bbsv="http://bigbank/savings"
-	xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-	name="SavingsAccountDept">
-
-    <service name="SavingsAccountService" promote="SavingsAccountServiceComponent">
-        <interface.java interface="bigbank.account.savings.SavingsAccountService"/>
-    </service>
-
-    <component name="SavingsAccountServiceComponent">
-        <implementation.java class="bigbank.account.savings.SavingsAccountServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/StockAccount.composite b/java/sca-contrib/demos/bigbank-account/src/main/resources/StockAccount.composite
deleted file mode 100644
index 62c0b63003..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/StockAccount.composite
+++ /dev/null
@@ -1,34 +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://bigbank/stock"
-	xmlns:bbst="http://bigbank/stock"
-	xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-	name="StockAccountDept">
-
-    <service name="StockAccountService" promote="StockAccountServiceComponent">
-        <interface.java interface="bigbank.account.stock.StockAccountService"/>
-    </service>
-
-    <component name="StockAccountServiceComponent">
-        <implementation.java class="bigbank.account.stock.StockAccountServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/definitions.xml b/java/sca-contrib/demos/bigbank-account/src/main/resources/definitions.xml
deleted file mode 100644
index 31a8798f8b..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 			targetNamespace="http://bigbankAccount"
- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-			xmlns:chk="http://bigbank/checkings"
- 			xmlns:bb="http://bigbank"
- 			xmlns:bba="http://bigbankAccount">
-
-  
-<sca:intent name="authorization" 
- 			 constrains="sca:implementation.java">
- 			 <description>
- 				Authorization Intent
- 			 </description>
-</sca:intent>
- 
- <!-- WS Security POLICY SETS -->
- <sca:policySet name="wsAuthenticationPolicy"
- 	provides="authentication"
- 	appliesTo="sca:service/sca:binding.ws">
- 	<tuscany:wsConfigParam>
- 		<parameter name="InflowSecurity">
- 			<action>
- 				<items>UsernameToken</items>
- 				<passwordCallbackClass>bigbank.account.security.AccountsDataPasswordCallbackHandler</passwordCallbackClass>
-       		</action>
-      	</parameter>
- 	</tuscany:wsConfigParam>
- </sca:policySet>
- 
- <sca:policySet name="chkDeptAuthorizationPolicy"
- 	provides="bba:authorization"
- 	appliesTo="sca:implementation.java">
- 	<chk:AuthPolicy>
- 		<!-- need to evolve what should go in here -->
- 	</chk:AuthPolicy>
- </sca:policySet>
- 
-</sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/web/AccountJSON.html b/java/sca-contrib/demos/bigbank-account/src/main/resources/web/AccountJSON.html
deleted file mode 100644
index 1609bf4b43..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/web/AccountJSON.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<html>
-<!--
- * 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.    
- -->
-<head>
-<title>Tuscany JSON-RPC BigBank Client</TITLE>
-
-<script type="text/javascript">
-        var djConfig = {isDebug: true,debugContainerId: "dojoDebug" };
-		djConfig.usePlainJson=true ;
-        //djConfig.debugAtAllCosts = true;
-    </script>
-<script type="text/javascript" src="dojo/dojo/dojo.js"> 
-    </script>
-<script type="text/javascript" src="dojo/dijit/dijit.js"> 
-    </script>
-
-<script type="text/javascript">
-    	dojo.require("dijit.form.Button");
-    	dojo.require("dojo.rpc.JsonService");    	
-    </script>
-
-<link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-
-<body>
-
-<table>
-	<tr>
-		<th colspan="2">Tuscany JSON-RPC BigBank Client</th>
-	</tr>
-	<tr>
-		<td colspan="2">
-		<p>This example uses the <a href="http://dojotoolkit.org/">Dojo
-		Toolkit</a> to create a JavaScript object <code>accountService</code> for
-		the service at <b>http://localhost:8080/AccountJSONService</b> using <a
-			href="http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book9">Dojo's
-		RPC classes</a> and providing them with <a href="AccountJSONService?smd">http://localhost:8080/AccountJSONService?smd</a>
-		for <a href="http://dojo.jot.com/SMD">Simple Method Description
-		(SMD)</a> input.</p>
-		<p>It then creates a Dojo button that will envoke the <code>getAccountReport</code>
-		method of the <code>accountService</code> object.</p>
-	</tr>
-	<tr>
-		<td>Request</td>
-		<td>Response</td>
-	</tr>
-	<tr>
-		<td><br>
-		<button id="myaccount" dojoType="dijit.form.Button"
-			onClick='accountService.getAccountReport("Dojo1234").addCallback(contentCallBack);'>getAccountReport("Dojo1234")</button>
-		<br>
-		</td>
-		<td>
-		<div id="ReturnedContent">None Yet.</div>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-		<div id="dojoDebug">Dojo Debug:</div>
-		</td>
-	</tr>
-</table>
-
-<script type="text/javascript">
-    
-    	function contentCallBack(result) {
-    		var handlerNode = document.getElementById("ReturnedContent");
-    		handlerNode.innerHTML = "<p>" + result + "</p>" ;
-    	}
-    
-    	var accountService = new dojo.rpc.JsonService("AccountJSONService?smd");
-    
-    </script>
-
-</body>
-</html>
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/web/style.css b/java/sca-contrib/demos/bigbank-account/src/main/resources/web/style.css
deleted file mode 100644
index 1071583264..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/web/style.css
+++ /dev/null
@@ -1,22 +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.
- */
-* { font-family: arial; }
-
-table, th, td { border: 2px solid blue; border-collapse: collapse; }
-th { color: white; background-color: blue; }
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl b/java/sca-contrib/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index ac4d987a57..0000000000
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
+++ /dev/null
@@ -1,91 +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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://bigbank"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://bigbank"
-	name="AccountService">
-
-	<wsdl:types>
-		<xsd:schema
-			targetNamespace="http://bigbank"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-			<xsd:element name="getAccountReport">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="getAccountReportResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:double" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-		</xsd:schema>
-	</wsdl:types>
-
-	<wsdl:message name="getAccountReportRequest">
-		<wsdl:part element="tns:getAccountReport"
-			name="getAccountReportRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="getAccountReportResponse">
-		<wsdl:part element="tns:getAccountReportResponse"
-			name="getAccountReportResponse" />
-	</wsdl:message>
-
-	<wsdl:portType name="AccountService">
-		<wsdl:operation name="getAccountReport">
-			<wsdl:input message="tns:getAccountReportRequest" />
-			<wsdl:output message="tns:getAccountReportResponse" />
-		</wsdl:operation>
-	</wsdl:portType>
-
-	<wsdl:binding name="AccountServiceSoap" type="tns:AccountService">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getAccountReport">
-			<soap:operation
-				soapAction="" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-
-	<wsdl:service name="AccountService">
-		<wsdl:port binding="tns:AccountServiceSoap"
-			name="AccountServiceSoap">
-			<soap:address
-				location="http://localhost:8082/services/AccountWebService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/java/sca-contrib/demos/bigbank-calculator/LICENSE b/java/sca-contrib/demos/bigbank-calculator/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/demos/bigbank-calculator/NOTICE b/java/sca-contrib/demos/bigbank-calculator/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/demos/bigbank-calculator/README b/java/sca-contrib/demos/bigbank-calculator/README
deleted file mode 100644
index e8ff28fc0f..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/README
+++ /dev/null
@@ -1,2 +0,0 @@
-bigbank-calculator is part of a larger demo called bigbank. 
-Please see the Readme file under bigbank to understand how bigbank-calculator fits into the overall demo.
diff --git a/java/sca-contrib/demos/bigbank-calculator/build.xml b/java/sca-contrib/demos/bigbank-calculator/build.xml
deleted file mode 100644
index a06f0806df..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/build.xml
+++ /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.    
--->
-<project name="calculator" default="run">
-    <property name="test.class" value="calculator.demo.CalculatorServer" />
-	
-    <path id="test.classpath">
-        <!-- pathelement location="../../modules/tuscany-binding-rmi-1.4-SNAPSHOT.jar"/-->
-        <pathelement path="target/demo-bigbank-calculator.jar"/>      
-    	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>    	
-    </path>
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/demo-bigbank-calculator.jar" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <path refid="test.classpath"/>
-            </classpath>
-        </java>    	
-    </target>	
-
-    <target name="clean">
-		<delete quiet="true" includeemptydirs="true">
-			<fileset dir="target" />
-		</delete>
-	</target>
-
-</project>
-
diff --git a/java/sca-contrib/demos/bigbank-calculator/pom.xml b/java/sca-contrib/demos/bigbank-calculator/pom.xml
deleted file mode 100644
index 982fdb7e2a..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/pom.xml
+++ /dev/null
@@ -1,78 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-demos</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>demo-bigbank-calculator</artifactId>
-    <name>Apache Tuscany SCA BigBank Calculator Demo</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/AddService.java b/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/AddService.java
deleted file mode 100644
index 4eeb30a9c2..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,25 +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 calculator;
-
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index c89043276e..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,34 +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 calculator;
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 0b42a6ab1f..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,72 +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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the Calculator service.
- */
-@Service(CalculatorService.class)
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        System.err.println("Multiply");
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/DivideService.java b/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 131c5a8014..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,25 +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 calculator;
-
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index a917896aeb..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,25 +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 calculator;
-
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java b/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index e328f024ea..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,25 +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 calculator;
-
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java b/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
deleted file mode 100644
index b1861daafc..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.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 calculator.demo;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CalculatorServer {
-
-    public static void main(String[] args) throws Exception {
-
-        System.out.println("Starting the Sample SCA Calculator...");
-
-        SCADomain domain = SCADomain.newInstance("Calculator.composite");
-
-        System.out.println("Press Enter to Exit...");
-        System.in.read();
-
-        domain.close();
-
-        System.out.println("Bye");
-        System.exit(0);
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/Calculator.composite b/java/sca-contrib/demos/bigbank-calculator/src/main/resources/Calculator.composite
deleted file mode 100644
index 851813d31f..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,55 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://calc"

-	xmlns:c="http://calc"

-	name="Calculator">

-

-    <component name="CalculatorServiceComponent">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-		
-	    <service name="CalculatorService">

-	        <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>

-	    </service>

-

-        <reference name="addService" target="AddServiceComponent" />

-        <reference name="subtractService" target="SubtractServiceComponent" />

-        <reference name="multiplyService" target="MultiplyServiceComponent" />

-        <reference name="divideService" target="DivideServiceComponent" />

-    </component>

-

-    <component name="AddServiceComponent">

-        <tuscany:implementation.script script="calculator/AddServiceImpl.js"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <tuscany:implementation.script script="calculator/SubtractServiceImpl.rb"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <tuscany:implementation.script script="calculator/MultiplyServiceImpl.py"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <tuscany:implementation.script script="calculator/DivideServiceImpl.groovy"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
deleted file mode 100644
index 1d4d221364..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ /dev/null
@@ -1,22 +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.    
- */
-
-function add(n1, n2) {
-   return n1 + n2;
-}
\ No newline at end of file
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
deleted file mode 100644
index c31c1e8fd6..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ /dev/null
@@ -1,22 +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.    

- */

- 

-def divide(n1, n2) {

-   return n1 / n2

-}
\ No newline at end of file
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
deleted file mode 100644
index dd56af0ad8..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ /dev/null
@@ -1,21 +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.
-#
- 
-def multiply(n1, n2):
-   print "Python Calculator component: multiply(", n1, ",", n2, ")"
-   return n1 * n2
\ No newline at end of file
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
deleted file mode 100644
index 08fa310f46..0000000000
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ /dev/null
@@ -1,22 +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.
-#
- 
-def subtract(n1, n2)
-    print "Ruby Calculator subtract(", n1, ",", n2, ")\n"
-    return n1 - n2
-end
\ No newline at end of file
diff --git a/java/sca-contrib/demos/bigbank-stockquote/LICENSE b/java/sca-contrib/demos/bigbank-stockquote/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/demos/bigbank-stockquote/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/demos/bigbank-stockquote/NOTICE b/java/sca-contrib/demos/bigbank-stockquote/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/demos/bigbank-stockquote/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/demos/bigbank-stockquote/README b/java/sca-contrib/demos/bigbank-stockquote/README
deleted file mode 100644
index 2ea98d020c..0000000000
--- a/java/sca-contrib/demos/bigbank-stockquote/README
+++ /dev/null
@@ -1,4 +0,0 @@
-bigbank-stockquote is a part of a larger demo called bigbank. 
-Please see the Readme file under bigbank to understand how bigbank-stockquote fits into the overall demo.
- 
-
diff --git a/java/sca-contrib/demos/bigbank-stockquote/build.xml b/java/sca-contrib/demos/bigbank-stockquote/build.xml
deleted file mode 100644
index 145c158ac2..0000000000
--- a/java/sca-contrib/demos/bigbank-stockquote/build.xml
+++ /dev/null
@@ -1,67 +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.    
--->
-<project name="calculator" default="run">
-    <property name="test.class" value="stockquote.demo.StockQuoteServer" />
-	
-    <path id="test.classpath">
-    	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>    	
-    	<pathelement location="target/demo-bigbank-stockquote.jar"/>    	
-    </path>
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/demo-bigbank-stockquote.jar" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>		
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <path refid="test.classpath"/>
-            </classpath>
-        </java>    	
-    </target>	
-
-    <target name="clean">
-		<delete quiet="true" includeemptydirs="true">
-			<fileset dir="target" />
-		</delete>
-	</target>
-
-</project>
-
diff --git a/java/sca-contrib/demos/bigbank-stockquote/pom.xml b/java/sca-contrib/demos/bigbank-stockquote/pom.xml
deleted file mode 100644
index 97586917cc..0000000000
--- a/java/sca-contrib/demos/bigbank-stockquote/pom.xml
+++ /dev/null
@@ -1,85 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-demos</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>demo-bigbank-stockquote</artifactId>
-    <name>Apache Tuscany SCA BigBank StockQuote Demo</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-            <version>1.5.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java b/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
deleted file mode 100644
index 2d7821171d..0000000000
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
+++ /dev/null
@@ -1,47 +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 stockquote;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.apache.ws.security.WSPasswordCallback;
-
-/**
- * Sample userid passwd generation class 
- */
-public class PasswordCallbackHandler implements CallbackHandler {
-
-    public void handle(Callback[] callbacks) throws IOException,
-            UnsupportedCallbackException {
-    	for (int i = 0; i < callbacks.length; i++) {
-            System.out.println("*** Calling Server User/Passwd Handler...." );
-            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
-            System.out.println("*** Getting password for user ...."  + pwcb.getIdentifer() + " & " + pwcb.getKey());
-            if ( pwcb.getUsage() == WSPasswordCallback.SIGNATURE ) {
-                System.out.println(" Usage is SIGNATURE ... ");
-                pwcb.setPassword("sqservice");
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java b/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
deleted file mode 100644
index 63c31bd116..0000000000
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
+++ /dev/null
@@ -1,38 +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 stockquote;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the StockQuote service.
- */
-@Service(StockQuoteService.class)
-public class StockQuoteImpl implements StockQuoteService {
-
-    public double getQuote(String symbol) {
-        double price = 104.0 + Math.random();
-        price = ((int)(price * 100)) / 100.0;
-
-        System.out.println("Getting stock quote for: " + symbol + ", value: "+ price);
-
-        return price;
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java b/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
deleted file mode 100644
index a20f4e46dd..0000000000
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
+++ /dev/null
@@ -1,30 +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 stockquote;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the StockQuote service.
- */
-@Remotable
-public interface StockQuoteService {
-
-    public double getQuote(String symbol);
-}
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java b/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
deleted file mode 100644
index 04ed762602..0000000000
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
+++ /dev/null
@@ -1,42 +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 stockquote.demo;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This server program shows how to bootstrap SCA from a simple J2SE program
- * and start it which activates the StockQuote Web service endpoint.
- */
-public class StockQuoteServer {
-
-    public static void main(String[] args) throws Exception {
-
-        System.out.println("Starting the Sample SCA StockQuote Service...");
-
-        SCADomain domain = SCADomain.newInstance("StockQuote.composite");
-
-        System.out.println("Press Enter to Exit...");
-        System.in.read();
-
-        domain.close();
-        System.out.println("Bye");
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/StockQuote.composite b/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
deleted file mode 100644
index aaad92c861..0000000000
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
+++ /dev/null
@@ -1,33 +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:sca="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://stockquote"
-	xmlns:hw="http://stockquote"
-    name="StockQuote">
-
-    <component name="StockQuoteServiceComponent">
-        <implementation.java class="stockquote.StockQuoteImpl" />
-	    <service name="StockQuoteService" requires="integrity">
-	        <binding.ws uri="http://localhost:8081/services/StockQuoteWebService"/>
-	    </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/definitions.xml b/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/definitions.xml
deleted file mode 100644
index 7e1f51304e..0000000000
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 			targetNamespace="http://stockQuote"
- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- 			xmlns:bb="http://bigbank">
-
- 
- <!-- WS Security POLICY SETS -->
- <sca:policySet name="wsIntegrityPolicy"
- 	provides="integrity"
- 	appliesTo="sca:binding.ws">
- 	<tuscany:wsConfigParam>
- 		<parameter name="InflowSecurity">
-		    <action>
-		        <items>Timestamp Signature</items>
-		        <signaturePropFile>security.properties</signaturePropFile>
-		    </action>
-		</parameter>
- 		<parameter name="OutflowSecurity">
-      		<action>
-        		<items>Timestamp Signature</items>
-        		<user>sqservice</user>
-        		<signaturePropFile>security.properties</signaturePropFile>
-        		<passwordCallbackClass>stockquote.PasswordCallbackHandler</passwordCallbackClass>
-        		<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
-      		</action>
-    	</parameter>
- 	</tuscany:wsConfigParam>
- </sca:policySet>
- </sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/security.properties b/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/security.properties
deleted file mode 100644
index a5b889c269..0000000000
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/security.properties
+++ /dev/null
@@ -1,20 +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.
-## ---------------------------------------------------------------------------
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=sqkeystore
-org.apache.ws.security.crypto.merlin.file=stockQuote.jks
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/stockQuote.jks b/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
deleted file mode 100644
index d53d32c4ef..0000000000
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
+++ /dev/null
diff --git a/java/sca-contrib/demos/bigbank/LICENSE b/java/sca-contrib/demos/bigbank/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/demos/bigbank/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/demos/bigbank/NOTICE b/java/sca-contrib/demos/bigbank/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/demos/bigbank/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/demos/bigbank/README b/java/sca-contrib/demos/bigbank/README
deleted file mode 100644
index 5ec796db60..0000000000
--- a/java/sca-contrib/demos/bigbank/README
+++ /dev/null
@@ -1,127 +0,0 @@
-BigBank Demo
-============
-
-This application is made of 3 modules that represent the different aspects 
-of a fictitious banking application. Please see bigbank.png in the bigbank-account directory for a diagram of this demo.
-
-To run the bigbank-account demo you need to first run bigbank-calculator and bigbank-stockquote composites. This will bring up Tuscany runtime and load the two applications and make them available as services. Bigbank-account is dependent on these services.
-
-This demo uses ant. This is just one way of running this demo. 
-
-Start Bigbank-calculator composite
-----------------------------------
-
-Bigbank-calculator is a calculator application which handles add, subtract, multiply and divide operations. Each of these operations is implemented in a different language, including JavaScript, groovy, Ruby and Python.
-
-To run the bigbank-calculator composite and make it available as a service for this demo do the following:
-
-cd bigbank-calculator
-ant compile  
-ant run
-
-.. Leave the server running
-
-Note that 'ant compile' needs to be done the first time you run this demo out of the binary distribution. No need to do 'ant compile' from there on.
-
-Start Bigbank-stockquote
-------------------------
-
-A very simple web services based stock quote application which returns random 
-stock quotes on request. Please note that the stockquote service is not live and is implemented instead to allow for this application to always run without dependency on the availability of a webservice.
-
-cd bigbank-stockquote
-ant compile  
-ant run
-
-.. Leave the server running
-
-Note that 'ant compile' needs to be done the first time you run this demo out of the binary distribution. No need to do 'ant compile' from there on.
-
-Start Bigbank
--------------
-The BigBank comprises of two subsystems that are built from two distinct contributions coming from ...
-1) bigbank
-	This contains all artifacts that make up the bigbank application.  This is the application that the 
-	end user interacts with
-	
-2) bigbank-account
-	This contains all artifacts that deal with the account management within the bigbank.  The services 
-	offered by the bigbank-account module are used by the bigbank.  The end user never gets to directly 
-	interact with bigbank account
-	
-Besides the bigbank-account the bigbank composite application calls into bigbank-stockquote and 
-bigbank-calculator services. 
-
-Start bigbank-account in the following way:
-
-i ) Compile the bigbank-account as follows :
-	
-	cd bigbank-account					
-	ant compile
-	
-ii) Now start the bigbank service as follows :
-	
-	cd bigbank
-	ant compile 
-	ant run
-
-	.. Leave the server running
-
-Note that 'ant compile' needs to be done the first time you run this demo out ofthe  binary distribution. 
-No need to do 'ant compile' from there on.
-
-Bigbank and the SCA Policies
-----------------------------
-The Bigbank demo uses the Tuscany PolicyFramework to enforce security in the following ways:
-
-Authentication
---------------
-	The bigbank-account subsystem enforces authentication as a required security characteristic for
-	all interactions with its CheckingAccountService.  Hence the 'bigbank' application which is a client
-	to this service authenticates itself for every interaction with the CheckingAccountService.  The interaction
-	between the bigbank and the CheckingAccountService is over the ws binding.
-	
-Integrity
----------
-	All interactions of the bigbank application with the StockQuoteService are guarded with message integrity.
-	These interactions use the ws binding.
-	
-Authorization
--------------
-	Within the bigbank-account subsystem the CheckingAccountService implementation enforces authorization on
-	its operations.  This is an instance of a custom policy enforcement i.e. the CheckingAccountService 
-	component's implementation has defined its own customized way of authorizing access to its services.
-	
-Demonstrated features 
----------------------
-This demo is to illustrate the following : -
-- composition of an application using artifacts belonging to multiple contributions (here two)
-- usage of sca policies in composite definitions with specific emphasis on enabling security
-
-	
-Run the demo
-------------- 
-The front end of this demo application is a web app which users Json/RPC to communicate with the backend for retrieving account information. 
-
-To try the app out point you browser at:
-
-http://localhost:8080/AccountJSON.html
-
-This should display an interface with a single button that goes and retrieves 
-a single set of account details exercising services across the three running 
-SCA applications. 
-
-If you press on getAccountReport, you'll see a response posted, 
-but the detail of the data will be displayed in the console where you started bigbank. Among other
-things you will note messages that confirm the enforecement of AUTHENTICATION, AUTHORIZATION and
-SIGNING of messages exchaged.
-
-On the console where you have started the StockQuote Service you should again be able to see messages
-that confirm the signing of messages exchanged.
-
-Stop the demo
--------------
-Go to each of the corresponding command line screens and hit 'enter'. 
-This will stop each of the applications.
- 
-
diff --git a/java/sca-contrib/demos/bigbank/bigbank.png b/java/sca-contrib/demos/bigbank/bigbank.png
deleted file mode 100644
index 985cc6bd05..0000000000
--- a/java/sca-contrib/demos/bigbank/bigbank.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/bigbank/bigbank.svg b/java/sca-contrib/demos/bigbank/bigbank.svg
deleted file mode 100644
index 30aa0eab6d..0000000000
--- a/java/sca-contrib/demos/bigbank/bigbank.svg
+++ /dev/null
@@ -1,537 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

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

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.44"

-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-0.91\demos\bigbank-account"

-   sodipodi:docname="bigbank.svg"

-   version="1.0"

-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-0.91\demos\bigbank-account\bigbank.png"

-   inkscape:export-xdpi="105.68515"

-   inkscape:export-ydpi="105.68515">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="0.7"

-     inkscape:cx="668.70076"

-     inkscape:cy="413.94086"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1138"

-     inkscape:window-height="772"

-     inkscape:window-x="94"

-     inkscape:window-y="129" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997"

-       transform="translate(-61.2386,-72.73099)">

-      <rect

-         rx="7.8521242"

-         ry="17.265177"

-         y="192.00223"

-         x="258.31161"

-         height="334.34488"

-         width="257.31851"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">Composite</flowPara><flowPara

-           id="flowPara1883">BigBank</flowPara></flowRoot>      <flowRoot

-         id="flowRoot2315"

-         xml:space="preserve"

-         transform="translate(-185.101,71.92054)"><flowRegion

-           id="flowRegion2317"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2319" /></flowRegion><flowPara

-           id="flowPara2323">WebApp</flowPara></flowRoot>    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="126.26909"

-       x="269.58636"

-       y="190.53091"

-       rx="6.9961648"

-       ry="10.475038" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(1.99553,-15.40766)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="171.01015"

-           height="76.580856"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">Component </flowPara><flowPara

-         id="flowPara1885">Account</flowPara><flowPara

-         id="flowPara1887" /><flowPara

-         id="flowPara1889" /><flowPara

-         id="flowPara1891">Java</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 252.43583,222.37787 L 285.77087,222.37787 L 291.83178,235.50985 L 284.76072,247.63169 L 252.43583,247.63169 L 260.01198,235.50985 L 252.43583,222.37787 z "

-       id="path3017" />

-    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 365.68827,205.3873 L 399.02331,205.3873 L 405.08422,218.51928 L 398.01316,230.64112 L 365.68827,230.64112 L 373.26442,218.51928 L 365.68827,205.3873 z "

-       id="path3019" />

-    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 152.40866,209.21877 L 214.80502,209.21877 L 226.1498,236.00801 L 212.91422,260.73656 L 152.40866,260.73656 L 166.58966,236.00801 L 152.40866,209.21877 z "

-       id="path1893" />

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1895"

-       width="115.66247"

-       height="85.862968"

-       x="272.53705"

-       y="351.65024"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1897"

-       transform="translate(4.94623,145.7117)"><flowRegion

-         id="flowRegion1899"><rect

-           id="rect1901"

-           width="171.01015"

-           height="76.580856"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1903">Component </flowPara><flowPara

-         id="flowPara1905">AccountData</flowPara><flowPara

-         id="flowPara1907" /><flowPara

-         id="flowPara1909" /><flowPara

-         id="flowPara1911">Java</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 255.38654,383.4972 L 288.72158,383.4972 L 294.78249,396.62918 L 287.71143,408.75102 L 255.38654,408.75102 L 262.96269,396.62918 L 255.38654,383.4972 z "

-       id="path1913" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1917"

-       transform="translate(-115.5876,5.278396)"><flowRegion

-         id="flowRegion1919"><rect

-           id="rect1921"

-           width="171.01015"

-           height="76.580856"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1931">binding.</flowPara><flowPara

-         id="flowPara1941">jsonrpc</flowPara></flowRoot>    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 426.15997,139.5181 L 490.26581,139.5181 L 501.9214,165.78205 L 488.32321,190.02572 L 426.15997,190.02572 L 440.72949,165.78205 L 426.15997,139.5181 z "

-       id="path1943" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1945"

-       transform="translate(161.03,-62.1275)"

-       inkscape:transform-center-y="51.51778"

-       inkscape:transform-center-x="-6.0609153"><flowRegion

-         id="flowRegion1947"><rect

-           id="rect1949"

-           width="171.01015"

-           height="76.580856"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1951">binding.</flowPara><flowPara

-         id="flowPara1953">ws</flowPara></flowRoot>    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 426.16,223.86592 L 490.26584,223.86592 L 501.92143,250.12987 L 488.32324,274.37354 L 426.16,274.37354 L 440.72952,250.12987 L 426.16,223.86592 z "

-       id="path1955" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1957"

-       transform="translate(161.03,22.22032)"

-       inkscape:transform-center-y="51.51778"

-       inkscape:transform-center-x="-6.0609153"><flowRegion

-         id="flowRegion1959"><rect

-           id="rect1961"

-           width="171.01015"

-           height="76.580856"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1963">binding.</flowPara><flowPara

-         id="flowPara1965">rmi</flowPara></flowRoot>    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 366.56099,240.53344 L 399.89603,240.53344 L 405.95694,253.66542 L 398.88588,265.78726 L 366.56099,265.78726 L 374.13714,253.66542 L 366.56099,240.53344 z "

-       id="path1967" />

-    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 365.55084,275.88877 L 398.88588,275.88877 L 404.94679,289.02075 L 397.87573,301.14259 L 365.55084,301.14259 L 373.12699,289.02075 L 365.55084,275.88877 z "

-       id="path1969" />

-    <g

-       id="g1971"

-       transform="translate(439.292,-139.3494)">

-      <rect

-         rx="7.8521242"

-         ry="7.8236527"

-         y="220.28642"

-         x="165.37758"

-         height="151.50719"

-         width="257.31851"

-         id="rect1973"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot1975"

-         xml:space="preserve"

-         transform="translate(-109.0965,17.17259)"><flowRegion

-           id="flowRegion1977"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect1979" /></flowRegion><flowPara

-           id="flowPara1981">Composite</flowPara><flowPara

-           id="flowPara1983">StockQuote</flowPara></flowRoot>      <g

-         id="g2067"

-         transform="translate(-98.99495,207.0814)">

-        <rect

-           rx="12.845777"

-           ry="17.265177"

-           y="192.00223"

-           x="258.31168"

-           height="334.34488"

-           width="420.96332"

-           id="rect2069"

-           style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-        <flowRoot

-           id="flowRoot2071"

-           xml:space="preserve"

-           transform="translate(-4.04061,-5.050763)"><flowRegion

-             id="flowRegion2073"><rect

-               y="212.66591"

-               x="281.42856"

-               height="61.42857"

-               width="170"

-               id="rect2075" /></flowRegion><flowPara

-             id="flowPara2077">Composite</flowPara><flowPara

-             id="flowPara2079">Calculator</flowPara></flowRoot>      </g>

-      <rect

-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-         id="rect2081"

-         width="115.66247"

-         height="200.01021"

-         x="231.82996"

-         y="470.34314"

-         rx="6.9961648"

-         ry="16.592457" />

-      <flowRoot

-         xml:space="preserve"

-         id="flowRoot2083"

-         transform="translate(-35.76085,264.4047)"><flowRegion

-           id="flowRegion2085"><rect

-             id="rect2087"

-             width="171.01015"

-             height="76.580856"

-             x="281.42856"

-             y="212.66591" /></flowRegion><flowPara

-           id="flowPara2089">Component </flowPara><flowPara

-           id="flowPara2091">Calculator</flowPara><flowPara

-           id="flowPara2093" /><flowPara

-           id="flowPara2095" /><flowPara

-           id="flowPara2097">Java</flowPara></flowRoot>      <path

-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-         d="M 214.67944,502.19018 L 248.01448,502.19018 L 254.07539,515.32216 L 247.00433,527.444 L 214.67944,527.444 L 222.25559,515.32216 L 214.67944,502.19018 z "

-         id="path2099" />

-      <path

-         style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-         d="M 327.93188,485.19961 L 361.26692,485.19961 L 367.32783,498.33159 L 360.25677,510.45343 L 327.93188,510.45343 L 335.50803,498.33159 L 327.93188,485.19961 z "

-         id="path2101" />

-      <path

-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-         d="M 114.65227,489.03108 L 177.04863,489.03108 L 188.39341,515.82032 L 175.15784,540.54887 L 114.65227,540.54887 L 128.83327,515.82032 L 114.65227,489.03108 z "

-         id="path2103" />

-      <rect

-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-         id="rect2105"

-         width="115.66247"

-         height="72.731003"

-         x="438.83148"

-         y="412.3407"

-         rx="6.9961648"

-         ry="6.0336223" />

-      <flowRoot

-         xml:space="preserve"

-         id="flowRoot2107"

-         transform="translate(183.2407,206.4021)"><flowRegion

-           id="flowRegion2109"><rect

-             id="rect2111"

-             width="171.01015"

-             height="76.580856"

-             x="281.42856"

-             y="212.66591" /></flowRegion><flowPara

-           id="flowPara2113">Component </flowPara><flowPara

-           id="flowPara2115">Add</flowPara><flowPara

-           id="flowPara2119" /><flowPara

-           id="flowPara2121">Javascript</flowPara></flowRoot>      <path

-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-         d="M 418.6505,435.09626 L 451.98554,435.09626 L 458.04645,448.22824 L 450.97539,460.35008 L 418.6505,460.35008 L 426.22665,448.22824 L 418.6505,435.09626 z "

-         id="path2123" />

-      <flowRoot

-         xml:space="preserve"

-         id="flowRoot2125"

-         transform="translate(-153.344,285.0907)"><flowRegion

-           id="flowRegion2127"><rect

-             id="rect2129"

-             width="171.01015"

-             height="76.580856"

-             x="281.42856"

-             y="212.66591" /></flowRegion><flowPara

-           id="flowPara2131">binding.</flowPara><flowPara

-           id="flowPara2133">rmi</flowPara></flowRoot>      <path

-         style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-         d="M 328.8046,531.45743 L 362.13964,531.45743 L 368.20055,544.58941 L 361.12949,556.71125 L 328.8046,556.71125 L 336.38075,544.58941 L 328.8046,531.45743 z "

-         id="path2159" />

-      <path

-         style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-         d="M 329.81476,581.96505 L 363.1498,581.96505 L 369.21071,595.09703 L 362.13965,607.21887 L 329.81476,607.21887 L 337.39091,595.09703 L 329.81476,581.96505 z "

-         id="path2161" />

-      <rect

-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-         id="rect2225"

-         width="115.66247"

-         height="72.731003"

-         x="438.39767"

-         y="491.58591"

-         rx="6.9961648"

-         ry="6.0336223" />

-      <flowRoot

-         xml:space="preserve"

-         id="flowRoot2227"

-         transform="translate(182.8068,285.6473)"><flowRegion

-           id="flowRegion2229"><rect

-             id="rect2231"

-             width="171.01015"

-             height="76.580856"

-             x="281.42856"

-             y="212.66591" /></flowRegion><flowPara

-           id="flowPara2233">Component </flowPara><flowPara

-           id="flowPara2235">Subtract</flowPara><flowPara

-           id="flowPara2237" /><flowPara

-           id="flowPara2239">Ruby</flowPara></flowRoot>      <path

-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-         d="M 418.21668,514.34147 L 451.55172,514.34147 L 457.61263,527.47345 L 450.54157,539.59529 L 418.21668,539.59529 L 425.79283,527.47345 L 418.21668,514.34147 z "

-         id="path2241" />

-      <rect

-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-         id="rect2243"

-         width="115.66247"

-         height="72.731003"

-         x="438.39767"

-         y="569.36768"

-         rx="6.9961648"

-         ry="6.0336223" />

-      <flowRoot

-         xml:space="preserve"

-         id="flowRoot2245"

-         transform="translate(182.8069,363.4291)"><flowRegion

-           id="flowRegion2247"><rect

-             id="rect2249"

-             width="171.01015"

-             height="76.580856"

-             x="281.42856"

-             y="212.66591" /></flowRegion><flowPara

-           id="flowPara2251">Component </flowPara><flowPara

-           id="flowPara2255">Multiply</flowPara><flowPara

-           id="flowPara2281" /><flowPara

-           id="flowPara2257">Python</flowPara></flowRoot>      <path

-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-         d="M 418.21667,592.12321 L 451.55171,592.12321 L 457.61262,605.25519 L 450.54156,617.37703 L 418.21667,617.37703 L 425.79282,605.25519 L 418.21667,592.12321 z "

-         id="path2259" />

-      <rect

-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-         id="rect2261"

-         width="115.66247"

-         height="72.731003"

-         x="439.40784"

-         y="647.14941"

-         rx="6.9961648"

-         ry="6.0336223" />

-      <flowRoot

-         xml:space="preserve"

-         id="flowRoot2263"

-         transform="translate(183.817,441.2108)"><flowRegion

-           id="flowRegion2265"><rect

-             id="rect2267"

-             width="171.01015"

-             height="76.580856"

-             x="281.42856"

-             y="212.66591" /></flowRegion><flowPara

-           id="flowPara2269">Component </flowPara><flowPara

-           id="flowPara2271">Divide</flowPara><flowPara

-           id="flowPara2273" /><flowPara

-           id="flowPara2275">Groovy</flowPara></flowRoot>      <path

-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-         d="M 419.22682,669.90496 L 452.56186,669.90496 L 458.62277,683.03694 L 451.55171,695.15878 L 419.22682,695.15878 L 426.80297,683.03694 L 419.22682,669.90496 z "

-         id="path2277" />

-      <path

-         style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-         d="M 328.29952,628.38036 L 361.63456,628.38036 L 367.69547,641.51234 L 360.62441,653.63418 L 328.29952,653.63418 L 335.87567,641.51234 L 328.29952,628.38036 z "

-         id="path2283" />

-    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1985"

-       width="113.64217"

-       height="94.954361"

-       x="677.18286"

-       y="121.89223"

-       rx="6.9961648"

-       ry="10.475038" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1987"

-       transform="translate(409.5921,-84.04634)"><flowRegion

-         id="flowRegion1989"><rect

-           id="rect1991"

-           width="171.01015"

-           height="76.580856"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1993">Component </flowPara><flowPara

-         id="flowPara1995">StockQuote</flowPara><flowPara

-         id="flowPara1997" /><flowPara

-         id="flowPara1999" /><flowPara

-         id="flowPara2001">Java</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 660.03239,153.73919 L 693.36743,153.73919 L 699.42834,166.87117 L 692.35728,178.99301 L 660.03239,178.99301 L 667.60854,166.87117 L 660.03239,153.73919 z "

-       id="path2003" />

-    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 560.00522,140.58009 L 622.40158,140.58009 L 633.74636,167.36933 L 620.51078,192.09788 L 560.00522,192.09788 L 574.18622,167.36933 L 560.00522,140.58009 z "

-       id="path2007" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2029"

-       transform="translate(292.009,-63.36024)"><flowRegion

-         id="flowRegion2031"><rect

-           id="rect2033"

-           width="171.01015"

-           height="76.580856"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2035">binding.</flowPara><flowPara

-         id="flowPara2037">ws</flowPara></flowRoot>    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 501.41636,164.26692 C 575.1575,165.27707 575.1575,165.27707 575.1575,165.27707"

-       id="path2285" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 633.74634,167.29737 C 667.08138,167.29737 667.08138,167.29737 667.08138,167.29737"

-       id="path2287" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 224.63456,235.98775 C 259.9899,235.98775 259.9899,235.98775 259.9899,235.98775"

-       id="path2289" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 403.43156,218.81515 L 412.52294,218.81515 L 412.52294,164.26692 L 439.79706,165.27707"

-       id="path2293" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 405.45187,254.17049 L 420.60416,254.17049 L 420.60416,250.12988 L 440.80721,251.14004"

-       id="path2295" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 404.44172,288.51568 L 419.59401,288.51568 L 419.59401,332.96239 L 225.64471,334.9827 L 226.65486,395.59185 L 262.01021,395.59185"

-       id="path2297" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 501.41636,249.11973 L 520.60926,249.11973 L 518.58895,377.4091 L 567.07628,377.4091"

-       id="path2299" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 625.66512,376.39895 L 660.01031,376.39895"

-       id="path2301" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 806.48243,359.22636 L 834.7667,359.22636 L 835.77685,309.72888 L 864.06112,308.71873"

-       id="path2303" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 807.49258,404.68322 L 840.82762,404.68322 L 840.82762,388.52078 L 864.06112,388.52078"

-       id="path2307" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 807.49258,455.19085 L 837.79716,455.19085 L 837.79716,467.31268 L 864.06112,467.31268"

-       id="path2309" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 805.47228,502.66802 L 833.75655,502.66802 L 833.75655,545.09443 L 865.07128,545.09443"

-       id="path2311" />

-    <rect

-       style="opacity:0.35555558;fill:#9a8787;fill-opacity:1;stroke:#261c1c;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2313"

-       width="87.14286"

-       height="77.14286"

-       x="17.142859"

-       y="192.66591"

-       rx="10.859112" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 102.85714,235.52305 L 164.28571,235.52305"

-       id="path2327" />

-  </g>

-</svg>

diff --git a/java/sca-contrib/demos/bigbank/build-dojo.xml b/java/sca-contrib/demos/bigbank/build-dojo.xml
deleted file mode 100644
index 9d282c2dd2..0000000000
--- a/java/sca-contrib/demos/bigbank/build-dojo.xml
+++ /dev/null
@@ -1,92 +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 name="DojoZipInstaller">
-	
-
-    <property name="dojo.version" value="1.0.0"/>
-    <property name="unpack.location" value="${basedir}/src/main/resources/web/dojo"/>
-	
-
-    <target name="check-dojo-installed">
-        <condition property="already.installed" >
-            <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-        </condition>
-        <condition property="maven.suffix" value="">
-            <os family="unix"/>
-        </condition>
-        <condition property="maven.suffix" value=".bat">
-            <os family="windows"/>
-        </condition>
-    </target>
-	
-
-    <target name="check-dojo-unpacked">
-        <condition property="already.unpacked" >
-            <available file="${unpack.location}"/>
-        </condition>
-    </target>
-
-    <target name="install-dojo" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
-            <arg line="install:install-file -DgroupId=dojo  -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"/>
-        </exec>
-    </target>
-
-    <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" 
-              tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-    </target>
-	
-
-    <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">
-        <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
-        <mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
-        <unzip src="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"
-               dest="${basedir}/target/dojo-unpack-temp/"
-               overwrite="false">
-            <patternset>
-                <include name="dojo-release-${dojo.version}/dojo/**"/>
-                <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/>
-                <include name="dojo-release-${dojo.version}/dijit/**"/>
-                <exclude name="dojo-release-${dojo.version}/dojox/**"/>
-                <exclude name="dojo-release-${dojo.version}/util/**"/>
-            </patternset>
-        </unzip>
-        <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}"
-              tofile="${unpack.location}"
-              verbose="true"/>
-        <delete dir="${basedir}/target/dojo-unpack-temp/"/>
-    </target>
-	
-
-    <target name="clean-dojo-files">
-        <delete dir="${unpack.location}"/>
-    </target>
-</project>
diff --git a/java/sca-contrib/demos/bigbank/build.xml b/java/sca-contrib/demos/bigbank/build.xml
deleted file mode 100644
index 046aadd228..0000000000
--- a/java/sca-contrib/demos/bigbank/build.xml
+++ /dev/null
@@ -1,84 +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 name="bigbank-account" default="run">
-    <property name="settings.localRepository" value="./target/repo" />
-    <property name="artifactId" value="demo-bigbank" />	
-    <property name="test.class" value="bigbank.demo.BigBankServer" />
-	
-    <path id="test.classpath">
-    	<pathelement location="target/classes"/>
-    	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>    	
-        <pathelement location="../bigbank-account/target/demo-bigbank-account.jar"/>    	
-    </path>
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-        <mkdir dir="target/classes/web"/>
-    	<mkdir dir="target/repo"/>
-    </target>
-	
-    <target name="dojo" depends="init">
-        <ant antfile="./build-dojo.xml" target="install-dojo-nomaven">
-          <property name="localRepository" value="${settings.localRepository}"/>
-        </ant>
-        
-        <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-          <property name="localRepository" value="${settings.localRepository}"/>
-          <property name="artifactId" value="${artifactId}"/>
-        </ant>
-    </target>
-
-
-    <target name="compile" depends="dojo">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-                <pathelement location="../bigbank-account/target/demo-bigbank-account.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/demo-bigbank.jar" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>		
-	
-    <target name="run" depends="compile">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <path refid="test.classpath"/>
-            </classpath>
-        </java>    	
-    </target>
-
-    <target name="clean">
-		<delete quiet="true" includeemptydirs="true">
-			<fileset dir="target" />
-		</delete>
-	</target>
-</project>
diff --git a/java/sca-contrib/demos/bigbank/pom.xml b/java/sca-contrib/demos/bigbank/pom.xml
deleted file mode 100644
index d9946b0a09..0000000000
--- a/java/sca-contrib/demos/bigbank/pom.xml
+++ /dev/null
@@ -1,201 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-demos</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>demo-bigbank</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA BigBank Demo</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-            <version>1.5.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>demo-bigbank-account</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-            <finalName>demo-bigbank</finalName>
-            <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                    
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-                
-                    <executions>
-                        <execution> 
-                            <id>install-dojo</id>                       
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <tasks>
-                                    <ant antfile="./build-dojo.xml" target="install-dojo">
-                                        <property name="localRepository" value="${settings.localRepository}"/>
-                                    </ant>
-                                </tasks>
-                            </configuration>
-                        </execution>
-                        <execution> 
-                            <id>copy-dojo-files</id>                       
-                            <phase>generate-resources</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <tasks>
-                                    <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-                                        <property name="localRepository" value="${settings.localRepository}"/>
-                                        <property name="artifactId" value="${artifactId}"/>
-                                    </ant>
-                                </tasks>
-                            </configuration>
-                        </execution>
-                        <execution> 
-                            <id>clean-dojo-files</id>                       
-                            <phase>clean</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <tasks>
-                                    <ant antfile="./build-dojo.xml" target="clean-dojo-files">
-                                        <property name="localRepository" value="${settings.localRepository}"/>
-                                        <property name="artifactId" value="${artifactId}"/>
-                                    </ant>
-                                </tasks>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>            
-                </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/AccountService.java b/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/AccountService.java
deleted file mode 100644
index 951cd175d3..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/AccountService.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 bigbank.account;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * @version $$Rev$$ $$Date$$
- */
-
-@Remotable
-public interface AccountService {
-
-    public double getAccountReport(String customerID);
-
-}
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
deleted file mode 100644
index 4cff2b7966..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ /dev/null
@@ -1,99 +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 bigbank.account;
-
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import stockquote.StockQuoteService;
-import bigbank.account.checking.CheckingAccountDetails;
-import bigbank.account.checking.CheckingAccountService;
-import bigbank.account.savings.SavingsAccountDetails;
-import bigbank.account.savings.SavingsAccountService;
-import bigbank.account.stock.StockAccountDetails;
-import bigbank.account.stock.StockAccountService;
-import calculator.CalculatorService;
-
-/**
- * @version $$Rev$$ $$Date$$
- */
-
-@Service(AccountService.class)
-public class AccountServiceImpl implements AccountService {
-
-    @Reference
-    protected SavingsAccountService savingsAcService;
-    
-    @Reference 
-    protected CheckingAccountService checkingAcService;
-    
-    @Reference
-    protected StockAccountService stockAcService;
-    
-    @Reference
-    protected StockQuoteService stockQuoteService;
-    
-    @Reference
-    protected CalculatorService calculatorService;
-    
-    @Property
-    protected String currency;
-
-    public double getAccountReport(String customerID) {
-
-        // Get the checking, savings and stock accounts from the AccountData
-        // service component
-        CheckingAccountDetails checking = null;
-        try {
-            checking = checkingAcService.getAccountDetails(customerID);
-            System.out.println("Checking account: " + checking);
-
-            SavingsAccountDetails savings = savingsAcService.getAccountDetails(customerID);
-            System.out.println("Savings account: " + savings);
-
-            StockAccountDetails stock = stockAcService.getAccountDetails(customerID);
-            System.out.println("Stock account: " + stock);
-        
-            // Get the stock price in USD
-            double price = stockQuoteService.getQuote(stock.getSymbol());
-            System.out.println("Stock price for " + stock.getSymbol() + ": " + price);
-        
-            // Convert to the configured currency
-            if (currency.equals("EURO")) {
-                
-                // Use our fancy calculator service to convert to the target currency
-                price = calculatorService.multiply(price, 0.70);
-                
-                System.out.println("Converted to " + currency + ": " + price);
-            }
-            
-            // Calculate the value of the stock account
-            double stockValue = price * stock.getQuantity(); 
-            
-            // Calculate the total balance of all accounts and return it
-            double balance = checking.getBalance() + savings.getBalance() + stockValue;
-            
-            return balance;
-        } catch ( Throwable e ) {
-            e.printStackTrace();
-            return 0;
-        }
-    }
-}
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
deleted file mode 100644
index b8aff2a3b1..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
+++ /dev/null
@@ -1,70 +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 bigbank.account.feed;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import bigbank.account.AccountService;
-
-/**
- * @version $$Rev$$ $$Date$$
- */
-
-@Service(Collection.class)
-public class AccountFeedImpl implements Collection<String, String> {
-
-    @Reference
-    protected AccountService accountService;
-    
-    public Entry<String, String>[] getAll() {
-
-        // Add the Account report entry 
-        String report = get("1234");
-        Entry<String, String> entry = new Entry<String, String>("1234", report);
-
-        return new Entry[] { entry } ;
-    }
-
-    public String get(String id) {
-
-        // Get the account report for the specified customer ID
-        double balance = accountService.getAccountReport(id); 
-        String report = Double.toString(balance);
-        
-        return report;
-    }
-
-    public void delete(String key) throws NotFoundException {
-    }
-
-    public String post(String key, String item) {
-        return null;
-    }
-
-    public void put(String key, String item) throws NotFoundException {
-    }
-
-    public Entry<String, String>[] query(String queryString) {
-        return null;
-    }
-}
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java b/java/sca-contrib/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
deleted file mode 100644
index a7fa5ecc22..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ /dev/null
@@ -1,50 +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 bigbank.client;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import bigbank.account.AccountService;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class BigBankClient {
-
-    public static void main(String[] args) throws Exception {
-
-        SCADomain domain = SCADomain.newInstance("BigBank.composite");
-
-        AccountService accountService = domain.getService(AccountService.class, "AccountServiceComponent");
-
-        String customerID = "1234";
-
-        System.out.println("Calling account service for customer: " + customerID);
-        System.out.println();
-        double balance = accountService.getAccountReport(customerID);
-
-        System.out.println();
-        System.out.println("Balance: " + balance);
-
-        domain.close();
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java b/java/sca-contrib/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
deleted file mode 100644
index 05360e07a5..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
+++ /dev/null
@@ -1,130 +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 bigbank.demo;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-import bigbank.account.savings.SavingsAccountService;
-
-
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class BigBankServer {
-
-    public static void main(String[] args) throws Exception {
-        long timeout = -1L;
-        if (args.length > 0) {
-            timeout = Long.parseLong(args[0]);
-        }
-        
-        System.out.println("Starting the Sample SCA BigBank server...");
-        ClassLoader cl = BigBankServer.class.getClassLoader();
-        EmbeddedSCADomain domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        //Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-        
-        URL javaContribURL = getContributionURL(SavingsAccountService.class);
-        Contribution bigbankAcContribution = contributionService.contribute("http://bigbank-account", javaContribURL, false);
-        for (Composite deployable : bigbankAcContribution.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-        
-        URL bigbankContribUrl = getContributionURL(BigBankServer.class);
-        Contribution bigbankContribution = contributionService.contribute("http://bigbank", bigbankContribUrl, false);
-        for (Composite deployable : bigbankContribution.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-
-
-        //Start Components from  composite
-        for (Composite deployable : bigbankAcContribution.getDeployables()) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }
-
-        for (Composite deployable : bigbankContribution.getDeployables()) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }
-        
-        if (timeout < 0) {
-            System.out.println("Press Enter to Exit...");
-            System.in.read();
-        } else {
-            Thread.sleep(timeout);
-        }
-        
-        contributionService.remove("http://bigbank-account");
-        contributionService.remove("http://bigbank");
-
-        // Stop Components from  composite
-        for (Composite deployable : bigbankContribution.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }
-
-        domain.stop();
-
-        domain.close();
-        
-        
-        /*SCADomain domain = SCADomain.newInstance("BigBank.composite");
-
-        if (timeout < 0) {
-            System.out.println("Press Enter to Exit...");
-            System.in.read();
-        } else {
-            Thread.sleep(timeout);
-        }
-
-        domain.close();*/
-        
-        System.out.println("Bye");
-    }
-    
-    private static URL getContributionURL(Class<?> cls) throws MalformedURLException {
-        String flag = "/" + cls.getName().replace('.', '/') + ".class";
-        URL url = cls.getResource(flag);
-        String root = url.toExternalForm();
-        root = root.substring(0, root.length() - flag.length() + 1);
-        if (root.startsWith("jar:") && root.endsWith("!/")) {
-            root = root.substring(4, root.length() - 2);
-        }
-        url = new URL(root);
-        return url;
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java b/java/sca-contrib/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
deleted file mode 100644
index 6d3b547939..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
+++ /dev/null
@@ -1,51 +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 bigbank.security;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.apache.ws.security.WSPasswordCallback;
-
-/**
- * Sample userid passwd generation class 
- */
-public class BigbankPasswordCallbackHandler implements CallbackHandler {
-
-    public void handle(Callback[] callbacks) throws IOException,
-            UnsupportedCallbackException {
-    	for (int i = 0; i < callbacks.length; i++) {
-            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
-            //System.out.println("*** Getting password for user ...."  + pwcb.getIdentifer() + " & " + pwcb.getKey());
-            if ( pwcb.getUsage() == WSPasswordCallback.SIGNATURE ) {
-                System.out.println("*** Calling BIG-BANK Passwd Handler for SIGNING...." );
-                pwcb.setPassword("bbservice");
-            } else if ( pwcb.getUsage() == WSPasswordCallback.USERNAME_TOKEN ) {
-                if ( pwcb.getIdentifer().equals("bbaservice")) {
-                    System.out.println("*** Calling BIG-BANK Passwd Handler for setting AUTHENTICATION password...." );
-                    pwcb.setPassword("bbaservice");
-                }
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/demos/bigbank/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index c89043276e..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,34 +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 calculator;
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/stockquote/StockQuoteService.java b/java/sca-contrib/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
deleted file mode 100644
index 5d3366ae00..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
+++ /dev/null
@@ -1,29 +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 stockquote;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the StockQuote service.
- */
-@Remotable
-public interface StockQuoteService {
-    public double getQuote(String symbol);
-}
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/BigBank.composite b/java/sca-contrib/demos/bigbank/src/main/resources/BigBank.composite
deleted file mode 100644
index 11591308b4..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/resources/BigBank.composite
+++ /dev/null
@@ -1,85 +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:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    targetNamespace="http://bigbank"
-    xmlns:bb="http://bigbank"
-    xmlns:bbsv="http://bigbank/savings"
-    xmlns:bbst="http://bigbank/stock"
-    xmlns:bbck="http://bigbank/checkings"
-    name="BigBank">
-
-    <component name="AccountServiceComponent">
-        <implementation.java class="bigbank.account.AccountServiceImpl"/>
-
-        <service name="AccountService">
-            <tuscany:binding.jsonrpc uri="http://localhost:8085/AccountJSONService"/>
-            <binding.ws wsdlElement="http://bigbank#wsdl.port(AccountService/AccountServiceSoap)"/>
-            <binding.sca/>
-        </service>
-
-        <reference name="savingsAcService" target="SavingsAccountServiceComponent"/>
-
-        <reference name="checkingAcService" requires="authentication">
-            <binding.ws uri="http://localhost:8085/services/CheckingAcWebService"/>
-        </reference>
-
-        <reference name="stockAcService" target="StockAccountServiceComponent"/>
-        
-        <reference name="calculatorService">
-            <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
-        </reference>
-        <reference name="stockQuoteService" requires="integrity">
-            <binding.ws uri="http://localhost:8081/services/StockQuoteWebService"/>
-        </reference>
-
-        <property name="currency">EURO</property>
-    </component>
-
-    <component name="SavingsAccountServiceComponent">
-        <implementation.composite name="bbsv:SavingsAccountDept"/>
-    </component>
-
-    <component name="CheckingAccountServiceComponent">
-        <implementation.composite name="bbck:CheckingsAccountDept"/>
-    </component>
-
-    <component name="StockAccountServiceComponent">
-        <implementation.composite name="bbst:StockAccountDept"/>
-    </component>
-
-    <component name="AccountFeedComponent">
-        <implementation.java class="bigbank.account.feed.AccountFeedImpl"/>
-        <service name="Collection">
-            <tuscany:binding.rss uri="http://localhost:8085/rss"/>
-            <tuscany:binding.atom uri="http://localhost:8085/atom"/>
-        </service>
-        <reference name="accountService" target="AccountServiceComponent"/>
-    </component>
-
-    <component name="WebResourceComponent">
-        <tuscany:implementation.resource location="web"/>
-        <service name="Resource">
-            <tuscany:binding.http uri="http://localhost:8085/"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 154992c843..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,36 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bigbank"
-    xmlns:bb="http://bigbank">
-
-   <deployable composite="bb:BigBank"/>
-
-   <import.java package="bigbank.account.checking"/>
-   <import.java package="bigbank.account.savings"/>
-   <import.java package="bigbank.account.stock"/>
-   
-   <import namespace="http://bigbank/checkings"/>
-   <import namespace="http://bigbank/savings"/>
-   <import namespace="http://bigbank/stock"/>
-   
-   <import.resource uri="definitions.xml"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/bigbank.jks b/java/sca-contrib/demos/bigbank/src/main/resources/bigbank.jks
deleted file mode 100644
index e6294d85f7..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/resources/bigbank.jks
+++ /dev/null
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/definitions.xml b/java/sca-contrib/demos/bigbank/src/main/resources/definitions.xml
deleted file mode 100644
index 8654151d82..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 			targetNamespace="http://bigbank"
- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-			xmlns:chk="http://bigbank/checkings"
- 			xmlns:bb="http://bigbank">
-
- <!-- WS Security POLICY SETS -->
- <sca:policySet name="wsIntegrityPolicy"
- 	provides="integrity"
- 	appliesTo="sca:binding.ws">
- 	<tuscany:wsConfigParam>
- 		<parameter name="InflowSecurity">
-		    <action>
-		        <items>Timestamp Signature</items>
-		        <signaturePropFile>security.properties</signaturePropFile>
-		    </action>
-		</parameter>
- 		<parameter name="OutflowSecurity">
-      		<action>
-        		<items>Timestamp Signature</items>
-        		<user>bbservice</user>
-        		<signaturePropFile>security.properties</signaturePropFile>
-        		<passwordCallbackClass>bigbank.security.BigbankPasswordCallbackHandler</passwordCallbackClass>
-        		<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
-      		</action>
-    	</parameter>
- 	</tuscany:wsConfigParam>
- </sca:policySet>
- 
- <sca:policySet name="wsClientAuthenticationPolicy"
- 	provides="authentication"
- 	appliesTo="sca:reference/sca:binding.ws">
- 	<tuscany:wsConfigParam>
- 		<parameter name="OutflowSecurity">
- 			<action>
- 				<items>UsernameToken</items>
- 				<user>bbaservice</user>
-				<passwordCallbackClass>bigbank.security.BigbankPasswordCallbackHandler</passwordCallbackClass>
-                <passwordType>PasswordText</passwordType>
-               </action>
-    	</parameter>
- 	</tuscany:wsConfigParam>
- </sca:policySet>
-</sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/security.properties b/java/sca-contrib/demos/bigbank/src/main/resources/security.properties
deleted file mode 100644
index d1b489acbb..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/resources/security.properties
+++ /dev/null
@@ -1,20 +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.
-## ---------------------------------------------------------------------------
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=bbakeystore
-org.apache.ws.security.crypto.merlin.file=bigbank.jks
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/web/AccountJSON.html b/java/sca-contrib/demos/bigbank/src/main/resources/web/AccountJSON.html
deleted file mode 100644
index 9f4368443f..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/resources/web/AccountJSON.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<html>
-<!--
- * 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.    
- -->
-<head>
-<title>Tuscany JSON-RPC BigBank Client</TITLE>
-
-<script type="text/javascript">
-        var djConfig = {isDebug: true,debugContainerId: "dojoDebug" };
-		djConfig.usePlainJson=true ;
-        //djConfig.debugAtAllCosts = true;
-    </script>
-<script type="text/javascript" src="dojo/dojo/dojo.js"> 
-    </script>
-<script type="text/javascript" src="dojo/dijit/dijit.js"> 
-    </script>
-
-<script type="text/javascript">
-    	dojo.require("dijit.form.Button");
-    	dojo.require("dojo.rpc.JsonService");    	
-    </script>
-
-<link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-
-<body>
-
-<table>
-	<tr>
-		<th colspan="2">Tuscany JSON-RPC BigBank Client</th>
-	</tr>
-	<tr>
-		<td colspan="2">
-		<p>This example uses the <a href="http://dojotoolkit.org/">Dojo
-		Toolkit</a> to create a JavaScript object <code>accountService</code> for
-		the service at <b>http://localhost:8080/AccountJSONService</b> using <a
-			href="http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book9">Dojo's
-		RPC classes</a> and providing them with <a href="AccountJSONService?smd">http://localhost:8080/AccountJSONService?smd</a>
-		for <a href="http://dojo.jot.com/SMD">Simple Method Description
-		(SMD)</a> input.</p>
-		<p>It then creates a Dojo button that will envoke the <code>getAccountReport</code>
-		method of the <code>accountService</code> object.</p>
-	</tr>
-	<tr>
-		<td>Request</td>
-		<td>Response</td>
-	</tr>
-	<tr>
-		<td><br>
-		<button id="myaccount" dojoType="dijit.form.Button"
-			onClick='accountService.getAccountReport("Customer_01").addCallback(contentCallBack);'>getAccountReport("Customer_01")</button>
-		<br>
-		</td>
-		<td>
-		<div id="ReturnedContent">None Yet.</div>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-		<div id="dojoDebug">Dojo Debug:</div>
-		</td>
-	</tr>
-</table>
-
-<script type="text/javascript">
-    
-    	function contentCallBack(result) {
-    		var handlerNode = document.getElementById("ReturnedContent");
-    		handlerNode.innerHTML = "<p>" + result + "</p>" ;
-    	}
-    
-    	var accountService = new dojo.rpc.JsonService("AccountJSONService?smd");
-    
-    </script>
-
-</body>
-</html>
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/web/style.css b/java/sca-contrib/demos/bigbank/src/main/resources/web/style.css
deleted file mode 100644
index 1071583264..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/resources/web/style.css
+++ /dev/null
@@ -1,22 +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.
- */
-* { font-family: arial; }
-
-table, th, td { border: 2px solid blue; border-collapse: collapse; }
-th { color: white; background-color: blue; }
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl b/java/sca-contrib/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index ac4d987a57..0000000000
--- a/java/sca-contrib/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
+++ /dev/null
@@ -1,91 +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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://bigbank"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://bigbank"
-	name="AccountService">
-
-	<wsdl:types>
-		<xsd:schema
-			targetNamespace="http://bigbank"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-			<xsd:element name="getAccountReport">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="getAccountReportResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:double" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-		</xsd:schema>
-	</wsdl:types>
-
-	<wsdl:message name="getAccountReportRequest">
-		<wsdl:part element="tns:getAccountReport"
-			name="getAccountReportRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="getAccountReportResponse">
-		<wsdl:part element="tns:getAccountReportResponse"
-			name="getAccountReportResponse" />
-	</wsdl:message>
-
-	<wsdl:portType name="AccountService">
-		<wsdl:operation name="getAccountReport">
-			<wsdl:input message="tns:getAccountReportRequest" />
-			<wsdl:output message="tns:getAccountReportResponse" />
-		</wsdl:operation>
-	</wsdl:portType>
-
-	<wsdl:binding name="AccountServiceSoap" type="tns:AccountService">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getAccountReport">
-			<soap:operation
-				soapAction="" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-
-	<wsdl:service name="AccountService">
-		<wsdl:port binding="tns:AccountServiceSoap"
-			name="AccountServiceSoap">
-			<soap:address
-				location="http://localhost:8082/services/AccountWebService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/java/sca-contrib/demos/bigbank/src/test/java/test/BigBankTestCase.java b/java/sca-contrib/demos/bigbank/src/test/java/test/BigBankTestCase.java
deleted file mode 100644
index 3b7c5ef2ad..0000000000
--- a/java/sca-contrib/demos/bigbank/src/test/java/test/BigBankTestCase.java
+++ /dev/null
@@ -1,33 +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 test;
-
-import junit.framework.TestCase;
-
-import bigbank.demo.BigBankServer;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BigBankTestCase extends TestCase {
-
-    public void testServer() throws Exception {
-        BigBankServer.main(new String[] {"1000"});
-    }
-}
diff --git a/java/sca-contrib/demos/load-balancing-webapp/LICENSE b/java/sca-contrib/demos/load-balancing-webapp/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/demos/load-balancing-webapp/NOTICE b/java/sca-contrib/demos/load-balancing-webapp/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/demos/load-balancing-webapp/README b/java/sca-contrib/demos/load-balancing-webapp/README
deleted file mode 100644
index b7bbb64b1a..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/README
+++ /dev/null
@@ -1,76 +0,0 @@
-WebApp Load Balancing Demo
-===========================
-
-Demonstrates balancing load acoss SCA services by deploying an SCA composite
-to two tomcat servers in a cluster. The tomcat servers sit behind an Apache
-server which directs load to one or other tomcat server based on a set of rules.
-
-The mvn pom distributed with this sample will download, install and configure
-two Tomcat servers automatically to act as workers. You need to install the 
-Apache web server and configure it manually.
-
-1 - Install and configure the Tomcat workers
-
-mvn
-
-This results in two tomcat servers at
-
-target/tomcat-8085
-target/tomcat-8086
-
-2 - Install and configure the Apache server to balance load
-
-In this case we've chosen to use the native JK connector. There are several 
-resources that tell you how to configure Apache for load balancing Tomcat with 
-the JK connector. For example, 
-
-http://tomcat.apache.org/connectors-doc/webserver_howto/apache.html
-http://www.crazysquirrel.com/computing/debian/servers/tomcat55.jspx
-
-Here is a high level summary 
-
-Download the latest version of Apache 2.2 (this demo was built with Apache 2.2.6)
-  http://httpd.apache.org/
-  Install in a local director called, say, apache
-  
-Download the mod_jk module (in binary form if you can)
-  http://tomcat.apache.org/download-connectors.cgi
-  Install it in apache/modules
-  
-Configure the mod_jk module
-  Copy src/test/resources/apache-80/conf/workers.properties to apache/conf
-  Append the contents of src/test/resources/apache-80/conf/httpd.conf to apache/conf/httpf.conf
-
-3 - Start the apache and tomcat servers
-
-In three command prompts
-
-cd target/tomcat-8085
-bin/catalina run
-
-cd target/tomcat-8086
-bin/catalina run
-
-cd apache
-bin/httpd
-
-4 - Run the client
-
-run the LanchClient program - TBD - need a script
-
-5 - Result
-
-The client will make 10 calls to the SCA service described in the helloworldws.composite that
-is part of the webapp deployed to the tomcat servers. You will see the result of this 
-service call reported at the client in the form 
-
-Called getGreetings
-Hello World 6
-
-If you look at the Tomcat consoles you will see that each server deals with half the requests 
-as the load is balanced equally between the two of them.
-
-
-
-
-
diff --git a/java/sca-contrib/demos/load-balancing-webapp/build-tomcat.xml b/java/sca-contrib/demos/load-balancing-webapp/build-tomcat.xml
deleted file mode 100644
index 7e1dc4b0e9..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/build-tomcat.xml
+++ /dev/null
@@ -1,96 +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 name="TomcatZipInstaller">
-    
-	<!--property name="tomcat.series" value="6"/>
-    <property name="tomcat.version" value="6.0.16"/-->
-	<property name="tomcat.series" value="5"/>
-	<property name="tomcat.version" value="5.5.26"/>
-    <property name="unpack.location" value="${basedir}/target/tomcat"/>
-	<property name="repo.location" value="${basedir}/target/repo"/>
-    
-    <target name="check-tomcat-downloaded">
-        <condition property="already.downloaded" >
-            <available file="${repo.location}/apache-tomcat-${tomcat.version}.zip"/>
-        </condition>
-        <condition property="maven.suffix" value="">
-            <os family="unix"/>
-        </condition>
-        <condition property="maven.suffix" value=".bat">
-            <os family="windows"/>
-        </condition>
-    </target>
-    
-    <target name="download-tomcat" depends="check-tomcat-downloaded" unless="already.downloaded">
-        <mkdir dir="${repo.location}"/>
-        <get src="http://www.apache.org/dist/jakarta/tomcat-${tomcat.series}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip"
-            dest="${repo.location}/apache-tomcat-${tomcat.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-    </target>
-  
-    <target name="check-tomcat-unpacked">
-        <condition property="already.unpacked" >
-            <available file="${unpack.location}-${port}"/>
-        </condition>
-    </target>
-
-    <target name="unpack-tomcat" depends="check-tomcat-downloaded, check-tomcat-unpacked" unless="already.unpacked">
-        <fail message="tomcat zip file not downloaded" unless="already.downloaded"/>
-        <mkdir dir="${unpack.location}-${port}/"/>
-        <unzip src="${repo.location}/apache-tomcat-${tomcat.version}.zip"
-               dest="."
-               overwrite="false">
-        </unzip>
-    	<move file="apache-tomcat-${tomcat.version}"
-    	      tofile="${unpack.location}-${port}/"
-    	      overwrite="false"
-    	      verbose="false"/>
-    	<delete dir="apache-tomcat-${tomcat.version}"/>
-    </target>
-	
-	<target name="configure-tomcat" depends="check-tomcat-downloaded, check-tomcat-unpacked">
-        <fail message="tomcat zip file not downloaded" unless="already.downloaded"/>
-		<fail message="tomcat zip file not unpacked" unless="already.unpacked"/>
-        <copy todir="${unpack.location}-${port}/"
-        	  overwrite="true"
-              verbose="false">
-            <fileset dir="${basedir}/src/test/resources/tomcat-${port}"/>
-        </copy>
-		<mkdir dir="${unpack.location}-${port}/webapps/balancer/WEB-INF/classes/org"/>
-        <copy todir="${unpack.location}-${port}/webapps/balancer/WEB-INF/classes/org"
-              overwrite="true"
-              verbose="false">
-            <fileset dir="${basedir}/target/classes/org"/>
-        </copy>	
-		
-    </target>
-	
-    <target name="copy-webapp" depends="check-tomcat-downloaded, check-tomcat-unpacked">
-        <fail message="tomcat zip file not downloaded" unless="already.downloaded"/>
-        <fail message="tomcat zip file not unpacked" unless="already.unpacked"/>
-        <copy file="${basedir}/target/demo-load-balancing-webapp.war"
-              todir="${unpack.location}-${port}/webapps/"
-              overwrite="true"
-              verbose="false">
-        </copy>         
-    </target>	
-
-</project>
diff --git a/java/sca-contrib/demos/load-balancing-webapp/build.xml b/java/sca-contrib/demos/load-balancing-webapp/build.xml
deleted file mode 100644
index b84f85616e..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/build.xml
+++ /dev/null
@@ -1,125 +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.    
--->
-<project name="calculator" >
-	<property name="test.jar"   value="sample-calculator-distributed.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <!--target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target-->
-	
-    <!--target name="runDomain">
-        <java classname="node.LaunchDomain"
-              fork="true">
-            <classpath>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
-            </classpath>    	        	
-        </java>
-    </target-->
-	
-    <target name="runClient">
-        <java classname="node.LaunchCalculatorNodeA"
-              fork="true">
-            <classpath>
-                <pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-                <pathelement path="target/${test.jar}"/>
-                <pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-                <pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
-                <pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
-            </classpath>                    
-        </java>
-    </target>
-	
-    <target name="run8085">
-        <java classname="node.LaunchCalculatorNodeA"
-              fork="true">
-            <classpath>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
-            </classpath>     	        	
-        </java>
-    </target>
-	
-    <target name="run8086">
-        <java classname="node.LaunchCalculatorNodeB"
-              fork="true">
-            <classpath>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
-            </classpath>      	
-        </java>
-    </target>	
-	
-    <target name="run8087">
-        <java classname="node.LaunchCalculatorNodeC"
-              fork="true">
-            <classpath>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
-            </classpath>      	
-        </java>
-    </target>	
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>	
-	
-	
-</project>
diff --git a/java/sca-contrib/demos/load-balancing-webapp/pom.xml b/java/sca-contrib/demos/load-balancing-webapp/pom.xml
deleted file mode 100644
index cdd6727460..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/pom.xml
+++ /dev/null
@@ -1,349 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-demos</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>demo-load-balancing-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA WebApp Load Balancing Demo</name>
-    <description>A sample SCA application that is deployed as a webapp to a cluster of tomcat servers</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>tomcat</groupId>
-            <artifactId>catalina-balancer</artifactId>
-            <version>5.5.12</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>provided</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <properties>
-       <http.port>8085</http.port>
-       <http.base>http://127.0.0.1:${http.port}</http.base>
-       <tomcat.home>${env.CATALINA_HOME}</tomcat.home>
-    </properties>    
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       
-       <plugins>
-       
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>download-tomcat</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-tomcat.xml" target="download-tomcat">
-                                    
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <!--execution>
-                        <id>unpack-tomcat-8085</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-tomcat.xml" target="unpack-tomcat">
-                                  <property name="port" value="8085" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution-->
-                    <execution>
-                        <id>unpack-tomcat-8086</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-tomcat.xml" target="unpack-tomcat">
-                                  <property name="port" value="8086" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>unpack-tomcat-8087</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-tomcat.xml" target="unpack-tomcat">
-                                  <property name="port" value="8087" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <!--execution>
-                        <id>configure-tomcat-8085</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-tomcat.xml" target="configure-tomcat">
-                                  <property name="port" value="8085" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution-->   
-                    <execution>
-                        <id>configure-tomcat-8086</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-tomcat.xml" target="configure-tomcat">
-                                  <property name="port" value="8086" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>  
-                    <execution>
-                        <id>configure-tomcat-8087</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-tomcat.xml" target="configure-tomcat">
-                                  <property name="port" value="8087" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>  
-                    
-                    <execution>
-                        <id>copy-webapp-8086</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-tomcat.xml" target="copy-webapp">
-                                  <property name="port" value="8086" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>  
-                    <execution>
-                        <id>copy-webapp-8087</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-tomcat.xml" target="copy-webapp">
-                                  <property name="port" value="8087" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>                     
-                </executions>
-            </plugin>             
-           <!--plugin>
-               <groupId>org.apache.tuscany.sca</groupId>
-               <artifactId>tuscany-maven-web-junit</artifactId>
-               <version>2.0-SNAPSHOT</version>
-               <executions>
-                   <execution>
-                       <id>generate-web-xml</id>
-                       <phase>process-resources</phase>
-                       <goals>
-                           <goal>generate</goal>
-                       </goals>
-                   </execution>
-                   <execution>
-                       <id>web-junit-test</id>
-                       <configuration>
-                           <url>${http.base}/${project.build.finalName}/junit?op=runAll</url>
-                       </configuration>
-                       <phase>integration-test</phase>
-                       <goals>
-                           <goal>test</goal>
-                       </goals>
-                   </execution>
-               </executions>
-           </plugin-->
-           <!--plugin>
-               <groupId>org.codehaus.cargo</groupId>
-               <artifactId>cargo-maven2-plugin</artifactId>
-               <executions>
-                   <execution>
-                       <id>start-container</id>
-                       <phase>pre-integration-test</phase>
-                       <goals>
-                           <goal>start</goal>
-                       </goals>
-                   </execution>
-                   <execution>
-                       <id>stop-container</id>
-                       <phase>post-integration-test</phase>
-                       <goals>
-                           <goal>stop</goal>
-                       </goals>
-                   </execution>
-               </executions>
-               <configuration>
-                   <container>
-                       <containerId>tomcat5x</containerId>
-                       <type>runtime</type>
-                       <home>${tomcat.home}</home>
-                       <systemProperties>
-                           <org.apache.commons.logging.Log>
-                               org.apache.commons.logging.impl.SimpleLog
-                           </org.apache.commons.logging.Log>
-                       </systemProperties>
-                   </container>
-                   <wait>false</wait>
-                   <configuration>
-                       <properties>
-                           <cargo.servlet.port>8085</cargo.servlet.port>
-                       </properties>
-                       <deployables>
-                           <deployable>
-                               <location>${project.build.directory}/${project.build.finalName}.war</location>
-                               <pingURL>${http.base}/${project.build.finalName}/junit?op=list</pingURL>
-                               <type>war</type>
-                           </deployable>
-                       </deployables>
-                       <home>${project.build.directory}/cargo-tomcat</home>
-                   </configuration>
-               </configuration>
-           </plugin-->
-
-     
-           
-          <!--plugin>
-            <groupId>org.codehaus.cargo</groupId>
-            <artifactId>cargo-maven2-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>tomcat-execution</id>
-                <phase>integration-test</phase>
-                <goals>
-                  <goal>install</goal>
-                </goals>
-                <configuration>
-                  <wait>false</wait>
-                  <container>
-                    <containerId>tomcat5x</containerId>
-                    <log>${project.build.directory}/tomcat-8085/cargo.log</log>
-                    <zipUrlInstaller>
-                      <url>http://www.apache.org/dist/jakarta/tomcat-5/v5.5.26/bin/apache-tomcat-5.5.26.zip</url>
-                      <installDir>${project.build.directory}/tomcat-8085</installDir>
-                    </zipUrlInstaller>
-                  </container>
-                  <configuration>
-                    <home>${project.build.directory}/tomcat-8085/container</home>
-                    <properties>
-                      <cargo.servlet.port>8085</cargo.servlet.port>
-                      <cargo.logging>high</cargo.logging>
-                    </properties>
-                  </configuration>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin-->           
-       </plugins>
-   </build>
-
-</project>
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java b/java/sca-contrib/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java
deleted file mode 100644
index 872893945e..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java
+++ /dev/null
@@ -1,57 +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 client;
-
-import java.io.File;
-
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-public class LaunchClient {
-    public static void main(String[] args) throws Exception {
-        
-        SCANode2 node = null;
-        try {
-            
-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-            node = nodeFactory.createSCANode(new File("src/main/resources/client-contribution/helloworldwsclient.composite").toURL().toString(),
-                                             new SCAContribution("TestContribution", 
-                                                                 new File("src/main/resources/client-contribution").toURL().toString()));
-
-            node.start();
-            HelloWorldService helloWorldService = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
-
-            
-            for (int i=0; i < 10; i++){
-                System.out.println(helloWorldService.getGreetings("World "  + i));
-            } 
-            
-            node.stop();
-            
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }        
-    }
-}
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java b/java/sca-contrib/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java
deleted file mode 100644
index 33c37869a3..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java
+++ /dev/null
@@ -1,33 +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 domain;
-
-//import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
-
-/**
- * This server program that loads a composite to provide simple registry function.
- * This server can be replaced with any registry that is appropriate but the components
- * in each node that talk to the registry should be replaced also. 
- */
-public class LaunchDomain {
-    public static void main(String[] args) throws Exception {
- //       DomainManagerLauncher.main(args);
-    }
-
-}
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 23beb7f933..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,35 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(String name) {
-        String message = "Hello " + name;
-        System.err.println(message);
-        return message;
-    }
-
-}
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 513c2e3129..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
-
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java b/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java
deleted file mode 100644
index f3d2fdb2ed..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java
+++ /dev/null
@@ -1,42 +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 helloworld;
-
-/**
- * The HelloWorld service implementation
- */
-public class HelloWorldServiceClient implements HelloWorldService {
-   
-    HelloWorldService helloWorldService;
-
-    public String getGreetings(String name) {
-        System.out.println("Called getGreetings");
-        return helloWorldService.getGreetings(name);
-    }
-
-    public HelloWorldService getHelloWorldService() {
-        System.out.println("Got Injected helloWorldService");
-        return helloWorldService;
-    }
-
-    public void setHelloWorldService(HelloWorldService helloWorldService) {
-        System.out.println("Injected helloWorldService");        
-        this.helloWorldService = helloWorldService;
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java b/java/sca-contrib/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java
deleted file mode 100644
index 5dc1b6671b..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java
+++ /dev/null
@@ -1,96 +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.demos.loadbalancer.rule;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.webapp.balancer.rules.BaseRule;
-
-
-public class RoundRobinRule extends BaseRule {
-    /**
-     * The number of worker nodes that load will  
-     * be balanced across
-     */
-    private int workerCount;
-    
-    private int currentCount = 1;
-
-
-    /**
-     * Sets the worker count.
-     *
-     * @param workerCount The worker count
-     */
-    public void setWorkerCount(int workerCount) {
-        if (workerCount == 0) {
-            throw new IllegalArgumentException(
-                "worker count cannot be 0.");
-        } else {
-            this.workerCount = workerCount;
-        }
-    }
-
-    /**
-     * Returns the worker count.
-     *
-     * @return int The worker count
-     */
-    protected int getWorkerCount() {
-        return workerCount;
-    }
-
-
-
-    /**
-     * @see org.apache.webapp.balancer.Rule#matches(HttpServletRequest)
-     */
-    public boolean matches(HttpServletRequest request) {
-
-        if (currentCount == workerCount){
-            currentCount = 1;
-            return true;
-        } else {
-            currentCount++;
-            return false;
-        }
-    }
-
-    /**
-     * Returns a String representation of this object.
-     *
-     * @return String
-     */
-    public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("[");
-        buffer.append(getClass().getName());
-        buffer.append(": ");
-
-        buffer.append("Worker count: ");
-        buffer.append(getWorkerCount());
-        buffer.append(" / ");
-
-        buffer.append("Redirect URL: ");
-        buffer.append(getRedirectUrl());
-
-        buffer.append("]");
-
-        return buffer.toString();
-    }
-}
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite b/java/sca-contrib/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite
deleted file mode 100644
index 9b6052741e..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite
+++ /dev/null
@@ -1,33 +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://helloworld"
-	xmlns:hw="http://helloworld"
-	name="helloworldwsclient">
-    
-    <component name="HelloWorldClientComponent">
-      <implementation.java class="helloworld.HelloWorldServiceClient"/>
-      <reference name="helloWorldService">
-        <binding.ws uri="http://localhost/demo-load-balancing-webapp/HelloWorldServiceComponent"/>
-      </reference>
-    </component>
-    
-
-</composite>
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 11347004f9..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://helloworld"
-              xmlns:credit="http://helloworld">
-   <deployable composite="tns:helloworldws"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
deleted file mode 100644
index 1ab78d802d..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
+++ /dev/null
@@ -1,32 +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://helloworld"
-	xmlns:hw="http://helloworld"
-    name="helloworldws">
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="helloworld.HelloWorldImpl" />
-	    <service name="HelloWorldService">
-	        <binding.ws/>
-	    </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 8d47ae2207..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    * 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.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-  <display-name>Apache Tuscany Load Balancing Demo</display-name>
-   
-  <filter>
-    <filter-name>tuscany</filter-name> 
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
-  </filter>
-
-  <filter-mapping>
-    <filter-name>tuscany</filter-name> 
-    <url-pattern>/*</url-pattern> 
-  </filter-mapping>    
-
-</web-app>
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf b/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf
deleted file mode 100644
index 37cf284d35..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Load mod_jk module

-# Update this path to match your modules location

-LoadModule    jk_module  modules/mod_jk.so

-

-# Declare the module for <IfModule directive> (remove this line on Apache 2.x)

-# AddModule     mod_jk.c

-# Where to find workers.properties

-# Update this path to match your conf directory location (put workers.properties next to httpd.conf)

-JkWorkersFile conf/workers.properties

-

-# Where to put jk shared memory

-# Update this path to match your local state directory or logs directory

-JkShmFile     logs/mod_jk.shm

-

-# Where to put jk logs

-# Update this path to match your logs directory location (put mod_jk.log next to access_log)

-JkLogFile     logs/mod_jk.log

-

-# Set the jk log level [debug/error/info]

-JkLogLevel    info

-

-# Select the timestamp log format

-JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "

-

-# Send everything for context /examples to worker named worker1 (ajp13)

-# JkMount  /examples/* worker1

-# Send everything for context /* to the router

-JkMount  /* router

diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties b/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties
deleted file mode 100644
index 9228c4fd8e..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-  # Load balancer looks after the workers
-  worker.list=router
-  
-  # The load balacer
-  worker.router.type=lb
-  worker.router.balance_workers=worker1,worker2
-
-  # Set properties for worker1 (ajp13)
-  worker.worker1.type=ajp13
-  worker.worker1.host=localhost
-  worker.worker1.port=8010
-  worker.worker1.lbfactor=1
-
-  # Set properties for worker1 (ajp13)
-  worker.worker2.type=ajp13
-  worker.worker2.host=localhost
-  worker.worker2.port=8011
-  worker.worker2.lbfactor=1
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml b/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml
deleted file mode 100644
index 920fa7b037..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml
+++ /dev/null
@@ -1,391 +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.
--->
-<!-- Example Server Configuration File -->
-<!-- Note that component elements are nested corresponding to their
-     parent-child relationships with each other -->
-
-<!-- A "Server" is a singleton element that represents the entire JVM,
-     which may contain one or more "Service" instances.  The Server
-     listens for a shutdown command on the indicated port.
-
-     Note:  A "Server" is not itself a "Container", so you may not
-     define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-
-<Server port="8005" shutdown="SHUTDOWN">
-
-  <!-- Comment these entries out to disable JMX MBeans support used for the 
-       administration web application -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" />
-  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-  <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
-
-  <!-- Global JNDI resources -->
-  <GlobalNamingResources>
-
-    <!-- Test entry for demonstration purposes -->
-    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-
-    <!-- Editable user database that can also be used by
-         UserDatabaseRealm to authenticate users -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-       description="User database that can be updated and saved"
-           factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-          pathname="conf/tomcat-users.xml" />
-
-  </GlobalNamingResources>
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" (and therefore the web applications visible
-       within that Container).  Normally, that Container is an "Engine",
-       but this is not required.
-
-       Note:  A "Service" is not itself a "Container", so you may not
-       define subcomponents such as "Valves" or "Loggers" at this level.
-   -->
-
-  <!-- Define the Tomcat Stand-Alone Service -->
-  <Service name="Catalina">
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned.  Each Connector passes requests on to the
-         associated "Container" (normally an Engine) for processing.
-
-         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
-         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
-         following the instructions below and uncommenting the second Connector
-         entry.  SSL support requires the following steps (see the SSL Config
-         HOWTO in the Tomcat 5 documentation bundle for more detailed
-         instructions):
-         * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
-           later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
-         * Execute:
-             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
-             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
-           with a password value of "changeit" for both the certificate and
-           the keystore itself.
-
-         By default, DNS lookups are enabled when a web application calls
-         request.getRemoteHost().  This can have an adverse impact on
-         performance, so you can disable it by setting the
-         "enableLookups" attribute to "false".  When DNS lookups are disabled,
-         request.getRemoteHost() will return the String version of the
-         IP address of the remote client.
-    -->
-
-    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
-    <Connector port="8085" maxHttpHeaderSize="8192"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" redirectPort="8443" acceptCount="100"
-               connectionTimeout="20000" disableUploadTimeout="true" />
-    <!-- Note : To disable connection timeouts, set connectionTimeout value
-     to 0 -->
-	
-	<!-- Note : To use gzip compression you could set the following properties :
-	
-			   compression="on" 
-			   compressionMinSize="2048" 
-			   noCompressionUserAgents="gozilla, traviata" 
-			   compressableMimeType="text/html,text/xml"
-	-->
-
-    <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
-    <!--
-    <Connector port="8443" maxHttpHeaderSize="8192"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" disableUploadTimeout="true"
-               acceptCount="100" scheme="https" secure="true"
-               clientAuth="false" sslProtocol="TLS" />
-    -->
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009" 
-               enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
-
-    <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
-    <!-- See proxy documentation for more information about using this. -->
-    <!--
-    <Connector port="8082" 
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" acceptCount="100" connectionTimeout="20000"
-               proxyPort="80" disableUploadTimeout="true" />
-    -->
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host). -->
-
-    <!-- You should set jvmRoute to support load-balancing via AJP ie :
-    <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">         
-    --> 
-         
-    <!-- Define the top level container in our container hierarchy -->
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <!-- The request dumper valve dumps useful debugging information about
-           the request headers and cookies that were received, and the response
-           headers and cookies that were sent, for all requests received by
-           this instance of Tomcat.  If you care only about requests to a
-           particular virtual host, or a particular application, nest this
-           element inside the corresponding <Host> or <Context> entry instead.
-
-           For a similar mechanism that is portable to all Servlet 2.4
-           containers, check out the "RequestDumperFilter" Filter in the
-           example application (the source for this filter may be found in
-           "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
-
-           Note that this Valve uses the platform's default character encoding.
-           This may cause problems for developers in another encoding, e.g.
-           UTF-8.  Use the RequestDumperFilter instead.
-
-           Also note that enabling this Valve will write a ton of stuff to your
-           logs.  They are likely to grow quite large.  This extensive log writing
-           will definitely slow down your server.
-
-           Request dumping is disabled by default.  Uncomment the following
-           element to enable it. -->
-      <!--
-      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
-      -->
-
-      <!-- Because this Realm is here, an instance will be shared globally -->
-
-      <!-- This Realm uses the UserDatabase configured in the global JNDI
-           resources under the key "UserDatabase".  Any edits
-           that are performed against this UserDatabase are immediately
-           available for use by the Realm.  -->
-      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-             resourceName="UserDatabase"/>
-
-      <!-- Comment out the old realm but leave here for now in case we
-           need to go back quickly -->
-      <!--
-      <Realm className="org.apache.catalina.realm.MemoryRealm" />
-      -->
-
-      <!-- Replace the above Realm with one of the following to get a Realm
-           stored in a database and accessed via JDBC -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm"
-             driverName="org.gjt.mm.mysql.Driver"
-          connectionURL="jdbc:mysql://localhost/authority"
-         connectionName="test" connectionPassword="test"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm"
-             driverName="oracle.jdbc.driver.OracleDriver"
-          connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
-         connectionName="scott" connectionPassword="tiger"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm"
-             driverName="sun.jdbc.odbc.JdbcOdbcDriver"
-          connectionURL="jdbc:odbc:CATALINA"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!-- Define the default virtual host
-           Note: XML Schema validation will not work with Xerces 2.2.
-       -->
-      <Host name="localhost" appBase="webapps"
-       unpackWARs="true" autoDeploy="true"
-       xmlValidation="false" xmlNamespaceAware="false">
-
-        <!-- Defines a cluster for this node,
-             By defining this element, means that every manager will be changed.
-             So when running a cluster, only make sure that you have webapps in there
-             that need to be clustered and remove the other ones.
-             A cluster has the following parameters:
-
-             className = the fully qualified name of the cluster class
-
-             clusterName = a descriptive name for your cluster, can be anything
-
-             mcastAddr = the multicast address, has to be the same for all the nodes
-
-             mcastPort = the multicast port, has to be the same for all the nodes
-             
-             mcastBindAddress = bind the multicast socket to a specific address
-             
-             mcastTTL = the multicast TTL if you want to limit your broadcast
-             
-             mcastSoTimeout = the multicast readtimeout 
-
-             mcastFrequency = the number of milliseconds in between sending a "I'm alive" heartbeat
-
-             mcastDropTime = the number a milliseconds before a node is considered "dead" if no heartbeat is received
-
-             tcpThreadCount = the number of threads to handle incoming replication requests, optimal would be the same amount of threads as nodes 
-
-             tcpListenAddress = the listen address (bind address) for TCP cluster request on this host, 
-                                in case of multiple ethernet cards.
-                                auto means that address becomes
-                                InetAddress.getLocalHost().getHostAddress()
-
-             tcpListenPort = the tcp listen port
-
-             tcpSelectorTimeout = the timeout (ms) for the Selector.select() method in case the OS
-                                  has a wakup bug in java.nio. Set to 0 for no timeout
-
-             printToScreen = true means that managers will also print to std.out
-
-             expireSessionsOnShutdown = true means that 
-
-             useDirtyFlag = true means that we only replicate a session after setAttribute,removeAttribute has been called.
-                            false means to replicate the session after each request.
-                            false means that replication would work for the following piece of code: (only for SimpleTcpReplicationManager)
-                            <%
-                            HashMap map = (HashMap)session.getAttribute("map");
-                            map.put("key","value");
-                            %>
-             replicationMode = can be either 'pooled', 'synchronous' or 'asynchronous'.
-                               * Pooled means that the replication happens using several sockets in a synchronous way. Ie, the data gets replicated, then the request return. This is the same as the 'synchronous' setting except it uses a pool of sockets, hence it is multithreaded. This is the fastest and safest configuration. To use this, also increase the nr of tcp threads that you have dealing with replication.
-                               * Synchronous means that the thread that executes the request, is also the
-                               thread the replicates the data to the other nodes, and will not return until all
-                               nodes have received the information.
-                               * Asynchronous means that there is a specific 'sender' thread for each cluster node,
-                               so the request thread will queue the replication request into a "smart" queue,
-                               and then return to the client.
-                               The "smart" queue is a queue where when a session is added to the queue, and the same session
-                               already exists in the queue from a previous request, that session will be replaced
-                               in the queue instead of replicating two requests. This almost never happens, unless there is a 
-                               large network delay.
-        -->             
-        <!--
-            When configuring for clustering, you also add in a valve to catch all the requests
-            coming in, at the end of the request, the session may or may not be replicated.
-            A session is replicated if and only if all the conditions are met:
-            1. useDirtyFlag is true or setAttribute or removeAttribute has been called AND
-            2. a session exists (has been created)
-            3. the request is not trapped by the "filter" attribute
-
-            The filter attribute is to filter out requests that could not modify the session,
-            hence we don't replicate the session after the end of this request.
-            The filter is negative, ie, anything you put in the filter, you mean to filter out,
-            ie, no replication will be done on requests that match one of the filters.
-            The filter attribute is delimited by ;, so you can't escape out ; even if you wanted to.
-
-            filter=".*\.gif;.*\.js;" means that we will not replicate the session after requests with the URI
-            ending with .gif and .js are intercepted.
-            
-            The deployer element can be used to deploy apps cluster wide.
-            Currently the deployment only deploys/undeploys to working members in the cluster
-            so no WARs are copied upons startup of a broken node.
-            The deployer watches a directory (watchDir) for WAR files when watchEnabled="true"
-            When a new war file is added the war gets deployed to the local instance,
-            and then deployed to the other instances in the cluster.
-            When a war file is deleted from the watchDir the war is undeployed locally 
-            and cluster wide
-        -->
-        
-        <!--
-        <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster"
-                 managerClassName="org.apache.catalina.cluster.session.DeltaManager"
-                 expireSessionsOnShutdown="false"
-                 useDirtyFlag="true"
-                 notifyListenersOnReplication="true">
-
-            <Membership 
-                className="org.apache.catalina.cluster.mcast.McastService"
-                mcastAddr="228.0.0.4"
-                mcastPort="45564"
-                mcastFrequency="500"
-                mcastDropTime="3000"/>
-
-            <Receiver 
-                className="org.apache.catalina.cluster.tcp.ReplicationListener"
-                tcpListenAddress="auto"
-                tcpListenPort="4001"
-                tcpSelectorTimeout="100"
-                tcpThreadCount="6"/>
-
-            <Sender
-                className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
-                replicationMode="pooled"
-                ackTimeout="15000"
-                waitForAck="true"/>
-
-            <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
-                   filter=".*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;"/>
-                   
-            <Deployer className="org.apache.catalina.cluster.deploy.FarmWarDeployer"
-                      tempDir="/tmp/war-temp/"
-                      deployDir="/tmp/war-deploy/"
-                      watchDir="/tmp/war-listen/"
-                      watchEnabled="false"/>
-                      
-            <ClusterListener className="org.apache.catalina.cluster.session.ClusterSessionListener"/>
-        </Cluster>
-        -->        
-
-
-
-        <!-- Normally, users must authenticate themselves to each web app
-             individually.  Uncomment the following entry if you would like
-             a user to be authenticated the first time they encounter a
-             resource protected by a security constraint, and then have that
-             user identity maintained across *all* web applications contained
-             in this virtual host. -->
-        <!--
-        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-        -->
-
-        <!-- Access log processes all requests for this virtual host.  By
-             default, log files are created in the "logs" directory relative to
-             $CATALINA_HOME.  If you wish, you can specify a different
-             directory with the "directory" attribute.  Specify either a relative
-             (to $CATALINA_HOME) or absolute path to the desired directory.
-        -->
-        <!--
-        <Valve className="org.apache.catalina.valves.AccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
-                 pattern="common" resolveHosts="false"/>
-        -->
-
-        <!-- Access log processes all requests for this virtual host.  By
-             default, log files are created in the "logs" directory relative to
-             $CATALINA_HOME.  If you wish, you can specify a different
-             directory with the "directory" attribute.  Specify either a relative
-             (to $CATALINA_HOME) or absolute path to the desired directory.
-             This access log implementation is optimized for maximum performance,
-             but is hardcoded to support only the "common" and "combined" patterns.
-        -->
-        <!--
-        <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
-                 pattern="common" resolveHosts="false"/>
-        -->
-
-      </Host>
-
-    </Engine>
-
-  </Service>
-
-</Server>
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml b/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml
deleted file mode 100644
index 7486dc8148..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<rules>
-  <rule className="org.apache.tuscany.sca.demos.loadbalancer.rule.RoundRobinRule"
-    workerCount="2"
-    redirectUrl="http://localhost:8086" />
-
-  <rule className="org.apache.tuscany.sca.demos.loadbalancer.rule.RoundRobinRule"
-    workerCount="1"
-    redirectUrl="http://localhost:8087" />
-</rules>
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml b/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml
deleted file mode 100644
index 5ecb8fe5c4..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml
+++ /dev/null
@@ -1,391 +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.
--->
-<!-- Example Server Configuration File -->
-<!-- Note that component elements are nested corresponding to their
-     parent-child relationships with each other -->
-
-<!-- A "Server" is a singleton element that represents the entire JVM,
-     which may contain one or more "Service" instances.  The Server
-     listens for a shutdown command on the indicated port.
-
-     Note:  A "Server" is not itself a "Container", so you may not
-     define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-
-<Server port="8006" shutdown="SHUTDOWN">
-
-  <!-- Comment these entries out to disable JMX MBeans support used for the 
-       administration web application -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" />
-  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-  <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
-
-  <!-- Global JNDI resources -->
-  <GlobalNamingResources>
-
-    <!-- Test entry for demonstration purposes -->
-    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-
-    <!-- Editable user database that can also be used by
-         UserDatabaseRealm to authenticate users -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-       description="User database that can be updated and saved"
-           factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-          pathname="conf/tomcat-users.xml" />
-
-  </GlobalNamingResources>
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" (and therefore the web applications visible
-       within that Container).  Normally, that Container is an "Engine",
-       but this is not required.
-
-       Note:  A "Service" is not itself a "Container", so you may not
-       define subcomponents such as "Valves" or "Loggers" at this level.
-   -->
-
-  <!-- Define the Tomcat Stand-Alone Service -->
-  <Service name="Catalina">
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned.  Each Connector passes requests on to the
-         associated "Container" (normally an Engine) for processing.
-
-         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
-         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
-         following the instructions below and uncommenting the second Connector
-         entry.  SSL support requires the following steps (see the SSL Config
-         HOWTO in the Tomcat 5 documentation bundle for more detailed
-         instructions):
-         * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
-           later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
-         * Execute:
-             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
-             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
-           with a password value of "changeit" for both the certificate and
-           the keystore itself.
-
-         By default, DNS lookups are enabled when a web application calls
-         request.getRemoteHost().  This can have an adverse impact on
-         performance, so you can disable it by setting the
-         "enableLookups" attribute to "false".  When DNS lookups are disabled,
-         request.getRemoteHost() will return the String version of the
-         IP address of the remote client.
-    -->
-
-    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
-    <Connector port="8086" maxHttpHeaderSize="8192"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" redirectPort="8443" acceptCount="100"
-               connectionTimeout="20000" disableUploadTimeout="true" />
-    <!-- Note : To disable connection timeouts, set connectionTimeout value
-     to 0 -->
-	
-	<!-- Note : To use gzip compression you could set the following properties :
-	
-			   compression="on" 
-			   compressionMinSize="2048" 
-			   noCompressionUserAgents="gozilla, traviata" 
-			   compressableMimeType="text/html,text/xml"
-	-->
-
-    <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
-    <!--
-    <Connector port="8443" maxHttpHeaderSize="8192"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" disableUploadTimeout="true"
-               acceptCount="100" scheme="https" secure="true"
-               clientAuth="false" sslProtocol="TLS" />
-    -->
-
-    <!-- Define an AJP 1.3 Connector on port 8010 -->
-    <Connector port="8010" 
-               enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
-
-    <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
-    <!-- See proxy documentation for more information about using this. -->
-    <!--
-    <Connector port="8082" 
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" acceptCount="100" connectionTimeout="20000"
-               proxyPort="80" disableUploadTimeout="true" />
-    -->
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host). -->
-
-    <!-- You should set jvmRoute to support load-balancing via AJP ie :
-    <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">         
-    --> 
-         
-    <!-- Define the top level container in our container hierarchy -->
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <!-- The request dumper valve dumps useful debugging information about
-           the request headers and cookies that were received, and the response
-           headers and cookies that were sent, for all requests received by
-           this instance of Tomcat.  If you care only about requests to a
-           particular virtual host, or a particular application, nest this
-           element inside the corresponding <Host> or <Context> entry instead.
-
-           For a similar mechanism that is portable to all Servlet 2.4
-           containers, check out the "RequestDumperFilter" Filter in the
-           example application (the source for this filter may be found in
-           "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
-
-           Note that this Valve uses the platform's default character encoding.
-           This may cause problems for developers in another encoding, e.g.
-           UTF-8.  Use the RequestDumperFilter instead.
-
-           Also note that enabling this Valve will write a ton of stuff to your
-           logs.  They are likely to grow quite large.  This extensive log writing
-           will definitely slow down your server.
-
-           Request dumping is disabled by default.  Uncomment the following
-           element to enable it. -->
-      <!--
-      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
-      -->
-
-      <!-- Because this Realm is here, an instance will be shared globally -->
-
-      <!-- This Realm uses the UserDatabase configured in the global JNDI
-           resources under the key "UserDatabase".  Any edits
-           that are performed against this UserDatabase are immediately
-           available for use by the Realm.  -->
-      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-             resourceName="UserDatabase"/>
-
-      <!-- Comment out the old realm but leave here for now in case we
-           need to go back quickly -->
-      <!--
-      <Realm className="org.apache.catalina.realm.MemoryRealm" />
-      -->
-
-      <!-- Replace the above Realm with one of the following to get a Realm
-           stored in a database and accessed via JDBC -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm"
-             driverName="org.gjt.mm.mysql.Driver"
-          connectionURL="jdbc:mysql://localhost/authority"
-         connectionName="test" connectionPassword="test"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm"
-             driverName="oracle.jdbc.driver.OracleDriver"
-          connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
-         connectionName="scott" connectionPassword="tiger"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm"
-             driverName="sun.jdbc.odbc.JdbcOdbcDriver"
-          connectionURL="jdbc:odbc:CATALINA"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!-- Define the default virtual host
-           Note: XML Schema validation will not work with Xerces 2.2.
-       -->
-      <Host name="localhost" appBase="webapps"
-       unpackWARs="true" autoDeploy="true"
-       xmlValidation="false" xmlNamespaceAware="false">
-
-        <!-- Defines a cluster for this node,
-             By defining this element, means that every manager will be changed.
-             So when running a cluster, only make sure that you have webapps in there
-             that need to be clustered and remove the other ones.
-             A cluster has the following parameters:
-
-             className = the fully qualified name of the cluster class
-
-             clusterName = a descriptive name for your cluster, can be anything
-
-             mcastAddr = the multicast address, has to be the same for all the nodes
-
-             mcastPort = the multicast port, has to be the same for all the nodes
-             
-             mcastBindAddress = bind the multicast socket to a specific address
-             
-             mcastTTL = the multicast TTL if you want to limit your broadcast
-             
-             mcastSoTimeout = the multicast readtimeout 
-
-             mcastFrequency = the number of milliseconds in between sending a "I'm alive" heartbeat
-
-             mcastDropTime = the number a milliseconds before a node is considered "dead" if no heartbeat is received
-
-             tcpThreadCount = the number of threads to handle incoming replication requests, optimal would be the same amount of threads as nodes 
-
-             tcpListenAddress = the listen address (bind address) for TCP cluster request on this host, 
-                                in case of multiple ethernet cards.
-                                auto means that address becomes
-                                InetAddress.getLocalHost().getHostAddress()
-
-             tcpListenPort = the tcp listen port
-
-             tcpSelectorTimeout = the timeout (ms) for the Selector.select() method in case the OS
-                                  has a wakup bug in java.nio. Set to 0 for no timeout
-
-             printToScreen = true means that managers will also print to std.out
-
-             expireSessionsOnShutdown = true means that 
-
-             useDirtyFlag = true means that we only replicate a session after setAttribute,removeAttribute has been called.
-                            false means to replicate the session after each request.
-                            false means that replication would work for the following piece of code: (only for SimpleTcpReplicationManager)
-                            <%
-                            HashMap map = (HashMap)session.getAttribute("map");
-                            map.put("key","value");
-                            %>
-             replicationMode = can be either 'pooled', 'synchronous' or 'asynchronous'.
-                               * Pooled means that the replication happens using several sockets in a synchronous way. Ie, the data gets replicated, then the request return. This is the same as the 'synchronous' setting except it uses a pool of sockets, hence it is multithreaded. This is the fastest and safest configuration. To use this, also increase the nr of tcp threads that you have dealing with replication.
-                               * Synchronous means that the thread that executes the request, is also the
-                               thread the replicates the data to the other nodes, and will not return until all
-                               nodes have received the information.
-                               * Asynchronous means that there is a specific 'sender' thread for each cluster node,
-                               so the request thread will queue the replication request into a "smart" queue,
-                               and then return to the client.
-                               The "smart" queue is a queue where when a session is added to the queue, and the same session
-                               already exists in the queue from a previous request, that session will be replaced
-                               in the queue instead of replicating two requests. This almost never happens, unless there is a 
-                               large network delay.
-        -->             
-        <!--
-            When configuring for clustering, you also add in a valve to catch all the requests
-            coming in, at the end of the request, the session may or may not be replicated.
-            A session is replicated if and only if all the conditions are met:
-            1. useDirtyFlag is true or setAttribute or removeAttribute has been called AND
-            2. a session exists (has been created)
-            3. the request is not trapped by the "filter" attribute
-
-            The filter attribute is to filter out requests that could not modify the session,
-            hence we don't replicate the session after the end of this request.
-            The filter is negative, ie, anything you put in the filter, you mean to filter out,
-            ie, no replication will be done on requests that match one of the filters.
-            The filter attribute is delimited by ;, so you can't escape out ; even if you wanted to.
-
-            filter=".*\.gif;.*\.js;" means that we will not replicate the session after requests with the URI
-            ending with .gif and .js are intercepted.
-            
-            The deployer element can be used to deploy apps cluster wide.
-            Currently the deployment only deploys/undeploys to working members in the cluster
-            so no WARs are copied upons startup of a broken node.
-            The deployer watches a directory (watchDir) for WAR files when watchEnabled="true"
-            When a new war file is added the war gets deployed to the local instance,
-            and then deployed to the other instances in the cluster.
-            When a war file is deleted from the watchDir the war is undeployed locally 
-            and cluster wide
-        -->
-        
-        <!--
-        <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster"
-                 managerClassName="org.apache.catalina.cluster.session.DeltaManager"
-                 expireSessionsOnShutdown="false"
-                 useDirtyFlag="true"
-                 notifyListenersOnReplication="true">
-
-            <Membership 
-                className="org.apache.catalina.cluster.mcast.McastService"
-                mcastAddr="228.0.0.4"
-                mcastPort="45564"
-                mcastFrequency="500"
-                mcastDropTime="3000"/>
-
-            <Receiver 
-                className="org.apache.catalina.cluster.tcp.ReplicationListener"
-                tcpListenAddress="auto"
-                tcpListenPort="4001"
-                tcpSelectorTimeout="100"
-                tcpThreadCount="6"/>
-
-            <Sender
-                className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
-                replicationMode="pooled"
-                ackTimeout="15000"
-                waitForAck="true"/>
-
-            <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
-                   filter=".*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;"/>
-                   
-            <Deployer className="org.apache.catalina.cluster.deploy.FarmWarDeployer"
-                      tempDir="/tmp/war-temp/"
-                      deployDir="/tmp/war-deploy/"
-                      watchDir="/tmp/war-listen/"
-                      watchEnabled="false"/>
-                      
-            <ClusterListener className="org.apache.catalina.cluster.session.ClusterSessionListener"/>
-        </Cluster>
-        -->        
-
-
-
-        <!-- Normally, users must authenticate themselves to each web app
-             individually.  Uncomment the following entry if you would like
-             a user to be authenticated the first time they encounter a
-             resource protected by a security constraint, and then have that
-             user identity maintained across *all* web applications contained
-             in this virtual host. -->
-        <!--
-        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-        -->
-
-        <!-- Access log processes all requests for this virtual host.  By
-             default, log files are created in the "logs" directory relative to
-             $CATALINA_HOME.  If you wish, you can specify a different
-             directory with the "directory" attribute.  Specify either a relative
-             (to $CATALINA_HOME) or absolute path to the desired directory.
-        -->
-        <!--
-        <Valve className="org.apache.catalina.valves.AccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
-                 pattern="common" resolveHosts="false"/>
-        -->
-
-        <!-- Access log processes all requests for this virtual host.  By
-             default, log files are created in the "logs" directory relative to
-             $CATALINA_HOME.  If you wish, you can specify a different
-             directory with the "directory" attribute.  Specify either a relative
-             (to $CATALINA_HOME) or absolute path to the desired directory.
-             This access log implementation is optimized for maximum performance,
-             but is hardcoded to support only the "common" and "combined" patterns.
-        -->
-        <!--
-        <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
-                 pattern="common" resolveHosts="false"/>
-        -->
-
-      </Host>
-
-    </Engine>
-
-  </Service>
-
-</Server>
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml b/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml
deleted file mode 100644
index f83c68191c..0000000000
--- a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml
+++ /dev/null
@@ -1,391 +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.
--->
-<!-- Example Server Configuration File -->
-<!-- Note that component elements are nested corresponding to their
-     parent-child relationships with each other -->
-
-<!-- A "Server" is a singleton element that represents the entire JVM,
-     which may contain one or more "Service" instances.  The Server
-     listens for a shutdown command on the indicated port.
-
-     Note:  A "Server" is not itself a "Container", so you may not
-     define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-
-<Server port="8007" shutdown="SHUTDOWN">
-
-  <!-- Comment these entries out to disable JMX MBeans support used for the 
-       administration web application -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" />
-  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-  <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
-
-  <!-- Global JNDI resources -->
-  <GlobalNamingResources>
-
-    <!-- Test entry for demonstration purposes -->
-    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-
-    <!-- Editable user database that can also be used by
-         UserDatabaseRealm to authenticate users -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-       description="User database that can be updated and saved"
-           factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-          pathname="conf/tomcat-users.xml" />
-
-  </GlobalNamingResources>
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" (and therefore the web applications visible
-       within that Container).  Normally, that Container is an "Engine",
-       but this is not required.
-
-       Note:  A "Service" is not itself a "Container", so you may not
-       define subcomponents such as "Valves" or "Loggers" at this level.
-   -->
-
-  <!-- Define the Tomcat Stand-Alone Service -->
-  <Service name="Catalina">
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned.  Each Connector passes requests on to the
-         associated "Container" (normally an Engine) for processing.
-
-         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
-         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
-         following the instructions below and uncommenting the second Connector
-         entry.  SSL support requires the following steps (see the SSL Config
-         HOWTO in the Tomcat 5 documentation bundle for more detailed
-         instructions):
-         * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
-           later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
-         * Execute:
-             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
-             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
-           with a password value of "changeit" for both the certificate and
-           the keystore itself.
-
-         By default, DNS lookups are enabled when a web application calls
-         request.getRemoteHost().  This can have an adverse impact on
-         performance, so you can disable it by setting the
-         "enableLookups" attribute to "false".  When DNS lookups are disabled,
-         request.getRemoteHost() will return the String version of the
-         IP address of the remote client.
-    -->
-
-    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
-    <Connector port="8087" maxHttpHeaderSize="8192"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" redirectPort="8443" acceptCount="100"
-               connectionTimeout="20000" disableUploadTimeout="true" />
-    <!-- Note : To disable connection timeouts, set connectionTimeout value
-     to 0 -->
-	
-	<!-- Note : To use gzip compression you could set the following properties :
-	
-			   compression="on" 
-			   compressionMinSize="2048" 
-			   noCompressionUserAgents="gozilla, traviata" 
-			   compressableMimeType="text/html,text/xml"
-	-->
-
-    <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
-    <!--
-    <Connector port="8443" maxHttpHeaderSize="8192"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" disableUploadTimeout="true"
-               acceptCount="100" scheme="https" secure="true"
-               clientAuth="false" sslProtocol="TLS" />
-    -->
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8011" 
-               enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
-
-    <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
-    <!-- See proxy documentation for more information about using this. -->
-    <!--
-    <Connector port="8082" 
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" acceptCount="100" connectionTimeout="20000"
-               proxyPort="80" disableUploadTimeout="true" />
-    -->
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host). -->
-
-    <!-- You should set jvmRoute to support load-balancing via AJP ie :
-    <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">         
-    --> 
-         
-    <!-- Define the top level container in our container hierarchy -->
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <!-- The request dumper valve dumps useful debugging information about
-           the request headers and cookies that were received, and the response
-           headers and cookies that were sent, for all requests received by
-           this instance of Tomcat.  If you care only about requests to a
-           particular virtual host, or a particular application, nest this
-           element inside the corresponding <Host> or <Context> entry instead.
-
-           For a similar mechanism that is portable to all Servlet 2.4
-           containers, check out the "RequestDumperFilter" Filter in the
-           example application (the source for this filter may be found in
-           "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
-
-           Note that this Valve uses the platform's default character encoding.
-           This may cause problems for developers in another encoding, e.g.
-           UTF-8.  Use the RequestDumperFilter instead.
-
-           Also note that enabling this Valve will write a ton of stuff to your
-           logs.  They are likely to grow quite large.  This extensive log writing
-           will definitely slow down your server.
-
-           Request dumping is disabled by default.  Uncomment the following
-           element to enable it. -->
-      <!--
-      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
-      -->
-
-      <!-- Because this Realm is here, an instance will be shared globally -->
-
-      <!-- This Realm uses the UserDatabase configured in the global JNDI
-           resources under the key "UserDatabase".  Any edits
-           that are performed against this UserDatabase are immediately
-           available for use by the Realm.  -->
-      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-             resourceName="UserDatabase"/>
-
-      <!-- Comment out the old realm but leave here for now in case we
-           need to go back quickly -->
-      <!--
-      <Realm className="org.apache.catalina.realm.MemoryRealm" />
-      -->
-
-      <!-- Replace the above Realm with one of the following to get a Realm
-           stored in a database and accessed via JDBC -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm"
-             driverName="org.gjt.mm.mysql.Driver"
-          connectionURL="jdbc:mysql://localhost/authority"
-         connectionName="test" connectionPassword="test"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm"
-             driverName="oracle.jdbc.driver.OracleDriver"
-          connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
-         connectionName="scott" connectionPassword="tiger"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm"
-             driverName="sun.jdbc.odbc.JdbcOdbcDriver"
-          connectionURL="jdbc:odbc:CATALINA"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!-- Define the default virtual host
-           Note: XML Schema validation will not work with Xerces 2.2.
-       -->
-      <Host name="localhost" appBase="webapps"
-       unpackWARs="true" autoDeploy="true"
-       xmlValidation="false" xmlNamespaceAware="false">
-
-        <!-- Defines a cluster for this node,
-             By defining this element, means that every manager will be changed.
-             So when running a cluster, only make sure that you have webapps in there
-             that need to be clustered and remove the other ones.
-             A cluster has the following parameters:
-
-             className = the fully qualified name of the cluster class
-
-             clusterName = a descriptive name for your cluster, can be anything
-
-             mcastAddr = the multicast address, has to be the same for all the nodes
-
-             mcastPort = the multicast port, has to be the same for all the nodes
-             
-             mcastBindAddress = bind the multicast socket to a specific address
-             
-             mcastTTL = the multicast TTL if you want to limit your broadcast
-             
-             mcastSoTimeout = the multicast readtimeout 
-
-             mcastFrequency = the number of milliseconds in between sending a "I'm alive" heartbeat
-
-             mcastDropTime = the number a milliseconds before a node is considered "dead" if no heartbeat is received
-
-             tcpThreadCount = the number of threads to handle incoming replication requests, optimal would be the same amount of threads as nodes 
-
-             tcpListenAddress = the listen address (bind address) for TCP cluster request on this host, 
-                                in case of multiple ethernet cards.
-                                auto means that address becomes
-                                InetAddress.getLocalHost().getHostAddress()
-
-             tcpListenPort = the tcp listen port
-
-             tcpSelectorTimeout = the timeout (ms) for the Selector.select() method in case the OS
-                                  has a wakup bug in java.nio. Set to 0 for no timeout
-
-             printToScreen = true means that managers will also print to std.out
-
-             expireSessionsOnShutdown = true means that 
-
-             useDirtyFlag = true means that we only replicate a session after setAttribute,removeAttribute has been called.
-                            false means to replicate the session after each request.
-                            false means that replication would work for the following piece of code: (only for SimpleTcpReplicationManager)
-                            <%
-                            HashMap map = (HashMap)session.getAttribute("map");
-                            map.put("key","value");
-                            %>
-             replicationMode = can be either 'pooled', 'synchronous' or 'asynchronous'.
-                               * Pooled means that the replication happens using several sockets in a synchronous way. Ie, the data gets replicated, then the request return. This is the same as the 'synchronous' setting except it uses a pool of sockets, hence it is multithreaded. This is the fastest and safest configuration. To use this, also increase the nr of tcp threads that you have dealing with replication.
-                               * Synchronous means that the thread that executes the request, is also the
-                               thread the replicates the data to the other nodes, and will not return until all
-                               nodes have received the information.
-                               * Asynchronous means that there is a specific 'sender' thread for each cluster node,
-                               so the request thread will queue the replication request into a "smart" queue,
-                               and then return to the client.
-                               The "smart" queue is a queue where when a session is added to the queue, and the same session
-                               already exists in the queue from a previous request, that session will be replaced
-                               in the queue instead of replicating two requests. This almost never happens, unless there is a 
-                               large network delay.
-        -->             
-        <!--
-            When configuring for clustering, you also add in a valve to catch all the requests
-            coming in, at the end of the request, the session may or may not be replicated.
-            A session is replicated if and only if all the conditions are met:
-            1. useDirtyFlag is true or setAttribute or removeAttribute has been called AND
-            2. a session exists (has been created)
-            3. the request is not trapped by the "filter" attribute
-
-            The filter attribute is to filter out requests that could not modify the session,
-            hence we don't replicate the session after the end of this request.
-            The filter is negative, ie, anything you put in the filter, you mean to filter out,
-            ie, no replication will be done on requests that match one of the filters.
-            The filter attribute is delimited by ;, so you can't escape out ; even if you wanted to.
-
-            filter=".*\.gif;.*\.js;" means that we will not replicate the session after requests with the URI
-            ending with .gif and .js are intercepted.
-            
-            The deployer element can be used to deploy apps cluster wide.
-            Currently the deployment only deploys/undeploys to working members in the cluster
-            so no WARs are copied upons startup of a broken node.
-            The deployer watches a directory (watchDir) for WAR files when watchEnabled="true"
-            When a new war file is added the war gets deployed to the local instance,
-            and then deployed to the other instances in the cluster.
-            When a war file is deleted from the watchDir the war is undeployed locally 
-            and cluster wide
-        -->
-        
-        <!--
-        <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster"
-                 managerClassName="org.apache.catalina.cluster.session.DeltaManager"
-                 expireSessionsOnShutdown="false"
-                 useDirtyFlag="true"
-                 notifyListenersOnReplication="true">
-
-            <Membership 
-                className="org.apache.catalina.cluster.mcast.McastService"
-                mcastAddr="228.0.0.4"
-                mcastPort="45564"
-                mcastFrequency="500"
-                mcastDropTime="3000"/>
-
-            <Receiver 
-                className="org.apache.catalina.cluster.tcp.ReplicationListener"
-                tcpListenAddress="auto"
-                tcpListenPort="4001"
-                tcpSelectorTimeout="100"
-                tcpThreadCount="6"/>
-
-            <Sender
-                className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
-                replicationMode="pooled"
-                ackTimeout="15000"
-                waitForAck="true"/>
-
-            <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
-                   filter=".*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;"/>
-                   
-            <Deployer className="org.apache.catalina.cluster.deploy.FarmWarDeployer"
-                      tempDir="/tmp/war-temp/"
-                      deployDir="/tmp/war-deploy/"
-                      watchDir="/tmp/war-listen/"
-                      watchEnabled="false"/>
-                      
-            <ClusterListener className="org.apache.catalina.cluster.session.ClusterSessionListener"/>
-        </Cluster>
-        -->        
-
-
-
-        <!-- Normally, users must authenticate themselves to each web app
-             individually.  Uncomment the following entry if you would like
-             a user to be authenticated the first time they encounter a
-             resource protected by a security constraint, and then have that
-             user identity maintained across *all* web applications contained
-             in this virtual host. -->
-        <!--
-        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-        -->
-
-        <!-- Access log processes all requests for this virtual host.  By
-             default, log files are created in the "logs" directory relative to
-             $CATALINA_HOME.  If you wish, you can specify a different
-             directory with the "directory" attribute.  Specify either a relative
-             (to $CATALINA_HOME) or absolute path to the desired directory.
-        -->
-        <!--
-        <Valve className="org.apache.catalina.valves.AccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
-                 pattern="common" resolveHosts="false"/>
-        -->
-
-        <!-- Access log processes all requests for this virtual host.  By
-             default, log files are created in the "logs" directory relative to
-             $CATALINA_HOME.  If you wish, you can specify a different
-             directory with the "directory" attribute.  Specify either a relative
-             (to $CATALINA_HOME) or absolute path to the desired directory.
-             This access log implementation is optimized for maximum performance,
-             but is hardcoded to support only the "common" and "combined" patterns.
-        -->
-        <!--
-        <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
-                 pattern="common" resolveHosts="false"/>
-        -->
-
-      </Host>
-
-    </Engine>
-
-  </Service>
-
-</Server>
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/LICENSE b/java/sca-contrib/demos/mortgage-creditcheck/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/demos/mortgage-creditcheck/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/NOTICE b/java/sca-contrib/demos/mortgage-creditcheck/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/demos/mortgage-creditcheck/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/README b/java/sca-contrib/demos/mortgage-creditcheck/README
deleted file mode 100644
index b785802920..0000000000
--- a/java/sca-contrib/demos/mortgage-creditcheck/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Mortgage Loan Approval Demo

-===========================

-Please refer to the README under mortgage-loanapproval for information on how to run this demo.

-

-Mortgage-creditcheck is part of a larger demo that is explained there.

-

diff --git a/java/sca-contrib/demos/mortgage-creditcheck/build.xml b/java/sca-contrib/demos/mortgage-creditcheck/build.xml
deleted file mode 100644
index 59f1342276..0000000000
--- a/java/sca-contrib/demos/mortgage-creditcheck/build.xml
+++ /dev/null
@@ -1,66 +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.    
--->
-<project name="mortgage-creditcheck" default="compile">
-	<property name="test.class" value="credit.CreditCheckServer" />
-	<property name="test.jar" value="demo-mortgage-creditcheck.jar" />
-
-	<target name="init">
-		<mkdir dir="target/classes" />
-	</target>
-
-	<target name="compile" depends="init">
-		<javac srcdir="src/main/java" destdir="target/classes" debug="on" source="1.5" target="1.5">
-			<classpath>
-				<pathelement location="../../lib/tuscany-sca-manifest.jar" />
-			</classpath>
-		</javac>
-		<copy todir="target/classes">
-			<fileset dir="src/main/resources" />
-		</copy>
-		<jar destfile="target/${test.jar}" basedir="target/classes">
-			<manifest>
-				<attribute name="Main-Class" value="${test.class}" />
-			</manifest>
-		</jar>
-	</target>
-
-	<target name="run-classes">
-		<java classname="${test.class}" fork="true">
-			<classpath>
-				<pathelement path="target/classes" />
-				<pathelement location="../../lib/tuscany-sca-manifest.jar" />
-			</classpath>
-		</java>
-	</target>
-
-	<target name="run">
-		<java classname="${test.class}" fork="true">
-			<classpath>
-				<pathelement path="target/${test.jar}" />
-				<pathelement location="../../lib/tuscany-sca-manifest.jar" />
-			</classpath>
-		</java>
-	</target>
-
-	<target name="clean">
-		<delete quiet="true" includeemptydirs="true">
-			<fileset dir="target" />
-		</delete>
-	</target>
-</project>
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/pom.xml b/java/sca-contrib/demos/mortgage-creditcheck/pom.xml
deleted file mode 100644
index a5e268812b..0000000000
--- a/java/sca-contrib/demos/mortgage-creditcheck/pom.xml
+++ /dev/null
@@ -1,75 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-demos</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>demo-mortgage-creditcheck</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA Mortgage Credit Check Demo</name>
-    <description>A sample Mortgage application made of several SCA components wired together.</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-
-</project>
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java b/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
deleted file mode 100644
index 26048de722..0000000000
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
+++ /dev/null
@@ -1,26 +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 credit;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CreditCheck {
-    int getCreditScore(String ssn);
-}
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java b/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
deleted file mode 100644
index 20a0c5dd7f..0000000000
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
+++ /dev/null
@@ -1,34 +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 credit;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the CreditReportService service
- */
-@Service(CreditCheck.class)
-public class CreditCheckImpl implements CreditCheck {
-
-    public int getCreditScore(String ssn) {
-        int score = (int)(700 + (Math.random() - 0.5) * 100);
-        System.out.println("Credit score for " + ssn + ": " + score);
-        return score;
-    }
-}
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java b/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
deleted file mode 100644
index 870ea1941d..0000000000
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
+++ /dev/null
@@ -1,40 +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 credit;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CreditCheckServer {
-    public static void main(String[] args) throws Exception {
-
-        System.out.println("Starting the CreditCheck Service...");
-
-        SCADomain domain = SCADomain.newInstance("http://localhost", "/", "CreditCheck.composite");
-
-        System.out.println("Press Enter to Exit...");
-        System.in.read();
-
-        domain.close();
-        System.out.println("Bye");
-    }
-}
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite b/java/sca-contrib/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
deleted file mode 100644
index 5c828f5a39..0000000000
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
+++ /dev/null
@@ -1,37 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-    targetNamespace="http://credit" name="CreditComposite">

-

-    <!-- 

-        <service name="CreditCheckService" promote="CreditCheckServiceComponent">

-        <interface.wsdl interface="http://credit#wsdl.interface(CreditCheck)" />

-        <binding.ws wsdlElement="http://credit#wsdl.port(CreditCheckService/CreditCheckSoapPort)" />

-        </service>

-    -->

-

-    <component name="CreditCheckServiceComponent">

-        <implementation.java class="credit.CreditCheckImpl" />

-        <service name="CreditCheck">

-            <binding.ws wsdlElement="http://credit#wsdl.port(CreditCheckService/CreditCheckSoapPort)" />

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl b/java/sca-contrib/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
deleted file mode 100644
index 9c2acc96d3..0000000000
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
+++ /dev/null
@@ -1,81 +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://credit" xmlns:tns="http://credit" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="credit">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://credit" xmlns:tns="http://credit"

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

-

-            <element name="getCreditScore">

-                <complexType>

-                    <sequence>

-                        <element name="ssn" type="xsd:string" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getCreditScoreResponse">

-                <complexType>

-                    <sequence>

-                        <element name="score" type="xsd:int" />

-                    </sequence>

-                </complexType>

-            </element>

-

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getCreditScoreRequest">

-        <wsdl:part element="tns:getCreditScore" name="inputMsg" />

-    </wsdl:message>

-

-    <wsdl:message name="getCreditScoreResponse">

-        <wsdl:part element="tns:getCreditScoreResponse" name="outputMsg" />

-    </wsdl:message>

-

-

-    <wsdl:portType name="CreditCheck">

-        <wsdl:operation name="getCreditScore">

-            <wsdl:input message="tns:getCreditScoreRequest" name="getCreditScoreRequest" />

-            <wsdl:output message="tns:getCreditScoreResponse" name="getCreditScoreResponse" />

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="CreditCheckSoapBinding" type="tns:CreditCheck">

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

-        <wsdl:operation name="getCreditScore">

-            <wsdlsoap:operation soapAction="" />

-            <wsdl:input name="getCreditScoreRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getCreditScoreResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="CreditCheckService">

-        <wsdl:port binding="tns:CreditCheckSoapBinding" name="CreditCheckSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/CreditCheckServiceComponent" />

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index aea009292a..0000000000
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://credit"

-              xmlns:credit="http://credit">

-   <deployable composite="credit:CreditComposite"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d7b2e32dd1..0000000000
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    * 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.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-    <display-name>Apache Tuscany Credit Check Demo</display-name>
-
-    <filter>
-        <filter-name>tuscany</filter-name>
-        <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>tuscany</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-</web-app>
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/LICENSE b/java/sca-contrib/demos/mortgage-loanapproval/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/NOTICE b/java/sca-contrib/demos/mortgage-loanapproval/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/README b/java/sca-contrib/demos/mortgage-loanapproval/README
deleted file mode 100644
index dbf3829a20..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/README
+++ /dev/null
@@ -1,60 +0,0 @@
-Mortgage Loan Approval Demo

-===========================

-

-This demo was used as an example in the java developer journal article:  http://jdj.sys-con.com/read/325183.htm.

-

-The demo consists of two modules:

-

-mortgage-loanapproval: provides the business logic for loan approval.  

-mortgage-creditcheck: handles credit check requests. This is a java component exposed as a webservice running on the embedded Tomcat.

-

-Please check mortgage_assembly.png file that is located in this directory for a high level view of the demo.

-

-Here is what happens when you run the demo. A loan approval request for customer with id 111-222-3333 

-gets initiated when mortgage-loanapproval application is run. Depending on what the 'imaginary' credit

- status of this person is, the loan gets approved or diapproved. 

-

-You would need two command windows to run mortgage loan approval composite. The order in which the

-applications are run is important. Run mortgage-creditcheck first since mortgage-loanapproval is dependent on 

-it's service.

-

-In the first command window 

----------------------------

-1) go to mortgage-creditcheck directory 

-2) ant compile

-3) ant run

-You should see the following displayed:

-Buildfile: build.xml

-

-run:

-     [java] Starting the CreditCheck Service...

-     [java] 14-Jan-2008 14:14:20 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:8085/CreditCheckServiceC

-omponent

-     [java] Press Enter to Exit...

-

-In the second command window

-----------------------------

-1) go to mortgage-loanapproval directory 

-2) ant compile

-3) ant run

-

-If the loan is approved, you will see the following displayed in the command screen where

-mortgage-loanapproval is run:

-

-Buildfile: build.xml

-run:

-     [java] Interest rate for a 30-year loan of $200000.0 in CA: 6.5%

-     [java] Approved: John Smith[111-22-3333]

-

-If the loan is disapproved, you will see the following displayed in the command screen where

-mortgage-loanapproval is run:

-

-Buildfile: build.xml

-run:

-     [java] Credit score for 111-22-3333: 708

-     [java] Interest rate for a 30-year loan of $200000.0 in CA: 6.5%

-     [java] Debt/Income ratio 0.2528272093971861 is too high.

-     [java] Rejected: John Smith[111-22-3333]

-

diff --git a/java/sca-contrib/demos/mortgage-loanapproval/build.xml b/java/sca-contrib/demos/mortgage-loanapproval/build.xml
deleted file mode 100644
index 9a0a83bf1d..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/build.xml
+++ /dev/null
@@ -1,66 +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.    
--->
-<project name="mortgage-loanapproval" default="compile">
-	<property name="test.class" value="mortgage.MortgageClient" />
-	<property name="test.jar" value="demo-mortgage-loanapproval.jar" />
-
-	<target name="init">
-		<mkdir dir="target/classes" />
-	</target>
-
-	<target name="compile" depends="init">
-		<javac srcdir="src/main/java" destdir="target/classes" debug="on" source="1.5" target="1.5">
-			<classpath>
-				<pathelement location="../../lib/tuscany-sca-manifest.jar" />
-			</classpath>
-		</javac>
-		<copy todir="target/classes">
-			<fileset dir="src/main/resources" />
-		</copy>
-		<jar destfile="target/${test.jar}" basedir="target/classes">
-			<manifest>
-				<attribute name="Main-Class" value="${test.class}" />
-			</manifest>
-		</jar>
-	</target>
-
-	<target name="run-classes">
-		<java classname="${test.class}" fork="true">
-			<classpath>
-				<pathelement path="target/classes" />
-				<pathelement location="../../lib/tuscany-sca-manifest.jar" />
-			</classpath>
-		</java>
-	</target>
-
-	<target name="run">
-		<java classname="${test.class}" fork="true">
-			<classpath>
-				<pathelement path="target/${test.jar}" />
-				<pathelement location="../../lib/tuscany-sca-manifest.jar" />
-			</classpath>
-		</java>
-	</target>
-
-	<target name="clean">
-		<delete quiet="true" includeemptydirs="true">
-			<fileset dir="target" />
-		</delete>
-	</target>
-</project>
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/credit_composite.jpg b/java/sca-contrib/demos/mortgage-loanapproval/doc/credit_composite.jpg
deleted file mode 100644
index e28ed63cfb..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/credit_composite.jpg
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/credit_composite.png b/java/sca-contrib/demos/mortgage-loanapproval/doc/credit_composite.png
deleted file mode 100644
index 0bfce0078d..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/credit_composite.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/loan_approval.jpg b/java/sca-contrib/demos/mortgage-loanapproval/doc/loan_approval.jpg
deleted file mode 100644
index 3f00557c7f..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/loan_approval.jpg
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/loan_approval.png b/java/sca-contrib/demos/mortgage-loanapproval/doc/loan_approval.png
deleted file mode 100644
index 9d5f829fe5..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/loan_approval.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
deleted file mode 100644
index 515b6ecde7..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.png b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
deleted file mode 100644
index 4b815a4b82..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
deleted file mode 100644
index 01a7c55a14..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.png b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
deleted file mode 100644
index 07422c4f45..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
deleted file mode 100644
index 992c048684..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.png b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
deleted file mode 100644
index 4667956ed0..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_composite.jpg b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
deleted file mode 100644
index 5021f6a317..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_composite.png b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_composite.png
deleted file mode 100644
index 1398c50ded..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_composite.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
deleted file mode 100644
index 32a0b72907..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package1.jpg b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
deleted file mode 100644
index e91c5f1bbd..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package1.png b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package1.png
deleted file mode 100644
index db304a4c28..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package1.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package2.jpg b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
deleted file mode 100644
index e8c2865e4a..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package2.png b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package2.png
deleted file mode 100644
index 502e538e94..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package2.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
deleted file mode 100644
index fccf2e35c3..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.png b/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.png
deleted file mode 100644
index b8f42ad318..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/mortgage_assembly.png b/java/sca-contrib/demos/mortgage-loanapproval/mortgage_assembly.png
deleted file mode 100644
index 4667956ed0..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/mortgage_assembly.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/pom.xml b/java/sca-contrib/demos/mortgage-loanapproval/pom.xml
deleted file mode 100644
index 2947a59ee9..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/pom.xml
+++ /dev/null
@@ -1,83 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-demos</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>demo-mortgage-loanapproval</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA Mortgage Loan Approval Demo</name>
-    <description>A sample Mortgage application made of several SCA components wired together.</description>
-
-    <properties>
-        <property name="tuscanyVersion">1.4-SNAPSHOT</property>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>mortgage.MortgageClient</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java b/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
deleted file mode 100644
index 2d830fdf7a..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
+++ /dev/null
@@ -1,29 +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 mortgage;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * CreditCheck interface
- */
-@Remotable
-public interface CreditCheck {
-    int getCreditScore(String ssn);
-}
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java b/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
deleted file mode 100644
index 8f85bc7d9c..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
+++ /dev/null
@@ -1,34 +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 mortgage;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * A pojo implementation of the CreditCheck service
- */
-@Service(CreditCheck.class)
-public class CreditCheckImpl implements CreditCheck {
-
-    public int getCreditScore(String ssn) {
-        int score = (int)(700 + (Math.random() - 0.5) * 100);
-        System.out.println("Credit score for " + ssn + ": " + score);
-        return score;
-    }
-}
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java b/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
deleted file mode 100644
index 66a486d516..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.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 mortgage;
-
-/**
- * A simple Customer object
- */
-public class Customer {
-    private String ssn;
-    private String firstName;
-    private String lastName;
-    private double monthlyIncome;
-    private String state;
-
-    public double getMonthlyIncome() {
-        return monthlyIncome;
-    }
-
-    public void setMonthlyIncome(double monthlyIncome) {
-        this.monthlyIncome = monthlyIncome;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public String getSsn() {
-        return ssn;
-    }
-
-    public void setSsn(String ssn) {
-        this.ssn = ssn;
-    }
-
-    @Override
-    public String toString() {
-        return firstName + " " + lastName + "[" + ssn + "]";
-    }
-}
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java b/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
deleted file mode 100644
index b5bafeb204..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
+++ /dev/null
@@ -1,23 +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 mortgage;
-
-public interface InterestRateQuote {
-    public float getRate(String state, double loanAmount, int termInYears);
-}
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java b/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
deleted file mode 100644
index e5d7a1f077..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
+++ /dev/null
@@ -1,42 +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 mortgage;
-
-import org.oasisopen.sca.annotation.Service;
-
-@Service(InterestRateQuote.class)
-public class InterestRateQuoteImpl implements InterestRateQuote {
-    public float getRate(String state, double loanAmount, int termInYears) {
-        float rate = 6.0f;
-        if (termInYears == 5) {
-            rate = 5.5f;
-        } else {
-            rate = 6.5f;
-        }
-        System.out.println("Interest rate for a " + termInYears
-            + "-year loan of $"
-            + loanAmount
-            + " in "
-            + state
-            + ": "
-            + rate
-            + "%");
-        return rate;
-    }
-}
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java b/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
deleted file mode 100644
index dcdad18496..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
+++ /dev/null
@@ -1,27 +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 mortgage;
-
-/**
- * Loan Approval interface
- */
-public interface LoanApproval {
-    public boolean approve(Customer customer, double loanAmount, int years);
-}
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java b/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
deleted file mode 100644
index f211e1356c..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.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 mortgage;
-
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the LoanApproval service.
- */
-@Service(LoanApproval.class)
-// Service declaration
-public class LoanApprovalImpl implements LoanApproval {
-    private CreditCheck[] creditCheck;
-    private MortgageCalculator mortgageCalculator;
-    private InterestRateQuote interestRateQuote;
-
-    // Reference declaration using a protected or public field
-    @Reference
-    public RiskAssessment riskAssessment;
-
-    private int minimumCreditScore = 650;
-
-    // Property declaration using a setter method
-    @Property(name = "minimumCreditScore")
-    public void setMinimumCreditScore(int minimumCreditScore) {
-        this.minimumCreditScore = minimumCreditScore;
-    }
-
-    // Reference declaration using a setter method
-    @Reference
-    public void setCreditCheck(CreditCheck[] creditCheck) {
-        this.creditCheck = creditCheck;
-    }
-
-    @Reference
-    public void setInterestRateQuote(InterestRateQuote interestRateQuote) {
-        this.interestRateQuote = interestRateQuote;
-    }
-
-    @Reference
-    public void setMortgageCalculator(MortgageCalculator mortgageCalculator) {
-        this.mortgageCalculator = mortgageCalculator;
-    }
-
-    public boolean approve(Customer customer, double loanAmount, int years) {
-        int score = 0;
-        for (int i = 0; i < creditCheck.length; i++) {
-            score += creditCheck[i].getCreditScore(customer.getSsn());
-        }
-        if (score != 0) {
-            score = score / creditCheck.length;
-        }
-        if (score < minimumCreditScore) {
-            System.err.println("Credit score " + score + " is below the minimum " + minimumCreditScore + ".");
-            return false;
-        }
-        float rate = interestRateQuote.getRate(customer.getState(), loanAmount, years);
-        double monthlyPayment = mortgageCalculator.getMonthlyPayment(loanAmount, years, rate);
-        double ratio = monthlyPayment / customer.getMonthlyIncome();
-        boolean approved = riskAssessment.assess(score, ratio);
-        if (!approved) {
-            System.err.println("Debt/Income ratio " + ratio + " is too high.");
-        }
-        return approved;
-    }
-}
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java b/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
deleted file mode 100644
index 350b2c24ea..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
+++ /dev/null
@@ -1,29 +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 mortgage;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The Mortgage Calculator service interface.
- */
-@Remotable
-public interface MortgageCalculator {
-    public double getMonthlyPayment(double principal, int years, float interestRate);
-}
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java b/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
deleted file mode 100644
index 839e9e098c..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
+++ /dev/null
@@ -1,38 +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 mortgage;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the Calculator service.
- */
-@Service(MortgageCalculator.class)
-public class MortgageCalculatorImpl implements MortgageCalculator {
-
-    public double getMonthlyPayment(double principal, int years, float interestRate) {
-        double monthlyRate = interestRate / 12.0 / 100.0;
-        double p = Math.pow(1 + monthlyRate, years * 12);
-        double q = p / (p - 1);
-        double monthlyPayment = principal * monthlyRate * q;
-        System.out.println("Monthly payment for a " + years + "-year loan of $" + principal + ": " + monthlyPayment);
-        return monthlyPayment;
-    }
-
-}
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java b/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
deleted file mode 100644
index d69f0a1163..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.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 mortgage;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program to invoke the Mortgage LoanApproval service
- */
-public class MortgageClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomain domain = SCADomain.newInstance("Mortgage1.composite");
-        LoanApproval loanApplication = domain.getService(LoanApproval.class, "LoanApprovalComponent");
-
-        // Create the customer
-        Customer customer = new Customer();
-        customer.setSsn("111-22-3333");
-        customer.setFirstName("John");
-        customer.setLastName("Smith");
-        customer.setMonthlyIncome(5000.0d);
-        customer.setState("CA");
-
-        // Invoke the service
-        boolean result = loanApplication.approve(customer, 200000d, 30);
-        System.out.println((result ? "Approved: " : "Rejected: ") + customer);
-    }
-}
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java b/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
deleted file mode 100644
index 23c9589e85..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
+++ /dev/null
@@ -1,27 +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 mortgage;
-
-/**
- * Risk Assessment interface
- */
-public interface RiskAssessment {
-    public boolean assess(int creditScore, double ratio);
-}
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java b/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
deleted file mode 100644
index 0e88093c61..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
+++ /dev/null
@@ -1,38 +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 mortgage;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * A pojo implementation of RiskAssessment service
- */
-@Service(RiskAssessment.class)
-public class RiskAssessmentImpl implements RiskAssessment {
-    public boolean assess(int creditScore, double ratio) {
-        if (creditScore >= 750) {
-            return ratio < 0.35;
-        } else if (creditScore >= 700) {
-            return ratio < 0.30;
-        } else {
-            return ratio < 0.25;
-        }
-    }
-}
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite b/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
deleted file mode 100644
index d1128b9907..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
+++ /dev/null
@@ -1,48 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-    targetNamespace="http://mortgage" name="MortgageComposite">

-

-    <component name="LoanApprovalComponent">

-        <implementation.java class="mortgage.LoanApprovalImpl" />

-        <property name="minimumCreditScore">600</property>

-        <reference name="creditCheck" target="CreditCheckComponent" />

-        <reference name="interestRateQuote" target="InterestRateQuoteComponent" />

-        <reference name="riskAssessment" target="RiskAssessmentComponent" />

-        <reference name="mortgageCalculator" target="MortgageCalculatorComponent" />

-    </component>

-

-    <component name="CreditCheckComponent">

-        <implementation.java class="mortgage.CreditCheckImpl" />

-    </component>

-

-    <component name="InterestRateQuoteComponent">

-        <implementation.java class="mortgage.InterestRateQuoteImpl" />

-    </component>

-

-    <component name="RiskAssessmentComponent">

-        <implementation.java class="mortgage.RiskAssessmentImpl" />

-    </component>

-

-    <component name="MortgageCalculatorComponent">

-        <implementation.java class="mortgage.MortgageCalculatorImpl" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite b/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
deleted file mode 100644
index 4cad6c7223..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
+++ /dev/null
@@ -1,57 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-    targetNamespace="http://mortgage" name="MortgageComposite">

-

-    <component name="LoanApprovalComponent">

-        <implementation.java class="mortgage.LoanApprovalImpl" />

-        <property name="minimumCreditScore">600</property>

-        <reference name="creditCheck">

-            <binding.ws wsdlElement="http://credit#wsdl.port(CreditCheckService/CreditCheckSoapPort)" />

-        </reference>

-        <reference name="interestRateQuote" target="InterestRateQuoteComponent" />

-        <reference name="riskAssessment" target="RiskAssessmentComponent" />

-        <reference name="mortgageCalculator" target="MortgageCalculatorJSComponent" />

-    </component>

-

-    <component name="CreditCheckComponent">

-        <implementation.java class="mortgage.CreditCheckImpl" />

-    </component>

-

-    <component name="InterestRateQuoteComponent">

-        <implementation.java class="mortgage.InterestRateQuoteImpl" />

-    </component>

-

-    <component name="RiskAssessmentComponent">

-        <implementation.java class="mortgage.RiskAssessmentImpl" />

-    </component>

-

-    <component name="MortgageCalculatorJSComponent">

-        <tuscany:implementation.script script="MortgageCalculator.js" />

-    </component>

-

-    <!-- 

-        <reference name="CreditCheckReference" promote="LoanApprovalComponent/creditCheck">

-        <interface.java interface="mortgage.CreditCheck" />

-        <binding.ws wsdlElement="http://credit#wsdl.port(CreditCheckService/CreditCheckSoapPort)" />

-        </reference>

-    -->

-

-</composite>

diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType b/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
deleted file mode 100644
index bf7b10e0f7..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-

-    <service name="MortgageCalculatorService">

-        <interface.java interface="mortgage.MortgageCalculator"/>

-    </service>

-

-</componentType>

diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js b/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
deleted file mode 100644
index b25af1d039..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
+++ /dev/null
@@ -1,25 +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.    

- */

-function getMonthlyPayment(principal, years, interestRate) {

-    var monthlyRate = interestRate / 12.0 / 100.0;

-    var p = Math.pow(1 + monthlyRate, years * 12);

-    var q = p / (p - 1);

-    var monthlyPayment = principal * monthlyRate * q;

-    return monthlyPayment;

-}

diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl b/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
deleted file mode 100644
index 9c2acc96d3..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
+++ /dev/null
@@ -1,81 +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://credit" xmlns:tns="http://credit" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="credit">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://credit" xmlns:tns="http://credit"

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

-

-            <element name="getCreditScore">

-                <complexType>

-                    <sequence>

-                        <element name="ssn" type="xsd:string" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getCreditScoreResponse">

-                <complexType>

-                    <sequence>

-                        <element name="score" type="xsd:int" />

-                    </sequence>

-                </complexType>

-            </element>

-

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getCreditScoreRequest">

-        <wsdl:part element="tns:getCreditScore" name="inputMsg" />

-    </wsdl:message>

-

-    <wsdl:message name="getCreditScoreResponse">

-        <wsdl:part element="tns:getCreditScoreResponse" name="outputMsg" />

-    </wsdl:message>

-

-

-    <wsdl:portType name="CreditCheck">

-        <wsdl:operation name="getCreditScore">

-            <wsdl:input message="tns:getCreditScoreRequest" name="getCreditScoreRequest" />

-            <wsdl:output message="tns:getCreditScoreResponse" name="getCreditScoreResponse" />

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="CreditCheckSoapBinding" type="tns:CreditCheck">

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

-        <wsdl:operation name="getCreditScore">

-            <wsdlsoap:operation soapAction="" />

-            <wsdl:input name="getCreditScoreRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getCreditScoreResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="CreditCheckService">

-        <wsdl:port binding="tns:CreditCheckSoapBinding" name="CreditCheckSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/CreditCheckServiceComponent" />

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java b/java/sca-contrib/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
deleted file mode 100644
index 285cc72515..0000000000
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
+++ /dev/null
@@ -1,56 +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 mortgage;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MortgageClientTestCase extends TestCase {
-    private SCADomain domain;
-    private LoanApproval loanApproval;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("Mortgage.composite");
-        loanApproval = domain.getService(LoanApproval.class, "LoanApprovalComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    public void testApprove() throws Exception {
-        Customer customer = new Customer();
-        customer.setSsn("111-22-3333");
-        customer.setFirstName("John");
-        customer.setLastName("Smith");
-        customer.setMonthlyIncome(5000.0d);
-        customer.setState("CA");
-
-        boolean approved = loanApproval.approve(customer, 200000d, 30);
-        System.out.println((approved ? "Approved: " : "Rejected: ") + customer);
-    }
-}
diff --git a/java/sca-contrib/demos/pom.xml b/java/sca-contrib/demos/pom.xml
deleted file mode 100644
index 9ada7dba1e..0000000000
--- a/java/sca-contrib/demos/pom.xml
+++ /dev/null
@@ -1,52 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-demos</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Demos</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>alert-aggregator-webapp</module>
-		<module>bigbank</module>
-                <module>bigbank-account</module>
-                <module>bigbank-calculator</module>
-                <module>bigbank-stockquote</module>
-                <module>mortgage-creditcheck</module>
-                <module>mortgage-loanapproval</module>
-                <module>xml-bigbank</module>
-            </modules>
-        </profile>
-
-    </profiles>
-    
-</project>
diff --git a/java/sca-contrib/demos/workpool-distributed/LICENSE b/java/sca-contrib/demos/workpool-distributed/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/demos/workpool-distributed/NOTICE b/java/sca-contrib/demos/workpool-distributed/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/demos/workpool-distributed/build.xml b/java/sca-contrib/demos/workpool-distributed/build.xml
deleted file mode 100644
index 9e10e8ec91..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/build.xml
+++ /dev/null
@@ -1,446 +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.    
--->
-<project name="workpool" default="runDomainNode">
-    <property name="node.class" value="node.WorkpoolNode" />
-	<property name="domain.class" value="node.DomainNode" />
-	<property name="test.jar" value="sample-workpool-distributed-dynamic.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-	    <fileset dir="./rule-engine" id="drools.jar">
-		<include name="*.jar"/>	
-	    </fileset>	    
-	        <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${node.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>
-	
-    <target name="runDomainNode">
-        <java classname="${domain.class}"
-              fork="true">
-            <classpath>
-	  <fileset dir="./rule-engine" id="drools.jar">
-		<include name="*.jar"/>	
-	    </fileset>
-    		
-		
-		<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>    	        	
-        </java>
-    </target>
-	
-    <target name="runNodeA">
-        <java classname="${node.class}"
-              fork="true">
-		            <classpath>
-<fileset dir="./rule-engine" id="drools.jar">
-		<include name="*.jar"/>	
-	    </fileset>
-	
-		
-            	
-		<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	
-	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        	<arg value="http://u12:8877/"/>
-        	<arg value="nodeA"/>
-        	<!-- iterations -->
-            <arg value="10"/>        	
-                	<!-- jobs -->
-            	<arg value="1024"/>
-                	<!-- workers -->
-                	<arg value="4" />
-        </java>
-    </target>
-	
-    <target name="runNodeB">
-        <java classname="${node.class}"
-              fork="true">
-            <classpath>
-<fileset dir="./rule-engine" id="drools.jar">
-		<include name="*.jar"/>	
-	    </fileset>
-
-				
-	    	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-		
-            </classpath>
-        	<arg value="http://u12:8877/"/>
-        	<arg value="nodeB"/>
-        	<!-- iterations -->
-                	<arg value="1000000"/>        	
-                	<!-- jobs -->
-                	<arg value="1024"/>
-                	<!-- workers -->
-                	<arg value="4" />
-        </java>
-    </target>	
-	
-    <target name="runNodeC">
-        <java classname="${node.class}"
-              fork="true">
-            <classpath>
-	<fileset dir="./rule-engine" id="drools.jar">
-		<include name="*.jar"/>	
-	    </fileset>
-
-		<pathelement location="${drools.jar}"/>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-		    </classpath>
-        	<arg value="http://u12:8877/"/>
-        	<arg value="nodeC"/>
-        	<!-- iterations -->
-        	<arg value="1000000"/>        	
-        	<!-- jobs -->
-        	<arg value="1024"/>
-        	<!-- workers -->
-        	<arg value="4" />
-        </java>
-    </target>	
-	<target name="runNodeD">
-	        <java classname="${node.class}"
-	              fork="true">
-	            <classpath>
-		<fileset dir="./rule-engine" id="drools.jar">
-			<include name="*.jar"/>	
-		    </fileset>
-
-			<pathelement location="${drools.jar}"/>
-	            	<pathelement path="src/main/resources"/>
-	                <pathelement path="target/classes"/>
-	            	<pathelement path="target/${test.jar}"/>
-	            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-			    </classpath>
-	        	<arg value="http://u12:8877/"/>
-	        	<arg value="nodeD"/>
-	        	<!-- iterations -->
-	        	<arg value="1000000"/>        	
-	        	<!-- jobs -->
-	        	<arg value="1024"/>
-	        	<!-- workers -->
-	        	<arg value="4" />
-	        </java>
-	    </target>	
-	<target name="runNodeE">
-	        <java classname="${node.class}"
-	              fork="true">
-	            <classpath>
-		<fileset dir="./rule-engine" id="drools.jar">
-			<include name="*.jar"/>	
-		    </fileset>
-
-			<pathelement location="${drools.jar}"/>
-	            	<pathelement path="src/main/resources"/>
-	                <pathelement path="target/classes"/>
-	            	<pathelement path="target/${test.jar}"/>
-	            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-			    </classpath>
-	        	<arg value="http://u12:8877/"/>
-	        	<arg value="nodeE"/>
-	        	<!-- iterations -->
-	        	<arg value="1000000"/>        	
-	        	<!-- jobs -->
-	        	<arg value="1024"/>
-	        	<!-- workers -->
-	        	<arg value="4" />
-	        </java>
-	    </target>	
-
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>	
-	
-	<!-- If you want to test without building the distribution jars set the       -->
-	<!-- localtion value of the m2.repo on your machine and use the targets below -->
-	<property name="m2.repo"   value="/var/cache/maven/repo" />
-    <path id="repo.classpath">   	
-    	<pathelement location="target/classes"/>
-	<pathelement location="/var/cache/maven/repo/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
-	<pathelement location="/var/cache/maven/repo/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/>
-    	<pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>
-    	<pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>
-    	<pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.0-incubating\tuscany-binding-sca-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ws\security\wss4j\1.5.3\wss4j-1.5.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.0-incubating\tuscany-assembly-xml-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\rampart\rampart-trust\1.3\rampart-trust-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.5\axiom-api-1.2.5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.0-incubating\tuscany-assembly-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.0-incubating\tuscany-interface-wsdl-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.3\axis2-kernel-1.3.jar"/>
-    	<pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>
-    	<pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore\4.0-alpha5\httpcore-4.0-alpha5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.0-incubating\tuscany-interface-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.0-incubating\tuscany-policy-xml-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\1.0-incubating\tuscany-domain-api-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-extension-helper\1.0-incubating\tuscany-extension-helper-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0-M1\geronimo-activation_1.1_spec-1.0-M1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-jsonrpc\1.0-incubating\tuscany-binding-jsonrpc-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.0-incubating\tuscany-interface-java-xml-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\bouncycastle\bcprov-jdk15\136\bcprov-jdk15-136.jar"/>
-    	<pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>
-    	<pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\1.0-incubating\tuscany-node-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-adb\1.3\axis2-adb-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-mtompolicy\1.3\axis2-mtompolicy-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\1.0-incubating\tuscany-definitions-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.0-incubating\tuscany-host-embedded-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.3\axis2-java2wsdl-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-nio\4.0-alpha5\httpcore-nio-4.0-alpha5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.0-incubating\tuscany-binding-ws-xml-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.0-incubating\tuscany-contribution-java-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-impl\1.0-incubating\tuscany-domain-impl-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\xalan\xalan\2.7.0\xalan-2.7.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\rampart\rampart-core\1.3\rampart-core-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\1.0-incubating\tuscany-policy-security-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.0-incubating\tuscany-core-spi-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.0-incubating\tuscany-binding-sca-axis2-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>
-    	<pathelement location="${m2.repo}\jaxen\jaxen\1.1-beta-9\jaxen-1.1-beta-9.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\1.0-incubating\tuscany-sca-api-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\rampart\rampart-policy\1.3\rampart-policy-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-niossl\4.0-alpha5\httpcore-niossl-4.0-alpha5.jar"/>
-    	<pathelement location="${m2.repo}\com\metaparadigm\json-rpc\1.0\json-rpc-1.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.5\axiom-impl-1.2.5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.0-incubating\tuscany-binding-ws-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.0-incubating\tuscany-contribution-namespace-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.0-incubating\tuscany-policy-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.2\neethi-2.0.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.0-incubating\tuscany-interface-wsdl-xml-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.0-incubating\tuscany-core-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\1.0-incubating\tuscany-domain-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.0-M1\geronimo-javamail_1.4_spec-1.0-M1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.0-incubating\tuscany-contribution-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node-impl\1.0-incubating\tuscany-node-impl-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\santuario\xmlsec\1.4.0\xmlsec-1.4.0.jar"/>
-    	<pathelement location="${m2.repo}\commons-io\commons-io\1.2\commons-io-1.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.0-incubating\tuscany-databinding-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.5\axiom-dom-1.2.5.jar"/>
-    	<pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>
-    	<pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>
-    	<pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.0-incubating\tuscany-binding-ws-axis2-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.0-incubating\tuscany-host-http-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.0-incubating\tuscany-databinding-axiom-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.0-incubating\tuscany-contribution-impl-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.0-incubating\tuscany-interface-java-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.2\XmlSchema-1.3.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7b\woden-1.0-incubating-M7b.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.0-incubating\tuscany-binding-sca-xml-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.0-incubating\tuscany-core-databinding-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.0-incubating\tuscany-binding-sca-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-resource\1.0-incubating\tuscany-implementation-resource-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\rampart\rampart-trust\1.3\rampart-trust-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.5\axiom-api-1.2.5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.0-incubating\tuscany-assembly-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.0-incubating\tuscany-policy-xml-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-extension-helper\1.0-incubating\tuscany-extension-helper-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node-api\1.0-incubating\tuscany-node-api-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0-M1\geronimo-activation_1.1_spec-1.0-M1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-tomcat\1.0-incubating\tuscany-host-tomcat-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\opensaml\opensaml\1.1\opensaml-1.1.jar"/>
-    	<pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>
-    	<pathelement location="${m2.repo}\bouncycastle\bcprov-jdk15\136\bcprov-jdk15-136.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\1.0-incubating\tuscany-assembly-xsd-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-xmlbeans\1.3\axis2-xmlbeans-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-adb\1.3\axis2-adb-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-mtompolicy\1.3\axis2-mtompolicy-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-http\1.0-incubating\tuscany-binding-http-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.3\axis2-java2wsdl-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-nio\4.0-alpha5\httpcore-nio-4.0-alpha5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.0-incubating\tuscany-contribution-java-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-impl\1.0-incubating\tuscany-domain-impl-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\rampart\rampart-core\1.3\rampart-core-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\1.0-incubating\tuscany-policy-security-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tomcat\catalina\6.0.10\catalina-6.0.10.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.0-incubating\tuscany-core-spi-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.0-incubating\tuscany-binding-sca-axis2-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\jaxen\jaxen\1.1-beta-9\jaxen-1.1-beta-9.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\rampart\rampart-policy\1.3\rampart-policy-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-niossl\4.0-alpha5\httpcore-niossl-4.0-alpha5.jar"/>
-    	<pathelement location="${m2.repo}\junit\junit\4.2\junit-4.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.0-incubating\tuscany-contribution-namespace-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.0-incubating\tuscany-implementation-java-xml-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.0-incubating\tuscany-interface-wsdl-xml-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.0-incubating\tuscany-core-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\1.0-incubating\tuscany-domain-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.0-M1\geronimo-javamail_1.4_spec-1.0-M1.jar"/>
-    	<pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>
-    	<pathelement location="${m2.repo}\commons-io\commons-io\1.2\commons-io-1.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.5\axiom-dom-1.2.5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.0-incubating\tuscany-host-http-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.0-incubating\tuscany-interface-java-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.0-incubating\tuscany-contribution-impl-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.2\XmlSchema-1.3.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7b\woden-1.0-incubating-M7b.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.0-incubating\tuscany-binding-sca-xml-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>
-    	<pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ws\security\wss4j\1.5.3\wss4j-1.5.3.jar"/>
-    	<pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.0-incubating\tuscany-assembly-xml-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.0-incubating\tuscany-interface-wsdl-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.3\axis2-kernel-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore\4.0-alpha5\httpcore-4.0-alpha5.jar"/>
-    	<pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.0-incubating\tuscany-interface-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-jsonrpc\1.0-incubating\tuscany-binding-jsonrpc-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.0-incubating\tuscany-interface-java-xml-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>
-    	<pathelement location="${m2.repo}\javax\servlet\servlet-api\2.5\servlet-api-2.5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\1.0-incubating\tuscany-node-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\1.0-incubating\tuscany-definitions-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.0-incubating\tuscany-host-embedded-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\commons-collections\commons-collections\3.1\commons-collections-3.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.0-incubating\tuscany-binding-ws-xml-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.0-incubating\tuscany-implementation-java-runtime-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\xalan\xalan\2.7.0\xalan-2.7.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-adb-codegen\1.3\axis2-adb-codegen-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\1.0-incubating\tuscany-sca-api-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tomcat\coyote\6.0.10\coyote-6.0.10.jar"/>
-    	<pathelement location="${m2.repo}\com\metaparadigm\json-rpc\1.0\json-rpc-1.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.5\axiom-impl-1.2.5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.0-incubating\tuscany-binding-ws-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\commons-discovery\commons-discovery\0.2\commons-discovery-0.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.2\neethi-2.0.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.0-incubating\tuscany-policy-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.0-incubating\tuscany-implementation-java-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.0-incubating\tuscany-contribution-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tomcat\annotations-api\6.0.10\annotations-api-6.0.10.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node-impl\1.0-incubating\tuscany-node-impl-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\santuario\xmlsec\1.4.0\xmlsec-1.4.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tomcat\juli\6.0.10\juli-6.0.10.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.0-incubating\tuscany-databinding-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>
-    	<pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-codegen\1.3\axis2-codegen-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.0-incubating\tuscany-binding-ws-axis2-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.0-incubating\tuscany-databinding-axiom-1.0-incubating.jar"/>
-    	<pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.0-incubating\tuscany-core-databinding-1.0-incubating.jar"/>  	
-   </path>	
-    	
-    <target name="runDomainNodeRepo">
-        <java classname="${domain.class}"
-              fork="true">
-            <classpath>
-            	<path refid="repo.classpath"/>
-            </classpath>    	        	
-        </java>
-    </target>
-	
-    <target name="runNodeARepo">
-        <java classname="${node.class}"
-              fork="true">
-            <classpath>
-            	<path refid="repo.classpath"/>
-            </classpath>
-        	<arg value="http://u12:8877/"/>
-        	<arg value="nodeA"/>        	        	
-        </java>
-    </target>
-	
-    <target name="runNodeARepoLoop">
-        <java classname="${node.class}"
-              fork="true">
-            <classpath>
-                <path refid="repo.classpath"/>
-            </classpath>
-            <arg value="http://u12:8877/"/>
-            <arg value="nodeA"/>    
-        	<arg value="loop"/>
-        </java>
-    </target>	
-	
-    <target name="runNodeBRepo">
-        <java classname="${node.class}"
-              fork="true">
-            <classpath>
-            	<path refid="repo.classpath"/>
-            </classpath>
-        	<arg value="http://u12:8877/"/>
-        	<arg value="nodeB"/>        	
-        </java>
-    </target>	
-	
-    <target name="runNodeCRepo">
-        <java classname="${node.class}"
-              fork="true">
-            <classpath>
-            	<path refid="repo.classpath"/>
-            </classpath>
-        	<arg value="http://u12:8877/"/>
-        	<arg value="nodeC"/>        	
-        </java>
-    </target>	
-	
-</project>
diff --git a/java/sca-contrib/demos/workpool-distributed/pom.xml b/java/sca-contrib/demos/workpool-distributed/pom.xml
deleted file mode 100644
index 6d441bdfaf..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/pom.xml
+++ /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.    
--->
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-sca</artifactId>
-		<version>2.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-	<artifactId>demo-workpool-distributed</artifactId>
-	<name>Apache Tuscany SCA Distributed Job Workpool Demo</name>
-
-	<repositories>
-		<repository>
-			<id>apache.incubator</id>
-			<url>
-				http://people.apache.org/repo/m2-incubating-repository
-			</url>
-		</repository>
-        <repository>
-            <id>org.drools</id>
-            <url>http://repository.jboss.com/maven2/org/drools/</url>
-        </repository>
-	</repositories>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-embedded</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-        <dependency>
-			<groupId>org.drools</groupId>
-			<artifactId>drools</artifactId>
-			<version>4.0.4</version>
-        </dependency>
-
-		<dependency>
-			<groupId>antlr</groupId>
-			<artifactId>antlr</artifactId>
-			<version>2.7.1</version>
-		</dependency>
-	<dependency>
-	  <groupId>commons-daemon</groupId>
-  	<artifactId>commons-daemon</artifactId>
-  	<version>1.0.1</version>
-  	</dependency>
-	
-		<dependency>
-			<groupId>antlr</groupId>
-			<artifactId>stringtemplate</artifactId>
-			<version>2.3b6</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-node-impl</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-domain-impl</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-sca-axis2</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-http-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-job</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-contribution-updater</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-xstream</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-resource-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-tomcat</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.2</version>
-			<scope>test</scope>
-		</dependency>
-
-	</dependencies>
-
-	<build>
-		<finalName>${artifactId}</finalName>
-	</build>
-</project>
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/DomainNode.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/node/DomainNode.java
deleted file mode 100644
index a278499aae..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/DomainNode.java
+++ /dev/null
@@ -1,57 +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 node;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.domain.SCADomainFactory;
-
-/**
- * This server program that loads a composite to provide simple registry
- * function. This server can be replaced with any registry that is appropriate
- * but the components in each node that talk to the registry should be replaced
- * also.
- */
-public class DomainNode {
-
-    private static String DEFAULT_DOMAIN_URI = "http://u12:8877";
-    private boolean stopped = true;
-
-    public static void main(String[] args) {
-
-        try {
-
-            SCADomainFactory domainFactory = SCADomainFactory.newInstance();
-            SCADomain domain = domainFactory
-                    .createSCADomain(DEFAULT_DOMAIN_URI);
-
-            System.out.println("Domain started (press enter to shutdown)");
-            System.in.read();
-            // waitForever();
-            domain.destroy();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        System.out.println("Domain stopped");
-    }
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java
deleted file mode 100644
index 9d05761ad6..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java
+++ /dev/null
@@ -1,79 +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 node;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import org.apache.commons.daemon.Daemon;
-import org.apache.commons.daemon.DaemonContext;
-import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.domain.SCADomainFactory;
-
-/**
- * This server program that loads a composite to provide simple registry
- * function. This server can be replaced with any registry that is appropriate
- * but the components in each node that talk to the registry should be replaced
- * also.
- */
-public class DomainNodeDaemon implements Daemon {
-
-    private SCADomain domain;
-    private static String DEFAULT_DOMAIN_URI = "http://u12:8877";
-    private boolean stopped = true;
-
-    private synchronized void waitForever() {
-        while (!stopped) {
-            try {
-                wait();
-            } catch (InterruptedException ex) {
-                stopped = true;
-                return;
-            }
-        }
-
-    }
-
-    public void destroy() {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void init(DaemonContext arg0) throws Exception {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void start() throws Exception {
-
-        SCADomainFactory domainFactory = SCADomainFactory.newInstance();
-        domain = domainFactory.createSCADomain(DEFAULT_DOMAIN_URI);
-
-        System.out.println("Domain started (press enter to shutdown)");
-        waitForever();
-
-    }
-
-    public void stop() throws Exception {
-        // TODO Auto-generated method stub
-        Thread.currentThread().interrupt();
-        domain.destroy();
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/TestJob.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/node/TestJob.java
deleted file mode 100644
index f48e647bd6..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/TestJob.java
+++ /dev/null
@@ -1,82 +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 node;
-
-import org.apache.tuscany.sca.databinding.job.Job;
-import org.apache.tuscany.sca.databinding.job.JobDataMap;
-import org.apache.tuscany.sca.databinding.job.JobExecutionContext;
-import org.apache.tuscany.sca.databinding.job.RemoteJob;
-
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
-
-public class TestJob extends RemoteJob<Double> implements java.io.Serializable {
-    private boolean EOS = false;
-    private Double value;
-
-    public TestJob(Double x, long iterations, int[] items) {
-        JobDataMap map = new JobDataMap();
-        map.addJobData("value", x);
-        map.addJobData("iterations", iterations);
-        map.addJobData("items", items);
-        context.setJobData(map);
-    }
-
-    public TestJob(Double i, boolean eos) {
-        value = i;
-        this.EOS = eos;
-    }
-
-    public TestJob(String jsonData) {
-        JobExecutionContext ctxt = new JobExecutionContext();
-        ctxt.storeJSONData(jsonData);
-    }
-
-    public int getType() {
-        return Job.REGULAR_JOB;
-    }
-
-    public void setEOS() {
-        EOS = true;
-    }
-
-    public boolean eos() {
-        return EOS;
-    }
-
-    @Override
-    public Double compute(JobExecutionContext context) {
-        JobDataMap contextMap = context.getJobData();
-        Long iterations = (Long) contextMap.getJobDataObject("iterations");
-        Double value = (Double) contextMap.getJobDataObject("value");
-        double x = value.doubleValue();
-        System.out.println("Computing sinx for " + value + " for "
-                + iterations.intValue() + " times");
-        long computing_start = System.currentTimeMillis();
-        for (long i = 0; i < iterations.longValue(); ++i) {
-            x = Math.sin(x);
-        }
-        long computing_end = System.currentTimeMillis();
-        System.out.println("Computing time= "
-                + (computing_end - computing_start));
-        System.out.println("Send result = " + x);
-        return new Double(x);
-    }
-
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java
deleted file mode 100644
index 1f2a4d1f9a..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java
+++ /dev/null
@@ -1,271 +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 node;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.commons.daemon.Daemon;
-import org.apache.commons.daemon.DaemonContext;
-import org.apache.commons.daemon.DaemonController;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.DeployedArtifact;
-import org.apache.tuscany.sca.contribution.service.impl.ContributionServiceImpl;
-import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.node.NodeException;
-import org.apache.tuscany.sca.node.NodeManagerInitService;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.SCANodeImpl;
-import org.apache.tuscany.sca.node.management.SCANodeManagerInitService;
-
-import java.net.URI;
-
-import workpool.WorkerManager;
-import workpool.WorkerManagerImpl;
-import workpool.WorkpoolManager;
-import workpool.WorkpoolService;
-import workpool.WorkpoolServiceImpl;
-
-/**
- * This client program shows how to run a distributed SCA node. In this case a
- * calculator node has been constructed specifically for running the calculator
- * composite. Internally it creates a representation of a node and associates a
- * distributed domain with the node. This separation is made different
- * implementations of the distributed domain can be provided.
- */
-public class WorkpoolDaemon implements Daemon, Runnable {
-    private String domainName;
-    private String nodeName;
-    private long iterations;
-    private long jobsNo;
-    private long workerNo;
-    private SCANode node;
-    private boolean stopped = false;
-    private DaemonController controller = null;
-    private Thread thread = null;
-    private String ruleFile = "workerRules.drl";
-
-    /*
-     * public static void main(String[] args) throws Exception {
-     *  // Check that the correct arguments have been provided if (null == args ||
-     * args.length < 4) { System.err.println("Usage: java WorkpoolNode
-     * domainname nodename iterTest workerNo"); System.exit(1); }
-     * 
-     * try { String domainName = args[0]; String nodeName = args[1]; long
-     * iterations = Long.parseLong(args[2]); long jobsNo =
-     * Long.parseLong(args[3]); long workerNo = Long.parseLong(args[4]);
-     * ClassLoader cl = WorkpoolDaemon.class.getClassLoader();
-     * 
-     * SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); node =
-     * nodeFactory.createSCANode(null, domainName);
-     * node.addContribution(nodeName, cl.getResource(nodeName + "/"));
-     * node.addToDomainLevelComposite(new QName("http://sample", "Workpool"));
-     * node.start(); // nodeA is the head node and runs some tests while all
-     * other nodes // simply listen for incoming messages
-     * 
-     * FileReader rules = new FileReader("workerRules.drl"); StringBuffer buffer =
-     * new StringBuffer();
-     * 
-     * BufferedReader br = new BufferedReader(rules); String ruleString; do {
-     * ruleString = br.readLine(); if (ruleString!=null) {
-     * buffer.append(ruleString);} } while (ruleString!=null);
-     * 
-     * if ( nodeName.equals("nodeA") ) { // do some application stuff
-     * WorkpoolService workpoolService =
-     * node.getDomain().getService(WorkpoolService.class,
-     * "WorkpoolServiceComponent"); workpoolService.start();
-     * NodeManagerInitService nodeInit =
-     * node.getDomain().getService(NodeManagerInitService.class,
-     * "WorkpoolManagerComponent/NodeManagerInitService");
-     * nodeInit.setNode(node); WorkpoolManager workpoolManager =
-     * node.getDomain().getService(WorkpoolManager.class,
-     * "WorkpoolManagerComponent/WorkpoolManager");
-     * workpoolManager.setWorkpoolReference(node.getDomain().getServiceReference(WorkpoolService.class,
-     * "WorkpoolServiceComponent"));
-     * workpoolManager.acceptRules(buffer.toString()); workpoolManager.start();
-     * int items[] = {3,4,5,6,3,6,3,5,9,5,6};
-     * 
-     * double x = 398349; for (int i = 0; i < jobsNo; ++i)
-     * workpoolService.submit(new TestJob(x,iterations,items));
-     * 
-     * TestJob j = new TestJob(-1.0,true); for (int i = 0; i < workerNo+1; ++i){
-     * j.setEOS(); workpoolService.submit(j); } } try { if
-     * (nodeName.equals("nodeB")) { NodeManagerInitService serviceNodeB =
-     * node.getDomain().getService(NodeManagerInitService.class,"WorkerManagerNodeBComponent/NodeManagerInitService");
-     * serviceNodeB.setNode(node); } if (nodeName.equals("nodeC")) {
-     * NodeManagerInitService workerManagerC =
-     * node.getDomain().getService(NodeManagerInitService.class,"WorkerManagerNodeCComponent/NodeManagerInitService");
-     * workerManagerC.setNode(node); } if (nodeName.equals("nodeD")) {
-     * NodeManagerInitService workerManagerD =
-     * node.getDomain().getService(NodeManagerInitService.class,"WorkerManagerNodeDComponent/NodeManagerInitService");
-     * workerManagerD.setNode(node); } if (nodeName.equals("nodeE")) {
-     * NodeManagerInitService workerManagerE =
-     * node.getDomain().getService(NodeManagerInitService.class,"WorkerManagerNodeEComponent/NodeManagerInitService");
-     * workerManagerE.setNode(node); }
-     * 
-     * System.out.println("Node started (press enter to shutdown)");
-     * System.in.read(); } catch (IOException e) { e.printStackTrace(); } //
-     * stop the node and all the domains in it node.stop(); node.destroy();
-     * System.exit(0); } catch(Exception ex) { System.err.println("Exception in
-     * node - " + ex.getMessage()); ex.printStackTrace(System.err); } }
-     */
-    public void destroy() {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void init(DaemonContext arg0) throws Exception {
-        String[] args = arg0.getArguments();
-        domainName = args[0];
-        nodeName = args[1];
-        iterations = Long.parseLong(args[2]);
-        jobsNo = Long.parseLong(args[3]);
-        workerNo = Long.parseLong(args[4]);
-        if (args.length == 6) {
-            ruleFile = args[5];
-        }
-        this.controller = arg0.getController();
-        // this.thread=new Thread(this);
-    }
-
-    public void start() throws Exception {
-
-        ClassLoader cl = WorkpoolDaemon.class.getClassLoader();
-
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(null, domainName);
-        node.addContribution(nodeName, cl.getResource(nodeName + "/"));
-        node.addToDomainLevelComposite(new QName("http://sample", "Workpool"));
-        node.start();
-        // nodeA is the head node and runs some tests while all other nodes
-        // simply listen for incoming messages
-
-        FileReader rules = new FileReader(ruleFile);
-        StringBuffer buffer = new StringBuffer();
-
-        BufferedReader br = new BufferedReader(rules);
-        String ruleString;
-        do {
-            ruleString = br.readLine();
-            if (ruleString != null) {
-                buffer.append(ruleString + "\n");
-            }
-        } while (ruleString != null);
-
-        if (nodeName.equals("nodeA")) {
-            // do some application stuff
-            WorkpoolService workpoolService = node.getDomain().getService(
-                    WorkpoolService.class, "WorkpoolServiceComponent");
-            workpoolService.start();
-            SCANodeManagerInitService nodeInit = node.getDomain().getService(
-                    SCANodeManagerInitService.class,
-                    "WorkpoolManagerComponent/NodeManagerInitService");
-            nodeInit.setNode(node);
-            WorkpoolManager workpoolManager = node.getDomain().getService(
-                    WorkpoolManager.class,
-                    "WorkpoolManagerComponent/WorkpoolManager");
-            workpoolManager.setWorkpoolReference(node.getDomain()
-                    .getServiceReference(WorkpoolService.class,
-                            "WorkpoolServiceComponent"));
-            workpoolManager.acceptRules(buffer.toString());
-            workpoolManager.start();
-
-            int items[] = { 3, 4, 5, 6, 3, 6, 3, 5, 9, 5, 6 };
-
-            double x = 398349;
-            for (int i = 0; i < jobsNo; ++i) {
-                workpoolService.submit(new TestJob(x, iterations, items));
-            }
-            TestJob j = new TestJob(-1.0, true);
-            for (int i = 0; i < workerNo + 1; ++i) {
-                j.setEOS();
-                workpoolService.submit(j);
-            }
-
-        }
-        if (nodeName.equals("nodeB")) {
-            SCANodeManagerInitService workerManagerNodeB = node
-                    .getDomain()
-                    .getService(SCANodeManagerInitService.class,
-                            "WorkerManagerNodeBComponent/NodeManagerInitService");
-            workerManagerNodeB.setNode(node);
-        }
-
-        if (nodeName.equals("nodeC")) {
-            SCANodeManagerInitService workerManagerNodeC = node
-                    .getDomain()
-                    .getService(SCANodeManagerInitService.class,
-                            "WorkerManagerNodeCComponent/NodeManagerInitService");
-            workerManagerNodeC.setNode(node);
-        }
-
-        if (nodeName.equals("nodeD")) {
-            SCANodeManagerInitService workerManagerNodeD = node
-                    .getDomain()
-                    .getService(SCANodeManagerInitService.class,
-                            "WorkerManagerNodeDComponent/NodeManagerInitService");
-            workerManagerNodeD.setNode(node);
-        }
-
-        if (nodeName.equals("nodeE")) {
-            SCANodeManagerInitService workerManagerNodeE = node
-                    .getDomain()
-                    .getService(SCANodeManagerInitService.class,
-                            "WorkerManagerNodeEComponent/NodeManagerInitService");
-            workerManagerNodeE.setNode(node);
-        }
-
-        this.waitForever();
-        // this.thread.start();
-    }
-
-    public void stop() throws Exception {
-        Thread.currentThread().interrupt();
-        // thread.interrupt();
-        node.stop();
-        node.destroy();
-    }
-
-    private synchronized void waitForever() {
-        while (!stopped) {
-            try {
-                wait();
-            } catch (InterruptedException ex) {
-                stopped = true;
-                return;
-            }
-        }
-    }
-
-    public void run() {
-        waitForever();
-    }
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java
deleted file mode 100644
index 86557548af..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java
+++ /dev/null
@@ -1,179 +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 node;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.DeployedArtifact;
-import org.apache.tuscany.sca.contribution.service.impl.ContributionServiceImpl;
-import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.node.NodeManagerInitService;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.impl.SCANodeImpl;
-import java.net.URI;
-
-import workpool.WorkerManager;
-import workpool.WorkerManagerImpl;
-import workpool.WorkpoolManager;
-import workpool.WorkpoolService;
-import workpool.WorkpoolServiceImpl;
-
-/**
- * This client program shows how to run a distributed SCA node. In this case a
- * calculator node has been constructed specifically for running the calculator
- * composite. Internally it creates a representation of a node and associates a
- * distributed domain with the node. This separation is made different
- * implementations of the distributed domain can be provided.
- */
-public class WorkpoolNode {
-
-    public static void main(String[] args) throws Exception {
-
-        // Check that the correct arguments have been provided
-        if (null == args || args.length < 4) {
-            System.err
-                    .println("Useage: java WorkpoolNode domainname nodename iterTest workerNo");
-            System.exit(1);
-        }
-        BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
-        String domainName = args[0];
-        String nodeName = args[1];
-        long iterations = Long.parseLong(args[2]);
-        long jobsNo = Long.parseLong(args[3]);
-        long workerNo = Long.parseLong(args[4]);
-        ClassLoader cl = WorkpoolNode.class.getClassLoader();
-
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        SCANode node = nodeFactory.createSCANode(null, domainName);
-        node.addContribution(nodeName, cl.getResource(nodeName + "/"));
-        node.addToDomainLevelComposite(new QName("http://sample", "Workpool"));
-        node.start();
-        // nodeA is the head node and runs some tests while all other nodes
-        // simply listen for incoming messages
-
-        FileReader rules = new FileReader("workerRules.drl");
-        StringBuffer buffer = new StringBuffer();
-
-        BufferedReader br = new BufferedReader(rules);
-        String ruleString;
-        do {
-            ruleString = br.readLine();
-            if (ruleString != null) {
-                buffer.append(ruleString + "\n");
-            }
-        } while (ruleString != null);
-
-        if (nodeName.equals("nodeA")) {
-            // do some application stuff
-            WorkpoolService workpoolService = node.getDomain().getService(
-                    WorkpoolService.class, "WorkpoolServiceComponent");
-            workpoolService.start();
-            NodeManagerInitService nodeInit = node.getDomain().getService(
-                    NodeManagerInitService.class,
-                    "WorkpoolManagerComponent/NodeManagerInitService");
-            nodeInit.setNode(node);
-            WorkpoolManager workpoolManager = node.getDomain().getService(
-                    WorkpoolManager.class,
-                    "WorkpoolManagerComponent/WorkpoolManager");
-            workpoolManager.setWorkpoolReference(node.getDomain()
-                    .getServiceReference(WorkpoolService.class,
-                            "WorkpoolServiceComponent"));
-            workpoolManager.setCycleTime(8000);
-            workpoolManager.acceptRules(buffer.toString());
-            workpoolManager.start();
-            int items[] = { 3, 4, 5, 6, 3, 6, 3, 5, 9, 5, 6 };
-
-            double x = 398349;
-
-            for (int i = 0; i < jobsNo; ++i)
-                workpoolService.submit(new TestJob(x, iterations, items));
-
-            TestJob j = new TestJob(-1.0, true);
-            for (int i = 0; i < workerNo + 1; ++i) {
-                j.setEOS();
-                workpoolService.submit(j);
-            }
-
-        }
-        try {
-            if (nodeName.equals("nodeB")) {
-                NodeManagerInitService serviceNodeB = node
-                        .getDomain()
-                        .getService(NodeManagerInitService.class,
-                                "WorkerManagerNodeBComponent/NodeManagerInitService");
-                serviceNodeB.setNode(node);
-            }
-            if (nodeName.equals("nodeC")) {
-                NodeManagerInitService workerManagerC = node
-                        .getDomain()
-                        .getService(NodeManagerInitService.class,
-                                "WorkerManagerNodeCComponent/NodeManagerInitService");
-                workerManagerC.setNode(node);
-            }
-            if (nodeName.equals("nodeD")) {
-                NodeManagerInitService workerManagerD = node
-                        .getDomain()
-                        .getService(NodeManagerInitService.class,
-                                "WorkerManagerNodeDComponent/NodeManagerInitService");
-                workerManagerD.setNode(node);
-            }
-            if (nodeName.equals("nodeE")) {
-                NodeManagerInitService workerManagerE = node
-                        .getDomain()
-                        .getService(NodeManagerInitService.class,
-                                "WorkerManagerNodeEComponent/NodeManagerInitService");
-                workerManagerE.setNode(node);
-            }
-
-            System.out.println("Node started (press enter to shutdown)");
-            String buff;
-            for (;;) {
-                try {
-                    buff = in.readLine();
-                    if (buff == null)
-                        break;
-                    System.out.print(in.readLine());
-                } catch (IOException ex) {
-                    break; // Exit thread.
-                }
-            }
-            // stop the node and all the domains in it
-            node.stop();
-            node.destroy();
-            System.exit(0);
-        } catch (Exception ex) {
-            System.err.println("Exception in node - " + ex.getMessage());
-            ex.printStackTrace(System.err);
-        }
-    }
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/workerRules1.drl b/java/sca-contrib/demos/workpool-distributed/src/main/java/node/workerRules1.drl
deleted file mode 100644
index 9c5a5d1b7f..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/workerRules1.drl
+++ /dev/null
@@ -1,13 +0,0 @@
-package workpool
-import workpool.*;
-rule "WorkerAdder1"
-	when 
-		$workerBean: WorkpoolBean(singleAction == false && (jobComputed > 500))
-	then
-		$workerBean.setSingleAction()
-		$workerBean.addWorkerToNode("nodeB")
-		$workerBean.addWorkerToNode("nodeC")
-		$workerBean.addWorkerToNode("nodeD")
-		$workerBean.addWorkerToNode("nodeE")
-end
-		
\ No newline at end of file
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java
deleted file mode 100644
index cdd0f30b34..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java
+++ /dev/null
@@ -1,85 +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 workpool;
-
-import java.io.StringReader;
-import java.net.URI;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.logging.Logger;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.MetaComponent;
-import org.apache.tuscany.sca.assembly.impl.DefaultMetaComponent;
-
-public class MetaComponentWorker extends DefaultMetaComponent {
-
-    private SecureRandom prng;
-    private String componentName;
-    private String scdl;
-    private String javaClass;
-    private boolean loadedFromString = false;
-    private Logger log = Logger.getLogger(MetaComponentWorker.class.getName());
-
-    public MetaComponentWorker() {
-        componentName = "WorkerComponent"
-                + java.util.UUID.randomUUID().toString();
-    }
-
-    public void setWorkerName(String componentName) {
-        this.componentName = componentName;
-    }
-
-    public void setWorkerClass(String javaClass) {
-        this.javaClass = javaClass;
-    }
-
-    private String generateSCDL() {
-        StringBuffer buffer = new StringBuffer(512);
-        buffer
-                .append("<component xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" name=\"");
-        buffer.append(this.componentName);
-        buffer.append("\">\n");
-        buffer.append("<implementation.java class=\"");
-        buffer.append(this.javaClass);
-        buffer.append("\"/>");
-        buffer.append("<property name=\"workerName\">");
-        buffer.append(this.componentName);
-        buffer.append("</property>\n</component>");
-        return buffer.toString();
-    }
-
-    @Override
-    public XMLStreamReader build() throws Exception {
-        XMLInputFactory factory = XMLInputFactory.newInstance();
-        if (!loadedFromString)
-            scdl = generateSCDL();
-        return factory.createXMLStreamReader(new StringReader(scdl));
-
-    }
-
-    public String getName() {
-
-        return componentName;
-    }
-
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/MyWorker.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/MyWorker.java
deleted file mode 100644
index 3d4df38c95..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/MyWorker.java
+++ /dev/null
@@ -1,46 +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 workpool;
-
-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
-import org.apache.tuscany.sca.databinding.job.Job;
-import org.apache.tuscany.sca.databinding.job.JobDataMap;
-import org.apache.tuscany.sca.databinding.job.JobExecutionContext;
-import org.apache.tuscany.sca.databinding.job.RemoteJob;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class MyWorker extends WorkerServiceImpl<Object, Double> {
-    private static int resultcount = 0;
-
-    @Override
-    public ResultJob computeTask(Job<Object, Double> job) {
-
-        RemoteJob remoteJob = (RemoteJob) job;
-        System.out.println("Computing the job");
-        JobExecutionContext context = remoteJob.getContext();
-        ResultJob resultJob = new ResultJob();
-        JobDataMap resultMap = new JobDataMap();
-        resultMap.addJobData("result", remoteJob.compute(context));
-        resultJob.setJobDataMap(resultMap);
-        System.out.println("Count result = " + (++resultcount));
-        return resultJob;
-    }
-
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/NullJob.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/NullJob.java
deleted file mode 100644
index fb930adf2e..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/NullJob.java
+++ /dev/null
@@ -1,43 +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 workpool;
-
-import org.apache.tuscany.sca.databinding.job.Job;
-import org.apache.tuscany.sca.databinding.job.JobDataMap;
-
-public class NullJob implements Job, java.io.Serializable {
-
-    public Object compute(Object arg0) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public JobDataMap getDataMap() {
-        return null;
-    }
-
-    public boolean eos() {
-        return false;
-    }
-
-    public int getType() {
-        return Job.NULL_JOB;
-    }
-
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/ResultJob.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/ResultJob.java
deleted file mode 100644
index e04411668b..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/ResultJob.java
+++ /dev/null
@@ -1,54 +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 workpool;
-
-import org.apache.tuscany.sca.databinding.job.Job;
-import org.apache.tuscany.sca.databinding.job.JobDataMap;
-import org.apache.tuscany.sca.databinding.job.JobExecutionContext;
-import org.apache.tuscany.sca.databinding.job.RemoteJob;
-
-public class ResultJob extends RemoteJob<Object> implements
-        java.io.Serializable {
-    private JobDataMap map;
-
-    public JobDataMap getDataMap() {
-        return map;
-    }
-
-    public void setJobDataMap(JobDataMap map) {
-        this.map = map;
-    }
-
-    public boolean eos() {
-        // TODO Auto-generated method stub
-        return true;
-    }
-
-    public int getType() {
-        // TODO Auto-generated method stub
-        return Job.RESULT_JOB;
-    }
-
-    @Override
-    public Object compute(JobExecutionContext v) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/Trigger.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/Trigger.java
deleted file mode 100644
index 52703d6954..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/Trigger.java
+++ /dev/null
@@ -1,29 +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 workpool;
-
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.apache.tuscany.sca.databinding.job.Job;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@DataBinding("org.apache.tuscany.sca.databinding.job.Job")
-public interface Trigger<T> {
-    void handleEvent(T c);
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java
deleted file mode 100644
index d2b306cbd5..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManager.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 workpool;
-import org.oasisopen.sca.annotation.Remotable;
-import org.oasisopen.sca.CallableReference;
-@Remotable
-public interface WorkerManager {
-    CallableReference<WorkerService> addWorker();
-    boolean removeWorker(String workerName);
-    boolean removeWorkers(int k);
-    boolean removeAllWorkers();
-    double getNodeLoad();
-    int activeWorkers();
-    void start();
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java
deleted file mode 100644
index 9660a6c2b2..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java
+++ /dev/null
@@ -1,213 +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 workpool;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.DeployedArtifact;
-import org.apache.tuscany.sca.contribution.service.impl.ContributionServiceImpl;
-import org.oasisopen.sca.CallableReference;
-import org.apache.tuscany.sca.node.management.SCANodeManagerInitService;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.impl.SCANodeImpl;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-import java.util.LinkedList;
-import java.util.ArrayList;
-
-@Scope("COMPOSITE")
-@Service(interfaces = { SCANodeManagerInitService.class, WorkerManager.class })
-public class WorkerManagerImpl implements WorkerManager, SCANodeManagerInitService {
-    private Logger log = Logger.getLogger(WorkerManagerImpl.class.getName());
-    private LinkedList<CallableReference<WorkerService>> activeWorkers = new LinkedList<CallableReference<WorkerService>>();
-    private List<String> workerComponentNames = new ArrayList<String>();
-    private SCANodeImpl node;
-    @Property
-    protected String nodeName;
-    @Property
-    protected String compositeName;
-    @Property
-    protected String workerClass;
-    @Context
-    protected ComponentContext context;
-    private double loadAverage;
-
-    /* This method is used to find a composite inside all deployed artifacts */
-    private Composite findComposite(List<Composite> artifacts) {
-        for (Composite fact : artifacts) {
-                log.info("Searching in a contribution deployed artifacts -"
-                        + compositeName);
-                Composite augmented = (Composite) fact;
-                // found
-                if (augmented.getURI().equals(compositeName)) {
-                    log.info("Found composite..." + compositeName);
-                    return augmented;
-                }
-            }
-        }
-        return null;
-    }
-
-    public CallableReference<WorkerService> addWorker() {
-        log.info("Adding a new worker call..");
-        long addWorkerStartTime = System.nanoTime();
-        ContributionServiceImpl cServiceImpl = (ContributionServiceImpl) node.getContributionService();
-        Contribution contribution = cServiceImpl.getContribution(nodeName);
-        List<Composite> artifacts = contribution.getDeployables();
-        CallableReference<WorkerService> workerReference = null;
-        CallableReference<WorkerService> ref = null;
-        log.info("Creating a MetaComponentWorker..");
-        MetaComponentWorker mcw = new MetaComponentWorker();
-        boolean found = false;
-        mcw.setWorkerClass(workerClass);
-        Composite augmented = findComposite(artifacts);
-        try {
-            if (augmented != null) {
-                long startCreation = System.nanoTime();
-                node.addComponentToComposite(mcw, contribution.getURI(),
-                        augmented.getURI());
-                System.out.println("addComponentToComposite time = "
-                        + (System.nanoTime() - startCreation));
-                RuntimeComponent workerComponent = (RuntimeComponent) node
-                        .getComponent(mcw.getName());
-                if (workerComponent != null) {
-                    ref = (CallableReference<WorkerService>) workerComponent
-                            .getComponentContext().createSelfReference(
-                                    WorkerService.class);
-                    ref.getService().start();
-                    activeWorkers.addLast(ref);
-                    workerComponentNames.add(mcw.getName());
-                    CallableReference<WorkerManager> manager = (CallableReference) context
-                            .createSelfReference(WorkerManager.class,
-                                    "WorkerManager");
-                    ref.getService().registerManager(manager);
-                    return ref;
-                }
-            } else {
-                log.info("Workpool composite not found!");
-            }
-        } catch (Exception e) {
-            log.info("Exception activation");
-            e.printStackTrace();
-        }
-        ;
-        System.out.println("Component Creation Time ="
-                + (System.nanoTime() - addWorkerStartTime));
-        return ref;
-    }
-
-    public boolean removeAllWorkers() {
-        for (CallableReference<WorkerService> callable : activeWorkers) {
-            callable.getService().stop();
-        }
-        return true;
-    }
-
-    public boolean removeWorker() {
-        CallableReference<WorkerService> callable = activeWorkers
-                .removeLast();
-        callable.getService().stop();
-        return true;
-    }
-
-    public boolean removeWorkers(int k) {
-        if (k >= activeWorkers.size())
-            return false;
-        for (int i = 0; i < k; ++i) {
-            if (!removeWorker())
-                return false;
-        }
-        return true;
-    }
-
-    public void setNode(SCANode node) {
-        this.node = (SCANodeImpl) node;
-
-    }
-
-    public double getNodeLoad() {
-        /*
-         * FIXME [jo] this works only on Linux To be replaced with an JNI
-         * extension
-         */
-        RandomAccessFile statfile;
-
-        this.loadAverage = 1.0;
-        // load = 0;
-        int NoProcessors = 0;
-        String cpuLine = null;
-        try {
-            NoProcessors = Runtime.getRuntime().availableProcessors();
-            if (NoProcessors > 1)
-                this.loadAverage = 1 / (1.0 * NoProcessors);
-            statfile = new RandomAccessFile("/proc/loadavg", "r");
-            try {
-                statfile.seek(0);
-                cpuLine = statfile.readLine();
-
-            } catch (IOException e) {
-                // FIX ME: Better exception handling.
-                e.printStackTrace();
-            }
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (NumberFormatException e) {
-            e.printStackTrace();
-        }
-        double min1;
-        if (cpuLine != null) {
-            java.util.StringTokenizer st = new java.util.StringTokenizer(
-                    cpuLine, " ");
-            min1 = Double.parseDouble(st.nextToken());
-        } else
-            min1 = 0;
-
-        return min1 * this.loadAverage;
-    }
-
-    public int activeWorkers() {
-        return activeWorkers.size();
-    }
-
-    public boolean removeWorker(String workerName) {
-        RuntimeComponent workerComponent = (RuntimeComponent) node
-                .getComponent(workerName);
-        if (workerComponent != null) {
-            log.info("Removing component " + workerName);
-            node.removeComponentFromComposite(nodeName, "Workpool.composite",
-                    workerName);
-            return true;
-        }
-        return false;
-    }
-
-    public void start() {
-        // do nothing for now.
-    }
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerService.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerService.java
deleted file mode 100644
index 3f702db369..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerService.java
+++ /dev/null
@@ -1,56 +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 workpool;
-
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-import org.oasisopen.sca.annotation.OneWay;
-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.apache.tuscany.sca.databinding.job.Job;
-
-/**
- * The interface for the multiply service
- */
-@Remotable
-@Callback(WorkerServiceCallback.class)
-@DataBinding("org.apache.tuscany.sca.databinding.job.Job")
-public interface WorkerService<T, E> {
-    @OneWay
-    void compute(Job<T, E> j);
-
-    void start();
-
-    void stop();
-
-    // void addJobCompleteHandler(String triggerName,
-    // CallableReferenceImpl<Trigger> handle);
-    // void removeJobCompleteHandler(String triggerName);
-    /* The worker manager */
-    void registerManager(CallableReferenceImpl<WorkerManager> wm);
-
-    void registerSender(CallableReferenceImpl<WorkpoolService> sender);
-
-    // void init(Job nullJob);
-    @OneWay
-    void computeFirstTime(Job nullJob,
-            CallableReferenceImpl<WorkpoolService> myReference);
-
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java
deleted file mode 100644
index 22cfc38ff4..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java
+++ /dev/null
@@ -1,27 +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 workpool;
-
-import org.apache.tuscany.sca.databinding.job.Job;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface WorkerServiceCallback {
-    void receiveResult(Job resultType, boolean reuse, String workerName);
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java
deleted file mode 100644
index c38b27a6cf..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java
+++ /dev/null
@@ -1,171 +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 workpool;
-
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.apache.tuscany.sca.databinding.job.Job;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.*;
-
-/**
- * An implementation of the worker service.
- */
-@Service(WorkerService.class)
-@DataBinding("org.apache.tuscany.sca.databinding.job.Job")
-@Scope("COMPOSITE")
-public abstract class WorkerServiceImpl<T, E> implements WorkerService<T, E> {
-    private Logger log = Logger.getLogger(this.getClass().getName());
-    private WorkerServiceCallback workerServiceCallback;
-    @Context
-    protected ComponentContext workerContext;
-    @Context
-    protected RequestContext requestContext;
-    @Property
-    protected String workerName;
-    private CallableReferenceImpl<WorkerManager> managerReference = null;
-
-    /* TODO add the triggers, but before ask */
-    // protected Map<String,Trigger> triggers = new HashMap<String,Trigger>();
-    public abstract ResultJob computeTask(Job<T, E> job);
-
-    private boolean stopped = false;
-    private CallableReferenceImpl<WorkerService> serviceRef;
-    private CallableReferenceImpl<WorkpoolService> senderService;
-    private WorkpoolService wp = null;
-    private WorkerManager manager = null;
-
-    public void start() {
-        log.info("Starting worker...");
-        stopped = false;
-        serviceRef = (CallableReferenceImpl) workerContext
-                .createSelfReference(WorkerService.class);
-
-    }
-
-    public void init(CallableReferenceImpl<WorkpoolService> sender, Job nullJob) {
-        compute(nullJob);
-    }
-
-    public void stop() {
-        stopped = true;
-    }
-
-    @Callback
-    public void setWorkerServiceCallback(
-            WorkerServiceCallback workerServiceCallback) {
-        log.info("Setting worker callback");
-        this.workerServiceCallback = workerServiceCallback;
-    }
-
-    public void computeFirstTime(Job nullJob,
-            CallableReferenceImpl<WorkpoolService> sender) {
-        senderService = sender;
-        wp = sender.getService();
-        workWithCallable(nullJob);
-    }
-
-    public void registerManager(CallableReferenceImpl<WorkerManager> wm) {
-        managerReference = wm;
-        manager = managerReference.getService();
-
-    }
-
-    public void registerSender(CallableReferenceImpl<WorkpoolService> sender) {
-        log.info("Registering sender..");
-        senderService = sender;
-        wp = sender.getService();
-    }
-
-    private void workWithInjection(Job j) {
-        log.info("Worker has received job");
-        if (stopped) {
-            workerServiceCallback
-                    .receiveResult(j, true, workerContext.getURI());
-            if (managerReference != null)
-                manager.removeWorker(workerContext.getURI());
-        } else if (j.eos()) {
-            if (managerReference != null)
-                manager.removeWorker(workerContext.getURI());
-        }
-        if (j instanceof NullJob) {
-            workerServiceCallback.receiveResult(j, false, workerContext
-                    .getURI());
-        } else {
-            workerServiceCallback.receiveResult(computeTask(j), false,
-                    workerContext.getURI());
-        }
-    }
-
-    private void workWithCallable(Job j) {
-        log.info("Worker " + workerContext.getURI()
-                + " has received job with eos --> " + j.eos());
-        if (stopped) {
-            wp.handleResult(j, true, workerContext.getURI(), serviceRef, false);
-            return;
-        }
-        if (j.eos()) {
-            log.info("Got poison token...");
-            if (managerReference != null) {
-                log.info("Removing component " + workerContext.getURI());
-                manager.removeWorker(workerContext.getURI());
-
-            }
-            return;
-        }
-        if (j.getType() != Job.NULL_JOB) {
-            wp.handleResult(computeTask(j), false, workerContext.getURI(),
-                    serviceRef, false);
-        } else {
-            log.info("Got a null job");
-            wp.handleResult(j, false, workerContext.getURI(), serviceRef, true);
-        }
-    }
-
-    public void compute(Job<T, E> j) {
-
-        if (senderService != null) {
-            log.info("Computing job using callable reference method");
-            workWithCallable(j);
-
-        } else {
-            log.info("Computing job using reference injection method");
-            workWithInjection(j);
-
-        }
-    }
-    /*
-     * public void addJobCompleteHandler(String triggerName,
-     * CallableReferenceImpl<Trigger> handle) { if
-     * (!triggers.containsKey(triggerName)) { triggers.put(triggerName,
-     * handle.getService()); } } public void removeJobCompleteHandler(String
-     * triggerName) { if (!triggers.containsKey(triggerName)) {
-     * triggers.remove(triggerName); } }
-     */
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java
deleted file mode 100644
index 80c093ff1c..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java
+++ /dev/null
@@ -1,162 +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 workpool;
-
-import java.beans.*;
-import java.util.Vector;
-import java.util.logging.*;
-
-public class WorkpoolBean {
-    private Vector<WorkpoolBeanListener> listeners = new Vector<WorkpoolBeanListener>();
-    double loadAverage = 0;
-    int nodeNumbers = 0;
-    int workers = 0;
-    int estimedQueueSize = 0;
-    double averageServiceTime = 0;
-    double averageArrivalTime = 0;
-    double usageFactor = 0;
-    private final PropertyChangeSupport changes = new PropertyChangeSupport(
-            this);
-    long jobComputed = 0;
-    boolean singleAction = false;
-    private Logger log = Logger.getLogger(WorkpoolBean.class.getName());
-
-    public void setNodeNumbers(int n) {
-        this.nodeNumbers = n;
-    }
-
-    public void setWorkers(int w) {
-        this.workers = w;
-    }
-
-    public void setLoadAverage(double loadAverage) {
-        this.loadAverage = loadAverage;
-    }
-
-    public void setAverageServiceTime(double service) {
-        this.averageServiceTime = service;
-    }
-
-    public void setAverageArrivalTime(double service) {
-        this.averageArrivalTime = service;
-    }
-
-    public double getAverageArrivalTime() {
-        return this.averageArrivalTime;
-    }
-
-    public double getUtilizationFactor() {
-        return usageFactor;
-    }
-
-    public void setUsageFactor() {
-        usageFactor = averageServiceTime / averageArrivalTime;
-    }
-
-    public void setEstimedQueueSize(int size) {
-        estimedQueueSize = size;
-    }
-
-    public int getEstimedQueueSize() {
-        return estimedQueueSize;
-    }
-
-    public double getLoadAverage() {
-        return this.loadAverage;
-    }
-
-    public int getWorkers() {
-        return this.workers;
-    }
-
-    public int getNodeNumbers() {
-        return this.nodeNumbers;
-    }
-
-    public double getAverageServiceTime() {
-        return this.averageServiceTime;
-    }
-
-    public void addPropertyChangeListener(final PropertyChangeListener l) {
-        this.changes.addPropertyChangeListener(l);
-    }
-
-    public void removePropertyChangeListener(final PropertyChangeListener l) {
-        this.changes.removePropertyChangeListener(l);
-    }
-
-    private synchronized void fireWorkpoolEvent(WorkpoolEvent ev) {
-        for (WorkpoolBeanListener l : listeners) {
-            l.handleEvent(new WorkpoolEvent(ev));
-        }
-    }
-
-    public void addWorkersToNode(int k, String nodeName) {
-        log.info("Adding a worker to node " + nodeName);
-        WorkpoolEvent ev = new WorkpoolEvent(this,
-                WorkpoolEvent.EVENT_MULTIPLE_ADD_WORKER, k, nodeName);
-        fireWorkpoolEvent(ev);
-    }
-
-    public void addWorkerToNode(String nodeName) {
-        log.info("Adding a worker to node " + nodeName);
-        WorkpoolEvent ev = new WorkpoolEvent(this,
-                WorkpoolEvent.SINGLE_ADD_WORKER, 1, nodeName);
-        fireWorkpoolEvent(ev);
-    }
-
-    public void removeWorkersToNode(int k, String nodeName) {
-        log.info("Removing a worker to node " + nodeName);
-        WorkpoolEvent ev = new WorkpoolEvent(this,
-                WorkpoolEvent.EVENT_MULTIPLE_REMOVE_WORKER, k, nodeName);
-        fireWorkpoolEvent(ev);
-    }
-
-    public void removeWorkerToNode(String nodeName) {
-        log.info("Removing a worker to node " + nodeName);
-        WorkpoolEvent ev = new WorkpoolEvent(this,
-                WorkpoolEvent.SINGLE_REMOVE_WORKER, 1, nodeName);
-        fireWorkpoolEvent(ev);
-    }
-
-    public synchronized void addListener(WorkpoolBeanListener l) {
-        this.listeners.add(l);
-    }
-
-    public synchronized void removeListener(WorkpoolBeanListener l) {
-        this.listeners.remove(l);
-    }
-
-    public void setJobComputed(long jobComputed) {
-        this.jobComputed = jobComputed;
-
-    }
-
-    public void setSingleAction() {
-        singleAction = true;
-    }
-
-    public boolean getSingleAction() {
-        return singleAction;
-    }
-
-    public long getJobComputed() {
-        return this.jobComputed;
-    }
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java
deleted file mode 100644
index 0ecc223fed..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java
+++ /dev/null
@@ -1,25 +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 workpool;
-
-import java.util.EventListener;
-
-public interface WorkpoolBeanListener extends EventListener {
-    public void handleEvent(WorkpoolEvent ev);
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java
deleted file mode 100644
index 0bdc3671d5..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java
+++ /dev/null
@@ -1,71 +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 workpool;
-
-import java.util.EventObject;
-
-public class WorkpoolEvent extends EventObject {
-
-    private static final long serialVersionUID = -1273928009411948768L;
-
-    public WorkpoolEvent(Object source) {
-        super(source);
-    }
-
-    public WorkpoolEvent(WorkpoolEvent ev) {
-        super(ev.source);
-        type = ev.type;
-        noWorker = ev.noWorker;
-        nodeName = ev.nodeName;
-    }
-
-    public WorkpoolEvent(Object source, int typeEv, int worker) {
-        super(source);
-        type = typeEv;
-        noWorker = worker;
-        nodeName = "";
-    }
-
-    public WorkpoolEvent(Object source, int typeEv, int worker, String nodeName) {
-        super(source);
-        type = typeEv;
-        noWorker = worker;
-        this.nodeName = nodeName;
-    }
-
-    public String getNodeName() {
-        return nodeName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public int workers() {
-        return noWorker;
-    }
-
-    private int type;
-    private int noWorker;
-    private String nodeName;
-    public static final int EVENT_MULTIPLE_ADD_WORKER = 0;
-    public static final int EVENT_MULTIPLE_REMOVE_WORKER = 1;
-    public static final int SINGLE_REMOVE_WORKER = 2;
-    public static final int SINGLE_ADD_WORKER = 3;
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java
deleted file mode 100644
index 46fbda7998..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java
+++ /dev/null
@@ -1,48 +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 workpool;
-
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface WorkpoolManager {
-    /*
-     * @param String rules This are the autonomic rules. The format is the Java
-     * Drools .drl file. You have to read it
-     */
-    @OneWay
-    void acceptRules(String rules);
-
-    @OneWay
-    void start();
-
-    @OneWay
-    void stopAutonomicCycle();
-
-    @OneWay
-    void startAutonomicCycle();
-
-    int activeWorkers();
-
-    void setCycleTime(long time);
-
-    void setWorkpoolReference(ServiceReference<WorkpoolService> serviceReference);
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java
deleted file mode 100644
index cf353fb3fe..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java
+++ /dev/null
@@ -1,555 +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 workpool;
-
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.logging.Logger;
-
-import javax.xml.stream.XMLStreamException;
-
-import node.TestJob;
-import java.io.File;
-import java.util.Vector;
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
-import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;
-import org.apache.tuscany.sca.databinding.job.Job;
-import org.apache.tuscany.sca.node.NodeManagerInitService;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.impl.SCANodeImpl;
-import org.oasisopen.sca.CallableReference;
-import org.drools.FactHandle;
-import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
-import org.drools.StatefulSession;
-import org.drools.StatelessSession;
-import org.drools.compiler.DroolsParserException;
-import org.drools.compiler.PackageBuilder;
-import org.drools.rule.Package;
-import org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.ReentrantLock;
-
-@Service(interfaces = { NodeManagerInitService.class, WorkpoolManager.class })
-@Scope("COMPOSITE")
-/*
- * This is the core manager of the workpool application. The Workpool Manager
- * holds the reference to each remote node manager. Inside it we've a rule
- * engine instance.
- */
-public class WorkpoolManagerImpl implements WorkpoolManager,
-        NodeManagerInitService, WorkpoolBeanListener {
-    /*
-     * This inner class trigs the rule engine, at given times: 1. It checks the
-     * different loads for each nodes and sets the WorkpoolBean 2. It checks the
-     * Workpool AverageService Time and sets the WorkpoolBean 3. It checks how
-     * many jobs are already computed and sets the WorkpoolBean Then given the
-     * configured bean and the rules, run the Rule Engine for executing the
-     * business logic
-     */
-    class RuleEngineTrigger extends TimerTask {
-        // private ReentrantLock triggerLock = new ReentrantLock();
-        @Override
-        public void run() {
-
-            System.out.println("Updating WorkpoolBean..");
-            // checkActiveWorkers();
-            // checkLoadInNodes();
-            checkServiceTime();
-            // checkEstimedQueueSize();
-            // checkArrivalTime();
-            getProcessedItem();
-            // computeUsageFactor();
-            doRun(bean);
-        }
-
-    }
-
-    private WorkerManager managerNodeB;
-    private WorkerManager managerNodeC;
-    private WorkerManager managerNodeD;
-    private WorkerManager managerNodeE;
-
-    private SCANodeImpl node;
-    private WorkpoolBean bean = new WorkpoolBean();
-    private ReentrantLock handleEventLock = new ReentrantLock();
-    private ReentrantLock updateRuleLock = new ReentrantLock();
-
-    private ServiceReference<WorkpoolService> reference;
-    private AtomicInteger activeWorkers = new AtomicInteger(0);
-    private Logger log = Logger.getLogger(WorkpoolManagerImpl.class.getName());
-    @Property
-    protected String workers;
-    @Property
-    protected String nodes;
-    @Property
-    protected String injection;
-    @Context
-    protected ComponentContext workpoolManagerContext;
-    private CallableReferenceImpl<WorkpoolManager> myReference;
-    private String rules = null;
-    private boolean referenceInjection = false;
-    private ConcurrentHashMap<String, WorkerManager> workerManagerTable = new ConcurrentHashMap<String, WorkerManager>();
-    private int workersNo;
-    private int nodesNo;
-    private Timer timer = new Timer();
-    /* this handle facts */
-    private RuleBase ruleBase = null;
-    private FactHandle handle = null;
-    private StatefulSession wm = null;
-    private long cycleTime = 5000;
-
-    @Reference
-    public void setManagerNodeB(WorkerManager managerNodeB) {
-        this.managerNodeB = managerNodeB;
-        workerManagerTable.put("nodeB", managerNodeB);
-    }
-
-    @Reference
-    public void setManagerNodeC(WorkerManager managerNodeC) {
-        this.managerNodeC = managerNodeC;
-        workerManagerTable.put("nodeC", managerNodeC);
-    }
-
-    @Reference
-    public void setManagerNodeD(WorkerManager managerNodeD) {
-        this.managerNodeD = managerNodeD;
-        workerManagerTable.put("nodeD", managerNodeD);
-    }
-
-    @Reference
-    public void setManagerNodeE(WorkerManager managerNodeE) {
-        this.managerNodeE = managerNodeE;
-        workerManagerTable.put("nodeE", managerNodeE);
-    }
-
-    private void startNewComponents(
-            Vector<CallableReferenceImpl<WorkerService>> vector) {
-        log.info("Starting new components");
-        WorkpoolService wp = reference.getService();
-        // CallableReferenceImpl<WorkpoolService> sink =
-        // (CallableReferenceImpl<WorkpoolService>) reference;
-        Job j = new NullJob();
-        for (CallableReferenceImpl<WorkerService> item : vector) {
-            // WorkerService service = item.getService();
-            // service.start();
-            // service.computeFirstTime(j, sink);
-            log.info("Send PostWorkerReference...");
-            wp.PostWorkerReference(item);
-        }
-        if (myReference != null)
-            wp.registerManager(myReference);
-    }
-
-    public void setCycleTime(long cycle) {
-        this.cycleTime = cycle;
-    }
-
-    @SuppressWarnings("unchecked")
-    /*
-     * This gets the number of workers workerNo and instantiates them
-     */
-    public void start() {
-        this.myReference = (CallableReferenceImpl<WorkpoolManager>) workpoolManagerContext
-                .createSelfReference(WorkpoolManager.class, "WorkpoolManager");
-        this.workersNo = Integer.parseInt(this.workers);
-        this.nodesNo = Integer.parseInt(this.nodes);
-        this.referenceInjection = (Integer.parseInt(this.injection) != 0);
-        log.info("Starting WorkpoolManager Component with #" + workersNo
-                + " workers and #" + nodes + " nodes");
-        nodesNo = workerManagerTable.values().size();
-        // Sets info in the bean.
-        bean.setWorkers(this.workersNo);
-        bean.setNodeNumbers(nodesNo);
-        Vector<CallableReferenceImpl<WorkerService>> workerRefs = new Vector<CallableReferenceImpl<WorkerService>>();
-        int exactTimes = workersNo / nodesNo;
-        for (int i = 0; i < exactTimes; ++i) {
-            for (WorkerManager manager : workerManagerTable.values()) {
-                manager.start();
-                if (manager != null) {
-                    System.err.println("Actual load  = "
-                            + manager.getNodeLoad() + " for node ");
-                    addNewComponent(manager, workerRefs);
-                }
-            }
-        }
-
-        int module = (workersNo % nodesNo);
-        int n = 0;
-        if (module > 0) {
-            Vector<String> v = new Vector(workerManagerTable.keySet());
-            Collections.sort(v);
-            // Iterator<WorkerManager> iter =
-            // workerManagerTable.values().iterator();
-            // Display (sorted) hashtable.
-            for (Enumeration<String> e = v.elements(); (e.hasMoreElements() && n < module); ++n) {
-                String key = e.nextElement();
-                WorkerManager m = workerManagerTable.get(key);
-                System.err.println("Module Actual load  = " + m.getNodeLoad()
-                        + " for node ");
-                addNewComponent(m, workerRefs);
-            }
-        }
-        startNewComponents(workerRefs);
-        bean.addListener(this);
-        TimerTask task = new WorkpoolManagerImpl.RuleEngineTrigger();
-        timer.scheduleAtFixedRate(task, 3000, cycleTime);
-    }
-
-    private void checkLoadInNodes() {
-        System.out.println("CheckLoadInNodes");
-        int number = 1;
-        double loadAverage = 0;
-        for (WorkerManager manager : workerManagerTable.values()) {
-            loadAverage += manager.getNodeLoad();
-            number++;
-        }
-        bean.setLoadAverage(loadAverage / number);
-    }
-
-    private void computeUsageFactor() {
-        bean.setUsageFactor();
-    }
-
-    private void checkEstimedQueueSize() {
-        WorkpoolService wp = reference.getService();
-
-        if (wp != null) {
-            int size = wp.estimatedQueueSize();
-            log.info("Estimed Queue Size =" + size);
-            bean.setEstimedQueueSize(size);
-        }
-    }
-
-    private WorkerManager findMinLoad() {
-        double load = 0;
-        // workerManagerTable.values().iterator().next().getNodeLoad();
-        WorkerManager toFind = null;
-        for (WorkerManager manager : workerManagerTable.values()) {
-            if (load == 0) {
-                load = manager.getNodeLoad();
-                toFind = manager;
-            } else if (manager.getNodeLoad() < load) {
-                load = manager.getNodeLoad();
-                toFind = manager;
-            }
-        }
-        return toFind;
-    }
-
-    private void checkServiceTime() {
-        WorkpoolService wp = reference.getService();
-
-        if (wp != null) {
-            double time = wp.getServiceTime();
-            log.info("Average System Service Time =" + time);
-            bean.setAverageServiceTime(time);
-        }
-    }
-
-    private void checkArrivalTime() {
-        WorkpoolService wp = reference.getService();
-
-        if (wp != null) {
-            double time = wp.getArrivalTime();
-            log.info("Average Arrival Service Time =" + time);
-            bean.setAverageArrivalTime(time);
-        }
-    }
-
-    private void checkActiveWorkers() {
-        bean.setWorkers(this.activeWorkers());
-    }
-
-    private void getProcessedItem() {
-        WorkpoolService wp = reference.getService();
-        if (wp != null) {
-            long computed = wp.getJobComputed();
-            log.info("The system has already computed " + computed + " jobs");
-            bean.setJobComputed(computed);
-        }
-    }
-
-    private boolean removeComponent(WorkerManager manager, int k) {
-        manager.removeWorkers(k);
-        activeWorkers.decrementAndGet();
-        return true;
-    }
-
-    @SuppressWarnings("unchecked")
-    private boolean addNewComponent(WorkerManager manager,
-            Vector<CallableReferenceImpl<WorkerService>> workerRefs) {
-        CallableReferenceImpl<WorkerService> workerReference = (CallableReferenceImpl<WorkerService>) manager
-                .addWorker();
-
-        if (workerReference != null) {
-            /* if i'll decide to use dynamically generated references */
-            if (referenceInjection) {
-                workerReference.getService();
-                String uri = workerReference.getEndpointReference().getURI();
-                int nameIndex = uri.indexOf("/");
-                String componentName = uri.substring(0, nameIndex);
-                if (componentName.startsWith("/"))
-                    componentName = uri.substring(1, uri.length());
-                if (componentName.endsWith("/"))
-                    componentName = uri.substring(0, uri.length() - 1);
-                // String componentName = uri.substring(0, nameIndex-1);
-
-                log.info("Adding wire from WorkpoolComponentService to "
-                        + componentName);
-                String referenceName = "ref" + componentName;
-
-                /*
-                 * I'm updating the WorkpoolServiceComponent with a new
-                 * reference to a just created component I assume that the
-                 * WorkpoolManagerService and the WorkpoolServiceComponent stay
-                 * in the same JVM It's like in the scdl there were: <reference
-                 * name=referenceName target="componentName"/> With this then
-                 * I've a wire WorkpoolService---> a new Worker
-                 */
-                try {
-                    node.addComponentReferenceWire(referenceName, "nodeA",
-                            "Workpool.composite", "workpool.WorkerServiceImpl",
-                            WorkerService.class, "WorkpoolServiceComponent",
-                            componentName);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    return false;
-                }
-                log.info("Sending reference name " + referenceName
-                        + " to WorkpoolService");
-                // TODO: this was part of dynamic wiring, but it doesn't work.
-                // reference.getService().PostWorkerName(referenceName);
-
-            } else {
-                // log.info("Sending callable reference to WorkpoolService
-                // placed at -->"+reference);
-                // reference.getService().PostWorkerReference(workerReference);
-                workerRefs.add(workerReference);
-            }
-            activeWorkers.incrementAndGet();
-            return true;
-        }
-        return false;
-    }
-
-    public int activeWorkers() {
-
-        return activeWorkers.get();
-    }
-
-    private void doRun(WorkpoolBean bean) {
-
-        long startTime = System.currentTimeMillis();
-        updateRuleLock.lock();
-        if (wm == null)
-            wm = ruleBase.newStatefulSession();
-        if (this.handle == null)
-            handle = wm.insert(bean);
-        else {
-            wm.update(handle, bean);
-        }
-        wm.fireAllRules();
-        updateRuleLock.unlock();
-
-        System.out.println("Engine rule overhead = "
-                + (System.currentTimeMillis() - startTime));
-    }
-
-    private RuleBase readRule(String rule) {
-
-        PackageBuilder packBuilder = new PackageBuilder();
-        try {
-            packBuilder.addPackageFromDrl(new StringReader(rule));
-        } catch (DroolsParserException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        Package pkg = packBuilder.getPackage();
-        RuleBase ruleBase = RuleBaseFactory.newRuleBase();
-        try {
-            ruleBase.addPackage(pkg);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return ruleBase;
-    }
-
-    public void acceptRules(String rules) {
-        this.rules = rules;
-        if (ruleBase == null) {
-            RuleBase base = readRule(rules);
-            if (base != null) {
-                ruleBase = base;
-            }
-        } else {
-            updateRuleLock.lock();
-            // i have already a rule: updating
-            ruleBase = readRule(rules);
-            wm = ruleBase.newStatefulSession();
-            handle = null;
-            updateRuleLock.unlock();
-        }
-
-        System.out.println("Accepted rules = " + rules);
-    }
-
-    public String getRules() {
-        return rules;
-    }
-
-    private WorkerManager findMaxLoadNode() {
-        double load = 0.0;
-        WorkerManager toFind = null;
-        for (WorkerManager manager : workerManagerTable.values()) {
-            if (manager.getNodeLoad() > load) {
-                load = manager.getNodeLoad();
-                toFind = manager;
-            }
-        }
-        return toFind;
-
-    }
-
-    public void setWorkpoolReference(
-            ServiceReference<WorkpoolService> serviceReference) {
-        reference = serviceReference;
-    }
-
-    public void setNode(SCANode arg0) {
-        node = (SCANodeImpl) arg0;
-    }
-
-    public void handleEvent(WorkpoolEvent ev) {
-        if (ev == null)
-            return;
-
-        String nodeName = ev.getNodeName();
-
-        switch (ev.getType()) {
-        case WorkpoolEvent.SINGLE_ADD_WORKER: {
-            if (nodeName != null) {
-                Vector<CallableReferenceImpl<WorkerService>> workerRefs = new Vector<CallableReferenceImpl<WorkerService>>();
-
-                // in this case I have a nodeName
-                if (!nodeName.equals("")
-                        && (workerManagerTable.containsKey(nodeName))) {
-                    WorkerManager manager = workerManagerTable.get(nodeName);
-                    addNewComponent(manager, workerRefs);
-                    startNewComponents(workerRefs);
-                } else if (nodeName.equals("")) {
-                    WorkerManager manager = findMinLoad();
-                    addNewComponent(manager, workerRefs);
-                    startNewComponents(workerRefs);
-                }
-            }
-            break;
-        }
-        case WorkpoolEvent.EVENT_MULTIPLE_ADD_WORKER: {
-            Vector<CallableReferenceImpl<WorkerService>> workerRefs = new Vector<CallableReferenceImpl<WorkerService>>();
-
-            if (nodeName.equals("")) {
-
-                WorkerManager manager = findMinLoad();
-                int k = ev.workers();
-                for (int h = 0; h < k; ++h) {
-                    addNewComponent(manager, workerRefs);
-                }
-            } else {
-                WorkerManager manager = workerManagerTable
-                        .get(ev.getNodeName());
-                int k = ev.workers();
-                for (int h = 0; h < k; ++h) {
-                    addNewComponent(manager, workerRefs);
-                }
-            }
-            startNewComponents(workerRefs);
-            break;
-        }
-        case WorkpoolEvent.SINGLE_REMOVE_WORKER: {
-            if (nodeName != null) {
-                // in this case I have a nodeName
-                if (!nodeName.equals("")
-                        && (workerManagerTable.containsKey(nodeName))) {
-                    WorkerManager manager = workerManagerTable.get(nodeName);
-                    removeComponent(manager, 1);
-                } else if (nodeName.equals("")) {
-                    WorkerManager manager = findMaxLoadNode();
-                    removeComponent(manager, 1);
-                }
-            }
-            break;
-        }
-        case WorkpoolEvent.EVENT_MULTIPLE_REMOVE_WORKER: {
-            if (nodeName.equals("")) {
-                WorkerManager manager = findMaxLoadNode();
-                removeComponent(manager, ev.workers());
-
-            } else {
-                WorkerManager manager = workerManagerTable.get(nodeName);
-                removeComponent(manager, ev.workers());
-            }
-            break;
-        }
-        }
-
-    }
-
-    @Destroy
-    public void onExit() {
-        // do cleanup
-        this.timer.cancel();
-        this.timer.purge();
-    }
-
-    public void stopAutonomicCycle() {
-        this.timer.cancel();
-        this.timer.purge();
-        this.timer = null;
-    }
-
-    public void startAutonomicCycle() {
-        if (this.timer == null) {
-            this.timer = new Timer();
-            TimerTask task = new WorkpoolManagerImpl.RuleEngineTrigger();
-            timer.schedule(task, 3000, cycleTime);
-        }
-    }
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java
deleted file mode 100644
index 239e5d145d..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java
+++ /dev/null
@@ -1,91 +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 workpool;
-
-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.apache.tuscany.sca.databinding.job.Job;
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-import org.oasisopen.sca.ServiceReference;
-
-@DataBinding("org.apache.tuscany.sca.databinding.job.Job")
-@Remotable
-public interface WorkpoolService {
-
-    /* this the functional part */
-    void submit(Job i);
-
-    /* the time between two subsequent worker invocations */
-    double getServiceTime();
-
-    /* the number of ResultJob received */
-    long getJobComputed();
-
-    /* the time elapsed between the stream has initiated and now */
-    long getElapsedTime();
-
-    /* the size of the internal queue : it's not accurate */
-    int estimatedQueueSize();
-
-    /* the average time between two consuecutive submit */
-    double getArrivalTime();
-
-    void start();
-
-    void stop();
-
-    /*
-     * this is the part needed by management. May be in future i'll refactor it
-     * order to hide this part.
-     */
-    @OneWay
-    void handleResult(Job j, boolean reuse, String string,
-            CallableReferenceImpl<WorkerService> worker, boolean newJob);
-
-    void addTrigger(CallableReferenceImpl<Trigger> reference);
-
-    void removeTrigger();
-
-    void registerManager(
-            CallableReferenceImpl<WorkpoolManager> createSelfReference);
-
-    /*
-     * This could placed in another interface definition - think about it These
-     * methods evict, and evictAll are needed when a worker finish to exist and
-     * it needs to be evicted by the WorkpoolManager. In the system I have two
-     * caches: 1) a domain cache, which holds the components URI 2) a
-     * workerReference cache (implemented by a ConcurrentHashMap), which holds a
-     * proxy to each worker. Every proxy gets built from the worker callable
-     * reference. I'm thinking for placing the workerReferenceCache in a local
-     * interface. Assuming that WorkpoolService and WorkpoolManager are in the
-     * same JVM.
-     */
-    void evict(String workerURI);
-
-    void evictAll();
-
-    /*
-     * these two are no longer needed. I leave it because if i'll have time to
-     * do dynamic wiring the first one is needed. void PostWorkerName(String
-     * referenceName);
-     */
-    void PostWorkerReference(CallableReferenceImpl<WorkerService> worker);
-
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java b/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java
deleted file mode 100644
index 268edae530..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java
+++ /dev/null
@@ -1,416 +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 workpool;
-
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.logging.Logger;
-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-import org.apache.tuscany.sca.databinding.job.Job;
-import org.apache.tuscany.sca.databinding.job.JobDataMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-
-/**
- * An implementation of the Workpool service.
- */
-@Service(WorkpoolService.class)
-@Scope("COMPOSITE")
-@DataBinding("org.apache.tuscany.sca.databinding.job.Job")
-public class WorkpoolServiceImpl implements WorkpoolService,
-        WorkerServiceCallback {
-
-    /* incoming job queue */
-    private LinkedBlockingQueue<Job> queue = new LinkedBlockingQueue<Job>(5000);
-    private CallableReferenceImpl<Trigger> trigger = null;
-    private Trigger forwardResult = null;
-    /* counter for job's number fetched from the queue and sent to the Worker */
-    private AtomicInteger jobSent = new AtomicInteger(0);
-    /* time for initHandleResult */
-    private AtomicLong initHandleResult = new AtomicLong(0);
-    /* time for endHandleResult */
-    private AtomicLong endHandleResult = new AtomicLong(0);
-    /*
-     * number of job computed, this will be exposed in order to be used to
-     * firing rules
-     */
-    private long jobComputed = 0;
-    /* same as above */
-    private AtomicLong elapsedTime = new AtomicLong(0);
-    /* this is for comuputing averageServiceTime */
-    private long times = 1;
-    /* this is for computing averageArrivalTime */
-    private long timesArrival = 1;
-    private ReentrantLock arrivalLock = new ReentrantLock();
-    private long arrivalPrevious = -1;
-    // private AtomicBoolean processingStopped = new AtomicBoolean(false);
-    private boolean processingStopped = false;
-    // private LinkedBlockingQueue<Trigger> triggers = new
-    // LinkedBlockingQueue<Trigger>();
-    @Context
-    protected ComponentContext workpoolContext;
-    private CallableReferenceImpl<WorkpoolManager> manager;
-    private long previousSubmitTime = -1;
-    private boolean firstTime = true;
-    private boolean first = true;
-    private long start = 0;
-    private long end = 0;
-    private double averageServiceTime = 0;
-    private double averageArrivalTime = 0;
-    private int workersNo = 0;
-    private final Job nullJob = new NullJob();
-    /* This is useful for counting the start and end */
-    private Logger log = Logger.getLogger(WorkpoolServiceImpl.class.getName());
-    private ReentrantLock handleResultLock = new ReentrantLock();
-    private ReentrantLock postWorkerReferenceLock = new ReentrantLock();
-    private ConcurrentHashMap<String, WorkerService> cacheReference = new ConcurrentHashMap<String, WorkerService>();
-    private CallableReferenceImpl<WorkpoolService> myReference;
-    private String previuosURI = "";
-    private long time = 0;
-
-    private void computeAverageTime() {
-        long actualServiceTime = 0;
-        // if the processing is finished
-        if (processingStopped)
-            return;
-
-        if (firstTime == true) {
-            this.previousSubmitTime = System.currentTimeMillis();
-            this.averageServiceTime = 0;
-            firstTime = false;
-        } else {
-            actualServiceTime = System.currentTimeMillis()
-                    - this.previousSubmitTime;
-            this.previousSubmitTime = System.currentTimeMillis();
-            averageServiceTime = ((averageServiceTime * times) + actualServiceTime)
-                    / (times + 1);
-            ++times;
-        }
-    }
-
-    public void submit(Job j) {
-        try {
-            // log.info("Submit job in queue -->"+ j.getType());
-            // processingStopped.set(false);
-            try {
-                arrivalLock.lock();
-                if (this.arrivalPrevious == -1) {
-                    arrivalPrevious = System.currentTimeMillis();
-                    averageArrivalTime = 0;
-                }
-                double actualArrivalTime = System.currentTimeMillis()
-                        - arrivalPrevious;
-                averageArrivalTime = ((averageArrivalTime * timesArrival) + actualArrivalTime)
-                        / (timesArrival + 1);
-                arrivalPrevious = System.currentTimeMillis();
-                ++timesArrival;
-            } finally {
-                arrivalLock.unlock();
-            }
-            queue.put(j);
-        } catch (Exception e) {
-            log.info("Exception in queue");
-            queue.clear();
-            e.printStackTrace();
-        }
-    }
-
-    public double getArrivalTime() {
-        return this.averageArrivalTime;
-    }
-
-    public double getServiceTime() {
-        return this.averageServiceTime;
-    }
-
-    public void receiveResult(Job resultType, boolean reuse, String workerURI) {
-
-        if (reuse) {
-            queue.add(resultType);
-            return;
-        }
-
-        computeAverageTime();
-        Job job = null;
-        try {
-            job = queue.take();
-        } catch (InterruptedException e) {
-            // TODO Better exception handling --> see Exception antipattern doc
-            e.printStackTrace();
-            return;
-        }
-
-        if ((job != null) && (job.eos() == false)) {
-            int nameIndex = workerURI.indexOf("/");
-            String workerName = workerURI.substring(0, nameIndex - 1);
-            log.info("Sending job to worker --> " + workerName);
-            WorkerService worker = workpoolContext.getService(
-                    WorkerService.class, workerName);
-            worker.compute(job);
-        }
-
-        JobDataMap map = ((ResultJob) resultType).getDataMap();
-        if (map != null) {
-            ++jobComputed;
-            Object obj = map.getJobDataObject("result");
-            System.out.println("Result = " + ((Double) obj).doubleValue());
-        }
-
-    }
-
-    public void start() {
-        log.info("WorkpoolServiceComponent started...");
-        myReference = (CallableReferenceImpl) workpoolContext
-                .createSelfReference(WorkpoolService.class, "WorkpoolService");
-        myReference.getService();
-    }
-
-    /*
-     * 
-     * This method is called by WorkpoolManagerImpl, when it creates a new
-     * worker component in order to dispatch worker to the WorkpoolServiceImpl
-     * @param CallableReferenceImpl reference - a dynamically created reference
-     * from the Worker
-     */
-    public void PostWorkerReference(
-            CallableReferenceImpl<WorkerService> reference) {
-
-        try {
-            long initPostWorkerReference;
-            long endPostWorkerReference;
-            this.postWorkerReferenceLock.lock();
-
-            initPostWorkerReference = System.currentTimeMillis();
-            WorkerService worker;
-            worker = reference.getService();
-            worker.start();
-
-            ++workersNo;
-            if (myReference != null) {
-
-                // Job poison = new ResultJob();
-                this.postWorkerReferenceLock.unlock();
-                log.info("Sending null job to worker");
-                worker.computeFirstTime(nullJob, myReference);
-                // queue.put(poison);
-                endPostWorkerReference = System.currentTimeMillis();
-                System.out.println("Time PostWorker ="
-                        + (endPostWorkerReference - initPostWorkerReference));
-            } else {
-                log.info("myReference is null");
-
-            }
-        } catch (Exception e) {
-            postWorkerReferenceLock.unlock();
-        } finally {
-        }
-
-    }
-
-    /*
-     * FIXME This method currently is not used because i've not yet ready
-     * dynamic wire injection
-     */
-
-    public void PostWorkerName(String referenceName) {
-        /* TODO Do something similar to PostWorkerReference */
-    }
-
-    private void printComputingTime(Job j) {
-
-        if (first == true) {
-            first = false;
-            start = System.currentTimeMillis();
-            end = System.currentTimeMillis();
-        } else {
-            end = System.currentTimeMillis();
-            System.out.println("Elapsed Time = " + (end - start));
-            elapsedTime.set(end - start);
-        }
-        /*
-         * i could use reflection or instance of (but it's a penalty kick) , or
-         * an object as result, but i'd prefer a job so i've defined a
-         * RESULT_JOB There're in the system three kind of jobs: RESULT_JOB,
-         * NULL_JOB, DEFAULT_JOB
-         */
-        if ((j != null) && (j.getType() == Job.RESULT_JOB)) {
-            jobComputed++;
-            ResultJob result = (ResultJob) j;
-            JobDataMap map = result.getDataMap();
-            if (map != null) {
-                Double doubleValue = (Double) map.getJobDataObject("result");
-                System.out
-                        .println("ResultValue = " + doubleValue.doubleValue());
-            }
-
-        }
-
-    }
-
-    public void handleResult(Job resultType, boolean reuse, String workerURI,
-            CallableReferenceImpl<WorkerService> worker, boolean newWorker) {
-        initHandleResult.set(System.nanoTime());
-        if (reuse) {
-            log.info("Reusing a job..");
-            queue.add(resultType);
-            return;
-        }
-        // init job variable
-        Job job;
-        if (newWorker)
-            System.out.println("newWorkerActivation= " + System.nanoTime());
-        printComputingTime(resultType);
-
-        try {
-            job = queue.take();
-        } catch (Exception e) {
-            log.info("Exception during fetching the queue");
-            e.printStackTrace();
-            return;
-        }
-
-        try {
-            // it needs to be locked because multiple threads could invoke this.
-            handleResultLock.lock();
-            if (previuosURI.equals("")) {
-                time = System.currentTimeMillis();
-                this.previuosURI = workerURI;
-            } else {
-                if (previuosURI.equals(workerURI))
-                    System.out.println("Complete ComputeTime for an item ="
-                            + (time - System.currentTimeMillis()));
-            }
-            if (job.eos()) {
-                long endTime = System.currentTimeMillis();
-                /* checking for EOS */
-                if (processingStopped == false) {
-                    processingStopped = true;
-                    System.out.println("GOT EOS in time=" + (endTime - start));
-                    log.info("Stop autonomic cycle..");
-                    /*
-                     * I'm doing this because i want that in the termination i
-                     * would have more jobs with eos == true than workers. So
-                     * i'm sure that every worker removes itself from its
-                     * manager. I do it only one time. This is necessary because
-                     * i have a variable number of workers. The number of
-                     * workers in the system might change every time the rule
-                     * engine cycle gets executed.
-                     */
-                    ResultJob poison = new ResultJob();
-                    for (int i = 0; i < workersNo; ++i) {
-                        try {
-
-                            queue.put(poison);
-
-                        } catch (Exception e) {
-                            log.info("Cannot duplicate poison tokens");
-                            break;
-                        }
-
-                    }
-                    manager.getService().stopAutonomicCycle();
-                }
-            }
-            computeAverageTime();
-            System.out.println("AverageTime =" + averageServiceTime);
-            if (job != null) {
-
-                WorkerService workerService;
-                /*
-                 * the workpool has a high reuse, i always call the same
-                 * component set or un superset or subset, so i cache it. When
-                 * the WorkpoolManager will remove an item, it removes still
-                 * this cache entry
-                 */
-                if (!cacheReference.containsKey(workerURI)) {
-                    workerService = worker.getService();
-                    handleResultLock.unlock();
-                    cacheReference.put(workerURI, workerService);
-                } else {
-                    handleResultLock.unlock();
-                    workerService = cacheReference.get(workerURI);
-                }
-                // it's still a penalty kick locking compute because it's going
-                // to be scheduled whereas it's async.
-                workerService.compute(job);
-                log.info("Sent job #" + jobSent.incrementAndGet()
-                        + " Queue size " + queue.size());
-                endHandleResult.set(System.nanoTime());
-                System.out
-                        .println("begin:handleResult ==> end:handleResult:compute = "
-                                + (endHandleResult.addAndGet(-(initHandleResult
-                                        .get())) / 1000000));
-            }
-        } catch (Exception e) {
-            handleResultLock.unlock();
-        }
-    }
-
-    public void evictAll() {
-        cacheReference.clear();
-    }
-
-    public void evict(String workerURI) {
-        if (cacheReference.containsKey(workerURI)) {
-            cacheReference.remove(workerURI);
-        }
-
-    }
-
-    public int estimatedQueueSize() {
-        return queue.size();
-    }
-
-    public long getElapsedTime() {
-        return elapsedTime.get();
-    }
-
-    public long getJobComputed() {
-        return jobComputed;
-    }
-
-    public void registerManager(
-            CallableReferenceImpl<WorkpoolManager> createSelfReference) {
-        manager = createSelfReference;
-
-    }
-
-    public void stop() {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void addTrigger(CallableReferenceImpl<Trigger> reference) {
-        this.trigger = reference;
-        this.forwardResult = reference.getService();
-
-    }
-
-    public void removeTrigger() {
-        this.trigger = null;
-        this.forwardResult = null;
-    }
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index b3e2d16c05..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:Workpool"/>
-</contribution>
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite b/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite
deleted file mode 100644
index 9a00a8e839..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite
+++ /dev/null
@@ -1,47 +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://sample"
-           xmlns:sample="http://sample"
-           name="Workpool">
-    
-    <component name="WorkpoolServiceComponent">
-	<implementation.java class="workpool.WorkpoolServiceImpl"/>
-    </component>
-    <component name="WorkpoolManagerComponent">
-    <implementation.java class="workpool.WorkpoolManagerImpl"/>
-    <property name="workers">4</property>
-    <property name="nodes">4</property>
-    <property name="injection">0</property>
-    <reference name="managerNodeB" target="WorkerManagerNodeBComponent" />
-
-    <reference name="managerNodeC" target="WorkerManagerNodeCComponent" />
-
-    <reference name="managerNodeD" target="WorkerManagerNodeDComponent" />
-
-    <reference name="managerNodeE" target="WorkerManagerNodeEComponent" />
-
-
-    <service name="WorkpoolManagerInitService">
-            <interface.java interface="org.apache.tuscany.sca.node.NodeManagerInitService"/>
-            <binding.sca/>
-    </service>
-    </component>     
- </composite>
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index b3e2d16c05..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:Workpool"/>
-</contribution>
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite b/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite
deleted file mode 100644
index a71dc9e08a..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite
+++ /dev/null
@@ -1,38 +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://sample"
-           xmlns:sample="http://sample"
-           name="Workpool">
-        <component name="WorkerManagerNodeBComponent">   
-        <implementation.java class="workpool.WorkerManagerImpl"/>
-        <property name="nodeName">nodeB</property>
-	 	<property name="compositeName">Workpool.composite</property>
-	 	 <property name="workerClass">workpool.MyWorker</property> 
-	 	<service name="WorkerManagerInitService">
-            <interface.java interface="org.apache.tuscany.sca.node.NodeManagerInitService"/>
-            <binding.sca/>
-        </service>
-     <service name="WorkerManager">
-      <binding.sca uri="http://u13:13001/WorkerManagerNodeBComponent"/>
-     </service>
-     </component>
-
-</composite>
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
deleted file mode 100644
index b3e2d16c05..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:Workpool"/>
-</contribution>
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite b/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite
deleted file mode 100644
index 771db5370b..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite
+++ /dev/null
@@ -1,38 +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://sample"
-           xmlns:sample="http://sample"
-           name="Workpool">
-        <component name="WorkerManagerNodeCComponent">   
-        <implementation.java class="workpool.WorkerManagerImpl"/>
-        <property name="nodeName">nodeC</property>
-	 	<property name="compositeName">Workpool.composite</property>
-	 	 <property name="workerClass">workpool.MyWorker</property> 
-	 	<service name="WorkerManagerInitService">
-            <interface.java interface="org.apache.tuscany.sca.node.NodeManagerInitService"/>
-            <binding.sca/>
-        </service>
-     <service name="WorkerManager">
-      <binding.sca uri="http://u14:13002/WorkerManagerNodeCComponent"/>
-     </service>
-     </component>
-
-</composite>
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml b/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml
deleted file mode 100644
index b3e2d16c05..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:Workpool"/>
-</contribution>
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite b/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite
deleted file mode 100644
index 55fd48934f..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite
+++ /dev/null
@@ -1,38 +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://sample"
-           xmlns:sample="http://sample"
-           name="Workpool">
-        <component name="WorkerManagerNodeDComponent">   
-        <implementation.java class="workpool.WorkerManagerImpl"/>
-        <property name="nodeName">nodeD</property>
-	 	<property name="compositeName">Workpool.composite</property>
-	 	 <property name="workerClass">workpool.MyWorker</property> 
-	 	<service name="WorkerManagerInitService">
-            <interface.java interface="org.apache.tuscany.sca.node.NodeManagerInitService"/>
-            <binding.sca/>
-        </service>
-     <service name="WorkerManager">
-      <binding.sca uri="http://u15:13003/WorkerManagerNodeDComponent"/>
-     </service>
-     </component>
-
-</composite>
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml b/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml
deleted file mode 100644
index b3e2d16c05..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:Workpool"/>
-</contribution>
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite b/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite
deleted file mode 100644
index 1dc9ccfcea..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite
+++ /dev/null
@@ -1,38 +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://sample"
-           xmlns:sample="http://sample"
-           name="Workpool">
-        <component name="WorkerManagerNodeEComponent">   
-        <implementation.java class="workpool.WorkerManagerImpl"/>
-        <property name="nodeName">nodeE</property>
-	 	<property name="compositeName">Workpool.composite</property>
-	 	 <property name="workerClass">workpool.MyWorker</property> 
-	 	<service name="WorkerManagerInitService">
-            <interface.java interface="org.apache.tuscany.sca.node.NodeManagerInitService"/>
-            <binding.sca/>
-        </service>
-     <service name="WorkerManager">
-      <binding.sca uri="http://u16:13004/WorkerManagerNodeEComponent"/>
-     </service>
-     </component>
-
-</composite>
diff --git a/java/sca-contrib/demos/workpool-distributed/src/test/java/workpool/AComponent.java b/java/sca-contrib/demos/workpool-distributed/src/test/java/workpool/AComponent.java
deleted file mode 100644
index 5c20537fab..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/src/test/java/workpool/AComponent.java
+++ /dev/null
@@ -1,25 +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 workpool;
-
-public interface AComponent {
-    public static final int RETURN_VALUE = 1;
-
-    public void greet();
-}
diff --git a/java/sca-contrib/demos/workpool-distributed/workerRules.drl b/java/sca-contrib/demos/workpool-distributed/workerRules.drl
deleted file mode 100644
index e7ebcad4c0..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/workerRules.drl
+++ /dev/null
@@ -1,9 +0,0 @@
-package workpool
-import workpool.*;
-rule "WorkerAdder"
-	when 
-		$workerBean: WorkpoolBean(singleAction == false && (jobComputed > 500))
-	then
-		$workerBean.addWorkerToNode("nodeB");
-		$workerBean.setSingleAction();
-end
diff --git a/java/sca-contrib/demos/workpool-distributed/workerRules1.drl b/java/sca-contrib/demos/workpool-distributed/workerRules1.drl
deleted file mode 100644
index 6fa0b85ba2..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/workerRules1.drl
+++ /dev/null
@@ -1,9 +0,0 @@
-package workpool
-import workpool.*;
-rule "WorkerAdder"
-	when 
-		$workerBean: WorkpoolBean(averageServiceTime > 250)
-	then
-		$workerBean.addWorkerToNode("nodeB");
-		$workerBean.setSingleAction();
-end
diff --git a/java/sca-contrib/demos/workpool-distributed/workerRules2.drl b/java/sca-contrib/demos/workpool-distributed/workerRules2.drl
deleted file mode 100644
index 9d9551c3ea..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/workerRules2.drl
+++ /dev/null
@@ -1,8 +0,0 @@
-package workpool
-import workpool.*;
-rule "WorkerAverageService"
-	when 
-		$workerBean: WorkpoolBean(jobComputed > 250)
-	then
-		$workerBean.addWorkerToNode("nodeB");
-end
diff --git a/java/sca-contrib/demos/workpool-distributed/workerRules3.drl b/java/sca-contrib/demos/workpool-distributed/workerRules3.drl
deleted file mode 100644
index a67af910a4..0000000000
--- a/java/sca-contrib/demos/workpool-distributed/workerRules3.drl
+++ /dev/null
@@ -1,14 +0,0 @@
-package workpool
-import workpool.*;
-rule "AdaptUsageFactor"
-	when 
-		$workerBean: WorkpoolBean(usageFactor > 0.8)
-	then
-		$workerBean.addWorkerToNode("");
-end
-rule "AdaptQueueFull"
-	when
-		$workerBean: WorkpoolBean((estimedQueueSize > 1900) && jobsComputed > 100)
-	then	
-		$workerBean.addWorkerToNode("nodeB")
-end 
\ No newline at end of file
diff --git a/java/sca-contrib/demos/xml-bigbank/LICENSE b/java/sca-contrib/demos/xml-bigbank/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/demos/xml-bigbank/NOTICE b/java/sca-contrib/demos/xml-bigbank/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/demos/xml-bigbank/README b/java/sca-contrib/demos/xml-bigbank/README
deleted file mode 100644
index 3bdeeca60a..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/README
+++ /dev/null
@@ -1,46 +0,0 @@
-XML BigBank Demo

-================

-

-This demo showcases the integration with XML technolgies in the service assembly.

-

-Note: The live stock quote web service is not always running. Sometimes empty response is returned and the stock value is 0.

-

-To run the demo, type "ant run" and it will produce the following output.

-

-Buildfile: build.xml

-

-init:

-      [get] Getting: http://www.swanandmokashi.com/HomePage/WebServices/StockQuotes.asmx?WSDL

-      [get] To: C:\Apache\tuscany-sca-1.0.1-incubating\demos\xml-bigbank\src\main\resources\wsdl\StockQuotes.wsdl

-      [get] local file date : Tue Nov 06 15:50:37 PST 2007

-      [get] .

-      [get] last modified = Wed Dec 31 16:00:00 PST 1969 - using current time instead

-    [mkdir] Created dir: C:\Apache\tuscany-sca-1.0.1-incubating\demos\xml-bigbank\target\classes

-

-compile:

-    [javac] Compiling 11 source files to C:\Apache\tuscany-sca-1.0.1-incubating\demos\xml-bigbank\target\classes

-     [copy] Copying 6 files to C:\Apache\tuscany-sca-1.0.1-incubating\demos\xml-bigbank\target\classes

-      [jar] Building jar: C:\Apache\tuscany-sca-1.0.1-incubating\demos\xml-bigbank\target\demo-xml-bigbank.jar

-

-run:

-     [java] Nov 6, 2007 3:52:28 PM org.apache.axis2.deployment.DeploymentEngine loadFromClassPath

-     [java] INFO: Module validation failed: The system is attempting to engage a module that is not available: rampart

-     [java] Retrieving exchange rate...

-     [java] Nov 6, 2007 3:52:29 PM org.apache.tuscany.sca.binding.feed.provider.RSSBindingInvoker invoke

-     [java] INFO: >>> RSSBindingInvoker (rss_2.0) http://ansuz.sooke.bc.ca/rippy/exchange/?M=R&B=USD&F=CAD,CNY,EUR&T=F&S=O&I=S

-     [java] Exchange rate: USD 1.0=EUR 0.68705

-     [java] Loading account data...

-     [java] Getting stock quote...

-     [java] Nov 6, 2007 3:52:30 PM org.apache.commons.httpclient.HttpMethodBase readResponse

-     [java] INFO: Discarding unexpected response: HTTP/1.1 100 Continue

-     [java] Calculating total value...

-     [java] Checking Balance: xs:double: 1000

-     [java] Saving Blance: xs:double: 20000

-     [java] Stock Value: xs:integer: 0

-     [java] Total Value [1]: xs:double: 21000

-     [java] Total Value=USD 21000.0

-     [java] EUR: 14428.050000000001

-

-BUILD SUCCESSFUL

-Total time: 7 seconds

-

diff --git a/java/sca-contrib/demos/xml-bigbank/build.xml b/java/sca-contrib/demos/xml-bigbank/build.xml
deleted file mode 100644
index 0ba1b069aa..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/build.xml
+++ /dev/null
@@ -1,63 +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.
--->
-<!DOCTYPE project [
-<!ENTITY buildDependency SYSTEM "build-dependency.xml">
-]>    
-
-<project name="demo-xml-bigbank" default="compile">
-	&buildDependency;
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src\main\java"/>
-            <classpath>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
-            </classpath>
-        </javac>
-        <copy todir="target/classes">
-            <fileset dir="src\main\resources"/>
-            <fileset dir="src\main\resources"/>
-        </copy>
-        <jar destfile="target/demo-xml-bigbank.jar" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="bigbank.BigBankClient"/>
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="package" depends="compile"/>
-
-    <target name="run">
-        <java classname="bigbank.BigBankClient" fork="true">
-            <classpath>
-                <pathelement location="target/demo-xml-bigbank.jar"/>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
-            </classpath>
-        </java>
-    </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
-</project>
diff --git a/java/sca-contrib/demos/xml-bigbank/pom.xml b/java/sca-contrib/demos/xml-bigbank/pom.xml
deleted file mode 100644
index 0dc535352b..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/pom.xml
+++ /dev/null
@@ -1,115 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-demos</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>demo-xml-bigbank</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA XML BigBank Demo</name>
-    <description>Apache Tuscany SCA XML BigBank Demo</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-saxon</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>bigbank.BigBankClient</mainClass>
-                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountData.java b/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
deleted file mode 100644
index c3ae8d0912..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountData.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 bigbank;
-
-import java.io.IOException;
-
-import javax.xml.stream.XMLStreamReader;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface AccountData {
-    /**
-     * Get the StAX stream that represent the accounts data
-     * @return The StAX stream containign the accounts
-     * @throws IOException
-     */
-    XMLStreamReader getAccounts() throws IOException;
-}
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java b/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
deleted file mode 100644
index bb37b97fb8..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
+++ /dev/null
@@ -1,48 +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 bigbank;
-
-import java.io.IOException;
-import java.net.URL;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(AccountData.class)
-public class AccountDataImpl implements AccountData {
-    private XMLInputFactory factory = XMLInputFactory.newInstance();
-
-    public XMLStreamReader getAccounts() throws IOException {
-        URL doc = getClass().getResource("/accounts.xml");
-        XMLStreamReader reader = null;
-        try {
-            reader = factory.createXMLStreamReader(doc.openStream());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return reader;
-    }
-
-}
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountService.java b/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
deleted file mode 100644
index 4c72384e7b..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountService.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 bigbank;
-
-
-/**
- * @version $Rev$ $Date$
- */
-public interface AccountService {
-    /**
-     * Get the total value of all accounts owned by the customer
-     * @return The total value
-     */
-    double getTotalValue();
-}
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java b/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
deleted file mode 100644
index 77af28d6cd..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.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 bigbank;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axiom.om.OMElement;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(AccountService.class)
-public class AccountServiceImpl implements AccountService {
-    private static final String STOCK_QUOTE_REQUEST =
-        "<q:GetQuote xmlns:q=\"http://www.webserviceX.NET/\"><q:symbol>IBM GOOG MSFT</q:symbol></q:GetQuote>";
-
-    private XMLInputFactory factory = XMLInputFactory.newInstance();
-
-    @Reference
-    protected ExchangeRate exchangeRate;
-
-    @Reference
-    protected StockQuote stockQuote;
-
-    @Reference
-    protected AccountData accountData;
-
-    @Reference
-    protected StockValue stockValue;
-
-    @Property
-    protected String currency;
-
-    public double getTotalValue() {
-        try {
-            double rate = exchangeRate.getExchangeRate(currency);
-
-            System.out.println("Loading account data...");
-            XMLStreamReader accounts = accountData.getAccounts();
-
-            System.out.println("Getting stock quote...");
-            XMLStreamReader request = factory.createXMLStreamReader(new StringReader(STOCK_QUOTE_REQUEST));
-
-            OMElement quotes = stockQuote.GetQuote(request);
-
-            String xml = quotes.getText();
-            System.out.println(xml);
-            XMLStreamReader qts = factory.createXMLStreamReader(new StringReader(xml));
-            System.out.println("Calculating total value...");
-            double value = stockValue.calculate(qts, accounts);
-
-            System.out.println("Total Value=USD " + value);
-
-            return value * rate;
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java b/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
deleted file mode 100644
index a7703787fb..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
+++ /dev/null
@@ -1,35 +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 bigbank;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program to invoke the Account service
- */
-public class BigBankClient {
-
-    public static void main(String[] args) throws Exception {
-
-        SCADomain domain = SCADomain.newInstance("BigBank.composite");
-        AccountService accountService = domain.getService(AccountService.class, "AccountService");
-
-        System.out.println("EUR: " + accountService.getTotalValue());
-    }
-}
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java b/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
deleted file mode 100644
index f5f1ca90b6..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
+++ /dev/null
@@ -1,40 +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 bigbank;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BigBankServer {
-    public static void main(String[] args) throws Exception {
-
-        System.out.println("Starting the BigBank Service...");
-
-        SCADomain domain = SCADomain.newInstance("http://localhost", "/", "BigBank.composite");
-
-        System.out.println("Press Enter to Exit...");
-        System.in.read();
-
-        domain.close();
-        System.out.println("Bye");
-    }
-}
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java b/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
deleted file mode 100644
index 96f9e9bd18..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.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 bigbank;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-import com.sun.syndication.feed.synd.SyndFeed;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface CurrencyExchange {
-    /**
-     * Get the currency exchange rates as a RSS feed
-     * @return
-     */
-    SyndFeed getRates();
-}
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java b/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
deleted file mode 100644
index 358e5e19a2..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.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 bigbank;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface ExchangeRate {
-    /**
-     * Look up the exchange rate of a currency against USD
-     * @param currency The currency
-     * @return The exchange rate
-     */
-    double getExchangeRate(String currency);
-}
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java b/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
deleted file mode 100644
index 3b95f5240f..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.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 bigbank;
-
-import java.io.ByteArrayInputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathFactory;
-
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(ExchangeRate.class)
-public class ExchangeRateImpl {
-    @Reference
-    protected CurrencyExchange exchangeRate;
-
-    private final DocumentBuilder builder;
-
-    public ExchangeRateImpl() {
-        try {
-            builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        } catch (ParserConfigurationException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    /**
-     * Retrieve the live currency exchange rate from a live feed and extract the data for a given
-     * currecy using XPath
-     * @param currency The currency
-     * @return The exchange rate
-     */
-    public double getExchangeRate(String currency) {
-        try {
-            System.out.println("Retrieving exchange rate...");
-            SyndFeed feed = exchangeRate.getRates();
-            SyndEntry entry = (SyndEntry)feed.getEntries().get(0);
-            String rateTable = entry.getDescription().getValue();
-
-            Document doc = builder.parse(new ByteArrayInputStream(rateTable.getBytes()));
-            Node node = doc.getDocumentElement();
-            XPath path = XPathFactory.newInstance().newXPath();
-            XPathExpression exp = path.compile("/TABLE/TR[TD[1]='" + currency.toUpperCase() + "']/TD[2]");
-            Node rateNode = (Node)exp.evaluate(node, XPathConstants.NODE);
-            double rate = Double.valueOf(rateNode.getTextContent().trim());
-            System.out.println("Exchange rate: USD 1.0=" + currency + " " + rate);
-            return rate;
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-}
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java b/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
deleted file mode 100644
index 7896cf7890..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
+++ /dev/null
@@ -1,38 +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 bigbank;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axiom.om.OMElement;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface StockQuote {
-    /**
-     * Invoke the stock quote web service to get the live quotes
-     * @param input The StAX stream of the request
-     * @return The StAX stream of the response
-     */
-    public OMElement GetQuote(XMLStreamReader input);
-}
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/StockValue.java b/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
deleted file mode 100644
index 6b9ab1f9a3..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
+++ /dev/null
@@ -1,38 +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 bigbank;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface StockValue {
-    /**
-     * Join the quotes and accounts document to calculate the value
-     * @param quotes The quotes XML document
-     * @param accounts The accounts XML document
-     * @return The value
-     */
-    double calculate(XMLStreamReader quotes, XMLStreamReader accounts);
-}
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/resources/BigBank.composite b/java/sca-contrib/demos/xml-bigbank/src/main/resources/BigBank.composite
deleted file mode 100644
index 8afde4bf80..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/resources/BigBank.composite
+++ /dev/null
@@ -1,51 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-    targetNamespace="http://bigbank" name="BigBank">

-

-    <component name="AccountService">

-        <implementation.java class="bigbank.AccountServiceImpl" />

-        <reference name="accountData" target="AccountData" />

-        <reference name="stockValue" target="StockValue" />

-        <reference name="exchangeRate" target="ExchangeRate"/>

-        <property name="currency">EUR</property>

-    </component>

-

-    <component name="ExchangeRate">

-        <implementation.java class="bigbank.ExchangeRateImpl" />

-        <reference name="exchangeRate">

-            <tuscany:binding.rss

-                uri="http://ansuz.sooke.bc.ca/rippy/exchange/?M=R&amp;B=USD&amp;F=CAD,CNY,EUR&amp;T=F&amp;S=O&amp;I=S" />

-        </reference>

-    </component>

-

-    <component name="AccountData">

-        <implementation.java class="bigbank.AccountDataImpl" />

-    </component>

-

-    <component name="StockValue">

-        <tuscany:implementation.xquery location="stock.xq" />

-    </component>

-

-    <reference name="StockQuoteReference" promote="AccountService/stockQuote">

-        <binding.ws wsdlElement="http://www.webserviceX.NET/#wsdl.port(StockQuote/StockQuoteSoap)" />

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/resources/accounts.xml b/java/sca-contrib/demos/xml-bigbank/src/main/resources/accounts.xml
deleted file mode 100644
index 52ffd41fa7..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/resources/accounts.xml
+++ /dev/null
@@ -1,29 +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.    
--->
-<customer id="123" xmlns="http://example.com/customer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <firstName>John</firstName>
-    <lastName>Smith</lastName>
-    <accounts>
-        <checking id="C01" balance="1000.0"></checking>
-        <saving id="S01" balance="20000.0"></saving>
-        <stock symbol="IBM" quantity="500" />
-        <stock symbol="MSFT" quantity="200" />
-    </accounts>
-</customer>
\ No newline at end of file
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/resources/customer.xsd b/java/sca-contrib/demos/xml-bigbank/src/main/resources/customer.xsd
deleted file mode 100644
index b22efb74c4..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/resources/customer.xsd
+++ /dev/null
@@ -1,46 +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 xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://exmaple.com/customer"
-    targetNamespace="http://exmaple.com/customer" elementFormDefault="qualified">
-    <element name="customer" type="tns:Customer" />
-    <complexType name="Customer">
-        <sequence>
-            <element name="id" type="string"></element>
-            <element name="firstName" type="string"></element>
-            <element name="lastName" type="string"></element>
-            <element name="accounts" type="string"></element>
-        </sequence>
-    </complexType>
-    <complexType name="Accounts">
-        <choice>
-            <element name="checking" type="tns:Account"></element>
-            <element name="saving" type="tns:Account"></element>
-            <element name="stock" type="tns:Stock"></element>
-        </choice>
-    </complexType>
-    <complexType name="Account">
-        <attribute name="id" type="string"></attribute>
-        <attribute name="balance" type="float"></attribute>
-    </complexType>
-    <complexType name="Stock">
-        <attribute name="symbol" type="string"></attribute>
-        <attribute name="quantity" type="int"></attribute>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/resources/stock.xq b/java/sca-contrib/demos/xml-bigbank/src/main/resources/stock.xq
deleted file mode 100644
index 03c19e457d..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/resources/stock.xq
+++ /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.    

-:)

-declare namespace q="http://www.webserviceX.NET/";

-declare namespace c="http://example.com/customer";

-declare namespace stock="scaservice:java/bigbank.StockValue";

-(: declare namespace currency="scaproperty:java/java.lang.String"; :)

-

-declare function stock:calculate($quoteDoc, $accountDoc) as xs:double {

-    let $checking := 

-    trace(

-    sum(

-        for $a in $accountDoc/c:customer/c:accounts/c:checking

-        return $a/@balance

-    ), "Checking Balance")

-    

-    let $saving :=

-    trace( 

-    sum(

-        for $a in $accountDoc/c:customer/c:accounts/c:saving

-        return $a/@balance

-    ), "Saving Blance")

-    

-    let $value :=

-    trace( 

-    sum( 

-        for $quote in $quoteDoc/StockQuotes/Stock,

-            $account in $accountDoc/c:customer/c:accounts/c:stock

-        where string($quote/Symbol) = string($account/@symbol)

-        return 

-            trace(number($quote/Last),"Stock Price") * trace(number($account/@quantity), "Quantity")

-    ), "Stock Value")

-    return trace($checking + $saving + $value, "Total Value")

-};

-

-

-

diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl b/java/sca-contrib/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
deleted file mode 100644
index 8411e22ff7..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
+++ /dev/null
@@ -1,23 +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://www.webserviceX.NET/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

-    <wsdl:import namespace="http://www.webserviceX.NET/"

-        location="http://www.webservicex.com/stockquote.asmx?WSDL" />

-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/demos/xml-bigbank/xml-bigbank.png b/java/sca-contrib/demos/xml-bigbank/xml-bigbank.png
deleted file mode 100644
index 0743a413a3..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/xml-bigbank.png
+++ /dev/null
diff --git a/java/sca-contrib/demos/xml-bigbank/xml-bigbank.svg b/java/sca-contrib/demos/xml-bigbank/xml-bigbank.svg
deleted file mode 100644
index c7acc03324..0000000000
--- a/java/sca-contrib/demos/xml-bigbank/xml-bigbank.svg
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-head\sca\demos\xml-bigbank"
-   sodipodi:docname="xm-bigbank.svg"
-   version="1.0"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\simon\tuscany\java-head\sca\demos\xml-bigbank\xm-bigbank.png"
-   inkscape:export-xdpi="63.484341"
-   inkscape:export-ydpi="63.484341">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="690.60907"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="g2997"
-     inkscape:window-width="1128"
-     inkscape:window-height="883"
-     inkscape:window-x="608"
-     inkscape:window-y="59"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997">
-      <rect
-         rx="21.797628"
-         ry="19.106352"
-         y="192.46646"
-         x="258.7756"
-         height="451.60468"
-         width="705.90796"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.92824173;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="translate(-10.101525,-7.0710678)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">BigBank</flowPara></flowRoot>      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2186"
-         width="115.66247"
-         height="85.862968"
-         x="533.78589"
-         y="326.39639"
-         rx="6.9961648"
-         ry="7.1230249" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2188"
-         transform="translate(278.19507,120.45784)"><flowRegion
-           id="flowRegion2190"><rect
-             id="rect2192"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2194">AccountData</flowPara><flowPara
-           id="flowPara2240">(Local file or</flowPara><flowPara
-           id="flowPara2242">Database)</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 516.63534,358.24336 L 549.97038,358.24336 L 556.03129,371.37534 L 548.96023,383.49718 L 516.63534,383.49718 L 524.21149,371.37534 L 516.63534,358.24336 z "
-         id="path2196" />
-      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2214"
-         width="115.66247"
-         height="85.862968"
-         x="539.84674"
-         y="545.59949"
-         rx="6.9961648"
-         ry="7.1230249" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2216"
-         transform="translate(282.25599,339.66095)"><flowRegion
-           id="flowRegion2218"><rect
-             id="rect2220"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2222">StockValue</flowPara><flowPara
-           id="flowPara2244">  (XQuery)</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 522.69626,577.44647 L 556.0313,577.44647 L 562.09221,590.57845 L 555.02115,602.70029 L 522.69626,602.70029 L 530.27241,590.57845 L 522.69626,577.44647 z "
-         id="path2224" />
-      <rect
-         style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2246"
-         width="143.44167"
-         height="85.862968"
-         x="754.58392"
-         y="216.79486"
-         rx="0"
-         ry="0" />
-      <rect
-         style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2248"
-         width="143.44167"
-         height="85.862968"
-         x="520.22852"
-         y="435.49289"
-         rx="0"
-         ry="0" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 662.66007,259.22126 L 755.5941,259.22126"
-         id="path2290" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 441.43666,383.47002 L 457.5991,383.47002 L 457.5991,261.24156 L 515.1778,261.24157"
-         id="path2292"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 441.43666,423.87613 L 473.76154,424.88628 L 474.77169,371.34819 L 524.26917,371.34819"
-         id="path2294"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 440.42651,463.27208 L 471.74124,463.27208 L 471.74124,486.50558 L 520.22856,486.50558"
-         id="path2296" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 440.42651,499.63757 L 455.5788,499.63757 L 456.58895,590.55129 L 528.30978,590.5513"
-         id="path2298"
-         sodipodi:nodetypes="cccc" />
-      <g
-         id="g3277"
-         transform="translate(3.5355339,-27.274119)">
-        <path
-           transform="matrix(1.0044058,0,0,0.9999286,0.1776037,54.104992)"
-           d="M 871.76167 370.33804 A 57.07362 15.152288 0 1 1  757.61443,370.33804 A 57.07362 15.152288 0 1 1  871.76167 370.33804 z"
-           sodipodi:ry="15.152288"
-           sodipodi:rx="57.07362"
-           sodipodi:cy="370.33804"
-           sodipodi:cx="814.68805"
-           id="path2304"
-           style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           sodipodi:type="arc" />
-        <rect
-           ry="0"
-           rx="0"
-           y="371.70511"
-           x="760.4967"
-           height="52.824245"
-           width="115.4537"
-           id="rect2306"
-           style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:none;stroke-width:0.70368773;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-        <path
-           transform="translate(3.0304576,0)"
-           d="M 871.76167 370.33804 A 57.07362 15.152288 0 1 1  757.61443,370.33804 A 57.07362 15.152288 0 1 1  871.76167 370.33804 z"
-           sodipodi:ry="15.152288"
-           sodipodi:rx="57.07362"
-           sodipodi:cy="370.33804"
-           sodipodi:cx="814.68805"
-           id="path2302"
-           style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           sodipodi:type="arc" />
-      </g>
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 648.51793,369.32789 C 763.67532,369.32789 763.67532,369.32789 763.67532,369.32789"
-         id="path3284" />
-      <flowRoot
-         id="flowRoot3286"
-         xml:space="preserve"
-         transform="translate(162.46587,234.52979)"><flowRegion
-           id="flowRegion3288"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect3290" /></flowRegion><flowPara
-           id="flowPara3292">WS</flowPara></flowRoot>      <flowRoot
-         id="flowRoot3294"
-         xml:space="preserve"
-         transform="translate(529.33292,158.01074)"><flowRegion
-           id="flowRegion3296"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect3298" /></flowRegion><flowPara
-           id="flowPara3300">XML</flowPara></flowRoot>      <flowRoot
-         id="flowRoot3302"
-         xml:space="preserve"
-         transform="translate(367.70851,14.569085)"><flowRegion
-           id="flowRegion3304"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect3306" /></flowRegion><flowPara
-           id="flowPara3308">Feed(rss)</flowPara></flowRoot>      <g
-         id="g3337"
-         transform="translate(474.7717,172.73609)">
-        <path
-           transform="translate(0,-2)"
-           d="M 239.40616 104.16285 A 12.626906 12.626906 0 1 1  214.15234,104.16285 A 12.626906 12.626906 0 1 1  239.40616 104.16285 z"
-           sodipodi:ry="12.626906"
-           sodipodi:rx="12.626906"
-           sodipodi:cy="104.16285"
-           sodipodi:cx="226.77925"
-           id="path3314"
-           style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           sodipodi:type="arc" />
-        <text
-           id="text3310"
-           y="106.68823"
-           x="224.25386"
-           style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           xml:space="preserve"><tspan
-             y="106.68823"
-             x="224.25386"
-             id="tspan3312"
-             sodipodi:role="line">1</tspan></text>
-      </g>
-      <g
-         id="g3342"
-         transform="translate(424.26407,258.59905)">
-        <path
-           transform="translate(54.043156,22.728428)"
-           d="M 239.40616 104.16285 A 12.626906 12.626906 0 1 1  214.15234,104.16285 A 12.626906 12.626906 0 1 1  239.40616 104.16285 z"
-           sodipodi:ry="12.626906"
-           sodipodi:rx="12.626906"
-           sodipodi:cy="104.16285"
-           sodipodi:cx="226.77925"
-           id="path3316"
-           style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           sodipodi:type="arc" />
-        <text
-           id="text3318"
-           y="131.41666"
-           x="278.29703"
-           style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           xml:space="preserve"><tspan
-             y="131.41666"
-             x="278.29703"
-             id="tspan3320"
-             sodipodi:role="line">2</tspan></text>
-      </g>
-      <g
-         id="g3347"
-         transform="translate(162.63456,307.08637)">
-        <path
-           transform="translate(97.479716,45.961937)"
-           d="M 239.40616 104.16285 A 12.626906 12.626906 0 1 1  214.15234,104.16285 A 12.626906 12.626906 0 1 1  239.40616 104.16285 z"
-           sodipodi:ry="12.626906"
-           sodipodi:rx="12.626906"
-           sodipodi:cy="104.16285"
-           sodipodi:cx="226.77925"
-           id="path3325"
-           style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           sodipodi:type="arc" />
-        <text
-           id="text3327"
-           y="154.65016"
-           x="321.73358"
-           style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           xml:space="preserve"><tspan
-             y="154.65016"
-             x="321.73358"
-             id="tspan3329"
-             sodipodi:role="line">3</tspan></text>
-      </g>
-      <g
-         id="g3352"
-         transform="translate(168.69547,472.75139)">
-        <path
-           transform="translate(192.43405,25.758886)"
-           d="M 239.40616 104.16285 A 12.626906 12.626906 0 1 1  214.15234,104.16285 A 12.626906 12.626906 0 1 1  239.40616 104.16285 z"
-           sodipodi:ry="12.626906"
-           sodipodi:rx="12.626906"
-           sodipodi:cy="104.16285"
-           sodipodi:cx="226.77925"
-           id="path3331"
-           style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           sodipodi:type="arc" />
-        <text
-           id="text3333"
-           y="134.44711"
-           x="416.68793"
-           style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           xml:space="preserve"><tspan
-             y="134.44711"
-             x="416.68793"
-             id="tspan3335"
-             sodipodi:role="line">4</tspan></text>
-      </g>
-    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.90783787;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="114.75463"
-       height="182.93993"
-       x="307.03519"
-       y="341.49756"
-       rx="6.9412518"
-       ry="15.176341" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(42.142794,135.10507)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2228">AccountService</flowPara><flowPara
-         id="flowPara2230">      (Java)</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 289.43077,372.8906 L 322.76581,372.8906 L 328.82672,386.02258 L 321.75566,398.14442 L 289.43077,398.14442 L 297.00692,386.02258 L 289.43077,372.8906 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 402.68321,371.05232 L 436.01825,371.05232 L 442.07916,384.1843 L 435.0081,396.30614 L 402.68321,396.30614 L 410.25936,384.1843 L 402.68321,371.05232 z "
-       id="path3019" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2172"
-       width="115.66247"
-       height="85.862968"
-       x="526.71478"
-       y="216.28978"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2174"
-       transform="translate(259.12401,10.351218)"><flowRegion
-         id="flowRegion2176"><rect
-           id="rect2178"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2234">ExchangeRate</flowPara><flowPara
-         id="flowPara2238">       (Java)</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 509.56428,248.13674 L 542.89932,248.13674 L 548.96023,261.26872 L 541.88917,273.39056 L 509.56428,273.39056 L 517.14043,261.26872 L 509.56428,248.13674 z "
-       id="path2182" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 622.81672,246.29846 L 656.15176,246.29846 L 662.21267,259.43044 L 655.14161,271.55228 L 622.81672,271.55228 L 630.39287,259.43044 L 622.81672,246.29846 z "
-       id="path2184" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2250"
-       transform="translate(266.32636,230.06025)"><flowRegion
-         id="flowRegion2252"><rect
-           id="rect2254"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2266">     StockQuote</flowPara><flowPara
-         id="flowPara2280">(Live WebService)</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2268"
-       transform="translate(479.34893,10.930395)"><flowRegion
-         id="flowRegion2270"><rect
-           id="rect2272"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2274">CurrencyExchangeRate</flowPara><flowPara
-         id="flowPara2276">    (Live RSS Feed)</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 401.53563,484.99035 L 434.87067,484.99035 L 440.93158,498.12233 L 433.86052,510.24417 L 401.53563,510.24417 L 409.11178,498.12233 L 401.53563,484.99035 z "
-       id="path2284" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 402.54579,448.62486 L 435.88083,448.62486 L 441.94174,461.75684 L 434.87068,473.87868 L 402.54579,473.87868 L 410.12194,461.75684 L 402.54579,448.62486 z "
-       id="path2286" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 403.55594,410.23907 L 436.89098,410.23907 L 442.95189,423.37105 L 435.88083,435.49289 L 403.55594,435.49289 L 411.13209,423.37105 L 403.55594,410.23907 z "
-       id="path2288"
-       inkscape:transform-center-x="245.46707"
-       inkscape:transform-center-y="100.0051" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/distribution/core/pom.xml b/java/sca-contrib/distribution/core/pom.xml
deleted file mode 100644
index 8da15ac32d..0000000000
--- a/java/sca-contrib/distribution/core/pom.xml
+++ /dev/null
@@ -1,152 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-distribution</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-distribution-core</artifactId>

-    <name>Apache Tuscany SCA Core Distribution</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-    </dependencies>

-

-    <profiles>

-

-        <!-- Build profile that can be used to build the distro packages -->

-        <profile>

-            <id>distribution</id>

-            <activation>

-                <activeByDefault>false</activeByDefault>

-            </activation>

-            <build>

-                <plugins>

-                    <plugin>

-                        <groupId>org.apache.tuscany.sca</groupId>

-                        <artifactId>tuscany-maven-bundle-plugin</artifactId>

-                        <version>2.0-SNAPSHOT</version>

-                        <executions>

-                            <execution>

-                                <id>distribution-modules</id>

-                                <phase>generate-resources</phase>

-                                <goals>

-                                    <goal>generate-modules</goal>

-                                </goals>

-                                <configuration>

-                                    <targetDirectory>target/modules</targetDirectory>

-                                    <generateManifestJar>true</generateManifestJar>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-

-                    <plugin>

-                        <groupId>org.apache.maven.plugins</groupId>

-                        <artifactId>maven-assembly-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>distribution-package</id>

-                                <phase>package</phase>

-                                <goals>

-                                    <goal>single</goal>

-                                </goals>

-                                <configuration>

-                                    <descriptors>

-                                        <descriptor>src/main/assembly/bin.xml</descriptor>

-                                        <descriptor>src/main/assembly/src.xml</descriptor>

-                                    </descriptors>

-                                    <tarLongFileMode>gnu</tarLongFileMode>

-                                    <finalName>apache-tuscany-sca-core-2.0-SNAPSHOT</finalName>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-

-                </plugins>

-            </build>

-        </profile>

-        

-        <!-- Profile that can be used to build the modules included in the distro -->

-        <profile>

-            <id>modules</id>

-            <modules>

-                <module>../../modules/assembly</module>

-                <module>../../modules/assembly-xml</module>

-                <module>../../modules/assembly-xsd</module>

-                <module>../../modules/binding-sca</module>

-                <module>../../modules/binding-sca-xml</module>

-                <module>../../modules/contribution</module>

-                <module>../../modules/contribution-java</module>

-                <module>../../modules/contribution-namespace</module>

-                <module>../../modules/contribution-xml</module>

-                <module>../../modules/core</module>

-                <module>../../modules/core-databinding</module>

-                <module>../../modules/core-spi</module>

-                <module>../../modules/databinding</module>

-                <module>../../modules/databinding-jaxb</module>

-                <module>../../modules/definitions</module>

-                <module>../../modules/definitions-xml</module>

-                <module>../../modules/endpoint</module>

-                <module>../../modules/extensibility</module>

-                <module>../../modules/extensibility-equinox</module>

-                <module>../../modules/host-http</module>

-                <module>../../modules/implementation-java</module>

-                <module>../../modules/implementation-java-runtime</module>

-                <module>../../modules/implementation-java-xml</module>

-                <module>../../modules/implementation-node</module>

-                <module>../../modules/implementation-node-runtime</module>

-                <module>../../modules/interface</module>

-                <module>../../modules/interface-java</module>

-                <module>../../modules/interface-java-jaxws</module>

-                <module>../../modules/interface-java-xml</module>

-                <module>../../modules/interface-wsdl</module>

-                <module>../../modules/interface-wsdl-xml</module>

-                <module>../../modules/monitor</module>

-                <module>../../modules/node-api</module>

-                <module>../../modules/node-impl</module>

-                <module>../../modules/node-launcher</module>

-                <module>../../modules/node-launcher-equinox</module>

-                <module>../../modules/policy</module>

-                <module>../../modules/policy-security</module>

-                <module>../../modules/policy-xml</module>

-                <module>../../modules/sca-api</module>

-                <module>../../modules/workspace</module>

-                <module>../../modules/workspace-impl</module>

-                <module>../../modules/workspace-xml</module>

-                <module>../../modules/xsd</module>

-                <module>../../modules/xsd-xml</module>

-            </modules>

-        </profile>

-    </profiles>

-

-</project>

diff --git a/java/sca-contrib/distribution/core/src/main/assembly/bin.xml b/java/sca-contrib/distribution/core/src/main/assembly/bin.xml
deleted file mode 100644
index 8a882e6623..0000000000
--- a/java/sca-contrib/distribution/core/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,36 +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.

--->

-<assembly>

-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->

-    <id></id>

-    <includeBaseDirectory>true</includeBaseDirectory>

-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>

-    <formats>

-        <format>dir</format>

-        <format>tar.gz</format>

-        <format>zip</format>

-    </formats>

-

-    <componentDescriptors>

-        <componentDescriptor>src/main/components/bin-common.xml</componentDescriptor>

-        <componentDescriptor>src/main/components/bin-modules.xml</componentDescriptor>

-        <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>

-    </componentDescriptors>

-</assembly>

diff --git a/java/sca-contrib/distribution/core/src/main/assembly/src.xml b/java/sca-contrib/distribution/core/src/main/assembly/src.xml
deleted file mode 100644
index 7fc8a97b96..0000000000
--- a/java/sca-contrib/distribution/core/src/main/assembly/src.xml
+++ /dev/null
@@ -1,37 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>src</id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>src/main/components/src-common.xml</componentDescriptor>
-        <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
diff --git a/java/sca-contrib/distribution/core/src/main/components/bin-common.xml b/java/sca-contrib/distribution/core/src/main/components/bin-common.xml
deleted file mode 100644
index c69e8e3699..0000000000
--- a/java/sca-contrib/distribution/core/src/main/components/bin-common.xml
+++ /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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add the text files to the top-level directroy -->
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/bin</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>INSTALL</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-</component>
diff --git a/java/sca-contrib/distribution/core/src/main/components/bin-modules.xml b/java/sca-contrib/distribution/core/src/main/components/bin-modules.xml
deleted file mode 100644
index 69ec47740a..0000000000
--- a/java/sca-contrib/distribution/core/src/main/components/bin-modules.xml
+++ /dev/null
@@ -1,33 +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.

--->

-<component>

-    <fileSets>

-

-        <fileSet>

-            <directory>target</directory>

-            <outputDirectory>/</outputDirectory>

-            <includes>

-                <include>modules/**/*</include>

-                <include>features/**/*</include>

-            </includes>

-        </fileSet>

-

-    </fileSets>

-

-</component>

diff --git a/java/sca-contrib/distribution/core/src/main/components/bin-samples.xml b/java/sca-contrib/distribution/core/src/main/components/bin-samples.xml
deleted file mode 100644
index 64533c6ee2..0000000000
--- a/java/sca-contrib/distribution/core/src/main/components/bin-samples.xml
+++ /dev/null
@@ -1,62 +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.

--->

-<component>

-    <fileSets>

-        <!-- Add top level samples files -->

-        <fileSet>

-            <directory>../../samples</directory>

-            <outputDirectory>samples</outputDirectory>

-            <includes>

-                <include>README</include>

-                <include>logging.properties</include>

-                <include>build-common.xml</include>

-                <include>implementation-java-calculator/**/*</include>

-                <include>calculator/**/*</include>

-                <include>calculator-equinox/**/*</include>

-                <include>calculator-osgi/**/*</include>

-            </includes>

-            <excludes>

-                <!-- General file/folders to exclude -->

-                <exclude>**/.*</exclude>

-                <exclude>**/.*/**</exclude>

-                <exclude>**/*.log</exclude>

-                <exclude>**/*.svg</exclude>

-                <exclude>**/maven-eclipse.xml</exclude>

-

-                <!-- Sample specific files/folders to exclude -->

-                <exclude>pom.xml</exclude>

-                <!-- exclude>**/target</exclude -->

-                <!-- exclude>**/target/**/*</exclude -->

-                <exclude>*/target/mvn-eclipse-cache.properties</exclude>

-                <exclude>*/target/classes</exclude>

-                <exclude>*/target/classes/**/*</exclude>

-                <exclude>*/target/dependency-maven-plugin-markers</exclude>

-                <exclude>*/target/dependency-maven-plugin-markers/**/*</exclude>

-                <exclude>*/target/.felix</exclude>

-                <exclude>*/target/.felix/**/*</exclude>

-                <exclude>*/target/maven-archiver</exclude>

-                <exclude>*/target/maven-archiver/**/*</exclude>

-                <exclude>*/target/test-classes</exclude>

-                <exclude>*/target/test-classes/**/*</exclude>

-                <exclude>*/target/surefire-reports</exclude>

-                <exclude>*/target/surefire-reports/**/*</exclude>

-            </excludes>

-        </fileSet>

-    </fileSets>

-</component>

diff --git a/java/sca-contrib/distribution/core/src/main/components/src-common.xml b/java/sca-contrib/distribution/core/src/main/components/src-common.xml
deleted file mode 100644
index 002df33fc7..0000000000
--- a/java/sca-contrib/distribution/core/src/main/components/src-common.xml
+++ /dev/null
@@ -1,42 +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.
--->
-<component>
-    <fileSets>
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/src</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>BUILDING</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-</component>
diff --git a/java/sca-contrib/distribution/core/src/main/components/src-modules.xml b/java/sca-contrib/distribution/core/src/main/components/src-modules.xml
deleted file mode 100644
index edf73ec8fc..0000000000
--- a/java/sca-contrib/distribution/core/src/main/components/src-modules.xml
+++ /dev/null
@@ -1,86 +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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add module sources to the modules directory -->
-        <fileSet>
-            <directory>../../../modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>assembly/**/*</include>
-                <include>assembly-xml/**/*</include>
-                <include>assembly-xsd/**/*</include>
-                <include>binding-sca/**/*</include>
-                <include>binding-sca-xml/**/*</include>
-                <include>contribution/**/*</include>
-                <include>contribution-java/**/*</include>
-                <include>contribution-namespace/**/*</include>
-                <include>contribution-xml/**/*</include>
-                <include>core/**/*</include>
-                <include>core-databinding/**/*</include>
-                <include>core-spi/**/*</include>
-                <include>databinding/**/*</include>
-                <include>databinding-jaxb/**/*</include>
-                <include>definitions/**/*</include>
-                <include>definitions-xml/**/*</include>
-                <include>endpoint/**/*</include>
-                <include>extensibility/**/*</include>
-                <include>extensibility-equinox/**/*</include>
-                <include>host-http/**/*</include>
-                <include>implementation-java/**/*</include>
-                <include>implementation-java-runtime/**/*</include>
-                <include>implementation-java-xml/**/*</include>
-                <include>implementation-node/**/*</include>
-                <include>implementation-node-runtime/**/*</include>
-                <include>interface/**/*</include>
-                <include>interface-java/**/*</include>
-                <include>interface-java-jaxws/**/*</include>
-                <include>interface-java-xml/**/*</include>
-                <include>interface-wsdl/**/*</include>
-                <include>interface-wsdl-xml/**/*</include>
-                <include>monitor/**/*</include>
-                <include>node-api/**/*</include>
-                <include>node-impl/**/*</include>
-                <include>node-launcher/**/*</include>
-                <include>node-launcher-equinox/**/*</include>
-                <include>policy/**/*</include>
-                <include>policy-security/**/*</include>
-                <include>policy-xml/**/*</include>
-                <include>sca-api/**/*</include>
-                <include>workspace/**/*</include>
-                <include>workspace-impl/**/*</include>
-                <include>workspace-xml/**/*</include>
-                <include>xsd/**/*</include>
-                <include>xsd-xml/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
diff --git a/java/sca-contrib/distribution/core/src/main/release/CHANGES b/java/sca-contrib/distribution/core/src/main/release/CHANGES
deleted file mode 100644
index 3de7358ec6..0000000000
--- a/java/sca-contrib/distribution/core/src/main/release/CHANGES
+++ /dev/null
@@ -1,431 +0,0 @@
-Changes With Apache Tuscany SCA 1.2 (incubating) April 2008 

-===========================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-2027

-  * TUSCANY-1999

-  * TUSCANY-2037

-  * TUSCANY-2034

-  * TUSCANY-2038

-  * TUSCANY-2043

-  * TUSCANY-2046

-  * TUSCANY-2047

-  * TUSCANY-2028

-  * TUSCANY-1873

-  * TUSCANY-2049

-  * TUSCANY-2035

-  * TUSCANY-1206

-  * TUSCANY-2036 

-  * TUSCANY-1771

-  * TUSCANY-2013

-  * TUSCANY-1926

-  * TUSCANY-1917

-  * TUSCANY-1949

-  * TUSCANY-1941

-  * TUSCANY-2045

-  * TUSCANY-2057

-  * TUSCANY-2055

-  * TUSCANY-2056

-  * TUSCANY-2072

-  * TUSCANY-2047

-  * TUSCANY-2073

-  * TUSCANY-1977 

-  * TUSCANY-2075

-  * TUSCANY-1894

-  * TUSCANY-2079

-  * TUSCANY-2078

-  * TUSCANY-2080

-  * TUSCANY-2068

-  * TUSCANY-1950

-  * TUSCANY-2077

-  * TUSCANY-2056

-  * TUSCANY-2088

-  * TUSCANY-2086

-  * TUSCANY-2094

-  * TUSCANY-2106 

-

-  Features and/or Enhancements

-

-  * Core

-    - Interceptor Enhancements

-      - Phase-based interceptor ordering to allow contribution of new interceptors and also define the order in witch they should be invoked

-      - Pass-by-reference SPI to allow interceptors to indicate if they support pass-by-reference

-      - PolicyProvider SPIs to allow extensions to plugin policy interceptors

-    - Support for JAXWS annotations and mapping of faults to Java exceptions according to JAXWS specification

-    - Improvement of contribution service to allow it to be used outside of the runtime environment 

-    - Support for Contribution Import/Export resource

-    - Enhanced Distributed Domain story using Workspace

-      - Implementation of a SCA domain allowing a system administrator to manage contributions, composites and sca nodes that run these composites

-        - Set of core services providing management capabilities

-        - Administration web interface

-        - This is a work in progress and you can see it in action in samples/calculator-distributed. Other samples that use distributed operation are yet to move over to the workspace.

-    - Enhanced support for SCA Policy spec

-      - Ability to apply external policy definitions to a SCA composition

-      - Ability to spread policy definitions to multiple definitions.xml files available across the sca domain

-      - Bug fixes

-    - Improvements of http binding to support servlet components

-    - Enable Tuscany to run inside an OSGi runtime

-

-  * Web 2.0 Extensions

-    - Enhancements to implementation.widget (support for properties)

-    - New atom binding based on Apache Abdera

-    - Refactoring of rss-rome binding

-  * Other Extensions

-    - Binding JMS

-      - greatly simplified the use of the JMS binding, support locating JMS resources from JNDI, and better compliance with the SCA JMS binding spec

-      - see the doc page for more details: http://incubator.apache.org/tuscany/sca-java-bindingjms.html

-    - Enhancements to Binding RMI

-      - Support shared RMI registry and use 999x as the ports in test case to avoid 1099 conflict

-    - Enhancements to Groovy extension

-      - Support for 'native' groovy classes

-    - Enhancements to OSGi bundle contributions

-      - Support Bundle URLs to be added as contributions

-

-  * Tools

-    - Eclipse plugin providing a Tuscany runtime Library and Tuscany launcher in Eclipse environment
-       - An updatesite is also available to facilitate the plugin installation using the Eclipse update manager

-

-  * Samples/Tutorial/Demos

-    - calculator-distributed migrated to use new Tuscany Distributed Workspace

-    - sample-calculator-ws-secure-webapp

-    - sample-helloworld-jms-webapp

-    - new jms samples

-    - improve bigbank demo to include support for policies 

-    - tutorial store changes

-      - use of import/export

-      - development of contribution without requiring dependencies on the Tuscany runtime

-      - usage of new sca domain infrastructure

-

-  * Testing

-    - Web Container Testing Framework integrated with (Tomcat, Jetty, Geronimo and Websphere)

-

-

-Changes With Apache Tuscany SCA 1.1 (incubating) January 2008 

-===============================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1939

-  * TUSCANY-1914

-  * TUSCANY-1854

-  * TUSCANY-1931

-  * TUSCANY-1547

-  * TUSCANY-1909

-  * TUSCANY-1919

-  * TUSCANY-1930

-  * TUSCANY-1806

-  * TUSCANY-1804

-  * TUSCANY-1916

-  * TUSCANY-1913

-  * TUSCANY-1834

-  * TUSCANY-1857

-  * TUSCANY-1687

-  * TUSCANY-1801

-  * TUSCANY-1742

-  * TUSCANY-1762

-  * TUSCANY-1945

-  * TUSCANY-1595

-  * TUSCANY-1594

-  * TUSCANY-1849

-  * TUSCANY-1836

-  * TUSCANY-1934

-  * TUSCANY-1902

-  * TUSCANY-1608

-  * TUSCANY-1943

-  * TUSCANY-1896

-  * TUSCANY-1626

-  * TUSCANY-1797

-  * TUSCANY-1601

-  * TUSCANY-1415

-

-- Better JMS support

-  * binding.jms supporting point to point text based messaging only

-  * New SOAP/JMS sample (helloworld-ws-reference/service-jms)

-

-- Improvements in PolicyFramework Support

-  * Support for policy specifications on operation elements in a composite definition

-  * Separate sample (calculator-implementation-policies) to demonstrate use of Implementation Policies 

-    (uses logging and JAAS Authentication)

-

-- Modeling of client side java script components

-  * See implementation.widget

-

-- Evolving support for doman API suggested by assembly spec including a standalone node and nodes running 

-  connected together in a domain. This is still experimental. 

- 

-- Class loading and OSGI improvements

-  * Enable Tuscany to be run in a multi-classloader environment including inside OSGi. By default,

-    Tuscany continues to run using a single CLASSPATH-based classloader.

-  * Contributions no longer need to be in the CLASSPATH. All import/export dependencies across contributions should be 

-    explicitly specified (as described in the spec).

-

-- JAXB based POJO transformations

-

-Changes With Apache Tuscany SCA 1.0.1 (incubating) November 2007 

-================================================================

-

-The Tuscany SCA Java 1.0.1 is mainly a bug-fix release. It also comes with some improvements as listed below.

- 

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1848

-  * TUSCANY-1857

-  * TUSCANY-1859

-  * TUSCANY-1801

-  * TUSCANY-1823

-  * TUSCANY-1839

-  * TUSCANY-1814

-  * TUSCANY-1818

-  * TUSCANY-1834

-  * TUSCANY-1637

-  * TUSCANY-1826

-  * TUSCANY-1823

-  * TUSCANY-1819

-  * TUSCANY-1821

-  * TUSCANY-1822

-  * TUSCANY-1806

-  * TUSCANY-1808

-  * TUSCANY-1756

-  * TUSCANY-1757

-

-- Fix build issues with Maven 2.0.7 and JDK 6

-

-- Reduce memory consumption for WSDLs that import large XSDs

-

-- Add more logging statements for better servicibility

-

-- Add an extension point to allow extensions to plug-in extension schemas.

-

-- Add a demo application to showcase XML integration story 

-

-- Improve in databinding framework

-  * Add support for JSON Databindings and other refactoring

-  * Set databinding for introspected data type and enhance the checking of wrapper style

-  * Improve the tree-based XMLStreamReader and convert Bean & DOM to use this approach

-  * Add a tree-iterator based XMLStreamReader base impl

-  * Add default element info to java interface

-  * Rename Interface.setDefaultDataBinding to resetDataBinding

-

-- Limit the method injection to setters and allow the setter annotation to override field annotation

-

-- Evolving support in Intent and Policy handling

-  * Add support for policies in implementation

-  * Fix the algorithm for macthing policySets defined on bindings for the wire

-  * Add policy intent for implementation.java

-  * Extend java implementation type to recognize and apply policies, adding util support for this in Policy module

-  * Add policy module for logging

-

-- Evolving development in the SCA Domain/Node

-

-- Update NOTICE files with missing dependencies

-

-

-Changes With Apache Tuscany SCA 1.0 (incubating) September 2007 

-===============================================================

-

-- Tuscany Java SCA now implements V1.0 of the core SCA 

-  specifications

-        SCA Assembly Model V1.0

-        SCA Java Common Annotations and APIs V1.0

-        SCA Java Component Implementation V1.0

-        SCA Web Services Binding V1.0

-  Including callbacks, conversations and callable references

-  

-

-- Support for ws-security configurable in the web services binding

-  thro Tuscany SCA policy intents and policysets using the policy framework 

-  introduced in the last release.  

-  

-  Note : This release supports specifications of policies around axis2

-         config params - see helloworld-ws-service-secure sample.  The policy

-         intents that have been tested are authentication, integrity and 

-         confidentiality.  

-         There is no sample or test that exercises confidentiality since there

-         are some unresolved licensing issue around bouncycastle libraries.  

-         However, users who are not encumbered by the bouncycastle license 

-         restrictions can try the 'confidentiality' intent. See FAQ - 

-         http://incubator.apache.org/tuscany/tuscany-sca-java-faq.html

-                

-         This release does not include support for WS-Policy

-         attachments in Tuscany Policysets for ws-security.

-         

-  

-- An XQuery component implementation type 

-        implementation-xquery

-        

-

-- A Databinding for converting data to and from nodes for XQuery 

-  processing

-        databinding-saxon

-        

-

-- OSGI support has been extended to allow Tuscany contributions 

-  packaged as OSGI bundles hence taking advantage of OSGI's bundle

-  loading an dependency management capabilities 

-  

-

-- A BPEL component implementation type experimental implementation

-based on SCA BPEL Client and Implementation V1.0. At the moment only

-supports BPEL process as services.

-	implementation-bpel

-

-

-- The distributed runtime implementation has been separated out 

-  into 

-        *) domain

-        *) node

-  It is now wrapped by a SCADomain interface as is the standalone 

-  runtime.

-  

-  Note: This release does not include support for WebApp host deployment 

-        for a distributed SCA Domain 

-  

-

-

-- The web service binding will now generate WSDL automatically

-  based on the service interface if no WSDL is provided

-  

-

-- A new "store" sample and associated document show how a 

-  simple store front application can be constructed 

-        samples/store

-        

-- The following features of this release are still experimental:

-     - BPEL implementation type, integrating with Apache ODE

-     - OSGI implementation type, integrating with Apache Felix

-     - XQuery implementation type

-

- 

-

-Changes With Apache Tuscany SCA 0.99 (incubating) August 2007 

-=============================================================

-

-The following are the significant additions to release 0.99 

-over and above all of what was offered in release 0.91.

-

-- A version of the default sca binding that works between

-  components runing in separate Java virtual machines

-       binding-sca-axis

-

-- A simple node implementation and a service discovery 

-  function for running sca applications distributed 

-  across more than one node

-       distributed

-       distributed-impl 

-

-- integration with OSGi runtimes is now supported with

-  a new implementation-osgi component type

-

-- PUB/SUB interactions are now supported by using new 

-  notification binding and implementation types, and

-  samples demonstrating the feature.

-

-- The Tuscany runtime now has a policy framework supporting

-  the SCA policy specification

-

-- the endpoint URIs used by SCA bindings has been rationalized 

-  and now follows the SCA Assembly specification

-

-- binding-ajax has been renamed to binding-dwr

-

-Changes With Apache Tuscany SCA 0.91 (incubating) July 2007 

-===========================================================

-

-The following are the significant additions to release 0.91 

-over and above all of what was offered in release 0.90.

-

-

-- Enhancements to support multiple contributions to the SCA Domain

-

-- The inclusion of a alternative simplified extensions-helper

-SPI layer to faciliate rapid development of extensions

-

-- More Implementation Extenstions

-        Spring

-        WebResource

-

-- More Binding Extensions

-        AJAX

-        EJB

-        RSS/ATOM Feeds

-        

-- Demos that demonstrate the use of a mix of extensions

-         alert-aggregator-webapp

-         bigbank-account

-         bigbank-calculator

-         bigbank-stockquote

-

-

-- Samples

-        Samples to demostrate use of Spring, Resource, AJAX extensions

-

-Changes With Apache Tuscany SCA 0.90 (incubating) June 2007 

-===========================================================

-

-- Implementations for all of the Java Annotations and API Specification V1.0 found at

-  (http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications) 

-  apart from the following.

-    @ComponentName

-    Conversation

-    RequestContext

-    

-- New assembly model implementation taking into account SCA 1.0 artifacts 

-  Data duplication between assembly model and runtime removed

-

-- Simple single process domain support

-  Contribution support to scope items being deployed into the runtime

-

-- Improved Package/Class naming consistency across modules

-

-- Extensions now loaded via Java service mechanism

-  Refactored extensions to use new SPIs (see below)

-

-- Maven and Ant based sample builds in the binary distribution

-

-- Implementation Extensions

-    Java

-    Script supporting (Ruby, Python, Groovy, JavaScript)

-

-- Binding Extensions

-    Axis2

-    RMI

-    JSONRPC

-

--Databinding Extensions

-    Axiom

-    JAXB

-    SDO

-

-- Host environments

-    Embedded

-    Tomcat

-    Jetty

-    RMI

-

-- A clear set of SPIs intended to be stable over future releases

-    SCA assembly model

-      org.apache.tuscany.sca.assembly

-      org.apache.tuscany.sca.interfacedef

-      org.apache.tuscany.sca.interfacedef.java

-      org.apache.tuscany.sca.interfacedef.wsdl

-      org.apache.tuscany.sca.policy

-

-    SCA contribution model

-      org.apache.tuscany.sca.contribution

-

-    Runtime extensions

-      org.apache.tuscany.sca.core

-      org.apache.tuscany.sca.invocation

-      org.apache.tuscany.sca.provider

-      org.apache.tuscany.sca.runtime

-      org.apache.tuscany.sca.work

-

-    Data binding support

-      org.apache.tuscany.sca.databinding

-

-    Embedding Tuscany

-      org.apache.tuscany.sca.host.embedded

-

-    Servlet container integration

-      org.apache.tuscany.sca.http

-

-- For this point release a partial set of JavaDoc is provided to 

-  be filled out as we close on release 1.0

diff --git a/java/sca-contrib/distribution/core/src/main/release/README b/java/sca-contrib/distribution/core/src/main/release/README
deleted file mode 100644
index 4d83dcfde9..0000000000
--- a/java/sca-contrib/distribution/core/src/main/release/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 README
-=====================================================
-
-Welcome to the Tuscany SCA 1.2 release. 
-
-See the RELEASE_NOTES file for information specific to this release.
-
-In the binary release see the INSTALL file for information on how to 
-install the release.
-
-In the source distribution see the BUILDING file for information on
-building the source code.
-
-
-
-
-
-
-
diff --git a/java/sca-contrib/distribution/core/src/main/release/RELEASE_NOTES b/java/sca-contrib/distribution/core/src/main/release/RELEASE_NOTES
deleted file mode 100644
index a04ef5c553..0000000000
--- a/java/sca-contrib/distribution/core/src/main/release/RELEASE_NOTES
+++ /dev/null
@@ -1,83 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 Release Notes
-============================================================
-
-Apache Tuscany provides a runtime based on the Service Component
-Architecture. SCA is a set of specifications aimed at simplifying SOA
-Application Development which are being standardized at OASIS as part
-of Open Composite Services Architecture (Open CSA) - http://www.oasis-opencsa.org/.
-
-Overview
---------
-
-     The Apache Tuscany SCA 1.2 release includes implementations of the
-     main SCA specifications including:
-
-        SCA Assembly Model V1.0
-        SCA Policy Framework V1.0
-        SCA Java Common Annotations and APIs V1.0
-        SCA Java Component Implementation V1.0
-        SCA Spring Component Implementation V1.0
-        SCA BPEL Client and Implementation V1.0
-        SCA Web Services Binding V1.0
-        SCA EJB Session Bean Binding V1.0
-
-    It also includes implementations of many features not yet defined
-    by SCA specifications, including:
-
-        - SCA bindings for Direct Web Remoting, RSS and ATOM Feeds, 
-          HTTP resources, JSON-RPC, PUB/SUB Notifications, and RMI.
-        - SCA implementation types for OSGI, XQuery, BPEL, Widget and various 
-          dynamic languages including Groovy, Javascript, Python and Ruby
-        - Databindings for Service Data Objects (SDO), JAXB, XmlBeans, 
-          Axis2's AXIOM, JSON, SAXON, DOM, SAX and StAX
-
-    The Tuscany SCA Runtime can be configured as a single node SCA domain or 
-    as an SCA domain distributed across multiple nodes. 
-    In addition Tuscany SCA supports the following host-deployment options: -
-        - running standalone 
-        - running with distributed nodes across multiple JVMs
-        - running with embedded Jetty or Tomcat
-        - running as part of a standard web application                                     
-     
-    The Wepapp samples included in this release have been tried and tested on 
-        - Tomcat 5.5.20 and Tomcat 6.0.14
-        - Jetty 6.1.3
-        - Geronimo 2.0.2 Tomcat6 jee5
-        - WebSphere 6.1 fix pack 9
-
-See the CHANGES file for a detailed list of the features in this release.
-
-Support
--------
-
-For more information on Apache Tuscany visit the website at:
-
-    http://incubator.apache.org/tuscany/
- 
-Any issues with this release can be reported to Apache Tuscany
-using the mailing lists or in the JIRA issue tracker.
-
-    Mailing list archives:
-
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-user/
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/
-
-    Jira:
-
-       http://issues.apache.org/jira/browse/TUSCANY
-
-To join the project's mailing lists follow the instructions at:
-
-    http://incubator.apache.org/tuscany/mailing-lists.html
-
-To find out more about OASIS Open CSA go to: 
-
-    http://www.oasis-opencsa.org.
-
-Apache Tuscany welcomes your help. Any contribution, including code,
-testing, improving the documentation, or bug reporting is always
-appreciated. 
-
-Thank you for using Apache Tuscany!
-
-- The Tuscany Team.
diff --git a/java/sca-contrib/distribution/core/src/main/release/bin/INSTALL b/java/sca-contrib/distribution/core/src/main/release/bin/INSTALL
deleted file mode 100644
index 2da53a2b44..0000000000
--- a/java/sca-contrib/distribution/core/src/main/release/bin/INSTALL
+++ /dev/null
@@ -1,27 +0,0 @@
-Installing the Apache Tuscany SCA 1.2 (incubating) April 2008 Release binary distribution
-=========================================================================================
-
-Unzip Tuscany binary distribution archive and you get the following:
-
-tuscany-sca-1.1-incubating        
-   DISCLAIMER    - the ASF incubation disclaimer
-   INSTALL       - this help file
-   LICENSE       - the Apache License and any dependecy licenses
-   NOTICE        - attribution notices associated with the licenses
-   README        - readme for the release
-   RELEASE_NOTES - description of this release 
-   CHANGES       - A note of the major changes in this release
-
-   /demos        - Demo applications showcasing the use of Apache Tuscany 
-
-   /lib          - The tuscany-sca-all and tuscany-sca-manifest jars and all their dependencies
-
-   /modules      - all of the individual Tuscany jars
-
-   /samples      - all the Tuscany samples, see the README in that directory
-
-   /tutorial     - The store tutorial, see the README in that directory
-
-
-
-
diff --git a/java/sca-contrib/distribution/core/src/main/release/bin/LICENSE b/java/sca-contrib/distribution/core/src/main/release/bin/LICENSE
deleted file mode 100644
index 5e1f585d46..0000000000
--- a/java/sca-contrib/distribution/core/src/main/release/bin/LICENSE
+++ /dev/null
@@ -1,2366 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================
-
-APACHE TUSCANY SUBCOMPONENTS: 
-
-The Apache Tuscany binary distribution includes a number of subcomponents
-with separate copyright notices and license terms. Your use of the
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.                             
-
-===============================================================================
-
-The following components come under Apache Software License 1.1
-
- commons-discovery-0.2.jar
- commons-primitives-1.0.jar
-
-The following components come under Apache Software License 2.0
-
- abdera-core-0.3.0-incubating.jar
- abdera-i18n-0.3.0-incubating.jar
- abdera-parser-0.3.0-incubating.jar
- activeio-2.0-r118.jar
- activeio-core-3.0.0-incubator.jar
- apache-activemq-4.1.1.jar
- addressing-1.3.mar
- annogen-0.1.0.jar
- annotations-api-6.0.14.jar
- aopalliance-1.0.jar
- axiom-api-1.2.5.jar
- axiom-dom-1.2.5.jar
- axiom-impl-1.2.5.jar
- axis2-adb-1.3.jar
- axis2-codegen-1.3.jar
- axis2-java2wsdl-1.3.jar
- axis2-kernel-1.3.jar
- axis2-mtompolicy-1.3.jar
- bsf-all-3.0-beta2.jar
- catalina-6.0.14.jar
- cglib-nodep-2.1_3.jar
- commons-collections-3.1.jar
- commons-codec-1.3.jar
- commons-fileupload-1.1.1.jar
- commons-httpclient-3.0.1.jar
- commons-io-1.2.jar
- commons-jexl-1.1.jar
- commons-lang-2.1.jar
- commons-logging-1.1.jar
- coyote-6.0.14.jar
- derby-10.1.3.1.jar
- geronimo-activation_1.1_spec-1.0-M1.jar
- geronimo-common-1.2-beta.jar
- geronimo-commonj_1.1_spec-1.0.jar
- geronimo-connector-1.2-beta.jar
- geronimo-core-1.2-beta.jar
- geronimo-deployment-1.2-beta.jar
- geronimo-ejb_3.0_spec-1.0.jar
- geronimo-interceptor-1.2-beta.jar
- geronimo-j2ee-1.2-beta.jar
- geronimo-j2ee-connector_1.5_spec-1.1.jar
- geronimo-j2ee-jacc_1.0_spec-1.1.jar
- geronimo-j2ee-management_1.0_spec-1.1.jar
- geronimo-javamail_1.4_spec-1.0-M1.jar
- geronimo-jms_1.1_spec-1.1.jar
- geronimo-jpa_3.0_spec-1.0.jar
- geronimo-jta_1.0.1B_spec-1.0.jar
- geronimo-kernel-1.2-beta.jar
- geronimo-management-1.2-beta.jar
- geronimo-naming-1.2-beta.jar
- geronimo-security-1.2-beta.jar
- geronimo-spec-j2ee-connector-1.5-rc4.jar
- geronimo-spec-jta-1.0.1B-rc4.jar
- geronimo-system-1.2-beta.jar
- geronimo-transaction-1.2-beta.jar
- geronimo-util-1.2-beta.jar
- httpcore-4.0-alpha5.jar
- httpcore-nio-4.0-alpha5.jar
- httpcore-niossl-4.0-alpha5.jar
- jettison-1.0-RC2.jar
- jetty-6.1.7.jar
- jetty-util-6.1.7.jar
- json-rpc-1.0.jar
- juli-6.0.14.jar
- log4j-1.2.12.jar
- logkit-1.0.1.jar
- neethi-2.0.2.jar
- ode-bpel-api-1.1.jar
- ode-bpel-compiler-1.1.jar
- ode-bpel-dao-1.1.jar
- ode-bpel-epr-1.1.jar
- ode-bpel-obj-1.1.jar
- ode-bpel-runtime-1.1.jar
- ode-bpel-schemas-1.1.jar
- ode-bpel-store-1.1.jar
- ode-dao-jpa-1.1.jar
- ode-dao-jpa-ojpa-derby-1.1.zip
- ode-jacob-1.1.jar
- ode-jacob-ap-1.1.jar
- ode-scheduler-simple-1.1.jar
- ode-utils-1.1.jar
- openjpa-all-0.9.7-incubating.jar
- openjpa-persistence-0.9.7-incubating.jar
- org.apache.felix.bundlerepository-1.0.2.jar
- org.apache.felix.framework-1.0.3.jar
- org.apache.felix.main-1.0.3.jar
- org.apache.felix.shell-1.0.0.jar
- org.apache.felix.shell.tui-1.0.0.jar
- rampart-core-1.3.jar
- rampart-policy-1.3.jar
- rampart-trust-1.3.jar
- regexp-1.3.jar
- spring-beans-2.0.6.jar
- spring-context-2.0.6.jar
- spring-core-2.0.6.jar
- tranql-connector-1.1.jar
- tuscany-sdo-api-r2.1-1.0-incubating.jar
- tuscany-sdo-impl-1.0-incubating.jar
- tuscany-sdo-lib-1.0-incubating.jar
- tuscany-sdo-tools-1.0-incubating.jar
- woden-1.0-incubating-M7b.jar
- wss4j-1.5.3.jar
- wstx-asl-3.2.1.jar
- xalan-2.7.0.jar
- xbean-naming-2.7.jar
- xercesImpl-2.8.1.jar
- xml-apis-1.3.03.jar
- xmlbeans-2.3.0.jar
- xml-resolver-1.1.jar
- xmlsec-1.4.0.jar
- XmlSchema-1.3.2.jar
-
-===============================================================================
-axion-1.0-M3-dev.jar 
-
-Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
- 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above 
-   copyright notice, this list of conditions and the following 
-   disclaimer. 
- 
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in 
-   the documentation and/or other materials provided with the 
-   distribution. 
-
-3. The names "Tigris", "Axion", nor the names of its contributors may 
-   not be used to endorse or promote products derived from this 
-   software without specific prior written permission. 
- 
-4. Products derived from this software may not be called "Axion", nor 
-   may "Tigris" or "Axion" appear in their names without specific prior
-   written permission.
- 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-The "Axion Development Team" is defined to be:
-
- * Chuck Burdick
- * James Burke
- * Morgan Delagrange
- * Geir Magnusson Jr.
- * Martin Poeschl
- * Steve Polyak
- * Daniel Rall
- * Ahimanikya Satapathy
- * Doug Sale
- * James Strachan
- * Rodney Waldhoff
- * Jason van Zyl
-
-License changes are to be determined by a simple majority vote of the 
-Axion Development Team.
-
-===============================================================================
-dom4j-1.6.1.jar
-
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
-   statements and notices.  Redistributions must also contain a
-   copy of this document.
- 
-2. Redistributions in binary form must reproduce the
-   above copyright notice, this list of conditions and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
- 
-3. The name "DOM4J" must not be used to endorse or promote
-   products derived from this Software without prior written
-   permission of MetaStuff, Ltd.  For written permission,
-   please contact dom4j-info@metastuff.com.
- 
-4. Products derived from this Software may not be called "DOM4J"
-   nor may "DOM4J" appear in their names without prior written
-   permission of MetaStuff, Ltd. DOM4J is a registered
-   trademark of MetaStuff, Ltd.
- 
-5. Due credit should be given to the DOM4J Project - 
-   http://www.dom4j.org
- 
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-The EMF jars; 
-   codegen-2.2.3.jar 
-   codegen-ecore-2.2.3.jar
-   common-2.2.3.jar
-   ecore-2.2.3.jar
-   ecore-change-2.2.3.jar
-   ecore-xmi-2.2.3.jar
-   xsd-2.2.3.jar
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the
-Program under their own license agreement, and (ii) are not derivative
-works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor
-which are necessarily infringed by the use or sale of its Contribution
-alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this 
-Agreement.
-
-"Recipient" means anyone who receives the Program under this
-Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor, if
-any, in source code and object code form. This patent license shall
-apply to the combination of the Contribution and the Program if, at
-the time the Contribution is added by the Contributor, such addition
-of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow
-Recipient to distribute the Program, it is Recipient's responsibility
-to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or
-conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the 
-Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a
-commercial product offering should do so in a manner which does not
-create potential liability for other Contributors. Therefore, if a
-Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend
-and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising
-from claims, lawsuits and other legal actions brought by a third party
-against the Indemnified Contributor to the extent caused by the acts
-or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement.
-In order to qualify, an Indemnified Contributor must: a) promptly
-notify the Commercial Contributor in writing of such claim, and b)
-allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such
-claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable
-laws, damage to or loss of data, programs or equipment, and
-unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-the Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of
-the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of
-time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use
-and distribution of the Program as soon as reasonably practicable.
-However, Recipient's obligations under this Agreement and any licenses
-granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and
-may only be modified in the following manner. The Agreement Steward
-reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation
-is the initial Agreement Steward. The Eclipse Foundation may assign
-the responsibility to serve as the Agreement Steward to a suitable
-separate entity. Each new version of the Agreement will be given a
-distinguishing version number. The Program (including Contributions)
-may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives
-no rights or licenses to the intellectual property of any Contributor
-under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No
-party to this Agreement will bring a legal action under this Agreement
-more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.
-
-===============================================================================
-For Saxon including 
-   saxon-8.7.jar
-   saxon-dom-8.7.jar
-   saxon-xpath-8.7.jar
-
- MOZILLA PUBLIC LICENSE
-Version 1.0
-
-1. Definitions.
-
-      1.1. ``Contributor'' means each entity that creates or contributes to the creation of Modifications.
-
-      1.2. ``Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-
-      1.3. ``Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.
-
-      1.4. ``Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data.
-
-      1.5. ``Executable'' means Covered Code in any form other than Source Code.
-
-      1.6. ``Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-
-      1.7. ``Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-
-      1.8. ``License'' means this document.
-
-      1.9. ``Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-
-            A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-
-            B. Any new file that contains any part of the Original Code or previous Modifications. 
-
-      1.10. ``Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-
-      1.11. ``Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or a list of source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-
-      1.12. ``You'' means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, ``You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, ``control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity. 
-
-2. Source Code License.
-
-      2.1. The Initial Developer Grant.
-      The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell (``Utilize'') the Original Code (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Original Code (or portions thereof) and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-      2.2. Contributor Grant.
-      Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Contributor, to Utilize the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Contributor Version (or portions thereof), and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-3. Distribution Obligations.
-
-      3.1. Application of License.
-      The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-
-      3.2. Availability of Source Code.
-      Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
-
-      3.3. Description of Modifications.
-      You must cause all Covered Code to which you contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-
-      3.4. Intellectual Property Matters
-
-            (a) Third Party Claims.
-            If You have knowledge that a party claims an intellectual property right in particular functionality or code (or its utilization under this License), you must include a text file with the source code distribution titled ``LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If you obtain such knowledge after You make Your Modification available as described in Section 3.2, You shall promptly modify the LEGAL file in all copies You make available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-
-            (b) Contributor APIs.
-            If Your Modification is an application programming interface and You own or control patents which are reasonably necessary to implement that API, you must also include this information in the LEGAL file. 
-
-      3.5. Required Notices.
-      You must duplicate the notice in Exhibit A in each file of the Source Code, and this License in any documentation for the Source Code, where You describe recipients' rights relating to Covered Code. If You created one or more Modification(s), You may add your name as a Contributor to the notice described in Exhibit A. If it is not possible to put such notice in a particular Source Code file due to its structure, then you must include such notice in a location (such as a relevant directory file) where a user would be likely to look for such a notice. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-      3.6. Distribution of Executable Versions.
-      You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-      3.7. Larger Works.
-      You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. 
-
-4. Inability to Comply Due to Statute or Regulation.
-
-      If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. 
-
-5. Application of this License.
-
-      This License applies to code to which the Initial Developer has attached the notice in Exhibit A, and to related Covered Code. 
-
-6. Versions of the License.
-
-      6.1. New Versions.
-      Netscape Communications Corporation (``Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-
-      6.2. Effect of New Versions.
-      Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License.
-
-      6.3. Derivative Works.
-      If you create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), you must (a) rename Your license so that the phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or any confusingly similar phrase do not appear anywhere in your license and (b) otherwise make it clear that your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) 
-
-7. DISCLAIMER OF WARRANTY.
-
-      COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 
-
-8. TERMINATION.
-
-      This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 
-
-9. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. 
-
-10. U.S. GOVERNMENT END USERS.
-
-      The Covered Code is a ``commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer software'' and ``commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 
-
-11. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in, the United States of America: (a) unless otherwise agreed in writing, all disputes relating to this License (excepting any dispute relating to intellectual property rights) shall be subject to final and binding arbitration, with the losing party paying all costs of arbitration; (b) any arbitration relating to this Agreement shall be held in Santa Clara County, California, under the auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. 
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-      Except in cases where another Contributor has failed to comply with Section 3.4, You are responsible for damages arising, directly or indirectly, out of Your utilization of rights under this License, based on the number of copies of Covered Code you made available, the revenues you received from utilizing such rights, and other relevant factors. You agree to work with affected parties to distribute responsibility on an equitable basis. 
-
-EXHIBIT A.
-
-      ``The contents of this file are subject to the Mozilla Public License Version 1.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.mozilla.org/MPL/
-
-      Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-
-      The Original Code is ______________________________________.
-
-      The Initial Developer of the Original Code is ________________________. Portions created by ______________________ are Copyright (C) ______ _______________________. All Rights Reserved.
-
-      Contributor(s): ______________________________________.'' 
-
-===============================================================================
-
-For the Rhino JavaScript engine js-1.6R7.jar:
-
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (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.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-
-===============================================================================
-Groovy (groovy-all-minimal-1.5.4.jar):
-
-/*
- $Id: LICENSE.txt 156 2003-09-26 17:36:37Z jstrachan $
-
- Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
-    statements and notices.  Redistributions must also contain a
-    copy of this document.
-
- 2. Redistributions in binary form must reproduce the
-    above copyright notice, this list of conditions and the
-    following disclaimer in the documentation and/or other
-    materials provided with the distribution.
-
- 3. The name "groovy" must not be used to endorse or promote
-    products derived from this Software without prior written
-    permission of The Codehaus.  For written permission,
-    please contact info@codehaus.org.
-
- 4. Products derived from this Software may not be called "groovy"
-    nor may "groovy" appear in their names without prior written
-    permission of The Codehaus. "groovy" is a registered
-    trademark of The Codehaus.
-
- 5. Due credit should be given to The Codehaus -
-    http://groovy.codehaus.org/
-
- THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- THE CODEHAUS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- */
-
-===============================================================================
-
-Jython (jython-2.2.jar):
-
-A. HISTORY OF THE SOFTWARE
-=======================
-
-JPython was created in late 1997 by Jim Hugunin. Jim was also the
-primary developer while he was at CNRI. In February 1999 Barry Warsaw
-took over as primary developer and released JPython version 1.1.
-
-In October 2000 Barry helped move the software to SourceForge
-where it was renamed to Jython.  Jython 2.0 and on are licensed under
-the Jython specific license below. 
-
-The standard library is covered by the Python Software Foundation
-license. See the LICENSE_CPython.txt file for details.
-
-The zxJDBC package was written by Brian Zimmer and originally licensed
-under the GNU Public License.  The package is now covered by the Jython
-Software License.
-
-The command line interpreter is covered by the Apache Software
-License.  See the LICENSE_Apache.txt file for details.
- 
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
-================================
-
-Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the distribution.
-
- - Neither the name of the Jython Developers nor the names of
-   its contributors may be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-
-JPython 1.1.x Software License.
-=========================
-
-______________________________________________________________________
-
-IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
-
-BY CLICKING ON THE "ACCEPT" BUTTON WHERE INDICATED, OR BY INSTALLING,
-COPYING OR OTHERWISE USING THE SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
-THE TERMS AND CONDITIONS OF THIS AGREEMENT.
-
-______________________________________________________________________
-
-JPython version 1.1.x
-
-  1. This LICENSE AGREEMENT is between the Corporation for National Research
-     Initiatives, having an office at 1895 Preston White Drive, Reston, VA
-     20191 ("CNRI"), and the Individual or Organization ("Licensee")
-     accessing and using JPython version 1.1.x in source or binary form and
-     its associated documentation as provided herein ("Software").
-
-  2. Subject to the terms and conditions of this License Agreement, CNRI
-     hereby grants Licensee a non-exclusive, non-transferable, royalty-free,
-     world-wide license to reproduce, analyze, test, perform and/or display
-     publicly, prepare derivative works, distribute, and otherwise use the
-     Software alone or in any derivative version, provided, however, that
-     CNRI's License Agreement and CNRI's notice of copyright, i.e.,
-     "Copyright ©1996-1999 Corporation for National Research Initiatives;
-     All Rights Reserved" are both retained in the Software, alone or in any
-     derivative version prepared by Licensee.
-
-     Alternatively, in lieu of CNRI's License Agreement, Licensee may
-     substitute the following text (omitting the quotes), provided, however,
-     that such text is displayed prominently in the Software alone or in any
-     derivative version prepared by Licensee: "JPython (Version 1.1.x) is
-     made available subject to the terms and conditions in CNRI's License
-     Agreement. This Agreement may be located on the Internet using the
-     following unique, persistent identifier (known as a handle):
-     1895.22/1006. The License may also be obtained from a proxy server on
-     the Web using the following URL: http://hdl.handle.net/1895.22/1006."
-
-  3. In the event Licensee prepares a derivative work that is based on or
-     incorporates the Software or any part thereof, and wants to make the
-     derivative work available to the public as provided herein, then
-     Licensee hereby agrees to indicate in any such work, in a prominently
-     visible way, the nature of the modifications made to CNRI's Software.
-
-  4. Licensee may not use CNRI trademarks or trade name, including JPython
-     or CNRI, in a trademark sense to endorse or promote products or
-     services of Licensee, or any third party. Licensee may use the mark
-     JPython in connection with Licensee's derivative versions that are
-     based on or incorporate the Software, but only in the form
-     "JPython-based ___________________," or equivalent.
-
-  5. CNRI is making the Software available to Licensee on an "AS IS" basis.
-     CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
-     OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY
-     REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
-     PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE
-     ANY THIRD PARTY RIGHTS.
-
-  6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
-     ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
-     USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE
-     THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT
-     ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER
-     MAY NOT APPLY TO LICENSEE.
-
-  7. This License Agreement may be terminated by CNRI (i) immediately upon
-     written notice from CNRI of any material breach by the Licensee, if the
-     nature of the breach is such that it cannot be promptly remedied; or
-     (ii) sixty (60) days following notice from CNRI to Licensee of a
-     material remediable breach, if Licensee has not remedied such breach
-     within that sixty-day period.
-
-  8. This License Agreement shall be governed by and interpreted in all
-     respects by the law of the State of Virginia, excluding conflict of law
-     provisions. Nothing in this Agreement shall be deemed to create any
-     relationship of agency, partnership, or joint venture between CNRI and
-     Licensee.
-
-  9. By clicking on the "ACCEPT" button where indicated, or by installing,
-     copying or otherwise using the Software, Licensee agrees to be bound by
-     the terms and conditions of this License Agreement.
-
-
-===============================================================================
-
-The jars; 
-activation-1.1.jar, 
-jaxb-api-2.1.jar, 
-jaxb-impl-2.1.6.jar, 
-jaxb-xjc-2.1.4.jar, 
-jaxb2-reflection-2.1.4.jar,
-jsr181-api-1.0-MR1.jar, 
-jsr250-api-1.0.jar, 
-jaxws-api-2.1-1.jar, 
-mail-1.4.jar, 
-saaj-api-1.3.jar, 
-servlet-api-2.5.jar, 
-stax-api-1.0-commons-cli-1.0.jar2.jar
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
-      1. Definitions.
-
-            1.1. "Contributor" means each individual or entity that
-            creates or contributes to the creation of Modifications.
-
-            1.2. "Contributor Version" means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-
-            1.3. "Covered Software" means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-
-            1.4. "Executable" means the Covered Software in any form
-            other than Source Code. 
-
-            1.5. "Initial Developer" means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            
-            1.6. "Larger Work" means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-
-            1.7. "License" means this document.
-
-            1.8. "Licensable" means having the right to grant, to the
-            maximum extent possible, whether at the time of the initial
-            grant or subsequently acquired, any and all of the rights
-            conveyed herein.
-            
-            1.9. "Modifications" means the Source Code and Executable
-            form of any of the following: 
-
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-
-            1.10. "Original Software" means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-
-            1.11. "Patent Claims" means any patent claim(s), now owned
-            or hereafter acquired, including without limitation,
-            method, process, and apparatus claims, in any patent
-            Licensable by grantor. 
-
-            1.12. "Source Code" means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-
-            1.13. "You" (or "Your") means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, "You"
-            includes any entity which controls, is controlled by, or is
-            under common control with You. For purposes of this
-            definition, "control" means (a) the power, direct or
-            indirect, to cause the direction or management of such
-            entity, whether by contract or otherwise, or (b) ownership
-            of more than fifty percent (50%) of the outstanding shares
-            or beneficial ownership of such entity.
-
-      2. License Grants. 
-
-            2.1. The Initial Developer Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Initial Developer,
-                  to use, reproduce, modify, display, perform,
-                  sublicense and distribute the Original Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party under the terms of this
-                  License. 
-
-                  (d) Notwithstanding Section 2.1(b) above, no patent
-                  license is granted: (1) for code that You delete from
-                  the Original Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-
-            2.2. Contributor Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, each
-            Contributor hereby grants You a world-wide, royalty-free,
-            non-exclusive license:
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Contributor to
-                  use, reproduce, modify, display, perform, sublicense
-                  and distribute the Modifications created by such
-                  Contributor (or portions thereof), either on an
-                  unmodified basis, with other Modifications, as
-                  Covered Software and/or as part of a Larger Work; and
-                  
-
-                  (b) under Patent Claims infringed by the making,
-                  using, or selling of Modifications made by that
-                  Contributor either alone and/or in combination with
-                  its Contributor Version (or portions of such
-                  combination), to make, use, sell, offer for sale,
-                  have made, and/or otherwise dispose of: (1)
-                  Modifications made by that Contributor (or portions
-                  thereof); and (2) the combination of Modifications
-                  made by that Contributor with its Contributor Version
-                  (or portions of such combination). 
-
-                  (c) The licenses granted in Sections 2.2(a) and
-                  2.2(b) are effective on the date Contributor first
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-
-                  (d) Notwithstanding Section 2.2(b) above, no patent
-                  license is granted: (1) for any code that Contributor
-                  has deleted from the Contributor Version; (2) for
-                  infringements caused by: (i) third party
-                  modifications of Contributor Version, or (ii) the
-                  combination of Modifications made by that Contributor
-                  with other software (except as part of the
-                  Contributor Version) or other devices; or (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-
-            3.1. Availability of Source Code.
-
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-
-            3.2. Modifications.
-
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-
-            3.3. Required Notices.
-
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-
-            3.4. Application of Additional Terms.
-
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipients'
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            However, you may do so only on Your own behalf, and not on
-            behalf of the Initial Developer or any Contributor. You
-            must make it absolutely clear that any such warranty,
-            support, indemnity or liability obligation is offered by
-            You alone, and You hereby agree to indemnify the Initial
-            Developer and every Contributor for any liability incurred
-            by the Initial Developer or such Contributor as a result of
-            warranty, support, indemnity or liability terms You offer.
-          
-
-            3.5. Distribution of Executable Versions.
-
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of a license of Your choice, which may contain terms
-            different from this License, provided that You are in
-            compliance with the terms of this License and that the
-            license for the Executable form does not attempt to limit
-            or alter the recipient's rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form under a
-            different license, You must make it absolutely clear that
-            any terms which differ from this License are offered by You
-            alone, not by the Initial Developer or Contributor. You
-            hereby agree to indemnify the Initial Developer and every
-            Contributor for any liability incurred by the Initial
-            Developer or such Contributor as a result of any such terms
-            You offer.
-
-            3.6. Larger Works.
-
-            You may create a Larger Work by combining Covered Software
-            with other code not governed by the terms of this License
-            and distribute the Larger Work as a single product. In such
-            a case, You must make sure the requirements of this License
-            are fulfilled for the Covered Software. 
-            
-      4. Versions of the License. 
-
-            4.1. New Versions.
-
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-
-            4.2. Effect of New Versions.
-
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-
-            4.3. Modified Versions.
-
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-            
-
-      5. DISCLAIMER OF WARRANTY.
-
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-
-            6.1. This License and the rights granted hereunder will
-            terminate automatically if You fail to comply with terms
-            herein and fail to cure such breach within 30 days of
-            becoming aware of the breach. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as "Participant")
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-
-      7. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-
-      8. U.S. GOVERNMENT END USERS.
-
-      The Covered Software is a "commercial item," as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-      computer software" (as that term is defined at 48 C.F.R. 
-      252.227-7014(a)(1)) and "commercial computer software
-      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users
-      acquire Covered Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-
-      9. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject
-      matter hereof. If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be
-      governed by the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdiction's conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, with the losing
-      party responsible for costs, including, without limitation, court
-      costs and reasonable attorneys' fees and expenses. The
-      application of the United Nations Convention on Contracts for the
-      International Sale of Goods is expressly excluded. Any law or
-      regulation which provides that the language of a contract shall
-      be construed against the drafter shall not apply to this License.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-      10. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis. Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.
-
-===============================================================================
-
-JRuby (jruby-complete-1.0.jar), wsdl4j (wsdl4j-1.6.2.jar):
-
-Common Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-      a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-      b) in the case of each subsequent Contributor:
-
-      i) changes to the Program, and
-
-      ii) additions to the Program;
-
-      where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
-
-      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
-
-      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
-
-      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
-
-      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-      iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form:
-
-      a) it must be made available under this Agreement; and 
-
-      b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
-
-===============================================================================
-
-backport-util-concurrent-2.2.jar:
-
-The software comprising backport-util-concurrent is based in large
-part on the code from JSR166, and the package dl.util.concurrent.
-The software has been released to the public domain, as explained at:
-http://creativecommons.org/licenses/publicdomain, excepting portions
-of the class
-edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList,
-which were adapted from class java.util.ArrayList, written by Sun
-Microsystems, Inc, which are used with kind permission, and subject
-to the following:
-
-Copyright 2002-2004 Sun Microsystems, Inc. All rights reserved. Use is
-subject to the following license terms.
-
-  "Sun hereby grants you a non-exclusive, worldwide, non-transferrable
-  license to use and distribute the Java Software technologies as part
-  of a larger work in source and binary forms, with or without
-  modification, provided that the following conditions are met:
-
-   -Neither the name of or trademarks of Sun may be used to endorse or
-    promote products derived from the Java Software technology without
-    specific prior written permission.
-
-   -Redistributions of source or binary code must be accompanied by the
-    following notice and disclaimers:
-
-    Portions copyright Sun Microsystems, Inc. Used with kind permission.
-
-    This software is provided AS IS, without a warranty of any kind.  ALL
-    EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
-    WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PUPOSE OR
-    NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
-    MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE
-    FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
-    USING, MODIFYING OR DISTRIBUTING THE SOFTWARE OR ITS
-    DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR
-    ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR
-    DATA, OR FOR DIRECT, INDIRECT,CONSQUENTIAL, INCIDENTAL
-    OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF
-    THE THEORY OR LIABILITY, ARISING OUT OF THE USE OF OR
-    INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.
-    HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-    You acknowledge that Software is not designed, licensed or intended for
-    use in the design, construction, operation or maintenance of any nuclear
-    facility."
-
-===============================================================================
-rome-0.9.jar
-
-Copyright 2004 Sun Microsystems, Inc.
-
-Licensed 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.
-
-===============================================================================
-jdom-1.0.jar :
-
-$Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions, and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions, and the disclaimer that follows 
-    these conditions in the documentation and/or other materials 
-    provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
-    derived from this software without prior written permission.  For
-    written permission, please contact <request_AT_jdom_DOT_org>.
- 
- 4. Products derived from this software may not be called "JDOM", nor
-    may "JDOM" appear in their name, without prior written permission
-    from the JDOM Project Management <request_AT_jdom_DOT_org>.
- 
- In addition, we request (but do not require) that you include in the 
- end-user documentation provided with the redistribution and/or in the 
- software itself an acknowledgement equivalent to the following:
-     "This product includes software developed by the
-      JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos 
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many 
- individuals on behalf of the JDOM Project and was originally 
- created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
- Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
- on the JDOM Project, please see <http://www.jdom.org/>. 
-
-========================================================================
-
-dwr-2.0.1.jar :
-
-/*
-* Copyright 2005 Joe Walker
-*
-* Licensed 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.
-*/
-
-==========================================================================
-
-dojotoolkit V1.0.0:
-
-The "New" BSD License:
-**********************
-
-Copyright (c) 2005, The Dojo Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-	list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-	this list of conditions and the following disclaimer in the documentation
-	and/or other materials provided with the distribution.
-  * Neither the name of the Dojo Foundation nor the names of its contributors
-	may be used to endorse or promote products derived from this software
-	without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The module tuscany-implementation-script-1.0-incubating.jar temporarily includes    
-one file under the below BSD license with the following copyright:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-
-The serp-1.12.0.jar is distributed under the BSD license with the following copyright:
-
- Copyright (c) 2002, A. Abram White
- All rights reserved.
-
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-The javacc-3.2.jar, and howl-1.0.1-1.jar are distributed under the BSD license:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The tuscany-assembly-xsd jar includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-================================================================================
-License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
-
-These files being ...
-commonj/sdo/ChangeSummary$Setting.class
-commonj/sdo/ChangeSummary.class
-commonj/sdo/DataGraph.class
-commonj/sdo/DataObject.class
-commonj/sdo/helper/CopyHelper.class
-commonj/sdo/helper/DataFactory.class
-commonj/sdo/helper/DataHelper.class
-commonj/sdo/helper/EqualityHelper.class
-commonj/sdo/helper/HelperContext.class
-commonj/sdo/helper/TypeHelper.class
-commonj/sdo/helper/XMLDocument.class
-commonj/sdo/helper/XMLHelper.class
-commonj/sdo/helper/XSDHelper.class
-commonj/sdo/impl/ExternalizableDelegator$Resolvable.class
-commonj/sdo/impl/ExternalizableDelegator.class
-commonj/sdo/Property.class
-commonj/sdo/Sequence.class
-commonj/sdo/Type.class
-xml/datagraph.xsd
-xml/sdoJava.xml
-xml/sdoJava.xsd
-xml/sdoModel.xml
-xml/sdoModel.xsd
-xml/sdoXML.xml
-xml/sdoXML.xsd
-
-
-License for the Service Data Objects JavaDoc and Interface Definition files.
-
-The Service Data Objects Specification is being provided by the copyright holders under the following 
-license. By using and/or copying this work, you agree that you have read, understood and will comply with 
-the following terms and conditions:
-
-Permission to copy, display and distribute the Service Data Objects Specification and/or portions thereof, without 
-modification, in any medium without fee or royalty is hereby granted, provided that you include the 
-following on ALL copies of the Service Data Objects Specification, or portions thereof, that you make:
-
-1. A link or URL to the Service Data Objects Specification at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2. The full text of this copyright notice as shown in the Service Data Objects Specification.
-
-BEA, IBM, Oracle, Primeton Technologies, Rogue Wave Software, SAP, Software AG, Sun Microsystems, Xcalia, 
-Zend Technologies (collectively, the “Authors”) agree to grant you a royalty-free license, under reasonable, 
-non-discriminatory terms and conditions to patents that they deem necessary to implement the Service Data 
-Objects Specification. 
-
-THE Service Data Objects SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR 
-WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL 
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE SERVICE DATA OBJECTS 
-SPECIFICATION.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity 
-pertaining to the Service Data Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects Specification will at all times remain with the 
-Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-================================================================================
-
diff --git a/java/sca-contrib/distribution/core/src/main/release/bin/NOTICE b/java/sca-contrib/distribution/core/src/main/release/bin/NOTICE
deleted file mode 100644
index 5daa9a3dfe..0000000000
--- a/java/sca-contrib/distribution/core/src/main/release/bin/NOTICE
+++ /dev/null
@@ -1,95 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses XmlSchema developed at 
-The Apache Software Foundation (http://ws.apache.org/commons/XmlSchema)
- Portions Copyright 2006 International Business Machines Corp.
-
-This product includes/uses ode-bpel-api-1.1 developed at
-The Apache Software Foundation (http://ode.apache.org)
- - Copyright 1999-2006 Intalio - This product includes software developed by Intalio (http://www.intalio.com)
- - Copyright 2006 Sybase - This product includes software developed by Sybase.(http://www.sybase.com)
-
-"This product includes software developed by the Spring Framework
- Project (http://www.springframework.org)."
-
-This product includes/uses the Jetty Servlet Engine (http://jetty.mortbay.org),
-developed by Mort Bay Consulting  (http://www.mortbay.com)
-
-This product includes/uses the Groovy Script Engine (http://groovy.codehaus.org/),
-Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
-This product includes/uses the Axion : the Open Source Java Database (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
-
-This product includes/uses DOM4J : the flexible XML framework for java (http://www.dom4j.org/) 
- Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)
-License: Public Domain 
-
-This product includes/uses JSON-RPC-Java (http://oss.metaparadigm.com/jsonrpc/)
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product includes software from the GlassFish project (https://glassfish.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-    
-This product includes software from the Rome project (https://rome.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-
-This product includes/uses the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
-
-This product includes/uses the Mozilla Rhino project (http://www.mozilla.org/rhino/)
-
-This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)i
-
-This product includes/uses the Codehaus JRuby project (http://jruby.codehaus.org/)
-
-This product includes/uses JDOM (http://www.jdom.org/)
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved.
- 
-This product includes/uses DWR (http://getahead.org/dwr)
- Copyright 2005 Joe Walker. All rights reserved.
- 
-This product includes/uses dojotoolkit (http://dojotoolkit.org/)
- Copyright (c) 2005, The Dojo Foundation. All rights reserved.
-
-This product includes/uses Howl (http://howl.objectweb.org/)
- Copyright (c) 2004, Bull S.A.
-
-This product includes/uses axion (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team.
-
-This product includes/uses javacc (https://javacc.dev.java.net/)
- Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.
-
-The Program includes all or portions of the following software: "The 
-Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under
-an MPL v1.0 license. Please refer to the homepage URL at 
-http://www.saxonica.com/.
-
-This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:
- Copyright (c) 2002, A. Abram White. All rights reserved.
-
-This product also includes software under the BSD license
-with the following copyright:
- Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
diff --git a/java/sca-contrib/distribution/core/src/main/release/src/BUILDING b/java/sca-contrib/distribution/core/src/main/release/src/BUILDING
deleted file mode 100644
index 65d09c5eae..0000000000
--- a/java/sca-contrib/distribution/core/src/main/release/src/BUILDING
+++ /dev/null
@@ -1,55 +0,0 @@
-Building the Apache Tuscany SCA 1.2 (incubating) April 2008 Release source distribution
-=======================================================================================
-
-Initial Setup
--------------
-
-1) Install J2SE 5.0 SDK, which can be downloaded from 
-   http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_06 JDK or higher.
-
-2) Make sure that your JAVA_HOME environment variable is set to the newly installed 
-   JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 
-   $JAVA_HOME$/bin (unix).
-
-3) Install Maven 2.0.7 or higher, which can be downloaded from 
-   http://maven.apache.org/download.html. Make sure that your PATH includes 
-   the MVN_HOME/bin directory. 
-
-4) Make sure that your MAVEN_OPTS environment variable has -Xmx128M (or more),
-   you can manually do this by executing the following in your prompt :
-   Windows users:
-      set MAVEN_OPTS=-Xmx128M
-   Unix users:
-      export MAVEN_OPTS=-Xmx128M
-
-
-Building
---------
-
-1) Change to the top level directory of Apache Tuscany source distribution.
-2) Run
-
-	$> mvn
-
-   This will compile Apache Tuscany and run all of the tests in the source
-   distribution. 
-
-   Depending on the load of remote Maven 2.0 repositories, you may have 
-   to run "mvn" several times utill the required dependencies are 
-   all located in your local maven repository. It usually takes some time for 
-   maven to download required dependencies in the first build. Once all the 
-   dependencies have been downloaded you may use the -o option to run maven
-   in offline mode, for example, 'mvn clean install -o'.
-
-
-Building the distributions
---------------------------
-
-1) Change to the distribution folder
-2) Run
-
-	$> mvn
-
-   This will build the binary and source distribution with .zip and .gz 
-   formats in the distribution/target directory.
-
diff --git a/java/sca-contrib/distribution/core/src/main/release/src/LICENSE b/java/sca-contrib/distribution/core/src/main/release/src/LICENSE
deleted file mode 100644
index 144d8ae692..0000000000
--- a/java/sca-contrib/distribution/core/src/main/release/src/LICENSE
+++ /dev/null
@@ -1,397 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================================================
-
-The module itest/databindings/common includes the test schema; datagraph.xsd, sdoJava.xsd, and sdoModel.xsd
-under the following license:
-
-License for the Service Data Objects JavaDoc, Interface Definition files
-and XSD files.
-
-The Service Data Objects JavaDoc, Interface Definition files and XSD files 
-are being provided by the copyright holders under the following license. 
-By using and/or copying this work, you agree that you have read, 
-understood and will comply with the following terms and conditions:
-
-Permission to copy, display, make derivative works of and distribute 
-the Service Data Objects JavaDoc, Interface Definition files and XSD files
-(the "Artifacts") in any medium without fee or royalty is hereby granted, 
-provided that you include the following on ALL copies of the Artifacts, 
-or portions thereof, that you make:
-
-1.	A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2.	The full text of this copyright notice as shown in the Artifacts.
-
-
-
-THE ARTIFACTS ARE PROVIDED "AS IS" AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE. 
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Data 
-Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects 
-Specification will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.11, last updated on 2007/12/21
-
-=================================================================================================================
-
-The module implementation-script temporarily includes one file under the following BSD license:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-=================================================================================================================
-
-The module assembly-xsd includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-=================================================================================================================
-The modules 
-
-binding-ws-xml
-databinding
-databinding-axiom
-databinding-jaxb
-databinding-json
-databinding-sdo
-databinding-sdo-axiom
-databinding-xmlbeans
-interface-wsdl-xml
-
-Include the ipo.xsd and address.xsd information from the XML Schema Primer 
-(http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) combined into the 
-file ipo.xsd and extended with UK postcode structures.
-
-The ipo.xsd file is include under the following license:
-
-W3C(c) SOFTWARE NOTICE AND LICENSE
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other 
-related items) is being provided by the copyright holders under the following 
-license. By obtaining, using and/or copying this work, you (the licensee) agree 
-that you have read, understood, and will comply with the following terms and conditions.
-
-Permission to copy, modify, and distribute this software and its documentation, 
-with or without modification, for any purpose and without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies of the 
-software and documentation or portions thereof, including modifications:
-
-   1. The full text of this NOTICE in a location viewable to users of the 
-      redistributed or derivative work.
-   2. Any pre-existing intellectual property disclaimers, notices, or terms 
-      and conditions. If none exist, the W3C Software Short Notice should be 
-      included (hypertext is preferred, text is permitted) within the body of 
-      any redistributed or derivative code.
-   3. Notice of any changes or modifications to the files, including the date 
-      changes were made. (We recommend you provide URIs to the location from which 
-      the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
-NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or 
-publicity pertaining to the software without specific, written prior permission. 
-Title to copyright in this software and any associated documentation will at all 
-times remain with copyright holders.
diff --git a/java/sca-contrib/distribution/core/src/main/release/src/NOTICE b/java/sca-contrib/distribution/core/src/main/release/src/NOTICE
deleted file mode 100644
index 31540fd607..0000000000
--- a/java/sca-contrib/distribution/core/src/main/release/src/NOTICE
+++ /dev/null
@@ -1,39 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product also includes software under the BSD license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-  Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
-This product includes software under the W3C(c) Software License
-with the following copyright:
-    
-Copyright (c) 2008 World Wide Web Consortium, (Massachusetts Institute of Technology, 
-European Research Consortium for Informatics and Mathematics, Keio University). 
-All Rights Reserved. This work is distributed under the W3C(c) Software License [1] in 
-the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
diff --git a/java/sca-contrib/distribution/ejava/pom.xml b/java/sca-contrib/distribution/ejava/pom.xml
deleted file mode 100644
index f02a29093e..0000000000
--- a/java/sca-contrib/distribution/ejava/pom.xml
+++ /dev/null
@@ -1,155 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-distribution</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-distribution-ejava</artifactId>

-    <name>Apache Tuscany SCA JEE Distribution</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-ejava</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-    </dependencies>

-

-    <profiles>

-

-        <!-- Build profile that can be used to build the distro packages -->

-        <profile>

-            <id>distribution</id>

-            <activation>

-                <activeByDefault>false</activeByDefault>

-            </activation>

-            <build>

-                <plugins>

-                    <plugin>

-                        <groupId>org.apache.tuscany.sca</groupId>

-                        <artifactId>tuscany-maven-bundle-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>distribution-modules</id>

-                                <phase>generate-resources</phase>

-                                <goals>

-                                    <goal>generate-modules</goal>

-                                </goals>

-                                <configuration>

-                                    <targetDirectory>target/modules</targetDirectory>

-                                    <excludeDirectories>

-                                        <excludeDirectory>../core/target/modules</excludeDirectory>

-                                    </excludeDirectories>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-

-                    <plugin>

-                        <groupId>org.apache.maven.plugins</groupId>

-                        <artifactId>maven-assembly-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>distribution-package</id>

-                                <phase>package</phase>

-                                <goals>

-                                    <goal>single</goal>

-                                </goals>

-                                <configuration>

-                                    <descriptors>

-                                        <descriptor>src/main/assembly/bin.xml</descriptor>

-                                        <descriptor>src/main/assembly/src.xml</descriptor>

-                                    </descriptors>

-                                    <tarLongFileMode>gnu</tarLongFileMode>

-                                    <finalName>apache-tuscany-sca-ejava-2.0-SNAPSHOT</finalName>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-                </plugins>

-            </build>

-        </profile>

-        

-        <!-- Profile that can be used to build the modules included in the distro -->

-        <profile>

-            <id>modules</id>

-            <modules>

-                <module>../../modules/assembly</module>

-                <module>../../modules/assembly-xml</module>

-                <module>../../modules/assembly-xsd</module>

-                <module>../../modules/binding-rmi</module>

-                <module>../../modules/binding-rmi-runtime</module>

-                <module>../../modules/binding-sca</module>

-                <module>../../modules/binding-sca-xml</module>

-                <module>../../modules/contribution</module>

-                <module>../../modules/contribution-java</module>

-                <module>../../modules/contribution-namespace</module>

-                <module>../../modules/contribution-xml</module>

-                <module>../../modules/core</module>

-                <module>../../modules/core-databinding</module>

-                <module>../../modules/core-spi</module>

-                <module>../../modules/databinding</module>

-                <module>../../modules/databinding-jaxb</module>

-                <module>../../modules/definitions</module>

-                <module>../../modules/definitions-xml</module>

-                <module>../../modules/endpoint</module>

-                <module>../../modules/extensibility</module>

-                <module>../../modules/extensibility-equinox</module>

-                <module>../../modules/host-http</module>

-                <module>../../modules/host-rmi</module>

-                <module>../../modules/implementation-java</module>

-                <module>../../modules/implementation-java-runtime</module>

-                <module>../../modules/implementation-java-xml</module>

-                <module>../../modules/implementation-node</module>

-                <module>../../modules/implementation-node-runtime</module>

-                <module>../../modules/interface</module>

-                <module>../../modules/interface-java</module>

-                <module>../../modules/interface-java-jaxws</module>

-                <module>../../modules/interface-java-xml</module>

-                <module>../../modules/interface-wsdl</module>

-                <module>../../modules/interface-wsdl-xml</module>

-                <module>../../modules/monitor</module>

-                <module>../../modules/node-api</module>

-                <module>../../modules/node-impl</module>

-                <module>../../modules/node-launcher</module>

-                <module>../../modules/node-launcher-equinox</module>

-                <module>../../modules/policy</module>

-                <module>../../modules/policy-security</module>

-                <module>../../modules/policy-xml</module>

-                <module>../../modules/sca-api</module>

-                <module>../../modules/workspace</module>

-                <module>../../modules/workspace-impl</module>

-                <module>../../modules/workspace-xml</module>

-                <module>../../modules/xsd</module>

-                <module>../../modules/xsd-xml</module>

-            </modules>

-        </profile>

-    </profiles>

-

-</project>

diff --git a/java/sca-contrib/distribution/ejava/src/main/assembly/bin.xml b/java/sca-contrib/distribution/ejava/src/main/assembly/bin.xml
deleted file mode 100644
index 3a85bc09a3..0000000000
--- a/java/sca-contrib/distribution/ejava/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,36 +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.

--->

-<assembly>

-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->

-    <id>bin</id>

-    <includeBaseDirectory>true</includeBaseDirectory>

-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>

-    <formats>

-        <format>dir</format>

-        <format>tar.gz</format>

-        <format>zip</format>

-    </formats>

-

-    <componentDescriptors>

-        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>

-        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>

-        <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>

-    </componentDescriptors>

-</assembly>

diff --git a/java/sca-contrib/distribution/ejava/src/main/assembly/src.xml b/java/sca-contrib/distribution/ejava/src/main/assembly/src.xml
deleted file mode 100644
index ce301181e0..0000000000
--- a/java/sca-contrib/distribution/ejava/src/main/assembly/src.xml
+++ /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.

--->

-<assembly>

-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->

-    <id>src</id>

-    <includeBaseDirectory>true</includeBaseDirectory>

-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory>

-    <formats>

-        <format>dir</format>

-        <format>tar.gz</format>

-        <format>zip</format>

-    </formats>

-

-    <componentDescriptors>

-        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>

-        <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>

-    </componentDescriptors>

-</assembly>

diff --git a/java/sca-contrib/distribution/ejava/src/main/components/bin-samples.xml b/java/sca-contrib/distribution/ejava/src/main/components/bin-samples.xml
deleted file mode 100644
index 02e58456c6..0000000000
--- a/java/sca-contrib/distribution/ejava/src/main/components/bin-samples.xml
+++ /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.

--->

-<component>

-    <fileSets>

-

-        <!-- Add samples to the samples directory -->

-        <fileSet>

-            <directory>../../samples</directory>

-            <outputDirectory>samples</outputDirectory>

-            <includes>

-                <include>calculator-rmi-reference/**/*</include>

-                <include>calculator-rmi-service/**/*</include>

-<!--

-                <include>helloworld-reference-jms/**/*</include>

-                <include>helloworld-service-jms/**/*</include>

-                <include>simple-bigbank-spring/**/*</include>

--->

-            </includes>

-            <excludes>

-                <!-- General file/folders to exclude -->

-                <exclude>**/.*</exclude>

-                <exclude>**/.*/**</exclude>

-                <exclude>**/*.log</exclude>

-

-                <!-- Sample specific files/folders to exclude -->

-                <exclude>pom.xml</exclude>

-                <exclude>*/target/mvn-eclipse-cache.properties</exclude>

-                <exclude>*/target/classes</exclude>

-                <exclude>*/target/classes/**/*</exclude>

-                <exclude>*/target/dependency-maven-plugin-markers</exclude>

-                <exclude>*/target/dependency-maven-plugin-markers/**/*</exclude>

-                <exclude>*/target/.felix</exclude>

-                <exclude>*/target/.felix/**/*</exclude>

-                <exclude>*/target/maven-archiver</exclude>

-                <exclude>*/target/maven-archiver/**/*</exclude>

-                <exclude>*/target/test-classes</exclude>

-                <exclude>*/target/test-classes/**/*</exclude>

-                <exclude>*/target/surefire-reports</exclude>

-                <exclude>*/target/surefire-reports/**/*</exclude>

-            </excludes>

-        </fileSet>

-    </fileSets>

-</component>

diff --git a/java/sca-contrib/distribution/ejava/src/main/components/src-modules.xml b/java/sca-contrib/distribution/ejava/src/main/components/src-modules.xml
deleted file mode 100644
index 4da310abab..0000000000
--- a/java/sca-contrib/distribution/ejava/src/main/components/src-modules.xml
+++ /dev/null
@@ -1,90 +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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add module sources to the modules directory -->
-        <fileSet>
-            <directory>../../modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>assembly/**/*</include>
-                <include>assembly-xml/**/*</include>
-                <include>assembly-xsd/**/*</include>
-                <include>binding-rmi/**/*</include>
-                <include>binding-rmi-runtime/**/*</include>
-                <include>binding-sca/**/*</include>
-                <include>binding-sca-xml/**/*</include>
-                <include>contribution/**/*</include>
-                <include>contribution-java/**/*</include>
-                <include>contribution-namespace/**/*</include>
-                <include>contribution-xml/**/*</include>
-                <include>core/**/*</include>
-                <include>core-databinding/**/*</include>
-                <include>core-spi/**/*</include>
-                <include>databinding/**/*</include>
-                <include>databinding-jaxb/**/*</include>
-                <include>definitions/**/*</include>
-                <include>definitions-xml/**/*</include>
-                <include>distribution-core/**/*</include>
-                <include>endpoint/**/*</include>
-                <include>extensibility/**/*</include>
-                <include>extensibility-equinox/**/*</include>
-                <include>host-http/**/*</include>
-                <include>host-rmi/**/*</include>
-                <include>implementation-java/**/*</include>
-                <include>implementation-java-runtime/**/*</include>
-                <include>implementation-java-xml/**/*</include>
-                <include>implementation-node/**/*</include>
-                <include>implementation-node-runtime/**/*</include>
-                <include>interface/**/*</include>
-                <include>interface-java/**/*</include>
-                <include>interface-java-jaxws/**/*</include>
-                <include>interface-java-xml/**/*</include>
-                <include>interface-wsdl/**/*</include>
-                <include>interface-wsdl-xml/**/*</include>
-                <include>monitor/**/*</include>
-                <include>node-api/**/*</include>
-                <include>node-impl/**/*</include>
-                <include>node-launcher/**/*</include>
-                <include>node-launcher-equinox/**/*</include>
-                <include>policy/**/*</include>
-                <include>policy-security/**/*</include>
-                <include>policy-xml/**/*</include>
-                <include>sca-api/**/*</include>
-                <include>workspace/**/*</include>
-                <include>workspace-impl/**/*</include>
-                <include>workspace-xml/**/*</include>
-                <include>xsd/**/*</include>
-                <include>xsd-xml/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/CHANGES b/java/sca-contrib/distribution/ejava/src/main/release/CHANGES
deleted file mode 100644
index 3de7358ec6..0000000000
--- a/java/sca-contrib/distribution/ejava/src/main/release/CHANGES
+++ /dev/null
@@ -1,431 +0,0 @@
-Changes With Apache Tuscany SCA 1.2 (incubating) April 2008 

-===========================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-2027

-  * TUSCANY-1999

-  * TUSCANY-2037

-  * TUSCANY-2034

-  * TUSCANY-2038

-  * TUSCANY-2043

-  * TUSCANY-2046

-  * TUSCANY-2047

-  * TUSCANY-2028

-  * TUSCANY-1873

-  * TUSCANY-2049

-  * TUSCANY-2035

-  * TUSCANY-1206

-  * TUSCANY-2036 

-  * TUSCANY-1771

-  * TUSCANY-2013

-  * TUSCANY-1926

-  * TUSCANY-1917

-  * TUSCANY-1949

-  * TUSCANY-1941

-  * TUSCANY-2045

-  * TUSCANY-2057

-  * TUSCANY-2055

-  * TUSCANY-2056

-  * TUSCANY-2072

-  * TUSCANY-2047

-  * TUSCANY-2073

-  * TUSCANY-1977 

-  * TUSCANY-2075

-  * TUSCANY-1894

-  * TUSCANY-2079

-  * TUSCANY-2078

-  * TUSCANY-2080

-  * TUSCANY-2068

-  * TUSCANY-1950

-  * TUSCANY-2077

-  * TUSCANY-2056

-  * TUSCANY-2088

-  * TUSCANY-2086

-  * TUSCANY-2094

-  * TUSCANY-2106 

-

-  Features and/or Enhancements

-

-  * Core

-    - Interceptor Enhancements

-      - Phase-based interceptor ordering to allow contribution of new interceptors and also define the order in witch they should be invoked

-      - Pass-by-reference SPI to allow interceptors to indicate if they support pass-by-reference

-      - PolicyProvider SPIs to allow extensions to plugin policy interceptors

-    - Support for JAXWS annotations and mapping of faults to Java exceptions according to JAXWS specification

-    - Improvement of contribution service to allow it to be used outside of the runtime environment 

-    - Support for Contribution Import/Export resource

-    - Enhanced Distributed Domain story using Workspace

-      - Implementation of a SCA domain allowing a system administrator to manage contributions, composites and sca nodes that run these composites

-        - Set of core services providing management capabilities

-        - Administration web interface

-        - This is a work in progress and you can see it in action in samples/calculator-distributed. Other samples that use distributed operation are yet to move over to the workspace.

-    - Enhanced support for SCA Policy spec

-      - Ability to apply external policy definitions to a SCA composition

-      - Ability to spread policy definitions to multiple definitions.xml files available across the sca domain

-      - Bug fixes

-    - Improvements of http binding to support servlet components

-    - Enable Tuscany to run inside an OSGi runtime

-

-  * Web 2.0 Extensions

-    - Enhancements to implementation.widget (support for properties)

-    - New atom binding based on Apache Abdera

-    - Refactoring of rss-rome binding

-  * Other Extensions

-    - Binding JMS

-      - greatly simplified the use of the JMS binding, support locating JMS resources from JNDI, and better compliance with the SCA JMS binding spec

-      - see the doc page for more details: http://incubator.apache.org/tuscany/sca-java-bindingjms.html

-    - Enhancements to Binding RMI

-      - Support shared RMI registry and use 999x as the ports in test case to avoid 1099 conflict

-    - Enhancements to Groovy extension

-      - Support for 'native' groovy classes

-    - Enhancements to OSGi bundle contributions

-      - Support Bundle URLs to be added as contributions

-

-  * Tools

-    - Eclipse plugin providing a Tuscany runtime Library and Tuscany launcher in Eclipse environment
-       - An updatesite is also available to facilitate the plugin installation using the Eclipse update manager

-

-  * Samples/Tutorial/Demos

-    - calculator-distributed migrated to use new Tuscany Distributed Workspace

-    - sample-calculator-ws-secure-webapp

-    - sample-helloworld-jms-webapp

-    - new jms samples

-    - improve bigbank demo to include support for policies 

-    - tutorial store changes

-      - use of import/export

-      - development of contribution without requiring dependencies on the Tuscany runtime

-      - usage of new sca domain infrastructure

-

-  * Testing

-    - Web Container Testing Framework integrated with (Tomcat, Jetty, Geronimo and Websphere)

-

-

-Changes With Apache Tuscany SCA 1.1 (incubating) January 2008 

-===============================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1939

-  * TUSCANY-1914

-  * TUSCANY-1854

-  * TUSCANY-1931

-  * TUSCANY-1547

-  * TUSCANY-1909

-  * TUSCANY-1919

-  * TUSCANY-1930

-  * TUSCANY-1806

-  * TUSCANY-1804

-  * TUSCANY-1916

-  * TUSCANY-1913

-  * TUSCANY-1834

-  * TUSCANY-1857

-  * TUSCANY-1687

-  * TUSCANY-1801

-  * TUSCANY-1742

-  * TUSCANY-1762

-  * TUSCANY-1945

-  * TUSCANY-1595

-  * TUSCANY-1594

-  * TUSCANY-1849

-  * TUSCANY-1836

-  * TUSCANY-1934

-  * TUSCANY-1902

-  * TUSCANY-1608

-  * TUSCANY-1943

-  * TUSCANY-1896

-  * TUSCANY-1626

-  * TUSCANY-1797

-  * TUSCANY-1601

-  * TUSCANY-1415

-

-- Better JMS support

-  * binding.jms supporting point to point text based messaging only

-  * New SOAP/JMS sample (helloworld-ws-reference/service-jms)

-

-- Improvements in PolicyFramework Support

-  * Support for policy specifications on operation elements in a composite definition

-  * Separate sample (calculator-implementation-policies) to demonstrate use of Implementation Policies 

-    (uses logging and JAAS Authentication)

-

-- Modeling of client side java script components

-  * See implementation.widget

-

-- Evolving support for doman API suggested by assembly spec including a standalone node and nodes running 

-  connected together in a domain. This is still experimental. 

- 

-- Class loading and OSGI improvements

-  * Enable Tuscany to be run in a multi-classloader environment including inside OSGi. By default,

-    Tuscany continues to run using a single CLASSPATH-based classloader.

-  * Contributions no longer need to be in the CLASSPATH. All import/export dependencies across contributions should be 

-    explicitly specified (as described in the spec).

-

-- JAXB based POJO transformations

-

-Changes With Apache Tuscany SCA 1.0.1 (incubating) November 2007 

-================================================================

-

-The Tuscany SCA Java 1.0.1 is mainly a bug-fix release. It also comes with some improvements as listed below.

- 

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1848

-  * TUSCANY-1857

-  * TUSCANY-1859

-  * TUSCANY-1801

-  * TUSCANY-1823

-  * TUSCANY-1839

-  * TUSCANY-1814

-  * TUSCANY-1818

-  * TUSCANY-1834

-  * TUSCANY-1637

-  * TUSCANY-1826

-  * TUSCANY-1823

-  * TUSCANY-1819

-  * TUSCANY-1821

-  * TUSCANY-1822

-  * TUSCANY-1806

-  * TUSCANY-1808

-  * TUSCANY-1756

-  * TUSCANY-1757

-

-- Fix build issues with Maven 2.0.7 and JDK 6

-

-- Reduce memory consumption for WSDLs that import large XSDs

-

-- Add more logging statements for better servicibility

-

-- Add an extension point to allow extensions to plug-in extension schemas.

-

-- Add a demo application to showcase XML integration story 

-

-- Improve in databinding framework

-  * Add support for JSON Databindings and other refactoring

-  * Set databinding for introspected data type and enhance the checking of wrapper style

-  * Improve the tree-based XMLStreamReader and convert Bean & DOM to use this approach

-  * Add a tree-iterator based XMLStreamReader base impl

-  * Add default element info to java interface

-  * Rename Interface.setDefaultDataBinding to resetDataBinding

-

-- Limit the method injection to setters and allow the setter annotation to override field annotation

-

-- Evolving support in Intent and Policy handling

-  * Add support for policies in implementation

-  * Fix the algorithm for macthing policySets defined on bindings for the wire

-  * Add policy intent for implementation.java

-  * Extend java implementation type to recognize and apply policies, adding util support for this in Policy module

-  * Add policy module for logging

-

-- Evolving development in the SCA Domain/Node

-

-- Update NOTICE files with missing dependencies

-

-

-Changes With Apache Tuscany SCA 1.0 (incubating) September 2007 

-===============================================================

-

-- Tuscany Java SCA now implements V1.0 of the core SCA 

-  specifications

-        SCA Assembly Model V1.0

-        SCA Java Common Annotations and APIs V1.0

-        SCA Java Component Implementation V1.0

-        SCA Web Services Binding V1.0

-  Including callbacks, conversations and callable references

-  

-

-- Support for ws-security configurable in the web services binding

-  thro Tuscany SCA policy intents and policysets using the policy framework 

-  introduced in the last release.  

-  

-  Note : This release supports specifications of policies around axis2

-         config params - see helloworld-ws-service-secure sample.  The policy

-         intents that have been tested are authentication, integrity and 

-         confidentiality.  

-         There is no sample or test that exercises confidentiality since there

-         are some unresolved licensing issue around bouncycastle libraries.  

-         However, users who are not encumbered by the bouncycastle license 

-         restrictions can try the 'confidentiality' intent. See FAQ - 

-         http://incubator.apache.org/tuscany/tuscany-sca-java-faq.html

-                

-         This release does not include support for WS-Policy

-         attachments in Tuscany Policysets for ws-security.

-         

-  

-- An XQuery component implementation type 

-        implementation-xquery

-        

-

-- A Databinding for converting data to and from nodes for XQuery 

-  processing

-        databinding-saxon

-        

-

-- OSGI support has been extended to allow Tuscany contributions 

-  packaged as OSGI bundles hence taking advantage of OSGI's bundle

-  loading an dependency management capabilities 

-  

-

-- A BPEL component implementation type experimental implementation

-based on SCA BPEL Client and Implementation V1.0. At the moment only

-supports BPEL process as services.

-	implementation-bpel

-

-

-- The distributed runtime implementation has been separated out 

-  into 

-        *) domain

-        *) node

-  It is now wrapped by a SCADomain interface as is the standalone 

-  runtime.

-  

-  Note: This release does not include support for WebApp host deployment 

-        for a distributed SCA Domain 

-  

-

-

-- The web service binding will now generate WSDL automatically

-  based on the service interface if no WSDL is provided

-  

-

-- A new "store" sample and associated document show how a 

-  simple store front application can be constructed 

-        samples/store

-        

-- The following features of this release are still experimental:

-     - BPEL implementation type, integrating with Apache ODE

-     - OSGI implementation type, integrating with Apache Felix

-     - XQuery implementation type

-

- 

-

-Changes With Apache Tuscany SCA 0.99 (incubating) August 2007 

-=============================================================

-

-The following are the significant additions to release 0.99 

-over and above all of what was offered in release 0.91.

-

-- A version of the default sca binding that works between

-  components runing in separate Java virtual machines

-       binding-sca-axis

-

-- A simple node implementation and a service discovery 

-  function for running sca applications distributed 

-  across more than one node

-       distributed

-       distributed-impl 

-

-- integration with OSGi runtimes is now supported with

-  a new implementation-osgi component type

-

-- PUB/SUB interactions are now supported by using new 

-  notification binding and implementation types, and

-  samples demonstrating the feature.

-

-- The Tuscany runtime now has a policy framework supporting

-  the SCA policy specification

-

-- the endpoint URIs used by SCA bindings has been rationalized 

-  and now follows the SCA Assembly specification

-

-- binding-ajax has been renamed to binding-dwr

-

-Changes With Apache Tuscany SCA 0.91 (incubating) July 2007 

-===========================================================

-

-The following are the significant additions to release 0.91 

-over and above all of what was offered in release 0.90.

-

-

-- Enhancements to support multiple contributions to the SCA Domain

-

-- The inclusion of a alternative simplified extensions-helper

-SPI layer to faciliate rapid development of extensions

-

-- More Implementation Extenstions

-        Spring

-        WebResource

-

-- More Binding Extensions

-        AJAX

-        EJB

-        RSS/ATOM Feeds

-        

-- Demos that demonstrate the use of a mix of extensions

-         alert-aggregator-webapp

-         bigbank-account

-         bigbank-calculator

-         bigbank-stockquote

-

-

-- Samples

-        Samples to demostrate use of Spring, Resource, AJAX extensions

-

-Changes With Apache Tuscany SCA 0.90 (incubating) June 2007 

-===========================================================

-

-- Implementations for all of the Java Annotations and API Specification V1.0 found at

-  (http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications) 

-  apart from the following.

-    @ComponentName

-    Conversation

-    RequestContext

-    

-- New assembly model implementation taking into account SCA 1.0 artifacts 

-  Data duplication between assembly model and runtime removed

-

-- Simple single process domain support

-  Contribution support to scope items being deployed into the runtime

-

-- Improved Package/Class naming consistency across modules

-

-- Extensions now loaded via Java service mechanism

-  Refactored extensions to use new SPIs (see below)

-

-- Maven and Ant based sample builds in the binary distribution

-

-- Implementation Extensions

-    Java

-    Script supporting (Ruby, Python, Groovy, JavaScript)

-

-- Binding Extensions

-    Axis2

-    RMI

-    JSONRPC

-

--Databinding Extensions

-    Axiom

-    JAXB

-    SDO

-

-- Host environments

-    Embedded

-    Tomcat

-    Jetty

-    RMI

-

-- A clear set of SPIs intended to be stable over future releases

-    SCA assembly model

-      org.apache.tuscany.sca.assembly

-      org.apache.tuscany.sca.interfacedef

-      org.apache.tuscany.sca.interfacedef.java

-      org.apache.tuscany.sca.interfacedef.wsdl

-      org.apache.tuscany.sca.policy

-

-    SCA contribution model

-      org.apache.tuscany.sca.contribution

-

-    Runtime extensions

-      org.apache.tuscany.sca.core

-      org.apache.tuscany.sca.invocation

-      org.apache.tuscany.sca.provider

-      org.apache.tuscany.sca.runtime

-      org.apache.tuscany.sca.work

-

-    Data binding support

-      org.apache.tuscany.sca.databinding

-

-    Embedding Tuscany

-      org.apache.tuscany.sca.host.embedded

-

-    Servlet container integration

-      org.apache.tuscany.sca.http

-

-- For this point release a partial set of JavaDoc is provided to 

-  be filled out as we close on release 1.0

diff --git a/java/sca-contrib/distribution/ejava/src/main/release/README b/java/sca-contrib/distribution/ejava/src/main/release/README
deleted file mode 100644
index 4d83dcfde9..0000000000
--- a/java/sca-contrib/distribution/ejava/src/main/release/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 README
-=====================================================
-
-Welcome to the Tuscany SCA 1.2 release. 
-
-See the RELEASE_NOTES file for information specific to this release.
-
-In the binary release see the INSTALL file for information on how to 
-install the release.
-
-In the source distribution see the BUILDING file for information on
-building the source code.
-
-
-
-
-
-
-
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/RELEASE_NOTES b/java/sca-contrib/distribution/ejava/src/main/release/RELEASE_NOTES
deleted file mode 100644
index a04ef5c553..0000000000
--- a/java/sca-contrib/distribution/ejava/src/main/release/RELEASE_NOTES
+++ /dev/null
@@ -1,83 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 Release Notes
-============================================================
-
-Apache Tuscany provides a runtime based on the Service Component
-Architecture. SCA is a set of specifications aimed at simplifying SOA
-Application Development which are being standardized at OASIS as part
-of Open Composite Services Architecture (Open CSA) - http://www.oasis-opencsa.org/.
-
-Overview
---------
-
-     The Apache Tuscany SCA 1.2 release includes implementations of the
-     main SCA specifications including:
-
-        SCA Assembly Model V1.0
-        SCA Policy Framework V1.0
-        SCA Java Common Annotations and APIs V1.0
-        SCA Java Component Implementation V1.0
-        SCA Spring Component Implementation V1.0
-        SCA BPEL Client and Implementation V1.0
-        SCA Web Services Binding V1.0
-        SCA EJB Session Bean Binding V1.0
-
-    It also includes implementations of many features not yet defined
-    by SCA specifications, including:
-
-        - SCA bindings for Direct Web Remoting, RSS and ATOM Feeds, 
-          HTTP resources, JSON-RPC, PUB/SUB Notifications, and RMI.
-        - SCA implementation types for OSGI, XQuery, BPEL, Widget and various 
-          dynamic languages including Groovy, Javascript, Python and Ruby
-        - Databindings for Service Data Objects (SDO), JAXB, XmlBeans, 
-          Axis2's AXIOM, JSON, SAXON, DOM, SAX and StAX
-
-    The Tuscany SCA Runtime can be configured as a single node SCA domain or 
-    as an SCA domain distributed across multiple nodes. 
-    In addition Tuscany SCA supports the following host-deployment options: -
-        - running standalone 
-        - running with distributed nodes across multiple JVMs
-        - running with embedded Jetty or Tomcat
-        - running as part of a standard web application                                     
-     
-    The Wepapp samples included in this release have been tried and tested on 
-        - Tomcat 5.5.20 and Tomcat 6.0.14
-        - Jetty 6.1.3
-        - Geronimo 2.0.2 Tomcat6 jee5
-        - WebSphere 6.1 fix pack 9
-
-See the CHANGES file for a detailed list of the features in this release.
-
-Support
--------
-
-For more information on Apache Tuscany visit the website at:
-
-    http://incubator.apache.org/tuscany/
- 
-Any issues with this release can be reported to Apache Tuscany
-using the mailing lists or in the JIRA issue tracker.
-
-    Mailing list archives:
-
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-user/
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/
-
-    Jira:
-
-       http://issues.apache.org/jira/browse/TUSCANY
-
-To join the project's mailing lists follow the instructions at:
-
-    http://incubator.apache.org/tuscany/mailing-lists.html
-
-To find out more about OASIS Open CSA go to: 
-
-    http://www.oasis-opencsa.org.
-
-Apache Tuscany welcomes your help. Any contribution, including code,
-testing, improving the documentation, or bug reporting is always
-appreciated. 
-
-Thank you for using Apache Tuscany!
-
-- The Tuscany Team.
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/bin/INSTALL b/java/sca-contrib/distribution/ejava/src/main/release/bin/INSTALL
deleted file mode 100644
index 2da53a2b44..0000000000
--- a/java/sca-contrib/distribution/ejava/src/main/release/bin/INSTALL
+++ /dev/null
@@ -1,27 +0,0 @@
-Installing the Apache Tuscany SCA 1.2 (incubating) April 2008 Release binary distribution
-=========================================================================================
-
-Unzip Tuscany binary distribution archive and you get the following:
-
-tuscany-sca-1.1-incubating        
-   DISCLAIMER    - the ASF incubation disclaimer
-   INSTALL       - this help file
-   LICENSE       - the Apache License and any dependecy licenses
-   NOTICE        - attribution notices associated with the licenses
-   README        - readme for the release
-   RELEASE_NOTES - description of this release 
-   CHANGES       - A note of the major changes in this release
-
-   /demos        - Demo applications showcasing the use of Apache Tuscany 
-
-   /lib          - The tuscany-sca-all and tuscany-sca-manifest jars and all their dependencies
-
-   /modules      - all of the individual Tuscany jars
-
-   /samples      - all the Tuscany samples, see the README in that directory
-
-   /tutorial     - The store tutorial, see the README in that directory
-
-
-
-
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/bin/LICENSE b/java/sca-contrib/distribution/ejava/src/main/release/bin/LICENSE
deleted file mode 100644
index 5e1f585d46..0000000000
--- a/java/sca-contrib/distribution/ejava/src/main/release/bin/LICENSE
+++ /dev/null
@@ -1,2366 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================
-
-APACHE TUSCANY SUBCOMPONENTS: 
-
-The Apache Tuscany binary distribution includes a number of subcomponents
-with separate copyright notices and license terms. Your use of the
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.                             
-
-===============================================================================
-
-The following components come under Apache Software License 1.1
-
- commons-discovery-0.2.jar
- commons-primitives-1.0.jar
-
-The following components come under Apache Software License 2.0
-
- abdera-core-0.3.0-incubating.jar
- abdera-i18n-0.3.0-incubating.jar
- abdera-parser-0.3.0-incubating.jar
- activeio-2.0-r118.jar
- activeio-core-3.0.0-incubator.jar
- apache-activemq-4.1.1.jar
- addressing-1.3.mar
- annogen-0.1.0.jar
- annotations-api-6.0.14.jar
- aopalliance-1.0.jar
- axiom-api-1.2.5.jar
- axiom-dom-1.2.5.jar
- axiom-impl-1.2.5.jar
- axis2-adb-1.3.jar
- axis2-codegen-1.3.jar
- axis2-java2wsdl-1.3.jar
- axis2-kernel-1.3.jar
- axis2-mtompolicy-1.3.jar
- bsf-all-3.0-beta2.jar
- catalina-6.0.14.jar
- cglib-nodep-2.1_3.jar
- commons-collections-3.1.jar
- commons-codec-1.3.jar
- commons-fileupload-1.1.1.jar
- commons-httpclient-3.0.1.jar
- commons-io-1.2.jar
- commons-jexl-1.1.jar
- commons-lang-2.1.jar
- commons-logging-1.1.jar
- coyote-6.0.14.jar
- derby-10.1.3.1.jar
- geronimo-activation_1.1_spec-1.0-M1.jar
- geronimo-common-1.2-beta.jar
- geronimo-commonj_1.1_spec-1.0.jar
- geronimo-connector-1.2-beta.jar
- geronimo-core-1.2-beta.jar
- geronimo-deployment-1.2-beta.jar
- geronimo-ejb_3.0_spec-1.0.jar
- geronimo-interceptor-1.2-beta.jar
- geronimo-j2ee-1.2-beta.jar
- geronimo-j2ee-connector_1.5_spec-1.1.jar
- geronimo-j2ee-jacc_1.0_spec-1.1.jar
- geronimo-j2ee-management_1.0_spec-1.1.jar
- geronimo-javamail_1.4_spec-1.0-M1.jar
- geronimo-jms_1.1_spec-1.1.jar
- geronimo-jpa_3.0_spec-1.0.jar
- geronimo-jta_1.0.1B_spec-1.0.jar
- geronimo-kernel-1.2-beta.jar
- geronimo-management-1.2-beta.jar
- geronimo-naming-1.2-beta.jar
- geronimo-security-1.2-beta.jar
- geronimo-spec-j2ee-connector-1.5-rc4.jar
- geronimo-spec-jta-1.0.1B-rc4.jar
- geronimo-system-1.2-beta.jar
- geronimo-transaction-1.2-beta.jar
- geronimo-util-1.2-beta.jar
- httpcore-4.0-alpha5.jar
- httpcore-nio-4.0-alpha5.jar
- httpcore-niossl-4.0-alpha5.jar
- jettison-1.0-RC2.jar
- jetty-6.1.7.jar
- jetty-util-6.1.7.jar
- json-rpc-1.0.jar
- juli-6.0.14.jar
- log4j-1.2.12.jar
- logkit-1.0.1.jar
- neethi-2.0.2.jar
- ode-bpel-api-1.1.jar
- ode-bpel-compiler-1.1.jar
- ode-bpel-dao-1.1.jar
- ode-bpel-epr-1.1.jar
- ode-bpel-obj-1.1.jar
- ode-bpel-runtime-1.1.jar
- ode-bpel-schemas-1.1.jar
- ode-bpel-store-1.1.jar
- ode-dao-jpa-1.1.jar
- ode-dao-jpa-ojpa-derby-1.1.zip
- ode-jacob-1.1.jar
- ode-jacob-ap-1.1.jar
- ode-scheduler-simple-1.1.jar
- ode-utils-1.1.jar
- openjpa-all-0.9.7-incubating.jar
- openjpa-persistence-0.9.7-incubating.jar
- org.apache.felix.bundlerepository-1.0.2.jar
- org.apache.felix.framework-1.0.3.jar
- org.apache.felix.main-1.0.3.jar
- org.apache.felix.shell-1.0.0.jar
- org.apache.felix.shell.tui-1.0.0.jar
- rampart-core-1.3.jar
- rampart-policy-1.3.jar
- rampart-trust-1.3.jar
- regexp-1.3.jar
- spring-beans-2.0.6.jar
- spring-context-2.0.6.jar
- spring-core-2.0.6.jar
- tranql-connector-1.1.jar
- tuscany-sdo-api-r2.1-1.0-incubating.jar
- tuscany-sdo-impl-1.0-incubating.jar
- tuscany-sdo-lib-1.0-incubating.jar
- tuscany-sdo-tools-1.0-incubating.jar
- woden-1.0-incubating-M7b.jar
- wss4j-1.5.3.jar
- wstx-asl-3.2.1.jar
- xalan-2.7.0.jar
- xbean-naming-2.7.jar
- xercesImpl-2.8.1.jar
- xml-apis-1.3.03.jar
- xmlbeans-2.3.0.jar
- xml-resolver-1.1.jar
- xmlsec-1.4.0.jar
- XmlSchema-1.3.2.jar
-
-===============================================================================
-axion-1.0-M3-dev.jar 
-
-Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
- 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above 
-   copyright notice, this list of conditions and the following 
-   disclaimer. 
- 
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in 
-   the documentation and/or other materials provided with the 
-   distribution. 
-
-3. The names "Tigris", "Axion", nor the names of its contributors may 
-   not be used to endorse or promote products derived from this 
-   software without specific prior written permission. 
- 
-4. Products derived from this software may not be called "Axion", nor 
-   may "Tigris" or "Axion" appear in their names without specific prior
-   written permission.
- 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-The "Axion Development Team" is defined to be:
-
- * Chuck Burdick
- * James Burke
- * Morgan Delagrange
- * Geir Magnusson Jr.
- * Martin Poeschl
- * Steve Polyak
- * Daniel Rall
- * Ahimanikya Satapathy
- * Doug Sale
- * James Strachan
- * Rodney Waldhoff
- * Jason van Zyl
-
-License changes are to be determined by a simple majority vote of the 
-Axion Development Team.
-
-===============================================================================
-dom4j-1.6.1.jar
-
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
-   statements and notices.  Redistributions must also contain a
-   copy of this document.
- 
-2. Redistributions in binary form must reproduce the
-   above copyright notice, this list of conditions and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
- 
-3. The name "DOM4J" must not be used to endorse or promote
-   products derived from this Software without prior written
-   permission of MetaStuff, Ltd.  For written permission,
-   please contact dom4j-info@metastuff.com.
- 
-4. Products derived from this Software may not be called "DOM4J"
-   nor may "DOM4J" appear in their names without prior written
-   permission of MetaStuff, Ltd. DOM4J is a registered
-   trademark of MetaStuff, Ltd.
- 
-5. Due credit should be given to the DOM4J Project - 
-   http://www.dom4j.org
- 
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-The EMF jars; 
-   codegen-2.2.3.jar 
-   codegen-ecore-2.2.3.jar
-   common-2.2.3.jar
-   ecore-2.2.3.jar
-   ecore-change-2.2.3.jar
-   ecore-xmi-2.2.3.jar
-   xsd-2.2.3.jar
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the
-Program under their own license agreement, and (ii) are not derivative
-works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor
-which are necessarily infringed by the use or sale of its Contribution
-alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this 
-Agreement.
-
-"Recipient" means anyone who receives the Program under this
-Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor, if
-any, in source code and object code form. This patent license shall
-apply to the combination of the Contribution and the Program if, at
-the time the Contribution is added by the Contributor, such addition
-of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow
-Recipient to distribute the Program, it is Recipient's responsibility
-to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or
-conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the 
-Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a
-commercial product offering should do so in a manner which does not
-create potential liability for other Contributors. Therefore, if a
-Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend
-and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising
-from claims, lawsuits and other legal actions brought by a third party
-against the Indemnified Contributor to the extent caused by the acts
-or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement.
-In order to qualify, an Indemnified Contributor must: a) promptly
-notify the Commercial Contributor in writing of such claim, and b)
-allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such
-claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable
-laws, damage to or loss of data, programs or equipment, and
-unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-the Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of
-the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of
-time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use
-and distribution of the Program as soon as reasonably practicable.
-However, Recipient's obligations under this Agreement and any licenses
-granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and
-may only be modified in the following manner. The Agreement Steward
-reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation
-is the initial Agreement Steward. The Eclipse Foundation may assign
-the responsibility to serve as the Agreement Steward to a suitable
-separate entity. Each new version of the Agreement will be given a
-distinguishing version number. The Program (including Contributions)
-may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives
-no rights or licenses to the intellectual property of any Contributor
-under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No
-party to this Agreement will bring a legal action under this Agreement
-more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.
-
-===============================================================================
-For Saxon including 
-   saxon-8.7.jar
-   saxon-dom-8.7.jar
-   saxon-xpath-8.7.jar
-
- MOZILLA PUBLIC LICENSE
-Version 1.0
-
-1. Definitions.
-
-      1.1. ``Contributor'' means each entity that creates or contributes to the creation of Modifications.
-
-      1.2. ``Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-
-      1.3. ``Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.
-
-      1.4. ``Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data.
-
-      1.5. ``Executable'' means Covered Code in any form other than Source Code.
-
-      1.6. ``Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-
-      1.7. ``Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-
-      1.8. ``License'' means this document.
-
-      1.9. ``Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-
-            A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-
-            B. Any new file that contains any part of the Original Code or previous Modifications. 
-
-      1.10. ``Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-
-      1.11. ``Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or a list of source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-
-      1.12. ``You'' means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, ``You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, ``control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity. 
-
-2. Source Code License.
-
-      2.1. The Initial Developer Grant.
-      The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell (``Utilize'') the Original Code (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Original Code (or portions thereof) and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-      2.2. Contributor Grant.
-      Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Contributor, to Utilize the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Contributor Version (or portions thereof), and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-3. Distribution Obligations.
-
-      3.1. Application of License.
-      The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-
-      3.2. Availability of Source Code.
-      Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
-
-      3.3. Description of Modifications.
-      You must cause all Covered Code to which you contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-
-      3.4. Intellectual Property Matters
-
-            (a) Third Party Claims.
-            If You have knowledge that a party claims an intellectual property right in particular functionality or code (or its utilization under this License), you must include a text file with the source code distribution titled ``LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If you obtain such knowledge after You make Your Modification available as described in Section 3.2, You shall promptly modify the LEGAL file in all copies You make available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-
-            (b) Contributor APIs.
-            If Your Modification is an application programming interface and You own or control patents which are reasonably necessary to implement that API, you must also include this information in the LEGAL file. 
-
-      3.5. Required Notices.
-      You must duplicate the notice in Exhibit A in each file of the Source Code, and this License in any documentation for the Source Code, where You describe recipients' rights relating to Covered Code. If You created one or more Modification(s), You may add your name as a Contributor to the notice described in Exhibit A. If it is not possible to put such notice in a particular Source Code file due to its structure, then you must include such notice in a location (such as a relevant directory file) where a user would be likely to look for such a notice. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-      3.6. Distribution of Executable Versions.
-      You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-      3.7. Larger Works.
-      You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. 
-
-4. Inability to Comply Due to Statute or Regulation.
-
-      If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. 
-
-5. Application of this License.
-
-      This License applies to code to which the Initial Developer has attached the notice in Exhibit A, and to related Covered Code. 
-
-6. Versions of the License.
-
-      6.1. New Versions.
-      Netscape Communications Corporation (``Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-
-      6.2. Effect of New Versions.
-      Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License.
-
-      6.3. Derivative Works.
-      If you create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), you must (a) rename Your license so that the phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or any confusingly similar phrase do not appear anywhere in your license and (b) otherwise make it clear that your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) 
-
-7. DISCLAIMER OF WARRANTY.
-
-      COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 
-
-8. TERMINATION.
-
-      This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 
-
-9. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. 
-
-10. U.S. GOVERNMENT END USERS.
-
-      The Covered Code is a ``commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer software'' and ``commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 
-
-11. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in, the United States of America: (a) unless otherwise agreed in writing, all disputes relating to this License (excepting any dispute relating to intellectual property rights) shall be subject to final and binding arbitration, with the losing party paying all costs of arbitration; (b) any arbitration relating to this Agreement shall be held in Santa Clara County, California, under the auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. 
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-      Except in cases where another Contributor has failed to comply with Section 3.4, You are responsible for damages arising, directly or indirectly, out of Your utilization of rights under this License, based on the number of copies of Covered Code you made available, the revenues you received from utilizing such rights, and other relevant factors. You agree to work with affected parties to distribute responsibility on an equitable basis. 
-
-EXHIBIT A.
-
-      ``The contents of this file are subject to the Mozilla Public License Version 1.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.mozilla.org/MPL/
-
-      Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-
-      The Original Code is ______________________________________.
-
-      The Initial Developer of the Original Code is ________________________. Portions created by ______________________ are Copyright (C) ______ _______________________. All Rights Reserved.
-
-      Contributor(s): ______________________________________.'' 
-
-===============================================================================
-
-For the Rhino JavaScript engine js-1.6R7.jar:
-
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (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.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-
-===============================================================================
-Groovy (groovy-all-minimal-1.5.4.jar):
-
-/*
- $Id: LICENSE.txt 156 2003-09-26 17:36:37Z jstrachan $
-
- Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
-    statements and notices.  Redistributions must also contain a
-    copy of this document.
-
- 2. Redistributions in binary form must reproduce the
-    above copyright notice, this list of conditions and the
-    following disclaimer in the documentation and/or other
-    materials provided with the distribution.
-
- 3. The name "groovy" must not be used to endorse or promote
-    products derived from this Software without prior written
-    permission of The Codehaus.  For written permission,
-    please contact info@codehaus.org.
-
- 4. Products derived from this Software may not be called "groovy"
-    nor may "groovy" appear in their names without prior written
-    permission of The Codehaus. "groovy" is a registered
-    trademark of The Codehaus.
-
- 5. Due credit should be given to The Codehaus -
-    http://groovy.codehaus.org/
-
- THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- THE CODEHAUS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- */
-
-===============================================================================
-
-Jython (jython-2.2.jar):
-
-A. HISTORY OF THE SOFTWARE
-=======================
-
-JPython was created in late 1997 by Jim Hugunin. Jim was also the
-primary developer while he was at CNRI. In February 1999 Barry Warsaw
-took over as primary developer and released JPython version 1.1.
-
-In October 2000 Barry helped move the software to SourceForge
-where it was renamed to Jython.  Jython 2.0 and on are licensed under
-the Jython specific license below. 
-
-The standard library is covered by the Python Software Foundation
-license. See the LICENSE_CPython.txt file for details.
-
-The zxJDBC package was written by Brian Zimmer and originally licensed
-under the GNU Public License.  The package is now covered by the Jython
-Software License.
-
-The command line interpreter is covered by the Apache Software
-License.  See the LICENSE_Apache.txt file for details.
- 
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
-================================
-
-Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the distribution.
-
- - Neither the name of the Jython Developers nor the names of
-   its contributors may be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-
-JPython 1.1.x Software License.
-=========================
-
-______________________________________________________________________
-
-IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
-
-BY CLICKING ON THE "ACCEPT" BUTTON WHERE INDICATED, OR BY INSTALLING,
-COPYING OR OTHERWISE USING THE SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
-THE TERMS AND CONDITIONS OF THIS AGREEMENT.
-
-______________________________________________________________________
-
-JPython version 1.1.x
-
-  1. This LICENSE AGREEMENT is between the Corporation for National Research
-     Initiatives, having an office at 1895 Preston White Drive, Reston, VA
-     20191 ("CNRI"), and the Individual or Organization ("Licensee")
-     accessing and using JPython version 1.1.x in source or binary form and
-     its associated documentation as provided herein ("Software").
-
-  2. Subject to the terms and conditions of this License Agreement, CNRI
-     hereby grants Licensee a non-exclusive, non-transferable, royalty-free,
-     world-wide license to reproduce, analyze, test, perform and/or display
-     publicly, prepare derivative works, distribute, and otherwise use the
-     Software alone or in any derivative version, provided, however, that
-     CNRI's License Agreement and CNRI's notice of copyright, i.e.,
-     "Copyright ©1996-1999 Corporation for National Research Initiatives;
-     All Rights Reserved" are both retained in the Software, alone or in any
-     derivative version prepared by Licensee.
-
-     Alternatively, in lieu of CNRI's License Agreement, Licensee may
-     substitute the following text (omitting the quotes), provided, however,
-     that such text is displayed prominently in the Software alone or in any
-     derivative version prepared by Licensee: "JPython (Version 1.1.x) is
-     made available subject to the terms and conditions in CNRI's License
-     Agreement. This Agreement may be located on the Internet using the
-     following unique, persistent identifier (known as a handle):
-     1895.22/1006. The License may also be obtained from a proxy server on
-     the Web using the following URL: http://hdl.handle.net/1895.22/1006."
-
-  3. In the event Licensee prepares a derivative work that is based on or
-     incorporates the Software or any part thereof, and wants to make the
-     derivative work available to the public as provided herein, then
-     Licensee hereby agrees to indicate in any such work, in a prominently
-     visible way, the nature of the modifications made to CNRI's Software.
-
-  4. Licensee may not use CNRI trademarks or trade name, including JPython
-     or CNRI, in a trademark sense to endorse or promote products or
-     services of Licensee, or any third party. Licensee may use the mark
-     JPython in connection with Licensee's derivative versions that are
-     based on or incorporate the Software, but only in the form
-     "JPython-based ___________________," or equivalent.
-
-  5. CNRI is making the Software available to Licensee on an "AS IS" basis.
-     CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
-     OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY
-     REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
-     PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE
-     ANY THIRD PARTY RIGHTS.
-
-  6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
-     ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
-     USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE
-     THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT
-     ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER
-     MAY NOT APPLY TO LICENSEE.
-
-  7. This License Agreement may be terminated by CNRI (i) immediately upon
-     written notice from CNRI of any material breach by the Licensee, if the
-     nature of the breach is such that it cannot be promptly remedied; or
-     (ii) sixty (60) days following notice from CNRI to Licensee of a
-     material remediable breach, if Licensee has not remedied such breach
-     within that sixty-day period.
-
-  8. This License Agreement shall be governed by and interpreted in all
-     respects by the law of the State of Virginia, excluding conflict of law
-     provisions. Nothing in this Agreement shall be deemed to create any
-     relationship of agency, partnership, or joint venture between CNRI and
-     Licensee.
-
-  9. By clicking on the "ACCEPT" button where indicated, or by installing,
-     copying or otherwise using the Software, Licensee agrees to be bound by
-     the terms and conditions of this License Agreement.
-
-
-===============================================================================
-
-The jars; 
-activation-1.1.jar, 
-jaxb-api-2.1.jar, 
-jaxb-impl-2.1.6.jar, 
-jaxb-xjc-2.1.4.jar, 
-jaxb2-reflection-2.1.4.jar,
-jsr181-api-1.0-MR1.jar, 
-jsr250-api-1.0.jar, 
-jaxws-api-2.1-1.jar, 
-mail-1.4.jar, 
-saaj-api-1.3.jar, 
-servlet-api-2.5.jar, 
-stax-api-1.0-commons-cli-1.0.jar2.jar
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
-      1. Definitions.
-
-            1.1. "Contributor" means each individual or entity that
-            creates or contributes to the creation of Modifications.
-
-            1.2. "Contributor Version" means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-
-            1.3. "Covered Software" means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-
-            1.4. "Executable" means the Covered Software in any form
-            other than Source Code. 
-
-            1.5. "Initial Developer" means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            
-            1.6. "Larger Work" means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-
-            1.7. "License" means this document.
-
-            1.8. "Licensable" means having the right to grant, to the
-            maximum extent possible, whether at the time of the initial
-            grant or subsequently acquired, any and all of the rights
-            conveyed herein.
-            
-            1.9. "Modifications" means the Source Code and Executable
-            form of any of the following: 
-
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-
-            1.10. "Original Software" means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-
-            1.11. "Patent Claims" means any patent claim(s), now owned
-            or hereafter acquired, including without limitation,
-            method, process, and apparatus claims, in any patent
-            Licensable by grantor. 
-
-            1.12. "Source Code" means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-
-            1.13. "You" (or "Your") means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, "You"
-            includes any entity which controls, is controlled by, or is
-            under common control with You. For purposes of this
-            definition, "control" means (a) the power, direct or
-            indirect, to cause the direction or management of such
-            entity, whether by contract or otherwise, or (b) ownership
-            of more than fifty percent (50%) of the outstanding shares
-            or beneficial ownership of such entity.
-
-      2. License Grants. 
-
-            2.1. The Initial Developer Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Initial Developer,
-                  to use, reproduce, modify, display, perform,
-                  sublicense and distribute the Original Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party under the terms of this
-                  License. 
-
-                  (d) Notwithstanding Section 2.1(b) above, no patent
-                  license is granted: (1) for code that You delete from
-                  the Original Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-
-            2.2. Contributor Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, each
-            Contributor hereby grants You a world-wide, royalty-free,
-            non-exclusive license:
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Contributor to
-                  use, reproduce, modify, display, perform, sublicense
-                  and distribute the Modifications created by such
-                  Contributor (or portions thereof), either on an
-                  unmodified basis, with other Modifications, as
-                  Covered Software and/or as part of a Larger Work; and
-                  
-
-                  (b) under Patent Claims infringed by the making,
-                  using, or selling of Modifications made by that
-                  Contributor either alone and/or in combination with
-                  its Contributor Version (or portions of such
-                  combination), to make, use, sell, offer for sale,
-                  have made, and/or otherwise dispose of: (1)
-                  Modifications made by that Contributor (or portions
-                  thereof); and (2) the combination of Modifications
-                  made by that Contributor with its Contributor Version
-                  (or portions of such combination). 
-
-                  (c) The licenses granted in Sections 2.2(a) and
-                  2.2(b) are effective on the date Contributor first
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-
-                  (d) Notwithstanding Section 2.2(b) above, no patent
-                  license is granted: (1) for any code that Contributor
-                  has deleted from the Contributor Version; (2) for
-                  infringements caused by: (i) third party
-                  modifications of Contributor Version, or (ii) the
-                  combination of Modifications made by that Contributor
-                  with other software (except as part of the
-                  Contributor Version) or other devices; or (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-
-            3.1. Availability of Source Code.
-
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-
-            3.2. Modifications.
-
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-
-            3.3. Required Notices.
-
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-
-            3.4. Application of Additional Terms.
-
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipients'
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            However, you may do so only on Your own behalf, and not on
-            behalf of the Initial Developer or any Contributor. You
-            must make it absolutely clear that any such warranty,
-            support, indemnity or liability obligation is offered by
-            You alone, and You hereby agree to indemnify the Initial
-            Developer and every Contributor for any liability incurred
-            by the Initial Developer or such Contributor as a result of
-            warranty, support, indemnity or liability terms You offer.
-          
-
-            3.5. Distribution of Executable Versions.
-
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of a license of Your choice, which may contain terms
-            different from this License, provided that You are in
-            compliance with the terms of this License and that the
-            license for the Executable form does not attempt to limit
-            or alter the recipient's rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form under a
-            different license, You must make it absolutely clear that
-            any terms which differ from this License are offered by You
-            alone, not by the Initial Developer or Contributor. You
-            hereby agree to indemnify the Initial Developer and every
-            Contributor for any liability incurred by the Initial
-            Developer or such Contributor as a result of any such terms
-            You offer.
-
-            3.6. Larger Works.
-
-            You may create a Larger Work by combining Covered Software
-            with other code not governed by the terms of this License
-            and distribute the Larger Work as a single product. In such
-            a case, You must make sure the requirements of this License
-            are fulfilled for the Covered Software. 
-            
-      4. Versions of the License. 
-
-            4.1. New Versions.
-
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-
-            4.2. Effect of New Versions.
-
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-
-            4.3. Modified Versions.
-
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-            
-
-      5. DISCLAIMER OF WARRANTY.
-
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-
-            6.1. This License and the rights granted hereunder will
-            terminate automatically if You fail to comply with terms
-            herein and fail to cure such breach within 30 days of
-            becoming aware of the breach. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as "Participant")
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-
-      7. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-
-      8. U.S. GOVERNMENT END USERS.
-
-      The Covered Software is a "commercial item," as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-      computer software" (as that term is defined at 48 C.F.R. 
-      252.227-7014(a)(1)) and "commercial computer software
-      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users
-      acquire Covered Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-
-      9. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject
-      matter hereof. If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be
-      governed by the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdiction's conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, with the losing
-      party responsible for costs, including, without limitation, court
-      costs and reasonable attorneys' fees and expenses. The
-      application of the United Nations Convention on Contracts for the
-      International Sale of Goods is expressly excluded. Any law or
-      regulation which provides that the language of a contract shall
-      be construed against the drafter shall not apply to this License.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-      10. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis. Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.
-
-===============================================================================
-
-JRuby (jruby-complete-1.0.jar), wsdl4j (wsdl4j-1.6.2.jar):
-
-Common Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-      a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-      b) in the case of each subsequent Contributor:
-
-      i) changes to the Program, and
-
-      ii) additions to the Program;
-
-      where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
-
-      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
-
-      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
-
-      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
-
-      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-      iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form:
-
-      a) it must be made available under this Agreement; and 
-
-      b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
-
-===============================================================================
-
-backport-util-concurrent-2.2.jar:
-
-The software comprising backport-util-concurrent is based in large
-part on the code from JSR166, and the package dl.util.concurrent.
-The software has been released to the public domain, as explained at:
-http://creativecommons.org/licenses/publicdomain, excepting portions
-of the class
-edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList,
-which were adapted from class java.util.ArrayList, written by Sun
-Microsystems, Inc, which are used with kind permission, and subject
-to the following:
-
-Copyright 2002-2004 Sun Microsystems, Inc. All rights reserved. Use is
-subject to the following license terms.
-
-  "Sun hereby grants you a non-exclusive, worldwide, non-transferrable
-  license to use and distribute the Java Software technologies as part
-  of a larger work in source and binary forms, with or without
-  modification, provided that the following conditions are met:
-
-   -Neither the name of or trademarks of Sun may be used to endorse or
-    promote products derived from the Java Software technology without
-    specific prior written permission.
-
-   -Redistributions of source or binary code must be accompanied by the
-    following notice and disclaimers:
-
-    Portions copyright Sun Microsystems, Inc. Used with kind permission.
-
-    This software is provided AS IS, without a warranty of any kind.  ALL
-    EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
-    WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PUPOSE OR
-    NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
-    MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE
-    FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
-    USING, MODIFYING OR DISTRIBUTING THE SOFTWARE OR ITS
-    DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR
-    ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR
-    DATA, OR FOR DIRECT, INDIRECT,CONSQUENTIAL, INCIDENTAL
-    OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF
-    THE THEORY OR LIABILITY, ARISING OUT OF THE USE OF OR
-    INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.
-    HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-    You acknowledge that Software is not designed, licensed or intended for
-    use in the design, construction, operation or maintenance of any nuclear
-    facility."
-
-===============================================================================
-rome-0.9.jar
-
-Copyright 2004 Sun Microsystems, Inc.
-
-Licensed 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.
-
-===============================================================================
-jdom-1.0.jar :
-
-$Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions, and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions, and the disclaimer that follows 
-    these conditions in the documentation and/or other materials 
-    provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
-    derived from this software without prior written permission.  For
-    written permission, please contact <request_AT_jdom_DOT_org>.
- 
- 4. Products derived from this software may not be called "JDOM", nor
-    may "JDOM" appear in their name, without prior written permission
-    from the JDOM Project Management <request_AT_jdom_DOT_org>.
- 
- In addition, we request (but do not require) that you include in the 
- end-user documentation provided with the redistribution and/or in the 
- software itself an acknowledgement equivalent to the following:
-     "This product includes software developed by the
-      JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos 
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many 
- individuals on behalf of the JDOM Project and was originally 
- created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
- Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
- on the JDOM Project, please see <http://www.jdom.org/>. 
-
-========================================================================
-
-dwr-2.0.1.jar :
-
-/*
-* Copyright 2005 Joe Walker
-*
-* Licensed 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.
-*/
-
-==========================================================================
-
-dojotoolkit V1.0.0:
-
-The "New" BSD License:
-**********************
-
-Copyright (c) 2005, The Dojo Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-	list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-	this list of conditions and the following disclaimer in the documentation
-	and/or other materials provided with the distribution.
-  * Neither the name of the Dojo Foundation nor the names of its contributors
-	may be used to endorse or promote products derived from this software
-	without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The module tuscany-implementation-script-1.0-incubating.jar temporarily includes    
-one file under the below BSD license with the following copyright:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-
-The serp-1.12.0.jar is distributed under the BSD license with the following copyright:
-
- Copyright (c) 2002, A. Abram White
- All rights reserved.
-
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-The javacc-3.2.jar, and howl-1.0.1-1.jar are distributed under the BSD license:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The tuscany-assembly-xsd jar includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-================================================================================
-License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
-
-These files being ...
-commonj/sdo/ChangeSummary$Setting.class
-commonj/sdo/ChangeSummary.class
-commonj/sdo/DataGraph.class
-commonj/sdo/DataObject.class
-commonj/sdo/helper/CopyHelper.class
-commonj/sdo/helper/DataFactory.class
-commonj/sdo/helper/DataHelper.class
-commonj/sdo/helper/EqualityHelper.class
-commonj/sdo/helper/HelperContext.class
-commonj/sdo/helper/TypeHelper.class
-commonj/sdo/helper/XMLDocument.class
-commonj/sdo/helper/XMLHelper.class
-commonj/sdo/helper/XSDHelper.class
-commonj/sdo/impl/ExternalizableDelegator$Resolvable.class
-commonj/sdo/impl/ExternalizableDelegator.class
-commonj/sdo/Property.class
-commonj/sdo/Sequence.class
-commonj/sdo/Type.class
-xml/datagraph.xsd
-xml/sdoJava.xml
-xml/sdoJava.xsd
-xml/sdoModel.xml
-xml/sdoModel.xsd
-xml/sdoXML.xml
-xml/sdoXML.xsd
-
-
-License for the Service Data Objects JavaDoc and Interface Definition files.
-
-The Service Data Objects Specification is being provided by the copyright holders under the following 
-license. By using and/or copying this work, you agree that you have read, understood and will comply with 
-the following terms and conditions:
-
-Permission to copy, display and distribute the Service Data Objects Specification and/or portions thereof, without 
-modification, in any medium without fee or royalty is hereby granted, provided that you include the 
-following on ALL copies of the Service Data Objects Specification, or portions thereof, that you make:
-
-1. A link or URL to the Service Data Objects Specification at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2. The full text of this copyright notice as shown in the Service Data Objects Specification.
-
-BEA, IBM, Oracle, Primeton Technologies, Rogue Wave Software, SAP, Software AG, Sun Microsystems, Xcalia, 
-Zend Technologies (collectively, the “Authors”) agree to grant you a royalty-free license, under reasonable, 
-non-discriminatory terms and conditions to patents that they deem necessary to implement the Service Data 
-Objects Specification. 
-
-THE Service Data Objects SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR 
-WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL 
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE SERVICE DATA OBJECTS 
-SPECIFICATION.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity 
-pertaining to the Service Data Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects Specification will at all times remain with the 
-Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-================================================================================
-
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/bin/NOTICE b/java/sca-contrib/distribution/ejava/src/main/release/bin/NOTICE
deleted file mode 100644
index 5daa9a3dfe..0000000000
--- a/java/sca-contrib/distribution/ejava/src/main/release/bin/NOTICE
+++ /dev/null
@@ -1,95 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses XmlSchema developed at 
-The Apache Software Foundation (http://ws.apache.org/commons/XmlSchema)
- Portions Copyright 2006 International Business Machines Corp.
-
-This product includes/uses ode-bpel-api-1.1 developed at
-The Apache Software Foundation (http://ode.apache.org)
- - Copyright 1999-2006 Intalio - This product includes software developed by Intalio (http://www.intalio.com)
- - Copyright 2006 Sybase - This product includes software developed by Sybase.(http://www.sybase.com)
-
-"This product includes software developed by the Spring Framework
- Project (http://www.springframework.org)."
-
-This product includes/uses the Jetty Servlet Engine (http://jetty.mortbay.org),
-developed by Mort Bay Consulting  (http://www.mortbay.com)
-
-This product includes/uses the Groovy Script Engine (http://groovy.codehaus.org/),
-Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
-This product includes/uses the Axion : the Open Source Java Database (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
-
-This product includes/uses DOM4J : the flexible XML framework for java (http://www.dom4j.org/) 
- Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)
-License: Public Domain 
-
-This product includes/uses JSON-RPC-Java (http://oss.metaparadigm.com/jsonrpc/)
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product includes software from the GlassFish project (https://glassfish.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-    
-This product includes software from the Rome project (https://rome.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-
-This product includes/uses the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
-
-This product includes/uses the Mozilla Rhino project (http://www.mozilla.org/rhino/)
-
-This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)i
-
-This product includes/uses the Codehaus JRuby project (http://jruby.codehaus.org/)
-
-This product includes/uses JDOM (http://www.jdom.org/)
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved.
- 
-This product includes/uses DWR (http://getahead.org/dwr)
- Copyright 2005 Joe Walker. All rights reserved.
- 
-This product includes/uses dojotoolkit (http://dojotoolkit.org/)
- Copyright (c) 2005, The Dojo Foundation. All rights reserved.
-
-This product includes/uses Howl (http://howl.objectweb.org/)
- Copyright (c) 2004, Bull S.A.
-
-This product includes/uses axion (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team.
-
-This product includes/uses javacc (https://javacc.dev.java.net/)
- Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.
-
-The Program includes all or portions of the following software: "The 
-Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under
-an MPL v1.0 license. Please refer to the homepage URL at 
-http://www.saxonica.com/.
-
-This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:
- Copyright (c) 2002, A. Abram White. All rights reserved.
-
-This product also includes software under the BSD license
-with the following copyright:
- Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/src/BUILDING b/java/sca-contrib/distribution/ejava/src/main/release/src/BUILDING
deleted file mode 100644
index 65d09c5eae..0000000000
--- a/java/sca-contrib/distribution/ejava/src/main/release/src/BUILDING
+++ /dev/null
@@ -1,55 +0,0 @@
-Building the Apache Tuscany SCA 1.2 (incubating) April 2008 Release source distribution
-=======================================================================================
-
-Initial Setup
--------------
-
-1) Install J2SE 5.0 SDK, which can be downloaded from 
-   http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_06 JDK or higher.
-
-2) Make sure that your JAVA_HOME environment variable is set to the newly installed 
-   JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 
-   $JAVA_HOME$/bin (unix).
-
-3) Install Maven 2.0.7 or higher, which can be downloaded from 
-   http://maven.apache.org/download.html. Make sure that your PATH includes 
-   the MVN_HOME/bin directory. 
-
-4) Make sure that your MAVEN_OPTS environment variable has -Xmx128M (or more),
-   you can manually do this by executing the following in your prompt :
-   Windows users:
-      set MAVEN_OPTS=-Xmx128M
-   Unix users:
-      export MAVEN_OPTS=-Xmx128M
-
-
-Building
---------
-
-1) Change to the top level directory of Apache Tuscany source distribution.
-2) Run
-
-	$> mvn
-
-   This will compile Apache Tuscany and run all of the tests in the source
-   distribution. 
-
-   Depending on the load of remote Maven 2.0 repositories, you may have 
-   to run "mvn" several times utill the required dependencies are 
-   all located in your local maven repository. It usually takes some time for 
-   maven to download required dependencies in the first build. Once all the 
-   dependencies have been downloaded you may use the -o option to run maven
-   in offline mode, for example, 'mvn clean install -o'.
-
-
-Building the distributions
---------------------------
-
-1) Change to the distribution folder
-2) Run
-
-	$> mvn
-
-   This will build the binary and source distribution with .zip and .gz 
-   formats in the distribution/target directory.
-
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/src/LICENSE b/java/sca-contrib/distribution/ejava/src/main/release/src/LICENSE
deleted file mode 100644
index 144d8ae692..0000000000
--- a/java/sca-contrib/distribution/ejava/src/main/release/src/LICENSE
+++ /dev/null
@@ -1,397 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================================================
-
-The module itest/databindings/common includes the test schema; datagraph.xsd, sdoJava.xsd, and sdoModel.xsd
-under the following license:
-
-License for the Service Data Objects JavaDoc, Interface Definition files
-and XSD files.
-
-The Service Data Objects JavaDoc, Interface Definition files and XSD files 
-are being provided by the copyright holders under the following license. 
-By using and/or copying this work, you agree that you have read, 
-understood and will comply with the following terms and conditions:
-
-Permission to copy, display, make derivative works of and distribute 
-the Service Data Objects JavaDoc, Interface Definition files and XSD files
-(the "Artifacts") in any medium without fee or royalty is hereby granted, 
-provided that you include the following on ALL copies of the Artifacts, 
-or portions thereof, that you make:
-
-1.	A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2.	The full text of this copyright notice as shown in the Artifacts.
-
-
-
-THE ARTIFACTS ARE PROVIDED "AS IS" AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE. 
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Data 
-Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects 
-Specification will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.11, last updated on 2007/12/21
-
-=================================================================================================================
-
-The module implementation-script temporarily includes one file under the following BSD license:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-=================================================================================================================
-
-The module assembly-xsd includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-=================================================================================================================
-The modules 
-
-binding-ws-xml
-databinding
-databinding-axiom
-databinding-jaxb
-databinding-json
-databinding-sdo
-databinding-sdo-axiom
-databinding-xmlbeans
-interface-wsdl-xml
-
-Include the ipo.xsd and address.xsd information from the XML Schema Primer 
-(http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) combined into the 
-file ipo.xsd and extended with UK postcode structures.
-
-The ipo.xsd file is include under the following license:
-
-W3C(c) SOFTWARE NOTICE AND LICENSE
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other 
-related items) is being provided by the copyright holders under the following 
-license. By obtaining, using and/or copying this work, you (the licensee) agree 
-that you have read, understood, and will comply with the following terms and conditions.
-
-Permission to copy, modify, and distribute this software and its documentation, 
-with or without modification, for any purpose and without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies of the 
-software and documentation or portions thereof, including modifications:
-
-   1. The full text of this NOTICE in a location viewable to users of the 
-      redistributed or derivative work.
-   2. Any pre-existing intellectual property disclaimers, notices, or terms 
-      and conditions. If none exist, the W3C Software Short Notice should be 
-      included (hypertext is preferred, text is permitted) within the body of 
-      any redistributed or derivative code.
-   3. Notice of any changes or modifications to the files, including the date 
-      changes were made. (We recommend you provide URIs to the location from which 
-      the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
-NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or 
-publicity pertaining to the software without specific, written prior permission. 
-Title to copyright in this software and any associated documentation will at all 
-times remain with copyright holders.
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/src/NOTICE b/java/sca-contrib/distribution/ejava/src/main/release/src/NOTICE
deleted file mode 100644
index 31540fd607..0000000000
--- a/java/sca-contrib/distribution/ejava/src/main/release/src/NOTICE
+++ /dev/null
@@ -1,39 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product also includes software under the BSD license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-  Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
-This product includes software under the W3C(c) Software License
-with the following copyright:
-    
-Copyright (c) 2008 World Wide Web Consortium, (Massachusetts Institute of Technology, 
-European Research Consortium for Informatics and Mathematics, Keio University). 
-All Rights Reserved. This work is distributed under the W3C(c) Software License [1] in 
-the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
diff --git a/java/sca-contrib/distribution/etc/generate-all-maven-files.sh b/java/sca-contrib/distribution/etc/generate-all-maven-files.sh
deleted file mode 100755
index 4d1327f518..0000000000
--- a/java/sca-contrib/distribution/etc/generate-all-maven-files.sh
+++ /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. 
-
-# This script can be used to generate Maven build POM and assembly files
-# for all the distributions
-
-echo "Generate Maven files: core"
-cd core; ../etc/generate-filtered-dependencies.sh > src/main/components/bin-filtered-dependencies.xml; ../etc/generate-maven-files.sh
-
-echo "Generate Maven files: ejava"
-cd ../ejava; ../etc/generate-maven-files.sh
-
-echo "Generate Maven files: manager"
-cd ../manager; ../etc/generate-maven-files.sh
-
-echo "Generate Maven files: process"
-cd ../process; ../etc/generate-maven-files.sh
-
-echo "Generate Maven files: web20"
-cd ../web20; ../etc/generate-maven-files.sh
-
-echo "Generate Maven files: webservice"
-cd ../webservice; ../etc/generate-maven-files.sh
-
-echo "Generate Maven files: all"
-cd ../all; ../etc/generate-maven-files.sh
-
-echo "Generate Maven files: repository"
-cd ../repository; ../etc/generate-maven-files.sh
-
diff --git a/java/sca-contrib/distribution/etc/generate-filtered-dependencies.sh b/java/sca-contrib/distribution/etc/generate-filtered-dependencies.sh
deleted file mode 100755
index 7a04369b50..0000000000
--- a/java/sca-contrib/distribution/etc/generate-filtered-dependencies.sh
+++ /dev/null
@@ -1,69 +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. 
-
-# This generates a Maven assembly component that can be included in a Maven
-# assembly to include the source of the modules in a source distribution.
-
-echo "<!--"
-echo "    * Licensed to the Apache Software Foundation (ASF) under one"
-echo "    * or more contributor license agreements.  See the NOTICE file"
-echo "    * distributed with this work for additional information"
-echo "    * regarding copyright ownership.  The ASF licenses this file"
-echo "    * to you under the Apache License, Version 2.0 (the"
-echo "    * "License"); you may not use this file except in compliance"
-echo "    * with the License.  You may obtain a copy of the License at"
-echo "    *"
-echo "    *   http://www.apache.org/licenses/LICENSE-2.0"
-echo "    *"
-echo "    * Unless required by applicable law or agreed to in writing,"
-echo "    * software distributed under the License is distributed on an"
-echo "    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"
-echo "    * KIND, either express or implied.  See the License for the"
-echo "    * specific language governing permissions and limitations"
-echo "    * under the License."
-echo "-->"
-echo "<component>"
-echo "    <dependencySets>"
-echo ""
-echo "        <!-- Add all the Tuscany modules to the modules directory -->"
-echo "        <dependencySet>"
-echo "            <outputDirectory>modules</outputDirectory>"
-echo "            <unpack>false</unpack>"
-echo "            <includes>"
-echo "                <include>org.apache.tuscany.sca:*</include>"
-echo "            </includes>"
-echo "            <excludes>"
-
-mvn -o dependency:list | awk '/.INFO.    (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO.    )(.*)(:)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\2:\\4", "g") }' | sort | awk '{ printf "                <exclude>%s</exclude>\n", $1 }'
-
-echo "            </excludes>"
-echo "        </dependencySet>"
-echo ""
-echo "        <!-- Add all the dependent jars to the lib directory -->"
-echo "        <dependencySet>"
-echo "            <outputDirectory>lib</outputDirectory>"
-echo "            <unpack>false</unpack>"
-echo "            <excludes>"
-
-mvn -o dependency:list | awk '/.INFO.    (.*):(.*):(.*):(.*):(.*)/ && !/(.*)(.tuscany.sca):(.*)/ { print gensub("(.INFO.    )(.*)(:)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\2:\\4", "g") }' | sort | awk '{ printf "                <exclude>%s</exclude>\n", $1 }'
-
-echo "                <exclude>org.apache.tuscany.sca:*</exclude>"
-echo "            </excludes>"
-echo "        </dependencySet>"
-echo "    </dependencySets>"
-echo "</component>"
-
diff --git a/java/sca-contrib/distribution/etc/generate-maven-files.sh b/java/sca-contrib/distribution/etc/generate-maven-files.sh
deleted file mode 100755
index adb190eabd..0000000000
--- a/java/sca-contrib/distribution/etc/generate-maven-files.sh
+++ /dev/null
@@ -1,25 +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. 
-
-# This script can be used to generate Maven build POM and assembly files
-# for a distribution
-
-../etc/generate-src-modules.sh > src/main/components/src-modules.xml
-../etc/generate-pom.sh > pom.xml.tmp
-cp pom.xml.tmp pom.xml
-rm pom.xml.tmp
-
diff --git a/java/sca-contrib/distribution/etc/generate-pom.sh b/java/sca-contrib/distribution/etc/generate-pom.sh
deleted file mode 100755
index b8446a51d3..0000000000
--- a/java/sca-contrib/distribution/etc/generate-pom.sh
+++ /dev/null
@@ -1,26 +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. 
-
-# This script can be used to generate a Maven build profile that includes all
-# the modules included directly or transitively in a distribution
-
-cat pom.xml | awk 'BEGIN { i=0 } /<modules>/ { i=1; print } /.*/ { if (i==0) print } '
-
-mvn -o dependency:list | awk '/.INFO.    (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO.    )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | grep -v "distribution-" | grep -v "maven-" | grep -v "wsdl2java" | grep -v "java2wsdl" | sort | awk '{ printf "                <module>../../modules/%s</module>\n", $1 }'
-
-cat pom.xml | awk 'BEGIN { i=0 } /<\/modules>/ { i=1 } /.*/ { if (i==1) print } '
-
diff --git a/java/sca-contrib/distribution/etc/generate-src-modules.sh b/java/sca-contrib/distribution/etc/generate-src-modules.sh
deleted file mode 100755
index 9a1272258c..0000000000
--- a/java/sca-contrib/distribution/etc/generate-src-modules.sh
+++ /dev/null
@@ -1,65 +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. 
-
-# This generates a Maven assembly component that can be included in a Maven
-# assembly to include the source of the modules in a source distribution.
-
-echo "<!--"
-echo "    * Licensed to the Apache Software Foundation (ASF) under one"
-echo "    * or more contributor license agreements.  See the NOTICE file"
-echo "    * distributed with this work for additional information"
-echo "    * regarding copyright ownership.  The ASF licenses this file"
-echo "    * to you under the Apache License, Version 2.0 (the"
-echo "    * "License"); you may not use this file except in compliance"
-echo "    * with the License.  You may obtain a copy of the License at"
-echo "    *"
-echo "    *   http://www.apache.org/licenses/LICENSE-2.0"
-echo "    *"
-echo "    * Unless required by applicable law or agreed to in writing,"
-echo "    * software distributed under the License is distributed on an"
-echo "    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"
-echo "    * KIND, either express or implied.  See the License for the"
-echo "    * specific language governing permissions and limitations"
-echo "    * under the License."
-echo "-->"
-echo "<component>"
-echo "    <fileSets>"
-echo ""
-echo "        <!-- Add module sources to the modules directory -->"
-echo "        <fileSet>"
-echo "            <directory>../../modules</directory>"
-echo "            <outputDirectory>modules</outputDirectory>"
-echo "            <includes>"
-
-mvn -o dependency:list | awk '/.INFO.    (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO.    )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | sort | awk '{ printf "                <include>%s/**/*</include>\n", $1 }'
-
-echo "            </includes>"
-echo "            <excludes>"
-echo "                <!-- General file/folders to exclude -->"
-echo "                <exclude>**/.*</exclude>"
-echo "                <exclude>**/.*/**</exclude>"
-echo "                <exclude>**/*.log</exclude>"
-echo ""
-echo "                <!-- Specific files/folders to exclude -->"
-echo "                <exclude>pom.xml</exclude>"
-echo "                <exclude>**/target</exclude>"
-echo "                <exclude>**/target/**/*</exclude>"
-echo "            </excludes>"
-echo "        </fileSet>"
-echo "    </fileSets>"
-echo "</component>"
-
diff --git a/java/sca-contrib/distribution/manager/pom.xml b/java/sca-contrib/distribution/manager/pom.xml
deleted file mode 100644
index bb4aec34e3..0000000000
--- a/java/sca-contrib/distribution/manager/pom.xml
+++ /dev/null
@@ -1,178 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-distribution</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-distribution-manager</artifactId>

-    <name>Apache Tuscany SCA Domain Manager Distribution</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-    

-        <!-- Core distribution -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-manager</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-    </dependencies>

-

-    <profiles>

-

-        <!-- Build profile that can be used to build the distro packages -->

-        <profile>

-            <id>distribution</id>

-            <build>

-                <plugins>

-                    <plugin>

-                        <groupId>org.apache.tuscany.sca</groupId>

-                        <artifactId>tuscany-maven-bundle-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>distribution-modules</id>

-                                <phase>generate-resources</phase>

-                                <goals>

-                                    <goal>generate-modules</goal>

-                                </goals>

-                                <configuration>

-                                    <targetDirectory>target/modules</targetDirectory>

-                                    <excludeDirectories>

-                                        <excludeDirectory>../core/target/modules</excludeDirectory>

-                                    </excludeDirectories>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-

-                    <plugin>

-                        <groupId>org.apache.maven.plugins</groupId>

-                        <artifactId>maven-assembly-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>distribution-package</id>

-                                <phase>package</phase>

-                                <goals>

-                                    <goal>single</goal>

-                                </goals>

-                                <configuration>

-                                    <descriptors>

-                                        <descriptor>src/main/assembly/bin.xml</descriptor>

-                                        <descriptor>src/main/assembly/src.xml</descriptor>

-                                    </descriptors>

-                                    <tarLongFileMode>gnu</tarLongFileMode>

-                                    <finalName>apache-tuscany-sca-manager-2.0-SNAPSHOT</finalName>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-                </plugins>

-            </build>

-        </profile>

-        

-        <!-- Profile that can be used to build the modules included in the distro -->

-        <profile>

-            <id>modules</id>

-            <modules>

-                <module>../../../modules/assembly</module>

-                <module>../../../modules/assembly-xml</module>

-                <module>../../../modules/assembly-xsd</module>

-                <module>../../../modules/binding-atom</module>

-                <module>../../../modules/binding-atom-abdera</module>

-                <module>../../../modules/binding-corba</module>

-                <module>../../../modules/binding-corba-runtime</module>

-                <module>../../../modules/binding-ejb</module>

-                <module>../../../modules/binding-http</module>

-                <module>../../../modules/binding-http-runtime</module>

-                <module>../../../modules/binding-jsonrpc</module>

-                <module>../../../modules/binding-rmi</module>

-                <module>../../../modules/binding-rss</module>

-                <module>../../../modules/binding-sca</module>

-                <module>../../../modules/binding-sca-xml</module>

-                <module>../../../modules/binding-ws</module>

-                <module>../../../modules/binding-ws-wsdlgen</module>

-                <module>../../../modules/binding-ws-xml</module>

-                <module>../../../modules/contribution</module>

-                <module>../../../modules/contribution-java</module>

-                <module>../../../modules/contribution-namespace</module>

-                <module>../../../modules/contribution-resource</module>

-                <module>../../../modules/contribution-xml</module>

-                <module>../../../modules/core</module>

-                <module>../../../modules/core-databinding</module>

-                <module>../../../modules/core-spi</module>

-                <module>../../../modules/data-api</module>

-                <module>../../../modules/databinding</module>

-                <module>../../../modules/databinding-jaxb</module>

-                <module>../../../modules/definitions</module>

-                <module>../../../modules/definitions-xml</module>

-                <module>../../../modules/domain-manager</module>

-                <module>../../../modules/endpoint</module>

-                <module>../../../modules/extensibility</module>

-                <module>../../../modules/extensibility-equinox</module>

-                <module>../../../modules/host-corba</module>

-                <module>../../../modules/host-corba-jse</module>

-                <module>../../../modules/host-http</module>

-                <module>../../../modules/host-jetty</module>

-                <module>../../../modules/implementation-bpel</module>

-                <module>../../../modules/implementation-ejb</module>

-                <module>../../../modules/implementation-java</module>

-                <module>../../../modules/implementation-java-runtime</module>

-                <module>../../../modules/implementation-java-xml</module>

-                <module>../../../modules/implementation-node</module>

-                <module>../../../modules/implementation-node-runtime</module>

-                <module>../../../modules/implementation-resource</module>

-                <module>../../../modules/implementation-widget</module>

-                <module>../../../modules/implementation-widget-runtime</module>

-                <module>../../../modules/interface</module>

-                <module>../../../modules/interface-java</module>

-                <module>../../../modules/interface-java-jaxws</module>

-                <module>../../../modules/interface-java-xml</module>

-                <module>../../../modules/interface-wsdl</module>

-                <module>../../../modules/interface-wsdl-xml</module>

-                <module>../../../modules/monitor</module>

-                <module>../../../modules/node-api</module>

-                <module>../../../modules/node-impl</module>

-                <module>../../../modules/node-launcher</module>

-                <module>../../../modules/node-launcher-equinox</module>

-                <module>../../../modules/node-launcher-webapp</module>

-                <module>../../../modules/node-manager</module>

-                <module>../../../modules/policy</module>

-                <module>../../../modules/policy-security</module>

-                <module>../../../modules/policy-security-jsr250</module>

-                <module>../../../modules/policy-security-ws</module>

-                <module>../../../modules/policy-xml</module>

-                <module>../../../modules/sca-api</module>

-                <module>../../../modules/workspace</module>

-                <module>../../../modules/workspace-impl</module>

-                <module>../../../modules/workspace-xml</module>

-                <module>../../../modules/xsd</module>

-                <module>../../../modules/xsd-xml</module>

-            </modules>

-        </profile>

-    </profiles>

-

-</project>

diff --git a/java/sca-contrib/distribution/manager/src/main/assembly/bin.xml b/java/sca-contrib/distribution/manager/src/main/assembly/bin.xml
deleted file mode 100644
index fdcc421f2f..0000000000
--- a/java/sca-contrib/distribution/manager/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,38 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id></id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
-        <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
diff --git a/java/sca-contrib/distribution/manager/src/main/assembly/src.xml b/java/sca-contrib/distribution/manager/src/main/assembly/src.xml
deleted file mode 100644
index af3cb8e6fc..0000000000
--- a/java/sca-contrib/distribution/manager/src/main/assembly/src.xml
+++ /dev/null
@@ -1,37 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>src</id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
-        <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
diff --git a/java/sca-contrib/distribution/manager/src/main/components/bin-samples.xml b/java/sca-contrib/distribution/manager/src/main/components/bin-samples.xml
deleted file mode 100644
index d4b13c42e0..0000000000
--- a/java/sca-contrib/distribution/manager/src/main/components/bin-samples.xml
+++ /dev/null
@@ -1,42 +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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add samples to the samples directory -->
-        <fileSet>
-            <directory>../../../samples</directory>
-            <outputDirectory>samples</outputDirectory>
-            <includes>
-                <include>domain-management/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
diff --git a/java/sca-contrib/distribution/manager/src/main/components/src-modules.xml b/java/sca-contrib/distribution/manager/src/main/components/src-modules.xml
deleted file mode 100644
index 3437db9cc5..0000000000
--- a/java/sca-contrib/distribution/manager/src/main/components/src-modules.xml
+++ /dev/null
@@ -1,116 +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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add module sources to the modules directory -->
-        <fileSet>
-            <directory>../../../modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>assembly/**/*</include>
-                <include>assembly-xml/**/*</include>
-                <include>assembly-xsd/**/*</include>
-                <include>binding-atom/**/*</include>
-                <include>binding-atom-abdera/**/*</include>
-                <include>binding-corba/**/*</include>
-                <include>binding-corba-runtime/**/*</include>
-                <include>binding-ejb/**/*</include>
-                <include>binding-http/**/*</include>
-                <include>binding-http-runtime/**/*</include>
-                <include>binding-jsonrpc/**/*</include>
-                <include>binding-rmi/**/*</include>
-                <include>binding-rss/**/*</include>
-                <include>binding-sca/**/*</include>
-                <include>binding-sca-xml/**/*</include>
-                <include>binding-ws/**/*</include>
-                <include>binding-ws-wsdlgen/**/*</include>
-                <include>binding-ws-xml/**/*</include>
-                <include>contribution/**/*</include>
-                <include>contribution-impl/**/*</include>
-                <include>contribution-java/**/*</include>
-                <include>contribution-namespace/**/*</include>
-                <include>contribution-resource/**/*</include>
-                <include>contribution-xml/**/*</include>
-                <include>core/**/*</include>
-                <include>core-databinding/**/*</include>
-                <include>core-spi/**/*</include>
-                <include>data-api/**/*</include>
-                <include>databinding/**/*</include>
-                <include>databinding-jaxb/**/*</include>
-                <include>definitions/**/*</include>
-                <include>definitions-xml/**/*</include>
-                <include>distribution-core/**/*</include>
-                <include>domain-manager/**/*</include>
-                <include>endpoint/**/*</include>
-                <include>extensibility/**/*</include>
-                <include>extensibility-equinox/**/*</include>
-                <include>host-corba/**/*</include>
-                <include>host-corba-jse/**/*</include>
-                <include>host-http/**/*</include>
-                <include>host-jetty/**/*</include>
-                <include>implementation-bpel/**/*</include>
-                <include>implementation-ejb/**/*</include>
-                <include>implementation-java/**/*</include>
-                <include>implementation-java-runtime/**/*</include>
-                <include>implementation-java-xml/**/*</include>
-                <include>implementation-node/**/*</include>
-                <include>implementation-node-runtime/**/*</include>
-                <include>implementation-resource/**/*</include>
-                <include>implementation-widget/**/*</include>
-                <include>implementation-widget-runtime/**/*</include>
-                <include>interface/**/*</include>
-                <include>interface-java/**/*</include>
-                <include>interface-java-jaxws/**/*</include>
-                <include>interface-java-xml/**/*</include>
-                <include>interface-wsdl/**/*</include>
-                <include>interface-wsdl-xml/**/*</include>
-                <include>monitor/**/*</include>
-                <include>node-api/**/*</include>
-                <include>node-impl/**/*</include>
-                <include>node-launcher/**/*</include>
-                <include>node-launcher-equinox/**/*</include>
-                <include>node-launcher-webapp/**/*</include>
-                <include>node-manager/**/*</include>
-                <include>policy/**/*</include>
-                <include>policy-security/**/*</include>
-                <include>policy-security-jsr250/**/*</include>
-                <include>policy-security-ws/**/*</include>
-                <include>policy-xml/**/*</include>
-                <include>sca-api/**/*</include>
-                <include>workspace/**/*</include>
-                <include>workspace-impl/**/*</include>
-                <include>workspace-xml/**/*</include>
-                <include>xsd/**/*</include>
-                <include>xsd-xml/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
diff --git a/java/sca-contrib/distribution/manager/src/main/release/CHANGES b/java/sca-contrib/distribution/manager/src/main/release/CHANGES
deleted file mode 100644
index 3de7358ec6..0000000000
--- a/java/sca-contrib/distribution/manager/src/main/release/CHANGES
+++ /dev/null
@@ -1,431 +0,0 @@
-Changes With Apache Tuscany SCA 1.2 (incubating) April 2008 

-===========================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-2027

-  * TUSCANY-1999

-  * TUSCANY-2037

-  * TUSCANY-2034

-  * TUSCANY-2038

-  * TUSCANY-2043

-  * TUSCANY-2046

-  * TUSCANY-2047

-  * TUSCANY-2028

-  * TUSCANY-1873

-  * TUSCANY-2049

-  * TUSCANY-2035

-  * TUSCANY-1206

-  * TUSCANY-2036 

-  * TUSCANY-1771

-  * TUSCANY-2013

-  * TUSCANY-1926

-  * TUSCANY-1917

-  * TUSCANY-1949

-  * TUSCANY-1941

-  * TUSCANY-2045

-  * TUSCANY-2057

-  * TUSCANY-2055

-  * TUSCANY-2056

-  * TUSCANY-2072

-  * TUSCANY-2047

-  * TUSCANY-2073

-  * TUSCANY-1977 

-  * TUSCANY-2075

-  * TUSCANY-1894

-  * TUSCANY-2079

-  * TUSCANY-2078

-  * TUSCANY-2080

-  * TUSCANY-2068

-  * TUSCANY-1950

-  * TUSCANY-2077

-  * TUSCANY-2056

-  * TUSCANY-2088

-  * TUSCANY-2086

-  * TUSCANY-2094

-  * TUSCANY-2106 

-

-  Features and/or Enhancements

-

-  * Core

-    - Interceptor Enhancements

-      - Phase-based interceptor ordering to allow contribution of new interceptors and also define the order in witch they should be invoked

-      - Pass-by-reference SPI to allow interceptors to indicate if they support pass-by-reference

-      - PolicyProvider SPIs to allow extensions to plugin policy interceptors

-    - Support for JAXWS annotations and mapping of faults to Java exceptions according to JAXWS specification

-    - Improvement of contribution service to allow it to be used outside of the runtime environment 

-    - Support for Contribution Import/Export resource

-    - Enhanced Distributed Domain story using Workspace

-      - Implementation of a SCA domain allowing a system administrator to manage contributions, composites and sca nodes that run these composites

-        - Set of core services providing management capabilities

-        - Administration web interface

-        - This is a work in progress and you can see it in action in samples/calculator-distributed. Other samples that use distributed operation are yet to move over to the workspace.

-    - Enhanced support for SCA Policy spec

-      - Ability to apply external policy definitions to a SCA composition

-      - Ability to spread policy definitions to multiple definitions.xml files available across the sca domain

-      - Bug fixes

-    - Improvements of http binding to support servlet components

-    - Enable Tuscany to run inside an OSGi runtime

-

-  * Web 2.0 Extensions

-    - Enhancements to implementation.widget (support for properties)

-    - New atom binding based on Apache Abdera

-    - Refactoring of rss-rome binding

-  * Other Extensions

-    - Binding JMS

-      - greatly simplified the use of the JMS binding, support locating JMS resources from JNDI, and better compliance with the SCA JMS binding spec

-      - see the doc page for more details: http://incubator.apache.org/tuscany/sca-java-bindingjms.html

-    - Enhancements to Binding RMI

-      - Support shared RMI registry and use 999x as the ports in test case to avoid 1099 conflict

-    - Enhancements to Groovy extension

-      - Support for 'native' groovy classes

-    - Enhancements to OSGi bundle contributions

-      - Support Bundle URLs to be added as contributions

-

-  * Tools

-    - Eclipse plugin providing a Tuscany runtime Library and Tuscany launcher in Eclipse environment
-       - An updatesite is also available to facilitate the plugin installation using the Eclipse update manager

-

-  * Samples/Tutorial/Demos

-    - calculator-distributed migrated to use new Tuscany Distributed Workspace

-    - sample-calculator-ws-secure-webapp

-    - sample-helloworld-jms-webapp

-    - new jms samples

-    - improve bigbank demo to include support for policies 

-    - tutorial store changes

-      - use of import/export

-      - development of contribution without requiring dependencies on the Tuscany runtime

-      - usage of new sca domain infrastructure

-

-  * Testing

-    - Web Container Testing Framework integrated with (Tomcat, Jetty, Geronimo and Websphere)

-

-

-Changes With Apache Tuscany SCA 1.1 (incubating) January 2008 

-===============================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1939

-  * TUSCANY-1914

-  * TUSCANY-1854

-  * TUSCANY-1931

-  * TUSCANY-1547

-  * TUSCANY-1909

-  * TUSCANY-1919

-  * TUSCANY-1930

-  * TUSCANY-1806

-  * TUSCANY-1804

-  * TUSCANY-1916

-  * TUSCANY-1913

-  * TUSCANY-1834

-  * TUSCANY-1857

-  * TUSCANY-1687

-  * TUSCANY-1801

-  * TUSCANY-1742

-  * TUSCANY-1762

-  * TUSCANY-1945

-  * TUSCANY-1595

-  * TUSCANY-1594

-  * TUSCANY-1849

-  * TUSCANY-1836

-  * TUSCANY-1934

-  * TUSCANY-1902

-  * TUSCANY-1608

-  * TUSCANY-1943

-  * TUSCANY-1896

-  * TUSCANY-1626

-  * TUSCANY-1797

-  * TUSCANY-1601

-  * TUSCANY-1415

-

-- Better JMS support

-  * binding.jms supporting point to point text based messaging only

-  * New SOAP/JMS sample (helloworld-ws-reference/service-jms)

-

-- Improvements in PolicyFramework Support

-  * Support for policy specifications on operation elements in a composite definition

-  * Separate sample (calculator-implementation-policies) to demonstrate use of Implementation Policies 

-    (uses logging and JAAS Authentication)

-

-- Modeling of client side java script components

-  * See implementation.widget

-

-- Evolving support for doman API suggested by assembly spec including a standalone node and nodes running 

-  connected together in a domain. This is still experimental. 

- 

-- Class loading and OSGI improvements

-  * Enable Tuscany to be run in a multi-classloader environment including inside OSGi. By default,

-    Tuscany continues to run using a single CLASSPATH-based classloader.

-  * Contributions no longer need to be in the CLASSPATH. All import/export dependencies across contributions should be 

-    explicitly specified (as described in the spec).

-

-- JAXB based POJO transformations

-

-Changes With Apache Tuscany SCA 1.0.1 (incubating) November 2007 

-================================================================

-

-The Tuscany SCA Java 1.0.1 is mainly a bug-fix release. It also comes with some improvements as listed below.

- 

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1848

-  * TUSCANY-1857

-  * TUSCANY-1859

-  * TUSCANY-1801

-  * TUSCANY-1823

-  * TUSCANY-1839

-  * TUSCANY-1814

-  * TUSCANY-1818

-  * TUSCANY-1834

-  * TUSCANY-1637

-  * TUSCANY-1826

-  * TUSCANY-1823

-  * TUSCANY-1819

-  * TUSCANY-1821

-  * TUSCANY-1822

-  * TUSCANY-1806

-  * TUSCANY-1808

-  * TUSCANY-1756

-  * TUSCANY-1757

-

-- Fix build issues with Maven 2.0.7 and JDK 6

-

-- Reduce memory consumption for WSDLs that import large XSDs

-

-- Add more logging statements for better servicibility

-

-- Add an extension point to allow extensions to plug-in extension schemas.

-

-- Add a demo application to showcase XML integration story 

-

-- Improve in databinding framework

-  * Add support for JSON Databindings and other refactoring

-  * Set databinding for introspected data type and enhance the checking of wrapper style

-  * Improve the tree-based XMLStreamReader and convert Bean & DOM to use this approach

-  * Add a tree-iterator based XMLStreamReader base impl

-  * Add default element info to java interface

-  * Rename Interface.setDefaultDataBinding to resetDataBinding

-

-- Limit the method injection to setters and allow the setter annotation to override field annotation

-

-- Evolving support in Intent and Policy handling

-  * Add support for policies in implementation

-  * Fix the algorithm for macthing policySets defined on bindings for the wire

-  * Add policy intent for implementation.java

-  * Extend java implementation type to recognize and apply policies, adding util support for this in Policy module

-  * Add policy module for logging

-

-- Evolving development in the SCA Domain/Node

-

-- Update NOTICE files with missing dependencies

-

-

-Changes With Apache Tuscany SCA 1.0 (incubating) September 2007 

-===============================================================

-

-- Tuscany Java SCA now implements V1.0 of the core SCA 

-  specifications

-        SCA Assembly Model V1.0

-        SCA Java Common Annotations and APIs V1.0

-        SCA Java Component Implementation V1.0

-        SCA Web Services Binding V1.0

-  Including callbacks, conversations and callable references

-  

-

-- Support for ws-security configurable in the web services binding

-  thro Tuscany SCA policy intents and policysets using the policy framework 

-  introduced in the last release.  

-  

-  Note : This release supports specifications of policies around axis2

-         config params - see helloworld-ws-service-secure sample.  The policy

-         intents that have been tested are authentication, integrity and 

-         confidentiality.  

-         There is no sample or test that exercises confidentiality since there

-         are some unresolved licensing issue around bouncycastle libraries.  

-         However, users who are not encumbered by the bouncycastle license 

-         restrictions can try the 'confidentiality' intent. See FAQ - 

-         http://incubator.apache.org/tuscany/tuscany-sca-java-faq.html

-                

-         This release does not include support for WS-Policy

-         attachments in Tuscany Policysets for ws-security.

-         

-  

-- An XQuery component implementation type 

-        implementation-xquery

-        

-

-- A Databinding for converting data to and from nodes for XQuery 

-  processing

-        databinding-saxon

-        

-

-- OSGI support has been extended to allow Tuscany contributions 

-  packaged as OSGI bundles hence taking advantage of OSGI's bundle

-  loading an dependency management capabilities 

-  

-

-- A BPEL component implementation type experimental implementation

-based on SCA BPEL Client and Implementation V1.0. At the moment only

-supports BPEL process as services.

-	implementation-bpel

-

-

-- The distributed runtime implementation has been separated out 

-  into 

-        *) domain

-        *) node

-  It is now wrapped by a SCADomain interface as is the standalone 

-  runtime.

-  

-  Note: This release does not include support for WebApp host deployment 

-        for a distributed SCA Domain 

-  

-

-

-- The web service binding will now generate WSDL automatically

-  based on the service interface if no WSDL is provided

-  

-

-- A new "store" sample and associated document show how a 

-  simple store front application can be constructed 

-        samples/store

-        

-- The following features of this release are still experimental:

-     - BPEL implementation type, integrating with Apache ODE

-     - OSGI implementation type, integrating with Apache Felix

-     - XQuery implementation type

-

- 

-

-Changes With Apache Tuscany SCA 0.99 (incubating) August 2007 

-=============================================================

-

-The following are the significant additions to release 0.99 

-over and above all of what was offered in release 0.91.

-

-- A version of the default sca binding that works between

-  components runing in separate Java virtual machines

-       binding-sca-axis

-

-- A simple node implementation and a service discovery 

-  function for running sca applications distributed 

-  across more than one node

-       distributed

-       distributed-impl 

-

-- integration with OSGi runtimes is now supported with

-  a new implementation-osgi component type

-

-- PUB/SUB interactions are now supported by using new 

-  notification binding and implementation types, and

-  samples demonstrating the feature.

-

-- The Tuscany runtime now has a policy framework supporting

-  the SCA policy specification

-

-- the endpoint URIs used by SCA bindings has been rationalized 

-  and now follows the SCA Assembly specification

-

-- binding-ajax has been renamed to binding-dwr

-

-Changes With Apache Tuscany SCA 0.91 (incubating) July 2007 

-===========================================================

-

-The following are the significant additions to release 0.91 

-over and above all of what was offered in release 0.90.

-

-

-- Enhancements to support multiple contributions to the SCA Domain

-

-- The inclusion of a alternative simplified extensions-helper

-SPI layer to faciliate rapid development of extensions

-

-- More Implementation Extenstions

-        Spring

-        WebResource

-

-- More Binding Extensions

-        AJAX

-        EJB

-        RSS/ATOM Feeds

-        

-- Demos that demonstrate the use of a mix of extensions

-         alert-aggregator-webapp

-         bigbank-account

-         bigbank-calculator

-         bigbank-stockquote

-

-

-- Samples

-        Samples to demostrate use of Spring, Resource, AJAX extensions

-

-Changes With Apache Tuscany SCA 0.90 (incubating) June 2007 

-===========================================================

-

-- Implementations for all of the Java Annotations and API Specification V1.0 found at

-  (http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications) 

-  apart from the following.

-    @ComponentName

-    Conversation

-    RequestContext

-    

-- New assembly model implementation taking into account SCA 1.0 artifacts 

-  Data duplication between assembly model and runtime removed

-

-- Simple single process domain support

-  Contribution support to scope items being deployed into the runtime

-

-- Improved Package/Class naming consistency across modules

-

-- Extensions now loaded via Java service mechanism

-  Refactored extensions to use new SPIs (see below)

-

-- Maven and Ant based sample builds in the binary distribution

-

-- Implementation Extensions

-    Java

-    Script supporting (Ruby, Python, Groovy, JavaScript)

-

-- Binding Extensions

-    Axis2

-    RMI

-    JSONRPC

-

--Databinding Extensions

-    Axiom

-    JAXB

-    SDO

-

-- Host environments

-    Embedded

-    Tomcat

-    Jetty

-    RMI

-

-- A clear set of SPIs intended to be stable over future releases

-    SCA assembly model

-      org.apache.tuscany.sca.assembly

-      org.apache.tuscany.sca.interfacedef

-      org.apache.tuscany.sca.interfacedef.java

-      org.apache.tuscany.sca.interfacedef.wsdl

-      org.apache.tuscany.sca.policy

-

-    SCA contribution model

-      org.apache.tuscany.sca.contribution

-

-    Runtime extensions

-      org.apache.tuscany.sca.core

-      org.apache.tuscany.sca.invocation

-      org.apache.tuscany.sca.provider

-      org.apache.tuscany.sca.runtime

-      org.apache.tuscany.sca.work

-

-    Data binding support

-      org.apache.tuscany.sca.databinding

-

-    Embedding Tuscany

-      org.apache.tuscany.sca.host.embedded

-

-    Servlet container integration

-      org.apache.tuscany.sca.http

-

-- For this point release a partial set of JavaDoc is provided to 

-  be filled out as we close on release 1.0

diff --git a/java/sca-contrib/distribution/manager/src/main/release/README b/java/sca-contrib/distribution/manager/src/main/release/README
deleted file mode 100644
index 4d83dcfde9..0000000000
--- a/java/sca-contrib/distribution/manager/src/main/release/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 README
-=====================================================
-
-Welcome to the Tuscany SCA 1.2 release. 
-
-See the RELEASE_NOTES file for information specific to this release.
-
-In the binary release see the INSTALL file for information on how to 
-install the release.
-
-In the source distribution see the BUILDING file for information on
-building the source code.
-
-
-
-
-
-
-
diff --git a/java/sca-contrib/distribution/manager/src/main/release/RELEASE_NOTES b/java/sca-contrib/distribution/manager/src/main/release/RELEASE_NOTES
deleted file mode 100644
index a04ef5c553..0000000000
--- a/java/sca-contrib/distribution/manager/src/main/release/RELEASE_NOTES
+++ /dev/null
@@ -1,83 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 Release Notes
-============================================================
-
-Apache Tuscany provides a runtime based on the Service Component
-Architecture. SCA is a set of specifications aimed at simplifying SOA
-Application Development which are being standardized at OASIS as part
-of Open Composite Services Architecture (Open CSA) - http://www.oasis-opencsa.org/.
-
-Overview
---------
-
-     The Apache Tuscany SCA 1.2 release includes implementations of the
-     main SCA specifications including:
-
-        SCA Assembly Model V1.0
-        SCA Policy Framework V1.0
-        SCA Java Common Annotations and APIs V1.0
-        SCA Java Component Implementation V1.0
-        SCA Spring Component Implementation V1.0
-        SCA BPEL Client and Implementation V1.0
-        SCA Web Services Binding V1.0
-        SCA EJB Session Bean Binding V1.0
-
-    It also includes implementations of many features not yet defined
-    by SCA specifications, including:
-
-        - SCA bindings for Direct Web Remoting, RSS and ATOM Feeds, 
-          HTTP resources, JSON-RPC, PUB/SUB Notifications, and RMI.
-        - SCA implementation types for OSGI, XQuery, BPEL, Widget and various 
-          dynamic languages including Groovy, Javascript, Python and Ruby
-        - Databindings for Service Data Objects (SDO), JAXB, XmlBeans, 
-          Axis2's AXIOM, JSON, SAXON, DOM, SAX and StAX
-
-    The Tuscany SCA Runtime can be configured as a single node SCA domain or 
-    as an SCA domain distributed across multiple nodes. 
-    In addition Tuscany SCA supports the following host-deployment options: -
-        - running standalone 
-        - running with distributed nodes across multiple JVMs
-        - running with embedded Jetty or Tomcat
-        - running as part of a standard web application                                     
-     
-    The Wepapp samples included in this release have been tried and tested on 
-        - Tomcat 5.5.20 and Tomcat 6.0.14
-        - Jetty 6.1.3
-        - Geronimo 2.0.2 Tomcat6 jee5
-        - WebSphere 6.1 fix pack 9
-
-See the CHANGES file for a detailed list of the features in this release.
-
-Support
--------
-
-For more information on Apache Tuscany visit the website at:
-
-    http://incubator.apache.org/tuscany/
- 
-Any issues with this release can be reported to Apache Tuscany
-using the mailing lists or in the JIRA issue tracker.
-
-    Mailing list archives:
-
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-user/
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/
-
-    Jira:
-
-       http://issues.apache.org/jira/browse/TUSCANY
-
-To join the project's mailing lists follow the instructions at:
-
-    http://incubator.apache.org/tuscany/mailing-lists.html
-
-To find out more about OASIS Open CSA go to: 
-
-    http://www.oasis-opencsa.org.
-
-Apache Tuscany welcomes your help. Any contribution, including code,
-testing, improving the documentation, or bug reporting is always
-appreciated. 
-
-Thank you for using Apache Tuscany!
-
-- The Tuscany Team.
diff --git a/java/sca-contrib/distribution/manager/src/main/release/bin/INSTALL b/java/sca-contrib/distribution/manager/src/main/release/bin/INSTALL
deleted file mode 100644
index 2da53a2b44..0000000000
--- a/java/sca-contrib/distribution/manager/src/main/release/bin/INSTALL
+++ /dev/null
@@ -1,27 +0,0 @@
-Installing the Apache Tuscany SCA 1.2 (incubating) April 2008 Release binary distribution
-=========================================================================================
-
-Unzip Tuscany binary distribution archive and you get the following:
-
-tuscany-sca-1.1-incubating        
-   DISCLAIMER    - the ASF incubation disclaimer
-   INSTALL       - this help file
-   LICENSE       - the Apache License and any dependecy licenses
-   NOTICE        - attribution notices associated with the licenses
-   README        - readme for the release
-   RELEASE_NOTES - description of this release 
-   CHANGES       - A note of the major changes in this release
-
-   /demos        - Demo applications showcasing the use of Apache Tuscany 
-
-   /lib          - The tuscany-sca-all and tuscany-sca-manifest jars and all their dependencies
-
-   /modules      - all of the individual Tuscany jars
-
-   /samples      - all the Tuscany samples, see the README in that directory
-
-   /tutorial     - The store tutorial, see the README in that directory
-
-
-
-
diff --git a/java/sca-contrib/distribution/manager/src/main/release/bin/LICENSE b/java/sca-contrib/distribution/manager/src/main/release/bin/LICENSE
deleted file mode 100644
index 5e1f585d46..0000000000
--- a/java/sca-contrib/distribution/manager/src/main/release/bin/LICENSE
+++ /dev/null
@@ -1,2366 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================
-
-APACHE TUSCANY SUBCOMPONENTS: 
-
-The Apache Tuscany binary distribution includes a number of subcomponents
-with separate copyright notices and license terms. Your use of the
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.                             
-
-===============================================================================
-
-The following components come under Apache Software License 1.1
-
- commons-discovery-0.2.jar
- commons-primitives-1.0.jar
-
-The following components come under Apache Software License 2.0
-
- abdera-core-0.3.0-incubating.jar
- abdera-i18n-0.3.0-incubating.jar
- abdera-parser-0.3.0-incubating.jar
- activeio-2.0-r118.jar
- activeio-core-3.0.0-incubator.jar
- apache-activemq-4.1.1.jar
- addressing-1.3.mar
- annogen-0.1.0.jar
- annotations-api-6.0.14.jar
- aopalliance-1.0.jar
- axiom-api-1.2.5.jar
- axiom-dom-1.2.5.jar
- axiom-impl-1.2.5.jar
- axis2-adb-1.3.jar
- axis2-codegen-1.3.jar
- axis2-java2wsdl-1.3.jar
- axis2-kernel-1.3.jar
- axis2-mtompolicy-1.3.jar
- bsf-all-3.0-beta2.jar
- catalina-6.0.14.jar
- cglib-nodep-2.1_3.jar
- commons-collections-3.1.jar
- commons-codec-1.3.jar
- commons-fileupload-1.1.1.jar
- commons-httpclient-3.0.1.jar
- commons-io-1.2.jar
- commons-jexl-1.1.jar
- commons-lang-2.1.jar
- commons-logging-1.1.jar
- coyote-6.0.14.jar
- derby-10.1.3.1.jar
- geronimo-activation_1.1_spec-1.0-M1.jar
- geronimo-common-1.2-beta.jar
- geronimo-commonj_1.1_spec-1.0.jar
- geronimo-connector-1.2-beta.jar
- geronimo-core-1.2-beta.jar
- geronimo-deployment-1.2-beta.jar
- geronimo-ejb_3.0_spec-1.0.jar
- geronimo-interceptor-1.2-beta.jar
- geronimo-j2ee-1.2-beta.jar
- geronimo-j2ee-connector_1.5_spec-1.1.jar
- geronimo-j2ee-jacc_1.0_spec-1.1.jar
- geronimo-j2ee-management_1.0_spec-1.1.jar
- geronimo-javamail_1.4_spec-1.0-M1.jar
- geronimo-jms_1.1_spec-1.1.jar
- geronimo-jpa_3.0_spec-1.0.jar
- geronimo-jta_1.0.1B_spec-1.0.jar
- geronimo-kernel-1.2-beta.jar
- geronimo-management-1.2-beta.jar
- geronimo-naming-1.2-beta.jar
- geronimo-security-1.2-beta.jar
- geronimo-spec-j2ee-connector-1.5-rc4.jar
- geronimo-spec-jta-1.0.1B-rc4.jar
- geronimo-system-1.2-beta.jar
- geronimo-transaction-1.2-beta.jar
- geronimo-util-1.2-beta.jar
- httpcore-4.0-alpha5.jar
- httpcore-nio-4.0-alpha5.jar
- httpcore-niossl-4.0-alpha5.jar
- jettison-1.0-RC2.jar
- jetty-6.1.7.jar
- jetty-util-6.1.7.jar
- json-rpc-1.0.jar
- juli-6.0.14.jar
- log4j-1.2.12.jar
- logkit-1.0.1.jar
- neethi-2.0.2.jar
- ode-bpel-api-1.1.jar
- ode-bpel-compiler-1.1.jar
- ode-bpel-dao-1.1.jar
- ode-bpel-epr-1.1.jar
- ode-bpel-obj-1.1.jar
- ode-bpel-runtime-1.1.jar
- ode-bpel-schemas-1.1.jar
- ode-bpel-store-1.1.jar
- ode-dao-jpa-1.1.jar
- ode-dao-jpa-ojpa-derby-1.1.zip
- ode-jacob-1.1.jar
- ode-jacob-ap-1.1.jar
- ode-scheduler-simple-1.1.jar
- ode-utils-1.1.jar
- openjpa-all-0.9.7-incubating.jar
- openjpa-persistence-0.9.7-incubating.jar
- org.apache.felix.bundlerepository-1.0.2.jar
- org.apache.felix.framework-1.0.3.jar
- org.apache.felix.main-1.0.3.jar
- org.apache.felix.shell-1.0.0.jar
- org.apache.felix.shell.tui-1.0.0.jar
- rampart-core-1.3.jar
- rampart-policy-1.3.jar
- rampart-trust-1.3.jar
- regexp-1.3.jar
- spring-beans-2.0.6.jar
- spring-context-2.0.6.jar
- spring-core-2.0.6.jar
- tranql-connector-1.1.jar
- tuscany-sdo-api-r2.1-1.0-incubating.jar
- tuscany-sdo-impl-1.0-incubating.jar
- tuscany-sdo-lib-1.0-incubating.jar
- tuscany-sdo-tools-1.0-incubating.jar
- woden-1.0-incubating-M7b.jar
- wss4j-1.5.3.jar
- wstx-asl-3.2.1.jar
- xalan-2.7.0.jar
- xbean-naming-2.7.jar
- xercesImpl-2.8.1.jar
- xml-apis-1.3.03.jar
- xmlbeans-2.3.0.jar
- xml-resolver-1.1.jar
- xmlsec-1.4.0.jar
- XmlSchema-1.3.2.jar
-
-===============================================================================
-axion-1.0-M3-dev.jar 
-
-Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
- 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above 
-   copyright notice, this list of conditions and the following 
-   disclaimer. 
- 
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in 
-   the documentation and/or other materials provided with the 
-   distribution. 
-
-3. The names "Tigris", "Axion", nor the names of its contributors may 
-   not be used to endorse or promote products derived from this 
-   software without specific prior written permission. 
- 
-4. Products derived from this software may not be called "Axion", nor 
-   may "Tigris" or "Axion" appear in their names without specific prior
-   written permission.
- 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-The "Axion Development Team" is defined to be:
-
- * Chuck Burdick
- * James Burke
- * Morgan Delagrange
- * Geir Magnusson Jr.
- * Martin Poeschl
- * Steve Polyak
- * Daniel Rall
- * Ahimanikya Satapathy
- * Doug Sale
- * James Strachan
- * Rodney Waldhoff
- * Jason van Zyl
-
-License changes are to be determined by a simple majority vote of the 
-Axion Development Team.
-
-===============================================================================
-dom4j-1.6.1.jar
-
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
-   statements and notices.  Redistributions must also contain a
-   copy of this document.
- 
-2. Redistributions in binary form must reproduce the
-   above copyright notice, this list of conditions and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
- 
-3. The name "DOM4J" must not be used to endorse or promote
-   products derived from this Software without prior written
-   permission of MetaStuff, Ltd.  For written permission,
-   please contact dom4j-info@metastuff.com.
- 
-4. Products derived from this Software may not be called "DOM4J"
-   nor may "DOM4J" appear in their names without prior written
-   permission of MetaStuff, Ltd. DOM4J is a registered
-   trademark of MetaStuff, Ltd.
- 
-5. Due credit should be given to the DOM4J Project - 
-   http://www.dom4j.org
- 
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-The EMF jars; 
-   codegen-2.2.3.jar 
-   codegen-ecore-2.2.3.jar
-   common-2.2.3.jar
-   ecore-2.2.3.jar
-   ecore-change-2.2.3.jar
-   ecore-xmi-2.2.3.jar
-   xsd-2.2.3.jar
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the
-Program under their own license agreement, and (ii) are not derivative
-works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor
-which are necessarily infringed by the use or sale of its Contribution
-alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this 
-Agreement.
-
-"Recipient" means anyone who receives the Program under this
-Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor, if
-any, in source code and object code form. This patent license shall
-apply to the combination of the Contribution and the Program if, at
-the time the Contribution is added by the Contributor, such addition
-of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow
-Recipient to distribute the Program, it is Recipient's responsibility
-to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or
-conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the 
-Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a
-commercial product offering should do so in a manner which does not
-create potential liability for other Contributors. Therefore, if a
-Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend
-and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising
-from claims, lawsuits and other legal actions brought by a third party
-against the Indemnified Contributor to the extent caused by the acts
-or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement.
-In order to qualify, an Indemnified Contributor must: a) promptly
-notify the Commercial Contributor in writing of such claim, and b)
-allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such
-claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable
-laws, damage to or loss of data, programs or equipment, and
-unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-the Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of
-the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of
-time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use
-and distribution of the Program as soon as reasonably practicable.
-However, Recipient's obligations under this Agreement and any licenses
-granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and
-may only be modified in the following manner. The Agreement Steward
-reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation
-is the initial Agreement Steward. The Eclipse Foundation may assign
-the responsibility to serve as the Agreement Steward to a suitable
-separate entity. Each new version of the Agreement will be given a
-distinguishing version number. The Program (including Contributions)
-may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives
-no rights or licenses to the intellectual property of any Contributor
-under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No
-party to this Agreement will bring a legal action under this Agreement
-more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.
-
-===============================================================================
-For Saxon including 
-   saxon-8.7.jar
-   saxon-dom-8.7.jar
-   saxon-xpath-8.7.jar
-
- MOZILLA PUBLIC LICENSE
-Version 1.0
-
-1. Definitions.
-
-      1.1. ``Contributor'' means each entity that creates or contributes to the creation of Modifications.
-
-      1.2. ``Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-
-      1.3. ``Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.
-
-      1.4. ``Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data.
-
-      1.5. ``Executable'' means Covered Code in any form other than Source Code.
-
-      1.6. ``Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-
-      1.7. ``Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-
-      1.8. ``License'' means this document.
-
-      1.9. ``Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-
-            A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-
-            B. Any new file that contains any part of the Original Code or previous Modifications. 
-
-      1.10. ``Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-
-      1.11. ``Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or a list of source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-
-      1.12. ``You'' means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, ``You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, ``control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity. 
-
-2. Source Code License.
-
-      2.1. The Initial Developer Grant.
-      The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell (``Utilize'') the Original Code (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Original Code (or portions thereof) and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-      2.2. Contributor Grant.
-      Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Contributor, to Utilize the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Contributor Version (or portions thereof), and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-3. Distribution Obligations.
-
-      3.1. Application of License.
-      The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-
-      3.2. Availability of Source Code.
-      Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
-
-      3.3. Description of Modifications.
-      You must cause all Covered Code to which you contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-
-      3.4. Intellectual Property Matters
-
-            (a) Third Party Claims.
-            If You have knowledge that a party claims an intellectual property right in particular functionality or code (or its utilization under this License), you must include a text file with the source code distribution titled ``LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If you obtain such knowledge after You make Your Modification available as described in Section 3.2, You shall promptly modify the LEGAL file in all copies You make available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-
-            (b) Contributor APIs.
-            If Your Modification is an application programming interface and You own or control patents which are reasonably necessary to implement that API, you must also include this information in the LEGAL file. 
-
-      3.5. Required Notices.
-      You must duplicate the notice in Exhibit A in each file of the Source Code, and this License in any documentation for the Source Code, where You describe recipients' rights relating to Covered Code. If You created one or more Modification(s), You may add your name as a Contributor to the notice described in Exhibit A. If it is not possible to put such notice in a particular Source Code file due to its structure, then you must include such notice in a location (such as a relevant directory file) where a user would be likely to look for such a notice. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-      3.6. Distribution of Executable Versions.
-      You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-      3.7. Larger Works.
-      You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. 
-
-4. Inability to Comply Due to Statute or Regulation.
-
-      If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. 
-
-5. Application of this License.
-
-      This License applies to code to which the Initial Developer has attached the notice in Exhibit A, and to related Covered Code. 
-
-6. Versions of the License.
-
-      6.1. New Versions.
-      Netscape Communications Corporation (``Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-
-      6.2. Effect of New Versions.
-      Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License.
-
-      6.3. Derivative Works.
-      If you create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), you must (a) rename Your license so that the phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or any confusingly similar phrase do not appear anywhere in your license and (b) otherwise make it clear that your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) 
-
-7. DISCLAIMER OF WARRANTY.
-
-      COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 
-
-8. TERMINATION.
-
-      This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 
-
-9. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. 
-
-10. U.S. GOVERNMENT END USERS.
-
-      The Covered Code is a ``commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer software'' and ``commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 
-
-11. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in, the United States of America: (a) unless otherwise agreed in writing, all disputes relating to this License (excepting any dispute relating to intellectual property rights) shall be subject to final and binding arbitration, with the losing party paying all costs of arbitration; (b) any arbitration relating to this Agreement shall be held in Santa Clara County, California, under the auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. 
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-      Except in cases where another Contributor has failed to comply with Section 3.4, You are responsible for damages arising, directly or indirectly, out of Your utilization of rights under this License, based on the number of copies of Covered Code you made available, the revenues you received from utilizing such rights, and other relevant factors. You agree to work with affected parties to distribute responsibility on an equitable basis. 
-
-EXHIBIT A.
-
-      ``The contents of this file are subject to the Mozilla Public License Version 1.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.mozilla.org/MPL/
-
-      Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-
-      The Original Code is ______________________________________.
-
-      The Initial Developer of the Original Code is ________________________. Portions created by ______________________ are Copyright (C) ______ _______________________. All Rights Reserved.
-
-      Contributor(s): ______________________________________.'' 
-
-===============================================================================
-
-For the Rhino JavaScript engine js-1.6R7.jar:
-
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (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.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-
-===============================================================================
-Groovy (groovy-all-minimal-1.5.4.jar):
-
-/*
- $Id: LICENSE.txt 156 2003-09-26 17:36:37Z jstrachan $
-
- Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
-    statements and notices.  Redistributions must also contain a
-    copy of this document.
-
- 2. Redistributions in binary form must reproduce the
-    above copyright notice, this list of conditions and the
-    following disclaimer in the documentation and/or other
-    materials provided with the distribution.
-
- 3. The name "groovy" must not be used to endorse or promote
-    products derived from this Software without prior written
-    permission of The Codehaus.  For written permission,
-    please contact info@codehaus.org.
-
- 4. Products derived from this Software may not be called "groovy"
-    nor may "groovy" appear in their names without prior written
-    permission of The Codehaus. "groovy" is a registered
-    trademark of The Codehaus.
-
- 5. Due credit should be given to The Codehaus -
-    http://groovy.codehaus.org/
-
- THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- THE CODEHAUS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- */
-
-===============================================================================
-
-Jython (jython-2.2.jar):
-
-A. HISTORY OF THE SOFTWARE
-=======================
-
-JPython was created in late 1997 by Jim Hugunin. Jim was also the
-primary developer while he was at CNRI. In February 1999 Barry Warsaw
-took over as primary developer and released JPython version 1.1.
-
-In October 2000 Barry helped move the software to SourceForge
-where it was renamed to Jython.  Jython 2.0 and on are licensed under
-the Jython specific license below. 
-
-The standard library is covered by the Python Software Foundation
-license. See the LICENSE_CPython.txt file for details.
-
-The zxJDBC package was written by Brian Zimmer and originally licensed
-under the GNU Public License.  The package is now covered by the Jython
-Software License.
-
-The command line interpreter is covered by the Apache Software
-License.  See the LICENSE_Apache.txt file for details.
- 
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
-================================
-
-Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the distribution.
-
- - Neither the name of the Jython Developers nor the names of
-   its contributors may be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-
-JPython 1.1.x Software License.
-=========================
-
-______________________________________________________________________
-
-IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
-
-BY CLICKING ON THE "ACCEPT" BUTTON WHERE INDICATED, OR BY INSTALLING,
-COPYING OR OTHERWISE USING THE SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
-THE TERMS AND CONDITIONS OF THIS AGREEMENT.
-
-______________________________________________________________________
-
-JPython version 1.1.x
-
-  1. This LICENSE AGREEMENT is between the Corporation for National Research
-     Initiatives, having an office at 1895 Preston White Drive, Reston, VA
-     20191 ("CNRI"), and the Individual or Organization ("Licensee")
-     accessing and using JPython version 1.1.x in source or binary form and
-     its associated documentation as provided herein ("Software").
-
-  2. Subject to the terms and conditions of this License Agreement, CNRI
-     hereby grants Licensee a non-exclusive, non-transferable, royalty-free,
-     world-wide license to reproduce, analyze, test, perform and/or display
-     publicly, prepare derivative works, distribute, and otherwise use the
-     Software alone or in any derivative version, provided, however, that
-     CNRI's License Agreement and CNRI's notice of copyright, i.e.,
-     "Copyright ©1996-1999 Corporation for National Research Initiatives;
-     All Rights Reserved" are both retained in the Software, alone or in any
-     derivative version prepared by Licensee.
-
-     Alternatively, in lieu of CNRI's License Agreement, Licensee may
-     substitute the following text (omitting the quotes), provided, however,
-     that such text is displayed prominently in the Software alone or in any
-     derivative version prepared by Licensee: "JPython (Version 1.1.x) is
-     made available subject to the terms and conditions in CNRI's License
-     Agreement. This Agreement may be located on the Internet using the
-     following unique, persistent identifier (known as a handle):
-     1895.22/1006. The License may also be obtained from a proxy server on
-     the Web using the following URL: http://hdl.handle.net/1895.22/1006."
-
-  3. In the event Licensee prepares a derivative work that is based on or
-     incorporates the Software or any part thereof, and wants to make the
-     derivative work available to the public as provided herein, then
-     Licensee hereby agrees to indicate in any such work, in a prominently
-     visible way, the nature of the modifications made to CNRI's Software.
-
-  4. Licensee may not use CNRI trademarks or trade name, including JPython
-     or CNRI, in a trademark sense to endorse or promote products or
-     services of Licensee, or any third party. Licensee may use the mark
-     JPython in connection with Licensee's derivative versions that are
-     based on or incorporate the Software, but only in the form
-     "JPython-based ___________________," or equivalent.
-
-  5. CNRI is making the Software available to Licensee on an "AS IS" basis.
-     CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
-     OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY
-     REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
-     PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE
-     ANY THIRD PARTY RIGHTS.
-
-  6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
-     ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
-     USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE
-     THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT
-     ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER
-     MAY NOT APPLY TO LICENSEE.
-
-  7. This License Agreement may be terminated by CNRI (i) immediately upon
-     written notice from CNRI of any material breach by the Licensee, if the
-     nature of the breach is such that it cannot be promptly remedied; or
-     (ii) sixty (60) days following notice from CNRI to Licensee of a
-     material remediable breach, if Licensee has not remedied such breach
-     within that sixty-day period.
-
-  8. This License Agreement shall be governed by and interpreted in all
-     respects by the law of the State of Virginia, excluding conflict of law
-     provisions. Nothing in this Agreement shall be deemed to create any
-     relationship of agency, partnership, or joint venture between CNRI and
-     Licensee.
-
-  9. By clicking on the "ACCEPT" button where indicated, or by installing,
-     copying or otherwise using the Software, Licensee agrees to be bound by
-     the terms and conditions of this License Agreement.
-
-
-===============================================================================
-
-The jars; 
-activation-1.1.jar, 
-jaxb-api-2.1.jar, 
-jaxb-impl-2.1.6.jar, 
-jaxb-xjc-2.1.4.jar, 
-jaxb2-reflection-2.1.4.jar,
-jsr181-api-1.0-MR1.jar, 
-jsr250-api-1.0.jar, 
-jaxws-api-2.1-1.jar, 
-mail-1.4.jar, 
-saaj-api-1.3.jar, 
-servlet-api-2.5.jar, 
-stax-api-1.0-commons-cli-1.0.jar2.jar
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
-      1. Definitions.
-
-            1.1. "Contributor" means each individual or entity that
-            creates or contributes to the creation of Modifications.
-
-            1.2. "Contributor Version" means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-
-            1.3. "Covered Software" means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-
-            1.4. "Executable" means the Covered Software in any form
-            other than Source Code. 
-
-            1.5. "Initial Developer" means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            
-            1.6. "Larger Work" means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-
-            1.7. "License" means this document.
-
-            1.8. "Licensable" means having the right to grant, to the
-            maximum extent possible, whether at the time of the initial
-            grant or subsequently acquired, any and all of the rights
-            conveyed herein.
-            
-            1.9. "Modifications" means the Source Code and Executable
-            form of any of the following: 
-
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-
-            1.10. "Original Software" means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-
-            1.11. "Patent Claims" means any patent claim(s), now owned
-            or hereafter acquired, including without limitation,
-            method, process, and apparatus claims, in any patent
-            Licensable by grantor. 
-
-            1.12. "Source Code" means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-
-            1.13. "You" (or "Your") means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, "You"
-            includes any entity which controls, is controlled by, or is
-            under common control with You. For purposes of this
-            definition, "control" means (a) the power, direct or
-            indirect, to cause the direction or management of such
-            entity, whether by contract or otherwise, or (b) ownership
-            of more than fifty percent (50%) of the outstanding shares
-            or beneficial ownership of such entity.
-
-      2. License Grants. 
-
-            2.1. The Initial Developer Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Initial Developer,
-                  to use, reproduce, modify, display, perform,
-                  sublicense and distribute the Original Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party under the terms of this
-                  License. 
-
-                  (d) Notwithstanding Section 2.1(b) above, no patent
-                  license is granted: (1) for code that You delete from
-                  the Original Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-
-            2.2. Contributor Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, each
-            Contributor hereby grants You a world-wide, royalty-free,
-            non-exclusive license:
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Contributor to
-                  use, reproduce, modify, display, perform, sublicense
-                  and distribute the Modifications created by such
-                  Contributor (or portions thereof), either on an
-                  unmodified basis, with other Modifications, as
-                  Covered Software and/or as part of a Larger Work; and
-                  
-
-                  (b) under Patent Claims infringed by the making,
-                  using, or selling of Modifications made by that
-                  Contributor either alone and/or in combination with
-                  its Contributor Version (or portions of such
-                  combination), to make, use, sell, offer for sale,
-                  have made, and/or otherwise dispose of: (1)
-                  Modifications made by that Contributor (or portions
-                  thereof); and (2) the combination of Modifications
-                  made by that Contributor with its Contributor Version
-                  (or portions of such combination). 
-
-                  (c) The licenses granted in Sections 2.2(a) and
-                  2.2(b) are effective on the date Contributor first
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-
-                  (d) Notwithstanding Section 2.2(b) above, no patent
-                  license is granted: (1) for any code that Contributor
-                  has deleted from the Contributor Version; (2) for
-                  infringements caused by: (i) third party
-                  modifications of Contributor Version, or (ii) the
-                  combination of Modifications made by that Contributor
-                  with other software (except as part of the
-                  Contributor Version) or other devices; or (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-
-            3.1. Availability of Source Code.
-
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-
-            3.2. Modifications.
-
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-
-            3.3. Required Notices.
-
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-
-            3.4. Application of Additional Terms.
-
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipients'
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            However, you may do so only on Your own behalf, and not on
-            behalf of the Initial Developer or any Contributor. You
-            must make it absolutely clear that any such warranty,
-            support, indemnity or liability obligation is offered by
-            You alone, and You hereby agree to indemnify the Initial
-            Developer and every Contributor for any liability incurred
-            by the Initial Developer or such Contributor as a result of
-            warranty, support, indemnity or liability terms You offer.
-          
-
-            3.5. Distribution of Executable Versions.
-
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of a license of Your choice, which may contain terms
-            different from this License, provided that You are in
-            compliance with the terms of this License and that the
-            license for the Executable form does not attempt to limit
-            or alter the recipient's rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form under a
-            different license, You must make it absolutely clear that
-            any terms which differ from this License are offered by You
-            alone, not by the Initial Developer or Contributor. You
-            hereby agree to indemnify the Initial Developer and every
-            Contributor for any liability incurred by the Initial
-            Developer or such Contributor as a result of any such terms
-            You offer.
-
-            3.6. Larger Works.
-
-            You may create a Larger Work by combining Covered Software
-            with other code not governed by the terms of this License
-            and distribute the Larger Work as a single product. In such
-            a case, You must make sure the requirements of this License
-            are fulfilled for the Covered Software. 
-            
-      4. Versions of the License. 
-
-            4.1. New Versions.
-
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-
-            4.2. Effect of New Versions.
-
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-
-            4.3. Modified Versions.
-
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-            
-
-      5. DISCLAIMER OF WARRANTY.
-
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-
-            6.1. This License and the rights granted hereunder will
-            terminate automatically if You fail to comply with terms
-            herein and fail to cure such breach within 30 days of
-            becoming aware of the breach. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as "Participant")
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-
-      7. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-
-      8. U.S. GOVERNMENT END USERS.
-
-      The Covered Software is a "commercial item," as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-      computer software" (as that term is defined at 48 C.F.R. 
-      252.227-7014(a)(1)) and "commercial computer software
-      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users
-      acquire Covered Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-
-      9. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject
-      matter hereof. If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be
-      governed by the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdiction's conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, with the losing
-      party responsible for costs, including, without limitation, court
-      costs and reasonable attorneys' fees and expenses. The
-      application of the United Nations Convention on Contracts for the
-      International Sale of Goods is expressly excluded. Any law or
-      regulation which provides that the language of a contract shall
-      be construed against the drafter shall not apply to this License.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-      10. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis. Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.
-
-===============================================================================
-
-JRuby (jruby-complete-1.0.jar), wsdl4j (wsdl4j-1.6.2.jar):
-
-Common Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-      a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-      b) in the case of each subsequent Contributor:
-
-      i) changes to the Program, and
-
-      ii) additions to the Program;
-
-      where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
-
-      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
-
-      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
-
-      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
-
-      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-      iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form:
-
-      a) it must be made available under this Agreement; and 
-
-      b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
-
-===============================================================================
-
-backport-util-concurrent-2.2.jar:
-
-The software comprising backport-util-concurrent is based in large
-part on the code from JSR166, and the package dl.util.concurrent.
-The software has been released to the public domain, as explained at:
-http://creativecommons.org/licenses/publicdomain, excepting portions
-of the class
-edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList,
-which were adapted from class java.util.ArrayList, written by Sun
-Microsystems, Inc, which are used with kind permission, and subject
-to the following:
-
-Copyright 2002-2004 Sun Microsystems, Inc. All rights reserved. Use is
-subject to the following license terms.
-
-  "Sun hereby grants you a non-exclusive, worldwide, non-transferrable
-  license to use and distribute the Java Software technologies as part
-  of a larger work in source and binary forms, with or without
-  modification, provided that the following conditions are met:
-
-   -Neither the name of or trademarks of Sun may be used to endorse or
-    promote products derived from the Java Software technology without
-    specific prior written permission.
-
-   -Redistributions of source or binary code must be accompanied by the
-    following notice and disclaimers:
-
-    Portions copyright Sun Microsystems, Inc. Used with kind permission.
-
-    This software is provided AS IS, without a warranty of any kind.  ALL
-    EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
-    WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PUPOSE OR
-    NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
-    MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE
-    FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
-    USING, MODIFYING OR DISTRIBUTING THE SOFTWARE OR ITS
-    DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR
-    ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR
-    DATA, OR FOR DIRECT, INDIRECT,CONSQUENTIAL, INCIDENTAL
-    OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF
-    THE THEORY OR LIABILITY, ARISING OUT OF THE USE OF OR
-    INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.
-    HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-    You acknowledge that Software is not designed, licensed or intended for
-    use in the design, construction, operation or maintenance of any nuclear
-    facility."
-
-===============================================================================
-rome-0.9.jar
-
-Copyright 2004 Sun Microsystems, Inc.
-
-Licensed 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.
-
-===============================================================================
-jdom-1.0.jar :
-
-$Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions, and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions, and the disclaimer that follows 
-    these conditions in the documentation and/or other materials 
-    provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
-    derived from this software without prior written permission.  For
-    written permission, please contact <request_AT_jdom_DOT_org>.
- 
- 4. Products derived from this software may not be called "JDOM", nor
-    may "JDOM" appear in their name, without prior written permission
-    from the JDOM Project Management <request_AT_jdom_DOT_org>.
- 
- In addition, we request (but do not require) that you include in the 
- end-user documentation provided with the redistribution and/or in the 
- software itself an acknowledgement equivalent to the following:
-     "This product includes software developed by the
-      JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos 
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many 
- individuals on behalf of the JDOM Project and was originally 
- created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
- Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
- on the JDOM Project, please see <http://www.jdom.org/>. 
-
-========================================================================
-
-dwr-2.0.1.jar :
-
-/*
-* Copyright 2005 Joe Walker
-*
-* Licensed 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.
-*/
-
-==========================================================================
-
-dojotoolkit V1.0.0:
-
-The "New" BSD License:
-**********************
-
-Copyright (c) 2005, The Dojo Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-	list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-	this list of conditions and the following disclaimer in the documentation
-	and/or other materials provided with the distribution.
-  * Neither the name of the Dojo Foundation nor the names of its contributors
-	may be used to endorse or promote products derived from this software
-	without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The module tuscany-implementation-script-1.0-incubating.jar temporarily includes    
-one file under the below BSD license with the following copyright:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-
-The serp-1.12.0.jar is distributed under the BSD license with the following copyright:
-
- Copyright (c) 2002, A. Abram White
- All rights reserved.
-
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-The javacc-3.2.jar, and howl-1.0.1-1.jar are distributed under the BSD license:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The tuscany-assembly-xsd jar includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-================================================================================
-License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
-
-These files being ...
-commonj/sdo/ChangeSummary$Setting.class
-commonj/sdo/ChangeSummary.class
-commonj/sdo/DataGraph.class
-commonj/sdo/DataObject.class
-commonj/sdo/helper/CopyHelper.class
-commonj/sdo/helper/DataFactory.class
-commonj/sdo/helper/DataHelper.class
-commonj/sdo/helper/EqualityHelper.class
-commonj/sdo/helper/HelperContext.class
-commonj/sdo/helper/TypeHelper.class
-commonj/sdo/helper/XMLDocument.class
-commonj/sdo/helper/XMLHelper.class
-commonj/sdo/helper/XSDHelper.class
-commonj/sdo/impl/ExternalizableDelegator$Resolvable.class
-commonj/sdo/impl/ExternalizableDelegator.class
-commonj/sdo/Property.class
-commonj/sdo/Sequence.class
-commonj/sdo/Type.class
-xml/datagraph.xsd
-xml/sdoJava.xml
-xml/sdoJava.xsd
-xml/sdoModel.xml
-xml/sdoModel.xsd
-xml/sdoXML.xml
-xml/sdoXML.xsd
-
-
-License for the Service Data Objects JavaDoc and Interface Definition files.
-
-The Service Data Objects Specification is being provided by the copyright holders under the following 
-license. By using and/or copying this work, you agree that you have read, understood and will comply with 
-the following terms and conditions:
-
-Permission to copy, display and distribute the Service Data Objects Specification and/or portions thereof, without 
-modification, in any medium without fee or royalty is hereby granted, provided that you include the 
-following on ALL copies of the Service Data Objects Specification, or portions thereof, that you make:
-
-1. A link or URL to the Service Data Objects Specification at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2. The full text of this copyright notice as shown in the Service Data Objects Specification.
-
-BEA, IBM, Oracle, Primeton Technologies, Rogue Wave Software, SAP, Software AG, Sun Microsystems, Xcalia, 
-Zend Technologies (collectively, the “Authors”) agree to grant you a royalty-free license, under reasonable, 
-non-discriminatory terms and conditions to patents that they deem necessary to implement the Service Data 
-Objects Specification. 
-
-THE Service Data Objects SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR 
-WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL 
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE SERVICE DATA OBJECTS 
-SPECIFICATION.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity 
-pertaining to the Service Data Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects Specification will at all times remain with the 
-Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-================================================================================
-
diff --git a/java/sca-contrib/distribution/manager/src/main/release/bin/NOTICE b/java/sca-contrib/distribution/manager/src/main/release/bin/NOTICE
deleted file mode 100644
index 5daa9a3dfe..0000000000
--- a/java/sca-contrib/distribution/manager/src/main/release/bin/NOTICE
+++ /dev/null
@@ -1,95 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses XmlSchema developed at 
-The Apache Software Foundation (http://ws.apache.org/commons/XmlSchema)
- Portions Copyright 2006 International Business Machines Corp.
-
-This product includes/uses ode-bpel-api-1.1 developed at
-The Apache Software Foundation (http://ode.apache.org)
- - Copyright 1999-2006 Intalio - This product includes software developed by Intalio (http://www.intalio.com)
- - Copyright 2006 Sybase - This product includes software developed by Sybase.(http://www.sybase.com)
-
-"This product includes software developed by the Spring Framework
- Project (http://www.springframework.org)."
-
-This product includes/uses the Jetty Servlet Engine (http://jetty.mortbay.org),
-developed by Mort Bay Consulting  (http://www.mortbay.com)
-
-This product includes/uses the Groovy Script Engine (http://groovy.codehaus.org/),
-Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
-This product includes/uses the Axion : the Open Source Java Database (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
-
-This product includes/uses DOM4J : the flexible XML framework for java (http://www.dom4j.org/) 
- Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)
-License: Public Domain 
-
-This product includes/uses JSON-RPC-Java (http://oss.metaparadigm.com/jsonrpc/)
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product includes software from the GlassFish project (https://glassfish.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-    
-This product includes software from the Rome project (https://rome.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-
-This product includes/uses the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
-
-This product includes/uses the Mozilla Rhino project (http://www.mozilla.org/rhino/)
-
-This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)i
-
-This product includes/uses the Codehaus JRuby project (http://jruby.codehaus.org/)
-
-This product includes/uses JDOM (http://www.jdom.org/)
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved.
- 
-This product includes/uses DWR (http://getahead.org/dwr)
- Copyright 2005 Joe Walker. All rights reserved.
- 
-This product includes/uses dojotoolkit (http://dojotoolkit.org/)
- Copyright (c) 2005, The Dojo Foundation. All rights reserved.
-
-This product includes/uses Howl (http://howl.objectweb.org/)
- Copyright (c) 2004, Bull S.A.
-
-This product includes/uses axion (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team.
-
-This product includes/uses javacc (https://javacc.dev.java.net/)
- Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.
-
-The Program includes all or portions of the following software: "The 
-Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under
-an MPL v1.0 license. Please refer to the homepage URL at 
-http://www.saxonica.com/.
-
-This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:
- Copyright (c) 2002, A. Abram White. All rights reserved.
-
-This product also includes software under the BSD license
-with the following copyright:
- Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
diff --git a/java/sca-contrib/distribution/manager/src/main/release/src/BUILDING b/java/sca-contrib/distribution/manager/src/main/release/src/BUILDING
deleted file mode 100644
index 65d09c5eae..0000000000
--- a/java/sca-contrib/distribution/manager/src/main/release/src/BUILDING
+++ /dev/null
@@ -1,55 +0,0 @@
-Building the Apache Tuscany SCA 1.2 (incubating) April 2008 Release source distribution
-=======================================================================================
-
-Initial Setup
--------------
-
-1) Install J2SE 5.0 SDK, which can be downloaded from 
-   http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_06 JDK or higher.
-
-2) Make sure that your JAVA_HOME environment variable is set to the newly installed 
-   JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 
-   $JAVA_HOME$/bin (unix).
-
-3) Install Maven 2.0.7 or higher, which can be downloaded from 
-   http://maven.apache.org/download.html. Make sure that your PATH includes 
-   the MVN_HOME/bin directory. 
-
-4) Make sure that your MAVEN_OPTS environment variable has -Xmx128M (or more),
-   you can manually do this by executing the following in your prompt :
-   Windows users:
-      set MAVEN_OPTS=-Xmx128M
-   Unix users:
-      export MAVEN_OPTS=-Xmx128M
-
-
-Building
---------
-
-1) Change to the top level directory of Apache Tuscany source distribution.
-2) Run
-
-	$> mvn
-
-   This will compile Apache Tuscany and run all of the tests in the source
-   distribution. 
-
-   Depending on the load of remote Maven 2.0 repositories, you may have 
-   to run "mvn" several times utill the required dependencies are 
-   all located in your local maven repository. It usually takes some time for 
-   maven to download required dependencies in the first build. Once all the 
-   dependencies have been downloaded you may use the -o option to run maven
-   in offline mode, for example, 'mvn clean install -o'.
-
-
-Building the distributions
---------------------------
-
-1) Change to the distribution folder
-2) Run
-
-	$> mvn
-
-   This will build the binary and source distribution with .zip and .gz 
-   formats in the distribution/target directory.
-
diff --git a/java/sca-contrib/distribution/manager/src/main/release/src/LICENSE b/java/sca-contrib/distribution/manager/src/main/release/src/LICENSE
deleted file mode 100644
index 144d8ae692..0000000000
--- a/java/sca-contrib/distribution/manager/src/main/release/src/LICENSE
+++ /dev/null
@@ -1,397 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================================================
-
-The module itest/databindings/common includes the test schema; datagraph.xsd, sdoJava.xsd, and sdoModel.xsd
-under the following license:
-
-License for the Service Data Objects JavaDoc, Interface Definition files
-and XSD files.
-
-The Service Data Objects JavaDoc, Interface Definition files and XSD files 
-are being provided by the copyright holders under the following license. 
-By using and/or copying this work, you agree that you have read, 
-understood and will comply with the following terms and conditions:
-
-Permission to copy, display, make derivative works of and distribute 
-the Service Data Objects JavaDoc, Interface Definition files and XSD files
-(the "Artifacts") in any medium without fee or royalty is hereby granted, 
-provided that you include the following on ALL copies of the Artifacts, 
-or portions thereof, that you make:
-
-1.	A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2.	The full text of this copyright notice as shown in the Artifacts.
-
-
-
-THE ARTIFACTS ARE PROVIDED "AS IS" AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE. 
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Data 
-Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects 
-Specification will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.11, last updated on 2007/12/21
-
-=================================================================================================================
-
-The module implementation-script temporarily includes one file under the following BSD license:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-=================================================================================================================
-
-The module assembly-xsd includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-=================================================================================================================
-The modules 
-
-binding-ws-xml
-databinding
-databinding-axiom
-databinding-jaxb
-databinding-json
-databinding-sdo
-databinding-sdo-axiom
-databinding-xmlbeans
-interface-wsdl-xml
-
-Include the ipo.xsd and address.xsd information from the XML Schema Primer 
-(http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) combined into the 
-file ipo.xsd and extended with UK postcode structures.
-
-The ipo.xsd file is include under the following license:
-
-W3C(c) SOFTWARE NOTICE AND LICENSE
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other 
-related items) is being provided by the copyright holders under the following 
-license. By obtaining, using and/or copying this work, you (the licensee) agree 
-that you have read, understood, and will comply with the following terms and conditions.
-
-Permission to copy, modify, and distribute this software and its documentation, 
-with or without modification, for any purpose and without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies of the 
-software and documentation or portions thereof, including modifications:
-
-   1. The full text of this NOTICE in a location viewable to users of the 
-      redistributed or derivative work.
-   2. Any pre-existing intellectual property disclaimers, notices, or terms 
-      and conditions. If none exist, the W3C Software Short Notice should be 
-      included (hypertext is preferred, text is permitted) within the body of 
-      any redistributed or derivative code.
-   3. Notice of any changes or modifications to the files, including the date 
-      changes were made. (We recommend you provide URIs to the location from which 
-      the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
-NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or 
-publicity pertaining to the software without specific, written prior permission. 
-Title to copyright in this software and any associated documentation will at all 
-times remain with copyright holders.
diff --git a/java/sca-contrib/distribution/manager/src/main/release/src/NOTICE b/java/sca-contrib/distribution/manager/src/main/release/src/NOTICE
deleted file mode 100644
index 31540fd607..0000000000
--- a/java/sca-contrib/distribution/manager/src/main/release/src/NOTICE
+++ /dev/null
@@ -1,39 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product also includes software under the BSD license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-  Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
-This product includes software under the W3C(c) Software License
-with the following copyright:
-    
-Copyright (c) 2008 World Wide Web Consortium, (Massachusetts Institute of Technology, 
-European Research Consortium for Informatics and Mathematics, Keio University). 
-All Rights Reserved. This work is distributed under the W3C(c) Software License [1] in 
-the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
diff --git a/java/sca-contrib/distribution/process/pom.xml b/java/sca-contrib/distribution/process/pom.xml
deleted file mode 100644
index f32271bf09..0000000000
--- a/java/sca-contrib/distribution/process/pom.xml
+++ /dev/null
@@ -1,162 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-distribution</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-distribution-process</artifactId>

-    <name>Apache Tuscany SCA Business Process Distribution</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-

-        <!-- Core distribution -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-process</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-    </dependencies>

-

-    <profiles>

-

-        <!-- Build profile that can be used to build the distro packages -->

-        <profile>

-            <id>distribution</id>

-            <build>

-                <plugins>

-                    <plugin>

-                        <groupId>org.apache.tuscany.sca</groupId>

-                        <artifactId>tuscany-maven-bundle-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>distribution-modules</id>

-                                <phase>generate-resources</phase>

-                                <goals>

-                                    <goal>generate-modules</goal>

-                                </goals>

-                                <configuration>

-                                    <targetDirectory>target/modules</targetDirectory>

-                                    <excludeDirectories>

-                                        <excludeDirectory>../core/target/modules</excludeDirectory>

-                                    </excludeDirectories>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-

-                    <plugin>

-                        <groupId>org.apache.maven.plugins</groupId>

-                        <artifactId>maven-assembly-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>distribution-package</id>

-                                <phase>package</phase>

-                                <goals>

-                                    <goal>single</goal>

-                                </goals>

-                                <configuration>

-                                    <descriptors>

-                                        <descriptor>src/main/assembly/bin.xml</descriptor>

-                                        <descriptor>src/main/assembly/src.xml</descriptor>

-                                    </descriptors>

-                                    <tarLongFileMode>gnu</tarLongFileMode>

-                                    <finalName>apache-tuscany-sca-process-2.0-SNAPSHOT</finalName>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-                </plugins>

-            </build>

-        </profile>

-        

-        <!-- Profile that can be used to build the modules included in the distro -->

-        <profile>

-            <id>modules</id>

-            <modules>

-                <module>../../../modules/assembly</module>

-                <module>../../../modules/assembly-xml</module>

-                <module>../../../modules/assembly-xsd</module>

-                <module>../../../modules/binding-corba</module>

-                <module>../../../modules/binding-corba-runtime</module>

-                <module>../../../modules/binding-sca</module>

-                <module>../../../modules/binding-sca-xml</module>

-                <module>../../../modules/contribution</module>

-                <module>../../../modules/contribution-java</module>

-                <module>../../../modules/contribution-namespace</module>

-                <module>../../../modules/contribution-xml</module>

-                <module>../../../modules/core</module>

-                <module>../../../modules/core-databinding</module>

-                <module>../../../modules/core-spi</module>

-                <module>../../../modules/data-api</module>

-                <module>../../../modules/databinding</module>

-                <module>../../../modules/databinding-jaxb</module>

-                <module>../../../modules/databinding-saxon</module>

-                <module>../../../modules/databinding-sdo</module>

-                <module>../../../modules/definitions</module>

-                <module>../../../modules/definitions-xml</module>

-                <module>../../../modules/endpoint</module>

-                <module>../../../modules/extensibility</module>

-                <module>../../../modules/extensibility-equinox</module>

-                <module>../../../modules/host-corba</module>

-                <module>../../../modules/host-corba-jse</module>

-                <module>../../../modules/host-http</module>

-                <module>../../../modules/implementation-bpel</module>

-                <module>../../../modules/implementation-bpel-ode</module>

-                <module>../../../modules/implementation-java</module>

-                <module>../../../modules/implementation-java-runtime</module>

-                <module>../../../modules/implementation-java-xml</module>

-                <module>../../../modules/implementation-node</module>

-                <module>../../../modules/implementation-node-runtime</module>

-                <module>../../../modules/implementation-xquery</module>

-                <module>../../../modules/interface</module>

-                <module>../../../modules/interface-java</module>

-                <module>../../../modules/interface-java-jaxws</module>

-                <module>../../../modules/interface-java-xml</module>

-                <module>../../../modules/interface-wsdl</module>

-                <module>../../../modules/interface-wsdl-xml</module>

-                <module>../../../modules/monitor</module>

-                <module>../../../modules/node-api</module>

-                <module>../../../modules/node-impl</module>

-                <module>../../../modules/node-launcher</module>

-                <module>../../../modules/node-launcher-equinox</module>

-                <module>../../../modules/node-launcher-webapp</module>

-                <module>../../../modules/policy</module>

-                <module>../../../modules/policy-security</module>

-                <module>../../../modules/policy-security-jsr250</module>

-                <module>../../../modules/policy-xml</module>

-                <module>../../../modules/sca-api</module>

-                <module>../../../modules/workspace</module>

-                <module>../../../modules/workspace-impl</module>

-                <module>../../../modules/workspace-xml</module>

-                <module>../../../modules/xsd</module>

-                <module>../../../modules/xsd-xml</module>

-            </modules>

-        </profile>

-    </profiles>

-

-</project>

diff --git a/java/sca-contrib/distribution/process/src/main/assembly/bin.xml b/java/sca-contrib/distribution/process/src/main/assembly/bin.xml
deleted file mode 100644
index fdcc421f2f..0000000000
--- a/java/sca-contrib/distribution/process/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,38 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id></id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
-        <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
diff --git a/java/sca-contrib/distribution/process/src/main/assembly/src.xml b/java/sca-contrib/distribution/process/src/main/assembly/src.xml
deleted file mode 100644
index af3cb8e6fc..0000000000
--- a/java/sca-contrib/distribution/process/src/main/assembly/src.xml
+++ /dev/null
@@ -1,37 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>src</id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
-        <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
diff --git a/java/sca-contrib/distribution/process/src/main/components/bin-samples.xml b/java/sca-contrib/distribution/process/src/main/components/bin-samples.xml
deleted file mode 100644
index 8e8bc2e507..0000000000
--- a/java/sca-contrib/distribution/process/src/main/components/bin-samples.xml
+++ /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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add samples to the samples directory -->
-        <fileSet>
-            <directory>../../../samples</directory>
-            <outputDirectory>samples</outputDirectory>
-            <includes>
-                <include>helloworld-bpel/**/*</include>
-                <include>helloworld-bpel-ws/**/*</include>
-                <include>quote-xquery/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
diff --git a/java/sca-contrib/distribution/process/src/main/components/src-modules.xml b/java/sca-contrib/distribution/process/src/main/components/src-modules.xml
deleted file mode 100644
index 68b2c39644..0000000000
--- a/java/sca-contrib/distribution/process/src/main/components/src-modules.xml
+++ /dev/null
@@ -1,100 +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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add module sources to the modules directory -->
-        <fileSet>
-            <directory>../../../modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>assembly/**/*</include>
-                <include>assembly-xml/**/*</include>
-                <include>assembly-xsd/**/*</include>
-                <include>binding-corba/**/*</include>
-                <include>binding-corba-runtime/**/*</include>
-                <include>binding-sca/**/*</include>
-                <include>binding-sca-xml/**/*</include>
-                <include>contribution/**/*</include>
-                <include>contribution-impl/**/*</include>
-                <include>contribution-java/**/*</include>
-                <include>contribution-namespace/**/*</include>
-                <include>contribution-xml/**/*</include>
-                <include>core/**/*</include>
-                <include>core-databinding/**/*</include>
-                <include>core-spi/**/*</include>
-                <include>data-api/**/*</include>
-                <include>databinding/**/*</include>
-                <include>databinding-jaxb/**/*</include>
-                <include>databinding-saxon/**/*</include>
-                <include>databinding-sdo/**/*</include>
-                <include>definitions/**/*</include>
-                <include>definitions-xml/**/*</include>
-                <include>distribution-core/**/*</include>
-                <include>endpoint/**/*</include>
-                <include>extensibility/**/*</include>
-                <include>extensibility-equinox/**/*</include>
-                <include>host-corba/**/*</include>
-                <include>host-corba-jse/**/*</include>
-                <include>host-http/**/*</include>
-                <include>implementation-bpel/**/*</include>
-                <include>implementation-bpel-ode/**/*</include>
-                <include>implementation-java/**/*</include>
-                <include>implementation-java-runtime/**/*</include>
-                <include>implementation-java-xml/**/*</include>
-                <include>implementation-node/**/*</include>
-                <include>implementation-node-runtime/**/*</include>
-                <include>implementation-xquery/**/*</include>
-                <include>interface/**/*</include>
-                <include>interface-java/**/*</include>
-                <include>interface-java-jaxws/**/*</include>
-                <include>interface-java-xml/**/*</include>
-                <include>interface-wsdl/**/*</include>
-                <include>interface-wsdl-xml/**/*</include>
-                <include>monitor/**/*</include>
-                <include>node-api/**/*</include>
-                <include>node-impl/**/*</include>
-                <include>node-launcher/**/*</include>
-                <include>node-launcher-equinox/**/*</include>
-                <include>node-launcher-webapp/**/*</include>
-                <include>policy/**/*</include>
-                <include>policy-security/**/*</include>
-                <include>policy-security-jsr250/**/*</include>
-                <include>policy-xml/**/*</include>
-                <include>sca-api/**/*</include>
-                <include>workspace/**/*</include>
-                <include>workspace-impl/**/*</include>
-                <include>workspace-xml/**/*</include>
-                <include>xsd/**/*</include>
-                <include>xsd-xml/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
diff --git a/java/sca-contrib/distribution/process/src/main/release/CHANGES b/java/sca-contrib/distribution/process/src/main/release/CHANGES
deleted file mode 100644
index 3de7358ec6..0000000000
--- a/java/sca-contrib/distribution/process/src/main/release/CHANGES
+++ /dev/null
@@ -1,431 +0,0 @@
-Changes With Apache Tuscany SCA 1.2 (incubating) April 2008 

-===========================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-2027

-  * TUSCANY-1999

-  * TUSCANY-2037

-  * TUSCANY-2034

-  * TUSCANY-2038

-  * TUSCANY-2043

-  * TUSCANY-2046

-  * TUSCANY-2047

-  * TUSCANY-2028

-  * TUSCANY-1873

-  * TUSCANY-2049

-  * TUSCANY-2035

-  * TUSCANY-1206

-  * TUSCANY-2036 

-  * TUSCANY-1771

-  * TUSCANY-2013

-  * TUSCANY-1926

-  * TUSCANY-1917

-  * TUSCANY-1949

-  * TUSCANY-1941

-  * TUSCANY-2045

-  * TUSCANY-2057

-  * TUSCANY-2055

-  * TUSCANY-2056

-  * TUSCANY-2072

-  * TUSCANY-2047

-  * TUSCANY-2073

-  * TUSCANY-1977 

-  * TUSCANY-2075

-  * TUSCANY-1894

-  * TUSCANY-2079

-  * TUSCANY-2078

-  * TUSCANY-2080

-  * TUSCANY-2068

-  * TUSCANY-1950

-  * TUSCANY-2077

-  * TUSCANY-2056

-  * TUSCANY-2088

-  * TUSCANY-2086

-  * TUSCANY-2094

-  * TUSCANY-2106 

-

-  Features and/or Enhancements

-

-  * Core

-    - Interceptor Enhancements

-      - Phase-based interceptor ordering to allow contribution of new interceptors and also define the order in witch they should be invoked

-      - Pass-by-reference SPI to allow interceptors to indicate if they support pass-by-reference

-      - PolicyProvider SPIs to allow extensions to plugin policy interceptors

-    - Support for JAXWS annotations and mapping of faults to Java exceptions according to JAXWS specification

-    - Improvement of contribution service to allow it to be used outside of the runtime environment 

-    - Support for Contribution Import/Export resource

-    - Enhanced Distributed Domain story using Workspace

-      - Implementation of a SCA domain allowing a system administrator to manage contributions, composites and sca nodes that run these composites

-        - Set of core services providing management capabilities

-        - Administration web interface

-        - This is a work in progress and you can see it in action in samples/calculator-distributed. Other samples that use distributed operation are yet to move over to the workspace.

-    - Enhanced support for SCA Policy spec

-      - Ability to apply external policy definitions to a SCA composition

-      - Ability to spread policy definitions to multiple definitions.xml files available across the sca domain

-      - Bug fixes

-    - Improvements of http binding to support servlet components

-    - Enable Tuscany to run inside an OSGi runtime

-

-  * Web 2.0 Extensions

-    - Enhancements to implementation.widget (support for properties)

-    - New atom binding based on Apache Abdera

-    - Refactoring of rss-rome binding

-  * Other Extensions

-    - Binding JMS

-      - greatly simplified the use of the JMS binding, support locating JMS resources from JNDI, and better compliance with the SCA JMS binding spec

-      - see the doc page for more details: http://incubator.apache.org/tuscany/sca-java-bindingjms.html

-    - Enhancements to Binding RMI

-      - Support shared RMI registry and use 999x as the ports in test case to avoid 1099 conflict

-    - Enhancements to Groovy extension

-      - Support for 'native' groovy classes

-    - Enhancements to OSGi bundle contributions

-      - Support Bundle URLs to be added as contributions

-

-  * Tools

-    - Eclipse plugin providing a Tuscany runtime Library and Tuscany launcher in Eclipse environment
-       - An updatesite is also available to facilitate the plugin installation using the Eclipse update manager

-

-  * Samples/Tutorial/Demos

-    - calculator-distributed migrated to use new Tuscany Distributed Workspace

-    - sample-calculator-ws-secure-webapp

-    - sample-helloworld-jms-webapp

-    - new jms samples

-    - improve bigbank demo to include support for policies 

-    - tutorial store changes

-      - use of import/export

-      - development of contribution without requiring dependencies on the Tuscany runtime

-      - usage of new sca domain infrastructure

-

-  * Testing

-    - Web Container Testing Framework integrated with (Tomcat, Jetty, Geronimo and Websphere)

-

-

-Changes With Apache Tuscany SCA 1.1 (incubating) January 2008 

-===============================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1939

-  * TUSCANY-1914

-  * TUSCANY-1854

-  * TUSCANY-1931

-  * TUSCANY-1547

-  * TUSCANY-1909

-  * TUSCANY-1919

-  * TUSCANY-1930

-  * TUSCANY-1806

-  * TUSCANY-1804

-  * TUSCANY-1916

-  * TUSCANY-1913

-  * TUSCANY-1834

-  * TUSCANY-1857

-  * TUSCANY-1687

-  * TUSCANY-1801

-  * TUSCANY-1742

-  * TUSCANY-1762

-  * TUSCANY-1945

-  * TUSCANY-1595

-  * TUSCANY-1594

-  * TUSCANY-1849

-  * TUSCANY-1836

-  * TUSCANY-1934

-  * TUSCANY-1902

-  * TUSCANY-1608

-  * TUSCANY-1943

-  * TUSCANY-1896

-  * TUSCANY-1626

-  * TUSCANY-1797

-  * TUSCANY-1601

-  * TUSCANY-1415

-

-- Better JMS support

-  * binding.jms supporting point to point text based messaging only

-  * New SOAP/JMS sample (helloworld-ws-reference/service-jms)

-

-- Improvements in PolicyFramework Support

-  * Support for policy specifications on operation elements in a composite definition

-  * Separate sample (calculator-implementation-policies) to demonstrate use of Implementation Policies 

-    (uses logging and JAAS Authentication)

-

-- Modeling of client side java script components

-  * See implementation.widget

-

-- Evolving support for doman API suggested by assembly spec including a standalone node and nodes running 

-  connected together in a domain. This is still experimental. 

- 

-- Class loading and OSGI improvements

-  * Enable Tuscany to be run in a multi-classloader environment including inside OSGi. By default,

-    Tuscany continues to run using a single CLASSPATH-based classloader.

-  * Contributions no longer need to be in the CLASSPATH. All import/export dependencies across contributions should be 

-    explicitly specified (as described in the spec).

-

-- JAXB based POJO transformations

-

-Changes With Apache Tuscany SCA 1.0.1 (incubating) November 2007 

-================================================================

-

-The Tuscany SCA Java 1.0.1 is mainly a bug-fix release. It also comes with some improvements as listed below.

- 

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1848

-  * TUSCANY-1857

-  * TUSCANY-1859

-  * TUSCANY-1801

-  * TUSCANY-1823

-  * TUSCANY-1839

-  * TUSCANY-1814

-  * TUSCANY-1818

-  * TUSCANY-1834

-  * TUSCANY-1637

-  * TUSCANY-1826

-  * TUSCANY-1823

-  * TUSCANY-1819

-  * TUSCANY-1821

-  * TUSCANY-1822

-  * TUSCANY-1806

-  * TUSCANY-1808

-  * TUSCANY-1756

-  * TUSCANY-1757

-

-- Fix build issues with Maven 2.0.7 and JDK 6

-

-- Reduce memory consumption for WSDLs that import large XSDs

-

-- Add more logging statements for better servicibility

-

-- Add an extension point to allow extensions to plug-in extension schemas.

-

-- Add a demo application to showcase XML integration story 

-

-- Improve in databinding framework

-  * Add support for JSON Databindings and other refactoring

-  * Set databinding for introspected data type and enhance the checking of wrapper style

-  * Improve the tree-based XMLStreamReader and convert Bean & DOM to use this approach

-  * Add a tree-iterator based XMLStreamReader base impl

-  * Add default element info to java interface

-  * Rename Interface.setDefaultDataBinding to resetDataBinding

-

-- Limit the method injection to setters and allow the setter annotation to override field annotation

-

-- Evolving support in Intent and Policy handling

-  * Add support for policies in implementation

-  * Fix the algorithm for macthing policySets defined on bindings for the wire

-  * Add policy intent for implementation.java

-  * Extend java implementation type to recognize and apply policies, adding util support for this in Policy module

-  * Add policy module for logging

-

-- Evolving development in the SCA Domain/Node

-

-- Update NOTICE files with missing dependencies

-

-

-Changes With Apache Tuscany SCA 1.0 (incubating) September 2007 

-===============================================================

-

-- Tuscany Java SCA now implements V1.0 of the core SCA 

-  specifications

-        SCA Assembly Model V1.0

-        SCA Java Common Annotations and APIs V1.0

-        SCA Java Component Implementation V1.0

-        SCA Web Services Binding V1.0

-  Including callbacks, conversations and callable references

-  

-

-- Support for ws-security configurable in the web services binding

-  thro Tuscany SCA policy intents and policysets using the policy framework 

-  introduced in the last release.  

-  

-  Note : This release supports specifications of policies around axis2

-         config params - see helloworld-ws-service-secure sample.  The policy

-         intents that have been tested are authentication, integrity and 

-         confidentiality.  

-         There is no sample or test that exercises confidentiality since there

-         are some unresolved licensing issue around bouncycastle libraries.  

-         However, users who are not encumbered by the bouncycastle license 

-         restrictions can try the 'confidentiality' intent. See FAQ - 

-         http://incubator.apache.org/tuscany/tuscany-sca-java-faq.html

-                

-         This release does not include support for WS-Policy

-         attachments in Tuscany Policysets for ws-security.

-         

-  

-- An XQuery component implementation type 

-        implementation-xquery

-        

-

-- A Databinding for converting data to and from nodes for XQuery 

-  processing

-        databinding-saxon

-        

-

-- OSGI support has been extended to allow Tuscany contributions 

-  packaged as OSGI bundles hence taking advantage of OSGI's bundle

-  loading an dependency management capabilities 

-  

-

-- A BPEL component implementation type experimental implementation

-based on SCA BPEL Client and Implementation V1.0. At the moment only

-supports BPEL process as services.

-	implementation-bpel

-

-

-- The distributed runtime implementation has been separated out 

-  into 

-        *) domain

-        *) node

-  It is now wrapped by a SCADomain interface as is the standalone 

-  runtime.

-  

-  Note: This release does not include support for WebApp host deployment 

-        for a distributed SCA Domain 

-  

-

-

-- The web service binding will now generate WSDL automatically

-  based on the service interface if no WSDL is provided

-  

-

-- A new "store" sample and associated document show how a 

-  simple store front application can be constructed 

-        samples/store

-        

-- The following features of this release are still experimental:

-     - BPEL implementation type, integrating with Apache ODE

-     - OSGI implementation type, integrating with Apache Felix

-     - XQuery implementation type

-

- 

-

-Changes With Apache Tuscany SCA 0.99 (incubating) August 2007 

-=============================================================

-

-The following are the significant additions to release 0.99 

-over and above all of what was offered in release 0.91.

-

-- A version of the default sca binding that works between

-  components runing in separate Java virtual machines

-       binding-sca-axis

-

-- A simple node implementation and a service discovery 

-  function for running sca applications distributed 

-  across more than one node

-       distributed

-       distributed-impl 

-

-- integration with OSGi runtimes is now supported with

-  a new implementation-osgi component type

-

-- PUB/SUB interactions are now supported by using new 

-  notification binding and implementation types, and

-  samples demonstrating the feature.

-

-- The Tuscany runtime now has a policy framework supporting

-  the SCA policy specification

-

-- the endpoint URIs used by SCA bindings has been rationalized 

-  and now follows the SCA Assembly specification

-

-- binding-ajax has been renamed to binding-dwr

-

-Changes With Apache Tuscany SCA 0.91 (incubating) July 2007 

-===========================================================

-

-The following are the significant additions to release 0.91 

-over and above all of what was offered in release 0.90.

-

-

-- Enhancements to support multiple contributions to the SCA Domain

-

-- The inclusion of a alternative simplified extensions-helper

-SPI layer to faciliate rapid development of extensions

-

-- More Implementation Extenstions

-        Spring

-        WebResource

-

-- More Binding Extensions

-        AJAX

-        EJB

-        RSS/ATOM Feeds

-        

-- Demos that demonstrate the use of a mix of extensions

-         alert-aggregator-webapp

-         bigbank-account

-         bigbank-calculator

-         bigbank-stockquote

-

-

-- Samples

-        Samples to demostrate use of Spring, Resource, AJAX extensions

-

-Changes With Apache Tuscany SCA 0.90 (incubating) June 2007 

-===========================================================

-

-- Implementations for all of the Java Annotations and API Specification V1.0 found at

-  (http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications) 

-  apart from the following.

-    @ComponentName

-    Conversation

-    RequestContext

-    

-- New assembly model implementation taking into account SCA 1.0 artifacts 

-  Data duplication between assembly model and runtime removed

-

-- Simple single process domain support

-  Contribution support to scope items being deployed into the runtime

-

-- Improved Package/Class naming consistency across modules

-

-- Extensions now loaded via Java service mechanism

-  Refactored extensions to use new SPIs (see below)

-

-- Maven and Ant based sample builds in the binary distribution

-

-- Implementation Extensions

-    Java

-    Script supporting (Ruby, Python, Groovy, JavaScript)

-

-- Binding Extensions

-    Axis2

-    RMI

-    JSONRPC

-

--Databinding Extensions

-    Axiom

-    JAXB

-    SDO

-

-- Host environments

-    Embedded

-    Tomcat

-    Jetty

-    RMI

-

-- A clear set of SPIs intended to be stable over future releases

-    SCA assembly model

-      org.apache.tuscany.sca.assembly

-      org.apache.tuscany.sca.interfacedef

-      org.apache.tuscany.sca.interfacedef.java

-      org.apache.tuscany.sca.interfacedef.wsdl

-      org.apache.tuscany.sca.policy

-

-    SCA contribution model

-      org.apache.tuscany.sca.contribution

-

-    Runtime extensions

-      org.apache.tuscany.sca.core

-      org.apache.tuscany.sca.invocation

-      org.apache.tuscany.sca.provider

-      org.apache.tuscany.sca.runtime

-      org.apache.tuscany.sca.work

-

-    Data binding support

-      org.apache.tuscany.sca.databinding

-

-    Embedding Tuscany

-      org.apache.tuscany.sca.host.embedded

-

-    Servlet container integration

-      org.apache.tuscany.sca.http

-

-- For this point release a partial set of JavaDoc is provided to 

-  be filled out as we close on release 1.0

diff --git a/java/sca-contrib/distribution/process/src/main/release/README b/java/sca-contrib/distribution/process/src/main/release/README
deleted file mode 100644
index 4d83dcfde9..0000000000
--- a/java/sca-contrib/distribution/process/src/main/release/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 README
-=====================================================
-
-Welcome to the Tuscany SCA 1.2 release. 
-
-See the RELEASE_NOTES file for information specific to this release.
-
-In the binary release see the INSTALL file for information on how to 
-install the release.
-
-In the source distribution see the BUILDING file for information on
-building the source code.
-
-
-
-
-
-
-
diff --git a/java/sca-contrib/distribution/process/src/main/release/RELEASE_NOTES b/java/sca-contrib/distribution/process/src/main/release/RELEASE_NOTES
deleted file mode 100644
index a04ef5c553..0000000000
--- a/java/sca-contrib/distribution/process/src/main/release/RELEASE_NOTES
+++ /dev/null
@@ -1,83 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 Release Notes
-============================================================
-
-Apache Tuscany provides a runtime based on the Service Component
-Architecture. SCA is a set of specifications aimed at simplifying SOA
-Application Development which are being standardized at OASIS as part
-of Open Composite Services Architecture (Open CSA) - http://www.oasis-opencsa.org/.
-
-Overview
---------
-
-     The Apache Tuscany SCA 1.2 release includes implementations of the
-     main SCA specifications including:
-
-        SCA Assembly Model V1.0
-        SCA Policy Framework V1.0
-        SCA Java Common Annotations and APIs V1.0
-        SCA Java Component Implementation V1.0
-        SCA Spring Component Implementation V1.0
-        SCA BPEL Client and Implementation V1.0
-        SCA Web Services Binding V1.0
-        SCA EJB Session Bean Binding V1.0
-
-    It also includes implementations of many features not yet defined
-    by SCA specifications, including:
-
-        - SCA bindings for Direct Web Remoting, RSS and ATOM Feeds, 
-          HTTP resources, JSON-RPC, PUB/SUB Notifications, and RMI.
-        - SCA implementation types for OSGI, XQuery, BPEL, Widget and various 
-          dynamic languages including Groovy, Javascript, Python and Ruby
-        - Databindings for Service Data Objects (SDO), JAXB, XmlBeans, 
-          Axis2's AXIOM, JSON, SAXON, DOM, SAX and StAX
-
-    The Tuscany SCA Runtime can be configured as a single node SCA domain or 
-    as an SCA domain distributed across multiple nodes. 
-    In addition Tuscany SCA supports the following host-deployment options: -
-        - running standalone 
-        - running with distributed nodes across multiple JVMs
-        - running with embedded Jetty or Tomcat
-        - running as part of a standard web application                                     
-     
-    The Wepapp samples included in this release have been tried and tested on 
-        - Tomcat 5.5.20 and Tomcat 6.0.14
-        - Jetty 6.1.3
-        - Geronimo 2.0.2 Tomcat6 jee5
-        - WebSphere 6.1 fix pack 9
-
-See the CHANGES file for a detailed list of the features in this release.
-
-Support
--------
-
-For more information on Apache Tuscany visit the website at:
-
-    http://incubator.apache.org/tuscany/
- 
-Any issues with this release can be reported to Apache Tuscany
-using the mailing lists or in the JIRA issue tracker.
-
-    Mailing list archives:
-
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-user/
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/
-
-    Jira:
-
-       http://issues.apache.org/jira/browse/TUSCANY
-
-To join the project's mailing lists follow the instructions at:
-
-    http://incubator.apache.org/tuscany/mailing-lists.html
-
-To find out more about OASIS Open CSA go to: 
-
-    http://www.oasis-opencsa.org.
-
-Apache Tuscany welcomes your help. Any contribution, including code,
-testing, improving the documentation, or bug reporting is always
-appreciated. 
-
-Thank you for using Apache Tuscany!
-
-- The Tuscany Team.
diff --git a/java/sca-contrib/distribution/process/src/main/release/bin/INSTALL b/java/sca-contrib/distribution/process/src/main/release/bin/INSTALL
deleted file mode 100644
index 2da53a2b44..0000000000
--- a/java/sca-contrib/distribution/process/src/main/release/bin/INSTALL
+++ /dev/null
@@ -1,27 +0,0 @@
-Installing the Apache Tuscany SCA 1.2 (incubating) April 2008 Release binary distribution
-=========================================================================================
-
-Unzip Tuscany binary distribution archive and you get the following:
-
-tuscany-sca-1.1-incubating        
-   DISCLAIMER    - the ASF incubation disclaimer
-   INSTALL       - this help file
-   LICENSE       - the Apache License and any dependecy licenses
-   NOTICE        - attribution notices associated with the licenses
-   README        - readme for the release
-   RELEASE_NOTES - description of this release 
-   CHANGES       - A note of the major changes in this release
-
-   /demos        - Demo applications showcasing the use of Apache Tuscany 
-
-   /lib          - The tuscany-sca-all and tuscany-sca-manifest jars and all their dependencies
-
-   /modules      - all of the individual Tuscany jars
-
-   /samples      - all the Tuscany samples, see the README in that directory
-
-   /tutorial     - The store tutorial, see the README in that directory
-
-
-
-
diff --git a/java/sca-contrib/distribution/process/src/main/release/bin/LICENSE b/java/sca-contrib/distribution/process/src/main/release/bin/LICENSE
deleted file mode 100644
index 5e1f585d46..0000000000
--- a/java/sca-contrib/distribution/process/src/main/release/bin/LICENSE
+++ /dev/null
@@ -1,2366 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================
-
-APACHE TUSCANY SUBCOMPONENTS: 
-
-The Apache Tuscany binary distribution includes a number of subcomponents
-with separate copyright notices and license terms. Your use of the
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.                             
-
-===============================================================================
-
-The following components come under Apache Software License 1.1
-
- commons-discovery-0.2.jar
- commons-primitives-1.0.jar
-
-The following components come under Apache Software License 2.0
-
- abdera-core-0.3.0-incubating.jar
- abdera-i18n-0.3.0-incubating.jar
- abdera-parser-0.3.0-incubating.jar
- activeio-2.0-r118.jar
- activeio-core-3.0.0-incubator.jar
- apache-activemq-4.1.1.jar
- addressing-1.3.mar
- annogen-0.1.0.jar
- annotations-api-6.0.14.jar
- aopalliance-1.0.jar
- axiom-api-1.2.5.jar
- axiom-dom-1.2.5.jar
- axiom-impl-1.2.5.jar
- axis2-adb-1.3.jar
- axis2-codegen-1.3.jar
- axis2-java2wsdl-1.3.jar
- axis2-kernel-1.3.jar
- axis2-mtompolicy-1.3.jar
- bsf-all-3.0-beta2.jar
- catalina-6.0.14.jar
- cglib-nodep-2.1_3.jar
- commons-collections-3.1.jar
- commons-codec-1.3.jar
- commons-fileupload-1.1.1.jar
- commons-httpclient-3.0.1.jar
- commons-io-1.2.jar
- commons-jexl-1.1.jar
- commons-lang-2.1.jar
- commons-logging-1.1.jar
- coyote-6.0.14.jar
- derby-10.1.3.1.jar
- geronimo-activation_1.1_spec-1.0-M1.jar
- geronimo-common-1.2-beta.jar
- geronimo-commonj_1.1_spec-1.0.jar
- geronimo-connector-1.2-beta.jar
- geronimo-core-1.2-beta.jar
- geronimo-deployment-1.2-beta.jar
- geronimo-ejb_3.0_spec-1.0.jar
- geronimo-interceptor-1.2-beta.jar
- geronimo-j2ee-1.2-beta.jar
- geronimo-j2ee-connector_1.5_spec-1.1.jar
- geronimo-j2ee-jacc_1.0_spec-1.1.jar
- geronimo-j2ee-management_1.0_spec-1.1.jar
- geronimo-javamail_1.4_spec-1.0-M1.jar
- geronimo-jms_1.1_spec-1.1.jar
- geronimo-jpa_3.0_spec-1.0.jar
- geronimo-jta_1.0.1B_spec-1.0.jar
- geronimo-kernel-1.2-beta.jar
- geronimo-management-1.2-beta.jar
- geronimo-naming-1.2-beta.jar
- geronimo-security-1.2-beta.jar
- geronimo-spec-j2ee-connector-1.5-rc4.jar
- geronimo-spec-jta-1.0.1B-rc4.jar
- geronimo-system-1.2-beta.jar
- geronimo-transaction-1.2-beta.jar
- geronimo-util-1.2-beta.jar
- httpcore-4.0-alpha5.jar
- httpcore-nio-4.0-alpha5.jar
- httpcore-niossl-4.0-alpha5.jar
- jettison-1.0-RC2.jar
- jetty-6.1.7.jar
- jetty-util-6.1.7.jar
- json-rpc-1.0.jar
- juli-6.0.14.jar
- log4j-1.2.12.jar
- logkit-1.0.1.jar
- neethi-2.0.2.jar
- ode-bpel-api-1.1.jar
- ode-bpel-compiler-1.1.jar
- ode-bpel-dao-1.1.jar
- ode-bpel-epr-1.1.jar
- ode-bpel-obj-1.1.jar
- ode-bpel-runtime-1.1.jar
- ode-bpel-schemas-1.1.jar
- ode-bpel-store-1.1.jar
- ode-dao-jpa-1.1.jar
- ode-dao-jpa-ojpa-derby-1.1.zip
- ode-jacob-1.1.jar
- ode-jacob-ap-1.1.jar
- ode-scheduler-simple-1.1.jar
- ode-utils-1.1.jar
- openjpa-all-0.9.7-incubating.jar
- openjpa-persistence-0.9.7-incubating.jar
- org.apache.felix.bundlerepository-1.0.2.jar
- org.apache.felix.framework-1.0.3.jar
- org.apache.felix.main-1.0.3.jar
- org.apache.felix.shell-1.0.0.jar
- org.apache.felix.shell.tui-1.0.0.jar
- rampart-core-1.3.jar
- rampart-policy-1.3.jar
- rampart-trust-1.3.jar
- regexp-1.3.jar
- spring-beans-2.0.6.jar
- spring-context-2.0.6.jar
- spring-core-2.0.6.jar
- tranql-connector-1.1.jar
- tuscany-sdo-api-r2.1-1.0-incubating.jar
- tuscany-sdo-impl-1.0-incubating.jar
- tuscany-sdo-lib-1.0-incubating.jar
- tuscany-sdo-tools-1.0-incubating.jar
- woden-1.0-incubating-M7b.jar
- wss4j-1.5.3.jar
- wstx-asl-3.2.1.jar
- xalan-2.7.0.jar
- xbean-naming-2.7.jar
- xercesImpl-2.8.1.jar
- xml-apis-1.3.03.jar
- xmlbeans-2.3.0.jar
- xml-resolver-1.1.jar
- xmlsec-1.4.0.jar
- XmlSchema-1.3.2.jar
-
-===============================================================================
-axion-1.0-M3-dev.jar 
-
-Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
- 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above 
-   copyright notice, this list of conditions and the following 
-   disclaimer. 
- 
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in 
-   the documentation and/or other materials provided with the 
-   distribution. 
-
-3. The names "Tigris", "Axion", nor the names of its contributors may 
-   not be used to endorse or promote products derived from this 
-   software without specific prior written permission. 
- 
-4. Products derived from this software may not be called "Axion", nor 
-   may "Tigris" or "Axion" appear in their names without specific prior
-   written permission.
- 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-The "Axion Development Team" is defined to be:
-
- * Chuck Burdick
- * James Burke
- * Morgan Delagrange
- * Geir Magnusson Jr.
- * Martin Poeschl
- * Steve Polyak
- * Daniel Rall
- * Ahimanikya Satapathy
- * Doug Sale
- * James Strachan
- * Rodney Waldhoff
- * Jason van Zyl
-
-License changes are to be determined by a simple majority vote of the 
-Axion Development Team.
-
-===============================================================================
-dom4j-1.6.1.jar
-
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
-   statements and notices.  Redistributions must also contain a
-   copy of this document.
- 
-2. Redistributions in binary form must reproduce the
-   above copyright notice, this list of conditions and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
- 
-3. The name "DOM4J" must not be used to endorse or promote
-   products derived from this Software without prior written
-   permission of MetaStuff, Ltd.  For written permission,
-   please contact dom4j-info@metastuff.com.
- 
-4. Products derived from this Software may not be called "DOM4J"
-   nor may "DOM4J" appear in their names without prior written
-   permission of MetaStuff, Ltd. DOM4J is a registered
-   trademark of MetaStuff, Ltd.
- 
-5. Due credit should be given to the DOM4J Project - 
-   http://www.dom4j.org
- 
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-The EMF jars; 
-   codegen-2.2.3.jar 
-   codegen-ecore-2.2.3.jar
-   common-2.2.3.jar
-   ecore-2.2.3.jar
-   ecore-change-2.2.3.jar
-   ecore-xmi-2.2.3.jar
-   xsd-2.2.3.jar
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the
-Program under their own license agreement, and (ii) are not derivative
-works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor
-which are necessarily infringed by the use or sale of its Contribution
-alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this 
-Agreement.
-
-"Recipient" means anyone who receives the Program under this
-Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor, if
-any, in source code and object code form. This patent license shall
-apply to the combination of the Contribution and the Program if, at
-the time the Contribution is added by the Contributor, such addition
-of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow
-Recipient to distribute the Program, it is Recipient's responsibility
-to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or
-conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the 
-Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a
-commercial product offering should do so in a manner which does not
-create potential liability for other Contributors. Therefore, if a
-Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend
-and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising
-from claims, lawsuits and other legal actions brought by a third party
-against the Indemnified Contributor to the extent caused by the acts
-or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement.
-In order to qualify, an Indemnified Contributor must: a) promptly
-notify the Commercial Contributor in writing of such claim, and b)
-allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such
-claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable
-laws, damage to or loss of data, programs or equipment, and
-unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-the Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of
-the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of
-time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use
-and distribution of the Program as soon as reasonably practicable.
-However, Recipient's obligations under this Agreement and any licenses
-granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and
-may only be modified in the following manner. The Agreement Steward
-reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation
-is the initial Agreement Steward. The Eclipse Foundation may assign
-the responsibility to serve as the Agreement Steward to a suitable
-separate entity. Each new version of the Agreement will be given a
-distinguishing version number. The Program (including Contributions)
-may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives
-no rights or licenses to the intellectual property of any Contributor
-under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No
-party to this Agreement will bring a legal action under this Agreement
-more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.
-
-===============================================================================
-For Saxon including 
-   saxon-8.7.jar
-   saxon-dom-8.7.jar
-   saxon-xpath-8.7.jar
-
- MOZILLA PUBLIC LICENSE
-Version 1.0
-
-1. Definitions.
-
-      1.1. ``Contributor'' means each entity that creates or contributes to the creation of Modifications.
-
-      1.2. ``Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-
-      1.3. ``Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.
-
-      1.4. ``Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data.
-
-      1.5. ``Executable'' means Covered Code in any form other than Source Code.
-
-      1.6. ``Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-
-      1.7. ``Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-
-      1.8. ``License'' means this document.
-
-      1.9. ``Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-
-            A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-
-            B. Any new file that contains any part of the Original Code or previous Modifications. 
-
-      1.10. ``Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-
-      1.11. ``Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or a list of source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-
-      1.12. ``You'' means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, ``You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, ``control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity. 
-
-2. Source Code License.
-
-      2.1. The Initial Developer Grant.
-      The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell (``Utilize'') the Original Code (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Original Code (or portions thereof) and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-      2.2. Contributor Grant.
-      Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Contributor, to Utilize the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Contributor Version (or portions thereof), and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-3. Distribution Obligations.
-
-      3.1. Application of License.
-      The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-
-      3.2. Availability of Source Code.
-      Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
-
-      3.3. Description of Modifications.
-      You must cause all Covered Code to which you contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-
-      3.4. Intellectual Property Matters
-
-            (a) Third Party Claims.
-            If You have knowledge that a party claims an intellectual property right in particular functionality or code (or its utilization under this License), you must include a text file with the source code distribution titled ``LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If you obtain such knowledge after You make Your Modification available as described in Section 3.2, You shall promptly modify the LEGAL file in all copies You make available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-
-            (b) Contributor APIs.
-            If Your Modification is an application programming interface and You own or control patents which are reasonably necessary to implement that API, you must also include this information in the LEGAL file. 
-
-      3.5. Required Notices.
-      You must duplicate the notice in Exhibit A in each file of the Source Code, and this License in any documentation for the Source Code, where You describe recipients' rights relating to Covered Code. If You created one or more Modification(s), You may add your name as a Contributor to the notice described in Exhibit A. If it is not possible to put such notice in a particular Source Code file due to its structure, then you must include such notice in a location (such as a relevant directory file) where a user would be likely to look for such a notice. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-      3.6. Distribution of Executable Versions.
-      You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-      3.7. Larger Works.
-      You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. 
-
-4. Inability to Comply Due to Statute or Regulation.
-
-      If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. 
-
-5. Application of this License.
-
-      This License applies to code to which the Initial Developer has attached the notice in Exhibit A, and to related Covered Code. 
-
-6. Versions of the License.
-
-      6.1. New Versions.
-      Netscape Communications Corporation (``Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-
-      6.2. Effect of New Versions.
-      Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License.
-
-      6.3. Derivative Works.
-      If you create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), you must (a) rename Your license so that the phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or any confusingly similar phrase do not appear anywhere in your license and (b) otherwise make it clear that your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) 
-
-7. DISCLAIMER OF WARRANTY.
-
-      COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 
-
-8. TERMINATION.
-
-      This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 
-
-9. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. 
-
-10. U.S. GOVERNMENT END USERS.
-
-      The Covered Code is a ``commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer software'' and ``commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 
-
-11. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in, the United States of America: (a) unless otherwise agreed in writing, all disputes relating to this License (excepting any dispute relating to intellectual property rights) shall be subject to final and binding arbitration, with the losing party paying all costs of arbitration; (b) any arbitration relating to this Agreement shall be held in Santa Clara County, California, under the auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. 
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-      Except in cases where another Contributor has failed to comply with Section 3.4, You are responsible for damages arising, directly or indirectly, out of Your utilization of rights under this License, based on the number of copies of Covered Code you made available, the revenues you received from utilizing such rights, and other relevant factors. You agree to work with affected parties to distribute responsibility on an equitable basis. 
-
-EXHIBIT A.
-
-      ``The contents of this file are subject to the Mozilla Public License Version 1.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.mozilla.org/MPL/
-
-      Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-
-      The Original Code is ______________________________________.
-
-      The Initial Developer of the Original Code is ________________________. Portions created by ______________________ are Copyright (C) ______ _______________________. All Rights Reserved.
-
-      Contributor(s): ______________________________________.'' 
-
-===============================================================================
-
-For the Rhino JavaScript engine js-1.6R7.jar:
-
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (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.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-
-===============================================================================
-Groovy (groovy-all-minimal-1.5.4.jar):
-
-/*
- $Id: LICENSE.txt 156 2003-09-26 17:36:37Z jstrachan $
-
- Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
-    statements and notices.  Redistributions must also contain a
-    copy of this document.
-
- 2. Redistributions in binary form must reproduce the
-    above copyright notice, this list of conditions and the
-    following disclaimer in the documentation and/or other
-    materials provided with the distribution.
-
- 3. The name "groovy" must not be used to endorse or promote
-    products derived from this Software without prior written
-    permission of The Codehaus.  For written permission,
-    please contact info@codehaus.org.
-
- 4. Products derived from this Software may not be called "groovy"
-    nor may "groovy" appear in their names without prior written
-    permission of The Codehaus. "groovy" is a registered
-    trademark of The Codehaus.
-
- 5. Due credit should be given to The Codehaus -
-    http://groovy.codehaus.org/
-
- THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- THE CODEHAUS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- */
-
-===============================================================================
-
-Jython (jython-2.2.jar):
-
-A. HISTORY OF THE SOFTWARE
-=======================
-
-JPython was created in late 1997 by Jim Hugunin. Jim was also the
-primary developer while he was at CNRI. In February 1999 Barry Warsaw
-took over as primary developer and released JPython version 1.1.
-
-In October 2000 Barry helped move the software to SourceForge
-where it was renamed to Jython.  Jython 2.0 and on are licensed under
-the Jython specific license below. 
-
-The standard library is covered by the Python Software Foundation
-license. See the LICENSE_CPython.txt file for details.
-
-The zxJDBC package was written by Brian Zimmer and originally licensed
-under the GNU Public License.  The package is now covered by the Jython
-Software License.
-
-The command line interpreter is covered by the Apache Software
-License.  See the LICENSE_Apache.txt file for details.
- 
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
-================================
-
-Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the distribution.
-
- - Neither the name of the Jython Developers nor the names of
-   its contributors may be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-
-JPython 1.1.x Software License.
-=========================
-
-______________________________________________________________________
-
-IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
-
-BY CLICKING ON THE "ACCEPT" BUTTON WHERE INDICATED, OR BY INSTALLING,
-COPYING OR OTHERWISE USING THE SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
-THE TERMS AND CONDITIONS OF THIS AGREEMENT.
-
-______________________________________________________________________
-
-JPython version 1.1.x
-
-  1. This LICENSE AGREEMENT is between the Corporation for National Research
-     Initiatives, having an office at 1895 Preston White Drive, Reston, VA
-     20191 ("CNRI"), and the Individual or Organization ("Licensee")
-     accessing and using JPython version 1.1.x in source or binary form and
-     its associated documentation as provided herein ("Software").
-
-  2. Subject to the terms and conditions of this License Agreement, CNRI
-     hereby grants Licensee a non-exclusive, non-transferable, royalty-free,
-     world-wide license to reproduce, analyze, test, perform and/or display
-     publicly, prepare derivative works, distribute, and otherwise use the
-     Software alone or in any derivative version, provided, however, that
-     CNRI's License Agreement and CNRI's notice of copyright, i.e.,
-     "Copyright ©1996-1999 Corporation for National Research Initiatives;
-     All Rights Reserved" are both retained in the Software, alone or in any
-     derivative version prepared by Licensee.
-
-     Alternatively, in lieu of CNRI's License Agreement, Licensee may
-     substitute the following text (omitting the quotes), provided, however,
-     that such text is displayed prominently in the Software alone or in any
-     derivative version prepared by Licensee: "JPython (Version 1.1.x) is
-     made available subject to the terms and conditions in CNRI's License
-     Agreement. This Agreement may be located on the Internet using the
-     following unique, persistent identifier (known as a handle):
-     1895.22/1006. The License may also be obtained from a proxy server on
-     the Web using the following URL: http://hdl.handle.net/1895.22/1006."
-
-  3. In the event Licensee prepares a derivative work that is based on or
-     incorporates the Software or any part thereof, and wants to make the
-     derivative work available to the public as provided herein, then
-     Licensee hereby agrees to indicate in any such work, in a prominently
-     visible way, the nature of the modifications made to CNRI's Software.
-
-  4. Licensee may not use CNRI trademarks or trade name, including JPython
-     or CNRI, in a trademark sense to endorse or promote products or
-     services of Licensee, or any third party. Licensee may use the mark
-     JPython in connection with Licensee's derivative versions that are
-     based on or incorporate the Software, but only in the form
-     "JPython-based ___________________," or equivalent.
-
-  5. CNRI is making the Software available to Licensee on an "AS IS" basis.
-     CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
-     OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY
-     REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
-     PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE
-     ANY THIRD PARTY RIGHTS.
-
-  6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
-     ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
-     USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE
-     THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT
-     ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER
-     MAY NOT APPLY TO LICENSEE.
-
-  7. This License Agreement may be terminated by CNRI (i) immediately upon
-     written notice from CNRI of any material breach by the Licensee, if the
-     nature of the breach is such that it cannot be promptly remedied; or
-     (ii) sixty (60) days following notice from CNRI to Licensee of a
-     material remediable breach, if Licensee has not remedied such breach
-     within that sixty-day period.
-
-  8. This License Agreement shall be governed by and interpreted in all
-     respects by the law of the State of Virginia, excluding conflict of law
-     provisions. Nothing in this Agreement shall be deemed to create any
-     relationship of agency, partnership, or joint venture between CNRI and
-     Licensee.
-
-  9. By clicking on the "ACCEPT" button where indicated, or by installing,
-     copying or otherwise using the Software, Licensee agrees to be bound by
-     the terms and conditions of this License Agreement.
-
-
-===============================================================================
-
-The jars; 
-activation-1.1.jar, 
-jaxb-api-2.1.jar, 
-jaxb-impl-2.1.6.jar, 
-jaxb-xjc-2.1.4.jar, 
-jaxb2-reflection-2.1.4.jar,
-jsr181-api-1.0-MR1.jar, 
-jsr250-api-1.0.jar, 
-jaxws-api-2.1-1.jar, 
-mail-1.4.jar, 
-saaj-api-1.3.jar, 
-servlet-api-2.5.jar, 
-stax-api-1.0-commons-cli-1.0.jar2.jar
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
-      1. Definitions.
-
-            1.1. "Contributor" means each individual or entity that
-            creates or contributes to the creation of Modifications.
-
-            1.2. "Contributor Version" means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-
-            1.3. "Covered Software" means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-
-            1.4. "Executable" means the Covered Software in any form
-            other than Source Code. 
-
-            1.5. "Initial Developer" means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            
-            1.6. "Larger Work" means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-
-            1.7. "License" means this document.
-
-            1.8. "Licensable" means having the right to grant, to the
-            maximum extent possible, whether at the time of the initial
-            grant or subsequently acquired, any and all of the rights
-            conveyed herein.
-            
-            1.9. "Modifications" means the Source Code and Executable
-            form of any of the following: 
-
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-
-            1.10. "Original Software" means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-
-            1.11. "Patent Claims" means any patent claim(s), now owned
-            or hereafter acquired, including without limitation,
-            method, process, and apparatus claims, in any patent
-            Licensable by grantor. 
-
-            1.12. "Source Code" means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-
-            1.13. "You" (or "Your") means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, "You"
-            includes any entity which controls, is controlled by, or is
-            under common control with You. For purposes of this
-            definition, "control" means (a) the power, direct or
-            indirect, to cause the direction or management of such
-            entity, whether by contract or otherwise, or (b) ownership
-            of more than fifty percent (50%) of the outstanding shares
-            or beneficial ownership of such entity.
-
-      2. License Grants. 
-
-            2.1. The Initial Developer Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Initial Developer,
-                  to use, reproduce, modify, display, perform,
-                  sublicense and distribute the Original Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party under the terms of this
-                  License. 
-
-                  (d) Notwithstanding Section 2.1(b) above, no patent
-                  license is granted: (1) for code that You delete from
-                  the Original Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-
-            2.2. Contributor Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, each
-            Contributor hereby grants You a world-wide, royalty-free,
-            non-exclusive license:
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Contributor to
-                  use, reproduce, modify, display, perform, sublicense
-                  and distribute the Modifications created by such
-                  Contributor (or portions thereof), either on an
-                  unmodified basis, with other Modifications, as
-                  Covered Software and/or as part of a Larger Work; and
-                  
-
-                  (b) under Patent Claims infringed by the making,
-                  using, or selling of Modifications made by that
-                  Contributor either alone and/or in combination with
-                  its Contributor Version (or portions of such
-                  combination), to make, use, sell, offer for sale,
-                  have made, and/or otherwise dispose of: (1)
-                  Modifications made by that Contributor (or portions
-                  thereof); and (2) the combination of Modifications
-                  made by that Contributor with its Contributor Version
-                  (or portions of such combination). 
-
-                  (c) The licenses granted in Sections 2.2(a) and
-                  2.2(b) are effective on the date Contributor first
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-
-                  (d) Notwithstanding Section 2.2(b) above, no patent
-                  license is granted: (1) for any code that Contributor
-                  has deleted from the Contributor Version; (2) for
-                  infringements caused by: (i) third party
-                  modifications of Contributor Version, or (ii) the
-                  combination of Modifications made by that Contributor
-                  with other software (except as part of the
-                  Contributor Version) or other devices; or (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-
-            3.1. Availability of Source Code.
-
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-
-            3.2. Modifications.
-
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-
-            3.3. Required Notices.
-
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-
-            3.4. Application of Additional Terms.
-
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipients'
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            However, you may do so only on Your own behalf, and not on
-            behalf of the Initial Developer or any Contributor. You
-            must make it absolutely clear that any such warranty,
-            support, indemnity or liability obligation is offered by
-            You alone, and You hereby agree to indemnify the Initial
-            Developer and every Contributor for any liability incurred
-            by the Initial Developer or such Contributor as a result of
-            warranty, support, indemnity or liability terms You offer.
-          
-
-            3.5. Distribution of Executable Versions.
-
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of a license of Your choice, which may contain terms
-            different from this License, provided that You are in
-            compliance with the terms of this License and that the
-            license for the Executable form does not attempt to limit
-            or alter the recipient's rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form under a
-            different license, You must make it absolutely clear that
-            any terms which differ from this License are offered by You
-            alone, not by the Initial Developer or Contributor. You
-            hereby agree to indemnify the Initial Developer and every
-            Contributor for any liability incurred by the Initial
-            Developer or such Contributor as a result of any such terms
-            You offer.
-
-            3.6. Larger Works.
-
-            You may create a Larger Work by combining Covered Software
-            with other code not governed by the terms of this License
-            and distribute the Larger Work as a single product. In such
-            a case, You must make sure the requirements of this License
-            are fulfilled for the Covered Software. 
-            
-      4. Versions of the License. 
-
-            4.1. New Versions.
-
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-
-            4.2. Effect of New Versions.
-
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-
-            4.3. Modified Versions.
-
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-            
-
-      5. DISCLAIMER OF WARRANTY.
-
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-
-            6.1. This License and the rights granted hereunder will
-            terminate automatically if You fail to comply with terms
-            herein and fail to cure such breach within 30 days of
-            becoming aware of the breach. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as "Participant")
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-
-      7. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-
-      8. U.S. GOVERNMENT END USERS.
-
-      The Covered Software is a "commercial item," as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-      computer software" (as that term is defined at 48 C.F.R. 
-      252.227-7014(a)(1)) and "commercial computer software
-      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users
-      acquire Covered Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-
-      9. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject
-      matter hereof. If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be
-      governed by the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdiction's conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, with the losing
-      party responsible for costs, including, without limitation, court
-      costs and reasonable attorneys' fees and expenses. The
-      application of the United Nations Convention on Contracts for the
-      International Sale of Goods is expressly excluded. Any law or
-      regulation which provides that the language of a contract shall
-      be construed against the drafter shall not apply to this License.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-      10. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis. Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.
-
-===============================================================================
-
-JRuby (jruby-complete-1.0.jar), wsdl4j (wsdl4j-1.6.2.jar):
-
-Common Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-      a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-      b) in the case of each subsequent Contributor:
-
-      i) changes to the Program, and
-
-      ii) additions to the Program;
-
-      where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
-
-      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
-
-      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
-
-      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
-
-      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-      iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form:
-
-      a) it must be made available under this Agreement; and 
-
-      b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
-
-===============================================================================
-
-backport-util-concurrent-2.2.jar:
-
-The software comprising backport-util-concurrent is based in large
-part on the code from JSR166, and the package dl.util.concurrent.
-The software has been released to the public domain, as explained at:
-http://creativecommons.org/licenses/publicdomain, excepting portions
-of the class
-edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList,
-which were adapted from class java.util.ArrayList, written by Sun
-Microsystems, Inc, which are used with kind permission, and subject
-to the following:
-
-Copyright 2002-2004 Sun Microsystems, Inc. All rights reserved. Use is
-subject to the following license terms.
-
-  "Sun hereby grants you a non-exclusive, worldwide, non-transferrable
-  license to use and distribute the Java Software technologies as part
-  of a larger work in source and binary forms, with or without
-  modification, provided that the following conditions are met:
-
-   -Neither the name of or trademarks of Sun may be used to endorse or
-    promote products derived from the Java Software technology without
-    specific prior written permission.
-
-   -Redistributions of source or binary code must be accompanied by the
-    following notice and disclaimers:
-
-    Portions copyright Sun Microsystems, Inc. Used with kind permission.
-
-    This software is provided AS IS, without a warranty of any kind.  ALL
-    EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
-    WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PUPOSE OR
-    NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
-    MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE
-    FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
-    USING, MODIFYING OR DISTRIBUTING THE SOFTWARE OR ITS
-    DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR
-    ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR
-    DATA, OR FOR DIRECT, INDIRECT,CONSQUENTIAL, INCIDENTAL
-    OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF
-    THE THEORY OR LIABILITY, ARISING OUT OF THE USE OF OR
-    INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.
-    HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-    You acknowledge that Software is not designed, licensed or intended for
-    use in the design, construction, operation or maintenance of any nuclear
-    facility."
-
-===============================================================================
-rome-0.9.jar
-
-Copyright 2004 Sun Microsystems, Inc.
-
-Licensed 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.
-
-===============================================================================
-jdom-1.0.jar :
-
-$Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions, and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions, and the disclaimer that follows 
-    these conditions in the documentation and/or other materials 
-    provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
-    derived from this software without prior written permission.  For
-    written permission, please contact <request_AT_jdom_DOT_org>.
- 
- 4. Products derived from this software may not be called "JDOM", nor
-    may "JDOM" appear in their name, without prior written permission
-    from the JDOM Project Management <request_AT_jdom_DOT_org>.
- 
- In addition, we request (but do not require) that you include in the 
- end-user documentation provided with the redistribution and/or in the 
- software itself an acknowledgement equivalent to the following:
-     "This product includes software developed by the
-      JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos 
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many 
- individuals on behalf of the JDOM Project and was originally 
- created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
- Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
- on the JDOM Project, please see <http://www.jdom.org/>. 
-
-========================================================================
-
-dwr-2.0.1.jar :
-
-/*
-* Copyright 2005 Joe Walker
-*
-* Licensed 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.
-*/
-
-==========================================================================
-
-dojotoolkit V1.0.0:
-
-The "New" BSD License:
-**********************
-
-Copyright (c) 2005, The Dojo Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-	list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-	this list of conditions and the following disclaimer in the documentation
-	and/or other materials provided with the distribution.
-  * Neither the name of the Dojo Foundation nor the names of its contributors
-	may be used to endorse or promote products derived from this software
-	without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The module tuscany-implementation-script-1.0-incubating.jar temporarily includes    
-one file under the below BSD license with the following copyright:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-
-The serp-1.12.0.jar is distributed under the BSD license with the following copyright:
-
- Copyright (c) 2002, A. Abram White
- All rights reserved.
-
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-The javacc-3.2.jar, and howl-1.0.1-1.jar are distributed under the BSD license:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The tuscany-assembly-xsd jar includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-================================================================================
-License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
-
-These files being ...
-commonj/sdo/ChangeSummary$Setting.class
-commonj/sdo/ChangeSummary.class
-commonj/sdo/DataGraph.class
-commonj/sdo/DataObject.class
-commonj/sdo/helper/CopyHelper.class
-commonj/sdo/helper/DataFactory.class
-commonj/sdo/helper/DataHelper.class
-commonj/sdo/helper/EqualityHelper.class
-commonj/sdo/helper/HelperContext.class
-commonj/sdo/helper/TypeHelper.class
-commonj/sdo/helper/XMLDocument.class
-commonj/sdo/helper/XMLHelper.class
-commonj/sdo/helper/XSDHelper.class
-commonj/sdo/impl/ExternalizableDelegator$Resolvable.class
-commonj/sdo/impl/ExternalizableDelegator.class
-commonj/sdo/Property.class
-commonj/sdo/Sequence.class
-commonj/sdo/Type.class
-xml/datagraph.xsd
-xml/sdoJava.xml
-xml/sdoJava.xsd
-xml/sdoModel.xml
-xml/sdoModel.xsd
-xml/sdoXML.xml
-xml/sdoXML.xsd
-
-
-License for the Service Data Objects JavaDoc and Interface Definition files.
-
-The Service Data Objects Specification is being provided by the copyright holders under the following 
-license. By using and/or copying this work, you agree that you have read, understood and will comply with 
-the following terms and conditions:
-
-Permission to copy, display and distribute the Service Data Objects Specification and/or portions thereof, without 
-modification, in any medium without fee or royalty is hereby granted, provided that you include the 
-following on ALL copies of the Service Data Objects Specification, or portions thereof, that you make:
-
-1. A link or URL to the Service Data Objects Specification at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2. The full text of this copyright notice as shown in the Service Data Objects Specification.
-
-BEA, IBM, Oracle, Primeton Technologies, Rogue Wave Software, SAP, Software AG, Sun Microsystems, Xcalia, 
-Zend Technologies (collectively, the “Authors”) agree to grant you a royalty-free license, under reasonable, 
-non-discriminatory terms and conditions to patents that they deem necessary to implement the Service Data 
-Objects Specification. 
-
-THE Service Data Objects SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR 
-WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL 
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE SERVICE DATA OBJECTS 
-SPECIFICATION.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity 
-pertaining to the Service Data Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects Specification will at all times remain with the 
-Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-================================================================================
-
diff --git a/java/sca-contrib/distribution/process/src/main/release/bin/NOTICE b/java/sca-contrib/distribution/process/src/main/release/bin/NOTICE
deleted file mode 100644
index 5daa9a3dfe..0000000000
--- a/java/sca-contrib/distribution/process/src/main/release/bin/NOTICE
+++ /dev/null
@@ -1,95 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses XmlSchema developed at 
-The Apache Software Foundation (http://ws.apache.org/commons/XmlSchema)
- Portions Copyright 2006 International Business Machines Corp.
-
-This product includes/uses ode-bpel-api-1.1 developed at
-The Apache Software Foundation (http://ode.apache.org)
- - Copyright 1999-2006 Intalio - This product includes software developed by Intalio (http://www.intalio.com)
- - Copyright 2006 Sybase - This product includes software developed by Sybase.(http://www.sybase.com)
-
-"This product includes software developed by the Spring Framework
- Project (http://www.springframework.org)."
-
-This product includes/uses the Jetty Servlet Engine (http://jetty.mortbay.org),
-developed by Mort Bay Consulting  (http://www.mortbay.com)
-
-This product includes/uses the Groovy Script Engine (http://groovy.codehaus.org/),
-Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
-This product includes/uses the Axion : the Open Source Java Database (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
-
-This product includes/uses DOM4J : the flexible XML framework for java (http://www.dom4j.org/) 
- Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)
-License: Public Domain 
-
-This product includes/uses JSON-RPC-Java (http://oss.metaparadigm.com/jsonrpc/)
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product includes software from the GlassFish project (https://glassfish.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-    
-This product includes software from the Rome project (https://rome.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-
-This product includes/uses the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
-
-This product includes/uses the Mozilla Rhino project (http://www.mozilla.org/rhino/)
-
-This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)i
-
-This product includes/uses the Codehaus JRuby project (http://jruby.codehaus.org/)
-
-This product includes/uses JDOM (http://www.jdom.org/)
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved.
- 
-This product includes/uses DWR (http://getahead.org/dwr)
- Copyright 2005 Joe Walker. All rights reserved.
- 
-This product includes/uses dojotoolkit (http://dojotoolkit.org/)
- Copyright (c) 2005, The Dojo Foundation. All rights reserved.
-
-This product includes/uses Howl (http://howl.objectweb.org/)
- Copyright (c) 2004, Bull S.A.
-
-This product includes/uses axion (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team.
-
-This product includes/uses javacc (https://javacc.dev.java.net/)
- Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.
-
-The Program includes all or portions of the following software: "The 
-Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under
-an MPL v1.0 license. Please refer to the homepage URL at 
-http://www.saxonica.com/.
-
-This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:
- Copyright (c) 2002, A. Abram White. All rights reserved.
-
-This product also includes software under the BSD license
-with the following copyright:
- Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
diff --git a/java/sca-contrib/distribution/process/src/main/release/src/BUILDING b/java/sca-contrib/distribution/process/src/main/release/src/BUILDING
deleted file mode 100644
index 65d09c5eae..0000000000
--- a/java/sca-contrib/distribution/process/src/main/release/src/BUILDING
+++ /dev/null
@@ -1,55 +0,0 @@
-Building the Apache Tuscany SCA 1.2 (incubating) April 2008 Release source distribution
-=======================================================================================
-
-Initial Setup
--------------
-
-1) Install J2SE 5.0 SDK, which can be downloaded from 
-   http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_06 JDK or higher.
-
-2) Make sure that your JAVA_HOME environment variable is set to the newly installed 
-   JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 
-   $JAVA_HOME$/bin (unix).
-
-3) Install Maven 2.0.7 or higher, which can be downloaded from 
-   http://maven.apache.org/download.html. Make sure that your PATH includes 
-   the MVN_HOME/bin directory. 
-
-4) Make sure that your MAVEN_OPTS environment variable has -Xmx128M (or more),
-   you can manually do this by executing the following in your prompt :
-   Windows users:
-      set MAVEN_OPTS=-Xmx128M
-   Unix users:
-      export MAVEN_OPTS=-Xmx128M
-
-
-Building
---------
-
-1) Change to the top level directory of Apache Tuscany source distribution.
-2) Run
-
-	$> mvn
-
-   This will compile Apache Tuscany and run all of the tests in the source
-   distribution. 
-
-   Depending on the load of remote Maven 2.0 repositories, you may have 
-   to run "mvn" several times utill the required dependencies are 
-   all located in your local maven repository. It usually takes some time for 
-   maven to download required dependencies in the first build. Once all the 
-   dependencies have been downloaded you may use the -o option to run maven
-   in offline mode, for example, 'mvn clean install -o'.
-
-
-Building the distributions
---------------------------
-
-1) Change to the distribution folder
-2) Run
-
-	$> mvn
-
-   This will build the binary and source distribution with .zip and .gz 
-   formats in the distribution/target directory.
-
diff --git a/java/sca-contrib/distribution/process/src/main/release/src/LICENSE b/java/sca-contrib/distribution/process/src/main/release/src/LICENSE
deleted file mode 100644
index 144d8ae692..0000000000
--- a/java/sca-contrib/distribution/process/src/main/release/src/LICENSE
+++ /dev/null
@@ -1,397 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================================================
-
-The module itest/databindings/common includes the test schema; datagraph.xsd, sdoJava.xsd, and sdoModel.xsd
-under the following license:
-
-License for the Service Data Objects JavaDoc, Interface Definition files
-and XSD files.
-
-The Service Data Objects JavaDoc, Interface Definition files and XSD files 
-are being provided by the copyright holders under the following license. 
-By using and/or copying this work, you agree that you have read, 
-understood and will comply with the following terms and conditions:
-
-Permission to copy, display, make derivative works of and distribute 
-the Service Data Objects JavaDoc, Interface Definition files and XSD files
-(the "Artifacts") in any medium without fee or royalty is hereby granted, 
-provided that you include the following on ALL copies of the Artifacts, 
-or portions thereof, that you make:
-
-1.	A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2.	The full text of this copyright notice as shown in the Artifacts.
-
-
-
-THE ARTIFACTS ARE PROVIDED "AS IS" AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE. 
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Data 
-Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects 
-Specification will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.11, last updated on 2007/12/21
-
-=================================================================================================================
-
-The module implementation-script temporarily includes one file under the following BSD license:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-=================================================================================================================
-
-The module assembly-xsd includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-=================================================================================================================
-The modules 
-
-binding-ws-xml
-databinding
-databinding-axiom
-databinding-jaxb
-databinding-json
-databinding-sdo
-databinding-sdo-axiom
-databinding-xmlbeans
-interface-wsdl-xml
-
-Include the ipo.xsd and address.xsd information from the XML Schema Primer 
-(http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) combined into the 
-file ipo.xsd and extended with UK postcode structures.
-
-The ipo.xsd file is include under the following license:
-
-W3C(c) SOFTWARE NOTICE AND LICENSE
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other 
-related items) is being provided by the copyright holders under the following 
-license. By obtaining, using and/or copying this work, you (the licensee) agree 
-that you have read, understood, and will comply with the following terms and conditions.
-
-Permission to copy, modify, and distribute this software and its documentation, 
-with or without modification, for any purpose and without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies of the 
-software and documentation or portions thereof, including modifications:
-
-   1. The full text of this NOTICE in a location viewable to users of the 
-      redistributed or derivative work.
-   2. Any pre-existing intellectual property disclaimers, notices, or terms 
-      and conditions. If none exist, the W3C Software Short Notice should be 
-      included (hypertext is preferred, text is permitted) within the body of 
-      any redistributed or derivative code.
-   3. Notice of any changes or modifications to the files, including the date 
-      changes were made. (We recommend you provide URIs to the location from which 
-      the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
-NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or 
-publicity pertaining to the software without specific, written prior permission. 
-Title to copyright in this software and any associated documentation will at all 
-times remain with copyright holders.
diff --git a/java/sca-contrib/distribution/process/src/main/release/src/NOTICE b/java/sca-contrib/distribution/process/src/main/release/src/NOTICE
deleted file mode 100644
index 31540fd607..0000000000
--- a/java/sca-contrib/distribution/process/src/main/release/src/NOTICE
+++ /dev/null
@@ -1,39 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product also includes software under the BSD license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-  Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
-This product includes software under the W3C(c) Software License
-with the following copyright:
-    
-Copyright (c) 2008 World Wide Web Consortium, (Massachusetts Institute of Technology, 
-European Research Consortium for Informatics and Mathematics, Keio University). 
-All Rights Reserved. This work is distributed under the W3C(c) Software License [1] in 
-the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
diff --git a/java/sca-contrib/distribution/repository/pom.xml b/java/sca-contrib/distribution/repository/pom.xml
deleted file mode 100644
index 7da3dffadf..0000000000
--- a/java/sca-contrib/distribution/repository/pom.xml
+++ /dev/null
@@ -1,188 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-distribution</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-distribution-repository</artifactId>

-    <name>Apache Tuscany SCA Maven Repository Distribution</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-repository</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-    </dependencies>

-

-    <profiles>

-    

-        <!-- Default build profile that can be used to build the distro packages -->

-        <profile>

-            <id>distribution</id>

-            <build>

-                <plugins>

-                    <plugin>

-                        <groupId>org.apache.maven.plugins</groupId>

-                        <artifactId>maven-assembly-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>distribution-package</id>

-                                <phase>package</phase>

-                                <goals>

-                                    <goal>single</goal>

-                                </goals>

-                                <configuration>

-                                    <descriptors>

-                                        <descriptor>src/main/assembly/repository.xml</descriptor>

-                                    </descriptors>

-                                    <tarLongFileMode>gnu</tarLongFileMode>

-                                    <finalName>apache-tuscany-sca-repository-2.0-SNAPSHOT</finalName>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-                </plugins>

-            </build>

-        </profile>    

-

-        <!-- Profile that can be used to build the modules included in the distro -->

-        <profile>

-            <id>modules</id>

-            <modules>

-                <module>../../../modules/assembly</module>

-                <module>../../../modules/assembly-xml</module>

-                <module>../../../modules/assembly-xsd</module>

-                <module>../../../modules/binding-atom</module>

-                <module>../../../modules/binding-atom-abdera</module>

-                <module>../../../modules/binding-corba</module>

-                <module>../../../modules/binding-corba-runtime</module>

-                <module>../../../modules/binding-ejb</module>

-                <module>../../../modules/binding-ejb-runtime</module>

-                <module>../../../modules/binding-gdata</module>

-                <module>../../../modules/binding-gdata-gsoc</module>

-                <module>../../../modules/binding-gdata-runtime</module>

-                <module>../../../modules/binding-gdata-runtime-gsoc</module>

-                <module>../../../modules/binding-http</module>

-                <module>../../../modules/binding-http-runtime</module>

-                <module>../../../modules/binding-jms</module>

-                <module>../../../modules/binding-jms-runtime</module>

-                <module>../../../modules/binding-jsonrpc</module>

-                <module>../../../modules/binding-jsonrpc-runtime</module>

-                <module>../../../modules/binding-rmi</module>

-                <module>../../../modules/binding-rmi-runtime</module>

-                <module>../../../modules/binding-rss</module>

-                <module>../../../modules/binding-rss-rome</module>

-                <module>../../../modules/binding-sca</module>

-                <module>../../../modules/binding-sca-axis2</module>

-                <module>../../../modules/binding-sca-xml</module>

-                <module>../../../modules/binding-ws</module>

-                <module>../../../modules/binding-ws-axis2</module>

-                <module>../../../modules/binding-ws-axis2-policy</module>

-                <module>../../../modules/binding-ws-wsdlgen</module>

-                <module>../../../modules/binding-ws-xml</module>

-                <module>../../../modules/contribution</module>

-                <module>../../../modules/contribution-java</module>

-                <module>../../../modules/contribution-namespace</module>

-                <module>../../../modules/contribution-resource</module>

-                <module>../../../modules/contribution-xml</module>

-                <module>../../../modules/core</module>

-                <module>../../../modules/core-databinding</module>

-                <module>../../../modules/core-spi</module>

-                <module>../../../modules/data-api</module>

-                <module>../../../modules/databinding</module>

-                <module>../../../modules/databinding-axiom</module>

-                <module>../../../modules/databinding-fastinfoset</module>

-                <module>../../../modules/databinding-jaxb</module>

-                <module>../../../modules/databinding-jaxb-axiom</module>

-                <module>../../../modules/databinding-json</module>

-                <module>../../../modules/databinding-saxon</module>

-                <module>../../../modules/databinding-sdo</module>

-                <module>../../../modules/databinding-sdo-axiom</module>

-                <module>../../../modules/databinding-xmlbeans</module>

-                <module>../../../modules/definitions</module>

-                <module>../../../modules/definitions-xml</module>

-                <module>../../../modules/domain-manager</module>

-                <module>../../../modules/endpoint</module>

-                <module>../../../modules/extensibility</module>

-                <module>../../../modules/extensibility-equinox</module>

-                <module>../../../modules/host-corba</module>

-                <module>../../../modules/host-corba-jee</module>

-                <module>../../../modules/host-corba-jse</module>

-                <module>../../../modules/host-http</module>

-                <module>../../../modules/host-jetty</module>

-                <module>../../../modules/host-rmi</module>

-                <module>../../../modules/implementation-bpel</module>

-                <module>../../../modules/implementation-bpel-ode</module>

-                <module>../../../modules/implementation-ejb</module>

-                <module>../../../modules/implementation-java</module>

-                <module>../../../modules/implementation-java-runtime</module>

-                <module>../../../modules/implementation-java-xml</module>

-                <module>../../../modules/implementation-node</module>

-                <module>../../../modules/implementation-node-runtime</module>

-                <module>../../../modules/implementation-resource</module>

-                <module>../../../modules/implementation-resource-runtime</module>

-                <module>../../../modules/implementation-script</module>

-                <module>../../../modules/implementation-script-runtime</module>

-                <module>../../../modules/implementation-spring</module>

-                <module>../../../modules/implementation-widget</module>

-                <module>../../../modules/implementation-widget-runtime</module>

-                <module>../../../modules/implementation-xquery</module>

-                <module>../../../modules/interface</module>

-                <module>../../../modules/interface-java</module>

-                <module>../../../modules/interface-java-jaxws</module>

-                <module>../../../modules/interface-java-xml</module>

-                <module>../../../modules/interface-wsdl</module>

-                <module>../../../modules/interface-wsdl-xml</module>

-                <module>../../../modules/monitor</module>

-                <module>../../../modules/node-api</module>

-                <module>../../../modules/node-impl</module>

-                <module>../../../modules/node-launcher</module>

-                <module>../../../modules/node-launcher-equinox</module>

-                <module>../../../modules/node-launcher-webapp</module>

-                <module>../../../modules/node-manager</module>

-                <module>../../../modules/policy</module>

-                <module>../../../modules/policy-security</module>

-                <module>../../../modules/policy-security-jsr250</module>

-                <module>../../../modules/policy-security-ws</module>

-                <module>../../../modules/policy-transaction</module>

-                <module>../../../modules/policy-xml</module>

-                <module>../../../modules/policy-xml-ws</module>

-                <module>../../../modules/sca-api</module>

-                <module>../../../modules/tracing-aspectj</module>

-                <module>../../../modules/workspace</module>

-                <module>../../../modules/workspace-impl</module>

-                <module>../../../modules/workspace-xml</module>

-                <module>../../../modules/xsd</module>

-                <module>../../../modules/xsd-xml</module>

-            </modules>

-        </profile>

-    </profiles>

-

-</project>

diff --git a/java/sca-contrib/distribution/repository/src/main/assembly/repository.xml b/java/sca-contrib/distribution/repository/src/main/assembly/repository.xml
deleted file mode 100644
index 03d8732bd6..0000000000
--- a/java/sca-contrib/distribution/repository/src/main/assembly/repository.xml
+++ /dev/null
@@ -1,43 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id></id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-    </componentDescriptors>
-
-    <repositories>
-        <repository>
-            <includeMetadata>true</includeMetadata>
-            <outputDirectory>repository</outputDirectory>
-        </repository>
-    </repositories>
-</assembly>
diff --git a/java/sca-contrib/distribution/repository/src/main/components/src-modules.xml b/java/sca-contrib/distribution/repository/src/main/components/src-modules.xml
deleted file mode 100644
index 0736faf913..0000000000
--- a/java/sca-contrib/distribution/repository/src/main/components/src-modules.xml
+++ /dev/null
@@ -1,173 +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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add module sources to the modules directory -->
-        <fileSet>
-            <directory>../../../modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>assembly/**/*</include>
-                <include>assembly-xml/**/*</include>
-                <include>assembly-xsd/**/*</include>
-                <include>binding-atom/**/*</include>
-                <include>binding-atom-abdera/**/*</include>
-                <include>binding-corba/**/*</include>
-                <include>binding-corba-runtime/**/*</include>
-                <include>binding-ejb/**/*</include>
-                <include>binding-ejb-runtime/**/*</include>
-                <include>binding-gdata/**/*</include>
-                <include>binding-gdata-gsoc/**/*</include>
-                <include>binding-gdata-runtime/**/*</include>
-                <include>binding-gdata-runtime-gsoc/**/*</include>
-                <include>binding-http/**/*</include>
-                <include>binding-http-runtime/**/*</include>
-                <include>binding-jms/**/*</include>
-                <include>binding-jms-runtime/**/*</include>
-                <include>binding-jsonrpc/**/*</include>
-                <include>binding-jsonrpc-runtime/**/*</include>
-                <include>binding-rmi/**/*</include>
-                <include>binding-rmi-runtime/**/*</include>
-                <include>binding-rss/**/*</include>
-                <include>binding-rss-rome/**/*</include>
-                <include>binding-sca/**/*</include>
-                <include>binding-sca-axis2/**/*</include>
-                <include>binding-sca-xml/**/*</include>
-                <include>binding-ws/**/*</include>
-                <include>binding-ws-axis2/**/*</include>
-                <include>binding-ws-axis2-policy/**/*</include>
-                <include>binding-ws-wsdlgen/**/*</include>
-                <include>binding-ws-xml/**/*</include>
-                <include>contribution/**/*</include>
-                <include>contribution-impl/**/*</include>
-                <include>contribution-java/**/*</include>
-                <include>contribution-namespace/**/*</include>
-                <include>contribution-resource/**/*</include>
-                <include>contribution-xml/**/*</include>
-                <include>core/**/*</include>
-                <include>core-databinding/**/*</include>
-                <include>core-spi/**/*</include>
-                <include>data-api/**/*</include>
-                <include>databinding/**/*</include>
-                <include>databinding-axiom/**/*</include>
-                <include>databinding-fastinfoset/**/*</include>
-                <include>databinding-jaxb/**/*</include>
-                <include>databinding-jaxb-axiom/**/*</include>
-                <include>databinding-json/**/*</include>
-                <include>databinding-saxon/**/*</include>
-                <include>databinding-sdo/**/*</include>
-                <include>databinding-sdo-axiom/**/*</include>
-                <include>databinding-xmlbeans/**/*</include>
-                <include>definitions/**/*</include>
-                <include>definitions-xml/**/*</include>
-                <include>distribution-all/**/*</include>
-                <include>distribution-core/**/*</include>
-                <include>distribution-core/**/*</include>
-                <include>distribution-core:zip/**/*</include>
-                <include>distribution-ejava/**/*</include>
-                <include>distribution-ejava/**/*</include>
-                <include>distribution-ejava:zip/**/*</include>
-                <include>distribution-manager/**/*</include>
-                <include>distribution-manager/**/*</include>
-                <include>distribution-manager:zip/**/*</include>
-                <include>distribution-process/**/*</include>
-                <include>distribution-process/**/*</include>
-                <include>distribution-process:zip/**/*</include>
-                <include>distribution-web20/**/*</include>
-                <include>distribution-web20/**/*</include>
-                <include>distribution-web20:zip/**/*</include>
-                <include>distribution-webservice/**/*</include>
-                <include>distribution-webservice/**/*</include>
-                <include>distribution-webservice:zip/**/*</include>
-                <include>domain-manager/**/*</include>
-                <include>endpoint/**/*</include>
-                <include>extensibility/**/*</include>
-                <include>extensibility-equinox/**/*</include>
-                <include>host-corba/**/*</include>
-                <include>host-corba-jee/**/*</include>
-                <include>host-corba-jse/**/*</include>
-                <include>host-http/**/*</include>
-                <include>host-jetty/**/*</include>
-                <include>host-rmi/**/*</include>
-                <include>implementation-bpel/**/*</include>
-                <include>implementation-bpel-ode/**/*</include>
-                <include>implementation-ejb/**/*</include>
-                <include>implementation-java/**/*</include>
-                <include>implementation-java-runtime/**/*</include>
-                <include>implementation-java-xml/**/*</include>
-                <include>implementation-node/**/*</include>
-                <include>implementation-node-runtime/**/*</include>
-                <include>implementation-resource/**/*</include>
-                <include>implementation-resource-runtime/**/*</include>
-                <include>implementation-script/**/*</include>
-                <include>implementation-script-runtime/**/*</include>
-                <include>implementation-spring/**/*</include>
-                <include>implementation-widget/**/*</include>
-                <include>implementation-widget-runtime/**/*</include>
-                <include>implementation-xquery/**/*</include>
-                <include>interface/**/*</include>
-                <include>interface-java/**/*</include>
-                <include>interface-java-jaxws/**/*</include>
-                <include>interface-java-xml/**/*</include>
-                <include>interface-wsdl/**/*</include>
-                <include>interface-wsdl-xml/**/*</include>
-                <include>java2wsdl/**/*</include>
-                <include>maven-ant-generator/**/*</include>
-                <include>maven-bundle-plugin/**/*</include>
-                <include>maven-incremental-build/**/*</include>
-                <include>maven-java2wsdl/**/*</include>
-                <include>maven-wsdl2java/**/*</include>
-                <include>monitor/**/*</include>
-                <include>node-api/**/*</include>
-                <include>node-impl/**/*</include>
-                <include>node-launcher/**/*</include>
-                <include>node-launcher-equinox/**/*</include>
-                <include>node-launcher-webapp/**/*</include>
-                <include>node-manager/**/*</include>
-                <include>policy/**/*</include>
-                <include>policy-security/**/*</include>
-                <include>policy-security-jsr250/**/*</include>
-                <include>policy-security-ws/**/*</include>
-                <include>policy-transaction/**/*</include>
-                <include>policy-xml/**/*</include>
-                <include>policy-xml-ws/**/*</include>
-                <include>sca-api/**/*</include>
-                <include>tracing-aspectj/**/*</include>
-                <include>workspace/**/*</include>
-                <include>workspace-impl/**/*</include>
-                <include>workspace-xml/**/*</include>
-                <include>wsdl2java/**/*</include>
-                <include>xsd/**/*</include>
-                <include>xsd-xml/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
diff --git a/java/sca-contrib/distribution/repository/src/main/release/CHANGES b/java/sca-contrib/distribution/repository/src/main/release/CHANGES
deleted file mode 100644
index 3de7358ec6..0000000000
--- a/java/sca-contrib/distribution/repository/src/main/release/CHANGES
+++ /dev/null
@@ -1,431 +0,0 @@
-Changes With Apache Tuscany SCA 1.2 (incubating) April 2008 

-===========================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-2027

-  * TUSCANY-1999

-  * TUSCANY-2037

-  * TUSCANY-2034

-  * TUSCANY-2038

-  * TUSCANY-2043

-  * TUSCANY-2046

-  * TUSCANY-2047

-  * TUSCANY-2028

-  * TUSCANY-1873

-  * TUSCANY-2049

-  * TUSCANY-2035

-  * TUSCANY-1206

-  * TUSCANY-2036 

-  * TUSCANY-1771

-  * TUSCANY-2013

-  * TUSCANY-1926

-  * TUSCANY-1917

-  * TUSCANY-1949

-  * TUSCANY-1941

-  * TUSCANY-2045

-  * TUSCANY-2057

-  * TUSCANY-2055

-  * TUSCANY-2056

-  * TUSCANY-2072

-  * TUSCANY-2047

-  * TUSCANY-2073

-  * TUSCANY-1977 

-  * TUSCANY-2075

-  * TUSCANY-1894

-  * TUSCANY-2079

-  * TUSCANY-2078

-  * TUSCANY-2080

-  * TUSCANY-2068

-  * TUSCANY-1950

-  * TUSCANY-2077

-  * TUSCANY-2056

-  * TUSCANY-2088

-  * TUSCANY-2086

-  * TUSCANY-2094

-  * TUSCANY-2106 

-

-  Features and/or Enhancements

-

-  * Core

-    - Interceptor Enhancements

-      - Phase-based interceptor ordering to allow contribution of new interceptors and also define the order in witch they should be invoked

-      - Pass-by-reference SPI to allow interceptors to indicate if they support pass-by-reference

-      - PolicyProvider SPIs to allow extensions to plugin policy interceptors

-    - Support for JAXWS annotations and mapping of faults to Java exceptions according to JAXWS specification

-    - Improvement of contribution service to allow it to be used outside of the runtime environment 

-    - Support for Contribution Import/Export resource

-    - Enhanced Distributed Domain story using Workspace

-      - Implementation of a SCA domain allowing a system administrator to manage contributions, composites and sca nodes that run these composites

-        - Set of core services providing management capabilities

-        - Administration web interface

-        - This is a work in progress and you can see it in action in samples/calculator-distributed. Other samples that use distributed operation are yet to move over to the workspace.

-    - Enhanced support for SCA Policy spec

-      - Ability to apply external policy definitions to a SCA composition

-      - Ability to spread policy definitions to multiple definitions.xml files available across the sca domain

-      - Bug fixes

-    - Improvements of http binding to support servlet components

-    - Enable Tuscany to run inside an OSGi runtime

-

-  * Web 2.0 Extensions

-    - Enhancements to implementation.widget (support for properties)

-    - New atom binding based on Apache Abdera

-    - Refactoring of rss-rome binding

-  * Other Extensions

-    - Binding JMS

-      - greatly simplified the use of the JMS binding, support locating JMS resources from JNDI, and better compliance with the SCA JMS binding spec

-      - see the doc page for more details: http://incubator.apache.org/tuscany/sca-java-bindingjms.html

-    - Enhancements to Binding RMI

-      - Support shared RMI registry and use 999x as the ports in test case to avoid 1099 conflict

-    - Enhancements to Groovy extension

-      - Support for 'native' groovy classes

-    - Enhancements to OSGi bundle contributions

-      - Support Bundle URLs to be added as contributions

-

-  * Tools

-    - Eclipse plugin providing a Tuscany runtime Library and Tuscany launcher in Eclipse environment
-       - An updatesite is also available to facilitate the plugin installation using the Eclipse update manager

-

-  * Samples/Tutorial/Demos

-    - calculator-distributed migrated to use new Tuscany Distributed Workspace

-    - sample-calculator-ws-secure-webapp

-    - sample-helloworld-jms-webapp

-    - new jms samples

-    - improve bigbank demo to include support for policies 

-    - tutorial store changes

-      - use of import/export

-      - development of contribution without requiring dependencies on the Tuscany runtime

-      - usage of new sca domain infrastructure

-

-  * Testing

-    - Web Container Testing Framework integrated with (Tomcat, Jetty, Geronimo and Websphere)

-

-

-Changes With Apache Tuscany SCA 1.1 (incubating) January 2008 

-===============================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1939

-  * TUSCANY-1914

-  * TUSCANY-1854

-  * TUSCANY-1931

-  * TUSCANY-1547

-  * TUSCANY-1909

-  * TUSCANY-1919

-  * TUSCANY-1930

-  * TUSCANY-1806

-  * TUSCANY-1804

-  * TUSCANY-1916

-  * TUSCANY-1913

-  * TUSCANY-1834

-  * TUSCANY-1857

-  * TUSCANY-1687

-  * TUSCANY-1801

-  * TUSCANY-1742

-  * TUSCANY-1762

-  * TUSCANY-1945

-  * TUSCANY-1595

-  * TUSCANY-1594

-  * TUSCANY-1849

-  * TUSCANY-1836

-  * TUSCANY-1934

-  * TUSCANY-1902

-  * TUSCANY-1608

-  * TUSCANY-1943

-  * TUSCANY-1896

-  * TUSCANY-1626

-  * TUSCANY-1797

-  * TUSCANY-1601

-  * TUSCANY-1415

-

-- Better JMS support

-  * binding.jms supporting point to point text based messaging only

-  * New SOAP/JMS sample (helloworld-ws-reference/service-jms)

-

-- Improvements in PolicyFramework Support

-  * Support for policy specifications on operation elements in a composite definition

-  * Separate sample (calculator-implementation-policies) to demonstrate use of Implementation Policies 

-    (uses logging and JAAS Authentication)

-

-- Modeling of client side java script components

-  * See implementation.widget

-

-- Evolving support for doman API suggested by assembly spec including a standalone node and nodes running 

-  connected together in a domain. This is still experimental. 

- 

-- Class loading and OSGI improvements

-  * Enable Tuscany to be run in a multi-classloader environment including inside OSGi. By default,

-    Tuscany continues to run using a single CLASSPATH-based classloader.

-  * Contributions no longer need to be in the CLASSPATH. All import/export dependencies across contributions should be 

-    explicitly specified (as described in the spec).

-

-- JAXB based POJO transformations

-

-Changes With Apache Tuscany SCA 1.0.1 (incubating) November 2007 

-================================================================

-

-The Tuscany SCA Java 1.0.1 is mainly a bug-fix release. It also comes with some improvements as listed below.

- 

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1848

-  * TUSCANY-1857

-  * TUSCANY-1859

-  * TUSCANY-1801

-  * TUSCANY-1823

-  * TUSCANY-1839

-  * TUSCANY-1814

-  * TUSCANY-1818

-  * TUSCANY-1834

-  * TUSCANY-1637

-  * TUSCANY-1826

-  * TUSCANY-1823

-  * TUSCANY-1819

-  * TUSCANY-1821

-  * TUSCANY-1822

-  * TUSCANY-1806

-  * TUSCANY-1808

-  * TUSCANY-1756

-  * TUSCANY-1757

-

-- Fix build issues with Maven 2.0.7 and JDK 6

-

-- Reduce memory consumption for WSDLs that import large XSDs

-

-- Add more logging statements for better servicibility

-

-- Add an extension point to allow extensions to plug-in extension schemas.

-

-- Add a demo application to showcase XML integration story 

-

-- Improve in databinding framework

-  * Add support for JSON Databindings and other refactoring

-  * Set databinding for introspected data type and enhance the checking of wrapper style

-  * Improve the tree-based XMLStreamReader and convert Bean & DOM to use this approach

-  * Add a tree-iterator based XMLStreamReader base impl

-  * Add default element info to java interface

-  * Rename Interface.setDefaultDataBinding to resetDataBinding

-

-- Limit the method injection to setters and allow the setter annotation to override field annotation

-

-- Evolving support in Intent and Policy handling

-  * Add support for policies in implementation

-  * Fix the algorithm for macthing policySets defined on bindings for the wire

-  * Add policy intent for implementation.java

-  * Extend java implementation type to recognize and apply policies, adding util support for this in Policy module

-  * Add policy module for logging

-

-- Evolving development in the SCA Domain/Node

-

-- Update NOTICE files with missing dependencies

-

-

-Changes With Apache Tuscany SCA 1.0 (incubating) September 2007 

-===============================================================

-

-- Tuscany Java SCA now implements V1.0 of the core SCA 

-  specifications

-        SCA Assembly Model V1.0

-        SCA Java Common Annotations and APIs V1.0

-        SCA Java Component Implementation V1.0

-        SCA Web Services Binding V1.0

-  Including callbacks, conversations and callable references

-  

-

-- Support for ws-security configurable in the web services binding

-  thro Tuscany SCA policy intents and policysets using the policy framework 

-  introduced in the last release.  

-  

-  Note : This release supports specifications of policies around axis2

-         config params - see helloworld-ws-service-secure sample.  The policy

-         intents that have been tested are authentication, integrity and 

-         confidentiality.  

-         There is no sample or test that exercises confidentiality since there

-         are some unresolved licensing issue around bouncycastle libraries.  

-         However, users who are not encumbered by the bouncycastle license 

-         restrictions can try the 'confidentiality' intent. See FAQ - 

-         http://incubator.apache.org/tuscany/tuscany-sca-java-faq.html

-                

-         This release does not include support for WS-Policy

-         attachments in Tuscany Policysets for ws-security.

-         

-  

-- An XQuery component implementation type 

-        implementation-xquery

-        

-

-- A Databinding for converting data to and from nodes for XQuery 

-  processing

-        databinding-saxon

-        

-

-- OSGI support has been extended to allow Tuscany contributions 

-  packaged as OSGI bundles hence taking advantage of OSGI's bundle

-  loading an dependency management capabilities 

-  

-

-- A BPEL component implementation type experimental implementation

-based on SCA BPEL Client and Implementation V1.0. At the moment only

-supports BPEL process as services.

-	implementation-bpel

-

-

-- The distributed runtime implementation has been separated out 

-  into 

-        *) domain

-        *) node

-  It is now wrapped by a SCADomain interface as is the standalone 

-  runtime.

-  

-  Note: This release does not include support for WebApp host deployment 

-        for a distributed SCA Domain 

-  

-

-

-- The web service binding will now generate WSDL automatically

-  based on the service interface if no WSDL is provided

-  

-

-- A new "store" sample and associated document show how a 

-  simple store front application can be constructed 

-        samples/store

-        

-- The following features of this release are still experimental:

-     - BPEL implementation type, integrating with Apache ODE

-     - OSGI implementation type, integrating with Apache Felix

-     - XQuery implementation type

-

- 

-

-Changes With Apache Tuscany SCA 0.99 (incubating) August 2007 

-=============================================================

-

-The following are the significant additions to release 0.99 

-over and above all of what was offered in release 0.91.

-

-- A version of the default sca binding that works between

-  components runing in separate Java virtual machines

-       binding-sca-axis

-

-- A simple node implementation and a service discovery 

-  function for running sca applications distributed 

-  across more than one node

-       distributed

-       distributed-impl 

-

-- integration with OSGi runtimes is now supported with

-  a new implementation-osgi component type

-

-- PUB/SUB interactions are now supported by using new 

-  notification binding and implementation types, and

-  samples demonstrating the feature.

-

-- The Tuscany runtime now has a policy framework supporting

-  the SCA policy specification

-

-- the endpoint URIs used by SCA bindings has been rationalized 

-  and now follows the SCA Assembly specification

-

-- binding-ajax has been renamed to binding-dwr

-

-Changes With Apache Tuscany SCA 0.91 (incubating) July 2007 

-===========================================================

-

-The following are the significant additions to release 0.91 

-over and above all of what was offered in release 0.90.

-

-

-- Enhancements to support multiple contributions to the SCA Domain

-

-- The inclusion of a alternative simplified extensions-helper

-SPI layer to faciliate rapid development of extensions

-

-- More Implementation Extenstions

-        Spring

-        WebResource

-

-- More Binding Extensions

-        AJAX

-        EJB

-        RSS/ATOM Feeds

-        

-- Demos that demonstrate the use of a mix of extensions

-         alert-aggregator-webapp

-         bigbank-account

-         bigbank-calculator

-         bigbank-stockquote

-

-

-- Samples

-        Samples to demostrate use of Spring, Resource, AJAX extensions

-

-Changes With Apache Tuscany SCA 0.90 (incubating) June 2007 

-===========================================================

-

-- Implementations for all of the Java Annotations and API Specification V1.0 found at

-  (http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications) 

-  apart from the following.

-    @ComponentName

-    Conversation

-    RequestContext

-    

-- New assembly model implementation taking into account SCA 1.0 artifacts 

-  Data duplication between assembly model and runtime removed

-

-- Simple single process domain support

-  Contribution support to scope items being deployed into the runtime

-

-- Improved Package/Class naming consistency across modules

-

-- Extensions now loaded via Java service mechanism

-  Refactored extensions to use new SPIs (see below)

-

-- Maven and Ant based sample builds in the binary distribution

-

-- Implementation Extensions

-    Java

-    Script supporting (Ruby, Python, Groovy, JavaScript)

-

-- Binding Extensions

-    Axis2

-    RMI

-    JSONRPC

-

--Databinding Extensions

-    Axiom

-    JAXB

-    SDO

-

-- Host environments

-    Embedded

-    Tomcat

-    Jetty

-    RMI

-

-- A clear set of SPIs intended to be stable over future releases

-    SCA assembly model

-      org.apache.tuscany.sca.assembly

-      org.apache.tuscany.sca.interfacedef

-      org.apache.tuscany.sca.interfacedef.java

-      org.apache.tuscany.sca.interfacedef.wsdl

-      org.apache.tuscany.sca.policy

-

-    SCA contribution model

-      org.apache.tuscany.sca.contribution

-

-    Runtime extensions

-      org.apache.tuscany.sca.core

-      org.apache.tuscany.sca.invocation

-      org.apache.tuscany.sca.provider

-      org.apache.tuscany.sca.runtime

-      org.apache.tuscany.sca.work

-

-    Data binding support

-      org.apache.tuscany.sca.databinding

-

-    Embedding Tuscany

-      org.apache.tuscany.sca.host.embedded

-

-    Servlet container integration

-      org.apache.tuscany.sca.http

-

-- For this point release a partial set of JavaDoc is provided to 

-  be filled out as we close on release 1.0

diff --git a/java/sca-contrib/distribution/repository/src/main/release/README b/java/sca-contrib/distribution/repository/src/main/release/README
deleted file mode 100644
index 4d83dcfde9..0000000000
--- a/java/sca-contrib/distribution/repository/src/main/release/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 README
-=====================================================
-
-Welcome to the Tuscany SCA 1.2 release. 
-
-See the RELEASE_NOTES file for information specific to this release.
-
-In the binary release see the INSTALL file for information on how to 
-install the release.
-
-In the source distribution see the BUILDING file for information on
-building the source code.
-
-
-
-
-
-
-
diff --git a/java/sca-contrib/distribution/repository/src/main/release/RELEASE_NOTES b/java/sca-contrib/distribution/repository/src/main/release/RELEASE_NOTES
deleted file mode 100644
index a04ef5c553..0000000000
--- a/java/sca-contrib/distribution/repository/src/main/release/RELEASE_NOTES
+++ /dev/null
@@ -1,83 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 Release Notes
-============================================================
-
-Apache Tuscany provides a runtime based on the Service Component
-Architecture. SCA is a set of specifications aimed at simplifying SOA
-Application Development which are being standardized at OASIS as part
-of Open Composite Services Architecture (Open CSA) - http://www.oasis-opencsa.org/.
-
-Overview
---------
-
-     The Apache Tuscany SCA 1.2 release includes implementations of the
-     main SCA specifications including:
-
-        SCA Assembly Model V1.0
-        SCA Policy Framework V1.0
-        SCA Java Common Annotations and APIs V1.0
-        SCA Java Component Implementation V1.0
-        SCA Spring Component Implementation V1.0
-        SCA BPEL Client and Implementation V1.0
-        SCA Web Services Binding V1.0
-        SCA EJB Session Bean Binding V1.0
-
-    It also includes implementations of many features not yet defined
-    by SCA specifications, including:
-
-        - SCA bindings for Direct Web Remoting, RSS and ATOM Feeds, 
-          HTTP resources, JSON-RPC, PUB/SUB Notifications, and RMI.
-        - SCA implementation types for OSGI, XQuery, BPEL, Widget and various 
-          dynamic languages including Groovy, Javascript, Python and Ruby
-        - Databindings for Service Data Objects (SDO), JAXB, XmlBeans, 
-          Axis2's AXIOM, JSON, SAXON, DOM, SAX and StAX
-
-    The Tuscany SCA Runtime can be configured as a single node SCA domain or 
-    as an SCA domain distributed across multiple nodes. 
-    In addition Tuscany SCA supports the following host-deployment options: -
-        - running standalone 
-        - running with distributed nodes across multiple JVMs
-        - running with embedded Jetty or Tomcat
-        - running as part of a standard web application                                     
-     
-    The Wepapp samples included in this release have been tried and tested on 
-        - Tomcat 5.5.20 and Tomcat 6.0.14
-        - Jetty 6.1.3
-        - Geronimo 2.0.2 Tomcat6 jee5
-        - WebSphere 6.1 fix pack 9
-
-See the CHANGES file for a detailed list of the features in this release.
-
-Support
--------
-
-For more information on Apache Tuscany visit the website at:
-
-    http://incubator.apache.org/tuscany/
- 
-Any issues with this release can be reported to Apache Tuscany
-using the mailing lists or in the JIRA issue tracker.
-
-    Mailing list archives:
-
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-user/
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/
-
-    Jira:
-
-       http://issues.apache.org/jira/browse/TUSCANY
-
-To join the project's mailing lists follow the instructions at:
-
-    http://incubator.apache.org/tuscany/mailing-lists.html
-
-To find out more about OASIS Open CSA go to: 
-
-    http://www.oasis-opencsa.org.
-
-Apache Tuscany welcomes your help. Any contribution, including code,
-testing, improving the documentation, or bug reporting is always
-appreciated. 
-
-Thank you for using Apache Tuscany!
-
-- The Tuscany Team.
diff --git a/java/sca-contrib/distribution/repository/src/main/release/bin/INSTALL b/java/sca-contrib/distribution/repository/src/main/release/bin/INSTALL
deleted file mode 100644
index 2da53a2b44..0000000000
--- a/java/sca-contrib/distribution/repository/src/main/release/bin/INSTALL
+++ /dev/null
@@ -1,27 +0,0 @@
-Installing the Apache Tuscany SCA 1.2 (incubating) April 2008 Release binary distribution
-=========================================================================================
-
-Unzip Tuscany binary distribution archive and you get the following:
-
-tuscany-sca-1.1-incubating        
-   DISCLAIMER    - the ASF incubation disclaimer
-   INSTALL       - this help file
-   LICENSE       - the Apache License and any dependecy licenses
-   NOTICE        - attribution notices associated with the licenses
-   README        - readme for the release
-   RELEASE_NOTES - description of this release 
-   CHANGES       - A note of the major changes in this release
-
-   /demos        - Demo applications showcasing the use of Apache Tuscany 
-
-   /lib          - The tuscany-sca-all and tuscany-sca-manifest jars and all their dependencies
-
-   /modules      - all of the individual Tuscany jars
-
-   /samples      - all the Tuscany samples, see the README in that directory
-
-   /tutorial     - The store tutorial, see the README in that directory
-
-
-
-
diff --git a/java/sca-contrib/distribution/repository/src/main/release/bin/LICENSE b/java/sca-contrib/distribution/repository/src/main/release/bin/LICENSE
deleted file mode 100644
index 5e1f585d46..0000000000
--- a/java/sca-contrib/distribution/repository/src/main/release/bin/LICENSE
+++ /dev/null
@@ -1,2366 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================
-
-APACHE TUSCANY SUBCOMPONENTS: 
-
-The Apache Tuscany binary distribution includes a number of subcomponents
-with separate copyright notices and license terms. Your use of the
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.                             
-
-===============================================================================
-
-The following components come under Apache Software License 1.1
-
- commons-discovery-0.2.jar
- commons-primitives-1.0.jar
-
-The following components come under Apache Software License 2.0
-
- abdera-core-0.3.0-incubating.jar
- abdera-i18n-0.3.0-incubating.jar
- abdera-parser-0.3.0-incubating.jar
- activeio-2.0-r118.jar
- activeio-core-3.0.0-incubator.jar
- apache-activemq-4.1.1.jar
- addressing-1.3.mar
- annogen-0.1.0.jar
- annotations-api-6.0.14.jar
- aopalliance-1.0.jar
- axiom-api-1.2.5.jar
- axiom-dom-1.2.5.jar
- axiom-impl-1.2.5.jar
- axis2-adb-1.3.jar
- axis2-codegen-1.3.jar
- axis2-java2wsdl-1.3.jar
- axis2-kernel-1.3.jar
- axis2-mtompolicy-1.3.jar
- bsf-all-3.0-beta2.jar
- catalina-6.0.14.jar
- cglib-nodep-2.1_3.jar
- commons-collections-3.1.jar
- commons-codec-1.3.jar
- commons-fileupload-1.1.1.jar
- commons-httpclient-3.0.1.jar
- commons-io-1.2.jar
- commons-jexl-1.1.jar
- commons-lang-2.1.jar
- commons-logging-1.1.jar
- coyote-6.0.14.jar
- derby-10.1.3.1.jar
- geronimo-activation_1.1_spec-1.0-M1.jar
- geronimo-common-1.2-beta.jar
- geronimo-commonj_1.1_spec-1.0.jar
- geronimo-connector-1.2-beta.jar
- geronimo-core-1.2-beta.jar
- geronimo-deployment-1.2-beta.jar
- geronimo-ejb_3.0_spec-1.0.jar
- geronimo-interceptor-1.2-beta.jar
- geronimo-j2ee-1.2-beta.jar
- geronimo-j2ee-connector_1.5_spec-1.1.jar
- geronimo-j2ee-jacc_1.0_spec-1.1.jar
- geronimo-j2ee-management_1.0_spec-1.1.jar
- geronimo-javamail_1.4_spec-1.0-M1.jar
- geronimo-jms_1.1_spec-1.1.jar
- geronimo-jpa_3.0_spec-1.0.jar
- geronimo-jta_1.0.1B_spec-1.0.jar
- geronimo-kernel-1.2-beta.jar
- geronimo-management-1.2-beta.jar
- geronimo-naming-1.2-beta.jar
- geronimo-security-1.2-beta.jar
- geronimo-spec-j2ee-connector-1.5-rc4.jar
- geronimo-spec-jta-1.0.1B-rc4.jar
- geronimo-system-1.2-beta.jar
- geronimo-transaction-1.2-beta.jar
- geronimo-util-1.2-beta.jar
- httpcore-4.0-alpha5.jar
- httpcore-nio-4.0-alpha5.jar
- httpcore-niossl-4.0-alpha5.jar
- jettison-1.0-RC2.jar
- jetty-6.1.7.jar
- jetty-util-6.1.7.jar
- json-rpc-1.0.jar
- juli-6.0.14.jar
- log4j-1.2.12.jar
- logkit-1.0.1.jar
- neethi-2.0.2.jar
- ode-bpel-api-1.1.jar
- ode-bpel-compiler-1.1.jar
- ode-bpel-dao-1.1.jar
- ode-bpel-epr-1.1.jar
- ode-bpel-obj-1.1.jar
- ode-bpel-runtime-1.1.jar
- ode-bpel-schemas-1.1.jar
- ode-bpel-store-1.1.jar
- ode-dao-jpa-1.1.jar
- ode-dao-jpa-ojpa-derby-1.1.zip
- ode-jacob-1.1.jar
- ode-jacob-ap-1.1.jar
- ode-scheduler-simple-1.1.jar
- ode-utils-1.1.jar
- openjpa-all-0.9.7-incubating.jar
- openjpa-persistence-0.9.7-incubating.jar
- org.apache.felix.bundlerepository-1.0.2.jar
- org.apache.felix.framework-1.0.3.jar
- org.apache.felix.main-1.0.3.jar
- org.apache.felix.shell-1.0.0.jar
- org.apache.felix.shell.tui-1.0.0.jar
- rampart-core-1.3.jar
- rampart-policy-1.3.jar
- rampart-trust-1.3.jar
- regexp-1.3.jar
- spring-beans-2.0.6.jar
- spring-context-2.0.6.jar
- spring-core-2.0.6.jar
- tranql-connector-1.1.jar
- tuscany-sdo-api-r2.1-1.0-incubating.jar
- tuscany-sdo-impl-1.0-incubating.jar
- tuscany-sdo-lib-1.0-incubating.jar
- tuscany-sdo-tools-1.0-incubating.jar
- woden-1.0-incubating-M7b.jar
- wss4j-1.5.3.jar
- wstx-asl-3.2.1.jar
- xalan-2.7.0.jar
- xbean-naming-2.7.jar
- xercesImpl-2.8.1.jar
- xml-apis-1.3.03.jar
- xmlbeans-2.3.0.jar
- xml-resolver-1.1.jar
- xmlsec-1.4.0.jar
- XmlSchema-1.3.2.jar
-
-===============================================================================
-axion-1.0-M3-dev.jar 
-
-Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
- 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above 
-   copyright notice, this list of conditions and the following 
-   disclaimer. 
- 
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in 
-   the documentation and/or other materials provided with the 
-   distribution. 
-
-3. The names "Tigris", "Axion", nor the names of its contributors may 
-   not be used to endorse or promote products derived from this 
-   software without specific prior written permission. 
- 
-4. Products derived from this software may not be called "Axion", nor 
-   may "Tigris" or "Axion" appear in their names without specific prior
-   written permission.
- 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-The "Axion Development Team" is defined to be:
-
- * Chuck Burdick
- * James Burke
- * Morgan Delagrange
- * Geir Magnusson Jr.
- * Martin Poeschl
- * Steve Polyak
- * Daniel Rall
- * Ahimanikya Satapathy
- * Doug Sale
- * James Strachan
- * Rodney Waldhoff
- * Jason van Zyl
-
-License changes are to be determined by a simple majority vote of the 
-Axion Development Team.
-
-===============================================================================
-dom4j-1.6.1.jar
-
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
-   statements and notices.  Redistributions must also contain a
-   copy of this document.
- 
-2. Redistributions in binary form must reproduce the
-   above copyright notice, this list of conditions and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
- 
-3. The name "DOM4J" must not be used to endorse or promote
-   products derived from this Software without prior written
-   permission of MetaStuff, Ltd.  For written permission,
-   please contact dom4j-info@metastuff.com.
- 
-4. Products derived from this Software may not be called "DOM4J"
-   nor may "DOM4J" appear in their names without prior written
-   permission of MetaStuff, Ltd. DOM4J is a registered
-   trademark of MetaStuff, Ltd.
- 
-5. Due credit should be given to the DOM4J Project - 
-   http://www.dom4j.org
- 
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-The EMF jars; 
-   codegen-2.2.3.jar 
-   codegen-ecore-2.2.3.jar
-   common-2.2.3.jar
-   ecore-2.2.3.jar
-   ecore-change-2.2.3.jar
-   ecore-xmi-2.2.3.jar
-   xsd-2.2.3.jar
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the
-Program under their own license agreement, and (ii) are not derivative
-works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor
-which are necessarily infringed by the use or sale of its Contribution
-alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this 
-Agreement.
-
-"Recipient" means anyone who receives the Program under this
-Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor, if
-any, in source code and object code form. This patent license shall
-apply to the combination of the Contribution and the Program if, at
-the time the Contribution is added by the Contributor, such addition
-of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow
-Recipient to distribute the Program, it is Recipient's responsibility
-to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or
-conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the 
-Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a
-commercial product offering should do so in a manner which does not
-create potential liability for other Contributors. Therefore, if a
-Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend
-and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising
-from claims, lawsuits and other legal actions brought by a third party
-against the Indemnified Contributor to the extent caused by the acts
-or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement.
-In order to qualify, an Indemnified Contributor must: a) promptly
-notify the Commercial Contributor in writing of such claim, and b)
-allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such
-claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable
-laws, damage to or loss of data, programs or equipment, and
-unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-the Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of
-the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of
-time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use
-and distribution of the Program as soon as reasonably practicable.
-However, Recipient's obligations under this Agreement and any licenses
-granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and
-may only be modified in the following manner. The Agreement Steward
-reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation
-is the initial Agreement Steward. The Eclipse Foundation may assign
-the responsibility to serve as the Agreement Steward to a suitable
-separate entity. Each new version of the Agreement will be given a
-distinguishing version number. The Program (including Contributions)
-may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives
-no rights or licenses to the intellectual property of any Contributor
-under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No
-party to this Agreement will bring a legal action under this Agreement
-more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.
-
-===============================================================================
-For Saxon including 
-   saxon-8.7.jar
-   saxon-dom-8.7.jar
-   saxon-xpath-8.7.jar
-
- MOZILLA PUBLIC LICENSE
-Version 1.0
-
-1. Definitions.
-
-      1.1. ``Contributor'' means each entity that creates or contributes to the creation of Modifications.
-
-      1.2. ``Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-
-      1.3. ``Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.
-
-      1.4. ``Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data.
-
-      1.5. ``Executable'' means Covered Code in any form other than Source Code.
-
-      1.6. ``Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-
-      1.7. ``Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-
-      1.8. ``License'' means this document.
-
-      1.9. ``Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-
-            A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-
-            B. Any new file that contains any part of the Original Code or previous Modifications. 
-
-      1.10. ``Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-
-      1.11. ``Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or a list of source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-
-      1.12. ``You'' means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, ``You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, ``control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity. 
-
-2. Source Code License.
-
-      2.1. The Initial Developer Grant.
-      The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell (``Utilize'') the Original Code (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Original Code (or portions thereof) and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-      2.2. Contributor Grant.
-      Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Contributor, to Utilize the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Contributor Version (or portions thereof), and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-3. Distribution Obligations.
-
-      3.1. Application of License.
-      The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-
-      3.2. Availability of Source Code.
-      Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
-
-      3.3. Description of Modifications.
-      You must cause all Covered Code to which you contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-
-      3.4. Intellectual Property Matters
-
-            (a) Third Party Claims.
-            If You have knowledge that a party claims an intellectual property right in particular functionality or code (or its utilization under this License), you must include a text file with the source code distribution titled ``LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If you obtain such knowledge after You make Your Modification available as described in Section 3.2, You shall promptly modify the LEGAL file in all copies You make available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-
-            (b) Contributor APIs.
-            If Your Modification is an application programming interface and You own or control patents which are reasonably necessary to implement that API, you must also include this information in the LEGAL file. 
-
-      3.5. Required Notices.
-      You must duplicate the notice in Exhibit A in each file of the Source Code, and this License in any documentation for the Source Code, where You describe recipients' rights relating to Covered Code. If You created one or more Modification(s), You may add your name as a Contributor to the notice described in Exhibit A. If it is not possible to put such notice in a particular Source Code file due to its structure, then you must include such notice in a location (such as a relevant directory file) where a user would be likely to look for such a notice. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-      3.6. Distribution of Executable Versions.
-      You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-      3.7. Larger Works.
-      You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. 
-
-4. Inability to Comply Due to Statute or Regulation.
-
-      If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. 
-
-5. Application of this License.
-
-      This License applies to code to which the Initial Developer has attached the notice in Exhibit A, and to related Covered Code. 
-
-6. Versions of the License.
-
-      6.1. New Versions.
-      Netscape Communications Corporation (``Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-
-      6.2. Effect of New Versions.
-      Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License.
-
-      6.3. Derivative Works.
-      If you create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), you must (a) rename Your license so that the phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or any confusingly similar phrase do not appear anywhere in your license and (b) otherwise make it clear that your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) 
-
-7. DISCLAIMER OF WARRANTY.
-
-      COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 
-
-8. TERMINATION.
-
-      This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 
-
-9. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. 
-
-10. U.S. GOVERNMENT END USERS.
-
-      The Covered Code is a ``commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer software'' and ``commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 
-
-11. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in, the United States of America: (a) unless otherwise agreed in writing, all disputes relating to this License (excepting any dispute relating to intellectual property rights) shall be subject to final and binding arbitration, with the losing party paying all costs of arbitration; (b) any arbitration relating to this Agreement shall be held in Santa Clara County, California, under the auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. 
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-      Except in cases where another Contributor has failed to comply with Section 3.4, You are responsible for damages arising, directly or indirectly, out of Your utilization of rights under this License, based on the number of copies of Covered Code you made available, the revenues you received from utilizing such rights, and other relevant factors. You agree to work with affected parties to distribute responsibility on an equitable basis. 
-
-EXHIBIT A.
-
-      ``The contents of this file are subject to the Mozilla Public License Version 1.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.mozilla.org/MPL/
-
-      Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-
-      The Original Code is ______________________________________.
-
-      The Initial Developer of the Original Code is ________________________. Portions created by ______________________ are Copyright (C) ______ _______________________. All Rights Reserved.
-
-      Contributor(s): ______________________________________.'' 
-
-===============================================================================
-
-For the Rhino JavaScript engine js-1.6R7.jar:
-
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (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.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-
-===============================================================================
-Groovy (groovy-all-minimal-1.5.4.jar):
-
-/*
- $Id: LICENSE.txt 156 2003-09-26 17:36:37Z jstrachan $
-
- Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
-    statements and notices.  Redistributions must also contain a
-    copy of this document.
-
- 2. Redistributions in binary form must reproduce the
-    above copyright notice, this list of conditions and the
-    following disclaimer in the documentation and/or other
-    materials provided with the distribution.
-
- 3. The name "groovy" must not be used to endorse or promote
-    products derived from this Software without prior written
-    permission of The Codehaus.  For written permission,
-    please contact info@codehaus.org.
-
- 4. Products derived from this Software may not be called "groovy"
-    nor may "groovy" appear in their names without prior written
-    permission of The Codehaus. "groovy" is a registered
-    trademark of The Codehaus.
-
- 5. Due credit should be given to The Codehaus -
-    http://groovy.codehaus.org/
-
- THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- THE CODEHAUS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- */
-
-===============================================================================
-
-Jython (jython-2.2.jar):
-
-A. HISTORY OF THE SOFTWARE
-=======================
-
-JPython was created in late 1997 by Jim Hugunin. Jim was also the
-primary developer while he was at CNRI. In February 1999 Barry Warsaw
-took over as primary developer and released JPython version 1.1.
-
-In October 2000 Barry helped move the software to SourceForge
-where it was renamed to Jython.  Jython 2.0 and on are licensed under
-the Jython specific license below. 
-
-The standard library is covered by the Python Software Foundation
-license. See the LICENSE_CPython.txt file for details.
-
-The zxJDBC package was written by Brian Zimmer and originally licensed
-under the GNU Public License.  The package is now covered by the Jython
-Software License.
-
-The command line interpreter is covered by the Apache Software
-License.  See the LICENSE_Apache.txt file for details.
- 
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
-================================
-
-Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the distribution.
-
- - Neither the name of the Jython Developers nor the names of
-   its contributors may be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-
-JPython 1.1.x Software License.
-=========================
-
-______________________________________________________________________
-
-IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
-
-BY CLICKING ON THE "ACCEPT" BUTTON WHERE INDICATED, OR BY INSTALLING,
-COPYING OR OTHERWISE USING THE SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
-THE TERMS AND CONDITIONS OF THIS AGREEMENT.
-
-______________________________________________________________________
-
-JPython version 1.1.x
-
-  1. This LICENSE AGREEMENT is between the Corporation for National Research
-     Initiatives, having an office at 1895 Preston White Drive, Reston, VA
-     20191 ("CNRI"), and the Individual or Organization ("Licensee")
-     accessing and using JPython version 1.1.x in source or binary form and
-     its associated documentation as provided herein ("Software").
-
-  2. Subject to the terms and conditions of this License Agreement, CNRI
-     hereby grants Licensee a non-exclusive, non-transferable, royalty-free,
-     world-wide license to reproduce, analyze, test, perform and/or display
-     publicly, prepare derivative works, distribute, and otherwise use the
-     Software alone or in any derivative version, provided, however, that
-     CNRI's License Agreement and CNRI's notice of copyright, i.e.,
-     "Copyright ©1996-1999 Corporation for National Research Initiatives;
-     All Rights Reserved" are both retained in the Software, alone or in any
-     derivative version prepared by Licensee.
-
-     Alternatively, in lieu of CNRI's License Agreement, Licensee may
-     substitute the following text (omitting the quotes), provided, however,
-     that such text is displayed prominently in the Software alone or in any
-     derivative version prepared by Licensee: "JPython (Version 1.1.x) is
-     made available subject to the terms and conditions in CNRI's License
-     Agreement. This Agreement may be located on the Internet using the
-     following unique, persistent identifier (known as a handle):
-     1895.22/1006. The License may also be obtained from a proxy server on
-     the Web using the following URL: http://hdl.handle.net/1895.22/1006."
-
-  3. In the event Licensee prepares a derivative work that is based on or
-     incorporates the Software or any part thereof, and wants to make the
-     derivative work available to the public as provided herein, then
-     Licensee hereby agrees to indicate in any such work, in a prominently
-     visible way, the nature of the modifications made to CNRI's Software.
-
-  4. Licensee may not use CNRI trademarks or trade name, including JPython
-     or CNRI, in a trademark sense to endorse or promote products or
-     services of Licensee, or any third party. Licensee may use the mark
-     JPython in connection with Licensee's derivative versions that are
-     based on or incorporate the Software, but only in the form
-     "JPython-based ___________________," or equivalent.
-
-  5. CNRI is making the Software available to Licensee on an "AS IS" basis.
-     CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
-     OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY
-     REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
-     PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE
-     ANY THIRD PARTY RIGHTS.
-
-  6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
-     ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
-     USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE
-     THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT
-     ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER
-     MAY NOT APPLY TO LICENSEE.
-
-  7. This License Agreement may be terminated by CNRI (i) immediately upon
-     written notice from CNRI of any material breach by the Licensee, if the
-     nature of the breach is such that it cannot be promptly remedied; or
-     (ii) sixty (60) days following notice from CNRI to Licensee of a
-     material remediable breach, if Licensee has not remedied such breach
-     within that sixty-day period.
-
-  8. This License Agreement shall be governed by and interpreted in all
-     respects by the law of the State of Virginia, excluding conflict of law
-     provisions. Nothing in this Agreement shall be deemed to create any
-     relationship of agency, partnership, or joint venture between CNRI and
-     Licensee.
-
-  9. By clicking on the "ACCEPT" button where indicated, or by installing,
-     copying or otherwise using the Software, Licensee agrees to be bound by
-     the terms and conditions of this License Agreement.
-
-
-===============================================================================
-
-The jars; 
-activation-1.1.jar, 
-jaxb-api-2.1.jar, 
-jaxb-impl-2.1.6.jar, 
-jaxb-xjc-2.1.4.jar, 
-jaxb2-reflection-2.1.4.jar,
-jsr181-api-1.0-MR1.jar, 
-jsr250-api-1.0.jar, 
-jaxws-api-2.1-1.jar, 
-mail-1.4.jar, 
-saaj-api-1.3.jar, 
-servlet-api-2.5.jar, 
-stax-api-1.0-commons-cli-1.0.jar2.jar
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
-      1. Definitions.
-
-            1.1. "Contributor" means each individual or entity that
-            creates or contributes to the creation of Modifications.
-
-            1.2. "Contributor Version" means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-
-            1.3. "Covered Software" means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-
-            1.4. "Executable" means the Covered Software in any form
-            other than Source Code. 
-
-            1.5. "Initial Developer" means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            
-            1.6. "Larger Work" means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-
-            1.7. "License" means this document.
-
-            1.8. "Licensable" means having the right to grant, to the
-            maximum extent possible, whether at the time of the initial
-            grant or subsequently acquired, any and all of the rights
-            conveyed herein.
-            
-            1.9. "Modifications" means the Source Code and Executable
-            form of any of the following: 
-
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-
-            1.10. "Original Software" means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-
-            1.11. "Patent Claims" means any patent claim(s), now owned
-            or hereafter acquired, including without limitation,
-            method, process, and apparatus claims, in any patent
-            Licensable by grantor. 
-
-            1.12. "Source Code" means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-
-            1.13. "You" (or "Your") means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, "You"
-            includes any entity which controls, is controlled by, or is
-            under common control with You. For purposes of this
-            definition, "control" means (a) the power, direct or
-            indirect, to cause the direction or management of such
-            entity, whether by contract or otherwise, or (b) ownership
-            of more than fifty percent (50%) of the outstanding shares
-            or beneficial ownership of such entity.
-
-      2. License Grants. 
-
-            2.1. The Initial Developer Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Initial Developer,
-                  to use, reproduce, modify, display, perform,
-                  sublicense and distribute the Original Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party under the terms of this
-                  License. 
-
-                  (d) Notwithstanding Section 2.1(b) above, no patent
-                  license is granted: (1) for code that You delete from
-                  the Original Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-
-            2.2. Contributor Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, each
-            Contributor hereby grants You a world-wide, royalty-free,
-            non-exclusive license:
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Contributor to
-                  use, reproduce, modify, display, perform, sublicense
-                  and distribute the Modifications created by such
-                  Contributor (or portions thereof), either on an
-                  unmodified basis, with other Modifications, as
-                  Covered Software and/or as part of a Larger Work; and
-                  
-
-                  (b) under Patent Claims infringed by the making,
-                  using, or selling of Modifications made by that
-                  Contributor either alone and/or in combination with
-                  its Contributor Version (or portions of such
-                  combination), to make, use, sell, offer for sale,
-                  have made, and/or otherwise dispose of: (1)
-                  Modifications made by that Contributor (or portions
-                  thereof); and (2) the combination of Modifications
-                  made by that Contributor with its Contributor Version
-                  (or portions of such combination). 
-
-                  (c) The licenses granted in Sections 2.2(a) and
-                  2.2(b) are effective on the date Contributor first
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-
-                  (d) Notwithstanding Section 2.2(b) above, no patent
-                  license is granted: (1) for any code that Contributor
-                  has deleted from the Contributor Version; (2) for
-                  infringements caused by: (i) third party
-                  modifications of Contributor Version, or (ii) the
-                  combination of Modifications made by that Contributor
-                  with other software (except as part of the
-                  Contributor Version) or other devices; or (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-
-            3.1. Availability of Source Code.
-
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-
-            3.2. Modifications.
-
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-
-            3.3. Required Notices.
-
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-
-            3.4. Application of Additional Terms.
-
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipients'
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            However, you may do so only on Your own behalf, and not on
-            behalf of the Initial Developer or any Contributor. You
-            must make it absolutely clear that any such warranty,
-            support, indemnity or liability obligation is offered by
-            You alone, and You hereby agree to indemnify the Initial
-            Developer and every Contributor for any liability incurred
-            by the Initial Developer or such Contributor as a result of
-            warranty, support, indemnity or liability terms You offer.
-          
-
-            3.5. Distribution of Executable Versions.
-
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of a license of Your choice, which may contain terms
-            different from this License, provided that You are in
-            compliance with the terms of this License and that the
-            license for the Executable form does not attempt to limit
-            or alter the recipient's rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form under a
-            different license, You must make it absolutely clear that
-            any terms which differ from this License are offered by You
-            alone, not by the Initial Developer or Contributor. You
-            hereby agree to indemnify the Initial Developer and every
-            Contributor for any liability incurred by the Initial
-            Developer or such Contributor as a result of any such terms
-            You offer.
-
-            3.6. Larger Works.
-
-            You may create a Larger Work by combining Covered Software
-            with other code not governed by the terms of this License
-            and distribute the Larger Work as a single product. In such
-            a case, You must make sure the requirements of this License
-            are fulfilled for the Covered Software. 
-            
-      4. Versions of the License. 
-
-            4.1. New Versions.
-
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-
-            4.2. Effect of New Versions.
-
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-
-            4.3. Modified Versions.
-
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-            
-
-      5. DISCLAIMER OF WARRANTY.
-
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-
-            6.1. This License and the rights granted hereunder will
-            terminate automatically if You fail to comply with terms
-            herein and fail to cure such breach within 30 days of
-            becoming aware of the breach. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as "Participant")
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-
-      7. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-
-      8. U.S. GOVERNMENT END USERS.
-
-      The Covered Software is a "commercial item," as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-      computer software" (as that term is defined at 48 C.F.R. 
-      252.227-7014(a)(1)) and "commercial computer software
-      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users
-      acquire Covered Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-
-      9. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject
-      matter hereof. If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be
-      governed by the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdiction's conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, with the losing
-      party responsible for costs, including, without limitation, court
-      costs and reasonable attorneys' fees and expenses. The
-      application of the United Nations Convention on Contracts for the
-      International Sale of Goods is expressly excluded. Any law or
-      regulation which provides that the language of a contract shall
-      be construed against the drafter shall not apply to this License.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-      10. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis. Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.
-
-===============================================================================
-
-JRuby (jruby-complete-1.0.jar), wsdl4j (wsdl4j-1.6.2.jar):
-
-Common Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-      a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-      b) in the case of each subsequent Contributor:
-
-      i) changes to the Program, and
-
-      ii) additions to the Program;
-
-      where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
-
-      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
-
-      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
-
-      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
-
-      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-      iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form:
-
-      a) it must be made available under this Agreement; and 
-
-      b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
-
-===============================================================================
-
-backport-util-concurrent-2.2.jar:
-
-The software comprising backport-util-concurrent is based in large
-part on the code from JSR166, and the package dl.util.concurrent.
-The software has been released to the public domain, as explained at:
-http://creativecommons.org/licenses/publicdomain, excepting portions
-of the class
-edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList,
-which were adapted from class java.util.ArrayList, written by Sun
-Microsystems, Inc, which are used with kind permission, and subject
-to the following:
-
-Copyright 2002-2004 Sun Microsystems, Inc. All rights reserved. Use is
-subject to the following license terms.
-
-  "Sun hereby grants you a non-exclusive, worldwide, non-transferrable
-  license to use and distribute the Java Software technologies as part
-  of a larger work in source and binary forms, with or without
-  modification, provided that the following conditions are met:
-
-   -Neither the name of or trademarks of Sun may be used to endorse or
-    promote products derived from the Java Software technology without
-    specific prior written permission.
-
-   -Redistributions of source or binary code must be accompanied by the
-    following notice and disclaimers:
-
-    Portions copyright Sun Microsystems, Inc. Used with kind permission.
-
-    This software is provided AS IS, without a warranty of any kind.  ALL
-    EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
-    WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PUPOSE OR
-    NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
-    MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE
-    FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
-    USING, MODIFYING OR DISTRIBUTING THE SOFTWARE OR ITS
-    DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR
-    ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR
-    DATA, OR FOR DIRECT, INDIRECT,CONSQUENTIAL, INCIDENTAL
-    OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF
-    THE THEORY OR LIABILITY, ARISING OUT OF THE USE OF OR
-    INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.
-    HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-    You acknowledge that Software is not designed, licensed or intended for
-    use in the design, construction, operation or maintenance of any nuclear
-    facility."
-
-===============================================================================
-rome-0.9.jar
-
-Copyright 2004 Sun Microsystems, Inc.
-
-Licensed 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.
-
-===============================================================================
-jdom-1.0.jar :
-
-$Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions, and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions, and the disclaimer that follows 
-    these conditions in the documentation and/or other materials 
-    provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
-    derived from this software without prior written permission.  For
-    written permission, please contact <request_AT_jdom_DOT_org>.
- 
- 4. Products derived from this software may not be called "JDOM", nor
-    may "JDOM" appear in their name, without prior written permission
-    from the JDOM Project Management <request_AT_jdom_DOT_org>.
- 
- In addition, we request (but do not require) that you include in the 
- end-user documentation provided with the redistribution and/or in the 
- software itself an acknowledgement equivalent to the following:
-     "This product includes software developed by the
-      JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos 
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many 
- individuals on behalf of the JDOM Project and was originally 
- created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
- Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
- on the JDOM Project, please see <http://www.jdom.org/>. 
-
-========================================================================
-
-dwr-2.0.1.jar :
-
-/*
-* Copyright 2005 Joe Walker
-*
-* Licensed 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.
-*/
-
-==========================================================================
-
-dojotoolkit V1.0.0:
-
-The "New" BSD License:
-**********************
-
-Copyright (c) 2005, The Dojo Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-	list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-	this list of conditions and the following disclaimer in the documentation
-	and/or other materials provided with the distribution.
-  * Neither the name of the Dojo Foundation nor the names of its contributors
-	may be used to endorse or promote products derived from this software
-	without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The module tuscany-implementation-script-1.0-incubating.jar temporarily includes    
-one file under the below BSD license with the following copyright:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-
-The serp-1.12.0.jar is distributed under the BSD license with the following copyright:
-
- Copyright (c) 2002, A. Abram White
- All rights reserved.
-
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-The javacc-3.2.jar, and howl-1.0.1-1.jar are distributed under the BSD license:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The tuscany-assembly-xsd jar includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-================================================================================
-License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
-
-These files being ...
-commonj/sdo/ChangeSummary$Setting.class
-commonj/sdo/ChangeSummary.class
-commonj/sdo/DataGraph.class
-commonj/sdo/DataObject.class
-commonj/sdo/helper/CopyHelper.class
-commonj/sdo/helper/DataFactory.class
-commonj/sdo/helper/DataHelper.class
-commonj/sdo/helper/EqualityHelper.class
-commonj/sdo/helper/HelperContext.class
-commonj/sdo/helper/TypeHelper.class
-commonj/sdo/helper/XMLDocument.class
-commonj/sdo/helper/XMLHelper.class
-commonj/sdo/helper/XSDHelper.class
-commonj/sdo/impl/ExternalizableDelegator$Resolvable.class
-commonj/sdo/impl/ExternalizableDelegator.class
-commonj/sdo/Property.class
-commonj/sdo/Sequence.class
-commonj/sdo/Type.class
-xml/datagraph.xsd
-xml/sdoJava.xml
-xml/sdoJava.xsd
-xml/sdoModel.xml
-xml/sdoModel.xsd
-xml/sdoXML.xml
-xml/sdoXML.xsd
-
-
-License for the Service Data Objects JavaDoc and Interface Definition files.
-
-The Service Data Objects Specification is being provided by the copyright holders under the following 
-license. By using and/or copying this work, you agree that you have read, understood and will comply with 
-the following terms and conditions:
-
-Permission to copy, display and distribute the Service Data Objects Specification and/or portions thereof, without 
-modification, in any medium without fee or royalty is hereby granted, provided that you include the 
-following on ALL copies of the Service Data Objects Specification, or portions thereof, that you make:
-
-1. A link or URL to the Service Data Objects Specification at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2. The full text of this copyright notice as shown in the Service Data Objects Specification.
-
-BEA, IBM, Oracle, Primeton Technologies, Rogue Wave Software, SAP, Software AG, Sun Microsystems, Xcalia, 
-Zend Technologies (collectively, the “Authors”) agree to grant you a royalty-free license, under reasonable, 
-non-discriminatory terms and conditions to patents that they deem necessary to implement the Service Data 
-Objects Specification. 
-
-THE Service Data Objects SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR 
-WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL 
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE SERVICE DATA OBJECTS 
-SPECIFICATION.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity 
-pertaining to the Service Data Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects Specification will at all times remain with the 
-Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-================================================================================
-
diff --git a/java/sca-contrib/distribution/repository/src/main/release/bin/NOTICE b/java/sca-contrib/distribution/repository/src/main/release/bin/NOTICE
deleted file mode 100644
index 5daa9a3dfe..0000000000
--- a/java/sca-contrib/distribution/repository/src/main/release/bin/NOTICE
+++ /dev/null
@@ -1,95 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses XmlSchema developed at 
-The Apache Software Foundation (http://ws.apache.org/commons/XmlSchema)
- Portions Copyright 2006 International Business Machines Corp.
-
-This product includes/uses ode-bpel-api-1.1 developed at
-The Apache Software Foundation (http://ode.apache.org)
- - Copyright 1999-2006 Intalio - This product includes software developed by Intalio (http://www.intalio.com)
- - Copyright 2006 Sybase - This product includes software developed by Sybase.(http://www.sybase.com)
-
-"This product includes software developed by the Spring Framework
- Project (http://www.springframework.org)."
-
-This product includes/uses the Jetty Servlet Engine (http://jetty.mortbay.org),
-developed by Mort Bay Consulting  (http://www.mortbay.com)
-
-This product includes/uses the Groovy Script Engine (http://groovy.codehaus.org/),
-Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
-This product includes/uses the Axion : the Open Source Java Database (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
-
-This product includes/uses DOM4J : the flexible XML framework for java (http://www.dom4j.org/) 
- Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)
-License: Public Domain 
-
-This product includes/uses JSON-RPC-Java (http://oss.metaparadigm.com/jsonrpc/)
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product includes software from the GlassFish project (https://glassfish.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-    
-This product includes software from the Rome project (https://rome.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-
-This product includes/uses the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
-
-This product includes/uses the Mozilla Rhino project (http://www.mozilla.org/rhino/)
-
-This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)i
-
-This product includes/uses the Codehaus JRuby project (http://jruby.codehaus.org/)
-
-This product includes/uses JDOM (http://www.jdom.org/)
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved.
- 
-This product includes/uses DWR (http://getahead.org/dwr)
- Copyright 2005 Joe Walker. All rights reserved.
- 
-This product includes/uses dojotoolkit (http://dojotoolkit.org/)
- Copyright (c) 2005, The Dojo Foundation. All rights reserved.
-
-This product includes/uses Howl (http://howl.objectweb.org/)
- Copyright (c) 2004, Bull S.A.
-
-This product includes/uses axion (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team.
-
-This product includes/uses javacc (https://javacc.dev.java.net/)
- Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.
-
-The Program includes all or portions of the following software: "The 
-Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under
-an MPL v1.0 license. Please refer to the homepage URL at 
-http://www.saxonica.com/.
-
-This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:
- Copyright (c) 2002, A. Abram White. All rights reserved.
-
-This product also includes software under the BSD license
-with the following copyright:
- Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
diff --git a/java/sca-contrib/distribution/repository/src/main/release/src/BUILDING b/java/sca-contrib/distribution/repository/src/main/release/src/BUILDING
deleted file mode 100644
index 65d09c5eae..0000000000
--- a/java/sca-contrib/distribution/repository/src/main/release/src/BUILDING
+++ /dev/null
@@ -1,55 +0,0 @@
-Building the Apache Tuscany SCA 1.2 (incubating) April 2008 Release source distribution
-=======================================================================================
-
-Initial Setup
--------------
-
-1) Install J2SE 5.0 SDK, which can be downloaded from 
-   http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_06 JDK or higher.
-
-2) Make sure that your JAVA_HOME environment variable is set to the newly installed 
-   JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 
-   $JAVA_HOME$/bin (unix).
-
-3) Install Maven 2.0.7 or higher, which can be downloaded from 
-   http://maven.apache.org/download.html. Make sure that your PATH includes 
-   the MVN_HOME/bin directory. 
-
-4) Make sure that your MAVEN_OPTS environment variable has -Xmx128M (or more),
-   you can manually do this by executing the following in your prompt :
-   Windows users:
-      set MAVEN_OPTS=-Xmx128M
-   Unix users:
-      export MAVEN_OPTS=-Xmx128M
-
-
-Building
---------
-
-1) Change to the top level directory of Apache Tuscany source distribution.
-2) Run
-
-	$> mvn
-
-   This will compile Apache Tuscany and run all of the tests in the source
-   distribution. 
-
-   Depending on the load of remote Maven 2.0 repositories, you may have 
-   to run "mvn" several times utill the required dependencies are 
-   all located in your local maven repository. It usually takes some time for 
-   maven to download required dependencies in the first build. Once all the 
-   dependencies have been downloaded you may use the -o option to run maven
-   in offline mode, for example, 'mvn clean install -o'.
-
-
-Building the distributions
---------------------------
-
-1) Change to the distribution folder
-2) Run
-
-	$> mvn
-
-   This will build the binary and source distribution with .zip and .gz 
-   formats in the distribution/target directory.
-
diff --git a/java/sca-contrib/distribution/repository/src/main/release/src/LICENSE b/java/sca-contrib/distribution/repository/src/main/release/src/LICENSE
deleted file mode 100644
index 144d8ae692..0000000000
--- a/java/sca-contrib/distribution/repository/src/main/release/src/LICENSE
+++ /dev/null
@@ -1,397 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================================================
-
-The module itest/databindings/common includes the test schema; datagraph.xsd, sdoJava.xsd, and sdoModel.xsd
-under the following license:
-
-License for the Service Data Objects JavaDoc, Interface Definition files
-and XSD files.
-
-The Service Data Objects JavaDoc, Interface Definition files and XSD files 
-are being provided by the copyright holders under the following license. 
-By using and/or copying this work, you agree that you have read, 
-understood and will comply with the following terms and conditions:
-
-Permission to copy, display, make derivative works of and distribute 
-the Service Data Objects JavaDoc, Interface Definition files and XSD files
-(the "Artifacts") in any medium without fee or royalty is hereby granted, 
-provided that you include the following on ALL copies of the Artifacts, 
-or portions thereof, that you make:
-
-1.	A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2.	The full text of this copyright notice as shown in the Artifacts.
-
-
-
-THE ARTIFACTS ARE PROVIDED "AS IS" AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE. 
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Data 
-Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects 
-Specification will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.11, last updated on 2007/12/21
-
-=================================================================================================================
-
-The module implementation-script temporarily includes one file under the following BSD license:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-=================================================================================================================
-
-The module assembly-xsd includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-=================================================================================================================
-The modules 
-
-binding-ws-xml
-databinding
-databinding-axiom
-databinding-jaxb
-databinding-json
-databinding-sdo
-databinding-sdo-axiom
-databinding-xmlbeans
-interface-wsdl-xml
-
-Include the ipo.xsd and address.xsd information from the XML Schema Primer 
-(http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) combined into the 
-file ipo.xsd and extended with UK postcode structures.
-
-The ipo.xsd file is include under the following license:
-
-W3C(c) SOFTWARE NOTICE AND LICENSE
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other 
-related items) is being provided by the copyright holders under the following 
-license. By obtaining, using and/or copying this work, you (the licensee) agree 
-that you have read, understood, and will comply with the following terms and conditions.
-
-Permission to copy, modify, and distribute this software and its documentation, 
-with or without modification, for any purpose and without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies of the 
-software and documentation or portions thereof, including modifications:
-
-   1. The full text of this NOTICE in a location viewable to users of the 
-      redistributed or derivative work.
-   2. Any pre-existing intellectual property disclaimers, notices, or terms 
-      and conditions. If none exist, the W3C Software Short Notice should be 
-      included (hypertext is preferred, text is permitted) within the body of 
-      any redistributed or derivative code.
-   3. Notice of any changes or modifications to the files, including the date 
-      changes were made. (We recommend you provide URIs to the location from which 
-      the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
-NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or 
-publicity pertaining to the software without specific, written prior permission. 
-Title to copyright in this software and any associated documentation will at all 
-times remain with copyright holders.
diff --git a/java/sca-contrib/distribution/repository/src/main/release/src/NOTICE b/java/sca-contrib/distribution/repository/src/main/release/src/NOTICE
deleted file mode 100644
index 31540fd607..0000000000
--- a/java/sca-contrib/distribution/repository/src/main/release/src/NOTICE
+++ /dev/null
@@ -1,39 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product also includes software under the BSD license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-  Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
-This product includes software under the W3C(c) Software License
-with the following copyright:
-    
-Copyright (c) 2008 World Wide Web Consortium, (Massachusetts Institute of Technology, 
-European Research Consortium for Informatics and Mathematics, Keio University). 
-All Rights Reserved. This work is distributed under the W3C(c) Software License [1] in 
-the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
diff --git a/java/sca-contrib/distribution/web20/pom.xml b/java/sca-contrib/distribution/web20/pom.xml
deleted file mode 100644
index c9d6adb1f9..0000000000
--- a/java/sca-contrib/distribution/web20/pom.xml
+++ /dev/null
@@ -1,173 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-distribution</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-distribution-web20</artifactId>

-    <name>Apache Tuscany SCA Web 2.0 Distribution</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-web20</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-    </dependencies>

-

-    <profiles>

-

-        <!-- Build profile that can be used to build the distro packages -->

-        <profile>

-            <id>distribution</id>

-            <build>

-                <plugins>

-                    <plugin>

-                        <groupId>org.apache.tuscany.sca</groupId>

-                        <artifactId>tuscany-maven-bundle-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>distribution-modules</id>

-                                <phase>generate-resources</phase>

-                                <goals>

-                                    <goal>generate-modules</goal>

-                                </goals>

-                                <configuration>

-                                    <targetDirectory>target/modules</targetDirectory>

-                                    <excludeDirectories>

-                                        <excludeDirectory>../core/target/modules</excludeDirectory>

-                                    </excludeDirectories>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-

-                    <plugin>

-                        <groupId>org.apache.maven.plugins</groupId>

-                        <artifactId>maven-assembly-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>distribution-package</id>

-                                <phase>package</phase>

-                                <goals>

-                                    <goal>single</goal>

-                                </goals>

-                                <configuration>

-                                    <descriptors>

-                                        <descriptor>src/main/assembly/bin.xml</descriptor>

-                                        <descriptor>src/main/assembly/src.xml</descriptor>

-                                    </descriptors>

-                                    <tarLongFileMode>gnu</tarLongFileMode>

-                                    <finalName>apache-tuscany-sca-web20-2.0-SNAPSHOT</finalName>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-                </plugins>

-            </build>

-        </profile>

-        

-        <!-- Profile that can be used to build the modules included in the distro -->

-        <profile>

-            <id>modules</id>

-            <modules>

-                <module>../../../modules/assembly</module>

-                <module>../../../modules/assembly-xml</module>

-                <module>../../../modules/assembly-xsd</module>

-                <module>../../../modules/binding-atom</module>

-                <module>../../../modules/binding-atom-abdera</module>

-                <module>../../../modules/binding-corba</module>

-                <module>../../../modules/binding-corba-runtime</module>

-                <module>../../../modules/binding-http</module>

-                <module>../../../modules/binding-http-runtime</module>

-                <module>../../../modules/binding-jsonrpc</module>

-                <module>../../../modules/binding-jsonrpc-runtime</module>

-                <module>../../../modules/binding-rss</module>

-                <module>../../../modules/binding-rss-rome</module>

-                <module>../../../modules/binding-sca</module>

-                <module>../../../modules/binding-sca-xml</module>

-                <module>../../../modules/contribution</module>

-                <module>../../../modules/contribution-java</module>

-                <module>../../../modules/contribution-namespace</module>

-                <module>../../../modules/contribution-resource</module>

-                <module>../../../modules/contribution-xml</module>

-                <module>../../../modules/core</module>

-                <module>../../../modules/core-databinding</module>

-                <module>../../../modules/core-spi</module>

-                <module>../../../modules/data-api</module>

-                <module>../../../modules/databinding</module>

-                <module>../../../modules/databinding-jaxb</module>

-                <module>../../../modules/databinding-json</module>

-                <module>../../../modules/definitions</module>

-                <module>../../../modules/definitions-xml</module>

-                <module>../../../modules/endpoint</module>

-                <module>../../../modules/extensibility</module>

-                <module>../../../modules/extensibility-equinox</module>

-                <module>../../../modules/host-corba</module>

-                <module>../../../modules/host-corba-jse</module>

-                <module>../../../modules/host-http</module>

-                <module>../../../modules/host-jetty</module>

-                <module>../../../modules/implementation-java</module>

-                <module>../../../modules/implementation-java-runtime</module>

-                <module>../../../modules/implementation-java-xml</module>

-                <module>../../../modules/implementation-node</module>

-                <module>../../../modules/implementation-node-runtime</module>

-                <module>../../../modules/implementation-resource</module>

-                <module>../../../modules/implementation-resource-runtime</module>

-                <module>../../../modules/implementation-script</module>

-                <module>../../../modules/implementation-script-runtime</module>

-                <module>../../../modules/implementation-widget</module>

-                <module>../../../modules/implementation-widget-runtime</module>

-                <module>../../../modules/interface</module>

-                <module>../../../modules/interface-java</module>

-                <module>../../../modules/interface-java-jaxws</module>

-                <module>../../../modules/interface-java-xml</module>

-                <module>../../../modules/interface-wsdl</module>

-                <module>../../../modules/interface-wsdl-xml</module>

-                <module>../../../modules/monitor</module>

-                <module>../../../modules/node-api</module>

-                <module>../../../modules/node-impl</module>

-                <module>../../../modules/node-launcher</module>

-                <module>../../../modules/node-launcher-equinox</module>

-                <module>../../../modules/node-launcher-webapp</module>

-                <module>../../../modules/policy</module>

-                <module>../../../modules/policy-security</module>

-                <module>../../../modules/policy-security-jsr250</module>

-                <module>../../../modules/policy-xml</module>

-                <module>../../../modules/sca-api</module>

-                <module>../../../modules/workspace</module>

-                <module>../../../modules/workspace-impl</module>

-                <module>../../../modules/workspace-xml</module>

-                <module>../../../modules/xsd</module>

-                <module>../../../modules/xsd-xml</module>

-            </modules>

-        </profile>

-    </profiles>

-

-</project>

diff --git a/java/sca-contrib/distribution/web20/src/main/assembly/bin.xml b/java/sca-contrib/distribution/web20/src/main/assembly/bin.xml
deleted file mode 100644
index fdcc421f2f..0000000000
--- a/java/sca-contrib/distribution/web20/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,38 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id></id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
-        <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
diff --git a/java/sca-contrib/distribution/web20/src/main/assembly/src.xml b/java/sca-contrib/distribution/web20/src/main/assembly/src.xml
deleted file mode 100644
index af3cb8e6fc..0000000000
--- a/java/sca-contrib/distribution/web20/src/main/assembly/src.xml
+++ /dev/null
@@ -1,37 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>src</id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
-        <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
diff --git a/java/sca-contrib/distribution/web20/src/main/components/bin-samples.xml b/java/sca-contrib/distribution/web20/src/main/components/bin-samples.xml
deleted file mode 100644
index 5cc62040c0..0000000000
--- a/java/sca-contrib/distribution/web20/src/main/components/bin-samples.xml
+++ /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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add samples to the samples directory -->
-        <fileSet>
-            <directory>../../../samples</directory>
-            <outputDirectory>samples</outputDirectory>
-            <includes>
-                <include>feed-aggregator/**/*</include>
-                <include>store/**/*</include>
-                <include>web-resource/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
diff --git a/java/sca-contrib/distribution/web20/src/main/components/src-modules.xml b/java/sca-contrib/distribution/web20/src/main/components/src-modules.xml
deleted file mode 100644
index 68aae46796..0000000000
--- a/java/sca-contrib/distribution/web20/src/main/components/src-modules.xml
+++ /dev/null
@@ -1,112 +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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add module sources to the modules directory -->
-        <fileSet>
-            <directory>../../../modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>assembly/**/*</include>
-                <include>assembly-xml/**/*</include>
-                <include>assembly-xsd/**/*</include>
-                <include>binding-atom/**/*</include>
-                <include>binding-atom-abdera/**/*</include>
-                <include>binding-corba/**/*</include>
-                <include>binding-corba-runtime/**/*</include>
-                <include>binding-http/**/*</include>
-                <include>binding-http-runtime/**/*</include>
-                <include>binding-jsonrpc/**/*</include>
-                <include>binding-jsonrpc-runtime/**/*</include>
-                <include>binding-rss/**/*</include>
-                <include>binding-rss-rome/**/*</include>
-                <include>binding-sca/**/*</include>
-                <include>binding-sca-xml/**/*</include>
-                <include>contribution/**/*</include>
-                <include>contribution-impl/**/*</include>
-                <include>contribution-java/**/*</include>
-                <include>contribution-namespace/**/*</include>
-                <include>contribution-resource/**/*</include>
-                <include>contribution-xml/**/*</include>
-                <include>core/**/*</include>
-                <include>core-databinding/**/*</include>
-                <include>core-spi/**/*</include>
-                <include>data-api/**/*</include>
-                <include>databinding/**/*</include>
-                <include>databinding-jaxb/**/*</include>
-                <include>databinding-json/**/*</include>
-                <include>definitions/**/*</include>
-                <include>definitions-xml/**/*</include>
-                <include>distribution-core/**/*</include>
-                <include>endpoint/**/*</include>
-                <include>extensibility/**/*</include>
-                <include>extensibility-equinox/**/*</include>
-                <include>host-corba/**/*</include>
-                <include>host-corba-jse/**/*</include>
-                <include>host-http/**/*</include>
-                <include>host-jetty/**/*</include>
-                <include>implementation-java/**/*</include>
-                <include>implementation-java-runtime/**/*</include>
-                <include>implementation-java-xml/**/*</include>
-                <include>implementation-node/**/*</include>
-                <include>implementation-node-runtime/**/*</include>
-                <include>implementation-resource/**/*</include>
-                <include>implementation-resource-runtime/**/*</include>
-                <include>implementation-script/**/*</include>
-                <include>implementation-script-runtime/**/*</include>
-                <include>implementation-widget/**/*</include>
-                <include>implementation-widget-runtime/**/*</include>
-                <include>interface/**/*</include>
-                <include>interface-java/**/*</include>
-                <include>interface-java-jaxws/**/*</include>
-                <include>interface-java-xml/**/*</include>
-                <include>interface-wsdl/**/*</include>
-                <include>interface-wsdl-xml/**/*</include>
-                <include>monitor/**/*</include>
-                <include>node-api/**/*</include>
-                <include>node-impl/**/*</include>
-                <include>node-launcher/**/*</include>
-                <include>node-launcher-equinox/**/*</include>
-                <include>node-launcher-webapp/**/*</include>
-                <include>policy/**/*</include>
-                <include>policy-security/**/*</include>
-                <include>policy-security-jsr250/**/*</include>
-                <include>policy-xml/**/*</include>
-                <include>sca-api/**/*</include>
-                <include>workspace/**/*</include>
-                <include>workspace-impl/**/*</include>
-                <include>workspace-xml/**/*</include>
-                <include>xsd/**/*</include>
-                <include>xsd-xml/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
diff --git a/java/sca-contrib/distribution/web20/src/main/release/CHANGES b/java/sca-contrib/distribution/web20/src/main/release/CHANGES
deleted file mode 100644
index 3de7358ec6..0000000000
--- a/java/sca-contrib/distribution/web20/src/main/release/CHANGES
+++ /dev/null
@@ -1,431 +0,0 @@
-Changes With Apache Tuscany SCA 1.2 (incubating) April 2008 

-===========================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-2027

-  * TUSCANY-1999

-  * TUSCANY-2037

-  * TUSCANY-2034

-  * TUSCANY-2038

-  * TUSCANY-2043

-  * TUSCANY-2046

-  * TUSCANY-2047

-  * TUSCANY-2028

-  * TUSCANY-1873

-  * TUSCANY-2049

-  * TUSCANY-2035

-  * TUSCANY-1206

-  * TUSCANY-2036 

-  * TUSCANY-1771

-  * TUSCANY-2013

-  * TUSCANY-1926

-  * TUSCANY-1917

-  * TUSCANY-1949

-  * TUSCANY-1941

-  * TUSCANY-2045

-  * TUSCANY-2057

-  * TUSCANY-2055

-  * TUSCANY-2056

-  * TUSCANY-2072

-  * TUSCANY-2047

-  * TUSCANY-2073

-  * TUSCANY-1977 

-  * TUSCANY-2075

-  * TUSCANY-1894

-  * TUSCANY-2079

-  * TUSCANY-2078

-  * TUSCANY-2080

-  * TUSCANY-2068

-  * TUSCANY-1950

-  * TUSCANY-2077

-  * TUSCANY-2056

-  * TUSCANY-2088

-  * TUSCANY-2086

-  * TUSCANY-2094

-  * TUSCANY-2106 

-

-  Features and/or Enhancements

-

-  * Core

-    - Interceptor Enhancements

-      - Phase-based interceptor ordering to allow contribution of new interceptors and also define the order in witch they should be invoked

-      - Pass-by-reference SPI to allow interceptors to indicate if they support pass-by-reference

-      - PolicyProvider SPIs to allow extensions to plugin policy interceptors

-    - Support for JAXWS annotations and mapping of faults to Java exceptions according to JAXWS specification

-    - Improvement of contribution service to allow it to be used outside of the runtime environment 

-    - Support for Contribution Import/Export resource

-    - Enhanced Distributed Domain story using Workspace

-      - Implementation of a SCA domain allowing a system administrator to manage contributions, composites and sca nodes that run these composites

-        - Set of core services providing management capabilities

-        - Administration web interface

-        - This is a work in progress and you can see it in action in samples/calculator-distributed. Other samples that use distributed operation are yet to move over to the workspace.

-    - Enhanced support for SCA Policy spec

-      - Ability to apply external policy definitions to a SCA composition

-      - Ability to spread policy definitions to multiple definitions.xml files available across the sca domain

-      - Bug fixes

-    - Improvements of http binding to support servlet components

-    - Enable Tuscany to run inside an OSGi runtime

-

-  * Web 2.0 Extensions

-    - Enhancements to implementation.widget (support for properties)

-    - New atom binding based on Apache Abdera

-    - Refactoring of rss-rome binding

-  * Other Extensions

-    - Binding JMS

-      - greatly simplified the use of the JMS binding, support locating JMS resources from JNDI, and better compliance with the SCA JMS binding spec

-      - see the doc page for more details: http://incubator.apache.org/tuscany/sca-java-bindingjms.html

-    - Enhancements to Binding RMI

-      - Support shared RMI registry and use 999x as the ports in test case to avoid 1099 conflict

-    - Enhancements to Groovy extension

-      - Support for 'native' groovy classes

-    - Enhancements to OSGi bundle contributions

-      - Support Bundle URLs to be added as contributions

-

-  * Tools

-    - Eclipse plugin providing a Tuscany runtime Library and Tuscany launcher in Eclipse environment
-       - An updatesite is also available to facilitate the plugin installation using the Eclipse update manager

-

-  * Samples/Tutorial/Demos

-    - calculator-distributed migrated to use new Tuscany Distributed Workspace

-    - sample-calculator-ws-secure-webapp

-    - sample-helloworld-jms-webapp

-    - new jms samples

-    - improve bigbank demo to include support for policies 

-    - tutorial store changes

-      - use of import/export

-      - development of contribution without requiring dependencies on the Tuscany runtime

-      - usage of new sca domain infrastructure

-

-  * Testing

-    - Web Container Testing Framework integrated with (Tomcat, Jetty, Geronimo and Websphere)

-

-

-Changes With Apache Tuscany SCA 1.1 (incubating) January 2008 

-===============================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1939

-  * TUSCANY-1914

-  * TUSCANY-1854

-  * TUSCANY-1931

-  * TUSCANY-1547

-  * TUSCANY-1909

-  * TUSCANY-1919

-  * TUSCANY-1930

-  * TUSCANY-1806

-  * TUSCANY-1804

-  * TUSCANY-1916

-  * TUSCANY-1913

-  * TUSCANY-1834

-  * TUSCANY-1857

-  * TUSCANY-1687

-  * TUSCANY-1801

-  * TUSCANY-1742

-  * TUSCANY-1762

-  * TUSCANY-1945

-  * TUSCANY-1595

-  * TUSCANY-1594

-  * TUSCANY-1849

-  * TUSCANY-1836

-  * TUSCANY-1934

-  * TUSCANY-1902

-  * TUSCANY-1608

-  * TUSCANY-1943

-  * TUSCANY-1896

-  * TUSCANY-1626

-  * TUSCANY-1797

-  * TUSCANY-1601

-  * TUSCANY-1415

-

-- Better JMS support

-  * binding.jms supporting point to point text based messaging only

-  * New SOAP/JMS sample (helloworld-ws-reference/service-jms)

-

-- Improvements in PolicyFramework Support

-  * Support for policy specifications on operation elements in a composite definition

-  * Separate sample (calculator-implementation-policies) to demonstrate use of Implementation Policies 

-    (uses logging and JAAS Authentication)

-

-- Modeling of client side java script components

-  * See implementation.widget

-

-- Evolving support for doman API suggested by assembly spec including a standalone node and nodes running 

-  connected together in a domain. This is still experimental. 

- 

-- Class loading and OSGI improvements

-  * Enable Tuscany to be run in a multi-classloader environment including inside OSGi. By default,

-    Tuscany continues to run using a single CLASSPATH-based classloader.

-  * Contributions no longer need to be in the CLASSPATH. All import/export dependencies across contributions should be 

-    explicitly specified (as described in the spec).

-

-- JAXB based POJO transformations

-

-Changes With Apache Tuscany SCA 1.0.1 (incubating) November 2007 

-================================================================

-

-The Tuscany SCA Java 1.0.1 is mainly a bug-fix release. It also comes with some improvements as listed below.

- 

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1848

-  * TUSCANY-1857

-  * TUSCANY-1859

-  * TUSCANY-1801

-  * TUSCANY-1823

-  * TUSCANY-1839

-  * TUSCANY-1814

-  * TUSCANY-1818

-  * TUSCANY-1834

-  * TUSCANY-1637

-  * TUSCANY-1826

-  * TUSCANY-1823

-  * TUSCANY-1819

-  * TUSCANY-1821

-  * TUSCANY-1822

-  * TUSCANY-1806

-  * TUSCANY-1808

-  * TUSCANY-1756

-  * TUSCANY-1757

-

-- Fix build issues with Maven 2.0.7 and JDK 6

-

-- Reduce memory consumption for WSDLs that import large XSDs

-

-- Add more logging statements for better servicibility

-

-- Add an extension point to allow extensions to plug-in extension schemas.

-

-- Add a demo application to showcase XML integration story 

-

-- Improve in databinding framework

-  * Add support for JSON Databindings and other refactoring

-  * Set databinding for introspected data type and enhance the checking of wrapper style

-  * Improve the tree-based XMLStreamReader and convert Bean & DOM to use this approach

-  * Add a tree-iterator based XMLStreamReader base impl

-  * Add default element info to java interface

-  * Rename Interface.setDefaultDataBinding to resetDataBinding

-

-- Limit the method injection to setters and allow the setter annotation to override field annotation

-

-- Evolving support in Intent and Policy handling

-  * Add support for policies in implementation

-  * Fix the algorithm for macthing policySets defined on bindings for the wire

-  * Add policy intent for implementation.java

-  * Extend java implementation type to recognize and apply policies, adding util support for this in Policy module

-  * Add policy module for logging

-

-- Evolving development in the SCA Domain/Node

-

-- Update NOTICE files with missing dependencies

-

-

-Changes With Apache Tuscany SCA 1.0 (incubating) September 2007 

-===============================================================

-

-- Tuscany Java SCA now implements V1.0 of the core SCA 

-  specifications

-        SCA Assembly Model V1.0

-        SCA Java Common Annotations and APIs V1.0

-        SCA Java Component Implementation V1.0

-        SCA Web Services Binding V1.0

-  Including callbacks, conversations and callable references

-  

-

-- Support for ws-security configurable in the web services binding

-  thro Tuscany SCA policy intents and policysets using the policy framework 

-  introduced in the last release.  

-  

-  Note : This release supports specifications of policies around axis2

-         config params - see helloworld-ws-service-secure sample.  The policy

-         intents that have been tested are authentication, integrity and 

-         confidentiality.  

-         There is no sample or test that exercises confidentiality since there

-         are some unresolved licensing issue around bouncycastle libraries.  

-         However, users who are not encumbered by the bouncycastle license 

-         restrictions can try the 'confidentiality' intent. See FAQ - 

-         http://incubator.apache.org/tuscany/tuscany-sca-java-faq.html

-                

-         This release does not include support for WS-Policy

-         attachments in Tuscany Policysets for ws-security.

-         

-  

-- An XQuery component implementation type 

-        implementation-xquery

-        

-

-- A Databinding for converting data to and from nodes for XQuery 

-  processing

-        databinding-saxon

-        

-

-- OSGI support has been extended to allow Tuscany contributions 

-  packaged as OSGI bundles hence taking advantage of OSGI's bundle

-  loading an dependency management capabilities 

-  

-

-- A BPEL component implementation type experimental implementation

-based on SCA BPEL Client and Implementation V1.0. At the moment only

-supports BPEL process as services.

-	implementation-bpel

-

-

-- The distributed runtime implementation has been separated out 

-  into 

-        *) domain

-        *) node

-  It is now wrapped by a SCADomain interface as is the standalone 

-  runtime.

-  

-  Note: This release does not include support for WebApp host deployment 

-        for a distributed SCA Domain 

-  

-

-

-- The web service binding will now generate WSDL automatically

-  based on the service interface if no WSDL is provided

-  

-

-- A new "store" sample and associated document show how a 

-  simple store front application can be constructed 

-        samples/store

-        

-- The following features of this release are still experimental:

-     - BPEL implementation type, integrating with Apache ODE

-     - OSGI implementation type, integrating with Apache Felix

-     - XQuery implementation type

-

- 

-

-Changes With Apache Tuscany SCA 0.99 (incubating) August 2007 

-=============================================================

-

-The following are the significant additions to release 0.99 

-over and above all of what was offered in release 0.91.

-

-- A version of the default sca binding that works between

-  components runing in separate Java virtual machines

-       binding-sca-axis

-

-- A simple node implementation and a service discovery 

-  function for running sca applications distributed 

-  across more than one node

-       distributed

-       distributed-impl 

-

-- integration with OSGi runtimes is now supported with

-  a new implementation-osgi component type

-

-- PUB/SUB interactions are now supported by using new 

-  notification binding and implementation types, and

-  samples demonstrating the feature.

-

-- The Tuscany runtime now has a policy framework supporting

-  the SCA policy specification

-

-- the endpoint URIs used by SCA bindings has been rationalized 

-  and now follows the SCA Assembly specification

-

-- binding-ajax has been renamed to binding-dwr

-

-Changes With Apache Tuscany SCA 0.91 (incubating) July 2007 

-===========================================================

-

-The following are the significant additions to release 0.91 

-over and above all of what was offered in release 0.90.

-

-

-- Enhancements to support multiple contributions to the SCA Domain

-

-- The inclusion of a alternative simplified extensions-helper

-SPI layer to faciliate rapid development of extensions

-

-- More Implementation Extenstions

-        Spring

-        WebResource

-

-- More Binding Extensions

-        AJAX

-        EJB

-        RSS/ATOM Feeds

-        

-- Demos that demonstrate the use of a mix of extensions

-         alert-aggregator-webapp

-         bigbank-account

-         bigbank-calculator

-         bigbank-stockquote

-

-

-- Samples

-        Samples to demostrate use of Spring, Resource, AJAX extensions

-

-Changes With Apache Tuscany SCA 0.90 (incubating) June 2007 

-===========================================================

-

-- Implementations for all of the Java Annotations and API Specification V1.0 found at

-  (http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications) 

-  apart from the following.

-    @ComponentName

-    Conversation

-    RequestContext

-    

-- New assembly model implementation taking into account SCA 1.0 artifacts 

-  Data duplication between assembly model and runtime removed

-

-- Simple single process domain support

-  Contribution support to scope items being deployed into the runtime

-

-- Improved Package/Class naming consistency across modules

-

-- Extensions now loaded via Java service mechanism

-  Refactored extensions to use new SPIs (see below)

-

-- Maven and Ant based sample builds in the binary distribution

-

-- Implementation Extensions

-    Java

-    Script supporting (Ruby, Python, Groovy, JavaScript)

-

-- Binding Extensions

-    Axis2

-    RMI

-    JSONRPC

-

--Databinding Extensions

-    Axiom

-    JAXB

-    SDO

-

-- Host environments

-    Embedded

-    Tomcat

-    Jetty

-    RMI

-

-- A clear set of SPIs intended to be stable over future releases

-    SCA assembly model

-      org.apache.tuscany.sca.assembly

-      org.apache.tuscany.sca.interfacedef

-      org.apache.tuscany.sca.interfacedef.java

-      org.apache.tuscany.sca.interfacedef.wsdl

-      org.apache.tuscany.sca.policy

-

-    SCA contribution model

-      org.apache.tuscany.sca.contribution

-

-    Runtime extensions

-      org.apache.tuscany.sca.core

-      org.apache.tuscany.sca.invocation

-      org.apache.tuscany.sca.provider

-      org.apache.tuscany.sca.runtime

-      org.apache.tuscany.sca.work

-

-    Data binding support

-      org.apache.tuscany.sca.databinding

-

-    Embedding Tuscany

-      org.apache.tuscany.sca.host.embedded

-

-    Servlet container integration

-      org.apache.tuscany.sca.http

-

-- For this point release a partial set of JavaDoc is provided to 

-  be filled out as we close on release 1.0

diff --git a/java/sca-contrib/distribution/web20/src/main/release/README b/java/sca-contrib/distribution/web20/src/main/release/README
deleted file mode 100644
index 4d83dcfde9..0000000000
--- a/java/sca-contrib/distribution/web20/src/main/release/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 README
-=====================================================
-
-Welcome to the Tuscany SCA 1.2 release. 
-
-See the RELEASE_NOTES file for information specific to this release.
-
-In the binary release see the INSTALL file for information on how to 
-install the release.
-
-In the source distribution see the BUILDING file for information on
-building the source code.
-
-
-
-
-
-
-
diff --git a/java/sca-contrib/distribution/web20/src/main/release/RELEASE_NOTES b/java/sca-contrib/distribution/web20/src/main/release/RELEASE_NOTES
deleted file mode 100644
index a04ef5c553..0000000000
--- a/java/sca-contrib/distribution/web20/src/main/release/RELEASE_NOTES
+++ /dev/null
@@ -1,83 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 Release Notes
-============================================================
-
-Apache Tuscany provides a runtime based on the Service Component
-Architecture. SCA is a set of specifications aimed at simplifying SOA
-Application Development which are being standardized at OASIS as part
-of Open Composite Services Architecture (Open CSA) - http://www.oasis-opencsa.org/.
-
-Overview
---------
-
-     The Apache Tuscany SCA 1.2 release includes implementations of the
-     main SCA specifications including:
-
-        SCA Assembly Model V1.0
-        SCA Policy Framework V1.0
-        SCA Java Common Annotations and APIs V1.0
-        SCA Java Component Implementation V1.0
-        SCA Spring Component Implementation V1.0
-        SCA BPEL Client and Implementation V1.0
-        SCA Web Services Binding V1.0
-        SCA EJB Session Bean Binding V1.0
-
-    It also includes implementations of many features not yet defined
-    by SCA specifications, including:
-
-        - SCA bindings for Direct Web Remoting, RSS and ATOM Feeds, 
-          HTTP resources, JSON-RPC, PUB/SUB Notifications, and RMI.
-        - SCA implementation types for OSGI, XQuery, BPEL, Widget and various 
-          dynamic languages including Groovy, Javascript, Python and Ruby
-        - Databindings for Service Data Objects (SDO), JAXB, XmlBeans, 
-          Axis2's AXIOM, JSON, SAXON, DOM, SAX and StAX
-
-    The Tuscany SCA Runtime can be configured as a single node SCA domain or 
-    as an SCA domain distributed across multiple nodes. 
-    In addition Tuscany SCA supports the following host-deployment options: -
-        - running standalone 
-        - running with distributed nodes across multiple JVMs
-        - running with embedded Jetty or Tomcat
-        - running as part of a standard web application                                     
-     
-    The Wepapp samples included in this release have been tried and tested on 
-        - Tomcat 5.5.20 and Tomcat 6.0.14
-        - Jetty 6.1.3
-        - Geronimo 2.0.2 Tomcat6 jee5
-        - WebSphere 6.1 fix pack 9
-
-See the CHANGES file for a detailed list of the features in this release.
-
-Support
--------
-
-For more information on Apache Tuscany visit the website at:
-
-    http://incubator.apache.org/tuscany/
- 
-Any issues with this release can be reported to Apache Tuscany
-using the mailing lists or in the JIRA issue tracker.
-
-    Mailing list archives:
-
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-user/
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/
-
-    Jira:
-
-       http://issues.apache.org/jira/browse/TUSCANY
-
-To join the project's mailing lists follow the instructions at:
-
-    http://incubator.apache.org/tuscany/mailing-lists.html
-
-To find out more about OASIS Open CSA go to: 
-
-    http://www.oasis-opencsa.org.
-
-Apache Tuscany welcomes your help. Any contribution, including code,
-testing, improving the documentation, or bug reporting is always
-appreciated. 
-
-Thank you for using Apache Tuscany!
-
-- The Tuscany Team.
diff --git a/java/sca-contrib/distribution/web20/src/main/release/bin/INSTALL b/java/sca-contrib/distribution/web20/src/main/release/bin/INSTALL
deleted file mode 100644
index 2da53a2b44..0000000000
--- a/java/sca-contrib/distribution/web20/src/main/release/bin/INSTALL
+++ /dev/null
@@ -1,27 +0,0 @@
-Installing the Apache Tuscany SCA 1.2 (incubating) April 2008 Release binary distribution
-=========================================================================================
-
-Unzip Tuscany binary distribution archive and you get the following:
-
-tuscany-sca-1.1-incubating        
-   DISCLAIMER    - the ASF incubation disclaimer
-   INSTALL       - this help file
-   LICENSE       - the Apache License and any dependecy licenses
-   NOTICE        - attribution notices associated with the licenses
-   README        - readme for the release
-   RELEASE_NOTES - description of this release 
-   CHANGES       - A note of the major changes in this release
-
-   /demos        - Demo applications showcasing the use of Apache Tuscany 
-
-   /lib          - The tuscany-sca-all and tuscany-sca-manifest jars and all their dependencies
-
-   /modules      - all of the individual Tuscany jars
-
-   /samples      - all the Tuscany samples, see the README in that directory
-
-   /tutorial     - The store tutorial, see the README in that directory
-
-
-
-
diff --git a/java/sca-contrib/distribution/web20/src/main/release/bin/LICENSE b/java/sca-contrib/distribution/web20/src/main/release/bin/LICENSE
deleted file mode 100644
index 5e1f585d46..0000000000
--- a/java/sca-contrib/distribution/web20/src/main/release/bin/LICENSE
+++ /dev/null
@@ -1,2366 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================
-
-APACHE TUSCANY SUBCOMPONENTS: 
-
-The Apache Tuscany binary distribution includes a number of subcomponents
-with separate copyright notices and license terms. Your use of the
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.                             
-
-===============================================================================
-
-The following components come under Apache Software License 1.1
-
- commons-discovery-0.2.jar
- commons-primitives-1.0.jar
-
-The following components come under Apache Software License 2.0
-
- abdera-core-0.3.0-incubating.jar
- abdera-i18n-0.3.0-incubating.jar
- abdera-parser-0.3.0-incubating.jar
- activeio-2.0-r118.jar
- activeio-core-3.0.0-incubator.jar
- apache-activemq-4.1.1.jar
- addressing-1.3.mar
- annogen-0.1.0.jar
- annotations-api-6.0.14.jar
- aopalliance-1.0.jar
- axiom-api-1.2.5.jar
- axiom-dom-1.2.5.jar
- axiom-impl-1.2.5.jar
- axis2-adb-1.3.jar
- axis2-codegen-1.3.jar
- axis2-java2wsdl-1.3.jar
- axis2-kernel-1.3.jar
- axis2-mtompolicy-1.3.jar
- bsf-all-3.0-beta2.jar
- catalina-6.0.14.jar
- cglib-nodep-2.1_3.jar
- commons-collections-3.1.jar
- commons-codec-1.3.jar
- commons-fileupload-1.1.1.jar
- commons-httpclient-3.0.1.jar
- commons-io-1.2.jar
- commons-jexl-1.1.jar
- commons-lang-2.1.jar
- commons-logging-1.1.jar
- coyote-6.0.14.jar
- derby-10.1.3.1.jar
- geronimo-activation_1.1_spec-1.0-M1.jar
- geronimo-common-1.2-beta.jar
- geronimo-commonj_1.1_spec-1.0.jar
- geronimo-connector-1.2-beta.jar
- geronimo-core-1.2-beta.jar
- geronimo-deployment-1.2-beta.jar
- geronimo-ejb_3.0_spec-1.0.jar
- geronimo-interceptor-1.2-beta.jar
- geronimo-j2ee-1.2-beta.jar
- geronimo-j2ee-connector_1.5_spec-1.1.jar
- geronimo-j2ee-jacc_1.0_spec-1.1.jar
- geronimo-j2ee-management_1.0_spec-1.1.jar
- geronimo-javamail_1.4_spec-1.0-M1.jar
- geronimo-jms_1.1_spec-1.1.jar
- geronimo-jpa_3.0_spec-1.0.jar
- geronimo-jta_1.0.1B_spec-1.0.jar
- geronimo-kernel-1.2-beta.jar
- geronimo-management-1.2-beta.jar
- geronimo-naming-1.2-beta.jar
- geronimo-security-1.2-beta.jar
- geronimo-spec-j2ee-connector-1.5-rc4.jar
- geronimo-spec-jta-1.0.1B-rc4.jar
- geronimo-system-1.2-beta.jar
- geronimo-transaction-1.2-beta.jar
- geronimo-util-1.2-beta.jar
- httpcore-4.0-alpha5.jar
- httpcore-nio-4.0-alpha5.jar
- httpcore-niossl-4.0-alpha5.jar
- jettison-1.0-RC2.jar
- jetty-6.1.7.jar
- jetty-util-6.1.7.jar
- json-rpc-1.0.jar
- juli-6.0.14.jar
- log4j-1.2.12.jar
- logkit-1.0.1.jar
- neethi-2.0.2.jar
- ode-bpel-api-1.1.jar
- ode-bpel-compiler-1.1.jar
- ode-bpel-dao-1.1.jar
- ode-bpel-epr-1.1.jar
- ode-bpel-obj-1.1.jar
- ode-bpel-runtime-1.1.jar
- ode-bpel-schemas-1.1.jar
- ode-bpel-store-1.1.jar
- ode-dao-jpa-1.1.jar
- ode-dao-jpa-ojpa-derby-1.1.zip
- ode-jacob-1.1.jar
- ode-jacob-ap-1.1.jar
- ode-scheduler-simple-1.1.jar
- ode-utils-1.1.jar
- openjpa-all-0.9.7-incubating.jar
- openjpa-persistence-0.9.7-incubating.jar
- org.apache.felix.bundlerepository-1.0.2.jar
- org.apache.felix.framework-1.0.3.jar
- org.apache.felix.main-1.0.3.jar
- org.apache.felix.shell-1.0.0.jar
- org.apache.felix.shell.tui-1.0.0.jar
- rampart-core-1.3.jar
- rampart-policy-1.3.jar
- rampart-trust-1.3.jar
- regexp-1.3.jar
- spring-beans-2.0.6.jar
- spring-context-2.0.6.jar
- spring-core-2.0.6.jar
- tranql-connector-1.1.jar
- tuscany-sdo-api-r2.1-1.0-incubating.jar
- tuscany-sdo-impl-1.0-incubating.jar
- tuscany-sdo-lib-1.0-incubating.jar
- tuscany-sdo-tools-1.0-incubating.jar
- woden-1.0-incubating-M7b.jar
- wss4j-1.5.3.jar
- wstx-asl-3.2.1.jar
- xalan-2.7.0.jar
- xbean-naming-2.7.jar
- xercesImpl-2.8.1.jar
- xml-apis-1.3.03.jar
- xmlbeans-2.3.0.jar
- xml-resolver-1.1.jar
- xmlsec-1.4.0.jar
- XmlSchema-1.3.2.jar
-
-===============================================================================
-axion-1.0-M3-dev.jar 
-
-Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
- 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above 
-   copyright notice, this list of conditions and the following 
-   disclaimer. 
- 
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in 
-   the documentation and/or other materials provided with the 
-   distribution. 
-
-3. The names "Tigris", "Axion", nor the names of its contributors may 
-   not be used to endorse or promote products derived from this 
-   software without specific prior written permission. 
- 
-4. Products derived from this software may not be called "Axion", nor 
-   may "Tigris" or "Axion" appear in their names without specific prior
-   written permission.
- 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-The "Axion Development Team" is defined to be:
-
- * Chuck Burdick
- * James Burke
- * Morgan Delagrange
- * Geir Magnusson Jr.
- * Martin Poeschl
- * Steve Polyak
- * Daniel Rall
- * Ahimanikya Satapathy
- * Doug Sale
- * James Strachan
- * Rodney Waldhoff
- * Jason van Zyl
-
-License changes are to be determined by a simple majority vote of the 
-Axion Development Team.
-
-===============================================================================
-dom4j-1.6.1.jar
-
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
-   statements and notices.  Redistributions must also contain a
-   copy of this document.
- 
-2. Redistributions in binary form must reproduce the
-   above copyright notice, this list of conditions and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
- 
-3. The name "DOM4J" must not be used to endorse or promote
-   products derived from this Software without prior written
-   permission of MetaStuff, Ltd.  For written permission,
-   please contact dom4j-info@metastuff.com.
- 
-4. Products derived from this Software may not be called "DOM4J"
-   nor may "DOM4J" appear in their names without prior written
-   permission of MetaStuff, Ltd. DOM4J is a registered
-   trademark of MetaStuff, Ltd.
- 
-5. Due credit should be given to the DOM4J Project - 
-   http://www.dom4j.org
- 
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-The EMF jars; 
-   codegen-2.2.3.jar 
-   codegen-ecore-2.2.3.jar
-   common-2.2.3.jar
-   ecore-2.2.3.jar
-   ecore-change-2.2.3.jar
-   ecore-xmi-2.2.3.jar
-   xsd-2.2.3.jar
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the
-Program under their own license agreement, and (ii) are not derivative
-works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor
-which are necessarily infringed by the use or sale of its Contribution
-alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this 
-Agreement.
-
-"Recipient" means anyone who receives the Program under this
-Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor, if
-any, in source code and object code form. This patent license shall
-apply to the combination of the Contribution and the Program if, at
-the time the Contribution is added by the Contributor, such addition
-of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow
-Recipient to distribute the Program, it is Recipient's responsibility
-to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or
-conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the 
-Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a
-commercial product offering should do so in a manner which does not
-create potential liability for other Contributors. Therefore, if a
-Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend
-and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising
-from claims, lawsuits and other legal actions brought by a third party
-against the Indemnified Contributor to the extent caused by the acts
-or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement.
-In order to qualify, an Indemnified Contributor must: a) promptly
-notify the Commercial Contributor in writing of such claim, and b)
-allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such
-claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable
-laws, damage to or loss of data, programs or equipment, and
-unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-the Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of
-the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of
-time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use
-and distribution of the Program as soon as reasonably practicable.
-However, Recipient's obligations under this Agreement and any licenses
-granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and
-may only be modified in the following manner. The Agreement Steward
-reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation
-is the initial Agreement Steward. The Eclipse Foundation may assign
-the responsibility to serve as the Agreement Steward to a suitable
-separate entity. Each new version of the Agreement will be given a
-distinguishing version number. The Program (including Contributions)
-may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives
-no rights or licenses to the intellectual property of any Contributor
-under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No
-party to this Agreement will bring a legal action under this Agreement
-more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.
-
-===============================================================================
-For Saxon including 
-   saxon-8.7.jar
-   saxon-dom-8.7.jar
-   saxon-xpath-8.7.jar
-
- MOZILLA PUBLIC LICENSE
-Version 1.0
-
-1. Definitions.
-
-      1.1. ``Contributor'' means each entity that creates or contributes to the creation of Modifications.
-
-      1.2. ``Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-
-      1.3. ``Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.
-
-      1.4. ``Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data.
-
-      1.5. ``Executable'' means Covered Code in any form other than Source Code.
-
-      1.6. ``Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-
-      1.7. ``Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-
-      1.8. ``License'' means this document.
-
-      1.9. ``Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-
-            A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-
-            B. Any new file that contains any part of the Original Code or previous Modifications. 
-
-      1.10. ``Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-
-      1.11. ``Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or a list of source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-
-      1.12. ``You'' means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, ``You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, ``control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity. 
-
-2. Source Code License.
-
-      2.1. The Initial Developer Grant.
-      The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell (``Utilize'') the Original Code (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Original Code (or portions thereof) and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-      2.2. Contributor Grant.
-      Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Contributor, to Utilize the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Contributor Version (or portions thereof), and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-3. Distribution Obligations.
-
-      3.1. Application of License.
-      The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-
-      3.2. Availability of Source Code.
-      Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
-
-      3.3. Description of Modifications.
-      You must cause all Covered Code to which you contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-
-      3.4. Intellectual Property Matters
-
-            (a) Third Party Claims.
-            If You have knowledge that a party claims an intellectual property right in particular functionality or code (or its utilization under this License), you must include a text file with the source code distribution titled ``LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If you obtain such knowledge after You make Your Modification available as described in Section 3.2, You shall promptly modify the LEGAL file in all copies You make available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-
-            (b) Contributor APIs.
-            If Your Modification is an application programming interface and You own or control patents which are reasonably necessary to implement that API, you must also include this information in the LEGAL file. 
-
-      3.5. Required Notices.
-      You must duplicate the notice in Exhibit A in each file of the Source Code, and this License in any documentation for the Source Code, where You describe recipients' rights relating to Covered Code. If You created one or more Modification(s), You may add your name as a Contributor to the notice described in Exhibit A. If it is not possible to put such notice in a particular Source Code file due to its structure, then you must include such notice in a location (such as a relevant directory file) where a user would be likely to look for such a notice. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-      3.6. Distribution of Executable Versions.
-      You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-      3.7. Larger Works.
-      You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. 
-
-4. Inability to Comply Due to Statute or Regulation.
-
-      If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. 
-
-5. Application of this License.
-
-      This License applies to code to which the Initial Developer has attached the notice in Exhibit A, and to related Covered Code. 
-
-6. Versions of the License.
-
-      6.1. New Versions.
-      Netscape Communications Corporation (``Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-
-      6.2. Effect of New Versions.
-      Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License.
-
-      6.3. Derivative Works.
-      If you create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), you must (a) rename Your license so that the phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or any confusingly similar phrase do not appear anywhere in your license and (b) otherwise make it clear that your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) 
-
-7. DISCLAIMER OF WARRANTY.
-
-      COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 
-
-8. TERMINATION.
-
-      This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 
-
-9. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. 
-
-10. U.S. GOVERNMENT END USERS.
-
-      The Covered Code is a ``commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer software'' and ``commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 
-
-11. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in, the United States of America: (a) unless otherwise agreed in writing, all disputes relating to this License (excepting any dispute relating to intellectual property rights) shall be subject to final and binding arbitration, with the losing party paying all costs of arbitration; (b) any arbitration relating to this Agreement shall be held in Santa Clara County, California, under the auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. 
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-      Except in cases where another Contributor has failed to comply with Section 3.4, You are responsible for damages arising, directly or indirectly, out of Your utilization of rights under this License, based on the number of copies of Covered Code you made available, the revenues you received from utilizing such rights, and other relevant factors. You agree to work with affected parties to distribute responsibility on an equitable basis. 
-
-EXHIBIT A.
-
-      ``The contents of this file are subject to the Mozilla Public License Version 1.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.mozilla.org/MPL/
-
-      Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-
-      The Original Code is ______________________________________.
-
-      The Initial Developer of the Original Code is ________________________. Portions created by ______________________ are Copyright (C) ______ _______________________. All Rights Reserved.
-
-      Contributor(s): ______________________________________.'' 
-
-===============================================================================
-
-For the Rhino JavaScript engine js-1.6R7.jar:
-
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (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.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-
-===============================================================================
-Groovy (groovy-all-minimal-1.5.4.jar):
-
-/*
- $Id: LICENSE.txt 156 2003-09-26 17:36:37Z jstrachan $
-
- Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
-    statements and notices.  Redistributions must also contain a
-    copy of this document.
-
- 2. Redistributions in binary form must reproduce the
-    above copyright notice, this list of conditions and the
-    following disclaimer in the documentation and/or other
-    materials provided with the distribution.
-
- 3. The name "groovy" must not be used to endorse or promote
-    products derived from this Software without prior written
-    permission of The Codehaus.  For written permission,
-    please contact info@codehaus.org.
-
- 4. Products derived from this Software may not be called "groovy"
-    nor may "groovy" appear in their names without prior written
-    permission of The Codehaus. "groovy" is a registered
-    trademark of The Codehaus.
-
- 5. Due credit should be given to The Codehaus -
-    http://groovy.codehaus.org/
-
- THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- THE CODEHAUS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- */
-
-===============================================================================
-
-Jython (jython-2.2.jar):
-
-A. HISTORY OF THE SOFTWARE
-=======================
-
-JPython was created in late 1997 by Jim Hugunin. Jim was also the
-primary developer while he was at CNRI. In February 1999 Barry Warsaw
-took over as primary developer and released JPython version 1.1.
-
-In October 2000 Barry helped move the software to SourceForge
-where it was renamed to Jython.  Jython 2.0 and on are licensed under
-the Jython specific license below. 
-
-The standard library is covered by the Python Software Foundation
-license. See the LICENSE_CPython.txt file for details.
-
-The zxJDBC package was written by Brian Zimmer and originally licensed
-under the GNU Public License.  The package is now covered by the Jython
-Software License.
-
-The command line interpreter is covered by the Apache Software
-License.  See the LICENSE_Apache.txt file for details.
- 
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
-================================
-
-Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the distribution.
-
- - Neither the name of the Jython Developers nor the names of
-   its contributors may be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-
-JPython 1.1.x Software License.
-=========================
-
-______________________________________________________________________
-
-IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
-
-BY CLICKING ON THE "ACCEPT" BUTTON WHERE INDICATED, OR BY INSTALLING,
-COPYING OR OTHERWISE USING THE SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
-THE TERMS AND CONDITIONS OF THIS AGREEMENT.
-
-______________________________________________________________________
-
-JPython version 1.1.x
-
-  1. This LICENSE AGREEMENT is between the Corporation for National Research
-     Initiatives, having an office at 1895 Preston White Drive, Reston, VA
-     20191 ("CNRI"), and the Individual or Organization ("Licensee")
-     accessing and using JPython version 1.1.x in source or binary form and
-     its associated documentation as provided herein ("Software").
-
-  2. Subject to the terms and conditions of this License Agreement, CNRI
-     hereby grants Licensee a non-exclusive, non-transferable, royalty-free,
-     world-wide license to reproduce, analyze, test, perform and/or display
-     publicly, prepare derivative works, distribute, and otherwise use the
-     Software alone or in any derivative version, provided, however, that
-     CNRI's License Agreement and CNRI's notice of copyright, i.e.,
-     "Copyright ©1996-1999 Corporation for National Research Initiatives;
-     All Rights Reserved" are both retained in the Software, alone or in any
-     derivative version prepared by Licensee.
-
-     Alternatively, in lieu of CNRI's License Agreement, Licensee may
-     substitute the following text (omitting the quotes), provided, however,
-     that such text is displayed prominently in the Software alone or in any
-     derivative version prepared by Licensee: "JPython (Version 1.1.x) is
-     made available subject to the terms and conditions in CNRI's License
-     Agreement. This Agreement may be located on the Internet using the
-     following unique, persistent identifier (known as a handle):
-     1895.22/1006. The License may also be obtained from a proxy server on
-     the Web using the following URL: http://hdl.handle.net/1895.22/1006."
-
-  3. In the event Licensee prepares a derivative work that is based on or
-     incorporates the Software or any part thereof, and wants to make the
-     derivative work available to the public as provided herein, then
-     Licensee hereby agrees to indicate in any such work, in a prominently
-     visible way, the nature of the modifications made to CNRI's Software.
-
-  4. Licensee may not use CNRI trademarks or trade name, including JPython
-     or CNRI, in a trademark sense to endorse or promote products or
-     services of Licensee, or any third party. Licensee may use the mark
-     JPython in connection with Licensee's derivative versions that are
-     based on or incorporate the Software, but only in the form
-     "JPython-based ___________________," or equivalent.
-
-  5. CNRI is making the Software available to Licensee on an "AS IS" basis.
-     CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
-     OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY
-     REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
-     PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE
-     ANY THIRD PARTY RIGHTS.
-
-  6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
-     ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
-     USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE
-     THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT
-     ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER
-     MAY NOT APPLY TO LICENSEE.
-
-  7. This License Agreement may be terminated by CNRI (i) immediately upon
-     written notice from CNRI of any material breach by the Licensee, if the
-     nature of the breach is such that it cannot be promptly remedied; or
-     (ii) sixty (60) days following notice from CNRI to Licensee of a
-     material remediable breach, if Licensee has not remedied such breach
-     within that sixty-day period.
-
-  8. This License Agreement shall be governed by and interpreted in all
-     respects by the law of the State of Virginia, excluding conflict of law
-     provisions. Nothing in this Agreement shall be deemed to create any
-     relationship of agency, partnership, or joint venture between CNRI and
-     Licensee.
-
-  9. By clicking on the "ACCEPT" button where indicated, or by installing,
-     copying or otherwise using the Software, Licensee agrees to be bound by
-     the terms and conditions of this License Agreement.
-
-
-===============================================================================
-
-The jars; 
-activation-1.1.jar, 
-jaxb-api-2.1.jar, 
-jaxb-impl-2.1.6.jar, 
-jaxb-xjc-2.1.4.jar, 
-jaxb2-reflection-2.1.4.jar,
-jsr181-api-1.0-MR1.jar, 
-jsr250-api-1.0.jar, 
-jaxws-api-2.1-1.jar, 
-mail-1.4.jar, 
-saaj-api-1.3.jar, 
-servlet-api-2.5.jar, 
-stax-api-1.0-commons-cli-1.0.jar2.jar
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
-      1. Definitions.
-
-            1.1. "Contributor" means each individual or entity that
-            creates or contributes to the creation of Modifications.
-
-            1.2. "Contributor Version" means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-
-            1.3. "Covered Software" means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-
-            1.4. "Executable" means the Covered Software in any form
-            other than Source Code. 
-
-            1.5. "Initial Developer" means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            
-            1.6. "Larger Work" means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-
-            1.7. "License" means this document.
-
-            1.8. "Licensable" means having the right to grant, to the
-            maximum extent possible, whether at the time of the initial
-            grant or subsequently acquired, any and all of the rights
-            conveyed herein.
-            
-            1.9. "Modifications" means the Source Code and Executable
-            form of any of the following: 
-
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-
-            1.10. "Original Software" means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-
-            1.11. "Patent Claims" means any patent claim(s), now owned
-            or hereafter acquired, including without limitation,
-            method, process, and apparatus claims, in any patent
-            Licensable by grantor. 
-
-            1.12. "Source Code" means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-
-            1.13. "You" (or "Your") means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, "You"
-            includes any entity which controls, is controlled by, or is
-            under common control with You. For purposes of this
-            definition, "control" means (a) the power, direct or
-            indirect, to cause the direction or management of such
-            entity, whether by contract or otherwise, or (b) ownership
-            of more than fifty percent (50%) of the outstanding shares
-            or beneficial ownership of such entity.
-
-      2. License Grants. 
-
-            2.1. The Initial Developer Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Initial Developer,
-                  to use, reproduce, modify, display, perform,
-                  sublicense and distribute the Original Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party under the terms of this
-                  License. 
-
-                  (d) Notwithstanding Section 2.1(b) above, no patent
-                  license is granted: (1) for code that You delete from
-                  the Original Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-
-            2.2. Contributor Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, each
-            Contributor hereby grants You a world-wide, royalty-free,
-            non-exclusive license:
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Contributor to
-                  use, reproduce, modify, display, perform, sublicense
-                  and distribute the Modifications created by such
-                  Contributor (or portions thereof), either on an
-                  unmodified basis, with other Modifications, as
-                  Covered Software and/or as part of a Larger Work; and
-                  
-
-                  (b) under Patent Claims infringed by the making,
-                  using, or selling of Modifications made by that
-                  Contributor either alone and/or in combination with
-                  its Contributor Version (or portions of such
-                  combination), to make, use, sell, offer for sale,
-                  have made, and/or otherwise dispose of: (1)
-                  Modifications made by that Contributor (or portions
-                  thereof); and (2) the combination of Modifications
-                  made by that Contributor with its Contributor Version
-                  (or portions of such combination). 
-
-                  (c) The licenses granted in Sections 2.2(a) and
-                  2.2(b) are effective on the date Contributor first
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-
-                  (d) Notwithstanding Section 2.2(b) above, no patent
-                  license is granted: (1) for any code that Contributor
-                  has deleted from the Contributor Version; (2) for
-                  infringements caused by: (i) third party
-                  modifications of Contributor Version, or (ii) the
-                  combination of Modifications made by that Contributor
-                  with other software (except as part of the
-                  Contributor Version) or other devices; or (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-
-            3.1. Availability of Source Code.
-
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-
-            3.2. Modifications.
-
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-
-            3.3. Required Notices.
-
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-
-            3.4. Application of Additional Terms.
-
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipients'
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            However, you may do so only on Your own behalf, and not on
-            behalf of the Initial Developer or any Contributor. You
-            must make it absolutely clear that any such warranty,
-            support, indemnity or liability obligation is offered by
-            You alone, and You hereby agree to indemnify the Initial
-            Developer and every Contributor for any liability incurred
-            by the Initial Developer or such Contributor as a result of
-            warranty, support, indemnity or liability terms You offer.
-          
-
-            3.5. Distribution of Executable Versions.
-
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of a license of Your choice, which may contain terms
-            different from this License, provided that You are in
-            compliance with the terms of this License and that the
-            license for the Executable form does not attempt to limit
-            or alter the recipient's rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form under a
-            different license, You must make it absolutely clear that
-            any terms which differ from this License are offered by You
-            alone, not by the Initial Developer or Contributor. You
-            hereby agree to indemnify the Initial Developer and every
-            Contributor for any liability incurred by the Initial
-            Developer or such Contributor as a result of any such terms
-            You offer.
-
-            3.6. Larger Works.
-
-            You may create a Larger Work by combining Covered Software
-            with other code not governed by the terms of this License
-            and distribute the Larger Work as a single product. In such
-            a case, You must make sure the requirements of this License
-            are fulfilled for the Covered Software. 
-            
-      4. Versions of the License. 
-
-            4.1. New Versions.
-
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-
-            4.2. Effect of New Versions.
-
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-
-            4.3. Modified Versions.
-
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-            
-
-      5. DISCLAIMER OF WARRANTY.
-
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-
-            6.1. This License and the rights granted hereunder will
-            terminate automatically if You fail to comply with terms
-            herein and fail to cure such breach within 30 days of
-            becoming aware of the breach. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as "Participant")
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-
-      7. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-
-      8. U.S. GOVERNMENT END USERS.
-
-      The Covered Software is a "commercial item," as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-      computer software" (as that term is defined at 48 C.F.R. 
-      252.227-7014(a)(1)) and "commercial computer software
-      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users
-      acquire Covered Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-
-      9. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject
-      matter hereof. If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be
-      governed by the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdiction's conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, with the losing
-      party responsible for costs, including, without limitation, court
-      costs and reasonable attorneys' fees and expenses. The
-      application of the United Nations Convention on Contracts for the
-      International Sale of Goods is expressly excluded. Any law or
-      regulation which provides that the language of a contract shall
-      be construed against the drafter shall not apply to this License.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-      10. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis. Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.
-
-===============================================================================
-
-JRuby (jruby-complete-1.0.jar), wsdl4j (wsdl4j-1.6.2.jar):
-
-Common Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-      a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-      b) in the case of each subsequent Contributor:
-
-      i) changes to the Program, and
-
-      ii) additions to the Program;
-
-      where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
-
-      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
-
-      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
-
-      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
-
-      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-      iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form:
-
-      a) it must be made available under this Agreement; and 
-
-      b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
-
-===============================================================================
-
-backport-util-concurrent-2.2.jar:
-
-The software comprising backport-util-concurrent is based in large
-part on the code from JSR166, and the package dl.util.concurrent.
-The software has been released to the public domain, as explained at:
-http://creativecommons.org/licenses/publicdomain, excepting portions
-of the class
-edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList,
-which were adapted from class java.util.ArrayList, written by Sun
-Microsystems, Inc, which are used with kind permission, and subject
-to the following:
-
-Copyright 2002-2004 Sun Microsystems, Inc. All rights reserved. Use is
-subject to the following license terms.
-
-  "Sun hereby grants you a non-exclusive, worldwide, non-transferrable
-  license to use and distribute the Java Software technologies as part
-  of a larger work in source and binary forms, with or without
-  modification, provided that the following conditions are met:
-
-   -Neither the name of or trademarks of Sun may be used to endorse or
-    promote products derived from the Java Software technology without
-    specific prior written permission.
-
-   -Redistributions of source or binary code must be accompanied by the
-    following notice and disclaimers:
-
-    Portions copyright Sun Microsystems, Inc. Used with kind permission.
-
-    This software is provided AS IS, without a warranty of any kind.  ALL
-    EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
-    WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PUPOSE OR
-    NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
-    MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE
-    FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
-    USING, MODIFYING OR DISTRIBUTING THE SOFTWARE OR ITS
-    DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR
-    ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR
-    DATA, OR FOR DIRECT, INDIRECT,CONSQUENTIAL, INCIDENTAL
-    OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF
-    THE THEORY OR LIABILITY, ARISING OUT OF THE USE OF OR
-    INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.
-    HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-    You acknowledge that Software is not designed, licensed or intended for
-    use in the design, construction, operation or maintenance of any nuclear
-    facility."
-
-===============================================================================
-rome-0.9.jar
-
-Copyright 2004 Sun Microsystems, Inc.
-
-Licensed 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.
-
-===============================================================================
-jdom-1.0.jar :
-
-$Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions, and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions, and the disclaimer that follows 
-    these conditions in the documentation and/or other materials 
-    provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
-    derived from this software without prior written permission.  For
-    written permission, please contact <request_AT_jdom_DOT_org>.
- 
- 4. Products derived from this software may not be called "JDOM", nor
-    may "JDOM" appear in their name, without prior written permission
-    from the JDOM Project Management <request_AT_jdom_DOT_org>.
- 
- In addition, we request (but do not require) that you include in the 
- end-user documentation provided with the redistribution and/or in the 
- software itself an acknowledgement equivalent to the following:
-     "This product includes software developed by the
-      JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos 
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many 
- individuals on behalf of the JDOM Project and was originally 
- created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
- Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
- on the JDOM Project, please see <http://www.jdom.org/>. 
-
-========================================================================
-
-dwr-2.0.1.jar :
-
-/*
-* Copyright 2005 Joe Walker
-*
-* Licensed 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.
-*/
-
-==========================================================================
-
-dojotoolkit V1.0.0:
-
-The "New" BSD License:
-**********************
-
-Copyright (c) 2005, The Dojo Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-	list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-	this list of conditions and the following disclaimer in the documentation
-	and/or other materials provided with the distribution.
-  * Neither the name of the Dojo Foundation nor the names of its contributors
-	may be used to endorse or promote products derived from this software
-	without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The module tuscany-implementation-script-1.0-incubating.jar temporarily includes    
-one file under the below BSD license with the following copyright:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-
-The serp-1.12.0.jar is distributed under the BSD license with the following copyright:
-
- Copyright (c) 2002, A. Abram White
- All rights reserved.
-
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-The javacc-3.2.jar, and howl-1.0.1-1.jar are distributed under the BSD license:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The tuscany-assembly-xsd jar includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-================================================================================
-License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
-
-These files being ...
-commonj/sdo/ChangeSummary$Setting.class
-commonj/sdo/ChangeSummary.class
-commonj/sdo/DataGraph.class
-commonj/sdo/DataObject.class
-commonj/sdo/helper/CopyHelper.class
-commonj/sdo/helper/DataFactory.class
-commonj/sdo/helper/DataHelper.class
-commonj/sdo/helper/EqualityHelper.class
-commonj/sdo/helper/HelperContext.class
-commonj/sdo/helper/TypeHelper.class
-commonj/sdo/helper/XMLDocument.class
-commonj/sdo/helper/XMLHelper.class
-commonj/sdo/helper/XSDHelper.class
-commonj/sdo/impl/ExternalizableDelegator$Resolvable.class
-commonj/sdo/impl/ExternalizableDelegator.class
-commonj/sdo/Property.class
-commonj/sdo/Sequence.class
-commonj/sdo/Type.class
-xml/datagraph.xsd
-xml/sdoJava.xml
-xml/sdoJava.xsd
-xml/sdoModel.xml
-xml/sdoModel.xsd
-xml/sdoXML.xml
-xml/sdoXML.xsd
-
-
-License for the Service Data Objects JavaDoc and Interface Definition files.
-
-The Service Data Objects Specification is being provided by the copyright holders under the following 
-license. By using and/or copying this work, you agree that you have read, understood and will comply with 
-the following terms and conditions:
-
-Permission to copy, display and distribute the Service Data Objects Specification and/or portions thereof, without 
-modification, in any medium without fee or royalty is hereby granted, provided that you include the 
-following on ALL copies of the Service Data Objects Specification, or portions thereof, that you make:
-
-1. A link or URL to the Service Data Objects Specification at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2. The full text of this copyright notice as shown in the Service Data Objects Specification.
-
-BEA, IBM, Oracle, Primeton Technologies, Rogue Wave Software, SAP, Software AG, Sun Microsystems, Xcalia, 
-Zend Technologies (collectively, the “Authors”) agree to grant you a royalty-free license, under reasonable, 
-non-discriminatory terms and conditions to patents that they deem necessary to implement the Service Data 
-Objects Specification. 
-
-THE Service Data Objects SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR 
-WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL 
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE SERVICE DATA OBJECTS 
-SPECIFICATION.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity 
-pertaining to the Service Data Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects Specification will at all times remain with the 
-Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-================================================================================
-
diff --git a/java/sca-contrib/distribution/web20/src/main/release/bin/NOTICE b/java/sca-contrib/distribution/web20/src/main/release/bin/NOTICE
deleted file mode 100644
index 5daa9a3dfe..0000000000
--- a/java/sca-contrib/distribution/web20/src/main/release/bin/NOTICE
+++ /dev/null
@@ -1,95 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses XmlSchema developed at 
-The Apache Software Foundation (http://ws.apache.org/commons/XmlSchema)
- Portions Copyright 2006 International Business Machines Corp.
-
-This product includes/uses ode-bpel-api-1.1 developed at
-The Apache Software Foundation (http://ode.apache.org)
- - Copyright 1999-2006 Intalio - This product includes software developed by Intalio (http://www.intalio.com)
- - Copyright 2006 Sybase - This product includes software developed by Sybase.(http://www.sybase.com)
-
-"This product includes software developed by the Spring Framework
- Project (http://www.springframework.org)."
-
-This product includes/uses the Jetty Servlet Engine (http://jetty.mortbay.org),
-developed by Mort Bay Consulting  (http://www.mortbay.com)
-
-This product includes/uses the Groovy Script Engine (http://groovy.codehaus.org/),
-Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
-This product includes/uses the Axion : the Open Source Java Database (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
-
-This product includes/uses DOM4J : the flexible XML framework for java (http://www.dom4j.org/) 
- Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)
-License: Public Domain 
-
-This product includes/uses JSON-RPC-Java (http://oss.metaparadigm.com/jsonrpc/)
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product includes software from the GlassFish project (https://glassfish.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-    
-This product includes software from the Rome project (https://rome.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-
-This product includes/uses the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
-
-This product includes/uses the Mozilla Rhino project (http://www.mozilla.org/rhino/)
-
-This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)i
-
-This product includes/uses the Codehaus JRuby project (http://jruby.codehaus.org/)
-
-This product includes/uses JDOM (http://www.jdom.org/)
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved.
- 
-This product includes/uses DWR (http://getahead.org/dwr)
- Copyright 2005 Joe Walker. All rights reserved.
- 
-This product includes/uses dojotoolkit (http://dojotoolkit.org/)
- Copyright (c) 2005, The Dojo Foundation. All rights reserved.
-
-This product includes/uses Howl (http://howl.objectweb.org/)
- Copyright (c) 2004, Bull S.A.
-
-This product includes/uses axion (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team.
-
-This product includes/uses javacc (https://javacc.dev.java.net/)
- Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.
-
-The Program includes all or portions of the following software: "The 
-Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under
-an MPL v1.0 license. Please refer to the homepage URL at 
-http://www.saxonica.com/.
-
-This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:
- Copyright (c) 2002, A. Abram White. All rights reserved.
-
-This product also includes software under the BSD license
-with the following copyright:
- Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
diff --git a/java/sca-contrib/distribution/web20/src/main/release/src/BUILDING b/java/sca-contrib/distribution/web20/src/main/release/src/BUILDING
deleted file mode 100644
index 65d09c5eae..0000000000
--- a/java/sca-contrib/distribution/web20/src/main/release/src/BUILDING
+++ /dev/null
@@ -1,55 +0,0 @@
-Building the Apache Tuscany SCA 1.2 (incubating) April 2008 Release source distribution
-=======================================================================================
-
-Initial Setup
--------------
-
-1) Install J2SE 5.0 SDK, which can be downloaded from 
-   http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_06 JDK or higher.
-
-2) Make sure that your JAVA_HOME environment variable is set to the newly installed 
-   JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 
-   $JAVA_HOME$/bin (unix).
-
-3) Install Maven 2.0.7 or higher, which can be downloaded from 
-   http://maven.apache.org/download.html. Make sure that your PATH includes 
-   the MVN_HOME/bin directory. 
-
-4) Make sure that your MAVEN_OPTS environment variable has -Xmx128M (or more),
-   you can manually do this by executing the following in your prompt :
-   Windows users:
-      set MAVEN_OPTS=-Xmx128M
-   Unix users:
-      export MAVEN_OPTS=-Xmx128M
-
-
-Building
---------
-
-1) Change to the top level directory of Apache Tuscany source distribution.
-2) Run
-
-	$> mvn
-
-   This will compile Apache Tuscany and run all of the tests in the source
-   distribution. 
-
-   Depending on the load of remote Maven 2.0 repositories, you may have 
-   to run "mvn" several times utill the required dependencies are 
-   all located in your local maven repository. It usually takes some time for 
-   maven to download required dependencies in the first build. Once all the 
-   dependencies have been downloaded you may use the -o option to run maven
-   in offline mode, for example, 'mvn clean install -o'.
-
-
-Building the distributions
---------------------------
-
-1) Change to the distribution folder
-2) Run
-
-	$> mvn
-
-   This will build the binary and source distribution with .zip and .gz 
-   formats in the distribution/target directory.
-
diff --git a/java/sca-contrib/distribution/web20/src/main/release/src/LICENSE b/java/sca-contrib/distribution/web20/src/main/release/src/LICENSE
deleted file mode 100644
index 144d8ae692..0000000000
--- a/java/sca-contrib/distribution/web20/src/main/release/src/LICENSE
+++ /dev/null
@@ -1,397 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================================================
-
-The module itest/databindings/common includes the test schema; datagraph.xsd, sdoJava.xsd, and sdoModel.xsd
-under the following license:
-
-License for the Service Data Objects JavaDoc, Interface Definition files
-and XSD files.
-
-The Service Data Objects JavaDoc, Interface Definition files and XSD files 
-are being provided by the copyright holders under the following license. 
-By using and/or copying this work, you agree that you have read, 
-understood and will comply with the following terms and conditions:
-
-Permission to copy, display, make derivative works of and distribute 
-the Service Data Objects JavaDoc, Interface Definition files and XSD files
-(the "Artifacts") in any medium without fee or royalty is hereby granted, 
-provided that you include the following on ALL copies of the Artifacts, 
-or portions thereof, that you make:
-
-1.	A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2.	The full text of this copyright notice as shown in the Artifacts.
-
-
-
-THE ARTIFACTS ARE PROVIDED "AS IS" AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE. 
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Data 
-Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects 
-Specification will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.11, last updated on 2007/12/21
-
-=================================================================================================================
-
-The module implementation-script temporarily includes one file under the following BSD license:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-=================================================================================================================
-
-The module assembly-xsd includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-=================================================================================================================
-The modules 
-
-binding-ws-xml
-databinding
-databinding-axiom
-databinding-jaxb
-databinding-json
-databinding-sdo
-databinding-sdo-axiom
-databinding-xmlbeans
-interface-wsdl-xml
-
-Include the ipo.xsd and address.xsd information from the XML Schema Primer 
-(http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) combined into the 
-file ipo.xsd and extended with UK postcode structures.
-
-The ipo.xsd file is include under the following license:
-
-W3C(c) SOFTWARE NOTICE AND LICENSE
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other 
-related items) is being provided by the copyright holders under the following 
-license. By obtaining, using and/or copying this work, you (the licensee) agree 
-that you have read, understood, and will comply with the following terms and conditions.
-
-Permission to copy, modify, and distribute this software and its documentation, 
-with or without modification, for any purpose and without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies of the 
-software and documentation or portions thereof, including modifications:
-
-   1. The full text of this NOTICE in a location viewable to users of the 
-      redistributed or derivative work.
-   2. Any pre-existing intellectual property disclaimers, notices, or terms 
-      and conditions. If none exist, the W3C Software Short Notice should be 
-      included (hypertext is preferred, text is permitted) within the body of 
-      any redistributed or derivative code.
-   3. Notice of any changes or modifications to the files, including the date 
-      changes were made. (We recommend you provide URIs to the location from which 
-      the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
-NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or 
-publicity pertaining to the software without specific, written prior permission. 
-Title to copyright in this software and any associated documentation will at all 
-times remain with copyright holders.
diff --git a/java/sca-contrib/distribution/web20/src/main/release/src/NOTICE b/java/sca-contrib/distribution/web20/src/main/release/src/NOTICE
deleted file mode 100644
index 31540fd607..0000000000
--- a/java/sca-contrib/distribution/web20/src/main/release/src/NOTICE
+++ /dev/null
@@ -1,39 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product also includes software under the BSD license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-  Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
-This product includes software under the W3C(c) Software License
-with the following copyright:
-    
-Copyright (c) 2008 World Wide Web Consortium, (Massachusetts Institute of Technology, 
-European Research Consortium for Informatics and Mathematics, Keio University). 
-All Rights Reserved. This work is distributed under the W3C(c) Software License [1] in 
-the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
diff --git a/java/sca-contrib/distribution/webapp/src/main/assembly/bin.xml b/java/sca-contrib/distribution/webapp/src/main/assembly/bin.xml
deleted file mode 100644
index fdcc421f2f..0000000000
--- a/java/sca-contrib/distribution/webapp/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,38 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id></id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
-        <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
diff --git a/java/sca-contrib/distribution/webapp/src/main/assembly/src.xml b/java/sca-contrib/distribution/webapp/src/main/assembly/src.xml
deleted file mode 100644
index af3cb8e6fc..0000000000
--- a/java/sca-contrib/distribution/webapp/src/main/assembly/src.xml
+++ /dev/null
@@ -1,37 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>src</id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
-        <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
diff --git a/java/sca-contrib/distribution/webapp/src/main/components/bin-samples.xml b/java/sca-contrib/distribution/webapp/src/main/components/bin-samples.xml
deleted file mode 100644
index a9b53dea4f..0000000000
--- a/java/sca-contrib/distribution/webapp/src/main/components/bin-samples.xml
+++ /dev/null
@@ -1,42 +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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add samples to the samples directory -->
-        <fileSet>
-            <directory>../../samples</directory>
-            <outputDirectory>samples</outputDirectory>
-            <includes>
-                <include>host-webapp-calculator/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
diff --git a/java/sca-contrib/distribution/webapp/src/main/components/src-modules.xml b/java/sca-contrib/distribution/webapp/src/main/components/src-modules.xml
deleted file mode 100644
index cb46e33258..0000000000
--- a/java/sca-contrib/distribution/webapp/src/main/components/src-modules.xml
+++ /dev/null
@@ -1,42 +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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add module sources to the modules directory -->
-        <fileSet>
-            <directory>../../../modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>host-webapp/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/CHANGES b/java/sca-contrib/distribution/webapp/src/main/release/CHANGES
deleted file mode 100644
index 3de7358ec6..0000000000
--- a/java/sca-contrib/distribution/webapp/src/main/release/CHANGES
+++ /dev/null
@@ -1,431 +0,0 @@
-Changes With Apache Tuscany SCA 1.2 (incubating) April 2008 

-===========================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-2027

-  * TUSCANY-1999

-  * TUSCANY-2037

-  * TUSCANY-2034

-  * TUSCANY-2038

-  * TUSCANY-2043

-  * TUSCANY-2046

-  * TUSCANY-2047

-  * TUSCANY-2028

-  * TUSCANY-1873

-  * TUSCANY-2049

-  * TUSCANY-2035

-  * TUSCANY-1206

-  * TUSCANY-2036 

-  * TUSCANY-1771

-  * TUSCANY-2013

-  * TUSCANY-1926

-  * TUSCANY-1917

-  * TUSCANY-1949

-  * TUSCANY-1941

-  * TUSCANY-2045

-  * TUSCANY-2057

-  * TUSCANY-2055

-  * TUSCANY-2056

-  * TUSCANY-2072

-  * TUSCANY-2047

-  * TUSCANY-2073

-  * TUSCANY-1977 

-  * TUSCANY-2075

-  * TUSCANY-1894

-  * TUSCANY-2079

-  * TUSCANY-2078

-  * TUSCANY-2080

-  * TUSCANY-2068

-  * TUSCANY-1950

-  * TUSCANY-2077

-  * TUSCANY-2056

-  * TUSCANY-2088

-  * TUSCANY-2086

-  * TUSCANY-2094

-  * TUSCANY-2106 

-

-  Features and/or Enhancements

-

-  * Core

-    - Interceptor Enhancements

-      - Phase-based interceptor ordering to allow contribution of new interceptors and also define the order in witch they should be invoked

-      - Pass-by-reference SPI to allow interceptors to indicate if they support pass-by-reference

-      - PolicyProvider SPIs to allow extensions to plugin policy interceptors

-    - Support for JAXWS annotations and mapping of faults to Java exceptions according to JAXWS specification

-    - Improvement of contribution service to allow it to be used outside of the runtime environment 

-    - Support for Contribution Import/Export resource

-    - Enhanced Distributed Domain story using Workspace

-      - Implementation of a SCA domain allowing a system administrator to manage contributions, composites and sca nodes that run these composites

-        - Set of core services providing management capabilities

-        - Administration web interface

-        - This is a work in progress and you can see it in action in samples/calculator-distributed. Other samples that use distributed operation are yet to move over to the workspace.

-    - Enhanced support for SCA Policy spec

-      - Ability to apply external policy definitions to a SCA composition

-      - Ability to spread policy definitions to multiple definitions.xml files available across the sca domain

-      - Bug fixes

-    - Improvements of http binding to support servlet components

-    - Enable Tuscany to run inside an OSGi runtime

-

-  * Web 2.0 Extensions

-    - Enhancements to implementation.widget (support for properties)

-    - New atom binding based on Apache Abdera

-    - Refactoring of rss-rome binding

-  * Other Extensions

-    - Binding JMS

-      - greatly simplified the use of the JMS binding, support locating JMS resources from JNDI, and better compliance with the SCA JMS binding spec

-      - see the doc page for more details: http://incubator.apache.org/tuscany/sca-java-bindingjms.html

-    - Enhancements to Binding RMI

-      - Support shared RMI registry and use 999x as the ports in test case to avoid 1099 conflict

-    - Enhancements to Groovy extension

-      - Support for 'native' groovy classes

-    - Enhancements to OSGi bundle contributions

-      - Support Bundle URLs to be added as contributions

-

-  * Tools

-    - Eclipse plugin providing a Tuscany runtime Library and Tuscany launcher in Eclipse environment
-       - An updatesite is also available to facilitate the plugin installation using the Eclipse update manager

-

-  * Samples/Tutorial/Demos

-    - calculator-distributed migrated to use new Tuscany Distributed Workspace

-    - sample-calculator-ws-secure-webapp

-    - sample-helloworld-jms-webapp

-    - new jms samples

-    - improve bigbank demo to include support for policies 

-    - tutorial store changes

-      - use of import/export

-      - development of contribution without requiring dependencies on the Tuscany runtime

-      - usage of new sca domain infrastructure

-

-  * Testing

-    - Web Container Testing Framework integrated with (Tomcat, Jetty, Geronimo and Websphere)

-

-

-Changes With Apache Tuscany SCA 1.1 (incubating) January 2008 

-===============================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1939

-  * TUSCANY-1914

-  * TUSCANY-1854

-  * TUSCANY-1931

-  * TUSCANY-1547

-  * TUSCANY-1909

-  * TUSCANY-1919

-  * TUSCANY-1930

-  * TUSCANY-1806

-  * TUSCANY-1804

-  * TUSCANY-1916

-  * TUSCANY-1913

-  * TUSCANY-1834

-  * TUSCANY-1857

-  * TUSCANY-1687

-  * TUSCANY-1801

-  * TUSCANY-1742

-  * TUSCANY-1762

-  * TUSCANY-1945

-  * TUSCANY-1595

-  * TUSCANY-1594

-  * TUSCANY-1849

-  * TUSCANY-1836

-  * TUSCANY-1934

-  * TUSCANY-1902

-  * TUSCANY-1608

-  * TUSCANY-1943

-  * TUSCANY-1896

-  * TUSCANY-1626

-  * TUSCANY-1797

-  * TUSCANY-1601

-  * TUSCANY-1415

-

-- Better JMS support

-  * binding.jms supporting point to point text based messaging only

-  * New SOAP/JMS sample (helloworld-ws-reference/service-jms)

-

-- Improvements in PolicyFramework Support

-  * Support for policy specifications on operation elements in a composite definition

-  * Separate sample (calculator-implementation-policies) to demonstrate use of Implementation Policies 

-    (uses logging and JAAS Authentication)

-

-- Modeling of client side java script components

-  * See implementation.widget

-

-- Evolving support for doman API suggested by assembly spec including a standalone node and nodes running 

-  connected together in a domain. This is still experimental. 

- 

-- Class loading and OSGI improvements

-  * Enable Tuscany to be run in a multi-classloader environment including inside OSGi. By default,

-    Tuscany continues to run using a single CLASSPATH-based classloader.

-  * Contributions no longer need to be in the CLASSPATH. All import/export dependencies across contributions should be 

-    explicitly specified (as described in the spec).

-

-- JAXB based POJO transformations

-

-Changes With Apache Tuscany SCA 1.0.1 (incubating) November 2007 

-================================================================

-

-The Tuscany SCA Java 1.0.1 is mainly a bug-fix release. It also comes with some improvements as listed below.

- 

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1848

-  * TUSCANY-1857

-  * TUSCANY-1859

-  * TUSCANY-1801

-  * TUSCANY-1823

-  * TUSCANY-1839

-  * TUSCANY-1814

-  * TUSCANY-1818

-  * TUSCANY-1834

-  * TUSCANY-1637

-  * TUSCANY-1826

-  * TUSCANY-1823

-  * TUSCANY-1819

-  * TUSCANY-1821

-  * TUSCANY-1822

-  * TUSCANY-1806

-  * TUSCANY-1808

-  * TUSCANY-1756

-  * TUSCANY-1757

-

-- Fix build issues with Maven 2.0.7 and JDK 6

-

-- Reduce memory consumption for WSDLs that import large XSDs

-

-- Add more logging statements for better servicibility

-

-- Add an extension point to allow extensions to plug-in extension schemas.

-

-- Add a demo application to showcase XML integration story 

-

-- Improve in databinding framework

-  * Add support for JSON Databindings and other refactoring

-  * Set databinding for introspected data type and enhance the checking of wrapper style

-  * Improve the tree-based XMLStreamReader and convert Bean & DOM to use this approach

-  * Add a tree-iterator based XMLStreamReader base impl

-  * Add default element info to java interface

-  * Rename Interface.setDefaultDataBinding to resetDataBinding

-

-- Limit the method injection to setters and allow the setter annotation to override field annotation

-

-- Evolving support in Intent and Policy handling

-  * Add support for policies in implementation

-  * Fix the algorithm for macthing policySets defined on bindings for the wire

-  * Add policy intent for implementation.java

-  * Extend java implementation type to recognize and apply policies, adding util support for this in Policy module

-  * Add policy module for logging

-

-- Evolving development in the SCA Domain/Node

-

-- Update NOTICE files with missing dependencies

-

-

-Changes With Apache Tuscany SCA 1.0 (incubating) September 2007 

-===============================================================

-

-- Tuscany Java SCA now implements V1.0 of the core SCA 

-  specifications

-        SCA Assembly Model V1.0

-        SCA Java Common Annotations and APIs V1.0

-        SCA Java Component Implementation V1.0

-        SCA Web Services Binding V1.0

-  Including callbacks, conversations and callable references

-  

-

-- Support for ws-security configurable in the web services binding

-  thro Tuscany SCA policy intents and policysets using the policy framework 

-  introduced in the last release.  

-  

-  Note : This release supports specifications of policies around axis2

-         config params - see helloworld-ws-service-secure sample.  The policy

-         intents that have been tested are authentication, integrity and 

-         confidentiality.  

-         There is no sample or test that exercises confidentiality since there

-         are some unresolved licensing issue around bouncycastle libraries.  

-         However, users who are not encumbered by the bouncycastle license 

-         restrictions can try the 'confidentiality' intent. See FAQ - 

-         http://incubator.apache.org/tuscany/tuscany-sca-java-faq.html

-                

-         This release does not include support for WS-Policy

-         attachments in Tuscany Policysets for ws-security.

-         

-  

-- An XQuery component implementation type 

-        implementation-xquery

-        

-

-- A Databinding for converting data to and from nodes for XQuery 

-  processing

-        databinding-saxon

-        

-

-- OSGI support has been extended to allow Tuscany contributions 

-  packaged as OSGI bundles hence taking advantage of OSGI's bundle

-  loading an dependency management capabilities 

-  

-

-- A BPEL component implementation type experimental implementation

-based on SCA BPEL Client and Implementation V1.0. At the moment only

-supports BPEL process as services.

-	implementation-bpel

-

-

-- The distributed runtime implementation has been separated out 

-  into 

-        *) domain

-        *) node

-  It is now wrapped by a SCADomain interface as is the standalone 

-  runtime.

-  

-  Note: This release does not include support for WebApp host deployment 

-        for a distributed SCA Domain 

-  

-

-

-- The web service binding will now generate WSDL automatically

-  based on the service interface if no WSDL is provided

-  

-

-- A new "store" sample and associated document show how a 

-  simple store front application can be constructed 

-        samples/store

-        

-- The following features of this release are still experimental:

-     - BPEL implementation type, integrating with Apache ODE

-     - OSGI implementation type, integrating with Apache Felix

-     - XQuery implementation type

-

- 

-

-Changes With Apache Tuscany SCA 0.99 (incubating) August 2007 

-=============================================================

-

-The following are the significant additions to release 0.99 

-over and above all of what was offered in release 0.91.

-

-- A version of the default sca binding that works between

-  components runing in separate Java virtual machines

-       binding-sca-axis

-

-- A simple node implementation and a service discovery 

-  function for running sca applications distributed 

-  across more than one node

-       distributed

-       distributed-impl 

-

-- integration with OSGi runtimes is now supported with

-  a new implementation-osgi component type

-

-- PUB/SUB interactions are now supported by using new 

-  notification binding and implementation types, and

-  samples demonstrating the feature.

-

-- The Tuscany runtime now has a policy framework supporting

-  the SCA policy specification

-

-- the endpoint URIs used by SCA bindings has been rationalized 

-  and now follows the SCA Assembly specification

-

-- binding-ajax has been renamed to binding-dwr

-

-Changes With Apache Tuscany SCA 0.91 (incubating) July 2007 

-===========================================================

-

-The following are the significant additions to release 0.91 

-over and above all of what was offered in release 0.90.

-

-

-- Enhancements to support multiple contributions to the SCA Domain

-

-- The inclusion of a alternative simplified extensions-helper

-SPI layer to faciliate rapid development of extensions

-

-- More Implementation Extenstions

-        Spring

-        WebResource

-

-- More Binding Extensions

-        AJAX

-        EJB

-        RSS/ATOM Feeds

-        

-- Demos that demonstrate the use of a mix of extensions

-         alert-aggregator-webapp

-         bigbank-account

-         bigbank-calculator

-         bigbank-stockquote

-

-

-- Samples

-        Samples to demostrate use of Spring, Resource, AJAX extensions

-

-Changes With Apache Tuscany SCA 0.90 (incubating) June 2007 

-===========================================================

-

-- Implementations for all of the Java Annotations and API Specification V1.0 found at

-  (http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications) 

-  apart from the following.

-    @ComponentName

-    Conversation

-    RequestContext

-    

-- New assembly model implementation taking into account SCA 1.0 artifacts 

-  Data duplication between assembly model and runtime removed

-

-- Simple single process domain support

-  Contribution support to scope items being deployed into the runtime

-

-- Improved Package/Class naming consistency across modules

-

-- Extensions now loaded via Java service mechanism

-  Refactored extensions to use new SPIs (see below)

-

-- Maven and Ant based sample builds in the binary distribution

-

-- Implementation Extensions

-    Java

-    Script supporting (Ruby, Python, Groovy, JavaScript)

-

-- Binding Extensions

-    Axis2

-    RMI

-    JSONRPC

-

--Databinding Extensions

-    Axiom

-    JAXB

-    SDO

-

-- Host environments

-    Embedded

-    Tomcat

-    Jetty

-    RMI

-

-- A clear set of SPIs intended to be stable over future releases

-    SCA assembly model

-      org.apache.tuscany.sca.assembly

-      org.apache.tuscany.sca.interfacedef

-      org.apache.tuscany.sca.interfacedef.java

-      org.apache.tuscany.sca.interfacedef.wsdl

-      org.apache.tuscany.sca.policy

-

-    SCA contribution model

-      org.apache.tuscany.sca.contribution

-

-    Runtime extensions

-      org.apache.tuscany.sca.core

-      org.apache.tuscany.sca.invocation

-      org.apache.tuscany.sca.provider

-      org.apache.tuscany.sca.runtime

-      org.apache.tuscany.sca.work

-

-    Data binding support

-      org.apache.tuscany.sca.databinding

-

-    Embedding Tuscany

-      org.apache.tuscany.sca.host.embedded

-

-    Servlet container integration

-      org.apache.tuscany.sca.http

-

-- For this point release a partial set of JavaDoc is provided to 

-  be filled out as we close on release 1.0

diff --git a/java/sca-contrib/distribution/webapp/src/main/release/README b/java/sca-contrib/distribution/webapp/src/main/release/README
deleted file mode 100644
index 4d83dcfde9..0000000000
--- a/java/sca-contrib/distribution/webapp/src/main/release/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 README
-=====================================================
-
-Welcome to the Tuscany SCA 1.2 release. 
-
-See the RELEASE_NOTES file for information specific to this release.
-
-In the binary release see the INSTALL file for information on how to 
-install the release.
-
-In the source distribution see the BUILDING file for information on
-building the source code.
-
-
-
-
-
-
-
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/RELEASE_NOTES b/java/sca-contrib/distribution/webapp/src/main/release/RELEASE_NOTES
deleted file mode 100644
index a04ef5c553..0000000000
--- a/java/sca-contrib/distribution/webapp/src/main/release/RELEASE_NOTES
+++ /dev/null
@@ -1,83 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 Release Notes
-============================================================
-
-Apache Tuscany provides a runtime based on the Service Component
-Architecture. SCA is a set of specifications aimed at simplifying SOA
-Application Development which are being standardized at OASIS as part
-of Open Composite Services Architecture (Open CSA) - http://www.oasis-opencsa.org/.
-
-Overview
---------
-
-     The Apache Tuscany SCA 1.2 release includes implementations of the
-     main SCA specifications including:
-
-        SCA Assembly Model V1.0
-        SCA Policy Framework V1.0
-        SCA Java Common Annotations and APIs V1.0
-        SCA Java Component Implementation V1.0
-        SCA Spring Component Implementation V1.0
-        SCA BPEL Client and Implementation V1.0
-        SCA Web Services Binding V1.0
-        SCA EJB Session Bean Binding V1.0
-
-    It also includes implementations of many features not yet defined
-    by SCA specifications, including:
-
-        - SCA bindings for Direct Web Remoting, RSS and ATOM Feeds, 
-          HTTP resources, JSON-RPC, PUB/SUB Notifications, and RMI.
-        - SCA implementation types for OSGI, XQuery, BPEL, Widget and various 
-          dynamic languages including Groovy, Javascript, Python and Ruby
-        - Databindings for Service Data Objects (SDO), JAXB, XmlBeans, 
-          Axis2's AXIOM, JSON, SAXON, DOM, SAX and StAX
-
-    The Tuscany SCA Runtime can be configured as a single node SCA domain or 
-    as an SCA domain distributed across multiple nodes. 
-    In addition Tuscany SCA supports the following host-deployment options: -
-        - running standalone 
-        - running with distributed nodes across multiple JVMs
-        - running with embedded Jetty or Tomcat
-        - running as part of a standard web application                                     
-     
-    The Wepapp samples included in this release have been tried and tested on 
-        - Tomcat 5.5.20 and Tomcat 6.0.14
-        - Jetty 6.1.3
-        - Geronimo 2.0.2 Tomcat6 jee5
-        - WebSphere 6.1 fix pack 9
-
-See the CHANGES file for a detailed list of the features in this release.
-
-Support
--------
-
-For more information on Apache Tuscany visit the website at:
-
-    http://incubator.apache.org/tuscany/
- 
-Any issues with this release can be reported to Apache Tuscany
-using the mailing lists or in the JIRA issue tracker.
-
-    Mailing list archives:
-
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-user/
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/
-
-    Jira:
-
-       http://issues.apache.org/jira/browse/TUSCANY
-
-To join the project's mailing lists follow the instructions at:
-
-    http://incubator.apache.org/tuscany/mailing-lists.html
-
-To find out more about OASIS Open CSA go to: 
-
-    http://www.oasis-opencsa.org.
-
-Apache Tuscany welcomes your help. Any contribution, including code,
-testing, improving the documentation, or bug reporting is always
-appreciated. 
-
-Thank you for using Apache Tuscany!
-
-- The Tuscany Team.
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/bin/INSTALL b/java/sca-contrib/distribution/webapp/src/main/release/bin/INSTALL
deleted file mode 100644
index 2da53a2b44..0000000000
--- a/java/sca-contrib/distribution/webapp/src/main/release/bin/INSTALL
+++ /dev/null
@@ -1,27 +0,0 @@
-Installing the Apache Tuscany SCA 1.2 (incubating) April 2008 Release binary distribution
-=========================================================================================
-
-Unzip Tuscany binary distribution archive and you get the following:
-
-tuscany-sca-1.1-incubating        
-   DISCLAIMER    - the ASF incubation disclaimer
-   INSTALL       - this help file
-   LICENSE       - the Apache License and any dependecy licenses
-   NOTICE        - attribution notices associated with the licenses
-   README        - readme for the release
-   RELEASE_NOTES - description of this release 
-   CHANGES       - A note of the major changes in this release
-
-   /demos        - Demo applications showcasing the use of Apache Tuscany 
-
-   /lib          - The tuscany-sca-all and tuscany-sca-manifest jars and all their dependencies
-
-   /modules      - all of the individual Tuscany jars
-
-   /samples      - all the Tuscany samples, see the README in that directory
-
-   /tutorial     - The store tutorial, see the README in that directory
-
-
-
-
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/bin/LICENSE b/java/sca-contrib/distribution/webapp/src/main/release/bin/LICENSE
deleted file mode 100644
index 5e1f585d46..0000000000
--- a/java/sca-contrib/distribution/webapp/src/main/release/bin/LICENSE
+++ /dev/null
@@ -1,2366 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================
-
-APACHE TUSCANY SUBCOMPONENTS: 
-
-The Apache Tuscany binary distribution includes a number of subcomponents
-with separate copyright notices and license terms. Your use of the
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.                             
-
-===============================================================================
-
-The following components come under Apache Software License 1.1
-
- commons-discovery-0.2.jar
- commons-primitives-1.0.jar
-
-The following components come under Apache Software License 2.0
-
- abdera-core-0.3.0-incubating.jar
- abdera-i18n-0.3.0-incubating.jar
- abdera-parser-0.3.0-incubating.jar
- activeio-2.0-r118.jar
- activeio-core-3.0.0-incubator.jar
- apache-activemq-4.1.1.jar
- addressing-1.3.mar
- annogen-0.1.0.jar
- annotations-api-6.0.14.jar
- aopalliance-1.0.jar
- axiom-api-1.2.5.jar
- axiom-dom-1.2.5.jar
- axiom-impl-1.2.5.jar
- axis2-adb-1.3.jar
- axis2-codegen-1.3.jar
- axis2-java2wsdl-1.3.jar
- axis2-kernel-1.3.jar
- axis2-mtompolicy-1.3.jar
- bsf-all-3.0-beta2.jar
- catalina-6.0.14.jar
- cglib-nodep-2.1_3.jar
- commons-collections-3.1.jar
- commons-codec-1.3.jar
- commons-fileupload-1.1.1.jar
- commons-httpclient-3.0.1.jar
- commons-io-1.2.jar
- commons-jexl-1.1.jar
- commons-lang-2.1.jar
- commons-logging-1.1.jar
- coyote-6.0.14.jar
- derby-10.1.3.1.jar
- geronimo-activation_1.1_spec-1.0-M1.jar
- geronimo-common-1.2-beta.jar
- geronimo-commonj_1.1_spec-1.0.jar
- geronimo-connector-1.2-beta.jar
- geronimo-core-1.2-beta.jar
- geronimo-deployment-1.2-beta.jar
- geronimo-ejb_3.0_spec-1.0.jar
- geronimo-interceptor-1.2-beta.jar
- geronimo-j2ee-1.2-beta.jar
- geronimo-j2ee-connector_1.5_spec-1.1.jar
- geronimo-j2ee-jacc_1.0_spec-1.1.jar
- geronimo-j2ee-management_1.0_spec-1.1.jar
- geronimo-javamail_1.4_spec-1.0-M1.jar
- geronimo-jms_1.1_spec-1.1.jar
- geronimo-jpa_3.0_spec-1.0.jar
- geronimo-jta_1.0.1B_spec-1.0.jar
- geronimo-kernel-1.2-beta.jar
- geronimo-management-1.2-beta.jar
- geronimo-naming-1.2-beta.jar
- geronimo-security-1.2-beta.jar
- geronimo-spec-j2ee-connector-1.5-rc4.jar
- geronimo-spec-jta-1.0.1B-rc4.jar
- geronimo-system-1.2-beta.jar
- geronimo-transaction-1.2-beta.jar
- geronimo-util-1.2-beta.jar
- httpcore-4.0-alpha5.jar
- httpcore-nio-4.0-alpha5.jar
- httpcore-niossl-4.0-alpha5.jar
- jettison-1.0-RC2.jar
- jetty-6.1.7.jar
- jetty-util-6.1.7.jar
- json-rpc-1.0.jar
- juli-6.0.14.jar
- log4j-1.2.12.jar
- logkit-1.0.1.jar
- neethi-2.0.2.jar
- ode-bpel-api-1.1.jar
- ode-bpel-compiler-1.1.jar
- ode-bpel-dao-1.1.jar
- ode-bpel-epr-1.1.jar
- ode-bpel-obj-1.1.jar
- ode-bpel-runtime-1.1.jar
- ode-bpel-schemas-1.1.jar
- ode-bpel-store-1.1.jar
- ode-dao-jpa-1.1.jar
- ode-dao-jpa-ojpa-derby-1.1.zip
- ode-jacob-1.1.jar
- ode-jacob-ap-1.1.jar
- ode-scheduler-simple-1.1.jar
- ode-utils-1.1.jar
- openjpa-all-0.9.7-incubating.jar
- openjpa-persistence-0.9.7-incubating.jar
- org.apache.felix.bundlerepository-1.0.2.jar
- org.apache.felix.framework-1.0.3.jar
- org.apache.felix.main-1.0.3.jar
- org.apache.felix.shell-1.0.0.jar
- org.apache.felix.shell.tui-1.0.0.jar
- rampart-core-1.3.jar
- rampart-policy-1.3.jar
- rampart-trust-1.3.jar
- regexp-1.3.jar
- spring-beans-2.0.6.jar
- spring-context-2.0.6.jar
- spring-core-2.0.6.jar
- tranql-connector-1.1.jar
- tuscany-sdo-api-r2.1-1.0-incubating.jar
- tuscany-sdo-impl-1.0-incubating.jar
- tuscany-sdo-lib-1.0-incubating.jar
- tuscany-sdo-tools-1.0-incubating.jar
- woden-1.0-incubating-M7b.jar
- wss4j-1.5.3.jar
- wstx-asl-3.2.1.jar
- xalan-2.7.0.jar
- xbean-naming-2.7.jar
- xercesImpl-2.8.1.jar
- xml-apis-1.3.03.jar
- xmlbeans-2.3.0.jar
- xml-resolver-1.1.jar
- xmlsec-1.4.0.jar
- XmlSchema-1.3.2.jar
-
-===============================================================================
-axion-1.0-M3-dev.jar 
-
-Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
- 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above 
-   copyright notice, this list of conditions and the following 
-   disclaimer. 
- 
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in 
-   the documentation and/or other materials provided with the 
-   distribution. 
-
-3. The names "Tigris", "Axion", nor the names of its contributors may 
-   not be used to endorse or promote products derived from this 
-   software without specific prior written permission. 
- 
-4. Products derived from this software may not be called "Axion", nor 
-   may "Tigris" or "Axion" appear in their names without specific prior
-   written permission.
- 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-The "Axion Development Team" is defined to be:
-
- * Chuck Burdick
- * James Burke
- * Morgan Delagrange
- * Geir Magnusson Jr.
- * Martin Poeschl
- * Steve Polyak
- * Daniel Rall
- * Ahimanikya Satapathy
- * Doug Sale
- * James Strachan
- * Rodney Waldhoff
- * Jason van Zyl
-
-License changes are to be determined by a simple majority vote of the 
-Axion Development Team.
-
-===============================================================================
-dom4j-1.6.1.jar
-
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
-   statements and notices.  Redistributions must also contain a
-   copy of this document.
- 
-2. Redistributions in binary form must reproduce the
-   above copyright notice, this list of conditions and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
- 
-3. The name "DOM4J" must not be used to endorse or promote
-   products derived from this Software without prior written
-   permission of MetaStuff, Ltd.  For written permission,
-   please contact dom4j-info@metastuff.com.
- 
-4. Products derived from this Software may not be called "DOM4J"
-   nor may "DOM4J" appear in their names without prior written
-   permission of MetaStuff, Ltd. DOM4J is a registered
-   trademark of MetaStuff, Ltd.
- 
-5. Due credit should be given to the DOM4J Project - 
-   http://www.dom4j.org
- 
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-The EMF jars; 
-   codegen-2.2.3.jar 
-   codegen-ecore-2.2.3.jar
-   common-2.2.3.jar
-   ecore-2.2.3.jar
-   ecore-change-2.2.3.jar
-   ecore-xmi-2.2.3.jar
-   xsd-2.2.3.jar
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the
-Program under their own license agreement, and (ii) are not derivative
-works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor
-which are necessarily infringed by the use or sale of its Contribution
-alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this 
-Agreement.
-
-"Recipient" means anyone who receives the Program under this
-Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor, if
-any, in source code and object code form. This patent license shall
-apply to the combination of the Contribution and the Program if, at
-the time the Contribution is added by the Contributor, such addition
-of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow
-Recipient to distribute the Program, it is Recipient's responsibility
-to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or
-conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the 
-Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a
-commercial product offering should do so in a manner which does not
-create potential liability for other Contributors. Therefore, if a
-Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend
-and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising
-from claims, lawsuits and other legal actions brought by a third party
-against the Indemnified Contributor to the extent caused by the acts
-or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement.
-In order to qualify, an Indemnified Contributor must: a) promptly
-notify the Commercial Contributor in writing of such claim, and b)
-allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such
-claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable
-laws, damage to or loss of data, programs or equipment, and
-unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-the Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of
-the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of
-time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use
-and distribution of the Program as soon as reasonably practicable.
-However, Recipient's obligations under this Agreement and any licenses
-granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and
-may only be modified in the following manner. The Agreement Steward
-reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation
-is the initial Agreement Steward. The Eclipse Foundation may assign
-the responsibility to serve as the Agreement Steward to a suitable
-separate entity. Each new version of the Agreement will be given a
-distinguishing version number. The Program (including Contributions)
-may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives
-no rights or licenses to the intellectual property of any Contributor
-under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No
-party to this Agreement will bring a legal action under this Agreement
-more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.
-
-===============================================================================
-For Saxon including 
-   saxon-8.7.jar
-   saxon-dom-8.7.jar
-   saxon-xpath-8.7.jar
-
- MOZILLA PUBLIC LICENSE
-Version 1.0
-
-1. Definitions.
-
-      1.1. ``Contributor'' means each entity that creates or contributes to the creation of Modifications.
-
-      1.2. ``Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-
-      1.3. ``Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.
-
-      1.4. ``Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data.
-
-      1.5. ``Executable'' means Covered Code in any form other than Source Code.
-
-      1.6. ``Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-
-      1.7. ``Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-
-      1.8. ``License'' means this document.
-
-      1.9. ``Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-
-            A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-
-            B. Any new file that contains any part of the Original Code or previous Modifications. 
-
-      1.10. ``Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-
-      1.11. ``Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or a list of source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-
-      1.12. ``You'' means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, ``You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, ``control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity. 
-
-2. Source Code License.
-
-      2.1. The Initial Developer Grant.
-      The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell (``Utilize'') the Original Code (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Original Code (or portions thereof) and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-      2.2. Contributor Grant.
-      Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Contributor, to Utilize the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Contributor Version (or portions thereof), and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-3. Distribution Obligations.
-
-      3.1. Application of License.
-      The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-
-      3.2. Availability of Source Code.
-      Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
-
-      3.3. Description of Modifications.
-      You must cause all Covered Code to which you contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-
-      3.4. Intellectual Property Matters
-
-            (a) Third Party Claims.
-            If You have knowledge that a party claims an intellectual property right in particular functionality or code (or its utilization under this License), you must include a text file with the source code distribution titled ``LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If you obtain such knowledge after You make Your Modification available as described in Section 3.2, You shall promptly modify the LEGAL file in all copies You make available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-
-            (b) Contributor APIs.
-            If Your Modification is an application programming interface and You own or control patents which are reasonably necessary to implement that API, you must also include this information in the LEGAL file. 
-
-      3.5. Required Notices.
-      You must duplicate the notice in Exhibit A in each file of the Source Code, and this License in any documentation for the Source Code, where You describe recipients' rights relating to Covered Code. If You created one or more Modification(s), You may add your name as a Contributor to the notice described in Exhibit A. If it is not possible to put such notice in a particular Source Code file due to its structure, then you must include such notice in a location (such as a relevant directory file) where a user would be likely to look for such a notice. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-      3.6. Distribution of Executable Versions.
-      You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-      3.7. Larger Works.
-      You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. 
-
-4. Inability to Comply Due to Statute or Regulation.
-
-      If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. 
-
-5. Application of this License.
-
-      This License applies to code to which the Initial Developer has attached the notice in Exhibit A, and to related Covered Code. 
-
-6. Versions of the License.
-
-      6.1. New Versions.
-      Netscape Communications Corporation (``Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-
-      6.2. Effect of New Versions.
-      Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License.
-
-      6.3. Derivative Works.
-      If you create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), you must (a) rename Your license so that the phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or any confusingly similar phrase do not appear anywhere in your license and (b) otherwise make it clear that your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) 
-
-7. DISCLAIMER OF WARRANTY.
-
-      COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 
-
-8. TERMINATION.
-
-      This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 
-
-9. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. 
-
-10. U.S. GOVERNMENT END USERS.
-
-      The Covered Code is a ``commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer software'' and ``commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 
-
-11. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in, the United States of America: (a) unless otherwise agreed in writing, all disputes relating to this License (excepting any dispute relating to intellectual property rights) shall be subject to final and binding arbitration, with the losing party paying all costs of arbitration; (b) any arbitration relating to this Agreement shall be held in Santa Clara County, California, under the auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. 
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-      Except in cases where another Contributor has failed to comply with Section 3.4, You are responsible for damages arising, directly or indirectly, out of Your utilization of rights under this License, based on the number of copies of Covered Code you made available, the revenues you received from utilizing such rights, and other relevant factors. You agree to work with affected parties to distribute responsibility on an equitable basis. 
-
-EXHIBIT A.
-
-      ``The contents of this file are subject to the Mozilla Public License Version 1.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.mozilla.org/MPL/
-
-      Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-
-      The Original Code is ______________________________________.
-
-      The Initial Developer of the Original Code is ________________________. Portions created by ______________________ are Copyright (C) ______ _______________________. All Rights Reserved.
-
-      Contributor(s): ______________________________________.'' 
-
-===============================================================================
-
-For the Rhino JavaScript engine js-1.6R7.jar:
-
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (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.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-
-===============================================================================
-Groovy (groovy-all-minimal-1.5.4.jar):
-
-/*
- $Id: LICENSE.txt 156 2003-09-26 17:36:37Z jstrachan $
-
- Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
-    statements and notices.  Redistributions must also contain a
-    copy of this document.
-
- 2. Redistributions in binary form must reproduce the
-    above copyright notice, this list of conditions and the
-    following disclaimer in the documentation and/or other
-    materials provided with the distribution.
-
- 3. The name "groovy" must not be used to endorse or promote
-    products derived from this Software without prior written
-    permission of The Codehaus.  For written permission,
-    please contact info@codehaus.org.
-
- 4. Products derived from this Software may not be called "groovy"
-    nor may "groovy" appear in their names without prior written
-    permission of The Codehaus. "groovy" is a registered
-    trademark of The Codehaus.
-
- 5. Due credit should be given to The Codehaus -
-    http://groovy.codehaus.org/
-
- THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- THE CODEHAUS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- */
-
-===============================================================================
-
-Jython (jython-2.2.jar):
-
-A. HISTORY OF THE SOFTWARE
-=======================
-
-JPython was created in late 1997 by Jim Hugunin. Jim was also the
-primary developer while he was at CNRI. In February 1999 Barry Warsaw
-took over as primary developer and released JPython version 1.1.
-
-In October 2000 Barry helped move the software to SourceForge
-where it was renamed to Jython.  Jython 2.0 and on are licensed under
-the Jython specific license below. 
-
-The standard library is covered by the Python Software Foundation
-license. See the LICENSE_CPython.txt file for details.
-
-The zxJDBC package was written by Brian Zimmer and originally licensed
-under the GNU Public License.  The package is now covered by the Jython
-Software License.
-
-The command line interpreter is covered by the Apache Software
-License.  See the LICENSE_Apache.txt file for details.
- 
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
-================================
-
-Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the distribution.
-
- - Neither the name of the Jython Developers nor the names of
-   its contributors may be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-
-JPython 1.1.x Software License.
-=========================
-
-______________________________________________________________________
-
-IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
-
-BY CLICKING ON THE "ACCEPT" BUTTON WHERE INDICATED, OR BY INSTALLING,
-COPYING OR OTHERWISE USING THE SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
-THE TERMS AND CONDITIONS OF THIS AGREEMENT.
-
-______________________________________________________________________
-
-JPython version 1.1.x
-
-  1. This LICENSE AGREEMENT is between the Corporation for National Research
-     Initiatives, having an office at 1895 Preston White Drive, Reston, VA
-     20191 ("CNRI"), and the Individual or Organization ("Licensee")
-     accessing and using JPython version 1.1.x in source or binary form and
-     its associated documentation as provided herein ("Software").
-
-  2. Subject to the terms and conditions of this License Agreement, CNRI
-     hereby grants Licensee a non-exclusive, non-transferable, royalty-free,
-     world-wide license to reproduce, analyze, test, perform and/or display
-     publicly, prepare derivative works, distribute, and otherwise use the
-     Software alone or in any derivative version, provided, however, that
-     CNRI's License Agreement and CNRI's notice of copyright, i.e.,
-     "Copyright ©1996-1999 Corporation for National Research Initiatives;
-     All Rights Reserved" are both retained in the Software, alone or in any
-     derivative version prepared by Licensee.
-
-     Alternatively, in lieu of CNRI's License Agreement, Licensee may
-     substitute the following text (omitting the quotes), provided, however,
-     that such text is displayed prominently in the Software alone or in any
-     derivative version prepared by Licensee: "JPython (Version 1.1.x) is
-     made available subject to the terms and conditions in CNRI's License
-     Agreement. This Agreement may be located on the Internet using the
-     following unique, persistent identifier (known as a handle):
-     1895.22/1006. The License may also be obtained from a proxy server on
-     the Web using the following URL: http://hdl.handle.net/1895.22/1006."
-
-  3. In the event Licensee prepares a derivative work that is based on or
-     incorporates the Software or any part thereof, and wants to make the
-     derivative work available to the public as provided herein, then
-     Licensee hereby agrees to indicate in any such work, in a prominently
-     visible way, the nature of the modifications made to CNRI's Software.
-
-  4. Licensee may not use CNRI trademarks or trade name, including JPython
-     or CNRI, in a trademark sense to endorse or promote products or
-     services of Licensee, or any third party. Licensee may use the mark
-     JPython in connection with Licensee's derivative versions that are
-     based on or incorporate the Software, but only in the form
-     "JPython-based ___________________," or equivalent.
-
-  5. CNRI is making the Software available to Licensee on an "AS IS" basis.
-     CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
-     OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY
-     REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
-     PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE
-     ANY THIRD PARTY RIGHTS.
-
-  6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
-     ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
-     USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE
-     THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT
-     ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER
-     MAY NOT APPLY TO LICENSEE.
-
-  7. This License Agreement may be terminated by CNRI (i) immediately upon
-     written notice from CNRI of any material breach by the Licensee, if the
-     nature of the breach is such that it cannot be promptly remedied; or
-     (ii) sixty (60) days following notice from CNRI to Licensee of a
-     material remediable breach, if Licensee has not remedied such breach
-     within that sixty-day period.
-
-  8. This License Agreement shall be governed by and interpreted in all
-     respects by the law of the State of Virginia, excluding conflict of law
-     provisions. Nothing in this Agreement shall be deemed to create any
-     relationship of agency, partnership, or joint venture between CNRI and
-     Licensee.
-
-  9. By clicking on the "ACCEPT" button where indicated, or by installing,
-     copying or otherwise using the Software, Licensee agrees to be bound by
-     the terms and conditions of this License Agreement.
-
-
-===============================================================================
-
-The jars; 
-activation-1.1.jar, 
-jaxb-api-2.1.jar, 
-jaxb-impl-2.1.6.jar, 
-jaxb-xjc-2.1.4.jar, 
-jaxb2-reflection-2.1.4.jar,
-jsr181-api-1.0-MR1.jar, 
-jsr250-api-1.0.jar, 
-jaxws-api-2.1-1.jar, 
-mail-1.4.jar, 
-saaj-api-1.3.jar, 
-servlet-api-2.5.jar, 
-stax-api-1.0-commons-cli-1.0.jar2.jar
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
-      1. Definitions.
-
-            1.1. "Contributor" means each individual or entity that
-            creates or contributes to the creation of Modifications.
-
-            1.2. "Contributor Version" means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-
-            1.3. "Covered Software" means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-
-            1.4. "Executable" means the Covered Software in any form
-            other than Source Code. 
-
-            1.5. "Initial Developer" means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            
-            1.6. "Larger Work" means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-
-            1.7. "License" means this document.
-
-            1.8. "Licensable" means having the right to grant, to the
-            maximum extent possible, whether at the time of the initial
-            grant or subsequently acquired, any and all of the rights
-            conveyed herein.
-            
-            1.9. "Modifications" means the Source Code and Executable
-            form of any of the following: 
-
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-
-            1.10. "Original Software" means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-
-            1.11. "Patent Claims" means any patent claim(s), now owned
-            or hereafter acquired, including without limitation,
-            method, process, and apparatus claims, in any patent
-            Licensable by grantor. 
-
-            1.12. "Source Code" means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-
-            1.13. "You" (or "Your") means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, "You"
-            includes any entity which controls, is controlled by, or is
-            under common control with You. For purposes of this
-            definition, "control" means (a) the power, direct or
-            indirect, to cause the direction or management of such
-            entity, whether by contract or otherwise, or (b) ownership
-            of more than fifty percent (50%) of the outstanding shares
-            or beneficial ownership of such entity.
-
-      2. License Grants. 
-
-            2.1. The Initial Developer Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Initial Developer,
-                  to use, reproduce, modify, display, perform,
-                  sublicense and distribute the Original Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party under the terms of this
-                  License. 
-
-                  (d) Notwithstanding Section 2.1(b) above, no patent
-                  license is granted: (1) for code that You delete from
-                  the Original Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-
-            2.2. Contributor Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, each
-            Contributor hereby grants You a world-wide, royalty-free,
-            non-exclusive license:
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Contributor to
-                  use, reproduce, modify, display, perform, sublicense
-                  and distribute the Modifications created by such
-                  Contributor (or portions thereof), either on an
-                  unmodified basis, with other Modifications, as
-                  Covered Software and/or as part of a Larger Work; and
-                  
-
-                  (b) under Patent Claims infringed by the making,
-                  using, or selling of Modifications made by that
-                  Contributor either alone and/or in combination with
-                  its Contributor Version (or portions of such
-                  combination), to make, use, sell, offer for sale,
-                  have made, and/or otherwise dispose of: (1)
-                  Modifications made by that Contributor (or portions
-                  thereof); and (2) the combination of Modifications
-                  made by that Contributor with its Contributor Version
-                  (or portions of such combination). 
-
-                  (c) The licenses granted in Sections 2.2(a) and
-                  2.2(b) are effective on the date Contributor first
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-
-                  (d) Notwithstanding Section 2.2(b) above, no patent
-                  license is granted: (1) for any code that Contributor
-                  has deleted from the Contributor Version; (2) for
-                  infringements caused by: (i) third party
-                  modifications of Contributor Version, or (ii) the
-                  combination of Modifications made by that Contributor
-                  with other software (except as part of the
-                  Contributor Version) or other devices; or (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-
-            3.1. Availability of Source Code.
-
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-
-            3.2. Modifications.
-
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-
-            3.3. Required Notices.
-
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-
-            3.4. Application of Additional Terms.
-
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipients'
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            However, you may do so only on Your own behalf, and not on
-            behalf of the Initial Developer or any Contributor. You
-            must make it absolutely clear that any such warranty,
-            support, indemnity or liability obligation is offered by
-            You alone, and You hereby agree to indemnify the Initial
-            Developer and every Contributor for any liability incurred
-            by the Initial Developer or such Contributor as a result of
-            warranty, support, indemnity or liability terms You offer.
-          
-
-            3.5. Distribution of Executable Versions.
-
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of a license of Your choice, which may contain terms
-            different from this License, provided that You are in
-            compliance with the terms of this License and that the
-            license for the Executable form does not attempt to limit
-            or alter the recipient's rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form under a
-            different license, You must make it absolutely clear that
-            any terms which differ from this License are offered by You
-            alone, not by the Initial Developer or Contributor. You
-            hereby agree to indemnify the Initial Developer and every
-            Contributor for any liability incurred by the Initial
-            Developer or such Contributor as a result of any such terms
-            You offer.
-
-            3.6. Larger Works.
-
-            You may create a Larger Work by combining Covered Software
-            with other code not governed by the terms of this License
-            and distribute the Larger Work as a single product. In such
-            a case, You must make sure the requirements of this License
-            are fulfilled for the Covered Software. 
-            
-      4. Versions of the License. 
-
-            4.1. New Versions.
-
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-
-            4.2. Effect of New Versions.
-
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-
-            4.3. Modified Versions.
-
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-            
-
-      5. DISCLAIMER OF WARRANTY.
-
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-
-            6.1. This License and the rights granted hereunder will
-            terminate automatically if You fail to comply with terms
-            herein and fail to cure such breach within 30 days of
-            becoming aware of the breach. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as "Participant")
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-
-      7. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-
-      8. U.S. GOVERNMENT END USERS.
-
-      The Covered Software is a "commercial item," as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-      computer software" (as that term is defined at 48 C.F.R. 
-      252.227-7014(a)(1)) and "commercial computer software
-      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users
-      acquire Covered Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-
-      9. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject
-      matter hereof. If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be
-      governed by the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdiction's conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, with the losing
-      party responsible for costs, including, without limitation, court
-      costs and reasonable attorneys' fees and expenses. The
-      application of the United Nations Convention on Contracts for the
-      International Sale of Goods is expressly excluded. Any law or
-      regulation which provides that the language of a contract shall
-      be construed against the drafter shall not apply to this License.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-      10. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis. Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.
-
-===============================================================================
-
-JRuby (jruby-complete-1.0.jar), wsdl4j (wsdl4j-1.6.2.jar):
-
-Common Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-      a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-      b) in the case of each subsequent Contributor:
-
-      i) changes to the Program, and
-
-      ii) additions to the Program;
-
-      where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
-
-      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
-
-      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
-
-      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
-
-      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-      iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form:
-
-      a) it must be made available under this Agreement; and 
-
-      b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
-
-===============================================================================
-
-backport-util-concurrent-2.2.jar:
-
-The software comprising backport-util-concurrent is based in large
-part on the code from JSR166, and the package dl.util.concurrent.
-The software has been released to the public domain, as explained at:
-http://creativecommons.org/licenses/publicdomain, excepting portions
-of the class
-edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList,
-which were adapted from class java.util.ArrayList, written by Sun
-Microsystems, Inc, which are used with kind permission, and subject
-to the following:
-
-Copyright 2002-2004 Sun Microsystems, Inc. All rights reserved. Use is
-subject to the following license terms.
-
-  "Sun hereby grants you a non-exclusive, worldwide, non-transferrable
-  license to use and distribute the Java Software technologies as part
-  of a larger work in source and binary forms, with or without
-  modification, provided that the following conditions are met:
-
-   -Neither the name of or trademarks of Sun may be used to endorse or
-    promote products derived from the Java Software technology without
-    specific prior written permission.
-
-   -Redistributions of source or binary code must be accompanied by the
-    following notice and disclaimers:
-
-    Portions copyright Sun Microsystems, Inc. Used with kind permission.
-
-    This software is provided AS IS, without a warranty of any kind.  ALL
-    EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
-    WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PUPOSE OR
-    NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
-    MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE
-    FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
-    USING, MODIFYING OR DISTRIBUTING THE SOFTWARE OR ITS
-    DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR
-    ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR
-    DATA, OR FOR DIRECT, INDIRECT,CONSQUENTIAL, INCIDENTAL
-    OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF
-    THE THEORY OR LIABILITY, ARISING OUT OF THE USE OF OR
-    INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.
-    HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-    You acknowledge that Software is not designed, licensed or intended for
-    use in the design, construction, operation or maintenance of any nuclear
-    facility."
-
-===============================================================================
-rome-0.9.jar
-
-Copyright 2004 Sun Microsystems, Inc.
-
-Licensed 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.
-
-===============================================================================
-jdom-1.0.jar :
-
-$Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions, and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions, and the disclaimer that follows 
-    these conditions in the documentation and/or other materials 
-    provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
-    derived from this software without prior written permission.  For
-    written permission, please contact <request_AT_jdom_DOT_org>.
- 
- 4. Products derived from this software may not be called "JDOM", nor
-    may "JDOM" appear in their name, without prior written permission
-    from the JDOM Project Management <request_AT_jdom_DOT_org>.
- 
- In addition, we request (but do not require) that you include in the 
- end-user documentation provided with the redistribution and/or in the 
- software itself an acknowledgement equivalent to the following:
-     "This product includes software developed by the
-      JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos 
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many 
- individuals on behalf of the JDOM Project and was originally 
- created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
- Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
- on the JDOM Project, please see <http://www.jdom.org/>. 
-
-========================================================================
-
-dwr-2.0.1.jar :
-
-/*
-* Copyright 2005 Joe Walker
-*
-* Licensed 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.
-*/
-
-==========================================================================
-
-dojotoolkit V1.0.0:
-
-The "New" BSD License:
-**********************
-
-Copyright (c) 2005, The Dojo Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-	list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-	this list of conditions and the following disclaimer in the documentation
-	and/or other materials provided with the distribution.
-  * Neither the name of the Dojo Foundation nor the names of its contributors
-	may be used to endorse or promote products derived from this software
-	without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The module tuscany-implementation-script-1.0-incubating.jar temporarily includes    
-one file under the below BSD license with the following copyright:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-
-The serp-1.12.0.jar is distributed under the BSD license with the following copyright:
-
- Copyright (c) 2002, A. Abram White
- All rights reserved.
-
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-The javacc-3.2.jar, and howl-1.0.1-1.jar are distributed under the BSD license:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The tuscany-assembly-xsd jar includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-================================================================================
-License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
-
-These files being ...
-commonj/sdo/ChangeSummary$Setting.class
-commonj/sdo/ChangeSummary.class
-commonj/sdo/DataGraph.class
-commonj/sdo/DataObject.class
-commonj/sdo/helper/CopyHelper.class
-commonj/sdo/helper/DataFactory.class
-commonj/sdo/helper/DataHelper.class
-commonj/sdo/helper/EqualityHelper.class
-commonj/sdo/helper/HelperContext.class
-commonj/sdo/helper/TypeHelper.class
-commonj/sdo/helper/XMLDocument.class
-commonj/sdo/helper/XMLHelper.class
-commonj/sdo/helper/XSDHelper.class
-commonj/sdo/impl/ExternalizableDelegator$Resolvable.class
-commonj/sdo/impl/ExternalizableDelegator.class
-commonj/sdo/Property.class
-commonj/sdo/Sequence.class
-commonj/sdo/Type.class
-xml/datagraph.xsd
-xml/sdoJava.xml
-xml/sdoJava.xsd
-xml/sdoModel.xml
-xml/sdoModel.xsd
-xml/sdoXML.xml
-xml/sdoXML.xsd
-
-
-License for the Service Data Objects JavaDoc and Interface Definition files.
-
-The Service Data Objects Specification is being provided by the copyright holders under the following 
-license. By using and/or copying this work, you agree that you have read, understood and will comply with 
-the following terms and conditions:
-
-Permission to copy, display and distribute the Service Data Objects Specification and/or portions thereof, without 
-modification, in any medium without fee or royalty is hereby granted, provided that you include the 
-following on ALL copies of the Service Data Objects Specification, or portions thereof, that you make:
-
-1. A link or URL to the Service Data Objects Specification at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2. The full text of this copyright notice as shown in the Service Data Objects Specification.
-
-BEA, IBM, Oracle, Primeton Technologies, Rogue Wave Software, SAP, Software AG, Sun Microsystems, Xcalia, 
-Zend Technologies (collectively, the “Authors”) agree to grant you a royalty-free license, under reasonable, 
-non-discriminatory terms and conditions to patents that they deem necessary to implement the Service Data 
-Objects Specification. 
-
-THE Service Data Objects SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR 
-WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL 
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE SERVICE DATA OBJECTS 
-SPECIFICATION.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity 
-pertaining to the Service Data Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects Specification will at all times remain with the 
-Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-================================================================================
-
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/bin/NOTICE b/java/sca-contrib/distribution/webapp/src/main/release/bin/NOTICE
deleted file mode 100644
index 0b2fe5dff3..0000000000
--- a/java/sca-contrib/distribution/webapp/src/main/release/bin/NOTICE
+++ /dev/null
@@ -1,95 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses XmlSchema developed at 
-The Apache Software Foundation (http://ws.apache.org/commons/XmlSchema)
- Portions Copyright 2006 International Business Machines Corp.
-
-This product includes/uses ode-bpel-api-1.1 developed at
-The Apache Software Foundation (http://ode.apache.org)
- - Copyright 1999-2006 Intalio - This product includes software developed by Intalio (http://www.intalio.com)
- - Copyright 2006 Sybase - This product includes software developed by Sybase.(http://www.sybase.com)
-
-"This product includes software developed by the Spring Framework
- Project (http://www.springframework.org)."
-
-This product includes/uses the Jetty Servlet Engine (http://jetty.mortbay.org),
-developed by Mort Bay Consulting  (http://www.mortbay.com)
-
-This product includes/uses the Groovy Script Engine (http://groovy.codehaus.org/),
-Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
-This product includes/uses the Axion : the Open Source Java Database (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
-
-This product includes/uses DOM4J : the flexible XML framework for java (http://www.dom4j.org/) 
- Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)
-License: Public Domain 
-
-This product includes/uses JSON-RPC-Java (http://oss.metaparadigm.com/jsonrpc/)
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product includes software from the GlassFish project (https://glassfish.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-    
-This product includes software from the Rome project (https://rome.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-
-This product includes/uses the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
-
-This product includes/uses the Mozilla Rhino project (http://www.mozilla.org/rhino/)
-
-This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)i
-
-This product includes/uses the Codehaus JRuby project (http://jruby.codehaus.org/)
-
-This product includes/uses JDOM (http://www.jdom.org/)
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved.
- 
-This product includes/uses DWR (http://getahead.org/dwr)
- Copyright 2005 Joe Walker. All rights reserved.
- 
-This product includes/uses dojotoolkit (http://dojotoolkit.org/)
- Copyright (c) 2005, The Dojo Foundation. All rights reserved.
-
-This product includes/uses Howl (http://howl.objectweb.org/)
- Copyright (c) 2004, Bull S.A.
-
-This product includes/uses axion (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team.
-
-This product includes/uses javacc (https://javacc.dev.java.net/)
- Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.
-
-The Program includes all or portions of the following software: "The 
-Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under
-an MPL v1.0 license. Please refer to the homepage URL at 
-http://www.saxonica.com/.
-
-This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:
- Copyright (c) 2002, A. Abram White. All rights reserved.
-
-This product also includes software under the BSD license
-with the following copyright:
- Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/src/BUILDING b/java/sca-contrib/distribution/webapp/src/main/release/src/BUILDING
deleted file mode 100644
index 65d09c5eae..0000000000
--- a/java/sca-contrib/distribution/webapp/src/main/release/src/BUILDING
+++ /dev/null
@@ -1,55 +0,0 @@
-Building the Apache Tuscany SCA 1.2 (incubating) April 2008 Release source distribution
-=======================================================================================
-
-Initial Setup
--------------
-
-1) Install J2SE 5.0 SDK, which can be downloaded from 
-   http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_06 JDK or higher.
-
-2) Make sure that your JAVA_HOME environment variable is set to the newly installed 
-   JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 
-   $JAVA_HOME$/bin (unix).
-
-3) Install Maven 2.0.7 or higher, which can be downloaded from 
-   http://maven.apache.org/download.html. Make sure that your PATH includes 
-   the MVN_HOME/bin directory. 
-
-4) Make sure that your MAVEN_OPTS environment variable has -Xmx128M (or more),
-   you can manually do this by executing the following in your prompt :
-   Windows users:
-      set MAVEN_OPTS=-Xmx128M
-   Unix users:
-      export MAVEN_OPTS=-Xmx128M
-
-
-Building
---------
-
-1) Change to the top level directory of Apache Tuscany source distribution.
-2) Run
-
-	$> mvn
-
-   This will compile Apache Tuscany and run all of the tests in the source
-   distribution. 
-
-   Depending on the load of remote Maven 2.0 repositories, you may have 
-   to run "mvn" several times utill the required dependencies are 
-   all located in your local maven repository. It usually takes some time for 
-   maven to download required dependencies in the first build. Once all the 
-   dependencies have been downloaded you may use the -o option to run maven
-   in offline mode, for example, 'mvn clean install -o'.
-
-
-Building the distributions
---------------------------
-
-1) Change to the distribution folder
-2) Run
-
-	$> mvn
-
-   This will build the binary and source distribution with .zip and .gz 
-   formats in the distribution/target directory.
-
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/src/LICENSE b/java/sca-contrib/distribution/webapp/src/main/release/src/LICENSE
deleted file mode 100644
index 144d8ae692..0000000000
--- a/java/sca-contrib/distribution/webapp/src/main/release/src/LICENSE
+++ /dev/null
@@ -1,397 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================================================
-
-The module itest/databindings/common includes the test schema; datagraph.xsd, sdoJava.xsd, and sdoModel.xsd
-under the following license:
-
-License for the Service Data Objects JavaDoc, Interface Definition files
-and XSD files.
-
-The Service Data Objects JavaDoc, Interface Definition files and XSD files 
-are being provided by the copyright holders under the following license. 
-By using and/or copying this work, you agree that you have read, 
-understood and will comply with the following terms and conditions:
-
-Permission to copy, display, make derivative works of and distribute 
-the Service Data Objects JavaDoc, Interface Definition files and XSD files
-(the "Artifacts") in any medium without fee or royalty is hereby granted, 
-provided that you include the following on ALL copies of the Artifacts, 
-or portions thereof, that you make:
-
-1.	A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2.	The full text of this copyright notice as shown in the Artifacts.
-
-
-
-THE ARTIFACTS ARE PROVIDED "AS IS" AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE. 
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Data 
-Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects 
-Specification will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.11, last updated on 2007/12/21
-
-=================================================================================================================
-
-The module implementation-script temporarily includes one file under the following BSD license:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-=================================================================================================================
-
-The module assembly-xsd includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-=================================================================================================================
-The modules 
-
-binding-ws-xml
-databinding
-databinding-axiom
-databinding-jaxb
-databinding-json
-databinding-sdo
-databinding-sdo-axiom
-databinding-xmlbeans
-interface-wsdl-xml
-
-Include the ipo.xsd and address.xsd information from the XML Schema Primer 
-(http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) combined into the 
-file ipo.xsd and extended with UK postcode structures.
-
-The ipo.xsd file is include under the following license:
-
-W3C(c) SOFTWARE NOTICE AND LICENSE
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other 
-related items) is being provided by the copyright holders under the following 
-license. By obtaining, using and/or copying this work, you (the licensee) agree 
-that you have read, understood, and will comply with the following terms and conditions.
-
-Permission to copy, modify, and distribute this software and its documentation, 
-with or without modification, for any purpose and without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies of the 
-software and documentation or portions thereof, including modifications:
-
-   1. The full text of this NOTICE in a location viewable to users of the 
-      redistributed or derivative work.
-   2. Any pre-existing intellectual property disclaimers, notices, or terms 
-      and conditions. If none exist, the W3C Software Short Notice should be 
-      included (hypertext is preferred, text is permitted) within the body of 
-      any redistributed or derivative code.
-   3. Notice of any changes or modifications to the files, including the date 
-      changes were made. (We recommend you provide URIs to the location from which 
-      the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
-NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or 
-publicity pertaining to the software without specific, written prior permission. 
-Title to copyright in this software and any associated documentation will at all 
-times remain with copyright holders.
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/src/NOTICE b/java/sca-contrib/distribution/webapp/src/main/release/src/NOTICE
deleted file mode 100644
index a37f9b03f5..0000000000
--- a/java/sca-contrib/distribution/webapp/src/main/release/src/NOTICE
+++ /dev/null
@@ -1,39 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product also includes software under the BSD license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-  Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
-This product includes software under the W3C(c) Software License
-with the following copyright:
-    
-Copyright (c) 2008 World Wide Web Consortium, (Massachusetts Institute of Technology, 
-European Research Consortium for Informatics and Mathematics, Keio University). 
-All Rights Reserved. This work is distributed under the W3C(c) Software License [1] in 
-the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
diff --git a/java/sca-contrib/distribution/webservice/pom.xml b/java/sca-contrib/distribution/webservice/pom.xml
deleted file mode 100644
index 628cc8ab67..0000000000
--- a/java/sca-contrib/distribution/webservice/pom.xml
+++ /dev/null
@@ -1,162 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-distribution</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-distribution-webservice</artifactId>

-    <name>Apache Tuscany SCA Web Service Distribution</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-webservice</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-    </dependencies>

-

-    <profiles>

-

-        <!-- Build profile that can be used to build the distro packages -->

-        <profile>

-            <id>distribution</id>

-            <activation>

-                <activeByDefault>false</activeByDefault>

-            </activation>

-            <build>

-                <plugins>

-                    <plugin>

-                        <groupId>org.apache.tuscany.sca</groupId>

-                        <artifactId>tuscany-maven-bundle-plugin</artifactId>

-                        <version>2.0-SNAPSHOT</version>

-                        <executions>

-                            <execution>

-                                <id>distribution-modules</id>

-                                <phase>generate-resources</phase>

-                                <goals>

-                                    <goal>generate-modules</goal>

-                                </goals>

-                                <configuration>

-                                    <targetDirectory>target/modules</targetDirectory>

-                                    <excludeDirectories>

-                                        <excludeDirectory>../core/target/modules</excludeDirectory>

-                                    </excludeDirectories>

-                                    <generateManifestJar>true</generateManifestJar>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-

-                    <plugin>

-                        <groupId>org.apache.maven.plugins</groupId>

-                        <artifactId>maven-assembly-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>distribution-package</id>

-                                <phase>package</phase>

-                                <goals>

-                                    <goal>single</goal>

-                                </goals>

-                                <configuration>

-                                    <descriptors>

-                                        <descriptor>src/main/assembly/bin.xml</descriptor>

-                                        <descriptor>src/main/assembly/src.xml</descriptor>

-                                    </descriptors>

-                                    <tarLongFileMode>gnu</tarLongFileMode>

-                                    <finalName>apache-tuscany-sca-webservice-2.0-SNAPSHOT</finalName>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-                </plugins>

-            </build>

-        </profile>

-        

-        <!-- Profile that can be used to build the modules included in the distro -->

-        <profile>

-            <id>modules</id>

-            <modules>

-                <module>../../modules/assembly</module>

-                <module>../../modules/assembly-xml</module>

-                <module>../../modules/assembly-xsd</module>

-                <module>../../modules/binding-sca</module>

-                <module>../../modules/binding-sca-xml</module>

-                <module>../../modules/binding-ws</module>

-                <module>../../modules/binding-ws-axis2</module>

-                <module>../../modules/binding-ws-axis2-policy</module>

-                <module>../../modules/binding-ws-wsdlgen</module>

-                <module>../../modules/binding-ws-xml</module>

-                <module>../../modules/contribution</module>

-                <module>../../modules/contribution-java</module>

-                <module>../../modules/contribution-namespace</module>

-                <module>../../modules/contribution-xml</module>

-                <module>../../modules/core</module>

-                <module>../../modules/core-databinding</module>

-                <module>../../modules/core-spi</module>

-                <module>../../modules/databinding</module>

-                <module>../../modules/databinding-axiom</module>

-                <module>../../modules/databinding-jaxb</module>

-                <module>../../modules/databinding-jaxb-axiom</module>

-                <module>../../modules/definitions</module>

-                <module>../../modules/definitions-xml</module>

-                <module>../../modules/endpoint</module>

-                <module>../../modules/extensibility</module>

-                <module>../../modules/extensibility-equinox</module>

-                <module>../../modules/host-http</module>

-                <module>../../modules/host-jetty</module>

-                <module>../../modules/implementation-java</module>

-                <module>../../modules/implementation-java-runtime</module>

-                <module>../../modules/implementation-java-xml</module>

-                <module>../../modules/implementation-node</module>

-                <module>../../modules/implementation-node-runtime</module>

-                <module>../../modules/interface</module>

-                <module>../../modules/interface-java</module>

-                <module>../../modules/interface-java-jaxws</module>

-                <module>../../modules/interface-java-xml</module>

-                <module>../../modules/interface-wsdl</module>

-                <module>../../modules/interface-wsdl-xml</module>

-                <module>../../modules/monitor</module>

-                <module>../../modules/node-api</module>

-                <module>../../modules/node-impl</module>

-                <module>../../modules/node-launcher</module>

-                <module>../../modules/node-launcher-equinox</module>

-                <module>../../modules/policy</module>

-                <module>../../modules/policy-security</module>

-                <module>../../modules/policy-xml</module>

-                <module>../../modules/policy-xml-ws</module>

-                <module>../../modules/sca-api</module>

-                <module>../../modules/workspace</module>

-                <module>../../modules/workspace-impl</module>

-                <module>../../modules/workspace-xml</module>

-                <module>../../modules/xsd</module>

-                <module>../../modules/xsd-xml</module>

-            </modules>

-        </profile>

-    </profiles>

-</project>

diff --git a/java/sca-contrib/distribution/webservice/src/main/assembly/bin.xml b/java/sca-contrib/distribution/webservice/src/main/assembly/bin.xml
deleted file mode 100644
index fdcc421f2f..0000000000
--- a/java/sca-contrib/distribution/webservice/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,38 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id></id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
-        <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
diff --git a/java/sca-contrib/distribution/webservice/src/main/assembly/src.xml b/java/sca-contrib/distribution/webservice/src/main/assembly/src.xml
deleted file mode 100644
index af3cb8e6fc..0000000000
--- a/java/sca-contrib/distribution/webservice/src/main/assembly/src.xml
+++ /dev/null
@@ -1,37 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>src</id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
-        <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
diff --git a/java/sca-contrib/distribution/webservice/src/main/components/bin-samples.xml b/java/sca-contrib/distribution/webservice/src/main/components/bin-samples.xml
deleted file mode 100644
index e2ced4a343..0000000000
--- a/java/sca-contrib/distribution/webservice/src/main/components/bin-samples.xml
+++ /dev/null
@@ -1,51 +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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add samples to the samples directory -->
-        <fileSet>
-            <directory>../../samples</directory>
-            <outputDirectory>samples</outputDirectory>
-            <includes>
-                <include>binding-ws-calculator/**/*</include>
-                <!--include>callback-ws-client/**/*</include>
-                <include>callback-ws-service/**/*</include>
-                <include>helloworld-ws-reference/**/*</include>
-                <include>helloworld-ws-service/**/*</include>
-                <include>helloworld-ws-reference-secure/**/*</include>
-                <include>helloworld-ws-service-secure/**/*</include>
-                <include>helloworld-ws-service-webapp/**/*</include>
-                <include>simple-callback-ws/**/*</include>
-                <include>zipcode-jaxws/**/*</include-->
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
diff --git a/java/sca-contrib/distribution/webservice/src/main/components/src-modules.xml b/java/sca-contrib/distribution/webservice/src/main/components/src-modules.xml
deleted file mode 100644
index deea9b713c..0000000000
--- a/java/sca-contrib/distribution/webservice/src/main/components/src-modules.xml
+++ /dev/null
@@ -1,96 +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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add module sources to the modules directory -->
-        <fileSet>
-            <directory>../../modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>assembly/**/*</include>
-                <include>assembly-xml/**/*</include>
-                <include>assembly-xsd/**/*</include>
-                <include>binding-sca/**/*</include>
-                <include>binding-sca-xml/**/*</include>
-                <include>binding-ws/**/*</include>
-                <include>binding-ws-axis2/**/*</include>
-                <include>binding-ws-axis2-policy/**/*</include>
-                <include>binding-ws-wsdlgen/**/*</include>
-                <include>binding-ws-xml/**/*</include>
-                <include>contribution/**/*</include>
-                <include>contribution-java/**/*</include>
-                <include>contribution-namespace/**/*</include>
-                <include>contribution-xml/**/*</include>
-                <include>core/**/*</include>
-                <include>core-databinding/**/*</include>
-                <include>core-spi/**/*</include>
-                <include>databinding/**/*</include>
-                <include>databinding-axiom/**/*</include>
-                <include>databinding-jaxb/**/*</include>
-                <include>databinding-jaxb-axiom/**/*</include>
-                <include>definitions/**/*</include>
-                <include>definitions-xml/**/*</include>
-                <include>distribution-core/**/*</include>
-                <include>endpoint/**/*</include>
-                <include>extensibility/**/*</include>
-                <include>extensibility-equinox/**/*</include>
-                <include>host-http/**/*</include>
-                <include>host-jetty/**/*</include>
-                <include>implementation-java/**/*</include>
-                <include>implementation-java-runtime/**/*</include>
-                <include>implementation-java-xml/**/*</include>
-                <include>implementation-node/**/*</include>
-                <include>implementation-node-runtime/**/*</include>
-                <include>interface/**/*</include>
-                <include>interface-java/**/*</include>
-                <include>interface-java-jaxws/**/*</include>
-                <include>interface-java-xml/**/*</include>
-                <include>interface-wsdl/**/*</include>
-                <include>interface-wsdl-xml/**/*</include>
-                <include>monitor/**/*</include>
-                <include>node-api/**/*</include>
-                <include>node-impl/**/*</include>
-                <include>node-launcher/**/*</include>
-                <include>node-launcher-equinox/**/*</include>
-                <include>policy/**/*</include>
-                <include>policy-security/**/*</include>
-                <include>policy-xml/**/*</include>
-                <include>policy-xml-ws/**/*</include>
-                <include>sca-api/**/*</include>
-                <include>workspace/**/*</include>
-                <include>workspace-impl/**/*</include>
-                <include>workspace-xml/**/*</include>
-                <include>xsd/**/*</include>
-                <include>xsd-xml/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/CHANGES b/java/sca-contrib/distribution/webservice/src/main/release/CHANGES
deleted file mode 100644
index 3de7358ec6..0000000000
--- a/java/sca-contrib/distribution/webservice/src/main/release/CHANGES
+++ /dev/null
@@ -1,431 +0,0 @@
-Changes With Apache Tuscany SCA 1.2 (incubating) April 2008 

-===========================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-2027

-  * TUSCANY-1999

-  * TUSCANY-2037

-  * TUSCANY-2034

-  * TUSCANY-2038

-  * TUSCANY-2043

-  * TUSCANY-2046

-  * TUSCANY-2047

-  * TUSCANY-2028

-  * TUSCANY-1873

-  * TUSCANY-2049

-  * TUSCANY-2035

-  * TUSCANY-1206

-  * TUSCANY-2036 

-  * TUSCANY-1771

-  * TUSCANY-2013

-  * TUSCANY-1926

-  * TUSCANY-1917

-  * TUSCANY-1949

-  * TUSCANY-1941

-  * TUSCANY-2045

-  * TUSCANY-2057

-  * TUSCANY-2055

-  * TUSCANY-2056

-  * TUSCANY-2072

-  * TUSCANY-2047

-  * TUSCANY-2073

-  * TUSCANY-1977 

-  * TUSCANY-2075

-  * TUSCANY-1894

-  * TUSCANY-2079

-  * TUSCANY-2078

-  * TUSCANY-2080

-  * TUSCANY-2068

-  * TUSCANY-1950

-  * TUSCANY-2077

-  * TUSCANY-2056

-  * TUSCANY-2088

-  * TUSCANY-2086

-  * TUSCANY-2094

-  * TUSCANY-2106 

-

-  Features and/or Enhancements

-

-  * Core

-    - Interceptor Enhancements

-      - Phase-based interceptor ordering to allow contribution of new interceptors and also define the order in witch they should be invoked

-      - Pass-by-reference SPI to allow interceptors to indicate if they support pass-by-reference

-      - PolicyProvider SPIs to allow extensions to plugin policy interceptors

-    - Support for JAXWS annotations and mapping of faults to Java exceptions according to JAXWS specification

-    - Improvement of contribution service to allow it to be used outside of the runtime environment 

-    - Support for Contribution Import/Export resource

-    - Enhanced Distributed Domain story using Workspace

-      - Implementation of a SCA domain allowing a system administrator to manage contributions, composites and sca nodes that run these composites

-        - Set of core services providing management capabilities

-        - Administration web interface

-        - This is a work in progress and you can see it in action in samples/calculator-distributed. Other samples that use distributed operation are yet to move over to the workspace.

-    - Enhanced support for SCA Policy spec

-      - Ability to apply external policy definitions to a SCA composition

-      - Ability to spread policy definitions to multiple definitions.xml files available across the sca domain

-      - Bug fixes

-    - Improvements of http binding to support servlet components

-    - Enable Tuscany to run inside an OSGi runtime

-

-  * Web 2.0 Extensions

-    - Enhancements to implementation.widget (support for properties)

-    - New atom binding based on Apache Abdera

-    - Refactoring of rss-rome binding

-  * Other Extensions

-    - Binding JMS

-      - greatly simplified the use of the JMS binding, support locating JMS resources from JNDI, and better compliance with the SCA JMS binding spec

-      - see the doc page for more details: http://incubator.apache.org/tuscany/sca-java-bindingjms.html

-    - Enhancements to Binding RMI

-      - Support shared RMI registry and use 999x as the ports in test case to avoid 1099 conflict

-    - Enhancements to Groovy extension

-      - Support for 'native' groovy classes

-    - Enhancements to OSGi bundle contributions

-      - Support Bundle URLs to be added as contributions

-

-  * Tools

-    - Eclipse plugin providing a Tuscany runtime Library and Tuscany launcher in Eclipse environment
-       - An updatesite is also available to facilitate the plugin installation using the Eclipse update manager

-

-  * Samples/Tutorial/Demos

-    - calculator-distributed migrated to use new Tuscany Distributed Workspace

-    - sample-calculator-ws-secure-webapp

-    - sample-helloworld-jms-webapp

-    - new jms samples

-    - improve bigbank demo to include support for policies 

-    - tutorial store changes

-      - use of import/export

-      - development of contribution without requiring dependencies on the Tuscany runtime

-      - usage of new sca domain infrastructure

-

-  * Testing

-    - Web Container Testing Framework integrated with (Tomcat, Jetty, Geronimo and Websphere)

-

-

-Changes With Apache Tuscany SCA 1.1 (incubating) January 2008 

-===============================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1939

-  * TUSCANY-1914

-  * TUSCANY-1854

-  * TUSCANY-1931

-  * TUSCANY-1547

-  * TUSCANY-1909

-  * TUSCANY-1919

-  * TUSCANY-1930

-  * TUSCANY-1806

-  * TUSCANY-1804

-  * TUSCANY-1916

-  * TUSCANY-1913

-  * TUSCANY-1834

-  * TUSCANY-1857

-  * TUSCANY-1687

-  * TUSCANY-1801

-  * TUSCANY-1742

-  * TUSCANY-1762

-  * TUSCANY-1945

-  * TUSCANY-1595

-  * TUSCANY-1594

-  * TUSCANY-1849

-  * TUSCANY-1836

-  * TUSCANY-1934

-  * TUSCANY-1902

-  * TUSCANY-1608

-  * TUSCANY-1943

-  * TUSCANY-1896

-  * TUSCANY-1626

-  * TUSCANY-1797

-  * TUSCANY-1601

-  * TUSCANY-1415

-

-- Better JMS support

-  * binding.jms supporting point to point text based messaging only

-  * New SOAP/JMS sample (helloworld-ws-reference/service-jms)

-

-- Improvements in PolicyFramework Support

-  * Support for policy specifications on operation elements in a composite definition

-  * Separate sample (calculator-implementation-policies) to demonstrate use of Implementation Policies 

-    (uses logging and JAAS Authentication)

-

-- Modeling of client side java script components

-  * See implementation.widget

-

-- Evolving support for doman API suggested by assembly spec including a standalone node and nodes running 

-  connected together in a domain. This is still experimental. 

- 

-- Class loading and OSGI improvements

-  * Enable Tuscany to be run in a multi-classloader environment including inside OSGi. By default,

-    Tuscany continues to run using a single CLASSPATH-based classloader.

-  * Contributions no longer need to be in the CLASSPATH. All import/export dependencies across contributions should be 

-    explicitly specified (as described in the spec).

-

-- JAXB based POJO transformations

-

-Changes With Apache Tuscany SCA 1.0.1 (incubating) November 2007 

-================================================================

-

-The Tuscany SCA Java 1.0.1 is mainly a bug-fix release. It also comes with some improvements as listed below.

- 

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1848

-  * TUSCANY-1857

-  * TUSCANY-1859

-  * TUSCANY-1801

-  * TUSCANY-1823

-  * TUSCANY-1839

-  * TUSCANY-1814

-  * TUSCANY-1818

-  * TUSCANY-1834

-  * TUSCANY-1637

-  * TUSCANY-1826

-  * TUSCANY-1823

-  * TUSCANY-1819

-  * TUSCANY-1821

-  * TUSCANY-1822

-  * TUSCANY-1806

-  * TUSCANY-1808

-  * TUSCANY-1756

-  * TUSCANY-1757

-

-- Fix build issues with Maven 2.0.7 and JDK 6

-

-- Reduce memory consumption for WSDLs that import large XSDs

-

-- Add more logging statements for better servicibility

-

-- Add an extension point to allow extensions to plug-in extension schemas.

-

-- Add a demo application to showcase XML integration story 

-

-- Improve in databinding framework

-  * Add support for JSON Databindings and other refactoring

-  * Set databinding for introspected data type and enhance the checking of wrapper style

-  * Improve the tree-based XMLStreamReader and convert Bean & DOM to use this approach

-  * Add a tree-iterator based XMLStreamReader base impl

-  * Add default element info to java interface

-  * Rename Interface.setDefaultDataBinding to resetDataBinding

-

-- Limit the method injection to setters and allow the setter annotation to override field annotation

-

-- Evolving support in Intent and Policy handling

-  * Add support for policies in implementation

-  * Fix the algorithm for macthing policySets defined on bindings for the wire

-  * Add policy intent for implementation.java

-  * Extend java implementation type to recognize and apply policies, adding util support for this in Policy module

-  * Add policy module for logging

-

-- Evolving development in the SCA Domain/Node

-

-- Update NOTICE files with missing dependencies

-

-

-Changes With Apache Tuscany SCA 1.0 (incubating) September 2007 

-===============================================================

-

-- Tuscany Java SCA now implements V1.0 of the core SCA 

-  specifications

-        SCA Assembly Model V1.0

-        SCA Java Common Annotations and APIs V1.0

-        SCA Java Component Implementation V1.0

-        SCA Web Services Binding V1.0

-  Including callbacks, conversations and callable references

-  

-

-- Support for ws-security configurable in the web services binding

-  thro Tuscany SCA policy intents and policysets using the policy framework 

-  introduced in the last release.  

-  

-  Note : This release supports specifications of policies around axis2

-         config params - see helloworld-ws-service-secure sample.  The policy

-         intents that have been tested are authentication, integrity and 

-         confidentiality.  

-         There is no sample or test that exercises confidentiality since there

-         are some unresolved licensing issue around bouncycastle libraries.  

-         However, users who are not encumbered by the bouncycastle license 

-         restrictions can try the 'confidentiality' intent. See FAQ - 

-         http://incubator.apache.org/tuscany/tuscany-sca-java-faq.html

-                

-         This release does not include support for WS-Policy

-         attachments in Tuscany Policysets for ws-security.

-         

-  

-- An XQuery component implementation type 

-        implementation-xquery

-        

-

-- A Databinding for converting data to and from nodes for XQuery 

-  processing

-        databinding-saxon

-        

-

-- OSGI support has been extended to allow Tuscany contributions 

-  packaged as OSGI bundles hence taking advantage of OSGI's bundle

-  loading an dependency management capabilities 

-  

-

-- A BPEL component implementation type experimental implementation

-based on SCA BPEL Client and Implementation V1.0. At the moment only

-supports BPEL process as services.

-	implementation-bpel

-

-

-- The distributed runtime implementation has been separated out 

-  into 

-        *) domain

-        *) node

-  It is now wrapped by a SCADomain interface as is the standalone 

-  runtime.

-  

-  Note: This release does not include support for WebApp host deployment 

-        for a distributed SCA Domain 

-  

-

-

-- The web service binding will now generate WSDL automatically

-  based on the service interface if no WSDL is provided

-  

-

-- A new "store" sample and associated document show how a 

-  simple store front application can be constructed 

-        samples/store

-        

-- The following features of this release are still experimental:

-     - BPEL implementation type, integrating with Apache ODE

-     - OSGI implementation type, integrating with Apache Felix

-     - XQuery implementation type

-

- 

-

-Changes With Apache Tuscany SCA 0.99 (incubating) August 2007 

-=============================================================

-

-The following are the significant additions to release 0.99 

-over and above all of what was offered in release 0.91.

-

-- A version of the default sca binding that works between

-  components runing in separate Java virtual machines

-       binding-sca-axis

-

-- A simple node implementation and a service discovery 

-  function for running sca applications distributed 

-  across more than one node

-       distributed

-       distributed-impl 

-

-- integration with OSGi runtimes is now supported with

-  a new implementation-osgi component type

-

-- PUB/SUB interactions are now supported by using new 

-  notification binding and implementation types, and

-  samples demonstrating the feature.

-

-- The Tuscany runtime now has a policy framework supporting

-  the SCA policy specification

-

-- the endpoint URIs used by SCA bindings has been rationalized 

-  and now follows the SCA Assembly specification

-

-- binding-ajax has been renamed to binding-dwr

-

-Changes With Apache Tuscany SCA 0.91 (incubating) July 2007 

-===========================================================

-

-The following are the significant additions to release 0.91 

-over and above all of what was offered in release 0.90.

-

-

-- Enhancements to support multiple contributions to the SCA Domain

-

-- The inclusion of a alternative simplified extensions-helper

-SPI layer to faciliate rapid development of extensions

-

-- More Implementation Extenstions

-        Spring

-        WebResource

-

-- More Binding Extensions

-        AJAX

-        EJB

-        RSS/ATOM Feeds

-        

-- Demos that demonstrate the use of a mix of extensions

-         alert-aggregator-webapp

-         bigbank-account

-         bigbank-calculator

-         bigbank-stockquote

-

-

-- Samples

-        Samples to demostrate use of Spring, Resource, AJAX extensions

-

-Changes With Apache Tuscany SCA 0.90 (incubating) June 2007 

-===========================================================

-

-- Implementations for all of the Java Annotations and API Specification V1.0 found at

-  (http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications) 

-  apart from the following.

-    @ComponentName

-    Conversation

-    RequestContext

-    

-- New assembly model implementation taking into account SCA 1.0 artifacts 

-  Data duplication between assembly model and runtime removed

-

-- Simple single process domain support

-  Contribution support to scope items being deployed into the runtime

-

-- Improved Package/Class naming consistency across modules

-

-- Extensions now loaded via Java service mechanism

-  Refactored extensions to use new SPIs (see below)

-

-- Maven and Ant based sample builds in the binary distribution

-

-- Implementation Extensions

-    Java

-    Script supporting (Ruby, Python, Groovy, JavaScript)

-

-- Binding Extensions

-    Axis2

-    RMI

-    JSONRPC

-

--Databinding Extensions

-    Axiom

-    JAXB

-    SDO

-

-- Host environments

-    Embedded

-    Tomcat

-    Jetty

-    RMI

-

-- A clear set of SPIs intended to be stable over future releases

-    SCA assembly model

-      org.apache.tuscany.sca.assembly

-      org.apache.tuscany.sca.interfacedef

-      org.apache.tuscany.sca.interfacedef.java

-      org.apache.tuscany.sca.interfacedef.wsdl

-      org.apache.tuscany.sca.policy

-

-    SCA contribution model

-      org.apache.tuscany.sca.contribution

-

-    Runtime extensions

-      org.apache.tuscany.sca.core

-      org.apache.tuscany.sca.invocation

-      org.apache.tuscany.sca.provider

-      org.apache.tuscany.sca.runtime

-      org.apache.tuscany.sca.work

-

-    Data binding support

-      org.apache.tuscany.sca.databinding

-

-    Embedding Tuscany

-      org.apache.tuscany.sca.host.embedded

-

-    Servlet container integration

-      org.apache.tuscany.sca.http

-

-- For this point release a partial set of JavaDoc is provided to 

-  be filled out as we close on release 1.0

diff --git a/java/sca-contrib/distribution/webservice/src/main/release/README b/java/sca-contrib/distribution/webservice/src/main/release/README
deleted file mode 100644
index 4d83dcfde9..0000000000
--- a/java/sca-contrib/distribution/webservice/src/main/release/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 README
-=====================================================
-
-Welcome to the Tuscany SCA 1.2 release. 
-
-See the RELEASE_NOTES file for information specific to this release.
-
-In the binary release see the INSTALL file for information on how to 
-install the release.
-
-In the source distribution see the BUILDING file for information on
-building the source code.
-
-
-
-
-
-
-
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/RELEASE_NOTES b/java/sca-contrib/distribution/webservice/src/main/release/RELEASE_NOTES
deleted file mode 100644
index a04ef5c553..0000000000
--- a/java/sca-contrib/distribution/webservice/src/main/release/RELEASE_NOTES
+++ /dev/null
@@ -1,83 +0,0 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 Release Notes
-============================================================
-
-Apache Tuscany provides a runtime based on the Service Component
-Architecture. SCA is a set of specifications aimed at simplifying SOA
-Application Development which are being standardized at OASIS as part
-of Open Composite Services Architecture (Open CSA) - http://www.oasis-opencsa.org/.
-
-Overview
---------
-
-     The Apache Tuscany SCA 1.2 release includes implementations of the
-     main SCA specifications including:
-
-        SCA Assembly Model V1.0
-        SCA Policy Framework V1.0
-        SCA Java Common Annotations and APIs V1.0
-        SCA Java Component Implementation V1.0
-        SCA Spring Component Implementation V1.0
-        SCA BPEL Client and Implementation V1.0
-        SCA Web Services Binding V1.0
-        SCA EJB Session Bean Binding V1.0
-
-    It also includes implementations of many features not yet defined
-    by SCA specifications, including:
-
-        - SCA bindings for Direct Web Remoting, RSS and ATOM Feeds, 
-          HTTP resources, JSON-RPC, PUB/SUB Notifications, and RMI.
-        - SCA implementation types for OSGI, XQuery, BPEL, Widget and various 
-          dynamic languages including Groovy, Javascript, Python and Ruby
-        - Databindings for Service Data Objects (SDO), JAXB, XmlBeans, 
-          Axis2's AXIOM, JSON, SAXON, DOM, SAX and StAX
-
-    The Tuscany SCA Runtime can be configured as a single node SCA domain or 
-    as an SCA domain distributed across multiple nodes. 
-    In addition Tuscany SCA supports the following host-deployment options: -
-        - running standalone 
-        - running with distributed nodes across multiple JVMs
-        - running with embedded Jetty or Tomcat
-        - running as part of a standard web application                                     
-     
-    The Wepapp samples included in this release have been tried and tested on 
-        - Tomcat 5.5.20 and Tomcat 6.0.14
-        - Jetty 6.1.3
-        - Geronimo 2.0.2 Tomcat6 jee5
-        - WebSphere 6.1 fix pack 9
-
-See the CHANGES file for a detailed list of the features in this release.
-
-Support
--------
-
-For more information on Apache Tuscany visit the website at:
-
-    http://incubator.apache.org/tuscany/
- 
-Any issues with this release can be reported to Apache Tuscany
-using the mailing lists or in the JIRA issue tracker.
-
-    Mailing list archives:
-
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-user/
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/
-
-    Jira:
-
-       http://issues.apache.org/jira/browse/TUSCANY
-
-To join the project's mailing lists follow the instructions at:
-
-    http://incubator.apache.org/tuscany/mailing-lists.html
-
-To find out more about OASIS Open CSA go to: 
-
-    http://www.oasis-opencsa.org.
-
-Apache Tuscany welcomes your help. Any contribution, including code,
-testing, improving the documentation, or bug reporting is always
-appreciated. 
-
-Thank you for using Apache Tuscany!
-
-- The Tuscany Team.
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/bin/INSTALL b/java/sca-contrib/distribution/webservice/src/main/release/bin/INSTALL
deleted file mode 100644
index 2da53a2b44..0000000000
--- a/java/sca-contrib/distribution/webservice/src/main/release/bin/INSTALL
+++ /dev/null
@@ -1,27 +0,0 @@
-Installing the Apache Tuscany SCA 1.2 (incubating) April 2008 Release binary distribution
-=========================================================================================
-
-Unzip Tuscany binary distribution archive and you get the following:
-
-tuscany-sca-1.1-incubating        
-   DISCLAIMER    - the ASF incubation disclaimer
-   INSTALL       - this help file
-   LICENSE       - the Apache License and any dependecy licenses
-   NOTICE        - attribution notices associated with the licenses
-   README        - readme for the release
-   RELEASE_NOTES - description of this release 
-   CHANGES       - A note of the major changes in this release
-
-   /demos        - Demo applications showcasing the use of Apache Tuscany 
-
-   /lib          - The tuscany-sca-all and tuscany-sca-manifest jars and all their dependencies
-
-   /modules      - all of the individual Tuscany jars
-
-   /samples      - all the Tuscany samples, see the README in that directory
-
-   /tutorial     - The store tutorial, see the README in that directory
-
-
-
-
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/bin/LICENSE b/java/sca-contrib/distribution/webservice/src/main/release/bin/LICENSE
deleted file mode 100644
index 5e1f585d46..0000000000
--- a/java/sca-contrib/distribution/webservice/src/main/release/bin/LICENSE
+++ /dev/null
@@ -1,2366 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================
-
-APACHE TUSCANY SUBCOMPONENTS: 
-
-The Apache Tuscany binary distribution includes a number of subcomponents
-with separate copyright notices and license terms. Your use of the
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.                             
-
-===============================================================================
-
-The following components come under Apache Software License 1.1
-
- commons-discovery-0.2.jar
- commons-primitives-1.0.jar
-
-The following components come under Apache Software License 2.0
-
- abdera-core-0.3.0-incubating.jar
- abdera-i18n-0.3.0-incubating.jar
- abdera-parser-0.3.0-incubating.jar
- activeio-2.0-r118.jar
- activeio-core-3.0.0-incubator.jar
- apache-activemq-4.1.1.jar
- addressing-1.3.mar
- annogen-0.1.0.jar
- annotations-api-6.0.14.jar
- aopalliance-1.0.jar
- axiom-api-1.2.5.jar
- axiom-dom-1.2.5.jar
- axiom-impl-1.2.5.jar
- axis2-adb-1.3.jar
- axis2-codegen-1.3.jar
- axis2-java2wsdl-1.3.jar
- axis2-kernel-1.3.jar
- axis2-mtompolicy-1.3.jar
- bsf-all-3.0-beta2.jar
- catalina-6.0.14.jar
- cglib-nodep-2.1_3.jar
- commons-collections-3.1.jar
- commons-codec-1.3.jar
- commons-fileupload-1.1.1.jar
- commons-httpclient-3.0.1.jar
- commons-io-1.2.jar
- commons-jexl-1.1.jar
- commons-lang-2.1.jar
- commons-logging-1.1.jar
- coyote-6.0.14.jar
- derby-10.1.3.1.jar
- geronimo-activation_1.1_spec-1.0-M1.jar
- geronimo-common-1.2-beta.jar
- geronimo-commonj_1.1_spec-1.0.jar
- geronimo-connector-1.2-beta.jar
- geronimo-core-1.2-beta.jar
- geronimo-deployment-1.2-beta.jar
- geronimo-ejb_3.0_spec-1.0.jar
- geronimo-interceptor-1.2-beta.jar
- geronimo-j2ee-1.2-beta.jar
- geronimo-j2ee-connector_1.5_spec-1.1.jar
- geronimo-j2ee-jacc_1.0_spec-1.1.jar
- geronimo-j2ee-management_1.0_spec-1.1.jar
- geronimo-javamail_1.4_spec-1.0-M1.jar
- geronimo-jms_1.1_spec-1.1.jar
- geronimo-jpa_3.0_spec-1.0.jar
- geronimo-jta_1.0.1B_spec-1.0.jar
- geronimo-kernel-1.2-beta.jar
- geronimo-management-1.2-beta.jar
- geronimo-naming-1.2-beta.jar
- geronimo-security-1.2-beta.jar
- geronimo-spec-j2ee-connector-1.5-rc4.jar
- geronimo-spec-jta-1.0.1B-rc4.jar
- geronimo-system-1.2-beta.jar
- geronimo-transaction-1.2-beta.jar
- geronimo-util-1.2-beta.jar
- httpcore-4.0-alpha5.jar
- httpcore-nio-4.0-alpha5.jar
- httpcore-niossl-4.0-alpha5.jar
- jettison-1.0-RC2.jar
- jetty-6.1.7.jar
- jetty-util-6.1.7.jar
- json-rpc-1.0.jar
- juli-6.0.14.jar
- log4j-1.2.12.jar
- logkit-1.0.1.jar
- neethi-2.0.2.jar
- ode-bpel-api-1.1.jar
- ode-bpel-compiler-1.1.jar
- ode-bpel-dao-1.1.jar
- ode-bpel-epr-1.1.jar
- ode-bpel-obj-1.1.jar
- ode-bpel-runtime-1.1.jar
- ode-bpel-schemas-1.1.jar
- ode-bpel-store-1.1.jar
- ode-dao-jpa-1.1.jar
- ode-dao-jpa-ojpa-derby-1.1.zip
- ode-jacob-1.1.jar
- ode-jacob-ap-1.1.jar
- ode-scheduler-simple-1.1.jar
- ode-utils-1.1.jar
- openjpa-all-0.9.7-incubating.jar
- openjpa-persistence-0.9.7-incubating.jar
- org.apache.felix.bundlerepository-1.0.2.jar
- org.apache.felix.framework-1.0.3.jar
- org.apache.felix.main-1.0.3.jar
- org.apache.felix.shell-1.0.0.jar
- org.apache.felix.shell.tui-1.0.0.jar
- rampart-core-1.3.jar
- rampart-policy-1.3.jar
- rampart-trust-1.3.jar
- regexp-1.3.jar
- spring-beans-2.0.6.jar
- spring-context-2.0.6.jar
- spring-core-2.0.6.jar
- tranql-connector-1.1.jar
- tuscany-sdo-api-r2.1-1.0-incubating.jar
- tuscany-sdo-impl-1.0-incubating.jar
- tuscany-sdo-lib-1.0-incubating.jar
- tuscany-sdo-tools-1.0-incubating.jar
- woden-1.0-incubating-M7b.jar
- wss4j-1.5.3.jar
- wstx-asl-3.2.1.jar
- xalan-2.7.0.jar
- xbean-naming-2.7.jar
- xercesImpl-2.8.1.jar
- xml-apis-1.3.03.jar
- xmlbeans-2.3.0.jar
- xml-resolver-1.1.jar
- xmlsec-1.4.0.jar
- XmlSchema-1.3.2.jar
-
-===============================================================================
-axion-1.0-M3-dev.jar 
-
-Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
- 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above 
-   copyright notice, this list of conditions and the following 
-   disclaimer. 
- 
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in 
-   the documentation and/or other materials provided with the 
-   distribution. 
-
-3. The names "Tigris", "Axion", nor the names of its contributors may 
-   not be used to endorse or promote products derived from this 
-   software without specific prior written permission. 
- 
-4. Products derived from this software may not be called "Axion", nor 
-   may "Tigris" or "Axion" appear in their names without specific prior
-   written permission.
- 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-The "Axion Development Team" is defined to be:
-
- * Chuck Burdick
- * James Burke
- * Morgan Delagrange
- * Geir Magnusson Jr.
- * Martin Poeschl
- * Steve Polyak
- * Daniel Rall
- * Ahimanikya Satapathy
- * Doug Sale
- * James Strachan
- * Rodney Waldhoff
- * Jason van Zyl
-
-License changes are to be determined by a simple majority vote of the 
-Axion Development Team.
-
-===============================================================================
-dom4j-1.6.1.jar
-
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
-   statements and notices.  Redistributions must also contain a
-   copy of this document.
- 
-2. Redistributions in binary form must reproduce the
-   above copyright notice, this list of conditions and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
- 
-3. The name "DOM4J" must not be used to endorse or promote
-   products derived from this Software without prior written
-   permission of MetaStuff, Ltd.  For written permission,
-   please contact dom4j-info@metastuff.com.
- 
-4. Products derived from this Software may not be called "DOM4J"
-   nor may "DOM4J" appear in their names without prior written
-   permission of MetaStuff, Ltd. DOM4J is a registered
-   trademark of MetaStuff, Ltd.
- 
-5. Due credit should be given to the DOM4J Project - 
-   http://www.dom4j.org
- 
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-The EMF jars; 
-   codegen-2.2.3.jar 
-   codegen-ecore-2.2.3.jar
-   common-2.2.3.jar
-   ecore-2.2.3.jar
-   ecore-change-2.2.3.jar
-   ecore-xmi-2.2.3.jar
-   xsd-2.2.3.jar
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and
-are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such
-Contributor itself or anyone acting on such Contributor's behalf.
-Contributions do not include additions to the Program which: (i) are
-separate modules of software distributed in conjunction with the
-Program under their own license agreement, and (ii) are not derivative
-works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor
-which are necessarily infringed by the use or sale of its Contribution
-alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this 
-Agreement.
-
-"Recipient" means anyone who receives the Program under this
-Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and
-object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor, if
-any, in source code and object code form. This patent license shall
-apply to the combination of the Contribution and the Program if, at
-the time the Contribution is added by the Contributor, such addition
-of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow
-Recipient to distribute the Program, it is Recipient's responsibility
-to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or
-conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental and
-consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable
-manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the 
-Program.
-
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a
-commercial product offering should do so in a manner which does not
-create potential liability for other Contributors. Therefore, if a
-Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend
-and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising
-from claims, lawsuits and other legal actions brought by a third party
-against the Indemnified Contributor to the extent caused by the acts
-or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement.
-In order to qualify, an Indemnified Contributor must: a) promptly
-notify the Commercial Contributor in writing of such claim, and b)
-allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such
-claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable
-laws, damage to or loss of data, programs or equipment, and
-unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-the Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of
-the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of
-time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use
-and distribution of the Program as soon as reasonably practicable.
-However, Recipient's obligations under this Agreement and any licenses
-granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted and
-may only be modified in the following manner. The Agreement Steward
-reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation
-is the initial Agreement Steward. The Eclipse Foundation may assign
-the responsibility to serve as the Agreement Steward to a suitable
-separate entity. Each new version of the Agreement will be given a
-distinguishing version number. The Program (including Contributions)
-may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives
-no rights or licenses to the intellectual property of any Contributor
-under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No
-party to this Agreement will bring a legal action under this Agreement
-more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.
-
-===============================================================================
-For Saxon including 
-   saxon-8.7.jar
-   saxon-dom-8.7.jar
-   saxon-xpath-8.7.jar
-
- MOZILLA PUBLIC LICENSE
-Version 1.0
-
-1. Definitions.
-
-      1.1. ``Contributor'' means each entity that creates or contributes to the creation of Modifications.
-
-      1.2. ``Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-
-      1.3. ``Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.
-
-      1.4. ``Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data.
-
-      1.5. ``Executable'' means Covered Code in any form other than Source Code.
-
-      1.6. ``Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-
-      1.7. ``Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-
-      1.8. ``License'' means this document.
-
-      1.9. ``Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-
-            A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-
-            B. Any new file that contains any part of the Original Code or previous Modifications. 
-
-      1.10. ``Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-
-      1.11. ``Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or a list of source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-
-      1.12. ``You'' means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, ``You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, ``control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity. 
-
-2. Source Code License.
-
-      2.1. The Initial Developer Grant.
-      The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell (``Utilize'') the Original Code (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Original Code (or portions thereof) and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-      2.2. Contributor Grant.
-      Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code or as part of a Larger Work; and
-
-            (b) under patents now or hereafter owned or controlled by Contributor, to Utilize the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Contributor Version (or portions thereof), and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 
-
-3. Distribution Obligations.
-
-      3.1. Application of License.
-      The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-
-      3.2. Availability of Source Code.
-      Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
-
-      3.3. Description of Modifications.
-      You must cause all Covered Code to which you contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-
-      3.4. Intellectual Property Matters
-
-            (a) Third Party Claims.
-            If You have knowledge that a party claims an intellectual property right in particular functionality or code (or its utilization under this License), you must include a text file with the source code distribution titled ``LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If you obtain such knowledge after You make Your Modification available as described in Section 3.2, You shall promptly modify the LEGAL file in all copies You make available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-
-            (b) Contributor APIs.
-            If Your Modification is an application programming interface and You own or control patents which are reasonably necessary to implement that API, you must also include this information in the LEGAL file. 
-
-      3.5. Required Notices.
-      You must duplicate the notice in Exhibit A in each file of the Source Code, and this License in any documentation for the Source Code, where You describe recipients' rights relating to Covered Code. If You created one or more Modification(s), You may add your name as a Contributor to the notice described in Exhibit A. If it is not possible to put such notice in a particular Source Code file due to its structure, then you must include such notice in a location (such as a relevant directory file) where a user would be likely to look for such a notice. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-      3.6. Distribution of Executable Versions.
-      You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-      3.7. Larger Works.
-      You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. 
-
-4. Inability to Comply Due to Statute or Regulation.
-
-      If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. 
-
-5. Application of this License.
-
-      This License applies to code to which the Initial Developer has attached the notice in Exhibit A, and to related Covered Code. 
-
-6. Versions of the License.
-
-      6.1. New Versions.
-      Netscape Communications Corporation (``Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-
-      6.2. Effect of New Versions.
-      Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License.
-
-      6.3. Derivative Works.
-      If you create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), you must (a) rename Your license so that the phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or any confusingly similar phrase do not appear anywhere in your license and (b) otherwise make it clear that your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) 
-
-7. DISCLAIMER OF WARRANTY.
-
-      COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 
-
-8. TERMINATION.
-
-      This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 
-
-9. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. 
-
-10. U.S. GOVERNMENT END USERS.
-
-      The Covered Code is a ``commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer software'' and ``commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 
-
-11. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in, the United States of America: (a) unless otherwise agreed in writing, all disputes relating to this License (excepting any dispute relating to intellectual property rights) shall be subject to final and binding arbitration, with the losing party paying all costs of arbitration; (b) any arbitration relating to this Agreement shall be held in Santa Clara County, California, under the auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. 
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-      Except in cases where another Contributor has failed to comply with Section 3.4, You are responsible for damages arising, directly or indirectly, out of Your utilization of rights under this License, based on the number of copies of Covered Code you made available, the revenues you received from utilizing such rights, and other relevant factors. You agree to work with affected parties to distribute responsibility on an equitable basis. 
-
-EXHIBIT A.
-
-      ``The contents of this file are subject to the Mozilla Public License Version 1.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.mozilla.org/MPL/
-
-      Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-
-      The Original Code is ______________________________________.
-
-      The Initial Developer of the Original Code is ________________________. Portions created by ______________________ are Copyright (C) ______ _______________________. All Rights Reserved.
-
-      Contributor(s): ______________________________________.'' 
-
-===============================================================================
-
-For the Rhino JavaScript engine js-1.6R7.jar:
-
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (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.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-
-===============================================================================
-Groovy (groovy-all-minimal-1.5.4.jar):
-
-/*
- $Id: LICENSE.txt 156 2003-09-26 17:36:37Z jstrachan $
-
- Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
-    statements and notices.  Redistributions must also contain a
-    copy of this document.
-
- 2. Redistributions in binary form must reproduce the
-    above copyright notice, this list of conditions and the
-    following disclaimer in the documentation and/or other
-    materials provided with the distribution.
-
- 3. The name "groovy" must not be used to endorse or promote
-    products derived from this Software without prior written
-    permission of The Codehaus.  For written permission,
-    please contact info@codehaus.org.
-
- 4. Products derived from this Software may not be called "groovy"
-    nor may "groovy" appear in their names without prior written
-    permission of The Codehaus. "groovy" is a registered
-    trademark of The Codehaus.
-
- 5. Due credit should be given to The Codehaus -
-    http://groovy.codehaus.org/
-
- THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- THE CODEHAUS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- */
-
-===============================================================================
-
-Jython (jython-2.2.jar):
-
-A. HISTORY OF THE SOFTWARE
-=======================
-
-JPython was created in late 1997 by Jim Hugunin. Jim was also the
-primary developer while he was at CNRI. In February 1999 Barry Warsaw
-took over as primary developer and released JPython version 1.1.
-
-In October 2000 Barry helped move the software to SourceForge
-where it was renamed to Jython.  Jython 2.0 and on are licensed under
-the Jython specific license below. 
-
-The standard library is covered by the Python Software Foundation
-license. See the LICENSE_CPython.txt file for details.
-
-The zxJDBC package was written by Brian Zimmer and originally licensed
-under the GNU Public License.  The package is now covered by the Jython
-Software License.
-
-The command line interpreter is covered by the Apache Software
-License.  See the LICENSE_Apache.txt file for details.
- 
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
-================================
-
-Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the distribution.
-
- - Neither the name of the Jython Developers nor the names of
-   its contributors may be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-
-JPython 1.1.x Software License.
-=========================
-
-______________________________________________________________________
-
-IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
-
-BY CLICKING ON THE "ACCEPT" BUTTON WHERE INDICATED, OR BY INSTALLING,
-COPYING OR OTHERWISE USING THE SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
-THE TERMS AND CONDITIONS OF THIS AGREEMENT.
-
-______________________________________________________________________
-
-JPython version 1.1.x
-
-  1. This LICENSE AGREEMENT is between the Corporation for National Research
-     Initiatives, having an office at 1895 Preston White Drive, Reston, VA
-     20191 ("CNRI"), and the Individual or Organization ("Licensee")
-     accessing and using JPython version 1.1.x in source or binary form and
-     its associated documentation as provided herein ("Software").
-
-  2. Subject to the terms and conditions of this License Agreement, CNRI
-     hereby grants Licensee a non-exclusive, non-transferable, royalty-free,
-     world-wide license to reproduce, analyze, test, perform and/or display
-     publicly, prepare derivative works, distribute, and otherwise use the
-     Software alone or in any derivative version, provided, however, that
-     CNRI's License Agreement and CNRI's notice of copyright, i.e.,
-     "Copyright ©1996-1999 Corporation for National Research Initiatives;
-     All Rights Reserved" are both retained in the Software, alone or in any
-     derivative version prepared by Licensee.
-
-     Alternatively, in lieu of CNRI's License Agreement, Licensee may
-     substitute the following text (omitting the quotes), provided, however,
-     that such text is displayed prominently in the Software alone or in any
-     derivative version prepared by Licensee: "JPython (Version 1.1.x) is
-     made available subject to the terms and conditions in CNRI's License
-     Agreement. This Agreement may be located on the Internet using the
-     following unique, persistent identifier (known as a handle):
-     1895.22/1006. The License may also be obtained from a proxy server on
-     the Web using the following URL: http://hdl.handle.net/1895.22/1006."
-
-  3. In the event Licensee prepares a derivative work that is based on or
-     incorporates the Software or any part thereof, and wants to make the
-     derivative work available to the public as provided herein, then
-     Licensee hereby agrees to indicate in any such work, in a prominently
-     visible way, the nature of the modifications made to CNRI's Software.
-
-  4. Licensee may not use CNRI trademarks or trade name, including JPython
-     or CNRI, in a trademark sense to endorse or promote products or
-     services of Licensee, or any third party. Licensee may use the mark
-     JPython in connection with Licensee's derivative versions that are
-     based on or incorporate the Software, but only in the form
-     "JPython-based ___________________," or equivalent.
-
-  5. CNRI is making the Software available to Licensee on an "AS IS" basis.
-     CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
-     OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY
-     REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
-     PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE
-     ANY THIRD PARTY RIGHTS.
-
-  6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
-     ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
-     USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE
-     THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT
-     ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER
-     MAY NOT APPLY TO LICENSEE.
-
-  7. This License Agreement may be terminated by CNRI (i) immediately upon
-     written notice from CNRI of any material breach by the Licensee, if the
-     nature of the breach is such that it cannot be promptly remedied; or
-     (ii) sixty (60) days following notice from CNRI to Licensee of a
-     material remediable breach, if Licensee has not remedied such breach
-     within that sixty-day period.
-
-  8. This License Agreement shall be governed by and interpreted in all
-     respects by the law of the State of Virginia, excluding conflict of law
-     provisions. Nothing in this Agreement shall be deemed to create any
-     relationship of agency, partnership, or joint venture between CNRI and
-     Licensee.
-
-  9. By clicking on the "ACCEPT" button where indicated, or by installing,
-     copying or otherwise using the Software, Licensee agrees to be bound by
-     the terms and conditions of this License Agreement.
-
-
-===============================================================================
-
-The jars; 
-activation-1.1.jar, 
-jaxb-api-2.1.jar, 
-jaxb-impl-2.1.6.jar, 
-jaxb-xjc-2.1.4.jar, 
-jaxb2-reflection-2.1.4.jar,
-jsr181-api-1.0-MR1.jar, 
-jsr250-api-1.0.jar, 
-jaxws-api-2.1-1.jar, 
-mail-1.4.jar, 
-saaj-api-1.3.jar, 
-servlet-api-2.5.jar, 
-stax-api-1.0-commons-cli-1.0.jar2.jar
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
-      1. Definitions.
-
-            1.1. "Contributor" means each individual or entity that
-            creates or contributes to the creation of Modifications.
-
-            1.2. "Contributor Version" means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-
-            1.3. "Covered Software" means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-
-            1.4. "Executable" means the Covered Software in any form
-            other than Source Code. 
-
-            1.5. "Initial Developer" means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            
-            1.6. "Larger Work" means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-
-            1.7. "License" means this document.
-
-            1.8. "Licensable" means having the right to grant, to the
-            maximum extent possible, whether at the time of the initial
-            grant or subsequently acquired, any and all of the rights
-            conveyed herein.
-            
-            1.9. "Modifications" means the Source Code and Executable
-            form of any of the following: 
-
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-
-            1.10. "Original Software" means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-
-            1.11. "Patent Claims" means any patent claim(s), now owned
-            or hereafter acquired, including without limitation,
-            method, process, and apparatus claims, in any patent
-            Licensable by grantor. 
-
-            1.12. "Source Code" means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-
-            1.13. "You" (or "Your") means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, "You"
-            includes any entity which controls, is controlled by, or is
-            under common control with You. For purposes of this
-            definition, "control" means (a) the power, direct or
-            indirect, to cause the direction or management of such
-            entity, whether by contract or otherwise, or (b) ownership
-            of more than fifty percent (50%) of the outstanding shares
-            or beneficial ownership of such entity.
-
-      2. License Grants. 
-
-            2.1. The Initial Developer Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Initial Developer,
-                  to use, reproduce, modify, display, perform,
-                  sublicense and distribute the Original Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party under the terms of this
-                  License. 
-
-                  (d) Notwithstanding Section 2.1(b) above, no patent
-                  license is granted: (1) for code that You delete from
-                  the Original Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-
-            2.2. Contributor Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, each
-            Contributor hereby grants You a world-wide, royalty-free,
-            non-exclusive license:
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Contributor to
-                  use, reproduce, modify, display, perform, sublicense
-                  and distribute the Modifications created by such
-                  Contributor (or portions thereof), either on an
-                  unmodified basis, with other Modifications, as
-                  Covered Software and/or as part of a Larger Work; and
-                  
-
-                  (b) under Patent Claims infringed by the making,
-                  using, or selling of Modifications made by that
-                  Contributor either alone and/or in combination with
-                  its Contributor Version (or portions of such
-                  combination), to make, use, sell, offer for sale,
-                  have made, and/or otherwise dispose of: (1)
-                  Modifications made by that Contributor (or portions
-                  thereof); and (2) the combination of Modifications
-                  made by that Contributor with its Contributor Version
-                  (or portions of such combination). 
-
-                  (c) The licenses granted in Sections 2.2(a) and
-                  2.2(b) are effective on the date Contributor first
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-
-                  (d) Notwithstanding Section 2.2(b) above, no patent
-                  license is granted: (1) for any code that Contributor
-                  has deleted from the Contributor Version; (2) for
-                  infringements caused by: (i) third party
-                  modifications of Contributor Version, or (ii) the
-                  combination of Modifications made by that Contributor
-                  with other software (except as part of the
-                  Contributor Version) or other devices; or (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-
-            3.1. Availability of Source Code.
-
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-
-            3.2. Modifications.
-
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-
-            3.3. Required Notices.
-
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-
-            3.4. Application of Additional Terms.
-
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipients'
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            However, you may do so only on Your own behalf, and not on
-            behalf of the Initial Developer or any Contributor. You
-            must make it absolutely clear that any such warranty,
-            support, indemnity or liability obligation is offered by
-            You alone, and You hereby agree to indemnify the Initial
-            Developer and every Contributor for any liability incurred
-            by the Initial Developer or such Contributor as a result of
-            warranty, support, indemnity or liability terms You offer.
-          
-
-            3.5. Distribution of Executable Versions.
-
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of a license of Your choice, which may contain terms
-            different from this License, provided that You are in
-            compliance with the terms of this License and that the
-            license for the Executable form does not attempt to limit
-            or alter the recipient's rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form under a
-            different license, You must make it absolutely clear that
-            any terms which differ from this License are offered by You
-            alone, not by the Initial Developer or Contributor. You
-            hereby agree to indemnify the Initial Developer and every
-            Contributor for any liability incurred by the Initial
-            Developer or such Contributor as a result of any such terms
-            You offer.
-
-            3.6. Larger Works.
-
-            You may create a Larger Work by combining Covered Software
-            with other code not governed by the terms of this License
-            and distribute the Larger Work as a single product. In such
-            a case, You must make sure the requirements of this License
-            are fulfilled for the Covered Software. 
-            
-      4. Versions of the License. 
-
-            4.1. New Versions.
-
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-
-            4.2. Effect of New Versions.
-
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-
-            4.3. Modified Versions.
-
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-            
-
-      5. DISCLAIMER OF WARRANTY.
-
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-
-            6.1. This License and the rights granted hereunder will
-            terminate automatically if You fail to comply with terms
-            herein and fail to cure such breach within 30 days of
-            becoming aware of the breach. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as "Participant")
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-
-      7. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-
-      8. U.S. GOVERNMENT END USERS.
-
-      The Covered Software is a "commercial item," as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-      computer software" (as that term is defined at 48 C.F.R. 
-      252.227-7014(a)(1)) and "commercial computer software
-      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users
-      acquire Covered Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-
-      9. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject
-      matter hereof. If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be
-      governed by the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdiction's conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, with the losing
-      party responsible for costs, including, without limitation, court
-      costs and reasonable attorneys' fees and expenses. The
-      application of the United Nations Convention on Contracts for the
-      International Sale of Goods is expressly excluded. Any law or
-      regulation which provides that the language of a contract shall
-      be construed against the drafter shall not apply to this License.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-      10. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis. Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.
-
-===============================================================================
-
-JRuby (jruby-complete-1.0.jar), wsdl4j (wsdl4j-1.6.2.jar):
-
-Common Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-      a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-      b) in the case of each subsequent Contributor:
-
-      i) changes to the Program, and
-
-      ii) additions to the Program;
-
-      where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
-
-      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
-
-      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
-
-      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
-
-      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-      iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form:
-
-      a) it must be made available under this Agreement; and 
-
-      b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
-
-===============================================================================
-
-backport-util-concurrent-2.2.jar:
-
-The software comprising backport-util-concurrent is based in large
-part on the code from JSR166, and the package dl.util.concurrent.
-The software has been released to the public domain, as explained at:
-http://creativecommons.org/licenses/publicdomain, excepting portions
-of the class
-edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList,
-which were adapted from class java.util.ArrayList, written by Sun
-Microsystems, Inc, which are used with kind permission, and subject
-to the following:
-
-Copyright 2002-2004 Sun Microsystems, Inc. All rights reserved. Use is
-subject to the following license terms.
-
-  "Sun hereby grants you a non-exclusive, worldwide, non-transferrable
-  license to use and distribute the Java Software technologies as part
-  of a larger work in source and binary forms, with or without
-  modification, provided that the following conditions are met:
-
-   -Neither the name of or trademarks of Sun may be used to endorse or
-    promote products derived from the Java Software technology without
-    specific prior written permission.
-
-   -Redistributions of source or binary code must be accompanied by the
-    following notice and disclaimers:
-
-    Portions copyright Sun Microsystems, Inc. Used with kind permission.
-
-    This software is provided AS IS, without a warranty of any kind.  ALL
-    EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
-    WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PUPOSE OR
-    NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
-    MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE
-    FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
-    USING, MODIFYING OR DISTRIBUTING THE SOFTWARE OR ITS
-    DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR
-    ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR
-    DATA, OR FOR DIRECT, INDIRECT,CONSQUENTIAL, INCIDENTAL
-    OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF
-    THE THEORY OR LIABILITY, ARISING OUT OF THE USE OF OR
-    INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.
-    HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-    You acknowledge that Software is not designed, licensed or intended for
-    use in the design, construction, operation or maintenance of any nuclear
-    facility."
-
-===============================================================================
-rome-0.9.jar
-
-Copyright 2004 Sun Microsystems, Inc.
-
-Licensed 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.
-
-===============================================================================
-jdom-1.0.jar :
-
-$Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions, and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions, and the disclaimer that follows 
-    these conditions in the documentation and/or other materials 
-    provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
-    derived from this software without prior written permission.  For
-    written permission, please contact <request_AT_jdom_DOT_org>.
- 
- 4. Products derived from this software may not be called "JDOM", nor
-    may "JDOM" appear in their name, without prior written permission
-    from the JDOM Project Management <request_AT_jdom_DOT_org>.
- 
- In addition, we request (but do not require) that you include in the 
- end-user documentation provided with the redistribution and/or in the 
- software itself an acknowledgement equivalent to the following:
-     "This product includes software developed by the
-      JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos 
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many 
- individuals on behalf of the JDOM Project and was originally 
- created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
- Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
- on the JDOM Project, please see <http://www.jdom.org/>. 
-
-========================================================================
-
-dwr-2.0.1.jar :
-
-/*
-* Copyright 2005 Joe Walker
-*
-* Licensed 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.
-*/
-
-==========================================================================
-
-dojotoolkit V1.0.0:
-
-The "New" BSD License:
-**********************
-
-Copyright (c) 2005, The Dojo Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-	list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-	this list of conditions and the following disclaimer in the documentation
-	and/or other materials provided with the distribution.
-  * Neither the name of the Dojo Foundation nor the names of its contributors
-	may be used to endorse or promote products derived from this software
-	without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The module tuscany-implementation-script-1.0-incubating.jar temporarily includes    
-one file under the below BSD license with the following copyright:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-
-The serp-1.12.0.jar is distributed under the BSD license with the following copyright:
-
- Copyright (c) 2002, A. Abram White
- All rights reserved.
-
-BSD license:
-
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-================================================================================
-The javacc-3.2.jar, and howl-1.0.1-1.jar are distributed under the BSD license:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The tuscany-assembly-xsd jar includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-================================================================================
-License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
-
-These files being ...
-commonj/sdo/ChangeSummary$Setting.class
-commonj/sdo/ChangeSummary.class
-commonj/sdo/DataGraph.class
-commonj/sdo/DataObject.class
-commonj/sdo/helper/CopyHelper.class
-commonj/sdo/helper/DataFactory.class
-commonj/sdo/helper/DataHelper.class
-commonj/sdo/helper/EqualityHelper.class
-commonj/sdo/helper/HelperContext.class
-commonj/sdo/helper/TypeHelper.class
-commonj/sdo/helper/XMLDocument.class
-commonj/sdo/helper/XMLHelper.class
-commonj/sdo/helper/XSDHelper.class
-commonj/sdo/impl/ExternalizableDelegator$Resolvable.class
-commonj/sdo/impl/ExternalizableDelegator.class
-commonj/sdo/Property.class
-commonj/sdo/Sequence.class
-commonj/sdo/Type.class
-xml/datagraph.xsd
-xml/sdoJava.xml
-xml/sdoJava.xsd
-xml/sdoModel.xml
-xml/sdoModel.xsd
-xml/sdoXML.xml
-xml/sdoXML.xsd
-
-
-License for the Service Data Objects JavaDoc and Interface Definition files.
-
-The Service Data Objects Specification is being provided by the copyright holders under the following 
-license. By using and/or copying this work, you agree that you have read, understood and will comply with 
-the following terms and conditions:
-
-Permission to copy, display and distribute the Service Data Objects Specification and/or portions thereof, without 
-modification, in any medium without fee or royalty is hereby granted, provided that you include the 
-following on ALL copies of the Service Data Objects Specification, or portions thereof, that you make:
-
-1. A link or URL to the Service Data Objects Specification at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2. The full text of this copyright notice as shown in the Service Data Objects Specification.
-
-BEA, IBM, Oracle, Primeton Technologies, Rogue Wave Software, SAP, Software AG, Sun Microsystems, Xcalia, 
-Zend Technologies (collectively, the “Authors”) agree to grant you a royalty-free license, under reasonable, 
-non-discriminatory terms and conditions to patents that they deem necessary to implement the Service Data 
-Objects Specification. 
-
-THE Service Data Objects SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR 
-WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL 
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE SERVICE DATA OBJECTS 
-SPECIFICATION.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity 
-pertaining to the Service Data Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects Specification will at all times remain with the 
-Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-================================================================================
-
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/bin/NOTICE b/java/sca-contrib/distribution/webservice/src/main/release/bin/NOTICE
deleted file mode 100644
index 5daa9a3dfe..0000000000
--- a/java/sca-contrib/distribution/webservice/src/main/release/bin/NOTICE
+++ /dev/null
@@ -1,95 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses XmlSchema developed at 
-The Apache Software Foundation (http://ws.apache.org/commons/XmlSchema)
- Portions Copyright 2006 International Business Machines Corp.
-
-This product includes/uses ode-bpel-api-1.1 developed at
-The Apache Software Foundation (http://ode.apache.org)
- - Copyright 1999-2006 Intalio - This product includes software developed by Intalio (http://www.intalio.com)
- - Copyright 2006 Sybase - This product includes software developed by Sybase.(http://www.sybase.com)
-
-"This product includes software developed by the Spring Framework
- Project (http://www.springframework.org)."
-
-This product includes/uses the Jetty Servlet Engine (http://jetty.mortbay.org),
-developed by Mort Bay Consulting  (http://www.mortbay.com)
-
-This product includes/uses the Groovy Script Engine (http://groovy.codehaus.org/),
-Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
-This product includes/uses the Axion : the Open Source Java Database (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
-
-This product includes/uses DOM4J : the flexible XML framework for java (http://www.dom4j.org/) 
- Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)
-License: Public Domain 
-
-This product includes/uses JSON-RPC-Java (http://oss.metaparadigm.com/jsonrpc/)
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product includes software from the GlassFish project (https://glassfish.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-    
-This product includes software from the Rome project (https://rome.dev.java.net/)
-    Copyright (c) 2006, Sun Microsystems, Inc.
-
-This product includes/uses the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
-
-This product includes/uses the Mozilla Rhino project (http://www.mozilla.org/rhino/)
-
-This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)i
-
-This product includes/uses the Codehaus JRuby project (http://jruby.codehaus.org/)
-
-This product includes/uses JDOM (http://www.jdom.org/)
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved.
- 
-This product includes/uses DWR (http://getahead.org/dwr)
- Copyright 2005 Joe Walker. All rights reserved.
- 
-This product includes/uses dojotoolkit (http://dojotoolkit.org/)
- Copyright (c) 2005, The Dojo Foundation. All rights reserved.
-
-This product includes/uses Howl (http://howl.objectweb.org/)
- Copyright (c) 2004, Bull S.A.
-
-This product includes/uses axion (http://axion.tigris.org/)
- Copyright (c) 2002-2003 Axion Development Team.
-
-This product includes/uses javacc (https://javacc.dev.java.net/)
- Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.
-
-The Program includes all or portions of the following software: "The 
-Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under
-an MPL v1.0 license. Please refer to the homepage URL at 
-http://www.saxonica.com/.
-
-This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:
- Copyright (c) 2002, A. Abram White. All rights reserved.
-
-This product also includes software under the BSD license
-with the following copyright:
- Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/src/BUILDING b/java/sca-contrib/distribution/webservice/src/main/release/src/BUILDING
deleted file mode 100644
index 65d09c5eae..0000000000
--- a/java/sca-contrib/distribution/webservice/src/main/release/src/BUILDING
+++ /dev/null
@@ -1,55 +0,0 @@
-Building the Apache Tuscany SCA 1.2 (incubating) April 2008 Release source distribution
-=======================================================================================
-
-Initial Setup
--------------
-
-1) Install J2SE 5.0 SDK, which can be downloaded from 
-   http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_06 JDK or higher.
-
-2) Make sure that your JAVA_HOME environment variable is set to the newly installed 
-   JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 
-   $JAVA_HOME$/bin (unix).
-
-3) Install Maven 2.0.7 or higher, which can be downloaded from 
-   http://maven.apache.org/download.html. Make sure that your PATH includes 
-   the MVN_HOME/bin directory. 
-
-4) Make sure that your MAVEN_OPTS environment variable has -Xmx128M (or more),
-   you can manually do this by executing the following in your prompt :
-   Windows users:
-      set MAVEN_OPTS=-Xmx128M
-   Unix users:
-      export MAVEN_OPTS=-Xmx128M
-
-
-Building
---------
-
-1) Change to the top level directory of Apache Tuscany source distribution.
-2) Run
-
-	$> mvn
-
-   This will compile Apache Tuscany and run all of the tests in the source
-   distribution. 
-
-   Depending on the load of remote Maven 2.0 repositories, you may have 
-   to run "mvn" several times utill the required dependencies are 
-   all located in your local maven repository. It usually takes some time for 
-   maven to download required dependencies in the first build. Once all the 
-   dependencies have been downloaded you may use the -o option to run maven
-   in offline mode, for example, 'mvn clean install -o'.
-
-
-Building the distributions
---------------------------
-
-1) Change to the distribution folder
-2) Run
-
-	$> mvn
-
-   This will build the binary and source distribution with .zip and .gz 
-   formats in the distribution/target directory.
-
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/src/LICENSE b/java/sca-contrib/distribution/webservice/src/main/release/src/LICENSE
deleted file mode 100644
index 144d8ae692..0000000000
--- a/java/sca-contrib/distribution/webservice/src/main/release/src/LICENSE
+++ /dev/null
@@ -1,397 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-===============================================================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================================================
-
-The module itest/databindings/common includes the test schema; datagraph.xsd, sdoJava.xsd, and sdoModel.xsd
-under the following license:
-
-License for the Service Data Objects JavaDoc, Interface Definition files
-and XSD files.
-
-The Service Data Objects JavaDoc, Interface Definition files and XSD files 
-are being provided by the copyright holders under the following license. 
-By using and/or copying this work, you agree that you have read, 
-understood and will comply with the following terms and conditions:
-
-Permission to copy, display, make derivative works of and distribute 
-the Service Data Objects JavaDoc, Interface Definition files and XSD files
-(the "Artifacts") in any medium without fee or royalty is hereby granted, 
-provided that you include the following on ALL copies of the Artifacts, 
-or portions thereof, that you make:
-
-1.	A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2.	The full text of this copyright notice as shown in the Artifacts.
-
-
-
-THE ARTIFACTS ARE PROVIDED "AS IS" AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE. 
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Data 
-Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects 
-Specification will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.11, last updated on 2007/12/21
-
-=================================================================================================================
-
-The module implementation-script temporarily includes one file under the following BSD license:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-=================================================================================================================
-
-The module assembly-xsd includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture JavaDoc, Interface Definition files, 
-and XSD files are being provided by the copyright holders under the 
-following license. By using and/or copying this work, you agree that 
-you have read, understood and will comply with the following terms and 
-conditions:
-
-Permission to copy, display, make derivative works of, and distribute 
-the Service Component Architecture JavaDoc, Interface Definition Files 
-and XSD files (the "Artifacts") in any medium without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies 
-of the Artifacts, or portions thereof, that you make: 
-
-1. A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 
-
-2. The full text of this copyright notice as shown in the Artifacts.
-
-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE, NON-INFRINGEMENT OR TITLE.  
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to the Service Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-=================================================================================================================
-The modules 
-
-binding-ws-xml
-databinding
-databinding-axiom
-databinding-jaxb
-databinding-json
-databinding-sdo
-databinding-sdo-axiom
-databinding-xmlbeans
-interface-wsdl-xml
-
-Include the ipo.xsd and address.xsd information from the XML Schema Primer 
-(http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) combined into the 
-file ipo.xsd and extended with UK postcode structures.
-
-The ipo.xsd file is include under the following license:
-
-W3C(c) SOFTWARE NOTICE AND LICENSE
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other 
-related items) is being provided by the copyright holders under the following 
-license. By obtaining, using and/or copying this work, you (the licensee) agree 
-that you have read, understood, and will comply with the following terms and conditions.
-
-Permission to copy, modify, and distribute this software and its documentation, 
-with or without modification, for any purpose and without fee or royalty is 
-hereby granted, provided that you include the following on ALL copies of the 
-software and documentation or portions thereof, including modifications:
-
-   1. The full text of this NOTICE in a location viewable to users of the 
-      redistributed or derivative work.
-   2. Any pre-existing intellectual property disclaimers, notices, or terms 
-      and conditions. If none exist, the W3C Software Short Notice should be 
-      included (hypertext is preferred, text is permitted) within the body of 
-      any redistributed or derivative code.
-   3. Notice of any changes or modifications to the files, including the date 
-      changes were made. (We recommend you provide URIs to the location from which 
-      the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
-NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or 
-publicity pertaining to the software without specific, written prior permission. 
-Title to copyright in this software and any associated documentation will at all 
-times remain with copyright holders.
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/src/NOTICE b/java/sca-contrib/distribution/webservice/src/main/release/src/NOTICE
deleted file mode 100644
index 31540fd607..0000000000
--- a/java/sca-contrib/distribution/webservice/src/main/release/src/NOTICE
+++ /dev/null
@@ -1,39 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
-This product also includes software under the BSD license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-  Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
-
-This product includes software under the Service Component Architecture JavaDoc, 
-Interface Definition files and XSD files license.
-  (c) Copyright SCA Collaboration 2006, 2007
-
-This product includes software under the Service Data Objects JavaDoc and 
-Interface Definition file license
-
-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
-2005, 2006. All rights reserved.
-
-This product includes software under the W3C(c) Software License
-with the following copyright:
-    
-Copyright (c) 2008 World Wide Web Consortium, (Massachusetts Institute of Technology, 
-European Research Consortium for Informatics and Mathematics, Keio University). 
-All Rights Reserved. This work is distributed under the W3C(c) Software License [1] in 
-the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
diff --git a/java/sca-contrib/features/compact/pom.xml b/java/sca-contrib/features/compact/pom.xml
deleted file mode 100644
index 0899195d06..0000000000
--- a/java/sca-contrib/features/compact/pom.xml
+++ /dev/null
@@ -1,221 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-compact-distribution</artifactId>

-    <name>Apache Tuscany SCA Compact Feature</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-assembly</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-assembly-xsd</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-binding-sca</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-binding-sca-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-contribution</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-contribution-java</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-contribution-namespace</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-contribution-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-core</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-core-databinding</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-core-spi</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-databinding</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-databinding-jaxb</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-definitions</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-definitions-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-endpoint</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-extensibility</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-host-http</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency> 

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-implementation-java</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-implementation-java-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-implementation-node</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-interface</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-interface-java</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-interface-java-jaxws</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-interface-java-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-monitor</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-policy</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-policy-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-workspace</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-workspace-impl</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-workspace-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>    

-    </dependencies>

-

-</project>

diff --git a/java/sca-contrib/features/manager/pom.xml b/java/sca-contrib/features/manager/pom.xml
deleted file mode 100644
index 6c593f8a31..0000000000
--- a/java/sca-contrib/features/manager/pom.xml
+++ /dev/null
@@ -1,147 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-feature</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-feature-manager</artifactId>

-    <name>Apache Tuscany SCA Domain Manager Feature</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-    

-        <!-- Core feature -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <!-- Binding Models -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-atom</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ejb</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-http</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jsonrpc</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rmi</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rss</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <!-- Contribution models -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-contribution-java</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-contribution-namespace</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-contribution-resource</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <!-- Domain support -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-domain-manager</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-manager</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <!-- Implementation Models -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-bpel</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-ejb</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-node</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-resource</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-widget</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-

-</project>

diff --git a/java/sca-contrib/features/process/pom.xml b/java/sca-contrib/features/process/pom.xml
deleted file mode 100644
index 17faf5ec41..0000000000
--- a/java/sca-contrib/features/process/pom.xml
+++ /dev/null
@@ -1,56 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-feature</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-feature-process</artifactId>

-    <name>Apache Tuscany SCA Business Process Feature</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-

-        <!-- Core distribution -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <!-- Implementations -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-bpel-ode</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-xquery</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-

-</project>

diff --git a/java/sca-contrib/features/repository/pom.xml b/java/sca-contrib/features/repository/pom.xml
deleted file mode 100644
index c6bb2a5d3b..0000000000
--- a/java/sca-contrib/features/repository/pom.xml
+++ /dev/null
@@ -1,84 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-feature</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-feature-repository</artifactId>

-    <name>Apache Tuscany SCA Maven Repository Feature</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-

-        <!-- All distribution -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-all</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <!-- Eclipse update site -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.updatesite</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <!-- Maven plugins -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-maven-ant-generator</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-maven-bundle-plugin</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-maven-eclipse-compiler</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-maven-incremental-build</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-maven-wsdl2java</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-maven-java2wsdl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-    </dependencies>

-

-</project>

diff --git a/java/sca-contrib/features/web20/pom.xml b/java/sca-contrib/features/web20/pom.xml
deleted file mode 100644
index ffd3d01888..0000000000
--- a/java/sca-contrib/features/web20/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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-feature</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-feature-web20</artifactId>

-    <name>Apache Tuscany SCA Web 2.0 Feature</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-

-        <!-- Core distribution -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <!-- Bindings -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-atom-abdera</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-http-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rss-rome</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <!-- Contribution model -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-contribution-resource</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <!-- Databindings -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-databinding-json</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <!-- Hosts -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <!-- Implementation types -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-resource-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-script-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-widget-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-

-</project>

diff --git a/java/sca-contrib/features/webapp/pom.xml b/java/sca-contrib/features/webapp/pom.xml
deleted file mode 100644
index 1e2af4b9ec..0000000000
--- a/java/sca-contrib/features/webapp/pom.xml
+++ /dev/null
@@ -1,53 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-feature</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-feature-webapp</artifactId>
-    <name>Apache Tuscany SCA Webapp Feature</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- Core feature -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-core</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- host support -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/itest/admin/README b/java/sca-contrib/itest/admin/README
deleted file mode 100644
index c4e96d7af0..0000000000
--- a/java/sca-contrib/itest/admin/README
+++ /dev/null
@@ -1,28 +0,0 @@
-This is a simple test compiled to test simple features of  SCA

-

-There are interfaces to different services that have been included

-

-1. MyListService

-2. MyListServiceByYear

-3. MyService

-4. MyServiceByDate

-5. MyTotalservice

-

-The service that has been used in the tests primarily is MyService/MyTotalService.

-in the test cases.

-

-There are three test cases and three composites (MySimppleService,Iteration1,Iteration3).

-

-1. MySimpleServiceTestCase            - Checks if the components in MySimpleService.composite are initialized properly. 

-                                        It tries to call simple functions implemented in MySimpleServiceImpl.

-                             

-2. MyTotalServiceTestCase             - Initializes the components in the Iteration3Composite.composite file.

-                                        tries to call simple functions implemented in MyTotalServiceImpl.

-                             

-3. MySimpleServiceInRecursiveTestCase - Initializes the components in the  Iteration1Composite.composite file.

-                                        It initializes its components using implementation:composite tag in the 

-                                        composite file which points to MySimpleService.composite.

-                                        The test case recursively calls functions initialized in MySimpleService.composite.

-                                        

-

-                                        

diff --git a/java/sca-contrib/itest/admin/pom.xml b/java/sca-contrib/itest/admin/pom.xml
deleted file mode 100644
index e179926bf1..0000000000
--- a/java/sca-contrib/itest/admin/pom.xml
+++ /dev/null
@@ -1,60 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-itest-admin</artifactId>

-    <name>Apache Tuscany Admin Tests</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-core-databinding</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-databinding-sdo</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>compile</scope>

-        </dependency>

-    </dependencies>

-    

-</project>

diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java b/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
deleted file mode 100644
index f081537dab..0000000000
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface MyListService {

-	String[] getHolidays();

-    String getYear();

-}

diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java b/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
deleted file mode 100644
index b4224e286e..0000000000
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface MyListServiceByYear {

-	String[] getHolidays(int year);

-}

diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java b/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
deleted file mode 100644
index 550303d856..0000000000
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-

-import java.util.List;

-

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-import org.apache.tuscany.sca.itest.admin.MyListService;

-import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;

-

-@Service(interfaces={MyListService.class,MyListServiceByYear.class})

-

-public class MyListServiceImpl implements MyListService,MyListServiceByYear

-{

-

-    // This is multiplicity=1:n

-    @Reference(name="myListServiceList",required=true)

-    public List<MyListService> myListServicesList;

-

-    // This is multiplicity=0:n

-    @Reference(name="myListServiceArray",required=false)

-    public MyListService[] myListServicesArray;

-    

-    @Property(name="serviceYear")

-    protected String year = "2006";

-    

-    public String[] getHolidays()

-    {

-        return getHolidays(new Integer(year).intValue());

-    }

-

-    public String[] getHolidays(int year)

-    {

-        MyListService myService;

-        if (myListServicesList!=null)

-        {

-            for (int i=0; i<myListServicesList.size(); i++)

-            {

-                myService=myListServicesList.get(i);

-                if(new Integer(myService.getYear()).intValue()==year)

-                {

-                    return myService.getHolidays();

-                }

-            }

-        }

-        if (myListServicesArray!=null)

-        {

-            for (int i=0; i<myListServicesArray.length; i++)

-            {

-                myService=myListServicesArray[i];

-                if(new Integer(myService.getYear()).intValue()==year)

-                {

-                    return myService.getHolidays();

-                }

-            }

-        }

-        return null;

-    }

-

-    public String getYear()

-    {

-        return year;

-    }

-    

-    

-    

-}

diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java b/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
deleted file mode 100644
index 8ff146b630..0000000000
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import java.io.PrintStream;

-

-public class MyLogger {

-

-	private PrintStream outStream;

-

-	public MyLogger(PrintStream out) {

-		this.outStream = out;

-	}

-	

-	public void println(String text) {

-		outStream.println("MyLog: " + text);

-	}

-

-}

diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java b/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
deleted file mode 100644
index 638c6aff8c..0000000000
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import java.util.Date;

-

-public interface MyService  extends SCAComponentService{

-    Date nextHoliday();

-    String getLocation();

-    String getYear();

-}

diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java b/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
deleted file mode 100644
index 344d0cb6b5..0000000000
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import java.util.Date;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface MyServiceByDate {

-	Date nextHoliday(Date date);

-}

diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java b/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
deleted file mode 100644
index 9789726156..0000000000
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import java.util.Date;

-

-import org.oasisopen.sca.annotation.ComponentName;

-import org.oasisopen.sca.annotation.Destroy;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Service;

-import org.apache.tuscany.sca.itest.admin.MyListService;

-import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;

-import org.apache.tuscany.sca.itest.admin.MyLogger;

-import org.apache.tuscany.sca.itest.admin.MyService;

-import org.apache.tuscany.sca.itest.admin.MyServiceByDate;

-

-

-@Service(interfaces={MyService.class, MyServiceByDate.class, MyListService.class, MyListServiceByYear.class})

-

-public class MyServiceImpl implements MyService, MyServiceByDate, MyListService, MyListServiceByYear{

-	static String[][] holidays = {{"2006/01/02","2006/05/29","2006/07/03","2006/07/04","2006/09/04","2006/11/23",

-	"2006/11/23","2006/11/24", "2006/12/25"},{"2007/01/01","2007/05/28","2007/07/04","2007/09/03","2007/11/22",

-        "2007/11/23","2007/12/25"},{"2006/01/02","2006/05/29","2006/07/03","2006/07/04","2006/09/04","2006/11/23",

-            "2006/11/23","2006/11/24", "2006/12/25"},{"2007/01/01","2007/05/28","2007/07/04","2007/09/03","2007/11/22",

-                "2007/11/23","2007/12/25"}};

-	

-	@Property(name="location")

-	protected String location = "RTP";

-

-    @Property(name="year")

-    protected String year = "2006";

-    

-

-    private String componentName;

-    

-

-    private MyLogger logger;

-

-	public MyServiceImpl()

-	{

-	    logger = new MyLogger(System.out);

-	    logger.println("creating service instance...");

-	}

-    

-	public Date nextHoliday() {

-        

-        return nextHoliday(new Date());

-	}

-

-    

-	public Date nextHoliday(Date today)

-    {

-        Date d1;

-        String[] days = getHolidays();

-        for (int j=0; j<days.length; j++)

-        {

-            d1 = new Date(days[j]);

-            if (d1.after(today))

-               return d1;

-        }

-        return null;

-    }

-

-    

-    public String[] getHolidays(int year)

-    {

-        int index = year -2006;

-        if (index>=0  && index<holidays.length)

-            return holidays[index];

-        return null;

-    }

-

-    public String[] getHolidays()

-    {

-        

-        Integer theYear;

-        if (year ==null || year.length()==0)

-            theYear = new Integer("2006");

-        else

-            theYear = new Integer(year);

-        

-        return getHolidays(theYear.intValue());

-    }

-

-    @Init

-	public void start()

-	{

-		logger.println("Start service..");

-	}

-

-	@Destroy

-	public void stop()

-	{

-		logger.println("Stop service..");

-		

-	}

-

-    public String getComponentName()

-    {

-        return componentName;

-    }

-

- 

-    public String getLocation()

-    {

-       return location;

-    }

-

-    public String getYear()

-    {

-        return year;

-    }

-	

-}

diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java b/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
deleted file mode 100644
index eec64fa0d8..0000000000
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-public interface MyTotalService extends MyListService, MyListServiceByYear, MyService, MyServiceByDate

-{

-

-}

diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java b/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
deleted file mode 100644
index dbb190beee..0000000000
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import java.util.Date;

-

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-import org.oasisopen.sca.annotation.ComponentName;

-import org.apache.tuscany.sca.itest.admin.MyListService;

-import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;

-import org.apache.tuscany.sca.itest.admin.MyService;

-import org.apache.tuscany.sca.itest.admin.MyServiceByDate;

-import org.apache.tuscany.sca.itest.admin.MyTotalService;

-

-@Service(MyTotalService.class)

-

-public class MyTotalServiceImpl implements MyTotalService

-{

-

-    // This is multiplicity=1:1

-    @Reference(required=true)

-    public MyListService myListService;

-    

-    // default required==true so it is 1:1

-    @Reference (required=false)

-    public MyListServiceByYear myListServiceByYear = new MyServiceImpl();

-    

-    // default required==true so it is 1:1

-    @Reference

-    public MyService myService;

-    

-    // This is multiplicity=0:1 

-    @Reference(required=false)

-    public MyServiceByDate myServiceByDate = new MyServiceImpl();

-	

-	   @ComponentName

-    private String componentName;

-

-    public String[] getHolidays()

-    {

-        return myListService.getHolidays();

-    }

-

-    public String[] getHolidays(int year)

-    {

-        return myListServiceByYear.getHolidays(year);

-    }

-

-    

-    public Date nextHoliday(Date date)

-    {

-        return myServiceByDate.nextHoliday(date);

-    }

-

-    public String getLocation()

-    {

-        return myService.getLocation();

-    }

-

-    public String getYear()

-    {

-        return myService.getYear();

-    }

-	

-	  public String getComponentName()

-    {

-        return componentName;

-    }

-

-    public Date nextHoliday()

-    {

-        return myService.nextHoliday();

-    }

-}

diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java b/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
deleted file mode 100644
index 42fa3f0c41..0000000000
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-

-

-public interface SCAComponentService

-{

-    String getComponentName();

-

-}

diff --git a/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java b/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
deleted file mode 100644
index bcf4153064..0000000000
--- a/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import static junit.framework.Assert.assertEquals;

-

-import org.apache.tuscany.sca.itest.admin.MyService;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-

-

-public class MySimpleServiceInRecursiveTestCase

-{

-    private static MyService myServiceOrg;

-    private static MyService myServiceAnother;

-    private static MyService myServiceCary;

-

-    private static SCADomain domain;

-

-    

-    @Test

-    public void testPropertyDefault()

-    {

-        assertEquals("RTP",myServiceOrg.getLocation());

-        assertEquals("2006",myServiceOrg.getYear());

-    }

-

-   

-    @Test

-    public void testPropertyOverrideValue()

-    {

-        assertEquals("CARY",myServiceCary.getLocation());

-        assertEquals("2007",myServiceCary.getYear());

-    }

-

-   

-    @Test

-    public void testPropertyOverrideVariable()

-    {

-        assertEquals("Durham",myServiceAnother.getLocation());

-        assertEquals("2009",myServiceAnother.getYear());

-    }

-

-

-    @BeforeClass

-    public static void init() throws Exception {

-        try {

-        domain = SCADomain.newInstance("Iteration1Composite.composite");

-        } catch ( Exception e ) { e.printStackTrace(); }

-        

-        myServiceOrg = domain.getService(MyService.class, "MySimpleServiceInRecursive/MyServiceOrig1");

-        myServiceCary = domain.getService(MyService.class, "MySimpleServiceInRecursive/MyServiceCary1");

-        myServiceAnother = domain.getService(MyService.class, "MySimpleServiceInRecursiveAnother/MyServiceNew1");

-    }

-	

-	@AfterClass

-    public static void destroy() throws Exception {

-        domain.close();

-    }

-}

diff --git a/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java b/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
deleted file mode 100644
index 747f71576c..0000000000
--- a/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import static junit.framework.Assert.assertEquals;

-

-import org.apache.tuscany.sca.itest.admin.MyService;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class MySimpleServiceTestCase

-{

-    private static SCADomain domain;

-    private static MyService myServiceOrg;

-    private static MyService myServiceNew;

-    private static MyService myServiceCary;

-

-	@Test

-    public void testPropertyDefault()

-    {

-        assertEquals("RTP",myServiceOrg.getLocation());

-        assertEquals("2006",myServiceOrg.getYear());

-    }

-

-   

-	 @Test 

-    public void testPropertyOverrideWithValue()

-    {

-        assertEquals("CARY",myServiceCary.getLocation());

-        assertEquals("2007",myServiceCary.getYear());

-    }

-

-    

-	 @Test 

-    public void testPropertyOverrideWithVariable()

-    {

-        assertEquals("Raleigh",myServiceNew.getLocation());

-        assertEquals("2008",myServiceNew.getYear());

-    }

-

-  

-    @BeforeClass

-    public static void init() throws Exception {

-        try {

-        domain = SCADomain.newInstance("MySimpleService.composite");

-        } catch ( Exception e ) { System.out.println("Could not initialize " + e.toString());

-                                e.printStackTrace(); }

-        myServiceOrg = domain.getService(MyService.class, "MyServiceComponentOrig/MyService");

-        myServiceCary = domain.getService(MyService.class, "MyServiceComponentCary2007/MyService");

-		myServiceNew = domain.getService(MyService.class, "MyServiceComponentNew/MyService");

-    }

-	

-    @AfterClass

-    public static void destroy() throws Exception {

-        domain.close();

-    }  

-}

diff --git a/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java b/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
deleted file mode 100644
index 6c2dffb7b4..0000000000
--- a/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import static junit.framework.Assert.assertEquals;

-

-import org.apache.tuscany.sca.itest.admin.MyTotalService;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class MyTotalServiceTestCase

-{

-    private static MyTotalService myTotalServiceOrg;

-    private static MyTotalService myTotalServiceNew;

-

-   private static SCADomain domain;

-

-	 @Test

-    public void testPropertyDefault()

-    {

-        assertEquals("RTP",myTotalServiceOrg.getLocation());

-        assertEquals("2006",myTotalServiceOrg.getYear());

-    }

-

-    

-	 @Test

-    public void testPropertyOverrideVariable()

-    {

-        assertEquals("Raleigh",myTotalServiceNew.getLocation());

-        assertEquals("2008",myTotalServiceNew.getYear());

-    }

-

-  

-    @BeforeClass

-    public static void init() throws Exception {

-        try {

-        domain = SCADomain.newInstance("Iteration3Composite.composite");

-        } catch ( Exception e ) { e.printStackTrace(); }

-		

-        myTotalServiceOrg =domain.getService(MyTotalService.class, "MyTotalServiceComponent");

-        myTotalServiceNew=domain.getService(MyTotalService.class, "MyTotalServiceNewComponent");

-    }

-	

-    @AfterClass

-    public static void destroy() throws Exception {

-        domain.close();

-    }

-}

diff --git a/java/sca-contrib/itest/admin/src/test/resources/Iteration1Composite.composite b/java/sca-contrib/itest/admin/src/test/resources/Iteration1Composite.composite
deleted file mode 100644
index 95dbbf0124..0000000000
--- a/java/sca-contrib/itest/admin/src/test/resources/Iteration1Composite.composite
+++ /dev/null
@@ -1,43 +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" 

-       xmlns:cust="http://www.example.com/Customer"

-       xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"

-       targetNamespace="http://foo"

-           name="Iteration1Composite" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-

-	<property name="newLocation" type="xs:anyURI">Raleigh</property>

-	<property name="newYear" type="xs:anyURI">2008</property>

-

-	<property name="anotherLocation" type="xs:anyURI">Durham</property>

-	<property name="anotherYear" type="xs:anyURI">2009</property>

-

-    <component name="MySimpleServiceInRecursive">

-        <implementation.composite name="foo:MySimpleService"/>

-    </component>

-

-    <component name="MySimpleServiceInRecursiveAnother">

-        <implementation.composite name="foo:MySimpleService"/>

-        <property name="newLocation">Durham</property>

-        <property name="newYear">2009</property>   

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/admin/src/test/resources/Iteration3Composite.composite b/java/sca-contrib/itest/admin/src/test/resources/Iteration3Composite.composite
deleted file mode 100644
index dd06d030d6..0000000000
--- a/java/sca-contrib/itest/admin/src/test/resources/Iteration3Composite.composite
+++ /dev/null
@@ -1,68 +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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osoa.org/xmlns/sca/1.0"

-    xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" name="Iteration3Composite"

-    targetNamespace="http://foo" local="true" autowire="false" requires="cns:confidentiality"

-    policySets="sns:secure">

-  <property name="newLocation" type="anyURI">Raleigh</property>

-  <property name="newYear" type="anyURI">2008</property>

- 

- <component name="MyServiceComponentOrig">

-    <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>

-  </component>

- 

- <component name="MyServiceComponentCary2007">

-    <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>

-    <property name="location">CARY</property>

-    <property name="year">2007</property>

-  </component>

- 

- <component name="MyServiceComponentNew">

-    <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>

-    <property name="location" source="$newLocation"/>

-    <property name="year" source="$newYear"/>

-  </component>

- 

- <component name="MyTotalServiceComponent">

-    <implementation.java class="org.apache.tuscany.sca.itest.admin.MyTotalServiceImpl"/>

-    <reference name="myService" target="MyServiceComponentOrig/MyService"/>

-    <reference name="myListService" target="MyServiceComponentOrig/MyListService"/>

-  </component>

- 

- <component name="MyTotalServiceNewComponent">

-    <implementation.java class="org.apache.tuscany.sca.itest.admin.MyTotalServiceImpl"/>

-    <reference name="myService" target="MyServiceComponentNew/MyService"/>

-    <reference name="myListService" target="MyServiceComponentNew/MyListService"/>

-  </component>

-  

-  <property name="anotherLocation" type="anyURI">Durham</property>

-  <property name="anotherYear" type="anyURI">2009</property>

- 

- <component name="MySimpleServiceInRecursive">

-    <implementation.composite name="foo:MySimpleService"/>

-  </component>

-  

-  <component name="MySimpleServiceInRecursiveAnother">

-    <implementation.composite name="foo:MySimpleService"/>

-    <property name="newLocation">Durham</property>

-    <property name="newYear">2009</property>

-  </component>

-</composite>

diff --git a/java/sca-contrib/itest/admin/src/test/resources/MySimpleService.composite b/java/sca-contrib/itest/admin/src/test/resources/MySimpleService.composite
deleted file mode 100644
index a1f8abb8da..0000000000
--- a/java/sca-contrib/itest/admin/src/test/resources/MySimpleService.composite
+++ /dev/null
@@ -1,59 +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" 

-       xmlns:cust="http://www.example.com/Customer"

-       xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"

-       targetNamespace="http://foo"

-           name="MySimpleService" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-

-    <service name="MyServiceCary1" promote="MyServiceComponentCary2007/MyService">

-        <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>

-    </service>

-

-    <service name="MyServiceOrig1" promote="MyServiceComponentOrig/MyService">

-        <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>

-    </service>

-

-    <service name="MyServiceNew1" promote="MyServiceComponentNew/MyService">

-        <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>

-    </service>

-

-	<property name="newLocation" type="anyURI">Raleigh</property>

-	<property name="newYear" type="anyURI">2008</property>

-

-    <component name="MyServiceComponentOrig">

-        <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>

-    </component>

-	

-    <component name="MyServiceComponentCary2007">

-        <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>

-		<property name="location">CARY</property>

-		<property name="year">2007</property>

-    </component>

-

-    <component name="MyServiceComponentNew">

-        <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>

-        <property name="location" source="$newLocation"/>

-		<property name="year" source="$newYear"/>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/itest/binding-sca-jms/client/pom.xml b/java/sca-contrib/itest/binding-sca-jms/client/pom.xml
deleted file mode 100644
index 2e24179309..0000000000
--- a/java/sca-contrib/itest/binding-sca-jms/client/pom.xml
+++ /dev/null
@@ -1,63 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-binidng-sca-jms</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-binding-sca-jms-client</artifactId>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca-jms</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-        <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java b/java/sca-contrib/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
deleted file mode 100644
index 3a546dcf72..0000000000
--- a/java/sca-contrib/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.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 itest;

-

-import org.oasisopen.sca.annotation.Reference;

-

-public class MyClientImpl implements MyService {

-

-    @Reference public MyService delegate;

-    

-    public String sayHello(String s) {

-        return "Hi " + delegate.sayHello(s);

-    }

-

-}

diff --git a/java/sca-contrib/itest/binding-sca-jms/client/src/main/java/itest/MyService.java b/java/sca-contrib/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
deleted file mode 100644
index b1daa53c86..0000000000
--- a/java/sca-contrib/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
+++ /dev/null
@@ -1,28 +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 itest;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface MyService {

-

-    String sayHello(String s);

-}

diff --git a/java/sca-contrib/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 8c311553c3..0000000000
--- a/java/sca-contrib/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:CalculatorC"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/binding-sca-jms/client/src/main/resources/MyClient.composite b/java/sca-contrib/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
deleted file mode 100644
index 81aa3ed98d..0000000000
--- a/java/sca-contrib/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
+++ /dev/null
@@ -1,29 +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://itest"

-           name="MyService">

-

-    <component name="MyClientComponent">

-        <implementation.java class="itest.MyClientImpl" />

-        <reference name="delegate" target="MyServiceComponent" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java b/java/sca-contrib/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
deleted file mode 100644
index 5c56dbaf84..0000000000
--- a/java/sca-contrib/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package itest;

-

-

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

-import org.junit.Test;

-

-/**

- * Runs a distributed domain in a single VM by using and in memory 

- * implementation of the distributed domain

- */

-public class MyClientTestCase {

-

-    @Test

-    public void testCalculator() throws Exception {       

-        

-        SCANode serviceNode = SCANodeFactory.newInstance().createSCANode("MyService.composite", new SCAContribution("bla2", "../service/target/itest-binding-sca-jms-service.jar"));

-        

-        SCANode clientNode = SCANodeFactory.newInstance().createSCANodeFromClassLoader("MyClient.composite", null);

-        try {

-

-            serviceNode.start();

-            clientNode.start();

-

-            MyService service = ((SCAClient)clientNode).getService(MyService.class, "MyClientComponent");

-

-            Assert.assertEquals("Hi Hello petra", service.sayHello("petra"));

-

-        } finally {

-            clientNode.stop();

-            serviceNode.stop();

-        }

-    }

-}

diff --git a/java/sca-contrib/itest/binding-sca-jms/pom.xml b/java/sca-contrib/itest/binding-sca-jms/pom.xml
deleted file mode 100644
index 9da74604f5..0000000000
--- a/java/sca-contrib/itest/binding-sca-jms/pom.xml
+++ /dev/null
@@ -1,36 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-binidng-sca-jms</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA JMS SCA Binding Integration Tests</name>

-

-    <modules>

-       <module>service</module>

-       <module>client</module>

-    </modules>

-</project>

diff --git a/java/sca-contrib/itest/binding-sca-jms/service/pom.xml b/java/sca-contrib/itest/binding-sca-jms/service/pom.xml
deleted file mode 100644
index 5b0677b0e6..0000000000
--- a/java/sca-contrib/itest/binding-sca-jms/service/pom.xml
+++ /dev/null
@@ -1,63 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-binidng-sca-jms</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-binding-sca-jms-service</artifactId>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca-jms</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-        <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/itest/binding-sca-jms/service/src/main/java/itest/MyService.java b/java/sca-contrib/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
deleted file mode 100644
index b1daa53c86..0000000000
--- a/java/sca-contrib/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
+++ /dev/null
@@ -1,28 +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 itest;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface MyService {

-

-    String sayHello(String s);

-}

diff --git a/java/sca-contrib/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java b/java/sca-contrib/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
deleted file mode 100644
index d0f8dcc393..0000000000
--- a/java/sca-contrib/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
+++ /dev/null
@@ -1,28 +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 itest;

-

-public class MyServiceImpl implements MyService {

-

-    public String sayHello(String s) {

-        return "Hello " + s;

-    }

-

-}

diff --git a/java/sca-contrib/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 8c311553c3..0000000000
--- a/java/sca-contrib/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:CalculatorC"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/binding-sca-jms/service/src/main/resources/MyService.composite b/java/sca-contrib/itest/binding-sca-jms/service/src/main/resources/MyService.composite
deleted file mode 100644
index 03ac786809..0000000000
--- a/java/sca-contrib/itest/binding-sca-jms/service/src/main/resources/MyService.composite
+++ /dev/null
@@ -1,28 +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://itest"

-           name="MyService">

-

-    <component name="MyServiceComponent">

-        <implementation.java class="itest.MyServiceImpl" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java b/java/sca-contrib/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
deleted file mode 100644
index cb79ae050a..0000000000
--- a/java/sca-contrib/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package itest;

-

-

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

-import org.junit.Test;

-

-/**

- * Runs a distributed domain in a single VM by using and in memory 

- * implementation of the distributed domain

- */

-public class MyServiceTestCase {

-

-    @Test

-    public void testCalculator() throws Exception {       

-        

-        SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("MyService.composite", null);

-        try {

-

-            node.start();

-

-            MyService service = ((SCAClient)node).getService(MyService.class, "MyServiceComponent");

-

-            Assert.assertEquals("Hello petra", service.sayHello("petra"));

-

-        } finally {

-            node.stop();

-        }

-    }

-}

diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/pom.xml b/java/sca-contrib/itest/bpel/helloworld-reference/pom.xml
deleted file mode 100644
index 1e662708d7..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/pom.xml
+++ /dev/null
@@ -1,210 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-bpel</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-bpel-helloworld-reference</artifactId>
-    <name>Apache Tuscany SCA HelloWorld Reference BPEL iTest</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-			<version>1.1</version>
-			<type>zip</type>
-		</dependency>
-		
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-		<dependency>
-		    <groupId>xerces</groupId>
-		    <artifactId>xercesImpl</artifactId>
-		    <version>2.8.0</version>
-		</dependency>	
-		        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <finalName>${artifactId}</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-                <!--  http://jira.codehaus.org/browse/SUREFIRE-322 -->
-                <version>2.3.1</version>
-				<configuration>
-					<useFile>false</useFile>
-					<trimStackTrace>false</trimStackTrace>
-					<useSystemClassLoader>true</useSystemClassLoader>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.apache.ode</groupId>
-									<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-									<version>1.1</version>
-									<type>zip</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>			
-			<!-- 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack</id>
-						<phase>test-compile</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.apache.ode</groupId>
-									<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-									<version>1.1</version>
-									<type>zip</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.1.1</version>
-				<executions>
-					<execution>
-						<id>generate-bpel-helloworld</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<schemaFile>${basedir}/src/test/resources/helloworld/helloworld.wsdl</schemaFile>
-							<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>
-							<prefix>HelloWorld</prefix>
-							<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>2.0-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<configuration>
-							<wsdlFiles>
-								<wsdlFile>
-									<fileName>${basedir}/src/test/resources/helloworld/helloworld.wsdl</fileName>
-								</wsdlFile>
-							</wsdlFiles>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			-->
-		</plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
deleted file mode 100644
index d7dff093f9..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.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 greetings;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface GreetingsService {
-
-    public String getGreetings(String name);
-}
-
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
deleted file mode 100644
index 5ecf5494be..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
+++ /dev/null
@@ -1,33 +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 greetings;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(GreetingsService.class)
-public class GreetingsServiceImpl implements GreetingsService {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
deleted file mode 100644
index 8dea2715bf..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
+++ /dev/null
@@ -1,60 +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 greetings;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the Greetings service
- * 
- * @version $Rev$ $Date$
- */
-public class GreetingsTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    GreetingsService greetingsService = null;
-    
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("greetings/greetings.composite");
-        greetingsService = scaDomain.getService(GreetingsService.class, "GreetingsServiceComponent");
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testInvoke() {
-        String response = greetingsService.getGreetings("Luciano");
-        assertEquals("Hello Luciano", response);
-    }
-}
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
deleted file mode 100644
index f46893481b..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,29 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    public String hello(String name);
-}
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index a687534bb2..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,47 +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 helloworld;
-
-import greetings.GreetingsService;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * The HelloWorld service implementation
- */
-public class HelloWorldServiceImpl implements HelloWorldService {
-   
-    protected GreetingsService greetingsService;
-
-    public GreetingsService getGreetingsService() {
-        System.out.println("Got Injected greetingsService");
-        return greetingsService;
-    }
-
-    @Reference
-    public void setGreetingsService(GreetingsService greetingsService) {
-        System.out.println("Injected greetingsService");
-        this.greetingsService = greetingsService;
-    }
-    
-    public String hello(String name) {
-        System.out.println("Calling greeting services getGreetings");
-        return greetingsService.getGreetings(name);
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index bdfedee2f8..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.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 helloworld;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL Helloworld Service
- * 
- * @version $Rev$ $Date$
- */
-public class HelloWorldTestCase extends TestCase {
-    private SCADomain scaDomain;
-    
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("helloworld/helloworld.composite");
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-    
-    public void testServiceInvocation() {
-        HelloWorldService bpelService = scaDomain.getService(HelloWorldService.class, "HelloWorldService");
-        String response = bpelService.hello("Luciano");
-        assertEquals("Hello Luciano", response);
-    }
-}
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
deleted file mode 100644
index dfec43e8e1..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
+++ /dev/null
@@ -1,32 +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://greetings"
-	xmlns:hw="http://greetings"
-    name="greetings">
-
-    <component name="GreetingsServiceComponent">
-        <implementation.java class="greetings.GreetingsServiceImpl" />
-	    <service name="GreetingsService">
-	    	<interface.wsdl interface="http://greetings#wsdl.interface(Greetings)" />
-	    </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
deleted file mode 100644
index e768707ccd..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
+++ /dev/null
@@ -1,87 +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 name="greetings"
-    targetNamespace="http://greetings" 
-    xmlns:tns="http://greetings" 
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://greetings" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="Greetings">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="GreetingsSoapBinding" type="tns:Greetings">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="GreetingsService">
-        <wsdl:port name="GreetingsSoapPort" binding="tns:GreetingsSoapBinding">
-            <wsdlsoap:address location="http://localhost:8085/GreetingsServiceComponent"/>
-        </wsdl:port>
-    </wsdl:service>
-
-    <plnk:partnerLinkType name="GreetingsPartnerLinkType">
-        <plnk:role name="Provider" portType="tns:Greetings"/>
-    </plnk:partnerLinkType>
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
deleted file mode 100644
index 25d676bcfc..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
+++ /dev/null
@@ -1,35 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://helloworld"
-	xmlns:helloworld="http://helloworld"
-	xmlns:greetings="http://greetings"
-	xmlns:tus="http://tuscany.apache.org">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="tus:helloPartnerLink" port="HelloWorld"/>
-		</provide>
-		<invoke partnerLink="greetingsPartnerLink">
-			<service name="tus:greetingsPartnerLink" port="Greetings"/>
-		</invoke>
-	</process>
-</deploy>
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
deleted file mode 100644
index 5ec2cc9f2e..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
+++ /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.
-  -->
-<process name="HelloWorld"
-    targetNamespace="http://helloworld"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://helloworld"    
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:helloworld="http://helloworld"

-    xmlns:greetings="http://greetings"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
-     namespace="http://helloworld"/>
-

-  <import location="../greetings/greetings.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"

-     namespace="http://greetings"/>

-
-   <partnerLinks>
-      <partnerLink name="helloPartnerLink" partnerLinkType="helloworld:HelloPartnerLinkType" myRole="me" />

-      <partnerLink name="greetingsPartnerLink" partnerLinkType="greetings:GreetingsPartnerLinkType" partnerRole="Provider" initializePartnerRole="yes" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="helloMessage" messageType="helloworld:HelloMessage"/>

-     <variable name="helloResponse" messageType="helloworld:HelloMessage"/>

-     <variable name="greetingsRequest" messageType="greetings:getGreetingsRequest"/>

-     <variable name="greetingsResponse" messageType="greetings:getGreetingsResponse"/>

-   </variables>
-
-   <sequence>
-       <receive
-          name="start"

-          createInstance="yes"
-          operation="hello"

-          variable="helloMessage"

-          partnerLink="helloPartnerLink"
-          portType="helloworld:HelloWorld" />
-

-       <assign name="assignToGreetingsRequest">

-          <copy>

-              <from>$helloMessage.TestPart</from>

-              <to>$greetingsRequest.parameters</to>

-          </copy>

-       </assign>

-
-      <invoke name="invokeGreetings"

-              operation="getGreetings"

-              inputVariable="greetingsRequest"

-              outputVariable="greetingsResponse"

-              partnerLink="greetingsPartnerLink"

-              portType="greetings:Greetings" />

-

-       <assign name="assignToHelloResponse">

-          <copy>

-              <from>$greetingsResponse.parameters/greetings:getGreetingsReturn</from>

-              <to>$helloResponse.TestPart</to>

-          </copy>

-       </assign>

-

-       <reply name="end"  

-              operation="hello"
-              partnerLink="helloPartnerLink"
-              portType="helloworld:HelloWorld" 
-              variable="helloResponse"/>
-   </sequence>
-</process>
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
deleted file mode 100644
index 13d12e32a0..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-  </service>
-
-  
-  <reference name="greetingsPartnerLink">
-        <interface.wsdl interface="http://greetings#wsdl.interface(Greetings)" />
-  </reference>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index 504e2ccc5d..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
+++ /dev/null
@@ -1,36 +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://bpel"
-    xmlns:hns="http://helloworld"
-    name="helloworld">
-    
-    <component name="HelloWorldService">
-    	<implementation.bpel process="hns:HelloWorld"/>
-    	<reference name="greetingsPartnerLink" target="GreetingsServiceComponent"/>
-    </component>
-    
-    <component name="GreetingsServiceComponent">
-        <implementation.java class="greetings.GreetingsServiceImpl" />
-	    <service name="GreetingsService">
-	    	<interface.wsdl interface="http://greetings#wsdl.interface(Greetings)" />
-	    </service>
-    </component>
-</composite>
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
deleted file mode 100644
index 0f51b96b27..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
+++ /dev/null
@@ -1,82 +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 name="helloworld"
-    targetNamespace="http://helloworld"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:tns="http://helloworld"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-    
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-           targetNamespace="http://helloworld" 
-           xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="hello">
-                <complexType>
-                    <sequence>
-                        <element name="message" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>            
-        </schema>
-    </wsdl:types>
-    
-    <wsdl:message name="HelloMessage">
-        <wsdl:part element="tns:hello" name="TestPart"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="hello">
-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>
-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>
-        </wsdl:operation>    
-    </wsdl:portType>
-    
-
-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="hello">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="TestIn">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="TestOut">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>    
-    
-    <wsdl:service name="HelloWorldService">
-		<wsdl:port name="HelloSoapPort" binding="tns:HelloSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>
-		</wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="HelloPartnerLinkType">
-       <plnk:role name="me" portType="tns:HelloWorld"/>
-       <plnk:role name="you" portType="tns:HelloWorld"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
deleted file mode 100644
index 4e13380e0b..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
+++ /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.
-#
-
-# Set root logger level to WARN and its only appender to CONSOLE
-log4j.rootLogger=OFF, CONSOLE
-
-# log4j properties to work with commandline tools.
-log4j.category.org.mortbay=OFF
-log4j.category.org.hibernate.type=OFF
-log4j.category.org.objectweb=OFF
-log4j.category.org.apache.ode.axis2=OFF
-log4j.category.org.apache.ode.bpel.engine=OFF
-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF
-log4j.category.org.apache.ode.bpel.epr=OFF
-log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG
-
-# Console appender
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/pom.xml b/java/sca-contrib/itest/bpel/helloworld-ws/pom.xml
deleted file mode 100644
index a676177e56..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-ws/pom.xml
+++ /dev/null
@@ -1,176 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-bpel</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-bpel-helloworld-ws</artifactId>
-    <name>Apache Tuscany SCA HelloWorld BPEL iTest</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-		<dependency>
-		    <groupId>xerces</groupId>
-		    <artifactId>xercesImpl</artifactId>
-		    <version>2.8.1</version>
-		</dependency>	
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>   
-				        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <finalName>${artifactId}</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-                                <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
-                                <version>2.3.1</version>
-				<configuration>
-					<useFile>false</useFile>
-					<trimStackTrace>false</trimStackTrace>
-					<useSystemClassLoader>true</useSystemClassLoader>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack</id>
-						<phase>test-compile</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.apache.ode</groupId>
-									<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-									<version>1.1</version>
-									<type>zip</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.1.1</version>
-				<executions>
-					<execution>
-						<id>generate-bpel-helloworld</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<schemaFile>${basedir}/src/test/resources/helloworld/helloworld.wsdl</schemaFile>
-							<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>
-							<prefix>HelloWorld</prefix>
-							<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>2.0-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<configuration>
-							<wsdlFiles>
-								<wsdlFile>
-									<fileName>${basedir}/src/test/resources/helloworld/helloworld.wsdl</fileName>
-								</wsdlFile>
-							</wsdlFiles>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/java/sca-contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
deleted file mode 100644
index 0999e97065..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.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.    
- */
-
-package helloworld;
-
-import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType;
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class HelloWorld {
-    private HelloPortType helloService;
-    
-    public HelloWorld() {
-        super();
-    }
-    
-    @Reference
-    public void setHelloService(HelloPortType helloService){
-        this.helloService = helloService;
-    }
-    
-    public String hello(String hello) throws java.rmi.RemoteException {
-        System.out.println(">>> Invoking helloService.hello with : " + hello);
-        return this.helloService.hello(hello);
-    }
-
-}
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/java/sca-contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index 6971151a77..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
+++ /dev/null
@@ -1,64 +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 helloworld;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL Helloworld Service
- * 
- * @version $Rev$ $Date$
- */
-public class HelloWorldTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("helloworld/helloworld.composite");
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-    
-    public void testPing() throws IOException {
-        new Socket("127.0.0.1", 8085);
-    }
-    
-    public void testServiceInvocation() throws Exception {
-        HelloPortType bpelService = scaDomain.getService(HelloPortType.class, "BPELHelloWorldServiceComponent");
-        String response = bpelService.hello("Hello");
-        assertEquals("Hello World", response);
-    }
-}
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml b/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
deleted file mode 100644
index 9bd95b2c58..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
+++ /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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-	xmlns:tus="http://tuscany.apache.org">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="tus:helloPartnerLink" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
deleted file mode 100644
index 8cf91adc2c..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
+++ /dev/null
@@ -1,66 +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.
-  -->
-<process name="HelloWorld"
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"    
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
-     namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
-
-   <partnerLinks>
-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="helloMessage" messageType="test:HelloMessage"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="hello"
-          variable="helloMessage"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <from variable="helloMessage" part="TestPart"/>
-              <to variable="tmpVar"/>
-          </copy>
-          <copy>
-              <from>concat($tmpVar,' World')</from>
-              <to variable="helloMessage" part="TestPart"/>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="hello"
-              variable="helloMessage"/>
-   </sequence>
-</process>
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType b/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index f864f45613..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
+++ /dev/null
@@ -1,32 +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://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="helloworld">
-    
-    <component name="BPELHelloWorldServiceComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-        <service name="helloPartnerLink">
-        	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-        	<binding.ws uri="http://localhost:8085/HelloPartnerLink" wsdlElement="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.service(HelloService)"/>
-        </service>
-    </component>
-</composite>
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
deleted file mode 100644
index 610bda3cc4..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
+++ /dev/null
@@ -1,82 +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 name="helloworld"
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-    
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-           targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" 
-           xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="hello">
-                <complexType>
-                    <sequence>
-                        <element name="message" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>            
-        </schema>
-    </wsdl:types>
-    
-    <wsdl:message name="HelloMessage">
-        <wsdl:part element="tns:hello" name="TestPart"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="HelloPortType">
-        <wsdl:operation name="hello">
-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>
-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>
-        </wsdl:operation>    
-    </wsdl:portType>
-    
-
-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="hello">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="TestIn">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="TestOut">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>    
-    
-    <wsdl:service name="HelloService">
-		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>
-		</wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="HelloPartnerLinkType">
-       <plnk:role name="me" portType="tns:HelloPortType"/>
-       <plnk:role name="you" portType="tns:HelloPortType"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
deleted file mode 100644
index 37f66e4189..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
+++ /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.
-#
-
-# Set root logger level to WARN and its only appender to CONSOLE

-log4j.rootLogger=OFF, CONSOLE

-

-# log4j properties to work with commandline tools.

-log4j.category.org.mortbay=OFF

-log4j.category.org.hibernate.type=OFF

-log4j.category.org.objectweb=OFF

-log4j.category.org.apache.ode.axis2=OFF

-log4j.category.org.apache.ode.bpel.engine=OFF

-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF

-log4j.category.org.apache.ode.bpel.epr=OFF
-log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG

-

-# Console appender

-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender

-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout

-log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n

diff --git a/java/sca-contrib/itest/bpel/helloworld/pom.xml b/java/sca-contrib/itest/bpel/helloworld/pom.xml
deleted file mode 100644
index 9eae937361..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld/pom.xml
+++ /dev/null
@@ -1,162 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-bpel</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-bpel-helloworld</artifactId>
-    <name>Apache Tuscany SCA HelloWorld BPEL iTest</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-		<dependency>
-		    <groupId>xerces</groupId>
-		    <artifactId>xercesImpl</artifactId>
-		    <version>2.8.1</version>
-		</dependency>	
-		        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <finalName>${artifactId}</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-                                <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
-                                <version>2.3.1</version>
-				<configuration>
-					<useFile>false</useFile>
-					<trimStackTrace>false</trimStackTrace>
-					<useSystemClassLoader>true</useSystemClassLoader>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack</id>
-						<phase>test-compile</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.apache.ode</groupId>
-									<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-									<version>1.1</version>
-									<type>zip</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.1.1</version>
-				<executions>
-					<execution>
-						<id>generate-bpel-helloworld</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<schemaFile>${basedir}/src/test/resources/helloworld/helloworld.wsdl</schemaFile>
-							<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>
-							<prefix>HelloWorld</prefix>
-							<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>2.0-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<configuration>
-							<wsdlFiles>
-								<wsdlFile>
-									<fileName>${basedir}/src/test/resources/helloworld/helloworld.wsdl</fileName>
-								</wsdlFile>
-							</wsdlFiles>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/java/sca-contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
deleted file mode 100644
index 0999e97065..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.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.    
- */
-
-package helloworld;
-
-import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType;
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class HelloWorld {
-    private HelloPortType helloService;
-    
-    public HelloWorld() {
-        super();
-    }
-    
-    @Reference
-    public void setHelloService(HelloPortType helloService){
-        this.helloService = helloService;
-    }
-    
-    public String hello(String hello) throws java.rmi.RemoteException {
-        System.out.println(">>> Invoking helloService.hello with : " + hello);
-        return this.helloService.hello(hello);
-    }
-
-}
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/java/sca-contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index 76fcd35c2d..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
+++ /dev/null
@@ -1,63 +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 helloworld;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL Helloworld Service
- * 
- * @version $Rev$ $Date$
- */
-public class HelloWorldTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("helloworld/helloworld.composite");
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-    
-    public void testServiceInvocation() throws Exception {
-        HelloPortType bpelService = scaDomain.getService(HelloPortType.class, "BPELHelloWorldService");
-        String response = bpelService.hello("Hello");
-        assertEquals("Hello World", response);
-    }
-    
-    public void testReferenceInvocation() throws Exception {
-        HelloWorld bpelService = scaDomain.getService(HelloWorld.class, "BPELHelloWorld");
-        String response = bpelService.hello("Hello");
-        assertEquals("Hello World", response);        
-    }
-}
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml b/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
deleted file mode 100644
index 9bd95b2c58..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
+++ /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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-	xmlns:tus="http://tuscany.apache.org">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="tus:helloPartnerLink" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
deleted file mode 100644
index 8cf91adc2c..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
+++ /dev/null
@@ -1,66 +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.
-  -->
-<process name="HelloWorld"
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"    
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
-     namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
-
-   <partnerLinks>
-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="helloMessage" messageType="test:HelloMessage"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="hello"
-          variable="helloMessage"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <from variable="helloMessage" part="TestPart"/>
-              <to variable="tmpVar"/>
-          </copy>
-          <copy>
-              <from>concat($tmpVar,' World')</from>
-              <to variable="helloMessage" part="TestPart"/>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="hello"
-              variable="helloMessage"/>
-   </sequence>
-</process>
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType b/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index f6b12fb14b..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
+++ /dev/null
@@ -1,36 +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://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="helloworld">
-    
-    <component name="BPELHelloWorld">
-        <implementation.java class="helloworld.HelloWorld"/>
-        <reference name="helloService" target="BPELHelloWorldService">
-            <!--  Workaround for databinding issue -->
-        	<!--  interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" / -->
-        </reference>
-    </component>
-    
-    <component name="BPELHelloWorldService">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-</composite>
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
deleted file mode 100644
index 610bda3cc4..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
+++ /dev/null
@@ -1,82 +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 name="helloworld"
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-    
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-           targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" 
-           xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="hello">
-                <complexType>
-                    <sequence>
-                        <element name="message" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>            
-        </schema>
-    </wsdl:types>
-    
-    <wsdl:message name="HelloMessage">
-        <wsdl:part element="tns:hello" name="TestPart"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="HelloPortType">
-        <wsdl:operation name="hello">
-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>
-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>
-        </wsdl:operation>    
-    </wsdl:portType>
-    
-
-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="hello">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="TestIn">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="TestOut">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>    
-    
-    <wsdl:service name="HelloService">
-		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>
-		</wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="HelloPartnerLinkType">
-       <plnk:role name="me" portType="tns:HelloPortType"/>
-       <plnk:role name="you" portType="tns:HelloPortType"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/log4j.properties b/java/sca-contrib/itest/bpel/helloworld/src/test/resources/log4j.properties
deleted file mode 100644
index 37f66e4189..0000000000
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/log4j.properties
+++ /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.
-#
-
-# Set root logger level to WARN and its only appender to CONSOLE

-log4j.rootLogger=OFF, CONSOLE

-

-# log4j properties to work with commandline tools.

-log4j.category.org.mortbay=OFF

-log4j.category.org.hibernate.type=OFF

-log4j.category.org.objectweb=OFF

-log4j.category.org.apache.ode.axis2=OFF

-log4j.category.org.apache.ode.bpel.engine=OFF

-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF

-log4j.category.org.apache.ode.bpel.epr=OFF
-log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG

-

-# Console appender

-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender

-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout

-log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n

diff --git a/java/sca-contrib/itest/bpel/pom.xml b/java/sca-contrib/itest/bpel/pom.xml
deleted file mode 100644
index d6909735db..0000000000
--- a/java/sca-contrib/itest/bpel/pom.xml
+++ /dev/null
@@ -1,37 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-bpel</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA BPEL Integration Tests</name>
-
-    <modules>
-       <module>helloworld</module>
-       <module>helloworld-ws</module>
-       <module>helloworld-reference</module>
-    </modules>
-</project>
diff --git a/java/sca-contrib/itest/builder/pom.xml b/java/sca-contrib/itest/builder/pom.xml
deleted file mode 100644
index b8dfd95783..0000000000
--- a/java/sca-contrib/itest/builder/pom.xml
+++ /dev/null
@@ -1,99 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-builder</artifactId>

-    <name>Apache Tuscany SCA Builder Integration Test</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-workspace-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>         

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>  

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>  

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-assembly</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-core-databinding</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>xerces</groupId>

-            <artifactId>xercesImpl</artifactId>

-            <version>2.8.1</version>

-            <scope>test</scope>

-        </dependency>

-              

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
deleted file mode 100644
index fb23a4e60f..0000000000
--- a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.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.    

- */

-package org.apache.tuscany.sca.itest.builder;

-

-import java.util.List;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Implementation class for ComponentD.

- * 

- * @version $Rev$ $Date$

- */

-@Service(interfaces={Service3.class, Service3a.class})

-public class ComponentDImpl implements Service3, Service3a {

-

-    @Reference

-    protected Service3a reference3;

-

-    public String getGreetings(String name) {

-        return "Hello, " + name + "!";

-    }

-

-    public String getGreetings2(String name) {

-        return "Goodbye, " + name + "!";

-    }

-

-}

diff --git a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
deleted file mode 100644
index 5ee020e181..0000000000
--- a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
+++ /dev/null
@@ -1,48 +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.itest.builder;

-

-import java.util.List;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Implementation class for ComponentD.

- * 

- * @version $Rev: 678875 $ $Date: 2008-07-22 21:01:07 +0100 (Tue, 22 Jul 2008) $

- */

-@Service(interfaces={Service3.class, Service3a.class})

-public class ComponentDReferenceMultiplicityImpl implements Service3, Service3a {

-

-    @Reference

-    protected Service3a reference3;

-    

-    @Reference

-    protected List<Service3> reference3a;

-

-    public String getGreetings(String name) {

-        return "Hello, " + name + "!";

-    }

-

-    public String getGreetings2(String name) {

-        return "Goodbye, " + name + "!";

-    }

-

-}

diff --git a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
deleted file mode 100644
index 2d8a37d5f0..0000000000
--- a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.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 org.apache.tuscany.sca.itest.builder;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Implementation class for ComponentD.

- * 

- * @version $Rev: 678875 $ $Date: 2008-07-22 21:01:07 +0100 (Tue, 22 Jul 2008) $

- */

-@Service(interfaces={Service3.class})

-public class ComponentEImpl implements Service3 {

-

-

-    public String getGreetings(String name) {

-        return "Hello, " + name + " from ComponentE";

-    }

-}

diff --git a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
deleted file mode 100644
index 4fdaac1fb1..0000000000
--- a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.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 org.apache.tuscany.sca.itest.builder;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Implementation class for ComponentD.

- * 

- * @version $Rev: 678875 $ $Date: 2008-07-22 21:01:07 +0100 (Tue, 22 Jul 2008) $

- */

-@Service(interfaces={Service3.class})

-public class ComponentFImpl implements Service3 {

-

-

-    public String getGreetings(String name) {

-        return "Hello, " + name + " from ComponentF";

-    }

-}

diff --git a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
deleted file mode 100644
index 1feb08b876..0000000000
--- a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
+++ /dev/null
@@ -1,33 +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.itest.builder;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * Interface for Service3 in ComponentD.

- * 

- * @version $Rev$ $Date$

- */

-@Remotable

-public interface Service3 {

-

-    String getGreetings(String name);

-

-}

diff --git a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
deleted file mode 100644
index 3a872376ea..0000000000
--- a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
+++ /dev/null
@@ -1,33 +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.itest.builder;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * Interface for Service3a in ComponentD.

- * 

- * @version $Rev$ $Date$

- */

-@Remotable

-public interface Service3a {

-

-    String getGreetings2(String name);

-

-}

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/java/sca-contrib/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
deleted file mode 100644
index 256d01be58..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://scenario1"

-              xmlns:ns1="http://scenario1">

-    <deployable composite="ns1:CompositeA" />

-</contribution>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario1/scenario1.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario1/scenario1.composite
deleted file mode 100644
index 5c2a98ab40..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario1/scenario1.composite
+++ /dev/null
@@ -1,45 +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://scenario1"

-        xmlns:tns="http://scenario1"

-        name="CompositeA">

-

-    <service name="Service1" promote="ComponentB/Service2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        <binding.ws />

-    </service>

-    <reference name="reference1" promote="ComponentB/reference2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentB">

-        <implementation.composite name="tns:CompositeC" />

-        <service name="Service2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario1/scenario1a.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario1/scenario1a.composite
deleted file mode 100644
index 21b5897aa1..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario1/scenario1a.composite
+++ /dev/null
@@ -1,47 +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://scenario1"

-        xmlns:tns="http://scenario1"

-        name="CompositeC">

-

-    <service name="Service2" promote="ComponentD/Service3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <service name="Service2a" promote="ComponentD/Service3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference2" promote="ComponentD/reference3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentD">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

-        <service name="Service3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/java/sca-contrib/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
deleted file mode 100644
index 083079ba42..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://scenario10"

-              xmlns:ns10="http://scenario10">

-   <deployable composite="ns10:CompositeA" />

-</contribution>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario10/scenario10.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario10/scenario10.composite
deleted file mode 100644
index c24b7f0046..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario10/scenario10.composite
+++ /dev/null
@@ -1,62 +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://scenario10"

-        xmlns:tns="http://scenario10"

-        name="CompositeA">

-

-    <service name="Service1" promote="ComponentB/Service2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference1" promote="ComponentB/reference2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-    <reference name="reference1a" promote="ComponentB/reference2a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>    

-

-    <component name="ComponentB">

-        <implementation.composite name="tns:CompositeC" />

-        <service name="Service2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws uri="http://foo.com/bar" />

-        </service>

-        <reference name="reference2" target="ComponentB/Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws />

-        </reference>

-        <reference name="reference2a" target="ComponentF">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />

-            <binding.ws />

-        </reference>        

-    </component>

-    

-    <component name="ComponentF">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

-        <service name="Service3">

-            <binding.sca />

-            <binding.ws />

-        </service>

-    </component>            

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario10/scenario10a.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario10/scenario10a.composite
deleted file mode 100644
index 27a73d5c41..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario10/scenario10a.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"

-        targetNamespace="http://scenario10"

-        xmlns:tns="http://scenario10"

-        name="CompositeC">

-

-    <service name="Service2" promote="ComponentD/Service3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <service name="Service2a" promote="ComponentD/Service3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference2" promote="ComponentD/reference3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-    <reference name="reference2a" promote="ComponentD/reference3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>    

-

-    <component name="ComponentD">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>

-        <service name="Service3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference3" target="ComponentD/Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-        <reference name="reference3a" target="ComponentE">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>        

-    </component>

-    

-    <component name="ComponentE">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

-        <service name="Service3">

-            <binding.sca />

-            <binding.ws />

-        </service>

-    </component>    

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario10/service3.wsdl b/java/sca-contrib/itest/builder/src/main/resources/scenario10/service3.wsdl
deleted file mode 100644
index 14edcc00e6..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario10/service3.wsdl
+++ /dev/null
@@ -1,63 +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 name="Service3Service"

-                  targetNamespace="http://scenarios"

-                  xmlns:tns="http://scenarios"

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

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

-

-  <wsdl:types>

-    <xs:schema attributeFormDefault="qualified"

-               elementFormDefault="unqualified"

-               targetNamespace="http://scenarios"

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

-      <xs:element name="getGreetings">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-      <xs:element name="getGreetingsResponse">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-    </xs:schema>

-  </wsdl:types>

-

-  <wsdl:message name="getGreetings">

-    <wsdl:part name="getGreetings" element="tns:getGreetings" />

-  </wsdl:message>

-

-  <wsdl:message name="getGreetingsResponse">

-    <wsdl:part name="getGreetingsResponse" element="tns:getGreetingsResponse" />

-  </wsdl:message>

-

-  <wsdl:portType name="Service3">

-    <wsdl:operation name="getGreetings">

-      <wsdl:input message="tns:getGreetings" />

-      <wsdl:output message="tns:getGreetingsResponse" />

-    </wsdl:operation>

-  </wsdl:portType>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/java/sca-contrib/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
deleted file mode 100644
index a6e4b65970..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://scenario11"

-              xmlns:ns11="http://scenario11">

-   <deployable composite="ns11:CompositeA" />

-</contribution>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario11/scenario11.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario11/scenario11.composite
deleted file mode 100644
index 3a94152e6a..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario11/scenario11.composite
+++ /dev/null
@@ -1,59 +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://scenario11"

-        xmlns:tns="http://scenario11"

-        name="CompositeA">

-

-    <service name="Service1" promote="ComponentB/Service2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference1" promote="ComponentB/reference2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-    <reference name="reference1a" promote="ComponentB/reference2a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>    

-

-    <component name="ComponentB">

-        <implementation.composite name="tns:CompositeC" />

-        <service name="Service2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws uri="http://foo.com/bar" />

-        </service>

-        <reference name="reference2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-        <reference name="reference2a" target="ComponentF">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>        

-    </component>

-    

-    <component name="ComponentF">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

-        <service name="Service3">

-            <binding.sca />

-            <binding.ws />

-        </service>

-    </component>            

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario11/scenario11a.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario11/scenario11a.composite
deleted file mode 100644
index 6130c68651..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario11/scenario11a.composite
+++ /dev/null
@@ -1,64 +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://scenario11"

-        xmlns:tns="http://scenario11"

-        name="CompositeC">

-

-    <service name="Service2" promote="ComponentD/Service3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <service name="Service2a" promote="ComponentD/Service3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference2" promote="ComponentD/reference3" target="ComponentB/Service2a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        <binding.ws />

-    </reference>

-    <reference name="reference2a" promote="ComponentD/reference3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />

-        <binding.ws />

-    </reference>    

-

-    <component name="ComponentD">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>

-        <service name="Service3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference3" target="ComponentD/Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-        <reference name="reference3a" target="ComponentE">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>        

-    </component>

-    

-    <component name="ComponentE">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

-        <service name="Service3">

-            <binding.sca />

-            <binding.ws />

-        </service>

-    </component>    

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario11/service3.wsdl b/java/sca-contrib/itest/builder/src/main/resources/scenario11/service3.wsdl
deleted file mode 100644
index 14edcc00e6..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario11/service3.wsdl
+++ /dev/null
@@ -1,63 +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 name="Service3Service"

-                  targetNamespace="http://scenarios"

-                  xmlns:tns="http://scenarios"

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

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

-

-  <wsdl:types>

-    <xs:schema attributeFormDefault="qualified"

-               elementFormDefault="unqualified"

-               targetNamespace="http://scenarios"

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

-      <xs:element name="getGreetings">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-      <xs:element name="getGreetingsResponse">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-    </xs:schema>

-  </wsdl:types>

-

-  <wsdl:message name="getGreetings">

-    <wsdl:part name="getGreetings" element="tns:getGreetings" />

-  </wsdl:message>

-

-  <wsdl:message name="getGreetingsResponse">

-    <wsdl:part name="getGreetingsResponse" element="tns:getGreetingsResponse" />

-  </wsdl:message>

-

-  <wsdl:portType name="Service3">

-    <wsdl:operation name="getGreetings">

-      <wsdl:input message="tns:getGreetings" />

-      <wsdl:output message="tns:getGreetingsResponse" />

-    </wsdl:operation>

-  </wsdl:portType>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/java/sca-contrib/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
deleted file mode 100644
index 125bdc5e53..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://scenario12"

-              xmlns:ns12="http://scenario12">

-   <deployable composite="ns12:CompositeA" />

-</contribution>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario12/scenario12.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario12/scenario12.composite
deleted file mode 100644
index aabd445e23..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario12/scenario12.composite
+++ /dev/null
@@ -1,58 +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://scenario12"

-        xmlns:tns="http://scenario12"

-        name="CompositeA">

-

-    <service name="Service1" promote="ComponentB/Service2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference1" promote="ComponentB/reference2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-    <reference name="reference1a" promote="ComponentB/reference2a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>    

-

-    <component name="ComponentB">

-        <implementation.composite name="tns:CompositeC" />

-        <service name="Service2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-        <reference name="reference2a" target="ComponentF">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>        

-    </component>

-    

-    <component name="ComponentF">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

-        <service name="Service3">

-            <binding.sca />

-            <binding.ws />

-        </service>

-    </component>            

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario12/scenario12a.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario12/scenario12a.composite
deleted file mode 100644
index a2ccc47c28..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario12/scenario12a.composite
+++ /dev/null
@@ -1,64 +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://scenario12"

-        xmlns:tns="http://scenario12"

-        name="CompositeC">

-

-    <service name="Service2" promote="ComponentD/Service3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <service name="Service2a" promote="ComponentD/Service3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference2" promote="ComponentD/reference3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-    <reference name="reference2a" promote="ComponentD/reference3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>    

-

-    <component name="ComponentD">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>

-        <service name="Service3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws uri="http://foo.com/bar" />

-        </service>

-        <reference name="reference3" target="ComponentD/Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws/>

-        </reference>

-        <reference name="reference3a" target="ComponentE">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws />

-        </reference>        

-    </component>

-    

-    <component name="ComponentE">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

-        <service name="Service3">

-            <binding.sca />

-            <binding.ws />

-        </service>

-    </component>    

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/java/sca-contrib/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
deleted file mode 100644
index c906c6c5b0..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://scenario13"

-              xmlns:ns13="http://scenario13">

-   <deployable composite="ns13:CompositeA" />

-</contribution>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario13/scenario13.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario13/scenario13.composite
deleted file mode 100644
index ed59cd2adf..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario13/scenario13.composite
+++ /dev/null
@@ -1,58 +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://scenario13"

-        xmlns:tns="http://scenario13"

-        name="CompositeA">

-

-    <service name="Service1" promote="ComponentB/Service2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference1" promote="ComponentB/reference2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-    <reference name="reference1a" promote="ComponentB/reference2a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>    

-

-    <component name="ComponentB">

-        <implementation.composite name="tns:CompositeC" />

-        <service name="Service2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-        <reference name="reference2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>        

-    </component>

-    

-    <component name="ComponentF">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

-        <service name="Service3">

-            <binding.sca />

-            <binding.ws />

-        </service>

-    </component>            

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario13/scenario13a.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario13/scenario13a.composite
deleted file mode 100644
index 41150f78fd..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario13/scenario13a.composite
+++ /dev/null
@@ -1,64 +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://scenario13"

-        xmlns:tns="http://scenario13"

-        name="CompositeC">

-

-    <service name="Service2" promote="ComponentD/Service3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <service name="Service2a" promote="ComponentD/Service3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference2" promote="ComponentD/reference3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-    <reference name="reference2a" promote="ComponentD/reference3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>    

-

-    <component name="ComponentD">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>

-        <service name="Service3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws uri="http://foo.com/bar" />

-        </service>

-        <reference name="reference3" target="ComponentD/Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws/>

-        </reference>

-        <reference name="reference3a" target="ComponentE">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws />

-        </reference>        

-    </component>

-    

-    <component name="ComponentE">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

-        <service name="Service3">

-            <binding.sca />

-            <binding.ws />

-        </service>

-    </component>    

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/java/sca-contrib/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
deleted file mode 100644
index 6fa901c4df..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://scenario2"

-              xmlns:ns2="http://scenario2">

-    <deployable composite="ns2:CompositeA" />

-</contribution>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario2/scenario2.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario2/scenario2.composite
deleted file mode 100644
index 66f88294ff..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario2/scenario2.composite
+++ /dev/null
@@ -1,45 +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://scenario2"

-        xmlns:tns="http://scenario2"

-        name="CompositeA">

-

-    <service name="Service1" promote="ComponentB/Service2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference1" promote="ComponentB/reference2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentB">

-        <implementation.composite name="tns:CompositeC" />

-        <service name="Service2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws />

-        </service>

-        <service name="Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario2/scenario2a.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario2/scenario2a.composite
deleted file mode 100644
index db1af4743f..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario2/scenario2a.composite
+++ /dev/null
@@ -1,47 +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://scenario2"

-        xmlns:tns="http://scenario2"

-        name="CompositeC">

-

-    <service name="Service2" promote="ComponentD/Service3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <service name="Service2a" promote="ComponentD/Service3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference2" promote="ComponentD/reference3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentD">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

-        <service name="Service3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/java/sca-contrib/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
deleted file mode 100644
index f5899ab1f0..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://scenario3"

-              xmlns:ns3="http://scenario3">

-    <deployable composite="ns3:CompositeA" />

-</contribution>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario3/scenario3.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario3/scenario3.composite
deleted file mode 100644
index 4b37c19e4e..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario3/scenario3.composite
+++ /dev/null
@@ -1,44 +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://scenario3"

-        xmlns:tns="http://scenario3"

-        name="CompositeA">

-

-    <service name="Service1" promote="ComponentB/Service2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference1" promote="ComponentB/reference2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentB">

-        <implementation.composite name="tns:CompositeC" />

-        <service name="Service2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario3/scenario3a.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario3/scenario3a.composite
deleted file mode 100644
index fedd79ff3d..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario3/scenario3a.composite
+++ /dev/null
@@ -1,48 +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://scenario3"

-        xmlns:tns="http://scenario3"

-        name="CompositeC">

-

-    <service name="Service2" promote="ComponentD/Service3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        <binding.ws />

-    </service>

-    <service name="Service2a" promote="ComponentD/Service3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference2" promote="ComponentD/reference3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentD">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

-        <service name="Service3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/java/sca-contrib/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
deleted file mode 100644
index 642245ea7e..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://scenario4"

-              xmlns:ns4="http://scenario4">

-   <deployable composite="ns4:CompositeA" />

-</contribution>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario4/scenario4.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario4/scenario4.composite
deleted file mode 100644
index 1bb876b33d..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario4/scenario4.composite
+++ /dev/null
@@ -1,44 +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://scenario4"

-        xmlns:tns="http://scenario4"

-        name="CompositeA">

-

-    <service name="Service1" promote="ComponentB/Service2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference1" promote="ComponentB/reference2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentB">

-        <implementation.composite name="tns:CompositeC" />

-        <service name="Service2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario4/scenario4a.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario4/scenario4a.composite
deleted file mode 100644
index 55e13700a6..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario4/scenario4a.composite
+++ /dev/null
@@ -1,48 +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://scenario4"

-        xmlns:tns="http://scenario4"

-        name="CompositeC">

-

-    <service name="Service2" promote="ComponentD/Service3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <service name="Service2a" promote="ComponentD/Service3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference2" promote="ComponentD/reference3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentD">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

-        <service name="Service3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws />

-        </service>

-        <service name="Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/java/sca-contrib/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
deleted file mode 100644
index 92da17179f..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://scenario5"

-              xmlns:ns5="http://scenario5">

-   <deployable composite="ns5:CompositeA" />

-</contribution>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenario5.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenario5.composite
deleted file mode 100644
index 403e19b087..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenario5.composite
+++ /dev/null
@@ -1,46 +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://scenario5"

-        xmlns:tns="http://scenario5"

-        name="CompositeA">

-

-    <service name="Service1" promote="ComponentB/Service2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference1" promote="ComponentB/reference2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />

-        <binding.ws uri="http://foo.com/bar" />

-    </reference>

-

-    <component name="ComponentB">

-        <implementation.composite name="tns:CompositeC" />

-        <service name="Service2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenario5a.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenario5a.composite
deleted file mode 100644
index 0e37ded0e4..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenario5a.composite
+++ /dev/null
@@ -1,47 +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://scenario5"

-        xmlns:tns="http://scenario5"

-        name="CompositeC">

-

-    <service name="Service2" promote="ComponentD/Service3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <service name="Service2a" promote="ComponentD/Service3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference2" promote="ComponentD/reference3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentD">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

-        <service name="Service3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenarios.wsdl
deleted file mode 100644
index 7480419231..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenarios.wsdl
+++ /dev/null
@@ -1,63 +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 name="Service3Service"

-                  targetNamespace="http://scenarios"

-                  xmlns:tns="http://scenarios"

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

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

-

-  <wsdl:types>

-    <xs:schema attributeFormDefault="qualified"

-               elementFormDefault="unqualified"

-               targetNamespace="http://scenarios"

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

-      <xs:element name="getGreetings2">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-      <xs:element name="getGreetings2Response">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-    </xs:schema>

-  </wsdl:types>

-

-  <wsdl:message name="getGreetings2">

-    <wsdl:part name="getGreetings2" element="tns:getGreetings2" />

-  </wsdl:message>

-

-  <wsdl:message name="getGreetings2Response">

-    <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />

-  </wsdl:message>

-

-  <wsdl:portType name="Service3a">

-    <wsdl:operation name="getGreetings2">

-      <wsdl:input message="tns:getGreetings2" />

-      <wsdl:output message="tns:getGreetings2Response" />

-    </wsdl:operation>

-  </wsdl:portType>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/java/sca-contrib/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
deleted file mode 100644
index 42d45b0b98..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://scenario6"

-              xmlns:ns6="http://scenario6">

-   <deployable composite="ns6:CompositeA" />

-</contribution>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenario6.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenario6.composite
deleted file mode 100644
index 1c89139905..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenario6.composite
+++ /dev/null
@@ -1,47 +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://scenario6"

-        xmlns:tns="http://scenario6"

-        name="CompositeA">

-

-    <service name="Service1" promote="ComponentB/Service2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference1" promote="ComponentB/reference2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentB">

-        <implementation.composite name="tns:CompositeC" />

-        <service name="Service2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws uri="http://foo.com/bar" />

-        </service>

-        <reference name="reference2" target="ComponentB/Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />

-            <binding.ws />

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenario6a.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenario6a.composite
deleted file mode 100644
index 853703a353..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenario6a.composite
+++ /dev/null
@@ -1,47 +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://scenario6"

-        xmlns:tns="http://scenario6"

-        name="CompositeC">

-

-    <service name="Service2" promote="ComponentD/Service3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <service name="Service2a" promote="ComponentD/Service3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference2" promote="ComponentD/reference3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentD">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

-        <service name="Service3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenarios.wsdl
deleted file mode 100644
index 7480419231..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenarios.wsdl
+++ /dev/null
@@ -1,63 +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 name="Service3Service"

-                  targetNamespace="http://scenarios"

-                  xmlns:tns="http://scenarios"

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

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

-

-  <wsdl:types>

-    <xs:schema attributeFormDefault="qualified"

-               elementFormDefault="unqualified"

-               targetNamespace="http://scenarios"

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

-      <xs:element name="getGreetings2">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-      <xs:element name="getGreetings2Response">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-    </xs:schema>

-  </wsdl:types>

-

-  <wsdl:message name="getGreetings2">

-    <wsdl:part name="getGreetings2" element="tns:getGreetings2" />

-  </wsdl:message>

-

-  <wsdl:message name="getGreetings2Response">

-    <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />

-  </wsdl:message>

-

-  <wsdl:portType name="Service3a">

-    <wsdl:operation name="getGreetings2">

-      <wsdl:input message="tns:getGreetings2" />

-      <wsdl:output message="tns:getGreetings2Response" />

-    </wsdl:operation>

-  </wsdl:portType>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/java/sca-contrib/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
deleted file mode 100644
index 44c471cc65..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://scenario7"

-              xmlns:ns7="http://scenario7">

-   <deployable composite="ns7:CompositeA" />

-</contribution>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenario7.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenario7.composite
deleted file mode 100644
index 6b1ac24cec..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenario7.composite
+++ /dev/null
@@ -1,45 +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://scenario7"

-        xmlns:tns="http://scenario7"

-        name="CompositeA">

-

-    <service name="Service1" promote="ComponentB/Service2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference1" promote="ComponentB/reference2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentB">

-        <implementation.composite name="tns:CompositeC" />

-        <service name="Service2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws uri="http://foo.com/bar" />

-        </service>

-        <reference name="reference2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenario7a.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenario7a.composite
deleted file mode 100644
index 8e0cebbdd5..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenario7a.composite
+++ /dev/null
@@ -1,49 +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://scenario7"

-        xmlns:tns="http://scenario7"

-        name="CompositeC">

-

-    <service name="Service2" promote="ComponentD/Service3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <service name="Service2a" promote="ComponentD/Service3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference2" promote="ComponentD/reference3" target="ComponentB/Service2a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />

-        <binding.ws />

-    </reference>

-

-    <component name="ComponentD">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

-        <service name="Service3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenarios.wsdl
deleted file mode 100644
index 7480419231..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenarios.wsdl
+++ /dev/null
@@ -1,63 +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 name="Service3Service"

-                  targetNamespace="http://scenarios"

-                  xmlns:tns="http://scenarios"

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

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

-

-  <wsdl:types>

-    <xs:schema attributeFormDefault="qualified"

-               elementFormDefault="unqualified"

-               targetNamespace="http://scenarios"

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

-      <xs:element name="getGreetings2">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-      <xs:element name="getGreetings2Response">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-    </xs:schema>

-  </wsdl:types>

-

-  <wsdl:message name="getGreetings2">

-    <wsdl:part name="getGreetings2" element="tns:getGreetings2" />

-  </wsdl:message>

-

-  <wsdl:message name="getGreetings2Response">

-    <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />

-  </wsdl:message>

-

-  <wsdl:portType name="Service3a">

-    <wsdl:operation name="getGreetings2">

-      <wsdl:input message="tns:getGreetings2" />

-      <wsdl:output message="tns:getGreetings2Response" />

-    </wsdl:operation>

-  </wsdl:portType>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/java/sca-contrib/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
deleted file mode 100644
index 7cb09d0a74..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://scenario8"

-              xmlns:ns8="http://scenario8">

-   <deployable composite="ns8:CompositeA" />

-</contribution>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenario8.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenario8.composite
deleted file mode 100644
index 26e5ee33fa..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenario8.composite
+++ /dev/null
@@ -1,44 +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://scenario8"

-        xmlns:tns="http://scenario8"

-        name="CompositeA">

-

-    <service name="Service1" promote="ComponentB/Service2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference1" promote="ComponentB/reference2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentB">

-        <implementation.composite name="tns:CompositeC" />

-        <service name="Service2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenario8a.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenario8a.composite
deleted file mode 100644
index 4fa0712199..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenario8a.composite
+++ /dev/null
@@ -1,50 +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://scenario8"

-        xmlns:tns="http://scenario8"

-        name="CompositeC">

-

-    <service name="Service2" promote="ComponentD/Service3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <service name="Service2a" promote="ComponentD/Service3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference2" promote="ComponentD/reference3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-

-    <component name="ComponentD">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/>

-        <service name="Service3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <binding.ws uri="http://foo.com/bar" />

-        </service>

-        <reference name="reference3" target="ComponentD/Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-            <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" />

-            <binding.ws />

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenarios.wsdl
deleted file mode 100644
index 7480419231..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenarios.wsdl
+++ /dev/null
@@ -1,63 +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 name="Service3Service"

-                  targetNamespace="http://scenarios"

-                  xmlns:tns="http://scenarios"

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

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

-

-  <wsdl:types>

-    <xs:schema attributeFormDefault="qualified"

-               elementFormDefault="unqualified"

-               targetNamespace="http://scenarios"

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

-      <xs:element name="getGreetings2">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-      <xs:element name="getGreetings2Response">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-    </xs:schema>

-  </wsdl:types>

-

-  <wsdl:message name="getGreetings2">

-    <wsdl:part name="getGreetings2" element="tns:getGreetings2" />

-  </wsdl:message>

-

-  <wsdl:message name="getGreetings2Response">

-    <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" />

-  </wsdl:message>

-

-  <wsdl:portType name="Service3a">

-    <wsdl:operation name="getGreetings2">

-      <wsdl:input message="tns:getGreetings2" />

-      <wsdl:output message="tns:getGreetings2Response" />

-    </wsdl:operation>

-  </wsdl:portType>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/java/sca-contrib/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
deleted file mode 100644
index 6e0908702b..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://scenario9"

-              xmlns:ns9="http://scenario9">

-   <deployable composite="ns9:CompositeA" />

-</contribution>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario9/scenario9.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario9/scenario9.composite
deleted file mode 100644
index 3fce35470e..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario9/scenario9.composite
+++ /dev/null
@@ -1,60 +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://scenario9"

-        xmlns:tns="http://scenario9"

-        name="CompositeA">

-

-    <service name="Service1" promote="ComponentB/Service2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference1" promote="ComponentB/reference2">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        <binding.ws uri="http://foo.com/bar"/>

-    </reference>

-    <reference name="reference1a" promote="ComponentB/reference2a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        <binding.ws uri="http://foo.com/bar"/>

-    </reference>    

-

-    <component name="ComponentB">

-        <implementation.composite name="tns:CompositeC" />

-        <service name="Service2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference2">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-        <reference name="reference2a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>        

-    </component>

-    

-    <component name="ComponentF">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

-        <service name="Service3">

-            <binding.sca />

-            <binding.ws />

-        </service>

-    </component>            

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario9/scenario9a.composite b/java/sca-contrib/itest/builder/src/main/resources/scenario9/scenario9a.composite
deleted file mode 100644
index 6e86c547b3..0000000000
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario9/scenario9a.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"

-        targetNamespace="http://scenario9"

-        xmlns:tns="http://scenario9"

-        name="CompositeC">

-

-    <service name="Service2" promote="ComponentD/Service3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <service name="Service2a" promote="ComponentD/Service3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </service>

-    <reference name="reference2" promote="ComponentD/reference3">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>

-    <reference name="reference2a" promote="ComponentD/reference3a">

-        <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-    </reference>    

-

-    <component name="ComponentD">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/>

-        <service name="Service3">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <service name="Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </service>

-        <reference name="reference3" target="ComponentD/Service3a">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>

-        <reference name="reference3a" target="ComponentE">

-            <!-- bindings and/or interfaces may or may not be specified explicitly here -->

-        </reference>        

-    </component>

-    

-    <component name="ComponentE">

-        <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/>

-        <service name="Service3">

-            <binding.sca />

-            <binding.ws />

-        </service>

-    </component>    

-</composite>

diff --git a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
deleted file mode 100644
index 1f45cb4a66..0000000000
--- a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
+++ /dev/null
@@ -1,805 +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.itest.builder;

-

-import javax.wsdl.Definition;

-import javax.wsdl.Port;

-import javax.xml.namespace.QName;

-import junit.framework.TestCase;

-import org.apache.tuscany.sca.assembly.Binding;

-import org.apache.tuscany.sca.assembly.Component;

-import org.apache.tuscany.sca.assembly.ComponentReference;

-import org.apache.tuscany.sca.assembly.ComponentService;

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.assembly.Reference;

-import org.apache.tuscany.sca.assembly.SCABinding;

-import org.apache.tuscany.sca.assembly.Service;

-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;

-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;

-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;

-

-/**

- * Load and build some composites and inspect the results.

- * 

- * @version $Rev$ $Date$

- */

-public class BuilderTestCase extends TestCase {

-    private CustomCompositeBuilder customBuilder;

-    

-    @Override

-    protected void setUp() throws Exception {

-    }

-

-    @Override

-    protected void tearDown() throws Exception {

-    }

-

-

-    // Scenario 1: <binding.ws> on outer composite service CompositeA/Service1

-    public void testScenario1() throws Exception {

-        System.out.println("====>Running testScenario1");

-        customBuilder = new CustomCompositeBuilder(false);

-        customBuilder.loadContribution("scenario1.composite", "TestContribution", "src/main/resources/scenario1/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario1Results(false);

-    }

-

-    public void testScenario1NonWiring() throws Exception {

-        System.out.println("====>Running testScenario1NonWiring");

-        customBuilder = new CustomCompositeBuilder(true);

-        customBuilder.loadContribution("scenario1.composite", "TestContribution", "src/main/resources/scenario1/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario1Results(true);

-    }

-

-    private void checkScenario1Results(boolean nonWiring) {

-        Composite domainComposite = customBuilder.getDomainComposite();

-

-        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

-        if (!nonWiring) {

-            // Should create component service $promoted$Service1 on innermost component

-            //  ComponentD, with <binding.ws> and uri="/Service1"

-            // No other services on ComponentD should have <binding.ws>

-            WebServiceBinding wsBinding = null;

-            for (ComponentService service : componentD.getServices()) {

-                WebServiceBinding wsb = service.getBinding(WebServiceBinding.class);

-                if ("$promoted$Service1".equals(service.getName())) {

-                    wsBinding = wsb;

-                } else {

-                    assert wsb == null;

-                }

-            }

-            assert "/Service1".equals(wsBinding.getURI());

-

-            // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1"

-            Definition def = wsBinding.getWSDLDocument();

-            javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

-            Port port = svc.getPort("Service3Port");

-            assert "/Service1".equals(TestUtils.getPortAddress(port));

-        } else {

-            // Should not create component service $promoted$Service1 on innermost component ComponentD

-            // No component services on ComponentD should have <binding.ws>

-            for (ComponentService service : componentD.getServices()) {

-                assert !"$promoted$Service1".equals(service.getName());

-                assert service.getBinding(WebServiceBinding.class) == null;

-            }

-        }

-

-        // No services on ComponentB should have <binding.ws>

-        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");

-        for (ComponentService service : componentB.getServices()) {

-            assert service.getBinding(WebServiceBinding.class) == null;

-        }

-

-        // No services on CompositeC should have <binding.ws>

-        Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario1", "CompositeC"));

-        for (Service service : compositeC.getServices()) {

-            assert service.getBinding(WebServiceBinding.class) == null;

-        }

-

-        if (nonWiring) {

-            // Should not add a WSDL document to domain composite service Service1

-            WebServiceBinding wsBinding = null;

-            for (Service service : domainComposite.getServices()) {

-                if ("Service1".equals(service.getName())) {

-                    wsBinding = service.getBinding(WebServiceBinding.class);

-                }

-            }

-            assert wsBinding.getWSDLDocument() == null;

-        }

-    }

-

-    // Scenario 2: <binding.ws> on outer component service ComponentB/Service2

-    public void testScenario2() throws Exception {

-        System.out.println("====>Running testScenario2");

-        customBuilder = new CustomCompositeBuilder(false);

-        customBuilder.loadContribution("scenario2.composite", "TestContribution", "src/main/resources/scenario2/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario2and3Results("http://scenario2", false);

-    }

-

-    public void testScenario2NonWiring() throws Exception {

-        System.out.println("====>Running testScenario2NonWiring");

-        customBuilder = new CustomCompositeBuilder(true);

-        customBuilder.loadContribution("scenario2.composite", "TestContribution", "src/main/resources/scenario2/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario2and3Results("http://scenario2", true);

-    }

-

-    private void checkScenario2and3Results(String namespace, boolean nonWiring) {

-        Composite domainComposite = customBuilder.getDomainComposite();

-

-        // Should create WSDL document for ComponentB/Service2 with endpoint uri="/ComponentB/Service2"

-        // No other services on ComponentB should have <binding.ws>

-        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");

-        WebServiceBinding wsBinding = null;

-        for (ComponentService service : componentB.getServices()) {

-            WebServiceBinding wsb = service.getBinding(WebServiceBinding.class);

-            if ("Service2".equals(service.getName())) {

-                wsBinding = wsb;

-            } else {

-                assert wsb == null;

-            }

-        }

-        Definition def = wsBinding.getWSDLDocument();

-        javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

-        Port port = svc.getPort("Service3Port");

-        assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));

-

-        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

-        if (!nonWiring) {

-            // Should create component service $promoted$ComponentB$slash$Service2 on innermost component

-            //  ComponentD, with <binding.ws> and uri="/ComponentB/Service2"

-            wsBinding = null;

-            for (ComponentService service : componentD.getServices()) {

-                if ("$promoted$ComponentB$slash$Service2".equals(service.getName())) {

-                    wsBinding = service.getBinding(WebServiceBinding.class);

-                }

-            }

-            assert "/ComponentB/Service2".equals(wsBinding.getURI());

-

-            // Should create WSDL document for ComponentD/$promoted$ComponentB$slash$Service2 with endpoint uri="/ComponentB/Service2"

-            def = wsBinding.getWSDLDocument();

-            svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

-            port = svc.getPort("Service3Port");

-            assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));

-        } else {

-            // Should not create component service $promoted$ComponentB$slash$Service2 on innermost component ComponentD

-            for (ComponentService service : componentD.getServices()) {

-                assert !"$promoted$ComponentB$slash$Service2".equals(service.getName());

-            }

-        }

-

-        // Should add <binding.ws> to outer composite service CompositeA/Service1 

-        wsBinding = null;

-        for (Service service : domainComposite.getServices()) {

-            if ("Service1".equals(service.getName())) {

-                wsBinding = service.getBinding(WebServiceBinding.class);

-            }

-        }

-        assert wsBinding != null;

-        if (nonWiring) {

-            // Should not add a WSDL document to domain composite service Service1

-            assert wsBinding.getWSDLDocument() == null;

-        }

-

-        if (!nonWiring) {

-            // Should create component service $promoted$Service1 on innermost component

-            //  ComponentD, with <binding.ws> and uri="/Service1"

-            wsBinding = null;

-            for (ComponentService service : componentD.getServices()) {

-                if ("$promoted$Service1".equals(service.getName())) {

-                    wsBinding = service.getBinding(WebServiceBinding.class);

-                }

-            }

-            assert "/Service1".equals(wsBinding.getURI());

-

-            // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1"

-            def = wsBinding.getWSDLDocument();

-            svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

-            port = svc.getPort("Service3Port");

-            assert "/Service1".equals(TestUtils.getPortAddress(port));

-        } else {

-            // Should not create component service $promoted$.Service1 on innermost component ComponentD

-            for (ComponentService service : componentD.getServices()) {

-                assert !"$promoted$Service1".equals(service.getName());

-            }

-        }

-

-        // No services on ComponentD should have <binding.ws>, except for $promoted$Service1

-        // and $promoted$ComponentB$slash$Service2  

-        for (ComponentService service : componentD.getServices()) {

-            if (!"$promoted$Service1".equals(service.getName()) &&

-                !"$promoted$ComponentB$slash$Service2".equals(service.getName())) {

-                assert service.getBinding(WebServiceBinding.class) == null;

-            }

-        }

-

-        // No services on CompositeC should have <binding.ws>, except for Service2 in Scenario 3

-        Composite compositeC = TestUtils.getComposite(domainComposite, new QName(namespace, "CompositeC"));

-        for (Service service : compositeC.getServices()) {

-            if ("http://scenario3".equals(namespace) && "Service2".equals(service.getName())) {

-                assert service.getBinding(WebServiceBinding.class) != null;

-            } else {

-                assert service.getBinding(WebServiceBinding.class) == null;

-            }

-        }

-    }

-

-    // Scenario 3: <binding.ws> on inner composite service CompositeC/Service2

-    public void testScenario3() throws Exception {

-        System.out.println("====>Running testScenario3");

-        customBuilder = new CustomCompositeBuilder(false);

-        customBuilder.loadContribution("scenario3.composite", "TestContribution", "src/main/resources/scenario3/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario2and3Results("http://scenario3", false);

-    }

-

-    public void testScenario3NonWiring() throws Exception {

-        System.out.println("====>Running testScenario3NonWiring");

-        customBuilder = new CustomCompositeBuilder(true);

-        customBuilder.loadContribution("scenario3.composite", "TestContribution", "src/main/resources/scenario3/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario2and3Results("http://scenario3", true);

-    }

-

-    // Scenario 4: <binding.ws> on inner component service ComponentD/Service3

-    public void testScenario4() throws Exception {

-        System.out.println("====>Running testScenario4");

-        customBuilder = new CustomCompositeBuilder(false);

-        customBuilder.loadContribution("scenario4.composite", "TestContribution", "src/main/resources/scenario4/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario4Results(false);

-    }

-

-    public void testScenario4NonWiring() throws Exception {

-        System.out.println("====>Running testScenario4NonWiring");

-        customBuilder = new CustomCompositeBuilder(true);

-        customBuilder.loadContribution("scenario4.composite", "TestContribution", "src/main/resources/scenario4/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario4Results(true);

-    }

-

-    private void checkScenario4Results(boolean nonWiring) {

-        Composite domainComposite = customBuilder.getDomainComposite();

-

-        // Should create WSDL document for ComponentD/Service3 with endpoint uri="/ComponentD/Service3"

-        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

-        WebServiceBinding wsBinding = null;

-        for (ComponentService service : componentD.getServices()) {

-            if ("Service3".equals(service.getName())) {

-                wsBinding = service.getBinding(WebServiceBinding.class);

-            }

-        }

-        Definition def = wsBinding.getWSDLDocument();

-        javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

-        Port port = svc.getPort("Service3Port");

-        assert "/ComponentB/ComponentD/Service3".equals(TestUtils.getPortAddress(port));

-

-        // Should add <binding.ws> to inner composite service CompositeC/Service2 

-        // No other services on CompositeC should have <binding.ws>

-        Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario4", "CompositeC"));

-        wsBinding = null;

-        for (Service service : compositeC.getServices()) {

-            WebServiceBinding wsb = service.getBinding(WebServiceBinding.class);

-            if ("Service2".equals(service.getName())) {

-                wsBinding = wsb;

-            } else {

-                assert wsb == null;

-            }

-        }

-        assert "/ComponentB/Service2".equals(wsBinding.getURI());

-

-        // Should add <binding.ws> to outer component service ComponentB/Service2 

-        // Should create WSDL document for ComponentB/Service2 with endpoint uri="/ComponentB/Service2"

-        // No other services on ComponentB should have <binding.ws>

-        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");

-        wsBinding = null;

-        for (ComponentService service : componentB.getServices()) {

-            WebServiceBinding wsb = service.getBinding(WebServiceBinding.class);

-            if ("Service2".equals(service.getName())) {

-                wsBinding = wsb;

-            } else {

-                assert wsb == null;

-            }

-        }

-        assert "/ComponentB/Service2".equals(wsBinding.getURI());

-        def = wsBinding.getWSDLDocument();

-        svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

-        port = svc.getPort("Service3Port");

-        assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));

-

-        if (!nonWiring) {

-            // Should create component service $promoted$ComponentB$slash$Service2 on innermost component

-            //  ComponentD, with <binding.ws> and uri="/ComponentB/Service2"

-            wsBinding = null;

-            for (ComponentService service : componentD.getServices()) {

-                if ("$promoted$ComponentB$slash$Service2".equals(service.getName())) {

-                    wsBinding = service.getBinding(WebServiceBinding.class);

-                }

-            }

-            assert "/ComponentB/Service2".equals(wsBinding.getURI());

-

-            // Should create WSDL document for ComponentD/$promoted$ComponentB$slash$Service2 with endpoint uri="/ComponentB/Service2"

-            def = wsBinding.getWSDLDocument();

-            svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

-            port = svc.getPort("Service3Port");

-            assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));

-        } else {

-            // Should not create component service $promoted$ComponentB$slash$Service2 on innermost component ComponentD

-            for (ComponentService service : componentD.getServices()) {

-                assert !"$promoted$ComponentB$slash$Service2".equals(service.getName());

-            }

-        }

-

-        // Should add <binding.ws> to outer composite service CompositeA/Service1 

-        wsBinding = null;

-        for (Service service : domainComposite.getServices()) {

-            if ("Service1".equals(service.getName())) {

-                wsBinding = service.getBinding(WebServiceBinding.class);

-            }

-        }

-        assert wsBinding != null;

-        if (nonWiring) {

-            // Should not add a WSDL document to domain composite service Service1

-            assert wsBinding.getWSDLDocument() == null;

-        }

-

-        if (!nonWiring) {

-            // Should create component service $promoted$Service1 on innermost component

-            //  ComponentD, with <binding.ws> and uri="/Service1"

-            wsBinding = null;

-            for (ComponentService service : componentD.getServices()) {

-                if ("$promoted$Service1".equals(service.getName())) {

-                    wsBinding = service.getBinding(WebServiceBinding.class);

-                }

-            }

-            assert "/Service1".equals(wsBinding.getURI());

-

-            // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1"

-            def = wsBinding.getWSDLDocument();

-            svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); 

-            port = svc.getPort("Service3Port");

-            assert "/Service1".equals(TestUtils.getPortAddress(port));

-        } else {

-            // Should not create component service $promoted$.Service1 on innermost component ComponentD

-            for (ComponentService service : componentD.getServices()) {

-                assert !"$promoted$Service1".equals(service.getName());

-            }

-        }

-

-        // No services on ComponentD should have <binding.ws>, except for Service3,

-        //  $promoted$.Service1 and $promoted$.ComponentB.Service2

-        for (ComponentService service : componentD.getServices()) {

-            if (!"Service3".equals(service.getName()) &&

-                !"$promoted$Service1".equals(service.getName()) &&

-                !"$promoted$ComponentB$slash$Service2".equals(service.getName())) {

-                assert service.getBinding(WebServiceBinding.class) == null;

-            }

-        }

-    }

-

-    // Scenario 5: <binding.ws> and <interface.wsdl> on outer composite reference CompositeA/reference1

-    public void testScenario5() throws Exception {

-        System.out.println("====>Running testScenario5");

-        customBuilder = new CustomCompositeBuilder(false);

-        customBuilder.loadContribution("scenario5.composite", "TestContribution", "src/main/resources/scenario5/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario5Results(false);

-    }

-

-    public void testScenario5NonWiring() throws Exception {

-        System.out.println("====>Running testScenario5NonWiring");

-        customBuilder = new CustomCompositeBuilder(true);

-        customBuilder.loadContribution("scenario5.composite", "TestContribution", "src/main/resources/scenario5/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario5Results(true);

-    }

-

-    private void checkScenario5Results(boolean nonWiring) {

-        Composite domainComposite = customBuilder.getDomainComposite();

-

-        // Should not add <binding.ws> to any outer component references 

-        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");

-        for (ComponentReference reference : componentB.getReferences()) {

-            assert reference.getBinding(WebServiceBinding.class) == null;

-        }

-

-        Definition def;

-        javax.wsdl.Service svc;

-        Port port;

-        WebServiceBinding wsBinding;

-        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

-        if (!nonWiring) {

-            // Should add <binding.ws> to inner component reference ComponentD/reference3 with uri="http://foo.com/bar" 

-            // Should set <interface.wsdl> on inner component reference ComponentD/reference3 

-            wsBinding = null;

-            for (ComponentReference reference : componentD.getReferences()) {

-                if ("reference3".equals(reference.getName())) {

-                    wsBinding = reference.getBinding(WebServiceBinding.class);

-                    assert reference.getInterfaceContract(wsBinding) instanceof WSDLInterfaceContract;

-                }

-            }

-            assert "http://foo.com/bar".equals(wsBinding.getURI());

-

-            // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar"

-            def = wsBinding.getWSDLDocument();

-            svc = def.getService(new QName("http://scenarios/ComponentD/reference3", "Service3aService")); 

-            port = svc.getPort("Service3aPort");

-            assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port));

-        } else {

-            // Should not add <binding.ws> to any inner component references 

-            for (ComponentReference reference : componentD.getReferences()) {

-                assert reference.getBinding(WebServiceBinding.class) == null;

-            }

-        }

-

-        // Should not add <binding.ws> or <interface.wsdl> to inner composite reference CompositeC/reference2 

-        Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario5", "CompositeC"));

-        for (Reference reference : compositeC.getReferences()) {

-            assert reference.getBinding(WebServiceBinding.class) == null;

-            assert reference.getInterfaceContract() instanceof JavaInterfaceContract;

-        }

-    }

-

-    // Scenario 6: <binding.ws> and <interface.wsdl> on outer component reference ComponentB/reference2

-    public void testScenario6() throws Exception {

-        System.out.println("====>Running testScenario6");

-        customBuilder = new CustomCompositeBuilder(false);

-        customBuilder.loadContribution("scenario6.composite", "TestContribution", "src/main/resources/scenario6/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario6and7Results("http://scenario6", false);

-    }

-

-    public void testScenario6NonWiring() throws Exception {

-        System.out.println("====>Running testScenario6NonWiring");

-        customBuilder = new CustomCompositeBuilder(true);

-        customBuilder.loadContribution("scenario6.composite", "TestContribution", "src/main/resources/scenario6/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario6and7Results("http://scenario6", true);

-    }

-

-    private void checkScenario6and7Results(String namespace, boolean nonWiring) {

-        Composite domainComposite = customBuilder.getDomainComposite();

-

-        // Should remove target= on ComponentB/reference2 (for Scenario 6) or

-        //  CompositeC/reference2 (for Scenario 7), and add uri="http://foo.com/bar"

-        //  to the <binding.ws> element on ComponentB/reference2

-        // For nonWiring, ComponentB/reference2 should have target=

-        //  and no uri= should be added

-        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");

-        WebServiceBinding wsBinding = null;

-        for (ComponentReference reference : componentB.getReferences()) {

-            if ("reference2".equals(reference.getName())) {

-                if (!nonWiring) {

-                    assert reference.getTargets().size() == 0;

-                } else {

-                    assert reference.getTargets().size() == 1;

-                }

-                wsBinding = reference.getBinding(WebServiceBinding.class);

-            }

-        }

-        if (!nonWiring) {

-            assert "http://foo.com/bar".equals(wsBinding.getURI());

-        } else {

-            assert wsBinding.getURI() == null;

-        }

-

-        Definition def;

-        javax.wsdl.Service svc;

-        Port port;

-        if (!nonWiring) {

-            // Should create WSDL document for ComponentB/reference2 with endpoint uri="http://foo.com/bar"

-            def = wsBinding.getWSDLDocument();

-            svc = def.getService(new QName("http://scenarios/ComponentB/reference2", "Service3aService")); 

-            port = svc.getPort("Service3aPort");

-            assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port));

-        }

-

-        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

-        if (!nonWiring) {

-            // Should add <binding.ws> to inner component reference ComponentD/reference3 with uri="http://foo.com/bar" 

-            // Should set <interface.wsdl> on inner component reference ComponentD/reference3 

-            wsBinding = null;

-            for (ComponentReference reference : componentD.getReferences()) {

-                if ("reference3".equals(reference.getName())) {

-                    wsBinding = reference.getBinding(WebServiceBinding.class);

-                    assert reference.getBindings().size() == 1;

-                    assert reference.getInterfaceContract(wsBinding) instanceof WSDLInterfaceContract;

-                }

-            }

-            assert "http://foo.com/bar".equals(wsBinding.getURI());

-

-            // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar"

-            def = wsBinding.getWSDLDocument();

-            svc = def.getService(new QName("http://scenarios/ComponentB/reference2", "Service3aService")); 

-            port = svc.getPort("Service3aPort");

-            assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port));

-        } else {

-            // Should not add <binding.ws> to any inner component references 

-            for (ComponentReference reference : componentD.getReferences()) {

-                assert reference.getBinding(WebServiceBinding.class) == null;

-            }

-        }

-

-        // No references on CompositeC should have <binding.ws> or <interface.wsdl>, except for

-        //  reference2 in Scenario 7

-        Composite compositeC = TestUtils.getComposite(domainComposite, new QName(namespace, "CompositeC"));

-        for (Reference reference : compositeC.getReferences()) {

-            if ("http://scenario7".equals(namespace) && "reference2".equals(reference.getName())) {

-                assert reference.getBinding(WebServiceBinding.class)!= null;

-                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;

-            } else {

-                assert reference.getBinding(WebServiceBinding.class) == null;

-                assert reference.getInterfaceContract() instanceof JavaInterfaceContract;

-            }

-        }

-

-        // Should add <binding.ws> and <interface.wsdl> to outer composite reference CompositeA/reference1 

-        wsBinding = null;

-        for (Reference reference : domainComposite.getReferences()) {

-            if ("reference1".equals(reference.getName())) {

-                wsBinding = reference.getBinding(WebServiceBinding.class);

-                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;

-            }

-        }

-        assert wsBinding.getURI() == null;

-

-        // Should not add a WSDL document to domain composite reference reference1

-        assert wsBinding.getWSDLDocument() == null;

-    }

-

-    // Scenario 7: <binding.ws> and <interface.wsdl> on inner composite reference CompositeC/reference2

-    public void testScenario7() throws Exception {

-        System.out.println("====>Running testScenario7");

-        customBuilder = new CustomCompositeBuilder(false);

-        customBuilder.loadContribution("scenario7.composite", "TestContribution", "src/main/resources/scenario7/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario6and7Results("http://scenario7", false);

-    }

-

-    public void testScenario7NonWiring() throws Exception {

-        System.out.println("====>Running testScenario7NonWiring");

-        customBuilder = new CustomCompositeBuilder(true);

-        customBuilder.loadContribution("scenario7.composite", "TestContribution", "src/main/resources/scenario7/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario6and7Results("http://scenario7", true);

-    }

-

-    // Scenario 8: <binding.ws> and <interface.wsdl> on inner component reference ComponentD/reference3

-    public void testScenario8() throws Exception {

-        System.out.println("====>Running testScenario8");

-        customBuilder = new CustomCompositeBuilder(false);

-        customBuilder.loadContribution("scenario8.composite", "TestContribution", "src/main/resources/scenario8/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario8Results(false);

-    }

-

-    public void testScenario8NonWiring() throws Exception {

-        System.out.println("====>Running testScenario8NonWiring");

-        customBuilder = new CustomCompositeBuilder(true);

-        customBuilder.loadContribution("scenario8.composite", "TestContribution", "src/main/resources/scenario8/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario8Results(true);

-    }

-

-    private void checkScenario8Results(boolean nonWiring) {

-        Composite domainComposite = customBuilder.getDomainComposite();

-

-        // Should replace target= on ComponentD/reference3 by uri="http://foo.com/bar" on <binding.ws>

-        // For nonWiring, the original target= is preserved and there is no uri=

-        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

-        WebServiceBinding wsBinding = null;

-        for (ComponentReference reference : componentD.getReferences()) {

-            if ("reference3".equals(reference.getName())) {

-                if (!nonWiring) {

-                    assert reference.getTargets().size() == 0;

-                } else {

-                    assert reference.getTargets().size() == 1;

-                }

-                wsBinding = reference.getBinding(WebServiceBinding.class);

-            }

-        }

-        if (!nonWiring) {

-            assert "http://foo.com/bar".equals(wsBinding.getURI());

-        } else {

-            assert wsBinding.getURI() == null;

-        }

-

-        Definition def;

-        javax.wsdl.Service svc;

-        Port port;

-        if (!nonWiring) {

-            // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar"

-            def = wsBinding.getWSDLDocument();

-            svc = def.getService(new QName("http://scenarios/ComponentD/reference3", "Service3aService")); 

-            port = svc.getPort("Service3aPort");

-            assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port));

-        }

-

-        // Should add <binding.ws> and <interface.wsdl> to inner composite reference CompositeC/reference2 

-        Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario8", "CompositeC"));

-        wsBinding = null;

-        for (Reference reference : compositeC.getReferences()) {

-            if ("reference2".equals(reference.getName())) {

-                wsBinding = reference.getBinding(WebServiceBinding.class);

-                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;

-            }

-        }

-        assert wsBinding.getURI() == null;

-

-        // Should add <binding.ws> and <interface.wsdl> to outer component reference ComponentB/reference2 

-        Component componentB = TestUtils.getComponent(domainComposite, "ComponentB");

-        wsBinding = null;

-        for (ComponentReference reference : componentB.getReferences()) {

-            if ("reference2".equals(reference.getName())) {

-                wsBinding = reference.getBinding(WebServiceBinding.class);

-                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;

-            }

-        }

-        assert wsBinding.getURI() == null;

-

-        // Should add <binding.ws> and <interface.wsdl> to outer composite reference CompositeA/reference1 

-        wsBinding = null;

-        for (Reference reference : domainComposite.getReferences()) {

-            if ("reference1".equals(reference.getName())) {

-                wsBinding = reference.getBinding(WebServiceBinding.class);

-                assert reference.getInterfaceContract() instanceof WSDLInterfaceContract;

-            }

-        }

-        assert wsBinding.getURI() == null;

-

-        // Should not add a WSDL document to domain composite reference reference1

-        assert wsBinding.getWSDLDocument() == null;

-    }

-

-    // Scenario 9: target in reference CDR3A and binding.ws uri= at CAR1A

-    public void testScenario9() throws Exception {

-        System.out.println("====>Running testScenario9");

-        customBuilder = new CustomCompositeBuilder(false);

-        customBuilder.loadContribution("scenario9.composite", "TestContribution", "src/main/resources/scenario9/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario9Results();

-    }    

-

-    private void checkScenario9Results() {

-        Composite domainComposite = customBuilder.getDomainComposite();

-

-        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

-        ComponentReference componentRef = null;

-        for (ComponentReference reference : componentD.getReferences()) {

-            if ("reference3a".equals(reference.getName())) {

-                componentRef = reference;

-                assertTrue(reference.getBindings().size() == 2);

-                assertTrue(reference.getBindings().get(0) instanceof SCABinding);

-                assertTrue(reference.getBindings().get(1) instanceof WebServiceBinding);

-            }

-        }

-        assertTrue(componentRef != null);

-    }    

-    

-    // Scenario 10: targets in references CBR2A and CDR3A and binding.ws at CBR2A

-    public void testScenario10() throws Exception {

-        System.out.println("====>Running testScenario10");

-        customBuilder = new CustomCompositeBuilder(false);

-        customBuilder.loadContribution("scenario10.composite", "TestContribution", "src/main/resources/scenario10/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario10And11Results();

-    }    

-    

-    // Scenario 11: targets in references CBR2A and CDR3A and binding.ws at CCR2A

-    public void testScenario11() throws Exception {

-        System.out.println("====>Running testScenario11");

-        customBuilder = new CustomCompositeBuilder(false);

-        customBuilder.loadContribution("scenario11.composite", "TestContribution", "src/main/resources/scenario11/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario10And11Results();

-    }

-

-    private void checkScenario10And11Results() {

-        Composite domainComposite = customBuilder.getDomainComposite();

-

-        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

-        ComponentReference componentRef = null;

-        for (ComponentReference reference : componentD.getReferences()) {

-            if ("reference3a".equals(reference.getName())) {

-                componentRef = reference;

-                assertTrue(reference.getBindings().size() == 2);

-                Binding binding1 = reference.getBindings().get(0);

-                assertTrue(binding1 instanceof SCABinding);

-                assertTrue(reference.getInterfaceContract(binding1) instanceof JavaInterfaceContract);

-                Binding binding2 = reference.getBindings().get(1);

-                assertTrue(binding2 instanceof WebServiceBinding);

-                assertTrue(reference.getInterfaceContract(binding2) instanceof WSDLInterfaceContract);

-            }

-        }

-        assertTrue(componentRef != null);

-    }  

-

-    // Scenario 12: targets in references CBR2A and CDR3A and binding.ws at CDR3A

-    public void testScenario12() throws Exception {

-        System.out.println("====>Running testScenario12");

-        customBuilder = new CustomCompositeBuilder(false);

-        customBuilder.loadContribution("scenario12.composite", "TestContribution", "src/main/resources/scenario12/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario12Results();

-    }

-

-    private void checkScenario12Results() {

-        Composite domainComposite = customBuilder.getDomainComposite();

-

-        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

-        ComponentReference componentRef = null;

-        for (ComponentReference reference : componentD.getReferences()) {

-            if ("reference3a".equals(reference.getName())) {

-                componentRef = reference;

-                assertTrue(reference.getBindings().size() == 2);

-                assertTrue(reference.getBindings().get(0) instanceof WebServiceBinding);

-                assertTrue(reference.getBindings().get(1) instanceof WebServiceBinding);

-            }

-        }

-        assertTrue(componentRef != null);

-    }

-

-    // Scenario 13: target in reference CDR3A

-    public void testScenario13() throws Exception {

-        System.out.println("====>Running testScenario13");

-        customBuilder = new CustomCompositeBuilder(false);

-        customBuilder.loadContribution("scenario13.composite", "TestContribution", "src/main/resources/scenario13/");

-        //TestUtils.printResults(customBuilder);

-        TestUtils.checkProblems(customBuilder);

-        checkScenario13Results();

-    }

-

-    private void checkScenario13Results() {

-        Composite domainComposite = customBuilder.getDomainComposite();

-

-        Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");

-        ComponentReference componentRef = null;

-        for (ComponentReference reference : componentD.getReferences()) {

-            if ("reference3a".equals(reference.getName())) {

-                componentRef = reference;

-                assertTrue(reference.getBindings().size() == 1);

-                assertTrue(reference.getBindings().get(0) instanceof WebServiceBinding);

-            }

-        }

-        assertTrue(componentRef != null);

-    }

-

-}

diff --git a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java b/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
deleted file mode 100644
index c9339c1545..0000000000
--- a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
+++ /dev/null
@@ -1,153 +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.itest.builder;
-
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.DefaultEndpointFactory;
-import org.apache.tuscany.sca.assembly.EndpointFactory;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.Definitions;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-
-/**
- * Test version of org.apache.tuscany.sca.assembly.builder.impl.builder.CompositeBuilderImpl
- *
- * This class should be identical to CompositeBuilderImpl except for omitting the
- * following builders:
- *  componentWireBuilder
- *  compositeReferenceWireBuilder
- *  compositePromotedServiceBuilder
- * It omits the component wiring step and the special processing that's performed
- * for composite service and reference promotion.
- * 
- * @version $Rev$ $Date$
- */
-public class CompositeBuilderNonWiringImpl implements CompositeBuilder {
-    private static final Logger logger = Logger.getLogger(CompositeBuilderNonWiringImpl.class.getName());
-    private CompositeBuilder compositeIncludeBuilder;
-    private CompositeBuilder compositeCloneBuilder;
-    private CompositeBuilder componentConfigurationBuilder;
-    private CompositeBuilder compositeServiceConfigurationBuilder;
-    private CompositeBuilder compositeReferenceConfigurationBuilder;
-    private CompositeBuilder compositeBindingURIBuilder;
-    private CompositeBuilder componentServicePromotionBuilder;
-    private CompositeBuilder compositePromotionBuilder;
-    private CompositeBuilder compositePolicyBuilder;
-    private CompositeBuilder componentServiceBindingBuilder;
-    private CompositeBuilder componentReferenceBindingBuilder;
-    
-    /**
-     * Constructs a new composite builder.
-     * 
-     * @param assemblyFactory
-     * @param scaBindingFactory
-     * @param intentAttachPointTypeFactory
-     * @param interfaceContractMapper
-     * @param monitor
-     */
-    public CompositeBuilderNonWiringImpl(AssemblyFactory assemblyFactory,
-                                SCABindingFactory scaBindingFactory,
-                                IntentAttachPointTypeFactory  intentAttachPointTypeFactory,
-                                InterfaceContractMapper interfaceContractMapper) {
-        this(assemblyFactory, null, scaBindingFactory,  intentAttachPointTypeFactory, interfaceContractMapper);
-    }
-    
-    /**
-     * Constructs a new composite builder.
-     * 
-     * @param assemblyFactory
-     * @param scaBindingFactory
-     * @param endpointFactory
-     * @param intentAttachPointTypeFactory
-     * @param interfaceContractMapper
-     * @param policyDefinitions
-     * @param monitor
-     */
-    public CompositeBuilderNonWiringImpl(AssemblyFactory assemblyFactory,
-                                EndpointFactory endpointFactory,
-                                SCABindingFactory scaBindingFactory,
-                                IntentAttachPointTypeFactory  intentAttachPointTypeFactory,
-                                InterfaceContractMapper interfaceContractMapper) {
-        
-        if (endpointFactory == null){
-            endpointFactory = new DefaultEndpointFactory();
-        }       
-        
-        compositeIncludeBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeIncludeBuilderImpl(); 
-        compositeCloneBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeCloneBuilderImpl();
-        componentConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentConfigurationBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper);
-        compositeServiceConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeServiceConfigurationBuilderImpl(assemblyFactory);
-        compositeReferenceConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeReferenceConfigurationBuilderImpl(assemblyFactory);
-        compositeBindingURIBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeBindingURIBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper);
-        compositePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositePromotionBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper);
-        compositePolicyBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositePolicyBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper);
-        componentServiceBindingBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentServiceBindingBuilderImpl();
-        componentReferenceBindingBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferenceBindingBuilderImpl();
-    }
-
-    public String getID() {
-        return "org.apache.tuscany.sca.assembly.builder.CompositeBuilderNonWiring";
-    }
-
-    public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
-
-        // Collect and fuse includes
-        compositeIncludeBuilder.build(composite, definitions, monitor);
-
-        // Expand nested composites
-        compositeCloneBuilder.build(composite, definitions, monitor);
-
-        // Configure all components
-        componentConfigurationBuilder.build(composite, definitions, monitor);
-
-        // Connect composite services/references to promoted services/references
-        compositePromotionBuilder.build(composite, definitions, monitor);
-        
-        // Compute the policies across the model hierarchy
-        compositePolicyBuilder.build(composite, definitions, monitor);
-        
-        // Configure composite services
-        compositeServiceConfigurationBuilder.build(composite, definitions, monitor);
-        
-        // Configure composite references
-        compositeReferenceConfigurationBuilder.build(composite, definitions, monitor);
-
-        // Configure binding URIs
-        compositeBindingURIBuilder.build(composite, definitions, monitor);
-
-        // Build component service binding-related information
-        componentServiceBindingBuilder.build(composite, definitions, monitor);
-        
-        // Build component reference binding-related information
-        componentReferenceBindingBuilder.build(composite, definitions, monitor);
-        
-        // Fuse nested composites
-        //FIXME do this later
-        //cloneBuilder.fuseCompositeImplementations(composite);
-    }
-
-}
diff --git a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
deleted file mode 100644
index 5f5fe43d89..0000000000
--- a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
+++ /dev/null
@@ -1,207 +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.itest.builder;

-

-import java.io.File;

-import java.net.URI;

-import java.net.URL;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLInputFactory;

-import javax.xml.stream.XMLOutputFactory;

-

-import org.apache.tuscany.sca.assembly.AssemblyFactory;

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.assembly.SCABindingFactory;

-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;

-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;

-import org.apache.tuscany.sca.assembly.xml.Constants;

-import org.apache.tuscany.sca.contribution.Artifact;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;

-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;

-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;

-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;

-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.apache.tuscany.sca.core.FactoryExtensionPoint;

-import org.apache.tuscany.sca.core.ModuleActivator;

-import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;

-import org.apache.tuscany.sca.core.UtilityExtensionPoint;

-import org.apache.tuscany.sca.definitions.Definitions;

-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;

-import org.apache.tuscany.sca.monitor.Monitor;

-import org.apache.tuscany.sca.monitor.MonitorFactory;

-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;

-import org.apache.tuscany.sca.workspace.Workspace;

-import org.apache.tuscany.sca.workspace.WorkspaceFactory;

-import org.apache.tuscany.sca.workspace.builder.ContributionBuilder;

-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;

-

-public class CustomCompositeBuilder {

-    private URLArtifactProcessor<Contribution> contributionProcessor;

-    private ModelResolverExtensionPoint modelResolvers;

-    private FactoryExtensionPoint modelFactories;

-    private WorkspaceFactory workspaceFactory;

-    private AssemblyFactory assemblyFactory;

-    private XMLOutputFactory outputFactory;

-    private StAXArtifactProcessor<Object> xmlProcessor; 

-    private ContributionBuilder contributionDependencyBuilder;

-    private CompositeBuilder domainCompositeBuilder;

-    private static Workspace workspace;

-    private List<Definitions> policyDefinitions;

-    private Monitor monitor;

-    private Composite domainComposite;

-    private boolean nonWiring;

-

-    public CustomCompositeBuilder(boolean nonWiring) {

-        this.nonWiring = nonWiring;

-    }

-

-    private void init() {

-        

-        // Create extension point registry 

-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

-        

-        // Create a monitor

-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);

-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);

-        monitor = monitorFactory.createMonitor();

-        

-        // Initialize the Tuscany module activators

-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);

-        for (ModuleActivator activator : moduleActivators.getModuleActivators()) {

-            activator.start(extensionPoints);

-        }

-        

-        // Get XML input/output factories

-        modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);

-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);

-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);       

-        

-        // Get contribution workspace and assembly model factories

-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 

-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);

-        

-        // Create XML artifact processors

-        StAXArtifactProcessorExtensionPoint xmlProcessorExtensions = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);

-        xmlProcessor = new ExtensibleStAXArtifactProcessor(xmlProcessorExtensions, inputFactory, outputFactory, monitor);

-        

-        // Create contribution content processor

-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);

-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);

-        

-        // Get the model resolvers

-        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);

-        

-        // Create a contribution dependency builder

-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(null);

-        

-        // Create a composite builder

-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);

-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);

-        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);

-        if (nonWiring) {

-            domainCompositeBuilder = new CompositeBuilderNonWiringImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper);

-        } else {

-            domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper);

-        }

-    }

-    

-    public void loadContribution(String compositeURL, String sourceURI, String sourceURL) throws Exception {

-        init();

-

-        // Create workspace model

-        workspace = workspaceFactory.createWorkspace();

-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));

-

-        // Read the test contribution

-        URI artifactURI = URI.create(sourceURI);

-        URL artifactURL = new File(sourceURL).toURI().toURL();

-        URL contributionURL = new File(compositeURL).toURI().toURL();

-        Contribution testContribution = contributionProcessor.read(contributionURL, artifactURI, artifactURL);                 

-        workspace.getContributions().add(testContribution);

-        

-        // Build the contribution dependencies

-        Set<Contribution> resolved = new HashSet<Contribution>();

-        for (Contribution contribution: workspace.getContributions()) {

-            contributionDependencyBuilder.build(contribution, workspace, monitor);

-            

-            // Resolve contributions

-            for (Contribution dependency: contribution.getDependencies()) {

-                if (!resolved.contains(dependency)) {

-                    resolved.add(dependency);

-                    contributionProcessor.resolve(dependency, workspace.getModelResolver());                                       

-                }

-            }

-        }

-        

-        // Create a composite model for the domain

-        domainComposite = assemblyFactory.createComposite();

-        domainComposite.setName(new QName(Constants.SCA10_NS, "domain"));

-        

-        // Add all deployables to it, normally the domain administrator would select

-        // the deployables to include

-        domainComposite.getIncludes().addAll(workspace.getDeployables());

-        

-        // Build the domain composite and wire the components included in it

-        domainCompositeBuilder.build(domainComposite, null, monitor);

-    }

-    

-    /**

-     * Returns the delegating model processor.

-     * @return the delegating model processor

-     */

-    public StAXArtifactProcessor<Object> getModelProcessor() {

-        return xmlProcessor;

-    }

-    

-    /**

-     * Returns the XML output factory.

-     * @return the XML output factory

-     */

-    public XMLOutputFactory getOutputFactory() {

-        return outputFactory;

-    }

-    

-    /**

-     * Returns the domain composite.

-     * @return the domain composite model object

-     */

-    public Composite getDomainComposite() {

-        return domainComposite;

-    }

-    

-    /**

-     * Returns the monitor.

-     * @return the monitor instance

-     */

-    public Monitor getMonitor() {

-        return monitor;

-    }

-

-}

diff --git a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
deleted file mode 100644
index 9bff4d394e..0000000000
--- a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
+++ /dev/null
@@ -1,203 +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.itest.builder;

-

-import java.io.ByteArrayInputStream;

-import java.io.ByteArrayOutputStream;

-import javax.wsdl.Definition;

-import javax.wsdl.Port;

-import javax.wsdl.WSDLException;

-import javax.wsdl.extensions.soap.SOAPAddress;

-import javax.wsdl.extensions.soap12.SOAP12Address;

-import javax.wsdl.factory.WSDLFactory;

-import javax.wsdl.xml.WSDLWriter;

-import javax.xml.namespace.QName;

-import javax.xml.parsers.DocumentBuilder;

-import javax.xml.parsers.DocumentBuilderFactory;

-import javax.xml.stream.XMLStreamWriter;

-import junit.framework.TestCase;

-import org.apache.tuscany.sca.assembly.Binding;

-import org.apache.tuscany.sca.assembly.Component;

-import org.apache.tuscany.sca.assembly.ComponentService;

-import org.apache.tuscany.sca.assembly.ComponentReference;

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.assembly.Contract;

-import org.apache.tuscany.sca.assembly.Implementation;

-import org.apache.tuscany.sca.assembly.Reference;

-import org.apache.tuscany.sca.assembly.Service;

-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

-import org.apache.tuscany.sca.monitor.Monitor;

-import org.apache.tuscany.sca.monitor.Problem;

-import org.apache.xml.serialize.OutputFormat;

-import org.apache.xml.serialize.XMLSerializer;

-import org.w3c.dom.Document;

-

-/**

- * Static utility methods for use by test cases.

- * 

- * @version $Rev$ $Date$

- */

-public class TestUtils {

-

-    protected static void checkProblems(CustomCompositeBuilder customBuilder) throws Exception {

-        boolean problems = false;

-        for (Problem problem : customBuilder.getMonitor().getProblems()) {

-            if (problem.getCause() != null) {

-                problem.getCause().printStackTrace();

-            }

-            problems = true;

-        }

-        assert !problems;

-    }

-

-    protected static String getPortAddress(Port port) {

-        Object ext = port.getExtensibilityElements().get(0);

-        if (ext instanceof SOAPAddress) {

-            return ((SOAPAddress)ext).getLocationURI();

-        }

-        if (ext instanceof SOAP12Address) {

-            return ((SOAP12Address)ext).getLocationURI();

-        }

-        return null;

-    }

-

-    protected static Component getComponent(Composite composite, String name) {

-        for (Component component : composite.getComponents()) {

-            if (name.equals(component.getName())) {

-                return component;

-            }

-            // process implementation composites recursively

-            Implementation impl = component.getImplementation();

-            if (impl instanceof Composite) {

-                Component comp = getComponent((Composite)impl, name);

-                if (comp != null) {

-                    return comp;

-                }

-            }

-        }

-        return null;

-    }

-

-    protected static Composite getComposite(Composite composite, QName name) {

-        if (name.equals(composite.getName())) {

-            return composite;

-        }

-        for (Component component : composite.getComponents()) {

-            // process implementation composites recursively

-            Implementation impl = component.getImplementation();

-            if (impl instanceof Composite) {

-                Composite comp = getComposite((Composite)impl, name);

-                if (comp != null) {

-                    return comp;

-                }

-            }

-        }

-        return null;

-    }

-

-    protected static void printResults(CustomCompositeBuilder customBuilder) throws Exception {

-        for (Problem problem : customBuilder.getMonitor().getProblems()) {

-            if (problem.getCause() != null) {

-                problem.getCause().printStackTrace();

-            }

-        }

-        Composite domainComposite = customBuilder.getDomainComposite();

-        printComposite(domainComposite, customBuilder);

-    }

-

-    private static void printComposite(Composite composite, CustomCompositeBuilder customBuilder) throws Exception {

-        // process implementation composites recursively

-        for (Component component : composite.getComponents()) {

-            Implementation implementation = component.getImplementation();

-            if (implementation instanceof Composite) {

-                printComposite((Composite)implementation, customBuilder);

-            }

-        }

-

-        // write out the SCDL

-        writeSCDL(composite, customBuilder);

-

-        // find all the component service and reference bindings     

-        for (Component component : composite.getComponents()) {

-            for (ComponentService componentService : component.getServices()) {

-                for (Binding binding : componentService.getBindings()) {

-                    if (binding instanceof WebServiceBinding) {

-                        writeWSDL(component, componentService, ((WebServiceBinding)binding).getWSDLDocument());

-                    }

-                }

-            }

-            for (ComponentReference componentReference : component.getReferences()) {

-                for (Binding binding : componentReference.getBindings()) {

-                    if (binding instanceof WebServiceBinding) {

-                        writeWSDL(component, componentReference, ((WebServiceBinding)binding).getWSDLDocument());

-                    }

-                }

-            }

-        }

-

-        // find all the composite service and reference bindings     

-        for (Service service : composite.getServices()) {

-            for (Binding binding : service.getBindings()) {

-                if (binding instanceof WebServiceBinding) {

-                    writeWSDL(null, service, ((WebServiceBinding)binding).getWSDLDocument());

-                }

-            }

-        }

-        for (Reference reference : composite.getReferences()) {

-            for (Binding binding : reference.getBindings()) {

-                if (binding instanceof WebServiceBinding) {

-                    writeWSDL(null, reference, ((WebServiceBinding)binding).getWSDLDocument());

-                }

-            }

-        }

-    }

-

-    private static void writeSCDL(Composite composite, CustomCompositeBuilder customBuilder) throws Exception {

-        // Print out a composite

-        ByteArrayOutputStream bos = new ByteArrayOutputStream();

-        XMLStreamWriter writer = customBuilder.getOutputFactory().createXMLStreamWriter(bos);

-        customBuilder.getModelProcessor().write(composite, writer);

-        

-        // Parse and write again to pretty format it

-        DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();

-        Document document = documentBuilder.parse(new ByteArrayInputStream(bos.toByteArray()));

-        OutputFormat format = new OutputFormat();

-        format.setIndenting(true);

-        format.setIndent(2);

-        XMLSerializer serializer = new XMLSerializer(System.out, format);

-        System.out.println("-->Runtime SCDL model for composite " + composite.getName());

-        serializer.serialize(document);

-    }

-

-    private static void writeWSDL(Component component, Contract contract, Definition definition) {

-        if (definition == null) {

-            System.out.println("-->No generated WSDL for " + (component != null ? component.getName() : "") + "/" + contract.getName());

-        } else {

-            try {

-                System.out.println("-->Generated WSDL for " + (component != null ? component.getName() : "") + "/" + contract.getName());

-                WSDLWriter writer =  WSDLFactory.newInstance().newWSDLWriter();

-                writer.writeWSDL(definition, System.out);

-            } catch (WSDLException e) {

-                // ignore

-            }

-        }

-    }

-

-}

diff --git a/java/sca-contrib/itest/callablereferences-ws/pom.xml b/java/sca-contrib/itest/callablereferences-ws/pom.xml
deleted file mode 100644
index a231c4d741..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/pom.xml
+++ /dev/null
@@ -1,59 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-callablereferences-ws</artifactId>

-    <name>Apache Tuscany Test for Callable References over Web Services</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-    </dependencies>

-</project>

diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java b/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
deleted file mode 100644
index ecf1ac27e1..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
+++ /dev/null
@@ -1,26 +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 com.example;

-

-public interface ExampleClient {

-

-    void runTest();

-

-    void sayHello(String name);

-}

diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java b/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
deleted file mode 100644
index 9a486b3be0..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.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 com.example;

-

-import org.oasisopen.sca.CallableReference;

-import org.oasisopen.sca.ComponentContext;

-import org.oasisopen.sca.ServiceReference;

-import org.oasisopen.sca.annotation.Context;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(ExampleClient.class)

-@Scope("COMPOSITE")

-public class ExampleClientImpl implements ExampleClient {

-

-    private ExampleService myService;

-

-    @Context

-    protected ComponentContext context;

-

-    @Reference

-    public void setMyService(ExampleService myService) {

-        this.myService = myService;

-    }

-

-    public void runTest() {

-        ServiceReference<ExampleClient> ref = context.createSelfReference(ExampleClient.class);

-        ref.getService().sayHello("Jack");

-        CallableReference result = myService.hello("Jill", ref);

-        if (result != null) {

-            ((CallableReference<ExampleClient>)result).getService().sayHello("John");

-        }

-        result = myService.hello("Jane", null);

-        if (result != null) {

-            ((CallableReference<ExampleClient>)result).getService().sayHello("Jim");

-        }

-    }

-

-    public void sayHello(String name) {

-        System.out.println("Hello, client " + name + "!");

-    }

-}

diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java b/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
deleted file mode 100644
index 9264def0dc..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
+++ /dev/null
@@ -1,30 +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 com.example;

-

-import org.oasisopen.sca.CallableReference;

-import org.oasisopen.sca.ServiceReference;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface ExampleService {

-

-	CallableReference hello(String name, ServiceReference ref);

-

-}

diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java b/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
deleted file mode 100644
index 22aecc8b27..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ /dev/null
@@ -1,33 +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 com.example;

-

-import org.oasisopen.sca.CallableReference;

-import org.oasisopen.sca.ServiceReference;

-

-public class ExampleServiceImpl implements ExampleService {

-

-    public CallableReference hello(String name, ServiceReference ref) {

-        if (ref != null) {

-            ((ServiceReference<ExampleClient>)ref).getService().sayHello(name);

-        }

-        return (CallableReference)ref;

-    }

-

-}

diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java b/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
deleted file mode 100644
index 6ecf3d662e..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
+++ /dev/null
@@ -1,26 +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.itest.callablerefwsreturn;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Alpha {
-    boolean run();
-}
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java b/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
deleted file mode 100644
index 64a11f0bf3..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
+++ /dev/null
@@ -1,96 +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.itest.callablerefwsreturn;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.Conversation;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(Alpha.class)
-@Scope("COMPOSITE")
-public class AlphaImpl implements Alpha {
-    @Reference
-    public Beta beta;
-
-    @Context
-    protected ComponentContext componentContext;
-    
-    Object conversationId0 = null;
-
-    public boolean run() {
-        CallableReference<Gamma> gammaRef = null;
-        try {
-            Object conversationId1 = null;
-            Object conversationId2 = null;
-            
-            // it is expected that this call returns a reference to Gamma that
-            // reuses the established Conversation
-            gammaRef = beta.getRef();
-
-            // no Conversation exists
-            Conversation con = gammaRef.getConversation();
-            if (con == null) {
-                System.out.println("Alpha1: Conversation to gamma is null");
-            } else {
-                System.out
-                        .println("Alpha1: Conversation to gamma exists. conversationId="
-                                + con.getConversationID());
-                conversationId1 = con.getConversationID();                
-            }
-
-            // this call should reuse a Conversation, but as none exists it
-            // creates a new conversation
-            gammaRef.getService().doSomething();
-            gammaRef.getService().doSomething();
-            gammaRef.getService().doSomething();
-            
-            con = gammaRef.getConversation();
-            if (con == null) {
-                System.out.println("Alpha2: Conversation to gamma is null");
-            } else {
-                System.out
-                        .println("Alpha2: Conversation to gamma exists. conversationId="
-                                + con.getConversationID());
-                conversationId2 = con.getConversationID();                
-            }
-            
-            boolean testPassed = conversationId1.equals(conversationId2);
-            
-            if (conversationId0 == null){
-                conversationId0 = conversationId1;
-                return testPassed;
-            } else {
-                return testPassed && (!conversationId0.equals(conversationId1));
-            }
-            
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        } finally {
-            if (gammaRef != null) {
-                gammaRef.getService().stop();
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java b/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
deleted file mode 100644
index 9861b0a85e..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
+++ /dev/null
@@ -1,27 +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.itest.callablerefwsreturn;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Beta {
-    CallableReference<Gamma> getRef();
-}
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java b/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
deleted file mode 100644
index c870cd87fe..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
+++ /dev/null
@@ -1,46 +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.itest.callablerefwsreturn;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(Beta.class)
-@Scope("COMPOSITE")
-public class BetaImpl implements Beta {
-    @Context
-    protected ComponentContext componentContext;
-
-    @Reference
-    public Gamma gamma;
-
-    public CallableReference<Gamma> getRef() {
-        ServiceReference<Gamma> gammaRef = componentContext
-                .getServiceReference(Gamma.class, "gamma");
-        Gamma g = gammaRef.getService();
-        g.start();
-        return gammaRef;
-    }
-
-}
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java b/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
deleted file mode 100644
index ee9d0f0b26..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
+++ /dev/null
@@ -1,34 +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.itest.callablerefwsreturn;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.EndsConversation;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Conversational
-public interface Gamma {
-    int start();
-
-    void doSomething();
-
-    @EndsConversation
-    void stop();
-}
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java b/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
deleted file mode 100644
index 9a4f31d79d..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.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 org.apache.tuscany.sca.itest.callablerefwsreturn;
-
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(Gamma.class)
-@Scope("CONVERSATION")
-public class GammaImpl implements Gamma {
-    @ConversationID
-    protected String conversationId;
-
-    public GammaImpl() {
-        System.out.println("GammaImpl:GammaImpl(), conversationId="
-                + conversationId);
-    }
-
-    public int start() {
-        System.out.println("Gamma:start(), conversationId=" + conversationId);
-        return 1;
-    }
-
-    public void doSomething() {
-        System.out.println("Gamma:doSomething(), conversationId="
-                + conversationId);
-    }
-
-    public void stop() {
-        System.out.println("Gamma:stop(), conversationId=" + conversationId);
-    }
-}
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite b/java/sca-contrib/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
deleted file mode 100644
index 3d782a0b84..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
+++ /dev/null
@@ -1,54 +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
-    * 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:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:s="http://test"
-	name="test">
-
-	<component name="Alpha">
-		<implementation.java
-			class="org.apache.tuscany.sca.itest.callablerefwsreturn.AlphaImpl" />
-		<service name="Alpha">
-			<binding.sca />
-		</service>
-		<reference name="beta">
-			<binding.ws uri="http://localhost:8085/Beta" />
-		</reference>
-	</component>
-
-	<component name="Beta">
-		<implementation.java
-			class="org.apache.tuscany.sca.itest.callablerefwsreturn.BetaImpl" />
-		<service name="Beta">
-			<binding.ws uri="http://localhost:8085/Beta" />
-		</service>
-		<reference name="gamma">
-			<binding.ws uri="http://localhost:8085/Gamma" />
-		</reference>
-	</component>
-
-	<component name="Gamma">
-		<implementation.java
-			class="org.apache.tuscany.sca.itest.callablerefwsreturn.GammaImpl" />
-		<service name="Gamma">
-			<binding.ws uri="http://localhost:8085/Gamma" />
-		</service>
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/resources/example.composite b/java/sca-contrib/itest/callablereferences-ws/src/main/resources/example.composite
deleted file mode 100644
index ea0819a32e..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/resources/example.composite
+++ /dev/null
@@ -1,40 +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://www.example.com"

-           xmlns:hw="http://www.example.com"

-           name="example">

-

-    <component name="ExampleClientComponent">

-        <implementation.java class="com.example.ExampleClientImpl" />

-        <reference name="myService">

-            <interface.java interface="com.example.ExampleService" />

-            <binding.ws uri="http://localhost:8085/axis2/services/ExampleService" />

-        </reference>

-    </component>

-

-    <component name="ExampleComponent">

-        <implementation.java class="com.example.ExampleServiceImpl"/>

-        <service name="ExampleService">

-            <interface.java interface="com.example.ExampleService" />

-            <binding.ws uri="http://localhost:8085/axis2/services/ExampleService" />

-        </service>  

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java b/java/sca-contrib/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
deleted file mode 100644
index 310e31fb02..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.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 com.example;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-public class ExampleTestCase extends TestCase {

-

-    private SCADomain scaDomain;

-    private ExampleClient client;

-

-    @Override

-    protected void setUp() throws Exception {

-        scaDomain = SCADomain.newInstance("example.composite");

-        client = scaDomain.getService(ExampleClient.class, "ExampleClientComponent");

-    }

-    

-    @Override

-    protected void tearDown() throws Exception {

-        scaDomain.close();

-    }

-

-    public void test() throws Exception {

-        client.runTest();

-    }

-}

diff --git a/java/sca-contrib/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java b/java/sca-contrib/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
deleted file mode 100644
index 66fb2ef96c..0000000000
--- a/java/sca-contrib/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.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 org.apache.tuscany.sca.itest.callablerefws;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.callablerefwsreturn.Alpha;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class CallableReferenceReturnTestCase {
-    private static SCADomain domain;
-    private static Alpha alpha;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("CallableReferenceWsReturnTest.composite");
-        alpha = domain.getService(Alpha.class, "Alpha");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void testCallableReferenceReturn() {
-        Assert.assertTrue(alpha.run());
-        Assert.assertTrue(alpha.run());
-    }
-
-}
diff --git a/java/sca-contrib/itest/callablereferences/pom.xml b/java/sca-contrib/itest/callablereferences/pom.xml
deleted file mode 100644
index ae12f41535..0000000000
--- a/java/sca-contrib/itest/callablereferences/pom.xml
+++ /dev/null
@@ -1,81 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callablereferences</artifactId>
-    <name>Apache Tuscany SCA Callable References Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-<!-- 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>   
--->        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>  
-        
-                      
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
deleted file mode 100644
index 33783be887..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
+++ /dev/null
@@ -1,39 +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.itest.callableref;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface AComponent {
-    String foo();
-    
-    String fooB();
-    String fooB1();
-
-    String fooC();
-    String fooC1();
-    
-    String fooStringD();
-    String fooD();
-
-    String fooBC();
-
-    String invokeDReference();
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
deleted file mode 100644
index f99051cd5f..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
+++ /dev/null
@@ -1,114 +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.itest.callableref;
-
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-
-import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AComponent.class)
-public class AComponentImpl implements AComponent {
-
-    @Context
-    protected ComponentContext componentContext;
-
-    @Reference(name = "bReference")
-    protected BComponent b;
-
-    @Reference
-    protected CComponent cReference;
-    
-    @Reference
-    protected ServiceReference<CComponent> cServiceReference;
-
-    @Reference(required=false)
-    protected DComponent dReference;
-    
-    protected DComponent dReference1;
-
-    @Reference(name = "dReference1")
-    public void setDReference(DComponent dReference) {
-        this.dReference1 = dReference;
-    }
-
-    public String foo() {
-        return "AComponent";
-    }
-
-    public String fooB() {
-        return b.foo();
-    }
-
-    public String fooB1() {
-        CallableReference<BComponent> bRef = componentContext.cast(b);
-        return bRef.getService().foo();
-    }
-    
-    public String fooC() {
-        return cReference.foo();
-    }
-
-    public String fooC1() {
-        return cServiceReference.getService().foo();
-    }
-    
-    public String fooBC() {
-        CallableReference<CComponent> cReference = componentContext.getServiceReference(CComponent.class, "cReference");
-        return b.fooC(cReference);
-    }
-
-    public String fooD() {
-        CallableReference<AComponent> aReference = componentContext.createSelfReference(AComponent.class);
-        return dReference1.foo(aReference);
-    }
-    
-    /**
-     * A test case to work out what needs to be done in a transformer to get the 
-     * CallableReference across the wire. Left here for interest in case anyone 
-     * is looking for how to get at the innards of CallableReferences
-     */
-    public String fooStringD() {
-        CallableReference<AComponent> aReference = componentContext.createSelfReference(AComponent.class);
-        ByteArrayOutputStream bos = null;
-        
-        try {
-            bos = new ByteArrayOutputStream();
-            ObjectOutputStream oos = new ObjectOutputStream(bos);
-            oos.writeObject(aReference);
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            return null;
-        }
-        
-        String aReferenceString = Base64Binary.encode(bos.toByteArray());
-        return dReference1.fooString(aReferenceString);
-    }    
-
-    public String invokeDReference() {
-        return dReference.foo(null);
-    }
-
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
deleted file mode 100644
index 1cf3029d82..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
+++ /dev/null
@@ -1,30 +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.itest.callableref;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface BComponent {
-
-    String foo();
-
-    String fooC(CallableReference<CComponent> cComponent);
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
deleted file mode 100644
index 084572b6e5..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
+++ /dev/null
@@ -1,38 +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.itest.callableref;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BComponent.class)
-public class BComponentImpl implements BComponent {
-
-    public BComponentImpl() {
-    }
-
-    public String foo() {
-        return "BComponent";
-    }
-
-    public String fooC(CallableReference<CComponent> cReference) {
-        return "B" + cReference.getService().foo();
-    }
-
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
deleted file mode 100644
index 059f42c4d3..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
+++ /dev/null
@@ -1,27 +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.itest.callableref;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CComponent {
-
-    String foo();
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
deleted file mode 100644
index 76fdd61191..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
+++ /dev/null
@@ -1,30 +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.itest.callableref;
-
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CComponent.class)
-public class CComponentImpl implements CComponent {
-
-    public String foo() {
-        return "CComponent";
-    }
-
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
deleted file mode 100644
index 8b2988b700..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
+++ /dev/null
@@ -1,30 +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.itest.callableref;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface DComponent {
-
-    String foo(CallableReference<AComponent> aReference); 
-    
-    String fooString(String aReferenceString);
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
deleted file mode 100644
index a43b3818c5..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
+++ /dev/null
@@ -1,65 +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.itest.callableref;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(DComponent.class)
-public class DComponentImpl implements DComponent {
-
-    @Context
-    protected RequestContext requestContext;
-
-    public String foo(CallableReference<AComponent> aReference) {
-        try {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            ObjectOutputStream oos = new ObjectOutputStream(bos);
-            oos.writeObject(aReference);
-            ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bos.toByteArray()));
-            Object obj = ois.readObject();
-            aReference = (CallableReference<AComponent>) obj;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        System.out.println("Invoking service: " + requestContext.getServiceName());
-        return "D" + aReference.getService().foo();
-    }
-    
-    public String fooString(String aReferenceString) {
-        CallableReference<AComponent> aReference = null;
-        try {
-            ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(Base64Binary.decode(aReferenceString)));
-            Object obj = ois.readObject();
-            aReference = (CallableReference<AComponent>) obj;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        System.out.println("Invoking service: " + requestContext.getServiceName());
-        return "D" + aReference.getService().foo();
-    }
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
deleted file mode 100644
index 33bc49e4d8..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.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 org.apache.tuscany.sca.itest.callablerefconversational;
-
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple conversational Service that is used to testing the method
- * ComponentContext.createSelfReference()
- * 
- * @version $Date$ $Revision$
- */
-@Conversational
-public interface ConversationalService {
-    /**
-     * Default value for the user data
-     */
-    String DEFAULT_USER_DATA = "NOT SET";
-
-    /**
-     * Retrieves the conversation ID for this Service
-     * 
-     * @return The conversation ID for this Service
-     */
-    Object getConversationID();
-
-    /**
-     * Creates a self reference to this Service
-     * 
-     * @return A self reference to this Service
-     */
-    ServiceReference<ConversationalService> createSelfRef();
-
-    /**
-     * Sets some user data on the instance
-     * 
-     * @param a_Data Some data
-     * 
-     * @See {@link #getUserData()}
-     */
-    void setUserData(String a_Data);
-
-    /**
-     * Gets some user data on the instance
-     * 
-     * @return Some data
-     * 
-     * @See {@link #setUserData(String)}
-     */
-    String getUserData();
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
deleted file mode 100644
index 36bafba562..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
+++ /dev/null
@@ -1,111 +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.itest.callablerefconversational;
-
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Simple conversational Service that is used to testing the method
- * ComponentContext.createSelfReference()
- * 
- * @version $Date$ $Revision$
- */
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-public class ConversationalServiceImpl implements ConversationalService {
-
-    /**
-     * The Conversation ID
-     */
-    private Object m_ConversationID;
-
-    /**
-     * Reference to the ComponentContext.
-     */
-    @Context
-    protected ComponentContext m_Ctx;
-
-    /**
-     * Some user data
-     */
-    private String m_UserData = DEFAULT_USER_DATA;
-
-    /**
-     * Constructor
-     */
-    public ConversationalServiceImpl() {
-        System.out.println("New instance of " + this + " created");
-    }
-
-    /**
-     * Used to inject the Conversation ID
-     * 
-     * @param a_ConversationID the Conversation ID
-     */
-    @ConversationID
-    public void setConversationID(Object a_ConversationID) {
-        m_ConversationID = a_ConversationID;
-        System.out.println("Converstation ID set on " + this + " to " + a_ConversationID);
-    }
-
-    /**
-     * Retrieves the conversation ID for this Service
-     * 
-     * @return The conversation ID for this Service
-     */
-    public Object getConversationID() {
-        return m_ConversationID;
-    }
-
-    /**
-     * Creates a self reference to this Service
-     * 
-     * @return A self reference to this Service
-     */
-    public ServiceReference<ConversationalService> createSelfRef() {
-        return m_Ctx.createSelfReference(ConversationalService.class);
-    }
-
-    /**
-     * Sets some user data on the instance
-     * 
-     * @param a_Data Some data
-     * 
-     * @See {@link #getUserData()}
-     */
-    public void setUserData(String a_Data) {
-        m_UserData = a_Data;
-    }
-
-    /**
-     * Gets some user data on the instance
-     * 
-     * @return Some data
-     * 
-     * @See {@link #setUserData(String)}
-     */
-    public String getUserData() {
-        return m_UserData;
-    }
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
deleted file mode 100644
index bf5a2e65cc..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
+++ /dev/null
@@ -1,27 +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.itest.callablerefreturn;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Alpha
-{	
-	boolean run();
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
deleted file mode 100644
index 59fed12279..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
+++ /dev/null
@@ -1,86 +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.itest.callablerefreturn;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.Conversation;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class AlphaImpl implements Alpha {
-    @Reference
-    public Beta beta;
-
-    @Context
-    protected ComponentContext componentContext;
-
-    public boolean run() {
-        CallableReference<Gamma> gammaRef = null;
-        try {
-            Object conversationId1 = null;
-            Object conversationId2 = null;
-
-            // it is expected that this call returns a reference to Gamma that
-            // reuses the established Conversation
-            gammaRef = beta.getRef();
-
-            // no Conversation exists
-            Conversation con = gammaRef.getConversation();
-            if (con == null) {
-                System.out.println("Alpha: Conversation to gamma is null");
-            } else {
-                System.out
-                        .println("Alpha: Conversation to gamma exists. conversationId="
-                                + con.getConversationID());
-                conversationId1 = con.getConversationID();
-            }
-
-            // this call should reuse a Conversation, but as none exists it
-            // creates a new conversation
-            gammaRef.getService().doSomething();
-            con = gammaRef.getConversation();
-            if (con == null) {
-                System.out.println("Alpha: Conversation to gamma is null");
-            } else {
-                System.out
-                        .println("Alpha: Conversation to gamma exists. conversationId="
-                                + con.getConversationID());
-                conversationId2 = con.getConversationID();
-            }
-
-            if ((conversationId1 == null) || (conversationId2 == null)) {
-                return false;
-            }
-
-            boolean testPassed = conversationId1.equals(conversationId2);
-            return testPassed;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        } finally {
-            if (gammaRef != null) {
-                gammaRef.getService().stop();
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
deleted file mode 100644
index b8dd1c5640..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
+++ /dev/null
@@ -1,28 +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.itest.callablerefreturn;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Beta
-{	
-	CallableReference<Gamma> getRef();
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
deleted file mode 100644
index 8425425c16..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.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 org.apache.tuscany.sca.itest.callablerefreturn;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class BetaImpl implements Beta
-{
-    @Context
-    protected ComponentContext componentContext;
-    
-    @Reference
-    public Gamma gamma;
-	        
-	public CallableReference<Gamma> getRef()
-	{
-		ServiceReference<Gamma> gammaRef = componentContext.getServiceReference(Gamma.class, "gamma");		
-		gammaRef.getService().start();		
-		return gammaRef;
-	}
-	
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
deleted file mode 100644
index 445fb7bf7f..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
+++ /dev/null
@@ -1,35 +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.itest.callablerefreturn;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.EndsConversation;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Conversational
-public interface Gamma
-{	
-	void start();
-			
-	void doSomething();
-	
-	@EndsConversation
-	void stop();
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
deleted file mode 100644
index 0670629bae..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
+++ /dev/null
@@ -1,47 +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.itest.callablerefreturn;
-
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("CONVERSATION")
-public class GammaImpl implements Gamma
-{    	
-    @ConversationID
-    protected String conversationId;
-       
-
-	public void start()
-	{	
-		System.out.println("Gamma:start(), conversationId=" + conversationId);
-	}
-	
-
-	public void doSomething()	
-	{
-		System.out.println("Gamma:doSomething(), conversationId=" + conversationId);
-	}
-
-	
-	public void stop()
-	{
-		System.out.println("Gamma:stop(), conversationId=" + conversationId);
-	}
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite b/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
deleted file mode 100644
index 0bf8f7ef1e..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
+++ /dev/null
@@ -1,29 +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
-    * 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="CallableReferenceConversation" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <service name="ConversationalService" promote="ConversationalComponent">
-        <interface.java interface="org.apache.tuscany.sca.itest.callablerefconversational.ConversationalService" />
-    </service>
-
-    <component name="ConversationalComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.callablerefconversational.ConversationalServiceImpl" />
-    </component>
-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite b/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
deleted file mode 100644
index 5b3add1e61..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
+++ /dev/null
@@ -1,39 +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
-    * 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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://test"			
-		name="test">
-
-	<component name="Alpha">
-		<implementation.java class="org.apache.tuscany.sca.itest.callablerefreturn.AlphaImpl"/>
-		<reference name="beta" target="Beta"/>		
-	</component>
-    
-	<component name="Beta">
-		<implementation.java class="org.apache.tuscany.sca.itest.callablerefreturn.BetaImpl"/>
-		<reference name="gamma" target="Gamma"/>
-	</component>     
-
-	<component name="Gamma">
-		<implementation.java class="org.apache.tuscany.sca.itest.callablerefreturn.GammaImpl"/>
-	</component>     
-
-</composite>
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
deleted file mode 100644
index 49b75f56e4..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
+++ /dev/null
@@ -1,45 +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

-    * 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="InnerReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-

-    <service name="AComponent" promote="AComponent">

-        <interface.java interface="org.apache.tuscany.sca.itest.callableref.AComponent" />

-    </service>

-

-    <component name="AComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.AComponentImpl" />

-        <reference name="bReference" target="BComponent" />

-        <reference name="cReference" target="CComponent" />

-        <reference name="cServiceReference" target="CComponent" />

-        <reference name="dReference1" target="DComponent" />

-    </component>

-

-    <component name="BComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.BComponentImpl" />

-    </component>

-

-    <component name="CComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.CComponentImpl" />

-    </component>

-

-    <component name="DComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.DComponentImpl" />

-    </component>

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/java/sca-contrib/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
deleted file mode 100644
index 9216f44191..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
+++ /dev/null
@@ -1,46 +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

-    * 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="CompositeA" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-

-    <!--service name="AComponentService" promote="AComponent">

-        <interface.java interface="org.apache.tuscany.sca.itest.callableref.AComponent" />

-        <binding.sca uri="http://localhost:8084/AComponentService"/>

-    </service-->

-

-    <component name="AComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.AComponentImpl" />

-        <service name="AComponent">

-            <binding.sca uri="http://localhost:8084/AComponent"/>

-        </service>

-        <reference name="bReference">

-            <binding.sca uri="http://localhost:8085/BComponent" />

-        </reference>

-        <reference name="cReference">

-            <binding.sca uri="http://localhost:8085/CComponent" />

-        </reference>        

-        <reference name="cServiceReference">

-            <binding.sca uri="http://localhost:8085/CComponent" />

-        </reference>        

-        <reference name="dReference1">

-            <binding.sca uri="http://localhost:8085/DComponent" />

-        </reference>

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/java/sca-contrib/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index 95021f72a4..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo">
-    <deployable composite="foo:CompositeA" />
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/java/sca-contrib/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
deleted file mode 100644
index 42d739564c..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
+++ /dev/null
@@ -1,43 +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

-    * 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="CompositeB" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-

-    <component name="BComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.BComponentImpl" />

-        <service name="BComponent">

-             <binding.sca uri="http://localhost:8085/BComponent"/>

-        </service>

-    </component>

-

-    <component name="CComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.CComponentImpl" />

-        <service name="CComponent">

-             <binding.sca uri="http://localhost:8085/CComponent"/>

-        </service>        

-    </component>

-

-    <component name="DComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.callableref.DComponentImpl" />

-        <service name="DComponent">

-             <binding.sca uri="http://localhost:8085/DComponent"/>

-        </service>        

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/java/sca-contrib/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index 2edda61601..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo">
-    <deployable composite="foo:CompositeB" />
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
deleted file mode 100644
index fb3a5d79b9..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
+++ /dev/null
@@ -1,109 +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.itest.callableref;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.callablerefconversational.ConversationalService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceReference;
-
-/**
- * Simple test case that creates a ServiceReference to a Conversational Component
- * using ComponentContext.createSelfReference()
- * <p>
- * This test case is for TUSCANY-2208
- * 
- * @version $Date$ $Revision$
- */
-public class CallableReferenceConversationalTestCase {
-    private static SCADomain domain;
-    private static ConversationalService acomponent;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("CallableReferenceConversationalTest.composite");
-        Assert.assertNotNull(domain);
-        acomponent = domain.getService(ConversationalService.class, "ConversationalComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    /**
-     * This is a dummy test so that this Unit Test has a test so it will build.
-     * Once TUSCANY-2208 is fixed, this dummy test method can be removed 
-     */
-    @Test
-    public void dummyTestRemoveWhenTuscany2208IsFixed() {
-    }
-
-    /**
-     * Tests creating Self References and validate them with Conversation IDs
-     */
-    // Disabled until TUSCANY-2208 is fixed
-    // @Test
-    public void testCreateSelfRefUsingConvID() {
-        Assert.assertNotNull(acomponent);
-
-        final Object origConvID = acomponent.getConversationID();
-        Assert.assertNotNull(origConvID);
-        final ServiceReference<ConversationalService> ref = acomponent.createSelfRef();
-        Assert.assertNotNull(ref);
-
-        final ConversationalService resolvedRef = ref.getService();
-        Assert.assertNotNull(resolvedRef);
-        final Object newConvID = resolvedRef.getConversationID();
-        Assert.assertNotNull(newConvID);
-
-        Assert.assertEquals(origConvID, newConvID);
-    }
-
-    /**
-     * Tests creating Self References and validate them with user specified data 
-     */
-    // Disabled until TUSCANY-2208 is fixed
-    // @Test
-    public void testCreateSelfRefUsingUserData() {
-        Assert.assertNotNull(acomponent);
-
-        final String origUserData = acomponent.getUserData();
-        Assert.assertEquals(ConversationalService.DEFAULT_USER_DATA, origUserData);
-
-        final String userData = "Some new user data set at " + System.currentTimeMillis();
-        acomponent.setUserData(userData);
-
-        final ServiceReference<ConversationalService> ref = acomponent.createSelfRef();
-        Assert.assertNotNull(ref);
-
-        final ConversationalService resolvedRef = ref.getService();
-        Assert.assertNotNull(resolvedRef);
-        final String newUserData = resolvedRef.getUserData();
-        Assert.assertNotNull(newUserData);
-
-        Assert.assertEquals(userData, newUserData);
-    }
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
deleted file mode 100644
index 927e91a8bc..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
+++ /dev/null
@@ -1,145 +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.itest.callableref;

-

-

-import static junit.framework.Assert.assertEquals;

-

-import java.io.File;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.node.Client;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-

-/**

- * Runs a distributed domain in a single VM by using and in memory 

- * implementation of the distributed domain

- */

-public class CallableReferenceRemoteTestCase {

-    

-    private static Node nodeA;

-    private static Node nodeB;

-   

-    private static AComponent acomponent;

-

-    @BeforeClass

-    public static void init() throws Exception {

-        

-        try {

-            

-            System.out.println("Setting up nodes");

-                  

-            NodeFactory nodeFactory = NodeFactory.newInstance();

-            nodeA = nodeFactory.createNode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(),

-                                             new Contribution("TestContribution", 

-                                                                 new File("src/main/resources/nodeA").toURL().toString()));

-            

-     

-            nodeB = nodeFactory.createNode(new File("src/main/resources/nodeB/CompositeB.composite").toURL().toString(),

-                                             new Contribution("TestContribution", 

-                                                                 new File("src/main/resources/nodeB").toURL().toString()));

-            

-            

-            nodeA.start();

-            nodeB.start();

-            

-            acomponent = ((Client)nodeA).getService(AComponent.class, "AComponent/AComponent");

-               

-        } catch (Throwable ex) {

-            System.out.println(ex.toString());

-            // Print detailed cause information.

-            ex.printStackTrace();

-            StringBuffer sb = new StringBuffer();

-            Throwable cause = ex.getCause();

-            while ( cause != null ) {

-                sb.append( "   " );

-                System.out.println( sb.toString() + "Cause: " + cause );

-                if (cause instanceof java.lang.reflect.InvocationTargetException)

-                    System.out.println( sb.toString() + "Target Exception: " + ((java.lang.reflect.InvocationTargetException)cause).getTargetException() );

-                cause = cause.getCause();                

-            }

-        }

-   }

-

-    @AfterClass

-    public static void destroy() throws Exception {

-        // stop the nodes and hence the domains they contain        

-        nodeA.stop();

-        nodeB.stop();

-    }

-

-    //@Test

-    public void testKeepServerRunning1() throws Exception {

-        System.out.println("press enter to continue");

-        System.in.read();

-    } 

-    

-    @Test

-    public void testBReference() {

-        assertEquals("BComponent", acomponent.fooB());

-    }

-

-    @Test

-    public void testBCast() {

-        assertEquals("BComponent", acomponent.fooB1());

-    }

-    

-    @Test

-    public void testCReference() {

-        assertEquals("CComponent", acomponent.fooC());

-    }

-    

-    @Test

-    public void testCServiceReference() {

-        assertEquals("CComponent", acomponent.fooC1());

-    }    

-

-    @Test

-    public void testDReferenceString() {

-        assertEquals("DAComponent", acomponent.fooStringD());

-    }

-  

-    @Test

-    public void testDReference() {

-        assertEquals("DAComponent", acomponent.fooD());

-    }    

-

-    

-    @Test

-    public void testBCReference() {

-        assertEquals("BCComponent", acomponent.fooBC());

-    }

-

-    @Test

-    public void testRequiredFalseReference() {

-        try {

-            acomponent.invokeDReference();

-        } catch (Exception e) {

-            Assert.assertTrue(true);

-        }

-    }

-

-}

diff --git a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java b/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
deleted file mode 100644
index f2d8fe5d64..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
+++ /dev/null
@@ -1,48 +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.itest.callableref;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.callablerefreturn.Alpha;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class CallableReferenceReturnTestCase {
-    private static SCADomain domain;
-    private static Alpha alpha;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("CallableReferenceReturnTest.composite");
-        alpha = domain.getService(Alpha.class, "Alpha");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void testCallableReferenceReturn() {
-        Assert.assertTrue(alpha.run());
-    }
-
-}
diff --git a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
deleted file mode 100644
index d785a6a397..0000000000
--- a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
+++ /dev/null
@@ -1,83 +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.itest.callableref;
-
-import static junit.framework.Assert.assertEquals;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class CallableReferenceTestCase {
-    private static SCADomain domain;
-    private static AComponent acomponent;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("CallableReferenceTest.composite");
-        acomponent = domain.getService(AComponent.class, "AComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void testBReference() {
-        assertEquals("BComponent", acomponent.fooB());
-    }
-
-    @Test
-    public void testBCast() {
-        assertEquals("BComponent", acomponent.fooB1());
-    }
-    
-    @Test
-    public void testCReference() {
-        assertEquals("CComponent", acomponent.fooC());
-    }
-    
-    @Test
-    public void testCServiceReference() {
-        assertEquals("CComponent", acomponent.fooC1());
-    }    
-
-    @Test
-    public void testDReference() {
-        assertEquals("DAComponent", acomponent.fooD());
-    }
-
-    @Test
-    public void testBCReference() {
-        assertEquals("BCComponent", acomponent.fooBC());
-    }
-
-    @Test
-    public void testRequiredFalseReference() {
-        try {
-            acomponent.invokeDReference();
-        } catch (Exception e) {
-            Assert.assertTrue(true);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/build-jar.xml b/java/sca-contrib/itest/contribution-classloader/contribution-classes/build-jar.xml
deleted file mode 100644
index 299ce6864f..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/build-jar.xml
+++ /dev/null
@@ -1,39 +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 name="JarCreator">
-
-    <target name="create-jar">
-
-        <mkdir dir="${jar.dir}"/>
-
-        <copy file="target/classes/META-INF/${sca.contribution}" tofile="target/classes/META-INF/sca-contribution.xml"/>
-
-
-        <jar jarfile="${jar.dir}/${jar.file.name}" >
-            <fileset dir="${files.dir}" includes="${files.list}">
-                <!-- include name="${files.list}"/-->
-            </fileset>
-        </jar>
-
-        <delete file="target/classes/META-INF/sca-contribution.xml"/>
-    </target>
-
-
-</project>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/pom.xml b/java/sca-contrib/itest/contribution-classloader/contribution-classes/pom.xml
deleted file mode 100644
index 55076f0f5e..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/pom.xml
+++ /dev/null
@@ -1,203 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-classloader-classes</artifactId>
-    <name>Apache Tuscany Contribution ClassLoader Test : Contribution Classes</name>
-
-<dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>itest-contribution-classloader-classes</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-jar</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="SupplyChain.jar" />
-                                    <property name="sca.contribution" value="supplychain-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/supplychain.composite \
-                                               supplychain/warehouse/JavaWarehouseComponentImpl.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="CompleteSupplyChain.jar" />
-                                    <property name="sca.contribution" value="complete-supplychain-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/supplychain.composite \
-                                               supplychain/customer/* \
-                                               supplychain/retailer/* \
-                                               supplychain/warehouse/* \
-                                               supplychain/shipper/* \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Customer.jar" />
-                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Retailer.jar" />
-                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/* \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Shipper.jar" />
-                                    <property name="sca.contribution" value="shipper-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/* \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Warehouse.jar" />
-                                    <property name="sca.contribution" value="warehouse-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/* \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="IllegalSupplyChain1.jar" />
-                                    <property name="sca.contribution" value="illegal1-supplychain-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/illegalsupplychain.composite \
-                                               supplychain/warehouse/JavaWarehouseComponentImpl.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="IllegalSupplyChain2.jar" />
-                                    <property name="sca.contribution" value="illegal2-supplychain-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/illegalsupplychain.composite \
-                                               supplychain/warehouse/JavaWarehouseComponentImpl.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="IllegalCustomer.jar" />
-                                    <property name="sca.contribution" value="illegal-customer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               supplychain/illegal/* \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="CustomerInterface.jar" />
-                                    <property name="sca.contribution" value="customer-interface-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-jar.xml" target="create-jar">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="CustomerImpl.jar" />
-                                    <property name="sca.contribution" value="customer-impl-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/JavaCustomerComponentImpl.class \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 8cadb2420e..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ /dev/null
@@ -1,35 +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 supplychain.customer;
-
-import org.oasisopen.sca.annotation.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-    
-    public void purchaseGoods();
-    
-    @OneWay
-    public void notifyShipment(String order);
-    
-    public int outstandingOrderCount();
-
-}
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 6a4bb82953..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,63 +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 supplychain.customer;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private static int outstandingOrderCount;
-    
-    private Retailer retailer;
-    
-    public JavaCustomerComponentImpl() {
-        System.out.println("Created " + this.getClass().getName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setRetailer(Retailer retailer) {
-        this.retailer = retailer;
-    }
-    
-    public void purchaseGoods() {
-        outstandingOrderCount++;
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrderCount--;
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public int outstandingOrderCount() {
-        return outstandingOrderCount;
-    }
-
-}
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
deleted file mode 100644
index 3c88ac9272..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,74 +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 supplychain.illegal;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.customer.Customer;
-import supplychain.retailer.JavaRetailerComponentImpl;
-import supplychain.retailer.Retailer;
-import supplychain.warehouse.JavaWarehouseComponentImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private static int outstandingOrderCount;
-    
-    private Retailer retailer;
-    
-    public JavaCustomerComponentImpl() {
-        System.out.println("Created " + this.getClass().getName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setRetailer(Retailer retailer) {
-        this.retailer = retailer;
-    }
-    
-    public void purchaseGoods() {
-        
-        Retailer retailerImpl = new JavaRetailerComponentImpl();
-        System.out.println("Created a retailer from Customer " + retailerImpl);
-        
-        Warehouse warehouseImpl = new JavaWarehouseComponentImpl();
-        System.out.println("Created a warehouse from Customer " + warehouseImpl);
-
-        outstandingOrderCount++;
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrderCount--;
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public int outstandingOrderCount() {
-        return outstandingOrderCount;
-    }
-
-}
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index e8342ee7b9..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,61 +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 supplychain.retailer;
-
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (POJO implementation).
- */
-@Service(Retailer.class)
-@Scope("STATELESS")
-public class JavaRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    public JavaRetailerComponentImpl() {
-        System.out.println("Created " + this.getClass().getName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setWarehouse(Warehouse warehouse) {
-        this.warehouse = warehouse;
-    }
-    
-     
-    public Warehouse getWarehouse() {
-        return warehouse;
-    }
-
-    public void submitOrder(String order) {
-    	
-        warehouse.fulfillOrder(order + ", submitted");
-        
-    }
-
-    
-    
-   
-}
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ /dev/null
@@ -1,28 +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 supplychain.retailer;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-    
-    public void submitOrder(String order);
-
-}
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index cf016617a6..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.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 supplychain.shipper;
-
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (POJO implementation).
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-    
-    private Customer customer;
-    
-    public JavaShipperComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ /dev/null
@@ -1,28 +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 supplychain.shipper;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-    
-    public void processShipment(String order);
-
-}
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index e81a11e55a..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.warehouse;
-
-import org.oasisopen.sca.annotation.Scope;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (POJO implementation).
- */
-@Scope("STATELESS")
-public class JavaWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    public JavaWarehouseComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using: " + this.getClass().getClassLoader());
-    }
-    
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ /dev/null
@@ -1,28 +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 supplychain.warehouse;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-    
-    public void fulfillOrder(String order);
-
-}
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
deleted file mode 100644
index 714d1826e1..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-              
-   <deployable composite="supplychain:supplychain"/>
-   
-</contribution>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
deleted file mode 100644
index 7f7dc969e2..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.customer"/>
-   <import.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-</contribution>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
deleted file mode 100644
index 7f7dc969e2..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.customer"/>
-   <import.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-</contribution>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
deleted file mode 100644
index 8a2bec308f..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-</contribution>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
deleted file mode 100644
index c77c4c1c7e..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.customer"/>
-   <export.java package="supplychain.illegal"/>
-   <import.java package="supplychain.retailer"/>
-</contribution>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
deleted file mode 100644
index 210a68011f..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-</contribution>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
deleted file mode 100644
index d118cceef9..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-   
-   <import.java package="supplychain.customer"/>
-   <import.java package="supplychain.illegal"/>
-   <import.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-   
-</contribution>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
deleted file mode 100644
index d37b6659da..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-</contribution>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
deleted file mode 100644
index 77b28d9023..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.shipper"/>
-   <import.java package="supplychain.customer"/>
-</contribution>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
deleted file mode 100644
index 8ec290a831..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,30 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-              
-   <deployable composite="supplychain:supplychain"/>
-   
-   <import.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-</contribution>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
deleted file mode 100644
index 1398416978..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-</contribution>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
deleted file mode 100644
index db1f0d34e7..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
+++ /dev/null
@@ -1,48 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponent">

-        <implementation.java class="supplychain.illegal.JavaCustomerComponentImpl" />

-        <reference name="retailer" target="RetailerComponent" />

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.java class="supplychain.shipper.JavaShipperComponentImpl" />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
deleted file mode 100644
index 5be79b741a..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
+++ /dev/null
@@ -1,48 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponent">

-        <implementation.java class="supplychain.customer.JavaCustomerComponentImpl" />

-        <reference name="retailer" target="RetailerComponent" />

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.java class="supplychain.shipper.JavaShipperComponentImpl" />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
deleted file mode 100644
index a76fae8090..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="JavaWarehouseComponentImpl">
-        <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    
-    <reference name="shipper">
-            <interface.java interface="supplychain.shipper.Shipper"/>
-    </reference>
-</componentType>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-test/pom.xml b/java/sca-contrib/itest/contribution-classloader/contribution-test/pom.xml
deleted file mode 100644
index dfa0efd5d5..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-test/pom.xml
+++ /dev/null
@@ -1,53 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-classloader-test</artifactId>
-    <name>Apache Tuscany Contribution Classloader tests</name>
-
-<dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
deleted file mode 100644
index 18fc2bbc88..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
+++ /dev/null
@@ -1,373 +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.contribution;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URLClassLoader;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * 
- * Contribution ClassLoading integration tests
- */
-
-public class ContributionTestCase {
-
-    private SupplyChain supplyChain;
-    
-    
-    @Before
-    public void setUp() throws Exception {
-        supplyChain = new SupplyChain();
-    }
-	
-
-	@After
-    public void tearDown() throws Exception {
-
-        supplyChain.tearDown();
-        
-	}
-
-   
-    /**
-     * Test static ClassLoading for classes that are visible from contribution
-     * 
-     * @throws Exception
-     */
-    public void staticClassLoadingTestForVisibleClasses() throws Exception {
-        
-        Contribution customerContribution = supplyChain.getContribution("Customer");
-        ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
-        customerClassRef = customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
-        Class<?> customerClass = customerClassRef.getJavaClass();
-        
-        Class customerClassFromContribution = customerContribution.getClassLoader().loadClass("supplychain.customer.Customer");
-        Assert.assertEquals(customerClass, customerClassFromContribution);
-        
-        Object customer = supplyChain.getCustomer(customerClass);
-                
-        Method m = customerClass.getMethod("purchaseGoods");
-        m.invoke(customer);
-        
-
-        m = customerClass.getMethod("outstandingOrderCount");
-        
-        int retries = 10;
-        int outstandingCount = 1;
-        while (retries-- > 0) {
-        
-            outstandingCount = (int)(Integer)m.invoke(customer);
-            if (outstandingCount == 0)
-                break;
-            else
-                Thread.sleep(100);
-        }
-        Assert.assertEquals(0, outstandingCount);
-        
-        
-    }
-    
-
-    /**
-     * Test dynamic ClassLoading for classes that are visible from contribution
-     * 
-     * @throws Exception
-     */
-    public void dynamicClassLoadingTestForVisibleClasses() throws Exception {
-        
-        Contribution customerContribution = supplyChain.getContribution("Customer");
-        Contribution retailerContribution = supplyChain.getContribution("Retailer");
-        Contribution warehouseContribution = supplyChain.getContribution("Warehouse");
-        Contribution shipperContribution = supplyChain.getContribution("Shipper");
-        Contribution supplyChainContribution = supplyChain.getContribution("SupplyChain");
-        
-        ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
-        customerClassRef = customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
-        Class customerClass = customerClassRef.getJavaClass();
-        
-        Class customerClassFromContribution = customerContribution.getClassLoader().loadClass("supplychain.customer.Customer");
-        Assert.assertEquals(customerClass, customerClassFromContribution);
-        
-        Object customer = supplyChain.getCustomer(customerClass);
-        Assert.assertTrue(customerClass.isInstance(customer));
-        
-        ClassReference retailerClassRef = new ClassReference("supplychain.retailer.Retailer");
-        retailerClassRef = retailerContribution.getModelResolver().resolveModel(ClassReference.class, retailerClassRef);
-        Class retailerClass = retailerClassRef.getJavaClass();
-        
-        Class retailerClassFromContribution = retailerContribution.getClassLoader().loadClass("supplychain.retailer.Retailer");
-        Assert.assertEquals(retailerClass, retailerClassFromContribution);
-        
-        Class retailerClassFromCustomer = customerContribution.getClassLoader().loadClass("supplychain.retailer.Retailer");
-        Assert.assertEquals(retailerClass, retailerClassFromCustomer);
-        
-        ClassReference warehouseClassRef = new ClassReference("supplychain.warehouse.Warehouse");
-        warehouseClassRef = warehouseContribution.getModelResolver().resolveModel(ClassReference.class, warehouseClassRef);
-        Class warehouseClass = warehouseClassRef.getJavaClass();
-        
-        Class warehouseClassFromContribution = warehouseContribution.getClassLoader().loadClass("supplychain.warehouse.Warehouse");
-        Assert.assertEquals(warehouseClass, warehouseClassFromContribution);
-        
-        Class warehouseClassFromRetailer = retailerContribution.getClassLoader().loadClass("supplychain.warehouse.Warehouse");
-        Assert.assertEquals(warehouseClass, warehouseClassFromRetailer);
-        
-        ClassReference shipperClassRef = new ClassReference("supplychain.shipper.Shipper");
-        shipperClassRef = shipperContribution.getModelResolver().resolveModel(ClassReference.class, shipperClassRef);
-        Class shipperClass = shipperClassRef.getJavaClass();
-        
-        Class shipperClassFromContribution = shipperContribution.getClassLoader().loadClass("supplychain.shipper.Shipper");
-        Assert.assertEquals(shipperClass, shipperClassFromContribution);
-        
-        Class shipperClassFromWarehouse = shipperContribution.getClassLoader().loadClass("supplychain.shipper.Shipper");
-        Assert.assertEquals(shipperClass, shipperClassFromWarehouse);
-        
-        Class customerClassFromShipper = shipperContribution.getClassLoader().loadClass("supplychain.customer.Customer");
-        Assert.assertEquals(customerClass, customerClassFromShipper);
-        
-        Class customerClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.customer.Customer");
-        Assert.assertEquals(customerClass, customerClassFromSupplyChain);
-        Class retailerClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.retailer.Retailer");
-        Assert.assertEquals(retailerClass, retailerClassFromSupplyChain);
-        Class warehouseClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.warehouse.Warehouse");
-        Assert.assertEquals(warehouseClass, warehouseClassFromSupplyChain);
-        Class shipperClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.shipper.Shipper");
-        Assert.assertEquals(shipperClass, shipperClassFromSupplyChain);
-        
-    }
-    
-    /**
-     * Test dynamic ClassLoading for classes that are visible from contribution
-     * 
-     * @throws Exception
-     */
-    public void dynamicClassLoadingTestForNonImportedClasses() throws Exception {
-        
-        Contribution customerContribution = supplyChain.getContribution("Customer");
-        Contribution shipperContribution = supplyChain.getContribution("Shipper");
-        
-        Class customerClass = customerContribution.getClassLoader().loadClass("supplychain.customer.Customer"); 
-        Class shipperClass = shipperContribution.getClassLoader().loadClass("supplychain.shipper.Shipper");
-        
-        try {
-            customerClass.getClassLoader().loadClass("supplychain.warehouse.Warehouse");
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        try {
-            customerClass.getClassLoader().loadClass("supplychain.shipper.JavaShipperComponentImpl");
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        
-        try {
-            Class.forName("supplychain.warehouse.Warehouse", true, customerClass.getClassLoader());
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        try {
-            Class.forName("supplychain.shipper.JavaShipperComponentImpl", true, customerClass.getClassLoader());
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        
-        try {
-            shipperClass.getClassLoader().loadClass("supplychain.warehouse.JavaWarehouseComponentImpl");
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        try {
-            shipperClass.getClassLoader().loadClass("supplychain.retailer.Retailer");
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        
-        try {
-            Class.forName("supplychain.warehouse.JavaWarehouseComponentImpl", true, shipperClass.getClassLoader());
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        try {
-            Class.forName("supplychain.retailer.Retailer", true, shipperClass.getClassLoader());
-            Assert.fail("Non-imported class loaded incorrectly");
-        } catch (ClassNotFoundException e) {
-        }
-        
-        
-    }
-    
-
-    /**
-     * This test ensures that classes from imported packages can be statically loaded 
-     * from other contributions even though the classes are not on CLASSPATH or on the 
-     * parent ClassLoader, or the thread context ClassLoader.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testValidStaticClassLoading() throws Exception {
-               
-        supplyChain.setUp(this.getClass().getClassLoader());
-        
-        staticClassLoadingTestForVisibleClasses();
-    }
-    
-    /**
-     * This test ensures that all imported classes are loaded from the exporting contributions 
-     * rather than the parent classLoader. If any of the interface classes were incorrectly loaded 
-     * through the parent ClassLoader, LinkageError should result.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testValidStaticClassLoadingWithContributionsInParentClassLoader() throws Exception {
-        
-        
-        URLClassLoader parentClassLoader = new URLClassLoader(
-                supplyChain.getContributionURLs(),
-                this.getClass().getClassLoader());
-
-        supplyChain.setUp(parentClassLoader);
-        
-        staticClassLoadingTestForVisibleClasses();
-    }
-    
-    
-    /**
-     * This test ensures that classes from imported packages can be dynamically loaded from
-     * other contributions even though the classes are not on CLASSPATH or on the 
-     * parent ClassLoader, or the thread context ClassLoader.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testValidDynamicClassLoading() throws Exception {
-               
-        supplyChain.setUp(this.getClass().getClassLoader());
-        
-        dynamicClassLoadingTestForVisibleClasses();
-    }
-    
-    /**
-     * This test ensures that all imported classes are dynamically loaded from the exporting 
-     * contributions rather  than the parent classLoader. If any of the interface classes were 
-     * incorrectly loaded through the parent, NoClassDefFoundError or LinkageError should result.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testValidDynamicClassLoadingWithContributionsInParentClassLoader() throws Exception {
-        
-        
-        URLClassLoader parentClassLoader = new URLClassLoader(
-                supplyChain.getContributionURLs(),
-                this.getClass().getClassLoader());
-
-        supplyChain.setUp(parentClassLoader);
-        
-        dynamicClassLoadingTestForVisibleClasses();
-    }
-    
-    @Test
-    public void testIllegalStaticClassLoading1() throws Exception {
-        // FIXME we have commented this code as we are not throwing exceptions anymore
-    	// need to deal with monitor logs to catch the errors.
-        
-    	/*try {
-            supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_ILLEGAL_1);
-        
-            Assert.fail("Composite containing unresolved references resolved incorrectly");
-        } catch (ContributionResolveException e) {
-        }*/
-    }
-    
-    @Test
-    public void testIllegalStaticClassLoading2() throws Exception {
-          
-        supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_ILLEGAL_2);
-        
-        Contribution customerContribution = supplyChain.getContribution("Customer");
-        ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
-        customerClassRef = customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
-        Class<?> customerClass = customerClassRef.getJavaClass();
-        
-        Object customer = supplyChain.getCustomer(customerClass);
-                
-        try {
-            Method m = customerClass.getMethod("purchaseGoods");
-            m.invoke(customer);
-            
-            Assert.fail("Classloading exception not thrown as expected");
-        } catch (InvocationTargetException e) {
-            
-            Throwable cause = e.getCause();
-            Assert.assertTrue(cause instanceof NoClassDefFoundError);
-            Assert.assertTrue(cause.getMessage().indexOf("JavaWarehouseComponentImpl") > -1);        }
-        
-    }
-    
-    /**
-     * This test ensures that classes from imported packages can be dynamically loaded from
-     * other contributions even though the classes are not on CLASSPATH or on the 
-     * parent ClassLoader, or the thread context ClassLoader.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testIllegalDynamicClassLoading() throws Exception {
-               
-        supplyChain.setUp(this.getClass().getClassLoader());
-        
-        dynamicClassLoadingTestForNonImportedClasses();
-    }
-    
-    
-    /**
-     * Self-contained contribution containing composites, componentType files and implementations
-     * should not require import/export statements for these files to find each other or for Tuscany
-     * to load these files.
-     * @throws Exception
-     */
-    @Test
-    public void testSelfContainedContribution() throws Exception {
-               
-        supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_SELFCONTAINED);
-        
-        staticClassLoadingTestForVisibleClasses();
-    }
-    
-    @Test
-    public void testContributionsWithSplitPackage() throws Exception {
-               
-        supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_SPLITPACKAGE);
-        
-        staticClassLoadingTestForVisibleClasses();
-        
-        dynamicClassLoadingTestForNonImportedClasses();
-    }
-}
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
deleted file mode 100644
index 1ec7aaaa3a..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
+++ /dev/null
@@ -1,231 +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.contribution;
-
-
-import java.io.File;
-import java.net.URL;
-import java.util.Hashtable;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-import org.junit.Assert;
-
-/*
- * 
- * Contribution ClassLoading integration tests
- */
-
-public class SupplyChain {
-    
-    public static final int SUPPLYCHAIN = 0;
-    public static final int SUPPLYCHAIN_ILLEGAL_1 = 1;
-    public static final int SUPPLYCHAIN_ILLEGAL_2 = 2;
-    public static final int SUPPLYCHAIN_SELFCONTAINED = 3;
-    public static final int SUPPLYCHAIN_SPLITPACKAGE = 4;
-    
-    private String folderName = "../contribution-classes/target/classes";
-
-    private String customerJarName = "Customer";
-    private String retailerJarName = "Retailer";
-    private String warehouseJarName = "Warehouse";
-    private String shipperJarName = "Shipper";
-    private String supplychainJarName = "SupplyChain";
-    private String illegalSupplyChain1JarName = "IllegalSupplyChain1";
-    private String illegalSupplyChain2JarName = "IllegalSupplyChain2";
-    private String illegalCustomerJarName = "IllegalCustomer";
-    private String completeSupplychainJarName = "CompleteSupplyChain";
-    private String customerInterfaceJarName = "CustomerInterface";
-    private String customerImplJarName = "CustomerImpl";
-    
-    
-    private  EmbeddedSCADomain domain;
-    private ContributionService contributionService;
-    private int supplyChainVersion;
-        
-    private Hashtable<String, Contribution> contributions = new Hashtable<String, Contribution>();
-    
-    private URL customerContribURL;
-    private URL retailerContribURL;
-    private URL warehouseContribURL;
-    private URL shipperContribURL;
-    private URL supplyChainContribURL;
-    private URL illegalSupplyChain1ContribURL;
-    private URL illegalSupplyChain2ContribURL;
-    private URL illegalCustomerContribURL;
-    private URL completeSupplyChainContribURL;
-    private URL customerInterfaceContribURL;
-    private URL customerImplContribURL;
-    
-    public SupplyChain() throws Exception {
-        
-        customerContribURL = new File(folderName + "/" + customerJarName + ".jar").toURI().toURL();
-        retailerContribURL = new File(folderName + "/" + retailerJarName + ".jar").toURI().toURL();
-        warehouseContribURL = new File(folderName + "/" + warehouseJarName + ".jar").toURI().toURL();
-        shipperContribURL = new File(folderName + "/" + shipperJarName + ".jar").toURI().toURL();
-        supplyChainContribURL = new File(folderName + "/" + supplychainJarName + ".jar").toURI().toURL();
-        illegalSupplyChain1ContribURL = new File(folderName + "/" + illegalSupplyChain1JarName + ".jar").toURI().toURL();
-        illegalSupplyChain2ContribURL = new File(folderName + "/" + illegalSupplyChain2JarName + ".jar").toURI().toURL();
-        illegalCustomerContribURL = new File(folderName + "/" + illegalCustomerJarName + ".jar").toURI().toURL();
-        completeSupplyChainContribURL = new File(folderName + "/" + completeSupplychainJarName + ".jar").toURI().toURL();
-        customerInterfaceContribURL = new File(folderName + "/" + customerInterfaceJarName + ".jar").toURI().toURL();
-        customerImplContribURL = new File(folderName + "/" + customerImplJarName + ".jar").toURI().toURL();
-    }
-    
-    public void setUp(ClassLoader parentClassLoader) throws Exception  {
-        this.setUp(parentClassLoader, SUPPLYCHAIN);
-    }
-    
-    public void setUp(ClassLoader parentClassLoader, int supplyChainVersion) throws Exception {
-        
-        this.supplyChainVersion = supplyChainVersion;
-        
-        Thread.currentThread().setContextClassLoader(parentClassLoader);
-        
-        //Create an embedded SCA domain
-        domain = new EmbeddedSCADomain(parentClassLoader, "http://localhost");
-
-        //Start the domain
-        domain.start();
-
-        this.contributionService = domain.getContributionService();
-        
-        addContributions(supplyChainVersion);
-    }
-        
-    protected void addContributions(int supplyChainVersion) throws Exception {
-            
-        Contribution contribution;
-        
-        if (supplyChainVersion != SUPPLYCHAIN_SELFCONTAINED) {
-            contribution = contributionService.contribute("Shipper", shipperContribURL, true);
-            contributions.put("Shipper", contribution);
-            contribution = contributionService.contribute("Warehouse", warehouseContribURL, true);
-            contributions.put("Warehouse", contribution);
-            contribution = contributionService.contribute("Retailer", retailerContribURL, true);
-            contributions.put("Retailer", contribution);
-        }
-        
-        switch (supplyChainVersion) {
-        case SUPPLYCHAIN:
-            contribution = contributionService.contribute("Customer", customerContribURL, true);
-            contributions.put("Customer", contribution);
-            
-            contribution = contributionService.contribute("SupplyChain", supplyChainContribURL, true);
-            contributions.put("SupplyChain", contribution);
-            break;
-        case SUPPLYCHAIN_ILLEGAL_1:
-            contribution = contributionService.contribute("Customer", customerContribURL, true);
-            contributions.put("Customer", contribution);
-            
-            contribution = contributionService.contribute("SupplyChain", illegalSupplyChain1ContribURL, true);
-            contributions.put("SupplyChain", contribution);
-            break;
-        case SUPPLYCHAIN_ILLEGAL_2:
-            contribution = contributionService.contribute("Customer", illegalCustomerContribURL, true);
-            contributions.put("Customer", contribution);
-            
-            contribution = contributionService.contribute("SupplyChain", illegalSupplyChain2ContribURL, true);
-            contributions.put("SupplyChain", contribution);
-            break;
-        case SUPPLYCHAIN_SELFCONTAINED:
-            contribution = contributionService.contribute("SupplyChain", completeSupplyChainContribURL, true);
-            contributions.put("SupplyChain", contribution);
-            break;
-        case SUPPLYCHAIN_SPLITPACKAGE:
-            contribution = contributionService.contribute("Customer", customerInterfaceContribURL, true);
-            contributions.put("Customer", contribution);
-            
-            contribution = contributionService.contribute("CustomerImpl", customerImplContribURL, true);
-            contributions.put("CustomerImpl", contribution);
-            
-            contribution = contributionService.contribute("SupplyChain", supplyChainContribURL, true);
-            contributions.put("SupplyChain", contribution);
-            break;
-        }
-        
-        // SUPPLYCHAIN_ILLEGAL_1 should throw an exception when the composite is resolved, and hence
-        // should not get this far.
-        Assert.assertTrue(supplyChainVersion != SUPPLYCHAIN_ILLEGAL_1);
-            
-        
-        for (Contribution c : contributions.values()) {
-
-            for (Composite deployable : c.getDeployables()) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-        }
-            
-        // Start Components from my composite
-        for (Composite deployable : contributions.get("SupplyChain").getDeployables() ) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }
-    }
-   
-    public void tearDown() throws Exception {
-        
-        if (domain == null)
-            return;
-        
-        for (String contributionURI : contributions.keySet()) {
-            contributionService.remove(contributionURI);
-        }
-
-
-        if (contributions.get("SupplyChain") != null) {
-            // Stop Components from my composite
-            for (Composite deployable : contributions.get("SupplyChain").getDeployables() ) {
-                domain.getCompositeActivator().stop(deployable);
-                domain.getCompositeActivator().deactivate(deployable);
-            }
-        }
-
-        domain.stop();
-
-        domain.close();
-    }
-
-    public Contribution getContribution(String uri) {
-        if (supplyChainVersion == SUPPLYCHAIN_SELFCONTAINED)
-            return contributions.get("SupplyChain");
-        else
-            return contributions.get(uri);
-    }
-    
-    public Object getCustomer(Class<?> customerClass) {
-        return domain.getService(customerClass, "CustomerComponent");
-    }
-      
-    public URL[] getContributionURLs() {
-        return new URL[] {
-                customerContribURL,
-                retailerContribURL,
-                warehouseContribURL,
-                shipperContribURL,
-                supplyChainContribURL
-        };
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
deleted file mode 100644
index 9918ce8fca..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
+++ /dev/null
@@ -1,381 +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.contribution;

-

-import java.io.File;

-import java.io.FileNotFoundException;

-import java.io.IOException;

-import java.lang.reflect.Constructor;

-import java.lang.reflect.Method;

-import java.net.URL;

-import java.net.URLClassLoader;

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.List;

-

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-import org.oasisopen.sca.ServiceReference;

-

-/*

- * 

- * Contribution ClassLoading integration tests

- */

-

-//FIXME This test case needs some serious rework!

-// First it is very dependent on the names of the Tuscany runtime JARs

-// and this is going to be difficult to maintain

-// Second its usage of reflection requires the Tuscany implementation classes

-// to be made public and this breaks isolation between modules.

-public class TuscanyClassloadingTestCaseFIXME {

-

-    //	private static final int SCA_API = 1;

-    //	private static final int TUSCANY_CORE_SPI = 2;

-    //	private static final int TUSCANY_RUNTIME = 3;

-    //	private static final int TUSCANY_EXTENSIONS = 4;

-    //	private static final int TUSCANY_DEPENDENCIES = 0;

-

-    private static final String[] scaApiJars = {"sca-api"};

-    private static final String[] tuscanyCoreSpiJars =

-        {"core-spi", "interface", "interface-java", "interface-wsdl", "assembly", "policy", "databinding",

-         "contribution", "definitions"};

-    private static final String[] tuscanyRuntimeJars =

-        {

-

-        "binding-sca-xml", "binding-sca", "assembly-java-dsl", "assembly-xml", "assembly-xsd", "contribution-impl",

-         "contribution-java", "contribution-namespace", "core-databinding", "core-spring", "core", "definitions-xml",

-         "domain-api", "domain-impl", "domain", "extension-helper", "host-embedded", "interface-java-xml",

-         "interface-wsdl-xml", "java2wsdl", "node-api", "node-impl", "node", "osgi-runtime", "policy-logging",

-         "policy-security", "policy-transaction", "policy-xml", "wsdl2java"};

-    private static final String[] tuscanyExtensionJars =

-        {"binding-dwr", "binding-ejb", "binding-feed", "binding-http", "binding-jms", "binding-jsonrpc",

-         "binding-notification", "binding-rmi", "binding-sca-axis2", "binding-ws-axis2", "binding-ws-xml",

-         "binding-ws", "databinding-axiom", "databinding-fastinfoset", "databinding-jaxb", "databinding-json",

-         "databinding-saxon", "databinding-sdo-axiom", "databinding-sdo", "databinding-xmlbeans", "host-http",

-         "host-jetty", "host-rmi", "host-tomcat", "host-webapp", "implementation-das.jar", "implementation-data.jar",

-         "implementation-java-runtime", "implementation-java-xml", "implementation-java",

-         "implementation-node-runtime", "implementation-node-xml", "implementation-node",

-         "implementation-notification", "implementation-osgi", "implementation-resource", "implementation-script",

-         "implementation-spring", "implementation-xquery", "contribution-osgi"};

-

-    private Class<?> embeddedDomainClass;

-    Object domain;

-

-    @Before

-    public void setUp() throws Exception {

-

-        embeddedDomainClass = getEmbeddedDomainClass();

-

-        Constructor c = embeddedDomainClass.getConstructor(ClassLoader.class, String.class);

-        // Create an embedded domain

-        domain = c.newInstance(embeddedDomainClass.getClassLoader(), "http://localhost");

-

-        // Start the domain

-        invokeNoArgsMethod(domain, "start");

-

-    }

-

-    @After

-    public void tearDown() throws Exception {

-

-        // Stop the domain

-        invokeNoArgsMethod(domain, "stop");

-

-    }

-

-    /**

-     * Create a ClassLoader hierarchy for Tuscany runtime

-     *     Dependencies <- SCA-API <- Core-SPI+ Runtime <- Extensions

-     * Load the embedded SCA domain class using the runtime ClassLoader

-     * 

-     * @return embedded SCA domain class

-     * @throws Exception

-     */

-    private Class<?> getEmbeddedDomainClass() throws Exception {

-

-        URL[] scaApiUrls;

-        URL[] runtimeUrls;

-        URL[] extensionUrls;

-        URL[] dependencyUrls;

-

-        // When the test is run under Eclipse, the ClassLoader for the test is

-        // sun.misc.Launcher$AppClassLoader. The first code path is taken.

-        // When the test is run under Maven, the ClassLoader for the test is

-        // org.apache.maven.surefire.booter.IsolatedClassLoader, which is a subclass

-        // of URLClassLoader. The second code path is taken.

-        if (!(this.getClass().getClassLoader() instanceof URLClassLoader)) {

-            String classPath = System.getProperty("java.class.path");

-            String[] classPathEntries = classPath.split(System.getProperty("path.separator"));

-            HashSet<String> dependentJars = new HashSet<String>();

-            for (int i = 0; i < classPathEntries.length; i++) {

-                dependentJars.add(classPathEntries[i]);

-            }

-

-            scaApiUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, scaApiJars);

-            runtimeUrls =

-                getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyCoreSpiJars, tuscanyRuntimeJars);

-            extensionUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyExtensionJars);

-            dependencyUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars);

-        } else {

-            HashSet<URL> dependentJars = new HashSet<URL>();

-            URL[] classPathEntries = ((URLClassLoader)this.getClass().getClassLoader()).getURLs();

-            for (int i = 0; i < classPathEntries.length; i++) {

-                dependentJars.add(classPathEntries[i]);

-            }

-            scaApiUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, scaApiJars);

-            runtimeUrls =

-                getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyCoreSpiJars, tuscanyRuntimeJars);

-            extensionUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyExtensionJars);

-            dependencyUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars);

-

-        }

-

-        boolean useSingleClassLoader =

-            (scaApiUrls == null || scaApiUrls.length == 0) || (runtimeUrls == null || runtimeUrls.length == 0)

-                || (extensionUrls == null || extensionUrls.length == 0)

-                || (dependencyUrls == null || dependencyUrls.length == 0);

-

-        if (useSingleClassLoader) {

-            return EmbeddedSCADomain.class;

-        } else {

-

-            ClassLoader dependencyLoader = new URLClassLoader(dependencyUrls, null);

-            ClassLoader scaApiLoader = new URLClassLoader(scaApiUrls, dependencyLoader);

-            ClassLoader runtimeClassLoader = new URLClassLoader(runtimeUrls, scaApiLoader);

-            ClassLoader extensionClassLoader = new URLClassLoader(extensionUrls, runtimeClassLoader);

-

-            Class<?> serviceDiscoveryClass = runtimeClassLoader.loadClass(ServiceDiscovery.class.getName());

-            Method getInstanceMethod = serviceDiscoveryClass.getMethod("getInstance");

-            Object serviceDiscoveryObj = getInstanceMethod.invoke(null);

-            Method registerClassLoaderMethod =

-                serviceDiscoveryClass.getMethod("registerClassLoader", ClassLoader.class);

-            registerClassLoaderMethod.invoke(serviceDiscoveryObj, extensionClassLoader);

-

-            Thread.currentThread().setContextClassLoader(extensionClassLoader);

-

-            return runtimeClassLoader.loadClass(EmbeddedSCADomain.class.getName());

-

-        }

-

-    }

-

-    /**

-     * From the list of entries in the test ClassLoader, match

-     * Tuscany jars corresponding to a ClassLoader, and return the list

-     * of matching entries as URLs.

-     * This method is used when the test is run under eclipse, using CLASSPATH

-     * based application ClassLoader.

-     * 

-     * @param classPathEntries List of entries on CLASSPATH

-     * @param dependentJars Complete set of jars, remove jars corresponding to this

-     *                      ClassLoader from the set.

-     * @param jars List of Tuscany jars corresponding to this ClassLoader

-     * @return Matching URLs for the ClassLoader 

-     * @throws IOException

-     */

-    private URL[] getTuscanyClassLoaderURLs(String[] classPathEntries, HashSet<String> dependentJars, String[]... jars)

-        throws IOException {

-

-        String pathSeparator = System.getProperty("file.separator");

-        HashSet<String> classPathEntrySet;

-

-        if (jars.length == 0)

-            classPathEntrySet = dependentJars;

-        else {

-            classPathEntrySet = new HashSet<String>();

-

-            for (int i = 0; i < classPathEntries.length; i++) {

-

-                String classPathEntry = classPathEntries[i];

-                for (int j = 0; j < jars.length; j++) {

-                    String[] jarList = jars[j];

-                    if (jarList != null) {

-                        for (int k = 0; k < jarList.length; k++) {

-                            String jarName = "tuscany-" + jarList[k];

-                            String alternateJarName = "modules" + pathSeparator + jarList[k];

-                            if (classPathEntry.indexOf(jarName) >= 0 || classPathEntry.indexOf(alternateJarName) >= 0) {

-                                classPathEntrySet.add(classPathEntry);

-                                dependentJars.remove(classPathEntry);

-                            }

-                        }

-                    }

-                }

-            }

-

-        }

-        ArrayList<URL> urls = new ArrayList<URL>();

-

-        for (String fileName : classPathEntrySet) {

-            File file = new File((String)fileName);

-            if (!file.exists()) {

-                throw new FileNotFoundException(fileName);

-

-            } else {

-                urls.add(file.toURL());

-

-            }

-        }

-

-        return (URL[])urls.toArray(new URL[urls.size()]);

-    }

-

-    /**

-     * From the list of URLs of the test ClassLoader, match

-     * Tuscany jars corresponding to a ClassLoader, and return the matching URLs

-     * This method is used when the test is run under Maven. The test ClassLoader is

-     * org.apache.maven.surefire.booter.IsolatedClassLoader, which is a subclass

-     * of URLClassLoader

-     * 

-     * @param classPathEntries List of URLs from the test ClassLoader

-     * @param dependentJars Complete set of jars, remove jars corresponding to this

-     *                      ClassLoader from the set.

-     * @param jars List of Tuscany jars corresponding to this ClassLoader

-     * @return Matching URLs for the ClassLoader 

-     * @throws IOException

-     */

-    private URL[] getTuscanyClassLoaderURLs(URL[] classPathEntries, HashSet<URL> dependentJars, String[]... jars)

-        throws IOException {

-

-        String pathSeparator = System.getProperty("file.separator");

-        HashSet<URL> classPathEntrySet;

-

-        if (jars.length == 0)

-            classPathEntrySet = dependentJars;

-        else {

-            classPathEntrySet = new HashSet<URL>();

-

-            for (int i = 0; i < classPathEntries.length; i++) {

-

-                URL classPathEntry = classPathEntries[i];

-                String classPathEntryStr = classPathEntry.getPath();

-                for (int j = 0; j < jars.length; j++) {

-                    String[] jarList = jars[j];

-                    if (jarList != null) {

-                        for (int k = 0; k < jarList.length; k++) {

-                            String jarName = "tuscany-" + jarList[k];

-                            String alternateJarName = "modules" + pathSeparator + jarList[k];

-                            if (classPathEntryStr.indexOf(jarName) >= 0 || classPathEntryStr.indexOf(alternateJarName) >= 0) {

-                                classPathEntrySet.add(classPathEntry);

-                                dependentJars.remove(classPathEntry);

-                            }

-                        }

-                    }

-                }

-            }

-

-        }

-        return (URL[])classPathEntrySet.toArray(new URL[classPathEntrySet.size()]);

-    }

-

-    private Object invokeNoArgsMethod(Object obj, String methodName) throws Exception {

-

-        return obj.getClass().getMethod(methodName).invoke(obj);

-    }

-

-    private Object invokeOneArgMethod(Object obj, String methodName, Class argType, Object arg) throws Exception {

-

-        return obj.getClass().getMethod(methodName, argType).invoke(obj, arg);

-    }

-

-    /**

-     * 

-     * Load Tuscany runtime using multiple ClassLoaders, and run supplychain

-     * test. 

-     * 

-     * @throws Exception

-     */

-    @SuppressWarnings("unchecked")

-    @Test

-    public void test() throws Exception {

-

-        ClassLoader runtimeClassloader = embeddedDomainClass.getClassLoader();

-

-        if (runtimeClassloader == this.getClass().getClassLoader()) {

-            System.out.println("Runtime and test loaded using the same classloader " + runtimeClassloader);

-        } else {

-            System.out

-                .println("Running test using separate Tuscany classloaders, runtime classloader=" + runtimeClassloader);

-            ClassLoader apiClassLoader =

-                runtimeClassloader.loadClass(ServiceReference.class.getName()).getClassLoader();

-            Assert.assertTrue(apiClassLoader != runtimeClassloader);

-

-            try {

-                runtimeClassloader.loadClass("org.apache.tuscany.sca.implementation.java.JavaImplementation");

-                Assert.fail("Loaded extension class incorrectly from runtimeClassLoader");

-            } catch (ClassNotFoundException e) {

-            }

-

-        }

-

-        // Contribute supplychain (as single contribution)

-        Object contributionService = invokeNoArgsMethod(domain, "getContributionService");

-        Method contributeMethod =

-            contributionService.getClass().getMethod("contribute", String.class, URL.class, boolean.class);

-

-        String folderName = "../contribution-classes/target/classes";

-        String supplychainJarName = "CompleteSupplyChain";

-        URL supplyChainContribURL = new File(folderName + "/" + supplychainJarName + ".jar").toURL();

-        Object contribution = contributeMethod.invoke(contributionService, "SupplyChain", supplyChainContribURL, true);

-

-        Object composite = ((List)invokeNoArgsMethod(contribution, "getDeployables")).get(0);

-        Object domainComposite = invokeNoArgsMethod(domain, "getDomainComposite");

-        List includes = (List)invokeNoArgsMethod(domainComposite, "getIncludes");

-        includes.add(composite);

-        //Object compositeBuilder = invokeNoArgsMethod(domain, "getCompositeBuilder");

-        Object compositeActivator = invokeNoArgsMethod(domain, "getCompositeActivator");

-

-        Class compositeClass = embeddedDomainClass.getClassLoader().loadClass(Composite.class.getName());

-        invokeOneArgMethod(domain, "buildComposite", compositeClass, composite);

-        invokeOneArgMethod(compositeActivator, "activate", compositeClass, composite);

-        invokeOneArgMethod(compositeActivator, "start", compositeClass, composite);

-

-        // Get customer service 

-        Method getClassLoaderMethod = contribution.getClass().getMethod("getClassLoader");

-        ClassLoader classLoader = (ClassLoader)getClassLoaderMethod.invoke(contribution);

-

-        Class customerClass = classLoader.loadClass("supplychain.customer.Customer");

-        Method getServiceMethod = embeddedDomainClass.getMethod("getService", Class.class, String.class);

-        Object customer = getServiceMethod.invoke(domain, customerClass, "CustomerComponent");

-

-        // Invoke purchaseGoods

-        Method m = customerClass.getMethod("purchaseGoods");

-        m.invoke(customer);

-

-        m = customerClass.getMethod("outstandingOrderCount");

-

-        int retries = 10;

-        int outstandingCount = 1;

-        while (retries-- > 0) {

-

-            outstandingCount = (int)(Integer)m.invoke(customer);

-            if (outstandingCount == 0)

-                break;

-            else

-                Thread.sleep(100);

-        }

-        Assert.assertEquals(0, outstandingCount);

-

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution-classloader/pom.xml b/java/sca-contrib/itest/contribution-classloader/pom.xml
deleted file mode 100644
index 7e94f897b8..0000000000
--- a/java/sca-contrib/itest/contribution-classloader/pom.xml
+++ /dev/null
@@ -1,51 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-classloader</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany Contribution ClassLoader Integration Tests</name>
-
-    <modules>
-        <module>contribution-classes</module>
-        <module>contribution-test</module>
-    </modules>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/pom.xml b/java/sca-contrib/itest/contribution-import-export/export-composite/pom.xml
deleted file mode 100644
index 094987318a..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/pom.xml
+++ /dev/null
@@ -1,67 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-contribution-export-composite</artifactId>

-    <name>Apache Tuscany SCA Contribution Export Integration Tests</name>

-

-<dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
deleted file mode 100644
index 32b024bccb..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ /dev/null
@@ -1,30 +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 hello;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * This is the business interface of the Hello service.

- */

-@Remotable

-public interface Hello {

-

-    public String getGreetings(String name);

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
deleted file mode 100644
index 0c60e62d35..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ /dev/null
@@ -1,33 +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 hello;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(Hello.class)

-public class HelloImpl implements Hello {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 3c14560a56..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ /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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://hello"

-              xmlns:hello="http://hello">

-   	<deployable composite="hello:hello"/>

-   	<export namespace="http://hello"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
deleted file mode 100644
index 636b7111d9..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/hello.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"

-	targetNamespace="http://hello"

-	xmlns:hello="http://hello"

-    name="hello">

-

-	<service name="HelloService" promote="HelloServiceComponent"/>

-	

-    <component name="HelloServiceComponent">

-        <implementation.java class="hello.HelloImpl" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/java/sca-contrib/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
deleted file mode 100644
index 72b77564d2..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ /dev/null
@@ -1,91 +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.contribution;

-

-import hello.Hello;

-

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-/**

- * Tests that the helloworld server is available

- */

-public class HelloTestCase extends TestCase {

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-

-    @Override

-    protected void setUp() throws Exception {

-        // Create a test embedded SCA domain

-        cl = getClass().getClassLoader();

-        domain = new EmbeddedSCADomain(cl, "http://localhost");

-

-        // Start the domain

-        domain.start();

-

-        // Contribute the SCA contribution

-        ContributionService contributionService = domain.getContributionService();

-

-        URL helloURL = getContributionURL(Hello.class);

-        

-        // File helloContrib = new File("./target/classes/");

-        // URL helloURL = helloContrib.toURL();

-        Contribution consumerContribution =

-            contributionService.contribute("http://import-export/hello", helloURL, false);

-        Composite consumerComposite = consumerContribution.getDeployables().get(0);

-        domain.getDomainComposite().getIncludes().add(consumerComposite);

-        domain.buildComposite(consumerComposite);

-

-        // Start Components from my composite

-        domain.getCompositeActivator().activate(consumerComposite);

-        domain.getCompositeActivator().start(consumerComposite);

-    }

-

-    private URL getContributionURL(Class<?> cls) throws MalformedURLException {

-        String flag = "/" + cls.getName().replace('.', '/') + ".class";

-        URL url = cls.getResource(flag);

-        String root = url.toExternalForm();

-        root = root.substring(0, root.length() - flag.length() + 1);

-        if (root.startsWith("jar:") && root.endsWith("!/")) {

-            root = root.substring(4, root.length() - 2);

-        }

-        url = new URL(root);

-        return url;

-    }

-

-    public void testHello() throws IOException {

-        Hello hello = domain.getService(Hello.class, "HelloServiceComponent");

-        assertNotNull(hello);

-        assertEquals(hello.getGreetings("lresende"), "Hello lresende");

-    }

-

-    @Override

-    public void tearDown() throws Exception {

-        domain.close();

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/export-java/pom.xml b/java/sca-contrib/itest/contribution-import-export/export-java/pom.xml
deleted file mode 100644
index 7050d77a67..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-java/pom.xml
+++ /dev/null
@@ -1,67 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-contribution-export-java</artifactId>

-    <name>Apache Tuscany SCA Contribution Java Export Integration Tests</name>

-

-<dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 134da7e34b..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index dc33dfa560..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://helloworld"

-              xmlns:helloworld="http://helloworld">

-   	<export.java package="helloworld"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
deleted file mode 100644
index 5a14b41650..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="HelloWorldService">
-        <interface.java interface="helloworld.HelloWorldService" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-import-export/export-resource/pom.xml b/java/sca-contrib/itest/contribution-import-export/export-resource/pom.xml
deleted file mode 100644
index 1202328b00..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-resource/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-export-resource</artifactId>
-    <name>Apache Tuscany SCA Contribution Resource Export Integration Tests</name>
-
-</project>
diff --git a/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index f11eacb416..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://store"
-              xmlns:helloworld="http://store">
-   	<export.resource uri="ufservices/store.html"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
deleted file mode 100644
index 1ff281373a..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ /dev/null
@@ -1,27 +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.    
--->
-<html>
-<head>
-<title>Store</TITLE>
-</head>
-
-<body>
-<h1>Sample Store Page</h1>
-</body>
-</html>
diff --git a/java/sca-contrib/itest/contribution-import-export/export-wsdl/pom.xml b/java/sca-contrib/itest/contribution-import-export/export-wsdl/pom.xml
deleted file mode 100644
index 51f9efd932..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-wsdl/pom.xml
+++ /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.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-contribution-export-wsdl</artifactId>

-    <name>Apache Tuscany SCA Contribution WSDL Export Integration Tests</name>

-

-</project>

diff --git a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index b7394ec14b..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://helloworld"

-              xmlns:helloworld="http://helloworld">

-   	<export namespace="http://helloworld"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
deleted file mode 100644
index 9b31363e1a..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ /dev/null
@@ -1,76 +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://helloworld" 

-                  xmlns:tns="http://helloworld" 

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 

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

-	          name="helloworld">

-

-    <wsdl:types>

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

-                xmlns:tns2="http://helloworld2" 

-                targetNamespace="http://helloworld" 

-                elementFormDefault="qualified">

-                

-  	        <xsd:import namespace="http://helloworld2" schemaLocation="helloworld.xsd" />            

-  	        

-  	       	<element name="getGreetings" type="tns2:getGreetingsType"/>

-		    <element name="getGreetingsResponse" type="tns2:getGreetingsResponseType"/>

-

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldServiceComponent"/>

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
deleted file mode 100644
index d3c83b08c6..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ /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.

--->

-<schema targetNamespace="http://helloworld2" 

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

-	    xmlns:ns="http://helloworld2">

-	

-	<complexType name="getGreetingsType">

-		<sequence>

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

-		</sequence>

-	</complexType>

-

-	<complexType name="getGreetingsResponseType">

-		<sequence>

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

-		</sequence>

-	</complexType>

-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/pom.xml b/java/sca-contrib/itest/contribution-import-export/import-composite/pom.xml
deleted file mode 100644
index be3d2f1fb0..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/pom.xml
+++ /dev/null
@@ -1,73 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-contribution-import-composite</artifactId>

-    <name>Apache Tuscany SCA Contribution Import Integration Tests</name>

-

-<dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>itest-contribution-export-composite</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 05bd7b7138..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,38 +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 helloworld;

-

-import hello.Hello;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-    @Reference

-    protected Hello helloServiceRef;

-

-    public String getGreetings(String name) {

-        return helloServiceRef.getGreetings(name);

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index 3d43290380..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ /dev/null
@@ -1,46 +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 helloworld;

-

-import java.io.IOException;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This server program shows how to create an SCA runtime, and start it which

- * activates the helloworld Web service endpoint.

- */

-public class HelloWorldServer {

-

-    public static void main(String[] args) {

-

-        SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite");

-

-        try {

-            System.out.println("HelloWorld server started (press enter to shutdown)");

-            System.in.read();

-        } catch (IOException e) {

-            e.printStackTrace();

-        }

-

-        scaDomain.close();

-        System.out.println("HelloWorld server stopped");

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 134da7e34b..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 9f3f5be452..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,27 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://helloworld"

-              xmlns:helloworld="http://helloworld"

-              xmlns:hello="http://hello">

-   <deployable composite="helloworld:helloworldws"/>

-   <import namespace="http://hello"/>

-   <!-- import namespace="http://hello" location="http://import-export/contrib-composite"/ -->

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
deleted file mode 100644
index 9b31363e1a..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ /dev/null
@@ -1,76 +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://helloworld" 

-                  xmlns:tns="http://helloworld" 

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 

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

-	          name="helloworld">

-

-    <wsdl:types>

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

-                xmlns:tns2="http://helloworld2" 

-                targetNamespace="http://helloworld" 

-                elementFormDefault="qualified">

-                

-  	        <xsd:import namespace="http://helloworld2" schemaLocation="helloworld.xsd" />            

-  	        

-  	       	<element name="getGreetings" type="tns2:getGreetingsType"/>

-		    <element name="getGreetingsResponse" type="tns2:getGreetingsResponseType"/>

-

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldServiceComponent"/>

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
deleted file mode 100644
index d3c83b08c6..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ /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.

--->

-<schema targetNamespace="http://helloworld2" 

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

-	    xmlns:ns="http://helloworld2">

-	

-	<complexType name="getGreetingsType">

-		<sequence>

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

-		</sequence>

-	</complexType>

-

-	<complexType name="getGreetingsResponseType">

-		<sequence>

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

-		</sequence>

-	</complexType>

-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
deleted file mode 100644
index e2f852ff7e..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,39 +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://helloworld"

-	xmlns:helloworld="http://helloworld"

-	xmlns:hello="http://hello"

-    name="helloworldws">

-

-    <component name="SourceHelloServiceComponent">

-       <implementation.composite name="hello:hello"/>

-    </component>

-

-    <component name="HelloWorldServiceComponent">

-	    <service name="HelloWorldService">

-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-	        <binding.ws uri="http://localhost:8085/HelloWorldService"/>

-	    </service>

-        <implementation.java class="helloworld.HelloWorldImpl" />

-        <reference name="helloServiceRef" target="SourceHelloServiceComponent/HelloService"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/java/sca-contrib/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
deleted file mode 100644
index 1176a89143..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ /dev/null
@@ -1,126 +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.test.contribution;

-

-import hello.Hello;

-import helloworld.HelloWorldService;

-

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.Socket;

-import java.net.URL;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-/**

- * Tests that the helloworld server is available

- */

-public class HelloWorldServerTestCase extends TestCase {

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-    private Contribution helloWorldContribution;

-    private Contribution compositeContribution;

-

-    @Override

-    protected void setUp() throws Exception {

-        //Create a test embedded SCA domain

-        cl = getClass().getClassLoader();

-        domain = new EmbeddedSCADomain(cl, "http://localhost");

-

-        //Start the domain

-        domain.start();

-

-        // Contribute the SCA contribution

-        ContributionService contributionService = domain.getContributionService();

-

-        // File compositeContribLocation = new File("../export-composite/target/classes");

-        // URL compositeContribURL = compositeContribLocation.toURL();

-        URL compositeContribURL = getContributionURL(Hello.class);

-        compositeContribution =

-            contributionService.contribute("http://import-export/export-composite", compositeContribURL, false);

-        for (Composite deployable : compositeContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-//        File helloWorldContribLocation = new File("./target/classes/");

-//        URL helloWorldContribURL = helloWorldContribLocation.toURL();

-        URL helloWorldContribURL = getContributionURL(HelloWorldService.class);

-        helloWorldContribution =

-            contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false);

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        // Start Components from my composite

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getCompositeActivator().activate(deployable);

-            domain.getCompositeActivator().start(deployable);

-        }

-    }

-    

-    private URL getContributionURL(Class<?> cls) throws MalformedURLException {

-        String flag = "/" + cls.getName().replace('.', '/') + ".class";

-        URL url = cls.getResource(flag);

-        String root = url.toExternalForm();

-        root = root.substring(0, root.length() - flag.length() + 1);

-        if (root.startsWith("jar:") && root.endsWith("!/")) {

-            root = root.substring(4, root.length() - 2);

-        }

-        url = new URL(root);

-        return url;

-    }

-

-    public void testPing() throws IOException {

-        new Socket("127.0.0.1", 8085);

-    }

-

-    public void testServiceCall() throws IOException {

-        HelloWorldService helloWorldService =

-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-

-        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

-    }

-

-    @Override

-    public void tearDown() throws Exception {

-        ContributionService contributionService = domain.getContributionService();

-

-        // Remove the contribution from the in-memory repository

-        contributionService.remove("http://import-export/helloworld");

-        contributionService.remove("http://import-export/export-composite");

-

-        //Stop Components from my composite

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getCompositeActivator().stop(deployable);

-            domain.getCompositeActivator().deactivate(deployable);

-        }

-

-        domain.stop();

-        domain.close();

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/pom.xml b/java/sca-contrib/itest/contribution-import-export/import-java/pom.xml
deleted file mode 100644
index 13d9a7ce58..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-java/pom.xml
+++ /dev/null
@@ -1,73 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-contribution-import-java</artifactId>

-    <name>Apache Tuscany SCA Contribution Java Import Java Integration Tests</name>

-

-<dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>itest-contribution-export-java</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 2186c00e57..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 224e2c4d79..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ /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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://helloworld"

-              xmlns:helloworld="http://helloworld">

-   <deployable composite="helloworld:helloworldws"/>

-   <import.java package="helloworld"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
deleted file mode 100644
index 9b650e4acc..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,29 +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://helloworld"

-	xmlns:helloworld="http://helloworld"

-    name="helloworldws">

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldImpl" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/java/sca-contrib/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
deleted file mode 100644
index 431988cc04..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ /dev/null
@@ -1,127 +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.contribution;

-

-import helloworld.HelloWorldImpl;

-import helloworld.HelloWorldService;

-

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-/**

- * Tests that the helloworld server is available

- */

-public class HelloWorldServerTestCase extends TestCase {

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-    private Contribution helloWorldContribution;

-    private Contribution javaContribution;

-

-    @Override

-    protected void setUp() throws Exception {

-        //Create a test embedded SCA domain

-        cl = getClass().getClassLoader();

-        domain = new EmbeddedSCADomain(cl, "http://localhost");

-

-        //Start the domain

-        domain.start();

-

-        // Contribute the SCA contribution

-        ContributionService contributionService = domain.getContributionService();

-        

-        //File javaContribLocation = new File("../export-java/target/classes");

-        //URL javaContribURL = javaContribLocation.toURL();

-        URL javaContribURL = getContributionURL(HelloWorldService.class);

-        javaContribution = contributionService.contribute("http://import-export/export-java", javaContribURL, false);

-        for (Composite deployable : javaContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        //File helloWorldContribLocation = new File("./target/classes/");

-        //URL helloWorldContribURL = helloWorldContribLocation.toURL();

-        URL helloWorldContribURL = getContributionURL(HelloWorldImpl.class);

-        helloWorldContribution = contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false);

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        // Start Components from my composite

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getCompositeActivator().activate(deployable);

-            domain.getCompositeActivator().start(deployable);

-        }

-    }

-    

-    private URL getContributionURL(Class<?> cls) throws MalformedURLException {

-        String flag = "/" + cls.getName().replace('.', '/') + ".class";

-        URL url = cls.getResource(flag);

-        String root = url.toExternalForm();

-        root = root.substring(0, root.length() - flag.length() + 1);

-        if (root.startsWith("jar:") && root.endsWith("!/")) {

-            root = root.substring(4, root.length() - 2);

-        }

-        url = new URL(root);

-        return url;

-    }

-

-    public void testPing() throws IOException {

-        HelloWorldService helloWorldService =

-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-        assertEquals("Hello test", helloWorldService.getGreetings("test"));

-    }

-

-    public void testServiceCall() throws IOException {

-        HelloWorldService helloWorldService =

-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-

-        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

-    }

-

-    @Override

-    public void tearDown() throws Exception {

-        ContributionService contributionService = domain.getContributionService();

-

-        // Remove the contribution from the in-memory repository

-        contributionService.remove("http://import-export/helloworld");

-        contributionService.remove("http://import-export/export-java");

-

-        // Stop Components from my composite

-        for (Composite deployable : helloWorldContribution.getDeployables()) {

-            domain.getCompositeActivator().stop(deployable);

-            domain.getCompositeActivator().deactivate(deployable);

-        }

-

-        domain.stop();

-

-        domain.close();

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/import-resource/pom.xml b/java/sca-contrib/itest/contribution-import-export/import-resource/pom.xml
deleted file mode 100644
index 6adf9effe5..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-resource/pom.xml
+++ /dev/null
@@ -1,102 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-import-resource</artifactId>
-    <name>Apache Tuscany SCA Contribution Resource Import Java Integration Tests</name>
-
-<dependencies>
-	
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-contribution-export-resource</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-		
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-				
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index ac6d7becb3..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://store"
-              xmlns:store="http://store">
-   <deployable composite="store:store"/>
-   <import.resource uri="ufservices/store.html"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/store.composite
deleted file mode 100644
index bb5a7b764f..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://store"
-	xmlns:helloworld="http://store"
-    name="store">
-
-    <component name="store">
-        <tuscany:implementation.resource location="ufservices/store.html"/>
-        <service name="Resource">
-        	<tuscany:binding.http uri="http://127.0.0.1:8085"/> 
-        </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/java/sca-contrib/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
deleted file mode 100644
index 1b7542b7d9..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ /dev/null
@@ -1,129 +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.contribution;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.Socket;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-/**
- * Tests that the helloworld server is available
- */
-public class StoreTestCase extends TestCase {
-    private ClassLoader cl;
-    private EmbeddedSCADomain domain;
-    private Contribution storeContribution;
-    private Contribution resourceContribution;
-
-    @Override
-    protected void setUp() throws Exception {
-        //Create a test embedded SCA domain
-        cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        //Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-
-        URL javaContribURL = getContributionURL(cl, "ufservices/store.html");
-        resourceContribution = contributionService.contribute("http://import-export/export-resource", javaContribURL, false);
-        for (Composite deployable : resourceContribution.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-
-        URL storeContributionURL = getContributionURL(cl, "store.composite");
-
-        storeContribution =
-            contributionService.contribute("http://import-export/store", storeContributionURL, false);
-        for (Composite deployable : storeContribution.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-
-        // Start Components from my composite
-        for (Composite deployable : storeContribution.getDeployables()) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }
-    }
-
-    public void testPing() throws IOException {
-    	new Socket("127.0.0.1", 8085);
-    }
-
-
-    @Override
-    public void tearDown() throws Exception {
-        ContributionService contributionService = domain.getContributionService();
-
-        // Remove the contribution from the in-memory repository
-        contributionService.remove("http://import-export/store");
-        contributionService.remove("http://import-export/export-resource");
-
-        // Stop Components from my composite
-        for (Composite deployable : storeContribution.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }
-
-        domain.stop();
-
-        domain.close();
-    }
-
-    
-    /**
-     * Utility methods
-     */
-    
-
-    private URL getContributionURL(ClassLoader cl, Class<?> cls) throws MalformedURLException {
-        String flag = "/" + cls.getName().replace('.', '/') + ".class";
-        URL url = cl.getResource(flag);
-        String root = url.toExternalForm();
-        root = root.substring(0, root.length() - flag.length() + 1);
-        if (root.startsWith("jar:") && root.endsWith("!/")) {
-            root = root.substring(4, root.length() - 2);
-        }
-        url = new URL(root);
-        return url;
-    }
-    
-    private URL getContributionURL(ClassLoader cl, String uri) throws MalformedURLException {
-        URL url = cl.getResource(uri);
-        String root = url.toExternalForm();
-        root = root.substring(0, root.length() - uri.length());
-        if (root.startsWith("jar:") && root.endsWith("!/")) {
-            root = root.substring(4, root.length() - 2);
-        }
-        url = new URL(root);
-        return url;
-    }        
-}
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/pom.xml b/java/sca-contrib/itest/contribution-import-export/import-wsdl/pom.xml
deleted file mode 100644
index 265376216b..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/pom.xml
+++ /dev/null
@@ -1,73 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-contribution-import-wsdl</artifactId>

-    <name>Apache Tuscany SCA Contribution WSDL Import Integration Tests</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>itest-contribution-export-wsdl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 2186c00e57..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index 3d43290380..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ /dev/null
@@ -1,46 +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 helloworld;

-

-import java.io.IOException;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This server program shows how to create an SCA runtime, and start it which

- * activates the helloworld Web service endpoint.

- */

-public class HelloWorldServer {

-

-    public static void main(String[] args) {

-

-        SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite");

-

-        try {

-            System.out.println("HelloWorld server started (press enter to shutdown)");

-            System.in.read();

-        } catch (IOException e) {

-            e.printStackTrace();

-        }

-

-        scaDomain.close();

-        System.out.println("HelloWorld server stopped");

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 134da7e34b..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index d46fe0b57c..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ /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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://helloworld"

-              xmlns:helloworld="http://helloworld">

-   <deployable composite="helloworld:helloworldws"/>

-   <import namespace="http://helloworld" location="http://import-export/export-wsdl"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
deleted file mode 100644
index 5008a2ea5b..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,33 +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://helloworld"

-	xmlns:hw="http://helloworld"

-    name="helloworldws">

-

-    <component name="HelloWorldServiceComponent">

-	    <service name="HelloWorldService">

-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-	        <binding.ws uri="http://localhost:8085/HelloWorldService"/>

-	    </service>

-        <implementation.java class="helloworld.HelloWorldImpl" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
deleted file mode 100644
index 5c40606e50..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ /dev/null
@@ -1,137 +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.contribution;

-

-import helloworld.HelloWorldService;

-

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.Socket;

-import java.net.URL;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-/**

- * Tests that the helloworld server is available

- */

-public class HelloWorldServerTestCase extends TestCase {

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-    private Contribution wsdlContribution;

-    private Contribution consumerContribution;

-

-    @Override

-    protected void setUp() throws Exception {

-        // Create a test embedded SCA domain

-        cl = getClass().getClassLoader();

-        domain = new EmbeddedSCADomain(cl, "http://localhost");

-

-        //Start the domain

-        domain.start();

-

-        // Contribute the SCA contribution

-        ContributionService contributionService = domain.getContributionService();

-

-        //        File wsdlContribLocation = new File("../export-wsdl/target/classes");

-        //        URL wsdlContribURL = wsdlContribLocation.toURL();

-        URL wsdlContribURL = getContributionURL(getClass().getClassLoader(), "helloworld.wsdl");

-        wsdlContribution = contributionService.contribute("http://import-export/export-wsdl", wsdlContribURL, false);

-        for (Composite deployable : wsdlContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        //        File helloWorldContribLocation = new File("./target/classes/");

-        //        URL helloWorldContribURL = helloWorldContribLocation.toURL();

-        URL helloWorldContribURL = getContributionURL(HelloWorldService.class);

-        consumerContribution =

-            contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false);

-        for (Composite deployable : consumerContribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        // Start Components from my composite

-        for (Composite deployable : consumerContribution.getDeployables()) {

-            domain.getCompositeActivator().activate(deployable);

-            domain.getCompositeActivator().start(deployable);

-        }

-    }

-

-    public void testPing() throws IOException {

-        new Socket("127.0.0.1", 8085);

-    }

-

-    private URL getContributionURL(Class<?> cls) throws MalformedURLException {

-        String flag = "/" + cls.getName().replace('.', '/') + ".class";

-        URL url = cls.getResource(flag);

-        String root = url.toExternalForm();

-        root = root.substring(0, root.length() - flag.length() + 1);

-        if (root.startsWith("jar:") && root.endsWith("!/")) {

-            root = root.substring(4, root.length() - 2);

-        }

-        url = new URL(root);

-        return url;

-    }

-

-    private URL getContributionURL(ClassLoader cl, String flag) throws MalformedURLException {

-        URL url = cl.getResource(flag);

-        String root = url.toExternalForm();

-        root = root.substring(0, root.length() - flag.length());

-        if (root.startsWith("jar:") && root.endsWith("!/")) {

-            root = root.substring(4, root.length() - 2);

-        }

-        url = new URL(root);

-        // System.out.println(url);

-        return url;

-    }

-

-    public void testServiceCall() throws IOException {

-        HelloWorldService helloWorldService =

-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-

-        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

-    }

-

-    @Override

-    public void tearDown() throws Exception {

-        ContributionService contributionService = domain.getContributionService();

-

-        // Remove the contribution from the in-memory repository

-        contributionService.remove("http://import-export/helloworld");

-        contributionService.remove("http://import-export/export-wsdl");

-

-        // Stop Components from my composite

-        for (Composite deployable : consumerContribution.getDeployables()) {

-            domain.getCompositeActivator().stop(deployable);

-            domain.getCompositeActivator().deactivate(deployable);

-        }

-

-        domain.stop();

-

-        domain.close();

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution-import-export/pom.xml b/java/sca-contrib/itest/contribution-import-export/pom.xml
deleted file mode 100644
index 36858e953e..0000000000
--- a/java/sca-contrib/itest/contribution-import-export/pom.xml
+++ /dev/null
@@ -1,56 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-contribution-import-export</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Contribution Import/Export Integration Tests</name>

-

-    <modules>

-        <module>export-composite</module>

-        <module>export-java</module>

-        <module>export-resource</module>

-        <module>export-wsdl</module>

-        <module>import-composite</module>

-        <module>import-java</module>

-        <module>import-resource</module>

-        <module>import-wsdl</module>

-    </modules>

-    

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-contribution-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-</project>

diff --git a/java/sca-contrib/itest/contribution-multiple/pom.xml b/java/sca-contrib/itest/contribution-multiple/pom.xml
deleted file mode 100644
index 5ff78b3d48..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/pom.xml
+++ /dev/null
@@ -1,51 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-multiple</artifactId>
-    <name>Apache Tuscany SCA Multiple Contribution Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/Hello.java b/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/Hello.java
deleted file mode 100644
index 7e574a7db3..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/Hello.java
+++ /dev/null
@@ -1,27 +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 hello;
-
-/**
- * This is the business interface of the Hello service.
- */
-public interface Hello {
-
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
deleted file mode 100644
index 7cd950453d..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
+++ /dev/null
@@ -1,33 +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 hello;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(Hello.class)
-public class HelloImpl implements Hello {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index e90d10dc24..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,38 +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 helloworld;
-
-import hello.Hello;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-    @Reference
-    protected Hello helloServiceRef;
-
-    public String getGreetings(String name) {
-        return helloServiceRef.getGreetings(name);
-    }
-
-}
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 5251fc0a45..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,28 +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 helloworld;
-
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
deleted file mode 100644
index ec5123eb2d..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
+++ /dev/null
@@ -1,121 +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 test;
-
-import helloworld.HelloWorldService;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-import junit.framework.TestCase;
-
-/**
- * Test multiple contributions scenario
- * 
- * FIXME This test case causes a StackOverflowException instead of
- * reporting an error when a composite is not found, as there's a
- * dependency cycle in the test contributions and the model resolvers
- * do not handle import cycles properly.
- * 
- */
-public class ContributionCycleTestCaseFIXME extends TestCase {
-
-    private String helloContribution_dir = "target/test-classes/contribution-cycle-export";
-    private String helloWorldContribution_one_dir = "target/test-classes/contribution-cycle-import";
-
-    private ClassLoader cl;
-    private EmbeddedSCADomain domain;
-    private Contribution helloContribution;
-    private Contribution helloWorldContribution_one;
-
-    protected void setUp() throws Exception {
-        URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL();
-        URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL();
-
-        // Create a test embedded SCA domain
-        cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        // Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-
-        helloContribution =
-            contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false);
-        
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }
-
-        helloWorldContribution_one =
-            contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false);
-        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-
-        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }
-
-    }
-
-    public void testServiceCall() throws IOException {
-        HelloWorldService helloWorldService_one =
-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService");
-        assertNotNull(helloWorldService_one);
-
-        assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith"));
-
-    }
-
-    public void tearDown() throws Exception {
-        ContributionService contributionService = domain.getContributionService();
-
-        // Remove the contribution from the in-memory repository
-        contributionService.remove("http://contribution-multiple/helloworld");
-        contributionService.remove("http://contribution-multiple/helloworld_one");
-
-        // Stop Components from my composite
-        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }
-        // domain.stop();
-        domain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java b/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
deleted file mode 100644
index 133c98f357..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
+++ /dev/null
@@ -1,131 +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 test;
-
-import helloworld.HelloWorldService;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-import junit.framework.TestCase;
-
-/**
- * Test multiple contribution scenario
- * Contributed by TUSCANY-1718
- */
-public class ContributionMultipleTestCaseFIXME extends TestCase {
-
-    private String helloContribution_dir = "target/test-classes/contribution-export";
-    private String helloWorldContribution_one_dir = "target/test-classes/contribution-import-one";
-    private String helloWorldContribution_two_dir = "target/test-classes/contribution-import-two";
-
-    private ClassLoader cl;
-    private EmbeddedSCADomain domain;
-    private Contribution helloContribution;
-    private Contribution helloWorldContribution_one;
-    private Contribution helloWorldContribution_two;
-
-    protected void setUp() throws Exception {
-        URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL();
-        URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL();
-        URL helloWorldContribution_two_URL = new java.io.File(helloWorldContribution_two_dir).toURI().toURL();
-
-        // Create a test embedded SCA domain
-        cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        // Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-
-        helloContribution =
-            contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false);
-
-        helloWorldContribution_one =
-            contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false);
-
-        helloWorldContribution_two =
-            contributionService.contribute("http://contribution-multiple/helloworld_two", helloWorldContribution_two_URL, false);
-
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-        }
-                
-        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-        }
-
-        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-        }
-
-        domain.buildComposite(domain.getDomainComposite());
-        domain.getCompositeActivator().activate(domain.getDomainComposite());
-        domain.getCompositeActivator().start(domain.getDomainComposite());
-
-    }
-
-    public void testServiceCall() throws IOException {
-        HelloWorldService helloWorldService_one =
-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService");
-        assertNotNull(helloWorldService_one);
-
-        assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith"));
-
-        HelloWorldService helloWorldService_two =
-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_two/HelloWorldService");
-        assertNotNull(helloWorldService_two);
-
-        assertEquals("Hello Smith", helloWorldService_two.getGreetings("Smith"));
-        
-    }
-
-    public void tearDown() throws Exception {
-        ContributionService contributionService = domain.getContributionService();
-
-        // Remove the contribution from the in-memory repository
-        contributionService.remove("http://contribution-multiple/helloworld");
-        contributionService.remove("http://contribution-multiple/helloworld_one");
-        contributionService.remove("http://contribution-multiple/helloworld_two");
-
-        // Stop Components from my composite
-        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }        
-        for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }
-        // domain.stop();
-        domain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
deleted file mode 100644
index 790b6fed98..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
+++ /dev/null
@@ -1,145 +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 test;
-
-import helloworld.HelloWorldService;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-import junit.framework.TestCase;
-
-/**
- * Test multiple contribution scenario
- * Contributed by TUSCANY-1756
- */
-public class ContributionTestCase extends TestCase {
-
-    private String helloContribution_dir = "target/test-classes/contribution-export";
-    //private String helloWorldContribution_one_dir = "target/test-classes/contribution-import-one";
-    private String helloWorldContribution_two_dir = "target/test-classes/contribution-import-two";
-
-    private ClassLoader cl;
-    private EmbeddedSCADomain domain;
-    private Contribution helloContribution;
-    //private Contribution helloWorldContribution_one;
-    private Contribution helloWorldContribution_two;
-
-    protected void setUp() throws Exception {
-        URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL();
-        //URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL();
-        URL helloWorldContribution_two_URL = new java.io.File(helloWorldContribution_two_dir).toURI().toURL();
-
-        // Create a test embedded SCA domain
-        cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        // Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-
-        helloContribution =
-            contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false);
-
-        //helloWorldContribution_one =
-         //   contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false);
-
-        helloWorldContribution_two =
-            contributionService.contribute("http://contribution-multiple/helloworld_two", helloWorldContribution_two_URL, false);
-
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-
-        //for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-        //    domain.getDomainComposite().getIncludes().add(deployable);
-        //    domain.buildComposite(deployable);
-        //}
-
-        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
-            domain.getDomainComposite().getIncludes().add(deployable);
-            domain.buildComposite(deployable);
-        }
-        
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }
-
-        //for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-        //    domain.getCompositeActivator().activate(deployable);
-        //    domain.getCompositeActivator().start(deployable);
-        //}
-
-        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
-            domain.getCompositeActivator().activate(deployable);
-            domain.getCompositeActivator().start(deployable);
-        }        
-
-    }
-
-    public void testServiceCall() throws IOException {
-        //HelloWorldService helloWorldService_one =
-            //domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService");
-        //assertNotNull(helloWorldService_one);
-
-        //assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith"));
-
-        HelloWorldService helloWorldService_two =
-            domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_two/HelloWorldService");
-        assertNotNull(helloWorldService_two);
-
-        assertEquals("Hello Smith", helloWorldService_two.getGreetings("Smith"));
-        
-    }
-
-    public void tearDown() throws Exception {
-        ContributionService contributionService = domain.getContributionService();
-
-        // Remove the contribution from the in-memory repository
-        contributionService.remove("http://contribution-multiple/helloworld");
-        //contributionService.remove("http://contribution-multiple/helloworld_one");
-        contributionService.remove("http://contribution-multiple/helloworld_two");
-
-        // Stop Components from my composite
-        for (Composite deployable : helloWorldContribution_two.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }        
-        //for (Composite deployable : helloWorldContribution_one.getDeployables()) {
-        //    domain.getCompositeActivator().stop(deployable);
-        //    domain.getCompositeActivator().deactivate(deployable);
-        //}
-        for (Composite deployable : helloContribution.getDeployables()) {
-            domain.getCompositeActivator().stop(deployable);
-            domain.getCompositeActivator().deactivate(deployable);
-        }
-        // domain.stop();
-        domain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
deleted file mode 100644
index 8b76783c3d..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://hello"
-              xmlns:hello="http://hello">
-   	<deployable composite="hello:hello"/>
-   	<export namespace="http://hello"/>
-   	<import namespace="http://hello"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
deleted file mode 100644
index aeeab337fa..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.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"
-	targetNamespace="http://hello"
-	xmlns:hello="http://hello"
-    name="hello">
-
-	<service name="HelloService" promote="HelloServiceComponent"/>
-	
-    <component name="HelloServiceComponent">
-        <implementation.java class="hello.HelloImpl" />
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
deleted file mode 100644
index bfbf74373a..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://helloworld"
-              xmlns:helloworld="http://helloworld"
-              xmlns:hello="http://hello">
-   <deployable composite="helloworld:helloworld_one"/>
-   <import namespace="http://hello"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
deleted file mode 100644
index 7a8003577e..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.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://helloworld"
-	xmlns:helloworld="http://helloworld"
-	xmlns:hello="http://hello"
-    name="helloworld_one">
-
-    <component name="SourceHelloServiceComponent_one">
-       <implementation.composite name="hello:helloexport"/>
-    </component>
-
-    <component name="HelloWorldServiceComponent_one">
-        <implementation.java class="helloworld.HelloWorldImpl" />
-        <reference name="helloServiceRef" target="SourceHelloServiceComponent_one/HelloService"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
deleted file mode 100644
index bea6f39932..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://hello"
-              xmlns:hello="http://hello">
-   	<deployable composite="hello:hello"/>
-   	<export namespace="http://hello"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
deleted file mode 100644
index aeeab337fa..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/hello.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"
-	targetNamespace="http://hello"
-	xmlns:hello="http://hello"
-    name="hello">
-
-	<service name="HelloService" promote="HelloServiceComponent"/>
-	
-    <component name="HelloServiceComponent">
-        <implementation.java class="hello.HelloImpl" />
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
deleted file mode 100644
index bfbf74373a..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://helloworld"
-              xmlns:helloworld="http://helloworld"
-              xmlns:hello="http://hello">
-   <deployable composite="helloworld:helloworld_one"/>
-   <import namespace="http://hello"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
deleted file mode 100644
index 45cb504ea4..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.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://helloworld"
-	xmlns:helloworld="http://helloworld"
-	xmlns:hello="http://hello"
-    name="helloworld_one">
-
-    <component name="SourceHelloServiceComponent_one">
-       <implementation.composite name="hello:hello"/>
-    </component>
-
-    <component name="HelloWorldServiceComponent_one">
-        <implementation.java class="helloworld.HelloWorldImpl" />
-        <reference name="helloServiceRef" target="SourceHelloServiceComponent_one/HelloService"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml b/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
deleted file mode 100644
index cbabdcd4fc..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://helloworld"
-              xmlns:helloworld="http://helloworld"
-              xmlns:hello="http://hello">
-   <deployable composite="helloworld:helloworld_two"/>
-   <import namespace="http://hello"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite b/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
deleted file mode 100644
index 4c9225de34..0000000000
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.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://helloworld"
-	xmlns:helloworld="http://helloworld"
-	xmlns:hello="http://hello"
-    name="helloworld_two">
-
-    <component name="SourceHelloServiceComponent_two">
-       <implementation.composite name="hello:hello"/>
-    </component>
-
-    <component name="HelloWorldServiceComponent_two">
-        <implementation.java class="helloworld.HelloWorldImpl" />
-        <reference name="helloServiceRef" target="SourceHelloServiceComponent_two/HelloService"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/contribution/pom.xml b/java/sca-contrib/itest/contribution/pom.xml
deleted file mode 100644
index 1fe5207ad5..0000000000
--- a/java/sca-contrib/itest/contribution/pom.xml
+++ /dev/null
@@ -1,52 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-contribution</artifactId>

-    <name>Apache Tuscany SCA Contribution Integration Tests</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-contribution-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-    </dependencies>

-</project>

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddService.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/AddService.java
deleted file mode 100644
index 4e72f92fda..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddService.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 calculator;

-

-/**

- * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this

- * interface. Implementation for these methods is provided in AddServiceImpl Class

- */

-public interface AddService {

-

-    /**

-     * This is an add method which takes 2 parameters of double type and returns the sum of two parameters

-     */

-    double add(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9c635e3c8..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Add service

- */

-public class AddServiceImpl implements AddService {

-

-    public double add(double n1, double n2) {

-        return n1 + n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 719ad69eef..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,46 +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 calculator;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * and locate and invoke a SCA component

- */

-public class CalculatorClient {

-    public static void main(String[] args) throws Exception {

-

-        SCADomain domain = SCADomain.newInstance("calculator/Calculator.composite");

-        

-        CalculatorService calculatorService = domain.getService(CalculatorService.class,

-                                                                                "CalculatorServiceComponent");

-

-        // Calculate

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-

-        domain.close();

-

-    }

-

-}
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index f288af0174..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-/**

- * This is a Calculator service interface. All the methods which are to be accessed as a service are declared in this

- * interface but not the implementation of those methods.

- */

-public interface CalculatorService {

-

-    double add(double n1, double n2);

-

-    double subtract(double n1, double n2);

-

-    double multiply(double n1, double n2);

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index d3fa7a8f41..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +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 calculator;

-

-import org.oasisopen.sca.annotation.Reference;

-

-

-/**

- * An implementation of the Calculator service.

- */

-public class CalculatorServiceImpl implements CalculatorService {

-

-    private AddService addService;

-    private SubtractService subtractService;

-    private MultiplyService multiplyService;

-    private DivideService divideService;

-

-    @Reference

-    public void setAddService(AddService addService) {

-        this.addService = addService;

-    }

-

-    @Reference

-    public void setSubtractService(SubtractService subtractService) {

-        this.subtractService = subtractService;

-    }

-

-    @Reference

-    public void setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-

-    @Reference

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-

-    public double add(double n1, double n2) {

-        return addService.add(n1, n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        return multiplyService.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        return divideService.divide(n1, n2);

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideService.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideService.java
deleted file mode 100644
index ad99418f5b..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideService.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 calculator;

-

-/**

- * This is an interface for Divide Service which has divide method declared which is implemented in DivideServiceImpl

- * class

- */

-public interface DivideService {

-

-    /**

-     * This is a divide method which takes 2 parameters of double type and returns the result of division

-     */

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Divide service.

- */

-public class DivideServiceImpl implements DivideService {

-

-    public double divide(double n1, double n2) {

-        return n1 / n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 3987b0a54f..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,33 +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 calculator;

-

-/**

- * This is an interface for Multiply Service which has multiply method declared which is implemented in

- * MultiplyServiceImpl class

- */

-public interface MultiplyService {

-

-    /**

-     * This is a multiply method which takes 2 parameters of double type and returns the result of multiplication of the

-     * two parameters

-     */

-    double multiply(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Multiply service.

- */

-public class MultiplyServiceImpl implements MultiplyService {

-

-    public double multiply(double n1, double n2) {

-        return n1 * n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractService.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 25e0ed6ca7..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,33 +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 calculator;

-

-/**

- * This is an interface for Subtract Service which has subtract method declared which is implemented in

- * SubtractServiceImpl class

- */

-

-public interface SubtractService {

-

-    /**

-     * This is a subtract method which takes 2 parameters of double type and returns the result of subtraction.

-     */

-    double subtract(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the subtract service.

- */

-public class SubtractServiceImpl implements SubtractService {

-

-    public double subtract(double n1, double n2) {

-        return n1 - n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/main/resources/ContributionTest.composite b/java/sca-contrib/itest/contribution/src/main/resources/ContributionTest.composite
deleted file mode 100644
index d814e439e2..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/resources/ContributionTest.composite
+++ /dev/null
@@ -1,24 +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" 
-           name="ContributionTest">
-   
-</composite>
diff --git a/java/sca-contrib/itest/contribution/src/main/resources/calculator/Calculator.composite b/java/sca-contrib/itest/contribution/src/main/resources/calculator/Calculator.composite
deleted file mode 100644
index 657a2f95d8..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ /dev/null
@@ -1,51 +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"

-           name="Calculator">

-

-    <service name="CalculatorService" promote="CalculatorServiceComponent">

-        <interface.java interface="calculator.CalculatorService"/>

-    </service>

-

-    <component name="CalculatorServiceComponent">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <reference name="addService" target="AddServiceComponent"></reference>

-        <reference name="subtractService" target="SubtractServiceComponent"></reference>

-        <reference name="multiplyService" target="MultiplyServiceComponent"></reference>

-        <reference name="divideService" target="DivideServiceComponent"></reference>

-    </component>

-

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/java/sca-contrib/itest/contribution/src/main/resources/calculator/sca-contribution.xml
deleted file mode 100644
index e95796d83a..0000000000
--- a/java/sca-contrib/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:Calculator"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/java/sca-contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
deleted file mode 100644
index 97b2e5d6ed..0000000000
--- a/java/sca-contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ /dev/null
@@ -1,218 +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.contribution;

-

-import java.io.File;

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.URL;

-import java.security.AccessController;

-import java.security.PrivilegedAction;

-import java.security.PrivilegedActionException;

-import java.security.PrivilegedExceptionAction;

-import java.util.List;

-

-import javax.xml.namespace.QName;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;

-import org.apache.tuscany.sca.contribution.Artifact;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.contribution.service.util.FileHelper;

-import org.apache.tuscany.sca.contribution.service.util.IOHelper;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-/**

- * This is more intended to be a integration test then a unit test. *

- */

-public class ContributionServiceTestCase extends TestCase {

-    private static final String CONTRIBUTION_001_ID = "contribution001/";

-    private static final String CONTRIBUTION_002_ID = "contribution002/";

-    private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";

-    private static final String FOLDER_CONTRIBUTION = "target/classes/";

-

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-    private ContributionService contributionService;

-

-    /**

-     * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending

-     * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and

-     * to get a reference to the contribution service

-     */

-

-    @Override

-    protected void setUp() throws Exception {

-        //Create a test embedded SCA domain

-        cl = getClass().getClassLoader();

-        domain = new EmbeddedSCADomain(cl, "http://localhost");

-

-        //Start the domain

-        domain.start();

-

-        //get a reference to the contribution service

-        contributionService = domain.getContributionService();

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime.

-     */

-    public void testContributeJAR() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        //URL contributionLocation = new URL("file:/D:/dev/Opensource/Apache/Tuscany/source/java/sca/samples/calculator/target/sample-calculator.jar");

-        String contributionId = CONTRIBUTION_001_ID;

-        contributionService.contribute(contributionId, contributionLocation, false);

-        assertNotNull(contributionService.getContribution(contributionId));

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime using

-     * contributionService.

-     */

-    public void testStoreContributionPackageInRepository() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        String contributionId = CONTRIBUTION_001_ID;

-        contributionService.contribute(contributionId, contributionLocation, true);

-

-        assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation()))

-            .exists());

-

-        assertNotNull(contributionId);

-

-        Contribution contributionModel = contributionService.getContribution(contributionId);

-

-        File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation()));

-        assertTrue(contributionFile.exists());

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime using

-     * contributionService.

-     */

-    public void testStoreContributionStreamInRepository() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        String contributionId = CONTRIBUTION_001_ID;

-

-        InputStream contributionStream = contributionLocation.openStream();

-        try {

-            contributionService.contribute(contributionId, contributionLocation, contributionStream);

-        } finally {

-            IOHelper.closeQuietly(contributionStream);

-        }

-

-        assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation()))

-            .exists());

-

-        assertNotNull(contributionId);

-

-        Contribution contributionModel = contributionService.getContribution(contributionId);

-

-        File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation()));

-        assertTrue(contributionFile.exists());

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contributionId1,contributionId2 with the value retrieved from the SCA

-     * runtime using contributionService.

-     */

-    public void testStoreDuplicatedContributionInRepository() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        String contributionId1 = CONTRIBUTION_001_ID;

-        contributionService.contribute(contributionId1, contributionLocation, true);

-        assertNotNull(contributionService.getContribution(contributionId1));

-        String contributionId2 = CONTRIBUTION_002_ID;

-        contributionService.contribute(contributionId2, contributionLocation, true);

-        assertNotNull(contributionService.getContribution(contributionId2));

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contributionId with the value retrieved from the SCA runtime using

-     * contributionService.

-     */

-    public void testContributeFolder() throws Exception {

-        final File rootContributionFolder = new File(FOLDER_CONTRIBUTION);

-        String contributionId = CONTRIBUTION_001_ID;

-        //first rename the sca-contribution metadata file 

-        //File calculatorMetadataFile = new File("target/classes/calculator/sca-contribution.xml"); 

-        //File metadataDirectory = new File("target/classes/META-INF/"); 

-        //if (!metadataDirectory.exists()) {

-        //    FileHelper.forceMkdir(metadataDirectory); 

-        //}

-        //FileHelper.copyFileToDirectory(calculatorMetadataFile, metadataDirectory);

-

-        // Requires permission to read user.dir property. Requires PropertyPermision in security policy.

-        URL contributionFolderURL;

-        try {

-            contributionFolderURL = AccessController.doPrivileged(new PrivilegedExceptionAction<URL>() {

-                public URL run() throws IOException {

-                    return rootContributionFolder.toURL();

-                }

-            });

-        } catch (PrivilegedActionException e) {

-            throw (IOException)e.getException();

-        }        

-        contributionService.contribute(contributionId, contributionFolderURL, false);

-        assertNotNull(contributionService.getContribution(contributionId));

-    }

-

-    /**

-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This

-     * test verifies the string assigned to contributionId, artifactId with the value retrieved from the SCA runtime

-     * using contributionService.

-     */

-    public void testAddDeploymentComposites() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        String contributionId = CONTRIBUTION_001_ID;

-        Contribution contribution = contributionService.contribute(contributionId, contributionLocation, false);

-        assertNotNull(contributionService.getContribution(contributionId));

-

-        String artifactId = "contributionComposite.composite";

-        Composite composite = (new DefaultAssemblyFactory()).createComposite();

-        composite.setName(new QName(null, "contributionComposite"));

-        composite.setURI("contributionComposite.composite");

-

-        contributionService.addDeploymentComposite(contribution, composite);

-

-        List deployables = contributionService.getContribution(contributionId).getDeployables();

-        Composite composite1 = (Composite)deployables.get(deployables.size() - 1);

-        assertEquals("contributionComposite", composite1.getName().toString());

-

-        Artifact artifact = null;

-        contribution = contributionService.getContribution(contributionId);

-        String id = artifactId.toString();

-        for (Artifact a : contribution.getArtifacts()) {

-            if (id.equals(a.getURI())) {

-                artifact = a;

-                break;

-            }

-        }

-        Composite composite2 = (Composite)artifact.getModel();

-        assertEquals("contributionComposite", composite2.getName().toString());

-    }

-

-}

diff --git a/java/sca-contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/java/sca-contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
--- a/java/sca-contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ /dev/null
diff --git a/java/sca-contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar b/java/sca-contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
--- a/java/sca-contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ /dev/null
diff --git a/java/sca-contrib/itest/conversations-ws/pom.xml b/java/sca-contrib/itest/conversations-ws/pom.xml
deleted file mode 100644
index 2789d3eee7..0000000000
--- a/java/sca-contrib/itest/conversations-ws/pom.xml
+++ /dev/null
@@ -1,60 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-conversations-ws</artifactId>

-    <name>Apache Tuscany SCA Conversations Over binding.ws Integration Tests</name>

-

-    <dependencies>

-

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>         

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-    </dependencies>

-</project>

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
deleted file mode 100644
index 9cd88620e3..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
+++ /dev/null
@@ -1,41 +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.itest.conversational;

-

-public class BusinessException extends Exception {

-

-    private String message;

-

-    public BusinessException() {

-        super();

-    }

-

-    public BusinessException(String message) {

-        super(message);

-        setMessage(message);

-    }

-

-    public String getMessage() {

-        return message;

-    }

-

-    public void setMessage(String message) {

-        this.message = message;

-    }

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
deleted file mode 100644
index b6c694c8a9..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ /dev/null
@@ -1,29 +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.itest.conversational;

-

-import org.oasisopen.sca.annotation.Conversational;

-

-@Conversational

-public interface ConversationIdService {

-

-    String getCIDField();

-    String getCIDSetter();

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
deleted file mode 100644
index b6645aec23..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ /dev/null
@@ -1,50 +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.itest.conversational;

-

-import org.oasisopen.sca.annotation.Conversational;

-import org.oasisopen.sca.annotation.EndsConversation;

-import org.oasisopen.sca.annotation.Remotable;

-

-

-/**

- * The callback interface used when testing conversational callbacks

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-@Conversational

-public interface ConversationalCallback {

-	

-   // public void init();

-    

-   // public void destroy();

-    

-    public void initializeCount(int count);

-    

-    public void incrementCount();

-    

-    public int retrieveCount();

-    

-    public void businessException() throws BusinessException;        

-    

-    @EndsConversation

-    public String endConversation();

-

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
deleted file mode 100644
index 772602568c..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ /dev/null
@@ -1,50 +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.itest.conversational;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The client for the conversational itest. Is implemented by clients

- * offering both stateless and stateful callbacks

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Remotable

-public interface ConversationalClient { 

-	

-	public int runConversationFromInjectedReference();

-	public int runConversationFromInjectedReference2();

-	public int runConversationFromServiceReference();

-	public int runConversationWithUserDefinedConversationId();

-	public String runConversationCheckUserDefinedConversationId();	

-	public int runConversationCheckingScope();

-	public int runConversationWithCallback(); 

-	public int runConversationHavingPassedReference();

-	public String runConversationBusinessException();

-	public String runConversationBusinessExceptionCallback();

-	public int runConversationCallingEndedConversation();

-	public int runConversationCallingEndedConversationCallback();

-        public String runConversationCallingEndedConversationCheckConversationId(); 

-	public String runConversationCallingEndedConversationCallbackCheckConversationId();

-	public int runConversationAgeTimeout();

-	public int runConversationIdleTimeout();

-	public int runConversationPrincipleError();	

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
deleted file mode 100644
index 481ed7b388..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.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 org.apache.tuscany.sca.itest.conversational;

-

-import org.oasisopen.sca.CallableReference;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The client that calls into an existing conversation by accepting

- * a reference to that conversation

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Remotable

-public interface ConversationalReferenceClient { 

-	

-    public void incrementCount(CallableReference<ConversationalService> conversationalService);

-

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
deleted file mode 100644
index c9d46b9072..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.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 org.apache.tuscany.sca.itest.conversational;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Conversational;

-import org.oasisopen.sca.annotation.EndsConversation;

-import org.oasisopen.sca.annotation.Remotable;

-

-

-/**

- * The service interface used when testing conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-@Conversational

-@Callback(ConversationalCallback.class)

-public interface ConversationalService {

-    

-    public void initializeCount(int count);

-    

-    public void incrementCount();

-    

-    public int retrieveCount();

-    

-    //public void businessException() throws BusinessException;        

-    

-    public void initializeCountCallback(int count);

-    

-    public void incrementCountCallback();

-    

-    public int retrieveCountCallback();

-    

-    //public void businessExceptionCallback() throws BusinessException;    

-    

-    @EndsConversation

-    public String endConversation();

-    

-    public String endConversationCallback();

-

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
deleted file mode 100644
index b46cb831df..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.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 org.apache.tuscany.sca.itest.conversational;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Conversational;

-import org.oasisopen.sca.annotation.EndsConversation;

-import org.oasisopen.sca.annotation.Remotable;

-

-

-/**

- * The service interface used when testing conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-@Conversational

-@Callback(NonConversationalCallback.class)

-public interface ConversationalServiceNonConversationalCallback {

-

-    

-    public void initializeCount(int count);

-    

-    public void incrementCount();

-    

-    public int retrieveCount();

-    

-    public void businessException() throws BusinessException;        

-    

-    public void initializeCountCallback(int count);

-    

-    public void incrementCountCallback();

-    

-    public int retrieveCountCallback();

-    

-    public void businessExceptionCallback() throws BusinessException;    

-    

-    @EndsConversation

-    public String endConversation();

-    

-    public String endConversationCallback();

-

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
deleted file mode 100644
index 4c3809676c..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ /dev/null
@@ -1,42 +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.itest.conversational;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-

-/**

- * The callback interface used when testing conversational callbacks

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-public interface NonConversationalCallback {

-	   

-    public void initializeCount(int count);

-    

-    public void incrementCount();

-    

-    public int retrieveCount();

-    

-    public void businessException() throws BusinessException;        

-    

-    public String endConversation();

-

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
deleted file mode 100644
index 2d048a76b5..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.oasisopen.sca.annotation.ConversationAttributes;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(ConversationalService.class)

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="1 seconds")

-public class ConversationAgeComponentImpl implements ConversationalService {

-

-    private int count;

-    

-    public void businessException() throws BusinessException {   

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {   

-    }      

-

-    public void destroy() {

-    }

-

-    public String endConversation() {

-        return null;

-    }

-

-    public String endConversationCallback() {

-        return null;

-    }

-

-    public void incrementCount() {

-    }

-

-    public void incrementCountCallback() {

-    }

-

-    public void init() {

-    }

-

-    public void initializeCount(int count) {

-        this.count = count;

-    }

-

-    public void initializeCountCallback(int count) {

-    }

-

-    public int retrieveCount() {

-        return count;

-    }

-

-    public int retrieveCountCallback() {

-        return 0;

-    }

-

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
deleted file mode 100644
index 34b8fbe9d0..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ /dev/null
@@ -1,48 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationIdService;

-import org.oasisopen.sca.annotation.ConversationID;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(ConversationIdService.class)

-@Scope("CONVERSATION")

-public class ConversationIdComponentImpl implements ConversationIdService {

-

-    @ConversationID

-    public String cid;

-

-    private String setterCid;

-    

-    public String getCIDField() {

-        return cid;

-    }

-    public String getCIDSetter() {

-        return setterCid;

-    }

-    

-

-    @ConversationID

-    public void setCID(String cid) {

-        this.setterCid = cid;

-    }

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
deleted file mode 100644
index 0d3ca8d350..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.oasisopen.sca.annotation.ConversationAttributes;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(ConversationalService.class)

-@Scope("CONVERSATION")

-@ConversationAttributes(maxIdleTime="1 seconds")

-public class ConversationMaxIdleComponentImpl implements ConversationalService {

-

-    private int count;

-

-    public void businessException() throws BusinessException {   

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {   

-    }    

-    

-    public void destroy() {

-    }

-

-    public String endConversation() {

-        return null;

-    }

-

-    public String endConversationCallback() {

-        return null;

-    }

-

-    public void incrementCount() {

-    }

-

-    public void incrementCountCallback() {

-    }

-

-    public void init() {

-    }

-

-    public void initializeCount(int count) {

-        this.count = count;

-    }

-

-    public void initializeCountCallback(int count) {

-    }

-

-    public int retrieveCount() {

-        return count;

-    }

-

-    public int retrieveCountCallback() {

-        return 0;

-    }

-

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
deleted file mode 100644
index db3bcabe02..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ /dev/null
@@ -1,322 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.oasisopen.sca.ComponentContext;

-import org.oasisopen.sca.ServiceReference;

-import org.oasisopen.sca.annotation.Context;

-import org.oasisopen.sca.annotation.ConversationAttributes;

-import org.oasisopen.sca.annotation.Destroy;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * The client for the conversational itest which presents a stateful

- * callback interface

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Service(interfaces={ConversationalClient.class})

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="10 minutes",

-                        maxIdleTime="5 minutes",

-                        singlePrincipal=false)

-public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback {

-    

-    @Context

-    protected ComponentContext componentContext;

-    

-    @Reference 

-    protected ConversationalService conversationalService;

-    

-    @Reference 

-    protected ConversationalService conversationalService2;

-    

-    @Reference

-    protected ConversationalReferenceClient conversationalReferenceClient;

-      

-    private int clientCount = 0;

-    private int callbackCount = 0;  

-    

-    

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();        

-	

-    // From ConversationalClient

-	public int runConversationFromInjectedReference(){

-	    calls.append("runConversationFromInjectedReference,");	    

-	    conversationalService.initializeCount(1);

-	    conversationalService.incrementCount();

-	    clientCount = conversationalService.retrieveCount();

-	    conversationalService.endConversation();

-	    

-	    return clientCount;

-	}

-    public int runConversationFromInjectedReference2(){

-        calls.append("runConversationFromInjectedReference2,");

-               

-        conversationalService2.initializeCount(1);

-        conversationalService2.incrementCount();

-        

-        // stick in a call to the first reference to 

-        // make sure the two references don't clash

-        conversationalService.initializeCount(1);

-        

-        clientCount = conversationalService2.retrieveCount();

-        conversationalService2.endConversation();

-        

-        // end the conversation through the first reference

-        conversationalService.endConversation();

-        

-        return clientCount;

-    }	

-    public int runConversationFromServiceReference(){

-        calls.append("runConversationFromServiceReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }	

-    public int runConversationWithUserDefinedConversationId(){

-        calls.append("runConversationWithUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation1");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }    

-    public String runConversationCheckUserDefinedConversationId(){

-        calls.append("runConversationCheckUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation2");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        

-        String clientConversationId = serviceReference.getConversationID().toString();

-        String serverConversationId = callableReference.endConversation();

-        

-        if (clientConversationId.equals("MyConversation2") &&

-            serverConversationId.equals("MyConversation2") ) {

-            return clientConversationId;

-        } else {

-            return "client = " + clientConversationId +

-                   "server = " + serverConversationId;

-        }  

-              

-    }      

-    public int runConversationCheckingScope(){

-        calls.append("runConversationCheckingScope,");

-        // run a conversation

-        return runConversationFromInjectedReference();

-        

-        // test will then use a static method to find out how many times 

-        // init/destroy were called

-    }    

-	public int runConversationWithCallback(){

-	    calls.append("runConversationWithCallback,");

-	    callbackCount = 2;

-        conversationalService.initializeCountCallback(1);

-        conversationalService.incrementCountCallback();

-        clientCount = conversationalService.retrieveCountCallback();

-        conversationalService.endConversationCallback();

-        

-        return clientCount;

-    } 

-    public int runConversationHavingPassedReference(){

-        calls.append("runConversationHavingPassedReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");       

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        conversationalReferenceClient.incrementCount(serviceReference);

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        serviceReference.getConversation().end();

-        

-        return clientCount;

-    }

-    public String runConversationBusinessException(){

-        calls.append("runConversationbusinessException,");      

-        try {

-            conversationalService.initializeCount(1);

-//            conversationalService.businessException();

-            clientCount = conversationalService.retrieveCount();

-            conversationalService.endConversation();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }

-    

-    public String runConversationBusinessExceptionCallback(){

-        calls.append("runConversationbusinessExceptionCallback,");

-        try {

-            conversationalService.initializeCountCallback(1);

-//            conversationalService.businessExceptionCallback();

-            clientCount = conversationalService.retrieveCountCallback();

-            conversationalService.endConversationCallback();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }   

-    

-    public int runConversationCallingEndedConversation(){

-        calls.append("runConversationCallingEndedConversation,");

-        conversationalService.initializeCount(1);

-        conversationalService.endConversation();

-        return conversationalService.retrieveCount();

-    }       

-    

-    public int runConversationCallingEndedConversationCallback(){

-        calls.append("runConversationCallingEndedConversationCallback,");

-        conversationalService.initializeCountCallback(1);

-        conversationalService.endConversationCallback();

-        return conversationalService.retrieveCountCallback();

-    } 

-     

-    public String runConversationCallingEndedConversationCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }    

-    

-    public String runConversationCallingEndedConversationCallbackCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversationCallback();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }    

-    

-    public int runConversationAgeTimeout(){

-        calls.append("runConversationAgeTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationIdleTimeout(){

-        calls.append("runConversationIdleTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationPrincipleError(){

-        calls.append("runConversationPrincipleError,");

-        // TODO - when policy framework is done

-        return clientCount;

-    }

-    

-    

-    // From ConversationalCallback

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,"); 

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        callbackCount += count;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        callbackCount++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        return  callbackCount;

-    }

-    

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }     

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        callbackCount = 0;

-        return null;

-    }

-

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index e25f367cf6..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ /dev/null
@@ -1,311 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;

-import org.oasisopen.sca.ComponentContext;

-import org.oasisopen.sca.ServiceReference;

-import org.oasisopen.sca.annotation.Context;

-import org.oasisopen.sca.annotation.ConversationAttributes;

-import org.oasisopen.sca.annotation.Destroy;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * The client for the conversational itest which presents a stateful

- * callback interface

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Service(interfaces={ConversationalClient.class})

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="10 minutes",

-                        maxIdleTime="5 minutes",

-                        singlePrincipal=false)

-public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient, NonConversationalCallback {

-    

-    @Context

-    protected ComponentContext componentContext;

-    

-    @Reference 

-    protected ConversationalService conversationalService;

-    

-    @Reference 

-    protected ConversationalService conversationalService2;

-    

-    @Reference

-    protected ConversationalReferenceClient conversationalReferenceClient;

-      

-    private int clientCount = 0;

-    private int callbackCount = 0;  

-    

-    

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();        

-	

-    // From ConversationalClient

-	public int runConversationFromInjectedReference(){

-	    calls.append("runConversationFromInjectedReference,");	    

-	    conversationalService.initializeCount(1);

-	    conversationalService.incrementCount();

-	    clientCount = conversationalService.retrieveCount();

-	    conversationalService.endConversation();

-	    

-	    return clientCount;

-	}

-    public int runConversationFromInjectedReference2(){

-        calls.append("runConversationFromInjectedReference2,");

-               

-        conversationalService2.initializeCount(1);

-        conversationalService2.incrementCount();

-        

-        // stick in a call to the first reference to 

-        // make sure the two references don't clash

-        conversationalService.initializeCount(1);

-        

-        clientCount = conversationalService2.retrieveCount();

-        conversationalService2.endConversation();

-        

-        // end the conversation through the first reference

-        conversationalService.endConversation();

-        

-        return clientCount;

-    }	

-    public int runConversationFromServiceReference(){

-        calls.append("runConversationFromServiceReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }	

-    public int runConversationWithUserDefinedConversationId(){

-        calls.append("runConversationWithUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation1");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }    

-    public String runConversationCheckUserDefinedConversationId(){

-        calls.append("runConversationCheckUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation2");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        return callableReference.endConversation();

-              

-    }      

-    public int runConversationCheckingScope(){

-        calls.append("runConversationCheckingScope,");

-        // run a conversation

-        return runConversationFromInjectedReference();

-        

-        // test will then use a static method to find out how many times 

-        // init/destroy were called

-    }    

-	public int runConversationWithCallback(){

-	    calls.append("runConversationWithCallback,");

-	    callbackCount = 2;

-        conversationalService.initializeCountCallback(1);

-        conversationalService.incrementCountCallback();

-        clientCount = conversationalService.retrieveCountCallback();

-        conversationalService.endConversationCallback();

-        

-        return clientCount;

-    } 

-    public int runConversationHavingPassedReference(){

-        calls.append("runConversationHavingPassedReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");       

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        conversationalReferenceClient.incrementCount(serviceReference);

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }

-    public String runConversationBusinessException(){

-        calls.append("runConversationbusinessException,");      

-        try {

-            conversationalService.initializeCount(1);

-//            conversationalService.businessException();

-            clientCount = conversationalService.retrieveCount();

-            conversationalService.endConversation();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }

-    

-    public String runConversationBusinessExceptionCallback(){

-        calls.append("runConversationbusinessExceptionCallback,");

-        try {

-            conversationalService.initializeCountCallback(1);

-//            conversationalService.businessExceptionCallback();

-            clientCount = conversationalService.retrieveCountCallback();

-            conversationalService.endConversationCallback();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }   

-    

-    public String runConversationCallingEndedConversationCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }    

-    

-    public String runConversationCallingEndedConversationCallbackCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversationCallback();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }     

-    

-    public int runConversationCallingEndedConversation(){

-        calls.append("runConversationCallingEndedConversation,");

-        conversationalService.initializeCount(1);

-        conversationalService.endConversation();

-        return conversationalService.retrieveCount();

-    }   

-    

-    public int runConversationCallingEndedConversationCallback(){

-        calls.append("runConversationCallingEndedConversationCallback,");

-        conversationalService.initializeCountCallback(1);

-        conversationalService.endConversationCallback();

-        return conversationalService.retrieveCountCallback();

-    }  

-    

-    public int runConversationAgeTimeout(){

-        calls.append("runConversationAgeTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationIdleTimeout(){

-        calls.append("runConversationIdleTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationPrincipleError(){

-        calls.append("runConversationPrincipleError,");

-        // TODO - when policy framework is done

-        return clientCount;

-    }

-    

-    

-    // From ConversationalCallback

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,"); 

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        callbackCount += count;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        callbackCount++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        return  callbackCount;

-    }

-    

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }     

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        return null;

-    }

-

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
deleted file mode 100644
index 3ac259ed7c..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ /dev/null
@@ -1,318 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.oasisopen.sca.ComponentContext;

-import org.oasisopen.sca.ServiceReference;

-import org.oasisopen.sca.annotation.Context;

-import org.oasisopen.sca.annotation.Destroy;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * The client for the conversational itest which presents a stateful

- * callback interface

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Service(interfaces={ConversationalClient.class})

-public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback {

-   

-    @Context

-    protected ComponentContext componentContext;

-    

-    @Reference 

-    protected ConversationalService conversationalService;

-    

-    @Reference 

-    protected ConversationalService conversationalService2;

-    

-    @Reference

-    protected ConversationalReferenceClient conversationalReferenceClient;

-    

-    private int clientCount = 0;

-    private int callbackCount = 0;

-    

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();    

-	

-    // From ConversationalClient

-    public int runConversationFromInjectedReference(){

-        calls.append("runConversationFromInjectedReference,");

-        conversationalService.initializeCount(1);

-        conversationalService.incrementCount();

-        clientCount = conversationalService.retrieveCount();

-        conversationalService.endConversation();

-        

-        return clientCount;

-    }

-    public int runConversationFromInjectedReference2(){

-        calls.append("runConversationFromInjectedReference2,");   

-

-        // now test the second reference        

-        conversationalService2.initializeCount(1);

-        conversationalService2.incrementCount();

-        

-        // stick in a call to the first reference to 

-        // make sure the two references don't clash

-        conversationalService.initializeCount(1);

-        

-        clientCount = conversationalService2.retrieveCount();

-        conversationalService2.endConversation();

-        

-        // end the conversation through the first reference

-        conversationalService.endConversation();

-        

-        return clientCount;

-    }

-    public int runConversationFromServiceReference(){

-        calls.append("runConversationFromServiceReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");       

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }   

-    public int runConversationWithUserDefinedConversationId(){

-        calls.append("runConversationWithUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation1");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        // serviceReference.getConversation().end();

-        

-        return clientCount;

-    }    

-    public String runConversationCheckUserDefinedConversationId(){

-        calls.append("runConversationCheckUserDefinedConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation2");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        

-        String clientConversationId = serviceReference.getConversationID().toString();

-        String serverConfersationId = callableReference.endConversation();

-        

-        if (clientConversationId.equals("MyConversation2") &&

-            serverConfersationId.equals("MyConversation2") ) {

-            return clientConversationId;

-        } else {

-            return "client = " + clientConversationId +

-                   "server = " + serverConfersationId;

-        }     

-    }     

-    public int runConversationCheckingScope(){

-        calls.append("runConversationCheckingScope,");

-        // run a conversation

-        return runConversationFromInjectedReference();

-        

-        // test will then use a static method to find out how many times 

-        // init/destroy were called

-    }

-    public int runConversationWithCallback(){

-        calls.append("runConversationWithCallback,");

-        conversationalService.initializeCountCallback(1);

-        conversationalService.incrementCountCallback();

-        clientCount = conversationalService.retrieveCountCallback();

-        conversationalService.endConversationCallback();

-        

-        return clientCount;

-    } 

-    

-    public int runConversationHavingPassedReference(){

-        calls.append("runConversationHavingPassedReference,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");       

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        conversationalReferenceClient.incrementCount(serviceReference);

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        serviceReference.getConversation().end();

-        

-        return clientCount;

-    }	

-    

-    public String runConversationBusinessException(){

-	    calls.append("runConversationbusinessException,");	    

-	    try {

-            conversationalService.initializeCount(1);

-//            conversationalService.businessException();

-            clientCount = conversationalService.retrieveCount();

-            conversationalService.endConversation();

-	    } catch(Exception ex) {

-	        return ex.getMessage();

-	    }

-         

-        return "No Exception Returned";

-    }

-	

-    public String runConversationBusinessExceptionCallback(){

-        calls.append("runConversationbusinessExceptionCallback,");

-        try {

-            conversationalService.initializeCountCallback(1);

-//            conversationalService.businessExceptionCallback();

-            clientCount = conversationalService.retrieveCountCallback();

-            conversationalService.endConversationCallback();

-        } catch(Exception ex) {

-            return ex.getMessage();

-        }

-         

-        return "No Exception Returned";

-    }	

-	

-    public int runConversationCallingEndedConversation(){

-        calls.append("runConversationCallingEndedConversation,");

-        conversationalService.initializeCount(1);

-        conversationalService.endConversation();

-        return conversationalService.retrieveCount();

-    }   

-    

-    public int runConversationCallingEndedConversationCallback(){

-        calls.append("runConversationCallingEndedConversationCallback,");

-        conversationalService.initializeCountCallback(1);

-        conversationalService.endConversationCallback();

-        return conversationalService.retrieveCountCallback();

-    }   

-    

-    public String runConversationCallingEndedConversationCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversation();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        }

-    }    

-    

-    public String runConversationCallingEndedConversationCallbackCheckConversationId(){

-        calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");

-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 

-                                                                                                        "conversationalService");

-        serviceReference.setConversationID("MyConversation3");

-        

-        ConversationalService callableReference = serviceReference.getService();

-        

-        callableReference.initializeCount(1);

-        callableReference.incrementCount();

-        clientCount = callableReference.retrieveCount();

-        callableReference.endConversationCallback();

-        

-        if (serviceReference.getConversation() ==null ) {

-            return null;

-        } else {

-            return serviceReference.getConversation().getConversationID().toString();

-        } 

-    }    

-    

-    public int runConversationAgeTimeout(){

-        calls.append("runConversationAgeTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationIdleTimeout(){

-        calls.append("runConversationIdleTimeout,");

-        // done in other testing

-        return clientCount;

-    }

-    public int runConversationPrincipleError(){

-        calls.append("runConversationPrincipleError,");

-        // TODO - when policy framework is done

-        return clientCount;

-    }

-    

-    

-    // From ConversationalCallback

-    @Init

-    public void init(){

-        calls.append("init,");

-

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-        

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        callbackCount = 0;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        callbackCount++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        return  callbackCount;

-    }

-    

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }     

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        callbackCount = 0;

-        return null;

-    }

-

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
deleted file mode 100644
index 1abe9e51c3..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ /dev/null
@@ -1,43 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.oasisopen.sca.CallableReference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * A client component that accepts a reference to an ongoing conversation

- * and takes part in that conversation

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-@Service(interfaces={ConversationalReferenceClient.class})

-public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{

-   

-    public void incrementCount(CallableReference<ConversationalService> conversationalService){

-        ConversationalService callableReference = conversationalService.getService();

-        

-        callableReference.incrementCount();        

-    }

-

-

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
deleted file mode 100644
index fc485b6c4b..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ /dev/null
@@ -1,124 +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.itest.conversational.impl;

-

-import java.util.HashMap;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.ConversationID;

-import org.oasisopen.sca.annotation.Destroy;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-

-/**

- * The service used when testing stateful conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Service(ConversationalService.class)

-@Scope("REQUEST")

-public class ConversationalServiceRequestImpl implements ConversationalService {

-    

-    @ConversationID

-    protected String conversationId;

-    

-    @Callback

-    protected ConversationalCallback conversationalCallback; 

-    

-    // static area in which to hold conversational data

-    private static HashMap<String, Integer> conversationalState = new HashMap<String, Integer>();

-   

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();

-   

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        Integer conversationalCount = new Integer(count); 

-        conversationalState.put(conversationId, conversationalCount);

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        Integer conversationalCount = conversationalState.get(conversationId);

-        conversationalCount++;

-        conversationalState.put(conversationId, conversationalCount);

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        Integer count = conversationalState.get(conversationId);

-        if (count != null){

-            return count.intValue();

-        } else {

-            return -999;

-        }

-    }

-    

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }    

-    

-    public void initializeCountCallback(int count){

-        calls.append("initializeCountCallback,");

-        initializeCount(count);

-        conversationalCallback.initializeCount(count);

-    }

-    

-    public void incrementCountCallback(){

-        calls.append("incrementCountCallback,");

-        incrementCount();

-        conversationalCallback.incrementCount();

-    }

-    

-    public int retrieveCountCallback(){

-        calls.append("retrieveCountCallback,");

-        return conversationalCallback.retrieveCount();

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {

-        calls.append("businessExceptionCallback,");        

-        conversationalCallback.businessException();

-    }

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        conversationalState.remove(conversationId);

-        return conversationId;

-    }

-    

-    public String endConversationCallback(){

-        calls.append("endConversationCallback,");       

-        return conversationalCallback.endConversation();

-    }   

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
deleted file mode 100644
index a783e79cae..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.ConversationAttributes;

-import org.oasisopen.sca.annotation.ConversationID;

-import org.oasisopen.sca.annotation.Destroy;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-

-/**

- * The service used when testing stateful conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Service(ConversationalService.class)

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="10 minutes",

-                        maxIdleTime="5 minutes",

-                        singlePrincipal=false)

-public class ConversationalServiceStatefulImpl implements ConversationalService {

-

-    @ConversationID

-    protected String conversationId;

-    

-    @Callback

-    protected ConversationalCallback conversationalCallback; 

-    

-    // local count - accumulates during the conversation

-    private int count = 0;

-          

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();

-   

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");       

-        this.count = count;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");        

-        count++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,"); 

-        return count;

-    }

-    

-    public void businessException() throws BusinessException {

-        calls.append("businessException,");

-        throw new BusinessException("Business Exception");

-    }     

-    

-    public void initializeCountCallback(int count){

-        calls.append("initializeCountCallback,"); 

-        this.count = count;

-        conversationalCallback.initializeCount(count);

-    }

-    

-    public void incrementCountCallback(){

-        calls.append("incrementCountCallback,"); 

-        count++;

-        conversationalCallback.incrementCount();

-    }

-    

-    public int retrieveCountCallback(){

-        calls.append("retrieveCountCallback,"); 

-        return conversationalCallback.retrieveCount();

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {

-        calls.append("businessExceptionCallback,");        

-        conversationalCallback.businessException();

-    }    

-    

-    public String endConversation(){

-        calls.append("endConversation,"); 

-        count = 0;

-        return conversationId;

-    }

-    

-    public String endConversationCallback(){

-        calls.append("endConversationCallback,"); 

-        return conversationalCallback.endConversation();

-    }

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index 5f34de66b3..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ /dev/null
@@ -1,118 +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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.ConversationAttributes;

-import org.oasisopen.sca.annotation.ConversationID;

-import org.oasisopen.sca.annotation.Destroy;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-

-/**

- * The service used when testing stateful conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Service(ConversationalServiceNonConversationalCallback.class)

-@Scope("CONVERSATION")

-@ConversationAttributes(maxAge="10 minutes",

-                        maxIdleTime="5 minutes",

-                        singlePrincipal=false)

-public class ConversationalServiceStatefulNonConversationalCallbackImpl implements ConversationalServiceNonConversationalCallback {

-

-    @ConversationID

-    protected String conversationId;

-    

-    @Callback

-    protected NonConversationalCallback nonConversationalCallback; 

-    

-    // local count - accumulates during the conversation

-    private int count = 0;

-          

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();

-   

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");       

-        this.count = count;

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");        

-        count++;

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,"); 

-        return count;

-    }

-    

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }     

-    

-    public void initializeCountCallback(int count){

-        calls.append("initializeCountCallback,"); 

-        this.count = count;

-        nonConversationalCallback.initializeCount(count);

-    }

-    

-    public void incrementCountCallback(){

-        calls.append("incrementCountCallback,"); 

-        count++;

-        nonConversationalCallback.incrementCount();

-    }

-    

-    public int retrieveCountCallback(){

-        calls.append("retrieveCountCallback,"); 

-        return nonConversationalCallback.retrieveCount();

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {

-        calls.append("businessExceptionCallback,");        

-        nonConversationalCallback.businessException();

-    }    

-    

-    public String endConversation(){

-        calls.append("endConversation,"); 

-        count = 0;

-        return conversationId;

-    }

-    

-    public String endConversationCallback(){

-        calls.append("endConversationCallback,"); 

-        return nonConversationalCallback.endConversation();

-    }

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
deleted file mode 100644
index 02a2fb1d4d..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ /dev/null
@@ -1,122 +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.itest.conversational.impl;

-

-import java.util.HashMap;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.ConversationID;

-import org.oasisopen.sca.annotation.Destroy;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Service;

-

-

-/**

- * The service used when testing stateful conversations

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Service(ConversationalService.class)

-public class ConversationalServiceStatelessImpl implements ConversationalService {

-    

-    @ConversationID

-    protected String conversationId;

-    

-    @Callback

-    protected ConversationalCallback conversationalCallback; 

-    

-    // static area in which to hold conversational data

-    private static HashMap<String, Integer> conversationalState = new HashMap<String, Integer>();

-   

-    // a static member variable that records the number of times this service is called

-    public static StringBuffer calls = new StringBuffer();

-   

-    @Init

-    public void init(){

-        calls.append("init,");

-    }

-    

-    @Destroy

-    public void destroy(){

-        calls.append("destroy,");

-    }

-    

-    public void initializeCount(int count){

-        calls.append("initializeCount,");

-        Integer conversationalCount = new Integer(count); 

-        conversationalState.put(conversationId, conversationalCount);

-    }

-    

-    public void incrementCount(){

-        calls.append("incrementCount,");

-        Integer conversationalCount = conversationalState.get(conversationId);

-        conversationalCount++;

-        conversationalState.put(conversationId, conversationalCount);

-    }

-    

-    public int retrieveCount(){

-        calls.append("retrieveCount,");

-        Integer count = conversationalState.get(conversationId);

-        if (count != null){

-            return count.intValue();

-        } else {

-            return -999;

-        }

-    }

-    

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }    

-    

-    public void initializeCountCallback(int count){

-        calls.append("initializeCountCallback,");

-        initializeCount(count);

-        conversationalCallback.initializeCount(count);

-    }

-    

-    public void incrementCountCallback(){

-        calls.append("incrementCountCallback,");

-        incrementCount();

-        conversationalCallback.incrementCount();

-    }

-    

-    public int retrieveCountCallback(){

-        calls.append("retrieveCountCallback,");

-        return conversationalCallback.retrieveCount();

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {

-        calls.append("businessExceptionCallback,");        

-        conversationalCallback.businessException();

-    }

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        conversationalState.remove(conversationId);

-        return conversationId;

-    }

-    

-    public String endConversationCallback(){

-        calls.append("endConversationCallback,");       

-        return conversationalCallback.endConversation();

-    }   

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
deleted file mode 100644
index 4550e3eaa1..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.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 org.apache.tuscany.sca.itest.conversational.impl;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.apache.tuscany.sca.itest.conversational.BusinessException;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.oasisopen.sca.annotation.ConversationID;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(ConversationalService.class)

-public class ConversationalServiceStatelessScopeImpl implements ConversationalService {

-

-    @ConversationID

-    protected String cid;

-

-    static Map<String, Integer> state = new HashMap<String, Integer>();

-    

-    public void destroy() {

-        // TODO Auto-generated method stub

-        

-    }

-

-    public String endConversation() {

-        state.remove(cid);

-        return cid;

-    }

-

-    public String endConversationCallback() {

-        // TODO Auto-generated method stub

-        return null;

-        

-    }

-

-    public void incrementCount() {

-        state.put(cid, Integer.valueOf(state.get(cid)+1));

-    }

-

-    public void businessException() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }

-    

-    public void incrementCountCallback() {

-        // TODO Auto-generated method stub

-        

-    }

-

-    public void init() {

-        // TODO Auto-generated method stub

-        

-    }

-

-    public void initializeCount(int count) {

-        state.put(cid, Integer.valueOf(count));

-    }

-

-    public void initializeCountCallback(int count) {

-        // TODO Auto-generated method stub

-        

-    }

-    

-    public void businessExceptionCallback() throws BusinessException {

-        throw new BusinessException("Business Exception");

-    }    

-

-    public int retrieveCount() {

-        return state.get(cid);

-    }

-

-    public int retrieveCountCallback() {

-        // TODO Auto-generated method stub

-        return 0;

-    }

-    

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/java/sca-contrib/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
deleted file mode 100644
index d5a1ff7410..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:conv="http://conversations">

-    <deployable composite="conv:ConversationalITest" />

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/java/sca-contrib/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
deleted file mode 100644
index c4da99145d..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
+++ /dev/null
@@ -1,169 +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://conversations"

-	name="ConversationalITest">

- 	      

-    <component name="ConversationalStatelessClientStatelessService">

-	    <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>		

-		<reference name="conversationalService" target="ConversationalServiceStatelessSL">

-		    <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />

-            <binding.ws/>

-            <callback>

-                <binding.ws uri="http://localhost:8085/ConversationalStatelessClientStatelessService"/>

-            </callback>

-        </reference>

-		<reference name="conversationalService2" target="ConversationalServiceStatelessSL">

-            <binding.ws/>

-        </reference> 		

-    </component>   

-    

-    <component name="ConversationalStatelessClientStatefulService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful">

-            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />

-            <binding.ws/>

-            <callback>

-                <binding.ws uri="http://localhost:8085/ConversationalStatelessClientStatefulService"/>

-            </callback>

-        </reference>

-        <reference name="conversationalService2" target="ConversationalServiceStateful">  

-            <binding.ws/>

-        </reference>     

-    </component>     

-    

-    <component name="ConversationalStatefulClientStatelessService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStatelessSL">

-            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />

-            <binding.ws/>

-            <callback>

-                <binding.ws uri="http://localhost:8085/ConversationalStatefulClientStatelessService"/>

-            </callback>

-        </reference>

-        <reference name="conversationalService2" target="ConversationalServiceStatelessSL">

-            <binding.ws/>

-        </reference>        

-    </component>   

-    

-    <component name="ConversationalStatefulClientStatefulService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful">

-            <binding.ws/>

-            <callback>

-                <binding.ws uri="http://localhost:8085/ConversationalStatefulClientStatefulService"/>

-            </callback>            

-        </reference>        

-        <reference name="conversationalService2" target="ConversationalServiceStateful">

-            <binding.ws/>

-        </reference>

-    </component>  

-    

-    <component name="ConversationalStatelessClientRequestService">

-	    <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>		

-        <reference name="conversationalService" target="ConversationalServiceRequest">

-            <binding.ws/>

-            <callback>

-                <binding.ws uri="http://localhost:8085/ConversationalStatelessClientRequestService"/>

-            </callback>            

-        </reference>        

-        <reference name="conversationalService2" target="ConversationalServiceRequest">

-            <binding.ws/>

-        </reference>

-    </component> 

-    

-    <component name="ConversationalStatefulClientNonConversationalCallbackStatefulService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl"/>

-        <reference name="conversationalService" target="ConversationalServiceStatefulNonConversationalCallback">

-            <binding.ws/>

-            <callback>

-                <binding.ws uri="http://localhost:8085/ConversationalStatefulClientNonConversationalCallbackStatefulService"/>

-            </callback>            

-        </reference>        

-        <reference name="conversationalService2" target="ConversationalServiceStatefulNonConversationalCallback">

-            <binding.ws/>

-        </reference>

-    </component>     

-    

-    <component name="ConversationalReferenceClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalReferenceClientImpl"/>

-    </component>    

-        

-    <component name="ConversationalServiceStateful">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl"/>

-		<service name="ConversationalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />		

-		    <binding.ws uri="http://localhost:8085/ConversationalServiceStateful"/>

-            <callback>

-                <binding.ws/>

-            </callback>

-		</service>

-	</component>       

-   

-    <component name="ConversationalServiceStateless">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessScopeImpl"/>

-	</component>  

-	

-    <component name="ConversationalServiceStatelessSL">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl"/>

-        <service name="ConversationalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />       

-            <binding.ws uri="http://localhost:8085/ConversationalServiceStatelessSL"/>

-            <callback>

-                <binding.ws/>

-            </callback>

-        </service>        

-    </component> 

-

-    <component name="ConversationalServiceRequest">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl"/>

-        <service name="ConversationalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />       

-            <binding.ws uri="http://localhost:8085/ConversationalServiceRequest"/>

-            <callback>

-                <binding.ws/>

-            </callback>

-        </service>            

-    </component> 

-    

-    <component name="ConversationalServiceStatefulNonConversationalCallback">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl"/>

-        <service name="ConversationalServiceNonConversationalCallback">

-            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback"

-                            callbackInterface="org.apache.tuscany.sca.itest.conversational.NonConversationalCallback" />       

-            <binding.ws uri="http://localhost:8085/ConversationalServiceStatefulNonConversationalCallback"/>

-            <callback>

-                <binding.ws/>

-            </callback>

-        </service> 		

-	</component>   

-

-</composite>

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
deleted file mode 100644
index 20a92c9dc7..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
+++ /dev/null
@@ -1,383 +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://conversational.itest.sca.tuscany.apache.org" 

-                  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" 

-                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 

-                  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 

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

-                  xmlns:ns0="http://conversational.itest.sca.tuscany.apache.org" 

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 

-                  xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" 

-                  xmlns:ns1="http://org.apache.axis2/xsd">

-  <wsdl:types>

-    <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://conversational.itest.sca.tuscany.apache.org" xmlns:ns="http://conversational.itest.sca.tuscany.apache.org">

-            <xs:element name="retrieveCountResponse">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="return" type="xs:int"/>

-                    </xs:sequence>

-                </xs:complexType>

-

-            </xs:element>

-            <xs:element name="retrieveCountCallbackResponse">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="return" type="xs:int"/>

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-            <xs:element name="endConversationResponse">

-

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-            <xs:element name="endConversationCallbackResponse">

-                <xs:complexType>

-                    <xs:sequence>

-

-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-            <xs:element name="initializeCount">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="param0" type="xs:int"/>

-                    </xs:sequence>

-

-                </xs:complexType>

-            </xs:element>

-            <xs:element name="initializeCountCallback">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="param0" type="xs:int"/>

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-

-        <xs:element name="retrieveCount"><xs:complexType/></xs:element><xs:element name="endConversation"><xs:complexType/></xs:element><xs:element name="endConversationCallback"><xs:complexType/></xs:element><xs:element name="incrementCountCallback"><xs:complexType/></xs:element><xs:element name="incrementCountCallbackResponse"><xs:complexType/></xs:element><xs:element name="incrementCount"><xs:complexType/></xs:element><xs:element name="incrementCountResponse"><xs:complexType/></xs:element><xs:element name="initializeCountCallbackResponse"><xs:complexType/></xs:element><xs:element name="initializeCountResponse"><xs:complexType/></xs:element><xs:element name="retrieveCountCallback"><xs:complexType/></xs:element></xs:schema>

-  </wsdl:types>

-  <wsdl:message name="initializeCountCallbackResponse">

-    <wsdl:part name="parameters" element="ns0:initializeCountCallbackResponse">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="retrieveCountCallbackRequest">

-    <wsdl:part name="parameters" element="ns0:retrieveCountCallback">

-    </wsdl:part>

-

-  </wsdl:message>

-  <wsdl:message name="incrementCountRequest">

-    <wsdl:part name="parameters" element="ns0:incrementCount">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="incrementCountCallbackResponse">

-    <wsdl:part name="parameters" element="ns0:incrementCountCallbackResponse">

-    </wsdl:part>

-  </wsdl:message>

-

-  <wsdl:message name="retrieveCountCallbackResponse">

-    <wsdl:part name="parameters" element="ns0:retrieveCountCallbackResponse">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="retrieveCountResponse">

-    <wsdl:part name="parameters" element="ns0:retrieveCountResponse">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="endConversationResponse">

-

-    <wsdl:part name="parameters" element="ns0:endConversationResponse">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="endConversationCallbackRequest">

-    <wsdl:part name="parameters" element="ns0:endConversationCallback">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="incrementCountCallbackRequest">

-    <wsdl:part name="parameters" element="ns0:incrementCountCallback">

-

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="retrieveCountRequest">

-    <wsdl:part name="parameters" element="ns0:retrieveCount">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="initializeCountRequest">

-    <wsdl:part name="parameters" element="ns0:initializeCount">

-    </wsdl:part>

-

-  </wsdl:message>

-  <wsdl:message name="initializeCountResponse">

-    <wsdl:part name="parameters" element="ns0:initializeCountResponse">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="endConversationCallbackResponse">

-    <wsdl:part name="parameters" element="ns0:endConversationCallbackResponse">

-    </wsdl:part>

-  </wsdl:message>

-

-  <wsdl:message name="endConversationRequest">

-    <wsdl:part name="parameters" element="ns0:endConversation">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="initializeCountCallbackRequest">

-    <wsdl:part name="parameters" element="ns0:initializeCountCallback">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="incrementCountResponse">

-

-    <wsdl:part name="parameters" element="ns0:incrementCountResponse">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:portType name="ConversationalServicePortType">

-    <wsdl:operation name="retrieveCount">

-      <wsdl:input message="ns0:retrieveCountRequest" wsaw:Action="urn:retrieveCount">

-    </wsdl:input>

-      <wsdl:output message="ns0:retrieveCountResponse" wsaw:Action="urn:retrieveCountResponse">

-    </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="endConversation">

-      <wsdl:input message="ns0:endConversationRequest" wsaw:Action="urn:endConversation">

-    </wsdl:input>

-      <wsdl:output message="ns0:endConversationResponse" wsaw:Action="urn:endConversationResponse">

-    </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="endConversationCallback">

-      <wsdl:input message="ns0:endConversationCallbackRequest" wsaw:Action="urn:endConversationCallback">

-

-    </wsdl:input>

-      <wsdl:output message="ns0:endConversationCallbackResponse" wsaw:Action="urn:endConversationCallbackResponse">

-    </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="incrementCountCallback">

-      <wsdl:input message="ns0:incrementCountCallbackRequest" wsaw:Action="urn:incrementCountCallback">

-    </wsdl:input>

-      <wsdl:output message="ns0:incrementCountCallbackResponse" wsaw:Action="urn:incrementCountCallbackResponse">

-    </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="incrementCount">

-      <wsdl:input message="ns0:incrementCountRequest" wsaw:Action="urn:incrementCount">

-    </wsdl:input>

-      <wsdl:output message="ns0:incrementCountResponse" wsaw:Action="urn:incrementCountResponse">

-    </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="initializeCountCallback">

-      <wsdl:input message="ns0:initializeCountCallbackRequest" wsaw:Action="urn:initializeCountCallback">

-

-    </wsdl:input>

-      <wsdl:output message="ns0:initializeCountCallbackResponse" wsaw:Action="urn:initializeCountCallbackResponse">

-    </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="initializeCount">

-      <wsdl:input message="ns0:initializeCountRequest" wsaw:Action="urn:initializeCount">

-    </wsdl:input>

-      <wsdl:output message="ns0:initializeCountResponse" wsaw:Action="urn:initializeCountResponse">

-    </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="retrieveCountCallback">

-      <wsdl:input message="ns0:retrieveCountCallbackRequest" wsaw:Action="urn:retrieveCountCallback">

-    </wsdl:input>

-      <wsdl:output message="ns0:retrieveCountCallbackResponse" wsaw:Action="urn:retrieveCountCallbackResponse">

-    </wsdl:output>

-    </wsdl:operation>

-  </wsdl:portType>

-  <wsdl:binding name="ConversationalServiceSOAP11Binding" type="ns0:ConversationalServicePortType">

-

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

-    <wsdl:operation name="retrieveCount">

-      <soap:operation soapAction="urn:retrieveCount" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="endConversation">

-      <soap:operation soapAction="urn:endConversation" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="endConversationCallback">

-      <soap:operation soapAction="urn:endConversationCallback" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="incrementCountCallback">

-      <soap:operation soapAction="urn:incrementCountCallback" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="incrementCount">

-      <soap:operation soapAction="urn:incrementCount" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="initializeCountCallback">

-      <soap:operation soapAction="urn:initializeCountCallback" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="initializeCount">

-      <soap:operation soapAction="urn:initializeCount" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-    <wsdl:operation name="retrieveCountCallback">

-      <soap:operation soapAction="urn:retrieveCountCallback" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-

-    </wsdl:operation>

-  </wsdl:binding>

-  <wsdl:binding name="ConversationalServiceHttpBinding" type="ns0:ConversationalServicePortType">

-    <http:binding verb="POST"/>

-    <wsdl:operation name="retrieveCount">

-      <http:operation location="ConversationalService/retrieveCount"/>

-      <wsdl:input>

-        <mime:content part="retrieveCount" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="retrieveCount" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="endConversation">

-      <http:operation location="ConversationalService/endConversation"/>

-      <wsdl:input>

-        <mime:content part="endConversation" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="endConversation" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="endConversationCallback">

-      <http:operation location="ConversationalService/endConversationCallback"/>

-      <wsdl:input>

-        <mime:content part="endConversationCallback" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="endConversationCallback" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="incrementCountCallback">

-      <http:operation location="ConversationalService/incrementCountCallback"/>

-      <wsdl:input>

-        <mime:content part="incrementCountCallback" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="incrementCountCallback" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="incrementCount">

-      <http:operation location="ConversationalService/incrementCount"/>

-      <wsdl:input>

-        <mime:content part="incrementCount" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="incrementCount" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="initializeCountCallback">

-      <http:operation location="ConversationalService/initializeCountCallback"/>

-      <wsdl:input>

-        <mime:content part="initializeCountCallback" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="initializeCountCallback" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="initializeCount">

-      <http:operation location="ConversationalService/initializeCount"/>

-      <wsdl:input>

-        <mime:content part="initializeCount" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="initializeCount" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-    <wsdl:operation name="retrieveCountCallback">

-      <http:operation location="ConversationalService/retrieveCountCallback"/>

-      <wsdl:input>

-        <mime:content part="retrieveCountCallback" type="text/xml"/>

-      </wsdl:input>

-

-      <wsdl:output>

-        <mime:content part="retrieveCountCallback" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-  </wsdl:binding>

-  <wsdl:service name="ConversationalService">

-    <wsdl:port name="ConversationalServiceSOAP11port_http" binding="ns0:ConversationalServiceSOAP11Binding">

-      <soap:address location="http://localhost:8085/ConversationalServiceStateful"/>

-    </wsdl:port>

-

-    <wsdl:port name="ConversationalServiceHttpport" binding="ns0:ConversationalServiceHttpBinding">

-      <http:address location="http://localhost:8085/ConversationalServiceStateful"/>

-    </wsdl:port>

-  </wsdl:service>

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
deleted file mode 100644
index 73d078674c..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:conv="http://conversations">

-    <deployable composite="conv:ConversationalWSDLITest" />

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
deleted file mode 100644
index 9c6b0a2b34..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
+++ /dev/null
@@ -1,46 +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://conversations"

-	name="ConversationalWSDLITest">

- 	      

-    <component name="ConversationalStatelessClientStatefulService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful">

-           <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.port(ConversationalService/ConversationalServiceSOAP11port_http)"/>

-        </reference>

-        <reference name="conversationalService2" target="ConversationalServiceStateful">  

-            <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.port(ConversationalService/ConversationalServiceSOAP11port_http)"/>

-        </reference>     

-    </component>     

-       

-    <component name="ConversationalServiceStateful">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl"/>

-		<service name="ConversationalService">

-		    <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.port(ConversationalService/ConversationalServiceSOAP11port_http)"/>

-		</service>

-    </component>  

-      

-    <component name="ConversationalReferenceClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalReferenceClientImpl"/>

-    </component> 

-   

-</composite>

diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
deleted file mode 100644
index 6c3cbe462c..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.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.itest.conversational;

-

-

-import java.io.File;

-

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.node.Client;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-

-public class ConversationWSDLTestCase {

-

-    private Node node; 

-    private ConversationalClient conversationalStatelessClientStatefulService;    

-

-    @Before

-    public void setUp() throws Exception {

-        NodeFactory nodeFactory = NodeFactory.newInstance();

-        node = nodeFactory.createNode(new File("src/main/resources/ConversationalWSDL/conversationalWSDL.composite").toURL().toString(),

-                                         new Contribution("TestContribution", 

-                                                                     new File("src/main/resources/ConversationalWSDL").toURL().toString()));

-                

-         

-        node.start();

-        

-        conversationalStatelessClientStatefulService = ((Client)node).getService(ConversationalClient.class, "ConversationalStatelessClientStatefulService");

-        

-        

-        ConversationalClientStatelessImpl.calls  = new StringBuffer(); 

-    }

-

-    @After

-    public void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatefulService = null;

-    }

-

-    @Test

-    public void testStatelessStatefulConversationFromInjectedReference() {

-        int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    //@Test

-    public void testKeepServerRunning() throws Exception {

-        System.out.println("press enter to continue");

-        System.in.read();

-    }    

-

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
deleted file mode 100644
index 051b6b9fc1..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ /dev/null
@@ -1,198 +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.itest.conversational;

-

-import java.io.File;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.apache.tuscany.sca.node.Client;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class NonConversationalCallbackTestCase {

-

-    private static Node node;

-    private static ConversationalClient conversationalStatelessClientStatelessService;

-    private static ConversationalClient conversationalStatelessClientStatefulService;

-    private static ConversationalClient conversationalStatefulClientStatelessService;

-    private static ConversationalClient conversationalStatefulClientStatefulService; 

-    private static ConversationalClient conversationalStatelessClientRequestService;

-    private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;    

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-    	try {

-            NodeFactory nodeFactory = NodeFactory.newInstance();

-            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new Contribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatelessClientStatelessService");

-	

-	    conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatelessClientStatefulService");

-	

-	    conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatefulClientStatelessService");

-	

-	    conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatefulClientStatefulService");

-	    conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatelessClientRequestService");

-	    conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-	        

-	    // reset the place where we record the sequence of calls passing

-	    // through each component instance

-	    ConversationalServiceStatelessImpl.calls = new StringBuffer();

-	    ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-	    ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-	    ConversationalClientStatefulImpl.calls   = new StringBuffer();

-        

-    	} catch(Exception ex) {

-    		System.err.println(ex.toString());

-    	}

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatelessService = null;

-        conversationalStatelessClientStatefulService = null;

-        conversationalStatefulClientStatelessService = null;

-        conversationalStatefulClientStatefulService = null; 

-        conversationalStatelessClientRequestService = null;

-        conversationalStatefulClientNonConversationalCallbackStatelessService = null;    

-    }

-    

-    private static void resetCallStack() {

-        

-        // reset the place where we record the sequence of calls passing

-        // through each component instance

-        ConversationalServiceStatelessImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-        ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-        ConversationalClientStatefulImpl.calls   = new StringBuffer();    

-        ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        

-    }    

-

-    // stateful client non conversational callback stateful service tests  

-    // ==================================================================

-   

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference2() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }     

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationFromServiceReference() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }          

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationWithUserDefinedConversationId() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCheckingScope() {

-        resetCallStack();

-    	ConversationalServiceStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-    	conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-        		            ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString());

-    }  

-

-    //@Test

-    public void testStatefulNonConversationalCallbackStatefulConversationWithCallback() {

-        resetCallStack();

-    	ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithCallback();

-        Assert.assertEquals(0, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", 

-        		           ConversationalClientStatefulNonConversationalCallbackImpl.calls.toString());        

-    }   

-    

-    //@Test

-    public void testStatefulNonConversationalCallbackStatefulConversationHavingPassedReference() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationHavingPassedReference();

-        Assert.assertEquals(0, count);

-    } 

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversation() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversation();

-        Assert.assertEquals(0, count);

-    }     

-    

-    //@Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallback() {

-        int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }    

-    

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    //@Test

-    public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals("MyConversation3", id);

-    } 

-    

-       

-        

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
deleted file mode 100644
index b9530c132b..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ /dev/null
@@ -1,209 +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.itest.conversational;

-

-import java.io.File;

-

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.apache.tuscany.sca.node.Client;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class RequestScopeTestCase {

-

-    private static Node node;

-    private static ConversationalClient conversationalStatelessClientStatelessService;

-    private static ConversationalClient conversationalStatelessClientStatefulService;

-    private static ConversationalClient conversationalStatefulClientStatelessService;

-    private static ConversationalClient conversationalStatefulClientStatefulService; 

-    private static ConversationalClient conversationalStatelessClientRequestService;

-    private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;    

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-        try {

-            NodeFactory nodeFactory = NodeFactory.newInstance();

-            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new Contribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-                

-            // reset the place where we record the sequence of calls passing

-            // through each component instance

-            ConversationalServiceStatelessImpl.calls = new StringBuffer();

-            ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-            ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-            ConversationalClientStatefulImpl.calls   = new StringBuffer();

-        

-        } catch(Exception ex) {

-                System.err.println(ex.toString());

-        }

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatelessService = null;

-        conversationalStatelessClientStatefulService = null;

-        conversationalStatefulClientStatelessService = null;

-        conversationalStatefulClientStatefulService = null; 

-        conversationalStatelessClientRequestService = null;

-        conversationalStatefulClientNonConversationalCallbackStatelessService = null;    

-    }

-    

-    private static void resetCallStack() {

-        

-        // reset the place where we record the sequence of calls passing

-        // through each component instance

-        ConversationalServiceStatelessImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-        ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-        ConversationalClientStatefulImpl.calls   = new StringBuffer();    

-        ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        

-    }    

-

-    // stateless client request scope service tests

-    // ============================================

-    @Test

-    public void testStatelessRequestConversationFromInjectedReference() {

-        int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    //@Test

-    public void testStatelessRequestConversationFromInjectedReference2() {

-        int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference2();

-        Assert.assertEquals(1, count);

-    }     

-    

-    @Test

-    public void testStatelessRequestConversationFromServiceReference() {

-        int count = conversationalStatelessClientRequestService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }          

-   

-    @Test

-    public void testStatelessRequestConversationWithUserDefinedConversationId() {

-        int count = conversationalStatelessClientRequestService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }   

-    

-    //@Test

-    public void testStatelessRequestConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatelessClientRequestService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-    

-    //@Test

-    public void testStatelessRequestConversationCheckingScope() {

-        resetCallStack();

-    	ConversationalServiceRequestImpl.calls = new StringBuffer();

-    	conversationalStatelessClientRequestService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,", 

-        		            ConversationalServiceRequestImpl.calls.toString());

-        //init,initializeCount,init,incrementCount,init,retrieveCount,init,endConversation,

-    }     

-

-    @Test

-    public void testStatelessRequestConversationWithCallback() {

-        resetCallStack();

-    	ConversationalClientStatelessImpl.calls = new StringBuffer();    	

-        int count = conversationalStatelessClientRequestService.runConversationWithCallback();

-        Assert.assertEquals(0, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", 

-                            ConversationalClientStatelessImpl.calls.toString());        

-    }  

-    

-    //@Test

-    public void testStatelessRequestConversationHavingPassedReference() {

-        int count = conversationalStatelessClientRequestService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    }    

-  

-    //@Test

-    public void testStatelessRequestConversationBusinessException() {

-        String message = conversationalStatelessClientRequestService.runConversationBusinessException();

-        Assert.assertEquals("Business Exception", message);

-    }     

-    

-    //@Test

-    public void testStatelessRequestConversationBusinessExceptionCallback() {

-        String message = conversationalStatelessClientRequestService.runConversationBusinessExceptionCallback();

-        Assert.assertEquals("Business Exception", message);

-    }  

-    

-    @Test

-    public void testStatelessRequestConversationCallingEndedConversation() {

-        int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversation();

-        Assert.assertEquals(-999, count);

-    }     

-    

-    @Test

-    public void testStatelessRequestConversationCallingEndedConversationCallback() {

-        int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }  

-    

-    @Test

-    public void testStatelessRequestConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    //@Test

-    public void testStatelessRequestConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    }    

-        

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
deleted file mode 100644
index 1e5f6adcf1..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ /dev/null
@@ -1,193 +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.itest.conversational;

-

-import java.io.File;

-

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.apache.tuscany.sca.node.Client;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class StatefulStatefulTestCase {

-

-    private static Node node;

-    private static ConversationalClient conversationalStatelessClientStatelessService;

-    private static ConversationalClient conversationalStatelessClientStatefulService;

-    private static ConversationalClient conversationalStatefulClientStatelessService;

-    private static ConversationalClient conversationalStatefulClientStatefulService; 

-    private static ConversationalClient conversationalStatelessClientRequestService;

-    private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;    

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-        try {

-            NodeFactory nodeFactory = NodeFactory.newInstance();

-            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new Contribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-                

-            // reset the place where we record the sequence of calls passing

-            // through each component instance

-            ConversationalServiceStatelessImpl.calls = new StringBuffer();

-            ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-            ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-            ConversationalClientStatefulImpl.calls   = new StringBuffer();

-        

-        } catch(Exception ex) {

-                System.err.println(ex.toString());

-        }

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatelessService = null;

-        conversationalStatelessClientStatefulService = null;

-        conversationalStatefulClientStatelessService = null;

-        conversationalStatefulClientStatefulService = null; 

-        conversationalStatelessClientRequestService = null;

-        conversationalStatefulClientNonConversationalCallbackStatelessService = null;    

-    }

-    

-    private static void resetCallStack() {

-        

-        // reset the place where we record the sequence of calls passing

-        // through each component instance

-        ConversationalServiceStatelessImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-        ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-        ConversationalClientStatefulImpl.calls   = new StringBuffer();    

-        ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        

-    }    

-

-    // stateful client stateful service tests  

-    // ======================================

-    @Test

-    public void testStatefulStatefulConversationFromInjectedReference() {

-        int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    @Test

-    public void testStatefulStatefulConversationFromInjectedReference2() {

-        int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }     

-    

-    @Test

-    public void testStatefulStatefulConversationFromServiceReference() {

-        int count = conversationalStatefulClientStatefulService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }          

-    

-    @Test

-    public void testStatefulStatefulConversationWithUserDefinedConversationId() {

-        int count = conversationalStatefulClientStatefulService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatefulStatefulConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatefulClientStatefulService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-   

-    @Test

-    public void testStatefulStatefulConversationCheckingScope() {

-        resetCallStack();

-        conversationalStatefulClientStatefulService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-                            ConversationalServiceStatefulImpl.calls.toString());

-    }  

-

-    @Test

-    public void testStatefulStatefulConversationWithCallback() {

-        resetCallStack();

-        int count = conversationalStatefulClientStatefulService.runConversationWithCallback();

-        Assert.assertEquals(4, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-                            ConversationalClientStatefulImpl.calls.toString());        

-    }   

-    

-    //@Test

-    public void testStatefulStatefulConversationHavingPassedReference() {

-        int count = conversationalStatefulClientStatefulService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    } 

-    

-    @Test

-    public void testStatefulStatefulConversationCallingEndedConversation() {

-        int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversation();

-        Assert.assertEquals(0, count);

-    }     

-

-    @Test

-    public void testStatefulStatefulConversationCallingEndedConversationCallback() {

-        int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }    

-    

-    @Test

-    public void testStatefulStatefulConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-

-    @Test

-    public void testStatefulStatefulConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    }    

-        

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
deleted file mode 100644
index 8a110477b5..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ /dev/null
@@ -1,193 +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.itest.conversational;

-

-import java.io.File;

-

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.apache.tuscany.sca.node.Client;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class StatefulStatelessTestCase {

-

-    private static Node node;

-    private static ConversationalClient conversationalStatelessClientStatelessService;

-    private static ConversationalClient conversationalStatelessClientStatefulService;

-    private static ConversationalClient conversationalStatefulClientStatelessService;

-    private static ConversationalClient conversationalStatefulClientStatefulService; 

-    private static ConversationalClient conversationalStatelessClientRequestService;

-    private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;    

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-        try {

-            NodeFactory nodeFactory = NodeFactory.newInstance();

-            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new Contribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-                

-            // reset the place where we record the sequence of calls passing

-            // through each component instance

-            ConversationalServiceStatelessImpl.calls = new StringBuffer();

-            ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-            ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-            ConversationalClientStatefulImpl.calls   = new StringBuffer();

-        

-        } catch(Exception ex) {

-                System.err.println(ex.toString());

-        }

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatelessService = null;

-        conversationalStatelessClientStatefulService = null;

-        conversationalStatefulClientStatelessService = null;

-        conversationalStatefulClientStatefulService = null; 

-        conversationalStatelessClientRequestService = null;

-        conversationalStatefulClientNonConversationalCallbackStatelessService = null;    

-    }

-    

-    private static void resetCallStack() {

-        

-        // reset the place where we record the sequence of calls passing

-        // through each component instance

-        ConversationalServiceStatelessImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-        ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-        ConversationalClientStatefulImpl.calls   = new StringBuffer();    

-        ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        

-    }    

-

-    // stateful client stateless service tests  

-    // =======================================

-    @Test

-    public void testStatefulStatelessConversationFromInjectedReference() {

-        int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    @Test

-    public void testStatefulStatelessConversationFromInjectedReference2() {

-        int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatefulStatelessConversationFromServiceReference() {

-        int count = conversationalStatefulClientStatelessService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatefulStatelessConversationWithUserDefinedConversationId() {

-        int count = conversationalStatefulClientStatelessService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }    

-

-    @Test

-    public void testStatefulStatelessConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatefulClientStatelessService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-    

-    @Test

-    public void testStatefulStatelessConversationCheckingScope() {

-        resetCallStack();

-        conversationalStatefulClientStatelessService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", 

-                            ConversationalServiceStatelessImpl.calls.toString());

-    } 

-

-    @Test

-    public void testStatefulStatelessConversationWithCallback() {

-        resetCallStack();

-        int count = conversationalStatefulClientStatelessService.runConversationWithCallback();

-        Assert.assertEquals(4, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-                            ConversationalClientStatefulImpl.calls.toString());        

-    }     

-    

-    //@Test

-    public void testStatefulStatelessConversationHavingPassedReference() {

-        int count = conversationalStatefulClientStatelessService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    }     

-    

-    @Test

-    public void testStatefulStatelessConversationCallingEndedConversation() {

-        int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversation();

-        Assert.assertEquals(-999, count);

-    }     

-    

-    @Test

-    public void testStatefulStatelessConversationCallingEndedConversationCallback() {

-        int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }  

-    

-    @Test

-    public void testStatefulStatelessConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    @Test

-    public void testStatefulStatelessConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    }      

-        

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
deleted file mode 100644
index 79ac9262c6..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ /dev/null
@@ -1,205 +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.itest.conversational;

-

-import java.io.File;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.apache.tuscany.sca.node.Client;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class StatelessStatefulTestCase {

-

-    private static Node node;

-    private static ConversationalClient conversationalStatelessClientStatelessService;

-    private static ConversationalClient conversationalStatelessClientStatefulService;

-    private static ConversationalClient conversationalStatefulClientStatelessService;

-    private static ConversationalClient conversationalStatefulClientStatefulService; 

-    private static ConversationalClient conversationalStatelessClientRequestService;

-    private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;    

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-        try {

-            NodeFactory nodeFactory = NodeFactory.newInstance();

-            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new Contribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-                

-            // reset the place where we record the sequence of calls passing

-            // through each component instance

-            ConversationalServiceStatelessImpl.calls = new StringBuffer();

-            ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-            ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-            ConversationalClientStatefulImpl.calls   = new StringBuffer();

-        

-        } catch(Exception ex) {

-                System.err.println(ex.toString());

-        }

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatelessService = null;

-        conversationalStatelessClientStatefulService = null;

-        conversationalStatefulClientStatelessService = null;

-        conversationalStatefulClientStatefulService = null; 

-        conversationalStatelessClientRequestService = null;

-        conversationalStatefulClientNonConversationalCallbackStatelessService = null;    

-    }

-    

-    private static void resetCallStack() {

-        

-        // reset the place where we record the sequence of calls passing

-        // through each component instance

-        ConversationalServiceStatelessImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-        ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-        ConversationalClientStatefulImpl.calls   = new StringBuffer();    

-        ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        

-    }    

-

-    // stateless client stateful service tests

-    // =======================================

-    @Test

-    public void testStatelessStatefulConversationFromInjectedReference() {

-        int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-    

-    @Test

-    public void testStatelessStatefulConversationFromInjectedReference2() {

-        int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }     

-    

-    @Test

-    public void testStatelessStatefulConversationFromServiceReference() {

-        int count = conversationalStatelessClientStatefulService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }          

-

-    @Test

-    public void testStatelessStatefulConversationWithUserDefinedConversationId() {

-        int count = conversationalStatelessClientStatefulService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }   

-   

-    @Test

-    public void testStatelessStatefulConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatelessClientStatefulService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    } 

-    

-    @Test

-    public void testStatelessStatefulConversationCheckingScope() {

-        resetCallStack();

-        conversationalStatelessClientStatefulService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-                            ConversationalServiceStatefulImpl.calls.toString());

-    }     

-

-    @Test

-    public void testStatelessStatefulConversationWithCallback() {

-        resetCallStack();

-        int count = conversationalStatelessClientStatefulService.runConversationWithCallback();

-        Assert.assertEquals(0, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", 

-                            ConversationalClientStatelessImpl.calls.toString());        

-    }  

-   

-    //@Test

-    public void testStatelessStatefulConversationHavingPassedReference() {

-        int count = conversationalStatelessClientStatefulService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    }    

- 

-    //@Test

-    public void testStatelessStatefulConversationBusinessException() {

-        String message = conversationalStatelessClientStatefulService.runConversationBusinessException();

-        Assert.assertEquals("Business Exception", message);

-    }     

-

-    //@Test

-    public void testStatelessStatefulConversationBusinessExceptionCallback() {

-        String message = conversationalStatelessClientStatefulService.runConversationBusinessExceptionCallback();

-        Assert.assertEquals("Business Exception", message);

-    }  

-    

-    @Test

-    public void testStatelessStatefulConversationCallingEndedConversation() {

-        int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversation();

-        Assert.assertEquals(0, count);

-    }     

-    

-    @Test

-    public void testStatelessStatefulConversationCallingEndedConversationCallback() {

-        int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    }   

-    

-    @Test

-    public void testStatelessStatefulConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    //@Test

-    public void testStatelessStatefulConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    } 

-

-        

-}

diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
deleted file mode 100644
index 9aebae9ced..0000000000
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ /dev/null
@@ -1,192 +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.itest.conversational;

-

-import java.io.File;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.apache.tuscany.sca.node.Client;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class StatelessStatelessTestCase {

-

-    private static Node node;

-    private static ConversationalClient conversationalStatelessClientStatelessService;

-    private static ConversationalClient conversationalStatelessClientStatefulService;

-    private static ConversationalClient conversationalStatefulClientStatelessService;

-    private static ConversationalClient conversationalStatefulClientStatefulService; 

-    private static ConversationalClient conversationalStatelessClientRequestService;

-    private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;    

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-        try {

-            NodeFactory nodeFactory = NodeFactory.newInstance();

-            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new Contribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-                

-            // reset the place where we record the sequence of calls passing

-            // through each component instance

-            ConversationalServiceStatelessImpl.calls = new StringBuffer();

-            ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-            ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-            ConversationalClientStatefulImpl.calls   = new StringBuffer();

-        

-        } catch(Exception ex) {

-                System.err.println(ex.toString());

-        }

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        node.stop();

-        conversationalStatelessClientStatelessService = null;

-        conversationalStatelessClientStatefulService = null;

-        conversationalStatefulClientStatelessService = null;

-        conversationalStatefulClientStatefulService = null; 

-        conversationalStatelessClientRequestService = null;

-        conversationalStatefulClientNonConversationalCallbackStatelessService = null;    

-    }

-    

-    private static void resetCallStack() {

-        

-        // reset the place where we record the sequence of calls passing

-        // through each component instance

-        ConversationalServiceStatelessImpl.calls = new StringBuffer();

-        ConversationalServiceStatefulImpl.calls  = new StringBuffer();

-        ConversationalClientStatelessImpl.calls  = new StringBuffer();         

-        ConversationalClientStatefulImpl.calls   = new StringBuffer();    

-        ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();

-        

-    }    

-

-

-    // stateless client stateless service tests

-    // ========================================

-   

-    @Test

-    public void testStatelessStatelessConversationFromInjectedReference() {

-        int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference();

-        Assert.assertEquals(2, count);

-    } 

-

-    @Test

-    public void testStatelessStatelessConversationFromInjectedReference2() {

-        int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference2();

-        Assert.assertEquals(2, count);

-    }     

-    

-    @Test

-    public void testStatelessStatelessConversationFromServiceReference() {

-        int count = conversationalStatelessClientStatelessService.runConversationFromServiceReference();

-        Assert.assertEquals(2, count);

-    }    

-    

-    @Test

-    public void testStatelessStatelessConversationWithUserDefinedConversationId() {

-        int count = conversationalStatelessClientStatelessService.runConversationWithUserDefinedConversationId();

-        Assert.assertEquals(2, count);

-    }  

-    @Test

-    public void testStatelessStatelessConversationCheckUserDefinedConversationId() {

-        String conversationId = conversationalStatelessClientStatelessService.runConversationCheckUserDefinedConversationId();

-        Assert.assertEquals("MyConversation2", conversationId);

-    }     

-    

-    @Test

-    public void testStatelessStatelessConversationCheckingScope() {

-        resetCallStack();

-        conversationalStatelessClientStatelessService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", 

-                            ConversationalServiceStatelessImpl.calls.toString());

-    }       

-    

-    @Test

-    public void testStatelessStatelessConversationWithCallback() {

-        resetCallStack();

-        int count = conversationalStatelessClientStatelessService.runConversationWithCallback();

-        Assert.assertEquals(0, count);

-               

-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", 

-                            ConversationalClientStatelessImpl.calls.toString());        

-    }

-    //@Test

-    public void testStatelessStatelessConversationHavingPassedReference() {

-        int count = conversationalStatelessClientStatelessService.runConversationHavingPassedReference();

-        Assert.assertEquals(3, count);

-    }     

-

-    @Test

-    public void testStatelessStatelessConversationCallingEndedConversation() {

-        int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversation();

-        Assert.assertEquals(-999, count);

-    }     

-    

-    @Test

-    public void testStatelessStatelessConversationCallingEndedConversationCallback() {

-        int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallback();

-        Assert.assertEquals(0, count);

-    } 

-    

-    @Test

-    public void testStatelessStatelessConversationCallingEndedConversationCheckConversationId() {

-        String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-    

-    //@Test

-    public void testStatelessStatelessConversationCallingEndedConversationCallbackCheckConversationId() {

-        String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();

-        Assert.assertEquals(null, id);

-    }     

-

-}

diff --git a/java/sca-contrib/itest/corba/pom.xml b/java/sca-contrib/itest/corba/pom.xml
deleted file mode 100644
index f1dd2a9187..0000000000
--- a/java/sca-contrib/itest/corba/pom.xml
+++ /dev/null
@@ -1,169 +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>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-itest</artifactId>
-		<version>2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<artifactId>itest-corba-binding</artifactId>
-	<name>Apache Tuscany SCA CORBA Binding Integration Tests</name>
-	<dependencies>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-embedded</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-corba-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-corba-jse-tns</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-sca</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-sca-corba</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-
-<!-- 
-		<dependency>
-			<groupId>org.apache.ws.commons.axiom</groupId>
-			<artifactId>axiom-api</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>xerces</groupId>
-					<artifactId>xercesImpl</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>stax</groupId>
-					<artifactId>stax-api</artifactId>
-				</exclusion>
-			</exclusions>
-			<version>1.2.5</version>
-		</dependency>
- -->        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.5</version>
-			<scope>compile</scope>
-		</dependency>
-
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.0</version>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>target/sdo-source</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.1.1</version>
-				<executions>
-					<execution>
-						<id>generate-scenariofour-sdo</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<schemaFile>
-								${basedir}/src/test/resources/scenariofour.xsd
-							</schemaFile>
-							<javaPackage>
-								org.apache.tuscany.sca.test.corba.scenariofour
-							</javaPackage>
-							<prefix>ScenarioFour</prefix>
-							<noNotification>true</noNotification>
-							<noContainer>true</noContainer>
-							<noUnsettable>true</noUnsettable>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
deleted file mode 100644
index 46e214eac3..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
+++ /dev/null
@@ -1,51 +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.corba;
-
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.host.corba.jse.tns.TnsDefaultCorbaHost;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.corba.types.ScenarioFive;
-import org.apache.tuscany.sca.test.corba.types.ScenarioFiveComponent;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- * Tests usage of TNS JSE Corba host
- */
-public class ScenarioFiveTestCase {
-
-    @Test
-    public void test_providedNameServer() {
-        TestCorbaHost.setCorbaHost(new TnsDefaultCorbaHost());
-        try {
-            // just make sure we can obtain and use the reference with success
-            SCADomain domain = SCADomain.newInstance("ScenarioFive.composite");
-            ScenarioFive scenarioFive =
-                domain.getService(ScenarioFiveComponent.class, "ScenarioFive").getScenarioFive();
-            scenarioFive.doNothing();
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
deleted file mode 100644
index cba8c823e8..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
+++ /dev/null
@@ -1,149 +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.corba;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourFactory;
-import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo;
-import org.apache.tuscany.sca.test.corba.types.ScenarioFour;
-import org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent;
-import org.apache.tuscany.sca.test.corba.types.ScenarioFourException;
-import org.apache.tuscany.sca.test.corba.types.ScenarioFourStruct;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- * Tests SCA default binding over CORBA binding
- */
-public class ScenarioFourTestCase {
-
-    // note that those values are also used in resources/*.composite file
-    private static SCADomain domain;
-    private static ScenarioFourComponent scenarioFourComponent;
-    private static ScenarioFour scenarioFour;
-    private static TransientNameServer server;
-    private static final int ORB_INITIAL_PORT = 5080;
-    
-    /**
-     * Initial configuration
-     */
-    @BeforeClass
-    public static void setUp() {
-        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
-        try {
-            server = new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
-            Thread t = server.start();
-            if (t == null) {
-                Assert.fail("The naming server cannot be started");
-            }
-            // obtain domain
-            domain = SCADomain.newInstance("ScenarioFour.composite");
-            scenarioFourComponent = domain.getService(ScenarioFourComponent.class, "ScenarioFour");
-            scenarioFour = scenarioFourComponent.getScenarioFour();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Test cleanup
-     */
-    @AfterClass
-    public static void tearDown() {
-        server.stop();
-    }
-
-    /**
-     * General tests for passing JAXB objects
-     */
-    @Test
-    public void test_generalJAXB() {
-        try {
-            ScenarioFourStruct input = new ScenarioFourStruct();
-            input.field1 = "Test";
-            input.field2 = 1;
-            input.field3 = new double[1];
-            ScenarioFourStruct output = scenarioFour.setStruct(input);
-            assertTrue(input.equals(output));
-        } catch (Exception e) {
-            e.printStackTrace();
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    /**
-     * Test for JAXB exceptions
-     */
-    @Test
-    public void test_exceptionsJAXB() {
-        try {
-            scenarioFour.exceptionTest();
-            fail();
-        } catch (ScenarioFourException e) {
-            assertTrue(ScenarioFourException.DEFAULT_CONTENT.equals(e.getContent()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * General test for passing SDO objects
-     */
-    @Test
-    public void test_generalSDO() {
-        try {
-            ScenarioFourSdo scenarioFourSdo = ScenarioFourFactory.INSTANCE.createScenarioFourSdo();
-            scenarioFourSdo.setMessage("Test1");
-            scenarioFourSdo.setSymbol("Test2");
-            ScenarioFourSdo result = scenarioFour.passScenarioFourStruct(scenarioFourSdo);
-            assertTrue(scenarioFourSdo.getMessage().equals(result.getMessage()) && scenarioFourSdo.getSymbol()
-                .equals(result.getSymbol()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests reusing local name server with multiple bindings
-     */
-    @Test
-    public void test_nameServerReuse() {
-        try {
-            ScenarioFour scenarioFour =
-                domain.getService(ScenarioFourComponent.class, "ScenarioFourReuse").getScenarioFour();
-            ScenarioFourStruct struct = new ScenarioFourStruct();
-            scenarioFour.setStruct(struct);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
deleted file mode 100644
index 0135c04495..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
+++ /dev/null
@@ -1,371 +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.corba;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.corba.generated.Color;
-import org.apache.tuscany.sca.test.corba.generated.InnerStruct;
-import org.apache.tuscany.sca.test.corba.generated.RichStruct;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioOne;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations;
-import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-import org.apache.tuscany.sca.test.corba.types.ScenarioOneServant;
-import org.apache.tuscany.sca.test.corba.types.TColor;
-import org.apache.tuscany.sca.test.corba.types.TInnerStruct;
-import org.apache.tuscany.sca.test.corba.types.TRichStruct;
-import org.apache.tuscany.sca.test.corba.types.TScenarioOne;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextHelper;
-
-/**
- * @version $Rev$ $Date$
- * This test class contains three main tests:<br>
- * 1. Tuscany is being used as a consumer of some non-Tuscany CORBA service<br>
- * 2. Tuscany is being used as a service provider, which will be consumed by
- * non-Tuscany CORBA client<br>
- * 3. Tuscany is being used as a service provider, which will be consumed by
- * Tuscany client<br>
- * But that's not all, there are some other variations. Tuscany CORBA binding
- * supports using Java interface generated by IDLJ, also it supports interfaces
- * provided by user - I combined those cases in each test.<br>
- */
-public class ScenarioOneTestCase {
-
-    // note that those values are also used in resources/*.composite file
-    private static int ORB_INITIAL_PORT = 5060;
-    private static String SERVICE_NAME = "ScenarioOne";
-
-    private static SCADomain domain;
-
-    private static TransientNameServer server;
-    private static ORB orb;
-
-    /**
-     * Sets up name service, creates and registers traditional CORBA service,
-     * obtains SCADomain
-     */
-    @BeforeClass
-    public static void setUp() {
-        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
-        try {
-            try {
-                server =
-                    new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
-                Thread t = server.start();
-                if (t == null) {
-                    Assert.fail("The naming server cannot be started");
-                }
-                orb = server.getORB();
-            } catch (Throwable e) {
-                e.printStackTrace();
-                Assert.fail(e.getMessage());
-            }
-            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-            NamingContext ncRef = NamingContextHelper.narrow(objRef);
-            NameComponent nc = new NameComponent(SERVICE_NAME, "");
-            NameComponent path[] = {nc};
-            ScenarioOne scenarioOne = new ScenarioOneServant();
-            ncRef.rebind(path, scenarioOne);
-            // obtain domain
-            domain = SCADomain.newInstance("ScenarioOne.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Kills previously spawned name service.
-     */
-    @AfterClass
-    public static void tearDown() {
-        server.stop();
-    }
-
-    /**
-     * Creates nicely filled structure for user provided interface.
-     * 
-     * @return
-     */
-    private static TRichStruct getTRichStruct() {
-        int[][] intArr = new int[][] { {1, 2}, {3, 4}};
-        TInnerStruct innerStruct = new TInnerStruct(intArr, "Test", TColor.green);
-        String[] strSeq = {"i", "Test"};
-        return new TRichStruct(innerStruct, strSeq, 1);
-
-    }
-
-    /**
-     * Creates nicely filled structure for generated interface.
-     * 
-     * @return
-     */
-    private static RichStruct getRichStruct() {
-        int[][] intArr = new int[][] { {1, 2}, {3, 4}};
-        InnerStruct innerStruct2 = new InnerStruct(intArr, "Test", Color.green);
-        String[] strSeq = {"i", "Test"};
-        return new RichStruct(innerStruct2, strSeq, 1);
-    }
-
-    /**
-     * Compares String arrays
-     * 
-     * @param arg1
-     * @param arg2
-     * @return
-     */
-    private boolean areSrringArraysEqual(String[] arg1, String[] arg2) {
-        try {
-            for (int i = 0; i < arg1.length; i++) {
-                if (!arg1[i].equals(arg2[i])) {
-                    return false;
-                }
-            }
-        } catch (Exception e) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Compares two dimensional int arrays
-     * 
-     * @param arg1
-     * @param arg2
-     * @return
-     */
-    private boolean areTwoDimIntArraysEqual(int[][] arg1, int[][] arg2) {
-        try {
-            for (int i = 0; i < arg1.length; i++) {
-                for (int j = 0; j < arg1[i].length; j++) {
-                    if (arg1[i][j] != arg2[i][j]) {
-                        return false;
-                    }
-                }
-            }
-        } catch (Exception e) {
-            return false;
-        }
-        return true;
-    }
-
-    private boolean equalTo(TInnerStruct arg1, TInnerStruct arg2) {
-        return (arg1.color.value() == arg2.color.value() && arg1.stringField.equals(arg2.stringField) && areTwoDimIntArraysEqual(arg1.twoDimLongSequence,
-                                                                                                                                 arg2.twoDimLongSequence));
-    }
-
-    private boolean equalTo(InnerStruct arg1, InnerStruct arg2) {
-        return (arg1.color.value() == arg2.color.value() && arg1.stringField.equals(arg2.stringField) && areTwoDimIntArraysEqual(arg1.twoDimLongSequence,
-                                                                                                                                 arg2.twoDimLongSequence));
-    }
-
-    private boolean equalTo(TRichStruct arg1, TRichStruct arg2) {
-        return (equalTo(arg1.innerStruct, arg2.innerStruct) && arg2.longField == arg1.longField && areSrringArraysEqual(arg1.stringSequence,
-                                                                                                                        arg2.stringSequence));
-    }
-
-    private boolean equalTo(RichStruct arg1, RichStruct arg2) {
-        return (equalTo(arg1.innerStruct, arg2.innerStruct) && arg2.longField == arg1.longField && areSrringArraysEqual(arg1.stringSequence,
-                                                                                                                        arg2.stringSequence));
-    }
-
-    /**
-     * Helper method used several times for various components. Executes several
-     * tests using Tuscany reference binding. This helper uses generated Java
-     * interface.
-     * 
-     * @param componentName
-     */
-    private void testClientUsingGeneratedInterface(String componentName) {
-        ScenarioOneOperations component = domain.getService(ScenarioOneOperations.class, componentName);
-        RichStruct richStruct = getRichStruct();
-
-        try {
-            RichStruct result = component.setRichStruct(richStruct);
-            assertTrue(equalTo(result, richStruct));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-
-        try {
-            richStruct.longField = 0;
-            component.setRichStruct(richStruct);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof UnexpectedException);
-        }
-
-        try {
-            richStruct.longField = 1;
-            richStruct.innerStruct.color = Color.red;
-            component.setRichStruct(richStruct);
-        } catch (Exception e) {
-            assertTrue(e instanceof WrongColor);
-        }
-    }
-
-    /**
-     * Helper method used several times for various components. Executes several
-     * tests using Tuscany reference binding. This helper uses user provided
-     * Java interface.
-     * 
-     * @param componentName
-     */
-    private void testClientUsingUserProvidedInterface(String componentName) {
-        TScenarioOne component = domain.getService(TScenarioOne.class, componentName);
-        TRichStruct tRichStruct = getTRichStruct();
-
-        try {
-            TRichStruct result = component.setRichStruct(tRichStruct);
-            assertTrue(equalTo(result, tRichStruct));
-        } catch (Exception e) {
-            fail();
-        }
-
-        try {
-            tRichStruct.longField = 0;
-            component.setRichStruct(tRichStruct);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof UnexpectedException);
-        }
-
-        try {
-            tRichStruct.longField = 1;
-            tRichStruct.innerStruct.color = TColor.red;
-            component.setRichStruct(tRichStruct);
-        } catch (Exception e) {
-            assertTrue(e instanceof WrongColor);
-        }
-    }
-
-    public void testServiceUsingGeneratedClient(String serviceName) {
-        try {
-            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-            NamingContext ncRef = NamingContextHelper.narrow(objRef);
-            NameComponent nc = new NameComponent(serviceName, "");
-            NameComponent path[] = {nc};
-            ScenarioOne so = ScenarioOneHelper.narrow(ncRef.resolve(path));
-
-            RichStruct richStruct = getRichStruct();
-            RichStruct result = so.setRichStruct(richStruct);
-            assertTrue(equalTo(result, richStruct));
-
-            try {
-                richStruct.innerStruct.color = Color.red;
-                result = so.setRichStruct(richStruct);
-                fail();
-            } catch (Exception e) {
-                assertTrue(e instanceof WrongColor);
-            }
-
-            try {
-                richStruct.innerStruct.color = Color.green;
-                richStruct.longField = 0;
-                result = so.setRichStruct(richStruct);
-                fail();
-            } catch (Exception e) {
-                assertTrue(e instanceof UnexpectedException);
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Service is exposed in traditional way (using CORBA API from JDK).
-     * Reference is obtained from Tuscany.
-     */
-    @Test
-    public void test_TraditionalService_TuscanyClient() {
-
-        // Client is using user provided interface
-        testClientUsingUserProvidedInterface("ScenarioOne");
-
-        // Client is using generated interface
-        testClientUsingGeneratedInterface("ScenarioOneGenerated");
-    }
-
-    /**
-     * Service is exposed by Tuscany. Reference is obtained in traditional way.
-     * (using CORBA API from JDK)
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void test_TuscanyService_TraditionalClient() throws Exception {
-
-        // tests service which uses user provided interface
-        testServiceUsingGeneratedClient("ScenarioOneTuscany");
-
-        // tests service which uses generated interface
-        testServiceUsingGeneratedClient("ScenarioOneTuscanyGenerated");
-    }
-
-    /**
-     * Service is exposed by Tuscany. Reference is obtained from Tuscany. There
-     * are 4 combinations (basing on if we are using generated or user provided
-     * interfaces, both on service and reference side).
-     */
-    @Test
-    public void test_TuscanyService_TuscanyClient() {
-
-        // Client is using user provided interface, service is using user
-        // provided interface.
-        testClientUsingUserProvidedInterface("TU2TS1");
-
-        // Client is using user provided interface, service is using generated
-        // interface.
-        testClientUsingUserProvidedInterface("TU2TS2");
-
-        // Client is using generated interface, service is using user provided
-        // interface.
-        testClientUsingGeneratedInterface("TG2TS1");
-
-        // Client is using generated interface, service is using generated
-        // interface.
-        testClientUsingGeneratedInterface("TG2TS2");
-    }
-    
-    /**
-     * Tests using reference obtained by corbaname URI
-     */
-    @Test
-    public void test_serviceAndReferenceByURI() {
-        testClientUsingUserProvidedInterface("UriBinding");
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
deleted file mode 100644
index b7309d68a0..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
+++ /dev/null
@@ -1,228 +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.corba;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct;
-import org.apache.tuscany.sca.test.corba.generated.InnerUnion;
-import org.apache.tuscany.sca.test.corba.generated.RichUnion;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioSix;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper;
-import org.apache.tuscany.sca.test.corba.types.ScenarioSixServant;
-import org.apache.tuscany.sca.test.corba.types.TAnnotatedStruct;
-import org.apache.tuscany.sca.test.corba.types.TInnerUnion;
-import org.apache.tuscany.sca.test.corba.types.TRichUnion;
-import org.apache.tuscany.sca.test.corba.types.TScenarioSix;
-import org.apache.tuscany.sca.test.corba.types.TScenarioSixComponent;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextHelper;
-
-/**
- * Tests using enhanced Java interfaces (annotations)
- * 
- * @version $Rev$ $Date$
- */
-public class ScenarioSixTestCase {
-
-    // note that those values are also used in resources/*.composite file
-    private static int ORB_INITIAL_PORT = 5050;
-    private static String SERVICE_NAME = "ScenarioSix";
-    private static String TUSCANY_SERVICE_NAME = "ScenarioSixTuscany";
-
-    private static SCADomain domain;
-
-    private static TransientNameServer server;
-    private static ORB orb;
-
-    /**
-     * Sets up name service, creates and registers traditional CORBA service,
-     * obtains SCADomain
-     */
-    @BeforeClass
-    public static void setUp() {
-        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
-        try {
-            try {
-                server =
-                    new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
-                Thread t = server.start();
-                if (t == null) {
-                    Assert.fail("The naming server cannot be started");
-                }
-                orb = server.getORB();
-            } catch (Throwable e) {
-                e.printStackTrace();
-                Assert.fail(e.getMessage());
-            }
-            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-            NamingContext ncRef = NamingContextHelper.narrow(objRef);
-            NameComponent nc = new NameComponent(SERVICE_NAME, "");
-            NameComponent path[] = {nc};
-            ScenarioSix scenarioSix = new ScenarioSixServant();
-            ncRef.rebind(path, scenarioSix);
-            // obtain domain
-            domain = SCADomain.newInstance("ScenarioSix.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Kills previously spawned name service.
-     */
-    @AfterClass
-    public static void tearDown() {
-        server.stop();
-    }
-
-    private boolean areArraysEqual(String[][] arr1, String[][] arr2) {
-        for (int i = 0; i < arr1.length; i++) {
-            for (int j = 0; j < arr1[i].length; j++) {
-                if (!arr1[i][j].equals(arr2[i][j])) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private String[][] getStringArray() {
-        String[][] result = { {"Hello", "World"}, {"Hi", "Again"}};
-        return result;
-    }
-
-    /**
-     * Tests passing arrays. Tuscany acts as a client, servant object is served
-     * in a traditional way
-     */
-    @Test
-    public void test_arraysPassing_tuscanyAsClient() {
-        try {
-            TScenarioSix ref = domain.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
-            String[][] arrayArg = getStringArray();
-            String[][] arrayRes = ref.passStringArray(arrayArg);
-            assertTrue(areArraysEqual(arrayArg, arrayRes));
-            TAnnotatedStruct structArg = new TAnnotatedStruct();
-            structArg.stringArray = getStringArray();
-            TAnnotatedStruct structRes = ref.passAnnotatedStruct(structArg);
-            assertTrue(areArraysEqual(structArg.stringArray, structRes.stringArray));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests passing arrays. Servant object is served by Tuscany and it is
-     * accessed by traditional Corba client
-     */
-    @Test
-    public void test_arraysPassing_tuscanyAsService() {
-        try {
-            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-            NamingContext ncRef = NamingContextHelper.narrow(objRef);
-            NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, "");
-            NameComponent path[] = {nc};
-            ScenarioSix ref = ScenarioSixHelper.narrow(ncRef.resolve(path));
-            String[][] stringArg = getStringArray();
-            String[][] stringRes = ref.passStringArray(stringArg);
-            assertTrue(areArraysEqual(stringArg, stringRes));
-            AnnotatedStruct structArg = new AnnotatedStruct();
-            structArg.stringArray = getStringArray();
-            AnnotatedStruct structRes = ref.passAnnotatedStruct(structArg);
-            assertTrue(areArraysEqual(structArg.stringArray, structRes.stringArray));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests passing unions. Tuscany acts as a client, servant object is served
-     * in a traditional way
-     */
-    @Test
-    public void test_unionsPassing_tuscanyAsClient() {
-        try {
-            TScenarioSix ref = domain.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
-            TRichUnion arg = new TRichUnion();
-            TInnerUnion inner = new TInnerUnion();
-            inner.setY(10f);
-            arg.setIu(inner);
-            TRichUnion result = ref.passRichUnion(arg);
-            assertEquals(arg.getIu().getY(), result.getIu().getY(), 0.0f);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-        try {
-            TScenarioSix ref = domain.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix();
-            TRichUnion arg = new TRichUnion();
-            arg.setY(15f);
-            TRichUnion result = ref.passRichUnion(arg);
-            assertEquals(arg.getY(), result.getY(), 0.0f);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-    
-    /**
-     * Tests passing unions. Servant object is served by Tuscany and it is
-     * accessed by traditional Corba client
-     */
-    @Test
-    public void test_unionsPassing_tuscanyAsService() {
-        try {
-            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-            NamingContext ncRef = NamingContextHelper.narrow(objRef);
-            NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, "");
-            NameComponent path[] = {nc};
-            ScenarioSix ref = ScenarioSixHelper.narrow(ncRef.resolve(path));
-            RichUnion arg = new RichUnion();
-            InnerUnion inner = new InnerUnion();
-            inner.y(20f);
-            arg.iu(inner);
-            RichUnion result = ref.passRichUnion(arg);
-            assertEquals(arg.iu().y(), result.iu().y(), 0.0f);
-            arg = new RichUnion();
-            arg.y(15f);
-            result = ref.passRichUnion(arg);
-            assertEquals(arg.y(), result.y(), 0.0f);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
deleted file mode 100644
index a738c6f211..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
+++ /dev/null
@@ -1,130 +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.corba;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.corba.types.TScenarioThree;
-import org.apache.tuscany.sca.test.corba.types.TScenarioThreeComponent;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- * Tests various mapping scenarios.
- */
-public class ScenarioThreeTestCase {
-
-    // note that those values are also used in resources/*.composite file
-    private static int ORB_INITIAL_PORT = 5060;
-    private static SCADomain domain;
-    private static TransientNameServer server;
-
-    /**
-     * Sets up name service, creates and registers traditional CORBA service,
-     * obtains SCADomain
-     */
-    @BeforeClass
-    public static void setUp() {
-        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
-        try {
-            try {
-                server =
-                    new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
-                Thread t = server.start();
-                if (t == null) {
-                    Assert.fail("The naming server cannot be started");
-                }
-            } catch (Throwable e) {
-                e.printStackTrace();
-                Assert.fail(e.getMessage());
-            }
-            // obtain domain
-            domain = SCADomain.newInstance("ScenarioThree.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Kills previously spawned name service.
-     */
-    @AfterClass
-    public static void tearDown() {
-        server.stop();
-    }
-
-    /**
-     * Tests mapping for getters and setters
-     */
-    @Test
-    public void test_getterSetter() {
-        try {
-            TScenarioThree ref =
-                domain.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
-            ref.getIntField();
-            ref.setIntField(1);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests mapping the same operation names but with different cases
-     */
-    @Test
-    public void test_nameCase() {
-        try {
-            TScenarioThree ref =
-                domain.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
-            assertEquals(0, ref.caseDifferent());
-            assertEquals(1, ref.CaseDifferent());
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests mappings for operations with overloaded names
-     */
-    @Test
-    public void test_overloadedNames() {
-        try {
-            TScenarioThree ref =
-                domain.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree();
-            ref.overloadedName();
-            ref.overloadedName("");
-            ref.overloadedName("", 0);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
deleted file mode 100644
index 008212bdbe..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
+++ /dev/null
@@ -1,139 +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.corba;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioTwo;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper;
-import org.apache.tuscany.sca.test.corba.types.ScenarioTwoServant;
-import org.apache.tuscany.sca.test.corba.types.TScenarioTwo;
-import org.apache.tuscany.sca.test.corba.types.TScenarioTwoComponent;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextHelper;
-
-/**
- * @version $Rev$ $Date$
- * Tests attribute get/set mapping using cooperation between traditional CORBA
- * and Tuscany CORBA
- */
-public class ScenarioTwoTestCase {
-
-    // note that those values are also used in resources/*.composite file
-    private static int ORB_INITIAL_PORT = 5060;
-
-    private static SCADomain domain;
-
-    private static TransientNameServer server;
-    private static ORB orb;
-    private static String TUSCANY_SERVICE_NAME = "ScenarioTwo";
-    private static String GENERATED_SERVICE_NAME = "ScenarioTwoGenerated";
-
-    /**
-     * Sets up name service, creates and registers traditional CORBA service,
-     * obtains SCADomain
-     */
-    @BeforeClass
-    public static void setUp() {
-        TestCorbaHost.setCorbaHost(new DefaultCorbaHost());
-        try {
-            try {
-                server =
-                    new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
-                Thread t = server.start();
-                if (t == null) {
-                    Assert.fail("The naming server cannot be started");
-                }
-                orb = server.getORB();
-                org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-                NamingContext ncRef = NamingContextHelper.narrow(objRef);
-                NameComponent nc = new NameComponent(GENERATED_SERVICE_NAME, "");
-                NameComponent path[] = {nc};
-                ScenarioTwo scenarioTwo = new ScenarioTwoServant();
-                ncRef.rebind(path, scenarioTwo);
-            } catch (Throwable e) {
-                e.printStackTrace();
-                Assert.fail(e.getMessage());
-            }
-            // obtain domain
-            domain = SCADomain.newInstance("ScenarioTwo.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Kills previously spawned name service.
-     */
-    @AfterClass
-    public static void tearDown() {
-        server.stop();
-    }
-
-    /**
-     * Tests using objects attribute (which is server in traditional way) by
-     * Tuscany CORBA binding
-     */
-    @Test
-    public void test_tuscanyGetSetAttribute() {
-        try {
-            TScenarioTwo ref = domain.getService(TScenarioTwoComponent.class, "ScenarioTwo").getScenarioTwo();
-            String strVal = "Whatever";
-            ref.setStringField(strVal);
-            assertEquals(strVal, ref.getStringField());
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests using objects attribute (which is served by Tuscany) in traditional
-     * way (by idlj generated code)
-     */
-    @Test
-    public void test_getneratedGetSetAttribute() {
-        try {
-            orb = server.getORB();
-            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-            NamingContext ncRef = NamingContextHelper.narrow(objRef);
-            NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, "");
-            NameComponent path[] = {nc};
-            ScenarioTwo st = ScenarioTwoHelper.narrow(ncRef.resolve(path));
-            st.stringField("");
-            assertEquals("", st.stringField());
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
deleted file mode 100644
index bd1ce8cb49..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
+++ /dev/null
@@ -1,56 +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.corba;
-
-import org.apache.tuscany.sca.host.corba.CorbaHost;
-import org.apache.tuscany.sca.host.corba.CorbaHostException;
-import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
-import org.omg.CORBA.Object;
-
-/**
- * @version $Rev$ $Date$
- * Mock Corba host which proxies to configured Corba host
- */
-public class TestCorbaHost implements CorbaHost {
-
-    private static CorbaHost corbaHost = new DefaultCorbaHost();
-
-    /**
-     * Configures environment to use given Corba host
-     * 
-     * @param corbaHost Corba host to use
-     */
-    public static void setCorbaHost(CorbaHost corbaHost) {
-       TestCorbaHost.corbaHost = corbaHost;
-    }
-    
-    public Object lookup(String arg0) throws CorbaHostException {
-        return TestCorbaHost.corbaHost.lookup(arg0);
-    }
-
-    public void registerServant(String arg0, Object arg1) throws CorbaHostException {
-        TestCorbaHost.corbaHost.registerServant(arg0, arg1);
-    }
-
-    public void unregisterServant(String arg0) throws CorbaHostException {
-        TestCorbaHost.corbaHost.unregisterServant(arg0);
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
deleted file mode 100644
index c25372c837..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
+++ /dev/null
@@ -1,41 +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.corba;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint;
-
-/**
- * @version $Rev$ $Date$
- * Registers TestCorbaHost as a Corba host extension. 
- */
-public class TestCorbaHostModuleActivator implements ModuleActivator {
-
-    public void start(ExtensionPointRegistry extensionPointRegistry) {
-        CorbaHostExtensionPoint chep = extensionPointRegistry.getExtensionPoint(CorbaHostExtensionPoint.class);
-        chep.getCorbaHosts().add(0, new TestCorbaHost());
-    }
-
-    public void stop(ExtensionPointRegistry extensionPointRegistry) {
-
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
deleted file mode 100644
index abcec43d0e..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
+++ /dev/null
@@ -1,43 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-public final class AnnotatedStruct implements org.omg.CORBA.portable.IDLEntity
-{
-  public String stringArray[][] = null;
-
-  public AnnotatedStruct ()
-  {
-  } // ctor
-
-  public AnnotatedStruct (String[][] _stringArray)
-  {
-    stringArray = _stringArray;
-  } // ctor
-
-} // class AnnotatedStruct
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
deleted file mode 100644
index 171a7919a2..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
+++ /dev/null
@@ -1,97 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-abstract public class AnnotatedStructHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct/AnnotatedStruct:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  private static boolean __active = false;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      synchronized (org.omg.CORBA.TypeCode.class)
-      {
-        if (__typeCode == null)
-        {
-          if (__active)
-          {
-            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
-          }
-          __active = true;
-          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [1];
-          org.omg.CORBA.TypeCode _tcOf_members0 = null;
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 );
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 );
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.id (), "StringArray", _tcOf_members0);
-          _members0[0] = new org.omg.CORBA.StructMember (
-            "stringArray",
-            _tcOf_members0,
-            null);
-          __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.id (), "AnnotatedStruct", _members0);
-          __active = false;
-        }
-      }
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value = new org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct ();
-    value.stringArray = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (istream);
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value)
-  {
-    org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (ostream, value.stringArray);
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
deleted file mode 100644
index 5f2dc56033..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
+++ /dev/null
@@ -1,57 +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.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-public final class AnnotatedStructHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value = null;
-
-  public AnnotatedStructHolder ()
-  {
-  }
-
-  public AnnotatedStructHolder (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
deleted file mode 100644
index 24a628d406..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
+++ /dev/null
@@ -1,61 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/Color.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public class Color implements org.omg.CORBA.portable.IDLEntity
-{
-  private        int __value;
-  private static int __size = 3;
-  private static org.apache.tuscany.sca.test.corba.generated.Color[] __array = new org.apache.tuscany.sca.test.corba.generated.Color [__size];
-
-  public static final int _red = 0;
-  public static final org.apache.tuscany.sca.test.corba.generated.Color red = new org.apache.tuscany.sca.test.corba.generated.Color(_red);
-  public static final int _yellow = 1;
-  public static final org.apache.tuscany.sca.test.corba.generated.Color yellow = new org.apache.tuscany.sca.test.corba.generated.Color(_yellow);
-  public static final int _green = 2;
-  public static final org.apache.tuscany.sca.test.corba.generated.Color green = new org.apache.tuscany.sca.test.corba.generated.Color(_green);
-
-  public int value ()
-  {
-    return __value;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.Color from_int (int value)
-  {
-    if (value >= 0 && value < __size)
-      return __array[value];
-    else
-      throw new org.omg.CORBA.BAD_PARAM ();
-  }
-
-  protected Color (int value)
-  {
-    __value = value;
-    __array[__value] = this;
-  }
-} // class Color
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
deleted file mode 100644
index da37f28e39..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
+++ /dev/null
@@ -1,72 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ColorHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class ColorHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/Color:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.Color that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.Color extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_enum_tc (org.apache.tuscany.sca.test.corba.generated.ColorHelper.id (), "Color", new String[] { "red", "yellow", "green"} );
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.Color read (org.omg.CORBA.portable.InputStream istream)
-  {
-    return org.apache.tuscany.sca.test.corba.generated.Color.from_int (istream.read_long ());
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.Color value)
-  {
-    ostream.write_long (value.value ());
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
deleted file mode 100644
index 7b2466f791..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
+++ /dev/null
@@ -1,57 +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.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ColorHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class ColorHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.Color value = null;
-
-  public ColorHolder ()
-  {
-  }
-
-  public ColorHolder (org.apache.tuscany.sca.test.corba.generated.Color initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.ColorHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
deleted file mode 100644
index 27052a1549..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
+++ /dev/null
@@ -1,47 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/InnerStruct.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class InnerStruct implements org.omg.CORBA.portable.IDLEntity
-{
-  public int twoDimLongSequence[][] = null;
-  public String stringField = null;
-  public org.apache.tuscany.sca.test.corba.generated.Color color = null;
-
-  public InnerStruct ()
-  {
-  } // ctor
-
-  public InnerStruct (int[][] _twoDimLongSequence, String _stringField, org.apache.tuscany.sca.test.corba.generated.Color _color)
-  {
-    twoDimLongSequence = _twoDimLongSequence;
-    stringField = _stringField;
-    color = _color;
-  } // ctor
-
-} // class InnerStruct
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
deleted file mode 100644
index 57daa51f42..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
+++ /dev/null
@@ -1,112 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class InnerStructHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/InnerStruct/InnerStruct:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.InnerStruct that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.InnerStruct extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  private static boolean __active = false;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      synchronized (org.omg.CORBA.TypeCode.class)
-      {
-        if (__typeCode == null)
-        {
-          if (__active)
-          {
-            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
-          }
-          __active = true;
-          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3];
-          org.omg.CORBA.TypeCode _tcOf_members0 = null;
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", _tcOf_members0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.id (), "TwoDimLongSequence", _tcOf_members0);
-          _members0[0] = new org.omg.CORBA.StructMember (
-            "twoDimLongSequence",
-            _tcOf_members0,
-            null);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-          _members0[1] = new org.omg.CORBA.StructMember (
-            "stringField",
-            _tcOf_members0,
-            null);
-          _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type ();
-          _members0[2] = new org.omg.CORBA.StructMember (
-            "color",
-            _tcOf_members0,
-            null);
-          __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.id (), "InnerStruct", _members0);
-          __active = false;
-        }
-      }
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.InnerStruct read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.InnerStruct value = new org.apache.tuscany.sca.test.corba.generated.InnerStruct ();
-    value.twoDimLongSequence = org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.read (istream);
-    value.stringField = istream.read_string ();
-    value.color = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream);
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.InnerStruct value)
-  {
-    org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.write (ostream, value.twoDimLongSequence);
-    ostream.write_string (value.stringField);
-    org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.color);
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
deleted file mode 100644
index 88fef0b4fb..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
+++ /dev/null
@@ -1,57 +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.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class InnerStructHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.InnerStruct value = null;
-
-  public InnerStructHolder ()
-  {
-  }
-
-  public InnerStructHolder (org.apache.tuscany.sca.test.corba.generated.InnerStruct initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
deleted file mode 100644
index 40c017dd29..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/InnerUnion.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-public final class InnerUnion implements org.omg.CORBA.portable.IDLEntity
-{
-  private int ___x;
-  private float ___y;
-  private int __discriminator;
-  private boolean __uninitialized = true;
-
-  public InnerUnion ()
-  {
-  }
-
-  public int discriminator ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    return __discriminator;
-  }
-
-  public int x ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyx (__discriminator);
-    return ___x;
-  }
-
-  public void x (int value)
-  {
-    __discriminator = 1;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  public void x (int discriminator, int value)
-  {
-    verifyx (discriminator);
-    __discriminator = discriminator;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  private void verifyx (int discriminator)
-  {
-    if (discriminator != 1)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public float y ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyy (__discriminator);
-    return ___y;
-  }
-
-  public void y (float value)
-  {
-    __discriminator = 2;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  public void y (int discriminator, float value)
-  {
-    verifyy (discriminator);
-    __discriminator = discriminator;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  private void verifyy (int discriminator)
-  {
-    if (discriminator != 2)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public void _default ()
-  {
-    __discriminator = -2147483648;
-    __uninitialized = false;
-  }
-
-  public void _default (int discriminator)
-  {
-    verifyDefault( discriminator ) ;
-    __discriminator = discriminator ;
-    __uninitialized = false;
-  }
-
-  private void verifyDefault( int value )
-  {
-    switch (value) {
-      case 1:
-      case 2:
-        throw new org.omg.CORBA.BAD_OPERATION() ;
-
-      default:
-        return;
-    }
-  }
-
-} // class InnerUnion
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
deleted file mode 100644
index 6ec067521e..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-abstract public class InnerUnionHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/InnerUnion/InnerUnion:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.InnerUnion that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.InnerUnion extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      org.omg.CORBA.TypeCode _disTypeCode0;
-      _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [2];
-      org.omg.CORBA.TypeCode _tcOf_members0;
-      org.omg.CORBA.Any _anyOf_members0;
-
-      // Branch for x (case label 1)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)1);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      _members0[0] = new org.omg.CORBA.UnionMember (
-        "x",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for y (case label 2)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)2);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float);
-      _members0[1] = new org.omg.CORBA.UnionMember (
-        "y",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-      __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.id (), "InnerUnion", _disTypeCode0, _members0);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.InnerUnion read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.InnerUnion value = new org.apache.tuscany.sca.test.corba.generated.InnerUnion ();
-    int _dis0 = (int)0;
-    _dis0 = istream.read_long ();
-    switch (_dis0)
-    {
-      case 1:
-        int _x = (int)0;
-        _x = istream.read_long ();
-        value.x (_x);
-        break;
-      case 2:
-        float _y = (float)0;
-        _y = istream.read_float ();
-        value.y (_y);
-        break;
-      default:
-        value._default( _dis0 ) ;
-        break;
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.InnerUnion value)
-  {
-    ostream.write_long (value.discriminator ());
-    switch (value.discriminator ())
-    {
-      case 1:
-        ostream.write_long (value.x ());
-        break;
-      case 2:
-        ostream.write_float (value.y ());
-        break;
-    }
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
deleted file mode 100644
index 8955f81694..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-public final class InnerUnionHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.InnerUnion value = null;
-
-  public InnerUnionHolder ()
-  {
-  }
-
-  public InnerUnionHolder (org.apache.tuscany.sca.test.corba.generated.InnerUnion initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
deleted file mode 100644
index 940b391499..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
+++ /dev/null
@@ -1,79 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class LongSequenceHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/LongSequence:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, int[] that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static int[] extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
-      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", __typeCode);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static int[] read (org.omg.CORBA.portable.InputStream istream)
-  {
-    int value[] = null;
-    int _len0 = istream.read_long ();
-    value = new int[_len0];
-    istream.read_long_array (value, 0, _len0);
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, int[] value)
-  {
-    ostream.write_long (value.length);
-    ostream.write_long_array (value, 0, value.length);
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
deleted file mode 100644
index 63a11dc56a..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class LongSequenceHolder implements org.omg.CORBA.portable.Streamable
-{
-  public int value[] = null;
-
-  public LongSequenceHolder ()
-  {
-  }
-
-  public LongSequenceHolder (int[] initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
deleted file mode 100644
index 8c0bfc9e39..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
+++ /dev/null
@@ -1,47 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/RichStruct.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class RichStruct implements org.omg.CORBA.portable.IDLEntity
-{
-  public org.apache.tuscany.sca.test.corba.generated.InnerStruct innerStruct = null;
-  public String stringSequence[] = null;
-  public int longField = (int)0;
-
-  public RichStruct ()
-  {
-  } // ctor
-
-  public RichStruct (org.apache.tuscany.sca.test.corba.generated.InnerStruct _innerStruct, String[] _stringSequence, int _longField)
-  {
-    innerStruct = _innerStruct;
-    stringSequence = _stringSequence;
-    longField = _longField;
-  } // ctor
-
-} // class RichStruct
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
deleted file mode 100644
index 72ff55a711..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
+++ /dev/null
@@ -1,110 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class RichStructHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/RichStruct/RichStruct:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.RichStruct that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.RichStruct extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  private static boolean __active = false;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      synchronized (org.omg.CORBA.TypeCode.class)
-      {
-        if (__typeCode == null)
-        {
-          if (__active)
-          {
-            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
-          }
-          __active = true;
-          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3];
-          org.omg.CORBA.TypeCode _tcOf_members0 = null;
-          _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.type ();
-          _members0[0] = new org.omg.CORBA.StructMember (
-            "innerStruct",
-            _tcOf_members0,
-            null);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.id (), "StringSequence", _tcOf_members0);
-          _members0[1] = new org.omg.CORBA.StructMember (
-            "stringSequence",
-            _tcOf_members0,
-            null);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-          _members0[2] = new org.omg.CORBA.StructMember (
-            "longField",
-            _tcOf_members0,
-            null);
-          __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.RichStructHelper.id (), "RichStruct", _members0);
-          __active = false;
-        }
-      }
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.RichStruct read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.RichStruct value = new org.apache.tuscany.sca.test.corba.generated.RichStruct ();
-    value.innerStruct = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.read (istream);
-    value.stringSequence = org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.read (istream);
-    value.longField = istream.read_long ();
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.RichStruct value)
-  {
-    org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.write (ostream, value.innerStruct);
-    org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.write (ostream, value.stringSequence);
-    ostream.write_long (value.longField);
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
deleted file mode 100644
index 8a063b8b9d..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
+++ /dev/null
@@ -1,57 +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.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class RichStructHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.RichStruct value = null;
-
-  public RichStructHolder ()
-  {
-  }
-
-  public RichStructHolder (org.apache.tuscany.sca.test.corba.generated.RichStruct initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.RichStructHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
deleted file mode 100644
index 4a3376c476..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/RichUnion.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-public final class RichUnion implements org.omg.CORBA.portable.IDLEntity
-{
-  private int ___x;
-  private float ___y;
-  private String ___z;
-  private org.apache.tuscany.sca.test.corba.generated.InnerUnion ___iu;
-  private boolean ___a;
-  private int __discriminator;
-  private boolean __uninitialized = true;
-
-  public RichUnion ()
-  {
-  }
-
-  public int discriminator ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    return __discriminator;
-  }
-
-  public int x ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyx (__discriminator);
-    return ___x;
-  }
-
-  public void x (int value)
-  {
-    __discriminator = 1;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  public void x (int discriminator, int value)
-  {
-    verifyx (discriminator);
-    __discriminator = discriminator;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  private void verifyx (int discriminator)
-  {
-    if (discriminator != 1)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public float y ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyy (__discriminator);
-    return ___y;
-  }
-
-  public void y (float value)
-  {
-    __discriminator = 2;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  public void y (int discriminator, float value)
-  {
-    verifyy (discriminator);
-    __discriminator = discriminator;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  private void verifyy (int discriminator)
-  {
-    if (discriminator != 2)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public String z ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyz (__discriminator);
-    return ___z;
-  }
-
-  public void z (String value)
-  {
-    __discriminator = 3;
-    ___z = value;
-    __uninitialized = false;
-  }
-
-  public void z (int discriminator, String value)
-  {
-    verifyz (discriminator);
-    __discriminator = discriminator;
-    ___z = value;
-    __uninitialized = false;
-  }
-
-  private void verifyz (int discriminator)
-  {
-    if (discriminator != 3)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public org.apache.tuscany.sca.test.corba.generated.InnerUnion iu ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyiu (__discriminator);
-    return ___iu;
-  }
-
-  public void iu (org.apache.tuscany.sca.test.corba.generated.InnerUnion value)
-  {
-    __discriminator = 4;
-    ___iu = value;
-    __uninitialized = false;
-  }
-
-  public void iu (int discriminator, org.apache.tuscany.sca.test.corba.generated.InnerUnion value)
-  {
-    verifyiu (discriminator);
-    __discriminator = discriminator;
-    ___iu = value;
-    __uninitialized = false;
-  }
-
-  private void verifyiu (int discriminator)
-  {
-    if (discriminator != 4)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public boolean a ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifya (__discriminator);
-    return ___a;
-  }
-
-  public void a (boolean value)
-  {
-    __discriminator = -2147483648;
-    ___a = value;
-    __uninitialized = false;
-  }
-
-  public void a (int discriminator, boolean value)
-  {
-    verifya (discriminator);
-    __discriminator = discriminator;
-    ___a = value;
-    __uninitialized = false;
-  }
-
-  private void verifya (int discriminator)
-  {
-    if (discriminator == 1 || discriminator == 2 || discriminator == 3 || discriminator == 4)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-} // class RichUnion
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
deleted file mode 100644
index 9b89d7f98a..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-abstract public class RichUnionHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/RichUnion/RichUnion:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.RichUnion that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.RichUnion extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      org.omg.CORBA.TypeCode _disTypeCode0;
-      _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [5];
-      org.omg.CORBA.TypeCode _tcOf_members0;
-      org.omg.CORBA.Any _anyOf_members0;
-
-      // Branch for x (case label 1)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)1);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      _members0[0] = new org.omg.CORBA.UnionMember (
-        "x",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for y (case label 2)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)2);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float);
-      _members0[1] = new org.omg.CORBA.UnionMember (
-        "y",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for z (case label 3)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)3);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-      _members0[2] = new org.omg.CORBA.UnionMember (
-        "z",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for iu (case label 4)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)4);
-      _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.type ();
-      _members0[3] = new org.omg.CORBA.UnionMember (
-        "iu",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for a (Default case)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_octet ((byte)0); // default member label
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_boolean);
-      _members0[4] = new org.omg.CORBA.UnionMember (
-        "a",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-      __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.id (), "RichUnion", _disTypeCode0, _members0);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.RichUnion read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.RichUnion value = new org.apache.tuscany.sca.test.corba.generated.RichUnion ();
-    int _dis0 = (int)0;
-    _dis0 = istream.read_long ();
-    switch (_dis0)
-    {
-      case 1:
-        int _x = (int)0;
-        _x = istream.read_long ();
-        value.x (_x);
-        break;
-      case 2:
-        float _y = (float)0;
-        _y = istream.read_float ();
-        value.y (_y);
-        break;
-      case 3:
-        String _z = null;
-        _z = istream.read_string ();
-        value.z (_z);
-        break;
-      case 4:
-        org.apache.tuscany.sca.test.corba.generated.InnerUnion _iu = null;
-        _iu = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.read (istream);
-        value.iu (_iu);
-        break;
-      default:
-        boolean _a = false;
-        _a = istream.read_boolean ();
-        value.a (_dis0, _a);
-        break;
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.RichUnion value)
-  {
-    ostream.write_long (value.discriminator ());
-    switch (value.discriminator ())
-    {
-      case 1:
-        ostream.write_long (value.x ());
-        break;
-      case 2:
-        ostream.write_float (value.y ());
-        break;
-      case 3:
-        ostream.write_string (value.z ());
-        break;
-      case 4:
-        org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.write (ostream, value.iu ());
-        break;
-      default:
-        ostream.write_boolean (value.a ());
-        break;
-    }
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
deleted file mode 100644
index 3c1a1c9a83..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-public final class RichUnionHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.RichUnion value = null;
-
-  public RichUnionHolder ()
-  {
-  }
-
-  public RichUnionHolder (org.apache.tuscany.sca.test.corba.generated.RichUnion initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
deleted file mode 100644
index 13f294b871..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public interface ScenarioOne extends ScenarioOneOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 
-{
-} // interface ScenarioOne
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
deleted file mode 100644
index 66cc1d1e82..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
+++ /dev/null
@@ -1,104 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class ScenarioOneHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioOne that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.id (), "ScenarioOne");
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne read (org.omg.CORBA.portable.InputStream istream)
-  {
-    return narrow (istream.read_Object (_ScenarioOneStub.class));
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioOne value)
-  {
-    ostream.write_Object ((org.omg.CORBA.Object) value);
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioOne)
-      return (org.apache.tuscany.sca.test.corba.generated.ScenarioOne)obj;
-    else if (!obj._is_a (id ()))
-      throw new org.omg.CORBA.BAD_PARAM ();
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne unchecked_narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioOne)
-      return (org.apache.tuscany.sca.test.corba.generated.ScenarioOne)obj;
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
deleted file mode 100644
index f14394b400..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
+++ /dev/null
@@ -1,57 +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.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class ScenarioOneHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.ScenarioOne value = null;
-
-  public ScenarioOneHolder ()
-  {
-  }
-
-  public ScenarioOneHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioOne initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
deleted file mode 100644
index 56388624d7..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
+++ /dev/null
@@ -1,33 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public interface ScenarioOneOperations 
-{
-  org.apache.tuscany.sca.test.corba.generated.RichStruct setRichStruct (org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct) throws org.apache.tuscany.sca.test.corba.generated.WrongColor, org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-} // interface ScenarioOneOperations
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
deleted file mode 100644
index 1897d0682c..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-public interface ScenarioSix extends ScenarioSixOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 
-{
-} // interface ScenarioSix
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
deleted file mode 100644
index c8c88ef91d..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
+++ /dev/null
@@ -1,104 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-abstract public class ScenarioSixHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioSix that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.id (), "ScenarioSix");
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix read (org.omg.CORBA.portable.InputStream istream)
-  {
-    return narrow (istream.read_Object (_ScenarioSixStub.class));
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioSix value)
-  {
-    ostream.write_Object ((org.omg.CORBA.Object) value);
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioSix)
-      return (org.apache.tuscany.sca.test.corba.generated.ScenarioSix)obj;
-    else if (!obj._is_a (id ()))
-      throw new org.omg.CORBA.BAD_PARAM ();
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix unchecked_narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioSix)
-      return (org.apache.tuscany.sca.test.corba.generated.ScenarioSix)obj;
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
deleted file mode 100644
index 5540b98c21..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
+++ /dev/null
@@ -1,57 +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.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-public final class ScenarioSixHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.ScenarioSix value = null;
-
-  public ScenarioSixHolder ()
-  {
-  }
-
-  public ScenarioSixHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioSix initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
deleted file mode 100644
index 648144299c..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
+++ /dev/null
@@ -1,35 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-public interface ScenarioSixOperations 
-{
-  String[][] passStringArray (String[][] arg);
-  org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct passAnnotatedStruct (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg);
-  org.apache.tuscany.sca.test.corba.generated.RichUnion passRichUnion (org.apache.tuscany.sca.test.corba.generated.RichUnion arg);
-} // interface ScenarioSixOperations
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
deleted file mode 100644
index b57e098a56..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
+++ /dev/null
@@ -1,34 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* wtorek, 15 lipiec 2008 13:36:31 CEST
-*/
-
-
-// objects for ScenarioTwo
-public interface ScenarioTwo extends ScenarioTwoOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 
-{
-} // interface ScenarioTwo
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
deleted file mode 100644
index 8ddfa10575..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
+++ /dev/null
@@ -1,106 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* wtorek, 15 lipiec 2008 13:36:31 CEST
-*/
-
-
-// objects for ScenarioTwo
-abstract public class ScenarioTwoHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioTwo that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.id (), "ScenarioTwo");
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo read (org.omg.CORBA.portable.InputStream istream)
-  {
-    return narrow (istream.read_Object (_ScenarioTwoStub.class));
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioTwo value)
-  {
-    ostream.write_Object ((org.omg.CORBA.Object) value);
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)
-      return (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)obj;
-    else if (!obj._is_a (id ()))
-      throw new org.omg.CORBA.BAD_PARAM ();
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo unchecked_narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)
-      return (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)obj;
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
deleted file mode 100644
index 9717629711..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.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 org.apache.tuscany.sca.test.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* wtorek, 15 lipiec 2008 13:36:31 CEST
-*/
-
-
-// objects for ScenarioTwo
-public final class ScenarioTwoHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.ScenarioTwo value = null;
-
-  public ScenarioTwoHolder ()
-  {
-  }
-
-  public ScenarioTwoHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
deleted file mode 100644
index 1247b4618d..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* wtorek, 15 lipiec 2008 13:36:31 CEST
-*/
-
-
-// objects for ScenarioTwo
-public interface ScenarioTwoOperations 
-{
-  String stringField ();
-  void stringField (String newStringField);
-} // interface ScenarioTwoOperations
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
deleted file mode 100644
index f2cc3adad5..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
+++ /dev/null
@@ -1,95 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-abstract public class StringArrayHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/StringArray:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, String[][] that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static String[][] extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0);
-      __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode );
-      __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode );
-      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.id (), "StringArray", __typeCode);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static String[][] read (org.omg.CORBA.portable.InputStream istream)
-  {
-    String value[][] = null;
-    value = new String[2][];
-    for (int _o0 = 0;_o0 < (2); ++_o0)
-    {
-      value[_o0] = new String[2];
-      for (int _o1 = 0;_o1 < (2); ++_o1)
-      {
-        value[_o0][_o1] = istream.read_string ();
-      }
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, String[][] value)
-  {
-    if (value.length != (2))
-      throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    for (int _i0 = 0;_i0 < (2); ++_i0)
-    {
-      if (value[_i0].length != (2))
-        throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-      for (int _i1 = 0;_i1 < (2); ++_i1)
-      {
-        ostream.write_string (value[_i0][_i1]);
-      }
-    }
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
deleted file mode 100644
index dbad550222..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* sobota, 16 sierpieñ 2008 15:31:35 CEST
-*/
-
-public final class StringArrayHolder implements org.omg.CORBA.portable.Streamable
-{
-  public String value[][] = null;
-
-  public StringArrayHolder ()
-  {
-  }
-
-  public StringArrayHolder (String[][] initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
deleted file mode 100644
index d29129236c..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
+++ /dev/null
@@ -1,81 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class StringSequenceHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/StringSequence:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, String[] that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static String[] extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0);
-      __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
-      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.id (), "StringSequence", __typeCode);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static String[] read (org.omg.CORBA.portable.InputStream istream)
-  {
-    String value[] = null;
-    int _len0 = istream.read_long ();
-    value = new String[_len0];
-    for (int _o1 = 0;_o1 < value.length; ++_o1)
-      value[_o1] = istream.read_string ();
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, String[] value)
-  {
-    ostream.write_long (value.length);
-    for (int _i0 = 0;_i0 < value.length; ++_i0)
-      ostream.write_string (value[_i0]);
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
deleted file mode 100644
index 837ba04cea..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class StringSequenceHolder implements org.omg.CORBA.portable.Streamable
-{
-  public String value[] = null;
-
-  public StringSequenceHolder ()
-  {
-  }
-
-  public StringSequenceHolder (String[] initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
deleted file mode 100644
index 0b24056642..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
+++ /dev/null
@@ -1,83 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class TwoDimLongSequenceHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequence:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, int[][] that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static int[][] extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
-      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", __typeCode);
-      __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
-      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.id (), "TwoDimLongSequence", __typeCode);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static int[][] read (org.omg.CORBA.portable.InputStream istream)
-  {
-    int value[][] = null;
-    int _len0 = istream.read_long ();
-    value = new int[_len0][];
-    for (int _o1 = 0;_o1 < value.length; ++_o1)
-      value[_o1] = org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.read (istream);
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, int[][] value)
-  {
-    ostream.write_long (value.length);
-    for (int _i0 = 0;_i0 < value.length; ++_i0)
-      org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.write (ostream, value[_i0]);
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
deleted file mode 100644
index e2ed1ab037..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class TwoDimLongSequenceHolder implements org.omg.CORBA.portable.Streamable
-{
-  public int value[][] = null;
-
-  public TwoDimLongSequenceHolder ()
-  {
-  }
-
-  public TwoDimLongSequenceHolder (int[][] initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
deleted file mode 100644
index 46888399ed..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class UnexpectedException extends org.omg.CORBA.UserException
-{
-  public String info = null;
-
-  public UnexpectedException ()
-  {
-    super(UnexpectedExceptionHelper.id());
-  } // ctor
-
-  public UnexpectedException (String _info)
-  {
-    super(UnexpectedExceptionHelper.id());
-    info = _info;
-  } // ctor
-
-
-  public UnexpectedException (String $reason, String _info)
-  {
-    super(UnexpectedExceptionHelper.id() + "  " + $reason);
-    info = _info;
-  } // ctor
-
-} // class UnexpectedException
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
deleted file mode 100644
index c276038050..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
+++ /dev/null
@@ -1,98 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class UnexpectedExceptionHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/UnexpectedException:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.UnexpectedException that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.UnexpectedException extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  private static boolean __active = false;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      synchronized (org.omg.CORBA.TypeCode.class)
-      {
-        if (__typeCode == null)
-        {
-          if (__active)
-          {
-            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
-          }
-          __active = true;
-          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [1];
-          org.omg.CORBA.TypeCode _tcOf_members0 = null;
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-          _members0[0] = new org.omg.CORBA.StructMember (
-            "info",
-            _tcOf_members0,
-            null);
-          __typeCode = org.omg.CORBA.ORB.init ().create_exception_tc (org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.id (), "UnexpectedException", _members0);
-          __active = false;
-        }
-      }
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.UnexpectedException read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.UnexpectedException value = new org.apache.tuscany.sca.test.corba.generated.UnexpectedException ();
-    // read and discard the repository ID
-    istream.read_string ();
-    value.info = istream.read_string ();
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.UnexpectedException value)
-  {
-    // write the repository ID
-    ostream.write_string (id ());
-    ostream.write_string (value.info);
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
deleted file mode 100644
index 079a56b446..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
+++ /dev/null
@@ -1,57 +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.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class UnexpectedExceptionHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.UnexpectedException value = null;
-
-  public UnexpectedExceptionHolder ()
-  {
-  }
-
-  public UnexpectedExceptionHolder (org.apache.tuscany.sca.test.corba.generated.UnexpectedException initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
deleted file mode 100644
index 0407184598..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.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 org.apache.tuscany.sca.test.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/WrongColor.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class WrongColor extends org.omg.CORBA.UserException
-{
-  public org.apache.tuscany.sca.test.corba.generated.Color givenColor = null;
-  public org.apache.tuscany.sca.test.corba.generated.Color correctColor = null;
-
-  public WrongColor ()
-  {
-    super(WrongColorHelper.id());
-  } // ctor
-
-  public WrongColor (org.apache.tuscany.sca.test.corba.generated.Color _givenColor, org.apache.tuscany.sca.test.corba.generated.Color _correctColor)
-  {
-    super(WrongColorHelper.id());
-    givenColor = _givenColor;
-    correctColor = _correctColor;
-  } // ctor
-
-
-  public WrongColor (String $reason, org.apache.tuscany.sca.test.corba.generated.Color _givenColor, org.apache.tuscany.sca.test.corba.generated.Color _correctColor)
-  {
-    super(WrongColorHelper.id() + "  " + $reason);
-    givenColor = _givenColor;
-    correctColor = _correctColor;
-  } // ctor
-
-} // class WrongColor
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
deleted file mode 100644
index 16e099cfa3..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
+++ /dev/null
@@ -1,105 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-abstract public class WrongColorHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/test/corba/generated/WrongColor:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.WrongColor that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.WrongColor extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  private static boolean __active = false;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      synchronized (org.omg.CORBA.TypeCode.class)
-      {
-        if (__typeCode == null)
-        {
-          if (__active)
-          {
-            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
-          }
-          __active = true;
-          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [2];
-          org.omg.CORBA.TypeCode _tcOf_members0 = null;
-          _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type ();
-          _members0[0] = new org.omg.CORBA.StructMember (
-            "givenColor",
-            _tcOf_members0,
-            null);
-          _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type ();
-          _members0[1] = new org.omg.CORBA.StructMember (
-            "correctColor",
-            _tcOf_members0,
-            null);
-          __typeCode = org.omg.CORBA.ORB.init ().create_exception_tc (org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.id (), "WrongColor", _members0);
-          __active = false;
-        }
-      }
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.test.corba.generated.WrongColor read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.test.corba.generated.WrongColor value = new org.apache.tuscany.sca.test.corba.generated.WrongColor ();
-    // read and discard the repository ID
-    istream.read_string ();
-    value.givenColor = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream);
-    value.correctColor = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream);
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.WrongColor value)
-  {
-    // write the repository ID
-    ostream.write_string (id ());
-    org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.givenColor);
-    org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.correctColor);
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
deleted file mode 100644
index b4883cb35c..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
+++ /dev/null
@@ -1,57 +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.corba.generated;
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public final class WrongColorHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.test.corba.generated.WrongColor value = null;
-
-  public WrongColorHolder ()
-  {
-  }
-
-  public WrongColorHolder (org.apache.tuscany.sca.test.corba.generated.WrongColor initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
deleted file mode 100644
index c96fb61204..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
+++ /dev/null
@@ -1,91 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public abstract class _ScenarioOneImplBase extends org.omg.CORBA.portable.ObjectImpl
-                implements org.apache.tuscany.sca.test.corba.generated.ScenarioOne, org.omg.CORBA.portable.InvokeHandler
-{
-
-  // Constructors
-  public _ScenarioOneImplBase ()
-  {
-  }
-
-  private static java.util.Hashtable _methods = new java.util.Hashtable ();
-  static
-  {
-    _methods.put ("setRichStruct", new java.lang.Integer (0));
-  }
-
-  public org.omg.CORBA.portable.OutputStream _invoke (String $method,
-                                org.omg.CORBA.portable.InputStream in,
-                                org.omg.CORBA.portable.ResponseHandler $rh)
-  {
-    org.omg.CORBA.portable.OutputStream out = null;
-    java.lang.Integer __method = (java.lang.Integer)_methods.get ($method);
-    if (__method == null)
-      throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-    switch (__method.intValue ())
-    {
-       case 0:  // org/apache/tuscany/sca/test/corba/generated/ScenarioOne/setRichStruct
-       {
-         try {
-           org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read (in);
-           org.apache.tuscany.sca.test.corba.generated.RichStruct $result = null;
-           $result = this.setRichStruct (richStruct);
-           out = $rh.createReply();
-           org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write (out, $result);
-         } catch (org.apache.tuscany.sca.test.corba.generated.WrongColor $ex) {
-           out = $rh.createExceptionReply ();
-           org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.write (out, $ex);
-         } catch (org.apache.tuscany.sca.test.corba.generated.UnexpectedException $ex) {
-           out = $rh.createExceptionReply ();
-           org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.write (out, $ex);
-         }
-         break;
-       }
-
-       default:
-         throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    }
-
-    return out;
-  } // _invoke
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-
-} // class _ScenarioOneImplBase
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
deleted file mode 100644
index 3427c127ec..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* pi±tek, 27 czerwiec 2008 20:40:03 CEST
-*/
-
-public class _ScenarioOneStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioOne
-{
-
-  public org.apache.tuscany.sca.test.corba.generated.RichStruct setRichStruct (org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct) throws org.apache.tuscany.sca.test.corba.generated.WrongColor, org.apache.tuscany.sca.test.corba.generated.UnexpectedException
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("setRichStruct", true);
-                org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write ($out, richStruct);
-                $in = _invoke ($out);
-                org.apache.tuscany.sca.test.corba.generated.RichStruct $result = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read ($in);
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                if (_id.equals ("IDL:org/apache/tuscany/sca/test/corba/generated/WrongColor:1.0"))
-                    throw org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.read ($in);
-                else if (_id.equals ("IDL:org/apache/tuscany/sca/test/corba/generated/UnexpectedException:1.0"))
-                    throw org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.read ($in);
-                else
-                    throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return setRichStruct (richStruct        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // setRichStruct
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
-  {
-     String str = s.readUTF ();
-     String[] args = null;
-     java.util.Properties props = null;
-     org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
-     org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
-     _set_delegate (delegate);
-  }
-
-  private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
-  {
-     String[] args = null;
-     java.util.Properties props = null;
-     String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
-     s.writeUTF (str);
-  }
-} // class _ScenarioOneStub
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
deleted file mode 100644
index 78464fe40d..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
+++ /dev/null
@@ -1,105 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 23:35:36 CEST
-*/
-
-public abstract class _ScenarioSixImplBase extends org.omg.CORBA.portable.ObjectImpl
-                implements org.apache.tuscany.sca.test.corba.generated.ScenarioSix, org.omg.CORBA.portable.InvokeHandler
-{
-
-  // Constructors
-  public _ScenarioSixImplBase ()
-  {
-  }
-
-  private static java.util.Hashtable _methods = new java.util.Hashtable ();
-  static
-  {
-    _methods.put ("passStringArray", new java.lang.Integer (0));
-    _methods.put ("passAnnotatedStruct", new java.lang.Integer (1));
-    _methods.put ("passRichUnion", new java.lang.Integer (2));
-  }
-
-  public org.omg.CORBA.portable.OutputStream _invoke (String $method,
-                                org.omg.CORBA.portable.InputStream in,
-                                org.omg.CORBA.portable.ResponseHandler $rh)
-  {
-    org.omg.CORBA.portable.OutputStream out = null;
-    java.lang.Integer __method = (java.lang.Integer)_methods.get ($method);
-    if (__method == null)
-      throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-    switch (__method.intValue ())
-    {
-       case 0:  // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passStringArray
-       {
-         String arg[][] = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (in);
-         String $result[][] = null;
-         $result = this.passStringArray (arg);
-         out = $rh.createReply();
-         org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (out, $result);
-         break;
-       }
-
-       case 1:  // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passAnnotatedStruct
-       {
-         org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read (in);
-         org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct $result = null;
-         $result = this.passAnnotatedStruct (arg);
-         out = $rh.createReply();
-         org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write (out, $result);
-         break;
-       }
-
-       case 2:  // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passRichUnion
-       {
-         org.apache.tuscany.sca.test.corba.generated.RichUnion arg = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read (in);
-         org.apache.tuscany.sca.test.corba.generated.RichUnion $result = null;
-         $result = this.passRichUnion (arg);
-         out = $rh.createReply();
-         org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write (out, $result);
-         break;
-       }
-
-       default:
-         throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    }
-
-    return out;
-  } // _invoke
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-
-} // class _ScenarioSixImplBase
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
deleted file mode 100644
index faff36c2a4..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* niedziela, 17 sierpieñ 2008 19:07:14 CEST
-*/
-
-public class _ScenarioSixStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioSix
-{
-
-  public String[][] passStringArray (String[][] arg)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("passStringArray", true);
-                org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write ($out, arg);
-                $in = _invoke ($out);
-                String $result[][] = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read ($in);
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return passStringArray (arg        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // passStringArray
-
-  public org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct passAnnotatedStruct (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("passAnnotatedStruct", true);
-                org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write ($out, arg);
-                $in = _invoke ($out);
-                org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct $result = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read ($in);
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return passAnnotatedStruct (arg        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // passAnnotatedStruct
-
-  public org.apache.tuscany.sca.test.corba.generated.RichUnion passRichUnion (org.apache.tuscany.sca.test.corba.generated.RichUnion arg)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("passRichUnion", true);
-                org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write ($out, arg);
-                $in = _invoke ($out);
-                org.apache.tuscany.sca.test.corba.generated.RichUnion $result = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read ($in);
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return passRichUnion (arg        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // passRichUnion
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
-  {
-     String str = s.readUTF ();
-     String[] args = null;
-     java.util.Properties props = null;
-     org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
-     org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
-     _set_delegate (delegate);
-  }
-
-  private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
-  {
-     String[] args = null;
-     java.util.Properties props = null;
-     String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
-     s.writeUTF (str);
-  }
-} // class _ScenarioSixStub
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
deleted file mode 100644
index 750006cec6..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* wtorek, 15 lipiec 2008 13:36:31 CEST
-*/
-
-
-// objects for ScenarioTwo
-public abstract class _ScenarioTwoImplBase extends org.omg.CORBA.portable.ObjectImpl
-                implements org.apache.tuscany.sca.test.corba.generated.ScenarioTwo, org.omg.CORBA.portable.InvokeHandler
-{
-
-  // Constructors
-  public _ScenarioTwoImplBase ()
-  {
-  }
-
-  private static java.util.Hashtable _methods = new java.util.Hashtable ();
-  static
-  {
-    _methods.put ("_get_stringField", new java.lang.Integer (0));
-    _methods.put ("_set_stringField", new java.lang.Integer (1));
-  }
-
-  public org.omg.CORBA.portable.OutputStream _invoke (String $method,
-                                org.omg.CORBA.portable.InputStream in,
-                                org.omg.CORBA.portable.ResponseHandler $rh)
-  {
-    org.omg.CORBA.portable.OutputStream out = null;
-    java.lang.Integer __method = (java.lang.Integer)_methods.get ($method);
-    if (__method == null)
-      throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-    switch (__method.intValue ())
-    {
-       case 0:  // org/apache/tuscany/sca/test/corba/generated/ScenarioTwo/_get_stringField
-       {
-         String $result = null;
-         $result = this.stringField ();
-         out = $rh.createReply();
-         out.write_string ($result);
-         break;
-       }
-
-       case 1:  // org/apache/tuscany/sca/test/corba/generated/ScenarioTwo/_set_stringField
-       {
-         String newStringField = in.read_string ();
-         this.stringField (newStringField);
-         out = $rh.createReply();
-         break;
-       }
-
-       default:
-         throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    }
-
-    return out;
-  } // _invoke
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-
-} // class _ScenarioTwoImplBase
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
deleted file mode 100644
index ef9f561d1b..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
+++ /dev/null
@@ -1,99 +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.corba.generated;
-
-
-/**
-* org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from itest_scenario.idl
-* wtorek, 15 lipiec 2008 13:36:31 CEST
-*/
-
-
-// objects for ScenarioTwo
-public class _ScenarioTwoStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioTwo
-{
-
-  public String stringField ()
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("_get_stringField", true);
-                $in = _invoke ($out);
-                String $result = $in.read_string ();
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return stringField (        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // stringField
-
-  public void stringField (String newStringField)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("_set_stringField", true);
-                $out.write_string (newStringField);
-                $in = _invoke ($out);
-                return;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                stringField (newStringField        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // stringField
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
-  {
-     String str = s.readUTF ();
-     String[] args = null;
-     java.util.Properties props = null;
-     org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
-     org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
-     _set_delegate (delegate);
-  }
-
-  private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
-  {
-     String[] args = null;
-     java.util.Properties props = null;
-     String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
-     s.writeUTF (str);
-  }
-} // class _ScenarioTwoStub
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
deleted file mode 100644
index 1bc2156183..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
+++ /dev/null
@@ -1,33 +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.corba.types;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * @version $Rev$ $Date$
- * Operations for scenario five
- */
-@Remotable
-public interface ScenarioFive {
-
-    void doNothing();
-    
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
deleted file mode 100644
index a198eaf646..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
+++ /dev/null
@@ -1,41 +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.corba.types;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for obtaining ScenarioFive reference
- */
-public class ScenarioFiveComponent {
-
-    private ScenarioFive scenarioFive;
-
-    @Reference
-    public void setScenarioFive(ScenarioFive scenarioFive) {
-        this.scenarioFive = scenarioFive;
-    }
-    
-    public ScenarioFive getScenarioFive() {
-        return scenarioFive;
-    }
-    
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
deleted file mode 100644
index dc752a2aea..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Implementation of ScenarioFive service
- */
-public class ScenarioFiveImpl implements ScenarioFive {
-
-    public void doNothing() {
-        // does nothing
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
deleted file mode 100644
index aa2f06909b..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
+++ /dev/null
@@ -1,38 +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.corba.types;
-
-import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * @version $Rev$ $Date$
- * Operations for ScenarioFour
- */
-@Remotable
-public interface ScenarioFour {
-
-    ScenarioFourStruct setStruct(ScenarioFourStruct struct);
-
-    void exceptionTest() throws ScenarioFourException;
-
-    ScenarioFourSdo passScenarioFourStruct(ScenarioFourSdo scenarioFourSdo);
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
deleted file mode 100644
index c7569720f0..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
+++ /dev/null
@@ -1,41 +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.corba.types;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for obtaining ScenarioFour reference
- */
-public class ScenarioFourComponent {
-
-    private ScenarioFour scenarioFour;
-
-    @Reference
-    public void setScenarioFour(ScenarioFour scenarioFour) {
-        this.scenarioFour = scenarioFour;
-    }
-
-    public ScenarioFour getScenarioFour() {
-        return scenarioFour;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
deleted file mode 100644
index bc76373633..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
+++ /dev/null
@@ -1,41 +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.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Exception for ScenarioFour tests
- */
-public class ScenarioFourException extends Exception {
-
-    public static final String DEFAULT_CONTENT = "Test";
-    
-    private static final long serialVersionUID = 1L;
-    private String content;
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
deleted file mode 100644
index 2f10177bd0..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo;
-
-/**
- * @version $Rev$ $Date$
- * Implementation of ScenarioFour service
- */
-public class ScenarioFourImpl implements ScenarioFour {
-
-    public ScenarioFourStruct setStruct(ScenarioFourStruct struct) {
-        return struct;
-    }
-
-    public void exceptionTest() throws ScenarioFourException {
-        ScenarioFourException exception = new ScenarioFourException();
-        exception.setContent(ScenarioFourException.DEFAULT_CONTENT);
-        throw exception;
-    }
-
-    public ScenarioFourSdo passScenarioFourStruct(ScenarioFourSdo scenarioFourSdo) {
-        return scenarioFourSdo;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
deleted file mode 100644
index de8624455f..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
+++ /dev/null
@@ -1,40 +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.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Type for ScenarioFour test
- */
-public class ScenarioFourStruct {
-
-    public String field1;
-    public int field2;
-    public double[] field3;
-
-    public boolean equals(ScenarioFourStruct arg) {
-        return (field1 != null && arg.field1 != null
-            && field1.equals(arg.field1)
-            && field2 == arg.field2
-            && field3 != null
-            && arg.field3 != null && field3.length == arg.field3.length);
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
deleted file mode 100644
index 1813de4e67..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
+++ /dev/null
@@ -1,46 +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.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated.RichStruct;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioOne;
-import org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations;
-import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for reference using generated interface.
- */
-public class ScenarioOneComponent implements ScenarioOneOperations {
-
-    private ScenarioOne scenarionOne;
-
-    @Reference
-    public void setScenarioOne(ScenarioOne scenarioOne) {
-        this.scenarionOne = scenarioOne;
-    }
-
-    public RichStruct setRichStruct(RichStruct richStruct) throws WrongColor, UnexpectedException {
-        return scenarionOne.setRichStruct(richStruct);
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
deleted file mode 100644
index 9b49adbfbb..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.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.    
- */
-
-package org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated.Color;
-import org.apache.tuscany.sca.test.corba.generated.RichStruct;
-import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-import org.apache.tuscany.sca.test.corba.generated._ScenarioOneImplBase;
-
-/**
- * @version $Rev$ $Date$
- * Servant for generated interface. Uses generated classes.
- */
-public class ScenarioOneServant extends _ScenarioOneImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public RichStruct setRichStruct(RichStruct richStruct) throws WrongColor, UnexpectedException {
-        if (richStruct.innerStruct.color.value() == Color.red.value()) {
-            throw new WrongColor(richStruct.innerStruct.color, Color.green);
-        } else if (richStruct.longField == 0) {
-            throw new UnexpectedException("Expected richStruct.longField != 0");
-        }
-        return richStruct;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
deleted file mode 100644
index 7889a80bf1..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
+++ /dev/null
@@ -1,46 +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.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct;
-import org.apache.tuscany.sca.test.corba.generated.RichUnion;
-import org.apache.tuscany.sca.test.corba.generated._ScenarioSixImplBase;
-
-/**
- * @version $Rev$ $Date$
- * Scenario six servant for generated interface. 
- */
-public class ScenarioSixServant extends _ScenarioSixImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public String[][] passStringArray(String[][] arg) {
-        return arg;
-    }
-
-    public AnnotatedStruct passAnnotatedStruct(AnnotatedStruct arg) {
-        return arg;
-    }
-    
-    public RichUnion passRichUnion(RichUnion arg) {
-        return arg;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
deleted file mode 100644
index cdd49904d3..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
+++ /dev/null
@@ -1,42 +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.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated._ScenarioTwoImplBase;
-
-/**
- * @version $Rev$ $Date$
- * Servant for generated interface. 
- */
-public class ScenarioTwoServant extends _ScenarioTwoImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    private String stringField = "";
-
-    public String stringField() {
-        return stringField;
-    }
-
-    public void stringField(String newStringField) {
-        this.stringField = newStringField;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
deleted file mode 100644
index 6f0ef584da..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
+++ /dev/null
@@ -1,40 +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.corba.types;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaArray;
-
-/**
- * @version $Rev$ $Date$ Scenario six structure used by Tuscany.
- */
-public final class TAnnotatedStruct {
-
-    @CorbaArray( {2, 2})
-    public String[][] stringArray;
-
-    public TAnnotatedStruct() {
-
-    }
-
-    public TAnnotatedStruct(String[][] stringArray) {
-        this.stringArray = stringArray;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
deleted file mode 100644
index 71003d008f..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
+++ /dev/null
@@ -1,62 +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.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * User provided enum representation for Color type.
- */
-public class TColor {
-
-    private int value;
-
-    public static final int _red = 0;
-    public static final int _yellow = 1;
-    public static final int _green = 2;
-
-    public static final TColor red = new TColor(_red);
-    public static final TColor yellow = new TColor(_yellow);
-    public static final TColor green = new TColor(_green);
-
-    public int value() {
-        return value;
-    }
-
-    public static TColor from_int(int value) {
-        switch (value) {
-            case 0:
-                return red;
-            case 1:
-                return yellow;
-            case 2:
-                return green;
-        }
-        return green;
-    }
-
-    protected TColor(int value) {
-        this.value = value;
-    }
-    
-    public TColor() {
-        
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
deleted file mode 100644
index 271f1e669b..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
+++ /dev/null
@@ -1,42 +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.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * User provided interface representation for InnerStruct type.
- */
-public final class TInnerStruct {
-
-    public int[][] twoDimLongSequence;
-    public String stringField;
-    public TColor color;
-
-    public TInnerStruct() {
-
-    }
-
-    public TInnerStruct(int[][] a1, String a2, TColor a3) {
-        twoDimLongSequence = a1;
-        stringField = a2;
-        color = a3;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
deleted file mode 100644
index f2baffce9a..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
-
-/**
- * @version $Rev$ $Date$
- * User provided interface representation for CORBA InnerUnion type.
- */
-public final class TInnerUnion {
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1)
-    private int x;
-   
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 2)
-    private float y;
-    
-    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
-    @SuppressWarnings("unused")
-    private int discriminator;
-
-    public int getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        discriminator = 1;
-        this.x = x;
-    }
-
-    public float getY() {
-        return y;
-    }
-
-    public void setY(float y) {
-        discriminator = 2;
-        this.y = y;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
deleted file mode 100644
index 1b44da9752..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
+++ /dev/null
@@ -1,42 +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.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * User provided interface representation for RichStruct type.
- */
-public final class TRichStruct {
-
-    public TInnerStruct innerStruct;
-    public String[] stringSequence;
-    public int longField;
-
-    public TRichStruct() {
-
-    }
-
-    public TRichStruct(TInnerStruct a1, String[] a2, int a3) {
-        innerStruct = a1;
-        stringSequence = a2;
-        longField = a3;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
deleted file mode 100644
index 8270ba1a8c..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
+++ /dev/null
@@ -1,95 +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.corba.types;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
-
-/**
- * @version $Rev$ $Date$
- * User provided interface representation for CORBA RichUnion type.
- */
-public final class TRichUnion {
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1)
-    private int x;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 2)
-    private float y;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 3)
-    private String z;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 4)
-    private TInnerUnion iu;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.defaultOption)
-    private boolean def;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
-    @SuppressWarnings("unused")
-    private int discriminator = -1;
-
-    public int getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        this.discriminator = 1;
-        this.x = x;
-    }
-
-    public float getY() {
-        return y;
-    }
-
-    public void setY(float y) {
-        this.discriminator = 2;
-        this.y = y;
-    }
-
-    public String getZ() {
-        return z;
-    }
-
-    public void setZ(String z) {
-        this.discriminator = 3;
-        this.z = z;
-    }
-
-    public boolean isDef() {
-        return def;
-    }
-
-    public void setDef(boolean def) {
-        this.discriminator = -1;
-        this.def = def;
-    }
-
-    public TInnerUnion getIu() {
-        return iu;
-    }
-
-    public void setIu(TInnerUnion iu) {
-        this.discriminator = 4;
-        this.iu = iu;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
deleted file mode 100644
index 922759cd8d..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
+++ /dev/null
@@ -1,33 +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.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-
-/**
- * @version $Rev$ $Date$
- * User provided CORBA service interface.
- */
-public interface TScenarioOne {
-
-    TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException;
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
deleted file mode 100644
index ac7b0af175..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
+++ /dev/null
@@ -1,43 +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.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for reference using user provided interface.
- */
-public class TScenarioOneComponent implements TScenarioOne {
-
-    private TScenarioOne scenarionOne;
-
-    @Reference
-    public void setScenarioOne(TScenarioOne scenarioOne) {
-        this.scenarionOne = scenarioOne;
-    }
-
-    public TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException {
-        return scenarionOne.setRichStruct(richStruct);
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
deleted file mode 100644
index 47f0775c16..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.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 org.apache.tuscany.sca.test.corba.types;
-
-import org.apache.tuscany.sca.test.corba.generated.Color;
-import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
-import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-
-/**
- * @version $Rev$ $Date$
- * Servant for user provided interface. Uses T* classes.
- */
-public class TScenarioOneServant implements TScenarioOne {
-
-    private static final long serialVersionUID = 1L;
-
-    public TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException {
-        if (richStruct.innerStruct.color.value() == Color.red.value()) {
-            Color translatedColor = Color.from_int(richStruct.innerStruct.color.value());
-            throw new WrongColor(translatedColor, Color.green);
-        } else if (richStruct.longField == 0) {
-            throw new UnexpectedException("Expected richStruct.longField != 0");
-        }
-        return richStruct;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
deleted file mode 100644
index 0e894cb7ea..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.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.corba.types;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaArray;
-
-/**
- * @version $Rev$ $Date$
- * Operations for scenario six.
- */
-public interface TScenarioSix {
-
-    @CorbaArray( {2, 2})
-    public String[][] passStringArray(@CorbaArray( {2, 2})String[][] arg);
-
-    public TAnnotatedStruct passAnnotatedStruct(TAnnotatedStruct arg);
-    
-    public TRichUnion passRichUnion(TRichUnion arg);
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
deleted file mode 100644
index 13bc1d499e..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
+++ /dev/null
@@ -1,41 +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.corba.types;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for obtaining ScenartioSix reference.
- */
-public class TScenarioSixComponent {
-
-    private TScenarioSix scenarioSix;
-
-    @Reference
-    public void setScenarioSix(TScenarioSix scenarioSix) {
-        this.scenarioSix = scenarioSix;
-    }
-    
-    public TScenarioSix getScenarioSix() {
-        return scenarioSix;
-    }
-    
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
deleted file mode 100644
index 8e76958e31..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
+++ /dev/null
@@ -1,42 +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.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Tuscany scenario six servant.
- */
-public class TScenarioSixServant implements TScenarioSix {
-
-    private static final long serialVersionUID = 1L;
-
-    public String[][] passStringArray(String[][] arg) {
-        return arg;
-    }
-
-    public TAnnotatedStruct passAnnotatedStruct(TAnnotatedStruct arg) {
-        return arg;
-    }
-    
-    public TRichUnion passRichUnion(TRichUnion arg) {
-        return arg;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
deleted file mode 100644
index 1e4264256b..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
+++ /dev/null
@@ -1,42 +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.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Operations for ScenarioThree.
- */
-public interface TScenarioThree {
-
-    int getIntField();
-
-    void setIntField(int intField);
-
-    void overloadedName();
-
-    void overloadedName(String arg1);
-
-    void overloadedName(String arg1, int arg2);
-
-    int caseDifferent();
-
-    int CaseDifferent();
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
deleted file mode 100644
index 12b0f404ae..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
+++ /dev/null
@@ -1,41 +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.corba.types;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for obtaining ScenartioThree reference.
- */
-public class TScenarioThreeComponent {
-
-    private TScenarioThree scenarionThree;
-
-    @Reference
-    public void setScenarioThree(TScenarioThree scenarioThree) {
-        this.scenarionThree = scenarioThree;
-    }
-
-    public TScenarioThree getScenarioThree() {
-        return scenarionThree;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
deleted file mode 100644
index b679214c6c..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Servant for user provided interface.
- */
-public class TScenarioThreeServant implements TScenarioThree {
-
-    public int getIntField() {
-        return 0;
-    }
-
-    public void overloadedName() {
-    }
-
-    public void overloadedName(String arg1) {
-    }
-
-    public void overloadedName(String arg1, int arg2) {
-    }
-
-    public void setIntField(int intField) {
-    }
-
-    public int CaseDifferent() {
-        return 1;
-    }
-
-    public int caseDifferent() {
-        return 0;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
deleted file mode 100644
index 415634c80f..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.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 org.apache.tuscany.sca.test.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Operations for ScenarioTwo.
- */
-public interface TScenarioTwo {
-
-    String getStringField();
-
-    void setStringField(String stringField);
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
deleted file mode 100644
index 937d82b33e..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
+++ /dev/null
@@ -1,41 +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.corba.types;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- * Component for obtaining ScenartioTwo reference.
- */
-public class TScenarioTwoComponent {
-
-    private TScenarioTwo scenarioTwo;
-
-    @Reference
-    public void setScenarioTwo(TScenarioTwo scenarioTwo) {
-        this.scenarioTwo = scenarioTwo;
-    }
-
-    public TScenarioTwo getScenarioTwo() {
-        return scenarioTwo;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java b/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
deleted file mode 100644
index cb868d18a0..0000000000
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
+++ /dev/null
@@ -1,38 +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.corba.types;
-
-/**
- * @version $Rev$ $Date$
- * Servant for user provided interface.
- */
-public class TScenarioTwoServant implements TScenarioTwo {
-
-    private static String stringField = "";
-
-    public String getStringField() {
-        return stringField;
-    }
-
-    public void setStringField(String stringField) {
-        TScenarioTwoServant.stringField = stringField;
-    }
-
-}
diff --git a/java/sca-contrib/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/java/sca-contrib/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 3e77527d73..0000000000
--- a/java/sca-contrib/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.test.corba.TestCorbaHostModuleActivator

diff --git a/java/sca-contrib/itest/corba/src/test/resources/ScenarioFive.composite b/java/sca-contrib/itest/corba/src/test/resources/ScenarioFive.composite
deleted file mode 100644
index 3c73e238a5..0000000000
--- a/java/sca-contrib/itest/corba/src/test/resources/ScenarioFive.composite
+++ /dev/null
@@ -1,41 +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.    

--->

-

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="Corba">

-    

-    <component name="ScenarioFiveService">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFiveImpl" />

-    </component>

-	<service name="ScenarioFive" promote="ScenarioFiveService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFive"/>

-        <binding.sca uri="corbaname::localhost:5090#ScenarioFive"/>

-    </service>

-    

-    <component name="ScenarioFive">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFiveComponent" />

-        <reference name="scenarioFive">

-			<binding.sca uri="corbaname::localhost:5090#ScenarioFive"/>        

-        </reference>

-    </component>

-        

-</composite>

diff --git a/java/sca-contrib/itest/corba/src/test/resources/ScenarioFour.composite b/java/sca-contrib/itest/corba/src/test/resources/ScenarioFour.composite
deleted file mode 100644
index 01d7e2314a..0000000000
--- a/java/sca-contrib/itest/corba/src/test/resources/ScenarioFour.composite
+++ /dev/null
@@ -1,56 +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.    

--->

-

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="Corba">

-    

-    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->

-    

-    <component name="ScenarioFourService">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourImpl" />

-    </component>

-	<service name="ScenarioFour" promote="ScenarioFourService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFour"/>

-        <binding.sca uri="corbaname::localhost:5080#ScenarioFour"/>

-    </service>

-    

-    <component name="ScenarioFour">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent" />

-        <reference name="scenarioFour">

-			<binding.sca uri="corbaname::localhost:5080#ScenarioFour"/>        

-        </reference>

-    </component>

-    

-    <!-- doubled service and reference to test reuse of name server --> 

-    <service name="ScenarioFourDoubled" promote="ScenarioFourService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFour"/>

-        <binding.sca uri="corbaname::localhost:5080#ScenarioFourReuse"/>

-    </service>

-    

-    <component name="ScenarioFourReuse">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent" />

-        <reference name="scenarioFour">

-			<binding.sca uri="corbaname::localhost:5080#ScenarioFourReuse"/>        

-        </reference>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/itest/corba/src/test/resources/ScenarioOne.composite b/java/sca-contrib/itest/corba/src/test/resources/ScenarioOne.composite
deleted file mode 100644
index c10b383661..0000000000
--- a/java/sca-contrib/itest/corba/src/test/resources/ScenarioOne.composite
+++ /dev/null
@@ -1,111 +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.    

--->

-

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="Corba">

-    

-    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->

-    

-    <!-- reference 1 - consuming traditional CORBA service using USER PROVIDED Java interface -->

-	<component name="ScenarioOne">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOne"/>        

-        </reference>

-    </component>

-    

-    <!-- reference 2 - consuming traditional CORBA service using GENERATED Java interface -->

-    <component name="ScenarioOneGenerated">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOne"/>        

-        </reference>

-    </component>

-    

-    <!-- TUSCANY CORBA SERVICE 1 (TS1) - CORBA service using USER PROVIDED Java interface -->

-    <component name="ScenarionOneService">

-    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneServant" />

-    </component>

-    <service name="ScenarionOneService" promote="ScenarionOneService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioOne"/>

-        <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscany" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"/>

-    </service>

-    

-    <!-- TUSCANY CORBA SERVICE 2 (TS2) - CORBA service using GENERATED provided Java interface -->

-    <component name="ScenarionOneServiceGenerated">

-    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneServant" />

-    </component>

-    <service name="ScenarionOneServiceGenerated" promote="ScenarionOneServiceGenerated">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations"/>

-        <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscanyGenerated" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"/>

-    </service>

-    

-    <!-- reference 3 - user provided interface combined with TUSCANY SERVICE 1 (TS1) -->

-	<component name="TU2TS1">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscany"/>        

-        </reference>

-    </component>

-    

-    <!-- reference 4 - generated interface combined with TUSCANY SERVICE 1 (TS1) -->

-    <component name="TG2TS1">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscany"/>        

-        </reference>

-    </component>

-    

-    <!-- reference 5 - user provided interface combined with TUSCANY SERVICE 2 (TS2) -->

-    <component name="TU2TS2">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscanyGenerated"/>        

-        </reference>

-    </component>

-    

-    <!-- reference 6 - generated interface combined with TUSCANY SERVICE 2 (TS2) -->

-    <component name="TG2TS2">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscanyGenerated"/>        

-        </reference>

-    </component>

-    

-    <!-- TUSCANY CORBA SERVICE 3 (TS3) - CORBA service using registered using URI -->

-    <component name="ScenarionOneServiceURI">

-    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneServant" />

-    </component>

-    <service name="ScenarionOneServiceGenerated" promote="ScenarionOneServiceGenerated">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations"/>

-        <tuscany:binding.corba uri="corbaname::localhost:5060#NamedWithURI"/>

-    </service>

-    

-    <!-- reference 7 - ... -->

-    <component name="UriBinding">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />

-        <reference name="scenarioOne">

-			<tuscany:binding.corba uri="corbaname::localhost:5060#NamedWithURI"/>        

-        </reference>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/itest/corba/src/test/resources/ScenarioSix.composite b/java/sca-contrib/itest/corba/src/test/resources/ScenarioSix.composite
deleted file mode 100644
index 88238478c1..0000000000
--- a/java/sca-contrib/itest/corba/src/test/resources/ScenarioSix.composite
+++ /dev/null
@@ -1,41 +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.    

--->

-

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="Corba">

-    

-	<component name="ScenarioSix">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioSixComponent" />

-        <reference name="scenarioSix">

-			<tuscany:binding.corba host="localhost" port="5050" name="ScenarioSix"/>        

-        </reference>

-    </component>

-    

-    <component name="ScenarionSixService">

-    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioSixServant" />

-    </component>

-    <service name="ScenarionSixService" promote="ScenarionSixService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioSix"/>

-        <tuscany:binding.corba host="localhost" port="5050" name="ScenarioSixTuscany" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"/>

-    </service>

-        

-</composite>

diff --git a/java/sca-contrib/itest/corba/src/test/resources/ScenarioThree.composite b/java/sca-contrib/itest/corba/src/test/resources/ScenarioThree.composite
deleted file mode 100644
index f43e4a3f7a..0000000000
--- a/java/sca-contrib/itest/corba/src/test/resources/ScenarioThree.composite
+++ /dev/null
@@ -1,43 +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.    

--->

-

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="Corba">

-    

-    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->

-    

-    <component name="ScenarioThreeService">

-    	<implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioThreeServant" />

-    </component>

-    <service name="ScenarioThreeServiceTuscany" promote="ScenarioThreeService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioThree"/>

-        <tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioThree"/>

-    </service>

-        

-    <component name="ScenarioThreeReference">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioThreeComponent" />

-        <reference name="scenarioThree">

-			<tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioThree"/>        

-        </reference>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/itest/corba/src/test/resources/ScenarioTwo.composite b/java/sca-contrib/itest/corba/src/test/resources/ScenarioTwo.composite
deleted file mode 100644
index dc5ddc50d3..0000000000
--- a/java/sca-contrib/itest/corba/src/test/resources/ScenarioTwo.composite
+++ /dev/null
@@ -1,43 +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.    

--->

-

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="Corba">

-    

-    <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->

-    

-    <component name="ScenarioTwoService">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioTwoServant" />

-    </component>

-	<service name="ScenarioTwoServiceTuscany" promote="ScenarioTwoService">

-    	<interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioTwo"/>

-        <tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioTwo" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"/>

-    </service>

-    

-    <component name="ScenarioTwo">

-        <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioTwoComponent" />

-        <reference name="scenarioTwo">

-			<tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioTwoGenerated"/>        

-        </reference>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/itest/corba/src/test/resources/itest_scenario.idl b/java/sca-contrib/itest/corba/src/test/resources/itest_scenario.idl
deleted file mode 100644
index 41489a4565..0000000000
--- a/java/sca-contrib/itest/corba/src/test/resources/itest_scenario.idl
+++ /dev/null
@@ -1,110 +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.    

- */

-

-/*

- * compile by

- * idlj -fall -oldImplBase itest_scenario.idl

- */

- 

-module org {

-	module apache {

-		module tuscany {

-			module sca {

-				module test {

-					module corba {

-						module generated { 

-						

-							// objects for ScenarioOne

-						

-							enum Color {red, yellow, green};

-							

-							typedef sequence<string> StringSequence;

-							typedef sequence<long> LongSequence;

-							typedef sequence<LongSequence> TwoDimLongSequence;

-							

-							struct InnerStruct {

-								TwoDimLongSequence twoDimLongSequence;

-								string stringField;

-								Color color;

-							};

-							

-							struct RichStruct {

-								InnerStruct innerStruct;

-								StringSequence stringSequence;

-								long longField;

-							};

-							

-							exception WrongColor { 

-								Color givenColor;

-								Color correctColor;

-							};

-							

-							exception UnexpectedException { 

-								string info;

-							};

-							

-							interface ScenarioOne {

-							

-								RichStruct setRichStruct(in RichStruct richStruct) raises (WrongColor, UnexpectedException);

-							

-							};

-							

-							// objects for ScenarioTwo

-							

-							interface ScenarioTwo {

-								

-								attribute string stringField;

-								

-							};

-							

-							typedef string StringArray[2][2];

-							

-							struct AnnotatedStruct {

-									StringArray stringArray;

-							};

-							

-                        	union InnerUnion switch (long) {	

-	                                case 1: long x;

-	                                case 2: float y;

-	                        };

-

-	                        union RichUnion switch (long) {

-	                            case 1: long x;

-	                                case 2: float y;

-	                            case 3: string z;

-	                            case 4: InnerUnion iu;

-	                            default: boolean a;

-	                        };

-							

-							interface ScenarioSix {

-								

-								StringArray passStringArray(in StringArray arg);

-								

-								AnnotatedStruct passAnnotatedStruct(in AnnotatedStruct arg);

-								

-								RichUnion passRichUnion(in RichUnion arg);

-								

-							};

-						};

-					};

-				};

-			};

-		};

-	};

-};

diff --git a/java/sca-contrib/itest/corba/src/test/resources/scenariofour.xsd b/java/sca-contrib/itest/corba/src/test/resources/scenariofour.xsd
deleted file mode 100644
index 2669b54be3..0000000000
--- a/java/sca-contrib/itest/corba/src/test/resources/scenariofour.xsd
+++ /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.    
--->
-<schema targetNamespace="http://example.com/scenariofour" xmlns="http://www.w3.org/2001/XMLSchema">
-
-    <element name="ScenarioFourSdo">
-        <complexType>
-            <sequence>
-                <element name="message" minOccurs="1" type="string" />
-                <element name="symbol" minOccurs="1" type="string" />
-            </sequence>
-        </complexType>
-    </element>
-
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/pom.xml b/java/sca-contrib/itest/databindings/common/pom.xml
deleted file mode 100644
index 661b264a49..0000000000
--- a/java/sca-contrib/itest/databindings/common/pom.xml
+++ /dev/null
@@ -1,126 +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>itest-databindings</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-common</artifactId>
-    <version>2.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA Databinding Common Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-tools</artifactId>
-            <version>1.1.1</version>
-            <scope>compile</scope>
-        </dependency>        
-        <dependency>
-            <groupId>velocity</groupId>
-            <artifactId>velocity</artifactId>
-            <version>1.4</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFiles>
-                                <configuration>
-                                    <fileName>${basedir}/src/main/resources/generate/generate.xsd</fileName>
-                                </configuration>                            
-                            </schemaFiles>
-                            <noNotification>true</noNotification>
-                            <noContainment>true</noContainment>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/java/sca-contrib/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
deleted file mode 100644
index adb546a1ea..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
+++ /dev/null
@@ -1,181 +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.itest.generate;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.tuscany.generate.GenerateFactory;
-import org.apache.tuscany.generate.GenerateType;
-import org.apache.tuscany.generate.InputFileType;
-import org.apache.tuscany.generate.TemplateType;
-import org.apache.tuscany.sdo.generate.XSD2JavaGenerator;
-import org.apache.tuscany.sdo.util.SDOUtil;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- * Generates test files based on the information in a configuration files (generate.xml)
- * and a set of velocity templates. The process is
- *
- * for each template
- *     for each xsd file
- *         generate SDOs
- *         include the factory into the composite
- *         for each type
- *             add client iface method
- *             add client impl method
- *             add service iface method
- *             add service impl method
- *             add test method
- *             add wsdl type and method
- *
- * @version $Rev$ $Date$
- */
-public class Generate {
-	
-    /**
-     * Does all the hard work of running the velocity templates against the 
-     * the list of types to test. Both the list of templates and the list of 
-     * XSD files is held in the configuration file (generate.xsd) which lives in the
-     * resources/generate directory of the project being generated. 
-     *
-     * @param projectBuildDir the path to the target dir of the project being generated. 
-     */
-    public static void generate(String projectBuildDir) {
-        System.out.println(">> Building project from dir: " + projectBuildDir);
-        FileInputStream fis = null;
-
-        try {
-            // Load the config file into a stream
-            fis = new FileInputStream(projectBuildDir + "/classes/generate/generate.xml");
-
-            // Load the stream into SDO
-            // We are just using SDO as a convenient way to parse the XML config file
-            HelperContext scope       = SDOUtil.createHelperContext();
-            GenerateFactory.INSTANCE.register(scope);
-            XMLDocument xmlDoc        = scope.getXMLHelper().load(fis);
-            GenerateType generateType = (GenerateType)xmlDoc.getRootObject();
-
-            // Get the file list. This is the list of XSD that is passed into the 
-            // the velocity templates. Each configured file holds a list of types
-            // that the velocity templates expand into appropriate methods and method calls           
-            List fileList = generateType.getInputFile();
-            
-            //Initialise velocity ready to generate the various files
-            Properties p = new Properties();
-            p.setProperty("file.resource.loader.path", projectBuildDir + "/classes/generate");            
-            Velocity.init(p);
-            VelocityContext context = new VelocityContext();
-            context.put("fileList", fileList);
-            
-            List templateList = generateType.getTemplate();
-
-            // For each velocity template in the template list pass in the XSD file list
-            for ( Object item: templateList){
-            	TemplateType template = (TemplateType)item;
-                context.put("template", template);
-            	String tmp = template.getTemplateName();
-            	String filename = projectBuildDir + "/" + template.getTemplateTargetDir() + "/" + tmp.substring(0,tmp.length() - 3);
-            	File f = new File(filename);
-            	// Create folders since the package doesn't exist before the code-gen for the 1st time
-            	f.getParentFile().mkdirs();
-                FileWriter fw = new FileWriter(f);
-            	System.out.println(">> Processing " + template.getTemplateName() + " to " + filename);
-                Velocity.mergeTemplate(template.getTemplateName(), context, fw );
-                fw.flush();
-                fw.close();
-            } 
-
-
-        } catch (Exception e) {
-            System.out.println("Exception : " + e.toString());
-            e.printStackTrace();
-            return;
-        }        
-    }
-    
-    /**
-     * The SDO generator tool does all of the hard work
-     *
-     * @param projectBuildDir the path to the target dir of the project being generated. 
-     */
-    public static void generateSDO(String projectBuildDir) {
-        System.out.println(">> Building SDOs from dir: " + projectBuildDir);
-        FileInputStream fis = null;
-
-        try {
-            // Load the config file into a stream
-            fis = new FileInputStream(projectBuildDir + "/classes/generate/generate.xml");
-
-            // Load the stream into SDO
-            // We are just using SDO as a convenient way to parse the XML config file
-            HelperContext scope       = SDOUtil.createHelperContext();
-            GenerateFactory.INSTANCE.register(scope);
-            XMLDocument xmlDoc        = scope.getXMLHelper().load(fis);
-            GenerateType generateType = (GenerateType)xmlDoc.getRootObject();
-
-            // Get the file list. This is the list of XSD that is passed into the 
-            // the velocity templates. Each configured file holds a list of types
-            // that the velocity templates expand into appropriate methods and method calls           
-            List fileList = generateType.getInputFile();
-                        
-            // for each XSD in the XSD file list generate an SDO.
-            XSD2JavaGenerator generator = new XSD2JavaGenerator();
-            
-            for ( Object item : fileList){
-                InputFileType file = (InputFileType)item;
-                
-                XSD2JavaGenerator.generateFromXMLSchema(projectBuildDir + "/classes/xsd/" + file.getFileName(), 
-                                                        file.getNamespace(), 
-                                                        projectBuildDir + "/sdo-source", 
-                                                        file.getJavaPackage(), 
-                                                        null, //file.getPrefix(), 
-                                                        XSD2JavaGenerator.OPTION_NO_CONTAINMENT | XSD2JavaGenerator.OPTION_NO_NOTIFICATION | XSD2JavaGenerator.OPTION_NO_UNSETTABLE);
-                             
-            }
-
-        } catch (Exception e) {
-            System.out.println("Exception : " + e.toString());
-            e.printStackTrace();
-            return;
-        }        
-    }    
-
-    /**
-     * The mainline
-     * 
-     * @param args the target directory where project in which files are being generated
-     */
-    public static void main(String[] args) {
-        
-        Generate.generate(args[0]);
-        
-        if (args.length > 1){
-            Generate.generateSDO(args[0]);
-        } 
-    }
-
-}
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/java/sca-contrib/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
deleted file mode 100644
index db24ceab14..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
+++ /dev/null
@@ -1,112 +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 $template.getJavaPackage();
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-
-import ${template.getJavaPackage()}.GreeterService;
-
-// Data types
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-import $file.getJavaPackage().$file.getFactory();
-#end
-#end
-
-/**
- * Automatically generated test case. Calls the greeter client for a number of 
- * bindings and a number of data types. 
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-public class DatabindingTestCase extends TestCase  {
-
-    private SCADomain domain;
-    private GreeterService greeterClient;
-
-    /**
-     * Runs before each test method
-     */
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("greeter.composite");
-        super.setUp();
-    }
-
-    /**
-     * Runs after each test method
-     */
-    protected void tearDown() {
-        domain.close();
-    }
-
-    /**
-     * Finds the SCA component that relates to the protocol being tested. This test 
-     * always connects locally to the client component but the client component will
-     * connect to the back end component using the appropriate protocol
-     *
-     * @param ext the protcol required
-     */
-    private void setUpClient(String ext) throws Exception {
-        greeterClient = domain.getService(GreeterService.class, ext + "GreeterServiceClient");  
-    }
-
-    /**
-     * Invokes the SDO Greet service using web service bindings with SDO payload
-     */
-    public void testWSGreet() throws Exception {
-        setUpClient("WS");
-        greet();
-    }
-
-    /**
-     * Invokes the SDO Greet service using default bindings with SDO payload
-     */
-    public void testDefaultGreet() throws Exception {
-        setUpClient("Default");
-        greet();
-    }
-
-    /**
-     * A generic method which, regarless of which client is connected, sends out a 
-     * series of requrests passing different data types. 
-     */
-    public void greet() {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-        // test $typeInstance.getTypeName()
-        { 
-            $typeInstance.getTypeName() param = null;
-            $typeInstance.getCreateTypeCode()
-            $typeInstance.getTypeName() result = greeterClient.greet$typeInstance.getTypeName()(param);
-            $typeInstance.getResultComparison()
-        }
-#end
-#end            
-    }
-
-}
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/java/sca-contrib/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
deleted file mode 100644
index 88616cc997..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
+++ /dev/null
@@ -1,103 +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://apache.org/tuscany/sca/itest/databinding/services"
-                  xmlns:tns="http://apache.org/tuscany/sca/itest/databinding/services" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                  name="Greeter">
-
-    <wsdl:types>
-        <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" 
-#foreach($file in $fileList)
-            xmlns:$file.getPrefix()="$file.getNamespace()"
-#end        
-            targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services" 
-            elementFormDefault="qualified">
-
-#foreach($file in $fileList)
-            <xsd:import namespace="$file.getNamespace()" 
-                        schemaLocation="../xsd/$file.getFileName()" />            
-#end 
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-            <element name="greet$typeInstance.getTypeName()">
-                <complexType>
-                    <sequence>
-                        <element name="parm" type="$file.getPrefix():$typeInstance.getTypeName()" />
-                    </sequence>
-                </complexType>
-            </element>
-#end
-#end
-        </xsd:schema>
-    </wsdl:types>
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-    <wsdl:message name="$typeInstance.getTypeName()Request">
-        <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" />
-    </wsdl:message>
-    <wsdl:message name="$typeInstance.getTypeName()Response">
-        <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" />
-    </wsdl:message>
-#end
-#end
-
-    <wsdl:portType name="GreeterPortType">
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-        <wsdl:operation name="greet$typeInstance.getTypeName()">
-            <wsdl:input message="tns:$typeInstance.getTypeName()Request" name="$typeInstance.getTypeName()RequestMsg" />
-            <wsdl:output message="tns:$typeInstance.getTypeName()Response" name="$typeInstance.getTypeName()ResponseMsg" />
-        </wsdl:operation>
-#end
-#end
-   </wsdl:portType>
-
-    <wsdl:binding name="GreeterBinding" type="tns:GreeterPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-        <wsdl:operation name="greet$typeInstance.getTypeName()">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="$typeInstance.getTypeName()RequestMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="$typeInstance.getTypeName()ResponseMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-#end
-#end              
-    </wsdl:binding>
-
-    <wsdl:service name="GreeterService">
-        <wsdl:port name="GreeterPort" binding="tns:GreeterBinding">
-            <wsdlsoap:address location="http://localhost:8085/services/GreeterServiceWebServiceBinding" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
deleted file mode 100644
index 2df4a558e6..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
+++ /dev/null
@@ -1,53 +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 $template.getJavaPackage();
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The automatically generated interface to the service that reflects data objects
- * that are sent to it
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-@Remotable
-public interface GreeterService {
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-    /**
-     * Take the provided data object, change it slightly and return it
-     * 
-     * @param param the data object to be changed and returned
-     * @return the change data object 
-     */
-    $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param);
-#end
-#end	
-
-}
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
deleted file mode 100644
index b73173247f..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
+++ /dev/null
@@ -1,42 +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 $template.getJavaPackage();
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-
-/**
- * GreeterServiceClient
- */
-@AllowsPassByReference
-public interface GreeterServiceClient {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-    $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param);
-#end
-#end	
-}
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
deleted file mode 100644
index 46c74ec819..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
+++ /dev/null
@@ -1,65 +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 $template.getJavaPackage();
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-/**
- * The automatically generated service that simply forwards data objects on to 
- * the GreeterService and passes back the responses
- *
- * @version $Rev: 508831 $ $Date: 2007-02-18 00:12:31 +0000 (Sun, 18 Feb 2007) $
- */
-@Service(GreeterService.class)
-public class GreeterServiceClientImpl implements GreeterService {
-
-    /**
-     * the reference the the GreeterService that will
-     * change each data object slightly and return it
-     */
-    private GreeterService service;
-
-    @Reference
-    public void setGreeterService(GreeterService service) {
-        this.service = service;
-    }
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.itest.sdodatabinding.GreeterService#greet$typeInstance.getTypeName()($typeInstance.getTypeName() param)
-     */
-    public $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) {
-        return service.greet$typeInstance.getTypeName()(param);
-    }
-#end
-#end    
-}
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
deleted file mode 100644
index 2fd10ef0bf..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
+++ /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 $template.getJavaPackage();
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * The automatically generated service implementation that reflects data objects
- * that are sent to it
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-@Service(GreeterService.class)
-public class GreeterServiceImpl implements GreeterService {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-    /**
-     * Take the provided data object, change it slightly and return it
-     * 
-     * @param param the data object to be changed and returned
-     * @return the change data object 
-     */
-    public $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) {
-        $typeInstance.getModifyTypeCode()
-        return param;
-    }
-#end
-#end	
-}
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/generate.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/generate/generate.xsd
deleted file mode 100644
index 1fabedf55f..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/generate.xsd
+++ /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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/generate" 
-        xmlns:tns="http://www.apache.org/tuscany/generate">
-        
-    <complexType name="TypeType">
-        <sequence>
-            <element name="TypeName" type="string"/>
-            <element name="CreateTypeCode" type="string"/>
-            <element name="ModifyTypeCode" type="string"/>
-            <element name="ResultComparison" type="string"/>
-        </sequence>
-    </complexType>        
-    
-    <complexType name="InputFileType">
-        <sequence>
-            <element name="FileName" type="string"/>
-            <element name="FilePath" type="string"/> 
-            <element name="JavaPackage" type="string"/>
-            <element name="Factory" type="string"/>
-            <element name="Namespace" type="string"/>
-            <element name="Prefix" type="string"/>
-            <element name="Type" type="tns:TypeType" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    
-    <complexType name="TemplateType">
-        <sequence>
-            <element name="TemplateName" type="string"/>
-            <element name="TemplateTargetDir" type="string"/>
-            <element name="JavaPackage" type="string"/>
-        </sequence>
-    </complexType>
-        
-    <complexType name="GenerateType">
-        <sequence>
-            <element name="Template" type="tns:TemplateType" maxOccurs="unbounded"/>
-            <element name="InputFile" type="tns:InputFileType" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    
-    <element name="Generate" type="tns:GenerateType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/java/sca-contrib/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
deleted file mode 100644
index 8927d725b6..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-A dummy file that causes the target/classes/wsdl dir to be created in the generated test project. This is 
-required because the test generator must run in the process-resource phase, after generate.xml has been copied
-into target. The generator needs to write out target/classes/wsdl and will fail the directory isn't there. So
-this file just gets unpacked and forces the directory to be created. 
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xml
deleted file mode 100644
index f1f4346e58..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:Annotation xmlns:tns="http://www.apache.org/tuscany/interop"
-	            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	            xsi:schemaLocation="http://www.apache.org/tuscany/interop Annotation.xsd">
-	<SimpleTypeWithNameElement>SimpleTypeWithName</SimpleTypeWithNameElement>
-</tns:Annotation>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
deleted file mode 100644
index 1fae43eb09..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <annotation>
-    <appinfo>SDO 2.0.1</appinfo>
-    <documentation>
-        A schema that tests the presence of annotations in schema read by SDO
-    </documentation>
-  </annotation>
-           
-  <complexType name="AnnotationComplexType">
-    <sequence>
-      <element name="SimpleTypeWithNameElement" type="string"/>
-    </sequence>
-  </complexType>  
-                 
-  <element name="Annotation" type="tns:AnnotationComplexType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xml
deleted file mode 100644
index c20c80b658..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:Attribute xmlns:tns="http://www.apache.org/tuscany/interop" 
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-               xsi:schemaLocation="http://www.apache.org/tuscany/interop Attribute.xsd ">
-  <AttributeElement Attribute="Attribute"/>
-</tns:Attribute>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
deleted file mode 100644
index bd3db2e030..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
+++ /dev/null
@@ -1,39 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-            
-  <complexType name="AttributeType">
-    <sequence>
-    </sequence> 
-    <attribute name="Attribute" type="string"/>
-  </complexType> 
-                 
-  <complexType name="AttributeComplexType">
-    <sequence>
-       <element name="AttributeElement" type="tns:AttributeType"/>
-    </sequence>
-  </complexType>
-  
-  <element name="Attribute" type="tns:AttributeComplexType"/>
- 
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
deleted file mode 100644
index 30e4979dca..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeReference xmlns:tns="http://www.apache.org/tuscany/interop" 
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                        xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeReference.xsd ">
-  <AttributeReferenceElement tns:ReferencedAttribute="AttributeReference"/>
-</tns:AttributeReference>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
deleted file mode 100644
index e7738dcff7..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
+++ /dev/null
@@ -1,40 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-          
-  <attribute name="ReferencedAttribute" type="string"/>    
-   
-  <complexType name="AttributeReferenceComplexType">
-    <sequence>
-    </sequence> 
-    <attribute ref="tns:ReferencedAttribute"/>   
-  </complexType> 
-                 
-  <element name="AttributeReference">
-    <complexType>
-      <sequence>
-        <element name="AttributeReferenceElement" type="tns:AttributeReferenceComplexType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
deleted file mode 100644
index 9552421e2d..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithDefaultValueElement xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                      xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithDefaultValue.xsd ">
-  <AttributeWithDefaultValueElement AttributeWithDefaultValue="AttributeWithDefaultValueDefaultValue"/>
-</tns:AttributeWithDefaultValueElement>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
deleted file mode 100644
index c7b9655749..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-          
-  <complexType name="AttributeWithDefaultValueType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithDefaultValue" type="string" default="AttributeWithDefaultValueDefaultValue"/>
-  </complexType> 
-                 
-  <element name="AttributeWithDefaultValueElement">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithDefaultValueElement" type="tns:AttributeWithDefaultValueType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
deleted file mode 100644
index 5e5e7fbd55..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithFixedValueType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                 xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithFixedValue.xsd ">
-  <AttributeWithFixedValueElement AttributeWithFixedValue="AttributeWithFixedValueFixedValue"/>
-</tns:AttributeWithFixedValueType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
deleted file mode 100644
index 5c455c2ab5..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-
-  <complexType name="AttributeWithFixedValueType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithFixedValue" type="string" fixed="AttributeWithFixedValueFixedValue"/> 
-  </complexType> 
-                 
-  <element name="AttributeWithFixedValueType">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithFixedValueElement" type="tns:AttributeWithFixedValueType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
deleted file mode 100644
index 635e851632..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithSDOAliasName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                               xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOAliasName.xsd ">
-  <AttributeWithSDOAliasNameElement AttributeWithSDOAliasName="AttributeWithSDOAliasName"/>
-</tns:AttributeWithSDOAliasName>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
deleted file mode 100644
index 004dab4fbb..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-          
-  <complexType name="AttributeWithSDOAliasNameType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithSDOAliasName" sdo:aliasName="AttributeWithSDOAliasNameSDOAliasName" type="string"/>
-  </complexType> 
-                 
-  <element name="AttributeWithSDOAliasName">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithSDOAliasNameElement" type="tns:AttributeWithSDOAliasNameType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
deleted file mode 100644
index 136092951b..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithSDODataType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                              xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDODataType.xsd ">
-  <AttributeWithSDODataTypeTypeElement AttributeWithSDODataType="AttributeWithSDODataType"/>
-</tns:AttributeWithSDODataType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
deleted file mode 100644
index 796f08e1cf..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-
-  <complexType name="AttributeWithSDODataTypeType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithSDODataType" sdo:dataType="string" type="string"/>
-  </complexType> 
-                 
-  <element name="AttributeWithSDODataType">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithSDODataTypeTypeElement" type="tns:AttributeWithSDODataTypeType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
deleted file mode 100644
index 927b94885c..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithSDOName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                          xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOName.xsd ">
-  <AttributeWithSDONameElement AttributeWithSDOName="AttributeWithSDOName"/>
-</tns:AttributeWithSDOName>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
deleted file mode 100644
index 93f83cd0a1..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-          
-  <complexType name="AttributeWithSDONameType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithSDOName" sdo:name="AttributeWithSDONameSDOName" type="string"/>
- </complexType> 
-                 
-  <element name="AttributeWithSDOName">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithSDONameElement" type="tns:AttributeWithSDONameType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
deleted file mode 100644
index ea7db70595..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithSDOPropertySDOOppositePropertyType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                                     xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOPropertySDOOppositePropertyType.xsd ">
-  <AttributeWithSDOPropertySDOOppositePropertyTypeElement AttributeWithSDOPropertySDOOppositePropertyType="idvalue0"/>
-</tns:AttributeWithSDOPropertySDOOppositePropertyType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
deleted file mode 100644
index c64323e7e1..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-
-  <complexType name="AttributeWithSDOPropertySDOOppositePropertyTypeType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithSDOPropertySDOOppositePropertyType" type="IDREF" sdo:propertyType="tns:SimpleTypeWithNameType" sdo:oppositeProperty="tns:AttributeWithSDOPropertyType"/>     
-  </complexType> 
-                 
-  <element name="AttributeWithSDOPropertySDOOppositePropertyType">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithSDOPropertySDOOppositePropertyTypeElement" type="tns:AttributeWithSDOPropertySDOOppositePropertyTypeType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
deleted file mode 100644
index 85c7d85fd4..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithSDOPropertyType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                  xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOPropertyType.xsd ">
-  <AttributeWithSDOPropertyTypeElement AttributeWithSDOPropertyType="idvalue0"/>
-</tns:AttributeWithSDOPropertyType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
deleted file mode 100644
index 543f276c50..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-
-  <complexType name="AttributeWithSDOPropertyTypeType">
-    <sequence>
-    </sequence>   
-    <attribute name="AttributeWithSDOPropertyType" type="IDREF" sdo:propertyType="tns:SimpleTypeWithNameType"/> 
-  </complexType> 
-                 
-  <element name="AttributeWithSDOPropertyType">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithSDOPropertyTypeElement" type="tns:AttributeWithSDOPropertyTypeType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
deleted file mode 100644
index fcd281539b..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:AttributeWithSDOString xmlns:tns="http://www.apache.org/tuscany/interop" 
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop AttributeWithSDOString.xsd ">
-  <AttributeWithSDOStringElement AttributeWithSDOString="AttributeWithSDOString"/>
-</tns:AttributeWithSDOString>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
deleted file mode 100644
index 1610c2b861..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-          
-  <complexType name="AttributeWithSDOStringType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithSDOString" type="string" sdo:string="true"/>     
-  </complexType> 
-                 
-  <element name="AttributeWithSDOString">
-    <complexType>
-      <sequence>
-        <element name="AttributeWithSDOStringElement" type="tns:AttributeWithSDOStringType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
deleted file mode 100644
index 36a0760a61..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInAnySimpleType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                          xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInAnySimpleType.xsd ">
-  <anySimpleType>anySimpleType</anySimpleType>
-</tns:BuiltInAnySimpleType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
deleted file mode 100644
index 999b72bb35..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-              
-  <element name="BuiltInAnySimpleType">
-    <complexType>
-      <sequence>
-        <element name="anySimpleType" type="anySimpleType" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
deleted file mode 100644
index 5849165fe0..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInAnyType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                    xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInAnyType.xsd ">
-  <anyType xsi:type="anyType"/>
-</tns:BuiltInAnyType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
deleted file mode 100644
index 71dad561ca..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-              
-  <element name="BuiltInAnyType">
-    <complexType>
-      <sequence>
-        <element name="anyType" type="anyType" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
deleted file mode 100644
index 8acf9376d7..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInAnyURI xmlns:tns="http://www.apache.org/tuscany/interop" 
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                   xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInAnyURI.xsd ">
-  <anyURI>http://tempuri.org</anyURI>
-</tns:BuiltInAnyURI>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
deleted file mode 100644
index a49987c352..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-                
-  <element name="BuiltInAnyURI">
-    <complexType>
-      <sequence>
-        <element name="anyURI" type="anyURI" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
deleted file mode 100644
index a35b6e174a..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuildInBase64Binary xmlns:tns="http://www.apache.org/tuscany/interop" 
-                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                         xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInBase64Binary.xsd ">
-  <base64Binary>ABCDEF</base64Binary>
-</tns:BuildInBase64Binary>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
deleted file mode 100644
index e1995890f9..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-              
-  <element name="BuildInBase64Binary">
-    <complexType>
-      <sequence>
-        <element name="base64Binary" type="base64Binary" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
deleted file mode 100644
index 91cfce51b8..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<tns:BuiltInBoolean xmlns:tns="http://www.apache.org/tuscany/interop" 
-                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                    xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInBoolean.xsd ">
-  <boolean>true</boolean>
-  <boolean>false</boolean>
-  <boolean>1</boolean>
-  <boolean>0</boolean>
-</tns:BuiltInBoolean>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
deleted file mode 100644
index a2f86ba8c5..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-               
-  <element name="BuiltInBoolean">
-    <complexType>
-      <sequence>
-        <element name="boolean" type="boolean" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
deleted file mode 100644
index 907474cd1b..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
+++ /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.
--->
-<tns:BuiltInByte xmlns:tns="http://www.apache.org/tuscany/interop" 
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                 xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInByte.xsd ">
-	<byte>127</byte>
-	<byte>-127</byte>
-</tns:BuiltInByte>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
deleted file mode 100644
index a2f6bcfa77..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-                
-  <element name="BuiltInByte">
-    <complexType>
-      <sequence>
-        <element name="byte" type="byte" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
deleted file mode 100644
index c5820e1a2e..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInDate xmlns:tns="http://www.apache.org/tuscany/interop" 
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                 xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDate.xsd ">
-  <date>2001-01-01</date>
-</tns:BuiltInDate>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
deleted file mode 100644
index f4d596bfe3..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-              
-  <element name="BuiltInDate">
-    <complexType>
-      <sequence>
-        <element name="date" type="date" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
deleted file mode 100644
index 0debe2fec5..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInDateTime xmlns:tns="http://www.apache.org/tuscany/interop" 
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                     xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDateTime.xsd ">
-  <dateTime>2001-12-31T12:00:00</dateTime>
-</tns:BuiltInDateTime>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
deleted file mode 100644
index b5bcfdcfd4..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-                
-  <element name="BuiltInDateTime">
-    <complexType>
-      <sequence>
-        <element name="dateTime" type="dateTime" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
deleted file mode 100644
index 7f001254cc..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
+++ /dev/null
@@ -1,23 +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.
--->
-<tns:BuiltInDecimal xmlns:tns="http://www.apache.org/tuscany/interop" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDecimal.xsd ">
-	<decimal>-1.23456789</decimal>
-	<decimal>1.23456789</decimal>
-</tns:BuiltInDecimal>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
deleted file mode 100644
index 8d4d106f59..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInDecimal">
-    <complexType>
-      <sequence>
-        <element name="decimal" type="decimal" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
deleted file mode 100644
index f875b9f94d..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
+++ /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.
--->
-<tns:BuiltInDouble xmlns:tns="http://www.apache.org/tuscany/interop" 
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                   xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDouble.xsd ">
-	<double>0.0</double>
-	<double>12.3E-4</double>
-</tns:BuiltInDouble>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
deleted file mode 100644
index 4c8a39b06c..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInDouble">
-    <complexType>
-      <sequence>
-        <element name="double" type="double" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
deleted file mode 100644
index 7d343d6dda..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInDuration xmlns:tns="http://www.apache.org/tuscany/interop" 
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                     xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInDuration.xsd ">
-  <duration>P1D</duration>
-</tns:BuiltInDuration>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
deleted file mode 100644
index bb12bc04a9..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-          
-  <element name="BuiltInDuration">
-    <complexType>
-      <sequence>
-        <element name="duration" type="duration" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
deleted file mode 100644
index 7a81f3b0dd..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInFloat xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInFloat.xsd ">
-  <float>0.0</float>
-</tns:BuiltInFloat>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
deleted file mode 100644
index f0e1c21233..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInFloat">
-    <complexType>
-      <sequence>
-        <element name="float" type="float" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
deleted file mode 100644
index d35568b3c9..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInGDay xmlns:tns="http://www.apache.org/tuscany/interop" 
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                 xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGDay.xsd ">
-  <gDay>---01</gDay>
-</tns:BuiltInGDay>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
deleted file mode 100644
index 92bd9a4b66..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
- 
-  <element name="BuiltInGDay">
-    <complexType>
-      <sequence>
-        <element name="gDay" type="gDay" maxOccurs="unbounded"/>
-       </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
deleted file mode 100644
index 52cdfa8c4e..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInGMonth xmlns:tns="http://www.apache.org/tuscany/interop" 
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                   xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGMonth.xsd ">
-  <gMonth>--01--</gMonth>
-</tns:BuiltInGMonth>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
deleted file mode 100644
index 78d001a585..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInGMonth">
-    <complexType>
-      <sequence>
-        <element name="gMonth" type="gMonth" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
deleted file mode 100644
index 2609a858f7..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInGMonthDay xmlns:tns="http://www.apache.org/tuscany/interop" 
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                      xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGMonthDay.xsd ">
-  <gMonthDay>--01-01</gMonthDay>
-</tns:BuiltInGMonthDay>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
deleted file mode 100644
index 38f6c55059..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-               
-  <element name="BuiltInGMonthDay">
-    <complexType>
-      <sequence>
-        <element name="gMonthDay" type="gMonthDay" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
deleted file mode 100644
index 7868a47ca3..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInGYear xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGYear.xsd ">
-  <gYear>2001</gYear>
-</tns:BuiltInGYear>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
deleted file mode 100644
index 0d65b124ff..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInGYear">
-    <complexType>
-      <sequence>
-        <element name="gYear" type="gYear" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
deleted file mode 100644
index 3f5080d49f..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInGYearMonth xmlns:tns="http://www.apache.org/tuscany/interop"    
-                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                       xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInGYearMonth.xsd ">
-  <gYearMonth>2001-01</gYearMonth>
-</tns:BuiltInGYearMonth>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
deleted file mode 100644
index 340555dc5f..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInGYearMonth">
-    <complexType>
-      <sequence>
-        <element name="gYearMonth" type="gYearMonth" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
deleted file mode 100644
index 0deb7af980..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInHexBinary xmlns:tns="http://www.apache.org/tuscany/interop" 
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                      xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInHexBinary.xsd ">
-  <hexBinary>0F00</hexBinary>
-</tns:BuiltInHexBinary>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
deleted file mode 100644
index 8059fe6da0..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInHexBinary">
-    <complexType>
-      <sequence>
-        <element name="hexBinary" type="hexBinary" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
deleted file mode 100644
index 06c92ce19b..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInID xmlns:tns="http://www.apache.org/tuscany/interop" 
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-               xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInID.xsd ">
-  <ID>idvalue0</ID>
-</tns:BuiltInID>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
deleted file mode 100644
index 7b1f02d1d4..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInID">
-    <complexType>
-      <sequence>
-        <element name="ID" type="ID" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
deleted file mode 100644
index 9bc0cefd0f..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
+++ /dev/null
@@ -1,24 +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.
--->           
-<tns:BuiltInIDREF xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInIDREF.xsd ">
-  <IDREF>idvalue0</IDREF>
-</tns:BuiltInIDREF>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
deleted file mode 100644
index 0c207983bc..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInIDREF">
-    <complexType>
-      <sequence>
-        <element name="IDREF" type="IDREF" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
deleted file mode 100644
index f91b602f99..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInIDREFS xmlns:tns="http://www.apache.org/tuscany/interop" 
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                   xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInIDREFS.xsd ">
-  <IDREFS>idvalue0</IDREFS>
-</tns:BuiltInIDREFS>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
deleted file mode 100644
index b99bf01b73..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInIDREFS">
-    <complexType>
-      <sequence>
-        <element name="IDREFS" type="IDREFS" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
deleted file mode 100644
index c99698e175..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
+++ /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.
--->
-<tns:BuiltInInt xmlns:tns="http://www.apache.org/tuscany/interop" 
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInInt.xsd ">
-    <int>-2147483648</int>
-	<int>2147483647</int>
-</tns:BuiltInInt>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
deleted file mode 100644
index b5b9b0d1eb..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-       
-  <element name="BuiltInInt">
-    <complexType>
-      <sequence>
-        <element name="int" type="int" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
deleted file mode 100644
index 80d22ce057..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
+++ /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.
--->
-<tns:BuiltInInteger xmlns:tns="http://www.apache.org/tuscany/interop" 
-                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                    xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInInteger.xsd ">
-	<integer>-2147483648</integer>
-	<integer>2147483647</integer>
-</tns:BuiltInInteger>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
deleted file mode 100644
index 4902935db5..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-  
-  <element name="BuiltInInteger">
-    <complexType>
-      <sequence>
-        <element name="integer" type="integer" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
deleted file mode 100644
index 664bf824b4..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInLanguage xmlns:tns="http://www.apache.org/tuscany/interop" 
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                     xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInLanguage.xsd ">
-  <language>EN</language>
-</tns:BuiltInLanguage>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
deleted file mode 100644
index 5d3658d224..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-    
-  <element name="BuiltInLanguage">
-    <complexType>
-      <sequence>
-        <element name="language" type="language" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
deleted file mode 100644
index c5861fa92a..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
+++ /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.
--->
-<tns:BuiltInLong xmlns:tns="http://www.apache.org/tuscany/interop" 
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                 xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInLong.xsd ">
-	<long>-9223372036854775808</long>
-    <long>9223372036854775807</long>
-</tns:BuiltInLong>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
deleted file mode 100644
index 0aa4710057..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
+++ /dev/null
@@ -1,33 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-<notation name="interop50" public="commonj.sdo"/>
-                
-  <element name="BuiltInLong">
-    <complexType>
-      <sequence>
-        <element name="long" type="long" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
deleted file mode 100644
index 1f95950394..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNCName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                   xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNCName.xsd ">
-  <NCName>NCName</NCName>
-</tns:BuiltInNCName>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
deleted file mode 100644
index 6ee9c435db..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInNCName">
-    <complexType>
-      <sequence>
-        <element name="NCName" type="NCName" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
deleted file mode 100644
index 0297f1aeb4..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuildInNMTOKEN xmlns:tns="http://www.apache.org/tuscany/interop" 
-                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                    xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNMTOKEN.xsd ">
-  <NMTOKEN>NMTOKEN</NMTOKEN>
-</tns:BuildInNMTOKEN>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
deleted file mode 100644
index 56d027bdbb..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuildInNMTOKEN">
-    <complexType>
-      <sequence>
-        <element name="NMTOKEN" type="NMTOKEN" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
deleted file mode 100644
index 81ba1069bd..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNMTOKENS xmlns:tns="http://www.apache.org/tuscany/interop" 
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                     xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNMTOKENS.xsd ">
-  <NMTOKENS>NMTOKENS</NMTOKENS>
-</tns:BuiltInNMTOKENS>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
deleted file mode 100644
index 866ab73024..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInNMTOKENS">
-    <complexType>
-      <sequence>
-        <element name="NMTOKENS" type="NMTOKENS" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
deleted file mode 100644
index 8bb3a08b94..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNOTATION xmlns:tns="http://www.apache.org/tuscany/interop" 
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                     xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNOTATION.xsd ">
-  <NOTATION>tns:BuiltInNotationNotation</NOTATION>
-</tns:BuiltInNOTATION>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
deleted file mode 100644
index c7c62f812b..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
+++ /dev/null
@@ -1,39 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <notation name="BuiltInNotationNotation" public="http://cwiki.apache.org/confluence/display/TUSCANY/Home"/>
-                
-  <element name="BuiltInNOTATION">
-    <complexType>
-      <sequence>
-        <element name="NOTATION"  maxOccurs="unbounded">
-          <simpleType >
-            <restriction base="NOTATION">
-              <enumeration value="tns:BuiltInNotationNotation"/>
-            </restriction>
-          </simpleType>
-        </element>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
deleted file mode 100644
index 8235718c5e..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                 xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInName.xsd ">
-  <Name>Name</Name>
-</tns:BuiltInName>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
deleted file mode 100644
index 36caba2f16..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-             
-  <element name="BuiltInName">
-    <complexType>
-      <sequence>
-        <element name="Name" type="Name" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
deleted file mode 100644
index 599c428a44..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNegativeInteger xmlns:tns="http://www.apache.org/tuscany/interop"  
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNegativeInteger.xsd ">
-  <negativeInteger>-1</negativeInteger>
-</tns:BuiltInNegativeInteger>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
deleted file mode 100644
index 389d5a99f0..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInNegativeInteger">
-    <complexType>
-      <sequence>
-        <element name="negativeInteger" type="negativeInteger" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
deleted file mode 100644
index 919c4a20ee..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNonNegativeInteger xmlns:tns="http://www.apache.org/tuscany/interop" 
-                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                               xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNonNegativeInteger.xsd ">
-  <nonNegativeInteger>0</nonNegativeInteger>
-</tns:BuiltInNonNegativeInteger>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
deleted file mode 100644
index 59887078b5..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-        
-  <element name="BuiltInNonNegativeInteger">
-    <complexType>
-      <sequence>
-        <element name="nonNegativeInteger" type="nonNegativeInteger" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
deleted file mode 100644
index 79011f26ab..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNonPositiveInteger xmlns:tns="http://www.apache.org/tuscany/interop" 
-                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                               xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNonPositiveInteger.xsd ">
-  <nonPositiveInteger>-1</nonPositiveInteger>
-</tns:BuiltInNonPositiveInteger>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
deleted file mode 100644
index 5de7d64d7b..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInNonPositiveInteger">
-    <complexType>
-      <sequence>
-        <element name="nonPositiveInteger" type="nonPositiveInteger" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
deleted file mode 100644
index c40be9e18b..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInNormalizedString xmlns:tns="http://www.apache.org/tuscany/interop" 
-                             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                             xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInNormalizedString.xsd ">
-  <normalizedString>normalizedString</normalizedString>
-</tns:BuiltInNormalizedString>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
deleted file mode 100644
index d4a78787b8..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-
-  <element name="BuiltInNormalizedString">
-    <complexType>
-      <sequence>
-        <element name="normalizedString" type="normalizedString" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
deleted file mode 100644
index c30434de66..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInPositiveInteger xmlns:tns="http://www.apache.org/tuscany/interop" 
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInPositiveInteger.xsd ">
-  <positiveInteger>1</positiveInteger>
-</tns:BuiltInPositiveInteger>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
deleted file mode 100644
index 5381590cd1..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInPositiveInteger">
-    <complexType>
-      <sequence>
-        <element name="positiveInteger" type="positiveInteger" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
deleted file mode 100644
index 4cd6ea7e72..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInQName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInQName.xsd ">
-  <QName>QName</QName>
-</tns:BuiltInQName>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
deleted file mode 100644
index e8faf6225b..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInQName">
-    <complexType>
-      <sequence>
-        <element name="QName" type="QName" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
deleted file mode 100644
index b4375467c4..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
+++ /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.
--->
-<tns:BuiltInShort xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInShort.xsd ">
-	<short>-32768</short>
-	<short>32767</short>
-</tns:BuiltInShort>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
deleted file mode 100644
index a4f564d9b7..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInShort">
-    <complexType>
-      <sequence>
-        <element name="short" type="short" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
deleted file mode 100644
index d30ab85530..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInString xmlns:tns="http://www.apache.org/tuscany/interop" 
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                   xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInString.xsd ">
-  <string>string</string>
-</tns:BuiltInString>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
deleted file mode 100644
index 8abb34b5a5..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInString">
-    <complexType>
-      <sequence>
-        <element name="string" type="string" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
deleted file mode 100644
index 7fd9a061ae..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInTime xmlns:tns="http://www.apache.org/tuscany/interop" 
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                 xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInTime.xsd ">
-  <time>12:00:00</time>
-</tns:BuiltInTime>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
deleted file mode 100644
index 1615976813..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInTime">
-    <complexType>
-      <sequence>
-        <element name="time" type="time" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
deleted file mode 100644
index cd567ba528..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:BuiltInToken xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInToken.xsd ">
-  <token>token</token>
-</tns:BuiltInToken>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
deleted file mode 100644
index 0beaac571f..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInToken">
-    <complexType>
-      <sequence>
-        <element name="token" type="token" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
deleted file mode 100644
index 025362defb..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
+++ /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.
--->
-<tns:BuiltInUnsignedByte xmlns:tns="http://www.apache.org/tuscany/interop" 
-                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                         xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInUnsignedByte.xsd ">
-	<unsignedByte>0</unsignedByte>
-	<unsignedByte>255</unsignedByte>
-</tns:BuiltInUnsignedByte>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
deleted file mode 100644
index d6d951fe5d..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInUnsignedByte">
-    <complexType>
-      <sequence>
-        <element name="unsignedByte" type="unsignedByte" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
deleted file mode 100644
index 5736a8c121..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
+++ /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.
--->
-<tns:BuiltInUnsignedInt xmlns:tns="http://www.apache.org/tuscany/interop" 
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                        xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInUnsignedInt.xsd ">
-	<unsignedInt>0</unsignedInt>
-	<unsignedInt>4294967295</unsignedInt>
-</tns:BuiltInUnsignedInt>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
deleted file mode 100644
index 242be1d53b..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInUnsignedInt">
-    <complexType>
-      <sequence>
-        <element name="unsignedInt" type="unsignedInt" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
deleted file mode 100644
index d728115a77..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
+++ /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.
--->
-<tns:BuiltInUnsignedLong xmlns:tns="http://www.apache.org/tuscany/interop" 
-                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                         xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInUnsignedLong.xsd ">
-	<unsignedLong>0</unsignedLong>
-	<unsignedLong>18446744073709551615</unsignedLong>
-</tns:BuiltInUnsignedLong>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
deleted file mode 100644
index 108e3a8619..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInUnsignedLong">
-    <complexType>
-      <sequence>
-        <element name="unsignedLong" type="unsignedLong" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
deleted file mode 100644
index d4ffae5e17..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
+++ /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.
--->
-<tns:BuiltInUnsignedShort xmlns:tns="http://www.apache.org/tuscany/interop" 
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                          xsi:schemaLocation="http://www.apache.org/tuscany/interop BuiltInUnsignedShort.xsd ">
-	<unsignedShort>0</unsignedShort>
-    <unsignedShort>65535</unsignedShort>
-</tns:BuiltInUnsignedShort>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
deleted file mode 100644
index 5ee5e0229e..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">   
-      
-  <element name="BuiltInUnsignedShort">
-    <complexType>
-      <sequence>
-        <element name="unsignedShort" type="unsignedShort" maxOccurs="unbounded"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
deleted file mode 100644
index 3d5aed5aa8..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<tns:ComplexTypeComplexContentRestrictingComplexType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                                     xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeComplexContentRestrictingComplexType.xsd ">
-  <ComplexTypeComplexContentRestrictingComplexTypeElement>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </ComplexTypeComplexContentRestrictingComplexTypeElement>
-</tns:ComplexTypeComplexContentRestrictingComplexType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
deleted file mode 100644
index e7b80ab11c..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
+++ /dev/null
@@ -1,44 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-      
-  <include schemaLocation="SimpleTypeWithName.xsd"/>
-   <include schemaLocation="ComplexTypeExtendingComplexType.xsd"/> 
-              
-  <complexType name="ComplexTypeComplexContentRestrictingComplexTypeType">
-    <complexContent>
-      <restriction base="tns:ComplexTypeExtendingComplexTypeType">
-        <sequence>
-          <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/>        
-        </sequence>  
-      </restriction>
-    </complexContent>  
-  </complexType>   
-                 
-  <element name="ComplexTypeComplexContentRestrictingComplexType">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeComplexContentRestrictingComplexTypeElement" type="tns:ComplexTypeComplexContentRestrictingComplexTypeType"/>                  
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
deleted file mode 100644
index 2b4fe5594e..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<tns:ComplexTypeExtendingComplexType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                     xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeExtendingComplexType.xsd ">
-  <ComplexTypeExtendingComplexTypeElement>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-    <SimpleTypeWithNameExtended>SimpleTypeWithNameExtended</SimpleTypeWithNameExtended>
-  </ComplexTypeExtendingComplexTypeElement>
-</tns:ComplexTypeExtendingComplexType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
deleted file mode 100644
index fc4deb63c2..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
+++ /dev/null
@@ -1,43 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-      
-  <include schemaLocation="ComplexTypeWithContent.xsd"/>
-              
-  <complexType name="ComplexTypeExtendingComplexTypeType">
-    <complexContent>
-      <extension base="tns:ComplexTypeWithContentType">
-        <sequence>
-          <element name="SimpleTypeWithNameExtended" type="string"/>
-        </sequence>
-      </extension>
-    </complexContent>  
-  </complexType> 
-                 
-  <element name="ComplexTypeExtendingComplexType">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeExtendingComplexTypeElement" type="tns:ComplexTypeExtendingComplexTypeType"/>      
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
deleted file mode 100644
index 03570f41d9..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ComplexTypeExtendingSimpeType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                   xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeExtendingSimpleType.xsd ">
-  <ComplexTypeExtendingSimpeTypeElement AddedByExtension="">ComplexTypeExtendingSimpeTypeElement</ComplexTypeExtendingSimpeTypeElement>
-</tns:ComplexTypeExtendingSimpeType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
deleted file mode 100644
index c754502645..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
+++ /dev/null
@@ -1,41 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-      
-  <include schemaLocation="SimpleTypeWithName.xsd"/>
-              
-  <complexType name="ComplexTypeExtendingSimpleTypeType">
-    <simpleContent>
-      <extension base="tns:SimpleTypeWithNameType">
-		<attribute name="AddedByExtension" type="string"/>
-      </extension>
-    </simpleContent>  
-  </complexType>
-                 
-  <element name="ComplexTypeExtendingSimpeType">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeExtendingSimpeTypeElement" type="tns:ComplexTypeExtendingSimpleTypeType"/>            
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
deleted file mode 100644
index 4603793bfc..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ComplexTypeSimpleContentRestrictingComplexType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                                    xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeSimpleContentRestrictingComplexType.xsd ">
-  <ComplexTypeSimpleContentRestrictingComplexTypeElement AddedByExtension="NCName">ComplexTypeSimpleContentRestrictingComplexTypeElement</ComplexTypeSimpleContentRestrictingComplexTypeElement>
-</tns:ComplexTypeSimpleContentRestrictingComplexType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
deleted file mode 100644
index 4bcd2f8c46..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
+++ /dev/null
@@ -1,41 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-      
-   <include schemaLocation="ComplexTypeExtendingSimpleType.xsd"/> 
-              
-  <complexType name="ComplexTypeSimpleContentRestrictingComplexTypeType">
-    <simpleContent>
-      <restriction base="tns:ComplexTypeExtendingSimpleTypeType">
-        <attribute name="AddedByExtension" type="NCName" />
-      </restriction>
-    </simpleContent>  
-  </complexType>     
-                 
-  <element name="ComplexTypeSimpleContentRestrictingComplexType">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeSimpleContentRestrictingComplexTypeElement" type="tns:ComplexTypeSimpleContentRestrictingComplexTypeType"/>                        
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
deleted file mode 100644
index a6861f803a..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<tns:ComplexTypeWithAbstract xmlns:tns="http://www.apache.org/tuscany/interop" 
-                             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                             xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithAbstract.xsd ">
-  <ComplexTypeWithAbstractExtensionElement>
-    <BaseElement>BaseElement</BaseElement>
-    <ExtensionElement>ExtensionElement</ExtensionElement>
-  </ComplexTypeWithAbstractExtensionElement>
-</tns:ComplexTypeWithAbstract>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
deleted file mode 100644
index 8bb251cab2..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
+++ /dev/null
@@ -1,47 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-              
-  <complexType name="ComplexTypeWithAbstractType" abstract="true">
-    <sequence>
-      <element name="BaseElement" type="string"/>
-    </sequence>
-  </complexType>
-  
-  <complexType name="ComplexTypeWithAbstractExtensionType">
-    <complexContent>
-      <extension base="tns:ComplexTypeWithAbstractType">
-        <sequence>
-          <element name="ExtensionElement" type="string"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-                 
-  <element name="ComplexTypeWithAbstract">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithAbstractExtensionElement" type="tns:ComplexTypeWithAbstractExtensionType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
deleted file mode 100644
index 467ec007ed..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
+++ /dev/null
@@ -1,30 +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.
--->
-<tns:ComplexTypeWithCDATA xmlns:tns="http://www.apache.org/tuscany/interop" 
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                          xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithCDATA.xsd ">
-  <ComplexTypeWithCDATAElement>
-     Some
-     <![CDATA[some data and some <MoreXML></MoreXML>]]>
-     Mixed 
-    <SimpleTypeWithName>SimpleType<![CDATA[some data and some <MoreXML></MoreXML>]]>WithName</SimpleTypeWithName>
-     Content
-  </ComplexTypeWithCDATAElement>
-</tns:ComplexTypeWithCDATA>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
deleted file mode 100644
index 8d00646678..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
+++ /dev/null
@@ -1,39 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-      
-  <include schemaLocation="SimpleTypeWithName.xsd"/> 
-              
-  <complexType name="ComplexTypeWithCDATAType" mixed="true">
-    <sequence>
-      <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/>
-    </sequence>
-  </complexType>   
-                 
-  <element name="ComplexTypeWithCDATA">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithCDATAElement" type="tns:ComplexTypeWithCDATAType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
deleted file mode 100644
index 7deafd798a..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<tns:ComplexTypeWithContent xmlns:tns="http://www.apache.org/tuscany/interop" 
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithContent.xsd ">
-  <ComplexTypeWithContentElement>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </ComplexTypeWithContentElement>
-</tns:ComplexTypeWithContent>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
deleted file mode 100644
index 72ac75fee0..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
+++ /dev/null
@@ -1,37 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-              
-  <complexType name="ComplexTypeWithContentType">
-    <sequence>
-      <element name="SimpleTypeWithName" type="string"/>
-    </sequence>
-  </complexType>
-                 
-  <element name="ComplexTypeWithContent">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithContentElement" type="tns:ComplexTypeWithContentType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
deleted file mode 100644
index f6208f81b3..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
+++ /dev/null
@@ -1,29 +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.
--->
-<tns:ComplexTypeWithMixed xmlns:tns="http://www.apache.org/tuscany/interop" 
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                          xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithMixed.xsd ">
-  <ComplexTypeWithMixedElement>
-    Some 
-	Mixed
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-    Content
-  </ComplexTypeWithMixedElement>
-</tns:ComplexTypeWithMixed>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
deleted file mode 100644
index 1f26e13673..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
+++ /dev/null
@@ -1,39 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-      
-  <include schemaLocation="SimpleTypeWithName.xsd"/> 
-              
-  <complexType name="ComplexTypeWithMixedType" mixed="true">
-    <sequence>
-      <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/>
-    </sequence>
-  </complexType>   
-                 
-  <element name="ComplexTypeWithMixed">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithMixedElement" type="tns:ComplexTypeWithMixedType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
deleted file mode 100644
index 97de7b98eb..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ComplexTypeWithOpenAttributes xmlns:tns="http://www.apache.org/tuscany/interop" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithOpenAttributes.xsd ">
-  <ComplexTypeWithOpenAttributesElement SomeOpenAttribute="Some Open Attribute">
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </ComplexTypeWithOpenAttributesElement>
-</tns:ComplexTypeWithOpenAttributes>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
deleted file mode 100644
index 67716553d8..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
+++ /dev/null
@@ -1,42 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-        
-  <include schemaLocation="SimpleTypeWithName.xsd"/>
-  
-  <attribute name="SomeOpenAttribute" type="string"/>
-                     
-  <complexType name="ComplexTypeWithOpenAttributesType">
-    <sequence>
-      <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/>
-    </sequence>
-    <anyAttribute namespace="##any"/>
-  </complexType>   
-                 
-  <element name="ComplexTypeWithOpenAttributes">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithOpenAttributesElement" type="tns:ComplexTypeWithOpenAttributesType"/>   
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
deleted file mode 100644
index 5941348921..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
+++ /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.
--->
-<tns:ComplexTypeWithOpenContent xmlns:tns="http://www.apache.org/tuscany/interop" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithOpenContent.xsd ">
-  <ComplexTypeWithOpenContentElement>
-    <tns:ComplexTypeWithMixed>
-      <ComplexTypeWithMixedElement>
-        Some
-        Mixed
-        <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-        Content
-      </ComplexTypeWithMixedElement>
-    </tns:ComplexTypeWithMixed>
-  </ComplexTypeWithOpenContentElement>
-</tns:ComplexTypeWithOpenContent>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
deleted file mode 100644
index 24d5d09054..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
+++ /dev/null
@@ -1,39 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-  
-  <include schemaLocation="ComplexTypeWithMixed.xsd"/>
-                   
-  <complexType name="ComplexTypeWithOpenContentType">
-    <sequence>
-      <any namespace="##any"/>
-    </sequence>
-  </complexType>   
-                 
-  <element name="ComplexTypeWithOpenContent">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithOpenContentElement" type="tns:ComplexTypeWithOpenContentType"/> 
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
deleted file mode 100644
index f684d06a4d..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
+++ /dev/null
@@ -1,30 +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.
--->
-<tns:ComplexTypeWithOppositeProperty xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                     xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithOppositeProperty.xsd ">
-  <ComplexTypeReferencedDataObject DataObjectId="idvalue0">
-    <SomeData>SomeData</SomeData>
-  </ComplexTypeReferencedDataObject>
-  <ComplexTypeReferencingDataObject AttributeWithSDOPropertyType="idvalue0" DataObjectId="idvalue1">
-    <OppositeProperty>idvalue2</OppositeProperty>
-  </ComplexTypeReferencingDataObject>
-  <ComplexTypeWithOppositePropertyElement AttributeWithSDOPropertyType="idvalue1" DataObjectId="idvalue2"/>
-</tns:ComplexTypeWithOppositeProperty>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
deleted file mode 100644
index de4a8a666d..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
+++ /dev/null
@@ -1,59 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-
-  <complexType name="ComplexTypeReferencedDataObjectType">
-    <sequence>
-      <element name="SomeData" type="string"/>
-    </sequence>
-    <attribute name="DataObjectId" type="ID"/>
-  </complexType>
-    
-  <complexType name="ComplexTypeReferencingDataObjectType">
-    <sequence>
-      <element name="OppositeProperty" type="IDREF"/>
-    </sequence> 
-    <attribute name="AttributeWithSDOPropertyType" type="IDREF" 
-               sdo:propertyType="tns:ComplexTypeReferencedDataObjectType"/> 
-    <attribute name="DataObjectId" type="ID"/>
-  </complexType>     
-    
-  <complexType name="ComplexTypeWithOppositePropertyType">
-    <sequence>
-    </sequence> 
-    <attribute name="AttributeWithSDOPropertyType" type="IDREF" 
-               sdo:propertyType="tns:ComplexTypeReferencingDataObjectType"
-               sdo:oppositeProperty="OppositeProperty"/>
-    <attribute name="DataObjectId" type="ID"/> 
-  </complexType>   
-                 
-  <element name="ComplexTypeWithOppositeProperty">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeReferencedDataObject" type="tns:ComplexTypeReferencedDataObjectType"/>
-        <element name="ComplexTypeReferencingDataObject" type="tns:ComplexTypeReferencingDataObjectType"/>
-        <element name="ComplexTypeWithOppositePropertyElement" type="tns:ComplexTypeWithOppositePropertyType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
deleted file mode 100644
index 242908bd27..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<tns:ComplexTypeWithSDOAliasName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                 xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithSDOAliasName.xsd ">
-  <ComplexTypeWithSDOAliasNameElement>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </ComplexTypeWithSDOAliasNameElement>
-</tns:ComplexTypeWithSDOAliasName>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
deleted file mode 100644
index 4c00fbe295..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">    
-        
-  <complexType name="ComplexTypeWithSDOAliasNameType" sdo:aliasName="ComplexTypeWithSDOAliasNameTypeSDOAliasName">
-    <sequence>
-      <element name="SimpleTypeWithName" type="string"/>
-    </sequence>
-  </complexType>  
-                 
-  <element name="ComplexTypeWithSDOAliasName">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithSDOAliasNameElement" type="tns:ComplexTypeWithSDOAliasNameType"/>      
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
deleted file mode 100644
index 925e8625d5..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<tns:ComplexTypeWithSDOName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithSDOName.xsd ">
-  <ComplexTypeWithSDONameElement>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </ComplexTypeWithSDONameElement>
-</tns:ComplexTypeWithSDOName>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
deleted file mode 100644
index b12bec040b..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">    
-        
-  <complexType name="ComplexTypeWithSDONameType" sdo:name="ComplexTypeWithSDONameTypeSDOName">
-    <sequence>
-      <element name="SimpleTypeWithName" type="string"/>
-    </sequence>
-  </complexType>
-                 
-  <element name="ComplexTypeWithSDOName">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithSDONameElement" type="tns:ComplexTypeWithSDONameType"/>  
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
deleted file mode 100644
index c73708ce46..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<tns:ComplexTypeWithSDOSequence xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithSDOSequence.xsd ">
-  <ComplexTypeWithSDOSequenceElement>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </ComplexTypeWithSDOSequenceElement>
-</tns:ComplexTypeWithSDOSequence>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
deleted file mode 100644
index 795c3ea7d9..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
+++ /dev/null
@@ -1,40 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-        
-  <include schemaLocation="SimpleTypeWithName.xsd"/>
-        
-  <complexType name="ComplexTypeWithSDOSequenceType" sdo:sequence="true">
-    <sequence>
-      <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType" />
-    </sequence>
-  </complexType>  
-                 
-  <element name="ComplexTypeWithSDOSequence">
-    <complexType>
-      <sequence>
-        <element name="ComplexTypeWithSDOSequenceElement" type="tns:ComplexTypeWithSDOSequenceType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
deleted file mode 100644
index 3ebdc89ae0..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ComplexTypeWithoutContent xmlns:tns="http://www.apache.org/tuscany/interop" 
-                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                               xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithoutContent.xsd ">
-  <ComplexTypeWithoutContentElement/>
-</tns:ComplexTypeWithoutContent>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
deleted file mode 100644
index 21546d0f67..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
+++ /dev/null
@@ -1,33 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-              
-  <complexType name="ComplexTypeWithoutContentType"/>
-                 
-  <element name="ComplexTypeWithoutContent">
-    <complexType>
-      <sequence>
-         <element name="ComplexTypeWithoutContentElement" type="tns:ComplexTypeWithoutContentType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
deleted file mode 100644
index 89657e42ca..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<tns:ComplexTypeWithoutName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop ComplexTypeWithoutName.xsd ">
-  <tns:ComplexTypeWithoutNameType>
-    <SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-  </tns:ComplexTypeWithoutNameType>
-</tns:ComplexTypeWithoutName>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
deleted file mode 100644
index d01b4172e4..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
+++ /dev/null
@@ -1,39 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-              
-  <element name="ComplexTypeWithoutNameType">
-    <complexType>
-      <sequence>
-        <element name="SimpleTypeWithName" type="string"/>
-      </sequence>
-    </complexType>
-  </element>
-                 
-  <element name="ComplexTypeWithoutName">
-    <complexType>
-      <sequence>
-        <element ref="tns:ComplexTypeWithoutNameType"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
deleted file mode 100644
index 82fd1eedaf..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
+++ /dev/null
@@ -1,23 +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.
--->
-<DefaultNamespace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="DefaultNamespace.xsd">
-	<SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-</DefaultNamespace>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
deleted file mode 100644
index e1dcf06194..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
+++ /dev/null
@@ -1,32 +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.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" >
-  
-  <!-- top level test type -->       
-  <xsd:complexType name="DefaultNamespaceComplexType">
-    <xsd:sequence>
-      <!-- simple types -->
-      <xsd:element name="SimpleTypeWithName" type="xsd:string"/>
-
-    </xsd:sequence>
-  </xsd:complexType>
-        
-  <xsd:element name="Default" type="DefaultNamespaceComplexType"/>
-</xsd:schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
deleted file mode 100644
index ebf03c9d5d..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<tns:ElementInAll xmlns:tns="http://www.apache.org/tuscany/interop" 
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                  xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementInAll.xsd ">
-  <ElementInAllElement>
-    <ElementInAllOne>ElementInAllOne</ElementInAllOne>
-    <ElementInAllTwo>ElementInAllTwo</ElementInAllTwo>
-  </ElementInAllElement>
-</tns:ElementInAll>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
deleted file mode 100644
index 8b9ba5b4b8..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
+++ /dev/null
@@ -1,40 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <complexType name="ComplexTypeElementInAllTestType">
-    <all>
-      <element name="ElementInAllOne" type="string"/>
-      <element name="ElementInAllTwo" type="string"/>      
-    </all>
-  </complexType>
-            
-  <element name="ElementInAll">
-    <complexType>
-      <sequence>
-        <choice maxOccurs="3">
-          <element name="ElementInAllElement" type="tns:ComplexTypeElementInAllTestType"/>
-        </choice>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
deleted file mode 100644
index 26466b1b39..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
+++ /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.
--->
-<tns:ElementInChoice xmlns:tns="http://www.apache.org/tuscany/interop" 
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                     xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementInChoice.xsd ">
-  <Element1InChoice>Element1InChoice</Element1InChoice>
-  <Element2InChoice>Element2InChoice</Element2InChoice>
-</tns:ElementInChoice>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
deleted file mode 100644
index ff418c56ab..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
+++ /dev/null
@@ -1,48 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-          
-  <group name="Group1">
-    <sequence>
-      <element name="Element1InChoice" type="string" maxOccurs="2"/>
-      <element name="Element2InChoice" type="string" />
-    </sequence>
-  </group>
-  
-  <group name="Group2"> 
-    <sequence>
-      <element name="Element2InChoice" type="string" />
-      <element name="Element1InChoice" type="string" maxOccurs="2"/>
-    </sequence>     
-  </group>    
-  
-  <element name="ElementInChoice">
-    <complexType>
-      <sequence>
-        <choice maxOccurs="3">
-          <group ref="tns:Group1"/>
-          <group ref="tns:Group2"/>
-        </choice>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
deleted file mode 100644
index 27bb1ce9cc..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
+++ /dev/null
@@ -1,29 +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.
--->
-<tns:ElementOfSDOChangeSummaryType xmlns:sdo="commonj.sdo" 
-                                   xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                   xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSDOChangeSummaryType.xsd commonj.sdo datagraph.xsd ">
-	<ElementOfSDOChangeSummaryTypeElement>
-          <ChangeSummaryElement>
-            ChangeSummaryText
-          </ChangeSummaryElement>
-	</ElementOfSDOChangeSummaryTypeElement>
-</tns:ElementOfSDOChangeSummaryType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
deleted file mode 100644
index 2bf1df8c99..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
+++ /dev/null
@@ -1,34 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-        
-  <import schemaLocation="datagraph.xsd" namespace="commonj.sdo"/>    
-                
-  <element name="ElementOfSDOChangeSummaryType">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSDOChangeSummaryTypeElement" type="sdo:ChangeSummaryType"/>                
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
deleted file mode 100644
index 9b5561ed43..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementOfSimpleTypeWithDefault xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                    xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithDefault.xsd ">
-  <ElementOfSimpleTypeWithDefaultElement>ElementOfSimpleTypeWithDefaultDefault</ElementOfSimpleTypeWithDefaultElement>
-</tns:ElementOfSimpleTypeWithDefault>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
deleted file mode 100644
index 0b4e7bdf45..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <element name="ElementOfSimpleTypeWithDefault">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSimpleTypeWithDefaultElement" type="string" default="ElementOfSimpleTypeWithDefaultDefault" />
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
deleted file mode 100644
index f1b7cd264c..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementOfSimpleTypeWithFixed xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                  xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithFixed.xsd ">
-  <ElementOfSimpleTypeWithFixedElement>ElementOfSimpleTypeWithFixedFixed</ElementOfSimpleTypeWithFixedElement>
-</tns:ElementOfSimpleTypeWithFixed>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
deleted file mode 100644
index a2c8456257..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <element name="ElementOfSimpleTypeWithFixed">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSimpleTypeWithFixedElement" type="string" fixed="ElementOfSimpleTypeWithFixedFixed" />      
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
deleted file mode 100644
index 1f60b0423f..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementOfSimpleTypeWithSDODataType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                        xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithSDODataType.xsd ">
-  <ElementOfSimpleTypeWithSDODataTypeElement>ElementOfSimpleTypeWithSDODataTypeElement</ElementOfSimpleTypeWithSDODataTypeElement>
-</tns:ElementOfSimpleTypeWithSDODataType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
deleted file mode 100644
index 21e55ab8c1..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
+++ /dev/null
@@ -1,33 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-        
-                
-  <element name="ElementOfSimpleTypeWithSDODataType">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSimpleTypeWithSDODataTypeElement" type="string" sdo:dataType="string"/>       
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
deleted file mode 100644
index 30762f4912..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementOfSimpleTypeWithSDOOppositePropertyType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                                    xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithSDOOppositePropertyType.xsd ">
-  <ElementOfSimpleTypeWithSDOOppositePropertyTypeElement>idvalue0</ElementOfSimpleTypeWithSDOOppositePropertyTypeElement>
-</tns:ElementOfSimpleTypeWithSDOOppositePropertyType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
deleted file mode 100644
index 5bf35d0d70..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
+++ /dev/null
@@ -1,33 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-        
-                
-  <element name="ElementOfSimpleTypeWithSDOOppositePropertyType">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSimpleTypeWithSDOOppositePropertyTypeElement" type="IDREF" sdo:propertyType="tns:SimpleTypeWithNameType" sdo:oppositeProperty="tns:ElementOfSimpleTypeWithSDOPropertyType"/>      
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
deleted file mode 100644
index 2dd01e4090..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementOfSimpleTypeWithSDOPropertyType xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                            xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithSDOPropertyType.xsd ">
-  <ElementOfSimpleTypeWithSDOPropertyTypeElement>idvalue0</ElementOfSimpleTypeWithSDOPropertyTypeElement>
-</tns:ElementOfSimpleTypeWithSDOPropertyType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
deleted file mode 100644
index 6920cd8dd0..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
+++ /dev/null
@@ -1,32 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-                        
-  <element name="ElementOfSimpleTypeWithSDOPropertyType">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSimpleTypeWithSDOPropertyTypeElement" type="IDREF" sdo:propertyType="tns:SimpleTypeWithNameType"/>      
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
deleted file mode 100644
index 6a526bdc47..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementOfSimpleTypeWithSDOString xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                      xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementOfSimpleTypeWithSDOString.xsd ">
-  <ElementOfSimpleTypeWithSDOStringElement>ElementOfSimpleTypeWithSDOStringElement</ElementOfSimpleTypeWithSDOStringElement>
-</tns:ElementOfSimpleTypeWithSDOString>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
deleted file mode 100644
index 1117a95eb8..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
+++ /dev/null
@@ -1,32 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">
-                        
-  <element name="ElementOfSimpleTypeWithSDOString">
-    <complexType>
-      <sequence>
-        <element name="ElementOfSimpleTypeWithSDOStringElement" type="string" sdo:string="true"/>      
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
deleted file mode 100644
index ab91458bff..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
+++ /dev/null
@@ -1,40 +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.
--->
-<tns:ElementSubstitutionGroupBase xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                  xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementSubstitutionGroupBase.xsd ">
-	<ElementSubstitutionGroupBaseElement>
-		<ElementInSubstitutionGroupBase>
-			ElementInSubstitutionGroupBase
-		</ElementInSubstitutionGroupBase>
-	</ElementSubstitutionGroupBaseElement>
-
-    <ElementSubstitutionUnrelated>Some Data</ElementSubstitutionUnrelated>
-
-	<ElementSubstitutionGroupExtends>
-		<ElementInSubstitutionGroupBase>
-			ElementInSubstitutionGroupBase
-		</ElementInSubstitutionGroupBase>
-		<ElementInSubstitutionGroupExtends>
-			ElementInSubstitutionGroupExtends
-		</ElementInSubstitutionGroupExtends>
-	</ElementSubstitutionGroupExtends>
-	
-</tns:ElementSubstitutionGroupBase>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
deleted file mode 100644
index 3e015843b5..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
+++ /dev/null
@@ -1,52 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <complexType name="ComplexTypeSubstitutionGroupBaseType">
-    <sequence>
-      <element name="ElementInSubstitutionGroupBase" type="string"/>
-    </sequence>
-  </complexType>
-  <element name="ElementSubstitutionGroupBaseElement" type="tns:ComplexTypeSubstitutionGroupBaseType"/>
-
-  <element name="ElementSubstitutionGroupUnrelated" type="string" substitutionGroup="tns:ElementSubstitutionGroupBaseElement"/>
-  
-  <complexType name="ComplexTypeSubstitutionGroupExtendsType">
-    <complexContent>
-      <extension base="tns:ComplexTypeSubstitutionGroupBaseType">
-        <sequence>
-          <element name="ElementInSubstitutionGroupExtends" type="string"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  
-  <element name="ElementSubstitutionGroupExtends" type="tns:ComplexTypeSubstitutionGroupExtendsType" substitutionGroup="tns:ElementSubstitutionGroupBaseElement"/>
- 
-  <element name="ElementSubstitutionGroupBase">
-    <complexType>
-      <sequence>
-        <element ref="tns:ElementSubstitutionGroupBaseElement" maxOccurs="unbounded" />
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
deleted file mode 100644
index b6d68fd08a..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
+++ /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.
--->
-<tns:ElementWithMaxOccurs xmlns:tns="http://www.apache.org/tuscany/interop" 
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                          xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementWithMaxOccurs.xsd ">
-  <ElementWithMaxOccursElement>ElementWithMaxOccursElement1</ElementWithMaxOccursElement>
-  <ElementWithMaxOccursElement>ElementWithMaxOccursElement2</ElementWithMaxOccursElement>  
-</tns:ElementWithMaxOccurs>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
deleted file mode 100644
index d4453a4477..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-          
-  <element name="ElementWithMaxOccurs">
-    <complexType>
-      <sequence>
-        <element name="ElementWithMaxOccursElement" type="string" maxOccurs="2"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
deleted file mode 100644
index 6de3adc937..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementWithNillable xmlns:tns="http://www.apache.org/tuscany/interop" 
-                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                         xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementWithNillable.xsd ">
-  <ElementWithNillableElement>ElementWithNillableElement</ElementWithNillableElement>
-</tns:ElementWithNillable>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
deleted file mode 100644
index 786ab226da..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <element name="ElementWithNillable">
-    <complexType>
-      <sequence>
-        <element name="ElementWithNillableElement" type="string" nillable="true" maxOccurs="unbounded"/>  
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
deleted file mode 100644
index 64093aa803..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:ElementWithSDOAliasName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                             xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementWithSDOAliasName.xsd ">
-  <ElementWithSDOAliasName>ElementWithSDOAliasName</ElementWithSDOAliasName>
-</tns:ElementWithSDOAliasName>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
deleted file mode 100644
index 01f4c2b1ef..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
+++ /dev/null
@@ -1,32 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo"> 
-                
-  <element name="ElementWithSDOAliasName">
-    <complexType>
-      <sequence>
-        <element name="ElementWithSDOAliasName" sdo:aliasName="ElementWithSDOAliasNameSDOAliasName" type="string"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
deleted file mode 100644
index 774646f682..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
+++ /dev/null
@@ -1,24 +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.
---> 
-<tns:ElementWithSDOName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                        xsi:schemaLocation="http://www.apache.org/tuscany/interop ElementWithSDOName.xsd ">
-  <ElementWithSDONameElement>ElementWithSDONameElement</ElementWithSDONameElement>
-</tns:ElementWithSDOName>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
deleted file mode 100644
index 34da37564c..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
+++ /dev/null
@@ -1,32 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo"> 
-                
-  <element name="ElementWithSDOName">
-    <complexType>
-      <sequence>
-        <element name="ElementWithSDONameElement" sdo:name="ElementWithSDONameSDOName" type="string"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
deleted file mode 100644
index a1fb3aa803..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:GlobalElementComplexType xmlns:tns="http://www.apache.org/tuscany/interop"
-	                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	                          xsi:schemaLocation="http://www.apache.org/tuscany/interop GlobalElementComplexType.xsd">
-	<SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-</tns:GlobalElementComplexType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
deleted file mode 100644
index 8eb7a4fce4..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-         
-  <complexType name="GlobalElementComplexTypeComplexType">
-    <sequence>
-      <element name="SimpleTypeWithName" type="string"/>
-    </sequence>
-  </complexType>  
-                 
-  <element name="GlobalElementComplexType" type="tns:GlobalElementComplexTypeComplexType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
deleted file mode 100644
index f68eb1939d..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<GlobalElementSimpleType xmlns="http://www.apache.org/tuscany/interop"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.apache.org/tuscany/interop GlobalElementSimpleType.xsd">
-	GlobalElementSimpleType
-</GlobalElementSimpleType>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
deleted file mode 100644
index b9f77e6658..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
+++ /dev/null
@@ -1,26 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-        
-                 
-  <element name="GlobalElementSimpleType" type="string"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Import.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Import.xml
deleted file mode 100644
index fd28850050..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Import.xml
+++ /dev/null
@@ -1,30 +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.
--->
-<tns:Import xmlns:tns="http://www.apache.org/tuscany/interop"
-	        xmlns:imp="http://www.apache.org/tuscany/interop/import"
-	        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	        xsi:schemaLocation="http://www.apache.org/tuscany/interop Import.xsd">
-
-	<SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-	<Imported>
-           <AnElement>SomeString</AnElement>
-           <AnotherElement>SomeString</AnotherElement>
-    </Imported>
-</tns:Import>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Import.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Import.xsd
deleted file mode 100644
index eae93fd44a..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Import.xsd
+++ /dev/null
@@ -1,40 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:imp="http://www.apache.org/tuscany/interop/import"
-        xmlns:sdo="commonj.sdo"
-        xmlns:sdoJava="commonj.sdo">
-        
-  <include schemaLocation="SimpleTypeWithName.xsd"/>
-  <import  schemaLocation="ImportedSchema.xsd" 
-           namespace="http://www.apache.org/tuscany/interop/import"/> 
-      
-  <!-- top level test type -->       
-  <complexType name="ImportComplexType">
-    <sequence>
-      <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/>
-      <element name="Imported" type="imp:ImportedComplexType"/> 
-    </sequence>
-  </complexType>
-        
-  <element name="Import" type="tns:ImportComplexType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
deleted file mode 100644
index a7e568decf..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
+++ /dev/null
@@ -1,33 +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.
--->
-
-<xsd:schema
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:imp="http://www.apache.org/tuscany/interop/import"
-  targetNamespace="http://www.apache.org/tuscany/interop/import">
-
-  <xsd:complexType name="ImportedComplexType">
-    <xsd:sequence>
-      <xsd:element name="AnElement" type="xsd:string"/>
-      <xsd:element name="AnotherElement" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-</xsd:schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Include.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Include.xml
deleted file mode 100644
index d4b9e24fa6..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Include.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:Include xmlns:tns="http://www.apache.org/tuscany/interop"
-	         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	         xsi:schemaLocation="http://www.apache.org/tuscany/interop Include.xsd">
-	<SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-</tns:Include>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Include.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Include.xsd
deleted file mode 100644
index 34ff314a19..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Include.xsd
+++ /dev/null
@@ -1,36 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
- 
-  <include schemaLocation="../xsd/SimpleTypeWithName.xsd"/> 
-      
-  <!-- top level test type -->       
-  <complexType name="IncludeComplexType">
-    <sequence>
-      <!-- simple types -->
-      <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameType"/>
-
-    </sequence>
-  </complexType>
-         
-  <element name="IncludeElement" type="tns:IncludeComplexType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Interop.xsd
deleted file mode 100644
index ae22ab2c44..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Interop.xsd
+++ /dev/null
@@ -1,138 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-        
-<!-- Causes SDO generator to crash
-  <include schemaLocation="../xsd/Annotation.xsd"/>
--->
-  <include schemaLocation="../xsd/Attribute.xsd"/>
-  <include schemaLocation="../xsd/AttributeReference.xsd"/>
-<!-- 
-  <include schemaLocation="AttributeWithDefaultValue.xsd"/>
-  <include schemaLocation="AttributeWithFixedValue.xsd"/>
-  <include schemaLocation="AttributeWithSDOAliasName.xsd"/>
-  <include schemaLocation="AttributeWithSDODataType.xsd"/>
-  <include schemaLocation="AttributeWithSDOName.xsd"/>
-  <include schemaLocation="AttributeWithSDOPropertySDOOppositePropertyType.xsd"/>
-  <include schemaLocation="AttributeWithSDOPropertyType.xsd"/>
-  <include schemaLocation="AttributeWithSDOString.xsd"/>
-  <include schemaLocation="BuiltInAnySimpleType.xsd"/>
-  <include schemaLocation="BuiltInAnyType.xsd"/>
-  <include schemaLocation="BuiltInAnyURI.xsd"/>
-  <include schemaLocation="BuiltInBase64Binary.xsd"/>
-  <include schemaLocation="BuiltInBoolean.xsd"/>
-  <include schemaLocation="BuiltInByte.xsd"/>
-  <include schemaLocation="BuiltInDate.xsd"/>
-  <include schemaLocation="BuiltInDateTime.xsd"/>
-  <include schemaLocation="BuiltInDecimal.xsd"/>
-  <include schemaLocation="BuiltInDouble.xsd"/>
-  <include schemaLocation="BuiltInDuration.xsd"/>
-  <include schemaLocation="BuiltInFloat.xsd"/>
-  <include schemaLocation="BuiltInGDay.xsd"/>
-  <include schemaLocation="BuiltInGMonth.xsd"/>
-  <include schemaLocation="BuiltInGMonthDay.xsd"/>
-  <include schemaLocation="BuiltInGYear.xsd"/>
-  <include schemaLocation="BuiltInGYearMonth.xsd"/>
-  <include schemaLocation="BuiltInHexBinary.xsd"/>
-  <include schemaLocation="BuiltInID.xsd"/>
-  <include schemaLocation="BuiltInIDREF.xsd"/>
-  <include schemaLocation="BuiltInIDREFS.xsd"/>
-  <include schemaLocation="BuiltInInt.xsd"/>
-  <include schemaLocation="BuiltInInteger.xsd"/>
-  <include schemaLocation="BuiltInLanguage.xsd"/>
-  <include schemaLocation="BuiltInLong.xsd"/>
-  <include schemaLocation="BuiltInNCName.xsd"/>
-  <include schemaLocation="BuiltInNMTOKEN.xsd"/>
-  <include schemaLocation="BuiltInNMTOKENS.xsd"/>
-  <include schemaLocation="BuiltInNOTATION.xsd"/>
-  <include schemaLocation="BuiltInName.xsd"/>
-  <include schemaLocation="BuiltInNegativeInteger.xsd"/>
-  <include schemaLocation="BuiltInNonNegativeInteger.xsd"/>
-  <include schemaLocation="BuiltInNonPositiveInteger.xsd"/>
-  <include schemaLocation="BuiltInNormalizedString.xsd"/>
-  <include schemaLocation="BuiltInPositiveInteger.xsd"/>
-  <include schemaLocation="BuiltInQName.xsd"/>
-  <include schemaLocation="BuiltInShort.xsd"/>
-  <include schemaLocation="BuiltInString.xsd"/>
-  <include schemaLocation="BuiltInTime.xsd"/>
-  <include schemaLocation="BuiltInToken.xsd"/>
-  <include schemaLocation="BuiltInUnsignedByte.xsd"/>
-  <include schemaLocation="BuiltInUnsignedInt.xsd"/>
-  <include schemaLocation="BuiltInUnsignedLong.xsd"/>
-  <include schemaLocation="BuiltInUnsignedShort.xsd"/>
-  <include schemaLocation="ComplexTypeComplexContentRestrictingComplexType.xsd"/>
-  <include schemaLocation="ComplexTypeExtendingComplexType.xsd"/>
-  <include schemaLocation="ComplexTypeExtendingSimpleType.xsd"/>
-  <include schemaLocation="ComplexTypeSimpleContentRestrictingComplexType.xsd"/>
-  <include schemaLocation="ComplexTypeWithAbstract.xsd"/>
-  <include schemaLocation="ComplexTypeWithCDATA.xsd"/>
--->
-  <include schemaLocation="../xsd/ComplexTypeWithContent.xsd"/>
-<!--
-  <include schemaLocation="ComplexTypeWithMixed.xsd"/>
-  <include schemaLocation="ComplexTypeWithOpenAttributes.xsd"/>
-  <include schemaLocation="ComplexTypeWithOpenContent.xsd"/>
-  <include schemaLocation="ComplexTypeWithOppositeProperty.xsd"/>
-  <include schemaLocation="ComplexTypeWithSDOAliasName.xsd"/>
-  <include schemaLocation="ComplexTypeWithSDOName.xsd"/>
-  <include schemaLocation="ComplexTypeWithSDOSequence.xsd"/>
-  <include schemaLocation="ComplexTypeWithoutContent.xsd"/>
-  <include schemaLocation="ComplexTypeWithoutName.xsd"/>
-  <include schemaLocation="DefaultNamespace.xsd"/>
-  <include schemaLocation="ElementInAll.xsd"/>
-  <include schemaLocation="ElementInChoice.xsd"/>
-  <include schemaLocation="ElementOfSDOChangeSummaryType.xsd"/>
-  <include schemaLocation="ElementOfSimpleTypeWithDefault.xsd"/>
-  <include schemaLocation="ElementOfSimpleTypeWithFixed.xsd"/>
-  <include schemaLocation="ElementOfSimpleTypeWithSDODataType.xsd"/>
-  <include schemaLocation="ElementOfSimpleTypeWithSDOOppositePropertyType.xsd"/>
-  <include schemaLocation="ElementOfSimpleTypeWithSDOPropertyType.xsd"/>
-  <include schemaLocation="ElementOfSimpleTypeWithSDOString.xsd"/>
-  <include schemaLocation="ElementSubstitutionGroupBase.xsd"/>
-  <include schemaLocation="ElementWithMaxOccurs.xsd"/>
-  <include schemaLocation="ElementWithNillable.xsd"/>
-  <include schemaLocation="ElementWithSDOAliasName.xsd"/>
-  <include schemaLocation="ElementWithSDOName.xsd"/>
-  <include schemaLocation="GlobalElementComplexType.xsd"/>
-  <include schemaLocation="GlobalElementSimpleType.xsd"/>
-  <include schemaLocation="Import.xsd"/>
-  <include schemaLocation="ImportedSchema.xsd"/>
--->
-  <include schemaLocation="../xsd/Include.xsd"/>
-<!--
-  <include schemaLocation="Notation.xsd"/>
-  <include schemaLocation="SDOJavaPackage.xsd"/>
--->
-  <include schemaLocation="../xsd/SimpleTypeWithAbstract.xsd"/>
-<!-- 
-  <include schemaLocation="SimpleTypeWithExtendedInstanceClass.xsd"/>
-  <include schemaLocation="SimpleTypeWithInstanceClass.xsd"/>
-  <include schemaLocation="SimpleTypeWithList.xsd"/>
--->
-  <include schemaLocation="../xsd/SimpleTypeWithName.xsd"/>
-<!--
-  <include schemaLocation="SimpleTypeWithSDOName.xsd"/>
-  <include schemaLocation="SimpleTypeWithUnion.xsd"/>
-  <include schemaLocation="SimpleTypeWithoutName.xsd"/>
-  <include schemaLocation="TargetNamespace.xsd"/>    
--->
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Notation.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Notation.xml
deleted file mode 100644
index b75ac6500a..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Notation.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:Notation xmlns:tns="http://www.apache.org/tuscany/interop" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-              xsi:schemaLocation="http://www.apache.org/tuscany/interop Notation.xsd ">
-tns:Tuscany
-</tns:Notation>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Notation.xsd
deleted file mode 100644
index 6ad019cb81..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Notation.xsd
+++ /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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-
-  <notation name="Tuscany" public="http://cwiki.apache.org/TUSCANY/"/>
-  <notation name="PHP_SCA_SDO" public="http://pecl.php.net/package/sca_sdo/"/>
-           
-  <simpleType name="NotationSimpleType">
-      <restriction base="NOTATION">
-          <enumeration value="tns:Tuscany"/>
-          <enumeration value="tns:PHP_SCA_SDO"/>
-      </restriction>
-  </simpleType>
-  
-  <element name="Notation" type="tns:NotationSimpleType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Person.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Person.xsd
deleted file mode 100644
index 5f5021b15e..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Person.xsd
+++ /dev/null
@@ -1,30 +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.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://apache.org/tuscany/sca/itest/databinding/types">
-
-    <xsd:complexType name="PersonType">
-        <xsd:sequence>
-            <xsd:element name="firstName" type="xsd:string" />
-            <xsd:element name="lastName" type="xsd:string" />
-            <xsd:element name="greeting" type="xsd:string" />
-        </xsd:sequence>
-    </xsd:complexType>
-</xsd:schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
deleted file mode 100644
index 6c5ad88ff4..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
+++ /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.
--->
-<tns:SDOJavaPackage xmlns:p="commonj.sdo"
-	xmlns:tns="http://www.apache.org/tuscany/interop"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.apache.org/tuscany/interop interop05.xsd">
-	<SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-</tns:SDOJavaPackage>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
deleted file mode 100644
index 6b7e39b334..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
+++ /dev/null
@@ -1,39 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdoJava="commonj.sdo/java"
-        sdoJava:package="org.apache.tuscany">
- 
-  <!-- should be a reference to the real schema wherever that is going to be -->
-  <import schemaLocation="sdoJava.xsd" namespace="commonj.sdo/java"/>
-  
-  <!-- top level test type -->       
-  <complexType name="SDOJavaPackageComplexType">
-    <sequence>
-      <!-- simple types -->
-      <element name="SimpleTypeWithName" type="string"/>
-
-    </sequence>
-  </complexType>
-        
-  <element name="SDOJavaPackage" type="tns:SDOJavaPackageComplexType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
deleted file mode 100644
index f9d4a24a49..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:SimpleTypeWithAbstract xmlns:tns="http://www.apache.org/tuscany/interop" 
-                            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithAbstract.xsd ">
-  <SimpleTypeWithAbstractExtensionElement>SimpleTypeWithAbstractExtensionElement</SimpleTypeWithAbstractExtensionElement>
-</tns:SimpleTypeWithAbstract>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
deleted file mode 100644
index f649e2ba83..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
+++ /dev/null
@@ -1,40 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">      
-        
-  <!--simpleType name="SimpleTypeWithAbstractType" abstract="true"-->
-  <simpleType name="SimpleTypeWithAbstractType" >
-    <restriction base="string"/>
-  </simpleType>
-
-  <simpleType name="SimpleTypeWithAbstractExtensionType">
-    <restriction base="tns:SimpleTypeWithAbstractType"/>
-  </simpleType>
-                 
-  <complexType name="SimpleTypeWithAbstractComplexType">
-    <sequence>
-      <element name="SimpleTypeWithAbstractExtensionElement" type="tns:SimpleTypeWithAbstractExtensionType"/>  
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithAbstract" type="tns:SimpleTypeWithAbstractComplexType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
deleted file mode 100644
index 410df4b7e4..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:SimpleTypeWithExtendedInstanceClass xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                         xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithExtendedInstanceClass.xsd ">
-  <SimpleTypeWithExtendedInstanceClassElement>SimpleTypeWithExtendedInstanceClassElement</SimpleTypeWithExtendedInstanceClassElement>
-</tns:SimpleTypeWithExtendedInstanceClass>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
deleted file mode 100644
index 5d27ef5ce1..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
+++ /dev/null
@@ -1,36 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdoJava="commonj.sdo">                
-        
-  <simpleType name="SimpleTypeWithExtendedInstanceClassType" sdoJava:extendedInstanceClass="String">
-  	<restriction base="string"/>
-  </simpleType>             
-
-  <complexType name="SimpleTypeWithExtendedInstanceClassComplexType">
-    <sequence>
-      <element name="SimpleTypeWithExtendedInstanceClassElement" type="tns:SimpleTypeWithExtendedInstanceClassType"/>                               
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithExtendedInstanceClass" type="SimpleTypeWithExtendedInstanceClassComplexType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
deleted file mode 100644
index 7b74867c03..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:SimpleTypeWithInstanceClass xmlns:tns="http://www.apache.org/tuscany/interop" 
-                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                                 xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithInstanceClass.xsd ">
-  <SimpleTypeWithInstanceClassElement>SimpleTypeWithInstanceClassElement</SimpleTypeWithInstanceClassElement>
-</tns:SimpleTypeWithInstanceClass>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
deleted file mode 100644
index ec16a678a3..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
+++ /dev/null
@@ -1,37 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdoJava="commonj.sdo">       
-        
-  <simpleType name="SimpleTypeWithInstanceClassType" sdoJava:instanceClass="String">
-  	<restriction base="string"/>
-  </simpleType>
-                 
-
-  <complexType name="SimpleTypeWithInstanceClassComplexType">
-    <sequence>
-      <element name="SimpleTypeWithInstanceClassElement" type="tns:SimpleTypeWithInstanceClassType"/>       
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithInstanceClass" type="SimpleTypeWithInstanceClassComplexType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
deleted file mode 100644
index 708d526f44..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:SimpleTypeWithList xmlns:tns="http://www.apache.org/tuscany/interop" 
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                        xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithList.xsd ">
-  <SimpleTypeWithListElement>listmember1 listmember2</SimpleTypeWithListElement>
-</tns:SimpleTypeWithList>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
deleted file mode 100644
index ed681009f9..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
+++ /dev/null
@@ -1,37 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdoJava="commonj.sdo">                
-        
-  <simpleType name="SimpleTypeWithListType">
-  	<list itemType="string"/>
-  </simpleType>
-                 
-
-  <complexType name="SimpleTypeWithListComplexType">
-    <sequence>
-      <element name="SimpleTypeWithListElement" type="tns:SimpleTypeWithListType"/>                               
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithList" type="SimpleTypeWithListComplexType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
deleted file mode 100644
index e404ac86b7..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:SimpleTypeWithName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                        xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithName.xsd ">
-  <SimpleTypeWithNameElement>SimpleTypeWithNameElement</SimpleTypeWithNameElement>
-</tns:SimpleTypeWithName>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
deleted file mode 100644
index af0431f048..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
+++ /dev/null
@@ -1,36 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-        
-  <simpleType name="SimpleTypeWithNameType">
-    <restriction base="string"/>
-  </simpleType>
-  
-  <complexType name="SimpleTypeWithNameComplexType">
-    <sequence>
-      <element name="SimpleTypeWithNameElement" type="tns:SimpleTypeWithNameType"/>
-    </sequence>
-  </complexType>
-                 
-  <element name="SimpleTypeWithName" type="tns:SimpleTypeWithNameComplexType"/>
-
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
deleted file mode 100644
index c86a0f6bcb..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:SimpleTypeWithSDOName xmlns:tns="http://www.apache.org/tuscany/interop" 
-                           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                           xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithSDOName.xsd ">
-  <SimpleTypeWithSDONameElement>SimpleTypeWithSDONameElement</SimpleTypeWithSDONameElement>
-</tns:SimpleTypeWithSDOName>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
deleted file mode 100644
index 89b00a36cc..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
+++ /dev/null
@@ -1,37 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdo="commonj.sdo">     
-        
-  <simpleType name="SimpleTypeWithSDONameType" sdo:name="SimpleTypeWithSDONameTypeSDOName">
-	<restriction base="string"/>
-  </simpleType>
-                 
-  
-  <complexType name="SimpleTypeWithSDONameComplexType">
-    <sequence>
-      <element name="SimpleTypeWithSDONameElement" type="tns:SimpleTypeWithSDONameType"/>
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithSDOName" type="tns:SimpleTypeWithSDONameComplexType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
deleted file mode 100644
index 399b0d8175..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
+++ /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.
--->
-<tns:SimpleTypeWithUnion xmlns:tns="http://www.apache.org/tuscany/interop" 
-                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                         xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithUnion.xsd ">
-  <SimpleTypeWithUnionElement>EN</SimpleTypeWithUnionElement>
-  <SimpleTypeWithUnionElement>01:02:03</SimpleTypeWithUnionElement>
-</tns:SimpleTypeWithUnion>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
deleted file mode 100644
index ea35bec61a..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
+++ /dev/null
@@ -1,46 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop"
-        xmlns:sdoJava="commonj.sdo">             
-        
-  <simpleType name="SimpleTypeWithUnionType">
-  	<union>
-  	  <simpleType>
-  	    <restriction base="language">
-  	    </restriction>
-  	  </simpleType>
-  	  <simpleType>
-  	    <restriction base="time">
-  	    </restriction>
-  	  </simpleType>
-  	</union>
-  </simpleType>
-                 
-  
-  <complexType name="SimpleTypeWithUnionComplexType">
-    <sequence>
-      <element name="SimpleTypeWithUnionElement" type="tns:SimpleTypeWithUnionType" minOccurs="2" maxOccurs="2"/>                               
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithUnion" type="SimpleTypeWithUnionComplexType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
deleted file mode 100644
index bc8cf35368..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
+++ /dev/null
@@ -1,26 +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.
--->
- <SimpleTypeWithoutName xmlns="http://www.apache.org/tuscany/interop"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.apache.org/tuscany/interop SimpleTypeWithoutName.xsd">
-	<SimpleTypeWithoutNameElement>
-		SimpleTypeWithoutName
-	</SimpleTypeWithoutNameElement>
-</SimpleTypeWithoutName>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
deleted file mode 100644
index 57981e3666..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
-        
-  <element name="SimpleTypeWithoutNameElement">
-    <simpleType>
-      <restriction base="string"/>
-    </simpleType>
-  </element>  
-                 
-
-  <complexType name="SimpleTypeWithoutNameComplexType">
-    <sequence>
-       <element ref="tns:SimpleTypeWithoutNameElement"/>
-    </sequence>
-  </complexType>
-
-  <element name="SimpleTypeWithoutName" type="SimpleTypeWithoutNameComplexType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
deleted file mode 100644
index da2929776e..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<tns:TargetNamespace xmlns:tns="http://www.apache.org/tuscany/interop"
-	               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	               xsi:schemaLocation="http://www.apache.org/tuscany/interop TargetNamespace.xsd">
-	<SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
-</tns:TargetNamespace>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
deleted file mode 100644
index ace5427786..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
+++ /dev/null
@@ -1,34 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.apache.org/tuscany/interop" 
-        xmlns:tns="http://www.apache.org/tuscany/interop">
- 
-  <!-- top level test type -->       
-  <complexType name="TargetNamespaceComplexType">
-    <sequence>
-      <!-- simple types -->
-      <element name="SimpleTypeWithName" type="string"/>
-
-    </sequence>
-  </complexType>
-        
-  <element name="TargetNamespace" type="tns:TargetNamespaceComplexType"/>
-</schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
deleted file mode 100644
index e6b9697a8d..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.1.0
- * Licensed Materials
- *
- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
- * 2005, 2006. All rights reserved.
- *
- * </copyright>
- * 
- */
--->
-
-<xsd:schema
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:sdo="commonj.sdo"
-  xmlns:sdoJava="commonj.sdo/java"
-  targetNamespace="commonj.sdo">
-
-  <xsd:element name="datagraph" type="sdo:DataGraphType"/>
-  
-  <xsd:complexType name="DataGraphType">
-    <xsd:complexContent>
-      <xsd:extension base="sdo:BaseDataGraphType">
-        <xsd:sequence>
-          <xsd:any minOccurs="0" maxOccurs="1" namespace="##other" processContents="lax"/>
-        </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="BaseDataGraphType" abstract="true">
-    <xsd:sequence>
-      <xsd:element name="models" type="sdo:ModelsType" minOccurs="0"/>
-      <xsd:element name="xsd" type="sdo:XSDType" minOccurs="0"/>
-      <xsd:element name="changeSummary" type="sdo:ChangeSummaryType" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:anyAttribute namespace="##other" processContents="lax"/>
-  </xsd:complexType>
-    
-  <xsd:complexType name="ModelsType">
-    <xsd:annotation>
-      <xsd:documentation>
-        Expected type is emof:Package.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="XSDType">
-    <xsd:annotation>
-      <xsd:documentation>
-        Expected type is xsd:schema.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/2001/XMLSchema" processContents="lax"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- FB TEMP -->
-  <xsd:simpleType name="ChangeSummaryType" sdoJava:instanceClass="commonj.sdo.ChangeSummary">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-<!--
-  <xsd:complexType name="ChangeSummaryType">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-    </xsd:sequence>
-    <xsd:attribute name="create" type="xsd:string"/>
-    <xsd:attribute name="delete" type="xsd:string"/>
-    <xsd:attribute name="logging" type="xsd:boolean"/>
-  </xsd:complexType>
--->
-
-  <xsd:attribute name="ref" type="xsd:string"/>
-  <xsd:attribute name="unset" type="xsd:string"/>
-
-</xsd:schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
deleted file mode 100644
index 7387568942..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.1.0
- * Licensed Materials
- *
- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
- * 2005, 2006. All rights reserved.
- *
- * </copyright>
- * 
- */
--->
-
-<xsd:schema
-  targetNamespace="commonj.sdo/java"
-  xmlns:sdoJava="commonj.sdo/java"
-  xmlns:sdo="commonj.sdo"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-<xsd:import namespace="commonj.sdo" schemaLocation="sdoModel.xsd"/>
-
-<!--
-   These attributes are used to customize the Java mapping of 
-   XSD to SDO Types and Properties.
--->
-
-<xsd:attribute name="package" type="xsd:string" />
-<xsd:attribute name="instanceClass" type="xsd:string" />
-<xsd:attribute name="extendedInstanceClass" type="xsd:string" />
-<xsd:attribute name="nestedInterfaces" type="xsd:boolean" />
-
-<!--
-   Global properties used in open content for 
-   the Java binding of SDO Types and Properties.
--->
-
-<xsd:attribute name="javaClass" type="sdo:String"/>
-
-<!-- JavaInfo deprecated in 2.1.0 -->
-<xsd:complexType name="JavaInfo">
-  <xsd:attribute name="javaClass" type="sdo:String"/>
-</xsd:complexType>
-
-<!--
-   The Java object data types.
--->
-
-<xsd:simpleType name="BooleanObject" sdoJava:instanceClass="java.lang.Boolean">
-  <xsd:restriction base="xsd:boolean"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="ByteObject" sdoJava:instanceClass="java.lang.Byte">
-  <xsd:restriction base="xsd:byte"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="CharacterObject" sdoJava:instanceClass="java.lang.Character">
-  <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="DoubleObject" sdoJava:instanceClass="java.lang.Double">
-  <xsd:restriction base="xsd:double"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="FloatObject" sdoJava:instanceClass="java.lang.Float">
-  <xsd:restriction base="xsd:float"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="IntObject" sdoJava:instanceClass="java.lang.Integer">
-  <xsd:restriction base="xsd:int"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="LongObject" sdoJava:instanceClass="java.lang.Long">
-  <xsd:restriction base="xsd:long"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="ShortObject" sdoJava:instanceClass="java.lang.Short">
-  <xsd:restriction base="xsd:short"/>
-</xsd:simpleType>
-
-</xsd:schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
deleted file mode 100644
index c5aabc9cc8..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.1.0
- * Licensed Materials
- *
- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
- * 2005, 2006. All rights reserved.
- *
- * </copyright>
- * 
- */
-
--->
-
-<xsd:schema 
-  targetNamespace="commonj.sdo"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xmlns:sdo="commonj.sdo"
-  xmlns:sdoXML="commonj.sdo/xml"
-  xmlns:sdoJava="commonj.sdo/java"
-  elementFormDefault="qualified"
-  xsi:schemaLocation="commonj.sdo/xml sdoXML.xsd
-                  commonj.sdo/java sdoJava.xsd"> 
-  
-<xsd:include schemaLocation="datagraph.xsd"/>
-  
-<!-- Root element for defining several Types in one document.
-       Is not part of the model.
--->
-<xsd:element name="types" type="sdo:Types"/>
-<xsd:complexType name="Types">
-  <xsd:sequence>
-    <xsd:element name="type" type="sdo:Type" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<!-- Any data object may be serialized with this element,
-      with xsi:type to declare the
-      actual type of the DataObject serialized.
--->      
-<xsd:element name="dataObject" type="xsd:anyType"/>
-
-<!-- Model Types 
-   SDO Type and Property are defined in terms of themselves.
--->
-<xsd:element name="type" type="sdo:Type"/>
-<xsd:complexType name="Type">
-  <xsd:sequence>
-    <xsd:element name="baseType" type="sdo:URI" 
-      minOccurs="0" maxOccurs="unbounded"
-      sdoXML:propertyType="sdo:Type" />
-    <xsd:element name="property" type="sdo:Property" 
-      minOccurs="0" maxOccurs="unbounded" />
-    <xsd:element name="aliasName" type="sdo:String"
-      minOccurs="0" maxOccurs="unbounded" />
-    <xsd:any namespace="##other" processContents="lax" 
-      minOccurs="0" maxOccurs="unbounded" />
-  </xsd:sequence>
-  <xsd:attribute name="name" type="xsd:ID" sdoXML:dataType="sdo:String"/>
-  <xsd:attribute name="uri" type="sdo:URI"/>
-  <xsd:attribute name="dataType" type="sdo:Boolean"/>
-  <xsd:attribute name="open" type="sdo:Boolean"/>
-  <xsd:attribute name="sequenced" type="sdo:Boolean"/>
-  <xsd:attribute name="abstract" type="sdo:Boolean"/>
-  <xsd:anyAttribute namespace="##any" processContents="lax"/>
-</xsd:complexType>
-
-<xsd:complexType name="Property">
-  <xsd:sequence>
-    <xsd:element name="aliasName" type="sdo:String"
-      minOccurs="0" maxOccurs="unbounded" />
-    <xsd:any namespace="##other" processContents="lax" 
-      minOccurs="0" maxOccurs="unbounded" />
-  </xsd:sequence>
-  <xsd:attribute name="name" type="sdo:String"/>
-  <xsd:attribute name="many" type="sdo:Boolean"/>
-  <xsd:attribute name="containment" type="sdo:Boolean"/>
-  <xsd:attribute name="default" type="sdo:String"/>
-  <xsd:attribute name="readOnly" type="sdo:Boolean"/>
-  <xsd:attribute name="type" type="sdo:URI" sdoXML:propertyType="sdo:Type"/>
-  <xsd:attribute name="opposite" type="sdo:URI" sdoXML:propertyType="sdo:Property"/>
-  <xsd:attribute name="nullable" type="sdo:Boolean"/>
-  <xsd:anyAttribute namespace="##any" processContents="lax"/>
-</xsd:complexType>
-
-<!-- Special Types -->
-<xsd:complexType name="DataObject" abstract="true"/>
-
-<!-- TextType deprecated in 2.1.0 -->
-      <xsd:complexType name="TextType" abstract="true">
-        <xsd:sequence>
-          <xsd:element name="text" minOccurs="0" maxOccurs="unbounded" type="xsd:string"/>
-        </xsd:sequence>
-      </xsd:complexType>
-
-<!-- ChangeSummaryType is defined in datagraph.xsd.
-       Although declared there as a ComplexType,
-       at the model level it is treated as a SimpleType
-       with a special XML serialization.
--->
-
-<!-- Data Types -->
-<xsd:simpleType name="Boolean" sdoJava:instanceClass="boolean">
-  <xsd:restriction base="xsd:boolean"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Byte" sdoJava:instanceClass="byte">
-  <xsd:restriction base="xsd:byte"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Bytes" sdoJava:instanceClass="byte[]">
-  <xsd:restriction base="xsd:hexBinary"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Character" sdoJava:instanceClass="char">
-  <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Date" sdoJava:instanceClass="java.util.Date">
-  <xsd:restriction base="xsd:dateTime"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="DateTime" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:dateTime"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Day" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gDay"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Decimal" sdoJava:instanceClass="java.math.BigDecimal">
-  <xsd:restriction base="xsd:decimal"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Double" sdoJava:instanceClass="double">
-  <xsd:restriction base="xsd:double"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Duration" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:duration"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Float" sdoJava:instanceClass="float">
-  <xsd:restriction base="xsd:float"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Int" sdoJava:instanceClass="int">
-  <xsd:restriction base="xsd:int"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Integer" sdoJava:instanceClass="java.math.BigInteger">
-  <xsd:restriction base="xsd:integer"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Long"  sdoJava:instanceClass="long">
-  <xsd:restriction base="xsd:long"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Month" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gMonth"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="MonthDay" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gMonthDay"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Object"  sdoJava:instanceClass="java.lang.Object">
-  <!-- Only the schema for schemas is allowed to restrict anySimpleType.
-         <xsd:restriction base="xsd:anySimpleType"/>
-       The equivalent declaration is a union of the predefined XSD data types.
-  -->
-  <xsd:union memberTypes="xsd:anyURI xsd:base64Binary xsd:boolean xsd:byte
-    xsd:date xsd:dateTime xsd:decimal xsd:double xsd:duration xsd:ENTITIES xsd:ENTITY xsd:float
-    xsd:gDay xsd:gMonth xsd:gMonthDay xsd:gYear xsd:gYearMonth xsd:hexBinary xsd:ID xsd:IDREF xsd:IDREFS
-    xsd:int xsd:integer xsd:language xsd:long xsd:Name xsd:NCName xsd:negativeInteger
-    xsd:NMTOKEN xsd:NMTOKENS xsd:nonNegativeInteger xsd:nonPositiveInteger
-    xsd:normalizedString xsd:NOTATION xsd:positiveInteger xsd:QName xsd:short xsd:string
-    xsd:time xsd:token xsd:unsignedByte xsd:unsignedInt xsd:unsignedLong xsd:unsignedShort"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Short" sdoJava:instanceClass="short">
-  <xsd:restriction base="xsd:short"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="String" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Strings" sdoJava:instanceClass="java.util.List">
-  <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Time" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:time"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Year" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gYear"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="YearMonth" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gYearMonth"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="YearMonthDay" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:date"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="URI" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:anyURI"/>
-</xsd:simpleType>
-
-</xsd:schema>
diff --git a/java/sca-contrib/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/java/sca-contrib/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
deleted file mode 100644
index fa3f310d4d..0000000000
--- a/java/sca-contrib/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.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 org.apache.tuscany.sca.itest.generate;
-
-import junit.framework.TestCase;
-
-
-/**
- * 
- */
-public class GenerateTestCase extends TestCase {
-
-    //private Generate generator = null;
-
-    @Override
-    protected void setUp() throws Exception {
-        //generator = new Generate();
-    }
-
-    @Override
-    protected void tearDown() {
-    }
-
-    /**
-     * Invokes the Generate class to generate databinding test classes and resources. 
-     * 
-     * @throws Exception
-     */
-    public void testGenerate() throws Exception {
-        //generator.generate();
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/config.png b/java/sca-contrib/itest/databindings/config.png
deleted file mode 100644
index 7912019e9d..0000000000
--- a/java/sca-contrib/itest/databindings/config.png
+++ /dev/null
diff --git a/java/sca-contrib/itest/databindings/config.svg b/java/sca-contrib/itest/databindings/config.svg
deleted file mode 100644
index aaf027e2df..0000000000
--- a/java/sca-contrib/itest/databindings/config.svg
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
-   id="svg3168"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings"
-   sodipodi:docname="config.svg">
-  <defs
-     id="defs3170" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="375"
-     inkscape:cy="748.57143"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="990"
-     inkscape:window-height="664"
-     inkscape:window-x="103"
-     inkscape:window-y="84" />
-  <metadata
-     id="metadata3173">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3194"
-       inkscape:export-xdpi="52.84"
-       inkscape:export-ydpi="52.84"><flowRegion
-         id="flowRegion3196"><rect
-           id="rect3198"
-           width="505.71429"
-           height="531.42859"
-           x="94.285713"
-           y="83.790756" /></flowRegion><flowPara
-         id="flowPara3200">&lt;tns:Generate ...&gt;</flowPara><flowPara
-         id="flowPara3202">  &lt;Template&gt;</flowPara><flowPara
-         id="flowPara3204">    &lt;TemplateName&gt;greeter.composite.vm&lt;/TemplateName&gt;</flowPara><flowPara
-         id="flowPara3206">    &lt;TemplateTargetDir&gt;classes&lt;/TemplateTargetDir&gt;</flowPara><flowPara
-         id="flowPara3208">  &lt;/Template&gt;</flowPara><flowPara
-         id="flowPara3210">  ...</flowPara><flowPara
-         id="flowPara3212">             </flowPara><flowPara
-         id="flowPara3214">  &lt;InputFile&gt;</flowPara><flowPara
-         id="flowPara3216">    &lt;FileName&gt;Person.xsd&lt;/FileName&gt;</flowPara><flowPara
-         id="flowPara3218">    &lt;FilePath&gt;xsd&lt;/FilePath&gt;</flowPara><flowPara
-         id="flowPara3220">    &lt;JavaPackage&gt;org.apache.tuscany.sca.itest.databinding.types&lt;/JavaPackage&gt;</flowPara><flowPara
-         id="flowPara3222">    &lt;Factory&gt;TypesFactory&lt;/Factory&gt;</flowPara><flowPara
-         id="flowPara3224">    &lt;Namespace&gt;http://apache.org/tuscany/sca/itest/databinding/types&lt;/Namespace&gt;</flowPara><flowPara
-         id="flowPara3226">    &lt;Prefix&gt;p&lt;/Prefix&gt;</flowPara><flowPara
-         id="flowPara3228">    &lt;Type&gt;</flowPara><flowPara
-         id="flowPara3230">      &lt;TypeName&gt;PersonType&lt;/TypeName&gt;</flowPara><flowPara
-         id="flowPara3232">      &lt;CreateTypeCode&gt;</flowPara><flowPara
-         id="flowPara3234">        TypesFactory factory = TypesFactory.INSTANCE;</flowPara><flowPara
-         id="flowPara3236">        param = factory.createPersonType();</flowPara><flowPara
-         id="flowPara3238">        param.setFirstName(&quot;George&quot;);</flowPara><flowPara
-         id="flowPara3240">        param.setLastName(&quot;Doors&quot;);</flowPara><flowPara
-         id="flowPara3242">      &lt;/CreateTypeCode&gt;</flowPara><flowPara
-         id="flowPara3244">      &lt;ModifyTypeCode&gt;</flowPara><flowPara
-         id="flowPara3246">        param.setGreeting(&quot;Hello&quot;);</flowPara><flowPara
-         id="flowPara3248">      &lt;/ModifyTypeCode&gt;</flowPara><flowPara
-         id="flowPara3250">      &lt;ResultComparison&gt;</flowPara><flowPara
-         id="flowPara3252">        assertNotSame(&quot;greetedPerson.getGreeting() not set&quot;, &quot;&quot;, result.getGreeting());</flowPara><flowPara
-         id="flowPara3254">      &lt;/ResultComparison&gt;</flowPara><flowPara
-         id="flowPara3256">    &lt;/Type&gt;</flowPara><flowPara
-         id="flowPara3258">  &lt;/InputFile&gt;</flowPara><flowPara
-         id="flowPara3260">  ...</flowPara><flowPara
-         id="flowPara3262"></flowPara><flowPara
-         id="flowPara3264">&lt;/tns:Generate&gt;</flowPara></flowRoot>  </g>
-</svg>
diff --git a/java/sca-contrib/itest/databindings/databinding.png b/java/sca-contrib/itest/databindings/databinding.png
deleted file mode 100644
index 76a9c71b7d..0000000000
--- a/java/sca-contrib/itest/databindings/databinding.png
+++ /dev/null
diff --git a/java/sca-contrib/itest/databindings/databinding.svg b/java/sca-contrib/itest/databindings/databinding.svg
deleted file mode 100644
index d6850ccf7d..0000000000
--- a/java/sca-contrib/itest/databindings/databinding.svg
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings"
-   sodipodi:docname="databinding.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings\databinding.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3078"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="499.13602"
-     inkscape:cy="337.74555"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1180"
-     inkscape:window-height="775"
-     inkscape:window-x="36"
-     inkscape:window-y="42" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1.084673,0,0,0.856154,-21.78728,27.4907)">
-      <rect
-         rx="15.307091"
-         ry="15.260983"
-         y="192.00233"
-         x="258.31146"
-         height="360.71414"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.07541251;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">GreeterService</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="312.05917"
-       y="258.59619"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(44.4684,52.65764)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">DefaultGreeter</flowPara><flowPara
-         id="flowPara2019">ServiceClient</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 294.90867,290.44317 L 328.24371,290.44317 L 334.30462,303.57515 L 327.23356,315.69699 L 294.90867,315.69699 L 302.48482,303.57515 L 294.90867,290.44317 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 408.16111,288.60489 L 441.49615,288.60489 L 447.55706,301.73687 L 440.486,313.85871 L 408.16111,313.85871 L 415.73726,301.73687 L 408.16111,288.60489 z "
-       id="path3019" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1985"
-       width="115.66247"
-       height="85.862968"
-       x="642.96918"
-       y="315.88455"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1987"
-       transform="translate(375.3784,109.946)"><flowRegion
-         id="flowRegion1989"><rect
-           id="rect1991"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1993">GreeterService</flowPara><flowPara
-         id="flowPara2017">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 625.81867,347.73153 L 659.15371,347.73153 L 665.21462,360.86351 L 658.14356,372.98535 L 625.81867,372.98535 L 633.39482,360.86351 L 625.81867,347.73153 z "
-       id="path1997" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2001"
-       width="115.66247"
-       height="85.862968"
-       x="313.68344"
-       y="371.59885"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2003"
-       transform="translate(46.09269,165.6602)"><flowRegion
-         id="flowRegion2005"><rect
-           id="rect2007"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2009">WSGreeter</flowPara><flowPara
-         id="flowPara2021">ServiceClient</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 296.53296,403.44581 L 329.868,403.44581 L 335.92891,416.57779 L 328.85785,428.69963 L 296.53296,428.69963 L 304.10911,416.57779 L 296.53296,403.44581 z "
-       id="path2013" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 409.7854,401.60753 L 443.12044,401.60753 L 449.18135,414.73951 L 442.11029,426.86135 L 409.7854,426.86135 L 417.36155,414.73951 L 409.7854,401.60753 z "
-       id="path2015" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2Lend);stroke-opacity:1"
-       d="M 447.14297,301.23734 L 527.11201,301.95163 L 526.12473,354.09448 L 626.8265,354.80877"
-       id="path2039" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 463.87333,395.75343 L 516.54902,395.75343 L 526.12641,417.42827 L 514.95279,437.43583 L 463.87333,437.43583 L 475.84509,417.42827 L 463.87333,395.75343 z "
-       id="path3108"
-       inkscape:transform-center-y="-33.571429"
-       inkscape:transform-center-x="31.706144" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 535.3019,397.182 L 577.70287,397.182 L 585.41213,416.99969 L 576.41799,435.29297 L 535.3019,435.29297 L 544.93849,416.99969 L 535.3019,397.182 z "
-       id="path3110" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3112"
-       transform="matrix(0.778099,0,0,0.884748,255.7727,214.0266)"><flowRegion
-         id="flowRegion3114"><rect
-           id="rect3116"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3120">WS</flowPara><flowPara
-         id="flowPara3124">Reference</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3128"
-       transform="matrix(0.778099,0,0,0.884748,324.368,215.5376)"><flowRegion
-         id="flowRegion3130"><rect
-           id="rect3132"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3134">WS</flowPara><flowPara
-         id="flowPara3136">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 447.85714,415.52305 L 475.71429,415.52305"
-       id="path3138" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 525.71429,417.66591 L 543.57143,417.66591"
-       id="path3140" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 585.71429,416.23734 L 599.28571,416.23734 L 600,364.80877 L 629.28571,364.80877"
-       id="path3142" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/itest/databindings/interop.png b/java/sca-contrib/itest/databindings/interop.png
deleted file mode 100644
index 005e0f24ea..0000000000
--- a/java/sca-contrib/itest/databindings/interop.png
+++ /dev/null
diff --git a/java/sca-contrib/itest/databindings/interop.svg b/java/sca-contrib/itest/databindings/interop.svg
deleted file mode 100644
index 03897c6d09..0000000000
--- a/java/sca-contrib/itest/databindings/interop.svg
+++ /dev/null
@@ -1,352 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings"
-   sodipodi:docname="interop.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\itest\databindings\interop.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3078"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="428.95418"
-     inkscape:cy="356.33178"
-     inkscape:document-units="px"
-     inkscape:current-layer="g2997"
-     inkscape:window-width="1234"
-     inkscape:window-height="800"
-     inkscape:window-x="27"
-     inkscape:window-y="108" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.979246,0,0,1.158467,-105.7257,-23.34339)">
-      <rect
-         rx="25.230545"
-         ry="12.196672"
-         y="179.85953"
-         x="146.34595"
-         height="288.28497"
-         width="817.08154"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.87776983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="translate(-102.7603,-25.12021)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">InteropGreeterService</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3332"
-       width="115.66247"
-       height="85.862968"
-       x="77.514153"
-       y="231.09024"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3334"
-       transform="translate(-185.0766,21.58025)"><flowRegion
-         id="flowRegion3336"><rect
-           id="rect3338"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3340">SDO</flowPara><flowPara
-         id="flowPara3379">DefaultGreeter</flowPara><flowPara
-         id="flowPara2019">ServiceClient</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 60.363662,262.93721 L 93.698702,262.93721 L 99.759609,276.06919 L 92.688552,288.19103 L 60.363662,288.19103 L 67.939812,276.06919 L 60.363662,262.93721 z "
-       id="path3343" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 173.6161,261.09893 L 206.95114,261.09893 L 213.01205,274.23091 L 205.94099,286.35275 L 173.6161,286.35275 L 181.19225,274.23091 L 173.6161,261.09893 z "
-       id="path3345" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1985"
-       width="115.66247"
-       height="85.862968"
-       x="681.65045"
-       y="289.48157"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1987"
-       transform="translate(423.3454,80.68594)"><flowRegion
-         id="flowRegion1989"><rect
-           id="rect1991"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1993">SDO</flowPara><flowPara
-         id="flowPara3399">GreeterService</flowPara><flowPara
-         id="flowPara2017">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 664.49995,321.32854 L 697.83499,321.32854 L 703.8959,334.46052 L 696.82484,346.58236 L 664.49995,346.58236 L 672.0761,334.46052 L 664.49995,321.32854 z "
-       id="path1997" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2001"
-       width="115.66247"
-       height="85.862968"
-       x="76.281281"
-       y="356.23575"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2003"
-       transform="translate(-185.5951,150.2971)"><flowRegion
-         id="flowRegion2005"><rect
-           id="rect2007"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2009">SDO</flowPara><flowPara
-         id="flowPara3401">WSGreeter</flowPara><flowPara
-         id="flowPara2021">ServiceClient</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 59.130809,388.08271 L 92.465849,388.08271 L 98.526759,401.21469 L 91.455699,413.33653 L 59.130809,413.33653 L 66.706959,401.21469 L 59.130809,388.08271 z "
-       id="path2013" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 172.38325,386.24443 L 205.71829,386.24443 L 211.7792,399.37641 L 204.70814,411.49825 L 172.38325,411.49825 L 179.9594,399.37641 L 172.38325,386.24443 z "
-       id="path2015" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 226.47114,380.39017 L 271.82375,380.39017 L 280.06966,400.95073 L 270.44943,419.92971 L 226.47114,419.92971 L 236.77856,400.95073 L 226.47114,380.39017 z "
-       id="path3108"
-       inkscape:transform-center-y="-31.845711"
-       inkscape:transform-center-x="27.298337" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 286.59013,381.79328 L 328.89058,381.79328 L 336.58156,401.62413 L 327.60875,419.92957 L 286.59013,419.92957 L 296.20387,401.62413 L 286.59013,381.79328 z "
-       id="path3110" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3112"
-       transform="matrix(0.654898,0,0,0.869049,51.92158,201.8882)"><flowRegion
-         id="flowRegion3114"><rect
-           id="rect3116"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3120">WS</flowPara><flowPara
-         id="flowPara3124">Reference</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3128"
-       transform="matrix(0.654898,0,0,0.869049,112.0605,203.3723)"><flowRegion
-         id="flowRegion3130"><rect
-           id="rect3132"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3134">WS</flowPara><flowPara
-         id="flowPara3136">Service</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3381"
-       width="115.66247"
-       height="85.862968"
-       x="376.54059"
-       y="229.73444"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3383"
-       transform="translate(113.9499,20.22444)"><flowRegion
-         id="flowRegion3385"><rect
-           id="rect3387"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3389">JAXB</flowPara><flowPara
-         id="flowPara3391">DefaultGreeter</flowPara><flowPara
-         id="flowPara3393">ServiceClient</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 359.39009,261.5814 L 392.72513,261.5814 L 398.78604,274.71338 L 391.71498,286.83522 L 359.39009,286.83522 L 366.96624,274.71338 L 359.39009,261.5814 z "
-       id="path3395" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 472.64253,259.74312 L 505.97757,259.74312 L 512.03848,272.8751 L 504.96742,284.99694 L 472.64253,284.99694 L 480.21868,272.8751 L 472.64253,259.74312 z "
-       id="path3397" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3403"
-       width="115.66247"
-       height="85.862968"
-       x="375.19193"
-       y="355.69083"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3405"
-       transform="translate(112.6012,146.1808)"><flowRegion
-         id="flowRegion3407"><rect
-           id="rect3409"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3411">JAXB</flowPara><flowPara
-         id="flowPara3413">WSGreeter</flowPara><flowPara
-         id="flowPara3415">ServiceClient</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 358.0414,387.53779 L 391.37644,387.53779 L 397.43735,400.66977 L 390.36629,412.79161 L 358.0414,412.79161 L 365.61755,400.66977 L 358.0414,387.53779 z "
-       id="path3417" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 471.29384,385.69951 L 504.62888,385.69951 L 510.68979,398.83149 L 503.61873,410.95333 L 471.29384,410.95333 L 478.86999,398.83149 L 471.29384,385.69951 z "
-       id="path3419" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 531.84342,380.87285 L 577.19603,380.87285 L 585.44194,401.43341 L 575.82171,420.41239 L 531.84342,420.41239 L 542.15084,401.43341 L 531.84342,380.87285 z "
-       id="path3421"
-       inkscape:transform-center-y="-31.845711"
-       inkscape:transform-center-x="27.298337" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 591.96241,382.27596 L 634.26286,382.27596 L 641.95384,402.10681 L 632.98103,420.41225 L 591.96241,420.41225 L 601.57615,402.10681 L 591.96241,382.27596 z "
-       id="path3423" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3425"
-       transform="matrix(0.654898,0,0,0.869049,357.2939,202.3709)"><flowRegion
-         id="flowRegion3427"><rect
-           id="rect3429"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3431">WS</flowPara><flowPara
-         id="flowPara3433">Reference</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3435"
-       transform="matrix(0.654898,0,0,0.869049,417.4328,203.855)"><flowRegion
-         id="flowRegion3437"><rect
-           id="rect3439"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3441">WS</flowPara><flowPara
-         id="flowPara3443">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 212.14286,274.09448 L 366.42857,274.80877"
-       id="path3447" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 512.14286,272.66591 L 599.28571,272.66591 L 599.28571,325.52305 L 665.71429,325.52305"
-       id="path3453" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 210.71429,399.80877 L 235.71429,399.80877"
-       id="path3455" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 278.57143,401.23734 L 295.71429,401.23734"
-       id="path3459" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 336.42857,401.95163 L 365.71429,401.95163"
-       id="path3461" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 510.71429,399.80877 L 540.71429,399.80877"
-       id="path3463" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 585,401.95163 L 600.71429,401.95163"
-       id="path3465" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 641.42857,402.66591 L 657.14286,402.66591 L 657.85714,339.09448 L 669.28571,339.09448"
-       id="path3467" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/itest/databindings/interop/pom.xml b/java/sca-contrib/itest/databindings/interop/pom.xml
deleted file mode 100644
index a8f7635183..0000000000
--- a/java/sca-contrib/itest/databindings/interop/pom.xml
+++ /dev/null
@@ -1,223 +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>itest-databindings</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-interop</artifactId>
-    <version>2.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA DataBinding Interop Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-jaxb</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.tuscany.sca</groupId>
-                                    <artifactId>itest-databindings-common</artifactId>
-                                    <version>${project.version}</version>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <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.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-source</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass>
-                    <arguments>
-                        <argument>${project.build.directory}</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
deleted file mode 100644
index 7bdfc57924..0000000000
--- a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
+++ /dev/null
@@ -1,113 +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 $template.getJavaPackage();
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import ${template.getJavaPackage()}.GreeterService;
-
-// Data types
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-import $file.getJavaPackage().$file.getFactory();
-#end
-#end
-
-/**
- * Automatically generated test case. Calls the greeter client for a number of 
- * bindings and a number of data types. 
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-public class InteropDatabindingTestCase extends TestCase  {
-
-    private static boolean initalised = false;
-    private GreeterService greeterClient;
-    private static SCADomain domain;
-
-    /**
-     * Runs before each test method
-     */
-    protected void setUp() throws Exception {
-        if (!initalised) {
-            domain = SCADomain.newInstance("interopgreeter.composite");
-            super.setUp();
-            initalised = true;
-        }
-    }
-
-    /**
-     * Runs after each test method
-     */
-    protected void tearDown() {
-
-    }
-
-    /**
-     * Finds the SCA component that relates to the protocol being tested. This test 
-     * always connects locally to the client component but the client component will
-     * connect to the back end component using the appropriate protocol
-     *
-     * @param ext the protcol required
-     */
-    private void setUpClient(String ext) throws Exception {
-        greeterClient = domain.getService(GreeterService.class, "SDO" + ext + "GreeterServiceClient");
-    }
-
-    /**
-     * Invokes the SDO Greet service using web service bindings with SDO payload
-     */
-    public void testWSGreet() throws Exception {
-        setUpClient("WS");
-        greet();
-    }
-
-    /**
-     * Invokes the SDO Greet service using default bindings with SDO payload
-     */
-    public void testDefaultGreet() throws Exception {
-        setUpClient("Default");
-        greet();
-    }
-
-    /**
-     * A generic method which, regarless of which client is connected, sends out a 
-     * series of requrests passing different data types. 
-     */
-    public void greet() {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-        // test $typeInstance.getTypeName()
-        { 
-            $typeInstance.getTypeName() param = null;
-            $typeInstance.getCreateTypeCode()
-            $typeInstance.getTypeName() result = greeterClient.greet$typeInstance.getTypeName()(param);
-            $typeInstance.getResultComparison()
-        }
-#end
-#end            
-    }
-
-}
diff --git a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
deleted file mode 100644
index 38bfccce0c..0000000000
--- a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
+++ /dev/null
@@ -1,103 +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://apache.org/tuscany/sca/itest/databinding/services/jaxb"
-                  xmlns:tns="http://apache.org/tuscany/sca/itest/databinding/services/jaxb" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                  name="Greeter">
-
-    <wsdl:types>
-        <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" 
-#foreach($file in $fileList)
-            xmlns:$file.getPrefix()="$file.getNamespace()"
-#end        
-            targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services/jaxb" 
-            elementFormDefault="qualified">
-
-#foreach($file in $fileList)
-            <xsd:import namespace="$file.getNamespace()" 
-                        schemaLocation="../xsd/$file.getFileName()" />            
-#end 
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-            <element name="greet$typeInstance.getTypeName()">
-                <complexType>
-                    <sequence>
-                        <element name="parm" type="$file.getPrefix():$typeInstance.getTypeName()" />
-                    </sequence>
-                </complexType>
-            </element>
-#end
-#end
-        </xsd:schema>
-    </wsdl:types>
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-    <wsdl:message name="$typeInstance.getTypeName()Request">
-        <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" />
-    </wsdl:message>
-    <wsdl:message name="$typeInstance.getTypeName()Response">
-        <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" />
-    </wsdl:message>
-#end
-#end
-
-    <wsdl:portType name="GreeterPortType">
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-        <wsdl:operation name="greet$typeInstance.getTypeName()">
-            <wsdl:input message="tns:$typeInstance.getTypeName()Request" name="$typeInstance.getTypeName()RequestMsg" />
-            <wsdl:output message="tns:$typeInstance.getTypeName()Response" name="$typeInstance.getTypeName()ResponseMsg" />
-        </wsdl:operation>
-#end
-#end
-   </wsdl:portType>
-
-    <wsdl:binding name="GreeterBinding" type="tns:GreeterPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-        <wsdl:operation name="greet$typeInstance.getTypeName()">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="$typeInstance.getTypeName()RequestMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="$typeInstance.getTypeName()ResponseMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-#end
-#end              
-    </wsdl:binding>
-
-    <wsdl:service name="GreeterService">
-        <wsdl:port name="GreeterPort" binding="tns:GreeterBinding">
-            <wsdlsoap:address location="http://localhost:8085/services/JAXBGreeterServiceWebServiceBinding" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
deleted file mode 100644
index 6f02af4c9d..0000000000
--- a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
+++ /dev/null
@@ -1,103 +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://apache.org/tuscany/sca/itest/databinding/services/sdo"
-                  xmlns:tns="http://apache.org/tuscany/sca/itest/databinding/services/sdo" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                  name="Greeter">
-
-    <wsdl:types>
-        <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" 
-#foreach($file in $fileList)
-            xmlns:$file.getPrefix()="$file.getNamespace()"
-#end        
-            targetNamespace="http://apache.org/tuscany/sca/itest/databinding/services/sdo" 
-            elementFormDefault="qualified">
-
-#foreach($file in $fileList)
-            <xsd:import namespace="$file.getNamespace()" 
-                        schemaLocation="../xsd/$file.getFileName()" />            
-#end 
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-            <element name="greet$typeInstance.getTypeName()">
-                <complexType>
-                    <sequence>
-                        <element name="parm" type="$file.getPrefix():$typeInstance.getTypeName()" />
-                    </sequence>
-                </complexType>
-            </element>
-#end
-#end
-        </xsd:schema>
-    </wsdl:types>
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-    <wsdl:message name="$typeInstance.getTypeName()Request">
-        <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" />
-    </wsdl:message>
-    <wsdl:message name="$typeInstance.getTypeName()Response">
-        <wsdl:part element="tns:greet$typeInstance.getTypeName()" name="parameters" />
-    </wsdl:message>
-#end
-#end
-
-    <wsdl:portType name="GreeterPortType">
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-        <wsdl:operation name="greet$typeInstance.getTypeName()">
-            <wsdl:input message="tns:$typeInstance.getTypeName()Request" name="$typeInstance.getTypeName()RequestMsg" />
-            <wsdl:output message="tns:$typeInstance.getTypeName()Response" name="$typeInstance.getTypeName()ResponseMsg" />
-        </wsdl:operation>
-#end
-#end
-   </wsdl:portType>
-
-    <wsdl:binding name="GreeterBinding" type="tns:GreeterPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-        <wsdl:operation name="greet$typeInstance.getTypeName()">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="$typeInstance.getTypeName()RequestMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="$typeInstance.getTypeName()ResponseMsg">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-#end
-#end              
-    </wsdl:binding>
-
-    <wsdl:service name="GreeterService">
-        <wsdl:port name="GreeterPort" binding="tns:GreeterBinding">
-            <wsdlsoap:address location="http://localhost:8085/services/SDOGreeterServiceWebServiceBinding" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/generate.xml b/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/generate.xml
deleted file mode 100644
index 8453dd56b4..0000000000
--- a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/generate.xml
+++ /dev/null
@@ -1,159 +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.    
--->
-<tns:Generate xmlns:tns="http://www.apache.org/tuscany/generate" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-              xsi:schemaLocation="http://www.example.org/generate generate.xsd ">
-                              
-  <Template>
-    <TemplateName>InteropDatabindingTestCase.java.vm</TemplateName>
-    <TemplateTargetDir>../src/test/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage>
-  </Template> 
-  <Template>
-    <TemplateName>interopgreeter.composite.vm</TemplateName>
-    <TemplateTargetDir>classes</TemplateTargetDir>
-  </Template>   
-  <Template>
-    <TemplateName>SDOGreeter.wsdl.vm</TemplateName>
-    <TemplateTargetDir>classes/wsdl</TemplateTargetDir>
-  </Template> 
-  <Template>
-    <TemplateName>JAXBGreeter.wsdl.vm</TemplateName>
-    <TemplateTargetDir>classes/wsdl</TemplateTargetDir>
-  </Template>
-  <InputFile>
-    <FileName>Person.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.sca.itest.databinding.types</JavaPackage>
-    <Factory>TypesFactory</Factory> 
-    <Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace>  
-    <Prefix>p</Prefix> 
-    <Type>
-      <TypeName>PersonType</TypeName>
-      <CreateTypeCode>
-        TypesFactory factory = TypesFactory.INSTANCE;
-        param = factory.createPersonType();
-        param.setFirstName("George");
-        param.setLastName("Doors");
-      </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setGreeting("Hello");
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting());
-      </ResultComparison>      
-    </Type>
-  </InputFile>
-  <InputFile>
-    <FileName>Interop.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.interop</JavaPackage>  
-    <Factory>InteropFactory</Factory>
-    <Namespace>http://www.apache.org/tuscany/interop</Namespace>  
-    <Prefix>i</Prefix> 
-    <!-- Type>
-      <TypeName>AnnotationComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createAnnotationComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type-->  
-    <Type>
-      <TypeName>AttributeComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        org.apache.tuscany.interop.AttributeType attrib = factory.createAttributeType();
-        attrib.setAttribute("SomeText");
-        param = factory.createAttributeComplexType();
-        param.setAttributeElement(attrib);
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.getAttributeElement().setAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>AttributeReferenceComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createAttributeReferenceComplexType();
-        
-        param.setReferencedAttribute("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setReferencedAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
-      </ResultComparison>      
-    </Type>          
-    <Type>
-      <TypeName>SimpleTypeWithAbstractComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createSimpleTypeWithAbstractComplexType();
-        param.setSimpleTypeWithAbstractExtensionElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
-      </ResultComparison>      
-    </Type>           
-    <Type>
-      <TypeName>SimpleTypeWithNameComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createSimpleTypeWithNameComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>ComplexTypeWithContentType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createComplexTypeWithContentType();
-        param.setSimpleTypeWithName("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithName("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName());
-      </ResultComparison>      
-    </Type> 
-  </InputFile> 
-</tns:Generate>
diff --git a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
deleted file mode 100644
index 36797fde57..0000000000
--- a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
+++ /dev/null
@@ -1,78 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
-    name="InteropGreeterService">
-
-    <!-- SDO factory classes -->  
-    #foreach( $file in $fileList )
-    <dbsdo:import.sdo factory="$file.getJavaPackage().$file.getFactory()"/>
-    #end   
-    
-    <!-- Default binding test -->
-    <component name="SDODefaultGreeterServiceClient">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
-        <reference name="greeterService" target="JAXBDefaultGreeterServiceClient"/>
-    </component> 
-        
-    <component name="JAXBDefaultGreeterServiceClient">
-        <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />
-        <reference name="greeterService" target="SDODefaultGreeterServiceComponent"/>
-    </component> 
-
-    <component name="SDODefaultGreeterServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceImpl" />
-    </component>
-
-    <!-- WS binding test -->
-    <component name="SDOWSGreeterServiceClient">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
-    </component>
-
-    <reference name="JAXBWSGreeterServiceReference" promote="SDOWSGreeterServiceClient/greeterService">
-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.interface(GreeterPortType)"/>
-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.port(GreeterService/GreeterPort)"/>
-    </reference>  
-
-    <service name="JAXBWSGreeterService" promote="JAXBWSGreeterServiceClient">
-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.interface(GreeterPortType)"/>
-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/jaxb#wsdl.port(GreeterService/GreeterPort)"/>
-    </service>
-
-    <component name="JAXBWSGreeterServiceClient">
-        <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />
-    </component>
-
-    <reference name="SDOWSGreeterServiceReference" promote="JAXBWSGreeterServiceClient/greeterService">
-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.interface(GreeterPortType)"/>
-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.port(GreeterService/GreeterPort)"/>
-    </reference>  
-
-    <service name="SDOWSGreeterService" promote="SDOWSGreeterServiceComponent">
-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.interface(GreeterPortType)"/>
-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services/sdo#wsdl.port(GreeterService/GreeterPort)"/>
-    </service>
-
-    <component name="SDOWSGreeterServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceImpl" />
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/pom.xml b/java/sca-contrib/itest/databindings/jaxb-bottom-up/pom.xml
deleted file mode 100644
index 45e5720602..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/pom.xml
+++ /dev/null
@@ -1,239 +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>itest-databindings</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-jaxb-bottom-up</artifactId>
-    <version>2.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA Databinding Integration Tests - JAXB Bottom Up</name>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-        <!-- Added by Simon Nash    -->
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.12</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- End of addition   -->
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <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.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.9</version>
-                <executions>
-
-                    <execution>
-                        <id>wsgen</id>
-                        <phase>process-test-classes</phase>
-                        <goals>
-                            <goal>wsgen-test</goal>
-                        </goals>
-                        <configuration>
-                            <sei>org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceSimpleImpl</sei>
-                            <genWsdl>true</genWsdl>
-                            <keep>true</keep>
-                            <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                        </configuration>
-                    </execution>
-
-                </executions>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>com.sun</groupId>
-                        <artifactId>tools</artifactId>
-                        <version>1.5.0</version>
-                        <scope>system</scope>
-                        <systemPath>${java.home}/../lib/tools.jar</systemPath>
-                    </dependency>
-                </dependencies>
-
-            </plugin>
-             -->
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
deleted file mode 100644
index 5d389643cc..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
+++ /dev/null
@@ -1,29 +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.itest.databindings.jaxb;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for AClientService.
- */
-@Remotable
-public interface AClientService {
-    public String getGreetingsForward(String name);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
deleted file mode 100644
index 52f1c01fd8..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.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 org.apache.tuscany.sca.itest.databindings.jaxb;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for AService.
- */
-@Remotable
-@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-public interface AService {
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
deleted file mode 100644
index 7529c2b841..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
+++ /dev/null
@@ -1,63 +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.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean1<T> {
-    private T item;
-    
-    public Bean1() {
-    }
-
-    public Bean1(T item) {
-        this.item = item;
-    }
-
-    public void setItem(T item) {
-        this.item = item;
-    }
-    
-    public T getItem() {
-        return item;
-    }
-    
-    public boolean equals(Object that) {
-        if(that == null) {
-            return false;
-        }
-        if(that.getClass() != this.getClass()) {
-            return false;
-        }
-
-        Bean1<?> that1 = (Bean1<?>)that;
-        if(this == that1) {
-            return true;
-        } else if(this.item != null) {
-            return this.item.equals(that1.item);
-        } else {
-            return that1.item == null;
-        }
-    }
-    
-    public String toString() {
-        return this.getClass().getSimpleName()+"[item = "+item+"]";
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
deleted file mode 100644
index 4a4419a42b..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
+++ /dev/null
@@ -1,25 +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.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean10 extends Bean1<String> {
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
deleted file mode 100644
index 65f019ec48..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
+++ /dev/null
@@ -1,25 +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.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean11 extends Bean1<String> {
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
deleted file mode 100644
index 844e28863a..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
+++ /dev/null
@@ -1,56 +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.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean2 {
-    private String name;
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    public boolean equals(Object that) {
-        if(that == null) {
-            return false;
-        }
-        
-        if(this.getClass() != that.getClass()) {
-            return false;
-        }
-        
-        if(this == that) {
-            return true;
-        } else if(this.name != null) {
-            return this.name.equals(((Bean2)that).name);
-        } else {
-            return ((Bean2)that).name == null;
-        }
-    }
-    
-    public String toString() {
-        return this.getClass().getSimpleName()+"[name = "+name+"]";
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
deleted file mode 100644
index 4e0bd38b2b..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
+++ /dev/null
@@ -1,56 +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.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean3 extends Bean2 {
-    private String address;
-    
-    public void setAddress(String address) {
-        this.address = address;
-    }
-    
-    public String getAddress() {
-        return address;
-    }
-    
-    public boolean equals(Object that) {
-        if(that == null) {
-            return false;
-        }
-        
-        if(this.getClass() != that.getClass()) {
-            return false;
-        }
-        
-        if(this == that) {
-            return true;
-        } else if(this.address != null) {
-            return this.address.equals(((Bean3)that).address) && super.equals(that);
-        } else {
-            return ((Bean3)that).address == null && super.equals(that);
-        }
-    }
-    
-    public String toString() {
-        return this.getClass().getSimpleName()+"[name = "+super.getName()+", address = "+address+"]";
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
deleted file mode 100644
index 40aff31297..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
+++ /dev/null
@@ -1,56 +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.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean31 extends Bean2 {
-    private String address;
-    
-    public void setAddress(String address) {
-        this.address = address;
-    }
-    
-    public String getAddress() {
-        return address;
-    }
-    
-    public boolean equals(Object that) {
-        if(that == null) {
-            return false;
-        }
-        
-        if(this.getClass() != that.getClass()) {
-            return false;
-        }
-        
-        if(this == that) {
-            return true;
-        } else if(this.address != null) {
-            return this.address.equals(((Bean31)that).address) && super.equals(that);
-        } else {
-            return ((Bean31)that).address == null && super.equals(that);
-        }
-    }
-
-    public String toString() {
-        return this.getClass().getSimpleName()+"[name = "+super.getName()+", address = "+address+"]";
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
deleted file mode 100644
index ca012b967d..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
+++ /dev/null
@@ -1,42 +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.itest.databindings.jaxb;
-
-/**
- * The interface for GenericsLocalService.
- * 
- * @version $Rev$ $Date$
- */
-public interface GenericsLocalService {
-    Bean1<String> getTypeExplicit(Bean1<String> arg);
-    
-    <T> Bean1<T> getTypeUnbound(T[] anArray);
-    
-    <T extends Bean2> Bean1<T> getTypeExtends(T[] anArray);
-    
-    <T extends Bean1<String>> Bean1<T> getRecursiveTypeBound(T[] anArray);
-    
-    Bean1<?> getWildcardUnbound(Bean1<?> arg);
-    
-    Bean1<? super Bean3> getWildcardSuper(Bean1<? super Bean3> arg);
-    
-    Bean1<? extends Bean2> getWildcardExtends(Bean1<? extends Bean2> arg);
-    
-    Bean2 getPolymorphic(Bean2 arg);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
deleted file mode 100644
index be446c9759..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
+++ /dev/null
@@ -1,30 +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.itest.databindings.jaxb;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for GenericsService.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface GenericsService extends GenericsLocalService{
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
deleted file mode 100644
index 3bae554dc7..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
+++ /dev/null
@@ -1,43 +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.itest.databindings.jaxb;
-
-/**
- * The interface for GenericsServiceClient.
- * 
- * @version $Rev$ $Date$
- */
-public interface GenericsServiceClient {
-    Bean1<String> getTypeExplicitForward(Bean1<String> arg);
-
-    <T> Bean1<T> getTypeUnboundForward(T[] anArray);
-    
-    <T extends Bean2> Bean1<T> getTypeExtendsForward(T[] anArray);
-
-    <T extends Bean1<String>> Bean1<T> getRecursiveTypeBoundForward(T[] anArray);
-    
-    Bean1<?> getWildcardUnboundForward(Bean1<?> arg);
-    
-    Bean1<? super Bean3> getWildcardSuperForward(Bean1<? super Bean3> arg);
-    
-    Bean1<? extends Bean2> getWildcardExtendsForward(Bean1<? extends Bean2> arg);
-
-    Bean2 getPolymorphicForward(Bean2 arg);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
deleted file mode 100644
index a31cc3d45a..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.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.itest.databindings.jaxb;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The interface for HelloLocalServiceSimple.
- */
-public interface HelloLocalServiceSimple {
-    String getGreetings(String name);
-    String[] getGreetingsArray(String[] names);
-    List<String> getGreetingsList(List<String> names);
-    ArrayList<String> getGreetingsArrayList(ArrayList<String> names);
-    Map<String, String> getGreetingsMap(Map<String, String> namesMap);
-    HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap);
-    String getGreetingsVarArgs(String... names);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
deleted file mode 100644
index df9e6e53ec..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
+++ /dev/null
@@ -1,29 +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.itest.databindings.jaxb;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for HelloServiceSimple.
- */
-@Remotable
-public interface HelloServiceSimple extends HelloLocalServiceSimple {
-    // Add any methods to the local interface.
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
deleted file mode 100644
index 23ed57dec9..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
+++ /dev/null
@@ -1,38 +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.itest.databindings.jaxb;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * The interface for HelloServiceSimpleClient.
- */
-public interface HelloServiceSimpleClient {
-    String getGreetingsForward(String name);
-    String[] getGreetingsArrayForward(String[] names);
-    List<String> getGreetingsListForward(List<String> names);
-    ArrayList<String> getGreetingsArrayListForward(ArrayList<String> names);
-    Map<String, String> getGreetingsMapForward(Map<String, String> namesMap);
-    HashMap<String, String> getGreetingsHashMapForward(HashMap<String, String> namesMap);
-    String getGreetingsVarArgsForward(String... names);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
deleted file mode 100644
index 6239c0f5f1..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
+++ /dev/null
@@ -1,47 +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.itest.databindings.jaxb;
-
-
-/**
- * The interface for PrimitivesLocalService.
- */
-public interface PrimitivesLocalService {
-    boolean negateBoolean(boolean flag);
-    boolean[] negateBooleanArray(boolean[] flags);
-    boolean[] identityBooleanArray(boolean[] flags);
-    byte negateByte(byte b);
-    byte[] negateByteArray(byte[] ba);
-    byte[] identityByteArray(byte[] ba);
-    short negateShort(short s);
-    short[] negateShortArray(short[] s);
-    short[] identityShortArray(short[] sa);
-    int negateInt(int s);
-    int[] negateIntArray(int[] s);
-    int[] identityIntArray(int[] ia);
-    long negateLong(long l);
-    long[] negateLongArray(long[] la);
-    long[] identityLongArray(long[] la);
-    float negateFloat(float f);
-    float[] negateFloatArray(float[] fa);
-    float[] identityFloatArray(float[] fa);
-    double negateDouble(double d);
-    double[] negateDoubleArray(double[] da);
-    double[] identityDoubleArray(double[] da);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
deleted file mode 100644
index 690a2adb3d..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ /dev/null
@@ -1,29 +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.itest.databindings.jaxb;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for PrimitivesService.
- */
-@Remotable
-public interface PrimitivesService extends PrimitivesLocalService {
-    // Add any methods to the local interface.
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
deleted file mode 100644
index 3bdf886dfa..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ /dev/null
@@ -1,48 +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.itest.databindings.jaxb;
-
-
-/**
- * The interface for PrimitivesServiceClient.
- */
-public interface PrimitivesServiceClient {
-    boolean negateBooleanForward(boolean flag);
-    boolean[] negateBooleanArrayForward(boolean[] flags);
-    boolean passByValueBooleanArray();
-    byte negateByteForward(byte b);
-    byte[] negateByteArrayForward(byte[] ba);
-    boolean passByValueByteArray();
-    short negateShortForward(short s);
-    short[] negateShortArrayForward(short[] sa);
-    boolean passByValueShortArray();
-    int negateIntForward(int i);
-    int[] negateIntArrayForward(int[] ia);
-    boolean passByValueIntArray();
-    long negateLongForward(long l);
-    long[] negateLongArrayForward(long[] la);
-    boolean passByValueLongArray();
-    float negateFloatForward(float f);
-    float[] negateFloatArrayForward(float[] fa);
-    boolean passByValueFloatArray();
-    double negateDoubleForward(double d);
-    double[] negateDoubleArrayForward(double[] da);
-    boolean passByValueDoubleArray();
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
deleted file mode 100644
index 0fdf69459f..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
+++ /dev/null
@@ -1,78 +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.itest.databindings.jaxb;
-
-import java.awt.Image;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-
-/**
- * The interface for StandardTypesLocalService.
- */
-public interface StandardTypesLocalService {
-    BigInteger getNewBigInteger(BigInteger bi);
-    BigInteger[] getNewBigIntegerArray(BigInteger[] bia);
-    
-    BigDecimal getNewBigDecimal(BigDecimal bd);
-    BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda);
-
-    Calendar getNewCalendar(Calendar c);
-    Calendar[] getNewCalendarArray(Calendar[] ca);
-    
-    Date getNewDate(Date d);
-    Date[] getNewDateArray(Date[] da);
-
-    QName getNewQName(QName qname);
-    QName[] getNewQNameArray(QName[] qnames);
-    
-    URI getNewURI(URI uri);
-    URI[] getNewURIArray(URI[] uris);
-    
-    XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal);
-    XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcal);
-    
-    Duration getNewDuration(Duration d);
-    Duration[] getNewDurationArray(Duration[] da);
-    
-    Object getNewObject(Object obj);
-    Object[] getNewObjectArray(Object[] objs);
-    
-    Image getNewImage(Image img);
-    Image[] getNewImageArray(Image[] imgs);
-    
-    DataHandler getNewDataHandler(DataHandler dh);
-    DataHandler[] getNewDataHandlerArray(DataHandler[] dha);
-
-    Source getNewSource(Source src);
-    Source[] getNewSourceArray(Source[] srcs);
-    
-    UUID getNewUUID(UUID uuid);
-    UUID[] getNewUUIDArray(UUID[] uuids);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
deleted file mode 100644
index 3b9690b7d2..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ /dev/null
@@ -1,30 +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.itest.databindings.jaxb;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-
-/**
- * The interface for StandardTypesService.
- */
-@Remotable
-public interface StandardTypesService extends StandardTypesLocalService{
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
deleted file mode 100644
index 351d9df0cb..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ /dev/null
@@ -1,79 +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.itest.databindings.jaxb;
-
-import java.awt.Image;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-
-/**
- * The interface for StandardTypesServiceClient.
- */
-public interface StandardTypesServiceClient {
-    BigInteger getNewBigIntegerForward(BigInteger bi);
-    BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia);
-
-    BigDecimal getNewBigDecimalForward(BigDecimal bd);
-    BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda);
-
-    Calendar getNewCalendarForward(Calendar c);
-    Calendar[] getNewCalendarArrayForward(Calendar[] ca);
-
-    Date getNewDateForward(Date d);
-    Date[] getNewDateArrayForward(Date[] da);
-
-    QName getNewQNameForward(QName qname);
-    QName[] getNewQNameArrayForward(QName[] qnames);
-
-    URI getNewURIForward(URI uri);
-    URI[] getNewURIArrayForward(URI[] uris);
-
-    XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal);
-    XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals);
-
-    Duration getNewDurationForward(Duration d);
-    Duration[] getNewDurationArrayForward(Duration[] da);
-
-    Object getNewObjectForward(Object obj);
-    Object[] getNewObjectArrayForward(Object[] objs);
-    
-    Image getNewImageForward(Image img);
-    Image[] getNewImageArrayForward(Image[] imgs);
-    
-    DataHandler getNewDataHandlerForward(DataHandler dh);
-    DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha);
-
-    Source getNewSourceForward(Source src);
-    Source[] getNewSourceArrayForward(Source[] srcs);
-
-    UUID getNewUUIDForward(UUID uuid);
-    UUID[] getNewUUIDArrayForward(UUID[] uuids);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
deleted file mode 100644
index 2f3bd3f2cb..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
+++ /dev/null
@@ -1,38 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.AClientService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.AService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AClientService.class)
-public class AClientServiceImpl implements AClientService {
-
-    @Reference
-    protected AService aService;
-    
-    public String getGreetingsForward(String name) {
-        return aService.getGreetings(name);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
deleted file mode 100644
index 078be8896e..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
+++ /dev/null
@@ -1,33 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.AService;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
deleted file mode 100644
index 4d451e6d32..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
+++ /dev/null
@@ -1,77 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean1;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3;
-import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of GenericsLocalServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- * 
- * @version $Rev$ $Date$
- */
-@Service(GenericsServiceClient.class)
-public class GenericsLocalServiceClientImpl implements GenericsServiceClient {
-
-    private GenericsLocalService service;
-
-    @Reference(required=false)
-    protected void setGenericsLocalService(GenericsLocalService service) {
-        this.service = service;
-    }
-
-    public Bean1<String> getTypeExplicitForward(Bean1<String> arg) {
-        return service.getTypeExplicit(arg);
-    }
-
-    public <T> Bean1<T> getTypeUnboundForward(T[] anArray) {
-        return service.getTypeUnbound(anArray);
-    }
-
-    public <T extends Bean2> Bean1<T> getTypeExtendsForward(T[] anArray) {
-        return service.getTypeExtends(anArray);
-    }
-
-    public <T extends Bean1<String>> Bean1<T> getRecursiveTypeBoundForward(T[] anArray) {
-        return service.getRecursiveTypeBound(anArray);
-    }
-
-    public Bean1<?> getWildcardUnboundForward(Bean1<?> arg) {
-        return service.getWildcardUnbound(arg);
-    }
-    
-    public Bean1<? super Bean3> getWildcardSuperForward(Bean1<? super Bean3> arg) {
-        return service.getWildcardSuper(arg);
-    }
-
-    public Bean1<? extends Bean2> getWildcardExtendsForward(Bean1<? extends Bean2> arg) {
-        return service.getWildcardExtends(arg);
-    }
-
-    public Bean2 getPolymorphicForward(Bean2 arg) {
-        return service.getPolymorphic(arg);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
deleted file mode 100644
index d520e64881..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
+++ /dev/null
@@ -1,40 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of GenericsServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- * 
- * @version $Rev$ $Date$
- */
-@Service(GenericsServiceClient.class)
-public class GenericsServiceClientImpl extends GenericsLocalServiceClientImpl {
-
-    @Reference
-    public void setGenericsService(GenericsService service) {
-        super.setGenericsLocalService(service);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
deleted file mode 100644
index 27dc25289e..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
+++ /dev/null
@@ -1,69 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean1;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3;
-import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of GenericsService.
- * This implementation provides both a local and a remotable service.
- * 
- * @version $Rev$ $Date$
- */
-@Service(interfaces={GenericsService.class, GenericsLocalService.class})
-public class GenericsServiceImpl implements GenericsService, GenericsLocalService {
-
-    public Bean1<String> getTypeExplicit(Bean1<String> arg) {
-        return GenericsTransformer.getTypeExplicit(arg);
-    }
-
-    public <T> Bean1<T> getTypeUnbound(T[] anArray) {
-        return GenericsTransformer.getTypeUnbound(anArray);
-    }
-
-    public <T extends Bean2> Bean1<T> getTypeExtends(T[] anArray) {
-        return GenericsTransformer.getTypeExtends(anArray);
-    }
-
-    public <T extends Bean1<String>> Bean1<T> getRecursiveTypeBound(T[] anArray) {
-        return GenericsTransformer.getRecursiveTypeBound(anArray);
-    }
-
-    public Bean1<?> getWildcardUnbound(Bean1<?> arg) {
-        return GenericsTransformer.getWildcardUnbound(arg);
-    }
-
-    public Bean1<? super Bean3> getWildcardSuper(Bean1<? super Bean3> arg) {
-        return GenericsTransformer.getWildcardSuper(arg);
-    }
-
-    public Bean1<? extends Bean2> getWildcardExtends(Bean1<? extends Bean2> arg) {
-        return GenericsTransformer.getWildcardExtends(arg);
-    }
-
-    public Bean2 getPolymorphic(Bean2 arg) {
-        return GenericsTransformer.getPolymorphic(arg);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
deleted file mode 100644
index 858b8da59a..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
+++ /dev/null
@@ -1,125 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean1;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean10;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean11;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3;
-import org.apache.tuscany.sca.itest.databindings.jaxb.Bean31;
-
-
-/**
- * GenericsTransformer class that provide for transforming input provided to GenericsService methods.
- * 
- * @version $Rev$ $Date$
- */
-public class GenericsTransformer {
-    
-    public static Bean1<String> getTypeExplicit(Bean1<String> arg) {
-        return new Bean1<String>(arg.getItem() == null ? null : arg.getItem()+" AA");
-    }
-    
-    public static <T> Bean1<T> getTypeUnbound(T[] arg) {
-        if(arg instanceof String[]) {
-            return new Bean1<T>(arg[0]);
-        } else if(arg instanceof Integer[]){
-            return new Bean1<T>(arg[1]);
-        } else {
-            return new Bean1<T>(arg[2]);
-        }
-    }
-
-    public static <T extends Bean2> Bean1<T> getTypeExtends(T[] arg) {
-        if(arg instanceof Bean3[]) {
-            return new Bean1<T>(arg[0]);
-        } else if(arg instanceof Bean31[]) {
-            return new Bean1<T>(arg[1]);
-        } else {
-            return new Bean1<T>(arg[2]);
-        }
-    }
-
-    public static <T extends Bean1<String>> Bean1<T> getRecursiveTypeBound(T[] arg) {
-        if(arg instanceof Bean10[]) {
-            return new Bean1<T>(arg[0]);
-        } else if(arg instanceof Bean11[]) {
-            return new Bean1<T>(arg[1]);
-        } else {
-            return new Bean1<T>(arg[2]);
-        }
-    }
-    
-    public static Bean1<?> getWildcardUnbound(Bean1<?> arg) {
-        if(arg.getItem() instanceof String) {
-            Bean1<String> temp = new Bean1<String>();
-            temp.setItem("Hello "+arg.getItem());
-            return temp;
-        } else if(arg.getItem() instanceof Integer) {
-            Bean1<Integer> temp = new Bean1<Integer>();
-            temp.setItem(10+(Integer)arg.getItem());
-            return temp;
-        } else {
-            return new Bean1<String>(arg.toString());
-        }
-    }
-    
-    public static Bean1<? super Bean3> getWildcardSuper(Bean1<? super Bean3> arg) {
-        Object item = arg.getItem();
-        if(item instanceof Bean3) {
-            Bean3 temp = new Bean3();
-            temp.setName("Hello " + ((Bean3)item).getName());
-            temp.setAddress("New "+((Bean3)item).getAddress());
-            return new Bean1<Bean3>(temp);
-        } else if(item instanceof Bean2) {
-            Bean2 temp = new Bean2();
-            temp.setName("Hello " + ((Bean3)item).getName());
-            return new Bean1<Bean2>(temp);
-        } else {
-            Bean2 temp = new Bean2();
-            temp.setName(item.toString());
-            return new Bean1<Bean2>(temp);
-        }
-    }
-
-    public static Bean1<? extends Bean2> getWildcardExtends(Bean1<? extends Bean2> arg) {
-        Bean2 item = arg.getItem();
-        if(item instanceof Bean3) {
-            Bean3 temp = new Bean3();
-            temp.setName("Hello "+item.getName());
-            temp.setAddress("New "+((Bean3)item).getAddress());
-            return new Bean1<Bean3>(temp);
-        } else if(item instanceof Bean31) {
-            Bean31 temp = new Bean31();
-            temp.setName("Hello "+item.getName());
-            temp.setAddress("New "+((Bean31)item).getAddress());
-            return new Bean1<Bean31>(temp);
-        } else {
-            Bean2 temp = new Bean2();
-            temp.setName("Hello "+item.getName());
-            return new Bean1<Bean2>(temp);
-        }
-    }
-    
-    public static Bean2 getPolymorphic(Bean2 arg) {
-        return arg;
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
deleted file mode 100644
index 37b3f1b680..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
+++ /dev/null
@@ -1,73 +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.itest.databindings.jaxb.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple;
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of HelloServiceSimpleClient.
- * The client forwards the request to the service component and returns the response from the service component.
- */
-@Service(HelloServiceSimpleClient.class)
-public class HelloLocalServiceSimpleClientImpl implements HelloServiceSimpleClient {
-
-    private HelloLocalServiceSimple service;
-
-    @Reference(required=false)
-    protected void setHelloLocalServiceSimple(HelloLocalServiceSimple service) {
-        this.service = service;
-    }
-
-    public String getGreetingsForward(String name) {
-        return service.getGreetings(name);
-    }
-
-    public String[] getGreetingsArrayForward(String[] names) {
-        return service.getGreetingsArray(names);
-    }
-
-    public List<String> getGreetingsListForward(List<String> names) {
-        return service.getGreetingsList(names);
-    }
-
-    public Map<String, String> getGreetingsMapForward(Map<String, String> namesMap) {
-        return service.getGreetingsMap(namesMap);
-    }
-
-    public ArrayList<String> getGreetingsArrayListForward(ArrayList<String> names) {
-        return service.getGreetingsArrayList(names);
-    }
-
-    public HashMap<String, String> getGreetingsHashMapForward(HashMap<String, String> namesMap) {
-        return service.getGreetingsHashMap(namesMap);
-    }
-
-    public String getGreetingsVarArgsForward(String... names) {
-        return service.getGreetingsVarArgs(names[0], names[1], names[2]);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
deleted file mode 100644
index 44b6e9d906..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
+++ /dev/null
@@ -1,38 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple;
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of HelloServiceSimpleClient.
- * The client forwards the request to the service component and returns the response from the service component.
- */
-@Service(HelloServiceSimpleClient.class)
-public class HelloServiceSimpleClientImpl extends HelloLocalServiceSimpleClientImpl {
-
-    @Reference
-    public void setHelloServiceSimple(HelloServiceSimple service) {
-        super.setHelloLocalServiceSimple(service);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
deleted file mode 100644
index 5c389bf67f..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
+++ /dev/null
@@ -1,86 +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.itest.databindings.jaxb.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple;
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of HelloServiceSimple.
- * The implementation provides both a local and a remotable service.
- */
-@Service(interfaces = {HelloServiceSimple.class, HelloLocalServiceSimple.class})
-public class HelloServiceSimpleImpl implements HelloServiceSimple {
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-    public String[] getGreetingsArray(String[] names) {
-        String[] resps = new String[names.length];
-        for (int i = 0; i < names.length; ++i) {
-            resps[i] = "Hello " + names[i];
-        }
-        return resps;
-    }
-
-    public List<String> getGreetingsList(List<String> names) {
-        List<String> resps = new ArrayList<String>();
-        for (int i = 0; i < names.size(); ++i) {
-            resps.add("Hello " + names.get(i));
-        }
-        return resps;
-    }
-
-    public ArrayList<String> getGreetingsArrayList(ArrayList<String> names) {
-        ArrayList<String> resps = new ArrayList<String>();
-        for (int i = 0; i < names.size(); ++i) {
-            resps.add("Hello " + names.get(i));
-        }
-        return resps;
-    }
-
-    public Map<String, String> getGreetingsMap(Map<String, String> namesMap) {
-        for (Map.Entry<String, String> entry : namesMap.entrySet()) {
-            entry.setValue("Hello " + entry.getKey());
-        }
-        return namesMap;
-    }
-
-    public HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap) {
-        for (Map.Entry<String, String> entry : namesMap.entrySet()) {
-            entry.setValue("Hello " + entry.getKey());
-        }
-        return namesMap;
-    }
-
-    public String getGreetingsVarArgs(String... names) {
-        String resp = "Hello";
-        for(int i = 0; i < names.length; ++i) {
-            resp += (" "+names[i]);
-        }
-        return resp;
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
deleted file mode 100644
index eea19521c4..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
+++ /dev/null
@@ -1,138 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of PrimitivesLocalServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- */
-@Service(PrimitivesServiceClient.class)
-public class PrimitivesLocalServiceClientImpl implements PrimitivesServiceClient {
-
-    private PrimitivesLocalService service;
-
-    @Reference(required=false)
-    protected void setPrimitivesLocalService(PrimitivesLocalService service) {
-        this.service = service;
-    }
-
-    public boolean negateBooleanForward(boolean flag) {
-        return service.negateBoolean(flag);
-    }
-    
-    public boolean[] negateBooleanArrayForward(boolean[] flags) {
-        return service.negateBooleanArray(flags);
-    }
-
-    public boolean passByValueBooleanArray() {
-        boolean[] req = new boolean[2];
-        boolean[] resp = service.identityBooleanArray(req);
-        return req != resp;
-    }
-    
-    public byte negateByteForward(byte b) {
-        return service.negateByte(b);
-    }
-    
-    public byte[] negateByteArrayForward(byte[] ba) {
-        return service.negateByteArray(ba);
-    }
-
-    public boolean passByValueByteArray() {
-        byte[] req = new byte[2];
-        byte[] resp = service.identityByteArray(req);
-        return req != resp;
-    }
-    
-    public short negateShortForward(short s) {
-        return service.negateShort(s);
-    }
-    
-    public short[] negateShortArrayForward(short[] s) {
-        return service.negateShortArray(s);
-    }
-
-    public boolean passByValueShortArray() {
-        short[] req = new short[2];
-        short[] resp = service.identityShortArray(req);
-        return req != resp;
-    }
-    
-    public int negateIntForward(int i) {
-        return service.negateInt(i);
-    }
-    
-    public int[] negateIntArrayForward(int[] ia) {
-        return service.negateIntArray(ia);
-    }
-
-    public boolean passByValueIntArray() {
-        int[] req = new int[2];
-        int[] resp = service.identityIntArray(req);
-        return req != resp;
-    }
-    
-    public long negateLongForward(long l) {
-        return service.negateLong(l);
-    }
-    
-    public long[] negateLongArrayForward(long[] la) {
-        return service.negateLongArray(la);
-    }
-
-    public boolean passByValueLongArray() {
-        long[] req = new long[2];
-        long[] resp = service.identityLongArray(req);
-        return req != resp;
-    }
-    
-    public float negateFloatForward(float f) {
-        return service.negateFloat(f);
-    }
-    
-    public float[] negateFloatArrayForward(float[] fa) {
-        return service.negateFloatArray(fa);
-    }
-
-    public boolean passByValueFloatArray() {
-        float[] req = new float[2];
-        float[] resp = service.identityFloatArray(req);
-        return req != resp;
-    }
-    
-    public double negateDoubleForward(double d) {
-        return service.negateDouble(d);
-    }
-    
-    public double[] negateDoubleArrayForward(double[] da) {
-        return service.negateDoubleArray(da);
-    }
-
-    public boolean passByValueDoubleArray() {
-        double[] req = new double[2];
-        double[] resp = service.identityDoubleArray(req);
-        return req != resp;
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
deleted file mode 100644
index 263d1212ca..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ /dev/null
@@ -1,38 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of PrimitivesServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- */
-@Service(PrimitivesServiceClient.class)
-public class PrimitivesServiceClientImpl extends PrimitivesLocalServiceClientImpl {
-
-    @Reference
-    public void setPrimitivesService(PrimitivesService service) {
-        super.setPrimitivesLocalService(service);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
deleted file mode 100644
index 9e14140752..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ /dev/null
@@ -1,151 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of PrimitivesService.
- * This implementation provides both a local and a remotable service.
- */
-@Service(interfaces={PrimitivesService.class, PrimitivesLocalService.class})
-public class PrimitivesServiceImpl implements PrimitivesService, PrimitivesLocalService {
-
-    public boolean negateBoolean(boolean flag) {
-        return !flag;
-    }
-
-    public boolean[] negateBooleanArray(boolean[] flags) {
-        boolean[] resp = new boolean[flags.length];
-        
-        for(int i = 0; i < flags.length; ++i) {
-            resp[i] = !flags[i];
-        }
-        return resp;
-    }
-    
-    public boolean[] identityBooleanArray(boolean[] flags) {
-        return flags;
-    }
-    
-    public byte negateByte(byte b) {
-        return (byte)-b;
-    }
-
-    public byte[] negateByteArray(byte[] ba) {
-        byte[] resp = new byte[ba.length];
-        
-        for(int i = 0; i < ba.length; ++i) {
-            resp[i] = (byte)-ba[i];
-        }
-        return resp;
-    }
-    
-    public byte[] identityByteArray(byte[] ba) {
-        return ba;
-    }
-    
-    public short negateShort(short s) {
-        return (short)-s;
-    }
-
-    public short[] negateShortArray(short[] s) {
-        short[] resp = new short[s.length];
-        
-        for(int i = 0; i < s.length; ++i) {
-            resp[i] = (short)-s[i];
-        }
-        return resp;
-    }
-    
-    public short[] identityShortArray(short[] sa) {
-        return sa;
-    }
-
-    public int negateInt(int i) {
-        return -i;
-    }
-
-    public int[] negateIntArray(int[] ia) {
-        int[] resp = new int[ia.length];
-        
-        for(int i = 0; i < ia.length; ++i) {
-            resp[i] = -ia[i];
-        }
-        return resp;
-    }
-
-    public int[] identityIntArray(int[] ia) {
-        return ia;
-    }
-    
-    public long negateLong(long l) {
-        return -l;
-    }
-
-    public long[] negateLongArray(long[] la) {
-        long[] resp = new long[la.length];
-        
-        for(int i = 0; i < la.length; ++i) {
-            resp[i] = -la[i];
-        }
-        return resp;
-    }
-    
-    public long[] identityLongArray(long[] la) {
-        return la;
-    }
-    
-    public float negateFloat(float f) {
-        return -f;
-    }
-
-    public float[] negateFloatArray(float[] fa) {
-        float[] resp = new float[fa.length];
-        
-        for(int i = 0; i < fa.length; ++i) {
-            resp[i] = -fa[i];
-        }
-        return resp;
-    }
-    
-    public float[] identityFloatArray(float[] fa) {
-        return fa;
-    }
-    
-    public double negateDouble(double d) {
-        return -d;
-    }
-
-    public double[] negateDoubleArray(double[] da) {
-        double[] resp = new double[da.length];
-        
-        for(int i = 0; i < da.length; ++i) {
-            resp[i] = -da[i];
-        }
-        return resp;
-    }
-    
-    public double[] identityDoubleArray(double[] da) {
-        return da;
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
deleted file mode 100644
index 3ceee3c4b1..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
+++ /dev/null
@@ -1,157 +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.itest.databindings.jaxb.impl;
-
-import java.awt.Image;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of StandardTypesLocalServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- */
-@Service(StandardTypesServiceClient.class)
-public class StandardTypesLocalServiceClientImpl implements StandardTypesServiceClient {
-
-    private StandardTypesLocalService service;
-
-    @Reference(required=false)
-    protected void setStandardTypesLocalService(StandardTypesLocalService service) {
-        this.service = service;
-    }
-
-    public BigInteger getNewBigIntegerForward(BigInteger bi) {
-        return service.getNewBigInteger(bi);
-    }
-
-    public BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia) {
-        return service.getNewBigIntegerArray(bia);
-    }
-
-    public BigDecimal getNewBigDecimalForward(BigDecimal bd) {
-        return service.getNewBigDecimal(bd);
-    }
-
-    public BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda) {
-        return service.getNewBigDecimalArray(bda);
-    }
-    public Calendar getNewCalendarForward(Calendar c) {
-        return service.getNewCalendar(c);
-    }
-    public Calendar[] getNewCalendarArrayForward(Calendar[] ca) {
-        return service.getNewCalendarArray(ca);
-    }
-
-    public Date getNewDateForward(Date d) {
-        return service.getNewDate(d);
-    }
-
-    public Date[] getNewDateArrayForward(Date[] da) {
-        return service.getNewDateArray(da);
-    }
-
-    public QName getNewQNameForward(QName qname) {
-        return service.getNewQName(qname);
-    }
-
-    public QName[] getNewQNameArrayForward(QName[] qnames) {
-        return service.getNewQNameArray(qnames);        
-    }
-
-    public URI getNewURIForward(URI uri) {
-        return service.getNewURI(uri);
-    }
-
-    public URI[] getNewURIArrayForward(URI[] uris) {
-        return service.getNewURIArray(uris);
-    }
-
-    public XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal) {
-        return service.getNewXMLGregorianCalendar(xgcal);
-    }
-
-    public XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals) {
-        return service.getNewXMLGregorianCalendarArray(xgcals);
-    }
-
-    public Duration getNewDurationForward(Duration d) {
-        return service.getNewDuration(d);
-    }
-
-    public Duration[] getNewDurationArrayForward(Duration[] da) {
-        return service.getNewDurationArray(da);
-    }
-
-    public Object getNewObjectForward(Object obj) {
-        return service.getNewObject(obj);
-    }
-
-    public Object[] getNewObjectArrayForward(Object[] objs) {
-        return service.getNewObjectArray(objs);
-    }
-    
-    public Image getNewImageForward(Image img) {
-        return service.getNewImage(img);
-    }
-
-    public Image[] getNewImageArrayForward(Image[] imgs) {
-        return service.getNewImageArray(imgs);
-    }
-
-    public DataHandler getNewDataHandlerForward(DataHandler dh) {
-        return service.getNewDataHandler(dh);
-    }
-
-    public DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha) {
-        return service.getNewDataHandlerArray(dha);
-    }
-
-    
-    public Source getNewSourceForward(Source src) {
-        return service.getNewSource(src);
-    }
-
-    public Source[] getNewSourceArrayForward(Source[] srcs) {
-        return service.getNewSourceArray(srcs);
-    }
-    
-    public UUID getNewUUIDForward(UUID uuid) {
-        return service.getNewUUID(uuid);
-    }
-
-    public UUID[] getNewUUIDArrayForward(UUID[] uuids) {
-        return service.getNewUUIDArray(uuids);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
deleted file mode 100644
index 6aefb05c83..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ /dev/null
@@ -1,38 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of StandardTypesServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- */
-@Service(StandardTypesServiceClient.class)
-public class StandardTypesServiceClientImpl extends StandardTypesLocalServiceClientImpl {
-
-    @Reference
-    public void setStandardTypesService(StandardTypesService service) {
-        super.setStandardTypesLocalService(service);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
deleted file mode 100644
index 42fb9cbac2..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ /dev/null
@@ -1,208 +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.itest.databindings.jaxb.impl;
-
-import java.awt.Image;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of StandardTypesService.
- * This implementation provides both a local and a remotable service.
- */
-@Service(interfaces={StandardTypesService.class, StandardTypesLocalService.class})
-public class StandardTypesServiceImpl implements StandardTypesService, StandardTypesLocalService {
-
-    public BigInteger getNewBigInteger(BigInteger bi) {
-        return bi.negate();
-    }
-
-    public BigInteger[] getNewBigIntegerArray(BigInteger[] bia) {
-        BigInteger[] resp = new BigInteger[bia.length];
-        for(int i = 0; i < bia.length; ++i) {
-            resp[i] = bia[i].negate();
-        }
-        return resp;
-    }
-
-    public BigDecimal getNewBigDecimal(BigDecimal bd) {
-        return bd.negate();
-    }
-
-    public BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda) {
-        BigDecimal[] resp = new BigDecimal[bda.length];
-        for(int i = 0; i < bda.length; ++i) {
-            resp[i] = bda[i].negate();
-        }
-        return resp;
-    }
-
-    public Calendar getNewCalendar(Calendar c) {
-        Calendar resp = (Calendar)c.clone();
-        resp.add(Calendar.DAY_OF_MONTH, 5);
-        return resp;
-    }
-
-    public Calendar[] getNewCalendarArray(Calendar[] ca) {
-        Calendar[] resp = new Calendar[ca.length];
-        for(int i = 0; i < ca.length; ++i) {
-            resp[i] = getNewCalendar(ca[i]);
-        }
-        return resp;
-    }
-
-    public Date getNewDate(Date d) {
-        return new Date(d.getTime() + 5*24*60*60*1000);
-    }
-
-    public Date[] getNewDateArray(Date[] da) {
-        Date[] resp = new Date[da.length];
-        for(int i = 0; i < da.length; ++i) {
-            resp[i] = getNewDate(da[i]);
-        }
-        return resp;
-    }
-
-    public QName getNewQName(QName qname) {
-        return new QName(qname.getNamespaceURI()+"q", qname.getLocalPart()+"q", qname.getPrefix()+"q");
-        
-    }
-
-    public QName[] getNewQNameArray(QName[] qnames) {
-        QName[] resp = new QName[qnames.length];
-        for(int i = 0; i < qnames.length; ++i) {
-            resp[i] = getNewQName(qnames[i]);
-        }
-        return resp;
-    }
-
-    public URI getNewURI(URI uri) {
-        return uri.resolve("uri");
-    }
-
-    public URI[] getNewURIArray(URI[] uris) {
-        URI[] resp = new URI[uris.length];
-        for(int i = 0; i < uris.length; ++i) {
-            resp[i] = getNewURI(uris[i]);
-        }
-        return resp;
-    }
-
-    public XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal) {
-        xgcal = (XMLGregorianCalendar)xgcal.clone();
-        xgcal.setDay(xgcal.getDay()+5);
-        return xgcal;
-    }
-
-    public XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcals) {
-        XMLGregorianCalendar[] resp = new XMLGregorianCalendar[xgcals.length];
-        for(int i = 0; i < xgcals.length; ++i) {
-            resp[i] = getNewXMLGregorianCalendar(xgcals[i]);
-        }
-        return resp;
-    }
-
-    public Duration getNewDuration(Duration d) {
-        return d.negate();
-    }
-
-    public Duration[] getNewDurationArray(Duration[] da) {
-        Duration[] resp = new Duration[da.length];
-        for(int i = 0; i < da.length; ++i) {
-            resp[i] = da[i].negate();
-        }
-        return resp;
-    }
-
-    public Object getNewObject(Object obj) {
-        return StandardTypesTransformer.getNewObject(obj);
-    }
-
-    public Object[] getNewObjectArray(Object[] objs) {
-        Object[] resp = new Object[objs.length];
-        for(int i = 0; i < objs.length; ++i) {
-            resp[i] = getNewObject(objs[i]);
-        }
-        return resp;
-    }
-
-    public Image getNewImage(Image img) {
-        return StandardTypesTransformer.getNewImage(img);
-    }
-
-    public Image[] getNewImageArray(Image[] imgs) {
-        Image[] resp = new Image[imgs.length];
-        for(int i = 0; i < imgs.length; ++i) {
-            resp[i] = getNewImage(imgs[i]);
-        }
-        return resp;
-    }
-
-    public DataHandler getNewDataHandler(DataHandler dh) {
-        // FIXME: transform the input
-        return dh;
-    }
-
-    public DataHandler[] getNewDataHandlerArray(DataHandler[] dha) {
-        DataHandler[] resp = new DataHandler[dha.length];
-        for(int i = 0; i < dha.length; ++i) {
-            resp[i] = dha[i];
-        }
-        return resp;
-    }
-    
-    public Source getNewSource(Source src) {
-        return StandardTypesTransformer.getNewSource(src);
-    }
-
-    public Source[] getNewSourceArray(Source[] srcs) {
-        Source[] resp = new Source[srcs.length];
-        for(int i = 0; i < srcs.length; ++i) {
-            resp[i] = getNewSource(srcs[i]);
-        }
-        return resp;
-    }
-
-    public UUID getNewUUID(UUID uuid) {
-        return UUID.fromString(uuid.toString()+"AAA");
-    }
-
-    public UUID[] getNewUUIDArray(UUID[] uuids) {
-        UUID[] resp = new UUID[uuids.length];
-        for(int i = 0; i < uuids.length; ++i) {
-            resp[i] = getNewUUID(uuids[i]);
-        }
-        return resp;
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
deleted file mode 100644
index 68510b4b03..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ /dev/null
@@ -1,144 +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.itest.databindings.jaxb.impl;
-
-import java.awt.Image;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.CharArrayReader;
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamSource;
-
-import org.xml.sax.InputSource;
-
-
-
-/**
- * StandardTypesTransformer class that provide for transforming input provided to StandardTypesService methods.
- * 
- * @version $Rev$ $Date$
- */
-public class StandardTypesTransformer {
-    
-    public static Object getNewObject(Object obj) {
-        if(obj instanceof String) {
-            return "Hello "+obj;
-        } else if(obj instanceof Integer) {
-            return new Integer(-((Integer)obj).intValue());
-        } else if(obj instanceof Double) {
-            return new Double(-((Double)obj).doubleValue());
-        }
-        
-        return obj;
-    }
-    
-    /**
-     * Returns a copy of the source object if the input is DOMSource, SAXSource or StreamSource.
-     * Returns the input object as is for other types.
-     */
-    public static Source getNewSource(Source src) {
-        Source ret = null;
-        if(src instanceof DOMSource) {
-            DOMSource dsrc = (DOMSource)src;
-            ret = new DOMSource(dsrc.getNode() != null ? dsrc.getNode().cloneNode(true) : null);
-        } else if(src instanceof SAXSource) {
-            SAXSource ssrc = (SAXSource)src;
-            if(ssrc.getInputSource().getByteStream() != null) {
-                InputStream inp = ssrc.getInputSource().getByteStream();
-                ByteArrayOutputStream bout = new ByteArrayOutputStream();
-                int b;
-                try {
-                    while((b = inp.read()) != -1) {
-                        bout.write(b);
-                    }
-                } catch (IOException ignored) {
-                }
-                try { bout.close();} catch (IOException ignored) {}
-                try { inp.reset();} catch (IOException ignored) {}
-                ret = new SAXSource(new InputSource(new ByteArrayInputStream(bout.toByteArray())));
-            } else if(ssrc.getInputSource().getCharacterStream() != null) {
-                Reader rdr = ssrc.getInputSource().getCharacterStream();
-                CharArrayWriter caw = new CharArrayWriter();
-                try {
-                    int c;
-                    while((c = rdr.read()) != -1) {
-                        caw.append((char)c);
-                    }
-                } catch (IOException ignored) {
-                }
-                caw.close();
-                try{ rdr.reset();} catch(IOException ignored) {}
-                ret = new SAXSource(new InputSource(new CharArrayReader(caw.toCharArray())));
-            } else {
-                ret = new SAXSource();
-            }
-        } else if(src instanceof StreamSource) {
-            StreamSource ssrc = (StreamSource)src;
-            if(ssrc.getInputStream() != null) {
-                InputStream inp = ssrc.getInputStream();
-                ByteArrayOutputStream bout = new ByteArrayOutputStream();
-                int b;
-                try {
-                    while((b = inp.read()) != -1) {
-                        bout.write(b);
-                    }
-                } catch (IOException ignored) {
-                }
-                try { bout.close();} catch (IOException ignored) {}
-                try { inp.reset();} catch (IOException ignored) {}
-                ret = new StreamSource(new ByteArrayInputStream(bout.toByteArray()));
-            } else if(ssrc.getReader() != null) {
-                Reader rdr = ssrc.getReader();
-                CharArrayWriter caw = new CharArrayWriter();
-                try {
-                    int c;
-                    while((c = rdr.read()) != -1) {
-                        caw.append((char)c);
-                    }
-                } catch (IOException ignored) {
-                }
-                caw.close();
-                try{ rdr.reset();} catch(IOException ignored) {}
-                ret = new StreamSource(new CharArrayReader(caw.toCharArray()));
-            } else {
-                ret = new StreamSource();
-            }
-        }
-        
-        if(ret != null) {
-            ret.setSystemId(src.getSystemId());
-        } else {
-            ret = src;
-        }
-        return ret;
-    }
-    
-    public static Image getNewImage(Image arg) {
-        arg.getGraphics().drawOval(2, 2, 7, 7);
-        return arg;
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
deleted file mode 100644
index 10a242be4d..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
+++ /dev/null
@@ -1,127 +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://jaxb.databindings.itest.sca.tuscany.apache.org"

-                  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"

-                  xmlns:ns0="http://jaxb.databindings.itest.sca.tuscany.apache.org"

-                  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"

-                  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"

-                  xmlns:ns1="http://org.apache.axis2/xsd"

-                  xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"

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

-                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

-  <wsdl:types>

-    <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org" xmlns:ns="http://jaxb.databindings.itest.sca.tuscany.apache.org">

-            <xs:element name="getGreetings" nillable="true" type="xs:string"/>

-            <xs:element name="getGreetingsResponse" nillable="true" type="xs:string"/>

-    </xs:schema>

-  </wsdl:types>

-

-  <wsdl:message name="getGreetingsRequest">

-    <wsdl:part name="parameters" element="ns0:getGreetings"/>

-  </wsdl:message>

-

-  <wsdl:message name="getGreetingsResponse">

-    <wsdl:part name="parameters" element="ns0:getGreetingsResponse"/>

-  </wsdl:message>

-

-  <wsdl:portType name="AServicePortType">

-    <wsdl:operation name="getGreetings">

-      <wsdl:input message="ns0:getGreetingsRequest" wsaw:Action="urn:getGreetings"/>

-      <wsdl:output message="ns0:getGreetingsResponse" wsaw:Action="urn:getGreetingsResponse"/>

-    </wsdl:operation>

-  </wsdl:portType>

-

-  <wsdl:binding name="AServiceSOAP12Binding" type="ns0:AServicePortType">

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

-    <wsdl:operation name="getGreetings">

-      <soap12:operation soapAction="urn:getGreetings" style="document"/>

-      <wsdl:input>

-        <soap12:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap12:body use="literal"/>

-      </wsdl:output>

-    </wsdl:operation>

-  </wsdl:binding>

-

-  <wsdl:binding name="AServicePortTypeBinding" type="ns0:AServicePortType">

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

-    <wsdl:operation name="getGreetings">

-      <soap:operation soapAction=""/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-    </wsdl:operation>

-  </wsdl:binding>

-

-  <wsdl:binding name="AServiceHttpBinding" type="ns0:AServicePortType">

-    <http:binding verb="POST"/>

-    <wsdl:operation name="getGreetings">

-      <http:operation location="AService/getGreetings"/>

-      <wsdl:input>

-        <mime:content part="getGreetings" type="text/xml"/>

-      </wsdl:input>

-      <wsdl:output>

-        <mime:content part="getGreetings" type="text/xml"/>

-      </wsdl:output>

-    </wsdl:operation>

-  </wsdl:binding>

-

-  <wsdl:binding name="AServiceSOAP11Binding" type="ns0:AServicePortType">

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

-    <wsdl:operation name="getGreetings">

-      <soap:operation soapAction="urn:getGreetings" style="document"/>

-      <wsdl:input>

-        <soap:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body use="literal"/>

-      </wsdl:output>

-    </wsdl:operation>

-  </wsdl:binding>

-

-  <wsdl:service name="AServicePortTypeService">

-    <wsdl:port name="AServicePortTypePort" binding="ns0:AServicePortTypeBinding">

-      <soap:address location="http://localhost:8080/AService"/>

-    </wsdl:port>

-  </wsdl:service>

-

-  <wsdl:service name="AService">

-    <wsdl:port name="AServiceHttpport" binding="ns0:AServiceHttpBinding">

-      <http:address location="http://localhost:8080/AService/httpport"/>

-    </wsdl:port>

-    <wsdl:port name="AServiceSOAP12port_http" binding="ns0:AServiceSOAP12Binding">

-      <soap12:address location="http://localhost:8080/AService/soap12port"/>

-    </wsdl:port>

-    <wsdl:port name="AServiceSOAP11port_http" binding="ns0:AServiceSOAP11Binding">

-      <soap:address location="http://localhost:8080/AService/soap11port"/>

-    </wsdl:port>

-    <wsdl:port name="AServiceSOAP12port_http_null" binding="ns0:AServiceSOAP12Binding">

-      <soap12:address location=""/>

-    </wsdl:port>

-    <wsdl:port name="AServiceSOAP12port_http_wsdl" binding="ns0:AServiceSOAP12Binding">

-      <soap12:address location="inWsdl"/>

-    </wsdl:port>

-  </wsdl:service>

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
deleted file mode 100644
index 5ecbb9edee..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
+++ /dev/null
@@ -1,37 +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://itest" name="doclitbarewsdltest">

-          

-    <component name="AComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.AServiceImpl"/>

-        <service name="AService">

-            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org#wsdl.interface(AServicePortType)"/>

-            <binding.ws uri="http://localhost:8085/AService/endpointref"/>

-        </service>

-    </component>

-    <component name="AClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <!--interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org#wsdl.interface(AServicePortType)"/-->

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.AService"/>

-            <binding.ws uri="http://localhost:8085/AService/endpointref"/>

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
deleted file mode 100644
index 2d47ba7b14..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
+++ /dev/null
@@ -1,69 +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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-           name="GenericsService">
-           
-    <!-- Clients to test the service -->
-    <!-- A GenericsServiceClient component that uses WS binding to invoke GenericsService -->
-    <component name="GenericsServiceClientWSComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsServiceClientImpl" />
-        <reference name="genericsService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService"/>
-            <binding.ws uri="http://localhost:8085/gs-ep"/>
-        </reference>
-    </component>
-
-    <!-- A GenericsServiceClient component that uses SCA binding to invoke GenericsService service -->
-    <component name="GenericsServiceClientSCAComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsServiceClientImpl" />
-        <reference name="genericsService" target="GenericsServiceComponent/GenericsService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService"/>
-            <binding.sca/>
-        </reference>
-    </component>
-    
-    <!-- A GenericsLocalServiceClient component that uses SCA binding to invoke GenericsLocalService service -->
-    <component name="GenericsLocalServiceClientSCAComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsLocalServiceClientImpl" />
-        <reference name="genericsLocalService" target="GenericsServiceComponent/GenericsLocalService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService"/>
-            <binding.sca/>
-        </reference>
-    </component>
-
-    <!-- Components used to implement the services -->
-    <!-- A GenericsService component. -->
-    <component name="GenericsServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsServiceImpl"/>
-        <service name="GenericsService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService"/>
-            <binding.ws uri="http://localhost:8085/gs-ep"/>
-            <binding.sca/>
-        </service>
-        <service name="GenericsLocalService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService"/>
-            <binding.sca/>
-        </service>
-    </component>
-</composite>
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
deleted file mode 100644
index c39cf21002..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
+++ /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.

--->

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 

-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-           name="HelloService">

-           

-    <!-- Clients to test the service -->

-    <!-- A HelloServiceSimpleClient component that uses WS binding to invoke HelloServiceSimple service -->

-    <component name="HelloServiceSimpleClientWSComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceSimpleClientImpl" />

-        <reference name="helloServiceSimple">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple"/>

-            <binding.ws uri="http://localhost:8085/hs-ep0"/>

-        </reference>

-    </component>

-

-    <!-- A HelloServiceSimpleClient component that uses SCA binding to invoke HelloServiceSimple service -->

-    <component name="HelloServiceSimpleClientSCAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceSimpleClientImpl" />

-        <reference name="helloServiceSimple" target="HelloServiceSimpleComponent/HelloServiceSimple">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple"/>

-            <binding.sca/>

-        </reference>

-    </component>

-    

-    <!-- A HelloLocalServiceSimpleClient component that uses SCA binding to invoke HelloLocalServiceSimple service -->

-    <component name="HelloLocalServiceSimpleClientSCAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloLocalServiceSimpleClientImpl" />

-        <reference name="helloLocalServiceSimple" target="HelloServiceSimpleComponent/HelloLocalServiceSimple">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple"/>

-            <binding.sca/>

-        </reference>

-    </component>

-

-    <!-- Components used to implement the services -->

-    <!-- A HelloServiceSimple component. -->

-    <component name="HelloServiceSimpleComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceSimpleImpl"/>

-        <service name="HelloServiceSimple">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple"/>

-            <binding.ws uri="http://localhost:8085/hs-ep0"/>

-            <binding.sca/>

-        </service>

-        <service name="HelloLocalServiceSimple">

-            <binding.sca/>

-        </service>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
deleted file mode 100644
index 4b0a6e215d..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
+++ /dev/null
@@ -1,66 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-           name="PrimitivesService">

-           

-    <!-- Clients to test the service -->

-    <!-- A PrimitivesServiceClient component that uses WS binding to invoke PrimitivesService -->

-    <component name="PrimitivesServiceClientWSComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />

-        <reference name="primitivesService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/>

-            <binding.ws uri="http://localhost:8085/ps-ep"/>

-        </reference>

-    </component>

-

-    <!-- A PrimitivesServiceClient component that uses SCA binding to invoke PrimitivesService service -->

-    <component name="PrimitivesServiceClientSCAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />

-        <reference name="primitivesService" target="PrimitivesServiceComponent/PrimitivesService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/>

-            <binding.sca/>

-        </reference>

-    </component>

-    

-    <!-- A PrimitivesLocalServiceClient component that uses SCA binding to invoke PrimitivesLocalService service -->

-    <component name="PrimitivesLocalServiceClientSCAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesLocalServiceClientImpl" />

-        <reference name="primitivesLocalService" target="PrimitivesServiceComponent/PrimitivesLocalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService"/>

-            <binding.sca/>

-        </reference>

-    </component>

-

-    <!-- Components used to implement the services -->

-    <!-- A PrimitivesService component. -->

-    <component name="PrimitivesServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceImpl"/>

-        <service name="PrimitivesService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/>

-            <binding.ws uri="http://localhost:8085/ps-ep"/>

-            <binding.sca/>

-        </service>

-        <service name="PrimitivesLocalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService"/>

-            <binding.sca/>

-        </service>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
deleted file mode 100644
index 13ef73c082..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
+++ /dev/null
@@ -1,66 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-           name="StandardTypesService">

-           

-    <!-- Clients to test the service -->

-    <!-- A StandardTypesServiceClient component that uses WS binding to invoke StandardTypesService -->

-    <component name="StandardTypesServiceClientWSComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />

-        <reference name="standardTypesService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/>

-            <binding.ws uri="http://localhost:8085/sts-ep"/>

-        </reference>

-    </component>

-

-    <!-- A StandardTypesServiceClient component that uses SCA binding to invoke StandardTypesService service -->

-    <component name="StandardTypesServiceClientSCAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />

-        <reference name="standardTypesService" target="StandardTypesServiceComponent/StandardTypesService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/>

-            <binding.sca/>

-        </reference>

-    </component>

-    

-    <!-- A StandardTypesLocalServiceClient component that uses SCA binding to invoke StandardTypesLocalService service -->

-    <component name="StandardTypesLocalServiceClientSCAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesLocalServiceClientImpl" />

-        <reference name="standardTypesLocalService" target="StandardTypesServiceComponent/StandardTypesLocalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService"/>

-            <binding.sca/>

-        </reference>

-    </component>

-

-    <!-- Components used to implement the services -->

-    <!-- A StandardTypesService component. -->

-    <component name="StandardTypesServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceImpl"/>

-        <service name="StandardTypesService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/>

-            <binding.ws uri="http://localhost:8085/sts-ep"/>

-            <binding.sca/>

-        </service>

-        <service name="StandardTypesLocalService">

-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService"/>

-            <binding.sca/>

-        </service>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
deleted file mode 100644
index 4967b896a5..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
+++ /dev/null
@@ -1,339 +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.itest.databindings.jaxb;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DatabindingTestCase {
-
-    private static SCADomain domain;
-
-    /**
-     * Runs once before running the tests
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        try { 
-            domain = SCADomain.newInstance("helloservice.composite");
-        } catch(Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Runs once after running the tests
-     */
-    @AfterClass
-    public static void tearDown() {
-        domain.close();
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetings.
-     */
-    @Test
-    public void testSCA() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTest(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsArray.
-     */
-    @Test
-    public void testSCAArray() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTestArray(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsList.
-     */
-    @Test
-    public void testSCAList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTestList(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsArrayList.
-     */
-    @Test
-    public void testSCAArrayList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTestArrayList(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsMap.
-     */
-    @Test
-    public void testSCAMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTestMap(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsHashMap.
-     */
-    @Test
-    public void testSCAHashMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTestHashMap(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsVarArgs.
-     */
-    @Test
-    public void testSCAVarArgs() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent");
-        performTestVarArgs(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetings.
-     */
-    @Test
-    public void testWS() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTest(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetingsArray.
-     */
-    @Test
-    public void testWSArray() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTestArray(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetingsList.
-     */
-    @Test
-    public void testWSList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTestList(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetingsArrayList.
-     */
-    @Test
-    public void testWSArrayList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTestArrayList(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetingsMap.
-     */
-    @Test
-    public void testWSMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTestMap(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetingsHashMap.
-     */
-    @Test
-    public void testWSHashMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTestHashMap(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloServiceSimple service using WS binding.
-     * Service method invoked is getGreetingsVarArgs.
-     */
-    @Test
-    public void testWSVarArgs() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent");
-        performTestVarArgs(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetings.
-     */
-    @Test
-    public void testSCALocal() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTest(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsArray.
-     */
-    @Test
-    public void testSCALocalArray() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTestArray(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsList.
-     */
-    @Test
-    public void testSCALocalList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTestList(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsArrayList.
-     */
-    @Test
-    public void testSCALocalArrayList() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTestArrayList(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsMap.
-     */
-    @Test
-    public void testSCALocalMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTestMap(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsHashMap.
-     */
-    @Test
-    public void testSCALocalHashMap() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTestHashMap(helloServiceSimpleClient);
-    }
-
-    /**
-     * Invokes the HelloLocalServiceSimple service using SCA binding.
-     * Service method invoked is getGreetingsVarArgs.
-     */
-    @Test
-    public void testSCALocalVarArgs() throws Exception {
-        HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent");
-        performTestVarArgs(helloServiceSimpleClient);
-    }
-
-    private void performTest(HelloServiceSimpleClient helloServiceSimpleClient) {
-        String name = "Pandu";
-        String resp = helloServiceSimpleClient.getGreetingsForward(name);
-        Assert.assertEquals("Hello "+name, resp);
-    }
-
-    private void performTestArray(HelloServiceSimpleClient helloServiceSimpleClient) {
-        String[] names = {"Me", "Pandu"};
-        String[] resps = helloServiceSimpleClient.getGreetingsArrayForward(names);
-        for(int i = 0; i < names.length; ++i) {
-            Assert.assertEquals("Hello "+names[i], resps[i]);
-        }
-    }
-
-    private void performTestList(HelloServiceSimpleClient helloServiceSimpleClient) {
-        List<String> namesList = new ArrayList<String>();
-        namesList.add("Me");
-        namesList.add("Pandu");
-        namesList.add("Chinnipandu");
-        List<String> respList = helloServiceSimpleClient.getGreetingsListForward(namesList);
-        Assert.assertEquals(namesList.size(), respList.size());
-        for(int i = 0; i < namesList.size(); ++i) {
-            Assert.assertEquals("Hello "+namesList.get(i), respList.get(i));
-        }
-    }
-
-    private void performTestArrayList(HelloServiceSimpleClient helloServiceSimpleClient) {
-        ArrayList<String> namesList = new ArrayList<String>();
-        namesList.add("Me");
-        namesList.add("Pandu");
-        namesList.add("Chinnipandu");
-        ArrayList<String> respList = helloServiceSimpleClient.getGreetingsArrayListForward(namesList);
-        Assert.assertEquals(namesList.size(), respList.size());
-        for(int i = 0; i < namesList.size(); ++i) {
-            Assert.assertEquals("Hello "+namesList.get(i), respList.get(i));
-        }
-    }
-
-    private void performTestMap(HelloServiceSimpleClient helloServiceSimpleClient) {
-        Map<String, String> namesMap = new HashMap<String, String>();
-        namesMap.put("Me", null);
-        namesMap.put("Pandu", null);
-        namesMap.put("Chinnipandu", null);
-        Map<String, String> respMap = helloServiceSimpleClient.getGreetingsMapForward(namesMap);
-        Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size());
-        for(Map.Entry<String, String> entry: namesMap.entrySet()) {
-            Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey()));
-        }
-    }
-
-    private void performTestHashMap(HelloServiceSimpleClient helloServiceSimpleClient) {
-        HashMap<String, String> namesMap = new HashMap<String, String>();
-        namesMap.put("Me", null);
-        namesMap.put("Pandu", null);
-        namesMap.put("Chinnipandu", null);
-        Map<String, String> respMap = helloServiceSimpleClient.getGreetingsHashMapForward(namesMap);
-        Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size());
-        for(Map.Entry<String, String> entry: namesMap.entrySet()) {
-            Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey()));
-        }
-    }
-
-    private void performTestVarArgs(HelloServiceSimpleClient helloServiceSimpleClient) {
-        String[] names = { "Me", "You", "Pandu" }; // Do not change the array size from 3.
-        String expected = "Hello Me You Pandu";
-        String actual = helloServiceSimpleClient.getGreetingsVarArgsForward(names[0], names[1], names[2]);
-        Assert.assertEquals(expected, actual);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
deleted file mode 100644
index 744bf20494..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
+++ /dev/null
@@ -1,67 +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.itest.databindings.jaxb;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DocLitBareWsdlTestCase {
-
-    private static SCADomain domain;
-
-    /**
-     * Runs once before running the tests
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        try {
-            domain = SCADomain.newInstance("doclitbarewsdl.composite");
-        } catch (Throwable e) {
-            // @Ignore("TUSCANY-2398")
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Runs once after running the tests
-     */
-    @AfterClass
-    public static void tearDown() {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    // @Ignore("TUSCANY-2398")
-    @Test
-    public void testDocLitBareWsdl() throws Exception {
-        AClientService client = domain.getService(AClientService.class, "AClientComponent");
-        String name = "Pandu";
-        String resp = client.getGreetingsForward(name);
-        Assert.assertEquals("Hello " + name, resp);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
deleted file mode 100644
index c22d00140e..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
+++ /dev/null
@@ -1,484 +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.itest.databindings.jaxb;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsTransformer;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Databinding tests for generics, parameterized and polymorphic types.
- * 
- * @version $Rev$ $Date$
- */
-public class GenericsDatabindingTestCase {
-    private static SCADomain domain;
- 
-    /**
-     * Runs before each test method
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        try { 
-            domain = SCADomain.newInstance("generics-service.composite");
-        } catch(Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Runs after each test method
-     */
-    @AfterClass
-    public static void tearDown() {
-        domain.close();
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getTypeExplicit.
-     */
-    @Test
-    public void testSCATypeExplicit() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestTypeExplicit(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getTypeUnbound.
-     */
-    @Test
-    public void testSCATypeUnbound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestTypeUnbound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getTypeExtends.
-     */
-    @Test
-    public void testSCATypeExtends() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestTypeExtends(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getRecursiveTypeBound.
-     */
-    @Test
-    public void testSCARecursiveTypeBound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestRecursiveTypeBound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getWildcardUnbound.
-     */
-    @Test
-    public void testSCAWildcardUnbound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestWildcardUnbound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getWildcardSuper.
-     */
-    @Test
-    public void testSCAWildcardSuper() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestWildcardSuper(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getWildcardExtends.
-     */
-    @Test
-    public void testSCAWildcardExtends() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestWildcardExtends(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using SCA binding.
-     * Service method invoked is getPolymorphic.
-     */
-    @Test
-    public void testSCAPolymorphic() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent");
-        performTestPolymorphic(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getTypeExplicit.
-     */
-    @Test
-    public void testWSTypeExplicit() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestTypeExplicit(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getTypeUnbound.
-     */
-    @Test
-    public void testWSTypeUnbound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestTypeUnbound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getTypeExtends.
-     */
-    @Test
-    public void testWSTypeExtends() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestTypeExtends(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getRecursiveTypeBound.
-     */
-    @Test
-    public void testWSRecursiveTypeBound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestRecursiveTypeBound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getWildcardUnbound.
-     */
-    @Test
-    public void testWSWildcardUnbound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestWildcardUnbound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getWildcardSuper.
-     */
-    @Test
-    public void testWSWildcardSuper() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestWildcardSuper(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getWildcardExtends.
-     */
-    @Test
-    public void testWSWildcardExtends() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestWildcardExtends(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsService service using WS binding.
-     * Service method invoked is getPolymorphic.
-     */
-    @Test
-    public void testWSPolymorphic() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent");
-        performTestPolymorphic(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getTypeExplicit.
-     */
-    @Test
-    public void testSCALocalTypeExplicit() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestTypeExplicit(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getTypeUnbound.
-     */
-    @Test
-    public void testSCALocalTypeUnbound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestTypeUnbound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getTypeExtends.
-     */
-    @Test
-    public void testSCALocalTypeExtends() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestTypeExtends(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getRecursiveTypeBound.
-     */
-    @Test
-    public void testSCALocalRecursiveTypeBound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestRecursiveTypeBound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getWildcardUnbound.
-     */
-    @Test
-    public void testSCALocalWildcardUnbound() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestWildcardUnbound(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getWildcardSuper.
-     */
-    @Test
-    public void testSCALocalWildcardSuper() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestWildcardSuper(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getWildcardExtends.
-     */
-    @Test
-    public void testSCALocalWildcardExtends() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestWildcardExtends(serviceClient);
-    }
-
-    /**
-     * Invokes the GenericsLocalService service using SCA binding.
-     * Service method invoked is getPolymorphic.
-     */
-    @Test
-    public void testSCALocalPolymorphic() throws Exception {
-        GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent");
-        performTestPolymorphic(serviceClient);
-    }
-
-    private void performTestTypeExplicit(GenericsServiceClient serviceClient) {
-        Bean1<String> args[] = new Bean1[2];
-        args[0] = new Bean1<String>("Me");
-        args[1] = new Bean1<String>();
-        for(int i = 0; i < args.length; ++i) {
-            Bean1<String> arg = args[i];
-            Bean1<String> expected = GenericsTransformer.getTypeExplicit(arg);
-            Bean1<String> actual = serviceClient.getTypeExplicitForward(arg);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    private void performTestTypeUnbound(GenericsServiceClient serviceClient) {
-        {   // String
-            String[] args = { "Me", "You", "Him" };
-            Bean1<String> expected = GenericsTransformer.getTypeUnbound(args);
-            Bean1<String> actual = serviceClient.getTypeUnboundForward(args);
-            // Assert.assertEquals(expected, actual);
-        }
-        {   // Integer
-            Integer[] args = new Integer[3];
-            args[0] = -10;
-            args[1] = 0;
-            args[2] = 10;
-            Bean1<Integer> expected = GenericsTransformer.getTypeUnbound(args);
-            Bean1<Integer> actual = serviceClient.getTypeUnboundForward(args);
-            // Assert.assertEquals(expected, actual);
-        }
-        {   // Object
-            Object[] args = new Object[3];
-            args[0] = "Me";
-            args[1] = 10;
-            args[2] = "Him";
-            Bean1<Object> expected = GenericsTransformer.getTypeUnbound(args);
-            Bean1<Object> actual = serviceClient.getTypeUnboundForward(args);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-    
-    private void performTestTypeExtends(GenericsServiceClient serviceClient) {
-        {   // Bean2
-            Bean2[] args = new Bean2[3];
-            for(int i = 0; i < args.length; ++i) {
-                args[i] = new Bean2();
-                args[i].setName("Name"+i);
-            }
-            
-            Bean1<Bean2> expected = GenericsTransformer.getTypeExtends(args);
-            Bean1<Bean2> actual = serviceClient.getTypeExtendsForward(args);
-            Assert.assertEquals(expected, actual);
-        }
-        {   // Bean3 extends Bean2
-            Bean3[] args = new Bean3[3];
-            for(int i = 0; i < args.length; ++i) {
-                args[i] = new Bean3();
-                args[i].setName("Name"+i);
-                args[i].setAddress("Address"+i);
-            }
-            
-            Bean1<Bean3> expected = GenericsTransformer.getTypeExtends(args);
-            Bean1<Bean3> actual = serviceClient.getTypeExtendsForward(args);
-            // Assert.assertEquals(expected, actual);
-        }
-        {   //Bean31 extends Bean2
-            Bean31[] args = new Bean31[3];
-            for(int i = 0; i < args.length; ++i) {
-                args[i] = new Bean31();
-                args[i].setName("Name"+i);
-                args[i].setAddress("Address"+i);
-            }
-            
-            Bean1<Bean31> expected = GenericsTransformer.getTypeExtends(args);
-            Bean1<Bean31> actual = serviceClient.getTypeExtendsForward(args);
-            // Assert.assertEquals(expected, actual);
-        }
-    }
-
-    private void performTestRecursiveTypeBound(GenericsServiceClient serviceClient) {
-        {   // Bean1<String>
-            Bean1<String>[] args = new Bean1[3];
-            for(int i = 0; i < args.length; ++i) {
-                args[i] = new Bean1<String>();
-                args[i].setItem("Bean."+i);
-            }
-            Bean1<Bean1<String>> expected = GenericsTransformer.getRecursiveTypeBound(args);
-            Bean1<Bean1<String>> actual = serviceClient.getRecursiveTypeBoundForward(args);
-            Assert.assertEquals(expected, actual);
-        }
-        {   // Bean10 extends Bean1<String>
-            Bean10[] args = new Bean10[3];
-            for(int i = 0; i < args.length; ++i) {
-                args[i] = new Bean10();
-                args[i].setItem("Bean10."+i);
-            }
-            Bean1<Bean10> expected = GenericsTransformer.getRecursiveTypeBound(args);
-            Bean1<Bean10> actual = serviceClient.getRecursiveTypeBoundForward(args);
-            // Assert.assertEquals(expected, actual);
-        }
-        {   // Bean11 extends Bean1<String>
-            Bean11[] args = new Bean11[3];
-            for(int i = 0; i < args.length; ++i) {
-                args[i] = new Bean11();
-                args[i].setItem("Bean11."+i);
-            }
-            Bean1<Bean11> expected = GenericsTransformer.getRecursiveTypeBound(args);
-            Bean1<Bean11> actual = serviceClient.getRecursiveTypeBoundForward(args);
-            // Assert.assertEquals(expected, actual);
-        }
-    }
-    
-    private void performTestWildcardUnbound(GenericsServiceClient serviceClient) {
-        {
-            Bean1<?> arg = new Bean1<String>("Me");
-            Bean1<?> expected = GenericsTransformer.getWildcardUnbound(arg);
-            Bean1<?> actual = serviceClient.getWildcardUnboundForward(arg);
-            Assert.assertEquals(expected, actual);
-        }
-        {
-            Bean1<?> arg = new Bean1<Integer>(1);
-            Bean1<?> expected = GenericsTransformer.getWildcardUnbound(arg);
-            Bean1<?> actual = serviceClient.getWildcardUnboundForward(arg);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-    
-    private void performTestWildcardSuper(GenericsServiceClient serviceClient) {
-        Bean1<? super Bean3> arg = new Bean1<Bean2>();
-        Bean3 item = new Bean3();
-        item.setName("Name");
-        item.setAddress("Address");
-        arg.setItem(item);
-        Bean1<? super Bean3> expected = GenericsTransformer.getWildcardSuper(arg);
-        Bean1<? super Bean3> actual = serviceClient.getWildcardSuperForward(arg);
-        Assert.assertEquals(expected, actual);
-    }
-
-    private void performTestWildcardExtends(GenericsServiceClient serviceClient) {
-        {   // Bean2
-            Bean2 temp = new Bean2();
-            temp.setName("Me");
-            Bean1<? extends Bean2> arg = new Bean1<Bean2>(temp);
-            Bean1<? extends Bean2> expected = GenericsTransformer.getWildcardExtends(arg);
-            Bean1<? extends Bean2> actual = serviceClient.getWildcardExtendsForward(arg);
-            Assert.assertEquals(expected, actual);
-        }
-        {   // Bean3 extends Bean2
-            Bean3 temp = new Bean3();
-            temp.setName("Me");
-            temp.setAddress("My address");
-            Bean1<? extends Bean2> arg = new Bean1<Bean3>(temp);
-            Bean1<? extends Bean2> expected = GenericsTransformer.getWildcardExtends(arg);
-            Bean1<? extends Bean2> actual = serviceClient.getWildcardExtendsForward(arg);
-            // The Bean3 will be unmarshalled into Bean2
-            // Assert.assertEquals(expected, actual);
-            Assert.assertTrue(actual.getItem() instanceof Bean2);
-        }
-        {   // Bean31 extends Bean2
-            Bean31 temp = new Bean31();
-            temp.setName("Me1");
-            temp.setAddress("My address1");
-            Bean1<? extends Bean2> arg = new Bean1<Bean31>(temp);
-            Bean1<? extends Bean2> expected = GenericsTransformer.getWildcardExtends(arg);
-            Bean1<? extends Bean2> actual = serviceClient.getWildcardExtendsForward(arg);
-            // The Bean31 will be unmarshalled into Bean2
-            // Assert.assertEquals(expected, actual);
-            Assert.assertTrue(actual.getItem() instanceof Bean2);
-        }
-    }
-    
-    private void performTestPolymorphic(GenericsServiceClient serviceClient) {
-        {   // Bean2
-            Bean2 arg = new Bean2();
-            arg.setName("Me");
-            Bean2 expected = GenericsTransformer.getPolymorphic(arg);
-            Bean2 actual = serviceClient.getPolymorphicForward(arg);
-            Assert.assertEquals(expected, actual);
-        }
-        {   // Bean3 extends Bean2
-            Bean3 arg = new Bean3();
-            arg.setName("Me");
-            arg.setAddress("My address");
-            Bean2 expected = GenericsTransformer.getPolymorphic(arg);
-            Bean2 actual = serviceClient.getPolymorphicForward(arg);
-            Assert.assertEquals(expected.getName(), actual.getName());
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
deleted file mode 100644
index f8aaad3dac..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
+++ /dev/null
@@ -1,776 +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.itest.databindings.jaxb;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PrimitivesDatabindingTestCase {
-
-    private static SCADomain domain;
-
-    /**
-     * Runs before each test method
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        try { 
-            domain = SCADomain.newInstance("primitivesservice.composite");
-        } catch(Throwable e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-    }
-
-    /**
-     * Runs after each test method
-     */
-    @AfterClass
-    public static void tearDown() {
-        domain.close();
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateBoolean.
-     */
-    @Test
-    public void testSCANegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateBoolean(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateBooleanArray.
-     */
-    @Test
-    public void testSCANegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateBooleanArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for boolean array.
-     */
-    @Test
-    public void testSCAPassByValueBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateByte.
-     */
-    @Test
-    public void testSCANegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateByte(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateByteArray.
-     */
-    @Test
-    public void testSCANegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateByteArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for byte array.
-     */
-    @Test
-    public void testSCAPassByValueByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateShort.
-     */
-    @Test
-    public void testSCANegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateShort(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateShortArray.
-     */
-    @Test
-    public void testSCANegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateShortArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for short array.
-     */
-    @Test
-    public void testSCAPassByValueShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateInt.
-     */
-    @Test
-    public void testSCANegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateInt(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateIntArray.
-     */
-    @Test
-    public void testSCANegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateIntArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for int array.
-     */
-    @Test
-    public void testSCAPassByValueIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateLong.
-     */
-    @Test
-    public void testSCANegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateLong(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateLongArray.
-     */
-    @Test
-    public void testSCANegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateLongArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for long array.
-     */
-    @Test
-    public void testSCAPassByValueLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateFloat.
-     */
-    @Test
-    public void testSCANegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateFloat(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateFloatArray.
-     */
-    @Test
-    public void testSCANegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateFloatArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for float array.
-     */
-    @Test
-    public void testSCAPassByValueFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateDouble.
-     */
-    @Test
-    public void testSCANegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateDouble(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateDoubleArray.
-     */
-    @Test
-    public void testSCANegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        performTestNegateDoubleArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with SCA binding.
-     * Test for double array.
-     */
-    @Test
-    public void testSCAPassByValueDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateBoolean.
-     */
-    @Test
-    public void testWSNegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateBoolean(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateBooleanArray.
-     */
-    @Test
-    public void testWSNegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateBooleanArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for boolean array.
-     */
-    @Test
-    public void testWSPassByValueBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateByte.
-     */
-    @Test
-    public void testWSNegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateByte(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateByteArray.
-     */
-    @Test
-    public void testWSNegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateByteArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for byte array.
-     */
-    @Test
-    public void testWSPassByValueByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateShort.
-     */
-    @Test
-    public void testWSNegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateShort(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateShortArray.
-     */
-    @Test
-    public void testWSNegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateShortArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for short array.
-     */
-    @Test
-    public void testWSPassByValueShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateInt.
-     */
-    @Test
-    public void testWSNegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateInt(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateIntArray.
-     */
-    @Test
-    public void testWSNegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateIntArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for int array.
-     */
-    @Test
-    public void testWSPassByValueIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateLong.
-     */
-    @Test
-    public void testWSNegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateLong(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateLongArray.
-     */
-    @Test
-    public void testWSNegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateLongArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for long array.
-     */
-    @Test
-    public void testWSPassByValueLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateFloat.
-     */
-    @Test
-    public void testWSNegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateFloat(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateFloatArray.
-     */
-    @Test
-    public void testWSNegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateFloatArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for float array.
-     */
-    @Test
-    public void testWSPassByValueFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateDouble.
-     */
-    @Test
-    public void testWSNegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateDouble(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateDoubleArray.
-     */
-    @Test
-    public void testWSNegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        performTestNegateDoubleArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for double array.
-     */
-    @Test
-    public void testWSPassByValueDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateBoolean.
-     */
-    @Test
-    public void testSCALocalNegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateBoolean(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateBooleanArray.
-     */
-    @Test
-    public void testSCALocalNegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateBooleanArray(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateByte.
-     */
-    @Test
-    public void testSCALocalNegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateByte(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateByteArray.
-     */
-    @Test
-    public void testSCALocalNegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateByteArray(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateShort.
-     */
-    @Test
-    public void testSCALocalNegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateShort(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateShortArray.
-     */
-    @Test
-    public void testSCALocalNegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateShortArray(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateInt.
-     */
-    @Test
-    public void testSCALocalNegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateInt(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateIntArray.
-     */
-    @Test
-    public void testSCALocalNegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateIntArray(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateLong.
-     */
-    @Test
-    public void testSCALocalNegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateLong(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateLongArray.
-     */
-    @Test
-    public void testSCALocalNegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateLongArray(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateFloat.
-     */
-    @Test
-    public void testSCALocalNegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateFloat(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using SCA binding.
-     * Service method invoked is negateFloatArray.
-     */
-    @Test
-    public void testSCALocalNegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateFloatArray(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateDouble.
-     */
-    @Test
-    public void testSCALocalNegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateDouble(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesLocalService service using SCA binding.
-     * Service method invoked is negateDoubleArray.
-     */
-    @Test
-    public void testSCALocalNegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent");
-        performTestNegateDoubleArray(primitivesServiceClient);
-    }
-    
-    private void performTestNegateBoolean(PrimitivesServiceClient primitivesServiceClient) {
-        Assert.assertTrue(primitivesServiceClient.negateBooleanForward(false));
-        Assert.assertFalse(primitivesServiceClient.negateBooleanForward(true));
-    }
-
-    private void performTestNegateBooleanArray(PrimitivesServiceClient primitivesServiceClient) {
-        boolean flags[] = new boolean[2];
-        flags[0] = false;
-        flags[1] = true;
-        boolean[] respFlags = primitivesServiceClient.negateBooleanArrayForward(flags);
-        Assert.assertEquals(flags.length, respFlags.length);
-        for(int i = 0; i < flags.length; ++i) {
-            Assert.assertEquals(!flags[i], respFlags[i]);
-        }
-    }
-
-    private void performTestNegateByte(PrimitivesServiceClient primitivesServiceClient) {
-        byte[] ba = new byte[3];
-        ba[0] = -1;
-        ba[1] = 0;
-        ba[2] = 1;
-
-        for(int i = 0; i < ba.length; ++i) {
-            Assert.assertEquals((byte)-ba[i], primitivesServiceClient.negateByteForward(ba[i]));
-        }
-    }
-
-    private void performTestNegateByteArray(PrimitivesServiceClient primitivesServiceClient) {
-        byte[] ba = new byte[3];
-        ba[0] = -1;
-        ba[1] = 0;
-        ba[2] = 1;
-
-        byte[] r = primitivesServiceClient.negateByteArrayForward(ba);
-        Assert.assertEquals(ba.length, r.length);
-        for(int i = 0; i < ba.length; ++i) {
-            Assert.assertEquals((byte)-ba[i], r[i]);
-        }
-    }
-    
-    private void performTestNegateShort(PrimitivesServiceClient primitivesServiceClient) {
-        short[] s = new short[3];
-        s[0] = -1;
-        s[1] = 0;
-        s[2] = 1;
-
-        for(int i = 0; i < s.length; ++i) {
-            Assert.assertEquals((short)-s[i], primitivesServiceClient.negateShortForward(s[i]));
-        }
-    }
-
-    private void performTestNegateShortArray(PrimitivesServiceClient primitivesServiceClient) {
-        short[] s = new short[3];
-        s[0] = -1;
-        s[1] = 0;
-        s[2] = 1;
-
-        short[] r = primitivesServiceClient.negateShortArrayForward(s);
-        Assert.assertEquals(s.length, r.length);
-        for(int i = 0; i < s.length; ++i) {
-            Assert.assertEquals((short)-s[i], r[i]);
-        }
-    }
-
-    private void performTestNegateInt(PrimitivesServiceClient primitivesServiceClient) {
-        int[] ia = new int[3];
-        ia[0] = -1;
-        ia[1] = 0;
-        ia[2] = 1;
-
-        for(int i = 0; i < ia.length; ++i) {
-            Assert.assertEquals(-ia[i], primitivesServiceClient.negateIntForward(ia[i]));
-        }
-    }
-
-    private void performTestNegateIntArray(PrimitivesServiceClient primitivesServiceClient) {
-        int[] ia = new int[3];
-        ia[0] = -1;
-        ia[1] = 0;
-        ia[2] = 1;
-
-        int[] r = primitivesServiceClient.negateIntArrayForward(ia);
-        Assert.assertEquals(ia.length, r.length);
-        for(int i = 0; i < ia.length; ++i) {
-            Assert.assertEquals(-ia[i], r[i]);
-        }
-    }
-
-    private void performTestNegateLong(PrimitivesServiceClient primitivesServiceClient) {
-        long[] la = new long[3];
-        la[0] = -1;
-        la[1] = 0;
-        la[2] = 1;
-
-        for(int i = 0; i < la.length; ++i) {
-            Assert.assertEquals(-la[i], primitivesServiceClient.negateLongForward(la[i]));
-        }
-    }
-
-    private void performTestNegateLongArray(PrimitivesServiceClient primitivesServiceClient) {
-        long[] la = new long[3];
-        la[0] = -1;
-        la[1] = 0;
-        la[2] = 1;
-
-        long[] r = primitivesServiceClient.negateLongArrayForward(la);
-        Assert.assertEquals(la.length, r.length);
-        for(int i = 0; i < la.length; ++i) {
-            Assert.assertEquals(-la[i], r[i]);
-        }
-    }
-
-    private void performTestNegateFloat(PrimitivesServiceClient primitivesServiceClient) {
-        float[] fa = new float[3];
-        fa[0] = -1;
-        fa[1] = 0;
-        fa[2] = 1;
-
-        for(int i = 0; i < fa.length; ++i) {
-            Assert.assertEquals(-fa[i], primitivesServiceClient.negateFloatForward(fa[i]));
-        }
-    }
-
-    private void performTestNegateFloatArray(PrimitivesServiceClient primitivesServiceClient) {
-        float[] ia = new float[3];
-        ia[0] = -1;
-        ia[1] = 0;
-        ia[2] = 1;
-
-        float[] r = primitivesServiceClient.negateFloatArrayForward(ia);
-        Assert.assertEquals(ia.length, r.length);
-        for(int i = 0; i < ia.length; ++i) {
-            Assert.assertEquals(-ia[i], r[i]);
-        }
-    }
-
-    private void performTestNegateDouble(PrimitivesServiceClient primitivesServiceClient) {
-        double[] da = new double[3];
-        da[0] = -1;
-        da[1] = 0;
-        da[2] = 1;
-
-        for(int i = 0; i < da.length; ++i) {
-            Assert.assertEquals(-da[i], primitivesServiceClient.negateDoubleForward(da[i]));
-        }
-    }
-
-    private void performTestNegateDoubleArray(PrimitivesServiceClient primitivesServiceClient) {
-        double[] da = new double[3];
-        da[0] = -1;
-        da[1] = 0;
-        da[2] = 1;
-
-        double[] r = primitivesServiceClient.negateDoubleArrayForward(da);
-        Assert.assertEquals(da.length, r.length);
-        for(int i = 0; i < da.length; ++i) {
-            Assert.assertEquals(-da[i], r[i]);
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
deleted file mode 100644
index 2d023ab448..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
+++ /dev/null
@@ -1,1438 +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.itest.databindings.jaxb;
-
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.awt.image.PixelGrabber;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.Assert;
-
-import org.apache.axiom.attachments.ByteArrayDataSource;
-import org.apache.tuscany.sca.databinding.xml.String2Node;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.xml.sax.InputSource;
-
-/**
- * @version $Rev$ $Date$
- */
-public class StandardTypesDatabindingTestCase {
-
-    private static SCADomain domain;
-
-    /**
-     * Runs before each test method
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        try {
-            domain = SCADomain.newInstance("standard-types-service.composite");
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Runs after each test method
-     */
-    @AfterClass
-    public static void tearDown() {
-        domain.close();
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewBigInteger.
-     */
-    @Test
-    public void testSCANewBigInteger() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewBigInteger(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewBigIntegerArray.
-     */
-    @Test
-    public void testSCANewBigIntegerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewBigIntegerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewBigDecimal.
-     */
-    @Test
-    public void testSCANewBigDecimal() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewBigDecimal(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewBigDecimalArray.
-     */
-    @Test
-    public void testSCANewBigDecimalArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewBigDecimalArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewCalendar.
-     */
-    @Test
-    public void testSCANewCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewCalendarArray.
-     */
-    @Test
-    public void testSCANewCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewDate.
-     */
-    @Test
-    public void testSCANewDate() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewDate(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewDateArray.
-     */
-    @Test
-    public void testSCANewDateArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewDateArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewQName.
-     */
-    @Test
-    public void testSCANewQName() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewQName(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewQNameArray.
-     */
-    @Test
-    public void testSCANewQNameArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewQNameArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewURI.
-     */
-    @Test
-    public void testSCANewURI() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewURI(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewURIArray.
-     */
-    @Test
-    public void testSCANewURIArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewURIArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewXMLGregorianCalendar.
-     */
-    @Test
-    public void testSCANewXMLGregorianCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewXMLGregorianCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewXMLGregorianCalendarArray.
-     */
-    @Test
-    public void testSCANewXMLGregorianCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewXMLGregorianCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewDuration.
-     */
-    @Test
-    public void testSCANewDuration() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewDuration(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewDurationArray.
-     */
-    @Test
-    public void testSCANewDurationArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewDurationArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewObject.
-     */
-    @Test
-    public void testSCANewObject() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewObject(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewObjectArray.
-     */
-    @Test
-    public void testSCANewObjectArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewObjectArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewImage.
-     */
-    @Test
-    public void testSCANewImage() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewImage(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewImageArray.
-     */
-    @Test
-    public void testSCANewImageArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewImageArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewDataHandler.
-     */
-    @Test
-    public void testSCANewDataHandler() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewDataHandler(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewDataHandlerArray.
-     */
-    @Test
-    public void testSCANewDataHandlerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewDataHandlerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewSource.
-     */
-    @Test
-    public void testSCANewSource() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewSource(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewSourceArray.
-     */
-    @Test
-    @Ignore("TUSCANY-2387")
-    public void testSCANewSourceArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewSourceArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewUUID.
-     */
-    @Test
-    public void testSCANewUUID() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewUUID(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using SCA binding.
-     * Service method invoked is getNewUUIDArray.
-     */
-    @Test
-    public void testSCANewUUIDArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent");
-        performTestNewUUIDArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigInteger.
-     */
-    @Test
-    public void testWSNewBigInteger() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewBigInteger(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigIntegerArray.
-     */
-    @Test
-    public void testWSNewBigIntegerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewBigIntegerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigDecimal.
-     */
-    @Test
-    public void testWSNewBigDecimal() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewBigDecimal(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigDecimalArray.
-     */
-    @Test
-    public void testWSNewBigDecimalArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewBigDecimalArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewCalendar.
-     */
-    @Test
-    public void testWSNewCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewCalendarArray.
-     */
-    @Test
-    public void testWSNewCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDate.
-     */
-    @Test
-    public void testWSNewDate() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewDate(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDateArray.
-     */
-    @Test
-    public void testWSNewDateArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewDateArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewQName.
-     */
-    @Test
-    public void testWSNewQName() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewQName(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewQNameArray.
-     */
-    @Test
-    public void testWSNewQNameArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewQNameArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewURI.
-     */
-    @Test
-    public void testWSNewURI() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewURI(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewURIArray.
-     */
-    @Test
-    public void testWSNewURIArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewURIArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewXMLGregorianCalendar.
-     */
-    @Test
-    public void testWSNewXMLGregorianCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewXMLGregorianCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewXMLGregorianCalendarArray.
-     */
-    @Test
-    public void testWSNewXMLGregorianCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewXMLGregorianCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDuration.
-     */
-    @Test
-    public void testWSNewDuration() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewDuration(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDurationArray.
-     */
-    @Test
-    public void testWSNewDurationArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewDurationArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewObject.
-     */
-    @Test
-    public void testWSNewObject() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewObject(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewObjectArray.
-     */
-    @Test
-    public void testWSNewObjectArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewObjectArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewImage.
-     */
-    @Test
-    public void testWSNewImage() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewImage(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewImageArray.
-     */
-    @Test
-    public void testWSNewImageArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewImageArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDataHandler.
-     */
-    @Test
-    public void testWSNewDataHandler() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewDataHandler(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDataHandlerArray.
-     */
-    @Test
-    public void testWSNewDataHandlerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewDataHandlerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewSource.
-     */
-    @Test
-    // @Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>")
-    public void testWSNewSource() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewSource(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewSourceArray.
-     */
-    @Test
-    @Ignore("TUSCANY-2386")
-    public void testWSNewSourceArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewSourceArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewUUID.
-     */
-    @Test
-    public void testWSNewUUID() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewUUID(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewUUIDArray.
-     */
-    @Test
-    public void testWSNewUUIDArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
-        performTestNewUUIDArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewBigInteger.
-     */
-    @Test
-    public void testSCALocalNewBigInteger() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewBigInteger(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewBigIntegerArray.
-     */
-    @Test
-    public void testSCALocalNewBigIntegerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewBigIntegerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewBigDecimal.
-     */
-    @Test
-    public void testSCALocalNewBigDecimal() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewBigDecimal(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewBigDecimalArray.
-     */
-    @Test
-    public void testSCALocalNewBigDecimalArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewBigDecimalArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewCalendar.
-     */
-    @Test
-    public void testSCALocalNewCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewCalendarArray.
-     */
-    @Test
-    public void testSCALocalNewCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewDate.
-     */
-    @Test
-    public void testSCALocalNewDate() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewDate(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewDateArray.
-     */
-    @Test
-    public void testSCALocalNewDateArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewDateArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewQName.
-     */
-    @Test
-    public void testSCALocalNewQName() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewQName(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewQNameArray.
-     */
-    @Test
-    public void testSCALocalNewQNameArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewQNameArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewURI.
-     */
-    @Test
-    public void testSCALocalNewURI() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewURI(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewURIArray.
-     */
-    @Test
-    public void testSCALocalNewURIArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewURIArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewXMLGregorianCalendar.
-     */
-    @Test
-    public void testSCALocalNewXMLGregorianCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewXMLGregorianCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewXMLGregorianCalendarArray.
-     */
-    @Test
-    public void testSCALocalNewXMLGregorianCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewXMLGregorianCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewDuration.
-     */
-    @Test
-    public void testSCALocalNewDuration() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewDuration(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewDurationArray.
-     */
-    @Test
-    public void testSCALocalNewDurationArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewDurationArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewObject.
-     */
-    @Test
-    public void testSCALocalNewObject() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewObject(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewObjectArray.
-     */
-    @Test
-    public void testSCALocalNewObjectArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewObjectArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewImage.
-     */
-    @Test
-    public void testSCALocalNewImage() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewImage(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewImageArray.
-     */
-    @Test
-    public void testSCALocalNewImageArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewImageArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalLocalService service using SCA binding.
-     * Service method invoked is getNewDataHandler.
-     */
-    @Test
-    public void testSCALocalNewDataHandler() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewDataHandler(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewDataHandlerArray.
-     */
-    @Test
-    public void testSCALocalNewDataHandlerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewDataHandlerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewSource.
-     */
-    @Test
-    public void testSCALocalNewSource() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewSource(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewSourceArray.
-     */
-    @Test
-    public void testSCALocalNewSourceArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewSourceArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewUUID.
-     */
-    @Test
-    public void testSCALocalNewUUID() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewUUID(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesLocalService service using SCA binding.
-     * Service method invoked is getNewUUIDArray.
-     */
-    @Test
-    public void testSCALocalNewUUIDArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent");
-        performTestNewUUIDArray(serviceClient);
-    }
-
-    private void performTestNewBigInteger(StandardTypesServiceClient serviceClient) {
-        BigInteger bi = new BigInteger("1234567890123456789012345678901234");
-        BigInteger expected = bi.negate();
-        BigInteger actual = serviceClient.getNewBigIntegerForward(bi);
-        Assert.assertEquals(expected, actual);
-    }
-
-    private void performTestNewBigIntegerArray(StandardTypesServiceClient serviceClient) {
-        BigInteger[] bia = new BigInteger[2];
-        bia[0] = new BigInteger("1234567890123456789012345678901234");
-        bia[1] = new BigInteger("-98765432109876543210987654321");
-        BigInteger[] actual = serviceClient.getNewBigIntegerArrayForward(bia);
-        Assert.assertEquals(bia.length, actual.length);
-        for (int i = 0; i < bia.length; ++i) {
-            Assert.assertEquals(bia[i].negate(), actual[i]);
-        }
-    }
-
-    private void performTestNewBigDecimal(StandardTypesServiceClient serviceClient) {
-        BigDecimal bd = new BigDecimal("12345678901234567890.12345678901234");
-        BigDecimal expected = bd.negate();
-        BigDecimal actual = serviceClient.getNewBigDecimalForward(bd);
-        Assert.assertEquals(expected, actual);
-    }
-
-    private void performTestNewBigDecimalArray(StandardTypesServiceClient serviceClient) {
-        BigDecimal[] bda = new BigDecimal[2];
-        bda[0] = new BigDecimal("1234567890123456.789012345678901234");
-        bda[1] = new BigDecimal("-987654321098765.43210987654321");
-        BigDecimal[] actual = serviceClient.getNewBigDecimalArrayForward(bda);
-        Assert.assertEquals(bda.length, actual.length);
-        for (int i = 0; i < bda.length; ++i) {
-            Assert.assertEquals(bda[i].negate(), actual[i]);
-        }
-    }
-
-    private void performTestNewCalendar(StandardTypesServiceClient serviceClient) {
-        Calendar[] ca = new Calendar[3];
-        String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"};
-        for (int i = 0; i < ca.length; ++i) {
-            ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i]));
-            ca[i].set(Calendar.DAY_OF_MONTH, i + 1);
-        }
-        for (int i = 0; i < ca.length; ++i) {
-            Calendar actual = serviceClient.getNewCalendarForward(ca[i]);
-            ca[i].add(Calendar.DAY_OF_MONTH, 5);
-            if (actual instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) {
-                // FIXME: Is this a problem?
-                // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover
-                // different from the instance passed.  Adjust the gregorianCutover as per the input instance.
-                ((GregorianCalendar)actual).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange());
-            }
-            Assert.assertEquals(ca[i], actual);
-        }
-    }
-
-    private void performTestNewCalendarArray(StandardTypesServiceClient serviceClient) {
-        Calendar[] ca = new Calendar[3];
-        String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"};
-        for (int i = 0; i < ca.length; ++i) {
-            ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i]));
-            ca[i].set(Calendar.DAY_OF_MONTH, i + 1);
-        }
-        Calendar[] actual = serviceClient.getNewCalendarArrayForward(ca);
-        Assert.assertEquals(ca.length, actual.length);
-        for (int i = 0; i < ca.length; ++i) {
-            ca[i].add(Calendar.DAY_OF_MONTH, 5);
-            if (actual[i] instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) {
-                // FIXME: Is this a problem?
-                // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover
-                // different from the instance passed.  Adjust the gregorianCutover as per the input instance.
-                ((GregorianCalendar)actual[i]).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange());
-            }
-            Assert.assertEquals(ca[i], actual[i]);
-        }
-    }
-
-    private void performTestNewDate(StandardTypesServiceClient serviceClient) {
-        Date d = new Date();
-        Date expected = new Date(d.getTime() + 5 * 24 * 60 * 60 * 1000);
-        Date actual = serviceClient.getNewDateForward(d);
-        Assert.assertEquals(expected, actual);
-    }
-
-    private void performTestNewDateArray(StandardTypesServiceClient serviceClient) {
-        Date[] d = new Date[2];
-        Date[] expected = new Date[d.length];
-        for (int i = 0; i < d.length; ++i) {
-            d[i] = new Date();
-            d[i].setTime(d[i].getTime() + i * 24 * 60 * 60 * 1000);
-            expected[i] = new Date(d[i].getTime() + 5 * 24 * 60 * 60 * 1000);
-        }
-        Date[] actual = serviceClient.getNewDateArrayForward(d);
-        Assert.assertEquals(expected.length, actual.length);
-        for (int i = 0; i < expected.length; ++i) {
-            Assert.assertEquals(expected[i], actual[i]);
-        }
-    }
-
-    private void performTestNewQName(StandardTypesServiceClient serviceClient) {
-        QName[] qnames = new QName[3];
-        qnames[0] = new QName("localPart");
-        qnames[1] = new QName("namespaceUri", "localPart");
-        qnames[2] = new QName("namespaceUri", "localPart", "prefix");
-        QName[] expected = new QName[qnames.length];
-        for (int i = 0; i < qnames.length; ++i) {
-            expected[i] =
-                new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q",
-                          qnames[i].getPrefix() + "q");
-        }
-        for (int i = 0; i < qnames.length; ++i) {
-            QName actual = serviceClient.getNewQNameForward(qnames[i]);
-            Assert.assertEquals(expected[i], actual);
-        }
-    }
-
-    private void performTestNewQNameArray(StandardTypesServiceClient serviceClient) {
-        QName[] qnames = new QName[4];
-        qnames[0] = new QName("localPart");
-        qnames[1] = new QName("namespaceUri", "localPart");
-        qnames[2] = new QName("namespaceUri", "localPart", "prefix");
-        qnames[3] = new QName("localPart2");
-        QName[] expected = new QName[qnames.length];
-        for (int i = 0; i < qnames.length; ++i) {
-            expected[i] =
-                new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q",
-                          qnames[i].getPrefix() + "q");
-        }
-        QName[] actual = serviceClient.getNewQNameArrayForward(qnames);
-        Assert.assertEquals(expected.length, actual.length);
-        for (int i = 0; i < qnames.length; ++i) {
-            Assert.assertEquals(expected[i], actual[i]);
-        }
-    }
-
-    private void performTestNewURI(StandardTypesServiceClient serviceClient) {
-        URI[] uris = new URI[4];
-        uris[0] = URI.create("a/b/c");
-        uris[1] = URI.create("http://abc/");
-        uris[2] = URI.create("ftp://a/b");
-        uris[3] = URI.create("http://abc/").resolve("xyz");
-
-        for (int i = 0; i < uris.length; ++i) {
-            URI expected = uris[i].resolve("uri");
-            URI actual = serviceClient.getNewURIForward(uris[i]);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    private void performTestNewURIArray(StandardTypesServiceClient serviceClient) {
-        URI[] uris = new URI[4];
-        uris[0] = URI.create("a/b/c");
-        // [rfeng] We need to have a trialign / to avoid the resolving problem
-        // FIXME: [vamsi] This is actually a data transformation problem. The array being returned from the service method is
-        // not making to the caller intact.
-        uris[1] = URI.create("http://abc/");
-        uris[2] = URI.create("ftp://a/b");
-        uris[3] = URI.create("http://abc/").resolve("xyz");
-
-        URI[] expected = new URI[uris.length];
-        for (int i = 0; i < uris.length; ++i) {
-            expected[i] = uris[i].resolve("uri");
-        }
-
-        URI[] actual = serviceClient.getNewURIArrayForward(uris);
-        Assert.assertEquals(expected.length, actual.length);
-        for (int i = 0; i < uris.length; ++i) {
-            Assert.assertEquals(expected[i], actual[i]);
-        }
-    }
-
-    private void performTestNewXMLGregorianCalendar(StandardTypesServiceClient serviceClient)
-        throws DatatypeConfigurationException {
-        DatatypeFactory df = DatatypeFactory.newInstance();
-        XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3];
-        xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19));
-        xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13));
-        xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16));
-
-        for (int i = 0; i < xgcals.length; ++i) {
-            XMLGregorianCalendar actual = serviceClient.getNewXMLGregorianCalendarForward(xgcals[i]);
-            xgcals[i].setDay(xgcals[i].getDay() + 5);
-            Assert.assertEquals(xgcals[i], actual);
-        }
-    }
-
-    private void performTestNewXMLGregorianCalendarArray(StandardTypesServiceClient serviceClient)
-        throws DatatypeConfigurationException {
-        DatatypeFactory df = DatatypeFactory.newInstance();
-        XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3];
-        xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19));
-        xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13));
-        xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16));
-
-        XMLGregorianCalendar[] actual = serviceClient.getNewXMLGregorianCalendarArrayForward(xgcals);
-        Assert.assertEquals(xgcals.length, actual.length);
-        for (int i = 0; i < xgcals.length; ++i) {
-            xgcals[i].setDay(xgcals[i].getDay() + 5);
-            Assert.assertEquals(xgcals[i], actual[i]);
-        }
-    }
-
-    private void performTestNewDuration(StandardTypesServiceClient serviceClient) throws DatatypeConfigurationException {
-        DatatypeFactory df = DatatypeFactory.newInstance();
-        Duration[] da = new Duration[3];
-        da[0] = df.newDuration(1000000000000L);
-        da[1] = df.newDurationDayTime(1000000000000L);
-        da[2] = df.newDurationYearMonth(true, 1, 3);
-
-        for (int i = 0; i < da.length; ++i) {
-            Assert.assertEquals(da[i].negate(), serviceClient.getNewDurationForward(da[i]));
-        }
-    }
-
-    private void performTestNewObject(StandardTypesServiceClient serviceClient) {
-        Object[] objs = new Object[5];
-        objs[0] = "Hello";
-        objs[1] = 10;
-        objs[2] = null;
-        objs[3] = -1.0;
-        objs[4] = null;
-
-        for (int i = 0; i < objs.length; ++i) {
-            Object expected = StandardTypesTransformer.getNewObject(objs[i]);
-            Object actual = serviceClient.getNewObjectForward(objs[i]);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    private void performTestNewObjectArray(StandardTypesServiceClient serviceClient) {
-        Object[] objs = new Object[5];
-        objs[0] = "Hello";
-        objs[1] = 10;
-        objs[2] = null;
-        objs[3] = -1.0;
-        objs[4] = null;
-
-        Object[] actual = serviceClient.getNewObjectArrayForward(objs);
-        Assert.assertEquals(objs.length, actual.length);
-        for (int i = 0; i < objs.length; ++i) {
-            Object expected = StandardTypesTransformer.getNewObject(objs[i]);
-            Assert.assertEquals(expected, actual[i]);
-        }
-    }
-
-    private void performTestNewImage(StandardTypesServiceClient serviceClient) throws InterruptedException {
-        // Create some images to test with.
-        Image[] imgs = new Image[3];
-        imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
-        imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-        imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        imgs[0].getGraphics().drawLine(1, 1, 8, 8);
-        imgs[1].getGraphics().drawLine(8, 1, 1, 8);
-        imgs[2].getGraphics().drawLine(1, 8, 8, 1);
-        
-        Image[] copy = imgs;
-        // Create the same images once again as the StandardTypesTransformer may manipulate the image passed.
-        imgs = new Image[3];
-        imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
-        imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-        imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        imgs[0].getGraphics().drawLine(1, 1, 8, 8);
-        imgs[1].getGraphics().drawLine(8, 1, 1, 8);
-        imgs[2].getGraphics().drawLine(1, 8, 8, 1);
-        
-        // Make sure the images and copies are equal using ImageInfo
-        for(int i = 0; i < imgs.length; ++i) {
-            Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i]));
-        }
-
-        for (int i = 0; i < imgs.length; ++i) {
-            Image actual = serviceClient.getNewImageForward(imgs[i]);
-            Image expected = StandardTypesTransformer.getNewImage(copy[i]);
-            // Compare using ImageInfo
-            Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual));
-        }
-    }
-
-    private void performTestNewImageArray(StandardTypesServiceClient serviceClient) throws InterruptedException {
-        // Create some images to test with.
-        Image[] imgs = new Image[3];
-        imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
-        imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-        imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        imgs[0].getGraphics().drawLine(1, 1, 8, 8);
-        imgs[1].getGraphics().drawLine(8, 1, 1, 8);
-        imgs[2].getGraphics().drawLine(1, 8, 8, 1);
-        
-        Image[] copy = imgs;
-        // Create the same images once again as the StandardTypesTransformer may manipulate the image passed.
-        imgs = new Image[3];
-        imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
-        imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-        imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        imgs[0].getGraphics().drawLine(1, 1, 8, 8);
-        imgs[1].getGraphics().drawLine(8, 1, 1, 8);
-        imgs[2].getGraphics().drawLine(1, 8, 8, 1);
-        
-        // Make sure the images and copies are equal using ImageInfo
-        for(int i = 0; i < imgs.length; ++i) {
-            Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i]));
-        }
-
-        Image[] actual = serviceClient.getNewImageArrayForward(imgs);
-        Assert.assertEquals(imgs.length, actual.length);
-        for (int i = 0; i < imgs.length; ++i) {
-            Image expected = StandardTypesTransformer.getNewImage(copy[i]);
-            // Compare using ImageInfo
-            Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual[i]));
-        }
-    }
-
-    private void performTestNewDurationArray(StandardTypesServiceClient serviceClient)
-        throws DatatypeConfigurationException {
-        DatatypeFactory df = DatatypeFactory.newInstance();
-        Duration[] da = new Duration[3];
-        da[0] = df.newDuration(1000000000000L);
-        da[1] = df.newDurationDayTime(1000000000000L);
-        da[2] = df.newDurationYearMonth(true, 1, 3);
-
-        Duration[] actual = serviceClient.getNewDurationArrayForward(da);
-        Assert.assertEquals(da.length, actual.length);
-        for (int i = 0; i < da.length; ++i) {
-            Assert.assertEquals(da[i].negate(), actual[i]);
-        }
-    }
-
-    private void performTestNewDataHandler(StandardTypesServiceClient serviceClient) throws IOException {
-        DataHandler[] dha = new DataHandler[3];
-        dha[0] = new DataHandler("Some data", "text/plain");
-        dha[1] = new DataHandler(this.getClass().getClassLoader().getResource("standard-types-service.composite"));
-        dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes()));
-
-        for (int i = 0; i < dha.length; ++i) {
-            DataHandler actual = serviceClient.getNewDataHandlerForward(dha[i]);
-            // Note: The DataHandler returned may use a different type of DataSource.
-            // Compare the data content instead of using equals().
-            Assert.assertTrue(compare(dha[i], actual));
-        }
-    }
-
-    private void performTestNewDataHandlerArray(StandardTypesServiceClient serviceClient) throws IOException {
-        DataHandler[] dha = new DataHandler[3];
-        dha[0] = new DataHandler("Some data", "text/plain");
-        dha[1] = new DataHandler(this.getClass().getClassLoader().getResource("standard-types-service.composite"));
-        dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes()));
-
-        DataHandler[] actual = serviceClient.getNewDataHandlerArrayForward(dha);
-        Assert.assertEquals(dha.length, actual.length);
-        for (int i = 0; i < dha.length; ++i) {
-            // Note: The DataHandler returned may use a different type of DataSource.
-            // Compare the data content instead of using equals().
-            Assert.assertTrue(compare(dha[i], actual[i]));
-        }
-    }
-
-    private void performTestNewSource(StandardTypesServiceClient serviceClient) throws Exception {
-        String xml = "<a>A<b>B</b><c>C</c></a>";
-        Source[] srcs = new Source[3];
-        srcs[0] = new DOMSource(new String2Node().transform(xml, null));
-        srcs[1] = new SAXSource(new InputSource(new StringReader(xml)));
-        srcs[2] = new StreamSource(new StringReader(xml));
-
-        for (int i = 0; i < srcs.length; ++i) {
-            Source expected = StandardTypesTransformer.getNewSource(srcs[i]);
-            Source actual = serviceClient.getNewSourceForward(srcs[i]);
-            // [rfeng] The data may come back as a different source
-            Assert.assertEquals(sourceToString(expected), sourceToString(actual));
-        }
-    }
-
-    private void performTestNewSourceArray(StandardTypesServiceClient serviceClient) throws Exception {
-        String xml = "<a>A<b>B</b><c>C</c></a>";
-        Source[] srcs = new Source[3];
-        srcs[0] = new DOMSource(new String2Node().transform(xml, null));
-        srcs[1] = new SAXSource(new InputSource(new StringReader(xml)));
-        srcs[2] = new StreamSource(new StringReader(xml));
-
-        Source[] actual = serviceClient.getNewSourceArrayForward(srcs);
-        Source[] expected = new Source[srcs.length];
-        for(int i = 0; i < srcs.length; ++i) {
-            expected[i] = StandardTypesTransformer.getNewSource(srcs[i]);
-        }
-        Assert.assertEquals(srcs.length, actual.length);
-        for (int i = 0; i < srcs.length; ++i) {
-            // [rfeng] The data may come back as a different source
-            Assert.assertEquals(sourceToString(expected[i]), sourceToString(actual[i]));
-        }
-
-    }
-
-    private void performTestNewUUID(StandardTypesServiceClient serviceClient) {
-        UUID[] uuids = new UUID[3];
-        uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes());
-        uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes());
-        uuids[2] = UUID.randomUUID();
-
-        for (int i = 0; i < uuids.length; ++i) {
-            UUID expected = UUID.fromString(uuids[i].toString() + "AAA");
-            UUID actual = serviceClient.getNewUUIDForward(uuids[i]);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    private void performTestNewUUIDArray(StandardTypesServiceClient serviceClient) {
-        UUID[] uuids = new UUID[3];
-        uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes());
-        uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes());
-        uuids[2] = UUID.randomUUID();
-
-        UUID[] actual = serviceClient.getNewUUIDArrayForward(uuids);
-        for (int i = 0; i < uuids.length; ++i) {
-            UUID expected = UUID.fromString(uuids[i].toString() + "AAA");
-            Assert.assertEquals(expected, actual[i]);
-        }
-    }
-    
-    /**
-     * This method compares two DataHandlers.
-     * @return true if the data in the two handlers is the same.
-     */
-    private boolean compare(DataHandler dh1, DataHandler dh2) throws IOException {
-        InputStream inp1 = dh1.getInputStream();
-        InputStream inp2 = dh2.getInputStream();
-        for(;;) {
-            int i1 = inp1.read();
-            int i2 = inp2.read();
-            if(i1 == -1 && i2 == -1) {
-                return true;
-            } else if(i1 != -1 && i2 != -1) {
-                if(i1 != i2) {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        }
-    }
-    
-    /**
-     * This method returns the content of a source object as String.
-     */
-    private String sourceToString(Source s) throws Exception {
-        StringWriter sw = new StringWriter();
-        Result r  = new StreamResult(sw);
-        TransformerFactory.newInstance().newTransformer().transform(s, r);
-        sw.close();
-        return sw.toString();
-    }
-    
-    /**
-     * This class initializes with the width, height and pixel data of a java.awt.Image object.
-     */
-    private static class ImageInfo {
-        private int h, w, pixels[];
-        public ImageInfo(Image img) throws InterruptedException {
-            w = img.getWidth(null);
-            h = img.getHeight(null);
-            pixels = new int[w*h];
-            PixelGrabber pg = new PixelGrabber(img, 0, 0, w, h, pixels, 0, w);
-            pg.grabPixels();
-        }
-        
-        public boolean equals(Object that) {
-            if(that == null) {
-                return false;
-            } else if(!(that instanceof ImageInfo)) {
-                return false;
-            }
-            
-            ImageInfo that1 = (ImageInfo)that;
-            if(w != that1.w || h != that1.h || pixels == null || that1.pixels == null || pixels.length != that1.pixels.length) {
-                return false;
-            }
-            for(int i = 0; i < pixels.length; ++i) {
-                if(pixels[i] != that1.pixels[i]) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        
-        public String toString() {
-            return this.getClass().getSimpleName()+"[w = "+w+", h = "+h+", pixels = "+pixels+"]";
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/pom.xml b/java/sca-contrib/itest/databindings/jaxb-top-down/pom.xml
deleted file mode 100644
index 4e3fcfbe5c..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/pom.xml
+++ /dev/null
@@ -1,194 +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.    
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-databindings</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-jaxb-top-down</artifactId>
-    <version>2.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA Databinding Integration Tests - JAXB Top Down</name>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-common</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency-->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-        <!-- Added by Simon Nash    -->
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.12</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- End of addition   -->
-
-        
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <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>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
deleted file mode 100644
index ab2d9630eb..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
+++ /dev/null
@@ -1,42 +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.itest.databindings.jaxb;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for HelloService.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface HelloService {
-    String getGreetings(String name);
-    String[] getGreetingsArray(String[] names);
-    List<String> getGreetingsList(List<String> names);
-    ArrayList<String> getGreetingsArrayList(ArrayList<String> names);
-    Map<String, String> getGreetingsMap(Map<String, String> namesMap);
-    HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap);
-    String getGreetingsVarArgs(String... names);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
deleted file mode 100644
index 7bd95cec95..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
+++ /dev/null
@@ -1,41 +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.itest.databindings.jaxb;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * The interface for HelloServiceClient.
- * 
- * @version $Rev$ $Date$
- */
-public interface HelloServiceClient {
-    String getGreetingsForward(String name);
-    String[] getGreetingsArrayForward(String[] names);
-    List<String> getGreetingsListForward(List<String> names);
-    ArrayList<String> getGreetingsArrayListForward(ArrayList<String> names);
-    Map<String, String> getGreetingsMapForward(Map<String, String> namesMap);
-    HashMap<String, String> getGreetingsHashMapForward(HashMap<String, String> namesMap);
-    String getGreetingsVarArgsForward(String... names);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
deleted file mode 100644
index ac6c8d5a60..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ /dev/null
@@ -1,51 +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.itest.databindings.jaxb;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for PrimitivesService.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface PrimitivesService {
-    boolean negateBoolean(boolean flag);
-    boolean[] negateBooleanArray(boolean[] flags);
-    boolean[] identityBooleanArray(boolean[] flags);
-    byte negateByte(byte b);
-    byte[] negateByteArray(byte[] ba);
-    byte[] identityByteArray(byte[] ba);
-    short negateShort(short s);
-    short[] negateShortArray(short[] s);
-    short[] identityShortArray(short[] sa);
-    int negateInt(int s);
-    int[] negateIntArray(int[] s);
-    int[] identityIntArray(int[] ia);
-    long negateLong(long l);
-    long[] negateLongArray(long[] la);
-    long[] identityLongArray(long[] la);
-    float negateFloat(float f);
-    float[] negateFloatArray(float[] fa);
-    float[] identityFloatArray(float[] fa);
-    double negateDouble(double d);
-    double[] negateDoubleArray(double[] da);
-    double[] identityDoubleArray(double[] da);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
deleted file mode 100644
index 3a5a81bae4..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ /dev/null
@@ -1,50 +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.itest.databindings.jaxb;
-
-
-/**
- * The interface for PrimitivesServiceClient.
- * 
- * @version $Rev$ $Date$
- */
-public interface PrimitivesServiceClient {
-    boolean negateBooleanForward(boolean flag);
-    boolean[] negateBooleanArrayForward(boolean[] flags);
-    boolean passByValueBooleanArray();
-    byte negateByteForward(byte b);
-    byte[] negateByteArrayForward(byte[] ba);
-    boolean passByValueByteArray();
-    short negateShortForward(short s);
-    short[] negateShortArrayForward(short[] sa);
-    boolean passByValueShortArray();
-    int negateIntForward(int i);
-    int[] negateIntArrayForward(int[] ia);
-    boolean passByValueIntArray();
-    long negateLongForward(long l);
-    long[] negateLongArrayForward(long[] la);
-    boolean passByValueLongArray();
-    float negateFloatForward(float f);
-    float[] negateFloatArrayForward(float[] fa);
-    boolean passByValueFloatArray();
-    double negateDoubleForward(double d);
-    double[] negateDoubleArrayForward(double[] da);
-    boolean passByValueDoubleArray();
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
deleted file mode 100644
index 1f3b7ec633..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.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.itest.databindings.jaxb;
-
-import java.awt.Image;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-
-/**
- * The interface for StandardTypesService.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface StandardTypesService {
-    BigInteger getNewBigInteger(BigInteger bi);
-    BigInteger[] getNewBigIntegerArray(BigInteger[] bia);
-    
-    BigDecimal getNewBigDecimal(BigDecimal bd);
-    BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda);
-
-    Calendar getNewCalendar(Calendar c);
-    Calendar[] getNewCalendarArray(Calendar[] ca);
-    
-    Date getNewDate(Date d);
-    Date[] getNewDateArray(Date[] da);
-
-    QName getNewQName(QName qname);
-    QName[] getNewQNameArray(QName[] qnames);
-    
-    URI getNewURI(URI uri);
-    URI[] getNewURIArray(URI[] uris);
-    
-    XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal);
-    XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcal);
-    
-    Duration getNewDuration(Duration d);
-    Duration[] getNewDurationArray(Duration[] da);
-    
-    Object getNewObject(Object obj);
-    Object[] getNewObjectArray(Object[] objs);
-    
-    Image getNewImage(Image img);
-    Image[] getNewImageArray(Image[] imgs);
-    
-    DataHandler getNewDataHandler(DataHandler dh);
-    DataHandler[] getNewDataHandlerArray(DataHandler[] dha);
-
-    Source getNewSource(Source src);
-    Source[] getNewSourceArray(Source[] srcs);
-    
-    UUID getNewUUID(UUID uuid);
-    UUID[] getNewUUIDArray(UUID[] uuids);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
deleted file mode 100644
index 0c073cd054..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ /dev/null
@@ -1,81 +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.itest.databindings.jaxb;
-
-import java.awt.Image;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-
-/**
- * The interface for StandardTypesServiceClient.
- * 
- * @version $Rev$ $Date$
- */
-public interface StandardTypesServiceClient {
-    BigInteger getNewBigIntegerForward(BigInteger bi);
-    BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia);
-
-    BigDecimal getNewBigDecimalForward(BigDecimal bd);
-    BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda);
-
-    Calendar getNewCalendarForward(Calendar c);
-    Calendar[] getNewCalendarArrayForward(Calendar[] ca);
-
-    Date getNewDateForward(Date d);
-    Date[] getNewDateArrayForward(Date[] da);
-
-    QName getNewQNameForward(QName qname);
-    QName[] getNewQNameArrayForward(QName[] qnames);
-
-    URI getNewURIForward(URI uri);
-    URI[] getNewURIArrayForward(URI[] uris);
-
-    XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal);
-    XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals);
-
-    Duration getNewDurationForward(Duration d);
-    Duration[] getNewDurationArrayForward(Duration[] da);
-
-    Object getNewObjectForward(Object obj);
-    Object[] getNewObjectArrayForward(Object[] objs);
-    
-    Image getNewImageForward(Image img);
-    Image[] getNewImageArrayForward(Image[] imgs);
-    
-    DataHandler getNewDataHandlerForward(DataHandler dh);
-    DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha);
-
-    Source getNewSourceForward(Source src);
-    Source[] getNewSourceArrayForward(Source[] srcs);
-
-    UUID getNewUUIDForward(UUID uuid);
-    UUID[] getNewUUIDArrayForward(UUID[] uuids);
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
deleted file mode 100644
index 61449c8981..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
+++ /dev/null
@@ -1,73 +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.itest.databindings.jaxb.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of HelloServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- */
-@Service(HelloServiceClient.class)
-public class HelloServiceClientImpl {
-
-    private HelloService service;
-
-    @Reference
-    public void setHelloService(HelloService service) {
-        this.service = service;
-    }
-
-    public String getGreetingsForward(String name) {
-        return service.getGreetings(name);
-    }
-
-    public String[] getGreetingsArrayForward(String[] names) {
-        return service.getGreetingsArray(names);
-    }
-
-    public List<String> getGreetingsListForward(List<String> names) {
-        return service.getGreetingsList(names);
-    }
-
-    public Map<String, String> getGreetingsMapForward(Map<String, String> namesMap) {
-        return service.getGreetingsMap(namesMap);
-    }
-
-    public ArrayList<String> getGreetingsArrayListForward(ArrayList<String> names) {
-        return service.getGreetingsArrayList(names);
-    }
-
-    public HashMap<String, String> getGreetingsHashMapForward(HashMap<String, String> namesMap) {
-        return service.getGreetingsHashMap(namesMap);
-    }
-
-    public String getGreetingsVarArgsForward(String... names) {
-        return service.getGreetingsVarArgs(names[0], names[1], names[2]);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
deleted file mode 100644
index c0868f0146..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
+++ /dev/null
@@ -1,86 +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.itest.databindings.jaxb.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloService;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of HelloService.
- * 
- * @version $Rev$ $Date$
- */
-@Service(interfaces = {HelloService.class})
-public class HelloServiceImpl implements HelloService {
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-    public String[] getGreetingsArray(String[] names) {
-        String[] resps = new String[names.length];
-        for (int i = 0; i < names.length; ++i) {
-            resps[i] = "Hello " + names[i];
-        }
-        return resps;
-    }
-
-    public List<String> getGreetingsList(List<String> names) {
-        List<String> resps = new ArrayList<String>();
-        for (int i = 0; i < names.size(); ++i) {
-            resps.add("Hello " + names.get(i));
-        }
-        return resps;
-    }
-
-    public ArrayList<String> getGreetingsArrayList(ArrayList<String> names) {
-        ArrayList<String> resps = new ArrayList<String>();
-        for (int i = 0; i < names.size(); ++i) {
-            resps.add("Hello " + names.get(i));
-        }
-        return resps;
-    }
-
-    public Map<String, String> getGreetingsMap(Map<String, String> namesMap) {
-        for (Map.Entry<String, String> entry : namesMap.entrySet()) {
-            entry.setValue("Hello " + entry.getKey());
-        }
-        return namesMap;
-    }
-
-    public HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap) {
-        for (Map.Entry<String, String> entry : namesMap.entrySet()) {
-            entry.setValue("Hello " + entry.getKey());
-        }
-        return namesMap;
-    }
-
-    public String getGreetingsVarArgs(String... names) {
-        String resp = "Hello";
-        for(int i = 0; i < names.length; ++i) {
-            resp += (" "+names[i]);
-        }
-        return resp;
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
deleted file mode 100644
index e55d2527f4..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ /dev/null
@@ -1,139 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of PrimitivesServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- * 
- * @version $Rev$ $Date$
- */
-@Service(PrimitivesServiceClient.class)
-public class PrimitivesServiceClientImpl {
-
-    private PrimitivesService service;
-    
-    @Reference
-    public void setPrimitivesService(PrimitivesService service) {
-        this.service = service;
-    }
-    public boolean negateBooleanForward(boolean flag) {
-        return service.negateBoolean(flag);
-    }
-    
-    public boolean[] negateBooleanArrayForward(boolean[] flags) {
-        return service.negateBooleanArray(flags);
-    }
-
-    public boolean passByValueBooleanArray() {
-        boolean[] req = new boolean[2];
-        boolean[] resp = service.identityBooleanArray(req);
-        return req != resp;
-    }
-    
-    public byte negateByteForward(byte b) {
-        return service.negateByte(b);
-    }
-    
-    public byte[] negateByteArrayForward(byte[] ba) {
-        return service.negateByteArray(ba);
-    }
-
-    public boolean passByValueByteArray() {
-        byte[] req = new byte[2];
-        byte[] resp = service.identityByteArray(req);
-        return req != resp;
-    }
-    
-    public short negateShortForward(short s) {
-        return service.negateShort(s);
-    }
-    
-    public short[] negateShortArrayForward(short[] s) {
-        return service.negateShortArray(s);
-    }
-
-    public boolean passByValueShortArray() {
-        short[] req = new short[2];
-        short[] resp = service.identityShortArray(req);
-        return req != resp;
-    }
-    
-    public int negateIntForward(int i) {
-        return service.negateInt(i);
-    }
-    
-    public int[] negateIntArrayForward(int[] ia) {
-        return service.negateIntArray(ia);
-    }
-
-    public boolean passByValueIntArray() {
-        int[] req = new int[2];
-        int[] resp = service.identityIntArray(req);
-        return req != resp;
-    }
-    
-    public long negateLongForward(long l) {
-        return service.negateLong(l);
-    }
-    
-    public long[] negateLongArrayForward(long[] la) {
-        return service.negateLongArray(la);
-    }
-
-    public boolean passByValueLongArray() {
-        long[] req = new long[2];
-        long[] resp = service.identityLongArray(req);
-        return req != resp;
-    }
-    
-    public float negateFloatForward(float f) {
-        return service.negateFloat(f);
-    }
-    
-    public float[] negateFloatArrayForward(float[] fa) {
-        return service.negateFloatArray(fa);
-    }
-
-    public boolean passByValueFloatArray() {
-        float[] req = new float[2];
-        float[] resp = service.identityFloatArray(req);
-        return req != resp;
-    }
-    
-    public double negateDoubleForward(double d) {
-        return service.negateDouble(d);
-    }
-    
-    public double[] negateDoubleArrayForward(double[] da) {
-        return service.negateDoubleArray(da);
-    }
-
-    public boolean passByValueDoubleArray() {
-        double[] req = new double[2];
-        double[] resp = service.identityDoubleArray(req);
-        return req != resp;
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
deleted file mode 100644
index 72ff27b85e..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ /dev/null
@@ -1,151 +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.itest.databindings.jaxb.impl;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of PrimitivesService.
- * 
- * @version $Rev$ $Date$
- */
-@Service(interfaces={PrimitivesService.class})
-public class PrimitivesServiceImpl implements PrimitivesService {
-
-    public boolean negateBoolean(boolean flag) {
-        return !flag;
-    }
-
-    public boolean[] negateBooleanArray(boolean[] flags) {
-        boolean[] resp = new boolean[flags.length];
-        
-        for(int i = 0; i < flags.length; ++i) {
-            resp[i] = !flags[i];
-        }
-        return resp;
-    }
-    
-    public boolean[] identityBooleanArray(boolean[] flags) {
-        return flags;
-    }
-    
-    public byte negateByte(byte b) {
-        return (byte)-b;
-    }
-
-    public byte[] negateByteArray(byte[] ba) {
-        byte[] resp = new byte[ba.length];
-        
-        for(int i = 0; i < ba.length; ++i) {
-            resp[i] = (byte)-ba[i];
-        }
-        return resp;
-    }
-    
-    public byte[] identityByteArray(byte[] ba) {
-        return ba;
-    }
-    
-    public short negateShort(short s) {
-        return (short)-s;
-    }
-
-    public short[] negateShortArray(short[] s) {
-        short[] resp = new short[s.length];
-        
-        for(int i = 0; i < s.length; ++i) {
-            resp[i] = (short)-s[i];
-        }
-        return resp;
-    }
-    
-    public short[] identityShortArray(short[] sa) {
-        return sa;
-    }
-
-    public int negateInt(int i) {
-        return -i;
-    }
-
-    public int[] negateIntArray(int[] ia) {
-        int[] resp = new int[ia.length];
-        
-        for(int i = 0; i < ia.length; ++i) {
-            resp[i] = -ia[i];
-        }
-        return resp;
-    }
-
-    public int[] identityIntArray(int[] ia) {
-        return ia;
-    }
-    
-    public long negateLong(long l) {
-        return -l;
-    }
-
-    public long[] negateLongArray(long[] la) {
-        long[] resp = new long[la.length];
-        
-        for(int i = 0; i < la.length; ++i) {
-            resp[i] = -la[i];
-        }
-        return resp;
-    }
-    
-    public long[] identityLongArray(long[] la) {
-        return la;
-    }
-    
-    public float negateFloat(float f) {
-        return -f;
-    }
-
-    public float[] negateFloatArray(float[] fa) {
-        float[] resp = new float[fa.length];
-        
-        for(int i = 0; i < fa.length; ++i) {
-            resp[i] = -fa[i];
-        }
-        return resp;
-    }
-    
-    public float[] identityFloatArray(float[] fa) {
-        return fa;
-    }
-    
-    public double negateDouble(double d) {
-        return -d;
-    }
-
-    public double[] negateDoubleArray(double[] da) {
-        double[] resp = new double[da.length];
-        
-        for(int i = 0; i < da.length; ++i) {
-            resp[i] = -da[i];
-        }
-        return resp;
-    }
-    
-    public double[] identityDoubleArray(double[] da) {
-        return da;
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
deleted file mode 100644
index b3d3c3eb3a..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ /dev/null
@@ -1,159 +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.itest.databindings.jaxb.impl;
-
-import java.awt.Image;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService;
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of StandardTypesServiceClient.
- * The client forwards the request to the service component and returns the response from the service component.
- * 
- * @version $Rev$ $Date$
- */
-@Service(StandardTypesServiceClient.class)
-public class StandardTypesServiceClientImpl implements StandardTypesServiceClient{
-
-    private StandardTypesService service;
-    
-    @Reference
-    public void setStandardTypesService(StandardTypesService service) {
-        this.service = service;
-    }
-
-    public BigInteger getNewBigIntegerForward(BigInteger bi) {
-        return service.getNewBigInteger(bi);
-    }
-
-    public BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia) {
-        return service.getNewBigIntegerArray(bia);
-    }
-
-    public BigDecimal getNewBigDecimalForward(BigDecimal bd) {
-        return service.getNewBigDecimal(bd);
-    }
-
-    public BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda) {
-        return service.getNewBigDecimalArray(bda);
-    }
-    public Calendar getNewCalendarForward(Calendar c) {
-        return service.getNewCalendar(c);
-    }
-    public Calendar[] getNewCalendarArrayForward(Calendar[] ca) {
-        return service.getNewCalendarArray(ca);
-    }
-
-    public Date getNewDateForward(Date d) {
-        return service.getNewDate(d);
-    }
-
-    public Date[] getNewDateArrayForward(Date[] da) {
-        return service.getNewDateArray(da);
-    }
-
-    public QName getNewQNameForward(QName qname) {
-        return service.getNewQName(qname);
-    }
-
-    public QName[] getNewQNameArrayForward(QName[] qnames) {
-        return service.getNewQNameArray(qnames);        
-    }
-
-    public URI getNewURIForward(URI uri) {
-        return service.getNewURI(uri);
-    }
-
-    public URI[] getNewURIArrayForward(URI[] uris) {
-        return service.getNewURIArray(uris);
-    }
-
-    public XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal) {
-        return service.getNewXMLGregorianCalendar(xgcal);
-    }
-
-    public XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals) {
-        return service.getNewXMLGregorianCalendarArray(xgcals);
-    }
-
-    public Duration getNewDurationForward(Duration d) {
-        return service.getNewDuration(d);
-    }
-
-    public Duration[] getNewDurationArrayForward(Duration[] da) {
-        return service.getNewDurationArray(da);
-    }
-
-    public Object getNewObjectForward(Object obj) {
-        return service.getNewObject(obj);
-    }
-
-    public Object[] getNewObjectArrayForward(Object[] objs) {
-        return service.getNewObjectArray(objs);
-    }
-    
-    public Image getNewImageForward(Image img) {
-        return service.getNewImage(img);
-    }
-
-    public Image[] getNewImageArrayForward(Image[] imgs) {
-        return service.getNewImageArray(imgs);
-    }
-
-    public DataHandler getNewDataHandlerForward(DataHandler dh) {
-        return service.getNewDataHandler(dh);
-    }
-
-    public DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha) {
-        return service.getNewDataHandlerArray(dha);
-    }
-
-    
-    public Source getNewSourceForward(Source src) {
-        return service.getNewSource(src);
-    }
-
-    public Source[] getNewSourceArrayForward(Source[] srcs) {
-        return service.getNewSourceArray(srcs);
-    }
-    
-    public UUID getNewUUIDForward(UUID uuid) {
-        return service.getNewUUID(uuid);
-    }
-
-    public UUID[] getNewUUIDArrayForward(UUID[] uuids) {
-        return service.getNewUUIDArray(uuids);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
deleted file mode 100644
index b58d04a04c..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ /dev/null
@@ -1,207 +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.itest.databindings.jaxb.impl;
-
-import java.awt.Image;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of StandardTypesService.
- * 
- * @version $Rev$ $Date$
- */
-@Service(interfaces={StandardTypesService.class})
-public class StandardTypesServiceImpl implements StandardTypesService {
-    public BigInteger getNewBigInteger(BigInteger bi) {
-        return bi.negate();
-    }
-
-    public BigInteger[] getNewBigIntegerArray(BigInteger[] bia) {
-        BigInteger[] resp = new BigInteger[bia.length];
-        for(int i = 0; i < bia.length; ++i) {
-            resp[i] = bia[i].negate();
-        }
-        return resp;
-    }
-
-    public BigDecimal getNewBigDecimal(BigDecimal bd) {
-        return bd.negate();
-    }
-
-    public BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda) {
-        BigDecimal[] resp = new BigDecimal[bda.length];
-        for(int i = 0; i < bda.length; ++i) {
-            resp[i] = bda[i].negate();
-        }
-        return resp;
-    }
-
-    public Calendar getNewCalendar(Calendar c) {
-        Calendar resp = (Calendar)c.clone();
-        resp.add(Calendar.DAY_OF_MONTH, 5);
-        return resp;
-    }
-
-    public Calendar[] getNewCalendarArray(Calendar[] ca) {
-        Calendar[] resp = new Calendar[ca.length];
-        for(int i = 0; i < ca.length; ++i) {
-            resp[i] = getNewCalendar(ca[i]);
-        }
-        return resp;
-    }
-
-    public Date getNewDate(Date d) {
-        return new Date(d.getTime() + 5*24*60*60*1000);
-    }
-
-    public Date[] getNewDateArray(Date[] da) {
-        Date[] resp = new Date[da.length];
-        for(int i = 0; i < da.length; ++i) {
-            resp[i] = getNewDate(da[i]);
-        }
-        return resp;
-    }
-
-    public QName getNewQName(QName qname) {
-        return new QName(qname.getNamespaceURI()+"q", qname.getLocalPart()+"q", qname.getPrefix()+"q");
-        
-    }
-
-    public QName[] getNewQNameArray(QName[] qnames) {
-        QName[] resp = new QName[qnames.length];
-        for(int i = 0; i < qnames.length; ++i) {
-            resp[i] = getNewQName(qnames[i]);
-        }
-        return resp;
-    }
-
-    public URI getNewURI(URI uri) {
-        return uri.resolve("uri");
-    }
-
-    public URI[] getNewURIArray(URI[] uris) {
-        URI[] resp = new URI[uris.length];
-        for(int i = 0; i < uris.length; ++i) {
-            resp[i] = getNewURI(uris[i]);
-        }
-        return resp;
-    }
-
-    public XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal) {
-        xgcal = (XMLGregorianCalendar)xgcal.clone();
-        xgcal.setDay(xgcal.getDay()+5);
-        return xgcal;
-    }
-
-    public XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcals) {
-        XMLGregorianCalendar[] resp = new XMLGregorianCalendar[xgcals.length];
-        for(int i = 0; i < xgcals.length; ++i) {
-            resp[i] = getNewXMLGregorianCalendar(xgcals[i]);
-        }
-        return resp;
-    }
-
-    public Duration getNewDuration(Duration d) {
-        return d.negate();
-    }
-
-    public Duration[] getNewDurationArray(Duration[] da) {
-        Duration[] resp = new Duration[da.length];
-        for(int i = 0; i < da.length; ++i) {
-            resp[i] = da[i].negate();
-        }
-        return resp;
-    }
-
-    public Object getNewObject(Object obj) {
-        return StandardTypesTransformer.getNewObject(obj);
-    }
-
-    public Object[] getNewObjectArray(Object[] objs) {
-        Object[] resp = new Object[objs.length];
-        for(int i = 0; i < objs.length; ++i) {
-            resp[i] = getNewObject(objs[i]);
-        }
-        return resp;
-    }
-
-    public Image getNewImage(Image img) {
-        return StandardTypesTransformer.getNewImage(img);
-    }
-
-    public Image[] getNewImageArray(Image[] imgs) {
-        Image[] resp = new Image[imgs.length];
-        for(int i = 0; i < imgs.length; ++i) {
-            resp[i] = getNewImage(imgs[i]);
-        }
-        return resp;
-    }
-
-    public DataHandler getNewDataHandler(DataHandler dh) {
-        // FIXME: transform the input
-        return dh;
-    }
-
-    public DataHandler[] getNewDataHandlerArray(DataHandler[] dha) {
-        DataHandler[] resp = new DataHandler[dha.length];
-        for(int i = 0; i < dha.length; ++i) {
-            resp[i] = dha[i];
-        }
-        return resp;
-    }
-    
-    public Source getNewSource(Source src) {
-        return StandardTypesTransformer.getNewSource(src);
-    }
-
-    public Source[] getNewSourceArray(Source[] srcs) {
-        Source[] resp = new Source[srcs.length];
-        for(int i = 0; i < srcs.length; ++i) {
-            resp[i] = getNewSource(srcs[i]);
-        }
-        return resp;
-    }
-
-    public UUID getNewUUID(UUID uuid) {
-        return UUID.fromString(uuid.toString()+"AAA");
-    }
-
-    public UUID[] getNewUUIDArray(UUID[] uuids) {
-        UUID[] resp = new UUID[uuids.length];
-        for(int i = 0; i < uuids.length; ++i) {
-            resp[i] = getNewUUID(uuids[i]);
-        }
-        return resp;
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
deleted file mode 100644
index 9d851455da..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ /dev/null
@@ -1,142 +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.itest.databindings.jaxb.impl;
-
-import java.awt.Image;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.CharArrayReader;
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamSource;
-
-import org.xml.sax.InputSource;
-
-/**
- * StandardTypesTransformer class that provide for transforming input provided to StandardTypesService methods.
- * 
- * @version $Rev$ $Date$
- */
-public class StandardTypesTransformer {
-    
-    public static Object getNewObject(Object obj) {
-        if(obj instanceof String) {
-            return "Hello "+obj;
-        } else if(obj instanceof Integer) {
-            return new Integer(-((Integer)obj).intValue());
-        } else if(obj instanceof Double) {
-            return new Double(-((Double)obj).doubleValue());
-        }
-        
-        return obj;
-    }
-    
-    /**
-     * Returns a copy of the source object if the input is DOMSource, SAXSource or StreamSource.
-     * Returns the input object as is for other types.
-     */
-    public static Source getNewSource(Source src) {
-        Source ret = null;
-        if(src instanceof DOMSource) {
-            DOMSource dsrc = (DOMSource)src;
-            ret = new DOMSource(dsrc.getNode() != null ? dsrc.getNode().cloneNode(true) : null);
-        } else if(src instanceof SAXSource) {
-            SAXSource ssrc = (SAXSource)src;
-            if(ssrc.getInputSource().getByteStream() != null) {
-                InputStream inp = ssrc.getInputSource().getByteStream();
-                ByteArrayOutputStream bout = new ByteArrayOutputStream();
-                int b;
-                try {
-                    while((b = inp.read()) != -1) {
-                        bout.write(b);
-                    }
-                } catch (IOException ignored) {
-                }
-                try { bout.close();} catch (IOException ignored) {}
-                try { inp.reset();} catch (IOException ignored) {}
-                ret = new SAXSource(new InputSource(new ByteArrayInputStream(bout.toByteArray())));
-            } else if(ssrc.getInputSource().getCharacterStream() != null) {
-                Reader rdr = ssrc.getInputSource().getCharacterStream();
-                CharArrayWriter caw = new CharArrayWriter();
-                try {
-                    int c;
-                    while((c = rdr.read()) != -1) {
-                        caw.append((char)c);
-                    }
-                } catch (IOException ignored) {
-                }
-                caw.close();
-                try{ rdr.reset();} catch(IOException ignored) {}
-                ret = new SAXSource(new InputSource(new CharArrayReader(caw.toCharArray())));
-            } else {
-                ret = new SAXSource();
-            }
-        } else if(src instanceof StreamSource) {
-            StreamSource ssrc = (StreamSource)src;
-            if(ssrc.getInputStream() != null) {
-                InputStream inp = ssrc.getInputStream();
-                ByteArrayOutputStream bout = new ByteArrayOutputStream();
-                int b;
-                try {
-                    while((b = inp.read()) != -1) {
-                        bout.write(b);
-                    }
-                } catch (IOException ignored) {
-                }
-                try { bout.close();} catch (IOException ignored) {}
-                try { inp.reset();} catch (IOException ignored) {}
-                ret = new StreamSource(new ByteArrayInputStream(bout.toByteArray()));
-            } else if(ssrc.getReader() != null) {
-                Reader rdr = ssrc.getReader();
-                CharArrayWriter caw = new CharArrayWriter();
-                try {
-                    int c;
-                    while((c = rdr.read()) != -1) {
-                        caw.append((char)c);
-                    }
-                } catch (IOException ignored) {
-                }
-                caw.close();
-                try{ rdr.reset();} catch(IOException ignored) {}
-                ret = new StreamSource(new CharArrayReader(caw.toCharArray()));
-            } else {
-                ret = new StreamSource();
-            }
-        }
-        
-        if(ret != null) {
-            ret.setSystemId(src.getSystemId());
-        } else {
-            ret = src;
-        }
-        return ret;
-    }
-    
-    public static Image getNewImage(Image arg) {
-        arg.getGraphics().drawOval(2, 2, 7, 7);
-        return arg;
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
deleted file mode 100644
index 926e4154aa..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
+++ /dev/null
@@ -1,371 +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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<wsdl:definitions name="HelloService"
-    targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
-    xmlns:tns="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
-    xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:types>
-        <xs:schema targetNamespace="http://util.java/"
-            version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-            <xs:complexType name="arrayList">
-                <xs:complexContent>
-                    <xs:extension base="abstractList">
-                        <xs:sequence />
-                    </xs:extension>
-                </xs:complexContent>
-            </xs:complexType>
-            <xs:complexType abstract="true" name="abstractList">
-                <xs:complexContent>
-                    <xs:extension base="abstractCollection">
-                        <xs:sequence />
-                    </xs:extension>
-                </xs:complexContent>
-            </xs:complexType>
-            <xs:complexType abstract="true" name="abstractCollection">
-                <xs:sequence />
-            </xs:complexType>
-            <xs:complexType name="hashMap">
-                <xs:complexContent>
-                    <xs:extension base="abstractMap">
-                        <xs:sequence />
-                    </xs:extension>
-                </xs:complexContent>
-            </xs:complexType>
-            <xs:complexType abstract="true" name="abstractMap">
-                <xs:sequence />
-            </xs:complexType>
-        </xs:schema>
-        <xs:schema targetNamespace="http://jaxb.dev.java.net/array"
-            version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-            <xs:complexType final="#all" name="stringArray">
-                <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0"
-                        name="item" nillable="true" type="xs:string" />
-                </xs:sequence>
-            </xs:complexType>
-        </xs:schema>
-        <xs:schema attributeFormDefault="qualified"
-            elementFormDefault="unqualified"
-            targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
-            xmlns:ns0="http://util.java/"
-            xmlns:xs="http://www.w3.org/2001/XMLSchema">
-            <xs:element name="getGreetings">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getGreetingsResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getGreetingsArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getGreetingsArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="return" nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getGreetingsList">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            nillable="true" type="xs:anyType" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getGreetingsListResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            nillable="true" type="xs:anyType" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getGreetingsArrayList">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            nillable="true" type="ns0:arrayList" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getGreetingsArrayListResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            nillable="true" type="ns0:arrayList" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getGreetingsMap">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            nillable="true" type="xs:anyType" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getGreetingsMapResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            nillable="true" type="xs:anyType" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getGreetingsHashMap">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            nillable="true" type="ns0:hashMap" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getGreetingsHashMapResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            nillable="true" type="ns0:hashMap" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getGreetingsVarArgs">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getGreetingsVarArgsResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:schema>
-    </wsdl:types>
-    <wsdl:message name="getGreetings">
-        <wsdl:part name="getGreetings" element="tns:getGreetings">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part name="getGreetingsResponse"
-            element="tns:getGreetingsResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="getGreetingsArray">
-        <wsdl:part name="getGreetingsArray"
-            element="tns:getGreetingsArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="getGreetingsArrayResponse">
-        <wsdl:part name="getGreetingsArrayResponse"
-            element="tns:getGreetingsArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="getGreetingsList">
-        <wsdl:part name="getGreetingsList"
-            element="tns:getGreetingsList">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="getGreetingsListResponse">
-        <wsdl:part name="getGreetingsListResponse"
-            element="tns:getGreetingsListResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="getGreetingsArrayList">
-        <wsdl:part name="getGreetingsArrayList"
-            element="tns:getGreetingsArrayList">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="getGreetingsArrayListResponse">
-        <wsdl:part name="getGreetingsArrayListResponse"
-            element="tns:getGreetingsArrayListResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="getGreetingsMap">
-        <wsdl:part name="getGreetingsMap"
-            element="tns:getGreetingsMap">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="getGreetingsMapResponse">
-        <wsdl:part name="getGreetingsMapResponse"
-            element="tns:getGreetingsMapResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="getGreetingsHashMap">
-        <wsdl:part name="getGreetingsHashMap"
-            element="tns:getGreetingsHashMap">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="getGreetingsHashMapResponse">
-        <wsdl:part name="getGreetingsHashMapResponse"
-            element="tns:getGreetingsHashMapResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="getGreetingsVarArgs">
-        <wsdl:part name="getGreetingsVarArgs"
-            element="tns:getGreetingsVarArgs">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="getGreetingsVarArgsResponse">
-        <wsdl:part name="getGreetingsVarArgsResponse"
-            element="tns:getGreetingsVarArgsResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="HelloService">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetings"></wsdl:input>
-            <wsdl:output message="tns:getGreetingsResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getGreetingsArray">
-            <wsdl:input message="tns:getGreetingsArray"></wsdl:input>
-            <wsdl:output message="tns:getGreetingsArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getGreetingsList">
-            <wsdl:input message="tns:getGreetingsList"></wsdl:input>
-            <wsdl:output message="tns:getGreetingsListResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getGreetingsArrayList">
-            <wsdl:input message="tns:getGreetingsArrayList">
-            </wsdl:input>
-            <wsdl:output message="tns:getGreetingsArrayListResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getGreetingsMap">
-            <wsdl:input message="tns:getGreetingsMap">
-            </wsdl:input>
-            <wsdl:output message="tns:getGreetingsMapResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getGreetingsHashMap">
-            <wsdl:input message="tns:getGreetingsHashMap"></wsdl:input>
-            <wsdl:output message="tns:getGreetingsHashMapResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getGreetingsVarArgs">
-            <wsdl:input message="tns:getGreetingsVarArgs">
-            </wsdl:input>
-            <wsdl:output message="tns:getGreetingsVarArgsResponse">
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="HelloServiceBinding" type="tns:HelloService">
-        <soap11:binding style="document"
-            transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="getGreetings">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getGreetingsArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getGreetingsList">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getGreetingsArrayList">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getGreetingsMap">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getGreetingsHashMap">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getGreetingsVarArgs">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="HelloServiceService">
-        <wsdl:port name="HelloServicePort"
-            binding="tns:HelloServiceBinding">
-            <soap11:address location="http://localhost:8085/hs-ep" />
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
deleted file mode 100644
index 63151f6a2d..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
+++ /dev/null
@@ -1,80 +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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-           targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
-           name="HelloService">
-           
-    <!-- Clients to test the service -->
-    <!-- A HelloServiceClient component that uses WS binding to invoke HelloService service.
-         The service component uses interface.wsdl on the service element.
-         This client component uses interface.wsdl on the reference element. -->
-    <component name="HelloServiceClientW2WComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceClientImpl" />
-        <reference name="helloService">
-            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(HelloService)"/>
-            <binding.ws uri="http://localhost:8085/hs-ep-w"/>
-        </reference>
-    </component>
-        
-    <!-- A HelloServiceClient component that uses WS binding to invoke HelloService service.
-         The service component uses interface.wsdl on the service element.
-         This client component uses interface.java on the reference element. -->
-    <component name="HelloServiceClientJ2WComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceClientImpl" />
-        <reference name="helloService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloService"/>
-            <binding.ws uri="http://localhost:8085/hs-ep-w"/>
-        </reference>
-    </component>
-        
-    <!-- A HelloServiceClient component that uses WS binding to invoke HelloService service.
-         The service component uses interface.wsdl on the service element.
-         This client component uses interface.java on the reference element. -->
-    <component name="HelloServiceClientW2JComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceClientImpl" />
-        <reference name="helloService">
-            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(HelloService)"/>
-            <binding.ws uri="http://localhost:8085/hs-ep-j"/>
-        </reference>
-    </component>
-        
-    <!-- Components used to implement the services -->
-    <!-- A HelloService component that uses interface.wsdl -->
-    <component name="HelloServiceWSDLComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceImpl"/>
-        <service name="HelloService">
-            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(HelloService)"/>
-            <binding.ws uri="http://localhost:8085/hs-ep-w"/>
-        </service>
-    </component>
-
-    <!-- A HelloService component that uses interface.java -->
-    <component name="HelloServiceJavaComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceImpl"/>
-        <service name="HelloService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloService"/>
-            <binding.ws uri="http://localhost:8085/hs-ep-j"/>
-        </service>
-    </component>
-</composite>
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
deleted file mode 100644
index f366783e5e..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
+++ /dev/null
@@ -1,927 +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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<wsdl:definitions name="PrimitivesService"
-    targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
-    xmlns:tns="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
-    xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:types>
-        <xs:schema targetNamespace="http://jaxb.dev.java.net/array"
-            version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-            <xs:complexType final="#all" name="shortArray">
-                <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0"
-                        name="item" nillable="true" type="xs:short" />
-                </xs:sequence>
-            </xs:complexType>
-            <xs:complexType final="#all" name="intArray">
-                <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0"
-                        name="item" nillable="true" type="xs:int" />
-                </xs:sequence>
-            </xs:complexType>
-            <xs:complexType final="#all" name="floatArray">
-                <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0"
-                        name="item" nillable="true" type="xs:float" />
-                </xs:sequence>
-            </xs:complexType>
-            <xs:complexType final="#all" name="doubleArray">
-                <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0"
-                        name="item" nillable="true" type="xs:double" />
-                </xs:sequence>
-            </xs:complexType>
-            <xs:complexType final="#all" name="longArray">
-                <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0"
-                        name="item" nillable="true" type="xs:long" />
-                </xs:sequence>
-            </xs:complexType>
-            <xs:complexType final="#all" name="booleanArray">
-                <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0"
-                        name="item" nillable="true" type="xs:boolean" />
-                </xs:sequence>
-            </xs:complexType>
-        </xs:schema>
-        <xs:schema attributeFormDefault="qualified"
-            elementFormDefault="unqualified"
-            targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
-            xmlns:xs="http://www.w3.org/2001/XMLSchema">
-            <xs:element name="negateLongArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="return" nillable="true" type="xs:long" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityByteArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            nillable="true" type="xs:base64Binary" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateDoubleArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:double" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityFloatArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:float" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateLong">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            type="xs:long" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityIntArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:int" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateIntResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            type="xs:int" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateLongArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:long" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateInt">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            type="xs:int" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateFloatArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="return" nillable="true" type="xs:float" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityDoubleArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="return" nillable="true" type="xs:double" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateDouble">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            type="xs:double" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityByteArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            nillable="true" type="xs:base64Binary" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateByte">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            type="xs:byte" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityLongArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="return" nillable="true" type="xs:long" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateDoubleResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            type="xs:double" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityFloatArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="return" nillable="true" type="xs:float" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateFloat">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            type="xs:float" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateShortArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="return" nillable="true" type="xs:short" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateByteArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            nillable="true" type="xs:base64Binary" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateLongResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            type="xs:long" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateShortArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:short" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateFloatArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:float" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateBoolean">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            type="xs:boolean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateShort">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            type="xs:short" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateByteArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="arg0"
-                            nillable="true" type="xs:base64Binary" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityBooleanArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:boolean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityShortArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="return" nillable="true" type="xs:short" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateBooleanResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            type="xs:boolean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateFloatResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            type="xs:float" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityBooleanArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="return" nillable="true" type="xs:boolean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateBooleanArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:boolean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateDoubleArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="return" nillable="true" type="xs:double" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityDoubleArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:double" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateIntArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="return" nillable="true" type="xs:int" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityIntArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="return" nillable="true" type="xs:int" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateByteResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            type="xs:byte" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateBooleanArrayResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="return" nillable="true" type="xs:boolean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateShortResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return"
-                            type="xs:short" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="negateIntArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:int" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityShortArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:short" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="identityLongArray">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0"
-                            name="arg0" nillable="true" type="xs:long" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:schema>
-    </wsdl:types>
-
-    <wsdl:message name="negateLongArrayResponse">
-        <wsdl:part name="negateLongArrayResponse"
-            element="tns:negateLongArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityByteArrayResponse">
-        <wsdl:part name="identityByteArrayResponse"
-            element="tns:identityByteArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateDoubleArray">
-        <wsdl:part name="negateDoubleArray"
-            element="tns:negateDoubleArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityFloatArray">
-        <wsdl:part name="identityFloatArray"
-            element="tns:identityFloatArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateLong">
-        <wsdl:part name="negateLong" element="tns:negateLong">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityIntArray">
-        <wsdl:part name="identityIntArray"
-            element="tns:identityIntArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateIntResponse">
-        <wsdl:part name="negateIntResponse"
-            element="tns:negateIntResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateLongArray">
-        <wsdl:part name="negateLongArray"
-            element="tns:negateLongArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateInt">
-        <wsdl:part name="negateInt" element="tns:negateInt"></wsdl:part>
-    </wsdl:message>
-
-    <wsdl:message name="negateFloatArrayResponse">
-        <wsdl:part name="negateFloatArrayResponse"
-            element="tns:negateFloatArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityDoubleArrayResponse">
-        <wsdl:part name="identityDoubleArrayResponse"
-            element="tns:identityDoubleArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateDouble">
-        <wsdl:part name="negateDouble" element="tns:negateDouble">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityByteArray">
-        <wsdl:part name="identityByteArray"
-            element="tns:identityByteArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateByte">
-        <wsdl:part name="negateByte" element="tns:negateByte">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityLongArrayResponse">
-        <wsdl:part name="identityLongArrayResponse"
-            element="tns:identityLongArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateDoubleResponse">
-        <wsdl:part name="negateDoubleResponse"
-            element="tns:negateDoubleResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityFloatArrayResponse">
-        <wsdl:part name="identityFloatArrayResponse"
-            element="tns:identityFloatArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateFloat">
-        <wsdl:part name="negateFloat" element="tns:negateFloat">
-        </wsdl:part>
-    </wsdl:message>
-
-    <wsdl:message name="negateShortArrayResponse">
-        <wsdl:part name="negateShortArrayResponse"
-            element="tns:negateShortArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateByteArrayResponse">
-        <wsdl:part name="negateByteArrayResponse"
-            element="tns:negateByteArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateLongResponse">
-        <wsdl:part name="negateLongResponse"
-            element="tns:negateLongResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateShortArray">
-        <wsdl:part name="negateShortArray"
-            element="tns:negateShortArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateFloatArray">
-        <wsdl:part name="negateFloatArray"
-            element="tns:negateFloatArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateBoolean">
-        <wsdl:part name="negateBoolean" element="tns:negateBoolean">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateShort">
-        <wsdl:part name="negateShort" element="tns:negateShort">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateByteArray">
-        <wsdl:part name="negateByteArray"
-            element="tns:negateByteArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityBooleanArray">
-        <wsdl:part name="identityBooleanArray"
-            element="tns:identityBooleanArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityShortArrayResponse">
-        <wsdl:part name="identityShortArrayResponse"
-            element="tns:identityShortArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateBooleanResponse">
-        <wsdl:part name="negateBooleanResponse"
-            element="tns:negateBooleanResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateFloatResponse">
-        <wsdl:part name="negateFloatResponse"
-            element="tns:negateFloatResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityBooleanArrayResponse">
-        <wsdl:part name="identityBooleanArrayResponse"
-            element="tns:identityBooleanArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateBooleanArray">
-        <wsdl:part name="negateBooleanArray"
-            element="tns:negateBooleanArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateDoubleArrayResponse">
-        <wsdl:part name="negateDoubleArrayResponse"
-            element="tns:negateDoubleArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityDoubleArray">
-        <wsdl:part name="identityDoubleArray"
-            element="tns:identityDoubleArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateIntArrayResponse">
-        <wsdl:part name="negateIntArrayResponse"
-            element="tns:negateIntArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityIntArrayResponse">
-        <wsdl:part name="identityIntArrayResponse"
-            element="tns:identityIntArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateByteResponse">
-        <wsdl:part name="negateByteResponse"
-            element="tns:negateByteResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateBooleanArrayResponse">
-        <wsdl:part name="negateBooleanArrayResponse"
-            element="tns:negateBooleanArrayResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateShortResponse">
-        <wsdl:part name="negateShortResponse"
-            element="tns:negateShortResponse">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="negateIntArray">
-        <wsdl:part name="negateIntArray" element="tns:negateIntArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityShortArray">
-        <wsdl:part name="identityShortArray"
-            element="tns:identityShortArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="identityLongArray">
-        <wsdl:part name="identityLongArray"
-            element="tns:identityLongArray">
-        </wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="PrimitivesService">
-        <wsdl:operation name="negateBoolean">
-            <wsdl:input message="tns:negateBoolean">
-            </wsdl:input>
-            <wsdl:output message="tns:negateBooleanResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateBooleanArray">
-            <wsdl:input message="tns:negateBooleanArray"></wsdl:input>
-            <wsdl:output message="tns:negateBooleanArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityBooleanArray">
-            <wsdl:input message="tns:identityBooleanArray"></wsdl:input>
-            <wsdl:output message="tns:identityBooleanArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateByte">
-            <wsdl:input message="tns:negateByte">
-            </wsdl:input>
-            <wsdl:output message="tns:negateByteResponse"></wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateByteArray">
-            <wsdl:input message="tns:negateByteArray"></wsdl:input>
-            <wsdl:output message="tns:negateByteArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityByteArray">
-            <wsdl:input message="tns:identityByteArray"></wsdl:input>
-            <wsdl:output message="tns:identityByteArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateShort">
-            <wsdl:input message="tns:negateShort">
-            </wsdl:input>
-            <wsdl:output message="tns:negateShortResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateShortArray">
-            <wsdl:input message="tns:negateShortArray"></wsdl:input>
-            <wsdl:output message="tns:negateShortArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityShortArray">
-            <wsdl:input message="tns:identityShortArray"></wsdl:input>
-            <wsdl:output message="tns:identityShortArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateInt">
-            <wsdl:input message="tns:negateInt">
-            </wsdl:input>
-            <wsdl:output message="tns:negateIntResponse"></wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateIntArray">
-            <wsdl:input message="tns:negateIntArray"></wsdl:input>
-            <wsdl:output message="tns:negateIntArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityIntArray">
-            <wsdl:input message="tns:identityIntArray"></wsdl:input>
-            <wsdl:output message="tns:identityIntArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateLong">
-            <wsdl:input message="tns:negateLong">
-            </wsdl:input>
-            <wsdl:output message="tns:negateLongResponse"></wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateLongArray">
-            <wsdl:input message="tns:negateLongArray"></wsdl:input>
-            <wsdl:output message="tns:negateLongArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityLongArray">
-            <wsdl:input message="tns:identityLongArray"></wsdl:input>
-            <wsdl:output message="tns:identityLongArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateFloat">
-            <wsdl:input message="tns:negateFloat">
-            </wsdl:input>
-            <wsdl:output message="tns:negateFloatResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateFloatArray">
-            <wsdl:input message="tns:negateFloatArray"></wsdl:input>
-            <wsdl:output message="tns:negateFloatArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityFloatArray">
-            <wsdl:input message="tns:identityFloatArray"></wsdl:input>
-            <wsdl:output message="tns:identityFloatArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateDouble">
-            <wsdl:input message="tns:negateDouble">
-            </wsdl:input>
-            <wsdl:output message="tns:negateDoubleResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateDoubleArray">
-            <wsdl:input message="tns:negateDoubleArray"></wsdl:input>
-            <wsdl:output message="tns:negateDoubleArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityDoubleArray">
-            <wsdl:input message="tns:identityDoubleArray"></wsdl:input>
-            <wsdl:output message="tns:identityDoubleArrayResponse">
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="PrimitivesServiceBinding"
-        type="tns:PrimitivesService">
-        <soap11:binding style="document"
-            transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="negateBoolean">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateBooleanArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityBooleanArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateByte">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateByteArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityByteArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateShort">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateShortArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityShortArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateInt">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateIntArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityIntArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateLong">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateLongArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityLongArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateFloat">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateFloatArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityFloatArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateDouble">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="negateDoubleArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="identityDoubleArray">
-            <soap11:operation />
-            <wsdl:input>
-                <soap11:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap11:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="PrimitivesServiceService">
-        <wsdl:port name="PrimitivesServicePort"
-            binding="tns:PrimitivesServiceBinding">
-            <soap11:address location="http://localhost:8085/ps-ep" />
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
deleted file mode 100644
index 85ca6d0789..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
+++ /dev/null
@@ -1,80 +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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-           name="PrimitivesService">
-           
-    <!-- Clients to test the service -->
-    <!-- A PrimitivesServiceClient component that uses WS binding to invoke PrimitivesService.
-         The service component uses interface.wsdl on the service element.
-         This client component uses interface.wsdl on the reference element. -->
-    <component name="PrimitivesServiceClientW2WComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />
-        <reference name="primitivesService">
-            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(PrimitivesService)"/>
-            <binding.ws uri="http://localhost:8085/ps-ep-w"/>
-        </reference>
-    </component>
-
-    <!-- A PrimitivesServiceClient component that uses WS binding to invoke PrimitivesService.
-         The service component uses interface.wsdl on the service element.
-         This client component uses interface.java on the reference element. -->
-    <component name="PrimitivesServiceClientJ2WComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />
-        <reference name="primitivesService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/>
-            <binding.ws uri="http://localhost:8085/ps-ep-w"/>
-        </reference>
-    </component>
-
-    <!-- A PrimitivesServiceClient component that uses WS binding to invoke PrimitivesService.
-         The service component uses interface.java on the service element.
-         This client component uses interface.wsdl on the reference element. -->
-    <component name="PrimitivesServiceClientW2JComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />
-        <reference name="primitivesService">
-            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(PrimitivesService)"/>
-            <binding.ws uri="http://localhost:8085/ps-ep-j"/>
-        </reference>
-    </component>
-
-    <!-- Components used to implement the services -->
-    <!-- A PrimitivesService component that uses interface.java -->
-    <component name="PrimitivesServiceJavaComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceImpl"/>
-        <service name="PrimitivesService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/>
-            <binding.ws uri="http://localhost:8085/ps-ep-j"/>
-        </service>
-    </component>
-    
-    <!-- A PrimitivesService component that uses interface.wsdl -->
-    <component name="PrimitivesServiceWSDLComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceImpl"/>
-        <service name="PrimitivesService">
-            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(PrimitivesService)"/>
-            <binding.ws uri="http://localhost:8085/ps-ep-w"/>
-        </service>
-    </component>
-</composite>
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
deleted file mode 100644
index 4788df78e0..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
+++ /dev/null
@@ -1,80 +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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-           targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-           name="StandardTypesService">
-           
-    <!-- Clients to test the service -->
-    <!-- A StandardTypesServiceClient component that uses WS binding to invoke StandardTypesService.
-         The service component uses interface.wsdl on the service element.
-         This client component uses interface.wsdl on the reference element. -->
-    <component name="StandardTypesServiceClientW2WComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />
-        <reference name="standardTypesService">
-            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(StandardTypesService)"/>
-            <binding.ws uri="http://localhost:8085/sts-ep-w"/>
-        </reference>
-    </component>
-
-    <!-- A StandardTypesServiceClient component that uses WS binding to invoke StandardTypesService.
-         The service component uses interface.wsdl on the service element.
-         This client component uses interface.java on the reference element. -->
-    <component name="StandardTypesServiceClientJ2WComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />
-        <reference name="standardTypesService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/>
-            <binding.ws uri="http://localhost:8085/sts-ep-w"/>
-        </reference>
-    </component>
-
-    <!-- A StandardTypesServiceClient component that uses WS binding to invoke StandardTypesService.
-         The service component uses interface.java on the service element.
-         This client component uses interface.wsdl on the reference element. -->
-    <component name="StandardTypesServiceClientW2JComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />
-        <reference name="standardTypesService">
-            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(StandardTypesService)"/>
-            <binding.ws uri="http://localhost:8085/sts-ep-j"/>
-        </reference>
-    </component>
-
-    <!-- Components used to implement the services -->
-    <!-- A StandardTypesService component. -->
-    <component name="StandardTypesServiceJavaComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceImpl"/>
-        <service name="StandardTypesService">
-            <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/>
-            <binding.ws uri="http://localhost:8085/sts-ep-j"/>
-        </service>
-    </component>
-
-    <!-- A StandardTypesService component. -->
-    <component name="StandardTypesServiceWSDLComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceImpl"/>
-        <service name="StandardTypesService">
-            <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(StandardTypesService)"/>
-            <binding.ws uri="http://localhost:8085/sts-ep-w"/>
-        </service>
-    </component>
-</composite>
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl b/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
deleted file mode 100644
index 5bfd1ea277..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
+++ /dev/null
@@ -1,1155 +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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<wsdl:definitions name="StandardTypesService"
-	targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
-	xmlns:tns="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
-	xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-	<wsdl:types>
-		<xs:schema targetNamespace="http://jaxb.dev.java.net/array"
-			version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-			<xs:complexType final="#all" name="anyTypeArray">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="0"
-						name="item" nillable="true" type="xs:anyType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType final="#all" name="base64BinaryArray">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="0"
-						name="item" nillable="true" type="xs:base64Binary" />
-				</xs:sequence>
-			</xs:complexType>
-		</xs:schema>
-		<xs:schema targetNamespace="http://jaxb.dev.java.net/array"
-			version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-			<xs:complexType final="#all" name="dateTimeArray">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="0"
-						name="item" nillable="true" type="xs:dateTime" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType final="#all" name="durationArray">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="0"
-						name="item" nillable="true" type="xs:duration" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType final="#all" name="integerArray">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="0"
-						name="item" nillable="true" type="xs:integer" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType final="#all" name="anySimpleTypeArray">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="0"
-						name="item" nillable="true" type="xs:anySimpleType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType final="#all" name="QNameArray">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="0"
-						name="item" nillable="true" type="xs:QName" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType final="#all" name="decimalArray">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="0"
-						name="item" nillable="true" type="xs:decimal" />
-				</xs:sequence>
-			</xs:complexType>
-
-			<xs:complexType final="#all" name="base64BinaryArray">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="0"
-						name="item" nillable="true" type="xs:base64Binary" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType final="#all" name="stringArray">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="0"
-						name="item" nillable="true" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-		</xs:schema>
-		<xs:schema attributeFormDefault="qualified"
-			elementFormDefault="unqualified"
-			targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
-			xmlns:ns0="http://activation.javax/"
-			xmlns:xs="http://www.w3.org/2001/XMLSchema">
-			<xs:element name="getNewBigDecimalArray">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="arg0" nillable="true" type="xs:decimal" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewImageArrayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="return" nillable="true" type="xs:base64Binary" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewBigDecimal">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="arg0"
-							nillable="true" type="xs:decimal" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewURIArray">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="arg0" nillable="true" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewObjectArray">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="arg0" nillable="true" type="xs:anyType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewDataHandler">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="arg0"
-							nillable="true" type="xs:base64Binary" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewDateResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return"
-							nillable="true" type="xs:dateTime" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewBigInteger">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="arg0"
-							nillable="true" type="xs:integer" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewDateArrayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="return" nillable="true" type="xs:dateTime" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewBigIntegerArray">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="arg0" nillable="true" type="xs:integer" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewQNameArrayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="return" nillable="true" type="xs:QName" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewURIResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return"
-							nillable="true" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewUUIDArrayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="return" nillable="true" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewCalendarArrayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="return" nillable="true" type="xs:dateTime" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewXMLGregorianCalendarArray">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="arg0" nillable="true" type="xs:anySimpleType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewCalendarResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return"
-							nillable="true" type="xs:dateTime" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewCalendar">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="arg0"
-							nillable="true" type="xs:dateTime" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewCalendarArray">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="arg0" nillable="true" type="xs:dateTime" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewImageArray">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="arg0" nillable="true" type="xs:base64Binary" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewObjectResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return"
-							nillable="true" type="xs:anyType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewDurationArray">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="arg0" nillable="true" type="xs:duration" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element
-				name="getNewXMLGregorianCalendarArrayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="return" nillable="true" type="xs:anySimpleType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewSource">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="arg0"
-							nillable="true" type="xs:base64Binary" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewObjectArrayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="return" nillable="true" type="xs:anyType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewUUIDResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return"
-							nillable="true" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewBigIntegerResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return"
-							nillable="true" type="xs:integer" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewQNameArray">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="arg0" nillable="true" type="xs:QName" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewUUIDArray">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="arg0" nillable="true" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewBigDecimalResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return"
-							nillable="true" type="xs:decimal" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewDateArray">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="arg0" nillable="true" type="xs:dateTime" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewURIArrayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="return" nillable="true" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewDurationArrayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="return" nillable="true" type="xs:duration" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewObject">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="arg0"
-							nillable="true" type="xs:anyType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewDataHandlerResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return"
-							nillable="true" type="xs:base64Binary" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewQName">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="arg0"
-							nillable="true" type="xs:QName" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewDate">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="arg0"
-							nillable="true" type="xs:dateTime" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewUUID">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="arg0"
-							nillable="true" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewXMLGregorianCalendarResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return"
-							nillable="true" type="xs:anySimpleType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewBigIntegerArrayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="return" nillable="true" type="xs:integer" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewSourceArray">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="arg0" nillable="true" type="xs:base64Binary" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewImage">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="arg0"
-							nillable="true" type="xs:base64Binary" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewSourceArrayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="return" nillable="true" type="xs:base64Binary" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewXMLGregorianCalendar">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="arg0"
-							nillable="true" type="xs:anySimpleType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewQNameResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return"
-							nillable="true" type="xs:QName" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewDataHandlerArrayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="return" nillable="true" type="xs:base64Binary" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewBigDecimalArrayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="return" nillable="true" type="xs:decimal" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewDuration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="arg0"
-							nillable="true" type="xs:duration" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewDataHandlerArray">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="arg0" nillable="true" type="xs:base64Binary" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewImageResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return"
-							nillable="true" type="xs:base64Binary" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewSourceResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return"
-							nillable="true" type="xs:base64Binary" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewDurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="return"
-							nillable="true" type="xs:duration" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="getNewURI">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="arg0"
-							nillable="true" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:schema>
-	</wsdl:types>
-	<wsdl:message name="getNewBigDecimalArray">
-		<wsdl:part name="getNewBigDecimalArray"
-			element="tns:getNewBigDecimalArray">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewImageArrayResponse">
-
-		<wsdl:part name="getNewImageArrayResponse"
-			element="tns:getNewImageArrayResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewBigDecimal">
-		<wsdl:part name="getNewBigDecimal"
-			element="tns:getNewBigDecimal">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewURIArray">
-		<wsdl:part name="getNewURIArray" element="tns:getNewURIArray">
-
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewObjectArray">
-		<wsdl:part name="getNewObjectArray"
-			element="tns:getNewObjectArray">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewDataHandler">
-		<wsdl:part name="getNewDataHandler"
-			element="tns:getNewDataHandler">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewDateResponse">
-		<wsdl:part name="getNewDateResponse"
-			element="tns:getNewDateResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewBigInteger">
-		<wsdl:part name="getNewBigInteger"
-			element="tns:getNewBigInteger">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewDateArrayResponse">
-		<wsdl:part name="getNewDateArrayResponse"
-			element="tns:getNewDateArrayResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewBigIntegerArray">
-		<wsdl:part name="getNewBigIntegerArray"
-			element="tns:getNewBigIntegerArray">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewQNameArrayResponse">
-		<wsdl:part name="getNewQNameArrayResponse"
-			element="tns:getNewQNameArrayResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewURIResponse">
-		<wsdl:part name="getNewURIResponse"
-			element="tns:getNewURIResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewUUIDArrayResponse">
-		<wsdl:part name="getNewUUIDArrayResponse"
-			element="tns:getNewUUIDArrayResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewCalendarArrayResponse">
-		<wsdl:part name="getNewCalendarArrayResponse"
-			element="tns:getNewCalendarArrayResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewXMLGregorianCalendarArray">
-		<wsdl:part name="getNewXMLGregorianCalendarArray"
-			element="tns:getNewXMLGregorianCalendarArray">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewCalendarResponse">
-		<wsdl:part name="getNewCalendarResponse"
-			element="tns:getNewCalendarResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewCalendar">
-		<wsdl:part name="getNewCalendar" element="tns:getNewCalendar">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewCalendarArray">
-		<wsdl:part name="getNewCalendarArray"
-			element="tns:getNewCalendarArray">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewImageArray">
-		<wsdl:part name="getNewImageArray"
-			element="tns:getNewImageArray">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewObjectResponse">
-		<wsdl:part name="getNewObjectResponse"
-			element="tns:getNewObjectResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewDurationArray">
-		<wsdl:part name="getNewDurationArray"
-			element="tns:getNewDurationArray">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewXMLGregorianCalendarArrayResponse">
-		<wsdl:part name="getNewXMLGregorianCalendarArrayResponse"
-			element="tns:getNewXMLGregorianCalendarArrayResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewSource">
-		<wsdl:part name="getNewSource" element="tns:getNewSource">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewObjectArrayResponse">
-		<wsdl:part name="getNewObjectArrayResponse"
-			element="tns:getNewObjectArrayResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewUUIDResponse">
-		<wsdl:part name="getNewUUIDResponse"
-			element="tns:getNewUUIDResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewBigIntegerResponse">
-		<wsdl:part name="getNewBigIntegerResponse"
-			element="tns:getNewBigIntegerResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewQNameArray">
-		<wsdl:part name="getNewQNameArray"
-			element="tns:getNewQNameArray">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewUUIDArray">
-		<wsdl:part name="getNewUUIDArray"
-			element="tns:getNewUUIDArray">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewBigDecimalResponse">
-		<wsdl:part name="getNewBigDecimalResponse"
-			element="tns:getNewBigDecimalResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewDateArray">
-		<wsdl:part name="getNewDateArray"
-			element="tns:getNewDateArray">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewURIArrayResponse">
-		<wsdl:part name="getNewURIArrayResponse"
-			element="tns:getNewURIArrayResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewDurationArrayResponse">
-		<wsdl:part name="getNewDurationArrayResponse"
-			element="tns:getNewDurationArrayResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewObject">
-		<wsdl:part name="getNewObject" element="tns:getNewObject">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewDataHandlerResponse">
-		<wsdl:part name="getNewDataHandlerResponse"
-			element="tns:getNewDataHandlerResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewQName">
-		<wsdl:part name="getNewQName" element="tns:getNewQName">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewDate">
-		<wsdl:part name="getNewDate" element="tns:getNewDate">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewUUID">
-		<wsdl:part name="getNewUUID" element="tns:getNewUUID">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewXMLGregorianCalendarResponse">
-		<wsdl:part name="getNewXMLGregorianCalendarResponse"
-			element="tns:getNewXMLGregorianCalendarResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewBigIntegerArrayResponse">
-		<wsdl:part name="getNewBigIntegerArrayResponse"
-			element="tns:getNewBigIntegerArrayResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewSourceArray">
-		<wsdl:part name="getNewSourceArray"
-			element="tns:getNewSourceArray">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewImage">
-		<wsdl:part name="getNewImage" element="tns:getNewImage">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewSourceArrayResponse">
-		<wsdl:part name="getNewSourceArrayResponse"
-			element="tns:getNewSourceArrayResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewXMLGregorianCalendar">
-		<wsdl:part name="getNewXMLGregorianCalendar"
-			element="tns:getNewXMLGregorianCalendar">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewQNameResponse">
-		<wsdl:part name="getNewQNameResponse"
-			element="tns:getNewQNameResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewDataHandlerArrayResponse">
-		<wsdl:part name="getNewDataHandlerArrayResponse"
-			element="tns:getNewDataHandlerArrayResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewBigDecimalArrayResponse">
-		<wsdl:part name="getNewBigDecimalArrayResponse"
-			element="tns:getNewBigDecimalArrayResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewDuration">
-		<wsdl:part name="getNewDuration" element="tns:getNewDuration">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewDataHandlerArray">
-		<wsdl:part name="getNewDataHandlerArray"
-			element="tns:getNewDataHandlerArray">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewImageResponse">
-		<wsdl:part name="getNewImageResponse"
-			element="tns:getNewImageResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewSourceResponse">
-		<wsdl:part name="getNewSourceResponse"
-			element="tns:getNewSourceResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewDurationResponse">
-		<wsdl:part name="getNewDurationResponse"
-			element="tns:getNewDurationResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getNewURI">
-		<wsdl:part name="getNewURI" element="tns:getNewURI"></wsdl:part>
-	</wsdl:message>
-	<wsdl:portType name="StandardTypesService">
-		<wsdl:operation name="getNewObject">
-			<wsdl:input message="tns:getNewObject"></wsdl:input>
-			<wsdl:output message="tns:getNewObjectResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewImage">
-			<wsdl:input message="tns:getNewImage"></wsdl:input>
-			<wsdl:output message="tns:getNewImageResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewSource">
-			<wsdl:input message="tns:getNewSource"></wsdl:input>
-			<wsdl:output message="tns:getNewSourceResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewBigInteger">
-			<wsdl:input message="tns:getNewBigInteger"></wsdl:input>
-			<wsdl:output message="tns:getNewBigIntegerResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewBigIntegerArray">
-			<wsdl:input message="tns:getNewBigIntegerArray">
-			</wsdl:input>
-			<wsdl:output message="tns:getNewBigIntegerArrayResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewBigDecimal">
-			<wsdl:input message="tns:getNewBigDecimal"></wsdl:input>
-			<wsdl:output message="tns:getNewBigDecimalResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewBigDecimalArray">
-			<wsdl:input message="tns:getNewBigDecimalArray">
-			</wsdl:input>
-			<wsdl:output message="tns:getNewBigDecimalArrayResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewCalendar">
-			<wsdl:input message="tns:getNewCalendar"></wsdl:input>
-			<wsdl:output message="tns:getNewCalendarResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewCalendarArray">
-			<wsdl:input message="tns:getNewCalendarArray"></wsdl:input>
-			<wsdl:output message="tns:getNewCalendarArrayResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewDate">
-			<wsdl:input message="tns:getNewDate"></wsdl:input>
-			<wsdl:output message="tns:getNewDateResponse"></wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewDateArray">
-			<wsdl:input message="tns:getNewDateArray"></wsdl:input>
-			<wsdl:output message="tns:getNewDateArrayResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewQName">
-			<wsdl:input message="tns:getNewQName"></wsdl:input>
-			<wsdl:output message="tns:getNewQNameResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewQNameArray">
-			<wsdl:input message="tns:getNewQNameArray"></wsdl:input>
-			<wsdl:output message="tns:getNewQNameArrayResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewURI">
-			<wsdl:input message="tns:getNewURI"></wsdl:input>
-			<wsdl:output message="tns:getNewURIResponse"></wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewURIArray">
-			<wsdl:input message="tns:getNewURIArray"></wsdl:input>
-			<wsdl:output message="tns:getNewURIArrayResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewXMLGregorianCalendar">
-			<wsdl:input message="tns:getNewXMLGregorianCalendar">
-			</wsdl:input>
-			<wsdl:output
-				message="tns:getNewXMLGregorianCalendarResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewXMLGregorianCalendarArray">
-			<wsdl:input message="tns:getNewXMLGregorianCalendarArray">
-			</wsdl:input>
-			<wsdl:output
-				message="tns:getNewXMLGregorianCalendarArrayResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewDuration">
-			<wsdl:input message="tns:getNewDuration"></wsdl:input>
-			<wsdl:output message="tns:getNewDurationResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewDurationArray">
-			<wsdl:input message="tns:getNewDurationArray"></wsdl:input>
-			<wsdl:output message="tns:getNewDurationArrayResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewObjectArray">
-			<wsdl:input message="tns:getNewObjectArray"></wsdl:input>
-			<wsdl:output message="tns:getNewObjectArrayResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewImageArray">
-			<wsdl:input message="tns:getNewImageArray"></wsdl:input>
-			<wsdl:output message="tns:getNewImageArrayResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewDataHandler">
-			<wsdl:input message="tns:getNewDataHandler"></wsdl:input>
-			<wsdl:output message="tns:getNewDataHandlerResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewDataHandlerArray">
-			<wsdl:input message="tns:getNewDataHandlerArray">
-			</wsdl:input>
-			<wsdl:output message="tns:getNewDataHandlerArrayResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewSourceArray">
-			<wsdl:input message="tns:getNewSourceArray"></wsdl:input>
-			<wsdl:output message="tns:getNewSourceArrayResponse">
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewUUID">
-			<wsdl:input message="tns:getNewUUID"></wsdl:input>
-			<wsdl:output message="tns:getNewUUIDResponse"></wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewUUIDArray">
-			<wsdl:input message="tns:getNewUUIDArray"></wsdl:input>
-			<wsdl:output message="tns:getNewUUIDArrayResponse">
-			</wsdl:output>
-		</wsdl:operation>
-
-	</wsdl:portType>
-	<wsdl:binding name="StandardTypesServiceBinding"
-		type="tns:StandardTypesService">
-		<soap11:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getNewObject">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewImage">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewSource">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewBigInteger">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewBigIntegerArray">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewBigDecimal">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewBigDecimalArray">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewCalendar">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewCalendarArray">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewDate">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewDateArray">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewQName">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewQNameArray">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewURI">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewURIArray">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewXMLGregorianCalendar">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewXMLGregorianCalendarArray">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewDuration">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewDurationArray">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewObjectArray">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewImageArray">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewDataHandler">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewDataHandlerArray">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewSourceArray">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewUUID">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getNewUUIDArray">
-			<soap11:operation />
-			<wsdl:input>
-				<soap11:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap11:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="StandardTypesServiceService">
-		<wsdl:port name="StandardTypesServicePort"
-			binding="tns:StandardTypesServiceBinding">
-			<soap11:address location="http://localhost:8085/sts-ep"/>
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
deleted file mode 100644
index 35f69608e7..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
+++ /dev/null
@@ -1,349 +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.itest.databindings.jaxb.topdown;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DatabindingTestCase {
-
-    private static Client client;
-    private static Node node;
-
-    /**
-     * Runs once before running the tests
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        try {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/helloservice.composite", null);
-        node.start();
-        client = (Client)node;
-        }catch(Throwable e) {
-            e.printStackTrace();
-        }
-        }catch(Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Runs once after running the tests
-     */
-    @AfterClass
-    public static void tearDown() {
-        node.stop();
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetings.
-     */
-    @Test
-    public void testW2W() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
-        performTest(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsArray.
-     */
-    @Test
-    public void testW2WArray() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
-        performTestArray(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsList.
-     */
-    @Test
-    public void testW2WList() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
-        performTestList(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsArrayList.
-     */
-    @Test
-    public void testW2WArrayList() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
-        performTestArrayList(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsMap.
-     */
-    @Test
-    public void testW2WMap() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
-        performTestMap(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsHashMap.
-     */
-    @Test
-    public void testW2WHashMap() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
-        performTestHashMap(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsVarArgs.
-     */
-    @Test
-    public void testW2WVarArgs() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent");
-        performTestVarArgs(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetings.
-     */
-    @Test
-    public void testJ2W() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
-        performTest(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsArray.
-     */
-    @Test
-    public void testJ2WArray() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
-        performTestArray(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsList.
-     */
-    @Test
-    public void testJ2WList() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
-        performTestList(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsArrayList.
-     */
-    @Test
-    public void testJ2WArrayList() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
-        performTestArrayList(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsMap.
-     */
-    @Test
-    public void testJ2WMap() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
-        performTestMap(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsHashMap.
-     */
-    @Test
-    public void testJ2WHashMap() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
-        performTestHashMap(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsVarArgs.
-     */
-    @Test
-    public void testJ2WVarArgs() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent");
-        performTestVarArgs(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetings.
-     */
-    @Test
-    public void testW2J() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
-        performTest(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsArray.
-     */
-    @Test
-    public void testW2JArray() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
-        performTestArray(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsList.
-     */
-    @Test
-    public void testW2JList() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
-        performTestList(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsArrayList.
-     */
-    @Test
-    public void testW2JArrayList() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
-        performTestArrayList(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsMap.
-     */
-    @Test
-    public void testW2JMap() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
-        performTestMap(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsHashMap.
-     */
-    @Test
-    public void testW2JHashMap() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
-        performTestHashMap(helloServiceClient);
-    }
-
-    /**
-     * Invokes the HelloService service using WS binding.
-     * Service method invoked is getGreetingsVarArgs.
-     */
-    @Test
-    public void testW2JVarArgs() throws Exception {
-        HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent");
-        performTestVarArgs(helloServiceClient);
-    }
-
-    private void performTest(HelloServiceClient helloServiceClient) {
-        String name = "Pandu";
-        String resp = helloServiceClient.getGreetingsForward(name);
-        Assert.assertEquals("Hello "+name, resp);
-    }
-
-    private void performTestArray(HelloServiceClient helloServiceClient) {
-        String[] names = {"Me", "Pandu"};
-        String[] resps = helloServiceClient.getGreetingsArrayForward(names);
-        for(int i = 0; i < names.length; ++i) {
-            Assert.assertEquals("Hello "+names[i], resps[i]);
-        }
-    }
-
-    private void performTestList(HelloServiceClient helloServiceClient) {
-        List<String> namesList = new ArrayList<String>();
-        namesList.add("Me");
-        namesList.add("Pandu");
-        namesList.add("Chinnipandu");
-        List<String> respList = helloServiceClient.getGreetingsListForward(namesList);
-        Assert.assertEquals(namesList.size(), respList.size());
-        for(int i = 0; i < namesList.size(); ++i) {
-            Assert.assertEquals("Hello "+namesList.get(i), respList.get(i));
-        }
-    }
-
-    private void performTestArrayList(HelloServiceClient helloServiceClient) {
-        ArrayList<String> namesList = new ArrayList<String>();
-        namesList.add("Me");
-        namesList.add("Pandu");
-        namesList.add("Chinnipandu");
-        ArrayList<String> respList = helloServiceClient.getGreetingsArrayListForward(namesList);
-        Assert.assertEquals(namesList.size(), respList.size());
-        for(int i = 0; i < namesList.size(); ++i) {
-            Assert.assertEquals("Hello "+namesList.get(i), respList.get(i));
-        }
-    }
-
-    private void performTestMap(HelloServiceClient helloServiceClient) {
-        Map<String, String> namesMap = new HashMap<String, String>();
-        namesMap.put("Me", null);
-        namesMap.put("Pandu", null);
-        namesMap.put("Chinnipandu", null);
-        Map<String, String> respMap = helloServiceClient.getGreetingsMapForward(namesMap);
-        Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size());
-        for(Map.Entry<String, String> entry: namesMap.entrySet()) {
-            Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey()));
-        }
-    }
-
-    private void performTestHashMap(HelloServiceClient helloServiceClient) {
-        HashMap<String, String> namesMap = new HashMap<String, String>();
-        namesMap.put("Me", null);
-        namesMap.put("Pandu", null);
-        namesMap.put("Chinnipandu", null);
-        Map<String, String> respMap = helloServiceClient.getGreetingsHashMapForward(namesMap);
-        Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size());
-        for(Map.Entry<String, String> entry: namesMap.entrySet()) {
-            Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey()));
-        }
-    }
-
-    private void performTestVarArgs(HelloServiceClient helloServiceClient) {
-        String[] names = { "Me", "You", "Pandu" }; // Do not change the array size from 3.
-        String expected = "Hello Me You Pandu";
-        String actual = helloServiceClient.getGreetingsVarArgsForward(names[0], names[1], names[2]);
-        Assert.assertEquals(expected, actual);
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
deleted file mode 100644
index 4a292a8b7a..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
+++ /dev/null
@@ -1,848 +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.itest.databindings.jaxb.topdown;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PrimitivesDatabindingTestCase {
-
-    private static Client domain;
-    private static Node node;
-
-    /**
-     * Runs before each test method
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/primitivesservice.composite", null);
-        node.start();
-        domain = (Client)node;
-    }
-
-    /**
-     * Runs after each test method
-     */
-    @AfterClass
-    public static void tearDown() {
-        node.stop();
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateBoolean.
-     */
-    @Test
-    public void testW2WNegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateBoolean(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateBooleanArray.
-     */
-    @Test
-    public void testW2WNegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateBooleanArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for boolean array.
-     */
-    @Test
-    public void testW2WPassByValueBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateByte.
-     */
-    @Test
-    public void testW2WNegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateByte(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateByteArray.
-     */
-    @Test
-    public void testW2WNegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateByteArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for byte array.
-     */
-    @Test
-    public void testW2WPassByValueByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateShort.
-     */
-    @Test
-    public void testW2WNegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateShort(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateShortArray.
-     */
-    @Test
-    public void testW2WNegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateShortArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for short array.
-     */
-    @Test
-    public void testW2WPassByValueShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateInt.
-     */
-    @Test
-    public void testW2WNegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateInt(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateIntArray.
-     */
-    @Test
-    public void testW2WNegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateIntArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for int array.
-     */
-    @Test
-    public void testW2WPassByValueIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateLong.
-     */
-    @Test
-    public void testW2WNegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateLong(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateLongArray.
-     */
-    @Test
-    public void testW2WNegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateLongArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for long array.
-     */
-    @Test
-    public void testW2WPassByValueLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateFloat.
-     */
-    @Test
-    public void testW2WNegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateFloat(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateFloatArray.
-     */
-    @Test
-    public void testW2WNegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateFloatArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for float array.
-     */
-    @Test
-    public void testW2WPassByValueFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateDouble.
-     */
-    @Test
-    public void testW2WNegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateDouble(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateDoubleArray.
-     */
-    @Test
-    public void testW2WNegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        performTestNegateDoubleArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for double array.
-     */
-    @Test
-    public void testW2WPassByValueDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateBoolean.
-     */
-    @Test
-    public void testJ2WNegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateBoolean(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateBooleanArray.
-     */
-    @Test
-    public void testJ2WNegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateBooleanArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for boolean array.
-     */
-    @Test
-    public void testJ2WPassByValueBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateByte.
-     */
-    @Test
-    public void testJ2WNegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateByte(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateByteArray.
-     */
-    @Test
-    public void testJ2WNegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateByteArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for byte array.
-     */
-    @Test
-    public void testJ2WPassByValueByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateShort.
-     */
-    @Test
-    public void testJ2WNegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateShort(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateShortArray.
-     */
-    @Test
-    public void testJ2WNegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateShortArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for short array.
-     */
-    @Test
-    public void testJ2WPassByValueShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateInt.
-     */
-    @Test
-    public void testJ2WNegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateInt(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateIntArray.
-     */
-    @Test
-    public void testJ2WNegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateIntArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for int array.
-     */
-    @Test
-    public void testJ2WPassByValueIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateLong.
-     */
-    @Test
-    public void testJ2WNegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateLong(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateLongArray.
-     */
-    @Test
-    public void testJ2WNegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateLongArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for long array.
-     */
-    @Test
-    public void testJ2WPassByValueLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateFloat.
-     */
-    @Test
-    public void testJ2WNegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateFloat(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateFloatArray.
-     */
-    @Test
-    public void testJ2WNegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateFloatArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for float array.
-     */
-    @Test
-    public void testJ2WPassByValueFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateDouble.
-     */
-    @Test
-    public void testJ2WNegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateDouble(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateDoubleArray.
-     */
-    @Test
-    public void testJ2WNegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        performTestNegateDoubleArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for double array.
-     */
-    @Test
-    public void testJ2WPassByValueDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateBoolean.
-     */
-    @Test
-    public void testW2JNegateBoolean() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateBoolean(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateBooleanArray.
-     */
-    @Test
-    public void testW2JNegateBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateBooleanArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for boolean array.
-     */
-    @Test
-    public void testW2JPassByValueBooleanArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateByte.
-     */
-    @Test
-    public void testW2JNegateByte() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateByte(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateByteArray.
-     */
-    @Test
-    public void testW2JNegateByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateByteArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for byte array.
-     */
-    @Test
-    public void testW2JPassByValueByteArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueByteArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateShort.
-     */
-    @Test
-    public void testW2JNegateShort() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateShort(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateShortArray.
-     */
-    @Test
-    public void testW2JNegateShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateShortArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for short array.
-     */
-    @Test
-    public void testW2JPassByValueShortArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueShortArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateInt.
-     */
-    @Test
-    public void testW2JNegateInt() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateInt(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateIntArray.
-     */
-    @Test
-    public void testW2JNegateIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateIntArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for int array.
-     */
-    @Test
-    public void testW2JPassByValueIntArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueIntArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateLong.
-     */
-    @Test
-    public void testW2JNegateLong() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateLong(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateLongArray.
-     */
-    @Test
-    public void testW2JNegateLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateLongArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for long array.
-     */
-    @Test
-    public void testW2JPassByValueLongArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueLongArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateFloat.
-     */
-    @Test
-    public void testW2JNegateFloat() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateFloat(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateFloatArray.
-     */
-    @Test
-    public void testW2JNegateFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateFloatArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for float array.
-     */
-    @Test
-    public void testW2JPassByValueFloatArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueFloatArray());
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateDouble.
-     */
-    @Test
-    public void testW2JNegateDouble() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateDouble(primitivesServiceClient);
-    }
-
-    /**
-     * Invokes the PrimitivesService service using WS binding.
-     * Service method invoked is negateDoubleArray.
-     */
-    @Test
-    public void testW2JNegateDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        performTestNegateDoubleArray(primitivesServiceClient);
-    }
-
-    /**
-     * Test the pass-by-value semantics of a remotable service with WS binding.
-     * Test for double array.
-     */
-    @Test
-    public void testW2JPassByValueDoubleArray() throws Exception {
-        PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent");
-        Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray());
-    }
-
-    private void performTestNegateBoolean(PrimitivesServiceClient primitivesServiceClient) {
-        Assert.assertTrue(primitivesServiceClient.negateBooleanForward(false));
-        Assert.assertFalse(primitivesServiceClient.negateBooleanForward(true));
-    }
-
-    private void performTestNegateBooleanArray(PrimitivesServiceClient primitivesServiceClient) {
-        boolean flags[] = new boolean[2];
-        flags[0] = false;
-        flags[1] = true;
-        boolean[] respFlags = primitivesServiceClient.negateBooleanArrayForward(flags);
-        Assert.assertEquals(flags.length, respFlags.length);
-        for(int i = 0; i < flags.length; ++i) {
-            Assert.assertEquals(!flags[i], respFlags[i]);
-        }
-    }
-
-    private void performTestNegateByte(PrimitivesServiceClient primitivesServiceClient) {
-        byte[] ba = new byte[3];
-        ba[0] = -1;
-        ba[1] = 0;
-        ba[2] = 1;
-
-        for(int i = 0; i < ba.length; ++i) {
-            Assert.assertEquals((byte)-ba[i], primitivesServiceClient.negateByteForward(ba[i]));
-        }
-    }
-
-    private void performTestNegateByteArray(PrimitivesServiceClient primitivesServiceClient) {
-        byte[] ba = new byte[3];
-        ba[0] = -1;
-        ba[1] = 0;
-        ba[2] = 1;
-
-        byte[] r = primitivesServiceClient.negateByteArrayForward(ba);
-        Assert.assertEquals(ba.length, r.length);
-        for(int i = 0; i < ba.length; ++i) {
-            Assert.assertEquals((byte)-ba[i], r[i]);
-        }
-    }
-    
-    private void performTestNegateShort(PrimitivesServiceClient primitivesServiceClient) {
-        short[] s = new short[3];
-        s[0] = -1;
-        s[1] = 0;
-        s[2] = 1;
-
-        for(int i = 0; i < s.length; ++i) {
-            Assert.assertEquals((short)-s[i], primitivesServiceClient.negateShortForward(s[i]));
-        }
-    }
-
-    private void performTestNegateShortArray(PrimitivesServiceClient primitivesServiceClient) {
-        short[] s = new short[3];
-        s[0] = -1;
-        s[1] = 0;
-        s[2] = 1;
-
-        short[] r = primitivesServiceClient.negateShortArrayForward(s);
-        Assert.assertEquals(s.length, r.length);
-        for(int i = 0; i < s.length; ++i) {
-            Assert.assertEquals((short)-s[i], r[i]);
-        }
-    }
-
-    private void performTestNegateInt(PrimitivesServiceClient primitivesServiceClient) {
-        int[] ia = new int[3];
-        ia[0] = -1;
-        ia[1] = 0;
-        ia[2] = 1;
-
-        for(int i = 0; i < ia.length; ++i) {
-            Assert.assertEquals(-ia[i], primitivesServiceClient.negateIntForward(ia[i]));
-        }
-    }
-
-    private void performTestNegateIntArray(PrimitivesServiceClient primitivesServiceClient) {
-        int[] ia = new int[3];
-        ia[0] = -1;
-        ia[1] = 0;
-        ia[2] = 1;
-
-        int[] r = primitivesServiceClient.negateIntArrayForward(ia);
-        Assert.assertEquals(ia.length, r.length);
-        for(int i = 0; i < ia.length; ++i) {
-            Assert.assertEquals(-ia[i], r[i]);
-        }
-    }
-
-    private void performTestNegateLong(PrimitivesServiceClient primitivesServiceClient) {
-        long[] la = new long[3];
-        la[0] = -1;
-        la[1] = 0;
-        la[2] = 1;
-
-        for(int i = 0; i < la.length; ++i) {
-            Assert.assertEquals(-la[i], primitivesServiceClient.negateLongForward(la[i]));
-        }
-    }
-
-    private void performTestNegateLongArray(PrimitivesServiceClient primitivesServiceClient) {
-        long[] la = new long[3];
-        la[0] = -1;
-        la[1] = 0;
-        la[2] = 1;
-
-        long[] r = primitivesServiceClient.negateLongArrayForward(la);
-        Assert.assertEquals(la.length, r.length);
-        for(int i = 0; i < la.length; ++i) {
-            Assert.assertEquals(-la[i], r[i]);
-        }
-    }
-
-    private void performTestNegateFloat(PrimitivesServiceClient primitivesServiceClient) {
-        float[] fa = new float[3];
-        fa[0] = -1;
-        fa[1] = 0;
-        fa[2] = 1;
-
-        for(int i = 0; i < fa.length; ++i) {
-            Assert.assertEquals(-fa[i], primitivesServiceClient.negateFloatForward(fa[i]));
-        }
-    }
-
-    private void performTestNegateFloatArray(PrimitivesServiceClient primitivesServiceClient) {
-        float[] ia = new float[3];
-        ia[0] = -1;
-        ia[1] = 0;
-        ia[2] = 1;
-
-        float[] r = primitivesServiceClient.negateFloatArrayForward(ia);
-        Assert.assertEquals(ia.length, r.length);
-        for(int i = 0; i < ia.length; ++i) {
-            Assert.assertEquals(-ia[i], r[i]);
-        }
-    }
-
-    private void performTestNegateDouble(PrimitivesServiceClient primitivesServiceClient) {
-        double[] da = new double[3];
-        da[0] = -1;
-        da[1] = 0;
-        da[2] = 1;
-
-        for(int i = 0; i < da.length; ++i) {
-            Assert.assertEquals(-da[i], primitivesServiceClient.negateDoubleForward(da[i]));
-        }
-    }
-
-    private void performTestNegateDoubleArray(PrimitivesServiceClient primitivesServiceClient) {
-        double[] da = new double[3];
-        da[0] = -1;
-        da[1] = 0;
-        da[2] = 1;
-
-        double[] r = primitivesServiceClient.negateDoubleArrayForward(da);
-        Assert.assertEquals(da.length, r.length);
-        for(int i = 0; i < da.length; ++i) {
-            Assert.assertEquals(-da[i], r[i]);
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
deleted file mode 100644
index 263b2f81eb..0000000000
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
+++ /dev/null
@@ -1,1450 +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.itest.databindings.jaxb.topdown;
-
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.awt.image.PixelGrabber;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.Assert;
-
-import org.apache.axiom.attachments.ByteArrayDataSource;
-import org.apache.tuscany.sca.databinding.xml.String2Node;
-import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient;
-import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.xml.sax.InputSource;
-
-/**
- * @version $Rev$ $Date$
- */
-public class StandardTypesDatabindingTestCase {
-
-    private static Client domain;
-    private static Node node;
-
-    /**
-     * Runs once before the tests
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/standard-types-service.composite", null);
-        node.start();
-        domain = (Client)node;
-    }
-
-    /**
-     * Runs once after the tests
-     */
-    @AfterClass
-    public static void tearDown() {
-        node.stop();
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigInteger.
-     */
-    @Test
-    public void testW2WNewBigInteger() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewBigInteger(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigIntegerArray.
-     */
-    @Test
-    public void testW2WNewBigIntegerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewBigIntegerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigDecimal.
-     */
-    @Test
-    public void testW2WNewBigDecimal() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewBigDecimal(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigDecimalArray.
-     */
-    @Test
-    public void testW2WNewBigDecimalArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewBigDecimalArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewCalendar.
-     */
-    @Test
-    public void testW2WNewCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewCalendarArray.
-     */
-    @Test
-    public void testW2WNewCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDate.
-     */
-    @Test
-    public void testW2WNewDate() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewDate(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDateArray.
-     */
-    @Test
-    public void testW2WNewDateArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewDateArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewQName.
-     */
-    @Test
-    public void testW2WNewQName() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewQName(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewQNameArray.
-     */
-    @Test
-    public void testW2WNewQNameArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewQNameArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewURI.
-     */
-    @Test
-    public void testW2WNewURI() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewURI(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewURIArray.
-     */
-    @Test
-    public void testW2WNewURIArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewURIArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewXMLGregorianCalendar.
-     */
-    @Test
-    public void testW2WNewXMLGregorianCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewXMLGregorianCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewXMLGregorianCalendarArray.
-     */
-    @Test
-    public void testW2WNewXMLGregorianCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewXMLGregorianCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDuration.
-     */
-    @Test
-    public void testW2WNewDuration() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewDuration(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDurationArray.
-     */
-    @Test
-    public void testW2WNewDurationArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewDurationArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewObject.
-     */
-    @Test
-    public void testW2WNewObject() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewObject(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewObjectArray.
-     */
-    @Test
-    public void testW2WNewObjectArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewObjectArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewImage.
-     */
-    @Test
-    public void testW2WNewImage() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewImage(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewImageArray.
-     */
-    @Test
-    public void testW2WNewImageArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewImageArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDataHandler.
-     */
-    @Test
-    @Ignore("TUSCANY-2451")
-    public void testW2WNewDataHandler() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewDataHandler(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDataHandlerArray.
-     */
-    @Test
-    @Ignore("TUSCANY-2451")
-    public void testW2WNewDataHandlerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewDataHandlerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewSource.
-     */
-    @Test
-    //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>")
-    public void testW2WNewSource() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewSource(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewSourceArray.
-     */
-    @Test
-    @Ignore("TUSCANY-2452")
-    public void testW2WNewSourceArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewSourceArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewUUID.
-     */
-    @Test
-    public void testW2WNewUUID() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewUUID(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewUUIDArray.
-     */
-    @Test
-    public void testW2WNewUUIDArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent");
-        performTestNewUUIDArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigInteger.
-     */
-    @Test
-    public void testJ2WNewBigInteger() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewBigInteger(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigIntegerArray.
-     */
-    @Test
-    public void testJ2WNewBigIntegerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewBigIntegerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigDecimal.
-     */
-    @Test
-    public void testJ2WNewBigDecimal() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewBigDecimal(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigDecimalArray.
-     */
-    @Test
-    public void testJ2WNewBigDecimalArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewBigDecimalArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewCalendar.
-     */
-    @Test
-    public void testJ2WNewCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewCalendarArray.
-     */
-    @Test
-    public void testJ2WNewCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDate.
-     */
-    @Test
-    public void testJ2WNewDate() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewDate(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDateArray.
-     */
-    @Test
-    public void testJ2WNewDateArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewDateArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewQName.
-     */
-    @Test
-    public void testJ2WNewQName() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewQName(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewQNameArray.
-     */
-    @Test
-    public void testJ2WNewQNameArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewQNameArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewURI.
-     */
-    @Test
-    public void testJ2WNewURI() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewURI(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewURIArray.
-     */
-    @Test
-    public void testJ2WNewURIArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewURIArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewXMLGregorianCalendar.
-     */
-    @Test
-    public void testJ2WNewXMLGregorianCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewXMLGregorianCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewXMLGregorianCalendarArray.
-     */
-    @Test
-    public void testJ2WNewXMLGregorianCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewXMLGregorianCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDuration.
-     */
-    @Test
-    public void testJ2WNewDuration() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewDuration(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDurationArray.
-     */
-    @Test
-    public void testJ2WNewDurationArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewDurationArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewObject.
-     */
-    @Test
-    public void testJ2WNewObject() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewObject(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewObjectArray.
-     */
-    @Test
-    public void testJ2WNewObjectArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewObjectArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewImage.
-     */
-    @Test
-    public void testJ2WNewImage() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewImage(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewImageArray.
-     */
-    @Test
-    public void testJ2WNewImageArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewImageArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDataHandler.
-     */
-    @Test
-    @Ignore("TUSCANY-2451")
-    public void testJ2WNewDataHandler() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewDataHandler(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDataHandlerArray.
-     */
-    @Test
-    @Ignore("TUSCANY-2451")
-    public void testJ2WNewDataHandlerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewDataHandlerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewSource.
-     */
-    @Test
-    //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>")
-    public void testJ2WNewSource() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewSource(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewSourceArray.
-     */
-    @Test
-    @Ignore("TUSCANY-2452")
-    public void testJ2WNewSourceArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewSourceArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewUUID.
-     */
-    @Test
-    public void testJ2WNewUUID() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewUUID(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewUUIDArray.
-     */
-    @Test
-    public void testJ2WNewUUIDArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent");
-        performTestNewUUIDArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigInteger.
-     */
-    @Test
-    public void testW2JNewBigInteger() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewBigInteger(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigIntegerArray.
-     */
-    @Test
-    public void testW2JNewBigIntegerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewBigIntegerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigDecimal.
-     */
-    @Test
-    public void testW2JNewBigDecimal() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewBigDecimal(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewBigDecimalArray.
-     */
-    @Test
-    public void testW2JNewBigDecimalArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewBigDecimalArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewCalendar.
-     */
-    @Test
-    public void testW2JNewCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewCalendarArray.
-     */
-    @Test
-    public void testW2JNewCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDate.
-     */
-    @Test
-    public void testW2JNewDate() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewDate(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDateArray.
-     */
-    @Test
-    public void testW2JNewDateArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewDateArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewQName.
-     */
-    @Test
-    public void testW2JNewQName() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewQName(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewQNameArray.
-     */
-    @Test
-    public void testW2JNewQNameArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewQNameArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewURI.
-     */
-    @Test
-    public void testW2JNewURI() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewURI(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewURIArray.
-     */
-    @Test
-    public void testW2JNewURIArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewURIArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewXMLGregorianCalendar.
-     */
-    @Test
-    public void testW2JNewXMLGregorianCalendar() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewXMLGregorianCalendar(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewXMLGregorianCalendarArray.
-     */
-    @Test
-    public void testW2JNewXMLGregorianCalendarArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewXMLGregorianCalendarArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDuration.
-     */
-    @Test
-    public void testW2JNewDuration() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewDuration(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDurationArray.
-     */
-    @Test
-    public void testW2JNewDurationArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewDurationArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewObject.
-     */
-    @Test
-    public void testW2JNewObject() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewObject(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewObjectArray.
-     */
-    @Test
-    public void testW2JNewObjectArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewObjectArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewImage.
-     */
-    @Test
-    public void testW2JNewImage() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewImage(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewImageArray.
-     */
-    @Test
-    public void testW2JNewImageArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewImageArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDataHandler.
-     */
-    @Test
-    @Ignore("TUSCANY-2451")
-    public void testW2JNewDataHandler() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewDataHandler(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewDataHandlerArray.
-     */
-    @Test
-    @Ignore("TUSCANY-2451")
-    public void testW2JNewDataHandlerArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewDataHandlerArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewSource.
-     */
-    @Test
-    //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>")
-    public void testW2JNewSource() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewSource(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewSourceArray.
-     */
-    @Test
-    @Ignore("TUSCANY-2452")
-    public void testW2JNewSourceArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewSourceArray(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewUUID.
-     */
-    @Test
-    public void testW2JNewUUID() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewUUID(serviceClient);
-    }
-
-    /**
-     * Invokes the StandardTypesService service using WS binding.
-     * Service method invoked is getNewUUIDArray.
-     */
-    @Test
-    public void testW2JNewUUIDArray() throws Exception {
-        StandardTypesServiceClient serviceClient =
-            domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent");
-        performTestNewUUIDArray(serviceClient);
-    }
-
-    private void performTestNewBigInteger(StandardTypesServiceClient serviceClient) {
-        BigInteger bi = new BigInteger("1234567890123456789012345678901234");
-        BigInteger expected = bi.negate();
-        BigInteger actual = serviceClient.getNewBigIntegerForward(bi);
-        Assert.assertEquals(expected, actual);
-    }
-
-    private void performTestNewBigIntegerArray(StandardTypesServiceClient serviceClient) {
-        BigInteger[] bia = new BigInteger[2];
-        bia[0] = new BigInteger("1234567890123456789012345678901234");
-        bia[1] = new BigInteger("-98765432109876543210987654321");
-        BigInteger[] actual = serviceClient.getNewBigIntegerArrayForward(bia);
-        Assert.assertEquals(bia.length, actual.length);
-        for (int i = 0; i < bia.length; ++i) {
-            Assert.assertEquals(bia[i].negate(), actual[i]);
-        }
-    }
-
-    private void performTestNewBigDecimal(StandardTypesServiceClient serviceClient) {
-        BigDecimal bd = new BigDecimal("12345678901234567890.12345678901234");
-        BigDecimal expected = bd.negate();
-        BigDecimal actual = serviceClient.getNewBigDecimalForward(bd);
-        Assert.assertEquals(expected, actual);
-    }
-
-    private void performTestNewBigDecimalArray(StandardTypesServiceClient serviceClient) {
-        BigDecimal[] bda = new BigDecimal[2];
-        bda[0] = new BigDecimal("1234567890123456.789012345678901234");
-        bda[1] = new BigDecimal("-987654321098765.43210987654321");
-        BigDecimal[] actual = serviceClient.getNewBigDecimalArrayForward(bda);
-        Assert.assertEquals(bda.length, actual.length);
-        for (int i = 0; i < bda.length; ++i) {
-            Assert.assertEquals(bda[i].negate(), actual[i]);
-        }
-    }
-
-    private void performTestNewCalendar(StandardTypesServiceClient serviceClient) {
-        Calendar[] ca = new Calendar[3];
-        String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"};
-        for (int i = 0; i < ca.length; ++i) {
-            ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i]));
-            ca[i].set(Calendar.DAY_OF_MONTH, i + 1);
-        }
-        for (int i = 0; i < ca.length; ++i) {
-            Calendar actual = serviceClient.getNewCalendarForward(ca[i]);
-            ca[i].add(Calendar.DAY_OF_MONTH, 5);
-            if (actual instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) {
-                // FIXME: Is this a problem?
-                // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover
-                // different from the instance passed.  Adjust the gregorianCutover as per the input instance.
-                ((GregorianCalendar)actual).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange());
-            }
-            Assert.assertEquals(ca[i], actual);
-        }
-    }
-
-    private void performTestNewCalendarArray(StandardTypesServiceClient serviceClient) {
-        Calendar[] ca = new Calendar[3];
-        String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"};
-        for (int i = 0; i < ca.length; ++i) {
-            ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i]));
-            ca[i].set(Calendar.DAY_OF_MONTH, i + 1);
-        }
-        Calendar[] actual = serviceClient.getNewCalendarArrayForward(ca);
-        Assert.assertEquals(ca.length, actual.length);
-        for (int i = 0; i < ca.length; ++i) {
-            ca[i].add(Calendar.DAY_OF_MONTH, 5);
-            if (actual[i] instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) {
-                // FIXME: Is this a problem?
-                // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover
-                // different from the instance passed.  Adjust the gregorianCutover as per the input instance.
-                ((GregorianCalendar)actual[i]).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange());
-            }
-            Assert.assertEquals(ca[i], actual[i]);
-        }
-    }
-
-    private void performTestNewDate(StandardTypesServiceClient serviceClient) {
-        Date d = new Date();
-        Date expected = new Date(d.getTime() + 5 * 24 * 60 * 60 * 1000);
-        Date actual = serviceClient.getNewDateForward(d);
-        Assert.assertEquals(expected, actual);
-    }
-
-    private void performTestNewDateArray(StandardTypesServiceClient serviceClient) {
-        Date[] d = new Date[2];
-        Date[] expected = new Date[d.length];
-        for (int i = 0; i < d.length; ++i) {
-            d[i] = new Date();
-            d[i].setTime(d[i].getTime() + i * 24 * 60 * 60 * 1000);
-            expected[i] = new Date(d[i].getTime() + 5 * 24 * 60 * 60 * 1000);
-        }
-        Date[] actual = serviceClient.getNewDateArrayForward(d);
-        Assert.assertEquals(expected.length, actual.length);
-        for (int i = 0; i < expected.length; ++i) {
-            Assert.assertEquals(expected[i], actual[i]);
-        }
-    }
-
-    private void performTestNewQName(StandardTypesServiceClient serviceClient) {
-        QName[] qnames = new QName[3];
-        qnames[0] = new QName("localPart");
-        qnames[1] = new QName("namespaceUri", "localPart");
-        qnames[2] = new QName("namespaceUri", "localPart", "prefix");
-        QName[] expected = new QName[qnames.length];
-        for (int i = 0; i < qnames.length; ++i) {
-            expected[i] =
-                new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q",
-                          qnames[i].getPrefix() + "q");
-        }
-        for (int i = 0; i < qnames.length; ++i) {
-            QName actual = serviceClient.getNewQNameForward(qnames[i]);
-            Assert.assertEquals(expected[i], actual);
-        }
-    }
-
-    private void performTestNewQNameArray(StandardTypesServiceClient serviceClient) {
-        QName[] qnames = new QName[4];
-        qnames[0] = new QName("localPart");
-        qnames[1] = new QName("namespaceUri", "localPart");
-        qnames[2] = new QName("namespaceUri", "localPart", "prefix");
-        qnames[3] = new QName("localPart2");
-        QName[] expected = new QName[qnames.length];
-        for (int i = 0; i < qnames.length; ++i) {
-            expected[i] =
-                new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q",
-                          qnames[i].getPrefix() + "q");
-        }
-        QName[] actual = serviceClient.getNewQNameArrayForward(qnames);
-        Assert.assertEquals(expected.length, actual.length);
-        for (int i = 0; i < qnames.length; ++i) {
-            Assert.assertEquals(expected[i], actual[i]);
-        }
-    }
-
-    private void performTestNewURI(StandardTypesServiceClient serviceClient) {
-        URI[] uris = new URI[4];
-        uris[0] = URI.create("a/b/c");
-        uris[1] = URI.create("http://abc/");
-        uris[2] = URI.create("ftp://a/b");
-        uris[3] = URI.create("http://abc/").resolve("xyz");
-
-        for (int i = 0; i < uris.length; ++i) {
-            URI expected = uris[i].resolve("uri");
-            URI actual = serviceClient.getNewURIForward(uris[i]);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    private void performTestNewURIArray(StandardTypesServiceClient serviceClient) {
-        URI[] uris = new URI[4];
-        uris[0] = URI.create("a/b/c");
-        // [rfeng] We need to have a trialign / to avoid the resolving problem
-        // FIXME: [vamsi] This is actually a data transformation problem. The array being returned from the service method is
-        // not making to the caller intact.
-        uris[1] = URI.create("http://abc/");
-        uris[2] = URI.create("ftp://a/b");
-        uris[3] = URI.create("http://abc/").resolve("xyz");
-
-        URI[] expected = new URI[uris.length];
-        for (int i = 0; i < uris.length; ++i) {
-            expected[i] = uris[i].resolve("uri");
-        }
-
-        URI[] actual = serviceClient.getNewURIArrayForward(uris);
-        Assert.assertEquals(expected.length, actual.length);
-        for (int i = 0; i < uris.length; ++i) {
-            Assert.assertEquals(expected[i], actual[i]);
-        }
-    }
-
-    private void performTestNewXMLGregorianCalendar(StandardTypesServiceClient serviceClient)
-        throws DatatypeConfigurationException {
-        DatatypeFactory df = DatatypeFactory.newInstance();
-        XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3];
-        xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19));
-        xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13));
-        xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16));
-
-        for (int i = 0; i < xgcals.length; ++i) {
-            XMLGregorianCalendar actual = serviceClient.getNewXMLGregorianCalendarForward(xgcals[i]);
-            xgcals[i].setDay(xgcals[i].getDay() + 5);
-            Assert.assertEquals(xgcals[i], actual);
-        }
-    }
-
-    private void performTestNewXMLGregorianCalendarArray(StandardTypesServiceClient serviceClient)
-        throws DatatypeConfigurationException {
-        DatatypeFactory df = DatatypeFactory.newInstance();
-        XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3];
-        xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19));
-        xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13));
-        xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16));
-
-        XMLGregorianCalendar[] actual = serviceClient.getNewXMLGregorianCalendarArrayForward(xgcals);
-        Assert.assertEquals(xgcals.length, actual.length);
-        for (int i = 0; i < xgcals.length; ++i) {
-            xgcals[i].setDay(xgcals[i].getDay() + 5);
-            Assert.assertEquals(xgcals[i], actual[i]);
-        }
-    }
-
-    private void performTestNewDuration(StandardTypesServiceClient serviceClient) throws DatatypeConfigurationException {
-        DatatypeFactory df = DatatypeFactory.newInstance();
-        Duration[] da = new Duration[3];
-        da[0] = df.newDuration(1000000000000L);
-        da[1] = df.newDurationDayTime(1000000000000L);
-        da[2] = df.newDurationYearMonth(true, 1, 3);
-
-        for (int i = 0; i < da.length; ++i) {
-            Assert.assertEquals(da[i].negate(), serviceClient.getNewDurationForward(da[i]));
-        }
-    }
-
-    private void performTestNewObject(StandardTypesServiceClient serviceClient) {
-        Object[] objs = new Object[5];
-        objs[0] = "Hello";
-        objs[1] = 10;
-        objs[2] = null;
-        objs[3] = -1.0;
-        objs[4] = null;
-
-        for (int i = 0; i < objs.length; ++i) {
-            Object expected = StandardTypesTransformer.getNewObject(objs[i]);
-            Object actual = serviceClient.getNewObjectForward(objs[i]);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    private void performTestNewObjectArray(StandardTypesServiceClient serviceClient) {
-        Object[] objs = new Object[5];
-        objs[0] = "Hello";
-        objs[1] = 10;
-        objs[2] = null;
-        objs[3] = -1.0;
-        objs[4] = null;
-
-        Object[] actual = serviceClient.getNewObjectArrayForward(objs);
-        Assert.assertEquals(objs.length, actual.length);
-        for (int i = 0; i < objs.length; ++i) {
-            Object expected = StandardTypesTransformer.getNewObject(objs[i]);
-            Assert.assertEquals(expected, actual[i]);
-        }
-    }
-
-    private void performTestNewImage(StandardTypesServiceClient serviceClient) throws InterruptedException {
-        // Create some images to test with.
-        Image[] imgs = new Image[3];
-        imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
-        imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-        imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        imgs[0].getGraphics().drawLine(1, 1, 8, 8);
-        imgs[1].getGraphics().drawLine(8, 1, 1, 8);
-        imgs[2].getGraphics().drawLine(1, 8, 8, 1);
-        
-        Image[] copy = imgs;
-        // Create the same images once again as the StandardTypesTransformer may manipulate the image passed.
-        imgs = new Image[3];
-        imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
-        imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-        imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        imgs[0].getGraphics().drawLine(1, 1, 8, 8);
-        imgs[1].getGraphics().drawLine(8, 1, 1, 8);
-        imgs[2].getGraphics().drawLine(1, 8, 8, 1);
-        
-        // Make sure the images and copies are equal using ImageInfo
-        for(int i = 0; i < imgs.length; ++i) {
-            Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i]));
-        }
-
-        for (int i = 0; i < imgs.length; ++i) {
-            Image actual = serviceClient.getNewImageForward(imgs[i]);
-            Image expected = StandardTypesTransformer.getNewImage(copy[i]);
-            // Compare using ImageInfo
-            Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual));
-        }
-    }
-
-    private void performTestNewImageArray(StandardTypesServiceClient serviceClient) throws InterruptedException {
-        // Create some images to test with.
-        Image[] imgs = new Image[3];
-        imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
-        imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-        imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        imgs[0].getGraphics().drawLine(1, 1, 8, 8);
-        imgs[1].getGraphics().drawLine(8, 1, 1, 8);
-        imgs[2].getGraphics().drawLine(1, 8, 8, 1);
-        
-        Image[] copy = imgs;
-        // Create the same images once again as the StandardTypesTransformer may manipulate the image passed.
-        imgs = new Image[3];
-        imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
-        imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB);
-        imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        imgs[0].getGraphics().drawLine(1, 1, 8, 8);
-        imgs[1].getGraphics().drawLine(8, 1, 1, 8);
-        imgs[2].getGraphics().drawLine(1, 8, 8, 1);
-        
-        // Make sure the images and copies are equal using ImageInfo
-        for(int i = 0; i < imgs.length; ++i) {
-            Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i]));
-        }
-
-        Image[] actual = serviceClient.getNewImageArrayForward(imgs);
-        Assert.assertEquals(imgs.length, actual.length);
-        for (int i = 0; i < imgs.length; ++i) {
-            Image expected = StandardTypesTransformer.getNewImage(copy[i]);
-            // Compare using ImageInfo
-            Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual[i]));
-        }
-    }
-
-    private void performTestNewDurationArray(StandardTypesServiceClient serviceClient)
-        throws DatatypeConfigurationException {
-        DatatypeFactory df = DatatypeFactory.newInstance();
-        Duration[] da = new Duration[3];
-        da[0] = df.newDuration(1000000000000L);
-        da[1] = df.newDurationDayTime(1000000000000L);
-        da[2] = df.newDurationYearMonth(true, 1, 3);
-
-        Duration[] actual = serviceClient.getNewDurationArrayForward(da);
-        Assert.assertEquals(da.length, actual.length);
-        for (int i = 0; i < da.length; ++i) {
-            Assert.assertEquals(da[i].negate(), actual[i]);
-        }
-    }
-
-    private void performTestNewDataHandler(StandardTypesServiceClient serviceClient) throws IOException {
-        DataHandler[] dha = new DataHandler[3];
-        dha[0] = new DataHandler("Some data", "text/plain");
-        dha[1] = new DataHandler(this.getClass().getClassLoader().getResource("standard-types-service.composite"));
-        dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes()));
-
-        for (int i = 0; i < dha.length; ++i) {
-            DataHandler actual = serviceClient.getNewDataHandlerForward(dha[i]);
-            // Note: The DataHandler returned may use a different type of DataSource.
-            // Compare the data content instead of using equals().
-            Assert.assertTrue(compare(dha[i], actual));
-        }
-    }
-
-    private void performTestNewDataHandlerArray(StandardTypesServiceClient serviceClient) throws IOException {
-        DataHandler[] dha = new DataHandler[3];
-        dha[0] = new DataHandler("Some data", "text/plain");
-        dha[1] = new DataHandler(this.getClass().getClassLoader().getResource("standard-types-service.composite"));
-        dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes()));
-
-        DataHandler[] actual = serviceClient.getNewDataHandlerArrayForward(dha);
-        Assert.assertEquals(dha.length, actual.length);
-        for (int i = 0; i < dha.length; ++i) {
-            // Note: The DataHandler returned may use a different type of DataSource.
-            // Compare the data content instead of using equals().
-            Assert.assertTrue(compare(dha[i], actual[i]));
-        }
-    }
-
-    private void performTestNewSource(StandardTypesServiceClient serviceClient) throws Exception {
-        String xml = "<a>A<b>B</b><c>C</c></a>";
-        Source[] srcs = new Source[3];
-        srcs[0] = new DOMSource(new String2Node().transform(xml, null));
-        srcs[1] = new SAXSource(new InputSource(new StringReader(xml)));
-        srcs[2] = new StreamSource(new StringReader(xml));
-
-        for (int i = 0; i < srcs.length; ++i) {
-            Source expected = StandardTypesTransformer.getNewSource(srcs[i]);
-            Source actual = serviceClient.getNewSourceForward(srcs[i]);
-            // [rfeng] The data may come back as a different source
-            Assert.assertEquals(sourceToString(expected), sourceToString(actual));
-        }
-    }
-
-    private void performTestNewSourceArray(StandardTypesServiceClient serviceClient) throws Exception {
-        String xml = "<a>A<b>B</b><c>C</c></a>";
-        Source[] srcs = new Source[3];
-        srcs[0] = new DOMSource(new String2Node().transform(xml, null));
-        srcs[1] = new SAXSource(new InputSource(new StringReader(xml)));
-        srcs[2] = new StreamSource(new StringReader(xml));
-
-        Source[] actual = serviceClient.getNewSourceArrayForward(srcs);
-        Source[] expected = new Source[srcs.length];
-        for(int i = 0; i < srcs.length; ++i) {
-            expected[i] = StandardTypesTransformer.getNewSource(srcs[i]);
-        }
-        Assert.assertEquals(srcs.length, actual.length);
-        for (int i = 0; i < srcs.length; ++i) {
-            // [rfeng] The data may come back as a different source
-            Assert.assertEquals(sourceToString(expected[i]), sourceToString(actual[i]));
-        }
-
-    }
-
-    private void performTestNewUUID(StandardTypesServiceClient serviceClient) {
-        UUID[] uuids = new UUID[3];
-        uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes());
-        uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes());
-        uuids[2] = UUID.randomUUID();
-
-        for (int i = 0; i < uuids.length; ++i) {
-            UUID expected = UUID.fromString(uuids[i].toString() + "AAA");
-            UUID actual = serviceClient.getNewUUIDForward(uuids[i]);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    private void performTestNewUUIDArray(StandardTypesServiceClient serviceClient) {
-        UUID[] uuids = new UUID[3];
-        uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes());
-        uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes());
-        uuids[2] = UUID.randomUUID();
-
-        UUID[] actual = serviceClient.getNewUUIDArrayForward(uuids);
-        for (int i = 0; i < uuids.length; ++i) {
-            UUID expected = UUID.fromString(uuids[i].toString() + "AAA");
-            Assert.assertEquals(expected, actual[i]);
-        }
-    }
-    
-    /**
-     * This method compares two DataHandlers.
-     * @return true if the data in the two handlers is the same.
-     */
-    private boolean compare(DataHandler dh1, DataHandler dh2) throws IOException {
-        InputStream inp1 = dh1.getInputStream();
-        InputStream inp2 = dh2.getInputStream();
-        for(;;) {
-            int i1 = inp1.read();
-            int i2 = inp2.read();
-            if(i1 == -1 && i2 == -1) {
-                return true;
-            } else if(i1 != -1 && i2 != -1) {
-                if(i1 != i2) {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        }
-    }
-    
-    /**
-     * This method returns the content of a source object as String.
-     */
-    private String sourceToString(Source s) throws Exception {
-        StringWriter sw = new StringWriter();
-        Result r  = new StreamResult(sw);
-        TransformerFactory.newInstance().newTransformer().transform(s, r);
-        sw.close();
-        return sw.toString();
-    }
-    
-    /**
-     * This class initializes with the width, height and pixel data of a java.awt.Image object.
-     */
-    private static class ImageInfo {
-        private int h, w, pixels[];
-        public ImageInfo(Image img) throws InterruptedException {
-            w = img.getWidth(null);
-            h = img.getHeight(null);
-            pixels = new int[w*h];
-            PixelGrabber pg = new PixelGrabber(img, 0, 0, w, h, pixels, 0, w);
-            pg.grabPixels();
-        }
-        
-        public boolean equals(Object that) {
-            if(that == null) {
-                return false;
-            } else if(!(that instanceof ImageInfo)) {
-                return false;
-            }
-            
-            ImageInfo that1 = (ImageInfo)that;
-            if(w != that1.w || h != that1.h || pixels == null || that1.pixels == null || pixels.length != that1.pixels.length) {
-                return false;
-            }
-            for(int i = 0; i < pixels.length; ++i) {
-                if(pixels[i] != that1.pixels[i]) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        
-        public String toString() {
-            return this.getClass().getSimpleName()+"[w = "+w+", h = "+h+", pixels = "+pixels+"]";
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/databindings/jaxbgen/pom.xml b/java/sca-contrib/itest/databindings/jaxbgen/pom.xml
deleted file mode 100644
index fb88bcfff1..0000000000
--- a/java/sca-contrib/itest/databindings/jaxbgen/pom.xml
+++ /dev/null
@@ -1,262 +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>itest-databindings</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-jaxb</artifactId>
-    <version>2.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA JAXB Databinding Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-            <scope>compile</scope>
-        </dependency>
- 
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-        <!-- Added by Simon Nash    -->
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.12</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- End of addition   -->
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.tuscany.sca</groupId>
-                                    <artifactId>itest-databindings-common</artifactId>
-                                    <version>${project.version}</version>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <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.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-source</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass>
-                    <arguments>
-                        <argument>${project.build.directory}</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.9</version>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <packageName>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</packageName>
-                    <wsdlDirectory>${project.build.directory}/classes/wsdl</wsdlDirectory>
-                    <wsdlFiles>
-                        <wsdlFile>Greeter.wsdl</wsdlFile>
-                    </wsdlFiles>
-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                    <verbose>false</verbose>
-                    <xnocompile>true</xnocompile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/java/sca-contrib/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
deleted file mode 100644
index 8381a164ea..0000000000
--- a/java/sca-contrib/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
+++ /dev/null
@@ -1,172 +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.    
--->
-<tns:Generate xmlns:tns="http://www.apache.org/tuscany/generate" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-              xsi:schemaLocation="http://www.example.org/generate generate.xsd ">
-             
-               
-  <Template>
-    <TemplateName>GreeterService.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>GreeterServiceImpl.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>GreeterServiceClient.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>GreeterServiceClientImpl.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>DatabindingTestCase.java.vm</TemplateName>
-    <TemplateTargetDir>../src/test/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template> 
-  <Template>
-    <TemplateName>Greeter.wsdl.vm</TemplateName>
-    <TemplateTargetDir>classes/wsdl</TemplateTargetDir>
-  </Template> 
-  <InputFile>
-    <FileName>Person.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</JavaPackage>
-    <Factory>ObjectFactory</Factory> 
-    <Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace>  
-    <Prefix>p</Prefix> 
-    <Type>
-      <TypeName>PersonType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createPersonType();
-        param.setFirstName("George");
-        param.setLastName("Doors");
-      </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setGreeting("Hello");
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting());
-      </ResultComparison>      
-    </Type>
-  </InputFile>
-  <InputFile>
-    <FileName>Interop.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</JavaPackage>  
-    <Factory>ObjectFactory</Factory>
-    <Namespace>http://www.apache.org/tuscany/interop</Namespace>  
-    <Prefix>i</Prefix>   
-    <!-- Type>
-      <TypeName>AnnotationComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createAnnotationComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type-->  
-    <Type>
-      <TypeName>AttributeComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        org.apache.tuscany.sca.itest.jaxbdatabinding.generated.AttributeType attrib = factory.createAttributeType();
-        attrib.setAttribute("SomeText");
-        param = factory.createAttributeComplexType();
-        param.setAttributeElement(attrib);
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.getAttributeElement().setAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>AttributeReferenceComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createAttributeReferenceComplexType();
-        
-        param.setReferencedAttribute("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setReferencedAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
-      </ResultComparison>      
-    </Type>     
-    <Type>
-      <TypeName>SimpleTypeWithAbstractComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createSimpleTypeWithAbstractComplexType();
-        param.setSimpleTypeWithAbstractExtensionElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
-      </ResultComparison>      
-    </Type>         
-    <Type>
-      <TypeName>SimpleTypeWithNameComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createSimpleTypeWithNameComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>ComplexTypeWithContentType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createComplexTypeWithContentType();
-        param.setSimpleTypeWithName("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithName("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName());
-      </ResultComparison>      
-    </Type> 
-  </InputFile>  
-</tns:Generate>
diff --git a/java/sca-contrib/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/java/sca-contrib/itest/databindings/jaxbgen/src/main/resources/greeter.composite
deleted file mode 100644
index ae0740e6fe..0000000000
--- a/java/sca-contrib/itest/databindings/jaxbgen/src/main/resources/greeter.composite
+++ /dev/null
@@ -1,49 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-           name="JAXBGreeterService">

-           

-    <!-- Clients to test the services -->

-    <component name="DefaultGreeterServiceClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />

-        <reference name="greeterService" target="JAXBGreeterServiceComponent"/>

-    </component>

-

-    <component name="WSGreeterServiceClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />

-    </component>

-

-    <reference name="JAXBGreeterServiceWSReference" promote="WSGreeterServiceClient/greeterService">

-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>

-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>

-    </reference>           

-

-    <!-- The greeter service -->

-    <service name="JAXBGreeterService" promote="JAXBGreeterServiceComponent">

-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>

-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>

-    </service>

-

-    <!-- Components used to implement the services -->

-    <component name="JAXBGreeterServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceImpl" />

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/databindings/pom.xml b/java/sca-contrib/itest/databindings/pom.xml
deleted file mode 100644
index 43f99aff39..0000000000
--- a/java/sca-contrib/itest/databindings/pom.xml
+++ /dev/null
@@ -1,47 +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>2.0-SNAPSHOT</version>
-      <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  
-  <groupId>org.apache.tuscany.sca</groupId>
-  <artifactId>itest-databindings</artifactId>
-  <name>Apache Tuscany SCA Databindings Integration Tests</name>
-  <version>2.0-SNAPSHOT</version>
-  
-  
-  <packaging>pom</packaging>
-  <build>
-	<defaultGoal>install</defaultGoal>
-  </build>
-  <modules>
-    <module>common</module>
-    <module>sdogen</module>
-    <module>jaxbgen</module>
-    <module>jaxb-bottom-up</module>
-    <module>jaxb-top-down</module>
-    <module>interop</module>
-  </modules>
-</project>
diff --git a/java/sca-contrib/itest/databindings/readme.html b/java/sca-contrib/itest/databindings/readme.html
deleted file mode 100644
index 24a44e4ed7..0000000000
--- a/java/sca-contrib/itest/databindings/readme.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!--
- * 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.    
--->
-
-<html>
-<head>
-  <meta http-equiv="Content-Type" content=
-  "text/html; charset=us-ascii">
-  <meta http-equiv="Content-Style-Type" content="text/css">
-
-  <title>Tuscany SCA Integration Test Databindings</title>
-  <!-- LINK rel="stylesheet" href="ait.css" type="text/css" -->
-  <link rel="stylesheet" href="../../css/base.css" type="text/css">
-</head>
-
-<body>
-<h3>Tuscany SCA Integation Test Databindings </h3>
-
-<h4>Overview</h4>
-
-<p>
-This integration test tests the Tuscany SCA databinding implementation by passing various data structures 
-across various bindings using the supported databindings. There are tests for the individual databindings 
-which exercise various bindings with the same databinding at client and server ends of each binding. There 
-is also an integration test which exercises the transformer chains by specifying different databindings at 
-client and server ends of the binding. 
-</p>
-<p>
-In doing this testing it is apparent that there is a lot of repetition in creating client, services, idl and 
-type for each of the data types for each of the bindings for each of the databindings. To reduce the amount 
-of effort required to maintain the tests as new types, bindings and databindings are added the test cases 
-themselves are generated from configuration files. 
-</p>
-
-<h4>Test Structure</h4>
-
-Databindings/Common             - hold files common across all tests <br/>
-Databindings/Interop            - test the transformer chains with combinations of databindings<br/>
-Databindings/sdogen and jaxbgen - test each databindings independently<br/>
-
-<h4>Test Generation</h4>
-<p>
-To reduce the amount of manual effort involved in building and maintaining tests cases the test cases 
-themselves are generated at run time using a set of velocity templates. Each test module has a generate.xml 
-file in the resources/generate directory which tells the generator what to do. The file looks like this. 
-</p>
-<img src="config.png">
-<p>
-Each <Template> element describes a velocit template to use in the test. The generator process is to expand
-each velocity template provided with all of the types specified in the <InputFile> sections. 
-</p>
-<p>
-Each <InputFile> element describes a schema file used in the test. It also contains a description of each 
-data type that will be tested. The generator then arranges for the databinding being tested to generate 
-appropriate Java classes to represent the type at runtime. The individual databinding tests use the following 
-flow.
-</p>
-
-Create data object at client<br/>
-Client passes data object to server<br/>
-Server modifies data object<br/>
-Server returns modified data object to client<br/>
-Client tests that modified data object is as expected<br/>
-<p>
-Hence the CreateTypeCode, ModifyTypeCode and ResultComparison elements which contain the type specific code 
-that is used in the tests. 
-</p>
-
-<h4>The Common Directory</h4>
-<p>
-The common directory contains the information that is common across all of the tests. This includes the 
-common velocity templates and the source for the generator that reads the config.xml for each test. Common 
-also contains all of the data type schema as these are common across all tests. Each test pom is written so 
-that the contents of the common project are expanded into the tests target directory before the test starts. 
-In this way all of the common elements are available for the test generation phase and at test runtime. 
-</p>
-
-<h4>Individual Databinding Tests</h4>
-<p>
-The individual databinding tests, for example, sdogen and jaxbgen, are mostly empty as their content is 
-generated at runtime. The configuration and any test specific templates can be found in the resources/generate 
-directory. Some files are hand crafted for each test and live in their static position in the tests directory 
-structure. 
-</p>
-<p>
-Each test uses the same scenario
-</p>
-<img src="databinding.png">
-<p>
-The interface exposed by the greeter service provides a greet method for each data type being tested, for 
-example, 
-</p>
-<code>
-PersonType greetPersonType(PersonType param);<br/>
-AttributeComplexType greetAttributeComplexType(AttributeComplexType param);<br/>
-AttributeReferenceComplexType greetAttributeReferenceComplexType(AttributeReferenceComplexType param);<br/>
-</code>
-<p>
-These methods are taken from the SDO databinding test and hence PersonType, AttributeComplexType, etc. will 
-have been generated by the SDO static type generator. 
-</p>
-<p>
-Hence this tests a single databinding across a variety of data types and a variety of bindings. New bindings 
-be tested by extending the composite. Be datatypes can be tested by updating the confix.xml file.
-</p>
-<h4>Databinding Interoperability Tests</h4>
-<p>
-This test uses the generated client, services and types from the individual databinding tests. It does not
-regenerate them and you will see a dependency in the interop test pom on the other databinding tests. Is also 
-has some generate elements because the composite file must currently have import statements for all of the 
-SDO factories required during tested.
-</p>
-<p>
-The scenario used here is,
-</p>
-<img src="interop.png">
-<p>
-A chain of components is built up for each binding. Each component, drawn from the the inidividual databinding
-tests, tests the full range of datatypes. The client components are designed so that they can be chained together
-and so tranformations across different databindings is tests. The service component simply changes the data
-content and returns it as before. 
-</p>
-<h4>Building And Running The Tests</h4>
-<p>
-The tests can be built by doing the following. 
-</p>
-<code>
-cd sca/itest/databindings <br/>
-mvn
-</code>
-<p>
-The only modification to this process is required if a new input file is added to the tests suite. In this 
-case you will need to edit the config.xml files as appropriate but run mvn twice. This may sound a little 
-odd but currently the sdo test uses its pom file to generate the require SDO types. As the test is self 
-generating the pom file will not be updated to include the new type file until the second time it's run. The 
-aim is at some point to remove this feature from the pom. 
-</p>
-
-
-</body>
-</html>
diff --git a/java/sca-contrib/itest/databindings/sdogen/pom.xml b/java/sca-contrib/itest/databindings/sdogen/pom.xml
deleted file mode 100644
index e8a27753cf..0000000000
--- a/java/sca-contrib/itest/databindings/sdogen/pom.xml
+++ /dev/null
@@ -1,251 +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>itest-databindings</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-sdo</artifactId>
-    <version>2.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA SDO Databinding Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency> 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency> 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>                 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency> 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>        
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>test</scope>
-        </dependency>
-	  <!-- Added by Mike Edwards    -->
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.12</version>
-      <scope>provided</scope>
-    </dependency>
-        <!-- End of addition   -->
-    </dependencies>
-
-    <build>
-        <plugins>
-           <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-dependency-plugin</artifactId>
-              <executions>
-                  <execution>
-                      <phase>generate-sources</phase>
-                      <goals>
-                          <goal>unpack</goal>
-                      </goals>
-                      <configuration>
-                          <artifactItems>
-                              <artifactItem>
-                                  <groupId>org.apache.tuscany.sca</groupId>
-                                  <artifactId>itest-databindings-common</artifactId>
-                                  <version>${project.version}</version>
-                                  <overWrite>true</overWrite>
-                                  <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                              </artifactItem>
-                          </artifactItems>
-                      </configuration>
-                  </execution>
-              </executions>              
-            </plugin>  
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-sdo-source</id>
-                        <phase>process-resources</phase>                    
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass>
-                    <arguments>  
-                        <argument>${project.build.directory}</argument>
-                        <argument>true</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-source</id>
-                        <phase>process-resources</phase>                    
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass>
-                    <arguments>  
-                        <argument>${project.build.directory}</argument>
-                        <argument>true</argument>
-                    </arguments>
-                </configuration>
-            </plugin> 
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>process-resources</phase>
-                        <configuration>
-                            <schemaFiles>
-                                <configuration>
-                                    <fileName>${project.build.directory}/classes/wsdl/Greeter.wsdl</fileName>
-                                    <javaPackage>org.apache.tuscany.sca.itest.databinding.services</javaPackage>
-                                </configuration>                            
-                            </schemaFiles>
-                            <noNotification>true</noNotification>
-                            <noContainment>true</noContainment>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/java/sca-contrib/itest/databindings/sdogen/src/main/resources/generate/generate.xml
deleted file mode 100644
index 3f9926604d..0000000000
--- a/java/sca-contrib/itest/databindings/sdogen/src/main/resources/generate/generate.xml
+++ /dev/null
@@ -1,170 +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.    
--->
-<tns:Generate xmlns:tns="http://www.apache.org/tuscany/generate" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-              xsi:schemaLocation="http://www.example.org/generate generate.xsd ">
-             
-  <Template>
-    <TemplateName>greeter.composite.vm</TemplateName>
-    <TemplateTargetDir>classes</TemplateTargetDir>
-  </Template>                
-  <Template>
-    <TemplateName>GreeterService.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>GreeterServiceImpl.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage>
-  </Template>                                 
-  <Template>
-    <TemplateName>GreeterServiceClientImpl.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>DatabindingTestCase.java.vm</TemplateName>
-    <TemplateTargetDir>../src/test/java/org/apache/tuscany/sca/itest/sdodatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.sdodatabinding</JavaPackage>
-  </Template> 
-  <Template>
-    <TemplateName>Greeter.wsdl.vm</TemplateName>
-    <TemplateTargetDir>classes/wsdl</TemplateTargetDir>
-  </Template> 
-  <InputFile>
-    <FileName>Person.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.sca.itest.databinding.types</JavaPackage>
-    <Factory>TypesFactory</Factory> 
-    <Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace>  
-    <Prefix>p</Prefix> 
-    <Type>
-      <TypeName>PersonType</TypeName>
-      <CreateTypeCode>
-        TypesFactory factory = TypesFactory.INSTANCE;
-        param = factory.createPersonType();
-        param.setFirstName("George");
-        param.setLastName("Doors");
-      </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setGreeting("Hello");
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting());
-      </ResultComparison>      
-    </Type>
-  </InputFile>
-  <InputFile>
-    <FileName>Interop.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.interop</JavaPackage>  
-    <Factory>InteropFactory</Factory>
-    <Namespace>http://www.apache.org/tuscany/interop</Namespace>  
-    <Prefix>i</Prefix>
-    <!-- Type>
-      <TypeName>AnnotationComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createAnnotationComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type-->  
-    <Type>
-      <TypeName>AttributeComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        org.apache.tuscany.interop.AttributeType attrib = factory.createAttributeType();
-        attrib.setAttribute("SomeText");
-        param = factory.createAttributeComplexType();
-        param.setAttributeElement(attrib);
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.getAttributeElement().setAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>AttributeReferenceComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createAttributeReferenceComplexType();
-        
-        param.setReferencedAttribute("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setReferencedAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
-      </ResultComparison>      
-    </Type>      
-    <Type>
-      <TypeName>SimpleTypeWithAbstractComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createSimpleTypeWithAbstractComplexType();
-        param.setSimpleTypeWithAbstractExtensionElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
-      </ResultComparison>      
-    </Type>            
-    <Type>
-      <TypeName>SimpleTypeWithNameComplexType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createSimpleTypeWithNameComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>ComplexTypeWithContentType</TypeName>
-      <CreateTypeCode>
-        InteropFactory factory = InteropFactory.INSTANCE;
-        param = factory.createComplexTypeWithContentType();
-        param.setSimpleTypeWithName("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithName("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName());
-      </ResultComparison>      
-    </Type> 
-  </InputFile>  
-</tns:Generate>
diff --git a/java/sca-contrib/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/java/sca-contrib/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
deleted file mode 100644
index 9494d70f96..0000000000
--- a/java/sca-contrib/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
+++ /dev/null
@@ -1,56 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
-    name="SDOGreeterService">
-    
-    <!-- SDO factory classes -->    
-    <dbsdo:import.sdo factory="org.apache.tuscany.sca.itest.databinding.services.ServicesFactory"/>    
-    #foreach( $file in $fileList )
-  <dbsdo:import.sdo factory="$file.getJavaPackage().$file.getFactory()"/>
-    #end    
-    
-    <!-- Clients to test the services -->
-    <component name="DefaultGreeterServiceClient">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
-        <reference name="greeterService" target="SDOGreeterServiceComponent"/>
-    </component>
-
-    <component name="WSGreeterServiceClient">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClientImpl" />
-    </component>
-
-    <reference name="SDOGreeterServiceWSReference" promote="WSGreeterServiceClient/greeterService">
-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>
-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>
-    </reference>    
-    
-    <!-- The greeter service -->
-    <service name="SDOGreeterService" promote="SDOGreeterServiceComponent">
-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>
-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>
-    </service>
-
-    <component name="SDOGreeterServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceImpl" />
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/definitions-multiple/pom.xml b/java/sca-contrib/itest/definitions-multiple/pom.xml
deleted file mode 100644
index 0d8d8cb828..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/pom.xml
+++ /dev/null
@@ -1,51 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-definitions-multiple</artifactId>
-    <name>Apache Tuscany SCA ITest Definitions Multiple</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>         
-
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/AddService.java b/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/AddService.java
deleted file mode 100644
index 198a38b657..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,34 +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 calculator;
-
-import org.oasisopen.sca.annotation.Remotable;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * The Add service interface
- */
-@Remotable
-@Service
-//@Requires(PolicyQNames.TEST_INTENT_FIVE)
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index a1880698ea..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-/**
- * The Calculator service interface.
- */
-
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index b4a797e597..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-//@Requires(PolicyQNames.TEST_INTENT_ONE)
-public class CalculatorServiceImpl implements CalculatorService, PolicyQNames {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    //@Requires({TEST_INTENT_TWO, TEST_INTENT_THREE})
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    //@Requires(TEST_INTENT_TWO)
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    //@Requires(PolicyQNames.QUALIFIED_TEST_INTENT_ONE)
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    //@Requires(QUALIFIED_TEST_INTENT_FOUR)
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/DivideService.java b/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 8f4c675370..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,33 +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 calculator;
-
-import org.oasisopen.sca.annotation.Remotable;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * The divide service interface
- */
-@Remotable
-@Service
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/PolicyQNames.java b/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/PolicyQNames.java
deleted file mode 100644
index 3e1bc45842..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/PolicyQNames.java
+++ /dev/null
@@ -1,43 +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 calculator;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface PolicyQNames {
-    public static final String QUALIFIER = ".";
-    
-    public static final String POLICY_ITEST_PREFIX="{http://itest/policy}";
-    public static final String TEST_INTENT_ONE = POLICY_ITEST_PREFIX + "TestIntent_1";
-    public static final String TEST_INTENT_TWO = POLICY_ITEST_PREFIX + "TestIntent_2";
-    public static final String TEST_INTENT_THREE = POLICY_ITEST_PREFIX + "TestIntent_3";
-    public static final String TEST_INTENT_FOUR = POLICY_ITEST_PREFIX + "TestIntent_4";
-    public static final String TEST_INTENT_FIVE = POLICY_ITEST_PREFIX + "TestIntent_5";
-    
-    public static final String QUALIFIER_ONE = "Qualifier_1";
-    
-    public static final String QUALIFIED_TEST_INTENT_FOUR = 
-        TEST_INTENT_FOUR + QUALIFIER + QUALIFIER_ONE;
-    
-    public static final String QUALIFIED_TEST_INTENT_ONE = 
-        TEST_INTENT_ONE + QUALIFIER + QUALIFIER_ONE;
-    
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/SubtractService.java b/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/resources/contrib3/META-INF/sca-contribution.xml b/java/sca-contrib/itest/definitions-multiple/src/main/resources/contrib3/META-INF/sca-contribution.xml
deleted file mode 100644
index 6371eaebd9..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/main/resources/contrib3/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <export.java package="calculator"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/resources/contrib3/definitions.xml b/java/sca-contrib/itest/definitions-multiple/src/main/resources/contrib3/definitions.xml
deleted file mode 100644
index 7d9e029f57..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/main/resources/contrib3/definitions.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://itest/policy"
-             xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:calc="http://calculator"
-             xmlns:ip="http://itest/policy" >
-
-    <sca:policySet name="TestPolicySet_2_reference" provides="ip:TestIntent_2" appliesTo="sca:reference"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-    
-    <sca:policySet name="TestPolicySet_2_service" provides="ip:TestIntent_2" appliesTo="sca:service"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/MultipleDefinitionsTestCase.java b/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/MultipleDefinitionsTestCase.java
deleted file mode 100644
index 31c616e988..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/MultipleDefinitionsTestCase.java
+++ /dev/null
@@ -1,72 +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.itest;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.equinox.launcher.Contribution;
-import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import calculator.CalculatorService;
-
-public class MultipleDefinitionsTestCase {
-    
-    private static NodeLauncher launcher;
-    private static Node node;     
-    private static CalculatorService calculatorService;  
-    
-    public static void main(String[] args) throws Exception {
-        setUpBeforeClass();
-        tearDownAfterClass();
-    }
-    
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        launcher = NodeLauncher.newInstance();
-        node = launcher.createNode("Calculator.composite", 
-                                   new Contribution("contrib2", "./src/test/resources/contrib2"),
-                                   new Contribution("contrib1", "./src/test/resources/contrib1"),
-                                   new Contribution("contrib3", "./target/classes"));
-        node.start();
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        if (node != null) {
-            node.stop();
-            node.destroy();
-        }
-        if (launcher != null) {
-            launcher.destroy();
-        }
-    }
-
-    @Test
-    public void testPolicies() {
-        Assert.assertEquals(20.0, calculatorService.add(10, 10));
-        Assert.assertEquals(100.0, calculatorService.multiply(10, 10));
-        Assert.assertEquals(1.0, calculatorService.divide(10, 10));
-        Assert.assertEquals(0.0, calculatorService.subtract(10, 10));
-    }   
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/Policy.java b/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/Policy.java
deleted file mode 100644
index ba17755b88..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/Policy.java
+++ /dev/null
@@ -1,33 +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.itest;
-
-import javax.xml.namespace.QName;
-
-/**
- * Interface that will abstract various types of policy specifications
- * and attachments for example WS-Policy
- *
- * @version $Rev$ $Date$
- */
-public interface Policy {
-    QName getSchemaName();
-    void setUnresolved(boolean unresolved);
-    boolean isUnresolved();
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java b/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
deleted file mode 100644
index 5196e2f215..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
+++ /dev/null
@@ -1,83 +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.itest;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-
-/**
- * A PolicyProcessor used for testing.
- *
- * @version $Rev$ $Date$
- */
-public class TestPolicyProcessor implements StAXArtifactProcessor<Policy> {
-    
-    public TestPolicyProcessor(FactoryExtensionPoint factoryExtensionPoint,
-                               StAXArtifactProcessor<Object> extensionProcessor,
-                               Monitor monitor) {
-        
-    }
-
-    public QName getArtifactType() {
-        return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "Policy");
-    }
-
-    public Policy read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException {
-        return new MockPolicyImplOne();
-    }
-
-    public void write(Policy arg0, XMLStreamWriter arg1) throws ContributionWriteException,
-                                                        XMLStreamException {
-    }
-
-    public Class<Policy> getModelType() {
-        // TODO Auto-generated method stub
-        return Policy.class;
-    }
-
-    public void resolve(Policy arg0, ModelResolver arg1) throws ContributionResolveException {
-
-    }
-
-    
-    public class MockPolicyImplOne implements Policy {
-        public QName getSchemaName() {
-            return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "Policy");
-        }
-
-        public boolean isUnresolved() {
-            return false;
-        }
-
-        public void setUnresolved(boolean unresolved) {
-        }
-        
-    }
-}
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/itest/definitions-multiple/src/test/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index a20489035b..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/test/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.itest.TestPolicyProcessor;qname=http://schemas.xmlsoap.org/ws/2004/09/policy#Policy,model=org.apache.tuscany.sca.itest.Policy
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/Calculator.composite b/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/Calculator.composite
deleted file mode 100644
index e49717dbe8..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/Calculator.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:sca="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://itest/policy" 
-           xmlns:sample="http://itest/policy" 
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:ip="http://itest/policy">
-
-    <component name="CalculatorServiceComponent">
-        <implementation.java class="calculator.CalculatorServiceImpl"/>
-        <!-- reference name="addService" target="AddServiceComponent" /-->
-        <reference name="addService" requires="ip:TestIntent_1" >
-            <interface.java interface="calculator.AddService" />
-            <binding.ws uri="http://localhost:8085/AddServiceComponentWS" />
-        </reference>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-        <service name="AddService" requires="ip:TestIntent_1" >
-            <interface.java interface="calculator.AddService" />
-            <binding.ws uri="http://localhost:8085/AddServiceComponentWS"  />
-            <binding.sca/>
-        </service>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl" />
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl" />
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl" />
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/META-INF/sca-contribution.xml b/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/META-INF/sca-contribution.xml
deleted file mode 100644
index 00d7793198..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="calculator"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions.xml b/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions.xml
deleted file mode 100644
index 07756b50b4..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://itest/policy"
-             xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:calc="http://calculator"
-             xmlns:ip="http://itest/policy" >
-
-    <!-- PolicySets -->
-    <sca:policySet name="TestPolicySet_1_reference" provides="ip:TestIntent_1" appliesTo="sca:reference"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions/definitions.xml b/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions/definitions.xml
deleted file mode 100644
index 84f8e8a3c9..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions/definitions.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://itest/policy"
-             xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:calc="http://calculator"
-             xmlns:ip="http://itest/policy" >
-
-    <!-- Policy Intents -->
-    <sca:intent name="TestIntent_1" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent One</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_2" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent Two</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_3" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent Three</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_4" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent Four</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_5" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent Five</description>
-    </sca:intent>
-
-
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib2/definitions.xml b/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib2/definitions.xml
deleted file mode 100644
index 439b7bbbe8..0000000000
--- a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib2/definitions.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://itest/policy"
-             xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:calc="http://calculator"
-             xmlns:ip="http://itest/policy" >
-
-    <sca:policySet name="TestPolicySet_1_service" provides="ip:TestIntent_1" appliesTo="sca:service"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/domain/pom.xml b/java/sca-contrib/itest/domain/pom.xml
deleted file mode 100644
index b1fe80ff47..0000000000
--- a/java/sca-contrib/itest/domain/pom.xml
+++ /dev/null
@@ -1,100 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-domain</artifactId>

-    <name>Apache Tuscany SCA Domain Integration Tests</name>

-

-    <dependencies>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>    

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-launcher</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>    

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-workspace-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>                                        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>         

-        

-        <dependency>

-            <groupId>org.codehaus.woodstox</groupId>

-            <artifactId>wstx-asl</artifactId>

-            <version>3.2.1</version>

-            <scope>runtime</scope>

-        </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-monitor-logging</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>            

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>   

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-</project>

diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/AddService.java b/java/sca-contrib/itest/domain/src/main/java/calculator/AddService.java
deleted file mode 100644
index 138213b5fc..0000000000
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/AddService.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 calculator;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The Add service interface

- */

-@Remotable

-public interface AddService {

-

-    double add(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/itest/domain/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 1a63d4ff77..0000000000
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/AddServiceImpl.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 calculator;

-

-/**

- * An implementation of the Add service

- */

-public class AddServiceImpl implements AddService {

-

-    public double add(double n1, double n2) {

-        System.out.println("AddService - add " + n1 + " and " + n2);

-        return n1 + n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java b/java/sca-contrib/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
deleted file mode 100644
index 93486d915e..0000000000
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.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 calculator;

-

-/**

- * An implementation of the Add service

- */

-public class AddServiceUpdateImpl implements AddService {

-

-    public double add(double n1, double n2) {

-        System.out.println("AddService Update - add " + n1 + " and " + n2);

-        return n1 + n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/itest/domain/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 12d80ffd1c..0000000000
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,38 +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 calculator;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-

-/**

- * The Calculator service interface.

- */

-@Remotable

-public interface CalculatorService {

-

-    double add(double n1, double n2);

-

-    double subtract(double n1, double n2);

-

-    double multiply(double n1, double n2);

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 6250563a09..0000000000
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,74 +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 calculator;

-

-import org.oasisopen.sca.annotation.Reference;

-

-

-/**

- * An implementation of the Calculator service.

- */

-public class CalculatorServiceImpl implements CalculatorService {

-

-    private AddService[] addService;

-    private SubtractService subtractService;

-    private MultiplyService multiplyService; 

-    private DivideService divideService;

-

-    @Reference

-    public void setAddService(AddService[] addService) {

-        this.addService = addService;

-    }

-

-    @Reference

-    public void setSubtractService(SubtractService subtractService) {

-       this.subtractService = subtractService;

-    }

-

-    @Reference

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-    

-    @Reference

-    public void setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-    

-    public double add(double n1, double n2) {

-        System.out.println("CalculatorService - add " + n1 + " and " + n2);

-        return addService[1].add(addService[0].add(n1, n2), n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        System.out.println("CalculatorService - subtract " + n1 + " and " + n2);

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        System.out.println("CalculatorService - multiply " + n1 + " and " + n2);

-        return multiplyService.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        System.out.println("CalculatorService - divide " + n1 + " and " + n2);

-        return divideService.divide(n1, n2);

-    }

-

-}

diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/DivideService.java b/java/sca-contrib/itest/domain/src/main/java/calculator/DivideService.java
deleted file mode 100644
index ef6a8b375b..0000000000
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The divide service interface

- */

-public interface DivideService {

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/itest/domain/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Divide service.

- */

-public class DivideServiceImpl implements DivideService {

-

-    public double divide(double n1, double n2) {

-        return n1 / n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/itest/domain/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the multiply service

- */

-public interface MultiplyService {

-

-    double multiply(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Multiply service.

- */

-public class MultiplyServiceImpl implements MultiplyService {

-

-    public double multiply(double n1, double n2) {

-        return n1 * n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/SubtractService.java b/java/sca-contrib/itest/domain/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index be3f1a61fc..0000000000
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/SubtractService.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 calculator;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The interface for the multiply service

- */

-@Remotable

-public interface SubtractService {

-

-    double subtract(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index abf2777c7d..0000000000
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/SubtractServiceImpl.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 calculator;

-

-/**

- * An implementation of the subtract service.

- */

-public class SubtractServiceImpl implements SubtractService {

-

-    public double subtract(double n1, double n2) {

-        System.out.println("SubtractService - subtract " + n1 + " and " + n2);

-        return n1 - n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionA/Calculator.composite b/java/sca-contrib/itest/domain/src/main/resources/contributionA/Calculator.composite
deleted file mode 100644
index 534e1a29af..0000000000
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionA/Calculator.composite
+++ /dev/null
@@ -1,44 +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://sample"

-           xmlns:sample="http://sample"

-           name="CalculatorA">

-

-    <component name="CalculatorServiceComponentA">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <service name="CalculatorService">

-            <binding.sca/>

-        </service>		

-        <reference name="addService" target="AddServiceComponentB" />     

-        <reference name="subtractService" target="SubtractServiceComponentC" />

-        <reference name="multiplyService" target="MultiplyServiceComponentA"/>     

-        <reference name="divideService" target="DivideServiceComponentA" />

-    </component>  

-

-    <component name="MultiplyServiceComponentA">

-        <implementation.java class="calculator.MultiplyServiceImpl" />

-    </component>    

-    

-    <component name="DivideServiceComponentA">

-        <implementation.java class="calculator.DivideServiceImpl" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml b/java/sca-contrib/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
deleted file mode 100644
index 1b1c0291e2..0000000000
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:CalculatorA"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite b/java/sca-contrib/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
deleted file mode 100644
index bdb89803d1..0000000000
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
+++ /dev/null
@@ -1,45 +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://sample"

-           xmlns:sample="http://sample"

-           name="CalculatorB">

-           

-    <component name="CalculatorServiceComponentB">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <reference name="addService" target="AddServiceComponentB" />     

-        <reference name="subtractService" target="SubtractServiceComponentC" />

-        <reference name="multiplyService" target="MultiplyServiceComponentB"/>     

-        <reference name="divideService" target="DivideServiceComponentB" />

-    </component>

-

-    <component name="MultiplyServiceComponentB">

-        <implementation.java class="calculator.MultiplyServiceImpl" />

-    </component>   

-    

-    <component name="DivideServiceComponentB">

-        <implementation.java class="calculator.DivideServiceImpl" />

-    </component>

-    

-    <component name="AddServiceComponentB">

-        <implementation.java class="calculator.AddServiceImpl" />

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite b/java/sca-contrib/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
deleted file mode 100644
index c5af8dd3cc..0000000000
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
+++ /dev/null
@@ -1,32 +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://sample"

-           xmlns:sample="http://sample"

-           name="CalculatorC">

-

-    <component name="SubtractServiceComponentC">

-        <implementation.java class="calculator.SubtractServiceImpl" />

-        <service name="SubtractService">

-            <binding.sca/>

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionDependent/Calculator.composite b/java/sca-contrib/itest/domain/src/main/resources/contributionDependent/Calculator.composite
deleted file mode 100644
index df00387b23..0000000000
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionDependent/Calculator.composite
+++ /dev/null
@@ -1,36 +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://dependent"

-           xmlns:dependent="http://dependent"

-           name="CalculatorB">

-               

-    <component name="AddServiceComponentB">

-        <implementation.java class="calculator.AddServiceImpl" />

-        <service name="AddService">

-            <binding.ws uri="http://localhost:8085/AddServiceComponentB"/>

-        </service>

-    </component>

-    

-    <component name="SubtractServiceComponentB">

-        <implementation.java class="calculator.SubtractServiceImpl" />

-    </component>    

-    

-</composite>

diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml b/java/sca-contrib/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
deleted file mode 100644
index 8264a8243f..0000000000
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://dependent"

-              xmlns:sample="http://dependent">

-   <export namespace="http://dependent"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionPrimary/Calculator.composite b/java/sca-contrib/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
deleted file mode 100644
index 92d069c6c9..0000000000
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
+++ /dev/null
@@ -1,57 +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://primary"

-           xmlns:primary="http://primary"

-           xmlns:dependent="http://dependent"

-           name="CalculatorA">

-           

-    <include name="dependent:CalculatorB"/>

-

-    <component name="CalculatorServiceComponentA">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <service name="CalculatorService">

-            <binding.sca/>

-        </service>		

-        <reference name="addService" multiplicity="0..n" target="AddServiceComponentA AddServiceComponentB AddServiceComponentC">

-          <binding.sca/>

-          <binding.ws/>

-        </reference>

-        <reference name="subtractService" target="SubtractServiceComponentB" />

-        <reference name="multiplyService" target="MultiplyServiceComponentA" />     

-        <reference name="divideService" target="DivideServiceComponentA" />

-    </component>  

-

-    <component name="AddServiceComponentA">

-        <implementation.java class="calculator.AddServiceImpl" />

-        <service name="AddService">

-            <binding.sca/>

-        </service>

-    </component>

-    

-    <component name="MultiplyServiceComponentA">

-        <implementation.java class="calculator.MultiplyServiceImpl" />

-    </component>    

-    

-    <component name="DivideServiceComponentA">

-        <implementation.java class="calculator.DivideServiceImpl" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml b/java/sca-contrib/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
deleted file mode 100644
index e53c14a651..0000000000
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
+++ /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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://primary"

-              xmlns:sample="http://primary">

-   <deployable composite="sample:CalculatorA"/>

-   <import namespace="http://dependent"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java b/java/sca-contrib/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
deleted file mode 100644
index 98f13df774..0000000000
--- a/java/sca-contrib/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
+++ /dev/null
@@ -1,279 +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.itest.domain;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import calculator.CalculatorService;
-
-/**
- * Runs a distributed domain in a single VM by using and in memory 
- * implementation of the distributed domain
- */
-public class ContributionSPIsTestCase {
-    
-     final static Logger logger = Logger.getLogger(ContributionSPIsTestCase.class.getName());
-    
-    private static ModelFactoryExtensionPoint modelFactories;
-    private static WorkspaceFactory workspaceFactory;  
-    private static XMLOutputFactory outputFactory;    
-    
-    private static ModelResolverExtensionPoint modelResolvers;
-    
-    private static URLArtifactProcessorExtensionPoint urlProcessors;
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    
-    private static Workspace workspace;
-    
-    private static List<String> problems = new ArrayList<String>();
-    private static ContributionDependencyBuilder dependencyBuilder;
-    
-    @BeforeClass
-    public static void init() throws Exception {
-
-        try {
-            // Bootstrap a runtime to get a populated registry
-            // FIXME needs to be tidied so we can get the registry without all of the other configuration
-            //       that is being repeated below
-            ReallySmallRuntime runtime = new ReallySmallRuntime(Thread.currentThread().getContextClassLoader());
-            runtime.start();
-            ExtensionPointRegistry registry = runtime.getExtensionPointRegistry();
-            
-            // Create model factories
-            modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-            outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-            outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true);
-            workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class);
-            
-            // Create model resolvers
-            modelResolvers = registry.getExtensionPoint(ModelResolverExtensionPoint.class);
-
-            // Create artifact processors
-            urlProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-                 
-            // Create contribution processor
-            contributionProcessor = urlProcessors.getProcessor(Contribution.class);
-            
-            // Create workspace model to hold contribution information
-            workspace = workspaceFactory.createWorkspace();
-            
-            MonitorFactory monitorFactory = registry.getExtensionPoint(MonitorFactory.class);
-            Monitor monitor = monitorFactory.createMonitor();
-            dependencyBuilder = new ContributionDependencyBuilderImpl(monitor);  
-            
-        } catch(Exception ex){
-            ex.printStackTrace();
-        } 
-        
-   }
-
-    @Test
-    public void testReadDependentContributions() throws Exception { 
-        try {            
-            // ====================================================================
-            // The contribution management phase. I.e. where a use is adding contributions
-            // prior to selecting a composite to run
-            
-            // Load a contribution
-            // Note that this contribution is added before the contribution that it depends on
-            // as the contribution processing doesn't start until both have been added
-            URI uri = URI.create("contributionPrimary");
-            File file = new File("./src/main/resources/contributionPrimary");
-            URL url = file.toURI().toURL();
-            Contribution contribution = (Contribution)contributionProcessor.read(null,uri, url);
-            workspace.getContributions().add(contribution);
-            System.out.println("Added contributionPrimary");
-            
-            // Load another contribution  
-            uri = URI.create("contributionDependent");
-            file = new File("./src/main/resources/contributionDependent");
-            url = file.toURI().toURL();      
-            contribution = (Contribution)contributionProcessor.read(null,uri, url);        
-            workspace.getContributions().add(contribution);
-            System.out.println("Added contributionDependent");
-              
-            // Choose a deployables as though a user had chosen it
-            List<Composite> deployables = workspace.getContributions().get(0).getDeployables();
-            QName chosenDeployableName = deployables.get(0).getName();
-            System.out.println("Composite chosen to deploy = " + chosenDeployableName);
-
-                  
-            // List the dependency problems
-            for (int i = 0, n = problems.size(); i < n ; i++) {
-                System.out.println("Problem: "+ problems.get(i));
-            }
-            
-            // ====================================================================
-            // process the first chosen composite ready for a node to run the composite
-             
-            // find the contribution that holds our chosen composite and all its dependencies 
-            // we are using the first deployable composite from the first contribution 
-            // so we really know this here really but lets find it anyway
-            List<Contribution> contributionsToDeploy = null;
-            String chosenDeployableLocation = null;
-            for (Contribution tmpContribution : workspace.getContributions()){
-                for (Composite deployable : tmpContribution.getDeployables()){
-                    if (deployable.getName().equals(chosenDeployableName)){
-                        contributionsToDeploy = dependencyBuilder.buildContributionDependencies(tmpContribution, workspace);
-                    }
-                }
-            }
-            
-            // load all the contributions in the dependency chain to find the chosen 
-            // composite
-            List<Contribution> loadedContributions = new ArrayList<Contribution>();
-            for (Contribution tmpContribution : contributionsToDeploy){
-                Contribution loadedContribution = contribution(loadedContributions, tmpContribution.getURI(), tmpContribution.getLocation());
-                loadedContributions.add(loadedContribution);
-                
-                // find the chosen composite artifact location
-                for ( Artifact artifact :loadedContribution.getArtifacts()){
-                    if ( artifact.getURI().endsWith(".composite")){
-                        Composite model = (Composite)artifact.getModel();
-                        if (model.getName().equals(chosenDeployableName)){
-                            chosenDeployableLocation = artifact.getLocation();
-                        }
-                    }
-                }                
-            }            
-            
-            System.out.println("Composite chosen to deploy location = " + chosenDeployableLocation);
-            for (Contribution dependency : contributionsToDeploy){
-                System.out.println("Composite chosen to deploy dependency chain = " + dependency.getURI());
-            }
-            
-/* At this point if there is more than one composite in the domain
- * we would build the domain to configure all the endpoint URIs
- * and then pass the individual composites off to the separate
- * nodes that are going to run the
- * TODO - I've skipped this part for clarity at the moment
- *             
-            // create a domain level composite
-            Composite domainComposite = assemblyFactory.createComposite();
-            domainComposite.setName(new QName(Constants.SCA10_TUSCANY_NS, "domain"));
-            
-            // etc.
- */
-           
-          
-            
-            // ====================================================================
-            // run the chosen composite   
-            SCAContribution [] contributions = new SCAContribution[contributionsToDeploy.size()];
-            for (int i = 0; i < contributionsToDeploy.size(); i++) {
-                contributions[i] = new SCAContribution(contributionsToDeploy.get(i).getURI(), contributionsToDeploy.get(i).getLocation()); 
-            }
-                   
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            
-            SCANode node = nodeFactory.createSCANode(chosenDeployableLocation, contributions);
-            
-            node.start();
-            SCAClient client = (SCAClient)node;
-            CalculatorService calculatorService = 
-                client.getService(CalculatorService.class, "CalculatorServiceComponentA");
-            
-            System.out.println("Add 2.0 + 3.0 + 3.0 = " + calculatorService.add(2.0, 3.0));
-
-/*
-            AssemblyInspector assemblyInspector = new AssemblyInspector();
-            System.out.println(assemblyInspector.assemblyAsString(node));
-*/
-            
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            Assert.fail();
-        }             
-    }
-    
-    
-    private Contribution contribution(List<Contribution> contributions, String contributionURI, String contributionLocation) throws ContributionReadException {
-        try {
-            URI uri = URI.create(contributionURI);
-            URL location = locationURL(contributionLocation);
-            Contribution contribution = (Contribution)contributionProcessor.read(null, uri, location);
-            
-            ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories);
-            contributionProcessor.resolve(contribution, modelResolver);
-            
-            return contribution;
-
-        } catch (ContributionReadException e) {
-            throw e;
-        } catch (ContributionResolveException e) {
-            throw new ContributionReadException(e);
-        } catch (MalformedURLException e) {
-            throw new ContributionReadException(e);
-        }
-    }
-    
-    private static URL locationURL(String location) throws MalformedURLException {
-        URI uri = URI.create(location);
-        String scheme = uri.getScheme();
-        if (scheme == null) {
-            File file = new File(location);
-            return file.toURI().toURL();
-        } else if (scheme.equals("file")) {
-            File file = new File(location.substring(5));
-            return file.toURI().toURL();
-        } else {
-            return uri.toURL();
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/pom.xml b/java/sca-contrib/itest/exceptions-cross-binding-ws/pom.xml
deleted file mode 100644
index 69be53cfe7..0000000000
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/pom.xml
+++ /dev/null
@@ -1,243 +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>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>itest-exceptions-cross-binding-ws</artifactId>
-    <name>Apache Tuscany SCA WS 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>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-        <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-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-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>
-            <!-- Sun's 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/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>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <wsdlFile>${basedir}/src/main/resources/wsdl/StockExceptionTest.wsdl</wsdlFile>
-                            <javaPackage>com.example.stock.sdo</javaPackage>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
deleted file mode 100644
index ffef7a4d71..0000000000
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ /dev/null
@@ -1,71 +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.StockExceptionTest;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * JAXB version of StockExceptionTest impl
- */
-@Service(StockExceptionTest.class)
-public class StockExchangeJaxB implements StockExceptionTest {
-
-    public StockExchangeJaxB() {
-
-    }
-
-    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 ("UNDECLARED_SOURCE".equals(input.getName())) {
-
-            throw new TestNotDeclaredAtSourceFault("not declared", "fault info");
-
-        } else if ("UNDECLARED_TARGET".equals(input.getName())) {
-            throw new IllegalArgumentException("System fault");
-        }
-        ObjectFactory jaxbOjectFactory = new ObjectFactory();
-
-        InvalidSymbolFault faultinfo = jaxbOjectFactory.createInvalidSymbolFault();
-
-        faultinfo.setOffer(input);
-
-        throw new InvalidSymbolFault_Exception("bad symbol", faultinfo);
-
-    }
-
-}
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
deleted file mode 100644
index 95496e1737..0000000000
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ /dev/null
@@ -1,39 +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();
-
-    Object testNotDeclaredAtTargetTest();
-
-}
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
deleted file mode 100644
index 1147b4c715..0000000000
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ /dev/null
@@ -1,136 +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.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import stockexceptiontestservice.scatesttool.ScatesttoolFactory;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/**
- * 
- */
-@Service(StockTraderSDO.class)
-public class StockTraderSDOImpl implements StockTraderSDO {
-
-    private StockExceptionTest exchangeJaxb;
-
-    /**
-     * 
-     */
-
-    public StockTraderSDOImpl() {
-        // TODO Auto-generated constructor stub
-    }
-
-    @Reference
-    public void setExchangeJaxb(StockExceptionTest exchangeJaxb) {
-        this.exchangeJaxb = exchangeJaxb;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO#tradingTest()
-     */
-    public StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-        stockOffer.setName("IBM");
-        stockOffer.setSymbol("IBM");
-        stockOffer.setPrice(100.00F); // offer to buy at max $100.00
-
-        StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-
-        return stockOfferAccepted;
-
-    }
-
-    public void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException,
-        MarketClosedSDOException {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-        // set up for a InvalidSymbolSDOException
-        stockOffer.setName("");
-        stockOffer.setSymbol("IBM0");
-
-        stockOffer.setPrice(11.0F); // offer to buy at max $100.00
-        exchangeJaxb.stockQuoteOffer(stockOffer);
-
-    }
-
-    public void marketClosedSDOExceptionTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("CLOSED");
-        stockOffer.setSymbol("MBI");
-        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
-        try {
-            StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-            stockOfferAccepted.getPrice(); // the price actually bought.
-        } catch (InvalidSymbolSDOException e) {
-
-            e.printStackTrace();
-        } catch (MarketClosedSDOException e) {
-
-            e.printStackTrace();
-        }
-    }
-
-    public Object testNotDeclaredAtSourceTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("UNDECLARED_SOURCE");
-        stockOffer.setSymbol("XYZ");
-        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
-        try {
-            return exchangeJaxb.stockQuoteOffer(stockOffer);
-
-        } catch (Exception e) {
-            return e;
-
-        }
-
-    }
-    
-    public Object testNotDeclaredAtTargetTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("UNDECLARED_TARGET");
-        stockOffer.setSymbol("XYZ");
-        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
-        try {
-            return exchangeJaxb.stockQuoteOffer(stockOffer);
-
-        } catch (Exception e) {
-            return e;
-
-        }
-
-    }
-
-}
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
deleted file mode 100644
index 74815dc6c1..0000000000
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/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/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
deleted file mode 100644
index aba83723bb..0000000000
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.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.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/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
deleted file mode 100644
index 4ee01fa303..0000000000
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/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.oasisopen.sca.annotation.Remotable;
-
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/*
- * StockExceptionTest java interface
- */
-
-@Remotable
-public interface StockExceptionTest {
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0
-     */
-    StockOffer stockQuoteOffer(StockOffer param0) throws InvalidSymbolSDOException, MarketClosedSDOException;
-
-}
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
deleted file mode 100644
index acecdff613..0000000000
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
+++ /dev/null
@@ -1,23 +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/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
deleted file mode 100644
index 460edab182..0000000000
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
+++ /dev/null
@@ -1,42 +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 targetNamespace="http://foo" name="intracomposite" xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">
-
-    <service name="exchangeJaxbService" promote="exchangeJaxbComponent">
-        <interface.java interface="org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest" />
-        <binding.ws
-            wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)" />
-    </service>
-
-    <component name="exchangeJaxbComponent">
-        <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockExchangeJaxB" />
-    </component>
-
-    <component name="stockTraderSDOComponent">
-        <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDOImpl" />
-    </component>
-
-    <reference name="stockTraderSDOReference" promote="stockTraderSDOComponent/exchangeJaxb">
-        <interface.java interface="org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest" />
-        <binding.ws
-            wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)" />
-    </reference>
-</composite>
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
deleted file mode 100644
index 40e87953b6..0000000000
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/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/services/exchangeJaxbService" />

-

-        </wsdl:port>

-

-    </wsdl:service>

-

-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
deleted file mode 100644
index 9759647cfe..0000000000
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/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/java/sca-contrib/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/java/sca-contrib/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
deleted file mode 100644
index 3e9febb6bc..0000000000
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ /dev/null
@@ -1,102 +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.oasisopen.sca.ServiceRuntimeException;
-
-import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-public class IntraCompositeTestCase extends TestCase {
-    private SCADomain domain;
-    private StockTraderSDO stockTrader;
-
-    public void testTrading() {
-        try {
-            StockOffer sp = stockTrader.testTrading();
-            assertNotNull(sp);
-            assertEquals(99.00F, sp.getPrice());
-            assertEquals("IBM", sp.getSymbol());
-        } catch (Exception e) {
-
-            e.printStackTrace();
-            fail(e + "");
-
-        }
-
-    }
-
-    public void testInvalidSymbolSDOException() {
-        try {
-            stockTrader.testInvalidSymbolSDOException();
-            fail("Expected InvalidSymbolSDOException");
-        } catch (InvalidSymbolSDOException e) {
-            InvalidSymbolFault isf = e.getFaultInfo();
-
-            assertNotNull(isf);
-            StockOffer sp = isf.getOffer();
-            assertEquals(11.00F, sp.getPrice());
-            assertEquals("IBM0", sp.getSymbol());
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("Expected InvalidSymbolSDOException" + e);
-
-        }
-    }
-
-    public void testNotDeclaredAtSourceException() {
-
-        Object ret = stockTrader.testNotDeclaredAtSourceTest();
-
-        assertNotNull(ret);
-
-        assertEquals(ServiceRuntimeException.class, ret.getClass());
-
-    }
-    
-    public void testNotDeclaredAtTargetException() {
-
-        Object ret = stockTrader.testNotDeclaredAtTargetTest();
-
-        assertNotNull(ret);
-
-        assertEquals(ServiceRuntimeException.class, ret.getClass());
-
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("intracomposite.composite");
-        stockTrader = domain.getService(StockTraderSDO.class, "stockTraderSDOComponent");
-        assertNotNull(stockTrader);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/pom.xml b/java/sca-contrib/itest/exceptions-cross-binding/pom.xml
deleted file mode 100644
index 140b1f352d..0000000000
--- a/java/sca-contrib/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>2.0-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>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-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>2.0-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/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
deleted file mode 100644
index 456cf07116..0000000000
--- a/java/sca-contrib/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.oasisopen.sca.annotation.Remotable;
-
-/**
- * 
- */
-@Remotable
-public interface StockExceptionTestJAXB extends StockExceptionTest {
-
-}
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
deleted file mode 100644
index ed2a287bcc..0000000000
--- a/java/sca-contrib/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.oasisopen.sca.annotation.Service;
-
-/**
- * 
- */
-@Service(StockExceptionTestJAXB.class)
-public class StockExchangeJaxB implements StockExceptionTestJAXB {
-
-    /**
-     * 
-     */
-    public StockExchangeJaxB() {
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest#stockQuoteOffer(org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer)
-     */
-    public StockOffer stockQuoteOffer(StockOffer input) throws InvalidSymbolFault_Exception, MarketClosedFault, TestNotDeclaredAtSourceFault{
-
-        System.out.println("stockQuoteOffer '" + input + "'");
-
-        String symbol = input.getSymbol();
-        if ("IBM".equals(symbol)) {
-            input.setPrice(99.00F);
-            return input;
-
-        }
-        else if ("CLOSED".equals(input.getName())) {
-            throw new MarketClosedFault("TO LATE!", 3);
-            
-        } else if( "testNotDeclaredAtSourceTest".equals(input.getName())){
-            
-            throw new TestNotDeclaredAtSourceFault("not declared", "fault info");
-            
-        }
-        ObjectFactory jaxbOjectFactory = new ObjectFactory();
-
-        InvalidSymbolFault faultinfo = jaxbOjectFactory.createInvalidSymbolFault();
-        
-        faultinfo.setOffer(input);
-
-        throw new InvalidSymbolFault_Exception("bad symbol", faultinfo);
-
-    }
-
-}
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
deleted file mode 100644
index 5f65d293ea..0000000000
--- a/java/sca-contrib/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/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
deleted file mode 100644
index 32ba65bd6b..0000000000
--- a/java/sca-contrib/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.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import stockexceptiontestservice.scatesttool.ScatesttoolFactory;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/**
- * 
- */
-@Service(StockTraderSDO.class)
-public class StockTraderSDOImpl implements StockTraderSDO {
-
-    private StockExceptionTest exchangeJaxb;
-
-    /**
-     * 
-     */
-
-    public StockTraderSDOImpl() {
-        // TODO Auto-generated constructor stub
-    }
-
-    @Reference
-    public void setExchangeJaxb(StockExceptionTest exchangeJaxb) {
-        this.exchangeJaxb = exchangeJaxb;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO#tradingTest()
-     */
-    public StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-        stockOffer.setName("IBM");
-        stockOffer.setSymbol("IBM");
-        stockOffer.setPrice(100.00F); // offer to buy at max $100.00
-
-        StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-
-        return stockOfferAccepted;
-
-    }
-
-    public void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException,
-        MarketClosedSDOException {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-        // set up for a InvalidSymbolSDOException
-        stockOffer.setName("");
-        stockOffer.setSymbol("IBM0");
-
-        stockOffer.setPrice(11.0F); // offer to buy at max $100.00
-        exchangeJaxb.stockQuoteOffer(stockOffer);
-
-    }
-
-    public void marketClosedSDOExceptionTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("CLOSED");
-        stockOffer.setSymbol("MBI");
-        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
-        try {
-            StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-            stockOfferAccepted.getPrice(); // the price actually bought.
-        } catch (InvalidSymbolSDOException e) {
-
-            e.printStackTrace();
-        } catch (MarketClosedSDOException e) {
-
-            e.printStackTrace();
-        }
-    }
-
-    public Object  testNotDeclaredAtSourceTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("testNotDeclaredAtSourceTest");
-        stockOffer.setSymbol("TNDAS");
-        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
-        try {
-            return  exchangeJaxb.stockQuoteOffer(stockOffer);
-            
-        } catch (Exception e) {
-            return e;
-           
-        }
-
-    }
-
-}
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
deleted file mode 100644
index 74815dc6c1..0000000000
--- a/java/sca-contrib/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/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
deleted file mode 100644
index 5fe40935ec..0000000000
--- a/java/sca-contrib/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/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
deleted file mode 100644
index 4ee01fa303..0000000000
--- a/java/sca-contrib/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.oasisopen.sca.annotation.Remotable;
-
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/*
- * StockExceptionTest java interface
- */
-
-@Remotable
-public interface StockExceptionTest {
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0
-     */
-    StockOffer stockQuoteOffer(StockOffer param0) throws InvalidSymbolSDOException, MarketClosedSDOException;
-
-}
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
deleted file mode 100644
index 872fd721d1..0000000000
--- a/java/sca-contrib/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/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
deleted file mode 100644
index 83526cb6a1..0000000000
--- a/java/sca-contrib/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/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
deleted file mode 100644
index d70cdad313..0000000000
--- a/java/sca-contrib/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/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
deleted file mode 100644
index 33b830c856..0000000000
--- a/java/sca-contrib/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/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
deleted file mode 100644
index 9759647cfe..0000000000
--- a/java/sca-contrib/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/java/sca-contrib/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/java/sca-contrib/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
deleted file mode 100644
index e65a1d4b64..0000000000
--- a/java/sca-contrib/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.oasisopen.sca.ServiceRuntimeException;
-
-import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-public class IntraCompositeTestCase extends TestCase {
-    private SCADomain domain;
-
-    private StockTraderSDO stockTrader;
-
-    public void testTrading() {
-        try {
-            StockOffer sp = stockTrader.testTrading();
-            assertNotNull(sp);
-            assertEquals(99.00F, sp.getPrice());
-            assertEquals("IBM", sp.getSymbol());
-        } catch (Exception e) {
-
-            e.printStackTrace();
-            fail(e + "");
-
-        }
-
-    }
-
-    public void testInvalidSymbolSDOException() {
-        try {
-            stockTrader.testInvalidSymbolSDOException();
-            fail("Expected InvalidSymbolSDOException");
-        } catch (InvalidSymbolSDOException e) {
-            InvalidSymbolFault isf = e.getFaultInfo();
-
-            assertNotNull(isf);
-            StockOffer sp = isf.getOffer();
-            assertEquals(11.00F, sp.getPrice());
-            assertEquals("IBM0", sp.getSymbol());
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("Expected InvalidSymbolSDOException" + e);
-
-        }
-    }
-
-    public void testNotDeclaredAtSourceException() {
-
-        Object ret = stockTrader.testNotDeclaredAtSourceTest();
-
-        assertNotNull(ret);
-
-        assertEquals(ServiceRuntimeException.class, ret.getClass());
-
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("ExceptionTest.composite");
-        stockTrader = domain.getService(StockTraderSDO.class, "stockTraderSDOComponent");
-        assertNotNull(stockTrader);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/pom.xml b/java/sca-contrib/itest/exceptions-simple-ws/pom.xml
deleted file mode 100644
index 5e68bb3640..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/pom.xml
+++ /dev/null
@@ -1,59 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-exceptions-simple-ws</artifactId>
-    <name>Apache Tuscany Test for Simple Exceptions over Web Services</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java b/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
deleted file mode 100644
index 764f31b7cd..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
+++ /dev/null
@@ -1,43 +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 com.example;
-
-public class BusinessException extends Exception {
-
-    private String clientName;
-
-    public BusinessException(String message) {
-        super(message);
-    }
-
-    public BusinessException(String message, String clientName) {
-        super(message);
-        this.clientName = clientName;
-    }
-
-    public String getClientName() {
-        return clientName;
-    }
-
-    public void setClientName(String clientName) {
-        this.clientName = clientName;
-    }
-
-}
-
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java b/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
deleted file mode 100644
index 1b597984e5..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
+++ /dev/null
@@ -1,28 +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 com.example;
-
-public class BusinessExceptionMinimal extends Exception {
-
-    public BusinessExceptionMinimal(String message) {
-        super(message);
-    }
-
-}
-
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java b/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
deleted file mode 100644
index 0c72b52ed9..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
+++ /dev/null
@@ -1,23 +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 com.example;
-
-public interface ExampleClient {
-    void runTest();
-}
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java b/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
deleted file mode 100644
index 5e80b7bdde..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.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 com.example;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(ExampleClient.class)
-@Scope("COMPOSITE")
-public class ExampleClientImpl implements ExampleClient {
-
-    private ExampleService myService;
-
-    @Reference
-    public void setMyService(ExampleService myService) {
-        this.myService = myService;
-    }
-
-    public void runTest() {
-        try {
-            Object result = myService.hello("John");
-            System.out.println("myService returned " + result.getClass().getName());
-        } catch (BusinessException e) {
-            System.out.println("caught exception from hello(): " + e.getMessage() + " for " + e.getClientName());
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java b/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
deleted file mode 100644
index 35f55b525a..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
+++ /dev/null
@@ -1,54 +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 com.example;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-//@Service(ExampleClient.class)
-@Scope("COMPOSITE")
-//public class ExampleClientMinimalImpl implements ExampleClient {
-public class ExampleClientMinimalImpl {
-    @Reference
-    protected ExampleServiceMinimal myService;
-
-    public void runTest() {
-        try {
-            //Object result = myService.hello("John");
-            myService.throwException("John");
-            //System.out.println("myService returned " + result.getClass().getName());
-        } catch (BusinessExceptionMinimal e) {
-            System.out.println("caught exception from hello(): " + e.getMessage() );
-        }
-    }
-    
-    public String hello(String name) throws BusinessExceptionMinimal{
-        throw new BusinessExceptionMinimal("bad news");
-    }
-    public void throwException(String name) throws BusinessExceptionMinimal{
-        throw new BusinessExceptionMinimal("bad news");
-    }
-    
-
-    public static void main(String[] args) {
-        
-    }
-
-}
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java b/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
deleted file mode 100644
index 1e887995dd..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
+++ /dev/null
@@ -1,27 +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 com.example;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface ExampleService {
-
-	String hello(String name) throws BusinessException;
-}
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java b/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
deleted file mode 100644
index b3b6f033e5..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ /dev/null
@@ -1,26 +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 com.example;
-
-public class ExampleServiceImpl implements ExampleService {
-    public String hello(String name) throws BusinessException {
-        throw new BusinessException("bad news", name);
-        // return "Hello, " + name;
-    }
-}
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java b/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
deleted file mode 100644
index 2a305913c8..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
+++ /dev/null
@@ -1,28 +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 com.example;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface ExampleServiceMinimal {
-
-	public String hello(String name) throws Exception;
-	public void throwException(String name) throws BusinessExceptionMinimal;
-}
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java b/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
deleted file mode 100644
index 728be51428..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
+++ /dev/null
@@ -1,30 +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 com.example;
-
-public class ExampleServiceMinimalImpl implements ExampleServiceMinimal {
-    public String hello(String name) throws Exception {
-        throw new BusinessExceptionMinimal("minimal bad news" + name);
-        // return "Hello, " + name;
-    }
-    
-    public void throwException(String name) throws BusinessExceptionMinimal {
-        throw new BusinessExceptionMinimal("minimal bad news" + name);
-    }
-}
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/resources/example.composite b/java/sca-contrib/itest/exceptions-simple-ws/src/main/resources/example.composite
deleted file mode 100644
index 505132277c..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/resources/example.composite
+++ /dev/null
@@ -1,56 +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://www.example.com"

-           xmlns:hw="http://www.example.com"

-           name="example">

-

-    <component name="ExampleClientComponent">

-        <implementation.java class="com.example.ExampleClientImpl" />

-        <reference name="myService">

-            <interface.wsdl interface="http://example.com/#wsdl.interface(ExampleServicePortType)" />

-            <binding.ws wsdlElement="http://example.com/#wsdl.port(ExampleService/ExampleServiceSOAP11port_http)" />

-        </reference>

-    </component>

-

-    <component name="ExampleComponent">

-        <implementation.java class="com.example.ExampleServiceImpl"/>

-        <service name="ExampleService">

-            <interface.wsdl interface="http://example.com/#wsdl.interface(ExampleServicePortType)" />

-            <binding.ws wsdlElement="http://example.com/#wsdl.port(ExampleService/ExampleServiceSOAP11port_http)" />

-        </service>  

-    </component>

-    

-    <component name="ExampleClientMinimalComponent">

-        <implementation.java class="com.example.ExampleClientMinimalImpl" />

-        <reference name="myService">

-			<interface.java interface="com.example.ExampleServiceMinimal"/>

-			<binding.ws uri="http://localhost:8085/ExampleMinimalComponent" />        

-       </reference>

-    </component>

-        

-	<component name="ExampleMinimalComponent">

-		<implementation.java class="com.example.ExampleServiceMinimalImpl" />

-		<service name="ExampleServiceMinimal">

-			<interface.java interface="com.example.ExampleServiceMinimal"/>

-			<binding.ws uri="http://localhost:8085/ExampleMinimalComponent" />

-		</service>

-	</component>    

-</composite>

diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl b/java/sca-contrib/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
deleted file mode 100644
index 628e6ca6ba..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
+++ /dev/null
@@ -1,126 +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 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"

-    xmlns:ns0="http://example.com/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"

-    xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ns1="http://example.com/xsd"

-    xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema"

-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://example.com/">

-    <wsdl:types>

-        <xs:schema xmlns:ns="http://example.com/" attributeFormDefault="qualified" elementFormDefault="qualified"

-            targetNamespace="http://example.com/">

-            <xs:complexType name="Exception">

-                <xs:sequence>

-                    <xs:element minOccurs="0" name="Exception" nillable="true" type="xs:anyType" />

-                </xs:sequence>

-            </xs:complexType>

-            <xs:element name="BusinessException">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="BusinessException" nillable="true" type="ns1:BusinessException" />

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-            <xs:element name="hello">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="param0" nillable="true" type="xs:string" />

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-            <xs:element name="helloResponse">

-                <xs:complexType>

-                    <xs:sequence>

-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string" />

-                    </xs:sequence>

-                </xs:complexType>

-            </xs:element>

-        </xs:schema>

-    </wsdl:types>

-    <wsdl:message name="helloRequest">

-        <wsdl:part name="parameters" element="ns0:hello" />

-    </wsdl:message>

-    <wsdl:message name="helloResponse">

-        <wsdl:part name="parameters" element="ns0:helloResponse" />

-    </wsdl:message>

-    <wsdl:message name="BusinessException">

-        <wsdl:part name="parameters" element="ns0:BusinessException" />

-    </wsdl:message>

-    <wsdl:portType name="ExampleServicePortType">

-        <wsdl:operation name="hello">

-            <wsdl:input message="ns0:helloRequest" wsaw:Action="urn:hello" />

-            <wsdl:output message="ns0:helloResponse" wsaw:Action="urn:helloResponse" />

-            <wsdl:fault message="ns0:BusinessException" name="BusinessException"

-                wsaw:Action="urn:helloBusinessException" />

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="ExampleServiceSOAP11Binding" type="ns0:ExampleServicePortType">

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

-        <wsdl:operation name="hello">

-            <soap:operation soapAction="urn:hello" style="document" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-            <wsdl:fault name="BusinessException">

-                <soap:fault use="literal" name="BusinessException" />

-            </wsdl:fault>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:binding name="ExampleServiceSOAP12Binding" type="ns0:ExampleServicePortType">

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

-        <wsdl:operation name="hello">

-            <soap12:operation soapAction="urn:hello" style="document" />

-            <wsdl:input>

-                <soap12:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap12:body use="literal" />

-            </wsdl:output>

-            <wsdl:fault name="BusinessException">

-                <soap12:fault use="literal" name="BusinessException" />

-            </wsdl:fault>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:binding name="ExampleServiceHttpBinding" type="ns0:ExampleServicePortType">

-        <http:binding verb="POST" />

-        <wsdl:operation name="hello">

-            <http:operation location="ExampleService/hello" />

-            <wsdl:input>

-                <mime:content type="text/xml" part="hello" />

-            </wsdl:input>

-            <wsdl:output>

-                <mime:content type="text/xml" part="hello" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="ExampleService">

-        <wsdl:port name="ExampleServiceSOAP11port_http" binding="ns0:ExampleServiceSOAP11Binding">

-            <soap:address location="http://localhost:8085/axis2/services/ExampleService" />

-        </wsdl:port>

-        <wsdl:port name="ExampleServiceSOAP12port_http" binding="ns0:ExampleServiceSOAP12Binding">

-            <soap12:address location="http://localhost:8085/axis2/services/ExampleService" />

-        </wsdl:port>

-        <wsdl:port name="ExampleServiceHttpport" binding="ns0:ExampleServiceHttpBinding">

-            <http:address location="http://localhost:8085/axis2/services/ExampleService" />

-        </wsdl:port>

-    </wsdl:service>

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java b/java/sca-contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
deleted file mode 100644
index 7310a0f1e7..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.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 com.example;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class ExampleMinimalTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private ExampleClientMinimalImpl client;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("example.composite");
-        client = scaDomain.getService(ExampleClientMinimalImpl.class, "ExampleClientMinimalComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-        client.runTest();
-    }
-}
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java b/java/sca-contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
deleted file mode 100644
index 740af4f43d..0000000000
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.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 com.example;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class ExampleTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private ExampleClient client;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("example.composite");
-        client = scaDomain.getService(ExampleClient.class, "ExampleClientComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-        client.runTest();
-    }
-}
diff --git a/java/sca-contrib/itest/extended-api/pom.xml b/java/sca-contrib/itest/extended-api/pom.xml
deleted file mode 100644
index fc857f21e1..0000000000
--- a/java/sca-contrib/itest/extended-api/pom.xml
+++ /dev/null
@@ -1,51 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-extended-api</artifactId>
-    <name>Apache Tuscany SCA Extended API Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            
-            <groupId>org.apache.tuscany.sca</groupId>
-            
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            
-            <version>2.0-SNAPSHOT</version>
-            
-            <scope>runtime</scope>
-        
-        </dependency>
-    
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
deleted file mode 100644
index 869565af17..0000000000
--- a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
+++ /dev/null
@@ -1,26 +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.extended;
-
-public interface BasicService {
-
-    int negate(int theInt);
-    int delegateNegate(int theInt);
-
-}
diff --git a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
deleted file mode 100644
index c54af93c05..0000000000
--- a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
+++ /dev/null
@@ -1,25 +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.extended;
-
-public interface MathService {
-
-    int negate(int theInt);
-
-}
diff --git a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
deleted file mode 100644
index b716c0dd07..0000000000
--- a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.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.    
- */
-package org.apache.tuscany.sca.test.extended.impl;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.extended.BasicService;
-import org.apache.tuscany.sca.test.extended.MathService;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BasicService.class)
-public class BasicServiceImpl implements BasicService {
-
-    @Context
-    protected ComponentContext context;
-    
-    public int negate(int theInt) {
-        return -theInt;
-    }
-
-    public int delegateNegate(int theInt) {
-        SCADomain domain = SCADomain.connect("sca://local");
-        MathService service = domain.getService(MathService.class, "MathServiceComponent");
-        return service.negate(theInt);       
-    }
-
-
-}
diff --git a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
deleted file mode 100644
index 869f951342..0000000000
--- a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.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.extended.impl;
-
-import org.apache.tuscany.sca.test.extended.MathService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(MathService.class)
-public class MathServiceImpl implements MathService {
-
-    public int negate(int theInt) {
-        return -theInt;
-    }
-
-}
diff --git a/java/sca-contrib/itest/extended-api/src/main/resources/BasicService.composite b/java/sca-contrib/itest/extended-api/src/main/resources/BasicService.composite
deleted file mode 100644
index 128b33b16f..0000000000
--- a/java/sca-contrib/itest/extended-api/src/main/resources/BasicService.composite
+++ /dev/null
@@ -1,29 +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="BasicServiceComposite">

-   

-    <component name="BasicServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.test.extended.impl.BasicServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/extended-api/src/main/resources/MathService.composite b/java/sca-contrib/itest/extended-api/src/main/resources/MathService.composite
deleted file mode 100644
index 8e99d3da60..0000000000
--- a/java/sca-contrib/itest/extended-api/src/main/resources/MathService.composite
+++ /dev/null
@@ -1,29 +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="MathServiceComposite">

-   

-    <component name="MathServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.test.extended.impl.MathServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/java/sca-contrib/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
deleted file mode 100644
index d0f20f98fc..0000000000
--- a/java/sca-contrib/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
+++ /dev/null
@@ -1,73 +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.extended;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-public class ServiceLocateTestCase {
-
-    private SCADomain domain;
-
-    /**
-     * Test description: Locate a service using Domain.getService() from an
-     * unmanaged client and invoke a method on that service
-     */
-    @Test
-    public void unmanagedLocateService() {
-        BasicService service = domain.getService(BasicService.class, "BasicServiceComponent");
-        assertEquals(-99, service.negate(99));
-    }
-
-    /**
-     * Test description: Locate a service using Domain.getService() from an
-     * managed client.  A service is located from this unmanaged test client and a method
-     * is invoked.  The method implementation of the service will also use Domain.getService
-     */
-    @Test
-    public void managedLocateService() {
-        BasicService service = domain.getService(BasicService.class, "BasicServiceComponent");
-        assertEquals(-99, service.delegateNegate(99));
-    }
-
-    /**
-     * Test description: Attempt to locate a service with an invalid name.
-     */
-    @Test(expected = ServiceRuntimeException.class)
-    public void badComponentName() {
-        BasicService service = domain.getService(BasicService.class, "IvalidServiceName");
-        service.negate(-1);
-    }
-
-    @Before
-    public void init() throws Exception {
-        domain = SCADomain.newInstance("http://localhost", "/", "BasicService.composite", "MathService.composite");
-    }
-
-    @After
-    public void destroy() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/interop-soap-client/pom.xml b/java/sca-contrib/itest/interop-soap-client/pom.xml
deleted file mode 100644
index 2fdc43ea32..0000000000
--- a/java/sca-contrib/itest/interop-soap-client/pom.xml
+++ /dev/null
@@ -1,126 +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>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-itest</artifactId>
-		<version>2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<artifactId>itest-interop-soap-client</artifactId>
-	<packaging>jar</packaging>
-	<name>Apache Tuscany SCA WS Interop Client Integration Tests</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-sca-api</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-embedded</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-ws-axis2</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-jetty</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sdo</groupId>
-			<artifactId>tuscany-sdo-impl</artifactId>
-			<version>1.0-incubating-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.0-incubating-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<configuration>
-							<schemaFile>${basedir}/src/main/resources/wsdl/interopdoc.wsdl</schemaFile>
-							<noNotification>true</noNotification>
-							<noContainer>true</noContainer>
-							<noInterfaces>true</noInterfaces>
-							<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>2.0-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<configuration>
-							<wsdlFile>
-								${basedir}/src/main/resources/wsdl/interopdoc.wsdl</wsdlFile>
-							<javaPackage>org.soapinterop</javaPackage>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/java/sca-contrib/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/java/sca-contrib/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
deleted file mode 100644
index f210545130..0000000000
--- a/java/sca-contrib/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
+++ /dev/null
@@ -1,46 +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.test.interop.client;
-
-import java.rmi.RemoteException;
-
-import org.oasisopen.sca.annotation.Service;
-import org.soapinterop.ComplexDocument;
-import org.soapinterop.DocTestPortType;
-import org.soapinterop.SimpleDocument1;
-import org.soapinterop.SingleTag;
-
-/**
- * This class implements the DocTest service component.
- */
-@Service(DocTestPortType.class)
-public class LoopbackInteropDocServiceComponentImpl implements DocTestPortType {
-    
-    public ComplexDocument ComplexDocument(ComplexDocument param0){
-        return param0;
-    }
-    
-    public SimpleDocument1 SimpleDocument(SimpleDocument1 param4) {
-        return param4;
-    }
-    
-    public SingleTag SingleTag(SingleTag param2) {
-        return param2;
-    }
-}
diff --git a/java/sca-contrib/itest/interop-soap-client/src/main/resources/default.composite b/java/sca-contrib/itest/interop-soap-client/src/main/resources/default.composite
deleted file mode 100644
index 7fd5cc0d65..0000000000
--- a/java/sca-contrib/itest/interop-soap-client/src/main/resources/default.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"

-        name="interop.client">

-    

-    <component name="InteropDocComponentService">

-        <implementation.java class="org.apache.tuscany.test.interop.client.LoopbackInteropDocServiceComponentImpl"/>

-

-		<service name="DocTestPortType">

-	        <!-- interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->

-	        <interface.java interface="org.soapinterop.DocTestPortType"/>

-	        <binding.ws wsdlElement="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"/>

-	    </service>

-    </component>

-    

-	    

-

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl b/java/sca-contrib/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
deleted file mode 100644
index 90d8a754b4..0000000000
--- a/java/sca-contrib/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.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.    
--->
-<definitions name="InteropTestDoc"
-	targetNamespace="http://soapinterop.org/"
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:tns="http://soapinterop.org/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-	<types>
-
-		<xsd:schema elementFormDefault="qualified"
-			targetNamespace="http://soapinterop.org/"
-			xmlns:interop="http://soapinterop.org/">
-
-			<xsd:element name="SingleTag">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="SingleTag" />
-			<xsd:element name="SingleTagResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			
-			<xsd:element name="SimpleDocument">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="SimpleDocument">
-				<xsd:simpleContent>
-					<xsd:extension base="xsd:string" />
-				</xsd:simpleContent>
-			</xsd:complexType>
-			<xsd:element name="SimpleDocumentResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			
-			<xsd:element name="ComplexDocument">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="ComplexDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="1" name="simpleDoc" type="interop:ArrayOfSimpleDocument" />
-					<xsd:element minOccurs="0" maxOccurs="1" name="child" type="interop:ChildDocument" />
-				</xsd:sequence>
-				<xsd:attribute name="AnAttribute" type="xsd:string" />
-			</xsd:complexType>
-			<xsd:element name="ComplexDocumentResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			
-			<xsd:complexType name="ArrayOfSimpleDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="unbounded" name="SimpleDocument" nillable="true" type="interop:SimpleDocument" />
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="ChildDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="1" name="childSimpleDoc" type="interop:ArrayOfSimpleDocument" />
-				</xsd:sequence>
-			</xsd:complexType>
-
-		</xsd:schema>
-
-	</types>
-
-	<message name="SingleTagSoapIn">
-		<part name="parameters" element="tns:SingleTag" />
-	</message>
-	<message name="SingleTagSoapOut">
-		<part name="outputDoc" element="tns:SingleTagResponse" />
-	</message>
-	<message name="SimpleDocumentSoapIn">
-		<part name="parameters" element="tns:SimpleDocument" />
-	</message>
-	<message name="SimpleDocumentSoapOut">
-		<part name="outputDoc" element="tns:SimpleDocumentResponse" />
-	</message>
-	<message name="ComplexDocumentSoapIn">
-		<part name="parameters" element="tns:ComplexDocument" />
-	</message>
-	<message name="ComplexDocumentSoapOut">
-		<part name="outputDoc" element="tns:ComplexDocumentResponse" />
-	</message>
-
-	<portType name="DocTestPortType">
-
-		<operation name="SingleTag">
-			<input message="tns:SingleTagSoapIn" />
-			<output message="tns:SingleTagSoapOut" />
-		</operation>
-		<operation name="SimpleDocument">
-			<input message="tns:SimpleDocumentSoapIn" />
-			<output message="tns:SimpleDocumentSoapOut" />
-		</operation>
-		<operation name="ComplexDocument">
-			<input message="tns:ComplexDocumentSoapIn" />
-			<output message="tns:ComplexDocumentSoapOut" />
-		</operation>
-
-	</portType>
-
-	<binding name="doc_test_binding" type="tns:DocTestPortType">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-
-		<operation name="SingleTag">
-			<soap:operation
-				soapAction="http://soapinterop.org/SingleTag" />
-			<input>
-				<soap:body use="literal" />
-			</input>
-			<output>
-				<soap:body use="literal" />
-			</output>
-		</operation>
-
-		<operation name="SimpleDocument">
-			<soap:operation
-				soapAction="http://soapinterop.org/SimpleDocument" />
-			<input>
-				<soap:body use="literal" />
-			</input>
-			<output>
-				<soap:body use="literal" />
-			</output>
-		</operation>
-
-		<operation name="ComplexDocument">
-			<soap:operation
-				soapAction="http://soapinterop.org/ComplexDocument" />
-			<input>
-				<soap:body use="literal" />
-			</input>
-			<output>
-				<soap:body use="literal" />
-			</output>
-		</operation>
-	</binding>
-
-	<service name="interopDocSvc">
-
-		<port name="interopDocPort" binding="tns:doc_test_binding">
-			<soap:address location="http://www.whitemesa.net/interopdoc" />
-			<!-- soap:address location="http://mssoapinterop.org/asmx/simple.asmx"/ -->
-			<!-- soap:address location="http://easysoap.sourceforge.net/cgi-bin/interopserver"/ -->
-			<!-- soap:address location="http://www.mssoapinterop.org/remoting/ServiceAllTypes.soap"/ -->
-			<http-conf:client
-				xmlns:http-conf="http://celtix.objectweb.org/transports/http/configuration"
-				AllowChunking="false" />
-		</port>
-
-	</service>
-
-</definitions>
diff --git a/java/sca-contrib/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java b/java/sca-contrib/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
deleted file mode 100644
index dc1ba48580..0000000000
--- a/java/sca-contrib/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
+++ /dev/null
@@ -1,144 +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.test.interop.client;
-
-import java.rmi.RemoteException;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.soapinterop.ArrayOfSimpleDocument;
-import org.soapinterop.ChildDocument;
-import org.soapinterop.ComplexDocument;
-import org.soapinterop.DocTestPortType;
-import org.soapinterop.SimpleDocument;
-import org.soapinterop.SimpleDocument1;
-import org.soapinterop.SingleTag;
-
-import commonj.sdo.helper.DataFactory;
-
-public class InteropDocClientTestCase extends TestCase {
-    private SCADomain scaDomain;
-    
-    private DataFactory dataFactory;
-
-    private DocTestPortType interopDoc;
-
-    public InteropDocClientTestCase(){};
-
-    
-    @Override
-    protected void setUp() throws Exception {
-
-        scaDomain = SCADomain.newInstance("default.composite");
-        interopDoc = locateInteropDocService();
-
-        //Get the SDO DataFactory
-        dataFactory = DataFactory.INSTANCE;
-    }
-    
-    
-    public void testSingleTag() throws RemoteException {
-
-        assertNotNull(interopDoc);
-        
-        // Create the input
-        SingleTag input = (SingleTag) dataFactory.create(SingleTag.class);
-
-        // Invoke the service
-        SingleTag output = interopDoc.SingleTag(input);
-
-        // Test the results
-        assertNotNull(output);
-
-    }
-
-    public void testSimpleDocument() throws RemoteException {
-
-        assertNotNull(interopDoc);
-        
-        // Create the input
-        SimpleDocument1 input = (SimpleDocument1) dataFactory.create(SimpleDocument1.class);
-        input.setValue("123");
-
-        // Invoke the service
-        SimpleDocument1 output = interopDoc.SimpleDocument(input);
-
-        // Test the results
-        assertNotNull(output);
-        assertEquals("123", output.getValue());
-
-    }
-
-    public void testComplexDocument() throws RemoteException {
-
-        assertNotNull(interopDoc);
-        
-        // Create the input
-        ComplexDocument input = (ComplexDocument) dataFactory.create(ComplexDocument.class);
-        input.setAnAttribute("789");
-        ChildDocument childDocument = (ChildDocument) dataFactory.create(ChildDocument.class);
-        SimpleDocument simpleDocument = (SimpleDocument) dataFactory.create(SimpleDocument.class);
-
-        SimpleDocument1 simpleDocument1 = (SimpleDocument1) dataFactory.create(SimpleDocument1.class);
-
-        simpleDocument.setSimpleDocument(simpleDocument1);
-        simpleDocument1.setValue("456");
-        ArrayOfSimpleDocument arrayOfSimpleDocument = (ArrayOfSimpleDocument) dataFactory.create(ArrayOfSimpleDocument.class);
-
-        arrayOfSimpleDocument.getSimpleDocument().add(simpleDocument1);
-        childDocument.setChildSimpleDoc(arrayOfSimpleDocument);
-        input.setChild(childDocument);
-
-        // Invoke the service
-        ComplexDocument output = interopDoc.ComplexDocument(input);
-
-        // Test the results
-        assertNotNull(output);
-        assertEquals("789", output.getAnAttribute());
-        assertNotNull(output.getChild());
-        assertNotNull(output.getChild().getChildSimpleDoc());
-
-        // FIXME Add more tests of the output document
-
-    }
-
-
-    /**
-     * Locate the interop service to test
-     * 
-     * @return
-     */
-    protected DocTestPortType locateInteropDocService() {
-        String interopLocation = System.getProperty("interopLocation");
-
-        // Valid service names are:
-        // RemoteInteropDocService: the live interop Web Service
-        // LocalHostInteropDocService: the interop Web Service hosted by Tuscany on localhost
-        // LoopbackInteropDocServiceComponent: a dummy loopback service component
-
-        // To specify the service name run mvn -interopLocation="Remote"
-
-        if (interopLocation == null)
-            interopLocation = "Remote";
-
-        return scaDomain.getService(DocTestPortType.class, interopLocation + "InteropDocService");
-    }
-
-}
diff --git a/java/sca-contrib/itest/interop-soap-round2-client/pom.xml b/java/sca-contrib/itest/interop-soap-round2-client/pom.xml
deleted file mode 100644
index 2757b21632..0000000000
--- a/java/sca-contrib/itest/interop-soap-round2-client/pom.xml
+++ /dev/null
@@ -1,124 +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>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-itest</artifactId>
-		<version>2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<artifactId>itest-interop-soap-round2-client</artifactId>
-	<name>Apache Tuscany SCA WS SOAP Round2 Interop Client Integration Tests</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-sca-api</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-embedded</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-ws-axis2</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-jetty</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sdo</groupId>
-			<artifactId>tuscany-sdo-impl</artifactId>
-			<version>1.0-incubating-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.0-incubating-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<configuration>
-							<schemaFile>${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl</schemaFile>
-							<noNotification>true</noNotification>
-							<noContainer>true</noContainer>
-							<noInterfaces>true</noInterfaces>
-							<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>2.0-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<configuration>
-							<wsdlFile>${basedir}/src/main/resources/wsdl/interoptestdoclit.wsdl</wsdlFile>
-							<javaPackage>org.soapinterop.wsdl.interop.test.doc.lit</javaPackage>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/java/sca-contrib/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java b/java/sca-contrib/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
deleted file mode 100644
index ca3031c646..0000000000
--- a/java/sca-contrib/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.tuscany.test.interop.client;
-import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType;
-
-/*
- * 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.
- */
-
-
-/**
- *
- *
- */
-public class InteropTestDocLit {
-    private WSDLInteropTestDocLitPortType interopTestDocLitPortType =null;
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-
-
-    }
-    WSDLInteropTestDocLitPortType getInteropTestDocLitPortType() {
-        return interopTestDocLitPortType;
-    }
-    void setInteropTestDocLitPortType(WSDLInteropTestDocLitPortType interopTestDocLitPortType) {
-        this.interopTestDocLitPortType = interopTestDocLitPortType;
-    }
-
-}
diff --git a/java/sca-contrib/itest/interop-soap-round2-client/src/main/resources/default.composite b/java/sca-contrib/itest/interop-soap-round2-client/src/main/resources/default.composite
deleted file mode 100644
index 9bde77ef37..0000000000
--- a/java/sca-contrib/itest/interop-soap-round2-client/src/main/resources/default.composite
+++ /dev/null
@@ -1,38 +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:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" 

-    name="InteropClient">

-

-	<dbsdo:import.sdo location="wsdl/interoptestdoclit.wsdl"/>

-	<dbsdo:import.sdo factory="org.soapinterop.xsd.XsdFactory"/>

-	

-    <reference name="RemoteInteropDocService">

-<!--    

-        <interface.wsdl interface="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.interface(WSDLInteropTestDocLitPortType)"/>

-        <binding.ws port="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.endpoint(WSDLInteropTestDocLitService/WSDLInteropTestDocLitPort)"/>

--->

-

-		<interface.java interface="org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType"/>

-		<binding.ws endpoint="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.endpoint(WSDLInteropTestDocLitService/WSDLInteropTestDocLitPort)"

-			location="wsdl/interoptestdoclit.wsdl" />

-    </reference>

-    

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl b/java/sca-contrib/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
deleted file mode 100644
index e08039cedb..0000000000
--- a/java/sca-contrib/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
+++ /dev/null
@@ -1,155 +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.    
- -->
-<definitions name="WSDLInteropTestDocLitService" 
-    targetNamespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://soapinterop.org/WSDLInteropTestDocLit" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsd1="http://soapinterop.org/xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <types>
-        <schema targetNamespace="http://soapinterop.org/xsd"
-            xmlns="http://www.w3.org/2001/XMLSchema" 
-            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-            elementFormDefault="qualified">
-            <complexType name="ArrayOfstring_literal">
-                <sequence>
-                    <element maxOccurs="unbounded" minOccurs="1" name="string" type="xsd:string"/>
-                </sequence>
-            </complexType>
-	    <complexType name="SOAPStruct">
-                <all>
-                    <element name="varFloat" type="xsd:float"/>
-                    <element name="varInt" type="xsd:int"/>
-                    <element name="varString" type="xsd:string"/>
-                </all>
-            </complexType>
-  
-            <element name="echoStringParam" type="xsd:string"/>
-         
-            <element name="echoStringReturn" type="xsd:string"/>
-            <element name="echoStringArrayParam" type="xsd1:ArrayOfstring_literal"/>
-                
-            <element name="echoStringArrayReturn" type="xsd1:ArrayOfstring_literal"/>
-               
-            <element name="echoStructParam" type="xsd1:SOAPStruct"/>
-                   
-            <element name="echoStructReturn" type="xsd1:SOAPStruct"/>
-        </schema>
-    </types>
-    <message name="echoString">
-        <part element="xsd1:echoStringParam" name="a"/>
-    </message>
-    <message name="echoStringResponse">
-        <part element="xsd1:echoStringReturn" name="result"/>
-    </message>
-    <message name="echoStringArray">
-        <part element="xsd1:echoStringArrayParam" name="a"/>
-    </message>
-    <message name="echoStringArrayResponse">
-        <part element="xsd1:echoStringArrayReturn" name="result"/>
-    </message>
-    <message name="echoStruct">
-        <part element="xsd1:echoStructParam" name="a"/>
-    </message>
-    <message name="echoStructResponse">
-        <part element="xsd1:echoStructReturn" name="result"/>
-    </message>
-    <message name="echoVoid"/>
-    <message name="echoVoidResponse"/>
-
-    <portType name="WSDLInteropTestDocLitPortType">
-        <operation name="echoString">
-            <input message="tns:echoString" name="echoString"/>
-            <output message="tns:echoStringResponse" name="echoStringResponse"/>
-        </operation>
-        <operation name="echoStringArray">
-            <input message="tns:echoStringArray" name="echoStringArray"/>
-            <output message="tns:echoStringArrayResponse" name="echoStringArrayResponse"/>
-        </operation>
-        <operation name="echoStruct">
-            <input message="tns:echoStruct" name="echoStruct"/>
-            <output message="tns:echoStructResponse" name="echoStructResponse"/>
-        </operation>
-        <operation name="echoVoid">
-            <input message="tns:echoVoid" name="echoVoid"/>
-            <output message="tns:echoVoidResponse" name="echoVoidResponse"/>
-        </operation>
-    </portType>
-    <binding name="WSDLInteropTestDocLitPortBinding" 
-        type="tns:WSDLInteropTestDocLitPortType">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="echoString">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoString">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStringResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoStringArray">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoStringArray">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStringArrayResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoStruct">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoStruct">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoStructResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-        <operation name="echoVoid">
-            <soap:operation soapAction="http://soapinterop.org/" style="document"/>
-            <input name="echoVoid">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </input>
-            <output name="echoVoidResponse">
-                <soap:body namespace="http://soapinterop.org/WSDLInteropTestDocLit" 
-                    use="literal"/>
-            </output>
-        </operation>
-    </binding>
-    <service name="WSDLInteropTestDocLitService">
-        <port binding="tns:WSDLInteropTestDocLitPortBinding" 
-            name="WSDLInteropTestDocLitPort">
-            <soap:address 
-                location="http://mssoapinterop.org/stkv3/wsdl/interopTestDocLit.wsdl"/>
-            <http-conf:client xmlns:http-conf="http://celtix.objectweb.org/transports/http/configuration"
-                AllowChunking="false"/>
-        </port>
-    </service>
-</definitions>
diff --git a/java/sca-contrib/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/java/sca-contrib/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
deleted file mode 100644
index 251f64bd6b..0000000000
--- a/java/sca-contrib/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
+++ /dev/null
@@ -1,133 +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.test.interop.client;
-
-import java.rmi.RemoteException;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.tuscany.test.SCATestCase;
-import org.oasisopen.sca.CompositeContext;
-import org.oasisopen.sca.CurrentCompositeContext;
-import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType;
-import org.soapinterop.xsd.ArrayOfstring_literal;
-import org.soapinterop.xsd.SOAPStruct;
-import org.soapinterop.xsd.XsdPackage;
-
-import commonj.sdo.helper.DataFactory;
-
-/**
- * This test case is part of the tuscany interop tests. This is a reduced version of the SOAPBuilders InteropTest test, document/literal mode. This
- * version has operations such as echoString, echoArrayOfString and echoStruct.
- * 
- * <p>
- * The WSDL for the external service used in this test case can be downloaded from http://www.mssoapinterop.org/stkV3/wsdl/InteropTestDocLit.wsdl.
- * This is part of the WSDL interop test from Microsoft and more details aobout this test case are found at
- * http://www.mssoapinterop.org/stkV3/wsdl/WSDLInterop-0118.htm
- */
-public class InteropTestDocLitTestCase extends TestCase {
-
-    private WSDLInteropTestDocLitPortType doc = null;
-
-    private DataFactory dataFactory;
-
-    
-    protected void setUp() throws Exception {
-        setApplicationSCDL(InteropTestDocLit.class, "META-INF/sca/default.scdl");
-        addExtension("test.extensions", InteropTestDocLit.class.getClassLoader().getResource("META-INF/tuscany/extensions/test-extensions.scdl"));
-
-         super.setUp();
-
-        // Get the SDO DataFactory
-        dataFactory = DataFactory.INSTANCE;
-
-        // Locate the service to test
-        doc = locateInteropDocService();
-    }
-
-    /**
-     * Locate the interop service to test
-     * 
-     * @return
-     */
-    protected WSDLInteropTestDocLitPortType locateInteropDocService() {
-
-        CompositeContext compositeContext = CurrentCompositeContext.getContext();
-        return compositeContext.locateService(WSDLInteropTestDocLitPortType.class, "RemoteInteropDocService");
-
-    }
-
-    /**
-     * test echo void
-     * 
-     * @throws RemoteException
-     */
-    public void testEchoVoid() throws RemoteException {
-        doc.echoVoid();
-        assertTrue(true);
-    }
-
-    /**
-     * test echo string
-     * 
-     * @throws RemoteException
-     */
-    public void testEchoString() throws RemoteException {
-        String input = "a test string";
-        String output = doc.echoString(input);
-        assertEquals(input, output);
-    }
-
-    /**
-     * test echo string
-     * 
-     * @throws RemoteException
-     */
-    public void testEchoStringArray() throws RemoteException {
-
-        ArrayOfstring_literal input = (ArrayOfstring_literal) dataFactory.create(ArrayOfstring_literal.class);
-        List inStrings = Arrays.asList(new String[] { "petra", "sue" });
-        input.set(XsdPackage.ARRAY_OFSTRING_LITERAL__STRING, inStrings);
-
-        ArrayOfstring_literal output = doc.echoStringArray(input);
-
-        List outStrings = output.getString();
-        assertNotNull(outStrings);
-        assertEquals(2, outStrings.size());
-        assertEquals("petra", outStrings.get(0));
-        assertEquals("sue", outStrings.get(1));
-    }
-
-    /**
-     * test echo struct
-     * 
-     * @throws RemoteException
-     */
-    public void testEchoStruct() throws RemoteException {
-        SOAPStruct input = (SOAPStruct) dataFactory.create(SOAPStruct.class);
-        input.setVarInt(200);
-        input.setVarFloat(.002f);
-        input.setVarString("Hello");
-        SOAPStruct output = doc.echoStruct(input);
-        assertEquals(input.getVarInt(), output.getVarInt());
-        assertEquals(input.getVarFloat(), output.getVarFloat());
-        assertEquals(input.getVarString(), output.getVarString());
-    }
-
-}
diff --git a/java/sca-contrib/itest/interop-soap-service/pom.xml b/java/sca-contrib/itest/interop-soap-service/pom.xml
deleted file mode 100644
index b72a0b89dd..0000000000
--- a/java/sca-contrib/itest/interop-soap-service/pom.xml
+++ /dev/null
@@ -1,134 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>itest-interop-soap-service</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA WS Interop Service Integration Tests</name>
-
-    <dependencies>
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-
-<dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-            </exclusions>
-            <version>1.2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.5</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-      
-    <build>
-        <plugins>
-            <plugin>
-		<groupId>org.apache.tuscany.sdo</groupId>
-		<artifactId>tuscany-sdo-plugin</artifactId>
-		<version>1.0-incubating-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/interopdoc.wsdl</schemaFile>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noInterfaces>true</noInterfaces>
-                            <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>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <wsdlFile>${basedir}/src/main/resources/wsdl/interopdoc.wsdl</wsdlFile>
-                            <javaPackage>org.soapinterop</javaPackage>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>     
-   </build>
-
-</project>
diff --git a/java/sca-contrib/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/java/sca-contrib/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
deleted file mode 100644
index 9892828ca2..0000000000
--- a/java/sca-contrib/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
+++ /dev/null
@@ -1,47 +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.test.interop.server;
-
-import java.rmi.RemoteException;
-
-import org.oasisopen.sca.annotation.Service;
-import org.soapinterop.ComplexDocument;
-import org.soapinterop.DocTestPortType;
-import org.soapinterop.SimpleDocument1;
-import org.soapinterop.SingleTag;
-
-/**
- * This class implements the HelloWorld service component.
- */
-@Service(DocTestPortType.class)
-public class InteropDocServiceComponentImpl implements DocTestPortType {
-
-    public ComplexDocument ComplexDocument(ComplexDocument param2) throws RemoteException {
-        return param2;
-    }
-
-    public SimpleDocument1 SimpleDocument(SimpleDocument1 param0) throws RemoteException {
-        return param0;
-    }
-
-    public SingleTag SingleTag(SingleTag param4) throws RemoteException {
-        return param4;
-    }
-
-}
diff --git a/java/sca-contrib/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl b/java/sca-contrib/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
deleted file mode 100644
index 820c26ca34..0000000000
--- a/java/sca-contrib/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.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.    
- -->
-<definitions name="InteropTestDoc" targetNamespace="http://soapinterop.org/"
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:tns="http://soapinterop.org/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-	<types>
-
-		<xsd:schema elementFormDefault="qualified" targetNamespace="http://soapinterop.org/" xmlns:interop="http://soapinterop.org/">
-
-			<xsd:element name="SingleTag">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="SingleTag"/>
-			<xsd:element name="SingleTagResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="SimpleDocument">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="SimpleDocument">
-				<xsd:simpleContent>
-					<xsd:extension base="xsd:string"/>
-				</xsd:simpleContent>
-			</xsd:complexType>
-			<xsd:element name="SimpleDocumentResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="ComplexDocument">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="ComplexDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="1" name="simpleDoc" type="interop:ArrayOfSimpleDocument"/>
-					<xsd:element minOccurs="0" maxOccurs="1" name="child" type="interop:ChildDocument"/>
-				</xsd:sequence>
-				<xsd:attribute name="AnAttribute" type="xsd:string"/>
-			</xsd:complexType>
-			<xsd:complexType name="ArrayOfSimpleDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="unbounded" name="SimpleDocument" nillable="true" type="interop:SimpleDocument"/>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="ChildDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="1" name="childSimpleDoc" type="interop:ArrayOfSimpleDocument"/>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:element name="ComplexDocumentResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-		</xsd:schema>
-
-	</types>
-
-	<message name="SingleTagSoapIn">
-		<part name="parameters" element="tns:SingleTag"/>
-	</message>
-	<message name="SingleTagSoapOut">
-		<part name="outputDoc" element="tns:SingleTagResponse"/>
-	</message>
-	<message name="SimpleDocumentSoapIn">
-		<part name="parameters" element="tns:SimpleDocument"/>
-	</message>
-	<message name="SimpleDocumentSoapOut">
-		<part name="outputDoc" element="tns:SimpleDocumentResponse"/>
-	</message>
-	<message name="ComplexDocumentSoapIn">
-		<part name="parameters" element="tns:ComplexDocument"/>
-	</message>
-	<message name="ComplexDocumentSoapOut">
-		<part name="outputDoc" element="tns:ComplexDocumentResponse"/>
-	</message>
-
-	<portType name="DocTestPortType">
-
-		<operation name="SingleTag">
-			<input message="tns:SingleTagSoapIn"/>
-			<output message="tns:SingleTagSoapOut"/>
-		</operation>
-		<operation name="SimpleDocument">
-			<input message="tns:SimpleDocumentSoapIn"/>
-			<output message="tns:SimpleDocumentSoapOut"/>
-		</operation>
-		<operation name="ComplexDocument">
-			<input message="tns:ComplexDocumentSoapIn"/>
-			<output message="tns:ComplexDocumentSoapOut"/>
-		</operation>
-
-	</portType>
-
-	<binding name="doc_test_binding" type="tns:DocTestPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-		<operation name="SingleTag">
-			<soap:operation soapAction="http://soapinterop.org/SingleTag"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation> 
-
-		<operation name="SimpleDocument">
-			<soap:operation soapAction="http://soapinterop.org/SimpleDocument"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation> 
-
-		<operation name="ComplexDocument">
-			<soap:operation soapAction="http://soapinterop.org/ComplexDocument"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation> 
-	</binding>
-
-	<service name="interopDocSvc">
-
-  		<port name="interopDocPort" binding="tns:doc_test_binding">
-    			<soap:address location="http://www.whitemesa.net/interopdoc"/>
-  		</port>
-
-	</service>
-
-</definitions>
diff --git a/java/sca-contrib/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl b/java/sca-contrib/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
deleted file mode 100644
index 3fbc73616e..0000000000
--- a/java/sca-contrib/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
+++ /dev/null
@@ -1,42 +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" 
-        name="interop.server">
-
-    <import.sdo location="wsdl/interopdoc.wsdl"/>
-    <!-- import.wsdl wsdlLocation="wsdl/interopdoc.wsdl"/ -->
-		
-    <service name="InteropDocService">
-       <!-- interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->
-       <interface.java interface="org.soapinterop.DocTestPortType"/>
-                
-       <binding.ws endpoint="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"
-          conformanceURIs="http://ws-i.org/profiles/basic/1.1"
-          location="wsdl/interopdoc.wsdl"
-         />
-        
-        <reference>InteropDocServiceComponent/DocTestPortType</reference>
-    </service>
-
-    <component name="InteropDocServiceComponent">
-        <implementation.java class="org.apache.tuscany.test.interop.server.InteropDocServiceComponentImpl"/>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 8cf95fb789..0000000000
--- a/java/sca-contrib/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-  <display-name>Tuscany Interop Test Server</display-name>
-
-  <context-param>
-     <param-name>systemScdlPath</param-name>
-     <param-value>/META-INF/sca/webapp.system.scdl</param-value>
-  </context-param>
-
-  <context-param>
-     <param-name>applicationScdlPath</param-name>
-     <param-value>/META-INF/sca/default.scdl</param-value>
-  </context-param>
-
-  <listener>
-     <listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
-  </listener>
-
-  <servlet>
-     <servlet-name>TuscanyServlet</servlet-name>
-     <display-name>Tuscany Servlet</display-name>
-     <servlet-class>org.apache.tuscany.runtime.webapp.TuscanyServlet</servlet-class>
-  </servlet>
-  
-  <servlet-mapping>
-     <servlet-name>TuscanyServlet</servlet-name>
-     <url-pattern>/services/*</url-pattern>
-  </servlet-mapping>
-
-</web-app>
diff --git a/java/sca-contrib/itest/interop-soap-service/t.bat b/java/sca-contrib/itest/interop-soap-service/t.bat
deleted file mode 100755
index 0f83dedc37..0000000000
--- a/java/sca-contrib/itest/interop-soap-service/t.bat
+++ /dev/null
@@ -1,34 +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.
-
-
-@echo off
-pushd target
-jar -xf  ..\apache-tomcat-5.5.17.zip 
-popd
-copy target\sample-helloworldws-1.0-SNAPSHOT.war target\apache-tomcat-5.5.17\webapps
-rem pushd target\apache-tomcat-5.5.17\webapps
-rem md sample-helloworldws-1.0-SNAPSHOT 
-rem cd sample-helloworldws-1.0-SNAPSHOT
-rem jar -xf ..\sample-helloworldws-1.0-SNAPSHOT.war
-pushd target\apache-tomcat-5.5.17\shared
-rem jar -xf  "%USERPROFILE%\.m2\repository\org\apache\tuscany\web\1.0-SNAPSHOT\web-1.0-SNAPSHOT-bin.zip"
-jar -xf  "%USERPROFILE%\.m2\repository\org\apache\tuscany\web\1.0-SNAPSHOT\web-1.0-SNAPSHOT-bin.zip"
-popd
-rem hack
-mkdir target\apache-tomcat-5.5.17\shared\extension
-copy target\apache-tomcat-5.5.17\shared\lib\axis2-1.0-SNAPSHOT.jar target\apache-tomcat-5.5.17\shared\extension 
diff --git a/java/sca-contrib/itest/jms-args/pom.xml b/java/sca-contrib/itest/jms-args/pom.xml
deleted file mode 100644
index dbddf929af..0000000000
--- a/java/sca-contrib/itest/jms-args/pom.xml
+++ /dev/null
@@ -1,92 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-jms-args</artifactId>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <!--  uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using

-              a temporary queue name -->

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-core</artifactId>

-            <version>5.1.0</version>

-        </dependency>

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
deleted file mode 100644
index 68506b857b..0000000000
--- a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ /dev/null
@@ -1,41 +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.binding.jms;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the OneWay service.

- */

-@Service(MyService.class)

-public class ClientImpl implements MyService {

-

-    private MyService serviceA;

-

-    @Reference

-    public void setServiceA(MyService service) {

-        this.serviceA = service;

-    }

-

-    public void sayHello(String name, String n2) {

-        serviceA.sayHello(name, n2);

-    }

-

-}

diff --git a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
deleted file mode 100644
index 5f19aa1fa5..0000000000
--- a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ /dev/null
@@ -1,29 +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.binding.jms;

-

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface MyService {

-    

-    @OneWay

-    void sayHello(String name, String n2);

-}

diff --git a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
deleted file mode 100644
index 18324d5d1d..0000000000
--- a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ /dev/null
@@ -1,38 +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.binding.jms;

-

-

-public class ServiceImpl implements MyService {

-

-    public static Object lock = new Object();

-    public static String name;

-    public static String n2;

-    

-    public void sayHello(String name, String n2) {

-        System.out.println("SelectorServiceImpl1 " + name + n2);

-        ServiceImpl.name = name;

-        ServiceImpl.n2 = n2;

-        synchronized (ServiceImpl.lock) {

-            ServiceImpl.lock.notify();

-        }

-    }

-

-}

diff --git a/java/sca-contrib/itest/jms-args/src/main/resources/jndi.properties b/java/sca-contrib/itest/jms-args/src/main/resources/jndi.properties
deleted file mode 100644
index bb431a592b..0000000000
--- a/java/sca-contrib/itest/jms-args/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,38 +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.

-## ---------------------------------------------------------------------------

-

-# START SNIPPET: jndi

-

-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory

-

-# use the following property to configure the default connector

-java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx=false

-

-# use the following property to specify the JNDI name the connection factory

-# should appear as. 

-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry

-connectionFactoryNames = ConnectionFactory, ConnectionFactory2

-

-# register some queues in JNDI using the form

-# queue.[jndiName] = [physicalName]

-

-# register some topics in JNDI using the form

-# topic.[jndiName] = [physicalName]

-#topic.MyTopic = example.MyTopic

-topic.ServiceTopic = ServiceTopic

-

-# END SNIPPET: jndi

diff --git a/java/sca-contrib/itest/jms-args/src/main/resources/selectors/selectors.composite b/java/sca-contrib/itest/jms-args/src/main/resources/selectors/selectors.composite
deleted file mode 100644
index 74c352934f..0000000000
--- a/java/sca-contrib/itest/jms-args/src/main/resources/selectors/selectors.composite
+++ /dev/null
@@ -1,39 +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://jms"

-           xmlns:itest="http://jms"

-           name="DefinitionsTests">

-

-    <component name="Client1">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>

-        <reference name="serviceA">

-           <binding.jms uri="jms:MyService" />

-        </reference>

-    </component>

-

-    <component name="Service1">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.ServiceImpl"/>

-        <service name="MyService">

-            <binding.jms />

-        </service> 

-    </component>       

-

-</composite>

diff --git a/java/sca-contrib/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/java/sca-contrib/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
deleted file mode 100644
index 228366d596..0000000000
--- a/java/sca-contrib/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
+++ /dev/null
@@ -1,61 +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.binding.jms;

-

-import static org.junit.Assert.assertEquals;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- */

-public class ArgsTestCase {

-

-    private static SCADomain scaDomain;

-

-    @Before

-    public void init() {

-        scaDomain = SCADomain.newInstance("http://localhost", "/", "selectors/selectors.composite");

-    }

-

-    @Test

-    public void testSayHello() throws Exception {

-        MyService client1 = scaDomain.getService(MyService.class, "Client1");

-

-        client1.sayHello("petra", "beate");

-

-        synchronized(ServiceImpl.lock) {

-            if (ServiceImpl.name == null) {

-                ServiceImpl.lock.wait(5000);

-            }

-        }

-

-        assertEquals("petra", ServiceImpl.name);

-        assertEquals("beate", ServiceImpl.n2);

-    }

-

-    @After

-    public void end() {

-        if (scaDomain != null) {

-            scaDomain.close();

-        }

-    }

-}

diff --git a/java/sca-contrib/itest/jms-callbacks/pom.xml b/java/sca-contrib/itest/jms-callbacks/pom.xml
deleted file mode 100644
index ceb8d128b2..0000000000
--- a/java/sca-contrib/itest/jms-callbacks/pom.xml
+++ /dev/null
@@ -1,94 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-jms-callbacks</artifactId>

-    <name>Apache Tuscany SCA JMS Tests for callbacks</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <!--  uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using

-              a temporary queue name -->

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-core</artifactId>

-            <version>5.1.0</version>

-            <scope>test</scope>

-        </dependency>

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
deleted file mode 100644
index d4cd5df431..0000000000
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ /dev/null
@@ -1,28 +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.binding.jms;

-

-

-/**

- * The client interface

- */

-public interface JMSClient {

-

-    void aClientMethod();

-}

diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
deleted file mode 100644
index a4d5190af3..0000000000
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
+++ /dev/null
@@ -1,50 +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.binding.jms;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Remote Web service client with callback interface

- */

-@Service(JMSClient.class)

-public class JMSClientImpl implements JMSClient, JMSServiceCallback {

-

-    @Reference protected JMSService myService;

-

-    public static String result;

-    public static Object lock = new Object();

-	

-    public void aClientMethod() {

-        System.out.println("aClientMethod " + this + " on thread " + Thread.currentThread());

-        myService.someMethod(" -> someMethod ");  // calls the server

-        System.out.println("aClientMethod return from someMethod on thread " + Thread.currentThread());

-    }

-

-    public void receiveResult(String result) {

-        System.out.println("receiveResult " + this + " '" + result + "' on thread " + Thread.currentThread());

-        JMSClientImpl.result = result;

-        

-        // wakeup the waiting testcase

-        synchronized (lock) {

-            lock.notifyAll();

-	}

-    }

-}

diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
deleted file mode 100644
index b78feab413..0000000000
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
+++ /dev/null
@@ -1,34 +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.binding.jms;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The remote service that will be invoked by the client

- */

-@Remotable

-@Callback(JMSServiceCallback.class)

-public interface JMSService {

-

-    @OneWay

-    void someMethod(String arg);

-}

diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
deleted file mode 100644
index 20b74ccc1a..0000000000
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.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 org.apache.tuscany.sca.binding.jms;

-

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The callback interface for {@link JMSService}.

- */

-@Remotable

-public interface JMSServiceCallback {

-

-    @OneWay

-    void receiveResult(String result);

-}

diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
deleted file mode 100644
index e8357338ae..0000000000
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
+++ /dev/null
@@ -1,47 +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.binding.jms;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements MyService and uses a callback.

- */

-@Service(JMSService.class)

-public class JMSServiceImpl implements JMSService {

-

-    private JMSServiceCallback myServiceCallback;

-    

-    @Callback

-    public void setMyServiceCallback(JMSServiceCallback myServiceCallback) {

-        System.out.println("setMyServiceCallback on thread " + Thread.currentThread() + " cb: " + myServiceCallback);

-        this.myServiceCallback = myServiceCallback;

-    }

-    

-    public void someMethod(String arg) {

-        System.out.println("someMethod '" + arg + "' on thread " + Thread.currentThread());

-        try {

-            myServiceCallback.receiveResult(arg + " -> receiveResult ");

-        } catch(Exception e) {

-            System.out.println("RuntimeException invoking receiveResult: " + e.toString());

-            e.printStackTrace();

-        }

-    }

-}

diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/resources/jndi.properties b/java/sca-contrib/itest/jms-callbacks/src/main/resources/jndi.properties
deleted file mode 100644
index 608fe747f5..0000000000
--- a/java/sca-contrib/itest/jms-callbacks/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,39 +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.

-## ---------------------------------------------------------------------------

-

-# START SNIPPET: jndi

-

-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory

-

-# use the following property to configure the default connector

-java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx=false

-

-# use the following property to specify the JNDI name the connection factory

-# should appear as. 

-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry

-connectionFactoryNames = ConnectionFactory

-

-# register some queues in JNDI using the form

-# queue.[jndiName] = [physicalName]

-queue.ServiceQueue = ServiceQueue

-queue.CallbackQueue = CallbackQueue

-

-# register some topics in JNDI using the form

-# topic.[jndiName] = [physicalName]

-#topic.MyTopic = example.MyTopic

-

-# END SNIPPET: jndi

diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/client.composite b/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/client.composite
deleted file mode 100644
index 93d8acb65b..0000000000
--- a/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/client.composite
+++ /dev/null
@@ -1,44 +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://jms"

-           name="CallbackClientComposite">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSClientImpl" />

-        <reference name="myService">

-            <binding.jms uri="jms:ServiceQueue"/>

-            <callback>

-                <binding.jms uri="jms:CallbackQueue"/>

-            </callback>

-        </reference>

-    </component>

-

-    <component name="ServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSServiceImpl" />

-        <service name="JMSService">

-            <binding.jms uri="jms:ServiceQueue"/>

-            <callback>

-                <binding.jms uri="jms:CallbackQueue"/>

-            </callback>

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/tempq.composite b/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/tempq.composite
deleted file mode 100644
index 636e951d03..0000000000
--- a/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/tempq.composite
+++ /dev/null
@@ -1,50 +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://jms"

-           name="CallbackClientComposite">

-

-<!-- 

-

-The client component does not define the callback destination so a temporary queue should be used

-

--->

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSClientImpl" />

-        <reference name="myService">

-            <binding.jms uri="jms:ServiceQueue"/>

-            <callback>

-                <binding.jms />

-            </callback>

-        </reference>

-    </component>

-

-    <component name="ServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSServiceImpl" />

-        <service name="JMSService">

-            <binding.jms uri="jms:ServiceQueue"/>

-            <callback>

-                <binding.jms />

-            </callback>

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
deleted file mode 100644
index cb9acb1bc1..0000000000
--- a/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
+++ /dev/null
@@ -1,60 +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.binding.jms;

-

-import static org.junit.Assert.assertEquals;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * This shows how to test the JMS binding using a simple HelloWorld application.

- */

-public class CallbackTestCase {

-

-    private static SCADomain scaDomain;

-

-    @Before

-    public void init() {

-        scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");

-    }

-

-    @Test

-    public void testHelloWorldCreate() throws Exception {

-        JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");

-

-        client.aClientMethod();

-

-        // wait for up to 5 seconds but should wake up as soon as done

-        synchronized(JMSClientImpl.lock) {

-        	JMSClientImpl.lock.wait(5000);

-        }

-

-        assertEquals(" -> someMethod  -> receiveResult ", JMSClientImpl.result);

-    }

-

-    @After

-    public void end() {

-        if (scaDomain != null) {

-            scaDomain.close();

-        }

-    }

-}

diff --git a/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
deleted file mode 100644
index 9f450574df..0000000000
--- a/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
+++ /dev/null
@@ -1,63 +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.binding.jms;

-

-import static org.junit.Assert.assertEquals;

-

-import java.net.MalformedURLException;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * This shows how to test the JMS binding using a simple HelloWorld application.

- */

-public class TempCallbackQTestCase {

-

-    private SCADomain scaDomain;

-

-    @Before

-    public void init() throws MalformedURLException {

-        scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/tempq.composite");

-    }

-

-    @Test

-    public void testHelloWorldCreate() throws Exception {

-        JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");

-

-        client.aClientMethod();

-

-        // wait for up to 5 seconds but should wake up as soon as done

-        synchronized (JMSClientImpl.lock) {

-            JMSClientImpl.lock.wait(5000);

-        }

-

-        assertEquals(" -> someMethod  -> receiveResult ", JMSClientImpl.result);

-    }

-

-    @After

-    public void end() {

-        if (scaDomain != null) {

-            scaDomain.close();

-        }

-    }

-

-}

diff --git a/java/sca-contrib/itest/jms-definitions/pom.xml b/java/sca-contrib/itest/jms-definitions/pom.xml
deleted file mode 100644
index 5f594ea957..0000000000
--- a/java/sca-contrib/itest/jms-definitions/pom.xml
+++ /dev/null
@@ -1,93 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-jms-definitions</artifactId>

-    <name>Apache Tuscany SCA JMS Tests for properties</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <!--  uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using

-              a temporary queue name -->

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-core</artifactId>

-            <version>5.1.0</version>

-        </dependency>

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
deleted file mode 100644
index b572b1012a..0000000000
--- a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ /dev/null
@@ -1,41 +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.binding.jms;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the OneWay service.

- */

-@Service(OneWayService.class)

-public class OneWayClientImpl implements OneWayService {

-

-    private OneWayService serviceA;

-

-    @Reference

-    public void setServiceA(OneWayService service) {

-        this.serviceA = service;

-    }

-

-    public void sayHello(String name) {

-        serviceA.sayHello(name);

-    }

-

-}

diff --git a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
deleted file mode 100644
index 9cec2d9b3e..0000000000
--- a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ /dev/null
@@ -1,29 +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.binding.jms;

-

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface OneWayService {

-    

-    @OneWay

-    void sayHello(String name);

-}

diff --git a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
deleted file mode 100644
index 6b763874df..0000000000
--- a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ /dev/null
@@ -1,34 +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.binding.jms;

-

-public class OneWayServiceImpl implements OneWayService {

-

-    public static Object lock = new Object();

-    public static String name;

-    

-    public void sayHello(String name) {

-        OneWayServiceImpl.name = name;

-        synchronized (OneWayServiceImpl.lock) {

-            OneWayServiceImpl.lock.notify();

-        }

-    }

-

-}

diff --git a/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions.xml b/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions.xml
deleted file mode 100644
index ff389c7014..0000000000
--- a/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"

-             xmlns:itest="http://jms"

-                 targetNamespace="http://jms" >

-

-    <binding.jms name="itest:TestService" >

-        <destination name="MyServiceQueue" create="never"/>

-        <connectionFactory name="MyConnectionFactory"/>

-    </binding.jms>

-

- </definitions>

diff --git a/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions/definitions.composite b/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions/definitions.composite
deleted file mode 100644
index 99e4e5016e..0000000000
--- a/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions/definitions.composite
+++ /dev/null
@@ -1,39 +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://jms"

-           xmlns:itest="http://jms"

-           name="DefinitionsTests">

-

-    <component name="OneWayClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayClientImpl"/>

-        <reference name="serviceA">

-           <binding.jms requestConnection="itest:TestService" />

-        </reference>

-    </component>

-

-    <component name="OneWayService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

-        <service name="OneWayService">

-            <binding.jms requestConnection="itest:TestService" />

-        </service> 

-    </component>       

-

-</composite>

diff --git a/java/sca-contrib/itest/jms-definitions/src/main/resources/jndi.properties b/java/sca-contrib/itest/jms-definitions/src/main/resources/jndi.properties
deleted file mode 100644
index f7555e0beb..0000000000
--- a/java/sca-contrib/itest/jms-definitions/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,38 +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.

-## ---------------------------------------------------------------------------

-

-# START SNIPPET: jndi

-

-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory

-

-# use the following property to configure the default connector

-java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx=false

-

-# use the following property to specify the JNDI name the connection factory

-# should appear as. 

-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry

-connectionFactoryNames = MyConnectionFactory

-

-# register some queues in JNDI using the form

-# queue.[jndiName] = [physicalName]

-queue.MyServiceQueue= MyServiceQueue

-

-# register some topics in JNDI using the form

-# topic.[jndiName] = [physicalName]

-#topic.MyTopic = example.MyTopic

-

-# END SNIPPET: jndi

diff --git a/java/sca-contrib/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/java/sca-contrib/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
deleted file mode 100644
index 9de3bff7c3..0000000000
--- a/java/sca-contrib/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
+++ /dev/null
@@ -1,61 +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.binding.jms;

-

-import static org.junit.Assert.assertEquals;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- */

-public class DefinitionsTestCase {

-

-    private static SCADomain scaDomain;

-

-    @Before

-    public void init() {

-        scaDomain = SCADomain.newInstance("http://localhost", "/", "definitions/definitions.composite");

-    }

-

-    @Test

-    public void testSayHello() throws Exception {

-        OneWayService client = scaDomain.getService(OneWayService.class, "OneWayClient");

-

-        client.sayHello("petra");

-

-        // wait for up to 5 seconds but should wake up as soon as done

-        synchronized(OneWayServiceImpl.lock) {

-            if (OneWayServiceImpl.name == null) {

-                OneWayServiceImpl.lock.wait(5000);

-            }

-        }

-

-        assertEquals("petra", OneWayServiceImpl.name);

-    }

-

-    @After

-    public void end() {

-        if (scaDomain != null) {

-            scaDomain.close();

-        }

-    }

-}

diff --git a/java/sca-contrib/itest/jms-format/pom.xml b/java/sca-contrib/itest/jms-format/pom.xml
deleted file mode 100644
index d9168ee4e6..0000000000
--- a/java/sca-contrib/itest/jms-format/pom.xml
+++ /dev/null
@@ -1,97 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-jms-format</artifactId>
-    <name>Apache Tuscany SCA JMS Message Format Tests</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>4.1.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-           <groupId>org.apache.geronimo.specs</groupId>
-           <artifactId>geronimo-jms_1.1_spec</artifactId>
-           <version>1.1</version>
-           <scope>provided</scope>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.apache.geronimo.specs</groupId>
-                   <artifactId>geronimo-jms_1.1_spec</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>         
-                
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
deleted file mode 100644
index 646cecc2b7..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.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 org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
-    public String getGreetings(String message);
-    
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
deleted file mode 100644
index 25a7e36fce..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ /dev/null
@@ -1,35 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-    
-    @Reference
-    protected HelloWorldService helloWorldService1;
-    
-    public String getGreetings(String name){     
-        byte[] bytesValue = helloWorldService1.getByteArrayGreetings(name.getBytes());
-        String stringValue = new String(bytesValue);  
-        return stringValue; 
-    }    
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
deleted file mode 100644
index f5596df894..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,33 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public byte[] getByteArrayGreetings(byte[] msg);
-    
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index f0b7819c3b..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,33 +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.binding.jms.format.jmsbytes.helloworld;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-    
-    public byte[] getByteArrayGreetings(byte[] msg){
-         
-        String name = new String(msg);
-        name =  "Hello " + name;
-        
-        return name.getBytes();
-    }
-
-
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java
deleted file mode 100644
index 735725e9c2..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java
+++ /dev/null
@@ -1,33 +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.binding.jms.format.jmsdelimited.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
-    public String getGreetings(String firstName, 
-                               String lastName);
-    
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java
deleted file mode 100644
index c2c991f857..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java
+++ /dev/null
@@ -1,42 +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.binding.jms.format.jmsdelimited.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-    
-    @Reference
-    protected HelloWorldService helloWorldService1;
-    
-    public String getGreetings(String firstName, 
-                               String lastName){
-        helloWorldService1.setGreetings(firstName, lastName);
-        
-        try {
-            Thread.sleep(2000);
-        } catch (Exception ex) {
-            // do nothing
-        }
-        
-        return HelloWorldServiceImpl.getGreetings(); 
-    }    
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java
deleted file mode 100644
index 2fb1c49685..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,35 +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.binding.jms.format.jmsdelimited.helloworld;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    @OneWay
-    public void setGreetings(String firstName, 
-                            String lastName);
-    
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldServiceImpl.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index 72ae0a330e..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldServiceImpl.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 org.apache.tuscany.sca.binding.jms.format.jmsdelimited.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-    
-    private static String greetings = "not set";
-    
-    public void setGreetings(String firstName, 
-                            String lastName){
-         
-        greetings =  "Hello " + firstName + " " + lastName;
-    }
-    
-    public static String getGreetings(){
-        return greetings;
-    }
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
deleted file mode 100644
index e67f2ba8fa..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.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 org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
-    public String getGreetings(String message);
-    
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
deleted file mode 100644
index 21b4d0461e..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ /dev/null
@@ -1,41 +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.binding.jms.format.jmsmessage.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-    
-    @Reference
-    protected HelloWorldServiceReferenceSide helloWorldService1;
-    
-    public String getGreetings(String name){
-        helloWorldService1.getGreetings(name);
-        
-        try {
-            Thread.sleep(2000);
-        } catch (Exception ex) {
-            // do nothing
-        }
-        
-        return HelloWorldServiceImpl.getGreetings(); 
-    }    
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
deleted file mode 100644
index 43e623f192..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,34 +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.binding.jms.format.jmsmessage.helloworld;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    @OneWay
-    public void onMessage(javax.jms.Message message);
-    
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index 2956df755b..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,51 +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.binding.jms.format.jmsmessage.helloworld;
-
-import javax.jms.TextMessage;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-    
-    private static String greetings = "not set";
-    
-    public void onMessage(javax.jms.Message message){
-         
-        String name = null;
-        
-        try {
-            name = ((TextMessage)message).getText();
-        } catch (Exception ex) {
-            name = "EXCEPTION";
-        }
-        greetings =  "Hello " + name;
-    }
-    
-    public static String getGreetings(){
-        return greetings;
-    }
-    
-    // javax.jms.BytesMessage
-    // javax.jms.MapMessage
-    // javax.jms.ObjectMessage
-    // javax.jms.StreamMessage
-    // javax.jms.TextMessage
-    
-
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
deleted file mode 100644
index feee945ccd..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.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.binding.jms.format.jmsmessage.helloworld;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldServiceReferenceSide {
-
-    @OneWay
-    @SOAPBinding(parameterStyle=SOAPBinding.ParameterStyle.BARE)
-    public void getGreetings(String message);
-    
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
deleted file mode 100644
index d266735183..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This test uses an SCA composite to fake a scenario where the reference is and SCA reference but the 
-service is a non-SCA JMS endpoint. This gives us the opportunity to play about with the interface
-configuration at the reference to see how the contents of the JMS message can be controlled. 
\ No newline at end of file
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
deleted file mode 100644
index 3444789d01..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ /dev/null
@@ -1,47 +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.binding.jms.format.jmstextxml.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldService {
-    
-    @Reference
-    protected HelloWorldService helloWorldService1;
-    
-    @Reference
-    protected HelloWorldService helloWorldService2;
-    
-    @Reference
-    protected HelloWorldService helloWorldService3;
-
-    public String getGreetings(String name){
-        return helloWorldService1.getGreetings(name) + " " +
-               helloWorldService2.getGreetings(name) + " " +
-               helloWorldService3.getGreetings(name);
-    }
-    
-    public String getPersonGreetings(Person person){
-        return helloWorldService1.getPersonGreetings(person) + " " + 
-               helloWorldService2.getPersonGreetings(person) + " " +
-               helloWorldService3.getPersonGreetings(person);
-    }
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
deleted file mode 100644
index f42a1e2de1..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,33 +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.binding.jms.format.jmstextxml.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-    
-    public String getPersonGreetings(Person person);
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index e1706dbe6b..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,35 +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.binding.jms.format.jmstextxml.helloworld;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
-    public String getGreetings(String name){
-        String response =  "Hello " + name;
-        System.out.println("getGreetings: " + response);
-        return response;
-    }
-    
-    public String getPersonGreetings(Person person){
-        String response =  "Hello " + person.getFirstName() + " " + person.getLastName();
-        System.out.println("getPersonGreetings: " + response);
-        return response;
-    }
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
deleted file mode 100644
index a58cb87714..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.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 org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-public class Person {
-  String firstName;
-  String lastName;
-  
-  public String getFirstName() {
-    return firstName;
-  }
-  public void setFirstName(String firstName) {
-    this.firstName = firstName;
-  }
-  
-  public String getLastName() {
-    return lastName;
-  }
-  
-  public void setLastName(String lastName) {
-    this.lastName = lastName;
-  }
-
-}
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite b/java/sca-contrib/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
deleted file mode 100644
index ef66c5583c..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
+++ /dev/null
@@ -1,45 +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://helloworld"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-	xmlns:hw="http://helloworld"
-    name="helloworld">
-
-    <component name="HelloWorldReferenceComponent">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReferenceImpl" />
-        <reference name="helloWorldService1" >
-           <binding.jms>
-                <destination name="HelloWorldService1"/>
-                <t:wireFormat.jmsBytes/>
-            </binding.jms>
-        </reference>  
-    </component>
-    
-    <component name="HelloWorldServiceComponent1">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldServiceImpl" />
-        <service name="HelloWorldService">
-            <binding.jms>
-                <destination name="HelloWorldService1"/>
-                <t:wireFormat.jmsBytes/>
-            </binding.jms>
-        </service>
-    </component> 
-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.composite b/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.composite
deleted file mode 100644
index f487996324..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.composite
+++ /dev/null
@@ -1,44 +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://helloworld"
-	xmlns:hw="http://helloworld"
-    name="helloworld">
-
-    <component name="HelloWorldReferenceComponent">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldReferenceImpl" />
-        <reference name="helloWorldService1" >
-            <!--interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"/-->
-            <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldServiceReferenceSide"/>
-            <binding.jms>
-                <destination name="HelloWorldService1"/>
-            </binding.jms>
-        </reference>  
-    </component>
-    
-    <component name="HelloWorldServiceComponent1">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldServiceImpl" />
-        <service name="HelloWorldService">
-            <binding.jms>
-                <destination name="HelloWorldService1"/>
-            </binding.jms>
-        </service>
-    </component> 
-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.wsdl b/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.wsdl
deleted file mode 100644
index 092c56b31d..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.wsdl
+++ /dev/null
@@ -1,129 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <xsd:complexType name="PersonType">
-                <xsd:sequence>
-                    <xsd:element name="firstName" type="xsd:string"/>
-                    <xsd:element name="lastName" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-            
-            <element name="getPersonGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="person" type="PersonType"/>
-                    </sequence>
-                </complexType>
-            </element> 
-            
-            <element name="getPersonGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getPersonGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <!-- wsdl:part element="tns:getGreetings" name="parameters"/-->
-        <wsdl:part type="xsd:string" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <!-- wsdl:part element="tns:getGreetingsResponse" name="parameters"/-->
-        <wsdl:part type="xsd:string" name="parameters"/>
-    </wsdl:message>
-    
-    <!-- wsdl:message name="getPersonGreetingsRequest">
-        <wsdl:part element="tns:getPersonGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getPersonGreetingsResponse">
-        <wsdl:part element="tns:getPersonGreetingsResponse" name="parameters"/>
-    </wsdl:message-->    
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-        <!-- wsdl:operation name="getPersonGreetings">
-            <wsdl:input message="tns:getPersonGreetingsRequest" name="getPersonGreetingsRequest"/>
-            <wsdl:output message="tns:getPersonGreetingsResponse" name="getPersonGreetingsResponse"/>
-        </wsdl:operation-->        
-    </wsdl:portType>
-
-    <!-- wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding-->
-
-    <!-- wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/jms"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding-->
-
-    <!-- wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
-        </wsdl:port>
-    </wsdl:service-->
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite b/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
deleted file mode 100644
index f487996324..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
+++ /dev/null
@@ -1,44 +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://helloworld"
-	xmlns:hw="http://helloworld"
-    name="helloworld">
-
-    <component name="HelloWorldReferenceComponent">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldReferenceImpl" />
-        <reference name="helloWorldService1" >
-            <!--interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"/-->
-            <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldServiceReferenceSide"/>
-            <binding.jms>
-                <destination name="HelloWorldService1"/>
-            </binding.jms>
-        </reference>  
-    </component>
-    
-    <component name="HelloWorldServiceComponent1">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldServiceImpl" />
-        <service name="HelloWorldService">
-            <binding.jms>
-                <destination name="HelloWorldService1"/>
-            </binding.jms>
-        </service>
-    </component> 
-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl b/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
deleted file mode 100644
index 092c56b31d..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
+++ /dev/null
@@ -1,129 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <xsd:complexType name="PersonType">
-                <xsd:sequence>
-                    <xsd:element name="firstName" type="xsd:string"/>
-                    <xsd:element name="lastName" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-            
-            <element name="getPersonGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="person" type="PersonType"/>
-                    </sequence>
-                </complexType>
-            </element> 
-            
-            <element name="getPersonGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getPersonGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <!-- wsdl:part element="tns:getGreetings" name="parameters"/-->
-        <wsdl:part type="xsd:string" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <!-- wsdl:part element="tns:getGreetingsResponse" name="parameters"/-->
-        <wsdl:part type="xsd:string" name="parameters"/>
-    </wsdl:message>
-    
-    <!-- wsdl:message name="getPersonGreetingsRequest">
-        <wsdl:part element="tns:getPersonGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getPersonGreetingsResponse">
-        <wsdl:part element="tns:getPersonGreetingsResponse" name="parameters"/>
-    </wsdl:message-->    
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-        <!-- wsdl:operation name="getPersonGreetings">
-            <wsdl:input message="tns:getPersonGreetingsRequest" name="getPersonGreetingsRequest"/>
-            <wsdl:output message="tns:getPersonGreetingsResponse" name="getPersonGreetingsResponse"/>
-        </wsdl:operation-->        
-    </wsdl:portType>
-
-    <!-- wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding-->
-
-    <!-- wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/jms"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding-->
-
-    <!-- wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
-        </wsdl:port>
-    </wsdl:service-->
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite b/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
deleted file mode 100644
index 07507e0ebe..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
+++ /dev/null
@@ -1,76 +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://helloworld"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	xmlns:hw="http://helloworld"
-    name="helloworld">
-
-    <component name="HelloWorldReferenceComponent">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldReferenceImpl" />
-        <reference name="helloWorldService1" >
-            <binding.jms>
-                <destination name="HelloWorldService1"/>
-                <tuscany:wireFormat.jmsTextXML/>
-            </binding.jms>
-        </reference>  
-        <reference name="helloWorldService2" >
-            <binding.jms>
-                <destination name="HelloWorldService2"/>
-            </binding.jms>
-        </reference>
-        <reference name="helloWorldService3" >
-            <binding.jms>
-                <destination name="HelloWorldService3"/>
-            </binding.jms>
-        </reference>      
-    </component>
-    
-    <component name="HelloWorldServiceComponent1">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl" />
-        <service name="HelloWorldService">
-            <binding.jms>
-                <destination name="HelloWorldService1"/>
-                <tuscany:wireFormat.jmsTextXML/>
-            </binding.jms>
-        </service>
-    </component> 
-    
-    <component name="HelloWorldServiceComponent2">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl" />
-        <service name="HelloWorldService">
-            <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldService" />
-            <binding.jms>
-                <destination name="HelloWorldService2"/>
-            </binding.jms>
-        </service>
-    </component>    
-        
-    <component name="HelloWorldServiceComponent3">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl" />
-	    <service name="HelloWorldService">
-	        <interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" />
-            <binding.jms>
-                <destination name="HelloWorldService3"/>
-            </binding.jms>
-	    </service>
-    </component>
-    
-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl b/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
deleted file mode 100644
index 30372cc02f..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
+++ /dev/null
@@ -1,139 +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://helloworld/textxml" xmlns:tns="http://helloworld/textxml" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld/textxml" xmlns="http://www.w3.org/2001/XMLSchema">
-           
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld/textxml" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <xsd:complexType name="PersonType">
-                <xsd:sequence>
-                    <xsd:element name="firstName" type="xsd:string"/>
-                    <xsd:element name="lastName" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-            
-            <element name="getPersonGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="person" type="PersonType"/>
-                    </sequence>
-                </complexType>
-            </element> 
-            
-            <element name="getPersonGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getPersonGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-        
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-    
-    <wsdl:message name="getPersonGreetingsRequest">
-        <wsdl:part element="tns:getPersonGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getPersonGreetingsResponse">
-        <wsdl:part element="tns:getPersonGreetingsResponse" name="parameters"/>
-    </wsdl:message>    
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-        <wsdl:operation name="getPersonGreetings">
-            <wsdl:input message="tns:getPersonGreetingsRequest" name="getPersonGreetingsRequest"/>
-            <wsdl:output message="tns:getPersonGreetingsResponse" name="getPersonGreetingsResponse"/>
-        </wsdl:operation>        
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getPersonGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getPersonGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getPersonGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>        
-    </wsdl:binding>
-
-    <!-- wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding-->
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/messages.xml b/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/messages.xml
deleted file mode 100644
index 3cd1238c79..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/messages.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-<getGreetings>
-  <name>Fred Bloggs</name>
-</getGreetings>
-
-<getGreetingsResponse>
-  <getGreetingsReturn>Hello Fred Bloggs</getGreetingsReturn>
-</getGreetingsReponse>
-
-
-<getPersonGreetings>
-  <firstName>Fred</firstName>
-  <lastName>Bloggs</lastName>
-</getPersonGreetings>
-
-<getPersonGreetingsResponse>
-  <getPersonGreetingsReturn>Hello Fred Bloggs</getPersonGreetingsReturn>
-</getPeronGreetingsReponse>
-
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jndi.properties b/java/sca-contrib/itest/jms-format/src/main/resources/jndi.properties
deleted file mode 100644
index 9abdff215d..0000000000
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as. 
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
deleted file mode 100644
index 3d40d4fa85..0000000000
--- a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
+++ /dev/null
@@ -1,64 +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.binding.jms.format;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class FormatJMSBytesTestCase {
-
-    private static SCANode node;
-
-    @Before
-    public void init() {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANode("jmsbytes/helloworld.composite", 
-                                     new SCAContribution("test", "./target/classes"));
-
-        node.start();
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
-        
-        System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
-        //assertEquals("Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
-        
-    }
-
-    @After
-    public void end() {
-        if (node != null) {
-            node.stop();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDelimitedTestCase.java b/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDelimitedTestCase.java
deleted file mode 100644
index 90b74146e5..0000000000
--- a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDelimitedTestCase.java
+++ /dev/null
@@ -1,66 +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.binding.jms.format;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.binding.jms.format.jmsdelimited.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class FormatJMSDelimitedTestCase {
-
-    private static SCANode node;
-
-    @Before
-    public void init() {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANode("jmsdelimited/helloworld.composite", 
-                                     new SCAContribution("test", "./target/classes"));
-
-        node.start();
-    }
-
-    @Test
-    @Ignore
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
-        
-        System.out.println(helloWorldService.getGreetings("Fred", "Bloggs"));
-        //assertEquals("Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
-        
-    }
-
-    @After
-    public void end() {
-        if (node != null) {
-            node.stop();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
deleted file mode 100644
index 18955df933..0000000000
--- a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
+++ /dev/null
@@ -1,64 +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.binding.jms.format;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class FormatJMSMessageTestCase {
-
-    private static SCANode node;
-
-    @Before
-    public void init() {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANode("jmsmessage/helloworld.composite", 
-                                     new SCAContribution("test", "./target/classes"));
-
-        node.start();
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
-        
-        System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
-        //assertEquals("Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
-        
-    }
-
-    @After
-    public void end() {
-        if (node != null) {
-            node.stop();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
deleted file mode 100644
index 944e8e5905..0000000000
--- a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.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 org.apache.tuscany.sca.binding.jms.format;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldService;
-import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.Person;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class FormatJMSTextXMLTestCase {
-
-    private static SCANode node;
-
-    @Before
-    public void init() {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANode("jmstextxml/helloworld.composite", 
-                                     new SCAContribution("test", "./target/classes"));
-
-        node.start();
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldReferenceComponent");
-        
-        assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
-        
-        Person person = new Person();
-        person.setFirstName("Fred");
-        person.setLastName("Bloggs");
-        assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getPersonGreetings(person));
-    }
-
-    @After
-    public void end() {
-        if (node != null) {
-            node.stop();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/jms-selectors/pom.xml b/java/sca-contrib/itest/jms-selectors/pom.xml
deleted file mode 100644
index 5c0a61bf3e..0000000000
--- a/java/sca-contrib/itest/jms-selectors/pom.xml
+++ /dev/null
@@ -1,93 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-jms-selectors</artifactId>

-    <name>Apache Tuscany SCA JMS Tests for selectors</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <!--  uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using

-              a temporary queue name -->

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-core</artifactId>

-            <version>5.1.0</version>

-        </dependency>

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
deleted file mode 100644
index b589d5e8bc..0000000000
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ /dev/null
@@ -1,41 +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.binding.jms;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the OneWay service.

- */

-@Service(SelectorService.class)

-public class ClientImpl implements SelectorService {

-

-    private SelectorService serviceA;

-

-    @Reference

-    public void setServiceA(SelectorService service) {

-        this.serviceA = service;

-    }

-

-    public void sayHello(String name) {

-        serviceA.sayHello(name);

-    }

-

-}

diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
deleted file mode 100644
index 1aff0d454e..0000000000
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
+++ /dev/null
@@ -1,29 +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.binding.jms;

-

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface SelectorService {

-    

-    @OneWay

-    void sayHello(String name);

-}

diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
deleted file mode 100644
index fb53c877e6..0000000000
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
+++ /dev/null
@@ -1,40 +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.binding.jms;

-

-import java.util.ArrayList;

-import java.util.List;

-

-public class SelectorServiceImpl1 implements SelectorService {

-

-    public static Object lock = new Object();

-    public static List<String> names = new ArrayList<String>();

-    

-    public void sayHello(String name) {

-        System.out.println("SelectorServiceImpl1 " + name);

-        SelectorServiceImpl1.names.add(name);

-        if (names.size() == 2) {

-            synchronized (SelectorServiceImpl1.lock) {

-                SelectorServiceImpl1.lock.notify();

-            }

-        }

-    }

-

-}

diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
deleted file mode 100644
index 1bbaf5d6f4..0000000000
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
+++ /dev/null
@@ -1,38 +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.binding.jms;

-

-public class SelectorServiceImpl2 implements SelectorService {

-

-    public static Object lock = new Object();

-    public static String name;

-    

-    public void sayHello(String name) {

-        if (SelectorServiceImpl2.name != null) {

-            throw new IllegalStateException("name already set");

-        }

-        System.out.println("SelectorServiceImpl2 " + name);

-        SelectorServiceImpl2.name = name;

-        synchronized (SelectorServiceImpl2.lock) {

-            SelectorServiceImpl2.lock.notify();

-        }

-    }

-

-}

diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
deleted file mode 100644
index 4bdc4edcb5..0000000000
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
+++ /dev/null
@@ -1,38 +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.binding.jms;

-

-public class SelectorServiceImpl3 implements SelectorService {

-

-    public static Object lock = new Object();

-    public static String name;

-    

-    public void sayHello(String name) {

-        if (SelectorServiceImpl3.name != null) {

-            throw new IllegalStateException("name already set");

-        }

-        System.out.println("SelectorServiceImpl3 " + name);

-        SelectorServiceImpl3.name = name;

-        synchronized (SelectorServiceImpl3.lock) {

-            SelectorServiceImpl3.lock.notify();

-        }

-    }

-

-}

diff --git a/java/sca-contrib/itest/jms-selectors/src/main/resources/jndi.properties b/java/sca-contrib/itest/jms-selectors/src/main/resources/jndi.properties
deleted file mode 100644
index bb431a592b..0000000000
--- a/java/sca-contrib/itest/jms-selectors/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,38 +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.

-## ---------------------------------------------------------------------------

-

-# START SNIPPET: jndi

-

-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory

-

-# use the following property to configure the default connector

-java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx=false

-

-# use the following property to specify the JNDI name the connection factory

-# should appear as. 

-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry

-connectionFactoryNames = ConnectionFactory, ConnectionFactory2

-

-# register some queues in JNDI using the form

-# queue.[jndiName] = [physicalName]

-

-# register some topics in JNDI using the form

-# topic.[jndiName] = [physicalName]

-#topic.MyTopic = example.MyTopic

-topic.ServiceTopic = ServiceTopic

-

-# END SNIPPET: jndi

diff --git a/java/sca-contrib/itest/jms-selectors/src/main/resources/selectors/selectors.composite b/java/sca-contrib/itest/jms-selectors/src/main/resources/selectors/selectors.composite
deleted file mode 100644
index 83fb50531b..0000000000
--- a/java/sca-contrib/itest/jms-selectors/src/main/resources/selectors/selectors.composite
+++ /dev/null
@@ -1,68 +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://jms"

-           xmlns:itest="http://jms"

-           name="DefinitionsTests">

-

-    <component name="Client1">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>

-        <reference name="serviceA">

-           <binding.jms uri="jms:ServiceTopic" >

-              <headers JMSType="type1" />

-           </binding.jms>

-        </reference>

-    </component>

-

-    <component name="Client2">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>

-        <reference name="serviceA">

-           <binding.jms uri="jms:ServiceTopic" >

-              <headers JMSType="type2" />

-           </binding.jms>

-        </reference>

-    </component>

-

-    <component name="Service1">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.SelectorServiceImpl1"/>

-        <service name="SelectorService">

-            <binding.jms uri="jms:ServiceTopic" />

-        </service> 

-    </component>       

-

-    <component name="Service2">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.SelectorServiceImpl2"/>

-        <service name="SelectorService">

-            <binding.jms uri="jms:ServiceTopic" >

-               <SubscriptionHeaders JMSSelector="JMSType = 'type1'"/>

-            </binding.jms>

-        </service> 

-    </component>       

-

-    <component name="Service3">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.SelectorServiceImpl3"/>

-        <service name="SelectorService">

-            <binding.jms uri="jms:ServiceTopic" >

-               <SubscriptionHeaders JMSSelector="JMSType = 'type2'"/>

-            </binding.jms>

-        </service> 

-    </component>       

-

-</composite>

diff --git a/java/sca-contrib/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/java/sca-contrib/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
deleted file mode 100644
index ea548c22e6..0000000000
--- a/java/sca-contrib/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.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.binding.jms;

-

-import static org.junit.Assert.assertEquals;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- */

-public class SelectorsTestCase {

-

-    private static SCADomain scaDomain;

-

-    @Before

-    public void init() {

-        scaDomain = SCADomain.newInstance("http://localhost", "/", "selectors/selectors.composite");

-    }

-

-    @Test

-    public void testSayHello() throws Exception {

-        SelectorService client1 = scaDomain.getService(SelectorService.class, "Client1");

-        SelectorService client2 = scaDomain.getService(SelectorService.class, "Client2");

-

-        client1.sayHello("petra");

-        client2.sayHello("beate");

-

-        // wait for up to 5 seconds but should wake up as soon as done

-        synchronized(SelectorServiceImpl2.lock) {

-            if (SelectorServiceImpl2.name == null) {

-                SelectorServiceImpl2.lock.wait(5000);

-            }

-        }

-        synchronized(SelectorServiceImpl3.lock) {

-            if (SelectorServiceImpl3.name == null) {

-                SelectorServiceImpl3.lock.wait(5000);

-            }

-        }

-        synchronized(SelectorServiceImpl1.lock) {

-            if (SelectorServiceImpl1.names.size() != 2) {

-                SelectorServiceImpl1.lock.wait(5000);

-            }

-        }

-

-        assertEquals("petra", SelectorServiceImpl2.name);

-        assertEquals("beate", SelectorServiceImpl3.name);

-        assertEquals(2, SelectorServiceImpl1.names.size());

-    }

-

-    @After

-    public void end() {

-        if (scaDomain != null) {

-            scaDomain.close();

-        }

-    }

-}

diff --git a/java/sca-contrib/itest/jms/pom.xml b/java/sca-contrib/itest/jms/pom.xml
deleted file mode 100644
index 49081dc48f..0000000000
--- a/java/sca-contrib/itest/jms/pom.xml
+++ /dev/null
@@ -1,97 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-jms</artifactId>
-    <name>Apache Tuscany SCA JMS Tests</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>4.1.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-           <groupId>org.apache.geronimo.specs</groupId>
-           <artifactId>geronimo-jms_1.1_spec</artifactId>
-           <version>1.1</version>
-           <scope>provided</scope>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.apache.geronimo.specs</groupId>
-                   <artifactId>geronimo-jms_1.1_spec</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>         
-                
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
deleted file mode 100644
index 7b1c63d437..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ /dev/null
@@ -1,28 +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.binding.jms;
-
-public class CheckedExcpetion extends Exception {
-    private static final long serialVersionUID = 1L;
-
-    public CheckedExcpetion(String s) {
-        super(s);
-    }
-}
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
deleted file mode 100644
index 0643fc8376..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ /dev/null
@@ -1,30 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface ExceptionService {
-
-    public void throwChecked() throws CheckedExcpetion;
-
-    public void throwUnChecked();
-}
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
deleted file mode 100644
index 2c9e822ac1..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.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.    
- */
-package org.apache.tuscany.sca.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(ExceptionService.class)
-public class ExceptionServiceClient implements ExceptionService {
-
-    private ExceptionService service;
-
-    @Reference
-    public void setService(ExceptionService service) {
-        this.service = service;
-    }
-
-    public void throwChecked() throws CheckedExcpetion {
-        service.throwChecked();
-    }
-
-    public void throwUnChecked() {
-        service.throwUnChecked();
-    }
-
-}
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
deleted file mode 100644
index ab293a5df1..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.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 org.apache.tuscany.sca.binding.jms;
-
-public class ExceptionServiceImpl implements ExceptionService {
-
-    public void throwChecked() throws CheckedExcpetion {
-        throw new CheckedExcpetion("foo");
-    }
-
-    public void throwUnChecked() {
-        throw new RuntimeException("bla");
-    }
-
-}
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
deleted file mode 100644
index 65a4b32694..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ /dev/null
@@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldClientImpl implements HelloWorldService {
-
-    private HelloWorldService serviceA;
-
-    @Reference
-    public void setServiceA(HelloWorldService service) {
-        this.serviceA = service;
-    }
-
-    public String sayHello(String name) {
-        return serviceA.sayHello(name);
-    }
-
-}
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
deleted file mode 100644
index 33298eb555..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ /dev/null
@@ -1,26 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldService {
-    String sayHello(String name);
-}
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
deleted file mode 100644
index 21d2de2cf0..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,30 +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.binding.jms;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
-    public String sayHello(String name) {
-        if ("bang".equals(name)) {
-            throw new RuntimeException("blem wit");
-        }
-        return "jmsHello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
deleted file mode 100644
index d4cd5df431..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ /dev/null
@@ -1,28 +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.binding.jms;

-

-

-/**

- * The client interface

- */

-public interface JMSClient {

-

-    void aClientMethod();

-}

diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
deleted file mode 100644
index 464072b42d..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ /dev/null
@@ -1,29 +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.binding.jms;

-

-

-/**

- * The client interface

- */

-public interface MsgClient {

-

-    void aClientMethod();

-    void op2();

-}

diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
deleted file mode 100644
index 4140fa0b89..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ /dev/null
@@ -1,38 +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.binding.jms;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(MsgClient.class)

-public class MsgClientImpl implements MsgClient {

-

-    @Reference protected MsgClientService myService;

-

-    public void aClientMethod() {

-        myService.aClientMethod();

-    }

-

-    public void op2() {

-        myService.op2();

-    }

-

-}

diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
deleted file mode 100644
index 2be4f2ad3e..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ /dev/null
@@ -1,33 +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.binding.jms;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-

-/**

- * The client interface

- */

-@Remotable

-public interface MsgClientService {

-

-    void aClientMethod();

-

-    void op2();

-}

diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
deleted file mode 100644
index d5684ca56c..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.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 org.apache.tuscany.sca.binding.jms;

-

-import org.oasisopen.sca.annotation.AllowsPassByReference;

-import org.oasisopen.sca.annotation.Remotable;

-

-

-@Remotable 

-@AllowsPassByReference

-public interface MsgService {

-    

-    void onMessage(javax.jms.Message msg);

-

-}

diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
deleted file mode 100644
index e18de0456c..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ /dev/null
@@ -1,39 +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.binding.jms;

-

-import javax.jms.Message;

-

-import org.oasisopen.sca.annotation.Service;

-

-@Service(MsgService.class)

-public class MsgServiceImpl implements MsgService {

-

-    public static Object lock = new Object();

-    public static Message msg;

-    

-    public void onMessage(Message msg) {

-        MsgServiceImpl.msg = msg;

-        synchronized(lock) {

-            lock.notifyAll();

-        }

-    }

-

-}

diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
deleted file mode 100644
index 6ec88aac6c..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ /dev/null
@@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the OneWay service.
- */
-@Service(OneWayService.class)
-public class OneWayClientImpl implements OneWayService {
-
-    private OneWayService serviceA;
-
-    @Reference
-    public void setServiceA(OneWayService service) {
-        this.serviceA = service;
-    }
-
-    public void sayHello(String name) {
-        serviceA.sayHello(name);
-    }
-
-}
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
deleted file mode 100644
index fc155d0324..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ /dev/null
@@ -1,29 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface OneWayObjectService {
-
-    @OneWay
-    void sayHello(Object name);
-}
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
deleted file mode 100644
index 25a89fc5b4..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ /dev/null
@@ -1,34 +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.binding.jms;
-
-public class OneWayObjectServiceImpl implements OneWayObjectService {
-
-    public static Object mutex = new Object();
-    public static Object name;
-
-    public void sayHello(Object name) {
-        OneWayObjectServiceImpl.name = name;
-        synchronized (OneWayObjectServiceImpl.mutex) {
-            OneWayObjectServiceImpl.mutex.notify();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
deleted file mode 100644
index 8fd6cc94bf..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ /dev/null
@@ -1,29 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface OneWayService {
-    
-    @OneWay
-    void sayHello(String name);
-}
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
deleted file mode 100644
index bff4536fa0..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ /dev/null
@@ -1,34 +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.binding.jms;
-
-public class OneWayServiceImpl implements OneWayService {
-
-    public static Object mutex = new Object();
-    public static String name;
-    
-    public void sayHello(String name) {
-        OneWayServiceImpl.name = name;
-        synchronized (OneWayServiceImpl.mutex) {
-            OneWayServiceImpl.mutex.notify();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
deleted file mode 100644
index 80368a0fb6..0000000000
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
+++ /dev/null
@@ -1,57 +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.binding.jms;
-
-import javax.jms.Message;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingImpl;
-import org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor;
-
-public class TestMessageProcessor extends XMLTextMessageProcessor {
-
-    public static boolean insertPayloadIntoJMSMessageCalled;
-    public static boolean extractPayloadFromJMSMessageCalled;
-    public static boolean setOperationNameCalled;
-    
-    public TestMessageProcessor(JMSBindingImpl jmsBinding) {
-        super(jmsBinding);
-    }
-    public Object extractPayloadFromJMSMessage(Message message) {
-        extractPayloadFromJMSMessageCalled = true;
-        return super.extractPayloadFromJMSMessage(message);
-    }
-
-    public String getOperationName(Message message) {
-        // is this used?
-        return super.getOperationName(message);
-    }
-
-    public Message insertPayloadIntoJMSMessage(Session session, Object payload) {
-        insertPayloadIntoJMSMessageCalled = true;
-        return super.insertPayloadIntoJMSMessage(session, payload);
-    }
-
-    public void setOperationName(String operationName, Message message) {
-        setOperationNameCalled = true;
-        super.setOperationName(operationName, message);
-    }
-
-}
diff --git a/java/sca-contrib/itest/jms/src/main/resources/defaults/client.composite b/java/sca-contrib/itest/jms/src/main/resources/defaults/client.composite
deleted file mode 100644
index 991b0cf11b..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/defaults/client.composite
+++ /dev/null
@@ -1,33 +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"

-           name="DefaultClientComposite">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

-        <binding.jms uri="jms:HelloWorldService" />

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/defaults/service.composite b/java/sca-contrib/itest/jms/src/main/resources/defaults/service.composite
deleted file mode 100644
index 3f299bc787..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/defaults/service.composite
+++ /dev/null
@@ -1,30 +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"

-           name="DefaultServiceComposite">

-

-    <component name="HelloWorldService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

-        <service name="HelloWorldService">

-            <binding.jms />

-        </service> 

-    </component>       

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/dynamic/client.composite b/java/sca-contrib/itest/jms/src/main/resources/dynamic/client.composite
deleted file mode 100644
index afa4135f1d..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/dynamic/client.composite
+++ /dev/null
@@ -1,36 +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"

-           name="DynamicComposite">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

-        <binding.jms>

-            <destination name="DestQueueA"/>

-            <!-- No response destination defined means a temporary queue will be used -->

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/exceptions/client.composite b/java/sca-contrib/itest/jms/src/main/resources/exceptions/client.composite
deleted file mode 100644
index 8bb7f86252..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/exceptions/client.composite
+++ /dev/null
@@ -1,33 +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"

-           name="ExceptionClientComposite">

-

-    <component name="ExceptionServiceClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceClient"/>

-        <reference name="service" />

-    </component>

-

-    <reference name="service" promote="ExceptionServiceClient/service">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.ExceptionService" />

-        <binding.jms uri="jms:ExceptionService" />

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/exceptions/service.composite b/java/sca-contrib/itest/jms/src/main/resources/exceptions/service.composite
deleted file mode 100644
index 052ff9d985..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/exceptions/service.composite
+++ /dev/null
@@ -1,30 +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"

-           name="ExceptionServiceComposite">

-

-    <component name="ExceptionService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceImpl"/>

-        <service name="ExceptionService">

-            <binding.jms />

-        </service> 

-    </component>       

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/external/client.composite b/java/sca-contrib/itest/jms/src/main/resources/external/client.composite
deleted file mode 100644
index 7a0013be4d..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/external/client.composite
+++ /dev/null
@@ -1,38 +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"

-           name="ExternalClientComposite">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

-        <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">

-            <destination name="DestQueueA"/>

-            <response>

-               <destination name="RespQueueA"/>

-            </response>

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/external/service.composite b/java/sca-contrib/itest/jms/src/main/resources/external/service.composite
deleted file mode 100644
index b9f33e5afc..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/external/service.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"

-           name="ExternalServiceComposite">

-

-    <component name="HelloWorldService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

-        <service name="HelloWorldService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">

-               <destination name="DestQueueA" create="always"/>

-               <response>

-                  <destination name="RespQueueA" create="always"/>

-               </response>

-            </binding.jms>  

-        </service> 

-    </component>       

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/jndi.properties b/java/sca-contrib/itest/jms/src/main/resources/jndi.properties
deleted file mode 100644
index 9abdff215d..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as. 
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/java/sca-contrib/itest/jms/src/main/resources/nonSCAclient/service.composite b/java/sca-contrib/itest/jms/src/main/resources/nonSCAclient/service.composite
deleted file mode 100644
index 1baa4af6b4..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/nonSCAclient/service.composite
+++ /dev/null
@@ -1,50 +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"

-           name="ServiceComposite">

-

-    <component name="DefaultService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

-        <service name="OneWayService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61618"

-                         messageProcessor="XMLTextMessage">

-            </binding.jms>

-        </service>

-    </component>

-

-    <component name="TextService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

-        <service name="OneWayService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61618"

-                         messageProcessor="TextMessage"

-                         uri="jms:TextDest" />

-        </service>

-    </component>

-

-    <component name="ObjectService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayObjectServiceImpl"/>

-        <service name="OneWayObjectService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61618"

-                         messageProcessor="ObjectMessage"

-                         uri="jms:ObjectDest" />

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayClient.composite b/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayClient.composite
deleted file mode 100644
index bed0663f58..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayClient.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"

-           name="OneWayClientComposite">

-

-    <component name="OneWayClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="OneWayClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.OneWayService" />

-        <binding.jms>

-            <destination name="DestQueueA"/>

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayService.composite b/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayService.composite
deleted file mode 100644
index 3d08de7d51..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayService.composite
+++ /dev/null
@@ -1,32 +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"

-           name="OneWayServiceComposite">

-

-    <component name="OneWayService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

-        <service name="OneWayService">

-            <binding.jms>

-               <destination name="DestQueueA" create="always"/>

-            </binding.jms>  

-        </service> 

-    </component>       

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/definitions.xml b/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/definitions.xml
deleted file mode 100644
index dd4350c6fe..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/definitions.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 			 targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- 			 xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <policySet name="JMSPolicySet1"
-               provides="priority"
-               appliesTo="sca:binding.jms">
-        <intentMap provides="priority" default="medium">
-            <qualifier name="high">
-                <tuscany:jmsHeader JMSPriority="9"/>
-            </qualifier>
-            <qualifier name="medium">
-                <tuscany:jmsHeader JMSPriority="4"/>
-            </qualifier>
-            <qualifier name="low">
-                <tuscany:jmsHeader JMSPriority="0"/>
-            </qualifier>
-        </intentMap>
-    </policySet>
-    
-    <policySet name="JMSPolicySet2"
-               provides="deliveryMode"
-               appliesTo="sca:binding.jms">
-        <intentMap provides="deliveryMode" default="nonPersistent">
-            <qualifier name="persistent">
-                <tuscany:jmsHeader JMSDeliveryMode="PERSISTENT"/>
-            </qualifier>
-            <qualifier name="nonPersistent">
-                <tuscany:jmsHeader JMSDeliveryMode="NON_PERSISTENT"/>
-            </qualifier>
-        </intentMap>
-    </policySet>    
-
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite b/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
deleted file mode 100644
index 6fb6330a21..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
+++ /dev/null
@@ -1,46 +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://jms"
-           name="PropertiesClientComposite">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgClientImpl" />
-        <reference name="myService" requires="priority.medium">
-            <binding.jms uri="jms:ServiceQueue">
-               <!-- headers JMSType="myType"
-                        JMSCorrelationID="xyz"
-                        JMSDeliveryMode="PERSISTENT"
-                        JMSTimeToLive="4321"	
-                        JMSPriority="7">
-                  <property name="headP1">myHeadP1</property>    
-               </headers-->
-            </binding.jms>
-        </reference>
-    </component>
-
-    <component name="ServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgServiceImpl" />
-        <service name="MsgService">
-            <binding.jms uri="jms:ServiceQueue"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/jms/src/main/resources/properties/properties.composite b/java/sca-contrib/itest/jms/src/main/resources/properties/properties.composite
deleted file mode 100644
index 43bd611b24..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/properties/properties.composite
+++ /dev/null
@@ -1,55 +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://jms"

-           name="PropertiesClientComposite">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgClientImpl" />

-        <reference name="myService">

-            <binding.jms uri="jms:ServiceQueue">

-               <headers JMSType="myType"

-                        JMSCorrelationID="xyz"

-                        JMSDeliveryMode="PERSISTENT"

-                        JMSTimeToLive="4321"	

-                        JMSPriority="7">

-                  <property name="headP1">myHeadP1</property>    

-               </headers>

-               <operationProperties name="op2" nativeOperation="nativeOp2">

-                  <headers JMSType="op2Type"

-                     JMSCorrelationID="op2CID"

-                     JMSDeliveryMode="NON_PERSISTENT"

-                     JMSTimeToLive="6"

-                     JMSPriority="8">

-                     <property name="op2P2">foo</property>

-                  </headers>

-               </operationProperties>

-            </binding.jms>

-        </reference>

-    </component>

-

-    <component name="ServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgServiceImpl" />

-        <service name="MsgService">

-            <binding.jms uri="jms:ServiceQueue"/>

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/simple/client.composite b/java/sca-contrib/itest/jms/src/main/resources/simple/client.composite
deleted file mode 100644
index 3e16e794cb..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/simple/client.composite
+++ /dev/null
@@ -1,38 +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"

-           name="SimpleClientComposite">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

-        <binding.jms>

-            <destination name="DestQueueA"/>

-            <response>

-               <destination name="RespQueueA"/>

-            </response>

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/simple/mpclient.composite b/java/sca-contrib/itest/jms/src/main/resources/simple/mpclient.composite
deleted file mode 100644
index 69c0ef305e..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/simple/mpclient.composite
+++ /dev/null
@@ -1,38 +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"

-           name="MPClientComposite">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

-        <binding.jms messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">

-            <destination name="DestQueueA"/>

-            <response>

-               <destination name="RespQueueA"/>

-            </response>

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/simple/service.composite b/java/sca-contrib/itest/jms/src/main/resources/simple/service.composite
deleted file mode 100644
index 2ab92923f6..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/simple/service.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"

-           name="SimpleServiceComposite">

-

-    <component name="HelloWorldService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

-        <service name="HelloWorldService">

-            <binding.jms>

-               <destination name="DestQueueA" create="always"/>

-               <response>

-                  <destination name="RespQueueA" create="always"/>

-               </response>

-            </binding.jms>  

-        </service> 

-    </component>       

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/main/resources/simple/uriclient.composite b/java/sca-contrib/itest/jms/src/main/resources/simple/uriclient.composite
deleted file mode 100644
index 83ef9c3c95..0000000000
--- a/java/sca-contrib/itest/jms/src/main/resources/simple/uriclient.composite
+++ /dev/null
@@ -1,33 +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"

-           name="URIClientComposite">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

-        <binding.jms uri="jms:DestQueueA" />

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
deleted file mode 100644
index dca9386637..0000000000
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ /dev/null
@@ -1,54 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class DefaultsTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "defaults/client.composite", "defaults/service.composite");
-        // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
deleted file mode 100644
index f4750e5453..0000000000
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ /dev/null
@@ -1,53 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class DynamicReplyQTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "dynamic/client.composite", "simple/service.composite");
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Beate", helloWorldService.sayHello("Beate"));
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
deleted file mode 100644
index ba3e697e13..0000000000
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ /dev/null
@@ -1,72 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class ExceptionsTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "exceptions/client.composite", "exceptions/service.composite");
-    }
-
-    @Test
-    @Ignore // TUSCANY-2593, currently fails for some jaxws reason?
-    public void testChecked() {
-        ExceptionService service = scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
-        try {
-            service.throwChecked();
-            fail();
-        } catch (CheckedExcpetion e) {
-            assertEquals("foo", e.getMessage());
-        }
-    }
-
-    @Test
-    public void testUnChecked() {
-        ExceptionService service = scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
-        try {
-            service.throwUnChecked();
-            fail();
-        } catch (Exception e) {
-            assertEquals("bla", e.getCause().getCause().getMessage());
-        }
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
deleted file mode 100644
index c34ad07901..0000000000
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ /dev/null
@@ -1,70 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests using the JMS binding with an external JMS broker
- */
-public class ExternalBrokerTestCase {
-
-    private static SCADomain scaDomain;
-    private BrokerService broker;
-
-    @Before
-    public void init() throws Exception {
-        startBroker();
-        scaDomain = SCADomain.newInstance("http://localhost", "/", "external/client.composite", "external/service.composite");
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
-    }
-
-    @After
-    public void end() throws Exception {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-        stopBroker();
-    }
-
-    protected void startBroker() throws Exception {
-        broker = new BrokerService();
-        broker.setPersistent(false);
-        broker.setUseJmx(false);
-        broker.addConnector("tcp://localhost:61616");
-        broker.start();
-    }
-    protected void stopBroker() throws Exception {
-        if (broker != null) {
-            broker.stop();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
deleted file mode 100644
index 9ec77ca440..0000000000
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.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 org.apache.tuscany.sca.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class MessageProcessorTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "simple/mpclient.composite", "simple/service.composite");
-        // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
-        assertTrue(TestMessageProcessor.extractPayloadFromJMSMessageCalled);
-        assertTrue(TestMessageProcessor.insertPayloadIntoJMSMessageCalled);
-        assertTrue(TestMessageProcessor.setOperationNameCalled);
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
deleted file mode 100644
index fc47211f46..0000000000
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ /dev/null
@@ -1,142 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.naming.NamingException;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactoryImpl;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class NonSCAClientTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() throws Exception {
-        startBroker();
-        scaDomain = SCADomain.newInstance("http://localhost", "/", "nonSCAclient/service.composite");
-        OneWayServiceImpl.name = null;
-    }
-
-    @Test
-    public void testXMLText() throws Exception {
-
-        synchronized (OneWayServiceImpl.mutex) {
-
-            sendTextMessage("dynamicQueues/OneWayService", "<ns2:sayHello xmlns:ns2=\"http://jms.binding.sca.tuscany.apache.org/\"><arg0>Petra</arg0></ns2:sayHello>");
-
-            // wait up to 10 seconds but it will likely be a lot less
-            // as the service invocation will wake this up earlier
-            if (OneWayServiceImpl.name == null) {
-                OneWayServiceImpl.mutex.wait(10000);
-            }
-        }
-        assertEquals("Petra", OneWayServiceImpl.name);
-    }
-
-    @Test
-    public void testText() throws Exception {
-
-        synchronized (OneWayServiceImpl.mutex) {
-
-            sendTextMessage("dynamicQueues/TextDest", "Petra");
-
-            // wait up to 10 seconds but it will likely be a lot less
-            // as the service invocation will wake this up earlier
-            OneWayServiceImpl.mutex.wait(10000);
-        }
-        assertEquals("Petra", OneWayServiceImpl.name);
-    }
-
-    @Test
-    public void testObject() throws Exception {
-
-        Set<Integer> arg = new HashSet<Integer>();
-        arg.add(new Integer(3));
-
-        synchronized (OneWayObjectServiceImpl.mutex) {
-
-            sendObjectMessage("dynamicQueues/ObjectDest", arg);
-
-            // wait up to 10 seconds but it will likely be a lot less
-            // as the service invocation will wake this up earlier
-            OneWayObjectServiceImpl.mutex.wait(10000);
-        }
-        assertEquals(arg, OneWayObjectServiceImpl.name);
-    }
-
-    @After
-    public void end() throws Exception {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-        stopBroker();
-    }
-
-    private BrokerService broker;
-    protected void startBroker() throws Exception {
-        broker = new BrokerService();
-        broker.setPersistent(false);
-        broker.setUseJmx(false);
-        broker.addConnector("tcp://localhost:61618");
-        broker.start();
-    }
-    protected void stopBroker() throws Exception {
-        if (broker != null) {
-            broker.stop();
-        }
-    }
-
-    protected static void sendTextMessage(String destName, String payload) throws JMSException, NamingException {
-        JMSResourceFactory rf = new JMSResourceFactoryImpl(null, null, "tcp://localhost:61618");
-        Session session = rf.getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
-        MessageProducer p = session.createProducer(rf.lookupDestination(destName));
-        rf.getConnection().start();
-        session.run();
-        p.send(session.createTextMessage(payload));
-        rf.closeConnection();
-    }
-
-    protected static void sendObjectMessage(String destName, Object payload) throws JMSException, NamingException {
-        JMSResourceFactory rf = new JMSResourceFactoryImpl(null, null, "tcp://localhost:61618");
-        Session session = rf.getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
-        MessageProducer p = session.createProducer(rf.lookupDestination(destName));
-        rf.getConnection().start();
-        session.run();
-        p.send(session.createObjectMessage((Serializable)payload));
-        rf.closeConnection();
-    }
-}
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
deleted file mode 100644
index 26dda13cf9..0000000000
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.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 org.apache.tuscany.sca.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class OneWayTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain = SCADomain.newInstance("http://localhost", "/", "oneway/OneWayClient.composite", "oneway/OneWayService.composite");
-    }
-
-    @Test
-    public void testOneWayInvoked() throws Exception {
-        OneWayService oneWayService = scaDomain.getService(OneWayService.class, "OneWayClient");
-        oneWayService.sayHello("Petra");
-        synchronized (OneWayServiceImpl.mutex) {
-            // wait up to 10 seconds but it will likely be a lot less 
-            // as the service invocation will wake this up earlier 
-            OneWayServiceImpl.mutex.wait(10000);
-        }
-        assertEquals("Petra", OneWayServiceImpl.name);
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
deleted file mode 100644
index c0c90cea95..0000000000
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
+++ /dev/null
@@ -1,97 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import javax.jms.DeliveryMode;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- */
-public class PolicyHeadersTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain = SCADomain.newInstance("http://localhost", "/", "policyHeaders/policyHeaders.composite");
-    }
-
-    @Test
-    public void testProps1() throws Exception {
-        JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");
-
-        client.aClientMethod();
-
-        // wait for up to 5 seconds but should wake up as soon as done
-        synchronized(MsgServiceImpl.lock) {
-            if (MsgServiceImpl.msg == null) {
-                MsgServiceImpl.lock.wait(5000);
-            }
-        }
-        assertNotNull(MsgServiceImpl.msg);
-
-
-        assertEquals(4, MsgServiceImpl.msg.getJMSPriority()); // Doesn't seem to work with ActiveMQ
-        /*
-        assertEquals("myType", MsgServiceImpl.msg.getJMSType());
-        assertEquals("xyz", MsgServiceImpl.msg.getJMSCorrelationID());
-        assertEquals(DeliveryMode.PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode());
-        assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
-        */
-    }
-
-    @Test
-    @Ignore
-    public void testOp2() throws Exception {
-        MsgClient client = scaDomain.getService(MsgClient.class, "ClientComponent");
-
-        client.op2();
-
-        // wait for up to 5 seconds but should wake up as soon as done
-        synchronized(MsgServiceImpl.lock) {
-            if (MsgServiceImpl.msg == null) {
-                MsgServiceImpl.lock.wait(5000);
-            }
-        }
-        assertNotNull(MsgServiceImpl.msg);
-
-        assertEquals("op2Type", MsgServiceImpl.msg.getJMSType());
-        assertEquals("op2CID", MsgServiceImpl.msg.getJMSCorrelationID());
-        // assertEquals(DeliveryMode.NON_PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode()); // Doesn't seem to work with ActiveMQ
-        // assertEquals(3, MsgServiceImpl.msg.getJMSPriority()); // Doesn't seem to work with ActiveMQ
-        assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
-        assertEquals("foo", MsgServiceImpl.msg.getStringProperty("op2P2"));
-        assertEquals("nativeOp2", MsgServiceImpl.msg.getStringProperty("scaOperationName"));
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
deleted file mode 100644
index 4cc229422e..0000000000
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ /dev/null
@@ -1,92 +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.binding.jms;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-

-import javax.jms.DeliveryMode;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- */

-public class PropertiesTestCase {

-

-    private static SCADomain scaDomain;

-

-    @Before

-    public void init() {

-        scaDomain = SCADomain.newInstance("http://localhost", "/", "properties/properties.composite");

-    }

-

-    @Test

-    public void testProps1() throws Exception {

-        JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");

-

-        client.aClientMethod();

-

-        // wait for up to 5 seconds but should wake up as soon as done

-        synchronized(MsgServiceImpl.lock) {

-            if (MsgServiceImpl.msg == null) {

-                MsgServiceImpl.lock.wait(5000);

-            }

-        }

-        assertNotNull(MsgServiceImpl.msg);

-

-        assertEquals("myType", MsgServiceImpl.msg.getJMSType());

-        assertEquals("xyz", MsgServiceImpl.msg.getJMSCorrelationID());

-        assertEquals(DeliveryMode.PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode());

-        // assertEquals(3, MsgServiceImpl.msg.getJMSPriority()); // Doesn't seem to work with ActiveMQ

-        assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));

-    }

-

-    @Test

-    public void testOp2() throws Exception {

-        MsgClient client = scaDomain.getService(MsgClient.class, "ClientComponent");

-

-        client.op2();

-

-        // wait for up to 5 seconds but should wake up as soon as done

-        synchronized(MsgServiceImpl.lock) {

-            if (MsgServiceImpl.msg == null) {

-                MsgServiceImpl.lock.wait(5000);

-            }

-        }

-        assertNotNull(MsgServiceImpl.msg);

-

-        assertEquals("op2Type", MsgServiceImpl.msg.getJMSType());

-        assertEquals("op2CID", MsgServiceImpl.msg.getJMSCorrelationID());

-        // assertEquals(DeliveryMode.NON_PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode()); // Doesn't seem to work with ActiveMQ

-        // assertEquals(3, MsgServiceImpl.msg.getJMSPriority()); // Doesn't seem to work with ActiveMQ

-        assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));

-        assertEquals("foo", MsgServiceImpl.msg.getStringProperty("op2P2"));

-        assertEquals("nativeOp2", MsgServiceImpl.msg.getStringProperty("scaOperationName"));

-    }

-

-    @After

-    public void end() {

-        if (scaDomain != null) {

-            scaDomain.close();

-        }

-    }

-}

diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
deleted file mode 100644
index c1882a1e26..0000000000
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ /dev/null
@@ -1,54 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class RPCTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "simple/client.composite", "simple/service.composite");
-        // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
deleted file mode 100644
index bed5515d7f..0000000000
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ /dev/null
@@ -1,54 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class URIRPCTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "simple/uriclient.composite", "simple/service.composite");
-        // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
-    }
-
-    @Test
-    public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
-        assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
-    }
-
-    @After
-    public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/large-sdo-ws/pom.xml b/java/sca-contrib/itest/large-sdo-ws/pom.xml
deleted file mode 100644
index c670bd9ec4..0000000000
--- a/java/sca-contrib/itest/large-sdo-ws/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-large-sdo-ws</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA Web Service with Large SDO Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <!-- Declare tuscany-host-jetty dependency in the default profile so that it can be replaced -->
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.tuscany.sca</groupId>
-                    <artifactId>tuscany-host-jetty</artifactId>
-                    <version>2.0-SNAPSHOT</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-    
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-ifx-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFiles>
-                                <configuration>
-                                    <fileName>${basedir}/src/main/resources/wsdl/IFX170_XSD.xsd</fileName>
-                                    <noNotification>true</noNotification>
-                                </configuration>
-                            </schemaFiles>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java b/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
deleted file mode 100644
index f5a8830c4a..0000000000
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
+++ /dev/null
@@ -1,43 +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.itest.trninq;
-
-import java.rmi.RemoteException;
-
-import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TrnInqClient implements TrninqInterface {
-
-    //service interface
-    private TrninqInterface transactionInquiryService;
-
-    // setting service interface
-    public void setTransactionInquiryService(TrninqInterface transactionInquiryService) {
-        this.transactionInquiryService = transactionInquiryService;
-    }
-
-    public DepAcctTrnInqRs_Type DepAcctTrnInq(DepAcctTrnInqRq_Type req) throws RemoteException {
-        return transactionInquiryService.DepAcctTrnInq(req);
-    }
-
-}
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java b/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
deleted file mode 100644
index 14da53cf98..0000000000
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
+++ /dev/null
@@ -1,112 +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.itest.trninq;
-
-import java.rmi.RemoteException;
-import java.util.List;
-
-import org.ifxforum.xsd._1.AdditionalStatus_Type;
-import org.ifxforum.xsd._1.BankAcctTrnRec_Type;
-import org.ifxforum.xsd._1.BillerId_Type;
-import org.ifxforum.xsd._1.BillerPayee_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type;
-import org.ifxforum.xsd._1.DepAcctTrnRec_Type;
-import org.ifxforum.xsd._1._1Factory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TrnInqService implements TrninqInterface {
-
-    public DepAcctTrnInqRs_Type DepAcctTrnInq(DepAcctTrnInqRq_Type req) throws RemoteException {
-
-        DepAcctTrnInqRs_Type response = _1Factory.INSTANCE.createDepAcctTrnInqRs_Type();
-
-        response.setStatus(_1Factory.INSTANCE.createStatus_Type());
-        response.getStatus().setStatusCode(1);
-        response.getStatus().setStatusDesc("the description associated with the code 1");
-        AdditionalStatus_Type addStatus = _1Factory.INSTANCE.createAdditionalStatus_Type();
-        addStatus.setServerStatusCode("STATUS_OK");
-        addStatus.setSeverity("SEVERITY_WARNING");
-        response.getStatus().getAdditionalStatus().add(addStatus);
-
-        response.setDepAcctId(_1Factory.INSTANCE.createDepAcctId_Type());
-        response.getDepAcctId().setBankInfo(_1Factory.INSTANCE.createBankInfo_Type());
-        response.getDepAcctId().getBankInfo().setBranchId("Concord_1");
-        response.getDepAcctId().getBankInfo().setBankId("Dufferin hill");
-        response.getDepAcctId().getBankInfo().setBankIdType("Concord branch");
-        response.getDepAcctId().getBankInfo().setBranchName("A Happy branch");
-        response.getDepAcctId().getBankInfo().setCity("Toronto");
-
-        response.getDepAcctId().getBankInfo().setCountry("Canada");
-        response.getDepAcctId().getBankInfo().setName("Info for A Happy branch");
-        response.getDepAcctId().getBankInfo().setPostalCode("L1LL1L");
-        response.getDepAcctId().getBankInfo().setStateProv("ON");
-
-        List records = response.getDepAcctTrnRec();
-        // Record1
-        DepAcctTrnRec_Type trnRec1 = null;
-        BankAcctTrnRec_Type baTrnRec1 = null;
-        long maxRec = req.getTrnCountLimit().getCount();
-        for (int i = 0; i < maxRec; i++) {
-            trnRec1 = _1Factory.INSTANCE.createDepAcctTrnRec_Type();
-            baTrnRec1 = _1Factory.INSTANCE.createBankAcctTrnRec_Type();
-
-            trnRec1.setBankAcctTrnRec(baTrnRec1);
-            trnRec1.getBankAcctTrnRec().setCSPRefId("CSPRefId1");
-            trnRec1.getBankAcctTrnRec().setPostedDt("1");
-            trnRec1.getBankAcctTrnRec().setOrigDt("1");
-            trnRec1.getBankAcctTrnRec().setBillRefInfo("aaaa");
-
-            trnRec1.getBankAcctTrnRec().setTrnType("1");
-
-            trnRec1.getBankAcctTrnRec().setCurAmt(_1Factory.INSTANCE.createCurrencyAmount());
-            trnRec1.getBankAcctTrnRec().getCurAmt().setAmt(new java.math.BigDecimal(2000.35));
-            trnRec1.getBankAcctTrnRec().getCurAmt().setCurCode("100");
-
-            trnRec1.setStmtRunningBal(_1Factory.INSTANCE.createCurrencyAmount());
-            trnRec1.getStmtRunningBal().setAmt(new java.math.BigDecimal("1345.55"));
-
-            trnRec1.getBankAcctTrnRec().setCustPayeeInfo(_1Factory.INSTANCE.createCustPayeeInfo_Type());
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setBillingAcct("000601832");
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setAcctPayAcctId("12");
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setName("John Doe");
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setNickname("Jody");
-
-            trnRec1.getBankAcctTrnRec().getCustPayeeInfo().setBillerPayee(_1Factory.INSTANCE.createBillerPayee_Type());
-            BillerPayee_Type BillerP = trnRec1.getBankAcctTrnRec().getCustPayeeInfo().getBillerPayee();
-
-            BillerP.setBillerId(_1Factory.INSTANCE.createBillerId_Type());
-            BillerId_Type BId = BillerP.getBillerId();
-
-            BId.setBillerNum("123");
-            BId.setSPName("SomeName");
-
-            trnRec1.setAvailDt("sss");
-            trnRec1.setPmtId("SomeID");
-            trnRec1.setXferId("SomeOtherID");
-
-            records.add(trnRec1);
-        }
-
-        return response;
-    }
-
-}
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java b/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
deleted file mode 100644
index b661f0c518..0000000000
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
+++ /dev/null
@@ -1,38 +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.itest.trninq;
-
-import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface TrninqInterface {
-
-    /**
-     * Auto generated method signatures
-     * @param depAcctTrnInqRq
-     */
-    public DepAcctTrnInqRs_Type DepAcctTrnInq(DepAcctTrnInqRq_Type depAcctTrnInqRq) throws java.rmi.RemoteException;
-
-    //
-}
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index ac66b6a425..0000000000
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://trninqcomposite"
-    xmlns:t="http://trninqcomposite">
-    <deployable composite="t:TestService" />
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/trnInq.composite b/java/sca-contrib/itest/large-sdo-ws/src/main/resources/trnInq.composite
deleted file mode 100644
index 97594216e1..0000000000
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/trnInq.composite
+++ /dev/null
@@ -1,39 +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://trninqcomposite"

-    name="TestService">

-

-    <service name="TrnInqService" promote="TransactionInquiryComponent">

-        <interface.java interface="org.apache.tuscany.sca.itest.trninq.TrninqInterface" />

-        <binding.ws wsdlElement="http://trninq#wsdl.port(TrnInqSvc/TrnInqSvcPort)" />

-    </service>

-    <component name="TransactionInquiryComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.trninq.TrnInqService" />

-    </component>

-

-    <reference name="TrnInqReference" promote="TransactionInquiryClientComponent/transactionInquiryService">

-        <interface.java interface="org.apache.tuscany.sca.itest.trninq.TrninqInterface" />

-        <binding.ws wsdlElement="http://trninq#wsdl.port(TrnInqSvc/TrnInqSvcPort)" />

-    </reference>

-    <component name="TransactionInquiryClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.trninq.TrnInqClient" />

-    </component>

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd b/java/sca-contrib/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
deleted file mode 100644
index b85b80abc4..0000000000
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
+++ /dev/null
@@ -1,146 +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.    
- -->
- <!--
- http://www.ifxforum.org/standards/standard/license
- 
-IFX License Statement
-===================== 
-IFX Forum hereby grants to all users of the IFX Business Message Specification 
-and Data Dictionary (the "Specification") a perpetual, worldwide, royalty-free, 
-nonexclusive, nontransferable license to (a) use the specification in the development 
-of software and/or data compilations which facilitate electronic transmission of 
-information in accordance with the Specification and otherwise implement the 
-Specification in user's products, and (b) market, reproduce, display, and distribute 
-(in any medium known now or in the future) the Specification as implemented in user's 
-products. The foregoing rights may be sublicensed through multiple tiers of distribution, 
-including resellers.
-
-Other than as licensed herein, the IFX Forum shall retain all right, title and interest 
-to any patent, copyrights, trade secrets or other proprietary rights ("Intellectual 
-Property Rights") in the Specification. Subject to all patent rights preserved by IFX Forum 
-members pursuant to Section 5.1 of the "Membership Rules of the Interactive Financial 
-Exchange Forum, Inc.", users shall retain all right, title and interest to the Intellectual 
-Property Rights in any products of user created using the Specification and any modifications, 
-extensions or derivative works of the Specification that user develops or has developed on 
-its behalf as permitted under this Agreement (the "Derivatives"), provided, however, that, 
-users may not hold Derivatives out as being endorsed, sponsored by or affiliated with the 
-IFX Forum. 
- -->
-<xsd:schema xmlns="urn:ifxforum-org:XSD:1" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="urn:ifxforum-org:XSD:1" elementFormDefault="qualified" attributeFormDefault="unqualified">
-    <xsd:complexType name="AdditionalStatus_Type">
-        <xsd:sequence>
-            <xsd:element name="ServerStatusCode" type="xsd:string" />
-            <xsd:element name="Severity" type="xsd:string" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BankAcctTrnRec_Type">
-        <xsd:sequence>
-            <xsd:element name="TrnType" type="xsd:string" minOccurs="0" />
-            <xsd:element name="PostedDt" type="xsd:string" />
-            <xsd:element name="OrigDt" type="xsd:string" minOccurs="0" />
-            <xsd:element name="CurAmt" type="CurrencyAmount" />
-            <xsd:element name="BillRefInfo" type="xsd:string" minOccurs="0" />
-            <xsd:element name="CustPayeeInfo" type="CustPayeeInfo_Type" minOccurs="0" />
-            <xsd:element name="CSPRefId" type="xsd:string" minOccurs="0" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BankInfo_Type">
-        <xsd:sequence>
-            <xsd:element name="BankIdType" type="xsd:string" minOccurs="0" />
-            <xsd:element name="BankId" type="xsd:string" minOccurs="0" />
-            <xsd:element name="Name" type="xsd:string" minOccurs="0" />
-            <xsd:element name="BranchId" type="xsd:string" minOccurs="0" />
-            <xsd:element name="BranchName" type="xsd:string" minOccurs="0" />
-            <xsd:element name="City" type="xsd:string" minOccurs="0" />
-            <xsd:element name="StateProv" type="xsd:string" minOccurs="0" />
-            <xsd:element name="PostalCode" type="xsd:string" minOccurs="0" />
-            <xsd:element name="Country" type="xsd:string" minOccurs="0" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BillerId_Type">
-        <xsd:sequence>
-            <xsd:element name="SPName" type="xsd:string" />
-            <xsd:element name="BillerNum" type="xsd:string" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BillerPayee_Type">
-        <xsd:sequence>
-            <xsd:element name="BillerId" type="BillerId_Type" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="CurrencyAmount">
-        <xsd:sequence>
-            <xsd:element name="Amt" type="xsd:decimal" />
-            <xsd:element name="CurCode" type="xsd:string" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="CustPayeeInfo_Type">
-        <xsd:sequence>
-            <xsd:element name="Name" type="xsd:string" minOccurs="0" />
-            <xsd:element name="Nickname" type="xsd:string" minOccurs="0" />
-            <xsd:element name="BillerPayee" type="BillerPayee_Type" />
-            <xsd:element name="BillingAcct" type="xsd:string" minOccurs="0" />
-            <xsd:element name="AcctPayAcctId" type="xsd:string" minOccurs="0" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="DepAcctTrnInqRq_Type">
-        <xsd:sequence>
-            <xsd:element name="TrnCountLimit" type="TrnCountLimit_Type" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="DepAcctTrnInqRs_Type">
-        <xsd:sequence>
-            <xsd:sequence>
-                <xsd:element name="Status" type="Status_Type" />
-                <xsd:element name="DepAcctId" type="DepAcctId_Type" />
-                <xsd:element name="DepAcctTrnRec" type="DepAcctTrnRec_Type" minOccurs="0" maxOccurs="unbounded" />
-            </xsd:sequence>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="DepAcctTrnRec_Type">
-        <xsd:sequence>
-            <xsd:element name="BankAcctTrnRec" type="BankAcctTrnRec_Type" />
-            <xsd:element name="StmtRunningBal" type="CurrencyAmount" minOccurs="0" />
-            <xsd:element name="AvailDt" type="xsd:string" minOccurs="0" />
-            <xsd:element name="XferId" type="xsd:string" minOccurs="0" />
-            <xsd:element name="PmtId" type="xsd:string" minOccurs="0" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="DepAcctId_Type">
-        <xsd:sequence>
-            <xsd:element name="BankInfo" type="BankInfo_Type" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="Status_Type">
-        <xsd:sequence>
-            <xsd:element name="StatusCode" type="xsd:int" />
-            <xsd:element name="StatusDesc" type="xsd:string" />
-            <xsd:element name="AdditionalStatus" type="AdditionalStatus_Type" minOccurs="0" maxOccurs="unbounded" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="TrnCountLimit_Type">
-        <xsd:sequence>
-            <xsd:element name="Count" type="xsd:int" />
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="DepAcctTrnInqRq" type="DepAcctTrnInqRq_Type" />
-    <xsd:element name="DepAcctTrnInqRs" type="DepAcctTrnInqRs_Type" />
-</xsd:schema>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl b/java/sca-contrib/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
deleted file mode 100644
index 842f7a9d4c..0000000000
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
+++ /dev/null
@@ -1,57 +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.    

--->

-<definitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:trninq="urn:ifxforum-org:XSD:1"

-    xmlns:tns="http://trninq" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-    xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://trninq">

-    <types>

-        <xsd:schema elementFormDefault="qualified" targetNamespace="http://trninq">

-            <xsd:import namespace="urn:ifxforum-org:XSD:1" schemaLocation="IFX170_XSD.xsd" />

-        </xsd:schema>

-    </types>

-    <message name="DepAcctTrnInqRq">

-        <part name="messagePart" element="trninq:DepAcctTrnInqRq" />

-    </message>

-    <message name="DepAcctTrnInqRs">

-        <part name="messagePart" element="trninq:DepAcctTrnInqRs" />

-    </message>

-    <portType name="trninqInterface">

-        <operation name="DepAcctTrnInq">

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

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

-        </operation>

-    </portType>

-    <binding name="trninq" type="tns:trninqInterface">

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

-        <operation name="DepAcctTrnInq">

-            <soap:operation soapAction="trninq:DepAcctTrnInq" style="document" />

-            <input>

-                <soap:body use="literal" />

-            </input>

-            <output>

-                <soap:body use="literal" />

-            </output>

-        </operation>

-    </binding>

-    <service name="TrnInqSvc">

-        <port name="TrnInqSvcPort" binding="tns:trninq">

-            <soap:address location="http://localhost:8085/itest-large-sdo-ws/TrnInqService" />

-        </port>

-    </service>

-</definitions>

diff --git a/java/sca-contrib/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java b/java/sca-contrib/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
deleted file mode 100644
index 17eb575d50..0000000000
--- a/java/sca-contrib/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
+++ /dev/null
@@ -1,87 +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 trninq;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.trninq.TrninqInterface;
-import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type;
-import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type;
-import org.ifxforum.xsd._1.TrnCountLimit_Type;
-import org.ifxforum.xsd._1._1Factory;
-import org.junit.Assert;
-
-/**
- * This test is created to cover https://issues.apache.org/jira/browse/TUSCANY-1541
- * 
- * @version $Rev$ $Date$
- */
-public class TrnInqServiceTestCase extends TestCase {
-
-    private static SCADomain scaDomain;
-    private TrninqInterface trnInq;
-
-    @Override
-    protected void setUp() throws Exception {
-        if (scaDomain == null) {
-            scaDomain = SCADomain.newInstance("trnInq.composite");
-        }
-        trnInq = scaDomain.getService(TrninqInterface.class, "TransactionInquiryClientComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testDepAcctTrnInq() throws IOException {
-        DepAcctTrnInqRq_Type depAcctTrnInqRequest = _1Factory.INSTANCE.createDepAcctTrnInqRq_Type();
-        TrnCountLimit_Type trnCountLimit = _1Factory.INSTANCE.createTrnCountLimit_Type();
-        depAcctTrnInqRequest.setTrnCountLimit(trnCountLimit);
-        depAcctTrnInqRequest.getTrnCountLimit().setCount(2);
-
-        try {
-            DepAcctTrnInqRs_Type depAcctTrnInqResponse = trnInq.DepAcctTrnInq(depAcctTrnInqRequest);
-        } catch (Exception e) {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            Assert.fail("Should pass with MaxRec 2! \n" + sw);
-            sw.close();
-            pw.close();
-        }
-
-        depAcctTrnInqRequest.getTrnCountLimit().setCount(10);
-        try {
-            DepAcctTrnInqRs_Type depAcctTrnInqResponse = trnInq.DepAcctTrnInq(depAcctTrnInqRequest);
-        } catch (Exception e) {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            Assert.fail("Should pass with MaxRec 10! \n" + sw);
-            sw.close();
-            pw.close();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/pom.xml b/java/sca-contrib/itest/late-reference-resolution/pom.xml
deleted file mode 100644
index c4970cc786..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/pom.xml
+++ /dev/null
@@ -1,126 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-late-reference-resolution</artifactId>
-    <name>Apache Tuscany SCA Late Reference Resolution Integration Test</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>                                        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>   
-                
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>   
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-                
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/AddService.java b/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/AddService.java
deleted file mode 100644
index dd7ecb827d..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/AddService.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 calculator;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The Add service interface
- */
-@Remotable
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9b7e254e5..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.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 calculator;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        System.out.println("AddService - add " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index c927500cc7..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,74 +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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService; 
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-       this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-    
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-    
-    public double add(double n1, double n2) {
-        System.out.println("CalculatorService - add " + n1 + " and " + n2);
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        System.out.println("CalculatorService - subtract " + n1 + " and " + n2);
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        System.out.println("CalculatorService - multiply " + n1 + " and " + n2);
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        System.out.println("CalculatorService - divide " + n1 + " and " + n2);
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/DivideService.java b/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java b/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index f03b9b94d4..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractService.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 calculator;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the multiply service
- */
-@Remotable
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1010207154..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.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 calculator;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        System.out.println("SubtractService - subtract " + n1 + " and " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/java/sca-contrib/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
deleted file mode 100644
index c53b55aacf..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-binding.sca.BindingScaEndpointResolverFactoryImpl;model=org.apache.tuscany.sca.assembly.SCABinding

diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite b/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
deleted file mode 100644
index 378d6e9706..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
+++ /dev/null
@@ -1,41 +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://sample"
-           xmlns:sample="http://sample"
-           name="CalculatorA">
-
-    <component name="CalculatorServiceComponentA">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponentB" />     
-        <reference name="subtractService" target="SubtractServiceComponentC" />
-        <reference name="multiplyService" target="MultiplyServiceComponentA"/>     
-        <reference name="divideService" target="DivideServiceComponentA" />
-    </component>    
-
-    <component name="MultiplyServiceComponentA">
-        <implementation.java class="calculator.MultiplyServiceImpl" />
-    </component>   
-    
-    <component name="DivideServiceComponentA">
-        <implementation.java class="calculator.DivideServiceImpl" />
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml b/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index db255e0232..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:CalculatorA"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite b/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
deleted file mode 100644
index 3fb16fa619..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
+++ /dev/null
@@ -1,32 +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://sample"
-           xmlns:sample="http://sample"
-           name="CalculatorB">
-
-    <component name="AddServiceComponentB">
-        <implementation.java class="calculator.AddServiceImpl" />
-        <service name="AddService">
-            <binding.sca uri="http://localhost:8085/AddServiceComponentB"/>
-        </service>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml b/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index 130157ac04..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:CalculatorB"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite b/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
deleted file mode 100644
index c615b4355a..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
+++ /dev/null
@@ -1,32 +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://sample"
-           xmlns:sample="http://sample"
-           name="CalculatorC">
-
-    <component name="SubtractServiceComponentC">
-        <implementation.java class="calculator.SubtractServiceImpl" />
-        <service name="SubtractService">
-            <binding.sca uri="http://localhost:8086/SubtractServiceComponentC"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml b/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
deleted file mode 100644
index cba0a5c281..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:CalculatorC"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java b/java/sca-contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
deleted file mode 100644
index e4bd3035e2..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
+++ /dev/null
@@ -1,50 +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 binding.sca;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory;
-
-/**
- * The factory for creating endpoint Binding providers
- * 
- * @version $Rev$ $Date$
- */
-public class BindingScaEndpointResolverFactoryImpl implements EndpointResolverFactory<SCABinding> {
-    
-    private ExtensionPointRegistry extensionPoints;
-    
-    public BindingScaEndpointResolverFactoryImpl(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;     
-    } 
-    
-    public EndpointResolver createEndpointResolver(Endpoint endpoint, Binding binding) {
-              
-        return  new BindingScaEndpointResolverImpl(extensionPoints, endpoint, binding);
-    }
-
-    public Class<SCABinding> getModelType() {
-        return SCABinding.class;
-    }
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java b/java/sca-contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
deleted file mode 100644
index c6e0689837..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
+++ /dev/null
@@ -1,72 +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 binding.sca;
-
-
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
-
-import calculator.LateReferenceResolutionTestCase;
-
-/** 
- * The endpoint resolver allows unresolved endpoints to be plumbed into
- * the runtime start and message send processing as a hook to late resolution
- * of target services
- * 
- * @version $Rev$ $Date$
- */
-public class BindingScaEndpointResolverImpl implements EndpointResolver {
-
-    private final static Logger logger = Logger.getLogger(BindingScaEndpointResolverImpl.class.getName());
-
-    private Endpoint endpoint;
-    private SCABinding binding;
-
-    public BindingScaEndpointResolverImpl(ExtensionPointRegistry extensionPoints,
-                                          Endpoint endpoint, 
-                                          Binding binding) {
-        this.endpoint = endpoint;
-        this.binding = (SCABinding)binding;
-    }
-
-    public void start(){
-        // do nothing
-    } 
-    
-    public void resolve() {
-        if (endpoint.isUnresolved()){
-            // I can cheat here because I know this test only has 
-            // SCA Bindings in it so all I have to do it find the URL 
-            // of the endpoint
-            String targetURL = LateReferenceResolutionTestCase.registry.locateService(endpoint.getTargetName());
-            binding.setURI(targetURL);
-            endpoint.setSourceBinding(binding);
-        }
-    }
-    
-    public void stop(){
-        // do nothing
-    }    
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java b/java/sca-contrib/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
deleted file mode 100644
index 74e01259e2..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
+++ /dev/null
@@ -1,97 +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 calculator;
-
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Runs a distributed domain in a single VM by using and in memory 
- * implementation of the distributed domain
- */
-public class LateReferenceResolutionTestCase {
-
-    private static Node nodeA;
-    private static Node nodeB;
-    private static Node nodeC;
-
-    private static CalculatorService calculatorService;
-    
-    public static TestRegistryImpl registry = new TestRegistryImpl();
-    
-    @BeforeClass
-    public static void init() throws Exception {
-             
-        try {
-            System.out.println("Setting up domain");
-
-            
-            NodeFactory nodeFactory = NodeFactory.newInstance();
-            nodeC = nodeFactory.createNode(new File("src/main/resources/nodeC/Calculator.composite").toURL().toString(),
-                new Contribution("NodeC", 
-                                    new File("src/main/resources/nodeC").toURL().toString()));
-            nodeB = nodeFactory.createNode(new File("src/main/resources/nodeB/Calculator.composite").toURL().toString(),
-                new Contribution("NodeB", 
-                                    new File("src/main/resources/nodeB").toURL().toString()));
-            nodeA = nodeFactory.createNode(new File("src/main/resources/nodeA/Calculator.composite").toURL().toString(),
-                new Contribution("NodeA", 
-                                    new File("src/main/resources/nodeA").toURL().toString()));
-
-            nodeC.start();
-            nodeB.start();
-            nodeA.start();
-            
-            Client client = (Client)nodeA;
-            calculatorService = 
-                client.getService(CalculatorService.class, "CalculatorServiceComponentA");
-
-        } catch(Exception ex){
-            System.err.println(ex.toString());
-        }  
-        
-   }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        nodeC.stop();
-        nodeB.stop();
-        nodeA.stop();
-    }    
-
-    @Test
-    public void testCalculator() throws Exception {       
-        
-        // Calculate
-        Assert.assertEquals(calculatorService.add(3, 2), 5.0);
-        Assert.assertEquals(calculatorService.subtract(3, 2), 1.0);
-        Assert.assertEquals(calculatorService.multiply(3, 2), 6.0);
-        Assert.assertEquals(calculatorService.divide(3, 2), 1.5);
-    }
-}
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java b/java/sca-contrib/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
deleted file mode 100644
index 57afc9ea50..0000000000
--- a/java/sca-contrib/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
+++ /dev/null
@@ -1,40 +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 calculator;
-
-/**
- * A dummy domain registry component
- */
-public class TestRegistryImpl {
-
-    public String locateService(String targetServiceName){
-        String targetURL = null;
-        
-        // In reality of course a registry would have to be initialized
-        // with the real target service endpoints but in this test
-        // we know what they are going to be ahead of time
-        if (targetServiceName.equals("AddServiceComponentB")){
-            targetURL = "http://localhost:8085/" + targetServiceName;
-        } else if (targetServiceName.equals("SubtractServiceComponentC")){
-            targetURL = "http://localhost:8086/" + targetServiceName;
-        }
-        
-        return targetURL;
-    }
-}
diff --git a/java/sca-contrib/itest/oneway/build.xml b/java/sca-contrib/itest/oneway/build.xml
deleted file mode 100644
index e6b8f2e51f..0000000000
--- a/java/sca-contrib/itest/oneway/build.xml
+++ /dev/null
@@ -1,127 +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.    

--->

-<project name="oneway" default="runServer">

-

-	<property name="m2.repo"   value="${user.home}\.m2\repository" />

-	

-    <path id="repo.classpath">   	

-    	<pathelement location="target/classes"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.4-SNAPSHOT\tuscany-core-spi-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.4-SNAPSHOT\tuscany-host-http-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.4-SNAPSHOT\tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.4-SNAPSHOT\tuscany-policy-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>

-    	<pathelement location="${m2.repo}\org\mortbay\jetty\jetty-util\6.1.3\jetty-util-6.1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.4-SNAPSHOT\tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>

-    	<pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>

-    	<pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\security\wss4j\1.5.3\wss4j-1.5.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.4-SNAPSHOT\tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\jdom\jdom\1.0\jdom-1.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\1.4-SNAPSHOT\tuscany-assembly-xsd-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.4-SNAPSHOT\tuscany-assembly-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\rampart\rampart-trust\1.3\rampart-trust-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.4-SNAPSHOT\tuscany-core-databinding-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\dom4j\dom4j\1.6.1\dom4j-1.6.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.5\axiom-api-1.2.5.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.4-SNAPSHOT\tuscany-policy-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.3\axis2-kernel-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\1.4-SNAPSHOT\tuscany-sca-api-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore\4.0-alpha5\httpcore-4.0-alpha5.jar"/>

-    	<pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>

-    	<pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.4-SNAPSHOT\tuscany-contribution-java-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0-M1\geronimo-activation_1.1_spec-1.0-M1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.4-SNAPSHOT\tuscany-databinding-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.4-SNAPSHOT\tuscany-binding-ws-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>

-    	<pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>

-    	<pathelement location="${m2.repo}\javax\servlet\servlet-api\2.5\servlet-api-2.5.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-adb\1.3\axis2-adb-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\1.4-SNAPSHOT\tuscany-policy-security-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.4-SNAPSHOT\tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-mtompolicy\1.3\axis2-mtompolicy-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\1.4-SNAPSHOT\tuscany-domain-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.4-SNAPSHOT\tuscany-interface-java-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.3\axis2-java2wsdl-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-nio\4.0-alpha5\httpcore-nio-4.0-alpha5.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.4-SNAPSHOT\tuscany-contribution-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.4-SNAPSHOT\tuscany-implementation-java-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\xalan\xalan\2.7.0\xalan-2.7.0.jar"/>

-    	<pathelement location="${m2.repo}\com\ibm\icu\icu4j\2.6.1\icu4j-2.6.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\rampart\rampart-core\1.3\rampart-core-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\1.4-SNAPSHOT\tuscany-domain-api-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.4-SNAPSHOT\tuscany-binding-sca-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\xom\xom\1.0\xom-1.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-jetty\1.4-SNAPSHOT\tuscany-host-jetty-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\rampart\rampart-policy\1.3\rampart-policy-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-niossl\4.0-alpha5\httpcore-niossl-4.0-alpha5.jar"/>

-    	<pathelement location="${m2.repo}\junit\junit\4.2\junit-4.2.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.5\axiom-impl-1.2.5.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.4-SNAPSHOT\tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.4-SNAPSHOT\tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.2\neethi-2.0.2.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.4-SNAPSHOT\tuscany-interface-wsdl-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.4-SNAPSHOT\tuscany-binding-ws-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.4-SNAPSHOT\tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\mortbay\jetty\jetty\6.1.3\jetty-6.1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.0-M1\geronimo-javamail_1.4_spec-1.0-M1.jar"/>

-    	<pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.4-SNAPSHOT\tuscany-core-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.4-SNAPSHOT\tuscany-interface-wsdl-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.4-SNAPSHOT\tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\1.4-SNAPSHOT\tuscany-node-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\1.4-SNAPSHOT\tuscany-definitions-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\santuario\xmlsec\1.4.0\xmlsec-1.4.0.jar"/>

-    	<pathelement location="${m2.repo}\jaxen\jaxen\1.1.1\jaxen-1.1.1.jar"/>

-    	<pathelement location="${m2.repo}\commons-io\commons-io\1.2\commons-io-1.2.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.4-SNAPSHOT\tuscany-host-embedded-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.5\axiom-dom-1.2.5.jar"/>

-    	<pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>

-    	<pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-codegen\1.3\axis2-codegen-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>

-    	<pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.4-SNAPSHOT\tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.2\XmlSchema-1.3.2.jar"/>

-    	<pathelement location="${m2.repo}\xerces\xmlParserAPIs\2.6.2\xmlParserAPIs-2.6.2.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7b\woden-1.0-incubating-M7b.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.4-SNAPSHOT\tuscany-interface-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\easymock\easymock\2.2\easymock-2.2.jar"/>  	

-   </path>	

-    	

-    <target name="runServer">

-        <java classname="org.apache.tuscany.sca.itest.oneway.impl.OneWayServer"

-              fork="true">

-            <classpath>

-            	<path refid="repo.classpath"/>

-            </classpath>    	        	

-        </java>

-    </target>

-	

-</project>

diff --git a/java/sca-contrib/itest/oneway/pom.xml b/java/sca-contrib/itest/oneway/pom.xml
deleted file mode 100644
index f28cf2a577..0000000000
--- a/java/sca-contrib/itest/oneway/pom.xml
+++ /dev/null
@@ -1,59 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-oneway</artifactId>

-    <name>Apache Tuscany SCA OneWay Integration Tests</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-                

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>        

-    </dependencies>

-</project>

diff --git a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
deleted file mode 100644
index babbfbc91b..0000000000
--- a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
+++ /dev/null
@@ -1,40 +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.itest.oneway;

-

-/**

- * The client for the oneway itest.

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-public interface OneWayClient {

-

-    /**

-     * This method will invoke the doSomething() @OneWay method on the OneWayService

-     * the specified number of times.

-     * 

-     * @param count The number of times to invoke doSomething() on the OneWayService

-     */

-    void doSomething(int count);

-

-    /**

-     * This method will invoke a @OneWay method that throws an exception.

-     */

-    void doSomethingWhichThrowsException();

-}

diff --git a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
deleted file mode 100644
index 80c339abd6..0000000000
--- a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.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.    

- */

-package org.apache.tuscany.sca.itest.oneway;

-

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The service interface used when testing @OneWay interactions.

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-@Remotable

-public interface OneWayService {

-

-    /**

-     * This OneWay method will increment the callCount by 1.

-     * 

-     * @param count Not used

-     */

-    @OneWay

-    void doSomething(int count);

-

-    /**

-     * This one way method will throw a NullPointerException.

-     */

-    @OneWay

-    void doSomethingWhichThrowsException();

-}

diff --git a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
deleted file mode 100644
index d941693f46..0000000000
--- a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
+++ /dev/null
@@ -1,63 +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.itest.oneway.impl;

-

-import org.apache.tuscany.sca.itest.oneway.OneWayClient;

-import org.apache.tuscany.sca.itest.oneway.OneWayService;

-import org.junit.Assert;

-import org.oasisopen.sca.annotation.Reference;

-

-/**

- * The client for the oneway itest.

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-public class OneWayClientImpl implements OneWayClient {

-    /**

-     * Injected reference to the OneWayService.

-     */

-    @Reference

-    protected OneWayService oneWayService;

-

-    /**

-     * Tracks the number of calls of the doSomething() method on the OneWayService.

-     */

-    public static int callCount = 0;

-

-    /**

-     * {@inheritDoc}

-     */

-    public void doSomething(int count) {

-        callCount = callCount + count;

-

-        for (int loopCount = 0; loopCount < count; loopCount++) {

-            //System.out.println("Client: doSomething " + loopCount);

-            //System.out.flush();

-            oneWayService.doSomething(loopCount);

-        }

-    }

-

-    /**

-     * {@inheritDoc}

-     */

-    public void doSomethingWhichThrowsException() {

-        Assert.assertNotNull(oneWayService);

-        oneWayService.doSomethingWhichThrowsException();

-    }

-}

diff --git a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
deleted file mode 100644
index 8dad4d669b..0000000000
--- a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
+++ /dev/null
@@ -1,67 +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.itest.oneway.impl;

-

-import java.util.concurrent.atomic.AtomicInteger;

-

-import org.apache.tuscany.sca.itest.oneway.OneWayService;

-

-/**

- * The service for the oneway itest.

- *

- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $

- */

-

-public class OneWayServiceImpl implements OneWayService {

-

-    /**

-     * This is the error message that will be in the Exception thrown by

-     * the doSomethingWhichThrowsException() method.

-     */

-    public static final String EXCEPTION_MESSAGE = "Sample RuntimeException from a @OneWay method";

-

-    /**

-     * Counts the number of invocations to doSomething().

-     */

-    public static final AtomicInteger CALL_COUNT = new AtomicInteger();

-

-    /**

-     * Counts the number of invocations of the doSomethingWhichThrowsException() method.

-     */

-    public static final AtomicInteger CALL_COUNT_FOR_THROWS_EXCEPTION_METHOD = new AtomicInteger();

-

-    /**

-     * {@inheritDoc}

-     */

-    public void doSomething(int count) {

-        CALL_COUNT.incrementAndGet();

-

-        // System.out.println("Service: doSomething " + count + " callCount = " + callCount);

-        // System.out.flush();

-    }

-

-    /**

-     * {@inheritDoc}

-     */

-    public void doSomethingWhichThrowsException() {

-        System.out.println("OneWay invoked. About to throw an Exception");

-        CALL_COUNT_FOR_THROWS_EXCEPTION_METHOD.incrementAndGet();

-        throw new NullPointerException(EXCEPTION_MESSAGE);

-    }

-}

diff --git a/java/sca-contrib/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite b/java/sca-contrib/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
deleted file mode 100644
index d053a6278c..0000000000
--- a/java/sca-contrib/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
+++ /dev/null
@@ -1,58 +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://oneway"

-	       name="OneWayITest">

- 	      

-    <component name="OneWayClientComponent">

-		<implementation.java class="org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl"/>

-		<reference name="oneWayService" target="OneWayServiceComponent">

-		    <interface.java interface="org.apache.tuscany.sca.itest.oneway.OneWayService" />       

-            <binding.ws/>

-        </reference>

-	</component> 

-          

-    <component name="OneWayServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl"/>

-        <service name="OneWayService">

-            <interface.java interface="org.apache.tuscany.sca.itest.oneway.OneWayService" /> 

-            <binding.ws uri="http://localhost:8085/OneWayServiceComponent"/>

-        </service>

-    </component> 	        

-

-

-    <!-- OneWay Client and Server Components that use the standard SCA Binding so we can validate -->

-    <!-- that the NonBlockingInterceptor logs an message when an Exception is thrown by the code -->

-    <!-- that is called. See TUSCANY-2225 --> 

-    <component name="OneWayClientComponentSCABinding">

-        <implementation.java class="org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl"/>

-        <reference name="oneWayService" target="OneWayServiceComponentSCABinding">

-            <interface.java interface="org.apache.tuscany.sca.itest.oneway.OneWayService" />

-        </reference>

-    </component> 

-

-    <component name="OneWayServiceComponentSCABinding">

-        <implementation.java class="org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl"/>

-        <service name="OneWayService">

-            <interface.java interface="org.apache.tuscany.sca.itest.oneway.OneWayService" /> 

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/java/sca-contrib/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
deleted file mode 100644
index a088b2090f..0000000000
--- a/java/sca-contrib/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
+++ /dev/null
@@ -1,235 +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.itest.oneway;

-

-import java.util.concurrent.atomic.AtomicBoolean;

-import java.util.logging.Handler;

-import java.util.logging.Level;

-import java.util.logging.LogRecord;

-import java.util.logging.Logger;

-

-import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor;

-import org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl;

-import org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl;

-import org.apache.tuscany.sca.node.Client;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.ContributionLocationHelper;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * This test case will test invoking @OneWay operations.

- *

- * @version $Date$ $Revision$

- */

-public class OneWayTestCase {

-    /**

-     * Maximum period of time that we are prepared to wait for all the @OneWay

-     * method calls to complete in milliseconds.

-     */

-    private static final int MAX_SLEEP_TIME = 10000;

-

-    private Node node;

-

-    /**

-     * Initialise the Node.

-     *

-     * @throws Exception Failed to initialise the Node

-     */

-    @Before

-    public void setUp() throws Exception {

-

-        NodeFactory nodeFactory = NodeFactory.newInstance();

-        String location =

-            ContributionLocationHelper

-                .getContributionLocation("OneWayContribution/META-INF/sca-deployables/oneWay.composite");

-        node =

-            nodeFactory.createNode("OneWayContribution/META-INF/sca-deployables/oneWay.composite",

-                                   new Contribution("c1", location));

-        node.start();

-

-    }

-

-    /**

-     * This method will ensure that the Node is shutdown.

-     *

-     * @throws Exception Failed to shutdown the Node

-     */

-    @After

-    public void tearDown() throws Exception {

-        node.stop();

-    }

-

-    /**

-     * This test will test repeatedly calling a @OneWay operation and ensure that the correct

-     * number of @OneWay operations  are run.

-     * 

-     * @throws Exception Test failed

-     */

-    @Test

-    public void testOneWay() throws Exception {

-        OneWayClient client = ((Client)node).getService(OneWayClient.class, "OneWayClientComponent");

-

-        int count = 100;

-

-        for (int i = 0; i < 10; i++) {

-            // System.out.println("Test: doSomething " + count);

-            // System.out.flush();

-            client.doSomething(count);

-

-            // TUSCANY-2192 - We need to sleep to allow the @OneWay method calls to complete.

-            // Note: This can take different periods depending on the speed and load

-            // on the computer where the test is being run.

-            // This loop will wait for the required number of @OneWay method calls to

-            // have taken place or MAX_SLEEP_TIME to have passed.

-            long startSleep = System.currentTimeMillis();

-            while (OneWayClientImpl.callCount != OneWayServiceImpl.CALL_COUNT.get() && System.currentTimeMillis() - startSleep < MAX_SLEEP_TIME) {

-                Thread.sleep(100);

-                // System.out.println("" + OneWayClientImpl.callCount + "," + OneWayServiceImpl.callCount);

-            }

-

-            System.out.println("Finished callCount = " + OneWayServiceImpl.CALL_COUNT);

-

-            Assert.assertEquals(OneWayClientImpl.callCount, OneWayServiceImpl.CALL_COUNT.get());

-        }

-    }

-

-    /**

-     * This method will invoke a @OneWay method that throws an exception

-     * when invoked over a SCA Binding which uses the NonBlockingInterceptor and

-     * ensure that the Exception is logged.

-     * See TUSCANY-2225

-     */

-    @Test

-    public void testOneWayUsingNonBlockingInterceptorThrowsAnException() {

-        OneWayClient client = ((Client)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding");

-

-        // We need to modify the JDK Logger for the NonBlockingInterceptor so we

-        // can check that it logs a message for the @OneWay invocation that throws

-        // an Exception

-        Logger nbiLogger = Logger.getLogger(NonBlockingInterceptor.class.getName());

-        DummyJDKHandler handler = new DummyJDKHandler();

-        nbiLogger.addHandler(handler);

-

-        // Add a message on the console to explain the stack dump that is going to be

-        // displayed and state that this is not a problem but expected behaviour

-        System.out.println();

-        System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");

-        System.out.println("IMPORTANT: The error message that appears on the console");

-        System.out.println("below is an expected error if it is a NullPointerException");

-        System.out.println(" with the message of:");

-        System.out.println("  \"" + OneWayServiceImpl.EXCEPTION_MESSAGE + "\"");

-        System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");

-        System.out.println();

-        System.out.flush();

-

-        // Invoke the @OneWay method that throws an exception

-        client.doSomethingWhichThrowsException();

-

-        // The logging is done asynchronously so we will need to wait a bit before

-        // the log message appears.

-        long start = System.currentTimeMillis();

-        boolean logged = false;

-        while (System.currentTimeMillis() - start < MAX_SLEEP_TIME && !logged) {

-            // Has the log message been logged?

-            if (handler.exceptionLogged.get()) {

-                logged = true;

-            } else {

-                try {

-                    Thread.sleep(25);

-                } catch (InterruptedException ex) {

-                    Assert.fail("Unexpected exception " + ex);

-                }

-            }

-        }

-

-        // Add a message explaining that errors beyond this point should be reported 

-        System.out.println();

-        System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");

-        System.out.println("End of expected exceptions. Any errors beyond this point are errors!");

-        System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");

-        System.out.println();

-        System.out.flush();

-

-        // Remove the handler

-        nbiLogger.removeHandler(handler);

-

-        // Make sure that the exception was logged

-        Assert.assertTrue(handler.exceptionLogged.get());

-    }

-

-    /**

-     * A handler that is added to the JDK Logging system to examine the log messages

-     * generated to ensure that a @OneWay method that throws an Exception will 

-     * generate a log message.

-     */

-    private class DummyJDKHandler extends Handler {

-

-        /**

-         * Used to track whether the exception has been logged.

-         */

-        private AtomicBoolean exceptionLogged = new AtomicBoolean(false);

-

-        /**

-         * Constructor.

-         */

-        private DummyJDKHandler() {

-            super.setLevel(Level.ALL);

-        }

-

-        /**

-         * {@inheritDoc}

-         */

-

-        public void close() throws SecurityException {

-            // Nothing to do

-        }

-

-        /**

-         * {@inheritDoc}

-         */

-

-        public void flush() {

-            // Nothing to do

-        }

-

-        /**

-         * Examines the LogRecord and checks whether it matches the one we are looking for.

-         * If it matches, it will set exceptionLogged to True.

-         * 

-         * @param record The Log Record that is being published

-         */

-

-        public void publish(LogRecord record) {

-            // The log message we are looking for is Severe

-            if (record.getLevel() == Level.SEVERE) {

-                if (record.getThrown() != null && record.getThrown().toString()

-                    .indexOf(OneWayServiceImpl.EXCEPTION_MESSAGE) != -1) {

-                    // We have found our Exception.

-                    exceptionLogged.set(true);

-                }

-            }

-        }

-    }

-}

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
deleted file mode 100644
index 82d536cbfe..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
+++ /dev/null
@@ -1,39 +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 name="OSGiBundleCreator">
-
-    <target name="create-bundles">
-
-        <mkdir dir="${jar.dir}"/>
-
-        <copy file="target/classes/META-INF/${sca.contribution}" tofile="target/classes/META-INF/sca-contribution.xml"/>
-
-
-        <jar jarfile="${jar.dir}/${jar.file.name}" manifest="${files.dir}/${manifest.file.name}" >
-            <fileset dir="${files.dir}" includes="${files.list}">
-                <!-- include name="${files.list}"/-->
-            </fileset>
-        </jar>
-
-        <delete file="target/classes/META-INF/sca-contribution.xml"/>
-    </target>
-
-
-</project>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/pom.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/pom.xml
deleted file mode 100644
index a26e309cbc..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/pom.xml
+++ /dev/null
@@ -1,211 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-contribution-classes</artifactId>
-    <name>Apache Tuscany OSGi Contribution Version 1 classes</name>
-
-<dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    <build>
-        <finalName>itest-osgi-contribution-classes-v2</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-bundles</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="CustomerV2.jar" />
-                                    <property name="manifest.file.name" value="osgi/Customer.mf" />
-                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               supplychain.composite \
-                                               CustomerV2.componentType \
-                                               RetailerV2.componentType \
-                                               WarehouseV2.componentType \
-                                               ShipperV2.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Customer2V2.jar" />
-                                    <property name="manifest.file.name" value="osgi/Customer2.mf" />
-                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               supplychain.composite \
-                                               Customer2V2.componentType \
-                                               RetailerV2.componentType \
-                                               WarehouseV2.componentType \
-                                               ShipperV2.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="RetailerV2.jar" />
-                                    <property name="manifest.file.name" value="osgi/Retailer.mf" />
-                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="RetailerJarV2.jar" />
-                                    <property name="manifest.file.name" value="osgi/RetailerJar.mf" />
-                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="ShipperV2.jar" />
-                                    <property name="manifest.file.name" value="osgi/Shipper.mf" />
-                                    <property name="sca.contribution" value="shipper-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="WarehouseV2.jar" />
-                                    <property name="manifest.file.name" value="osgi/Warehouse.mf" />
-                                    <property name="sca.contribution" value="warehouse-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="SupplyChainV2.jar" />
-                                    <property name="manifest.file.name" value="osgi/SupplyChain.mf" />
-                                    <property name="sca.contribution" value="supplychain-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/** \
-                                               supplychain.composite \
-                                               CustomerV2.componentType \
-                                               RetailerV2.componentType \
-                                               WarehouseV2.componentType \
-                                               ShipperV2.componentType \
-                                               CustomerV2.jar \
-                                               RetailerV2.jar \
-                                               WarehouseV2.jar \
-                                               ShipperV2.jar \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index fba9a109b3..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
+++ /dev/null
@@ -1,121 +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 supplychain;
-
-
-import java.lang.reflect.Field;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-
-
-/**
- * Common code for all OSGi bundles which don't use declarative services.
- * Registers services and sets references.
- */
-public class OSGiBundleImpl implements ServiceListener, BundleActivator {
-    
-
-    String name;
-    String serviceName;
-    String[] references;
-    Class<?>[] referenceClasses;
-    Field[] referenceFields;
-    
-    Class myClass;
-    
-	private BundleContext bundleContext;
-    
-    public OSGiBundleImpl(String serviceName, String... references) {
-        
-        myClass = this.getClass();
-        this.name = this.getClass().getSimpleName();
-        this.serviceName = serviceName;
-        this.references = references;
-        
-        try {
-            referenceClasses = new Class[references.length];
-            referenceFields = new Field[references.length];
-            for (int i = 0; i < references.length; i++) {
-                referenceFields[i] = this.getClass().getDeclaredField(references[i]);
-                referenceFields[i].setAccessible(true);
-                referenceClasses[i] = referenceFields[i].getType();
-            }
-            
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        
-    }
-    
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started OSGi bundle with activator " + name);
-    	
-    	this.bundleContext = bc;
-    	
-        bundleContext.registerService(serviceName, this, new Hashtable());
-        
-        for (int i = 0; i < references.length; i++) {
-
-            try {
-                
-    	        ServiceReference ref = bundleContext.getServiceReference(referenceClasses[i].getName());
-	            if (ref != null) {
-                    Object obj = bundleContext.getService(ref);
-                    referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                } else {
-				    String filter = "(objectclass=" + referenceClasses[i].getName() + ")";
-				    this.bundleContext.addServiceListener(this, filter);				
-	            }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    
-    public void stop(BundleContext bc)  {
-        System.out.println("Stop OSGi bundle with activator " + name);
-
-    }
-    
-
-	public void serviceChanged(ServiceEvent event) {
-		try {
-			if (event.getType() == ServiceEvent.REGISTERED) {
-                
-                ServiceReference ref = event.getServiceReference();
-                Object obj = bundleContext.getService(ref);
-                for (int i = 0; i < references.length; i++) {
-                    if (referenceClasses[i].isAssignableFrom(obj.getClass())) {
-                        referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                    }
-                }
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-    
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index b70ddede4f..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
+++ /dev/null
@@ -1,33 +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 supplychain.customer;
-
-import org.oasisopen.sca.annotation.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-    
-    public void purchaseGoods();
-    
-    @OneWay
-    public void notifyShipment(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 34b1b0e94f..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.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 supplychain.customer;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private Retailer retailer;
-    
-    public JavaCustomerComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                "(v2) using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setRetailer(Retailer retailer) {
-        this.retailer = retailer;
-    }
-    
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a1c7fce60a..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ /dev/null
@@ -1,51 +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 supplychain.customer;
-
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi declarative services implementation).
- */
-public class OSGiCustomerComponentImpl implements Customer {
-    
-
-    private Retailer retailer;
-    
-   
-    protected void setRetailer(Retailer retailer) {
-    	this.retailer = retailer;
-    }
-    
-    protected void unsetRetailer(Retailer retailer) {
-    	this.retailer = null;
-    }
-   
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 4647a716c7..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.customer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi procedural services implementation).
- */
-public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
-    
-    private Retailer retailer;
-    
-    public OSGiCustomerImpl() {
-        super("supplychain.customer.Customer", "retailer");
-                
-    }
-   
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index aa91ef663c..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,57 +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 supplychain.retailer;
-
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (POJO implementation).
- */
-@Service(Retailer.class)
-@Scope("STATELESS")
-public class JavaRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    public JavaRetailerComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                "(v2) using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setWarehouse(Warehouse warehouse) {
-        this.warehouse = warehouse;
-    }
-    
-       
-    public void submitOrder(String order) {
-    	
-        warehouse.fulfillOrder(order + ", submitted");
-        
-    }
-
-    
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index 1b7fb15bf1..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ /dev/null
@@ -1,46 +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 supplychain.retailer;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi declarative services implementation).
- */
-public class OSGiRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    
-    protected void setWarehouse(Warehouse warehouse) {
-    	this.warehouse = warehouse;
-    }
-    
-    protected void unsetWarehouse(Warehouse warehouse) {
-    	this.warehouse = null;
-    }
-    
-    public void submitOrder(String order) {
-    	
-        warehouse.fulfillOrder(order + ", submitted");
-       
-    }
-
-   
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e97331c06c..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.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 supplychain.retailer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi procedural services implementation).
- */
-public class OSGiRetailerImpl extends OSGiBundleImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    public OSGiRetailerImpl() {
-
-        super("supplychain.retailer.Retailer", "warehouse");
-    }
-    
-    public void submitOrder(String order) {
-        warehouse.fulfillOrder(order + ", submitted");        
-        
-    }
-
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
+++ /dev/null
@@ -1,28 +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 supplychain.retailer;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-    
-    public void submitOrder(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 32015b9b60..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.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 supplychain.shipper;
-
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (POJO implementation).
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-    
-    private Customer customer;
-    
-    public JavaShipperComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                "(v2) using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index 0f88cca213..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.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.    
- */
-package supplychain.shipper;
-
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi declarative services implementation).
- */
-public class OSGiShipperComponentImpl implements Shipper {
-
-    private Customer customer;
-    
-    
-    protected void setCustomer(Customer customer) {
-    	this.customer = customer;
-    }
-    
-    protected void unsetCustomer(Customer customer) {
-    	this.customer = null;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index f55a068ede..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ /dev/null
@@ -1,42 +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 supplychain.shipper;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi procedural services implementation).
- */
-public class OSGiShipperImpl extends OSGiBundleImpl implements Shipper {
-
-    private Customer customer;
-    
-    public OSGiShipperImpl() {
-    	super("supplychain.shipper.Shipper", "customer");
-    }
-    
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
+++ /dev/null
@@ -1,28 +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 supplychain.shipper;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-    
-    public void processShipment(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index c904f07693..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ /dev/null
@@ -1,51 +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 supplychain.warehouse;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (POJO implementation).
- */
-@Service(Warehouse.class)
-@Scope("STATELESS")
-public class JavaWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    public JavaWarehouseComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                "(v2) using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 600f3f0c74..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.warehouse;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (OSGi declarative services implementation).
- */
-
-public class OSGiWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-   
-    protected void setShipper(Shipper shipper) {
-    	this.shipper = shipper;
-    }
-    
-    protected void unsetShipper(Shipper shipper) {
-    	this.shipper = null;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-   
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index 0ba54b363a..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.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 supplychain.warehouse;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (OSGi procedural services implementation).
- */
-
-public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    public OSGiWarehouseImpl() {
-    	super("supplychain.warehouse.Warehouse", "shipper");
-    }
-    
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
+++ /dev/null
@@ -1,28 +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 supplychain.warehouse;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-    
-    public void fulfillOrder(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.customer.Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    

-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.customer.Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    

-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
deleted file mode 100644
index 4779eff514..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-   
-   <export.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-   
-   <import namespace="RetailerV2" location="RetailerV2" />
-   <import namespace="ShipperV2" location="ShipperV2" />
-   <import namespace="WarehouseV2" location="WarehouseV2" />
-   <export namespace="CustomerV2" />
-</contribution>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
deleted file mode 100644
index d505834f15..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ /dev/null
@@ -1,29 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export namespace="RetailerV2" />
-   
-   
-   <export.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-   
-</contribution>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
deleted file mode 100644
index 6bcf6cef0a..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ /dev/null
@@ -1,27 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export namespace="ShipperV2" />
-   
-   <export.java package="supplychain.shipper"/>
-   <import.java package="supplychain.customer"/>
-</contribution>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
deleted file mode 100644
index 210a68011f..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-</contribution>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
deleted file mode 100644
index e23e1a2ecd..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ /dev/null
@@ -1,28 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export namespace="WarehouseV2" />
-   
-   
-   <export.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-</contribution>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
deleted file mode 100644
index 9832da880e..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.retailer.Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-      

-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
deleted file mode 100644
index 5586179421..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.shipper.Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-      

-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
deleted file mode 100644
index ccc4f84ee4..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.warehouse.Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
deleted file mode 100644
index 644b207e70..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: supplychain.customer.Customer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.retailer;version="[2.0.0,3.0.0)",

-                supplychain.shipper;version="[2.0.0,3.0.0)",

-                supplychain.warehouse;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.customer;version="2.0.0"

-Bundle-Activator: supplychain.customer.OSGiCustomerImpl

-

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
deleted file mode 100644
index e649870356..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: supplychain.customer.Customer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,               

-                supplychain.retailer,

-                supplychain.shipper,

-                supplychain.warehouse

-Export-Package: supplychain.customer;version="2.0.0"

-Bundle-Activator: supplychain.customer.OSGiCustomerImpl

-

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
deleted file mode 100644
index 8e8e33ecd1..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: supplychain.retailer.Retailer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.retailer;version="2.0.0"

-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
deleted file mode 100644
index 2f4b56835b..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
+++ /dev/null
@@ -1 +0,0 @@
-Manifest-Version: 1.0

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
deleted file mode 100644
index 5f4a8b94ec..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: supplychain.shipper.Shipper

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.customer;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.shipper;version="2.0.0"

-Bundle-Activator: supplychain.shipper.OSGiShipperImpl

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
deleted file mode 100644
index 57d2ac9e4d..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: SupplyChain

-Bundle-SymbolicName: supplychain.SupplyChain

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework

-Export-Package: supplychain.customer;version="2.0.0",

-    supplychain.retailer;version="2.0.0",

-    supplychain.warehouse;version="2.0.0",

-    supplychain.shipper;version="2.0.0"

-Bundle-ClassPath: .,CustomerV2.jar,RetailerV2.jar,WarehouseV2.jar,ShipperV2.jar

-

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
deleted file mode 100644
index 2e1399bb3b..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: supplychain.warehouse.Warehouse

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.shipper;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.warehouse;version="2.0.0"

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
deleted file mode 100644
index bb8fb2b07c..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
+++ /dev/null
@@ -1,67 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponentV2">

-        <tuscany:implementation.osgi 

-            bundle="Customer" 

-            bundleSymbolicName="supplychain.customer.Customer"

-            bundleVersion="2.0.0"

-        />

-            

-        <!--implementation.java class="supplychain.customer.JavaCustomerComponentImpl" /-->

-        <reference name="retailer" target="RetailerComponentV2" />

-    </component>

-

-    <component name="RetailerComponentV2">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <!--implementation.osgi

-            bundle="Retailer" 

-            bundleLocation="file:target/Retailer.jar" 

-        /-->

-        <reference name="warehouse" target="WarehouseComponentV2"/>

-    </component>

-

-    <component name="WarehouseComponentV2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <!--implementation.osgi

-            bundle="Warehouse" 

-            bundleLocation="file:target/Warehouse.jar" 

-        /-->

-        <reference name="shipper" target="ShipperComponentV2" />

-    </component>

-

-    <component name="ShipperComponentV2">

-        <tuscany:implementation.osgi

-            bundle="Shipper"

-            bundleSymbolicName="supplychain.shipper.Shipper"

-            bundleVersion="2.0.0"

-        />

-        <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /-->

-        <reference name="customer" target="CustomerComponentV2" />

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/build-bundles.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes/build-bundles.xml
deleted file mode 100644
index 82d536cbfe..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/build-bundles.xml
+++ /dev/null
@@ -1,39 +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 name="OSGiBundleCreator">
-
-    <target name="create-bundles">
-
-        <mkdir dir="${jar.dir}"/>
-
-        <copy file="target/classes/META-INF/${sca.contribution}" tofile="target/classes/META-INF/sca-contribution.xml"/>
-
-
-        <jar jarfile="${jar.dir}/${jar.file.name}" manifest="${files.dir}/${manifest.file.name}" >
-            <fileset dir="${files.dir}" includes="${files.list}">
-                <!-- include name="${files.list}"/-->
-            </fileset>
-        </jar>
-
-        <delete file="target/classes/META-INF/sca-contribution.xml"/>
-    </target>
-
-
-</project>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/pom.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes/pom.xml
deleted file mode 100644
index b8524b90a7..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/pom.xml
+++ /dev/null
@@ -1,212 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-contribution-classes-v2</artifactId>
-    <name>Apache Tuscany OSGi Contribution Version 2 classes</name>
-
-<dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>itest-osgi-contribution-classes</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-bundles</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="CustomerV1.jar" />
-                                    <property name="manifest.file.name" value="osgi/Customer.mf" />
-                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               supplychain.composite \
-                                               CustomerV1.componentType \
-                                               RetailerV1.componentType \
-                                               WarehouseV1.componentType \
-                                               ShipperV1.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Customer2V1.jar" />
-                                    <property name="manifest.file.name" value="osgi/Customer2.mf" />
-                                    <property name="sca.contribution" value="customer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               supplychain.composite \
-                                               Customer2V1.componentType \
-                                               RetailerV1.componentType \
-                                               WarehouseV1.componentType \
-                                               ShipperV1.componentType \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="RetailerV1.jar" />
-                                    <property name="manifest.file.name" value="osgi/Retailer.mf" />
-                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="RetailerJarV1.jar" />
-                                    <property name="manifest.file.name" value="osgi/RetailerJar.mf" />
-                                    <property name="sca.contribution" value="retailer-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="ShipperV1.jar" />
-                                    <property name="manifest.file.name" value="osgi/Shipper.mf" />
-                                    <property name="sca.contribution" value="shipper-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="WarehouseV1.jar" />
-                                    <property name="manifest.file.name" value="osgi/Warehouse.mf" />
-                                    <property name="sca.contribution" value="warehouse-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/* \
-                                               supplychain/OSGiBundleImpl.class \
-                                               META-INF/sca-contribution.xml" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="SupplyChainV1.jar" />
-                                    <property name="manifest.file.name" value="osgi/SupplyChain.mf" />
-                                    <property name="sca.contribution" value="supplychain-sca-contribution.xml" />
-                                    <property name="files.list"
-                                        value="supplychain/** \
-                                               supplychain.composite \
-                                               CustomerV1.componentType \
-                                               RetailerV1.componentType \
-                                               WarehouseV1.componentType \
-                                               ShipperV1.componentType \
-                                               CustomerV1.jar \
-                                               RetailerV1.jar \
-                                               WarehouseV1.jar \
-                                               ShipperV1.jar \
-                                               META-INF/sca-contribution.xml" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index fba9a109b3..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
+++ /dev/null
@@ -1,121 +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 supplychain;
-
-
-import java.lang.reflect.Field;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-
-
-/**
- * Common code for all OSGi bundles which don't use declarative services.
- * Registers services and sets references.
- */
-public class OSGiBundleImpl implements ServiceListener, BundleActivator {
-    
-
-    String name;
-    String serviceName;
-    String[] references;
-    Class<?>[] referenceClasses;
-    Field[] referenceFields;
-    
-    Class myClass;
-    
-	private BundleContext bundleContext;
-    
-    public OSGiBundleImpl(String serviceName, String... references) {
-        
-        myClass = this.getClass();
-        this.name = this.getClass().getSimpleName();
-        this.serviceName = serviceName;
-        this.references = references;
-        
-        try {
-            referenceClasses = new Class[references.length];
-            referenceFields = new Field[references.length];
-            for (int i = 0; i < references.length; i++) {
-                referenceFields[i] = this.getClass().getDeclaredField(references[i]);
-                referenceFields[i].setAccessible(true);
-                referenceClasses[i] = referenceFields[i].getType();
-            }
-            
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        
-    }
-    
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started OSGi bundle with activator " + name);
-    	
-    	this.bundleContext = bc;
-    	
-        bundleContext.registerService(serviceName, this, new Hashtable());
-        
-        for (int i = 0; i < references.length; i++) {
-
-            try {
-                
-    	        ServiceReference ref = bundleContext.getServiceReference(referenceClasses[i].getName());
-	            if (ref != null) {
-                    Object obj = bundleContext.getService(ref);
-                    referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                } else {
-				    String filter = "(objectclass=" + referenceClasses[i].getName() + ")";
-				    this.bundleContext.addServiceListener(this, filter);				
-	            }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    
-    public void stop(BundleContext bc)  {
-        System.out.println("Stop OSGi bundle with activator " + name);
-
-    }
-    
-
-	public void serviceChanged(ServiceEvent event) {
-		try {
-			if (event.getType() == ServiceEvent.REGISTERED) {
-                
-                ServiceReference ref = event.getServiceReference();
-                Object obj = bundleContext.getService(ref);
-                for (int i = 0; i < references.length; i++) {
-                    if (referenceClasses[i].isAssignableFrom(obj.getClass())) {
-                        referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                    }
-                }
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-    
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index b70ddede4f..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ /dev/null
@@ -1,33 +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 supplychain.customer;
-
-import org.oasisopen.sca.annotation.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-    
-    public void purchaseGoods();
-    
-    @OneWay
-    public void notifyShipment(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 958d1cf111..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.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 supplychain.customer;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private Retailer retailer;
-    
-    public JavaCustomerComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setRetailer(Retailer retailer) {
-        this.retailer = retailer;
-    }
-    
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a1c7fce60a..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ /dev/null
@@ -1,51 +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 supplychain.customer;
-
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi declarative services implementation).
- */
-public class OSGiCustomerComponentImpl implements Customer {
-    
-
-    private Retailer retailer;
-    
-   
-    protected void setRetailer(Retailer retailer) {
-    	this.retailer = retailer;
-    }
-    
-    protected void unsetRetailer(Retailer retailer) {
-    	this.retailer = null;
-    }
-   
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 4647a716c7..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.customer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi procedural services implementation).
- */
-public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
-    
-    private Retailer retailer;
-    
-    public OSGiCustomerImpl() {
-        super("supplychain.customer.Customer", "retailer");
-                
-    }
-   
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index 9f1e8b63e5..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,57 +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 supplychain.retailer;
-
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (POJO implementation).
- */
-@Service(Retailer.class)
-@Scope("STATELESS")
-public class JavaRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    public JavaRetailerComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setWarehouse(Warehouse warehouse) {
-        this.warehouse = warehouse;
-    }
-    
-       
-    public void submitOrder(String order) {
-    	
-        warehouse.fulfillOrder(order + ", submitted");
-        
-    }
-
-    
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index 1b7fb15bf1..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ /dev/null
@@ -1,46 +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 supplychain.retailer;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi declarative services implementation).
- */
-public class OSGiRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    
-    protected void setWarehouse(Warehouse warehouse) {
-    	this.warehouse = warehouse;
-    }
-    
-    protected void unsetWarehouse(Warehouse warehouse) {
-    	this.warehouse = null;
-    }
-    
-    public void submitOrder(String order) {
-    	
-        warehouse.fulfillOrder(order + ", submitted");
-       
-    }
-
-   
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e97331c06c..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.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 supplychain.retailer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi procedural services implementation).
- */
-public class OSGiRetailerImpl extends OSGiBundleImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    public OSGiRetailerImpl() {
-
-        super("supplychain.retailer.Retailer", "warehouse");
-    }
-    
-    public void submitOrder(String order) {
-        warehouse.fulfillOrder(order + ", submitted");        
-        
-    }
-
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ /dev/null
@@ -1,28 +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 supplychain.retailer;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-    
-    public void submitOrder(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 5c8903fe5a..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.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 supplychain.shipper;
-
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (POJO implementation).
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-    
-    private Customer customer;
-    
-    public JavaShipperComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index 0f88cca213..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.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.    
- */
-package supplychain.shipper;
-
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi declarative services implementation).
- */
-public class OSGiShipperComponentImpl implements Shipper {
-
-    private Customer customer;
-    
-    
-    protected void setCustomer(Customer customer) {
-    	this.customer = customer;
-    }
-    
-    protected void unsetCustomer(Customer customer) {
-    	this.customer = null;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index f55a068ede..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ /dev/null
@@ -1,42 +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 supplychain.shipper;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi procedural services implementation).
- */
-public class OSGiShipperImpl extends OSGiBundleImpl implements Shipper {
-
-    private Customer customer;
-    
-    public OSGiShipperImpl() {
-    	super("supplychain.shipper.Shipper", "customer");
-    }
-    
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ /dev/null
@@ -1,28 +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 supplychain.shipper;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-    
-    public void processShipment(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index 7dd7adda6b..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ /dev/null
@@ -1,51 +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 supplychain.warehouse;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (POJO implementation).
- */
-@Service(Warehouse.class)
-@Scope("STATELESS")
-public class JavaWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    public JavaWarehouseComponentImpl() {
-        System.out.println("Created " + this.getClass().getCanonicalName() + 
-                " using classloader " + this.getClass().getClassLoader());
-    }
-    
-    @Reference
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 600f3f0c74..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.warehouse;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (OSGi declarative services implementation).
- */
-
-public class OSGiWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-   
-    protected void setShipper(Shipper shipper) {
-    	this.shipper = shipper;
-    }
-    
-    protected void unsetShipper(Shipper shipper) {
-    	this.shipper = null;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-   
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index 0ba54b363a..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.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 supplychain.warehouse;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (OSGi procedural services implementation).
- */
-
-public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    public OSGiWarehouseImpl() {
-    	super("supplychain.warehouse.Warehouse", "shipper");
-    }
-    
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ /dev/null
@@ -1,28 +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 supplychain.warehouse;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-    
-    public void fulfillOrder(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.customer.Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    

-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.customer.Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    

-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
deleted file mode 100644
index 828dc6f472..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ /dev/null
@@ -1,30 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-   <export.java package="supplychain.customer"/>
-   <import.java package="supplychain.retailer"/>
-   <import namespace="RetailerV1" location="RetailerV1" />
-   <import namespace="ShipperV1" location="ShipperV1" />
-   <import namespace="WarehouseV1" location="WarehouseV1" />
-   <export namespace="CustomerV1" />
-</contribution>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
deleted file mode 100644
index 9293b1ff52..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.retailer"/>
-   <import.java package="supplychain.warehouse"/>
-   <export namespace="RetailerV1" />
-</contribution>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
deleted file mode 100644
index 03077aa4d4..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.shipper"/>
-   <import.java package="supplychain.customer"/>
-   <export namespace="ShipperV1" />
-</contribution>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
deleted file mode 100644
index 210a68011f..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <deployable composite="supplychain:supplychain"/>
-</contribution>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
deleted file mode 100644
index c96deb4e1b..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://supplychain"
-              xmlns:supplychain="http://supplychain">
-   <export.java package="supplychain.warehouse"/>
-   <import.java package="supplychain.shipper"/>
-   <export namespace="WarehouseV1" />
-</contribution>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
deleted file mode 100644
index 9832da880e..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.retailer.Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-      

-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
deleted file mode 100644
index 5586179421..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.shipper.Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-      

-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
deleted file mode 100644
index ccc4f84ee4..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.warehouse.Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
deleted file mode 100644
index 404995a90f..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.retailer;version="[1.0.0,2.0.0)",

-                supplychain.warehouse;version="[1.0.0,2.0.0)",

-                supplychain.shipper;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.customer;version="1.0.0"

-Bundle-Activator: supplychain.customer.OSGiCustomerImpl

-

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
deleted file mode 100644
index 0441e8c6f0..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.retailer,

-                supplychain.shipper,

-                supplychain.warehouse

-Export-Package: supplychain.customer;version="1.0.0"

-Bundle-Activator: supplychain.customer.OSGiCustomerImpl

-

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
deleted file mode 100644
index ac0ca72030..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.retailer;version="1.0.0"

-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
deleted file mode 100644
index 2f4b56835b..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
+++ /dev/null
@@ -1 +0,0 @@
-Manifest-Version: 1.0

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
deleted file mode 100644
index 61f62fa16e..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.customer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.shipper;version="1.0.0"

-Bundle-Activator: supplychain.shipper.OSGiShipperImpl

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
deleted file mode 100644
index dc4aa2c30e..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: SupplyChain

-Bundle-SymbolicName: supplychain.SupplyChain

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework

-Export-Package: supplychain.customer;version="1.0.0",

-    supplychain.retailer;version="1.0.0",

-    supplychain.warehouse;version="1.0.0",

-    supplychain.shipper;version="1.0.0"

-Bundle-ClassPath: .,CustomerV1.jar,RetailerV1.jar,WarehouseV1.jar,ShipperV1.jar

-

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
deleted file mode 100644
index d149165366..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.shipper;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.warehouse;version="1.0.0"

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite b/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
deleted file mode 100644
index 4a18aed5f3..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
+++ /dev/null
@@ -1,66 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponent">

-        <!--tuscany:implementation.osgi 

-            bundle="Customer" 

-            bundleLocation="file:target/Customer.jar" 

-            scope="COMPOSITE"

-        /-->

-            

-        <implementation.java class="supplychain.customer.JavaCustomerComponentImpl" />

-        <reference name="retailer" target="RetailerComponent" />

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <!--implementation.osgi

-            bundle="Retailer" 

-            bundleLocation="file:target/Retailer.jar" 

-        /-->

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <!--implementation.osgi

-            bundle="Warehouse" 

-            bundleLocation="file:target/Warehouse.jar" 

-        /-->

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <!--tuscany:implementation.osgi

-            bundle="Shipper" 

-            bundleLocation="file:target/Shipper.jar" 

-        /-->

-        <implementation.java class="supplychain.shipper.JavaShipperComponentImpl" />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/pom.xml b/java/sca-contrib/itest/osgi-contribution/contribution-test/pom.xml
deleted file mode 100644
index 5ee3746bbb..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/pom.xml
+++ /dev/null
@@ -1,92 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-contribution-test</artifactId>
-    <name>Apache Tuscany OSGi Contribution tests</name>
-
-<dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.main</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.0.2</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java b/java/sca-contrib/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
deleted file mode 100644
index 108481fcbd..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
+++ /dev/null
@@ -1,73 +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.contribution.osgi;
-
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * OSGi Test Utils
- */
-public  class OSGiTestUtil  {
-    
-    public static BundleContext setUpOSGiTestRuntime() throws Exception {
-
-        setUpFelixTestRuntime();
-        return OSGiRuntime.getRuntime().getBundleContext();
-    }
-    
-    
-    public static void setUpFelixTestRuntime() throws Exception {
-
-        String felixConfigFileName = "file:target/test-classes/osgi/felix/felix.config.properties";
-        
-        System.setProperty("felix.config.properties", felixConfigFileName);
-        
-        try {
-            
-            ClassLoader cl = OSGiTestUtil.class.getClassLoader();
-            
-            Class felixMainClass = cl.loadClass("org.apache.felix.main.Main");
-            if (felixMainClass != null) {
-                String felixDir = felixMainClass.getProtectionDomain().getCodeSource().getLocation().getPath();
-                int index = 0;
-                if ((index = felixDir.indexOf("/org.apache.felix.main")) >= 0) {
-                    felixDir = felixDir.substring(0, index);
-                    System.setProperty("FELIX_DIR", felixDir);
-                }
-            }
-            
-        } catch (Exception e) {
-            // Ignore
-        }
-        
-        
-    }
-    
-    public static void shutdownOSGiRuntime()  {
-        try {
-            OSGiRuntime.stop();
-        
-        } catch (Exception e) {
-            // Ignore
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java b/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
deleted file mode 100644
index 28fe368663..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
+++ /dev/null
@@ -1,43 +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.contribution.osgi.test;
-
-
-/*
- * 
- * Supplychain using OSGi and non-OSGi contributions
- * 
- * 
- */
-
-public class MixedContributionTestCase extends SCAResolverTestCase {
-
-    @Override
-    protected void setUp() throws Exception {
-        
-
-        customerJarName = "Customer2";
-        retailerJarName = "RetailerJar";
-    
-        setUpOSGi();
-        setUpSCA();
-        
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java b/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
deleted file mode 100644
index be3b7365e5..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
+++ /dev/null
@@ -1,182 +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.contribution.osgi.test;
-
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.osgi.OSGiTestUtil;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-/*
- * 
- * Supplychain using OSGi contributions, with nested jar files and bundles used
- * by <implementation.java/> and <implementation.osgi/>
- * 
- * SupplyChain v1 is a bundle containing jar files which are used by <implementation.java/>
- * SupplyChain v2 is a bundle containing bundles which are used by <implementation.osgi/>
- */
-
-public class NestedBundleTestCase extends TestCase {
-
-
-    protected  EmbeddedSCADomain domain;
-    
-    private SupplyChain supplyChainV1;
-    private SupplyChain supplyChainV2;
-    
-    @Override
-    protected void setUp() throws Exception {
-    
-        setUpOSGi();
-        setUpSCA();
-    }
-        
-    protected void setUpOSGi() throws Exception {
-        OSGiTestUtil.setUpFelixTestRuntime();
-    }
-    
-    protected void setUpSCA() throws Exception {
-        //Create a test embedded SCA domain
-        ClassLoader cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        //Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-        supplyChainV1 = new SupplyChain("../contribution-classes/target/classes",
-                contributionService, "V1");
-        supplyChainV1.setUpSCA();
-
-        supplyChainV2 = new SupplyChain("../contribution-classes-v2/target/classes",
-                contributionService, "V2");
-        supplyChainV2.setUpSCA();
-    }
-
-	
-
-	@Override
-    public void tearDown() throws Exception {
-
-
-        supplyChainV1.tearDownSCA();
-        supplyChainV2.tearDownSCA();
-        
-        domain.stop();
-
-        domain.close();
-        
-        OSGiTestUtil.shutdownOSGiRuntime();
-	}
-
-    
-    @SuppressWarnings("unchecked")
-    public void test() throws Exception {
-        
-        ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
-        customerClassRef = supplyChainV1.supplychainContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
-        Class customerClass = customerClassRef.getJavaClass();
-        
-        Object customer = 
-            domain.getService(customerClass, "CustomerComponent");
-                
-        Method m = customerClass.getMethod("purchaseGoods");
-        m.invoke(customer);
-        
-        System.out.println("Sleeping ...");
-        Thread.sleep(1000);
-        
-        ClassReference customerClassRefV2 = new ClassReference("supplychain.customer.Customer");
-        customerClassRefV2 = supplyChainV2.supplychainContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRefV2);
-        Class customerClassV2 = customerClassRefV2.getJavaClass();
-        
-        Object customerV2 = 
-            domain.getService(customerClassV2, "CustomerComponentV2");
-                
-        Method mV2 = customerClassV2.getMethod("purchaseGoods");
-        mV2.invoke(customerV2);
-        
-        System.out.println("Sleeping ...");
-        Thread.sleep(2000);
-        
-        System.out.println("Test complete");
-        
-    }
-    
-    private class SupplyChain {
-        
-        private String folderName;
-        private ContributionService contributionService;
-        private String version;
-        
-        private Contribution supplychainContribution;
-        
-        
-        public SupplyChain(String folderName, ContributionService contributionService, String version) {
-            this.folderName = folderName;
-            this.contributionService = contributionService;
-            this.version = version;
-        }
-        
-        protected void setUpSCA() throws Exception {
-            File supplychainLocation = new File(folderName + "/SupplyChain" + version + ".jar");
-            URL supplychainContribURL = supplychainLocation.toURL();
-
-            
-            String supplychainURI = "SupplyChain" + version;
-
-            supplychainContribution = contributionService.contribute(
-                    supplychainURI, supplychainContribURL, true);
-            
-            for (Composite deployable : supplychainContribution.getDeployables()) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            // Start Components from my composite
-            for (Composite deployable : supplychainContribution.getDeployables() ) {
-                domain.getCompositeActivator().activate(deployable);
-                domain.getCompositeActivator().start(deployable);
-            }
-        }
-
-        public void tearDownSCA() throws Exception {
-            // Remove the contribution from the in-memory repository
-            contributionService.remove("SupplyChain" + version);
-            
-            // Stop Components from my composite
-            for (Composite deployable : supplychainContribution.getDeployables() ) {
-                domain.getCompositeActivator().stop(deployable);
-                domain.getCompositeActivator().deactivate(deployable);
-            }
-
-        }
-        
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java b/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
deleted file mode 100644
index 03372349f8..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
+++ /dev/null
@@ -1,257 +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.contribution.osgi.test;
-
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.Hashtable;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.osgi.OSGiTestUtil;
-import org.apache.tuscany.sca.contribution.osgi.impl.OSGiModelResolverImpl;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/*
- * 
- * Supplychain using OSGi contributions, using an OSGi ModelResolver
- * 
- * Notes:
- *    All OSGi bundle references should be resolvable using pure OSGi bundle mechanisms. No
- *    dummy bundles will be created to resolve combinations of OSGi and non-OSGi contributions
- *    
- *    All dependent OSGi contribution bundles should be installed before the referring contribution.
- *    Hence dependencies should be a tree and cannot contain cycles.
- *    
- *    For Jar files contained within OSGi bundles, Bundle-Classpath should be
- *    set so that standard OSGi class resolution is sufficient to resolve classes containing in
- *    nested jars or bundles.
- */
-
-public class OSGiResolverTestCase extends TestCase {
-
-
-    protected  EmbeddedSCADomain domain;
-    protected BundleContext bundleContext;
-    
-    private SupplyChain supplyChainV1;
-    private SupplyChain supplyChainV2;
-  
-    @Override
-    protected void setUp() throws Exception {
-    
-        setUpOSGi();
-        setUpSCA();
-    }
-        
-    protected void setUpOSGi() throws Exception {
-        bundleContext = OSGiTestUtil.setUpOSGiTestRuntime();
-    }
-    
-    protected void setUpSCA() throws Exception {
-        //Create a test embedded SCA domain
-        ClassLoader cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        //Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-        supplyChainV1 = new SupplyChain("../contribution-classes/target/classes",
-                contributionService, "V1");
-        supplyChainV1.setUpSCA();
-
-        supplyChainV2 = new SupplyChain("../contribution-classes-v2/target/classes",
-                contributionService, "V2");
-        supplyChainV2.setUpSCA();
-    }
-
-	
-
-	@Override
-    public void tearDown() throws Exception {
-
-
-        supplyChainV1.tearDownSCA();
-        supplyChainV2.tearDownSCA();
-        
-        domain.stop();
-
-        domain.close();
-        
-        OSGiTestUtil.shutdownOSGiRuntime();
-	}
-
-    
-    @SuppressWarnings("unchecked")
-    public void test() throws Exception {
-        
-        Class customerClass = supplyChainV1.customerBundle.loadClass("supplychain.customer.Customer");
-        
-        Object customer = 
-            domain.getService(customerClass, "CustomerComponent");
-                
-        Method m = customerClass.getMethod("purchaseGoods");
-        m.invoke(customer);
-        
-        System.out.println("Sleeping ...");
-        Thread.sleep(1000);
-        
-        Class customerClassV2 = supplyChainV2.customerBundle.loadClass("supplychain.customer.Customer");
-        
-        Object customerV2 = 
-            domain.getService(customerClassV2, "CustomerComponentV2");
-                
-        Method mV2 = customerClassV2.getMethod("purchaseGoods");
-        mV2.invoke(customerV2);
-        
-        System.out.println("Sleeping ...");
-        Thread.sleep(2000);
-        
-        System.out.println("Test complete");
-        
-    }
-    
-    private class SupplyChain {
-        
-        private String folderName;
-        private ContributionService contributionService;
-        private String version;
-        
-        private Bundle customerBundle;
-
-
-        private Contribution customerContribution;
-        private Contribution retailerContribution;
-        private Contribution warehouseContribution;
-        private Contribution shipperContribution;
-        
-        
-        public SupplyChain(String folderName, ContributionService contributionService, String version) {
-            this.folderName = folderName;
-            this.contributionService = contributionService;
-            this.version = version;
-        }
-        
-        protected void setUpSCA() throws Exception {
-            File customerLocation = new File(folderName + "/Customer" + version + ".jar");
-            URL customerContribURL = customerLocation.toURL();
-            File retailerLocation = new File(folderName + "/Retailer" + version + ".jar");
-            URL retailerContribURL = retailerLocation.toURL();
-            File warehouseLocation = new File(folderName + "/Warehouse" + version + ".jar");
-            URL warehouseContribURL = warehouseLocation.toURL();
-            File shipperLocation = new File(folderName + "/Shipper" + version + ".jar");
-            URL shipperContribURL = shipperLocation.toURL();
-            
-            customerBundle = bundleContext.installBundle(customerContribURL.toString());
-            Bundle retailerBundle = bundleContext.installBundle(retailerContribURL.toString());
-            Bundle warehouseBundle = bundleContext.installBundle(warehouseContribURL.toString());
-            Bundle shipperBundle = bundleContext.installBundle(shipperContribURL.toString());
-                
-            Hashtable<String,Bundle> bundles = new Hashtable<String,Bundle>();
-            bundles.put("Customer" + version + ".jar", customerBundle);
-            bundles.put("Retailer" + version + ".jar", retailerBundle);
-            bundles.put("Warehouse" + version + ".jar", warehouseBundle);
-            bundles.put("Shipper" + version + ".jar", shipperBundle);
-            
-            ModelResolver customerResolver = new OSGiModelResolverImpl(bundles);
-            
-            bundles = new Hashtable<String,Bundle>();
-            bundles.put("Retailer" + version + ".jar", retailerBundle);
-            ModelResolver retailerResolver = new OSGiModelResolverImpl(bundles);
-            
-            bundles = new Hashtable<String,Bundle>();
-            bundles.put("Warehouse" + version + ".jar", warehouseBundle);
-            ModelResolver warehouseResolver = new OSGiModelResolverImpl(bundles);
-            
-            bundles = new Hashtable<String,Bundle>();
-            bundles.put("Shipper" + version + ".jar", shipperBundle);
-            ModelResolver shipperResolver = new OSGiModelResolverImpl(bundles);
-
-
-            shipperContribution = contributionService.contribute(
-                        "Shipper" + version,
-                        shipperContribURL, shipperResolver, false);
-            warehouseContribution = contributionService.contribute(
-                        "Warehouse" + version,
-                        warehouseContribURL, warehouseResolver, false);
-            retailerContribution = contributionService.contribute(
-                        "Retailer" + version,
-                        retailerContribURL, retailerResolver, false);                
-               
-            customerContribution = contributionService.contribute(
-                        "Customer" + version,
-                        customerContribURL, customerResolver, false);
-             
-            for (Composite deployable : customerContribution.getDeployables()) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-
-            for (Composite deployable : retailerContribution.getDeployables() ) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            for (Composite deployable : warehouseContribution.getDeployables() ) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            for (Composite deployable : shipperContribution.getDeployables() ) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            // Start Components from my composite
-            for (Composite deployable : customerContribution.getDeployables() ) {
-                domain.getCompositeActivator().activate(deployable);
-                domain.getCompositeActivator().start(deployable);
-            }
-        }
-
-        public void tearDownSCA() throws Exception {
-            // Remove the contribution from the in-memory repository
-            contributionService.remove("Customer" + version);
-            contributionService.remove("Retailer" + version);
-            contributionService.remove("Warehouse" + version);
-            contributionService.remove("Shipper" + version);
-
-
-            // Stop Components from my composite
-            for (Composite deployable : customerContribution.getDeployables() ) {
-                domain.getCompositeActivator().stop(deployable);
-                domain.getCompositeActivator().deactivate(deployable);
-            }
-
-        }
-        
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java b/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
deleted file mode 100644
index a2b3a7bc92..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
+++ /dev/null
@@ -1,240 +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.contribution.osgi.test;
-
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.osgi.OSGiTestUtil;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-/*
- * 
- * Supplychain using OSGi contributions, using default SCA resolver
- * 
- *    This test uses two sets of four contributions where each set contains a bundle corresponding
- *    to the four components of supplychain (customer, retailer, warehouse and shipper).
- *    Tests classes from the bundle used in <implementation.java/>, and the bundles themselves
- *    used as the bundle in <implementation.osgi/>.
- * 
- * Notes:
- *    All OSGi bundle references should be resolvable using pure OSGi bundle mechanisms. No
- *    dummy bundles will be created to resolve combinations of OSGi and non-OSGi contributions
- *    
- *    Notes:
- *    All OSGi bundle references should be resolvable using pure OSGi bundle mechanisms. No
- *    dummy bundles will be created to resolve combinations of OSGi and non-OSGi contributions
- *    
- *    All dependent OSGi contribution bundles should be installed before the referring contribution.
- *    Hence dependencies should be a tree and cannot contain cycles.
- *    
- *    For Jar files contained within OSGi bundles, Bundle-Classpath should be
- *    set so that standard OSGi class resolution is sufficient to resolve classes containing in
- *    nested jars or bundles.
- */
-
-public class SCAResolverTestCase extends TestCase {
-
-
-    protected  EmbeddedSCADomain domain;
-    
-    private SupplyChain supplyChainV1;
-    private SupplyChain supplyChainV2;
-    
-    
-    protected String customerJarName = "Customer";
-    protected String retailerJarName = "Retailer";
-    protected String warehouseJarName = "Warehouse";
-    protected String shipperJarName = "Shipper";
-    
-    
-    
-    @Override
-    protected void setUp() throws Exception {
-    
-        setUpOSGi();
-        setUpSCA();
-    }
-        
-    protected void setUpOSGi() throws Exception {
-       OSGiTestUtil.setUpFelixTestRuntime();
-    }
-    
-    protected void setUpSCA() throws Exception {
-        //Create a test embedded SCA domain
-        ClassLoader cl = getClass().getClassLoader();
-        domain = new EmbeddedSCADomain(cl, "http://localhost");
-
-        //Start the domain
-        domain.start();
-
-        // Contribute the SCA contribution
-        ContributionService contributionService = domain.getContributionService();
-        supplyChainV1 = new SupplyChain("../contribution-classes/target/classes",
-                contributionService, "V1");
-        supplyChainV1.setUpSCA();
-
-        supplyChainV2 = new SupplyChain("../contribution-classes-v2/target/classes",
-                contributionService, "V2");
-        supplyChainV2.setUpSCA();
-    }
-
-	
-
-	@Override
-    public void tearDown() throws Exception {
-
-
-        supplyChainV1.tearDownSCA();
-        supplyChainV2.tearDownSCA();
-        
-        domain.stop();
-
-        domain.close();
-        
-        OSGiTestUtil.shutdownOSGiRuntime();
-	}
-
-    
-    @SuppressWarnings("unchecked")
-    public void test() throws Exception {
-        
-        ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
-        customerClassRef = supplyChainV1.customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
-        Class customerClass = customerClassRef.getJavaClass();
-        
-        Object customer = 
-            domain.getService(customerClass, "CustomerComponent");
-                
-        Method m = customerClass.getMethod("purchaseGoods");
-        m.invoke(customer);
-        
-        System.out.println("Sleeping ...");
-        Thread.sleep(1000);
-        
-        ClassReference customerClassRefV2 = new ClassReference("supplychain.customer.Customer");
-        customerClassRefV2 = supplyChainV2.customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRefV2);
-        Class customerClassV2 = customerClassRefV2.getJavaClass();
-        
-        Object customerV2 = 
-            domain.getService(customerClassV2, "CustomerComponentV2");
-                
-        Method mV2 = customerClassV2.getMethod("purchaseGoods");
-        mV2.invoke(customerV2);
-        
-        System.out.println("Sleeping ...");
-        Thread.sleep(2000);
-        
-        System.out.println("Test complete");
-        
-    }
-    
-    private class SupplyChain {
-        
-        private String folderName;
-        private ContributionService contributionService;
-        private String version;
-        
-        private Contribution customerContribution;
-        private Contribution retailerContribution;
-        private Contribution warehouseContribution;
-        private Contribution shipperContribution;
-        
-        
-        public SupplyChain(String folderName, ContributionService contributionService, String version) {
-            this.folderName = folderName;
-            this.contributionService = contributionService;
-            this.version = version;
-        }
-        
-        protected void setUpSCA() throws Exception {
-            File customerLocation = new File(folderName + "/" + customerJarName + version + ".jar");
-            URL customerContribURL = customerLocation.toURL();
-            File retailerLocation = new File(folderName + "/" + retailerJarName + version + ".jar");
-            URL retailerContribURL = retailerLocation.toURL();
-            File warehouseLocation = new File(folderName + "/" + warehouseJarName + version + ".jar");
-            URL warehouseContribURL = warehouseLocation.toURL();
-            File shipperLocation = new File(folderName + "/" + shipperJarName + version + ".jar");
-            URL shipperContribURL = shipperLocation.toURL();
-            
-            shipperContribution = contributionService.contribute("Shipper"
-                    + version, shipperContribURL, true);
-            warehouseContribution = contributionService.contribute("Warehouse"
-                    + version, warehouseContribURL, true);
-            retailerContribution = contributionService.contribute("Retailer"
-                    + version, retailerContribURL, true);
-            customerContribution = contributionService.contribute("Customer"
-                    + version, customerContribURL, true);
-            
-
-            for (Composite deployable : customerContribution.getDeployables()) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-
-            for (Composite deployable : retailerContribution.getDeployables() ) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            for (Composite deployable : warehouseContribution.getDeployables() ) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            for (Composite deployable : shipperContribution.getDeployables() ) {
-                domain.getDomainComposite().getIncludes().add(deployable);
-                domain.buildComposite(deployable);
-            }
-            
-            // Start Components from my composite
-            for (Composite deployable : customerContribution.getDeployables() ) {
-                domain.getCompositeActivator().activate(deployable);
-                domain.getCompositeActivator().start(deployable);
-            }
-        }
-
-        public void tearDownSCA() throws Exception {
-            // Remove the contribution from the in-memory repository
-            contributionService.remove("Customer" + version);
-            contributionService.remove("Retailer" + version);
-            contributionService.remove("Warehouse" + version);
-            contributionService.remove("Shipper" + version);
-
-
-            // Stop Components from my composite
-            for (Composite deployable : customerContribution.getDeployables() ) {
-                domain.getCompositeActivator().stop(deployable);
-                domain.getCompositeActivator().deactivate(deployable);
-            }
-
-        }
-        
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
deleted file mode 100644
index ea8d272a0c..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
+++ /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.    
-#
-#
-# Framework config properties.
-#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.0.0, \
- org.osgi.service.url; version=1.0.0 \
- org.osgi.util.tracker; version=1.3.2 
-
-
-felix.auto.start.1= \     
-    "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" \
-    "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar" 
-
-# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \
-# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \
-# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \
-
-felix.startlevel.framework=1
-felix.startlevel.bundle=1
-
-#
-# Bundle config properties.
-#
-org.osgi.service.http.port=8080
-obr.shell.telnet=on
diff --git a/java/sca-contrib/itest/osgi-contribution/pom.xml b/java/sca-contrib/itest/osgi-contribution/pom.xml
deleted file mode 100644
index 85656d9702..0000000000
--- a/java/sca-contrib/itest/osgi-contribution/pom.xml
+++ /dev/null
@@ -1,52 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-contribution-osgi</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany OSGi Contribution Tests</name>
-
-    <modules>
-        <module>contribution-classes</module>
-        <module>contribution-classes-v2</module>
-        <module>contribution-test</module>
-    </modules>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/osgi-implementation/build-bundles.xml b/java/sca-contrib/itest/osgi-implementation/build-bundles.xml
deleted file mode 100644
index 53bf014546..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/build-bundles.xml
+++ /dev/null
@@ -1,48 +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 name="OSGiBundleCreator">
-
-    <target name="create-bundles">
-
-        <mkdir dir="${jar.dir}"/>
-
-        <jar jarfile="${jar.dir}/${jar.file.name}" manifest="${files.dir}/${manifest.file.name}" >
-            <fileset dir="${files.dir}" includes="${files.list}">
-                <!-- include name="${files.list}"/-->
-            </fileset>
-        </jar>
-    </target>
-
-    <!-- Add a file to a jar file, into a different path in the jar file -->
-    <target name="update-bundle">
-
-        <copy overwrite="true" todir="${files.dir}/${target.dir}" >
-            <fileset dir="${files.dir}/${source.dir}" includes="${files.list}" />
-        </copy>
-        <jar update="true" jarfile="${jar.dir}/${jar.file.name}" >
-            <fileset dir="${files.dir}" includes="${files.list}" />
-        </jar>
-        <delete>
-            <fileset dir="${files.dir}/${target.dir}" includes="${files.list}" />
-        </delete>
-    </target>
-
-
-</project>
diff --git a/java/sca-contrib/itest/osgi-implementation/pom.xml b/java/sca-contrib/itest/osgi-implementation/pom.xml
deleted file mode 100644
index 4fbc4258d0..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/pom.xml
+++ /dev/null
@@ -1,1220 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-implementation</artifactId>
-    <name>Apache Tuscany SCA OSGi-SCA Integration Tests</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.main</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>1.0.1</version>
-            <!-- Exclude the javax.servlet to avoid conflict -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>javax.servlet</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.0.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-lib</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-            <finalName>itest-osgi-implementation</finalName>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.0</version>
-                    <executions>
-                        <execution>
-                            <id>add-source</id>
-                            <phase>generate-sources</phase>
-                            <goals>
-                                <goal>add-test-source</goal>
-                            </goals>
-                            <configuration>
-                                <sources>
-                                    <source>target/sdo-source</source>
-                                </sources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.tuscany.sdo</groupId>
-                    <artifactId>tuscany-sdo-plugin</artifactId>
-                    <version>1.1.1</version>
-                    <executions>
-                        <execution>
-                            <id>generate-helloworld-sdo</id>
-                            <phase>generate-sources</phase>
-                            <configuration>
-                                <schemaFile>${basedir}/src/main/resources/sdo/ds/helloworld.wsdl</schemaFile>
-                                <javaPackage>helloworld.sdo</javaPackage>
-                                <prefix>Helloworld</prefix>
-                                <noNotification>true</noNotification>
-                                <noContainer>true</noContainer>
-                                <noUnsettable>true</noUnsettable>
-                            </configuration>
-                            <goals>
-                                <goal>generate</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.1</version>
-
-                    <dependencies>
-                        <dependency>
-                            <groupId>ant</groupId>
-                            <artifactId>ant-trax</artifactId>
-                            <version>1.6.5</version>
-                        </dependency>
-                    </dependencies>                    
-            
-                    <executions>
-                        <execution>
-                            <id>create-bundles</id>
-                            <phase>generate-test-sources</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <tasks>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/customer/OSGiCustomerImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/retailer/OSGiRetailerImpl.class \
-                                                    supplychain/retailer/OSGiRetailerServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/shipper/OSGiShipperImpl.class \
-                                                    supplychain/shipper/OSGiShipperServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/Warehouse.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/ds/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    osgi/wiring/ds/Customer.xml \
-                                                    supplychain/customer/OSGiCustomerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/ds/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    osgi/wiring/ds/Retailer1.xml \
-                                                    osgi/wiring/ds/Retailer2.xml \
-                                                    supplychain/retailer/OSGiRetailerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/ds/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    osgi/wiring/ds/Shipper1.xml \
-                                                    osgi/wiring/ds/Shipper2.xml \
-                                                    supplychain/shipper/OSGiShipperComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/wiring/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/wiring/ds/Warehouse.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    osgi/wiring/ds/Warehouse1.xml \
-                                                    osgi/wiring/ds/Warehouse2.xml \
-                                                    supplychain/warehouse/OSGiWarehouseComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/customer/OSGiCustomerImpl.class \
-                                                    supplychain/customer/OSGiStatelessCustomerImpl.class \
-                                                    supplychain/customer/OSGiCustomerFactoryImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/retailer/OSGiRetailerImpl.class \
-                                                    supplychain/retailer/OSGiRetailerServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/shipper/OSGiShipperImpl.class \
-                                                    supplychain/shipper/OSGiShipperServiceImpl.class \
-                                                    supplychain/shipper/OSGiStatelessShipperServiceImpl.class \
-                                                    supplychain/shipper/OSGiShipperFactoryImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/ds/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    osgi/factory/ds/Customer.xml \
-                                                    supplychain/customer/OSGiStatelessCustomerComponentImpl.class \
-                                                    supplychain/customer/OSGiCustomerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/ds/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    osgi/factory/ds/Retailer1.xml \
-                                                    osgi/factory/ds/Retailer2.xml \
-                                                    supplychain/retailer/OSGiRetailerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/ds/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    osgi/factory/ds/Shipper1.xml \
-                                                    osgi/factory/ds/Shipper2.xml \
-                                                    supplychain/shipper/OSGiStatelessShipperComponentImpl.class \
-                                                    supplychain/shipper/OSGiShipperComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/factory/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/factory/ds/Warehouse.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    osgi/factory/ds/Warehouse.xml \
-                                                    supplychain/warehouse/OSGiWarehouseComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/customer/OSGiCustomerImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/retailer/OSGiRetailerImpl.class \
-                                                    supplychain/retailer/OSGiRetailerServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/shipper/OSGiShipperImpl.class \
-                                                    supplychain/shipper/OSGiShipperServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/Warehouse.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/ds/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    osgi/services/ds/Customer.xml \
-                                                    supplychain/customer/OSGiCustomerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/ds/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    osgi/services/ds/Retailer1.xml \
-                                                    osgi/services/ds/Retailer2.xml \
-                                                    supplychain/retailer/OSGiRetailerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/ds/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    osgi/services/ds/Shipper1.xml \
-                                                    osgi/services/ds/Shipper2.xml \
-                                                    supplychain/shipper/OSGiShipperComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/services/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/services/ds/Warehouse.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    osgi/services/ds/Warehouse1.xml \
-                                                    osgi/services/ds/Warehouse2.xml \
-                                                    supplychain/warehouse/OSGiWarehouseComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/interfaces" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/interfaces/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/customer/OSGiCustomerWithQueryImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/interfaces" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/interfaces/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/retailer/RetailerQuery.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/retailer/OSGiRetailerWithQueryImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/interfaces" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/interfaces/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/shipper/OSGiShipperImpl.class \
-                                                    supplychain/shipper/OSGiShipperServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/interfaces/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/interfaces/ds/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    osgi/interfaces/ds/Customer.xml \
-                                                    supplychain/customer/OSGiCustomerWithQueryComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/interfaces/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/interfaces/ds/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/retailer/RetailerQuery.class \
-                                                    osgi/interfaces/ds/Retailer.xml \
-                                                    supplychain/retailer/OSGiRetailerWithQueryComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/interfaces/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/interfaces/ds/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    osgi/interfaces/ds/Shipper.xml \
-                                                    supplychain/shipper/OSGiShipperComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Customer1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/customer/OSGiVersionedCustomerImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Retailer1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/retailer/OSGiVersionedRetailerImpl.class \
-                                                    supplychain/retailer/OSGiVersionedRetailerServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Shipper1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/shipper/OSGiVersionedShipperImpl.class \
-                                                    supplychain/shipper/OSGiVersionedShipperServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Warehouse1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Customer2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/customer/OSGiVersionedCustomerImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Retailer2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/retailer/OSGiVersionedRetailerImpl.class \
-                                                    supplychain/retailer/OSGiVersionedRetailerServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Shipper2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/shipper/OSGiVersionedShipperImpl.class \
-                                                    supplychain/shipper/OSGiVersionedShipperServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/Warehouse2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Customer1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    osgi/version/ds/CustomerV1.xml \
-                                                    supplychain/customer/OSGiCustomerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Customer2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Customer2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    osgi/version/ds/CustomerV2.xml \
-                                                    supplychain/customer/OSGiCustomerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Retailer1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    osgi/version/ds/Retailer1V1.xml \
-                                                    osgi/version/ds/Retailer2V1.xml \
-                                                    supplychain/retailer/OSGiRetailerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Retailer2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Retailer2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    osgi/version/ds/Retailer1V2.xml \
-                                                    osgi/version/ds/Retailer2V2.xml \
-                                                    supplychain/retailer/OSGiRetailerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Shipper1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    osgi/version/ds/Shipper1V1.xml \
-                                                    osgi/version/ds/Shipper2V1.xml \
-                                                    supplychain/shipper/OSGiShipperComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Shipper2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Shipper2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    osgi/version/ds/Shipper1V2.xml \
-                                                    osgi/version/ds/Shipper2V2.xml \
-                                                    supplychain/shipper/OSGiShipperComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse1.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Warehouse1.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    osgi/version/ds/Warehouse1V1.xml \
-                                                    osgi/version/ds/Warehouse2V1.xml \
-                                                    supplychain/warehouse/OSGiWarehouseComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/version/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Warehouse2.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/version/ds/Warehouse2.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    osgi/version/ds/Warehouse1V2.xml \
-                                                    osgi/version/ds/Warehouse2V2.xml \
-                                                    supplychain/warehouse/OSGiWarehouseComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/ws" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="HelloWorld.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/ws/HelloWorld.mf" />
-                                    <property name="files.list"
-                                        value="helloworld/HelloWorld.class \
-                                                    helloworld/OSGiHelloWorldImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/passbyref" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="Greetings.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/passbyref/Greetings.mf" />
-                                    <property name="files.list"
-                                        value="helloworld/Greetings.class \
-                                                    helloworld/OSGiGreetingsImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/callback" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="CallbackClient.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/callback/CallbackClient.mf" />
-                                    <property name="files.list"
-                                        value="callback/client/CallbackClient.class \
-                                                    callback/client/CallbackCallback.class \
-                                                    callback/client/OSGiCallbackClientImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/callback" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="CallbackService.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/callback/CallbackService.mf" />
-                                    <property name="files.list"
-                                        value="callback/service/CallbackService.class \
-                                                    callback/service/OSGiCallbackServiceImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/conversation" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="ConversationalClient.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/conversation/ConversationalClient.mf" />
-                                    <property name="files.list"
-                                        value="conversation/client/ConversationalClientStatefulImpl.class \
-                                                    conversation/client/ConversationalClientStatelessImpl.class \
-                                                    conversation/client/ConversationalCallback.class \
-                                                    conversation/client/ConversationalClient.class \
-                                                    conversation/client/ConversationalClientServiceFactory.class \
-                                                    conversation/client/ConversationalClientActivator.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/conversation" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="ConversationalReferenceClient.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/conversation/ConversationalReferenceClient.mf" />
-                                    <property name="files.list"
-                                        value="conversation/referenceclient/ConversationalReferenceClient.class \
-                                                    conversation/referenceclient/ConversationalReferenceClientImpl.class \
-                                                    conversation/referenceclient/ConversationalReferenceClientActivator.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/conversation" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="ConversationalService.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/conversation/ConversationalService.mf" />
-                                    <property name="files.list"
-                                        value="conversation/service/ConversationalService.class \
-                                                    conversation/service/ConversationalServiceStatefulImpl.class \
-                                                    conversation/service/ConversationalServiceStatelessImpl.class
-                                                    conversation/service/ConversationalServiceFactory.class \
-                                                    conversation/service/ConversationalServiceActivator.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/conversation" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="ConversationalService.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/conversation/ConversationalService.mf" />
-                                    <property name="files.list"
-                                        value="conversation/ConversationalService.class \
-                                                    conversation/ConversationalServiceStatefulImpl.class \
-                                                    conversation/ConversationalServiceStatelessImpl.class
-                                                    conversation/ConversationalServiceFactory.class \
-                                                    conversation/OSGiConversationTestActivator.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/properties" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="StockQuote.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/properties/StockQuote.mf" />
-                                    <property name="files.list"
-                                        value="stockquote/StockQuote.class \
-                                                    stockquote/OSGiStockQuoteImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/properties/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="StockQuote.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/properties/ds/StockQuote.mf" />
-                                    <property name="files.list"
-                                        value="stockquote/StockQuote.class \
-                                                    osgi/properties/ds/StockQuote.xml \
-                                                    stockquote/OSGiStockQuoteComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/properties" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="StockQuoteFactory.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/properties/StockQuoteFactory.mf" />
-                                    <property name="files.list"
-                                        value="stockquote/StockQuote.class \
-                                                    stockquote/OSGiStockQuoteImpl.class \
-                                                    stockquote/OSGiStockQuoteFactoryImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/properties/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="StockQuoteFactory.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/properties/ds/StockQuoteFactory.mf" />
-                                    <property name="files.list"
-                                        value="stockquote/StockQuote.class \
-                                                    osgi/properties/ds/StockQuoteFactory.xml \
-                                                    stockquote/OSGiStockQuoteComponentImpl.class" />
-              
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/sdo/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="HelloWorldService.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/sdo/ds/HelloWorldService.mf" />
-                                    <property name="files.list"
-                                        value="helloworld/sdo/HelloWorldService.class \
-                                               osgi/sdo/ds/HelloWorldService.xml \
-                                               helloworld/sdo/impl/* \
-                                               helloworld/sdo/Name.class \
-                                               helloworld/sdo/getGreetings* \
-                                               helloworld/sdo/HelloworldFactory.class \
-                                               helloworld/sdo/HelloWorldServiceComponent.class" />
-              
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="create-bundles">
-                                    <property name="jar.dir"
-                                        value="target/classes/sdo/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="HelloWorldClient.jar" />
-                                    <property name="manifest.file.name"
-                                        value="osgi/sdo/ds/HelloWorldClient.mf" />
-                                    <property name="files.list"
-                                        value="helloworld/sdo/client/HelloWorldClient.class \
-                                               osgi/sdo/ds/HelloWorldClient.xml \
-                                               sdo/ds/helloworldsdo.composite \
-                                               helloworld/sdo/client/HelloWorldClientComponent.class" />
-              
-                                </ant>
-                                <ant antfile="./build-bundles.xml"
-                                    target="update-bundle">
-                                    <property name="jar.dir"
-                                        value="target/classes/sdo/ds" />
-                                    <property name="files.dir"
-                                        value="target/classes" />
-                                    <property name="jar.file.name"
-                                        value="HelloWorldClient.jar" />
-                                    <property name="source.dir"
-                                        value="sdo/ds" />
-                                    <property name="target.dir"
-                                        value="." />
-                                    <property name="files.list"
-                                        value="HelloWorldClient.componentType \
-                                               HelloWorldService.componentType \
-                                               META-INF/sca-contribution.xml" />
-              
-                                </ant>
-
-                                </tasks>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
deleted file mode 100644
index 37e750d7ec..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
+++ /dev/null
@@ -1,33 +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 callback.client;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-/*
- * Callback interface
- */
-public interface CallbackCallback {
-
-    public void callbackMessage(String aString);
-
-    public void callbackIncrement(String aString);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
deleted file mode 100644
index 9c145ff59f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.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 callback.client;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-/**
- * Callback test client interface
- */
-public interface CallbackClient {
-
-    public void run();
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
deleted file mode 100644
index b1bb8c2aa0..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
+++ /dev/null
@@ -1,141 +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 callback.client;
-
-import junit.framework.Assert;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import callback.service.CallbackService;
-
-@Service(CallbackClient.class)
-/**
- * Callback test client implementation
- */
-public class JavaCallbackClientImpl implements CallbackClient, CallbackCallback {
-
-	@Reference
-    protected CallbackService callbackService;
-	
-    private static String returnMessage = null;
-    private static int callbackCount = 0;
-    private static Object monitor = new Object();
-
-    public void run() {
-
-        // This tests basic callback patterns.
-
-        // Test1 is the basic callback where the target calls back prior to
-        // returning to the client.
-        test1a();
-
-        // Test2 is where the target does not call back to the client.
-        test1b();
-
-        // Test3 is where the target calls back multiple times to the client.
-        test1c();
-
-        return;
-    }
-
-    private void test1a() {
-        callbackService.knockKnock("Knock Knock");
-        int count = 0;
-
-        // 
-        // If we cant get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallbackITest - test1a", "Who's There", this.getReturnMessage());
-
-    }
-
-    private void test1b() {
-        callbackService.noCallback("No Reply Desired");
-        Assert.assertEquals("CallbackITest - test1b", 1, 1);
-
-        return;
-    }
-
-    private void test1c() {
-        callbackService.multiCallback("Call me back 3 times");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (this.getCallbackCount() < 3 && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallbackITest - test1c", 3, this.getCallbackCount());
-        return;
-    }
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    public int getCallbackCount() {
-        return callbackCount;
-    }
-
-    public void incrementCallbackCount() {
-        callbackCount++;
-    }
-
-    public void callbackMessage(String aString) {
-        System.out.println("Entering callback callbackMessage: " + aString);
-        synchronized (monitor) {
-            this.setReturnMessage(aString);
-            monitor.notify();
-        }
-    }
-
-    public void callbackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        synchronized (monitor) {
-            this.incrementCallbackCount();
-            monitor.notify();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
deleted file mode 100644
index 1c65ca573b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
+++ /dev/null
@@ -1,181 +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 callback.client;
-
-import java.util.Hashtable;
-
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-import callback.service.CallbackService;
-
-/**
- * OSGi Callback test client implementation
- */
-public class OSGiCallbackClientImpl implements 
-        CallbackClient, CallbackCallback, BundleActivator {
-
-    protected CallbackService callbackService;
-    
-    private static String returnMessage = null;
-    private static int callbackCount = 0;
-    private static Object monitor = new Object();
-    
-    private BundleContext bundleContext;
-
-    public void run() {
-        
-        // This tests basic callback patterns.
-
-        // Test1 is the basic callback where the target calls back prior to
-        // returning to the client.
-        test1a();
-
-        // Test2 is where the target does not call back to the client.
-        test1b();
-
-        // Test3 is where the target calls back multiple times to the client.
-        test1c();
-
-        return;
-    }
-    
-   
-
-    private void test1a() {
-        callbackService.knockKnock("Knock Knock");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        if (!"Who's There".equals(this.getReturnMessage())) {
-           throw new RuntimeException("CallbackITest - test1a");
-        }
-
-    }
-
-    private void test1b() {
-        callbackService.noCallback("No Reply Desired");
-
-        return;
-    }
-
-    private void test1c() {
-        callbackService.multiCallback("Call me back 3 times");
-        int count = 0;
-
-        // 
-        // If we can't get a response in 30 seconds consider this a failure
-        // 
-
-        synchronized (monitor) {
-            while (this.getCallbackCount() < 3 && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        if (this.getCallbackCount() != 3)
-            throw new RuntimeException("CallbackITest - test1c");
-        return;
-    }
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    public int getCallbackCount() {
-        return callbackCount;
-    }
-
-    public void incrementCallbackCount() {
-        callbackCount++;
-    }
-
-    public void callbackMessage(String aString) {
-        System.out.println("Entering callback callbackMessage: " + aString);
-        synchronized (monitor) {
-            this.setReturnMessage(aString);
-            monitor.notify();
-        }
-    }
-
-    public void callbackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        synchronized (monitor) {
-            this.incrementCallbackCount();
-            monitor.notify();
-        }
-    }
-
-    
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiCallbackClientImpl bundle ");
-        
-        this.bundleContext = bc;
-        
-        Hashtable<String, Object> serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.service.name", "CallbackClient/CallbackClient");
-
-        serviceProps.put("component.name", "CallbackClient");        
-        bundleContext.registerService("callback.client.CallbackClient", this, serviceProps);
-        
-        Hashtable<String, Object> callbackProps = new Hashtable<String, Object>();
-        callbackProps.put("component.service.name", "CallbackClient/callbackService");
-        callbackProps.put("component.name", "CallbackClient");
-        
-        bundleContext.registerService("callback.client.CallbackCallback", this, callbackProps);
-        
-        ServiceReference ref= bundleContext.getServiceReference("callback.service.CallbackService");
-        
-        if (ref != null)
-            callbackService = (callback.service.CallbackService)bundleContext.getService(ref);
-        
-        
-        
-      
-    }
-    
-    public void stop(BundleContext bc)  {
-    }
-    
-  
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
deleted file mode 100644
index 958b0bf266..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
+++ /dev/null
@@ -1,39 +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 callback.service;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-
-import callback.client.CallbackCallback;
-
-@Remotable
-@Callback(CallbackCallback.class)
-/*
- * Callback service interface
- */
-public interface CallbackService {
-
-    public void knockKnock(String aString);
-
-    public void noCallback(String aString);
-
-    public void multiCallback(String aString);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
deleted file mode 100644
index 88fd845acd..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.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 callback.service;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Service;
-
-import callback.client.CallbackCallback;
-
-@Service(CallbackService.class)
-/*
- * Callback service implementation
- */
-public class JavaCallbackServiceImpl implements CallbackService {
-
-    private CallbackCallback callback;
-    
-    @Callback
-    protected void setCallback(CallbackCallback callback) {
-        this.callback = callback;
-    }
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        callback.callbackMessage("Who's There");
-        System.out.println("CallbackServiceImpl response sent");
-        return;
-
-    }
-
-    public void multiCallback(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        callback.callbackIncrement("Who's There 1");
-        System.out.println("CallbackServiceImpl response sent");
-        callback.callbackIncrement("Who's There 2");
-        System.out.println("CallbackServiceImpl response sent");
-        callback.callbackIncrement("Who's There 3");
-        System.out.println("CallbackServiceImpl response sent");
-        return;
-
-    }
-
-    public void noCallback(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        // System.out.println("CallbackServiceImpl No response desired");
-        return;
-
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
deleted file mode 100644
index 21753cc33b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
+++ /dev/null
@@ -1,95 +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 callback.service;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.oasisopen.sca.annotation.Callback;
-
-import callback.client.CallbackCallback;
-
-/*
- * OSGi Callback service implementation
- */
-public class OSGiCallbackServiceImpl implements CallbackService, BundleActivator {
-
-    @Callback
-    protected CallbackCallback callback;
-    
-    
-    private BundleContext bundleContext;
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        callback.callbackMessage("Who's There");
-        System.out.println("CallbackServiceImpl response sent");
-        return;
-
-    }
-
-    public void multiCallback(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        callback.callbackIncrement("Who's There 1");
-        System.out.println("CallbackServiceImpl response sent");
-        callback.callbackIncrement("Who's There 2");
-        System.out.println("CallbackServiceImpl response sent");
-        callback.callbackIncrement("Who's There 3");
-        System.out.println("CallbackServiceImpl response sent");
-        return;
-
-    }
-
-    public void noCallback(String aString) {
-
-        System.out.println("CallbackServiceImpl message received: " + aString);
-        // System.out.println("CallbackServiceImpl No response desired");
-        return;
-
-    }
-    
-
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiCallbackServiceImpl bundle ");
-        
-        this.bundleContext = bc;
-        
-        Hashtable<String, Object> serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.service.name", "CallbackService/CallbackService");
-        bundleContext.registerService("callback.service.CallbackService", this, serviceProps);
-        
-       
-        ServiceReference ref= bundleContext.getServiceReference("callback.client.CallbackCallback");
-        
-        if (ref != null)
-            callback = (CallbackCallback)bundleContext.getService(ref);
-        
-    }
-    
-    public void stop(BundleContext bc)  {
-    }
-    
-    
-  
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
deleted file mode 100644
index acef7fbf6a..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
+++ /dev/null
@@ -1,50 +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 conversation.client;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.EndsConversation;
-import org.oasisopen.sca.annotation.Remotable;
-
-
-/**
- * The callback interface used when testing conversational callbacks
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-@Conversational
-public interface ConversationalCallback {
-	
-    public void init();
-    
-    public void destroy();
-    
-    public void initializeCount(int count);
-    
-    public void incrementCount();
-    
-    public int retrieveCount();
-    
-    public void businessException() throws Exception;        
-    
-    @EndsConversation
-    public String endConversation();
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
deleted file mode 100644
index 19b2fed53e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
+++ /dev/null
@@ -1,51 +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 conversation.client;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The client for the conversational itest. Is implemented by clients
- * offering both stateless and stateful callbacks
- *
- * @version $Rev$ $Date$
- */
-
-@Remotable
-public interface ConversationalClient { 
-	
-	public int runConversationFromInjectedReference(); 	
-	public int runConversationFromServiceReference();
-	public int runConversationWithUserDefinedConversationId();
-	public String runConversationCheckUserDefinedConversationId();	
-	public int runConversationCheckingScope();
-	public int runConversationWithCallback(); 
-	public int runConversationHavingPassedReference();
-	public String runConversationBusinessException();
-	public String runConversationBusinessExceptionCallback();
-	public int runConversationCallingEndedConversation();
-	public int runConversationCallingEndedConversationCallback();
-	public int runConversationAgeTimeout();
-	public int runConversationIdleTimeout();
-	public int runConversationPrincipleError();	
-    
-    public String getCalls();
-    public String getServiceCalls();
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
deleted file mode 100644
index 5eb16be597..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
+++ /dev/null
@@ -1,105 +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 conversation.client;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-
-import conversation.client.ConversationalCallback;
-import conversation.client.ConversationalClient;
-import conversation.client.ConversationalClientStatefulImpl;
-import conversation.client.ConversationalClientStatelessImpl;
-
-/*
- * OSGi bundle activator for conversation tests
- */
-public class ConversationalClientActivator implements BundleActivator, ServiceListener {
-
-   
-    private BundleContext bundleContext;
-
-
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiConversationClientActivator ");
-        
-        this.bundleContext = bc;
-        
-        bc.addServiceListener(this);
-        
-        Hashtable<String, Object> serviceProps;
-        
-        serviceProps = new Hashtable<String, Object>();
-         
-        serviceProps.put("component.name", "ConversationalStatelessClientStatelessService");
-        Object statelessClientFactory1 = 
-            new ConversationalClientServiceFactory(ConversationalClientStatelessImpl.class, bundleContext, 1);
-        bundleContext.registerService(
-                new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()},
-                statelessClientFactory1, 
-                serviceProps);
-      
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalStatelessClientStatefulService");       
-        Object statelessClientFactory2 = 
-            new ConversationalClientServiceFactory(ConversationalClientStatelessImpl.class, bundleContext, 2);
-        bundleContext.registerService(
-                new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()},
-                statelessClientFactory2,
-                serviceProps);
-        
-            
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalStatefulClientStatelessService");
-        Object statefulClientFactory1 = 
-            new ConversationalClientServiceFactory(ConversationalClientStatefulImpl.class, bundleContext, 3);
-        bundleContext.registerService(
-                new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()},
-                statefulClientFactory1, 
-                serviceProps);
-        
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalStatefulClientStatefulService");
-        Object statefulClientFactory2 = 
-            new ConversationalClientServiceFactory(ConversationalClientStatefulImpl.class, bundleContext, 4);
-        bundleContext.registerService(
-                new String[] {ConversationalClient.class.getName(), ConversationalCallback.class.getName()},
-                statefulClientFactory2, 
-                serviceProps);
-      
-        
-    }
-    
-    
-    
-    public void stop(BundleContext bc)  {
-    }
-
-    public void serviceChanged(ServiceEvent event) {
-        
-        if (event.getType() == ServiceEvent.REGISTERED) {
-            
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
deleted file mode 100644
index 8479624546..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
+++ /dev/null
@@ -1,135 +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 conversation.client;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-
-import conversation.client.ConversationalClientStatefulImpl;
-import conversation.client.ConversationalClientStatelessImpl;
-import conversation.referenceclient.ConversationalReferenceClient;
-import conversation.service.ConversationalService;
-
-public class ConversationalClientServiceFactory implements ServiceFactory {
-    
-    private Class<?> clazz;
-    private BundleContext bundleContext;
-    private int serviceNum;
-    
-    public ConversationalClientServiceFactory(Class<?> clazz, BundleContext bundleContext, int serviceNum) {
-        this.clazz = clazz;
-        this.bundleContext = bundleContext;
-        this.serviceNum = serviceNum;
-    }
-
-    public Object getService(Bundle bundle, ServiceRegistration reg) {
-
-
-        try {
-            Object instance = clazz.newInstance();
-            
-            ConversationalClientStatelessImpl statelessClient = null;
-            ConversationalClientStatefulImpl statefulClient = null;
-            
-            if (serviceNum == 1 || serviceNum == 2) {
-                
-                ServiceReference ref = bundleContext.getServiceReference(ConversationalReferenceClient.class.getName());
-                statelessClient  = (ConversationalClientStatelessImpl)instance;
-                statelessClient.conversationalReferenceClient = 
-                    (ConversationalReferenceClient)bundleContext.getService(ref);
-            }
-            if (serviceNum == 1) {
-                
-                ServiceReference ref = getServiceReference(ConversationalService.class.getName(), 
-                    "(component.name=ConversationalServiceStateless)");
-                statelessClient.conversationalService = (ConversationalService)bundleContext.getService(ref);
-                
-            }
-            
-            if (serviceNum == 2) {
-                
-                ServiceReference ref = getServiceReference(ConversationalService.class.getName(), 
-                    "(component.name=ConversationalServiceStateful)");
-                statelessClient.conversationalService = (ConversationalService)bundleContext.getService(ref);
-                
-            }
-            
-
-            if (serviceNum == 3 || serviceNum == 4) {
-                
-                ServiceReference ref = bundleContext.getServiceReference(ConversationalReferenceClient.class.getName());
-                statefulClient  = (ConversationalClientStatefulImpl)instance;
-                statefulClient.conversationalReferenceClient = 
-                    (ConversationalReferenceClient)bundleContext.getService(ref);
-            }
-            if (serviceNum == 3) {
-                
-                ServiceReference ref = getServiceReference(ConversationalService.class.getName(), 
-                    "(component.name=ConversationalServiceStateless)");
-                statefulClient.conversationalService = (ConversationalService)bundleContext.getService(ref);
-                
-            }
-            
-            if (serviceNum == 4) {
-                
-                ServiceReference ref = getServiceReference(ConversationalService.class.getName(), 
-                    "(component.name=ConversationalServiceStateful)");
-                statefulClient.conversationalService = (ConversationalService)bundleContext.getService(ref);
-                
-            }
-            
-            return instance;
-        } catch (Exception e) {
-            
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public void ungetService(Bundle bundle, ServiceRegistration reg, Object obj) {
-    	
-    }
-    
-    private ServiceReference getServiceReference(String name, String filter) throws Exception {
-        
-        ServiceReference refs[] = bundleContext.getServiceReferences(name, filter);
-        ServiceReference ref = refs[0];
-        int ranking = 0;
-        if (ref.getProperty(Constants.SERVICE_RANKING) instanceof Integer)
-            ranking = (Integer)ref.getProperty(Constants.SERVICE_RANKING);
-        for (int i = 1; i < refs.length; i++) {
-            int thisranking = 0;
-            if (refs[i].getProperty(Constants.SERVICE_RANKING) instanceof Integer) {
-                thisranking = (Integer)refs[i].getProperty(Constants.SERVICE_RANKING);
-            }
-            if (thisranking > ranking) {
-                ref = refs[i];
-                ranking = thisranking;
-            }
-        }
-        
-        return ref;
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
deleted file mode 100644
index ed1f12de44..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
+++ /dev/null
@@ -1,254 +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 conversation.client;
-
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.ConversationAttributes;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import conversation.referenceclient.ConversationalReferenceClient;
-import conversation.service.ConversationalService;
-
-/**
- * The client for the conversational itest which presents a stateful
- * callback interface
- *
- * @version $Rev$ $Date$
- */
-
-@Service(interfaces={ConversationalClient.class})
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
-                        maxIdleTime="5 minutes",
-                        singlePrincipal=false)
-public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback {
-    
-    @Context
-    protected ComponentContext componentContext;
-    
-    protected ConversationalService conversationalService;
-    
-    protected ConversationalReferenceClient conversationalReferenceClient;
-      
-    private int clientCount = 0;
-    private int callbackCount = 0;  
-    
-    
-    // a static member variable that records the number of times this service is called
-    public static StringBuffer calls = new StringBuffer();        
-	
-    // From ConversationalClient
-	public int runConversationFromInjectedReference(){
-	    calls.append("runConversationFromInjectedReference,");	    
-	    conversationalService.initializeCount(1);
-	    conversationalService.incrementCount();
-	    clientCount = conversationalService.retrieveCount();
-	    conversationalService.endConversation();
-	    
-	    return clientCount;
-	}
-    public int runConversationFromServiceReference(){
-        calls.append("runConversationFromServiceReference,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }	
-    public int runConversationWithUserDefinedConversationId(){
-        calls.append("runConversationWithUserDefinedConversationId,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");
-        serviceReference.setConversationID("MyConversation1");
-        
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }    
-    public String runConversationCheckUserDefinedConversationId(){
-        calls.append("runConversationCheckUserDefinedConversationId,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");
-        serviceReference.setConversationID("MyConversation2");
-        
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        return callableReference.endConversation();
-              
-    }      
-    public int runConversationCheckingScope(){
-        calls.append("runConversationCheckingScope,");
-        // run a conversation
-        return runConversationFromInjectedReference();
-        
-        // test will then use a static method to find out how many times 
-        // init/destroy were called
-    }    
-	public int runConversationWithCallback(){
-	    calls.append("runConversationWithCallback,");
-	    callbackCount = 2;
-        conversationalService.initializeCountCallback(1);
-        conversationalService.incrementCountCallback();
-        clientCount = conversationalService.retrieveCountCallback();
-        conversationalService.endConversationCallback();
-        
-        return clientCount;
-    } 
-    public int runConversationHavingPassedReference(){
-        calls.append("runConversationHavingPassedReference,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");       
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        conversationalReferenceClient.incrementCount(serviceReference);
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        serviceReference.getConversation().end();
-        
-        return clientCount;
-    }
-    public String runConversationBusinessException(){
-        calls.append("runConversationbusinessException,");      
-        try {
-            conversationalService.initializeCount(1);
-            conversationalService.businessException();
-            clientCount = conversationalService.retrieveCount();
-            conversationalService.endConversation();
-        } catch(Exception ex) {
-            return ex.getMessage();
-        }
-         
-        return "No Exception Returned";
-    }
-    
-    public String runConversationBusinessExceptionCallback(){
-        calls.append("runConversationbusinessExceptionCallback,");
-        try {
-            conversationalService.initializeCountCallback(1);
-            conversationalService.businessExceptionCallback();
-            clientCount = conversationalService.retrieveCountCallback();
-            conversationalService.endConversationCallback();
-        } catch(Exception ex) {
-            return ex.getMessage();
-        }
-         
-        return "No Exception Returned";
-    }   
-    
-    public int runConversationCallingEndedConversation(){
-        calls.append("runConversationCallingEndedConversation,");
-        conversationalService.initializeCount(1);
-        conversationalService.endConversation();
-        return conversationalService.retrieveCount();
-    }   
-    
-    public int runConversationCallingEndedConversationCallback(){
-        calls.append("runConversationCallingEndedConversationCallback,");
-        conversationalService.initializeCountCallback(1);
-        conversationalService.endConversationCallback();
-        return conversationalService.retrieveCountCallback();
-    }  
-    
-    public int runConversationAgeTimeout(){
-        calls.append("runConversationAgeTimeout,");
-        // done in other testing
-        return clientCount;
-    }
-    public int runConversationIdleTimeout(){
-        calls.append("runConversationIdleTimeout,");
-        // done in other testing
-        return clientCount;
-    }
-    public int runConversationPrincipleError(){
-        calls.append("runConversationPrincipleError,");
-        // TODO - when policy framework is done
-        return clientCount;
-    }
-    
-    
-    // From ConversationalCallback
-    @Init
-    public void init(){
-        calls.append("init,");
-    }
-    
-    @Destroy
-    public void destroy(){
-        calls.append("destroy,"); 
-    }
-    
-    public void initializeCount(int count){
-        calls.append("initializeCount,");
-        callbackCount += count;
-    }
-    
-    public void incrementCount(){
-        calls.append("incrementCount,");
-        callbackCount++;
-    }
-    
-    public int retrieveCount(){
-        calls.append("retrieveCount,");
-        return  callbackCount;
-    }
-    
-    public void businessException() throws Exception {
-        throw new Exception("Business Exception");
-    }     
-    
-    public String endConversation(){
-        calls.append("endConversation,");
-        callbackCount = 0;
-        return null;
-    }
-    
-    public String getCalls() {
-        return calls.toString();
-    }
-
-    public String getServiceCalls() {
-        return conversationalService.getCalls().toString();
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
deleted file mode 100644
index e0f8c51262..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
+++ /dev/null
@@ -1,253 +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 conversation.client;
-
-
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import conversation.referenceclient.ConversationalReferenceClient;
-import conversation.service.ConversationalService;
-
-/**
- * The client for the conversational itest which presents a stateful
- * callback interface
- *
- * @version $Rev$ $Date$
- */
-
-@Service(interfaces={ConversationalClient.class})
-@Scope("STATELESS")
-public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback {
-   
-    @Context
-    protected ComponentContext componentContext;
-    
-    @Reference 
-    protected ConversationalService conversationalService;
-    
-    @Reference
-    protected ConversationalReferenceClient conversationalReferenceClient;
-    
-    private int clientCount = 0;
-    private int callbackCount = 0;
-    
-    // a static member variable that records the number of times this service is called
-    public static StringBuffer calls = new StringBuffer();    
-	
-    // From ConversationalClient
-    public int runConversationFromInjectedReference(){
-        calls.append("runConversationFromInjectedReference,");
-        conversationalService.initializeCount(1);
-        conversationalService.incrementCount();
-        clientCount = conversationalService.retrieveCount();
-        conversationalService.endConversation();
-        
-        return clientCount;
-    }
-    public int runConversationFromServiceReference(){
-        calls.append("runConversationFromServiceReference,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");       
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }   
-    public int runConversationWithUserDefinedConversationId(){
-        calls.append("runConversationWithUserDefinedConversationId,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");       
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }    
-    public String runConversationCheckUserDefinedConversationId(){
-        calls.append("runConversationCheckUserDefinedConversationId,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");
-        serviceReference.setConversationID("MyConversation2");
-        
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        clientCount = callableReference.retrieveCount();
-        return callableReference.endConversation();
-              
-    }     
-    public int runConversationCheckingScope(){
-        calls.append("runConversationCheckingScope,");
-        // run a conversation
-        return runConversationFromInjectedReference();
-        
-        // test will then use a static method to find out how many times 
-        // init/destroy were called
-    }
-    public int runConversationWithCallback(){
-        calls.append("runConversationWithCallback,");
-        conversationalService.initializeCountCallback(1);
-        conversationalService.incrementCountCallback();
-        clientCount = conversationalService.retrieveCountCallback();
-        conversationalService.endConversationCallback();
-        
-        return clientCount;
-    } 
-    
-    public int runConversationHavingPassedReference(){
-        calls.append("runConversationHavingPassedReference,");
-        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
-                                                                                                        "conversationalService");       
-        ConversationalService callableReference = serviceReference.getService();
-        
-        callableReference.initializeCount(1);
-        callableReference.incrementCount();
-        conversationalReferenceClient.incrementCount(serviceReference);
-        clientCount = callableReference.retrieveCount();
-        callableReference.endConversation();
-        
-        // serviceReference.getConversation().end();
-        
-        return clientCount;
-    }	
-    
-	public String runConversationBusinessException(){
-	    calls.append("runConversationbusinessException,");	    
-	    try {
-            conversationalService.initializeCount(1);
-            conversationalService.businessException();
-            clientCount = conversationalService.retrieveCount();
-            conversationalService.endConversation();
-	    } catch(Exception ex) {
-	        return ex.getMessage();
-	    }
-         
-        return "No Exception Returned";
-    }
-	
-    public String runConversationBusinessExceptionCallback(){
-        calls.append("runConversationbusinessExceptionCallback,");
-        try {
-            conversationalService.initializeCountCallback(1);
-            conversationalService.businessExceptionCallback();
-            clientCount = conversationalService.retrieveCountCallback();
-            conversationalService.endConversationCallback();
-        } catch(Exception ex) {
-            return ex.getMessage();
-        }
-         
-        return "No Exception Returned";
-    }	
-	
-    public int runConversationCallingEndedConversation(){
-        calls.append("runConversationCallingEndedConversation,");
-        conversationalService.initializeCount(1);
-        conversationalService.endConversation();
-        return conversationalService.retrieveCount();
-    }   
-    
-    public int runConversationCallingEndedConversationCallback(){
-        calls.append("runConversationCallingEndedConversationCallback,");
-        conversationalService.initializeCountCallback(1);
-        conversationalService.endConversationCallback();
-        return conversationalService.retrieveCountCallback();
-    }   
-    
-    public int runConversationAgeTimeout(){
-        calls.append("runConversationAgeTimeout,");
-        // done in other testing
-        return clientCount;
-    }
-    public int runConversationIdleTimeout(){
-        calls.append("runConversationIdleTimeout,");
-        // done in other testing
-        return clientCount;
-    }
-    public int runConversationPrincipleError(){
-        calls.append("runConversationPrincipleError,");
-        // TODO - when policy framework is done
-        return clientCount;
-    }
-    
-    
-    // From ConversationalCallback
-    @Init
-    public void init(){
-        calls.append("init,");
-
-    }
-    
-    @Destroy
-    public void destroy(){
-        calls.append("destroy,");
-        
-    }
-    
-    public void initializeCount(int count){
-        calls.append("initializeCount,");
-        callbackCount = 0;
-    }
-    
-    public void incrementCount(){
-        calls.append("incrementCount,");
-        callbackCount++;
-    }
-    
-    public int retrieveCount(){
-        calls.append("retrieveCount,");
-        return  callbackCount;
-    }
-    
-    public void businessException() throws Exception {
-        throw new Exception("Business Exception");
-    }     
-    
-    public String endConversation(){
-        calls.append("endConversation,");
-        return null;
-    }
-    
-    public String getCalls() {
-        return calls.toString();
-    }
-    
-    public String getServiceCalls() {
-        return conversationalService.getCalls().toString();
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
deleted file mode 100644
index 9b8049164a..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
+++ /dev/null
@@ -1,38 +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 conversation.referenceclient;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.annotation.Remotable;
-
-import conversation.service.ConversationalService;
-
-/**
- * The client that calls into an existing conversation by accepting
- * a reference to that conversation
- *
- * @version $Rev$ $Date$
- */
-
-@Remotable
-public interface ConversationalReferenceClient { 
-	
-    public void incrementCount(CallableReference<ConversationalService> conversationalService);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
deleted file mode 100644
index ff6f16cba3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
+++ /dev/null
@@ -1,66 +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 conversation.referenceclient;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-
-/*
- * OSGi bundle activator for conversation tests
- */
-public class ConversationalReferenceClientActivator implements BundleActivator, ServiceListener {
-
-   
-    private BundleContext bundleContext;
-
-
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiConversationReferenceClientActivator ");
-        
-        this.bundleContext = bc;
-        
-        bc.addServiceListener(this);
-        
-        Hashtable<String, Object> serviceProps;
-        
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalReferenceClient");
-        ConversationalReferenceClientImpl refClient = new ConversationalReferenceClientImpl();
-        bundleContext.registerService(ConversationalReferenceClient.class.getName(), refClient, serviceProps);
-        
-    }
-    
-    
-    
-    public void stop(BundleContext bc)  {
-    }
-
-    public void serviceChanged(ServiceEvent event) {
-        
-        if (event.getType() == ServiceEvent.REGISTERED) {
-            
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
deleted file mode 100644
index d6d6bcf4b1..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.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.    
- */
-package conversation.referenceclient;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.Service;
-
-import conversation.service.ConversationalService;
-
-/**
- * A client component that accepts a reference to an ongoing conversation
- * and takes part in that conversation
- *
- * @version $Rev$ $Date$
- */
-
-@Service(interfaces={ConversationalReferenceClient.class})
-@AllowsPassByReference
-public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{
-   
-    public void incrementCount(CallableReference<ConversationalService> conversationalService){
-        ConversationalService callableReference = conversationalService.getService();
-        
-        callableReference.incrementCount();        
-    }
-
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
deleted file mode 100644
index 1966bc76a4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
+++ /dev/null
@@ -1,65 +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 conversation.service;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.EndsConversation;
-import org.oasisopen.sca.annotation.Remotable;
-
-import conversation.client.ConversationalCallback;
-
-
-/**
- * The service interface used when testing conversations
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-@Conversational
-@Callback(ConversationalCallback.class)
-public interface ConversationalService {
-	
-    public void init();
-    
-    public void destroy();
-    
-    public void initializeCount(int count);
-    
-    public void incrementCount();
-    
-    public int retrieveCount();
-    
-    public void businessException() throws Exception;        
-    
-    public void initializeCountCallback(int count);
-    
-    public void incrementCountCallback();
-    
-    public int retrieveCountCallback();
-    
-    public void businessExceptionCallback() throws Exception;    
-    
-    @EndsConversation
-    public String endConversation();
-    
-    public String endConversationCallback();
-
-    public String getCalls();
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
deleted file mode 100644
index 903f8bf229..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.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 conversation.service;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-
-
-/*
- * OSGi bundle activator for conversation tests
- */
-public class ConversationalServiceActivator implements BundleActivator, ServiceListener {
-
-   
-    private BundleContext bundleContext;
-
-
-    public void start(BundleContext bc) throws Exception {
-        
-        System.out.println("Started OSGiConversationServiceActivator ");
-        
-        this.bundleContext = bc;
-        
-        bc.addServiceListener(this);
-        
-        Hashtable<String, Object> serviceProps;
-        
-        serviceProps = new Hashtable<String, Object>();
-       
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalServiceStateful");
-        Object statefulService = 
-            new ConversationalServiceFactory(ConversationalServiceStatefulImpl.class);
-        bundleContext.registerService(ConversationalService.class.getName(), statefulService, serviceProps);
-        
-        serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "ConversationalServiceStateless");
-        ConversationalServiceStatelessImpl statelessService = new ConversationalServiceStatelessImpl();
-        bundleContext.registerService(ConversationalService.class.getName(), statelessService, serviceProps);
-        
-        
-    }
-    
-    
-    
-    public void stop(BundleContext bc)  {
-    }
-
-    public void serviceChanged(ServiceEvent event) {
-        
-        if (event.getType() == ServiceEvent.REGISTERED) {
-            
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
deleted file mode 100644
index fe8bd23f07..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.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 conversation.service;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-
-public class ConversationalServiceFactory implements ServiceFactory {
-    
-    private Class<?> clazz;
-    
-    public ConversationalServiceFactory(Class<?> clazz) {
-        this.clazz = clazz;
-    }
-
-    public Object getService(Bundle bundle, ServiceRegistration reg) {
-
-        try {
-            return clazz.newInstance();
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-       
-    }
-
-    public void ungetService(Bundle bundle, ServiceRegistration reg, Object obj) {
-    	
-    }
-    
-   
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
deleted file mode 100644
index 96b23e771c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
+++ /dev/null
@@ -1,121 +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 conversation.service;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.ConversationAttributes;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import conversation.client.ConversationalCallback;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev$ $Date$
- */
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
-                        maxIdleTime="5 minutes",
-                        singlePrincipal=false)
-public class ConversationalServiceStatefulImpl implements ConversationalService {
-
-    @ConversationID
-    protected String conversationId;
-    
-    @Callback
-    protected ConversationalCallback conversationalCallback; 
-    
-    // local count - accumulates during the conversation
-    private int count = 0;
-          
-    // a static member variable that records the number of times this service is called
-    public static StringBuffer calls = new StringBuffer();
-   
-    @Init
-    public void init(){
-        calls.append("init,");
-    }
-    
-    @Destroy
-    public void destroy(){
-        calls.append("destroy,");
-    }
-    
-    public void initializeCount(int count){
-        calls.append("initializeCount,");       
-        this.count = count;
-    }
-    
-    public void incrementCount(){
-        calls.append("incrementCount,");        
-        count++;
-    }
-    
-    public int retrieveCount(){
-        calls.append("retrieveCount,"); 
-        return count;
-    }
-    
-    public void businessException() throws Exception {
-        throw new Exception("Business Exception");
-    }     
-    
-    public void initializeCountCallback(int count){
-        calls.append("initializeCountCallback,"); 
-        this.count = count;
-        conversationalCallback.initializeCount(count);
-    }
-    
-    public void incrementCountCallback(){
-        calls.append("incrementCountCallback,"); 
-        count++;
-        conversationalCallback.incrementCount();
-    }
-    
-    public int retrieveCountCallback(){
-        calls.append("retrieveCountCallback,"); 
-        return conversationalCallback.retrieveCount();
-    }
-    
-    public void businessExceptionCallback() throws Exception {
-        calls.append("businessExceptionCallback,");        
-        conversationalCallback.businessException();
-    }    
-    
-    public String endConversation(){
-        calls.append("endConversation,"); 
-        count = 0;
-        return conversationId;
-    }
-    
-    public String endConversationCallback(){
-        calls.append("endConversationCallback,"); 
-        return conversationalCallback.endConversation();
-    }
-    
-    public String getCalls() {
-        return calls.toString();
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
deleted file mode 100644
index 9147c0ffa2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
+++ /dev/null
@@ -1,127 +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 conversation.service;
-
-import java.util.HashMap;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import conversation.client.ConversationalCallback;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev$ $Date$
- */
-@Service(ConversationalService.class)
-@Scope("STATELESS")
-public class ConversationalServiceStatelessImpl implements ConversationalService {
-    
-    @ConversationID
-    protected String conversationId;
-    
-    @Callback
-    protected ConversationalCallback conversationalCallback; 
-    
-    // static area in which to hold conversational data
-    private static HashMap<String, Integer> conversationalState = new HashMap<String, Integer>();
-   
-    // a static member variable that records the number of times this service is called
-    public static StringBuffer calls = new StringBuffer();
-   
-    @Init
-    public void init(){
-        calls.append("init,");
-    }
-    
-    @Destroy
-    public void destroy(){
-        calls.append("destroy,");
-    }
-    
-    public void initializeCount(int count){
-        calls.append("initializeCount,");
-        Integer conversationalCount = new Integer(count); 
-        conversationalState.put(conversationId, conversationalCount);
-    }
-    
-    public void incrementCount(){
-        calls.append("incrementCount,");
-        Integer conversationalCount = conversationalState.get(conversationId);
-        conversationalCount++;
-        conversationalState.put(conversationId, conversationalCount);
-    }
-    
-    public int retrieveCount(){
-        calls.append("retrieveCount,");
-        Integer count = conversationalState.get(conversationId);
-        if (count != null){
-            return count.intValue();
-        } else {
-            return -999;
-        }
-    }
-    
-    public void businessException() throws Exception {
-        throw new Exception("Business Exception");
-    }    
-    
-    public void initializeCountCallback(int count){
-        calls.append("initializeCountCallback,");
-        initializeCount(count);
-        conversationalCallback.initializeCount(count);
-    }
-    
-    public void incrementCountCallback(){
-        calls.append("incrementCountCallback,");
-        incrementCount();
-        conversationalCallback.incrementCount();
-    }
-    
-    public int retrieveCountCallback(){
-        calls.append("retrieveCountCallback,");
-        return conversationalCallback.retrieveCount();
-    }
-    
-    public void businessExceptionCallback() throws Exception {
-        calls.append("businessExceptionCallback,");        
-        conversationalCallback.businessException();
-    }
-    
-    public String endConversation(){
-        calls.append("endConversation,");
-        conversationalState.remove(conversationId);
-        return conversationId;
-    }
-    
-    public String endConversationCallback(){
-        calls.append("endConversationCallback,");       
-        return conversationalCallback.endConversation();
-    }   
-    
-    public String getCalls() {
-        return calls.toString();
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
deleted file mode 100644
index c55cb68d03..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/Greetings.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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Greetings {
-    
-    
-    public String[] getGreetingsFromJava(String[] s);
-    
-    public String[] getGreetingsFromOSGi(String[] s);
-    
-    public String[] getModifiedGreetingsFromJava(String[] s);
-    
-    public String[] getModifiedGreetingsFromOSGi(String[] s);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
deleted file mode 100644
index 0940f9baf4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
+++ /dev/null
@@ -1,29 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-    
-    public String getGreetings(String s);
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
deleted file mode 100644
index 50d8c26388..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
+++ /dev/null
@@ -1,73 +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 helloworld;
-
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(Greetings.class)
-@Scope("COMPOSITE")
-public class JavaGreetingsComponent implements Greetings {
-
-    private Greetings greetingsService;
-    
-    @Reference
-    public void setGreetingsService(Greetings greetingsService) {
-    	this.greetingsService = greetingsService;
-    }
-    
-   
-    public String[] getGreetingsFromJava(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = "Hello " + s[i] + "(From Java)";
-        }
-            
-        return greetingsService.getGreetingsFromJava(s);
-    }
-    
-    public String[] getGreetingsFromOSGi(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = s[i] + "(From Java)";
-        }
-            
-        return s;
-    }
-    
-    @AllowsPassByReference
-    public String[] getModifiedGreetingsFromJava(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = "Hello " + s[i] + "(From Java)";
-        }
-            
-        return greetingsService.getModifiedGreetingsFromJava(s);
-    }
-    
-    @AllowsPassByReference
-    public String[] getModifiedGreetingsFromOSGi(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = s[i] + "(From Java)";
-        }
-            
-        return s;
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
deleted file mode 100644
index a7bcb2ba06..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
+++ /dev/null
@@ -1,41 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class JavaHelloWorldComponent implements HelloWorld {
-
-    public helloworld.ws.HelloWorld helloWorldWS;
-    
-    @Reference
-    public void setHelloWorldWS(helloworld.ws.HelloWorld helloWorldWS) {
-    	this.helloWorldWS = helloWorldWS;
-    }
-    
-    public String getGreetings(String s) {
-        return helloWorldWS.getGreetings(s);
-    }
-    
-   
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
deleted file mode 100644
index 9b3907c752..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
+++ /dev/null
@@ -1,112 +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 helloworld;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.BundleActivator;
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-
-
-public class OSGiGreetingsImpl implements Greetings, ServiceListener, BundleActivator {
-
-    private Greetings greetingsService;
-    
-    private BundleContext bundleContext;
-    
-    public String[] getGreetingsFromOSGi(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = "Hello " + s[i] + "(From OSGi)";
-        }
-            
-        return greetingsService.getGreetingsFromOSGi(s);
-    }
-    
-    public String[] getGreetingsFromJava(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = s[i] + "(From OSGi)";
-        }
-            
-        return s;
-    }
-    
-    @AllowsPassByReference
-    public String[] getModifiedGreetingsFromOSGi(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = "Hello " + s[i] + "(From OSGi)";
-        }
-            
-        return greetingsService.getModifiedGreetingsFromOSGi(s);
-    }
-    
-    @AllowsPassByReference
-    public String[] getModifiedGreetingsFromJava(String s[]) {
-        for (int i = 0; i < s.length; i++) {
-            s[i] = s[i] + "(From OSGi)";
-        }
-            
-        return s;
-    }
-
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started OsgiGreetingsImpl bundle ");
-    	
-    	this.bundleContext = bc;
-    	
-        Hashtable<String, Object> serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.service.name", "OSGiGreetingsComponent/Greetings");
-        bundleContext.registerService("helloworld.Greetings", this, serviceProps);
-        
-        
-        ServiceReference ref = bundleContext.getServiceReference("helloworld.Greetings");
-        if (ref != null)
-            greetingsService = (helloworld.Greetings)bundleContext.getService(ref);
-        else {
-            try {
-                String filter = "(objectclass=helloworld.Greetings)";
-                this.bundleContext.addServiceListener(this, filter);                
-
-            } catch (InvalidSyntaxException e) {
-                e.printStackTrace();
-            }
-        }
-      
-    }
-    
-    public void stop(BundleContext bc)  {
-    }
-    
-	public void serviceChanged(ServiceEvent event) {
-		try {
-			if (event.getType() == ServiceEvent.REGISTERED) {
-			    ServiceReference ref = event.getServiceReference();
-			    greetingsService =  (helloworld.Greetings) bundleContext.getService(ref);
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
deleted file mode 100644
index 0588da9a85..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
+++ /dev/null
@@ -1,81 +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 helloworld;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.BundleActivator;
-
-
-public class OSGiHelloWorldImpl implements HelloWorld, ServiceListener, BundleActivator {
-
-    public helloworld.ws.HelloWorld helloWorldWS;
-    
-    private BundleContext bundleContext;
-    
-    public String getGreetings(String s) {
-        return helloWorldWS.getGreetings(s);
-    }
-    
-
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started OsgiHelloWorldImpl bundle ");
-    	
-    	this.bundleContext = bc;
-    	
-        Hashtable<String, Object> serviceProps = new Hashtable<String, Object>();
-        serviceProps.put("component.name", "HelloWorldComponent");
-        bundleContext.registerService("helloworld.HelloWorld", this, serviceProps);
-        
-        ServiceReference ref = bundleContext.getServiceReference("helloworld.ws.HelloWorld");
-        if (ref != null)
-            helloWorldWS = (helloworld.ws.HelloWorld)bundleContext.getService(ref);
-        else {
-            try {
-            	String filter = "(objectclass=helloworld.ws.HelloWorld)";
-            	this.bundleContext.addServiceListener(this, filter);				
-
-            } catch (InvalidSyntaxException e) {
-            	e.printStackTrace();
-            }
-        }
-        
-    }
-    
-    public void stop(BundleContext bc)  {
-    }
-    
-	public void serviceChanged(ServiceEvent event) {
-		try {
-			if (event.getType() == ServiceEvent.REGISTERED) {
-			    ServiceReference ref = event.getServiceReference();
-			    helloWorldWS =  (helloworld.ws.HelloWorld) bundleContext.getService(ref);
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
deleted file mode 100644
index f48c91d518..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld.sdo;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    
-    public String getGreetings(Name name);
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
deleted file mode 100644
index e52565aedb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,33 +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 helloworld.sdo;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldServiceComponent implements HelloWorldService {
-
-    public String getGreetings(Name name) {
-        return "Hello " + name.getFirst() + " " + name.getLast();
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
deleted file mode 100644
index 6548b409fb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
+++ /dev/null
@@ -1,30 +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 helloworld.sdo.client;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the helloworld client
- */
-@Remotable
-public interface HelloWorldClient {
-    
-    public String getGreetings(String firstName, String lastName);
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
deleted file mode 100644
index 1aabf4d10c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
+++ /dev/null
@@ -1,50 +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 helloworld.sdo.client;
-
-import helloworld.sdo.HelloWorldService;
-import helloworld.sdo.HelloworldFactory;
-import helloworld.sdo.Name;
-
-/**
- * The HelloWorld client implementation
- */
-public class HelloWorldClientComponent implements HelloWorldClient {
-   
-    HelloWorldService helloWorldService;
-    
-    public String getGreetings(String firstName, String lastName) {
-        Name name = HelloworldFactory.INSTANCE.createName();
-        name.setFirst(firstName);
-        name.setLast(lastName);
-        return helloWorldService.getGreetings(name);
-    }
-
-    public HelloWorldService getHelloWorldService() {
-        return helloWorldService;
-    }
-
-    public void setHelloWorldService(HelloWorldService helloWorldService) {
-        this.helloWorldService = helloWorldService;
-    }
-    
-    public void unsetHelloWorldService(HelloWorldService helloWorldService) {
-        this.helloWorldService = null;
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
deleted file mode 100644
index 99a3d0087c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
+++ /dev/null
@@ -1,29 +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 helloworld.ws;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-    
-    public String getGreetings(String s);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
deleted file mode 100644
index 4a3cd4aed2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
+++ /dev/null
@@ -1,28 +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 helloworld.ws;
-
-public class HelloWorldService implements HelloWorld {
-
-    public String getGreetings(String s) {
-        return "Hello " + s;
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
deleted file mode 100644
index 305b3610d4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
+++ /dev/null
@@ -1,86 +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 stockquote;
-
-import java.util.Dictionary;
-
-import org.osgi.service.component.ComponentContext;
-import org.oasisopen.sca.annotation.Property;
-
-/**
- * Declarative Stock quote with configurable properties.
- */
-public class OSGiStockQuoteComponentImpl implements StockQuote {
-    
-    @Property
-    public double exchangeRate;
-    
-    private String currency;
-    
-    
-    public double configExchangeRate;
-    public String configCurrency;
-    
-    @Property
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-    
-    public double getQuote(String ticker) throws Exception {
-        
-        if (exchangeRate == 2.0 && !"USD".equals(currency)) {
-            throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + 
-                    exchangeRate + " currency=" + currency);
-        }
-        if (exchangeRate == 1.48 && !"EURO".equals(currency)) {
-            throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + 
-                    exchangeRate + " currency=" + currency);
-        }
-        
-        if (configExchangeRate == 2.0 && !"USD".equals(configCurrency)) {
-            throw new RuntimeException("ConfigAdmin Property exchangeRate not set correctly, exchangeRate= " + 
-                    configExchangeRate + " currency=" + configCurrency);
-        }
-        if (configExchangeRate == 1.48 && !"EURO".equals(configCurrency)) {
-            throw new RuntimeException("Property configExchangeRate not set correctly, exchangeRate= " + 
-                    configExchangeRate + " currency=" + configCurrency);
-        }
-        
-        return 52.81 * exchangeRate;
-        
-    }
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiStockQuoteComponentImpl bundle ");
-        Dictionary props = context.getProperties();
-        Object prop = props.get("currency");
-        if (prop instanceof String[]&& ((String [])prop).length > 0)
-            configCurrency = ((String [])prop)[0];
-        prop = props.get("exchangeRate");
-        if (prop instanceof Double[]&& ((Double [])prop).length > 0)
-            configExchangeRate = (double)((Double [])prop)[0];
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiStockQuoteComponentImpl bundle ");
-    }
-
-    
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
deleted file mode 100644
index e2d25bf47d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
+++ /dev/null
@@ -1,65 +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 stockquote;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * 
- * OSGi service factory where service has configurable properties
- * Only property injection is tested. ConfigurationAdmin is not used.
- *
- */
-public class OSGiStockQuoteFactoryImpl implements BundleActivator, ServiceFactory {
-    
-   
-    private BundleContext bundleContext;
-    
-
-    public void start(BundleContext bc) throws Exception {
-        
-        bundleContext = bc;
-        
-        Hashtable<String, Object> props = new Hashtable<String, Object>();
-        bc.registerService(StockQuote.class.getName(), this, props);
-        
-    }
-
-    public void stop(BundleContext bc) throws Exception {
-    }
-
-
-    public Object getService(Bundle bundle, ServiceRegistration registration) {
-        return new OSGiStockQuoteImpl(bundleContext);
-    }
-
-
-    public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
-        
-    }
-
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
deleted file mode 100644
index 4cd4fb36a5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.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 stockquote;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.oasisopen.sca.annotation.Property;
-
-/**
- * 
- * Stock quote with configurable properties.
- *
- */
-public class OSGiStockQuoteImpl implements StockQuote, BundleActivator {
-    
-    public String pid;
-    
-    @Property
-    public double exchangeRate;
-    
-    private String currency;
-    
-    private BundleContext bundleContext;
-    
-    public OSGiStockQuoteImpl() {     
-        this.pid = "stockQuote";
-    }
-    
-    protected OSGiStockQuoteImpl(BundleContext bc) {
-        this.bundleContext = bc;
-    }
-    
-    @Property
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-    
-     
-    private void checkProperties() throws Exception {
-               
-        if (exchangeRate == 2.0 && !"USD".equals(currency)) {
-            throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + 
-                    exchangeRate + " currency=" + currency);
-        }
-        
-        if (exchangeRate == 1.48 && !"EURO".equals(currency)) {
-            throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + 
-                    exchangeRate + " currency=" + currency);
-        }
-        
-        ServiceReference configAdminReference = bundleContext.getServiceReference("org.osgi.service.cm.ConfigurationAdmin");
-        if (configAdminReference != null && pid != null ) {
-            
-            ConfigurationAdmin cm = (ConfigurationAdmin)bundleContext.getService(configAdminReference);
-            
-            Configuration config = cm.getConfiguration("stockQuote", null);
-            
-            Dictionary props = config.getProperties();
-            
-            if (exchangeRate != (double)(Double)props.get("exchangeRate")) {
-                throw new Exception("Config Property exchangeRate not set correctly, expected " 
-                        + props.get("exchangeRate") + " got " + exchangeRate);
-            }
-            
-            if (!currency.equals(props.get("currency"))) {
-                throw new Exception("Config Property currency not set correctly, expected " 
-                        + props.get("currency") + " got " + currency);
-            }
-        }
-        
-    }
-    
-    public double getQuote(String ticker) throws Exception {
-        
-        checkProperties();
-       
-        return 52.81 * exchangeRate;
-        
-    }
-
-    public void start(BundleContext bc) throws Exception {
-        
-        bundleContext = bc;
-        
-        Hashtable<String, Object> props = new Hashtable<String, Object>();
-        props.put("service.pid", "stockQuote");
-        
-        bc.registerService(StockQuote.class.getName(), this, props);
-        
-    }
-
-    public void stop(BundleContext bc) throws Exception {
-    }
-
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
deleted file mode 100644
index a47f68c579..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/StockQuote.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 stockquote;
-
-/**
- * 
- * Stock Quote interface
- *
- */
-public interface StockQuote {
-    
-    public double getQuote(String ticker) throws Exception ;
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index 25d7bcf2ff..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
+++ /dev/null
@@ -1,163 +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 supplychain;
-
-
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-
-
-/**
- * This class implements the Customer service component.
- */
-public  class OSGiBundleImpl implements ServiceListener, BundleActivator {
-    
-
-    String name;
-    
-    String[] references;
-    Class<?>[] referenceClasses;
-    Field[] referenceFields;
-    String[] referenceFilters;
-    
-    Class myClass;
-    ArrayList<String> serviceNames = new ArrayList<String>();
-    ArrayList<Object> serviceObjs = new ArrayList<Object>();
-    ArrayList<Hashtable<String, Object>> serviceProperties = new ArrayList<Hashtable<String, Object>>();
-    
-    
-	private BundleContext bundleContext;
-    
-    public OSGiBundleImpl() {}
-    
-    public OSGiBundleImpl(String[] references, String[] filters) {
-        
-        myClass = this.getClass();
-        this.name = this.getClass().getSimpleName();
-        this.references = references == null?new String[0] : references;
-        
-       
-        try {
-            referenceClasses = new Class[references.length];
-            referenceFields = new Field[references.length];
-            referenceFilters = new String[references.length];
-            for (int i = 0; i < references.length; i++) {
-                referenceFields[i] = this.getClass().getDeclaredField(references[i]);
-                referenceFields[i].setAccessible(true);
-                referenceClasses[i] = referenceFields[i].getType();
-                
-                if (filters != null && filters.length > i)
-                    referenceFilters[i] = filters[i];
-            }
-            
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        
-    }
-    
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started bundle " + name);
-    	
-    	this.bundleContext = bc;
-        
-        boolean useSingleRegisterService = serviceNames.size() > 1;
-        for (int i = 1; i < serviceNames.size(); i++) {
-            if (serviceObjs.get(i) != serviceObjs.get(0) || 
-                    serviceProperties.get(i) != serviceProperties.get(0)) {
-                useSingleRegisterService = false;
-                break;
-            }
-        }
-        if (useSingleRegisterService) {
-            bundleContext.registerService(serviceNames.toArray(new String[serviceNames.size()]), 
-                    serviceObjs.get(0), serviceProperties.get(0));
-        }
-        else {
-            for (int i = 0; i < serviceNames.size(); i++) {
-                bundleContext.registerService(serviceNames.get(i), serviceObjs.get(i), serviceProperties.get(i));
-            }
-        }
-        
-        started(bc);
-    	
-        for (int i = 0; i < references.length; i++) {
-
-            try {
-                if (referenceFields[i].get(this) != null)
-                    continue;
-                
-    	        ServiceReference[] refs = bundleContext.getServiceReferences(referenceClasses[i].getName(), referenceFilters[i]);
-	            if (refs != null && refs.length > 0) {
-                    Object obj = bundleContext.getService(refs[0]);
-                    referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                } else {
-				    String filter = "(objectclass=" + referenceClasses[i].getName() + ")";
-				    this.bundleContext.addServiceListener(this, filter);				
-	            }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    
-    public void stop(BundleContext bc)  {
-        System.out.println("Stop bundle " + name);
-
-    }
-    
-    protected void started(BundleContext bc)  {
-        
-    }
-
-	public void serviceChanged(ServiceEvent event) {
-		try {
-			if (event.getType() == ServiceEvent.REGISTERED) {
-                
-                ServiceReference ref = event.getServiceReference();
-                Object obj = bundleContext.getService(ref);
-                for (int i = 0; i < references.length; i++) {
-                    if (referenceClasses[i].isAssignableFrom(obj.getClass())) {
-                        referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                    }
-                }
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-    
-
-    public void registerService(Object serviceObject, String serviceName, Hashtable<String, Object> props) {
-        serviceObjs.add(serviceObject);
-        serviceNames.add(serviceName);
-        serviceProperties.add(props == null? new Hashtable<String, Object>() : props);
-    }
-}
- 
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index ecbad11fa0..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
+++ /dev/null
@@ -1,39 +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 supplychain.customer;
-
-import org.oasisopen.sca.annotation.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-    
-    public void purchaseBooks();
-    
-    public void purchaseGames();
-    
-    public void purchaseGoods();
-    
-    @OneWay
-    public void notifyShipment(String order);
-    
-    public boolean hasOutstandingOrders();
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 03040d81d1..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,88 +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 supplychain.customer;
-
-import java.util.ArrayList;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component.
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private Retailer retailer1;
-	
-    private Retailer retailer2;
-    
-    private Retailer retailer3;
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    @Reference
-    public void setRetailer1(Retailer retailer1) {
-        this.retailer1 = retailer1;
-    }
-    
-    @Reference
-    public void setRetailer2(Retailer retailer2) {
-        this.retailer2 = retailer2;
-    }
-    
-    @Reference
-    public void setRetailer3(Retailer retailer3) {
-        this.retailer3 = retailer3;
-    }
-    
-    public void purchaseBooks() {
-    	System.out.println("JavaCustomerComponentImpl.purchaseBooks");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)");
-        retailer1.submitOrder("Order");
-    }
-    
-    public void purchaseGames() {
-        System.out.println("JavaCustomerComponentImpl.purchaseGames");
-        outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)");
-        
-        retailer2.submitOrder("Order");
-    }
-    
-    public void purchaseGoods() {
-        retailer3.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrders.remove(order);
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);       
-    }
-
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-    
-    
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a879505610..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ /dev/null
@@ -1,106 +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 supplychain.customer;
-
-
-import java.util.ArrayList;
-
-import org.osgi.service.component.ComponentContext;
-
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiCustomerComponentImpl implements Customer {
-    
-
-    private Retailer retailer1;
-    private Retailer retailer2;
-    private Retailer retailer3;
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    public OSGiCustomerComponentImpl() {
-        System.out.println("Created OSGiCustomerComponentImpl " + this);
-    }
-    
-    protected void setRetailer1(Retailer retailer1) {
-    	this.retailer1 = retailer1;
-    }
-    
-    protected void unsetRetailer1(Retailer retailer1) {
-    	// this.retailer1 = null;
-    }
-    
-    
-    protected void setRetailer2(Retailer retailer2) {
-    	this.retailer2 = retailer2;
-    }
-    
-    protected void unsetRetailer2(Retailer retailer2) {
-    	// this.retailer2 = null;
-    }
-    
-    protected void setRetailer3(Retailer retailer3) {
-        this.retailer3 = retailer3;
-    }
-    
-    protected void unsetRetailer3(Retailer retailer3) {
-        // this.retailer3 = null;
-    }
-    
-
-    public void purchaseBooks() {
-    	System.out.println("OSGiCustomerComponentImpl.purchaseBooks, retailer1 is " + retailer1);
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)");
-        retailer1.submitOrder("Order");
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerComponentImpl.purchaseGames, retailer2 is " + retailer2);
-        outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)");
-        
-        retailer2.submitOrder("Order");
-    }
-    
-    public void purchaseGoods() {
-    	System.out.println("OSGiCustomerComponentImpl.purchaseGames, retailer3 is " + retailer3);
-    	retailer3.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrders.remove(order);
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiCustomerComponentImpl bundle ");
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiCustomerComponentImpl bundle ");
-    }
-
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
deleted file mode 100644
index c8cb522cf4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
+++ /dev/null
@@ -1,65 +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 supplychain.customer;
-
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiCustomerFactoryImpl implements BundleActivator, ServiceFactory {
-    
-    private BundleContext bundleContext;
-    
-    public OSGiCustomerFactoryImpl() {
-    }
-    
-    
-    public void start(BundleContext bc)  {
-        
-        this.bundleContext = bc;
-        bc.registerService(Customer.class.getName(), this, null);
-    }
-    
-    
-    
-   
-    public void stop(BundleContext context) throws Exception {
-        
-    }
-
-
-    public Object getService(Bundle bundle, ServiceRegistration registration) {
-        
-        OSGiCustomerImpl customer = new OSGiCustomerImpl(false);
-        customer.start(bundleContext);
-        return customer;
-        
-    }
-
-    public void ungetService(Bundle bundle, ServiceRegistration registration, Object obj) {       
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 8ef4a2d8d8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ /dev/null
@@ -1,92 +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 supplychain.customer;
-
-
-import java.util.ArrayList;
-
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component.
- */
-@AllowsPassByReference
-public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
-    
-    private ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    private Retailer retailer1;
-    private Retailer retailer2;
-    private Retailer retailer3;
-    
-    public OSGiCustomerImpl() {
-        super(  new String[]{"retailer1", "retailer2", "retailer3"},
-                new String[]{"(retailerName=amazon.com)", 
-                             "(retailerName=play.com)",
-                             "(retailerName=ebay.com)"
-                             });
-        registerService(this, "supplychain.customer.Customer", null);
-                
-    }
-    
-    public OSGiCustomerImpl(boolean ignore) { // Used only to test service factories
-        super(  new String[]{"retailer1", "retailer2", "retailer3"},
-                new String[]{"(retailerName=amazon.com)", 
-                             "(retailerName=play.com)",
-                             "(retailerName=ebay.com)"
-                             });
-               
-    }
-   
-    public void purchaseBooks() {
-    	System.out.println("OSGiCustomerImpl.purchaseBooks, retailer is " + retailer1);
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)");
-        
-        retailer1.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerImpl.purchaseGames, retailer is " + retailer2);
-        outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)");
-        
-        retailer2.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGoods() {
-        retailer3.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        
-        outstandingOrders.remove(order);
-        
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
deleted file mode 100644
index 593e55f3f5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
+++ /dev/null
@@ -1,100 +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 supplychain.customer;
-
-
-import java.util.ArrayList;
-
-import org.osgi.service.component.ComponentContext;
-
-
-import supplychain.retailer.Retailer;
-import supplychain.retailer.RetailerQuery;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiCustomerWithQueryComponentImpl implements Customer {
-    
-
-    private Retailer retailer;
-    private RetailerQuery retailerQuery;
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    public OSGiCustomerWithQueryComponentImpl() {
-        System.out.println("Created OSGiCustomerWithQueryComponentImpl " + this);
-    }
-    
-    protected void setRetailer(Retailer retailer) {
-    	this.retailer = retailer;
-    }
-    
-    protected void unsetRetailer(Retailer retailer) {
-    	// this.retailer = null;
-    }
-    
-    
-    protected void setRetailerQuery(RetailerQuery retailerQuery) {
-        this.retailerQuery = retailerQuery;
-    }
-    
-    protected void unsetRetailerQuery(RetailerQuery retailerQuery) {
-        // this.retailerQuery = null;
-    }
-    
-    public void purchaseBooks() {
-    	System.out.println("OSGiCustomerWithQueryComponentImpl.purchaseBooks");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)");
-        
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerWithQueryComponentImpl.purchaseGames");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)");
-        
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-    }
-    
-    public void purchaseGoods() {
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        outstandingOrders.remove(order);
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiCustomerWithQueryComponentImpl bundle ");
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiCustomerWithQueryComponentImpl bundle ");
-    }
-
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
deleted file mode 100644
index 18483817ad..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
+++ /dev/null
@@ -1,82 +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 supplychain.customer;
-
-
-import java.util.ArrayList;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-import supplychain.retailer.RetailerQuery;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiCustomerWithQueryImpl extends OSGiBundleImpl implements Customer {
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    private Retailer retailer;
-    private RetailerQuery retailerQuery;
-    
-    public OSGiCustomerWithQueryImpl() {
-        super(  new String[]{"retailer", "retailerQuery"},
-                new String[]{"(component.service.name=RetailerComponent/Retailer)",
-                             "(component.service.name=RetailerComponent/RetailerQuery)"
-                });
-        registerService(this, "supplychain.customer.Customer", null);
-                
-    }
-   
-    public void purchaseBooks() {
-    	System.out.println("OSGiCustomerWithQueryImpl.purchaseBooks");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)");
-        
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerWithQueryImpl.purchaseGames");
-        outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)");
-        
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGoods() {
-        if (retailerQuery.isAvailable("Order"))
-            retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        
-        outstandingOrders.remove(order);
-        
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
deleted file mode 100644
index f3ea404997..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
+++ /dev/null
@@ -1,30 +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 supplychain.customer;
-
-import org.oasisopen.sca.annotation.Scope;
-
-
-/**
- * This class implements the Customer service component.
- */
-@Scope("STATELESS")
-public class OSGiStatelessCustomerComponentImpl extends OSGiCustomerComponentImpl {
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
deleted file mode 100644
index eda77b0c5d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
+++ /dev/null
@@ -1,35 +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 supplychain.customer;
-
-
-import org.oasisopen.sca.annotation.Scope;
-
-
-/**
- * This class implements the Customer service component.
- */
-@Scope("STATELESS")
-public class OSGiStatelessCustomerImpl extends OSGiCustomerImpl {
-    
-    public OSGiStatelessCustomerImpl(boolean ignore) { 
-        super(ignore);
-    }
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
deleted file mode 100644
index 599ab51a50..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
+++ /dev/null
@@ -1,98 +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 supplychain.customer;
-
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiVersionedCustomerImpl extends OSGiBundleImpl implements Customer {
-    
-    private static ArrayList<String> outstandingOrders = new ArrayList<String>();
-    
-    private Retailer retailer1;
-    private Retailer retailer2;
-    private Retailer retailer3;
-    private int version;
-    
-    public OSGiVersionedCustomerImpl() {
-        super(  new String[]{"retailer1", "retailer2", "retailer3"},
-                new String[]{"(retailerName=amazon.com)", 
-                             "(retailerName=play.com)",
-                             "(retailerName=ebay.com)"
-                             });
-               
-    }
-    
-    protected void started(BundleContext bc)  {
-        
-        String jarFile = bc.getBundle().getLocation();
-        if (jarFile.endsWith("1.jar")) version = 1;
-        else if (jarFile.endsWith("2.jar")) version = 2;
-        else version = 3;
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("component.name", "CustomerComponent" + version);
-        bc.registerService("supplychain.customer.Customer", this, props1);
-               
-    }
-   
-    public void purchaseBooks() {
-    	System.out.println("OSGiVersionedCustomerImpl.purchaseBooks , retailer is " + retailer1);
-        outstandingOrders.add("Order, submitted (amazon.com v" + version + 
-                "), fulfilled, shipped (ParcelForce)");
-        
-        retailer1.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGames() {
-        System.out.println("OSGiCustomerImpl.purchaseGames");
-        outstandingOrders.add("Order, submitted (play.com v" + version + 
-                "), fulfilled, shipped (ParcelForce)");
-        
-        retailer2.submitOrder("Order");
-        
-    }
-    
-    public void purchaseGoods() {
-        retailer3.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        
-        outstandingOrders.remove(order);
-        
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    public boolean hasOutstandingOrders() {
-        return outstandingOrders.size() != 0;
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index b9adacca55..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,67 +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 supplychain.retailer;
-
-
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Customer service component.
- */
-@Service(Retailer.class)
-@Scope("COMPOSITE")
-public class JavaRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    private String retailerName;
-    
-    public JavaRetailerComponentImpl() {
-    	System.out.println("Created RetailerComponentImpl");
-    }
-    
-    @Reference
-    public void setWarehouse(Warehouse warehouse) {
-    	System.out.println("retailer setWarehouse " + warehouse);
-    	
-        this.warehouse = warehouse;
-    }
-    
-    @Property
-    public void setRetailerName(String retailerName) {
-    	this.retailerName = retailerName;
-    }
-    
-    
-    public void submitOrder(String order) {
-    	
-    	System.out.println("JavaRetailerComponentImpl.submitOrder " + warehouse);
-        warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")");
-        
-    }
-
-    
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index aca5943552..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ /dev/null
@@ -1,64 +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 supplychain.retailer;
-
-import org.osgi.service.component.ComponentContext;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    private String retailerName;
-    
-    
-    protected void setWarehouse(Warehouse warehouse) {
-    	this.warehouse = warehouse;
-    }
-    
-    protected void unsetWarehouse(Warehouse warehouse) {
-    	// this.warehouse = null;
-    }
-    
-    public void submitOrder(String order) {
-    	
-    	System.out.println("OSGiRetailerComponentImpl.submitOrder , warehouse is " + warehouse);
-        warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")");
-        
-    }
-
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiRetailerComponentImpl bundle ");
-        
-        Object prop = context.getProperties().get("retailerName");
-	    if (prop instanceof String[])
-	        retailerName = ((String [])prop)[0];
-        
-        
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiRetailerComponentImpl bundle ");
-    }
-
-	
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e71c624f49..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.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 supplychain.retailer;
-
-
-import java.util.Hashtable;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component.
- */
-public class OSGiRetailerImpl extends OSGiBundleImpl {
-    
-    protected Warehouse warehouse;
-    
-    public OSGiRetailerImpl() {
-
-        super(new String[]{"warehouse"}, 
-                new String[]{"(component.service.name=WarehouseComponent1/Warehouse)"});
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("retailerName", "amazon.com");
-        registerService(new OSGiRetailerServiceImpl(this, "amazon.com"),
-                "supplychain.retailer.Retailer", props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("retailerName", "play.com");
-        registerService(
-                new OSGiRetailerServiceImpl(this, "play.com"),
-                "supplychain.retailer.Retailer", props2);
-        
-        Hashtable<String, Object> props3 = new Hashtable<String, Object>();
-        props3.put("retailerName", "ebay.com");
-        registerService(
-                new OSGiRetailerServiceImpl(this, "ebay.com"),
-                "supplychain.retailer.Retailer", props3);
-    }
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
deleted file mode 100644
index a036ecfc76..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.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.    
- */
-package supplychain.retailer;
-
-
-/**
- * This class implements the Retailer service.
- */
-public class OSGiRetailerServiceImpl implements Retailer {
-
-    private OSGiRetailerImpl retailerImpl;
-
-    private String retailerName;
-
-    OSGiRetailerServiceImpl(OSGiRetailerImpl retailerImpl, String retailerName) {
-        this.retailerImpl = retailerImpl;
-        this.retailerName = retailerName;
-        
-    }
-
-    public void submitOrder(String order) {
-
-        System.out.println("Retailer.submitOrder, warehouse is " + retailerImpl.warehouse);
-        retailerImpl.warehouse.fulfillOrder(order + ", submitted ("
-                + retailerName + ")");
-
-    }
-
-}
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
deleted file mode 100644
index db877bb366..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
+++ /dev/null
@@ -1,78 +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 supplychain.retailer;
-
-import org.osgi.service.component.ComponentContext;
-
-import supplychain.warehouse.Warehouse;
-import supplychain.warehouse.WarehouseQuery;
-
-/**
- * This class implements the Customer service component.
- */
-public class OSGiRetailerWithQueryComponentImpl implements Retailer, RetailerQuery {
-    
-    private Warehouse warehouse;
-    private WarehouseQuery warehouseQuery;
-    private String retailerName;
-    
-    
-    protected void setWarehouse(Warehouse warehouse) {
-    	this.warehouse = warehouse;
-    }
-    
-    protected void unsetWarehouse(Warehouse warehouse) {
-    	// this.warehouse = null;
-    }
-    
-    protected void setWarehouseQuery(WarehouseQuery warehouseQuery) {
-        this.warehouseQuery = warehouseQuery;
-    }
-    
-    protected void unsetWarehouseQuery(WarehouseQuery warehouse) {
-        // this.warehouseQuery = null;
-    }
-    
-    public void submitOrder(String order) {
-    	
-    	System.out.println("OSGiRetailerComponentImpl.submitOrder , warehouse is " + warehouse);
-        warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")");
-        
-    }
-    
-    public boolean isAvailable(String order) {
-        return warehouseQuery.isAvailable(order);
-    }
-
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiRetailerComponentImpl bundle ");
-        
-        Object prop = context.getProperties().get("retailerName");
-	    if (prop instanceof String[])
-	        retailerName = ((String [])prop)[0];
-        
-        
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiRetailerComponentImpl bundle ");
-    }
-
-	
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
deleted file mode 100644
index ee1f575e70..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
+++ /dev/null
@@ -1,64 +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 supplychain.retailer;
-
-
-import java.util.Hashtable;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-import supplychain.warehouse.WarehouseQuery;
-
-/**
- * This class implements the Retailer service component with query.
- */
-public class OSGiRetailerWithQueryImpl extends OSGiBundleImpl implements Retailer, RetailerQuery {
-    
-    private Warehouse warehouse;
-    private WarehouseQuery warehouseQuery;
-    
-    public OSGiRetailerWithQueryImpl() {
-
-        super(new String[]{"warehouse", "warehouseQuery"}, null);
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("retailerName", "amazon.com");
-        registerService(this,
-                "supplychain.retailer.Retailer", props1);
-        
-        registerService(this,
-                "supplychain.retailer.RetailerQuery", props1);
-        
-    }
-    
-    public void submitOrder(String order) {
-
-        System.out.println("Retailer.submitOrder, warehouse is " + warehouse);
-        warehouse.fulfillOrder(order + ", submitted ("
-                + "amazon.com" + ")");
-
-    }
-
-    public boolean isAvailable(String order) {
-        return warehouseQuery.isAvailable(order);
-    }
-
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
deleted file mode 100644
index 09e60ca626..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.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 supplychain.retailer;
-
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component.
- */
-public class OSGiVersionedRetailerImpl extends OSGiBundleImpl {
-    
-    protected Warehouse warehouse;
-    
-    private int version;
-    
-    public OSGiVersionedRetailerImpl() {
-
-        super(new String[]{"warehouse"}, null);
-        
-        
-    }
-    
-    protected void started(BundleContext bc)  {
-        String jarFile = bc.getBundle().getLocation();
-        if (jarFile.endsWith("1.jar")) version = 1;
-        else if (jarFile.endsWith("2.jar")) version = 2;
-        else version = 3;
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("retailerName", "amazon.com");
-        bc.registerService("supplychain.retailer.Retailer", 
-                new OSGiVersionedRetailerServiceImpl(this, "amazon.com", version),
-                props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("retailerName", "play.com");
-        bc.registerService(
-                "supplychain.retailer.Retailer", 
-                new OSGiVersionedRetailerServiceImpl(this, "play.com", version),
-                props2);
-        
-        try {
-            ServiceReference[] refs = bc.getServiceReferences(Warehouse.class.getName(), 
-                    "(component.service.name=WarehouseComponent" + version + "/Warehouse)");
-            if (refs != null && refs.length > 0) {
-                warehouse = (Warehouse) bc.getService(refs[0]);
-            }
-        } catch (InvalidSyntaxException e) {
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
deleted file mode 100644
index 7dd70889c7..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.retailer;
-
-
-/**
- * This class implements the Retailer service.
- */
-public class OSGiVersionedRetailerServiceImpl implements Retailer {
-
-    private OSGiVersionedRetailerImpl retailerImpl;
-
-    private String retailerName;
-    
-    private int version;
-
-    OSGiVersionedRetailerServiceImpl(OSGiVersionedRetailerImpl retailerImpl, String retailerName, int version) {
-        this.retailerImpl = retailerImpl;
-        this.retailerName = retailerName;
-        this.version = version;
-    }
-
-    public void submitOrder(String order) {
-
-        System.out.println("Retailer.submitOrder, warehouse is " + retailerImpl.warehouse);
-        retailerImpl.warehouse.fulfillOrder(order + ", submitted ("
-                + retailerName + " v" + version + ")");
-
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
+++ /dev/null
@@ -1,28 +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 supplychain.retailer;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-    
-    public void submitOrder(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
deleted file mode 100644
index 354f40a064..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
+++ /dev/null
@@ -1,28 +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 supplychain.retailer;
-
-/**
- * This is the business interface of the RetailerQuery service.
- */
-public interface RetailerQuery {
-    
-    public boolean isAvailable(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 3da2fb8e39..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.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 supplychain.shipper;
-
-
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component.
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-    
-    private Customer customer;
-    
-    private String shipperName;
-    
-    @Reference
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
-    
-    @Property
-    public void setShipperName(String shipperName) {
-        this.shipperName = shipperName;
-    }
-    
-    
-    
-    public void processShipment(String order) {
-    	System.out.println("JavaShipperComponentImpl.processShipment");
-        customer.notifyShipment(order + ", shipped (" + shipperName + ")");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index ff40a7ae36..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ /dev/null
@@ -1,62 +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 supplychain.shipper;
-
-
-import org.osgi.service.component.ComponentContext;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component.
- */
-public class OSGiShipperComponentImpl implements Shipper {
-
-    private Customer customer;
-    private String shipperName;
-    
-    protected void setCustomer(Customer customer) {
-    	this.customer = customer;
-    }
-    
-    protected void unsetCustomer(Customer customer) {
-    	// this.customer = null;
-    }
-    
-    public void processShipment(String order) {
-    	System.out.println("OSGiShipperComponentImpl.processShipment, customer is " + customer);
-        customer.notifyShipment(order + ", shipped (" + shipperName + ")");
-    }
-    
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiShipperComponentImpl bundle ");
-        
-        Object prop = context.getProperties().get("shipperName");
-	    if (prop instanceof String[])
-	    	shipperName = ((String [])prop)[0];
-        
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiShipperComponentImpl bundle ");
-    }
-
-	
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
deleted file mode 100644
index ef989d6fcf..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
+++ /dev/null
@@ -1,78 +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 supplychain.shipper;
-
-
-import java.util.Hashtable;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-
-
-/**
- * This class implements the Shipper service component.
- */
-public class OSGiShipperFactoryImpl implements BundleActivator, ServiceFactory {
-    
-    private BundleContext bundleContext;
-    
-    public OSGiShipperFactoryImpl() {
-
-    }
-    
-
-    public void start(BundleContext bc)  {
-        
-        this.bundleContext = bc;
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("shipperName", "RoyalMail");
-        bc.registerService(Shipper.class.getName(), this, props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("shipperName", "ParcelForce");
-        bc.registerService(Shipper.class.getName(), this, props2);
-    }
-    
-    
-    
-   
-    public void stop(BundleContext context) throws Exception {
-        
-    }
-
-    
-    public Object getService(Bundle bundle, ServiceRegistration reg) {
-        OSGiShipperImpl shipper = new OSGiShipperImpl(false);
-        shipper.start(bundleContext);
-        OSGiStatelessShipperServiceImpl shipperService = new OSGiStatelessShipperServiceImpl(shipper, 
-                (String)reg.getReference().getProperty("shipperName"));
-        return shipperService;
-    }
-
-    public void ungetService(Bundle arg0, ServiceRegistration arg1, Object arg2) {
-        
-    }
-    
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index effae8c246..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ /dev/null
@@ -1,57 +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 supplychain.shipper;
-
-
-import java.util.Hashtable;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component.
- */
-public class OSGiShipperImpl extends OSGiBundleImpl {
-    
-    protected Customer customer;
-
-    
-    public OSGiShipperImpl() {
-
-        super(new String[]{"customer"}, null);
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("shipperName", "RoyalMail");
-        registerService(new OSGiShipperServiceImpl(this, "RoyalMail"),
-                "supplychain.shipper.Shipper", props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("shipperName", "ParcelForce");
-        registerService(
-                new OSGiShipperServiceImpl(this, "ParcelForce"),
-                "supplychain.shipper.Shipper", props2);
-    }
-    
-    // Used only by service factories
-    public OSGiShipperImpl(boolean ignore) {
-
-        super(new String[]{"customer"}, null);
-    }
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
deleted file mode 100644
index 4effadf208..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
+++ /dev/null
@@ -1,43 +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 supplychain.shipper;
-
-
-/**
- * This class implements the Shipper service.
- */
-public class OSGiShipperServiceImpl implements Shipper {
-
-    private OSGiShipperImpl shipperImpl;
-
-    private String shipperName;
-
-    OSGiShipperServiceImpl(OSGiShipperImpl shipperImpl, String shipperName) {
-        this.shipperImpl = shipperImpl;
-        this.shipperName = shipperName;
-    }
-
-    public void processShipment(String order) {
-
-        System.out.println("Shipper.submitOrder, warehouse is " + shipperImpl.customer);
-        shipperImpl.customer.notifyShipment(order + ", shipped (" + shipperName + ")");
-
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
deleted file mode 100644
index 90f709bf95..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
+++ /dev/null
@@ -1,30 +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 supplychain.shipper;
-
-import org.oasisopen.sca.annotation.Scope;
-
-
-/**
- * This class implements the Shipper service component.
- */
-@Scope("STATELESS")
-public class OSGiStatelessShipperComponentImpl extends OSGiShipperComponentImpl {
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
deleted file mode 100644
index d265f42c1b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
+++ /dev/null
@@ -1,35 +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 supplychain.shipper;
-
-import org.oasisopen.sca.annotation.Scope;
-
-
-/**
- * This class implements the Shipper service.
- */
-@Scope("STATELESS")
-public class OSGiStatelessShipperServiceImpl extends OSGiShipperServiceImpl {
-
-    public OSGiStatelessShipperServiceImpl(OSGiShipperImpl shipperImpl, String shipperName) {
-       super(shipperImpl, shipperName);
-    }
-
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
deleted file mode 100644
index 6ebd1f2894..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
+++ /dev/null
@@ -1,78 +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 supplychain.shipper;
-
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component.
- */
-public class OSGiVersionedShipperImpl extends OSGiBundleImpl {
-    
-    protected Customer customer;
-    
-    private int version;
-
-    
-    public OSGiVersionedShipperImpl() {
-
-        super(new String[]{"customer"}, null);
-    }
-    
-    protected void started(BundleContext bc) {
-        
-        String jarFile = bc.getBundle().getLocation();
-        if (jarFile.endsWith("1.jar")) version = 1;
-        else if (jarFile.endsWith("2.jar")) version = 2;
-        
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("shipperName", "RoyalMail");
-        props1.put("component.service.name", "ShipperComponent"+version+"/ShipperService1");
-        bc.registerService("supplychain.shipper.Shipper", 
-                new OSGiVersionedShipperServiceImpl(this, "RoyalMail", version),
-                props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("shipperName", "ParcelForce");
-        props2.put("component.service.name", "ShipperComponent"+version+"/ShipperService2");
-        bc.registerService("supplychain.shipper.Shipper", 
-                new OSGiVersionedShipperServiceImpl(this, "ParcelForce", version),
-                props2);
-        
-        try {
-            ServiceReference[] refs = bc.getServiceReferences(Customer.class.getName(), 
-                    "(component.service.name=CustomerComponent" + version + "/CustomerService)");
-            if (refs != null && refs.length > 0) {
-                customer = (Customer) bc.getService(refs[0]);
-            }
-        } catch (InvalidSyntaxException e) {
-        }
-    }
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
deleted file mode 100644
index b66961b1c2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
+++ /dev/null
@@ -1,46 +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 supplychain.shipper;
-
-
-/**
- * This class implements the Shipper service.
- */
-public class OSGiVersionedShipperServiceImpl implements Shipper {
-
-    private OSGiVersionedShipperImpl shipperImpl;
-
-    private String shipperName;
-    
-    private int version;
-
-    OSGiVersionedShipperServiceImpl(OSGiVersionedShipperImpl shipperImpl, String shipperName, int version) {
-        this.shipperImpl = shipperImpl;
-        this.shipperName = shipperName;
-        this.version = version;
-    }
-
-    public void processShipment(String order) {
-
-        System.out.println("Shipper.processShipment, version " + version + " customer is " + shipperImpl.customer);
-        shipperImpl.customer.notifyShipment(order + ", shipped (" + shipperName + ")");
-
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
+++ /dev/null
@@ -1,28 +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 supplychain.shipper;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-    
-    public void processShipment(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index 9f636957ac..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ /dev/null
@@ -1,48 +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 supplychain.warehouse;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component.
- */
-@Service(Warehouse.class)
-@Scope("STATELESS")
-public class JavaWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    @Reference
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-    	System.out.println("JavaWarehouseComponentImpl.fulfillOrder : shipper is " + shipper);
-        
-        shipper.processShipment(order + ", fulfilled");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
deleted file mode 100644
index e32028dd30..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.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 supplychain.warehouse;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component.
- */
-@Service(interfaces={Warehouse.class, WarehouseQuery.class})
-@Scope("COMPOSITE")
-public class JavaWarehouseWithQueryComponentImpl implements Warehouse, WarehouseQuery {
-    
-    private Shipper shipper;
-    
-    @Reference
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-    	System.out.println("JavaWarehouseComponentImpl.fulfillOrder : shipper is " + shipper);
-        
-        shipper.processShipment(order + ", fulfilled");
-    }
-
-    public boolean isAvailable(String order) {
-        return true;
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 7c9e102fd2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ /dev/null
@@ -1,57 +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 supplychain.warehouse;
-
-
-import org.osgi.service.component.ComponentContext;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component.
- */
-
-public class OSGiWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    protected void setShipper(Shipper shipper) {
-    	this.shipper = shipper;
-    }
-    
-    protected void unsetShipper(Shipper shipper) {
-    	// this.shipper = null;
-    }
-    
-    public void fulfillOrder(String order) {
-    	System.out.println("OSGiWarehouseComponentImpl.fulfillOrder : shipper is " + shipper);
-        
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-    protected void activate(ComponentContext context){
-        System.out.println("Activated OSGiWarehouseComponentImpl ");
-    }
-
-    protected void deactivate(ComponentContext context){
-        System.out.println("Deactivated OSGiWarehouseComponentImpl ");
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index bb04ff42e0..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.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 supplychain.warehouse;
-
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleContext;
-
-import supplychain.OSGiBundleImpl;
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component.
- */
-
-public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse {
-    
-    protected Shipper shipper;
-    private OSGiWarehouseServiceImpl warehouseService1;
-    private OSGiWarehouseServiceImpl warehouseService2;
-    
-    public OSGiWarehouseImpl() {
-    	super(new String[]{"shipper"}, null);
-        
-        Hashtable<String, Object> props1 = new Hashtable<String, Object>();
-        props1.put("component.name", "WarehouseComponent1");
-        warehouseService1 = new OSGiWarehouseServiceImpl(this, 2);
-        registerService(warehouseService1,
-                "supplychain.warehouse.Warehouse", props1);
-        
-        Hashtable<String, Object> props2 = new Hashtable<String, Object>();
-        props2.put("component.name", "WarehouseComponent2");
-        warehouseService2 = new OSGiWarehouseServiceImpl(this, 1);
-        registerService(warehouseService2,
-                "supplychain.warehouse.Warehouse", props2);
-    }
-    
-    protected void started(BundleContext bc) {
-        warehouseService1.started(bc);
-        warehouseService2.started(bc);
-    }
-    
-    public void fulfillOrder(String order) {
-    	System.out.println("OSGiWarehouseImpl.fulfillOrder : shipper is " + shipper);
-        	
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
deleted file mode 100644
index 3317816557..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
+++ /dev/null
@@ -1,62 +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 supplychain.warehouse;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-import supplychain.shipper.Shipper;
-
-
-/**
- * This class implements the Warehouse service.
- */
-public class OSGiWarehouseServiceImpl implements Warehouse {
-
-    private OSGiWarehouseImpl warehouseImpl;
-    private Shipper shipper;
-    private int shipperNum;
-
-
-    OSGiWarehouseServiceImpl(OSGiWarehouseImpl warehouseImpl, int shipperNum) {
-        this.warehouseImpl = warehouseImpl;
-        this.shipperNum = shipperNum;
-    }
-    
-    
-    protected void started(BundleContext bc) {
-        try {
-            ServiceReference[] refs = bc.getServiceReferences(Shipper.class.getName(), 
-                    "(component.service.name=ShipperComponent" + shipperNum + "/Shipper)");
-            if (refs != null && refs.length > 0) {
-                shipper = (Shipper) bc.getService(refs[0]);
-            }
-        } catch (InvalidSyntaxException e) {
-        }
-    }
-
-    public void fulfillOrder(String order) {
-        System.out.println("OSGiWarehouseImpl.fulfillOrder : shipper is " + warehouseImpl.shipper);
-            
-        shipper.processShipment(order + ", fulfilled");
-        
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
+++ /dev/null
@@ -1,28 +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 supplychain.warehouse;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-    
-    public void fulfillOrder(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
deleted file mode 100644
index 6d1ad76796..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
+++ /dev/null
@@ -1,28 +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 supplychain.warehouse;
-
-/**
- * This is the business interface of the RetailerQuery service.
- */
-public interface WarehouseQuery {
-    
-    public boolean isAvailable(String order);
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
deleted file mode 100644
index 71e248590b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="CallbackClient">

-        <interface.java interface="callback.client.CallbackClient"/>

-    </service>

-    

-    

-    <reference name="callbackService" >

-        <interface.java interface="callback.service.CallbackService" 

-                        callbackInterface="callback.client.CallbackCallback" />

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
deleted file mode 100644
index 7c1125bbb5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
+++ /dev/null
@@ -1,27 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="CallbackService">

-        <interface.java interface="callback.service.CallbackService" 

-                        callbackInterface="callback.client.CallbackCallback"/>

-    </service>

-    

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
deleted file mode 100644
index 8456b878f2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
+++ /dev/null
@@ -1,39 +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://callback"

-    name="CallbackTest">

-           

-    <component name="CallbackClient">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0" 

-            bundleSymbolicName="callback.CallbackClient">

-            

-            <properties referenceCallback="callbackService">

-               <property name="component.name">CallbackClient</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="callbackService" target="CallbackService"/>

-    </component> 

-    

-    <component name="CallbackService">

-      <implementation.java class="callback.service.JavaCallbackServiceImpl"/>

-    </component>  

-  

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
deleted file mode 100644
index d5a47c6403..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
+++ /dev/null
@@ -1,41 +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://callback"

-    name="CallbackTest">

-           

-    <component name="CallbackClient">

-        <implementation.java class="callback.client.JavaCallbackClientImpl"/>

-        <reference name="callbackService" target="CallbackService"/>

-    </component> 

-    

-   

-    <component name="CallbackService">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="callback.CallbackService"

-        >

-        <properties serviceCallback="CallbackService">

-            <property name="component.name">CallbackClient</property>

-        </properties>

-        

-        </implementation.osgi >   

-    </component> 

-  

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
deleted file mode 100644
index e6391d2159..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
+++ /dev/null
@@ -1,38 +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://callback"

-    name="CallbackTest">

-           

-    <component name="CallbackClient">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="callback.CallbackClient"

-        />

-        <reference name="callbackService" target="CallbackService"/>

-    </component> 

-    

-   

-    <component name="CallbackService">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="callback.CallbackService"

-        />

-    </component> 

-  

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
deleted file mode 100644
index c79ede815b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
+++ /dev/null
@@ -1,37 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-

-    <service name="ConversationalClient">

-        <interface.java interface="conversation.client.ConversationalClient"/>

-    </service>

-    

-    

-    <reference name="conversationalReferenceClient" >

-        <interface.java interface="conversation.referenceclient.ConversationalReferenceClient" />

-    </reference>

-    

-    <reference name="conversationalService" >

-        <interface.java interface="conversation.service.ConversationalService" 

-                        callbackInterface="conversation.client.ConversationalCallback" />

-    </reference>

-    

-   

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
deleted file mode 100644
index 04cc73b85c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-

-    

-    <service name="ConversationalReferenceClient">

-        <interface.java interface="conversation.referenceclient.ConversationalReferenceClient"/>

-    </service>

-    

-   

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
deleted file mode 100644
index 9ece700efe..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
+++ /dev/null
@@ -1,29 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-

-    <service name="ConversationalService">

-        <interface.java interface="conversation.service.ConversationalService"

-                        callbackInterface="conversation.client.ConversationalCallback" />

-    </service>

-    

-   

-    

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
deleted file mode 100644
index 52bc43478d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
+++ /dev/null
@@ -1,162 +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://conversations"

-    name="ConversationalITest">

-           

-    <component name="ConversationalStatelessClientStatelessService">

-        <!-- <implementation.java class="conversation.ConversationalClientStatelessImpl"/> -->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalClient"

-            classes="conversation.client.ConversationalClientStatelessImpl">

-            

-            <properties service="ConversationalClient">

-               <property name="component.name">ConversationalStatelessClientStatelessService</property>

-            </properties>

-            <properties reference="conversationalReferenceClient">

-               <property name="component.name">ConversationalReferenceClient</property>

-            </properties>

-            <properties reference="conversationalService">

-               <property name="component.name">ConversationalServiceStateless</property>

-            </properties>

-            <properties serviceCallback="$callback$.conversationalService">

-               <property name="component.name">ConversationalStatelessClientStatelessService</property>

-            </properties>

-            

-        </implementation.osgi>

-        

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>        

-        <reference name="conversationalService" target="ConversationalServiceStateless/ConversationalService"/>

-    </component>   

-    

-    <component name="ConversationalStatelessClientStatefulService">

-        <!--<implementation.java class="conversation.ConversationalClientStatelessImpl"/>-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalClient"

-            classes="conversation.client.ConversationalClientStatelessImpl">

-            

-            <properties service="ConversationalClient">

-               <property name="component.name">ConversationalStatelessClientStatefulService</property>

-            </properties>

-            <properties reference="conversationalReferenceClient">

-               <property name="component.name">ConversationalReferenceClient</property>

-            </properties>

-            <properties reference="conversationalService">

-               <property name="component.name">ConversationalServiceStateful</property>

-            </properties>

-            <properties serviceCallback="$callback$.conversationalService">

-               <property name="component.name">ConversationalStatelessClientStatefulService</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful/ConversationalService"/>

-    </component>     

-    

-    <component name="ConversationalStatefulClientStatelessService">

-        <!--<implementation.java class="conversation.ConversationalClientStatefulImpl"/>-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalClient"

-            classes="conversation.client.ConversationalClientStatefulImpl">

-            

-            <properties service="ConversationalClient">

-               <property name="component.name">ConversationalStatefulClientStatelessService</property>

-            </properties>

-            <properties reference="conversationalReferenceClient">

-               <property name="component.name">ConversationalReferenceClient</property>

-            </properties>

-            <properties reference="conversationalService">

-               <property name="component.name">ConversationalServiceStateless</property>

-            </properties>

-            <properties serviceCallback="$callback$.conversationalService">

-               <property name="component.name">ConversationalStatefulClientStatelessService</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateless/ConversationalService"/>

-    </component>   

-    

-    <component name="ConversationalStatefulClientStatefulService">

-        <!--<implementation.java class="conversation.ConversationalClientStatefulImpl"/>-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalClient"

-            classes="conversation.client.ConversationalClientStatefulImpl">

-            

-            <properties service="ConversationalClient">

-               <property name="component.name">ConversationalStatefulClientStatefulService</property>

-            </properties>

-            <properties reference="conversationalReferenceClient">

-               <property name="component.name">ConversationalReferenceClient</property>

-            </properties>

-            <properties reference="conversationalService">

-               <property name="component.name">ConversationalServiceStateful</property>

-            </properties>

-            <properties serviceCallback="$callback$.conversationalService">

-               <property name="component.name">ConversationalStatefulClientStatefulService</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient/ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStateful/ConversationalService"/>

-    </component>   

-    

-    <component name="ConversationalReferenceClient">

-        <!--<implementation.java class="conversation.ConversationalReferenceClientImpl"/>-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalReferenceClient"

-            classes="conversation.referenceclient.ConversationalReferenceClientImpl"

-        />

-        

-    </component>    

-        

-    <component name="ConversationalServiceStateful">

-        <!--<implementation.java class="conversation.ConversationalServiceStatefulImpl"/>-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalService"

-            classes="conversation.service.ConversationalServiceStatefulImpl">

-            

-            <properties service="ConversationalService">

-               <property name="component.name">ConversationalServiceStateful</property>

-            </properties>

-        </implementation.osgi>

-        

-    </component>       

-   

-    <component name="ConversationalServiceStateless">

-        <!--<implementation.java class="conversation.ConversationalServiceStatelessImpl"/>-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="conversation.ConversationalService"

-            classes="conversation.service.ConversationalServiceStatelessImpl">

-            

-            <properties service="ConversationalService">

-               <property name="component.name">ConversationalServiceStateless</property>

-            </properties>

-        </implementation.osgi>

-        

-    </component> 

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
+++ /dev/null
@@ -1,34 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
+++ /dev/null
@@ -1,29 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
+++ /dev/null
@@ -1,29 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
+++ /dev/null
@@ -1,34 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
+++ /dev/null
@@ -1,29 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
+++ /dev/null
@@ -1,29 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
deleted file mode 100644
index 0b8d2e5851..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
+++ /dev/null
@@ -1,130 +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"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.factory.supplychain.customer.Customer"

-                classes="supplychain.customer.OSGiStatelessCustomerComponentImpl" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent1"/>

-        

-        <reference name="retailer2" target="RetailerComponent2" />

-        

-        <reference name="retailer3" target="RetailerComponent3" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-

-

-

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.factory.supplychain.shipper.Shipper"

-            classes="supplychain.shipper.OSGiStatelessShipperComponentImpl" >

-            

-            <properties service="Shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.factory.supplychain.shipper.Shipper"

-            classes="supplychain.shipper.OSGiStatelessShipperComponentImpl" >

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
deleted file mode 100644
index 87370a6df4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
+++ /dev/null
@@ -1,116 +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"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="factory.supplychain.customer.Customer"

-                classes="supplychain.customer.OSGiStatelessCustomerImpl" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent1"/>

-        

-        <reference name="retailer2" target="RetailerComponent2" />

-        

-        <reference name="retailer3" target="RetailerComponent3" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="factory.supplychain.retailer.Retailer">

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="factory.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-

-

-

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="factory.supplychain.shipper.Shipper"

-            classes="supplychain.shipper.OSGiStatelessShipperServiceImpl" >

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-    </component>

-    

-     

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
deleted file mode 100644
index 127349eacf..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
+++ /dev/null
@@ -1,30 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="Greetings">
-        <interface.java interface="helloworld.Greetings"/>
-    </service>
-    
-    
-    <reference name="greetingsService" >
-        <interface.java interface="helloworld.Greetings" />
-    </reference>
-      
-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
deleted file mode 100644
index 7e3810c458..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
+++ /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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="OSGiHelloWorld">
-        <interface.java interface="helloworld.HelloWorld"/>
-    </service>
-    
-    
-    <reference name="helloWorldWS" >
-        <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" / -->
-        <interface.java interface="helloworld.ws.HelloWorld" />
-    </reference>
-      
-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
deleted file mode 100644
index fb9a112d18..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailerQuery">

-            <interface.java interface="supplychain.retailer.RetailerQuery"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
deleted file mode 100644
index ee732b5efc..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerQuery">

-        <interface.java interface="supplychain.retailer.RetailerQuery"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <reference name="warehouseQuery">

-            <interface.java interface="supplychain.warehouse.WarehouseQuery"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
+++ /dev/null
@@ -1,29 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
deleted file mode 100644
index b1723660d7..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    <service name="WarehouseQuery">

-        <interface.java interface="supplychain.warehouse.WarehouseQuery"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
deleted file mode 100644
index fb9a112d18..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailerQuery">

-            <interface.java interface="supplychain.retailer.RetailerQuery"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
deleted file mode 100644
index ee732b5efc..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerQuery">

-        <interface.java interface="supplychain.retailer.RetailerQuery"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <reference name="warehouseQuery">

-            <interface.java interface="supplychain.warehouse.WarehouseQuery"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
+++ /dev/null
@@ -1,29 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
deleted file mode 100644
index b1723660d7..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    <service name="WarehouseQuery">

-        <interface.java interface="supplychain.warehouse.WarehouseQuery"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
deleted file mode 100644
index 5172cbe21e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
+++ /dev/null
@@ -1,57 +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"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-    

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.interfaces.supplychain.customer.Customer"

-        />

-        <reference name="retailer" target="RetailerComponent/Retailer"/>

-        <reference name="retailerQuery" target="RetailerComponent/RetailerQuery"/>

-        

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.interfaces.supplychain.retailer.Retailer"

-        />

-        <reference name="warehouse" target="WarehouseComponent/Warehouse"/>

-        <reference name="warehouseQuery" target="WarehouseComponent/WarehouseQuery"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseWithQueryComponentImpl" />

-       

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.interfaces.supplychain.shipper.Shipper"

-        />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-   

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
deleted file mode 100644
index b7591e732d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
+++ /dev/null
@@ -1,57 +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"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-    

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="interfaces.supplychain.customer.Customer"

-        />

-        <reference name="retailer" target="RetailerComponent/Retailer"/>

-        <reference name="retailerQuery" target="RetailerComponent/RetailerQuery"/>

-        

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="interfaces.supplychain.retailer.Retailer"

-        />

-        <reference name="warehouse" target="WarehouseComponent/Warehouse"/>

-        <reference name="warehouseQuery" target="WarehouseComponent/WarehouseQuery"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseWithQueryComponentImpl" />

-       

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="interfaces.supplychain.shipper.Shipper"

-        />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-   

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
deleted file mode 100644
index cf8717fcf5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: CallbackClient

-Bundle-SymbolicName: callback.CallbackClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, callback.service

-Export-Package: callback.client

-Bundle-Activator: callback.client.OSGiCallbackClientImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
deleted file mode 100644
index 785212fa6d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: CallbackService

-Bundle-SymbolicName: callback.CallbackService

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, callback.client

-Export-Package: callback.service

-Bundle-Activator: callback.service.OSGiCallbackServiceImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
deleted file mode 100644
index 510b3cdcce..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: ConversationTest

-Bundle-SymbolicName: conversation.ConversationalClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.oasisopen.sca, org.oasisopen.sca.annotation,

-                conversation.service, conversation.referenceclient

-Export-Package: conversation.client

-Bundle-Activator: conversation.client.ConversationalClientActivator

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
deleted file mode 100644
index a8270363d2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: ConversationTest

-Bundle-SymbolicName: conversation.ConversationalReferenceClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.oasisopen.sca, org.oasisopen.sca.annotation,

-                conversation.service

-Export-Package: conversation.referenceclient

-Bundle-Activator: conversation.referenceclient.ConversationalReferenceClientActivator

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
deleted file mode 100644
index 6062757a32..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: ConversationTest

-Bundle-SymbolicName: conversation.ConversationalService

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.oasisopen.sca, org.oasisopen.sca.annotation,

-                conversation.client

-Export-Package: conversation.service

-Bundle-Activator: conversation.service.ConversationalServiceActivator

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
deleted file mode 100644
index 26f32fe617..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: factory.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.retailer

-Export-Package: supplychain.customer

-Bundle-Activator: supplychain.customer.OSGiCustomerFactoryImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
deleted file mode 100644
index 1b9e0e847e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: factory.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
deleted file mode 100644
index 6066a38f29..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: factory.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.customer

-Export-Package: supplychain.shipper

-Bundle-Activator: supplychain.shipper.OSGiShipperFactoryImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
deleted file mode 100644
index 777edd3f7d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.factory.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer

-Export-Package: supplychain.customer

-Service-Component: osgi/factory/ds/Customer.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
deleted file mode 100644
index d8adaa2ba3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
+++ /dev/null
@@ -1,41 +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.    
--->
-<component name="CustomerComponent" >
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service servicefactory="true" >
-         <provide interface="supplychain.customer.Customer" />
-    </service>
-    <reference 
-        name="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
deleted file mode 100644
index e0bd9d8c10..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.factory.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Service-Component: osgi/factory/ds/Retailer1.xml, osgi/factory/ds/Retailer2.xml 

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
deleted file mode 100644
index 6005ae785c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="RetailerComponent1"  >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service servicefactory="true">
-         <provide interface="supplychain.retailer.Retailer" />
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <property name="retailerName">amazon.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
deleted file mode 100644
index 6f0b79ebc2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="RetailerComponent2" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service servicefactory="true">
-         <provide interface="supplychain.retailer.Retailer" />
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
deleted file mode 100644
index d4b461460e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.factory.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer

-Export-Package: supplychain.shipper

-Service-Component: osgi/factory/ds/Shipper1.xml, osgi/factory/ds/Shipper2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
deleted file mode 100644
index bb15e6e3aa..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<component name="ShipperComponent1"  >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service servicefactory="true">
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
deleted file mode 100644
index 7591201b8c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<component name="ShipperComponent2">
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service servicefactory="true">
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
deleted file mode 100644
index 0e844fab99..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.factory.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.shipper

-Export-Package: supplychain.warehouse

-Service-Component: osgi/factory/ds/Warehouse.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
deleted file mode 100644
index fc86a76784..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="WarehouseComponent"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
deleted file mode 100644
index a8a87c5c8c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: interfaces.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.retailer

-Export-Package: supplychain.customer

-Bundle-Activator: supplychain.customer.OSGiCustomerWithQueryImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
deleted file mode 100644
index 05bbf4db88..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: interfaces.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Bundle-Activator: supplychain.retailer.OSGiRetailerWithQueryImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
deleted file mode 100644
index a12d1a21ea..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: interfaces.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.customer

-Export-Package: supplychain.shipper

-Bundle-Activator: supplychain.shipper.OSGiShipperImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
deleted file mode 100644
index 2214db11a6..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.interfaces.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer

-Export-Package: supplychain.customer

-Service-Component: osgi/interfaces/ds/Customer.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
deleted file mode 100644
index 8d44067992..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
+++ /dev/null
@@ -1,43 +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.    
---> 
-<component name="CustomerComponent" immediate="true">
-    <implementation class="supplychain.customer.OSGiCustomerWithQueryComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer"/>
-    </service>
-    <reference 
-        name="retailer"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer"
-        unbind="unsetRetailer"
-        target="(component.service.name=RetailerComponent/Retailer)"
-        policy="dynamic"
-    />
-    
-    <reference 
-        name="retailerQuery"
-        interface="supplychain.retailer.RetailerQuery" 
-        bind="setRetailerQuery"
-        unbind="unsetRetailerQuery"
-        target="(component.service.name=RetailerComponent/RetailerQuery)"
-        policy="dynamic"
-    />
-    
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
deleted file mode 100644
index 60c0fb3fd3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.interfaces.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Service-Component: osgi/interfaces/ds/Retailer.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
deleted file mode 100644
index ca1392d2b8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
+++ /dev/null
@@ -1,39 +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.    
--->
-<component name="RetailerComponent" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerWithQueryComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-         <provide interface="supplychain.retailer.RetailerQuery"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <reference 
-        name="supplychain.warehouse.WarehouseQuery" 
-        interface="supplychain.warehouse.WarehouseQuery" 
-        bind="setWarehouseQuery"
-        unbind="unsetWarehouseQuery"
-    />
-    <property name="retailerName">amazon.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
deleted file mode 100644
index 7c9f67c36d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.interfaces.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer

-Export-Package: supplychain.shipper

-Service-Component: osgi/interfaces/ds/Shipper.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
deleted file mode 100644
index 760c761666..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<component name="ShipperComponent"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
deleted file mode 100644
index 7d56770311..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Greetings

-Bundle-SymbolicName: passbyref.helloworld.Greetings

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework

-Export-Package: helloworld

-Bundle-Activator: helloworld.OSGiGreetingsImpl

-

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
deleted file mode 100644
index 321bdc713f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: stockquote.ManagedStockQuoteFactory

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.cm

-Export-Package: stockquote

-Bundle-Activator: stockquote.OSGiManagedStockQuoteFactoryImpl

-

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
deleted file mode 100644
index 66f98011cb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: stockquote.StockQuote

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.cm

-Export-Package: stockquote

-Bundle-Activator: stockquote.OSGiStockQuoteImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
deleted file mode 100644
index 6874a66db9..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: stockquote.StockQuoteFactory

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.cm

-Export-Package: stockquote

-Bundle-Activator: stockquote.OSGiStockQuoteFactoryImpl

-

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
deleted file mode 100644
index 47d290eb1a..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: ds.stockquote.StockQuote

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.component, org.osgi.service.cm

-Export-Package: stockquote

-Service-Component: osgi/properties/ds/StockQuote.xml

-

-

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
deleted file mode 100644
index c7f13a50a7..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
+++ /dev/null
@@ -1,27 +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.    
--->
-<component name="StockQuoteComponent" immediate="true">
-    <implementation class="stockquote.OSGiStockQuoteComponentImpl" />
-    <service>
-         <provide interface="stockquote.StockQuote"/>
-    </service>
-    <property name="currency">GBP</property>
-    <property name="exchangeRate" type="Double">1.0</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
deleted file mode 100644
index f4c102c4f0..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: StockQuote

-Bundle-SymbolicName: ds.stockquote.StockQuoteFactory

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.component, org.osgi.service.cm

-Export-Package: stockquote

-Service-Component: osgi/properties/ds/StockQuoteFactory.xml

-

-

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
deleted file mode 100644
index cbebf7eec2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
+++ /dev/null
@@ -1,27 +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.    
--->
-<component name="StockQuoteComponent" >
-    <implementation class="stockquote.OSGiStockQuoteComponentImpl" />
-    <service servicefactory="true" >
-         <provide interface="stockquote.StockQuote" />
-    </service>
-    <property name="currency">GBP</property>
-    <property name="exchangeRate" type="Double">1.0</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
deleted file mode 100644
index 19b41cf4a4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: HelloWorldClient

-Bundle-SymbolicName: ds.helloworld.sdo.HelloWorldClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.component, 

- org.oasisopen.sca, org.oasisopen.sca.annotation,

- commonj.sdo, commonj.sdo.helper, 

- org.apache.tuscany.sdo.helper, org.apache.tuscany.sdo.impl, org.apache.tuscany.sdo.model, org.apache.tuscany.sdo.model.impl,

- org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl,

- helloworld.sdo

-Export-Package: helloworld.sdo.client

-Service-Component: osgi/sdo/ds/HelloWorldClient.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
deleted file mode 100644
index cb6345432f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<component name="HelloWorldClientComponent" immediate="true">
-    <implementation class="helloworld.sdo.client.HelloWorldClientComponent" />
-    <service>
-         <provide interface="helloworld.sdo.client.HelloWorldClient"/>
-    </service>
-    <reference 
-        name="helloWorldService"
-        interface="helloworld.sdo.HelloWorldService" 
-        bind="setHelloWorldService"
-        unbind="unsetHelloWorldService"
-        target="(component.service.name=JavaHelloWorldServiceComponent/HelloWorldService)"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
deleted file mode 100644
index d730273c0e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: HelloWorldService

-Bundle-SymbolicName: ds.helloworld.sdo.HelloWorldService

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, org.osgi.service.component,

- org.oasisopen.sca, org.oasisopen.sca.annotation,

- commonj.sdo, commonj.sdo.helper, 

- org.apache.tuscany.sdo.helper, org.apache.tuscany.sdo.impl, org.apache.tuscany.sdo.model, org.apache.tuscany.sdo.model.impl,

- org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl

-Export-Package: helloworld.sdo

-Service-Component: osgi/sdo/ds/HelloWorldService.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
deleted file mode 100644
index d968d1ffc5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
+++ /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.    
--->
-<component name="HelloWorldServiceComponent" immediate="true">
-    <implementation class="helloworld.sdo.HelloWorldServiceComponent" />
-    <service>
-         <provide interface="helloworld.sdo.HelloWorldService"/>
-    </service>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
deleted file mode 100644
index fc762df8d5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: services.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.retailer

-Export-Package: supplychain.customer

-Bundle-Activator: supplychain.customer.OSGiCustomerImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
deleted file mode 100644
index 02e42bc010..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: services.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
deleted file mode 100644
index 390367b99b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: services.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.customer

-Export-Package: supplychain.shipper

-Bundle-Activator: supplychain.shipper.OSGiShipperImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
deleted file mode 100644
index 4715cbd976..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: services.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.shipper

-Export-Package: supplychain.warehouse

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
deleted file mode 100644
index 932fb8a483..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.services.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer

-Export-Package: supplychain.customer

-Service-Component: osgi/services/ds/Customer.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
deleted file mode 100644
index b10d0416dc..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
+++ /dev/null
@@ -1,41 +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.    
--->
-<component name="CustomerComponent" immediate="true">
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer"/>
-    </service>
-    <reference 
-        name="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
deleted file mode 100644
index c799f31606..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.services.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Service-Component: osgi/services/ds/Retailer1.xml, osgi/services/ds/Retailer2.xml 

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
deleted file mode 100644
index db68d7e333..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="RetailerComponent1" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <property name="retailerName">amazon.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
deleted file mode 100644
index 1aea3cf669..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="RetailerComponent2" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
deleted file mode 100644
index 106bd1b6aa..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.services.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer

-Export-Package: supplychain.shipper

-Service-Component: osgi/services/ds/Shipper1.xml, osgi/services/ds/Shipper2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
deleted file mode 100644
index 1e3c915a59..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<component name="ShipperComponent1"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
deleted file mode 100644
index d7d0b41f5e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<component name="ShipperComponent2"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
deleted file mode 100644
index 81c51e6804..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.services.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.shipper

-Export-Package: supplychain.warehouse

-Service-Component: osgi/services/ds/Warehouse1.xml, osgi/services/ds/Warehouse2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="WarehouseComponent1"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="WarehouseComponent2"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
deleted file mode 100644
index 335bc419c1..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: version.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.retailer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.customer;version="1.0.0"

-Bundle-Activator: supplychain.customer.OSGiVersionedCustomerImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
deleted file mode 100644
index a68b9d6dbb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: version.supplychain.customer.Customer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.retailer;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.customer;version="2.0.0"

-Bundle-Activator: supplychain.customer.OSGiVersionedCustomerImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
deleted file mode 100644
index 02f79c15f3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: version.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer;version="1.0.0"

-Bundle-Activator: supplychain.retailer.OSGiVersionedRetailerImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
deleted file mode 100644
index 8428b08d96..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: version.supplychain.retailer.Retailer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer;version="2.0.0"

-Bundle-Activator: supplychain.retailer.OSGiVersionedRetailerImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
deleted file mode 100644
index c81bf00d00..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: version.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.customer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.shipper;version="1.0.0"

-Bundle-Activator: supplychain.shipper.OSGiVersionedShipperImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
deleted file mode 100644
index 61c161617c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: version.supplychain.shipper.Shipper

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.customer;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.shipper;version="2.0.0"

-Bundle-Activator: supplychain.shipper.OSGiVersionedShipperImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
deleted file mode 100644
index fd6a26a65f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: version.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.shipper;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.warehouse;version="1.0.0"

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
deleted file mode 100644
index 0168bc2435..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: version.supplychain.warehouse.Warehouse

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.shipper;version="2.0.0"

-Export-Package: supplychain.warehouse;version="2.0.0"

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
deleted file mode 100644
index 6674cdd7f2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.version.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.customer;version="1.0.0"

-Service-Component: osgi/version/ds/CustomerV1.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
deleted file mode 100644
index 72df35ef41..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.version.supplychain.customer.Customer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.customer;version="2.0.0"

-Service-Component: osgi/version/ds/CustomerV2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
deleted file mode 100644
index 724c8132df..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
+++ /dev/null
@@ -1,41 +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.    
--->
-<component name="CustomerComponent1" immediate="true">
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer"/>
-    </service>
-    <reference 
-        name="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
deleted file mode 100644
index 1e5035d949..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
+++ /dev/null
@@ -1,41 +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.    
--->
-<component name="CustomerComponent2" immediate="true">
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer"/>
-    </service>
-    <reference 
-        name="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
deleted file mode 100644
index 85bfd86422..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.version.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer;version="1.0.0"

-Service-Component: osgi/version/ds/Retailer1V1.xml, osgi/version/ds/Retailer2V1.xml 

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
deleted file mode 100644
index 6e51b3d6f2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<component name="RetailerComponent1.Retailer1" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent1/Warehouse)"
-    />
-    <property name="retailerName">amazon.com</property>
-    <property name="version">1</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
deleted file mode 100644
index 9a87758ec2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<component name="RetailerComponent2.Retailer1" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent2/Warehouse)"
-    />
-    <property name="retailerName">amazon.com</property>
-    <property name="version">2</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
deleted file mode 100644
index e134bd1061..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.version.supplychain.retailer.Retailer

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer;version="2.0.0"

-Service-Component: osgi/version/ds/Retailer1V2.xml, osgi/version/ds/Retailer2V2.xml 

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
deleted file mode 100644
index c19895bab1..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<component name="RetailerComponent1.Retailer2" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent1/Warehouse)"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
deleted file mode 100644
index 707609d2c4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<component name="RetailerComponent2.Retailer2" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent2/Warehouse)"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
deleted file mode 100644
index e084e5831a..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.version.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.shipper;version="1.0.0"

-Service-Component: osgi/version/ds/Shipper1V1.xml, osgi/version/ds/Shipper2V1.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
deleted file mode 100644
index d96f6481fb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
+++ /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.    
--->
-<component name="ShipperComponent1.ShipperService1"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-        target="(component.name=CustomerComponent1)"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
deleted file mode 100644
index 10ef690c9b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
+++ /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.    
--->
-<component name="ShipperComponent2.ShipperService1"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-        target="(component.name=CustomerComponent2)"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
deleted file mode 100644
index 003f9dca5a..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.version.supplychain.shipper.Shipper

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.shipper;version="2.0.0"

-Service-Component: osgi/version/ds/Shipper1V2.xml, osgi/version/ds/Shipper2V2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
deleted file mode 100644
index fefdea106d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
+++ /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.    
--->
-<component name="ShipperComponent1.ShipperService2"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-        target="(component.name=CustomerComponent1)"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
deleted file mode 100644
index f6b847ed59..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
+++ /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.    
--->
-<component name="ShipperComponent2.ShipperService2"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-        target="(component.name=CustomerComponent2)"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
deleted file mode 100644
index 5cff2f573e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.version.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.shipper;version="[1.0.0,2.0.0)"

-Export-Package: supplychain.warehouse;version="1.0.0"

-Service-Component: osgi/version/ds/Warehouse1V1.xml, osgi/version/ds/Warehouse2V2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="WarehouseComponent1"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="WarehouseComponent2"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
deleted file mode 100644
index 0fec68a725..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.version.supplychain.warehouse.Warehouse

-Bundle-Version: 2.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.shipper;version="[2.0.0,3.0.0)"

-Export-Package: supplychain.warehouse;version="2.0.0"

-Service-Component: osgi/version/ds/Warehouse1V1.xml, osgi/version/ds/Warehouse2V2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="WarehouseComponent1"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="WarehouseComponent2"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
deleted file mode 100644
index 678014d48d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: wiring.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.retailer

-Export-Package: supplychain.customer

-Bundle-Activator: supplychain.customer.OSGiCustomerImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
deleted file mode 100644
index f0090fb52b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: wiring.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
deleted file mode 100644
index 0b50923a05..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: wiring.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.customer

-Export-Package: supplychain.shipper

-Bundle-Activator: supplychain.shipper.OSGiShipperImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
deleted file mode 100644
index 1000a5f974..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: wiring.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.shipper

-Export-Package: supplychain.warehouse

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
deleted file mode 100644
index 4e392a9ff1..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.wiring.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer

-Export-Package: supplychain.customer

-Service-Component: osgi/wiring/ds/Customer.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
deleted file mode 100644
index b10d0416dc..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
+++ /dev/null
@@ -1,41 +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.    
--->
-<component name="CustomerComponent" immediate="true">
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer"/>
-    </service>
-    <reference 
-        name="retailer1"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer1"
-        unbind="unsetRetailer1"
-        target="(retailerName=amazon.com)"
-        policy="dynamic"
-    />
-    <reference 
-        name="retailer2"
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer2"
-        unbind="unsetRetailer2"
-        target="(retailerName=play.com)"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
deleted file mode 100644
index 788ec4f19a..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.wiring.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Service-Component: osgi/wiring/ds/Retailer1.xml, osgi/wiring/ds/Retailer2.xml 

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
deleted file mode 100644
index 1ba16d0693..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<component name="RetailerComponent1" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent1/Warehouse)"
-    />
-    <property name="retailerName">amazon.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
deleted file mode 100644
index a55ebd02a8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<component name="RetailerComponent2" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference 
-        name="supplychain.warehouse.Warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        target="(component.service.name=WarehouseComponent1/Warehouse)"
-    />
-    <property name="retailerName">play.com</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
deleted file mode 100644
index e7459360e6..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.wiring.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer

-Export-Package: supplychain.shipper

-Service-Component: osgi/wiring/ds/Shipper1.xml, osgi/wiring/ds/Shipper2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
deleted file mode 100644
index d518ecab62..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
+++ /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.    
--->
-<component name="ShipperComponent1"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        target="(component.service.name=CustomerComponent/Customer)"
-        policy="dynamic"
-    />
-    <property name="shipperName">RoyalMail</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
deleted file mode 100644
index d7d0b41f5e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<component name="ShipperComponent2"  immediate="true" >
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper" />
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-    <property name="shipperName">ParcelForce</property>
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
deleted file mode 100644
index 880304187b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.wiring.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.shipper

-Export-Package: supplychain.warehouse

-Service-Component: osgi/wiring/ds/Warehouse1.xml, osgi/wiring/ds/Warehouse2.xml

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
deleted file mode 100644
index d72db04425..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<component name="WarehouseComponent1"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-        target="(shipperName=ParcelForce)"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
deleted file mode 100644
index f9c1218f82..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<component name="WarehouseComponent2"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-        target="(shipperName=RoyalMail)"
-    />
-</component>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
deleted file mode 100644
index d8e4c1cb7e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: HelloWorld

-Bundle-SymbolicName: helloworld.HelloWorld

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component ,

- helloworld.ws

-Export-Package: helloworld

-Bundle-Activator: helloworld.OSGiHelloWorldImpl

-

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
deleted file mode 100644
index a6de268bf6..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
+++ /dev/null
@@ -1,30 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Greetings">

-        <interface.java interface="helloworld.Greetings"/>

-    </service>

-    

-    

-    <reference name="greetingsService" >

-        <interface.java interface="helloworld.Greetings" />

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
deleted file mode 100644
index 660e277693..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
+++ /dev/null
@@ -1,39 +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"

-           name="HelloWorld">

-

-    <component name="JavaGreetingsComponent">

-        <implementation.java class="helloworld.JavaGreetingsComponent"/>

-        

-        <reference name="greetingsService" target="OSGiGreetingsComponent" />

-    </component>

-

-    <component name="OSGiGreetingsComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="passbyref.helloworld.Greetings"

-            classes="helloworld.OSGiGreetingsImpl"

-        />

-        <reference name="greetingsService" target="JavaGreetingsComponent" />

-    </component>

-

-    

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="StockQuoteService">

-        <interface.java interface="stockquote.StockQuote"/>

-    </service>

-    

-    <property name="currency" type="xsd:string" >GBP</property> 

-    <property name="exchangeRate" type="xsd:double" >1.0</property> 

-    

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="StockQuoteService">

-        <interface.java interface="stockquote.StockQuote"/>

-    </service>

-    

-    <property name="currency" type="xsd:string" >GBP</property> 

-    <property name="exchangeRate" type="xsd:double" >1.0</property> 

-    

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="StockQuoteService">

-        <interface.java interface="stockquote.StockQuote"/>

-    </service>

-    

-    <property name="currency" type="xsd:string" >GBP</property> 

-    <property name="exchangeRate" type="xsd:double" >1.0</property> 

-    

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="StockQuoteService">

-        <interface.java interface="stockquote.StockQuote"/>

-    </service>

-    

-    <property name="currency" type="xsd:string" >GBP</property> 

-    <property name="exchangeRate" type="xsd:double" >1.0</property> 

-    

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
deleted file mode 100644
index 02ae93aec2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
+++ /dev/null
@@ -1,39 +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"

-           name="StockQuoteComposite">

-

-    <component name="StockQuoteComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.stockquote.StockQuote"

-            classes="stockquote.OSGiStockQuoteComponentImpl">

-            

-            <properties service="StockQuoteService">

-                <property name="service.pid">stockQuote</property>

-            </properties>

-        </implementation.osgi>

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
deleted file mode 100644
index c94504f07d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
+++ /dev/null
@@ -1,54 +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"

-           name="StockQuoteComposite">

-

-    <component name="USDStockQuoteComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.stockquote.StockQuoteFactory"

-            classes="stockquote.OSGiStockQuoteComponentImpl">

-            

-            <properties service="StockQuoteService">

-                <property name="service.pid">stockQuote</property>

-            </properties>

-        </implementation.osgi>

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-    

-     <component name="EUROStockQuoteComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.stockquote.StockQuoteFactory"

-            classes="stockquote.OSGiStockQuoteComponentImpl">

-            

-            <properties service="StockQuoteService">

-                <property name="service.pid">stockQuote</property>

-            </properties>

-        </implementation.osgi>

-        

-        <property name="currency" type="xsd:string" >EURO</property> 

-        <property name="exchangeRate" type="xsd:double" >1.48</property> 

-            

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
deleted file mode 100644
index fea03404fd..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
+++ /dev/null
@@ -1,39 +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"

-           name="StockQuoteComposite">

-

-    <component name="StockQuoteComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="stockquote.StockQuote"

-            classes="stockquote.OSGiStockQuoteImpl">

-            

-            <properties service="StockQuoteService">

-                <property name="service.pid">stockQuote</property>

-            </properties>

-        </implementation.osgi>

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
deleted file mode 100644
index 3c425fcbc9..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
+++ /dev/null
@@ -1,50 +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"

-           name="StockQuoteComposite">

-

-    <component name="USDStockQuoteComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="stockquote.StockQuoteFactory"

-            classes="stockquote.OSGiStockQuoteImpl">

-            

-        </implementation.osgi>

-       

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-    

-    <component name="EUROStockQuoteComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="stockquote.StockQuoteFactory"

-            classes="stockquote.OSGiStockQuoteImpl">

-            

-        </implementation.osgi>

-        

-        

-        <property name="currency" type="xsd:string" >EURO</property> 

-        <property name="exchangeRate" type="xsd:double" >1.48</property> 

-            

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
deleted file mode 100644
index f6c04de980..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
+++ /dev/null
@@ -1,30 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    

-    <service name="HelloWorldClient">

-        <interface.java interface="helloworld.sdo.client.HelloWorldClient"/>

-    </service>

-        

-    <reference name="helloWorldService" >

-        <interface.java interface="helloworld.sdo.HelloWorldService" />

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
deleted file mode 100644
index 87918132e6..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="HelloWorldService">

-        <interface.java interface="helloworld.sdo.HelloWorldService"/>

-    </service>

-    

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml b/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
deleted file mode 100644
index 9b00787162..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://helloworld"
-              xmlns:helloworld="http://helloworld">
-   <deployable composite="helloworld:helloworldsdo"/>
-   
-   <import.java package="helloworld.sdo"/>
-</contribution>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl b/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
deleted file mode 100644
index 2ecc0bea43..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
+++ /dev/null
@@ -1,88 +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://helloworld" xmlns:tns="http://helloworld"

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

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

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld"

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

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="tns:Name" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <complexType name="Name">

-                <sequence>

-                    <element name="first" type="xsd:string" />

-                    <element name="last" type="xsd:string" />

-                </sequence>

-            </complexType>

-

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest" />

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse" />

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction="" />

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldService" />

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
deleted file mode 100644
index af79dc4bdf..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
+++ /dev/null
@@ -1,47 +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://helloworld"

-    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:hw="http://helloworld"

-    name="helloworldsdo">

-    

-    <component name="JavaHelloWorldServiceComponent">

-        <implementation.java class="helloworld.sdo.HelloWorldServiceComponent" />

-    </component>

-    

-    <component name="JavaHelloWorldClientComponent">

-        <implementation.java class="helloworld.sdo.client.HelloWorldClientComponent" />

-        <reference name="helloWorldService" target="OSGiHelloWorldServiceComponent" />

-    </component>

-    

-    <component name="OSGiHelloWorldServiceComponent">       

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.helloworld.sdo.HelloWorldService"

-        />

-    </component>

-    

-    <component name="OSGiHelloWorldClientComponent">       

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.helloworld.sdo.HelloWorldClient"

-        />

-        

-        <reference name="helloWorldService" target="JavaHelloWorldServiceComponent" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Customer.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Customer.componentType
+++ /dev/null
@@ -1,34 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
+++ /dev/null
@@ -1,33 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
+++ /dev/null
@@ -1,30 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
+++ /dev/null
@@ -1,34 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
+++ /dev/null
@@ -1,33 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
+++ /dev/null
@@ -1,30 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
deleted file mode 100644
index c144a1bc18..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
+++ /dev/null
@@ -1,90 +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"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.services.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>            

-            

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent/RetailerService3" />

-    </component>

-    

-    <component name="RetailerComponent">

-        <!-- implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" -->

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.services.supplychain.retailer.Retailer" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>    

-    </component>

-    

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent/ShipperService2"  />

-    </component>

-    

-

-    <component name="ShipperComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.services.supplychain.shipper.Shipper" >

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-         </implementation.osgi>

-        <reference name="customer" target="CustomerComponent" />

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/services-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/services-test.composite
deleted file mode 100644
index 64f3b30f88..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/services-test.composite
+++ /dev/null
@@ -1,89 +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"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="services.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>            

-            

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent/RetailerService3" />

-    </component>

-    

-    <component name="RetailerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="services.supplychain.retailer.Retailer" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>    

-    </component>

-    

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent/ShipperService2"  />

-    </component>

-    

-

-    <component name="ShipperComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="services.supplychain.shipper.Shipper"  >

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-         </implementation.osgi>

-        <reference name="customer" target="CustomerComponent" />

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
deleted file mode 100644
index 0b0aa0912b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="StockQuoteService">
-        <interface.java interface="stockquote.StockQuote"/>
-    </service>
-    
-    <property name="currency" type="xsd:string" >GBP</property> 
-    <property name="exchangeRate" type="xsd:double" >1.0</property> 
-    
-</componentType>
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
+++ /dev/null
@@ -1,34 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
+++ /dev/null
@@ -1,34 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
+++ /dev/null
@@ -1,33 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
+++ /dev/null
@@ -1,33 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
+++ /dev/null
@@ -1,30 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
+++ /dev/null
@@ -1,30 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
+++ /dev/null
@@ -1,34 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
+++ /dev/null
@@ -1,34 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="CustomerService">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
+++ /dev/null
@@ -1,33 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
+++ /dev/null
@@ -1,33 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="RetailerService1">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService2">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <service name="RetailerService3">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
+++ /dev/null
@@ -1,30 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
+++ /dev/null
@@ -1,30 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="ShipperService1">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <service name="ShipperService2">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
deleted file mode 100644
index 877d0de1c9..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
+++ /dev/null
@@ -1,184 +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"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.version.supplychain.customer.Customer"

-                bundleVersion="1.0.0" >

-                

-            <properties service="CustomerService">

-                <property name="component.name">CustomerComponent1</property>

-            </properties>

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent1/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent1/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent1/RetailerService3" />

-    </component>

-    

-    

-    

-    <component name="CustomerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.version.supplychain.customer.Customer"

-                bundleVersion="2.0.0" >

-                

-            <properties service="CustomerService">

-                <property name="component.name">CustomerComponent2</property>

-            </properties>

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent2/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent2/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent2/RetailerService3" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.version.supplychain.retailer.Retailer"

-                bundleVersion="1.0.0" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.service.name">WarehouseComponent1/Warehouse</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>    

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.version.supplychain.retailer.Retailer"

-                bundleVersion="2.0.0" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-             <properties reference="warehouse">

-                <property name="component.service.name">WarehouseComponent2/Warehouse</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent2"/>

-    </component>

-

-   

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1/ShipperService2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2/ShipperService2"  />

-    </component>

-

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.version.supplychain.shipper.Shipper"

-                bundleVersion="1.0.0">

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-                <property name="component.name">ShipperComponent1.ShipperService1</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-                <property name="component.name">ShipperComponent1.ShipperService2</property>

-            </properties>

-            <properties reference="customer">

-                <property name="component.name">CustomerComponent1</property>

-            </properties>

-         </implementation.osgi>

-         

-        <reference name="customer" target="CustomerComponent1" />

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.version.supplychain.shipper.Shipper"

-                bundleVersion="2.0.0">

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-                <property name="component.name">ShipperComponent2.ShipperService1</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-                <property name="component.name">ShipperComponent2.ShipperService2</property>

-            </properties>

-            <properties reference="customer">

-                <property name="component.name">CustomerComponent2</property>

-            </properties>

-         </implementation.osgi>

-         

-        <reference name="customer" target="CustomerComponent2" />

-        

-    </component>

-    

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/version-test.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/version-test.composite
deleted file mode 100644
index bbb397ee70..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/version-test.composite
+++ /dev/null
@@ -1,170 +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"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="version.supplychain.customer.Customer"

-                bundleVersion="1.0.0" >

-                

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-        

-        <reference name="retailer1" target="RetailerComponent1/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent1/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent1/RetailerService3" />

-    </component>

-    

-    

-    

-    <component name="CustomerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="version.supplychain.customer.Customer"

-                bundleVersion="2.0.0" >

-                

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent2/RetailerService1"/>

-        

-        <reference name="retailer2" target="RetailerComponent2/RetailerService2" />

-        

-        <reference name="retailer3" target="RetailerComponent2/RetailerService3" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="version.supplychain.retailer.Retailer"

-                bundleVersion="1.0.0" >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>    

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="version.supplychain.retailer.Retailer"

-                bundleVersion="2.0.0"  >

-            <properties service="RetailerService1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties service="RetailerService2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties service="RetailerService3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.service.name">WarehouseComponent2/Warehouse</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent2"/>

-    </component>

-

-   

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1/ShipperService2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2/ShipperService2"  />

-    </component>

-

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="version.supplychain.shipper.Shipper"

-                bundleVersion="1.0.0" >

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-            <properties reference="customer">

-                <property name="component.name">CustomerComponent1</property>

-            </properties>

-         </implementation.osgi>

-         

-        <reference name="customer" target="CustomerComponent1" />

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="version.supplychain.shipper.Shipper"

-                bundleVersion="2.0.0">

-            

-            <properties service="ShipperService1">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-            <properties service="ShipperService2">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-            <properties reference="customer">

-                <property name="component.name">CustomerComponent2</property>

-            </properties>

-         </implementation.osgi>

-         

-        <reference name="customer" target="CustomerComponent2" />

-        

-    </component>

-    

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
+++ /dev/null
@@ -1,34 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
+++ /dev/null
@@ -1,29 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
+++ /dev/null
@@ -1,29 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
+++ /dev/null
@@ -1,34 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer1">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer2">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    <reference name="retailer3">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
+++ /dev/null
@@ -1,29 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-    <property name="retailerName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
+++ /dev/null
@@ -1,29 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <service name="Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-    <property name="shipperName" type="xsd:string" >default</property> 

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
deleted file mode 100644
index 617200d8dd..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
+++ /dev/null
@@ -1,136 +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"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent1/Retailer" />

-        

-        <reference name="retailer2" target="RetailerComponent2/Retailer" />

-        

-        <reference name="retailer3" target="RetailerComponent3" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    

-    <component name="RetailerComponent3">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent2</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent2"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-

-

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper" >

-            

-            <properties service="Shipper">

-                <property name="component.name">ShipperComponent1</property>

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper"  >

-            

-            <properties service="Shipper">

-                <property name="component.name">ShipperComponent2</property>

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
deleted file mode 100644
index 213cde2c1d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
+++ /dev/null
@@ -1,151 +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"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent1/Retailer" />

-        

-        <reference name="retailer2" target="RetailerComponent2/Retailer" />

-        

-        <reference name="retailer3" target="RetailerComponent3/Retailer" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-            

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-    

-    <component name="WarehouseComponent1">

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.warehouse.Warehouse" >

-                

-            <properties reference="shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-

-

-    <component name="WarehouseComponent2">

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="ds.wiring.supplychain.warehouse.Warehouse" >

-                

-            <properties reference="shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-    

-   

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="ds.wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
deleted file mode 100644
index 0dca0da75e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
+++ /dev/null
@@ -1,127 +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"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.customer.Customer"

-                classes="supplychain.customer.OSGiCustomerImpl" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent1/Retailer" />

-        

-        <reference name="retailer2" target="RetailerComponent2/Retailer" />

-        

-        <reference name="retailer3" target="RetailerComponent3/Retailer" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent2"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-

-

-    <component name="WarehouseComponent1">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-    

-    <component name="WarehouseComponent2">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-    

-   

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
deleted file mode 100644
index 953045fefa..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
+++ /dev/null
@@ -1,151 +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"

-    targetNamespace="http://supplychain"

-    xmlns:sp="http://supplychain"

-    name="supplychain">

-

-    <component name="CustomerComponent">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.customer.Customer" >

-            

-            <properties reference="retailer1">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="retailer2">

-                <property name="retailerName">play.com</property>

-            </properties>

-            <properties reference="retailer3">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-        </implementation.osgi>

-            

-        <reference name="retailer1" target="RetailerComponent1/Retailer" />

-        

-        <reference name="retailer2" target="RetailerComponent2/Retailer" />

-        

-        <reference name="retailer3" target="RetailerComponent3/Retailer" />

-    </component>

-

-    <component name="RetailerComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            <properties service="Retailer">

-                <property name="retailerName">amazon.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <service name="Retailer"/>

-        

-        <reference name="warehouse" target="WarehouseComponent1"/>        

-        <property name="retailerName" type="xsd:string" >amazon.com</property> 

-    </component>

-    

-    <component name="RetailerComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">play.com</property>

-            </properties>

-            

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >play.com</property> 

-    </component>

-    

-    <component name="RetailerComponent3">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.retailer.Retailer" >

-            

-            <properties service="Retailer">

-                <property name="retailerName">ebay.com</property>

-            </properties>

-            <properties reference="warehouse">

-                <property name="component.name">WarehouseComponent1</property>

-            </properties>

-        </implementation.osgi>

-        <reference name="warehouse" target="WarehouseComponent1"/>

-        <property name="retailerName" type="xsd:string" >ebay.com</property> 

-    </component>

-    

-    <component name="WarehouseComponent1">

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.warehouse.Warehouse" >

-                

-            <properties reference="shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="shipper" target="ShipperComponent2"  />

-    </component>

-

-

-    <component name="WarehouseComponent2">

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-                bundleSymbolicName="wiring.supplychain.warehouse.Warehouse" >

-                

-            <properties reference="shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="shipper" target="ShipperComponent1"  />

-    </component>

-    

-   

-    <component name="ShipperComponent1">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">RoyalMail</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >RoyalMail</property> 

-    </component>

-    

-     <component name="ShipperComponent2">

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="wiring.supplychain.shipper.Shipper">

-            

-            <properties service="Shipper">

-                <property name="shipperName">ParcelForce</property>

-            </properties>

-        </implementation.osgi>

-        

-        <reference name="customer" target="CustomerComponent" />

-        <property name="shipperName" type="xsd:string" >ParcelForce</property> 

-        

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
deleted file mode 100644
index c621d9aca0..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
+++ /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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="OSGiHelloWorld">

-        <interface.java interface="helloworld.HelloWorld"/>

-    </service>

-    

-    

-    <reference name="helloWorldWS" >

-        <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" / -->

-        <interface.java interface="helloworld.ws.HelloWorld" />

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
deleted file mode 100644
index 6d3f853382..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
+++ /dev/null
@@ -1,80 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-	name="helloworld">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-            

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService"/>

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
deleted file mode 100644
index d545c844d2..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
+++ /dev/null
@@ -1,51 +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"

-           name="HelloWorld">

-

-    <service name="helloWorld" promote="HelloWorldService">

-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-        <!-- interface.java interface="helloworld.ws.HelloWorld" / -->

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>

-    </service>

-

-    <component name="HelloWorldService">

-        <implementation.java class="helloworld.ws.HelloWorldService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <!--implementation.java class="helloworld.HelloWorldComponent"/-->

-        

-        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

-            bundleSymbolicName="helloworld.HelloWorld"

-        />

-        

-        <service name="OSGiHelloWorld"/>

-        

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-        <!-- interface.java interface="helloworld.ws.HelloWorld" / -->

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
deleted file mode 100644
index 54b9b00bc8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
+++ /dev/null
@@ -1,30 +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 callback;
-
-
-public class Callback1TestCase extends CallbackTestCase {
-
-    public Callback1TestCase() {
-        super("callback-test1.composite");
-    }
-    
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
deleted file mode 100644
index b26bfbd98d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
+++ /dev/null
@@ -1,29 +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 callback;
-
-
-public class Callback2TestCase extends CallbackTestCase {
-
-    public Callback2TestCase() {
-        super("callback-test2.composite");
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
deleted file mode 100644
index 667df7aa12..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
+++ /dev/null
@@ -1,29 +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 callback;
-
-
-public class Callback3TestCase extends CallbackTestCase {
-
-    public Callback3TestCase() {
-        super("callback-test3.composite");
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
deleted file mode 100644
index a95437f8c1..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
+++ /dev/null
@@ -1,50 +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 callback;
-
-
-import callback.client.CallbackClient;
-
-import test.OSGiTestCase;
-
-public abstract class CallbackTestCase extends OSGiTestCase {
-
-    private CallbackClient aCallbackClient;
-    
-    protected String compositeName;
-    
-   
-    public CallbackTestCase(String compositeName) {
-        super(compositeName, "callback");
-    }
-
-   
-
-    protected void setUp() throws Exception {
-    	super.setUp();
-        aCallbackClient = scaDomain.getService(CallbackClient.class, "CallbackClient");
-    }
-
-    
-    public void test() throws Exception {
-        aCallbackClient.run(); 
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
deleted file mode 100644
index c5d94df93d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
+++ /dev/null
@@ -1,325 +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 conversation;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import conversation.client.ConversationalClient;
-
-import test.OSGiTestCase;
-
-public class ConversationTestCase  extends OSGiTestCase {
-
-    private ConversationalClient conversationalStatelessClientStatelessService;
-    private ConversationalClient conversationalStatelessClientStatefulService;
-    private ConversationalClient conversationalStatefulClientStatelessService;
-    private ConversationalClient conversationalStatefulClientStatefulService; 
-    
-    public ConversationTestCase() {
-    	super("conversation-test.composite", "conversation");
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        
-        try {
-
-        	super.setUp();
-
-            conversationalStatelessClientStatelessService = scaDomain.getService(ConversationalClient.class,
-                                   "ConversationalStatelessClientStatelessService/ConversationalClient");
-
-            conversationalStatelessClientStatefulService  = scaDomain.getService(ConversationalClient.class,
-                                   "ConversationalStatelessClientStatefulService/ConversationalClient");
-
-            conversationalStatefulClientStatelessService  = scaDomain.getService(ConversationalClient.class,
-                                   "ConversationalStatefulClientStatelessService/ConversationalClient");
-
-            conversationalStatefulClientStatefulService   = scaDomain.getService(ConversationalClient.class,
-                                   "ConversationalStatefulClientStatefulService/ConversationalClient");
-
-
-            
-        } catch (Exception e) {
-            e.printStackTrace();
-            
-            throw e;
-        }
-               
-    }
-
-    
-    // stateless client stateful service tests
-    // =======================================
-    @Test
-    public void testStatelessStatefulConversationFromInjectedReference() {
-        int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference();
-        Assert.assertEquals(2, count);
-    } 
-    
-    @Test
-    public void testStatelessStatefulConversationFromServiceReference() {
-        int count = conversationalStatelessClientStatefulService.runConversationFromServiceReference();
-        Assert.assertEquals(2, count);
-    }          
-    
-    @Test
-    public void testStatelessStatefulConversationWithUserDefinedConversationId() {
-        int count = conversationalStatelessClientStatefulService.runConversationWithUserDefinedConversationId();
-        Assert.assertEquals(2, count);
-    }   
-    
-     @Test
-    public void testStatelessStatefulConversationCheckUserDefinedConversationId() {
-        String conversationId = conversationalStatelessClientStatefulService.runConversationCheckUserDefinedConversationId();
-        Assert.assertEquals("MyConversation2", conversationId);
-    } 
-    
-     @Test
-    public void testStatelessStatefulConversationCheckingScope() {
-        conversationalStatelessClientStatefulService.runConversationCheckingScope();
-        
-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,init,", 
-                conversationalStatelessClientStatefulService.getServiceCalls());
-    }     
-    
-     @Test
-    public void testStatelessStatefulConversationWithCallback() {
-        int count = conversationalStatelessClientStatefulService.runConversationWithCallback();
-        Assert.assertEquals(0, count);
-               
-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,init,", 
-                conversationalStatelessClientStatefulService.getCalls());        
-    }  
-    
-    /////@Test
-    public void _testStatelessStatefulConversationHavingPassedReference() {
-        int count = conversationalStatelessClientStatefulService.runConversationHavingPassedReference();
-        Assert.assertEquals(3, count);
-    }    
-  
-    @Test
-    public void testStatelessStatefulConversationBusinessException() {
-        String message = conversationalStatelessClientStatefulService.runConversationBusinessException();
-        Assert.assertEquals("Business Exception", message);
-    }     
-    
-    @Test
-    public void testStatelessStatefulConversationBusinessExceptionCallback() {
-        String message = conversationalStatelessClientStatefulService.runConversationBusinessExceptionCallback();
-        Assert.assertEquals("Business Exception", message);
-    }  
-    
-    @Test
-    public void testStatelessStatefulConversationCallingEndedConversation() {
-        int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversation();
-        Assert.assertEquals(0, count);
-    }     
-    
-    @Test
-    public void testStatelessStatefulConversationCallingEndedConversationCallback() {
-        int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallback();
-        Assert.assertEquals(0, count);
-    }     
-    
-    // stateless client stateless service tests
-    // ========================================
-    @Test
-    public void testStatelessStatelessConversationFromInjectedReference() {
-        int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference();
-        Assert.assertEquals(2, count);
-    } 
-    
-    @Test
-    public void testStatelessStatelessConversationFromServiceReference() {
-        int count = conversationalStatelessClientStatelessService.runConversationFromServiceReference();
-        Assert.assertEquals(2, count);
-    }    
-    
-    @Test
-    public void testStatelessStatelessConversationWithUserDefinedConversationId() {
-        int count = conversationalStatelessClientStatelessService.runConversationWithUserDefinedConversationId();
-        Assert.assertEquals(2, count);
-    }  
-    @Test
-    public void testStatelessStatelessConversationCheckUserDefinedConversationId() {
-        String conversationId = conversationalStatelessClientStatelessService.runConversationCheckUserDefinedConversationId();
-        Assert.assertEquals("MyConversation2", conversationId);
-    }     
-    
-    @Test
-    public void testStatelessStatelessConversationCheckingScope() {
-        conversationalStatelessClientStatelessService.runConversationCheckingScope();
-        Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,init,", 
-                conversationalStatelessClientStatelessService.getServiceCalls());
-    }       
-    
-    @Test
-    public void testStatelessStatelessConversationWithCallback() {
-        int count = conversationalStatelessClientStatelessService.runConversationWithCallback();
-        Assert.assertEquals(0, count);
-             
-        Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,init,", 
-                conversationalStatelessClientStatelessService.getCalls());        
-    }
-    /////@Test
-    public void _testStatelessStatelessConversationHavingPassedReference() {
-        int count = conversationalStatelessClientStatelessService.runConversationHavingPassedReference();
-        Assert.assertEquals(3, count);
-    }     
-
-    @Test
-    public void testStatelessStatelessConversationCallingEndedConversation() {
-        int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversation();
-        Assert.assertEquals(-999, count);
-    }     
-    
-    @Test
-    public void testStatelessStatelessConversationCallingEndedConversationCallback() {
-        int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallback();
-        Assert.assertEquals(0, count);
-    } 
-
-    // stateful client stateful service tests  
-    // ======================================
-    @Test
-    public void testStatefulStatefulConversationFromInjectedReference() {
-        int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference();
-        Assert.assertEquals(2, count);
-    } 
-    
-    @Test
-    public void testStatefulStatefulConversationFromServiceReference() {
-        int count = conversationalStatefulClientStatefulService.runConversationFromServiceReference();
-        Assert.assertEquals(2, count);
-    }          
-    
-    @Test
-    public void testStatefulStatefulConversationWithUserDefinedConversationId() {
-        int count = conversationalStatefulClientStatefulService.runConversationWithUserDefinedConversationId();
-        Assert.assertEquals(2, count);
-    }    
-    
-    @Test
-    public void testStatefulStatefulConversationCheckUserDefinedConversationId() {
-        String conversationId = conversationalStatefulClientStatefulService.runConversationCheckUserDefinedConversationId();
-        Assert.assertEquals("MyConversation2", conversationId);
-    } 
-    
-    @Test
-    public void testStatefulStatefulConversationCheckingScope() {
-        conversationalStatefulClientStatefulService.runConversationCheckingScope();
-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,init,", 
-                conversationalStatefulClientStatefulService.getServiceCalls());
-    }  
-
-    @Test
-    public void testStatefulStatefulConversationWithCallback() {
-        int count = conversationalStatefulClientStatefulService.runConversationWithCallback();
-        //System.out.println("Calls: " + conversationalStatefulClientStatefulService.getCalls());
-        Assert.assertEquals(4, count);
-              
-        Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,init,", 
-                conversationalStatefulClientStatefulService.getCalls());        
-    }   
-    
-    /////@Test
-    public void _testStatefulStatefulConversationHavingPassedReference() {
-        int count = conversationalStatefulClientStatefulService.runConversationHavingPassedReference();
-        Assert.assertEquals(3, count);
-    } 
-    
-    @Test
-    public void testStatefulStatefulConversationCallingEndedConversation() {
-        int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversation();
-        Assert.assertEquals(0, count);
-    }     
-    
-    @Test
-    public void testStatefulStatefulConversationCallingEndedConversationCallback() {
-        int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallback();
-        Assert.assertEquals(0, count);
-    }     
-   
-    // stateful client stateless service tests  
-    // =======================================
-    @Test
-    public void testStatefulStatelessConversationFromInjectedReference() {
-        int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference();
-        Assert.assertEquals(2, count);
-    } 
-    
-    @Test
-    public void testStatefulStatelessConversationFromServiceReference() {
-        int count = conversationalStatefulClientStatelessService.runConversationFromServiceReference();
-        Assert.assertEquals(2, count);
-    }    
-    
-    @Test
-    public void testStatefulStatelessConversationWithUserDefinedConversationId() {
-        int count = conversationalStatefulClientStatelessService.runConversationWithUserDefinedConversationId();
-        Assert.assertEquals(2, count);
-    }    
-
-    @Test
-    public void testStatefulStatelessConversationCheckUserDefinedConversationId() {
-        String conversationId = conversationalStatefulClientStatelessService.runConversationCheckUserDefinedConversationId();
-        Assert.assertEquals("MyConversation2", conversationId);
-    } 
-    
-    @Test
-    public void testStatefulStatelessConversationCheckingScope() {
-        conversationalStatefulClientStatelessService.runConversationCheckingScope();
-        
-        Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,init,", 
-                conversationalStatefulClientStatelessService.getServiceCalls());
-    } 
-    
-    @Test
-    public void testStatefulStatelessConversationWithCallback() {
-        int count = conversationalStatefulClientStatelessService.runConversationWithCallback();
-        Assert.assertEquals(4, count);
-        
-        Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,init,", 
-                conversationalStatefulClientStatelessService.getCalls());        
-    }     
-    
-    /////@Test
-    public void _testStatefulStatelessConversationHavingPassedReference() {
-        int count = conversationalStatefulClientStatelessService.runConversationHavingPassedReference();
-        Assert.assertEquals(3, count);
-    }     
-    
-    @Test
-    public void testStatefulStatelessConversationCallingEndedConversation() {
-        int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversation();
-        Assert.assertEquals(-999, count);
-    }     
-    
-    @Test
-    public void testStatefulStatelessConversationCallingEndedConversationCallback() {
-        int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallback();
-        Assert.assertEquals(0, count);
-    }        
-        
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
deleted file mode 100644
index d340923938..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
+++ /dev/null
@@ -1,130 +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 helloworld.passbyref;
-
-import helloworld.Greetings;
-import test.OSGiTestCase;
-
-
-public class PassByRefTestCase extends OSGiTestCase {
-
-    private Greetings greetingsJava;
-    private Greetings greetingsOSGi;
-    private String[] origNames = {"world"};
-    private String[] names;
-    
-    public PassByRefTestCase() {
-    	super("passbyref-test.composite", "passbyref");
-    }
-
-    protected void setUp() throws Exception {
-
-    	super.setUp();
-        greetingsJava = scaDomain.getService(Greetings.class, "JavaGreetingsComponent");
-        greetingsOSGi = scaDomain.getService(Greetings.class, "OSGiGreetingsComponent");
-        
-        names = new String[origNames.length];
-        System.arraycopy(origNames, 0, names, 0, names.length);
-    }
-    
-    
-    public void test() throws Exception {
-        
-        javaOSGiPassByValue();
-        osgiJavaPassByValue();
-        javaOSGiPassByRef();
-        osgiJavaPassByRef();
-        
-    }
-    
-
-    public void javaOSGiPassByValue() throws Exception {
-        
-        String[] greetings = greetingsJava.getGreetingsFromJava(names);
-        for (int i = 0; i < origNames.length; i++) {
-            assertEquals(origNames[i], names[i]);
-        }
-        for (int i = 0; i < origNames.length; i++) {
-
-            System.out.println(greetings[i]);
-            
-            assertEquals(greetings[i], 
-                    "Hello " + origNames[i] + "(From Java)(From OSGi)");
-        }
-        
-    }
-    
-    public void osgiJavaPassByValue() throws Exception {
-        String[] names = {
-                "world"
-        };
-        String[] greetings = greetingsOSGi.getGreetingsFromOSGi(names);
-        
-        for (int i = 0; i < origNames.length; i++) {
-            assertEquals(origNames[i], names[i]);
-        }
-        for (int i = 0; i < origNames.length; i++) {
-
-            System.out.println(greetings[i]);
-            
-            assertEquals(greetings[i], 
-                    "Hello " + origNames[i] + "(From OSGi)(From Java)");
-        }
-        
-
-
-    }
-    
-    public void javaOSGiPassByRef() throws Exception {
-        String[] names = {
-                "world"
-        };
-        String[] greetings = greetingsJava.getModifiedGreetingsFromJava(names);
-        for (int i = 0; i < origNames.length; i++) {
-            assertEquals("Hello " + origNames[i] + "(From Java)(From OSGi)", names[i]);
-        }
-        for (int i = 0; i < origNames.length; i++) {
-
-            System.out.println(greetings[i]);
-            
-            assertEquals(greetings[i], 
-                    "Hello " + origNames[i] + "(From Java)(From OSGi)");
-        }
-    }
-    
-    public void osgiJavaPassByRef() throws Exception {
-        String[] names = {
-                "world"
-        };
-        String[] greetings = greetingsOSGi.getModifiedGreetingsFromOSGi(names);
-        for (int i = 0; i < origNames.length; i++) {
-            assertEquals("Hello " + origNames[i] + "(From OSGi)(From Java)", names[i]);
-        }
-        for (int i = 0; i < origNames.length; i++) {
-
-            System.out.println(greetings[i]);
-            
-            assertEquals(greetings[i], 
-                    "Hello " + origNames[i] + "(From OSGi)(From Java)");
-        }
-    }
-
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
deleted file mode 100644
index c1f11d0b6e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
+++ /dev/null
@@ -1,95 +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 helloworld.sdo;
-
-import helloworld.sdo.client.HelloWorldClient;
-
-import java.io.File;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-import util.OSGiTestUtil;
-
-
-public class SdoTestCase extends TestCase {
-
-    
-    private EmbeddedSCADomain scaDomain;
-    
-    
-    protected void setUp() throws Exception {
-
-        OSGiTestUtil.setUpOSGiTestRuntime();
-
-        scaDomain = new EmbeddedSCADomain(this.getClass().getClassLoader(), "http://localhost");
-        scaDomain.start();
-        ContributionService contributionService = scaDomain.getContributionService();
-        
-        URL serviceURL = new File("./target/classes/sdo/ds/HelloWorldService.jar").toURI().toURL();
-        URL clientURL = new File("./target/classes/sdo/ds/HelloWorldClient.jar").toURI().toURL();
-        
-        Contribution serviceContribution = contributionService.contribute("HelloWorldService", serviceURL, true);
-        Contribution clientContribution = contributionService.contribute("HelloWorldClient", clientURL, true);
-        
-        for (Composite deployable : serviceContribution.getDeployables()) {
-            scaDomain.getDomainComposite().getIncludes().add(deployable);
-            scaDomain.buildComposite(deployable);
-        }
-        for (Composite deployable : clientContribution.getDeployables()) {
-            scaDomain.getDomainComposite().getIncludes().add(deployable);
-            scaDomain.buildComposite(deployable);
-        }
-        for (Composite deployable : clientContribution.getDeployables() ) {
-            scaDomain.getCompositeActivator().activate(deployable);
-            scaDomain.getCompositeActivator().start(deployable);
-        }
-    }
-
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-
-        OSGiTestUtil.shutdownOSGiRuntime();
-    }
-    
-
-    public void testJavaToOSGi() throws Exception {
-
-        HelloWorldClient helloWorldClient = scaDomain.getService(HelloWorldClient.class, "JavaHelloWorldClientComponent");
-        String greetings = helloWorldClient.getGreetings("Apache", "Tuscany");
-        System.out.println(greetings);
-        assertEquals("Hello Apache Tuscany", greetings);
-    }
-    
-    public void testOSGiToJava() throws Exception {
-
-        HelloWorldClient helloWorldClient = scaDomain.getService(HelloWorldClient.class, "OSGiHelloWorldClientComponent");
-        String greetings = helloWorldClient.getGreetings("Apache", "Tuscany");
-        System.out.println(greetings);
-        assertEquals("Hello Apache Tuscany", greetings);
-    }
-
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
deleted file mode 100644
index 49afb3d8e8..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.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 helloworld.ws;
-
-import helloworld.HelloWorld;
-
-
-import test.OSGiTestCase;
-import util.OSGiTestUtil;
-
-
-public class HelloWorldTestCase extends OSGiTestCase {
-
-    private HelloWorld helloWorld;
-    
-    public HelloWorldTestCase() {
-    	super("ws-helloworld.composite", "ws");
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        helloWorld = scaDomain.getService(HelloWorld.class, "HelloWorldComponent");
-    }
-    
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-        OSGiTestUtil.shutdownOSGiRuntime();
-    }
-    
-
-    public void testHelloWorld() throws Exception {
-        String greetings = helloWorld.getGreetings("petra");
-        System.out.println(greetings);
-        assertEquals("Hello petra", greetings);
-    }
-
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
deleted file mode 100644
index a858c18a90..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
+++ /dev/null
@@ -1,63 +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 supplychain;
-
-import supplychain.customer.Customer;
-import test.OSGiTestCase;
-
-/**
- * Test case for supplychain - it is invoked with different composite files to test 
- * various scenarios.
- */
-public abstract class SupplyChainTestCase extends OSGiTestCase {
-
-    public Customer customer;
-    
-   
-    public SupplyChainTestCase(String compositeName, String contributionLocation) {
-        super(compositeName, contributionLocation);
-    }
-
-    protected void setUp() throws Exception {
-
-    	super.setUp();
-        customer = scaDomain.getService(Customer.class, "CustomerComponent");
-    }
-    
-    public void test() throws Exception {
-        
-        System.out.println("Main thread " + Thread.currentThread());
-        customer.purchaseBooks();
-        customer.purchaseGames();
-        long timeout = 5000L;
-        while (timeout > 0) {
-            if (customer.hasOutstandingOrders()) {
-                Thread.sleep(100);
-                timeout -= 100;
-            } else
-                break;
-        }
-        assertFalse(customer.hasOutstandingOrders());
-
-        System.out.println("Test complete");
-        
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
deleted file mode 100644
index a9941aebcd..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
+++ /dev/null
@@ -1,71 +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 supplychain;
-
-import supplychain.customer.Customer;
-import test.OSGiTestCase;
-
-/**
- * OSGi test program - common code for versioned bundles
- */
-public abstract class VersionedSupplyChainTestCase extends OSGiTestCase {
-    
-    private Customer customer1;
-    private Customer customer2;
-    
-
-    public VersionedSupplyChainTestCase(String compositeName, String contributionLocation) {
-        super(compositeName, contributionLocation);
-    }
-    
-    protected void setUp() throws Exception {
-        
-        super.setUp();
-        customer1 = scaDomain.getService(Customer.class, "CustomerComponent1");
-        customer2 = scaDomain.getService(Customer.class, "CustomerComponent2");
-    }
-    
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        Thread.sleep(2000);
-    }
-   
-    public void test() throws Exception {
-        
-        System.out.println("Main thread " + Thread.currentThread());
-        customer1.purchaseBooks();
-        customer2.purchaseGames();
-        long timeout = 5000L;
-        while (timeout > 0) {
-            if (customer1.hasOutstandingOrders()) {
-                Thread.sleep(100);
-                timeout -= 100;
-            } else if (customer2.hasOutstandingOrders()) {
-                Thread.sleep(100);
-                timeout -= 100;
-            } else
-                break;
-        }
-        assertFalse(customer1.hasOutstandingOrders());
-        assertFalse(customer2.hasOutstandingOrders());
-
-        System.out.println("Test complete");
-        
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
deleted file mode 100644
index 8e939b1a83..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.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 supplychain.factory;
-
-
-/**
- * OSGi test program - declarative with scopes other than composites which use OSGi service factories
- */
-public class DSFactoryTestCase extends FactoryTestCase {
-
-    public DSFactoryTestCase() {
-        super("factory-ds-test.composite", "factory/ds");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
deleted file mode 100644
index 39d90bb75c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
+++ /dev/null
@@ -1,72 +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 supplychain.factory;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with scopes other than composites which use OSGi service factories
- */
-public class FactoryTestCase extends SupplyChainTestCase {
-    /**
-     * This constant defines the time period (in milliseconds) for which we are prepared to wait for
-     * the @OneWay notifyShipment() callback to run. 
-     */
-    private static final long MAX_WAIT_TIME_FOR_CALLBACK = 10000;
-
-    public FactoryTestCase() {
-        super("factory-test.composite", "factory");
-    }
-    
-    protected FactoryTestCase(String compositeName, String contributionLocation) {
-        super(compositeName, contributionLocation);
-    }
-    
-    
-    @Override
-    public void test() throws Exception {
-        
-        System.out.println("Main thread " + Thread.currentThread());
-        customer.purchaseBooks();
-        waitForOrderShipmentNotification();                // TUSCANY-2198 notifyShipment() callback is @OneWay 
-        assertFalse(customer.hasOutstandingOrders());
-        
-        customer.purchaseGames();       
-        waitForOrderShipmentNotification();                // TUSCANY-2198 notifyShipment() callback is @OneWay 
-        assertFalse(customer.hasOutstandingOrders());
-
-        Thread.sleep(2000);
-        System.out.println("Test complete");
-        
-    }
-
-    /**
-     * Since the notifyShipment() callback on the Customer is @OneWay, we need to allow
-     * some time for it to complete as it is runs asynchronously.
-     *
-     * This is for TUSCANY-2198
-     */
-    private void waitForOrderShipmentNotification() throws InterruptedException {
-        long startTime = System.currentTimeMillis();
-        while (customer.hasOutstandingOrders()
-                && System.currentTimeMillis() - startTime < MAX_WAIT_TIME_FOR_CALLBACK) {
-            Thread.sleep(100);
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
deleted file mode 100644
index 5376687b61..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.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 supplychain.interfaces;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with components exposing multiple services with multiple interfaces
- */
-public class DSInterfacesTestCase extends SupplyChainTestCase {
-
-    public DSInterfacesTestCase() {
-        super("interfaces-ds-test.composite", "interfaces/ds");
-    }
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
deleted file mode 100644
index 6d8dc1021e..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.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 supplychain.interfaces;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with components exposing multiple services with multiple interfaces
- */
-public class InterfacesTestCase extends SupplyChainTestCase {
-
-    public InterfacesTestCase() {
-        super("interfaces-test.composite", "interfaces");
-    }
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
deleted file mode 100644
index e037ae9675..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.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 supplychain.properties;
-
-
-/**
- * OSGi test program - declarative with business properties
- */
-public class DSProperties2TestCase extends Properties2TestCase {
-
-    public DSProperties2TestCase() {
-        super("properties2-ds-test.composite", "properties/ds");
-    }
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
deleted file mode 100644
index eecf67913d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.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 supplychain.properties;
-
-
-/**
- * OSGi test program - declarative with business properties
- */
-public class DSPropertiesTestCase extends PropertiesTestCase {
-
-    public DSPropertiesTestCase() {
-        super("properties-ds-test.composite", "properties/ds");
-    }
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
deleted file mode 100644
index 203bf5123c..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
+++ /dev/null
@@ -1,69 +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 supplychain.properties;
-
-
-import stockquote.StockQuote;
-import test.OSGiTestCase;
-
-/**
- * OSGi test program - procedural with business properties
- */
-public class Properties2TestCase extends OSGiTestCase {
-    
-
-    private StockQuote stockQuoteServiceUSD;
-    private StockQuote stockQuoteServiceEURO;
-    
-    public Properties2TestCase() {
-        super("properties2-test.composite", "properties");
-    }
-    
-    protected Properties2TestCase(String compositeName, String contributionLocation) {
-        super(compositeName, contributionLocation);
-    }
-
-    protected void setUp() throws Exception {
-        
-        super.setUp();
-        stockQuoteServiceUSD = scaDomain.getService(StockQuote.class, "USDStockQuoteComponent");
-        stockQuoteServiceEURO = scaDomain.getService(StockQuote.class, "EUROStockQuoteComponent");
-    }
-    
-    public void test() throws Exception {
-    
-        double stockQuote = stockQuoteServiceUSD.getQuote("IBM");
-        
-        double expectedValue = 52.81 * 2.0;
-        
-        System.out.println("IBM: $" + stockQuote);
-        
-        assertTrue(stockQuote > expectedValue - 0.1 && stockQuote < expectedValue + 0.1);
-        
-        double stockQuote2 = stockQuoteServiceEURO.getQuote("IBM");
-        
-        double expectedValue2 = 52.81 * 1.48;
-        
-        System.out.println("IBM: Euro " + stockQuote2);
-        
-        assertTrue(stockQuote2 > expectedValue2 - 0.1 && stockQuote2 < expectedValue2 + 0.1);
-        
-    }
-        
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
deleted file mode 100644
index 429b1f10ef..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.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 supplychain.properties;
-
-import stockquote.StockQuote;
-import test.OSGiTestCase;
-
-/**
- * OSGi test program - procedural with business properties
- */
-public class PropertiesTestCase extends OSGiTestCase {
-    
-
-    private StockQuote stockQuoteService;
-    
-    public PropertiesTestCase() {
-        super("properties-test.composite", "properties");
-    }
-    
-    protected PropertiesTestCase(String compositeName, String contributionLocation) {
-        super(compositeName, contributionLocation);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        stockQuoteService = scaDomain.getService(StockQuote.class, "StockQuoteComponent");
-    }
-    
-    
-    public void test() throws Exception {
-    
-        double stockQuote = stockQuoteService.getQuote("IBM");
-        
-        double expectedValue = 52.81 * 2.0;
-        
-        System.out.println("IBM: " + stockQuote);
-        
-        assertTrue(stockQuote > expectedValue - 0.1 && stockQuote < expectedValue + 0.1);
-        
-    }
-        
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
deleted file mode 100644
index dbc980f8c4..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.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 supplychain.services;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with components exposing multiple services
- */
-public class DSServicesTestCase extends SupplyChainTestCase {
-
-    public DSServicesTestCase() {
-        super("services-ds-test.composite", "services/ds");
-    }
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
deleted file mode 100644
index e39295a402..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.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 supplychain.services;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with components exposing multiple services
- */
-public class ServicesTestCase extends SupplyChainTestCase {
-
-    public ServicesTestCase() {
-        super("services-test.composite", "services");
-    }
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
deleted file mode 100644
index c2f6bff4f5..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
+++ /dev/null
@@ -1,33 +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 supplychain.version;
-
-import supplychain.VersionedSupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with versioning
- */
-public class DSVersionTestCase extends VersionedSupplyChainTestCase {
-    
-    public DSVersionTestCase() {
-        super("version-ds-test.composite", "version/ds");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
deleted file mode 100644
index 17ba7a2f14..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
+++ /dev/null
@@ -1,33 +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 supplychain.version;
-
-import supplychain.VersionedSupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with versioning
- */
-public  class VersionTestCase extends VersionedSupplyChainTestCase {
-    
-    public VersionTestCase() {
-        super("version-test.composite", "version");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
deleted file mode 100644
index 8c33720018..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
+++ /dev/null
@@ -1,33 +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 supplychain.wiring;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with SCA wiring
- */
-public class DSWiring1TestCase extends SupplyChainTestCase {
-
-    public DSWiring1TestCase() {
-        super("wiring-ds-test1.composite", "wiring/ds");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
deleted file mode 100644
index 0c6edd6691..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
+++ /dev/null
@@ -1,33 +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 supplychain.wiring;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - declarative with SCA wiring 
- */
-public class DSWiring2TestCase extends SupplyChainTestCase {
-
-    public DSWiring2TestCase() {
-        super("wiring-ds-test2.composite", "wiring/ds");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
deleted file mode 100644
index 0b48ac90ba..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.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 supplychain.wiring;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with SCA wiring
- */
-public class Wiring1TestCase extends SupplyChainTestCase {
-
-    public Wiring1TestCase() {
-        super("wiring-test1.composite", "wiring");
-    }
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
deleted file mode 100644
index c84741f34f..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.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 supplychain.wiring;
-
-import supplychain.SupplyChainTestCase;
-
-/**
- * OSGi test program - procedural with SCA wiring
- */
-public class Wiring2TestCase extends SupplyChainTestCase {
-
-    public Wiring2TestCase() {
-        super("wiring-test2.composite", "wiring");
-    }
-   
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
deleted file mode 100644
index 5a9b2a8b1d..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
+++ /dev/null
@@ -1,67 +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 test;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import util.OSGiTestUtil;
-
-/**
- * Test case setup base code - it is invoked with different composite files to test 
- * various scenarios.
- */
-public abstract class OSGiTestCase extends TestCase {
-
-    private String compositeName;
-    private String contributionLocation;
-    public SCADomain scaDomain;
-
-    public OSGiTestCase(String compositeName, String contributionLocation) {
-        super();
-        this.compositeName = compositeName;
-        this.contributionLocation = contributionLocation;
-        try {
-            if (contributionLocation != null) {
-                File f = new File("target/classes/" + contributionLocation);
-                this.contributionLocation = f.toURL().toString();
-            }
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    protected void setUp() throws Exception {
-
-        OSGiTestUtil.setUpOSGiTestRuntime();
-
-        scaDomain = SCADomain.newInstance("http://localhost", contributionLocation, compositeName);
-    }
-
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-
-        OSGiTestUtil.shutdownOSGiRuntime();
-    }
-
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/java/sca-contrib/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
deleted file mode 100644
index 7b95c12038..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
+++ /dev/null
@@ -1,71 +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 util;
-
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-
-/**
- * OSGi Test Utils
- */
-public  class OSGiTestUtil  {
-    
-    public static void setUpOSGiTestRuntime() throws Exception {
-
-        setUpFelixTestRuntime();
-    }
-    
-    
-    private static void setUpFelixTestRuntime() throws Exception {
-
-        String felixConfigFileName = "file:target/test-classes/osgi/felix/felix.config.properties";
-        
-        System.setProperty("felix.config.properties", felixConfigFileName);
-        
-        try {
-            
-            ClassLoader cl = OSGiTestUtil.class.getClassLoader();
-            
-            Class felixMainClass = cl.loadClass("org.apache.felix.main.Main");
-            if (felixMainClass != null) {
-                String felixDir = felixMainClass.getProtectionDomain().getCodeSource().getLocation().getPath();
-                int index = 0;
-                if ((index = felixDir.indexOf("/org.apache.felix.main")) >= 0) {
-                    felixDir = felixDir.substring(0, index);
-                    System.setProperty("FELIX_DIR", felixDir);
-                }
-            }
-            
-        } catch (Exception e) {
-            // Ignore
-        }
-        
-        
-    }
-    
-    public static void shutdownOSGiRuntime()  {
-        try {
-            OSGiRuntime.stop();
-        
-        } catch (Exception e) {
-            // Ignore
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/java/sca-contrib/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
deleted file mode 100644
index 8399991503..0000000000
--- a/java/sca-contrib/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
+++ /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.    
-#
-#
-# Framework config properties.
-#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.0.0, \
- org.osgi.service.url; version=1.0.0 \
- org.osgi.util.tracker; version=1.3.2 
-
-
-felix.auto.start.1= \
-    "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" \
-    "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar" 
-
-
-#    "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \
-#    "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \
-#    "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \
-
-felix.startlevel.framework=1
-felix.startlevel.bundle=1
-
-#
-# Bundle config properties.
-#
-org.osgi.service.http.port=8080
-obr.shell.telnet=on
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
deleted file mode 100644
index 189012d38b..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
+++ /dev/null
@@ -1,99 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-osgi-tuscany-test</artifactId>

-    <name>Apache Tuscany OSGi-Based Tuscany Runtime Tests</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.eclipse</groupId>

-            <artifactId>osgi</artifactId>

-            <version>3.3.2.R33x_v20080105</version>

-        </dependency>

-

-

-<!--  Uncomment this section and comment out the Equinox dependency above to run tests using Felix.

-

-        <dependency>

-            <groupId>org.apache.felix</groupId>

-            <artifactId>org.apache.felix.main</artifactId>

-            <version>1.0.4</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.felix</groupId>

-            <artifactId>org.apache.felix.configadmin</artifactId>

-            <version>1.0.1</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.felix</groupId>

-                    <artifactId>javax.servlet</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.felix</groupId>

-            <artifactId>org.apache.felix.scr</artifactId>

-            <version>1.0.2</version>

-        </dependency>

-

-End Felix dependencies -->

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-surefire-plugin</artifactId>

-                <configuration>

-                  <forkMode>pertest</forkMode>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-    <repositories>

-        <repository>

-            <id>ops4j-repository</id>

-            <url>http://repository.ops4j.org/maven2</url>

-            <snapshots>

-                <enabled>false</enabled>

-            </snapshots>

-        </repository>

-    </repositories>

-

-</project>

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
deleted file mode 100644
index 2e3137239e..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
+++ /dev/null
@@ -1,92 +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.osgi.runtime.impl;
-
-import java.lang.reflect.Method;
-
-import org.osgi.framework.BundleContext;
-
-public class EquinoxTestRuntime extends OSGiTestRuntime  {
-    
-    
-    private static BundleContext bundleContext;
-    
-    private static EquinoxTestRuntime instance;
-    
-    private static Class<?> eclipseStarterClass;
-    
-    public static OSGiTestRuntime getInstance() throws Exception {
-        if (instance == null) {
-            eclipseStarterClass = EquinoxTestRuntime.class.getClassLoader().loadClass("org.eclipse.core.runtime.adaptor.EclipseStarter");
-            EquinoxTestRuntime runtime = new EquinoxTestRuntime();
-            instance = runtime;
-        }
-        return instance;
-    }
-    
-    
-    protected BundleContext startRuntime() throws Exception {
-        
-        if (bundleContext != null)
-            return bundleContext;
-                    
-        Method startupMethod = eclipseStarterClass.getMethod("startup", String [].class, Runnable.class);
-        
-        System.setProperty("org.osgi.framework.system.packages", getSystemPackages());
-        // Equinox version 3.2 upwards have a startup method which returns BundleContext
-        bundleContext = (BundleContext) startupMethod.invoke(null, 
-                new String[] {/*"-clean", */"-console", "-configuration", "target/configuration"}, 
-                null );        
-        
-        return bundleContext;
-        
-    }
-
-    @Override
-    public BundleContext getBundleContext() {
-        return bundleContext;
-    }
-
-    @Override
-    protected void setBundleContext(BundleContext bundleContext) {
-        super.setBundleContext(bundleContext);
-        EquinoxTestRuntime.bundleContext = bundleContext;
-    }
-    
-    @Override
-    public void shutdown() throws Exception {
-
-        if (bundleContext == null)
-            return;
-        bundleContext = null;
-        instance = null;
-        if (eclipseStarterClass != null) {
-            Method shutdownMethod = eclipseStarterClass.getMethod("shutdown");
-            try {
-                shutdownMethod.invoke(eclipseStarterClass);
-            } catch (Exception e) {
-                // Ignore errors.
-            }
-        }
-        super.shutdown();
-    }
-
-
-   
-}
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
deleted file mode 100644
index 0dafffdb8c..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
+++ /dev/null
@@ -1,163 +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.osgi.runtime.impl;

-

-import java.io.File;

-import java.lang.reflect.Constructor;

-import java.lang.reflect.Method;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-import java.util.Properties;

-

-import org.osgi.framework.Bundle;

-import org.osgi.framework.BundleActivator;

-import org.osgi.framework.BundleContext;

-

-public class FelixTestRuntime extends OSGiTestRuntime implements BundleActivator {

-    

-    private static BundleContext bundleContext;

-    

-    private static FelixTestRuntime instance;

-    

-    private static Bundle felix;

-    

-    

-    public static OSGiTestRuntime getInstance() throws Exception {

-        if (instance == null) {

-            

-            FelixTestRuntime runtime = new FelixTestRuntime();

-            instance = runtime;

-        }

-        return instance;

-    }

-    

-    

-//    private void deleteDirectory(File dir) {

-//        File[] files = dir.listFiles();

-//        for (int i = 0; i < files.length; i++) {

-//            if (files[i].isDirectory()) 

-//                deleteDirectory(files[i]);

-//            else {

-//                files[i].delete();

-//            }

-//        }

-//        dir.delete();

-//        

-//    }

-    

-//    private void deleteProfile() {

-//        String profileDirName = System.getProperty("felix.cache.profiledir");

-//        if (profileDirName == null) profileDirName = ".felix";

-//        File profileDir = new File(profileDirName); 

-//        if (profileDir.isDirectory())  

-//            deleteDirectory(profileDir);

-//        else

-//            profileDir.delete();

-//    }

-    

-    protected BundleContext startRuntime() throws Exception {

-        

-        if (bundleContext != null)

-            return bundleContext;

-        

-        ClassLoader cl = this.getClass().getClassLoader();

-        Class<?> felixMainClass = cl.loadClass("org.apache.felix.main.Main");

-        Class<?> felixClass = cl.loadClass("org.apache.felix.framework.Felix");

-        Method propsMethod = felixMainClass.getMethod("loadConfigProperties");

-        Properties props = (Properties)propsMethod.invoke(null);

-        

-        //deleteProfile();

-        // Create profile directory

-        String profileDirName = System.getProperty("felix.cache.profiledir");

-        if (profileDirName == null) profileDirName = ".felix";

-        File profileDir = new File(profileDirName); 

-        profileDir.mkdir();

-        

-        props.put("felix.cache.profiledir", profileDir.getAbsolutePath());

-        props.put("felix.embedded.execution", "true");

-        String systemPackages = getSystemPackages() + 

-                ", org.apache.felix.main";

-        

-        

-        props.put("org.osgi.framework.system.packages", systemPackages);

-        

-        Constructor felixConstructor = felixClass.getConstructor(Map.class, List.class);

-        List<BundleActivator> activators = new ArrayList<BundleActivator>();

-

-        Class<?> autoActivatorClass = cl.loadClass("org.apache.felix.main.AutoActivator");

-        Constructor autoActivatorConstructor = autoActivatorClass.getConstructor(Map.class);

-        BundleActivator autoActivator = (BundleActivator)autoActivatorConstructor.newInstance(props);            

-        activators.add(autoActivator);

-        felix = (Bundle)felixConstructor.newInstance(props, activators);

-        felix.start();

-        bundleContext = felix.getBundleContext();

-                   

-        return bundleContext;

-        

-    }

-

-    public void start(BundleContext context) throws Exception {

-        

-        bundleContext = context;

-        synchronized (this) {

-            this.notify();

-        }

-    }

-

-    public void stop(BundleContext context) throws Exception {

-        bundleContext = null;

-    }

-    

-    

-    

-    @Override

-    public BundleContext getBundleContext() {

-        return bundleContext;

-    }

-    

-    @Override

-    protected void setBundleContext(BundleContext bundleContext) {

-        super.setBundleContext(bundleContext);

-        FelixTestRuntime.bundleContext = bundleContext;

-    }

-

-

-    @Override

-    public void shutdown() throws Exception {

-

-        if (bundleContext == null)

-            return;

-        

-        bundleContext = null;

-        instance = null;

-        

-        felix.stop();

-        int retries = 50;

-        synchronized (felix) {

-            while (retries-- > 0 && felix.getState() != Bundle.UNINSTALLED) {

-                felix.wait(100);

-            }

-        }

-        

-        super.shutdown();

-    }

-    

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
deleted file mode 100644
index 6356718fe5..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
+++ /dev/null
@@ -1,163 +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.osgi.runtime.impl;

-

-import java.lang.reflect.Method;

-

-import org.osgi.framework.BundleContext;

-import org.osgi.framework.BundleException;

-

-public abstract class OSGiTestRuntime {

-

-    public abstract BundleContext getBundleContext();

-

-    protected abstract BundleContext startRuntime() throws Exception;

-       

-    private static OSGiTestRuntime instance;

-    

-    private BundleContext bundleContext;

-    

-    

-    /**

-     * System property org.apache.tuscany.implementation.osgi.runtime.OSGiRuntime can be set to the

-     * name of the OSGiRuntime class (eg. EquinoxRuntime). If set, start this runtime and return the

-     * system bundlecontext. If not set, start Felix from the classpath.

-     * 

-     * @throws BundleException

-     */

-    public synchronized static OSGiTestRuntime findRuntime() throws Exception {

-        if (instance != null) {            

-            return instance;

-        }

-        String runtimeClassName = System.getProperty(OSGiTestRuntime.class.getName());

-        

-        if (instance != null)

-            return instance;

-

-        if (runtimeClassName != null) {

-            try {

-                Class<?> runtimeClass = OSGiTestRuntime.class.getClassLoader().loadClass(runtimeClassName);

-                Method method = runtimeClass.getMethod("getInstance");

-                instance = (OSGiTestRuntime) method.invoke(null);

-                return instance;

-                

-            } catch (Exception e) {

-                throw new BundleException("Could not start OSGi runtime " + runtimeClassName, e);

-            }

-        }

-

-        try {

-            instance = EquinoxTestRuntime.getInstance();

-        } catch (Throwable e) {

-            instance = FelixTestRuntime.getInstance();

-        }

-        

-        return instance;

- 

-    }

-    

- 

-    public synchronized static OSGiTestRuntime getRuntime() throws Exception {

-        

-        instance = findRuntime();

-        

-        if (instance != null) {

-            

-            if (instance.bundleContext == null) {

-                instance.startRuntime();

-                instance.bundleContext = instance.getBundleContext();

-            }

-            return instance;

-        }

-        return instance;

-    }

-

-

-    public void shutdown() throws Exception {

-        

-        bundleContext = null;

-        if (this == instance)

-            instance = null;

-    }

-    

-    protected void setBundleContext(BundleContext bundleContext) {

-        this.bundleContext = bundleContext;

-    }

-    

-

-    /**

-     * @return the instance

-     */

-    public synchronized static void stop() throws Exception {

-        if (instance != null) {

-            instance.shutdown();

-            instance = null;

-        }

-    }

-    

-    

-    /**

-     * @return the list of packages to be exported by the system bundle

-     */

-    protected String getSystemPackages() {

-        String systemPackages =

-            "org.osgi.framework; version=1.3.0," +

-            "org.osgi.service.packageadmin; version=1.2.0, " +

-            "org.osgi.service.startlevel; version=1.0.0, " +

-            "org.osgi.service.url; version=1.0.0, " +

-            "org.osgi.util.tracker; version=1.3.2, " +

-            "javax.xml, " +

-            "javax.xml.datatype, " +               

-            "javax.xml.namespace, " +

-            "javax.xml.parsers, " +

-            "javax.xml.transform, " +

-            "javax.xml.transform.dom, " +

-            "javax.xml.transform.sax, " +

-            "javax.xml.transform.stream, " +

-            "javax.xml.validation, " +

-            "javax.xml.xpath, " +

-            "javax.sql," +

-            "org.w3c.dom, " +

-            "org.w3c.dom.bootstrap, " +

-            "org.w3c.dom.ls, " +

-            "org.xml.sax, " +

-            "org.xml.sax.ext, " +

-            "org.xml.sax.helpers, " +

-            "javax.security.auth, " +

-            "javax.security.auth.login, " +

-            "javax.security.auth.callback, " +

-            "javax.security.cert, " +

-            "javax.naming, " +

-            "javax.naming.spi, " +

-            "javax.naming.directory, " +

-            "javax.management, " + 

-            "javax.imageio, " +

-            "sun.misc, " +

-            "javax.net, " +

-            "javax.net.ssl, " +

-            "javax.crypto, " +

-            "javax.rmi, " +

-            "javax.transaction, " +

-            "javax.transaction.xa";

-        

-        return systemPackages;

-    

-    }

-

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
deleted file mode 100644
index c9f77b71cf..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
+++ /dev/null
@@ -1,86 +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.util;

-

-import org.apache.tuscany.sca.test.osgi.runtime.impl.OSGiTestRuntime;

-

-

-

-/**

- * OSGi Test Utils : Set up OSGi runtime

- */

-public  class OSGiRuntimeLoader  {

-    

-    public static OSGiTestRuntime startOSGiTestRuntime() throws Exception {

-

-        setUpFelixTestRuntime();

-        

-

-        System.setProperty("felix.cache.profiledir", "target/.felix.test");

-        

-        OSGiTestRuntime osgiRuntime = OSGiTestRuntime.getRuntime();

-

-        System.setProperty("felix.cache.profiledir", ".felix");

-        

-        return osgiRuntime;

-        

-    }

-    

-    public static void setUpOSGiTestRuntime() throws Exception {

-

-        setUpFelixTestRuntime();

-        

-    }

-    

-    

-    private static void setUpFelixTestRuntime() throws Exception {

-

-        String felixConfigFileName = "file:target/test-classes/felix/felix.config.properties";

-        

-        System.setProperty("felix.config.properties", felixConfigFileName);

-        

-        System.setProperty("felix.service.urlhandlers", "false");

-        

-        

-        try {

-            Class<?> felixMainClass = OSGiRuntimeLoader.class.getClassLoader().loadClass("org.apache.felix.main.Main");

-            String felixDir = felixMainClass.getProtectionDomain().getCodeSource().getLocation().getPath();

-            int index = 0;

-            if ((index = felixDir.indexOf("/org.apache.felix.main")) >= 0) {

-                felixDir = felixDir.substring(0, index);

-                System.setProperty("FELIX_DIR", felixDir);

-            }

-            

-        } catch (Throwable e) {

-            // Ignore

-        }

-        

-        

-    }

-    

-    public static void shutdownOSGiRuntime()  {

-        try {

-            OSGiTestRuntime.stop();

-        

-        } catch (Exception e) {

-            // Ignore

-        }

-    }

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
deleted file mode 100644
index 1fba0d6dcd..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
+++ /dev/null
@@ -1,136 +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.util;

-

-

-import java.io.File;

-import java.io.FilenameFilter;

-import java.lang.reflect.Method;

-

-import org.osgi.framework.Bundle;

-import org.osgi.framework.BundleContext;

-import org.osgi.framework.BundleException;

-

-/**

- * Load Tuscany into an OSGi runtime

- *

- */

-public class TuscanyLoader {

-    

-    private static final String tuscanyInstallerDir = "../tuscany-osgi-installer";

-    private static final String tuscanyInstallerJar = "tuscany-sca-osgi-installer.jar";

-    

-    // 5-bundle version of Tuscany

-    private static final String scaApiDir = "../sca-api";

-    private static final String tuscanySpiDir = "../tuscany-spi";

-    private static final String tuscanyRuntimeDir = "../tuscany-runtime";

-    private static final String tuscanyExtensionsDir = "../tuscany-extensions";

-    private static final String thirdPartyDir = "../tuscany-3rdparty";

-    

-    private static String findBundle(String subDirName, final String jarPrefix) throws Exception {

-        

-        File dir = new File(subDirName + "/target");

-        if (dir.exists() && dir.isDirectory()) {

-            File[] files = dir.listFiles(new FilenameFilter() {

-

-                public boolean accept(File dir, String name) {

-                    return name.endsWith(".jar") && (jarPrefix == null || name.startsWith(jarPrefix));

-                }

-                

-            });

-            

-            if (files != null && files.length > 0)

-                return files[0].toURI().toURL().toString();

-        }

-        return null;

-    }

-    

-    public static Bundle loadTuscanyIntoOSGi(BundleContext bundleContext) throws Exception {

-        

-        String tuscanyInstallerBundleName = new File(tuscanyInstallerDir + "/target/" + tuscanyInstallerJar).toURI().toURL().toString();

-        Bundle tuscanyInstallerBundle = bundleContext.installBundle(tuscanyInstallerBundleName); 

-        tuscanyInstallerBundle.start();

-        Bundle[] bundles = bundleContext.getBundles();

-        Bundle tuscanyRuntimeBundle = tuscanyInstallerBundle;

-        for (Bundle bundle : bundles) {

-            if ("org.apache.tuscany.sca.osgi.runtime".equals(bundle.getSymbolicName())) {

-                tuscanyRuntimeBundle = bundle;

-                break;

-            }

-        }

-        setThreadContextClassLoader(tuscanyRuntimeBundle);

-        

-        return tuscanyRuntimeBundle;

-    }

-    

-    /**

-     * Load four Tuscany bundles (API, Core-SPI, Runtime, Extensions)  and combined third party bundle

-     * 

-     * @param bundleContext

-     */

-    public static Bundle load5BundleTuscanyIntoOSGi(BundleContext bundleContext) throws Exception {

-        

-

-        String thirdPartyBundleName = findBundle(thirdPartyDir, null);

-        Bundle thirdPartyBundle = bundleContext.installBundle(thirdPartyBundleName);        

-        thirdPartyBundle.start();

-            

-

-        String scaApiBundleName = findBundle(scaApiDir, null);

-        Bundle scaApiBundle = bundleContext.installBundle(scaApiBundleName);            

-        scaApiBundle.start();            

-

-        String tuscanySpiBundleName = findBundle(tuscanySpiDir, null);

-        Bundle tuscanySpiBundle = bundleContext.installBundle(tuscanySpiBundleName);    

-        

-        String tuscanyRuntimeBundleName = findBundle(tuscanyRuntimeDir, null);

-        Bundle tuscanyRuntimeBundle = bundleContext.installBundle(tuscanyRuntimeBundleName);

-        

-        String tuscanyExtensionsBundleName = findBundle(tuscanyExtensionsDir, null);

-        Bundle tuscanyExtensionsBundle = bundleContext.installBundle(tuscanyExtensionsBundleName);

-        

-

-        tuscanySpiBundle.start();      

-        tuscanyExtensionsBundle.start();    

-        

-        setThreadContextClassLoader(tuscanyRuntimeBundle);

-        return tuscanyRuntimeBundle;

-    

-    }

-    

-

-    // Tuscany runtime is started on a different thread when previously cached bundle is used.

-    // Set this thread's TCCL to the one used by the runtime.

-    public static void setThreadContextClassLoader(Bundle tuscanyRuntimeBundle) throws BundleException {

-        if (tuscanyRuntimeBundle != null) {

-            

-            try {

-                Class<?> runtimeClass = tuscanyRuntimeBundle.loadClass("org.apache.tuscany.sca.osgi.runtime.OSGiRuntime");

-                Method getRuntimeMethod = runtimeClass.getMethod("findRuntime");

-                Object runtime = getRuntimeMethod.invoke(runtimeClass);

-                Method getTCCLMethod = runtimeClass.getMethod("getContextClassLoader");

-                ClassLoader runtimeTCCL = (ClassLoader) getTCCLMethod.invoke(runtime);

-                Thread.currentThread().setContextClassLoader(runtimeTCCL);               

-                

-            } catch (Throwable e) {

-            }

-        }

-    }

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
deleted file mode 100644
index 8bf7a1fb2f..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
+++ /dev/null
@@ -1,109 +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.osgi.harness;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.HashSet;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.test.util.TuscanyLoader;
-
-/*
- * Test Tuscany running in an OSGi container
- * This harness runs Tuscany samples outside OSGi with Tuscany running in OSGi
- */
-public class OSGiTuscanyNonOSGiTestHarness extends OSGiTuscanyTestHarness {
-
-    public void runTest(String... testDirs) throws Exception {
-
-        String mainTestDir = testDirs[0];
-
-        File testDir = new File(mainTestDir + "/target/test-classes");
-        if (!testDir.exists()) {
-            System.err.println("Test directory " + testDir + " does not exist");
-            return;
-        }
-
-        System.out.println("Run tests from : " + mainTestDir);
-
-        long startTime = System.currentTimeMillis();
-
-        String[] dirs = new String[testDirs.length + 2];
-        int i = 0;
-        dirs[i++] = mainTestDir + "/target/test-classes";
-        dirs[i++] = "target/test-classes";
-        for (int j = 0; j < testDirs.length; j++) {
-            dirs[i++] = testDirs[j] + "/target/classes";
-        }
-
-        tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(getBundleContext());
-        long endTime = System.currentTimeMillis();
-
-        System.out.println("Loaded Tuscany, time taken = " + (endTime - startTime) + " ms");
-
-        URL[] dirURLs = new URL[dirs.length];
-        for (int j = 0; j < dirs.length; j++) {
-            dirURLs[j] = new File(dirs[j]).toURI().toURL();
-        }
-        ClassLoader testClassLoader = new URLClassLoader(dirURLs, Thread.currentThread().getContextClassLoader());
-        Thread.currentThread().setContextClassLoader(testClassLoader);
-
-        Class<?> testClass = testClassLoader.loadClass(this.getClass().getName());
-        Method testMethod = testClass.getMethod("runAllTestsFromDirs", ClassLoader.class, String[].class);
-        Object testObject = testClass.newInstance();
-        testMethod.invoke(testObject, testClassLoader, dirs);
-
-    }
-
-    public void getTestCases(File dir, String prefix, HashSet<String> testCaseSet) {
-        File[] files = dir.listFiles();
-        for (File file : files) {
-            if (file.isDirectory()) {
-                String newPrefix = prefix == null ? file.getName() : prefix + "." + file.getName();
-                getTestCases(file, newPrefix, testCaseSet);
-            } else if (file.getName().endsWith("TestCase.class")) {
-                String name = file.getName();
-                name = name.substring(0, name.length() - 6); // remove .class
-                name = (prefix == null) ? name : prefix + "." + name;
-
-                testCaseSet.add(name);
-            }
-        }
-    }
-
-    public void runAllTestsFromDirs(ClassLoader testClassLoader, String[] testDirs) throws Exception {
-
-        int failures = 0;
-        HashSet<String> testCaseSet = new HashSet<String>();
-        for (String testDir : testDirs) {
-            getTestCases(new File(testDir), null, testCaseSet);
-        }
-        for (String className : testCaseSet) {
-            Class testClass = testClassLoader.loadClass(className);
-            failures += runTestCase(testClass).getFailureCount();
-        }
-
-        Assert.assertEquals(0, failures);
-
-    }
-}
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
deleted file mode 100644
index ba9b7007b4..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
+++ /dev/null
@@ -1,243 +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.osgi.harness;

-

-import java.io.ByteArrayInputStream;

-import java.io.ByteArrayOutputStream;

-import java.io.File;

-import java.io.FileInputStream;

-import java.lang.reflect.Method;

-import java.net.URL;

-import java.util.Enumeration;

-import java.util.jar.JarOutputStream;

-import java.util.jar.Manifest;

-import java.util.zip.ZipEntry;

-

-import junit.framework.Assert;

-import junit.framework.AssertionFailedError;

-

-import org.apache.tuscany.sca.test.osgi.runtime.impl.OSGiTestRuntime;

-import org.apache.tuscany.sca.test.util.OSGiRuntimeLoader;

-import org.apache.tuscany.sca.test.util.TuscanyLoader;

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Request;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.osgi.framework.Bundle;

-import org.osgi.framework.BundleContext;

-

-/*

- * Test Tuscany running in an OSGi container

- * Harness can be used to run Tuscany samples with Tuscany running in OSGi

- */

-public class OSGiTuscanyTestHarness {

-

-    private OSGiTestRuntime osgiRuntime;

-    protected Bundle tuscanyRuntime;

-    private BundleContext bundleContext;

-    private Bundle testBundle;

-

-    public void setUp() throws Exception {

-

-        osgiRuntime = OSGiRuntimeLoader.startOSGiTestRuntime();

-        bundleContext = osgiRuntime.getBundleContext();

-

-        // Uninstall any previously installed test bundles

-        for (Bundle bundle : bundleContext.getBundles()) {

-            if ("org.apache.tuscany.sca.test.samples".equals(bundle.getSymbolicName())) {

-                bundle.uninstall();

-            }

-        }

-    }

-

-    public void tearDown() throws Exception {

-        if (tuscanyRuntime != null) {

-            tuscanyRuntime.stop();

-        }

-        OSGiRuntimeLoader.shutdownOSGiRuntime();

-    }

-

-    public BundleContext getBundleContext() {

-        return bundleContext;

-    }

-

-    public void runTest(String... testDirs) throws Exception {

-

-        String mainTestDir = testDirs[0];

-

-        File testDir = new File(mainTestDir + "/target/test-classes");

-        if (!testDir.exists()) {

-            System.err.println("Test directory " + testDir + " does not exist");

-            return;

-        }

-

-        System.out.println("Run tests from : " + mainTestDir);

-

-        long startTime = System.currentTimeMillis();

-

-        tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(bundleContext);

-

-        String[] dirs = new String[testDirs.length + 2];

-        int i = 0;

-        dirs[i++] = mainTestDir + "/target/test-classes";

-        dirs[i++] = "target/test-classes";

-        for (int j = 0; j < testDirs.length; j++) {

-            dirs[i++] = testDirs[j] + "/target/classes";

-        }

-

-        String manifestFile = "target/test-classes/META-INF/MANIFEST.MF";

-

-        testBundle = createAndInstallBundle("file:" + mainTestDir + "/target/classes", // Bundle location: used to get File URLs for DefaultSCADomain

-                                            manifestFile, // Test bundle manifest file

-                                            dirs // Directory entries to be added to bundle

-            );

-

-        long endTime = System.currentTimeMillis();

-

-        System.out.println("Loaded Tuscany, time taken = " + (endTime - startTime) + " ms");

-

-        testBundle.start();

-

-        Class<?> testClass = testBundle.loadClass(this.getClass().getName());

-        Method testMethod = testClass.getMethod("runAllTestsFromBundle", Bundle.class);

-        Object testObject = testClass.newInstance();

-        testMethod.invoke(testObject, testBundle);

-

-        testBundle.stop();

-        testBundle.uninstall();

-    }

-

-    // Create and install a bundle with the specified manifest file

-    // The bundle contains all files from the list of directories specified

-    public Bundle createAndInstallBundle(String bundleLocation, String manifestFileName, String[] dirNames)

-        throws Exception {

-

-        ByteArrayOutputStream out = new ByteArrayOutputStream();

-

-        File manifestFile = new File(manifestFileName);

-        Manifest manifest = new Manifest();

-        manifest.read(new FileInputStream(manifestFile));

-        manifest.getMainAttributes().putValue("Bundle-Version",

-                                              (String)tuscanyRuntime.getHeaders().get("Bundle-Version"));

-

-        JarOutputStream jarOut = new JarOutputStream(out, manifest);

-

-        for (int i = 0; i < dirNames.length; i++) {

-            File dir = new File(dirNames[i]);

-            addFilesToJar(dir, dirNames[i], jarOut);

-        }

-

-        jarOut.close();

-        out.close();

-

-        ByteArrayInputStream inStream = new ByteArrayInputStream(out.toByteArray());

-        return bundleContext.installBundle(bundleLocation, inStream);

-

-    }

-

-    // Add all the files from a build directory into a jar file

-    // This method is used to create bundles on the fly

-    private void addFilesToJar(File dir, String rootDirName, JarOutputStream jarOut) throws Exception {

-

-        if (dir.getName().equals(".svn"))

-            return;

-

-        File[] files = dir.listFiles();

-

-        if (files == null)

-            return;

-

-        for (int i = 0; i < files.length; i++) {

-

-            if (files[i].isDirectory()) {

-                addFilesToJar(files[i], rootDirName, jarOut);

-            }

-            if (files[i].getName().endsWith("MANIFEST.MF"))

-                continue;

-

-            String entryName = files[i].getPath().substring(rootDirName.length() + 1);

-            entryName = entryName.replaceAll("\\\\", "/");

-            if (files[i].isDirectory()) {

-                entryName += "/";

-            }

-            ZipEntry ze = new ZipEntry(entryName);

-

-            try {

-                jarOut.putNextEntry(ze);

-                FileInputStream file = new FileInputStream(files[i]);

-                byte[] fileContents = new byte[file.available()];

-                file.read(fileContents);

-                jarOut.write(fileContents);

-            } catch (Exception e) {

-                // Ignore duplicate entry errors 

-            }

-        }

-    }

-

-    public void runAllTestsFromBundle(Bundle bundle) throws Exception {

-        int failures = 0;

-        Enumeration entries = bundle.findEntries("/", "*TestCase.class", true);

-        while (entries.hasMoreElements()) {

-            URL entry = (URL)entries.nextElement();

-            String className = entry.getFile();

-            className = className.substring(1, className.length() - 6); // remove leading / and trailing .class

-            className = className.replaceAll("/", ".");

-            Class testClass = bundle.loadClass(className);

-            failures += runTestCase(testClass).getFailureCount();

-        }

-

-        Assert.assertEquals(0, failures);

-

-    }

-

-    public Result runTestCase(Class testClass) throws Exception {

-

-        if (testClass.getName().endsWith("TestCase") && !testClass.getName()

-            .startsWith("org.apache.tuscany.sca.test.osgi.")) {

-            JUnitCore core = new JUnitCore();

-            System.out.println("Running test " + testClass.getName() + " ");

-            Result result = core.run(Request.aClass(testClass));

-            // long duration = result.getRunTime();

-            int runs = result.getRunCount();

-            int failures = 0, errors = 0;

-            int ignores = result.getIgnoreCount();

-

-            for (Failure f : result.getFailures()) {

-                if (f.getException() instanceof AssertionFailedError) {

-                    failures++;

-                } else {

-                    errors++;

-                }

-            }

-

-            System.out.println("Test Runs: " + runs

-                + ", Failures: "

-                + failures

-                + ", Errors: "

-                + errors

-                + ", Ignores: "

-                + ignores);

-

-            return result;

-

-        }

-        return new Result();

-

-    }

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
deleted file mode 100644
index 85397195bd..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
+++ /dev/null
@@ -1,61 +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.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-calculator-implementation-policies

- */

-public class CalculatorImplementationPoliciesTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "calculator-implementation-policies");

-        

-    }

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
deleted file mode 100644
index 9346fb8ed2..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
+++ /dev/null
@@ -1,62 +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.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-calculator-rmi-reference and samples-calculator-rmi-service

- */

-public class CalculatorRmiTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "calculator-rmi-reference");

-        testHarness.runTest("../../../samples/" + "calculator-rmi-service");

-        

-    }

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
deleted file mode 100644
index 501cded48d..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
+++ /dev/null
@@ -1,63 +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.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-calculator-script

- */

-public class CalculatorScriptTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-

-        System.setProperty("python.cachedir", "target/cachedir");

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "calculator-script");

-        

-    }

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
deleted file mode 100644
index 687335b3c4..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
+++ /dev/null
@@ -1,61 +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.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-callback-ws

- */

-public class CallbackWsClientTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "callback-ws-client", 

-                "../../../samples/" + "callback-ws-service");

-    }

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
deleted file mode 100644
index f605e024ba..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
+++ /dev/null
@@ -1,61 +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.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-callback-ws

- */

-public class CallbackWsServiceTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "callback-ws-service");

-        

-    }

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
deleted file mode 100644
index 4f5640960b..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
+++ /dev/null
@@ -1,61 +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.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-helloworld-ws-service-jms

- */

-public class HelloworldWsServiceJmsTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "helloworld-ws-service-jms");

-        

-    }

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
deleted file mode 100644
index 9a491304bf..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
+++ /dev/null
@@ -1,61 +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.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-helloworld-ws-service-secure

- */

-public class HelloworldWsServiceSecureTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "helloworld-ws-service-secure");

-        

-    }

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
deleted file mode 100644
index 2e0b49e693..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
+++ /dev/null
@@ -1,61 +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.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-helloworld-ws-service

- */

-public class HelloworldWsServiceTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "helloworld-ws-service");

-        

-    }

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
deleted file mode 100644
index eac9979f56..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
+++ /dev/null
@@ -1,85 +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.osgi.tuscany;
-
-
-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyNonOSGiTestHarness;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * Test Tuscany running in an OSGi container
- * 
- * Run samples which use old domain code
- */
-public class NonOSGiSamplesTestCase {
-    
-    
-    private static String[] SAMPLES = {
-        "binding-notification-consumer",
-        "binding-notification-producer",
-        "calculator",
-        "implementation-composite",
-        "implementation-notification", 
-        "loanapplication", 
-        "simple-bigbank", 
-        "simple-callback",
-        "supplychain",
-        "calculator-implementation-policies",
-        "calculator-rmi-reference",
-        "calculator-rmi-service",
-        "callback-ws-service",
-        "helloworld-ws-service-jms",
-        "helloworld-ws-service-secure",
-        "helloworld-ws-service"
-        
-    };
-    
-
-    private OSGiTuscanyNonOSGiTestHarness testHarness;
-
-    @Before
-    public void setUp() throws Exception {
-        
-        testHarness = new OSGiTuscanyNonOSGiTestHarness();
-        testHarness.setUp();
-    }
-    
-
-    @After
-    public void tearDown() throws Exception {
-
-        if (testHarness != null) {
-            testHarness.tearDown();
-            testHarness = null;
-        }
-    }
-    
-
-    @Test
-    public void runTestsOutsideOSGi() throws Exception {
-        
-        for (String testDir : SAMPLES) {
-            testHarness.runTest("../../../samples/" + testDir);
-        }
-    }
-    
-    
-}
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
deleted file mode 100644
index 62c0eef16d..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
+++ /dev/null
@@ -1,71 +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.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-import org.osgi.framework.BundleContext;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples-osgi-supplychain

- */

-public class OSGiSupplyChainTestCase {

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        BundleContext bundleContext = testHarness.getBundleContext();

-        if (bundleContext != null) {

-            Bundle[] bundles = bundleContext.getBundles();

-            for (Bundle bundle : bundles) {

-                if (bundle.getSymbolicName() != null && bundle.getSymbolicName().contains("supplychain"))

-                    bundle.uninstall();

-            }

-        }

-        if (testHarness != null) {

-            testHarness.tearDown();

-        }

-    }

-    

-

-    @Test

-    public void runTest() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "osgi-supplychain");

-        

-    }

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
deleted file mode 100644
index 155dd368a3..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
+++ /dev/null
@@ -1,137 +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.osgi.tuscany;

-

-

-import java.io.File;

-import java.lang.reflect.Method;

-import java.net.URL;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.test.osgi.runtime.impl.OSGiTestRuntime;

-import org.apache.tuscany.sca.test.util.OSGiRuntimeLoader;

-import org.apache.tuscany.sca.test.util.TuscanyLoader;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-import org.osgi.framework.BundleContext;

-import org.osgi.framework.ServiceReference;

-

-/*

- * Test Tuscany running inside OSGi

- */

-public class OSGiTuscanyRuntimeTestCase {

-    

-    private OSGiTestRuntime osgiRuntime;

-    private Bundle tuscanyRuntime;

-    

-

-    @Before

-    public void setUp() throws Exception {

-        

-        osgiRuntime = OSGiRuntimeLoader.startOSGiTestRuntime();

-        BundleContext bundleContext = osgiRuntime.getBundleContext();

-        

-        // Uninstall any previously installed test bundles

-        for (Bundle bundle : bundleContext.getBundles()) {

-            String bundleName = bundle.getSymbolicName();

-            if (bundleName != null && 

-               (bundleName.equals("org.apache.tuscany.sca.test.samples")||

-               bundleName.startsWith("supplychain"))) {

-                  bundle.uninstall();

-            }

-        }

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (tuscanyRuntime != null) {

-            tuscanyRuntime.stop();

-        }

-        OSGiRuntimeLoader.shutdownOSGiRuntime();

-    }

-

-   

-    

-    @Test

-    public void startTuscanyRuntimeInOSGi() throws Exception {

-        

-        tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(osgiRuntime.getBundleContext());

-        Assert.assertNotNull(tuscanyRuntime);

-        Bundle[] bundles = osgiRuntime.getBundleContext().getBundles();

-        Bundle runtimeBundle = null;

-        for (Bundle bundle : bundles) {

-            if ("org.apache.tuscany.sca.osgi.runtime".equals(bundle.getSymbolicName())) {

-                runtimeBundle = bundle;

-                break;

-            }

-        }

-        Assert.assertNotNull(runtimeBundle);

-        Class<?> clazz = runtimeBundle.loadClass("org.apache.tuscany.sca.osgi.runtime.OSGiRuntime");

-        Assert.assertNotNull(clazz);

-               

-    }

-    

-    @Test

-    public void testOSGiTuscany_ImplementationJava() throws Exception {

-        testOSGiTuscanyUsingOSGiClient("SupplyChain.jar");

-    }

-    

-    @Test

-    public void testOSGiTuscany_BindingWS() throws Exception {

-        testOSGiTuscanyUsingOSGiClient("SupplyChainWS.jar");

-    }

-   

-    

-    private void testOSGiTuscanyUsingOSGiClient(String contributionJarName) throws Exception {

-        

-        tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(osgiRuntime.getBundleContext());

-        

-        String folderName = "../test-bundles/target/"; 

-        String supplychainJarName = contributionJarName;

-        String supplychainClientJarName = "SupplyChainClient.jar";

-        URL supplyChainURL = new File(folderName + supplychainJarName).toURI().toURL();        

-        URL supplyChainClientURL = new File(folderName + supplychainClientJarName).toURI().toURL();

-    

-        Bundle supplyChainBundle = osgiRuntime.getBundleContext().installBundle(supplyChainURL.toString());

-        supplyChainBundle.start();

-        Bundle clientBundle = osgiRuntime.getBundleContext().installBundle(supplyChainClientURL.toString());

-        clientBundle.start();

-        

-        String clientClassName = "supplychain.client.SupplyChainClient";

-        Class<?> clientClass = clientBundle.loadClass(clientClassName);

-        ServiceReference testServiceRef = clientBundle.getBundleContext().getServiceReference(clientClassName);

-        Object testService = clientBundle.getBundleContext().getService(testServiceRef);

-        

-        Method m = clientClass.getMethod("runTest", String.class);

-        m.invoke(testService, contributionJarName);

-        

-        System.out.println("OSGi Client test completed successfully.");

-        

-        supplyChainBundle.uninstall();

-        clientBundle.uninstall();

-    }

-    

-   

-

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
deleted file mode 100644
index b45c062761..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.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.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples which use provide Tuscany extensions

- */

-public class TuscanySampleExtensionsTestCase {

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-            testHarness = null;

-        }

-    }

-    

-

-    @Test

-    public void testBindingEchoExtension() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "binding-echo-extension");

-    }

-    

-    @Test

-    public void testBindingEcho() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "binding-echo", "../../../samples/" + "binding-echo-extension");

-

-    }

-    

-    @Test

-    public void testDataBindingEcho() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "databinding-echo", "../../../samples/" + "binding-echo-extension");

-

-    }

-    

-    @Test

-    public void testImplementationCrudExtension() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "implementation-crud-extension");

-    }

-    

-    @Test

-    public void testImplementationCrud() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "implementation-crud", "../../../samples/" + "implementation-crud-extension");

-

-    }

-    

-    @Test

-    public void testImplementationPojoExtension() throws Exception {

-        

-        testHarness.runTest("../../../samples/" + "implementation-pojo-extension");

-    }

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
deleted file mode 100644
index c2dae9eb97..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
+++ /dev/null
@@ -1,80 +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.osgi.tuscany;

-

-

-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/*

- * Test Tuscany running in an OSGi container

- * 

- * Run samples which use old domain code

- */

-public class TuscanySamplesUsingOldDomainTestCase {

-    

-    

-    private static String[] SAMPLES = {

-                

-        "binding-notification-consumer",

-        "binding-notification-producer",

-        "calculator",

-        "implementation-composite",

-        "implementation-notification", 

-        "loanapplication", 

-        "quote-xquery",

-        "simple-bigbank", 

-        "simple-callback",

-        "supplychain"

-        

-    };

-    

-

-    private OSGiTuscanyTestHarness testHarness;

-

-    @Before

-    public void setUp() throws Exception {

-        

-        testHarness = new OSGiTuscanyTestHarness();

-        testHarness.setUp();

-    }

-    

-

-    @After

-    public void tearDown() throws Exception {

-

-        if (testHarness != null) {

-            testHarness.tearDown();

-            testHarness = null;

-        }

-    }

-    

-

-    @Test

-    public void runTestsUsingOldDomainCode() throws Exception {

-        

-        for (String testDir : SAMPLES) {

-            testHarness.runTest("../../../samples/" + testDir);

-        }

-    }

-    

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 5966311f0e..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: tuscany.sca.samples

-Bundle-SymbolicName: org.apache.tuscany.sca.test.samples

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, 

-  junit.framework, 

-  org.junit,

-  org.apache.tuscany.sca.host.embedded,

-  org.oasisopen.sca,

-  org.oasisopen.sca.annotation,

-  org.apache.tuscany.sca.databinding.annotation

-DynamicImport-Package: *

diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
deleted file mode 100644
index 6a38f48c4a..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
+++ /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.    

-#

-#

-# Framework config properties.

-#

-org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \

- org.osgi.service.packageadmin; version=1.2.0, \

- org.osgi.service.startlevel; version=1.0.0, \

- org.osgi.service.url; version=1.0.0 \

- org.osgi.util.tracker; version=1.3.2 

-

-

-felix.auto.start.1= \   

-    "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" 

-    

-# "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar" 

-# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \

-# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \

-# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \

-

-

-felix.startlevel.framework=1

-felix.startlevel.bundle=1

-

-#

-# Bundle config properties.

-#

-org.osgi.service.http.port=8080

-obr.shell.telnet=on

diff --git a/java/sca-contrib/itest/osgi-tuscany/pom.xml b/java/sca-contrib/itest/osgi-tuscany/pom.xml
deleted file mode 100644
index ad589503d6..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/pom.xml
+++ /dev/null
@@ -1,39 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-osgi-tuscany</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany OSGi-based Tuscany Runtime Integration Tests</name>

-

-    <modules>

-        <module>test-bundles</module>

-        <module>tuscany-versioned</module>

-        <module>tuscany-osgi-installer</module>

-        <module>osgi-tuscany-test</module>

-    </modules>

-    

-</project>

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/build-bundles.xml b/java/sca-contrib/itest/osgi-tuscany/test-bundles/build-bundles.xml
deleted file mode 100644
index c7ea66863f..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/build-bundles.xml
+++ /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.

--->

-<project name="OSGiBundleCreator">

-

-    <target name="create-bundles">

-

-        <jar jarfile="${jar.dir}/${jar.file.name}" manifest="${files.dir}/${manifest.file.name}" >

-            <fileset dir="${files.dir}" includes="${files.list}">

-            </fileset>

-        </jar>

-    </target>

-

-

-</project>

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/pom.xml b/java/sca-contrib/itest/osgi-tuscany/test-bundles/pom.xml
deleted file mode 100644
index 4cbe7b4f85..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/pom.xml
+++ /dev/null
@@ -1,124 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-osgi-tuscany-test-bundles</artifactId>

-    <name>Apache Tuscany OSGi-Based Tuscany Runtime Test Bundles</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.felix</groupId>

-            <artifactId>org.apache.felix.main</artifactId>

-            <version>1.0.4</version>

-        </dependency>

-

-

-    </dependencies>

-

-    <build>

-        <finalName>itest-osgi-tuscany-test-bundles</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <version>1.1</version>

-

-                <dependencies>

-                    <dependency>

-                        <groupId>ant</groupId>

-                        <artifactId>ant-trax</artifactId>

-                        <version>1.6.5</version>

-                    </dependency>

-                </dependencies>

-

-                <executions>

-                    <execution>

-                        <id>create-bundles</id>

-                        <phase>generate-test-sources</phase>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                        <configuration>

-                            <tasks>

-                                <ant antfile="./build-bundles.xml" target="create-bundles">

-                                    <property name="jar.dir" value="target" />

-                                    <property name="files.dir" value="target/classes" />

-                                    <property name="jar.file.name" value="SupplyChain.jar" />

-                                    <property name="manifest.file.name" value="META-INF/SupplyChain.mf" />

-                                    <property name="files.list"

-                                        value="supplychain/customer/* \

-                                               supplychain/retailer/* \

-                                               supplychain/warehouse/* \

-                                               supplychain/shipper/* \

-                                               supplychain/supplychain.composite \

-                                               META-INF/sca-contribution.xml" />

-

-                                </ant>

-                                <ant antfile="./build-bundles.xml" target="create-bundles">

-                                    <property name="jar.dir" value="target" />

-                                    <property name="files.dir" value="target/classes" />

-                                    <property name="jar.file.name" value="SupplyChainClient.jar" />

-                                    <property name="manifest.file.name" value="META-INF/SupplyChainClient.mf" />

-                                    <property name="files.list"

-                                        value="supplychain/client/*" />

-                                </ant>

-                                <ant antfile="./build-bundles.xml" target="create-bundles">

-                                    <property name="jar.dir" value="target" />

-                                    <property name="files.dir" value="target/classes" />

-                                    <property name="jar.file.name" value="SupplyChainWS.jar" />

-                                    <property name="manifest.file.name" value="META-INF/SupplyChain.mf" />

-                                    <property name="files.list"

-                                        value="supplychain/customer/* \

-                                               supplychain/retailer/* \

-                                               supplychain/warehouse/* \

-                                               supplychain/shipper/* \

-                                               supplychain/ws/supplychain.composite \

-                                               supplychain/ws/Customer.wsdl \

-                                               META-INF/sca-contribution.xml" />

-

-                                </ant>

-

-                            </tasks>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
deleted file mode 100644
index 0ac96b35a3..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
+++ /dev/null
@@ -1,115 +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 supplychain.client;

-

-

-import java.io.File;

-import java.net.URL;

-import java.util.Hashtable;

-

-

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-import org.osgi.framework.BundleActivator;

-import org.osgi.framework.BundleContext;

-

-

-

-import supplychain.customer.Customer;

-

-/**

- * SupplyChain test client

- */

-public class SupplyChainClient implements BundleActivator {

-

-    private EmbeddedSCADomain scaDomain;

-    private Customer customer;

-    

-    

-

-    public void start(BundleContext context) throws Exception {

-        

-        context.registerService(SupplyChainClient.class.getName(), this, new Hashtable());

-        

-    }

-

-    public void stop(BundleContext context) throws Exception {

-        

-    }

-

-    protected void setUp(String contributionJarName) throws Exception {

-        

-        scaDomain = new EmbeddedSCADomain(EmbeddedSCADomain.class.getClassLoader(), "http://localhost");

-        scaDomain.start();

-        ContributionService contributionService = scaDomain.getContributionService();

-        String folderName = "../test-bundles/target/"; 

-        String supplychainJarName = contributionJarName;

-        URL supplyChainURL = new File(folderName + supplychainJarName).toURI().toURL();

-        

-        Contribution contribution = contributionService.contribute("SupplyChain", supplyChainURL, false);

-        for (Composite deployable : contribution.getDeployables() ) {

-            scaDomain.getDomainComposite().getIncludes().add(deployable);

-            scaDomain.buildComposite(deployable);

-        }

-        

-        for (Composite deployable : contribution.getDeployables() ) {

-            scaDomain.getCompositeActivator().activate(deployable);

-            scaDomain.getCompositeActivator().start(deployable);

-        }

-        customer = scaDomain.getService(Customer.class, "CustomerComponent");

-    }

-    

-    protected void tearDown() throws Exception {

-        if (scaDomain != null) {

-            scaDomain.close();

-            scaDomain = null;

-        }

-    }

-

-

-    public void runTest(String contributionJarName) throws Exception {

-        

-        try {

-            setUp(contributionJarName);

-            customer.purchaseGoods();

-            int retries = 10;

-            int outstandingCount = 1;

-            while (retries-- > 0) {

-

-                outstandingCount = customer.outstandingOrderCount();

-                if (outstandingCount == 0)

-                    break;

-                else

-                    Thread.sleep(100);

-            }

-            if (outstandingCount != 0)

-                throw new RuntimeException("Orders not processed on time");

-            

-        } finally {

-            

-            tearDown();

-        }    

-        

-        

-    }

-    

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index b7da27733d..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.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 supplychain.customer;

-

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * This is the business interface of the Customer service component.

- */

-@Remotable

-public interface Customer {

-    

-    public void purchaseGoods();

-    

-    @OneWay

-    public void notifyShipment(String order);

-    

-    public int outstandingOrderCount();

-

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 950606d044..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,61 +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 supplychain.customer;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-import supplychain.retailer.Retailer;

-

-/**

- * This class implements the Customer service component (POJO implementation).

- */

-@Service(Customer.class)

-@Scope("COMPOSITE")

-public class JavaCustomerComponentImpl implements Customer {

-    

-    private static int outstandingOrderCount;

-    

-    private Retailer retailer;

-    

-    public JavaCustomerComponentImpl() {

-    }

-    

-    @Reference

-    public void setRetailer(Retailer retailer) {

-        this.retailer = retailer;

-    }

-    

-    public void purchaseGoods() {

-        outstandingOrderCount++;

-        retailer.submitOrder("Order");

-    }

-    

-    public void notifyShipment(String order) {

-        outstandingOrderCount--;

-        System.out.print("Work thread " + Thread.currentThread() + " - ");

-        System.out.println(order);

-    }

-    

-    public int outstandingOrderCount() {

-        return outstandingOrderCount;

-    }

-

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index 08e2f8df08..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.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 supplychain.retailer;

-

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-import supplychain.warehouse.Warehouse;

-

-/**

- * This class implements the Retailer service component (POJO implementation).

- */

-@Service(Retailer.class)

-@Scope("STATELESS")

-public class JavaRetailerComponentImpl implements Retailer {

-    

-    private Warehouse warehouse;

-    

-    public JavaRetailerComponentImpl() {

-    }

-    

-    @Reference

-    public void setWarehouse(Warehouse warehouse) {

-        this.warehouse = warehouse;

-    }

-    

-     

-    public Warehouse getWarehouse() {

-        return warehouse;

-    }

-

-    public void submitOrder(String order) {

-        

-        warehouse.fulfillOrder(order + ", submitted");

-        

-    }

-

-    

-    

-   

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 17b342f8dd..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
+++ /dev/null
@@ -1,28 +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 supplychain.retailer;

-

-/**

- * This is the business interface of the Retailer service component.

- */

-public interface Retailer {

-    

-    public void submitOrder(String order);

-

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 6bdec3615f..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ /dev/null
@@ -1,50 +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 supplychain.shipper;

-

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-import supplychain.customer.Customer;

-

-/**

- * This class implements the Shipper service component (POJO implementation).

- */

-@Service(Shipper.class)

-@Scope("COMPOSITE")

-public class JavaShipperComponentImpl implements Shipper {

-    

-    private Customer customer;

-    

-    public JavaShipperComponentImpl() {

-    }

-    

-    @Reference

-    public void setCustomer(Customer customer) {

-        this.customer = customer;

-    }

-    

-    public void processShipment(String order) {

-        customer.notifyShipment(order + ", shipped");

-    }

-    

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index cd204ebc2e..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
+++ /dev/null
@@ -1,28 +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 supplychain.shipper;

-

-/**

- * This is the business interface of the Shipper service component.

- */

-public interface Shipper {

-    

-    public void processShipment(String order);

-

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index cbb55c969f..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.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 supplychain.warehouse;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-import supplychain.shipper.Shipper;

-

-/**

- * This class implements the Warehouse service component (POJO implementation).

- */

-@Service(Warehouse.class)

-@Scope("STATELESS")

-public class JavaWarehouseComponentImpl implements Warehouse {

-    

-    private Shipper shipper;

-    

-    public JavaWarehouseComponentImpl() {

-    }

-    

-    @Reference

-    public void setShipper(Shipper shipper) {

-        this.shipper = shipper;

-    }

-    

-    public void fulfillOrder(String order) {

-        shipper.processShipment(order + ", fulfilled");

-    }

-    

-    

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index b4807b80d1..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
+++ /dev/null
@@ -1,28 +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 supplychain.warehouse;

-

-/**

- * This is the business interface of the Warehouse service component.

- */

-public interface Warehouse {

-    

-    public void fulfillOrder(String order);

-

-}

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
deleted file mode 100644
index 645a94f6bf..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: SupplyChain

-Bundle-SymbolicName: supplychain.SupplyChain

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                org.oasisopen.sca,

-                org.oasisopen.sca.annotation,

-                javax.xml.bind.annotation

-Export-Package: supplychain.customer, supplychain

-

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
deleted file mode 100644
index 4cbd41b627..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: SupplyChainClient

-Bundle-SymbolicName: supplychain.SupplyChainClient

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework, 

-        supplychain.customer, supplychain,

-        org.apache.tuscany.sca.host.embedded,

-        org.apache.tuscany.sca.host.embedded.impl,

-        org.apache.tuscany.sca.assembly,

-        org.apache.tuscany.sca.contribution,

-        org.apache.tuscany.sca.contribution.service,

-        org.apache.tuscany.sca.core.assembly,

-        org.apache.tuscany.sca.assembly.builder,

-        org.oasisopen.sca,

-        org.oasisopen.sca.annotation,

-        javax.xml.bind.annotation

-Export-Package: supplychain.client

-Bundle-Activator: supplychain.client.SupplyChainClient

-

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index b524abc2a6..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	          targetNamespace="http://supplychain"

-              xmlns:supplychain="http://supplychain">

-              

-   <deployable composite="supplychain:supplychain"/>

-   

-</contribution>

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
deleted file mode 100644
index 5be79b741a..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
+++ /dev/null
@@ -1,48 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponent">

-        <implementation.java class="supplychain.customer.JavaCustomerComponentImpl" />

-        <reference name="retailer" target="RetailerComponent" />

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.java class="supplychain.shipper.JavaShipperComponentImpl" />

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
deleted file mode 100644
index 8549ca3409..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
+++ /dev/null
@@ -1,135 +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://supplychain"
-  xmlns:axis2ns1="http://supplychain"
-  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-  xmlns:ns1="http://supplychain"
-  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <xs:schema attributeFormDefault="unqualified"
-      elementFormDefault="qualified"
-      targetNamespace="http://supplychain"
-      xmlns:ns="http://supplychain" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="outstandingOrderCount">
-        <xs:complexType>
-          <xs:sequence/>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="outstandingOrderCountResponse">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="return" type="xs:int"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="notifyShipment">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="param0" type="xs:string"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="notifyShipmentResponse">
-        <xs:complexType>
-          <xs:sequence/>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="purchaseGoods">
-        <xs:complexType>
-          <xs:sequence/>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="purchaseGoodsResponse">
-        <xs:complexType>
-          <xs:sequence/>
-        </xs:complexType>
-      </xs:element>
-    </xs:schema>
-  </wsdl:types>
-  <wsdl:message name="outstandingOrderCountRequest" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:part element="ns1:outstandingOrderCount" name="part1" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-  </wsdl:message>
-  <wsdl:message name="outstandingOrderCountResponseMessage" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:part element="ns1:outstandingOrderCountResponse" name="part1" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-  </wsdl:message>
-  <wsdl:message name="notifyShipmentRequest" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:part element="ns1:notifyShipment" name="part1" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-  </wsdl:message>
-  <wsdl:message name="notifyShipmentResponseMessage" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:part element="ns1:notifyShipmentResponse" name="part1" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-  </wsdl:message>
-  <wsdl:message name="purchaseGoodsRequest" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:part element="ns1:purchaseGoods" name="part1" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-  </wsdl:message>
-  <wsdl:message name="purchaseGoodsResponseMessage" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:part element="ns1:purchaseGoodsResponse" name="part1" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-  </wsdl:message>
-  <wsdl:portType name="Customer" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:operation name="outstandingOrderCount" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <wsdl:input message="axis2ns1:outstandingOrderCountRequest" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-      <wsdl:output
-        message="axis2ns1:outstandingOrderCountResponseMessage" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-    </wsdl:operation>
-    <wsdl:operation name="notifyShipment" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <wsdl:input message="axis2ns1:notifyShipmentRequest" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-    </wsdl:operation>
-    <wsdl:operation name="purchaseGoods" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <wsdl:input message="axis2ns1:purchaseGoodsRequest" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-      <wsdl:output message="axis2ns1:purchaseGoodsResponseMessage" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="CustomerBinding" type="axis2ns1:Customer" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <soap:binding style="document"
-      transport="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-    <wsdl:operation name="outstandingOrderCount" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <soap:operation soapAction="urn:outstandingOrderCount"
-        style="document" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      <wsdl:input xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-        <soap:body namespace="http://supplychain" use="literal" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      </wsdl:input>
-      <wsdl:output xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-        <soap:body namespace="http://supplychain" use="literal" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="notifyShipment" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <soap:operation soapAction="urn:notifyShipment" style="document" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      <wsdl:input xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-        <soap:body namespace="http://supplychain" use="literal" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      </wsdl:input>
-    </wsdl:operation>
-    <wsdl:operation name="purchaseGoods" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <soap:operation soapAction="urn:purchaseGoods" style="document" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      <wsdl:input xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-        <soap:body namespace="http://supplychain" use="literal" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-      </wsdl:input>
-    </wsdl:operation>
-  </wsdl:binding>
-  
-  <wsdl:service name="CustomerWebService" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:port binding="axis2ns1:CustomerBinding"
-      name="CustomerPort" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <soap:address
-        location="http://localhost:8085/services/Customer" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
-    </wsdl:port>
-  </wsdl:service>
-  
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite b/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
deleted file mode 100644
index 88d1e72efc..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
+++ /dev/null
@@ -1,55 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponent">

-        <implementation.java class="supplychain.customer.JavaCustomerComponentImpl" />

-        <reference name="retailer" target="RetailerComponent" />

-        <service name="Customer">

-             <interface.wsdl interface="http://supplychain#wsdl.interface(Customer)" />

-            <binding.ws wsdlElement="http://supplychain#wsdl.port(CustomerWebService/CustomerPort)"/>

-        </service>

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <implementation.java class="supplychain.shipper.JavaShipperComponentImpl" />

-        <reference name="customer">

-            <interface.wsdl interface="http://supplychain#wsdl.interface(Customer)" />

-            <binding.ws wsdlElement="http://supplychain#wsdl.port(CustomerWebService/CustomerPort)"/>

-        </reference>

-    </component>

-   

-    

-</composite>

diff --git a/java/sca-contrib/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/java/sca-contrib/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
deleted file mode 100644
index 84f8cc015b..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
+++ /dev/null
@@ -1,666 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-installer</artifactId>
-    <name>Apache Tuscany OSGi - Tuscany Installer Bundle</name>
-
-    <properties>
-        <maven.test.skip>true</maven.test.skip>
-        <tuscany.version>${pom.version}</tuscany.version>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-dwr</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
--->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-feed</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-rss</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>apache-activemq</artifactId>
-            <version>4.1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-httpclient</groupId>
-                    <artifactId>commons-httpclient</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-fileupload</groupId>
-                    <artifactId>commons-fileupload</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-beanutils</groupId>
-                    <artifactId>commons-beanutils</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-console</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-optional</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-web</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-web-demo</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-jaas</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jms_1.1_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jsp_2.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>servlet-api-2.5</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>jetty</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>backport-util-concurrent</groupId>
-                    <artifactId>backport-util-concurrent</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>activesoap</groupId>
-                    <artifactId>jaxp-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>activemq</groupId>
-                    <artifactId>jmdns</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jrms</groupId>
-                    <artifactId>jrms</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xmlParserAPIs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xstream</groupId>
-                    <artifactId>xstream</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xmlpull</groupId>
-                    <artifactId>xmlpull</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>mx4j</groupId>
-                    <artifactId>mx4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>mx4j</groupId>
-                    <artifactId>mx4j-remote</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>  
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-notification</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ws</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution-groovy</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-fastinfoset</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-xmlbeans</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-xstream</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-rmi</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
--->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-das</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-jetty</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>groovy</groupId>
-                    <artifactId>groovy-all-minimal</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-policy-logging</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-definitions</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-workspace</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-jetty</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-workspace-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-java2wsdl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-wsdl2java</artifactId>
-            <version>${pom.version}</version>
-        </dependency>        
--->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-tools</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.1.6</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.stream</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.0</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>junit</groupId>
-                  <artifactId>junit</artifactId>
-               </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.2</version>
-        </dependency>
-     </dependencies>
-   
-
-    <build>
-
-        <plugins>
-
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <configuration>
-                    <cpFile>${project.build.directory}/classes/org/apache/tuscany/sca/installer/.classpath</cpFile>
-                    <includeScope>runtime</includeScope>
-                </configuration>
-                 <executions>
-                     <execution>
-                         <id>build-classpath</id>
-                         <phase>compile</phase>
-                         <goals>
-                             <goal>build-classpath</goal>
-                         </goals>
-                     </execution>
-                 </executions>
-            </plugin>
-
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <finalName>tuscany-sca-osgi-installer</finalName>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                        </manifest>
-                        <manifestEntries>
-                            
-                            <Bundle-Version>2.0</Bundle-Version>
-                            <Bundle-SymbolicName>org.apache.tuscany.sca.installer</Bundle-SymbolicName>
-                            <Bundle-Description>${pom.name}</Bundle-Description>
-                            <Import-Package>org.osgi.framework</Import-Package>
-                            <Export-Package>org.apache.tuscany.sca.installer</Export-Package>
-                            <Bundle-Activator>org.apache.tuscany.sca.installer.InstallerBundleActivator</Bundle-Activator>
-kage>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java b/java/sca-contrib/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
deleted file mode 100644
index 0c26477a43..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
+++ /dev/null
@@ -1,405 +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.installer;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.jar.Attributes;
-import java.util.jar.JarInputStream;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * Bundle activator which installs Tuscany modules and 3rd party jars into an OSGi runtime.
- *
- */
-public class InstallerBundleActivator implements BundleActivator {
-    
-    private ArrayList<Bundle> tuscanyBundles = new ArrayList<Bundle>();
-    
-    private static final String[] immutableJars = {
-        "bcprov"
-    };
-    
-    private static final String[] tuscanyModulesToIgnore = {
-        "node2-launcher-webapp",
-        "implementation-node-runtime", // uses node2
-        "saxon",
-        "runtime",
-        "runtime-webapp",
-        "runtime-tomcat",
-        "runtime-war",
-        "host-webapp",
-        "host-tomcat",
-        "policy-transaction",
-        "implementation-bpel",
-        "binding-ejb",
-        "implementation-ejb",
-        "implementation-ejb-xml",
-        
-    };
-    
-    private static final String[] rebundleJars = {
-        "org.apache.tuscany.sca.3rdparty.org.apache.tuscany.sdo",   // Recreate export statements
-    };
-    
-	public void start(BundleContext bundleContext) throws Exception {
-        
-        String tuscanyHome = System.getProperty("TUSCANY_HOME");
-        if (tuscanyHome == null) {
-          File homeDir = new File("../tuscany-versioned/target/classes");
-          if (homeDir.exists()) {
-              tuscanyHome = homeDir.getCanonicalPath();
-          }
-        }
-		
-        System.out.println("Installing Tuscany from TUSCANY_HOME=" + tuscanyHome);
-        installVersionedTuscanyIntoOSGi(bundleContext, tuscanyHome);
-	}
-
-	public void stop(BundleContext bundleContext) throws Exception {
-        
-        for (Bundle bundle : tuscanyBundles) {
-            try {
-                bundle.stop();
-            } catch (Exception e) {
-                // Ignore error
-            }
-        }
-	}
-    
-    private void installVersionedTuscanyIntoOSGi(BundleContext bundleContext, String tuscanyHome) {
-        
-        try {
-            Bundle[] installedBundles = bundleContext.getBundles();
-            HashSet<String> installedBundleSet = new HashSet<String>();
-            for (Bundle bundle : installedBundles) {
-                if (bundle.getSymbolicName() != null)
-                    installedBundleSet.add(bundle.getSymbolicName());
-            }
-            
-            // FIXME: SDO bundles dont have the correct dependencies
-            System.setProperty("commonj.sdo.impl.HelperProvider", "org.apache.tuscany.sdo.helper.HelperProviderImpl");
-            
-            HashSet<File> tuscanyJars = new HashSet<File>();
-            HashSet<File> thirdPartyJars = new HashSet<File>();
-            
-
-            File tuscanyInstallDir = new File(tuscanyHome).getCanonicalFile();
-            findBundles(bundleContext, tuscanyInstallDir, tuscanyJars, thirdPartyJars);
-            
-            
-            for (File bundleFile : thirdPartyJars) {
-                
-                String bundleName = bundleFile.getName();
-                if (bundleName.startsWith("org.apache.felix"))
-                    continue;
-                
-                boolean installed = false;
-                for (String name : rebundleJars) {
-                  if (bundleName.startsWith(name)) {
-                      rebundleAndInstall(bundleContext, tuscanyInstallDir, bundleFile);
-                      installed = true;
-                  }
-                }
-                if (installed)
-                    continue;
-                
-                bundleContext.installBundle(bundleFile.toURI().toURL().toString());
-               
-            }
-            
-            Bundle osgiRuntimeBundle = null;
-            for (File bundleFile : tuscanyJars) {
-                Bundle bundle = bundleContext.installBundle(bundleFile.toURI().toURL().toString());
-                if ("org.apache.tuscany.sca.osgi.runtime".equals(bundle.getSymbolicName())) 
-                    osgiRuntimeBundle = bundle;
-            }
-            if (osgiRuntimeBundle != null)
-                osgiRuntimeBundle.start();
-            
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    private void rebundleAndInstall(BundleContext bundleContext, File tuscanyInstallDir, File bundleFile) throws Exception {
-        String bundleSymbolicName = bundleFile.getName();
-        if (bundleSymbolicName.endsWith(".jar")) bundleSymbolicName = bundleSymbolicName.substring(0, bundleSymbolicName.length()-4);
-        
-        String bundleLocation = bundleFile.toURI().toURL().toString();
-        InputStream bundleManifestStream = updateBundleManifest(bundleFile, bundleSymbolicName);
-        HashSet<File> jarSet = new HashSet<File>();
-        jarSet.add(bundleFile);
-
-        File newBundleFile = new File(tuscanyInstallDir, "org.apache.tuscany.sca." + bundleFile.getName());
-        createAndInstallBundle(bundleContext, bundleLocation, newBundleFile, bundleManifestStream, jarSet);
-        bundleManifestStream.close();
-    }
-	
-    
-    private void findBundles(BundleContext bundleContext, 
-            File tuscanyInstallDir,
-            HashSet<File> tuscanyJars, 
-            HashSet<File> thirdPartyJars) 
-    throws IOException
-    {
-        
-        File[] jars = tuscanyInstallDir.listFiles();
-        for (File jar : jars) {
-            String jarName = jar.getName();
-            if (!jarName.endsWith(".jar"))
-                continue;
-            
-            if (!jarName.startsWith("org.apache.tuscany.sca")||jarName.startsWith("org.apache.tuscany.sca.3rdparty")) {
-                if (jarName.endsWith(".jar"))
-                { 
-                    thirdPartyJars.add(jar);
-                }
-            } else {
-                boolean installTuscanyJar = true;
-                for (String name : tuscanyModulesToIgnore) {
-                    name = name.replaceAll("-", ".");
-                    if (jarName.startsWith("org.apache.tuscany.sca." + name)) {
-                        installTuscanyJar = false;
-                        break;
-                    }
-                }
-                if (installTuscanyJar)
-                    tuscanyJars.add(jar);
-            }
-        }
-    }
-    
-
-    private InputStream updateBundleManifest(File jarFile, String bundleSymbolicName) throws Exception {
-        
-        if (!jarFile.exists())
-            return null;
-        JarInputStream jar = new JarInputStream(new FileInputStream(jarFile));
-        Manifest manifest = jar.getManifest();
-        if (manifest == null) {
-            ZipEntry ze;
-            while ((ze = jar.getNextEntry()) != null) {
-                if (ze.getName().equals("META-INF/MANIFEST.MF"))
-                    break;
-            }
-            if (ze != null) {
-                byte[] bytes = new byte[(int)ze.getSize()];
-                jar.read(bytes);
-                manifest = new Manifest(new ByteArrayInputStream(bytes));
-            }
-        }
-        if (manifest == null) {
-            manifest = new Manifest();
-        }
-        
-        String bundleName = jarFile.getName();
-        boolean isImmutableJar = false;
-        for (String immutableJar : immutableJars) {
-            if (bundleName.startsWith(immutableJar)) {
-                isImmutableJar = true;
-                break;
-            }
-        }
-        Attributes attributes = manifest.getMainAttributes();
-        if (isImmutableJar)
-            attributes.putValue("Bundle-ClassPath", bundleName);
-        
-
-        attributes.remove(new Attributes.Name("Require-Bundle"));
-        attributes.putValue("DynamicImport-Package", "*");   
-        
-        // Existing export statements in bundles may contain versions, so they should be used as is
-        // SDO exports are not sufficient, and should be changed
-        if (attributes.getValue("Export-Package") == null || bundleName.startsWith("org.apache.tuscany.sca.3rdparty.org.apache.tuscany.sdo.tuscany-sdo-impl")) {
-        
-            HashSet<String> packages = getPackagesInJar(bundleName, jar);
-            String version = getJarVersion(bundleName);
-            
-            attributes.putValue("Export-Package", packagesToString(packages, version));
-            attributes.putValue("Import-Package", packagesToString(packages, null));
-        }
-        
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        manifest.write(out);
-        ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-        out.close();
-               
-        return in;
-        
-    }
-    
-    public Bundle createAndInstallBundle(BundleContext bundleContext, 
-            String bundleLocation, 
-            File bundleFile,
-            InputStream manifestStream,
-            final HashSet<File> thirdPartyJars) throws Exception {
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-        Manifest manifest = new Manifest();
-        manifest.read(manifestStream);
-        
-        StringBuilder bundleClassPath = new StringBuilder(".");
-        for (File jar : thirdPartyJars) {
-            bundleClassPath.append(',');
-            bundleClassPath.append(jar.getName());           
-        }
-        
-        if (thirdPartyJars.size() > 1)
-            manifest.getMainAttributes().putValue("Bundle-ClassPath", bundleClassPath.toString());
-
-        JarOutputStream jarOut = new JarOutputStream(out, manifest);
-        
-        String classpath = manifest.getMainAttributes().getValue("Bundle-ClassPath");
-        boolean embed = classpath != null && !classpath.trim().equals(".");
-        for (File jarFile : thirdPartyJars) {
-            if (embed)
-                addFileToJar(jarFile, jarOut);
-            else {
-                copyJar(jarFile, jarOut);
-            }
-        }
-
-        jarOut.close();
-        out.close();
-
-        Bundle bundle;
-        if (System.getenv("TUSCANY_OSGI_DEBUG") != null) {
-            FileOutputStream fileOut = new FileOutputStream(bundleFile);
-            fileOut.write(out.toByteArray());
-            bundle = bundleContext.installBundle(bundleFile.toURL().toString());
-            
-        } else {
-            ByteArrayInputStream inStream = new ByteArrayInputStream(out.toByteArray());
-            bundle = bundleContext.installBundle(bundleLocation, inStream);
-            inStream.close();
-        }
-        return bundle;
-
-    }
-    
-    private void addFileToJar(File file, JarOutputStream jarOut) throws Exception {
-        
-        ZipEntry ze = new ZipEntry(file.getName());
-
-        try {
-            jarOut.putNextEntry(ze);
-            FileInputStream inStream = new FileInputStream(file);
-            byte[] fileContents = new byte[inStream.available()];
-            inStream.read(fileContents);
-            jarOut.write(fileContents);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-
-    private void copyJar(File file, JarOutputStream jarOut) throws Exception {
-        
-        try {
-            JarInputStream jarIn = new JarInputStream(new FileInputStream(file));
-            ZipEntry ze;
-            byte[] readBuf = new byte[1000];
-            int bytesRead;
-            while ((ze = jarIn.getNextEntry()) != null) {
-                if (ze.getName().equals("META-INF/MANIFEST.MF"))
-                    continue;
-                jarOut.putNextEntry(ze);
-                while ((bytesRead = jarIn.read(readBuf)) > 0) {
-                    jarOut.write(readBuf, 0, bytesRead);
-                }
-            }
-            jarIn.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    private HashSet<String> getPackagesInJar(String bundleName, JarInputStream jar) throws Exception {
-        HashSet<String> packages = new HashSet<String>();
-        ZipEntry entry;
-        while ((entry = jar.getNextEntry()) != null) {
-            String entryName = entry.getName();
-            if (!entry.isDirectory() && entryName != null && entryName.length() > 0 && 
-                    !entryName.startsWith(".") && !entryName.startsWith("META-INF") &&
-                    entryName.lastIndexOf("/") > 0) {
-                String pkg = entryName.substring(0, entryName.lastIndexOf("/")).replace('/', '.');
-                packages.add(pkg);
-                
-            }
-        }
-        // FIXME: Split package
-        if (bundleName.startsWith("axis2-adb"))
-            packages.remove("org.apache.axis2.util");
-        else if (bundleName.startsWith("axis2-codegen")) {
-            packages.remove("org.apache.axis2.wsdl");
-            packages.remove("org.apache.axis2.wsdl.util");
-        }
-        else if (bundleName.startsWith("bsf-all"))
-            packages.remove("org.mozilla.javascript");
-        
-        return packages;
-    }
-    
-    private String packagesToString(HashSet<String> packages, String version) {
-        
-        StringBuilder pkgBuf = new StringBuilder();
-        for (String pkg : packages) {
-            if (pkgBuf.length() >0) pkgBuf.append(',');
-            pkgBuf.append(pkg);
-            if (version != null) {
-                pkgBuf.append(";version=\"");
-                pkgBuf.append(version);
-                pkgBuf.append('\"');
-            }
-        }
-        return pkgBuf.toString();
-    }
-    
-    private String getJarVersion(String bundleName) {
-        Pattern pattern = Pattern.compile("-([0-9.]+)");
-        Matcher matcher = pattern.matcher(bundleName);
-        String version = "1.0.0";
-        if (matcher.find()) {
-            version = matcher.group();
-            if (version.endsWith("."))
-                version = version.substring(1, version.length()-1);
-            else
-                version = version.substring(1);
-        }
-        return version;
-    }
-	
-}
diff --git a/java/sca-contrib/itest/osgi-tuscany/tuscany-versioned/pom.xml b/java/sca-contrib/itest/osgi-tuscany/tuscany-versioned/pom.xml
deleted file mode 100644
index 5804f4711d..0000000000
--- a/java/sca-contrib/itest/osgi-tuscany/tuscany-versioned/pom.xml
+++ /dev/null
@@ -1,639 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-versioned</artifactId>
-    <name>Apache Tuscany OSGi - Versioned Tuscany Bundles</name>
-
-    <properties>
-        <maven.test.skip>true</maven.test.skip>
-        <tuscany.version>${pom.version}</tuscany.version>
-
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-dwr</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
--->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-feed</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-rss</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>apache-activemq</artifactId>
-            <version>4.1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-httpclient</groupId>
-                    <artifactId>commons-httpclient</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-fileupload</groupId>
-                    <artifactId>commons-fileupload</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-beanutils</groupId>
-                    <artifactId>commons-beanutils</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-console</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-optional</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-web</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-web-demo</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-jaas</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jms_1.1_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jsp_2.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>servlet-api-2.5</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>jetty</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>backport-util-concurrent</groupId>
-                    <artifactId>backport-util-concurrent</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>activesoap</groupId>
-                    <artifactId>jaxp-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>activemq</groupId>
-                    <artifactId>jmdns</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jrms</groupId>
-                    <artifactId>jrms</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xmlParserAPIs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xstream</groupId>
-                    <artifactId>xstream</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xmlpull</groupId>
-                    <artifactId>xmlpull</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>mx4j</groupId>
-                    <artifactId>mx4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>mx4j</groupId>
-                    <artifactId>mx4j-remote</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>  
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-notification</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ws</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution-groovy</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-fastinfoset</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-xmlbeans</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-databinding-xstream</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-rmi</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
--->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-das</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-jetty</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>groovy</groupId>
-                    <artifactId>groovy-all-minimal</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-policy-logging</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-definitions</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-workspace</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-jetty</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-workspace-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-java2wsdl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-wsdl2java</artifactId>
-            <version>${pom.version}</version>
-        </dependency>        
--->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-tools</artifactId>
-            <version>1.1-incubating</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.1.6</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.stream</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.0</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>junit</groupId>
-                  <artifactId>junit</artifactId>
-               </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.2</version>
-        </dependency>
-     </dependencies>
-   
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-bundle-plugin</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <goals>
-                              <goal>execute</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/itest/policy-security-basicauth/pom.xml b/java/sca-contrib/itest/policy-security-basicauth/pom.xml
deleted file mode 100644
index f3b3b28c1f..0000000000
--- a/java/sca-contrib/itest/policy-security-basicauth/pom.xml
+++ /dev/null
@@ -1,113 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-policy-security-basicauth</artifactId>
-    <name>Apache Tuscany SCA Policy Basic Authentication Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>4.1.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-           <groupId>org.apache.geronimo.specs</groupId>
-           <artifactId>geronimo-jms_1.1_spec</artifactId>
-           <version>1.1</version>
-           <scope>provided</scope>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.apache.geronimo.specs</groupId>
-                   <artifactId>geronimo-jms_1.1_spec</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>  
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>httpunit</groupId>
-            <artifactId>httpunit</artifactId>
-            <version>1.6.1</version>
-            <scope>test</scope>
-        </dependency>        
-
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java b/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
deleted file mode 100644
index a7e60e7e09..0000000000
--- a/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
+++ /dev/null
@@ -1,40 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldClientImpl implements HelloWorldService {
-    
-    @Reference
-    protected HelloWorldService helloworldWS;
-    
-
-
-    public String getGreetings(String name) {
-        return "Hello " + 
-                helloworldWS.getGreetings(name);
-    }
-
-}
diff --git a/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 18f74b083f..0000000000
--- a/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java b/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index e9787bfac3..0000000000
--- a/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,46 +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 helloworld;
-
-import javax.security.auth.Subject;
-
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldServiceImpl implements HelloWorldService {
-
-    @Context
-    protected RequestContext requestContext;
-    
-    public String getGreetings(String name) {
-        Subject subject = requestContext.getSecuritySubject();
-        
-        if (subject == null){
-            return "Hello " + name + " null subject";
-        } else {
-            return "Hello " + name + " " + subject.toString();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/policy-security-basicauth/src/main/resources/definitions.xml b/java/sca-contrib/itest/policy-security-basicauth/src/main/resources/definitions.xml
deleted file mode 100644
index dbdf0cd263..0000000000
--- a/java/sca-contrib/itest/policy-security-basicauth/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://itest/policy"
-    		 xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-    		 xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:ip="http://itest/policy" >
-
-
-    <sca:policySet name="BasicAuthenticationPolicySet"
-                   provides="authentication"
-                   appliesTo="sca:binding.ws">
-        <tuscany:basicAuthentication>
-          <tuscany:userName>myname</tuscany:userName>
-          <tuscany:password>mypassword</tuscany:password>
-        </tuscany:basicAuthentication>
-    </sca:policySet>
-    
-    <sca:policySet name="ImplementationIdentityPolicySet"
-                    provides="tuscany:identity"
-                   appliesTo="sca:implementation.java">
-        <securityIdentity>
-            <useCallerIdentity/>
-        </securityIdentity>  
-    </sca:policySet>      
-      
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/policy-security-basicauth/src/main/resources/helloworld.composite b/java/sca-contrib/itest/policy-security-basicauth/src/main/resources/helloworld.composite
deleted file mode 100644
index f883629180..0000000000
--- a/java/sca-contrib/itest/policy-security-basicauth/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,46 +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://itest/policy"
-           xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:ip="http://itest/policy"
-           name="Helloworld">
-           
-    <component name="HelloWorldClientComponent">
-        <implementation.java class="helloworld.HelloWorldClientImpl" />
-        <service name="HelloWorldService">
-            <interface.java interface="helloworld.HelloWorldService"/>
-            <binding.sca/>
-        </service>
-        <reference name="helloworldWS" requires="authentication">
-            <binding.ws uri="http://localhost:8085/HelloWorldServiceWSComponent"/>
-        </reference>
-    </component>           
-
-    <component name="HelloWorldServiceWSComponent">
-        <implementation.java class="helloworld.HelloWorldServiceImpl" requires="tuscany:identity"/>
-        <service name="HelloWorldService" requires="authentication">
-        	<interface.java interface="helloworld.HelloWorldService"/>
-            <binding.ws uri="http://localhost:8085/HelloWorldServiceWSComponent"/>
-        </service>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java b/java/sca-contrib/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
deleted file mode 100644
index 10fbac4e20..0000000000
--- a/java/sca-contrib/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
+++ /dev/null
@@ -1,114 +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.itest;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.Assert;
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.ws.security.util.Base64;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.meterware.httpunit.PostMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-public class BasicAuthTestCase {
-    private static Node node;
-    private static HelloWorldService service;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            NodeFactory factory = NodeFactory.newInstance();
-            node = factory.createSCANodeFromClassLoader("helloworld.composite", 
-                                                        BasicAuthTestCase.class.getClassLoader());
-            node.start();
-            
-            service = ((Client)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        node.stop();
-    }
-    
-    @Test
-    //@Ignore
-    public void testViaSCAClient() {
-        String greetings = service.getGreetings("Simon");
-        System.out.println(">>>" + greetings);
-    } 
-    
-    @Test
-    @Ignore
-    public void testWSViaNonSCAClient() {
-        
-        try {
-            String token ="MyToken";
-            String encToken = Base64.encode(token.getBytes());
-            
-            String response = callService("http://L3AW203:8085/HelloWorldServiceWSComponent",
-                                          "<?xml version='1.0' encoding='UTF-8'?>" +
-                                            "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\">" + 
-                                             "<soapenv:Header>" + 
-                                               "<ns2:Token xmlns:ns2=\"http://helloworld/\">" + encToken + "</ns2:Token>" + 
-                                             "</soapenv:Header>" + 
-                                             "<soapenv:Body>" + 
-                                               "<ns2:getGreetings xmlns:ns2=\"http://helloworld/\">" + 
-                                                 "<arg0>Simon</arg0>" + 
-                                               "</ns2:getGreetings>" + 
-                                             "</soapenv:Body>" + 
-                                            "</soapenv:Envelope>" );
-            System.out.println(">>>" + response);
-        } catch(Exception ex) {
-            System.out.println(ex.toString());
-        }
-    } 
-    
-    @Test
-    public void testJMSViaNonSCAClient() {
-        // TODO
-    }
-    
-    public String callService(String url, String requestString) throws Exception {
-        System.out.println("Request = " + requestString);
-        WebConversation wc   = new WebConversation();
-        wc.setAuthorization("Me", "MyPasswd");
-        WebRequest request   = new PostMethodWebRequest( url, 
-                                                         new ByteArrayInputStream(requestString.getBytes("UTF-8")),"text/xml");
-        request.setHeaderField("SOAPAction", "");
-        WebResponse response = wc.getResource(request);
-        System.out.println("Response= " + response.getText());               
-        Assert.assertEquals(200, response.getResponseCode());
-        return response.getText(); 
-    }    
-}
diff --git a/java/sca-contrib/itest/policy-security-jsr250/pom.xml b/java/sca-contrib/itest/policy-security-jsr250/pom.xml
deleted file mode 100644
index 935958d8c2..0000000000
--- a/java/sca-contrib/itest/policy-security-jsr250/pom.xml
+++ /dev/null
@@ -1,75 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-policy-security-jsr250</artifactId>
-    <name>Apache Tuscany SCA Policy Framework Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>            
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security-jsr250</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>   
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-        </dependency>
-
-
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 3569410e7d..0000000000
--- a/java/sca-contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,51 +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 helloworld;
-
-import javax.annotation.security.DenyAll;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RunAs;
-import javax.annotation.security.RolesAllowed;
-
-/**
- * This class implements the HelloWorld service.
- */
-@RunAs("Administrator")
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-    @DenyAll()
-    public String getGreetingsDenyAll(String name) {
-        return "Hello " + name;
-    }
-
-    @PermitAll
-    public String getGreetingsPermitAll(String name) {
-        return "Hello " + name;
-    }
-
-    @RolesAllowed("Administrator")
-    public String getGreetingsRolesAllowed(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index bf4e1edaaa..0000000000
--- a/java/sca-contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,38 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-    
-    public String getGreetingsRolesAllowed(String name);
-    
-    public String getGreetingsPermitAll(String name);
-    
-    public String getGreetingsDenyAll(String name);
-    
-    
-}
diff --git a/java/sca-contrib/itest/policy-security-jsr250/src/main/resources/definitions.xml b/java/sca-contrib/itest/policy-security-jsr250/src/main/resources/definitions.xml
deleted file mode 100644
index 64b8a95d18..0000000000
--- a/java/sca-contrib/itest/policy-security-jsr250/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://itest/policy"
-    		 xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-    		 xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:ip="http://itest/policy" >
-
-    <policySet name="allowed_users" appliesTo="sca:implementation.java">
-    	<permitAll/>
-    </policySet>
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/policy-security-jsr250/src/main/resources/helloworld.composite b/java/sca-contrib/itest/policy-security-jsr250/src/main/resources/helloworld.composite
deleted file mode 100644
index 456ca450f1..0000000000
--- a/java/sca-contrib/itest/policy-security-jsr250/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,33 +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://itest/policy"
-           xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:ip="http://itest/policy"
-           name="Helloworld">
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="helloworld.HelloWorldImpl" policySets="ip:allowed_users"/>
-        <service name="HelloWorldService">
-        	<interface.java interface="helloworld.HelloWorldService"/>
-        </service>
-    </component>
-</composite>
diff --git a/java/sca-contrib/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java b/java/sca-contrib/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
deleted file mode 100644
index da5f6409ba..0000000000
--- a/java/sca-contrib/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
+++ /dev/null
@@ -1,54 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class PolicySecurityJSR250TestCase {
-    private static SCADomain domain;
-    private static HelloWorldService service;
-
-    @Test
-    public void testPolicies() {
-        //TODO
-        String greetings = service.getGreetings("Luciano");
-        System.out.println(">>>" + greetings);
-    }
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            domain = SCADomain.newInstance("helloworld.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        service = domain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-}
diff --git a/java/sca-contrib/itest/policy-security-token/pom.xml b/java/sca-contrib/itest/policy-security-token/pom.xml
deleted file mode 100644
index af7c2fe882..0000000000
--- a/java/sca-contrib/itest/policy-security-token/pom.xml
+++ /dev/null
@@ -1,106 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-policy-security-token</artifactId>
-    <name>Apache Tuscany SCA Policy Token Authentication Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>4.1.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-           <groupId>org.apache.geronimo.specs</groupId>
-           <artifactId>geronimo-jms_1.1_spec</artifactId>
-           <version>1.1</version>
-           <scope>provided</scope>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.apache.geronimo.specs</groupId>
-                   <artifactId>geronimo-jms_1.1_spec</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>  
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>httpunit</groupId>
-            <artifactId>httpunit</artifactId>
-            <version>1.6.1</version>
-            <scope>test</scope>
-        </dependency>        
-
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java b/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
deleted file mode 100644
index 2150cb63c6..0000000000
--- a/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
+++ /dev/null
@@ -1,42 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldClientImpl implements HelloWorldService {
-    
-    @Reference
-    protected HelloWorldService helloworldWS;
-    
-    @Reference
-    protected HelloWorldService helloworldJMS;    
-
-    public String getGreetings(String name) {
-        return "Hello " + 
-                helloworldWS.getGreetings(name) + 
-                helloworldJMS.getGreetings(name);
-    }
-
-}
diff --git a/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 18f74b083f..0000000000
--- a/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java b/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index e9787bfac3..0000000000
--- a/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,46 +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 helloworld;
-
-import javax.security.auth.Subject;
-
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldServiceImpl implements HelloWorldService {
-
-    @Context
-    protected RequestContext requestContext;
-    
-    public String getGreetings(String name) {
-        Subject subject = requestContext.getSecuritySubject();
-        
-        if (subject == null){
-            return "Hello " + name + " null subject";
-        } else {
-            return "Hello " + name + " " + subject.toString();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/policy-security-token/src/main/resources/definitions.xml b/java/sca-contrib/itest/policy-security-token/src/main/resources/definitions.xml
deleted file mode 100644
index f7bb9bc374..0000000000
--- a/java/sca-contrib/itest/policy-security-token/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://itest/policy"
-    		 xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-    		 xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:ip="http://itest/policy" >
-
-
-    <sca:policySet name="Axis2TokenAuthenticationPolicySet"
-                   provides="authentication"
-                   appliesTo="sca:binding.ws">
-                
-        <tuscany:axis2TokenAuthentication xmlns:foo="http://tuscany.apache.org/foo" tokenName="foo:myname"/>
-    </sca:policySet>
-    
-    <sca:policySet name="JMSTokenAuthenticationPolicySet"
-                   provides="authentication"
-                   appliesTo="sca:binding.jms">
-                
-        <tuscany:jmsTokenAuthentication xmlns:foo="http://tuscany.apache.org/foo" tokenName="foo:myname"/>
-    </sca:policySet>
-    
-    <sca:policySet name="ImplementationIdentityPolicySet"
-                    provides="tuscany:identity"
-                   appliesTo="sca:implementation.java">
-        <securityIdentity>
-            <useCallerIdentity/>
-        </securityIdentity>  
-    </sca:policySet>    
-      
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/policy-security-token/src/main/resources/helloworld.composite b/java/sca-contrib/itest/policy-security-token/src/main/resources/helloworld.composite
deleted file mode 100644
index 1db89fd502..0000000000
--- a/java/sca-contrib/itest/policy-security-token/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,56 +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://itest/policy"
-           xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:ip="http://itest/policy"
-           name="Helloworld">
-           
-    <component name="HelloWorldClientComponent">
-        <implementation.java class="helloworld.HelloWorldClientImpl"/>
-        <service name="HelloWorldService">
-            <interface.java interface="helloworld.HelloWorldService"/>
-            <binding.sca/>
-        </service>
-        <reference name="helloworldWS" requires="authentication">
-            <binding.ws uri="http://localhost:8085/HelloWorldServiceWSComponent"/>
-        </reference>
-        <reference name="helloworldJMS" requires="authentication">
-            <binding.jms uri="jms:HelloWorldService"/>
-        </reference>
-    </component>           
-
-    <component name="HelloWorldServiceWSComponent">
-        <implementation.java class="helloworld.HelloWorldServiceImpl" requires="tuscany:identity"/>
-        <service name="HelloWorldService" requires="authentication">
-        	<interface.java interface="helloworld.HelloWorldService"/>
-            <binding.ws uri="http://localhost:8085/HelloWorldServiceWSComponent"/>
-        </service>
-    </component>
-    
-    <component name="HelloWorldServiceJMSComponent">
-        <implementation.java class="helloworld.HelloWorldServiceImpl" requires="tuscany:identity"/>
-        <service name="HelloWorldService" requires="authentication">
-            <interface.java interface="helloworld.HelloWorldService"/>
-            <binding.jms/>
-        </service>
-    </component>    
-</composite>
diff --git a/java/sca-contrib/itest/policy-security-token/src/main/resources/jndi.properties b/java/sca-contrib/itest/policy-security-token/src/main/resources/jndi.properties
deleted file mode 100644
index 9abdff215d..0000000000
--- a/java/sca-contrib/itest/policy-security-token/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as. 
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/java/sca-contrib/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java b/java/sca-contrib/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
deleted file mode 100644
index 167e45738f..0000000000
--- a/java/sca-contrib/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
+++ /dev/null
@@ -1,115 +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.itest;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.Assert;
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.ws.security.util.Base64;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.meterware.httpunit.PostMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-public class TokenAuthTestCase {
-    private static SCANode node;
-    private static HelloWorldService service;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            SCANodeFactory factory = SCANodeFactory.newInstance();
-            node = factory.createSCANodeFromClassLoader("helloworld.composite", 
-                                                        TokenAuthTestCase.class.getClassLoader());
-            node.start();
-            
-            service = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        node.stop();
-    }
-    
-    @Test
-    //@Ignore
-    public void testViaSCAClient() {
-        String greetings = service.getGreetings("Simon");
-        System.out.println(">>>" + greetings);
-    } 
-    
-    @Test
-    @Ignore
-    public void testWSViaNonSCAClient() {
-        
-        try {
-            String token ="MyToken";
-            String encToken = Base64.encode(token.getBytes());
-            
-            String response = callService("http://L3AW203:8085/HelloWorldServiceWSComponent",
-                                          "<?xml version='1.0' encoding='UTF-8'?>" +
-                                            "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\">" + 
-                                             "<soapenv:Header>" + 
-                                               "<ns2:Token xmlns:ns2=\"http://helloworld/\">" + encToken + "</ns2:Token>" + 
-                                             "</soapenv:Header>" + 
-                                             "<soapenv:Body>" + 
-                                               "<ns2:getGreetings xmlns:ns2=\"http://helloworld/\">" + 
-                                                 "<arg0>Simon</arg0>" + 
-                                               "</ns2:getGreetings>" + 
-                                             "</soapenv:Body>" + 
-                                            "</soapenv:Envelope>" );
-            System.out.println(">>>" + response);
-        } catch(Exception ex) {
-            System.out.println(ex.toString());
-        }
-    } 
-    
-    @Test
-    @Ignore
-    public void testJMSViaNonSCAClient() {
-        // TODO
-    }
-    
-    public String callService(String url, String requestString) throws Exception {
-        System.out.println("Request = " + requestString);
-        WebConversation wc   = new WebConversation();
-        wc.setAuthorization("Me", "MyPasswd");
-        WebRequest request   = new PostMethodWebRequest( url, 
-                                                         new ByteArrayInputStream(requestString.getBytes("UTF-8")),"text/xml");
-        request.setHeaderField("SOAPAction", "");
-        WebResponse response = wc.getResource(request);
-        System.out.println("Response= " + response.getText());               
-        Assert.assertEquals(200, response.getResponseCode());
-        return response.getText(); 
-    }    
-}
diff --git a/java/sca-contrib/itest/policy-security/pom.xml b/java/sca-contrib/itest/policy-security/pom.xml
deleted file mode 100644
index 23bced91b5..0000000000
--- a/java/sca-contrib/itest/policy-security/pom.xml
+++ /dev/null
@@ -1,68 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-policy-security</artifactId>
-    <name>Apache Tuscany SCA Policy Framework Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>            
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>   
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-        </dependency>
-
-
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index a75187f0d7..0000000000
--- a/java/sca-contrib/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/itest/policy-security/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 18f74b083f..0000000000
--- a/java/sca-contrib/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/itest/policy-security/src/main/resources/definitions.xml b/java/sca-contrib/itest/policy-security/src/main/resources/definitions.xml
deleted file mode 100644
index c8118a0caf..0000000000
--- a/java/sca-contrib/itest/policy-security/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://itest/policy"
-    		 xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-    		 xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:ip="http://itest/policy" >
-
-    <policySet name="allowed_users" appliesTo="sca:implementation.java">
-    	<permitAll/>
-    </policySet>
-    
-    <policySet name="runAsAdmin" appliesTo="sca:implementation.java">
-    	<runAs role="Administrator"/>
-    </policySet>
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/policy-security/src/main/resources/helloworld.composite b/java/sca-contrib/itest/policy-security/src/main/resources/helloworld.composite
deleted file mode 100644
index 9e0f289f87..0000000000
--- a/java/sca-contrib/itest/policy-security/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,34 +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://itest/policy"
-           xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:ip="http://itest/policy"
-           name="Helloworld">
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="helloworld.HelloWorldImpl" policySets="ip:allowed_users"/>
-        
-        <service name="HelloWorldService">
-        	<interface.java interface="helloworld.HelloWorldService"/>
-        </service>
-    </component>
-</composite>
diff --git a/java/sca-contrib/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java b/java/sca-contrib/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
deleted file mode 100644
index 9dad17741e..0000000000
--- a/java/sca-contrib/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
+++ /dev/null
@@ -1,54 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class PolicyIdentityTestCase {
-    private static SCADomain domain;
-    private static HelloWorldService service;
-
-    @Test
-    public void testPolicies() {
-        //TODO
-        String greetings = service.getGreetings("Luciano");
-        System.out.println(">>>" + greetings);
-    }
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            domain = SCADomain.newInstance("helloworld.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        service = domain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-}
diff --git a/java/sca-contrib/itest/policy/pom.xml b/java/sca-contrib/itest/policy/pom.xml
deleted file mode 100644
index 67e956abca..0000000000
--- a/java/sca-contrib/itest/policy/pom.xml
+++ /dev/null
@@ -1,68 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-policy</artifactId>
-    <name>Apache Tuscany SCA Policy Framework Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>            
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>   
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-        </dependency>
-
-
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/AddService.java b/java/sca-contrib/itest/policy/src/main/java/calculator/AddService.java
deleted file mode 100644
index 198a38b657..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,34 +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 calculator;
-
-import org.oasisopen.sca.annotation.Remotable;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * The Add service interface
- */
-@Remotable
-@Service
-//@Requires(PolicyQNames.TEST_INTENT_FIVE)
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/itest/policy/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorClient.java b/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 9abc488523..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,69 +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 calculator;
-
-import javax.security.auth.login.Configuration;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
-    public static void main(String[] args) throws Exception {
-        try {
-            Configuration secConf = Configuration.getConfiguration();
-        } catch ( java.lang.SecurityException e ) {
-            if ( e.getMessage().equals("Unable to locate a login configuration") ) {
-                System.setProperty("java.security.auth.login.config", "target/classes/CalculatorJass.config");
-            } else {
-                throw e;
-            }
-        }
-
-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
-        
-        CalculatorService calculatorService = 
-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-
-        // Calculate
-        System.out.println("Calling CalculatorServiceComponent configured with 'logging' " +
-                "policy for subtract and divide operations...");
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-        
-        calculatorService = 
-            scaDomain.getService(CalculatorService.class, "AnotherCalculatorServiceComponent");
-
-        // Calculate
-        System.out.println("Calling CalculatorServiceComponent configured with 'logging' " +
-                "for all operations in the implementation...");
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index a1880698ea..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-/**
- * The Calculator service interface.
- */
-
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index e1726250de..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorServiceImpl.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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Requires;
-
-
-/**
- * An implementation of the Calculator service.
- */
-@Requires(PolicyQNames.TEST_INTENT_ONE)
-public class CalculatorServiceImpl implements CalculatorService, PolicyQNames {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    //@Requires({TEST_INTENT_TWO, TEST_INTENT_THREE})
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    @Requires(TEST_INTENT_TWO)
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    @Requires(PolicyQNames.QUALIFIED_TEST_INTENT_ONE)
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    //@Requires(QUALIFIED_TEST_INTENT_FOUR)
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/DivideService.java b/java/sca-contrib/itest/policy/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 8f4c675370..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,33 +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 calculator;
-
-import org.oasisopen.sca.annotation.Remotable;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * The divide service interface
- */
-@Remotable
-@Service
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/itest/policy/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/itest/policy/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/PolicyQNames.java b/java/sca-contrib/itest/policy/src/main/java/calculator/PolicyQNames.java
deleted file mode 100644
index 3e1bc45842..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/PolicyQNames.java
+++ /dev/null
@@ -1,43 +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 calculator;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface PolicyQNames {
-    public static final String QUALIFIER = ".";
-    
-    public static final String POLICY_ITEST_PREFIX="{http://itest/policy}";
-    public static final String TEST_INTENT_ONE = POLICY_ITEST_PREFIX + "TestIntent_1";
-    public static final String TEST_INTENT_TWO = POLICY_ITEST_PREFIX + "TestIntent_2";
-    public static final String TEST_INTENT_THREE = POLICY_ITEST_PREFIX + "TestIntent_3";
-    public static final String TEST_INTENT_FOUR = POLICY_ITEST_PREFIX + "TestIntent_4";
-    public static final String TEST_INTENT_FIVE = POLICY_ITEST_PREFIX + "TestIntent_5";
-    
-    public static final String QUALIFIER_ONE = "Qualifier_1";
-    
-    public static final String QUALIFIED_TEST_INTENT_FOUR = 
-        TEST_INTENT_FOUR + QUALIFIER + QUALIFIER_ONE;
-    
-    public static final String QUALIFIED_TEST_INTENT_ONE = 
-        TEST_INTENT_ONE + QUALIFIER + QUALIFIER_ONE;
-    
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/SubtractService.java b/java/sca-contrib/itest/policy/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java b/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
deleted file mode 100644
index 4b04a4d0b8..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.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 calculator.policy;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.junit.Assert;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestImplPolicyHandler implements PolicyHandler {
-    private PolicySet applicablePolicySet = null;
-
-    public void afterInvoke(Object... arg0) {
-    }
-
-    public void beforeInvoke(Object... context) {
-        for ( Object contextObj : context) {
-            if ( contextObj instanceof Operation ) {
-                Operation op = (Operation)contextObj;
-                //System.out.println(" *TestImplPolicyHandler* " + op.getName() + " ** " + applicablePolicySet);
-                if ( op.getName().equals("add") ) {
-                    boolean match = applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_1_implementation") ||
-                        applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_2_implementation") ||
-                        applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_1_Qualified_implementation") ||
-                        applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_3_implementation") ;
-                    Assert.assertTrue(match); 
-                } else if ( op.getName().equals("subtract") ) {
-                    boolean match = applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_1_Qualified_implementation") ||
-                    applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_1_implementation");
-                    Assert.assertTrue(match); 
-                } else if ( op.getName().equals("divide")) {
-                    Assert.assertEquals(applicablePolicySet.getName().getLocalPart(), 
-                                        "TestPolicySet_1_implementation");
-                } else if ( op.getName().equals("multiply") ) {
-                    boolean match = applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_5_implementation") ||
-                    applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_1_implementation");
-                    Assert.assertTrue(match);
-                }    
-                else {
-                    Assert.fail();
-                }
-                //System.out.println(" *TestImplPolicyHandler* " + op.getName() + " ** " + applicablePolicySet);
-            } else if ( contextObj instanceof Message ) {
-                Message msg = (Message)contextObj;
-                System.out.println(" *TestImplPolicyHandler* " + msg.getOperation().getName() + " ** " + applicablePolicySet);
-            }
-        }
-    }
-
-    public void cleanUp(Object... arg0) {
-    }
-
-    public PolicySet getApplicablePolicySet() {
-        return applicablePolicySet;
-    }
-
-    public void setApplicablePolicySet(PolicySet arg0) {
-        this.applicablePolicySet = arg0;
-    }
-
-    public void setUp(Object... arg0) {
-    }
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java b/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
deleted file mode 100644
index 3dcadd724e..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
+++ /dev/null
@@ -1,61 +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 calculator.policy;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestRefPolicyHandler implements PolicyHandler {
-    private PolicySet applicablePolicySet = null;
-
-    public void afterInvoke(Object... arg0) {
-    }
-
-    public void beforeInvoke(Object... context) {
-        for ( Object contextObj : context) {
-            if ( contextObj instanceof Operation ) {
-                Operation op = (Operation)contextObj;
-                System.out.println(" *TestReflPolicyHandler* " + op.getName() + " ** " + applicablePolicySet);
-            } else if ( contextObj instanceof Message ) {
-                Message msg = (Message)contextObj;
-                System.out.println(" *TestRefPolicyHandler* " + msg.getOperation().getName() + " ** " + applicablePolicySet);
-            }
-        }
-    }
-
-    public void cleanUp(Object... arg0) {
-    }
-
-    public PolicySet getApplicablePolicySet() {
-        return applicablePolicySet;
-    }
-
-    public void setApplicablePolicySet(PolicySet arg0) {
-        this.applicablePolicySet = arg0;
-    }
-
-    public void setUp(Object... arg0) {
-    }
-}
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java b/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
deleted file mode 100644
index 3d314a9d14..0000000000
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
+++ /dev/null
@@ -1,61 +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 calculator.policy;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestSvcPolicyHandler implements PolicyHandler {
-    private PolicySet applicablePolicySet = null;
-
-    public void afterInvoke(Object... arg0) {
-    }
-
-    public void beforeInvoke(Object... context) {
-        for ( Object contextObj : context) {
-            if ( contextObj instanceof Operation ) {
-                Operation op = (Operation)contextObj;
-                System.out.println(" *TestSvcPolicyHandler* " + op.getName() + " ** " + applicablePolicySet);
-            } else if ( contextObj instanceof Message ) {
-                Message msg = (Message)contextObj;
-                System.out.println(" *TestSvcPolicyHandler* " + msg.getOperation().getName() + " ** " + applicablePolicySet);
-            }
-        }
-    }
-
-    public void cleanUp(Object... arg0) {
-    }
-
-    public PolicySet getApplicablePolicySet() {
-        return applicablePolicySet;
-    }
-
-    public void setApplicablePolicySet(PolicySet arg0) {
-        this.applicablePolicySet = arg0;
-    }
-
-    public void setUp(Object... arg0) {
-    }
-}
diff --git a/java/sca-contrib/itest/policy/src/main/resources/Calculator.composite b/java/sca-contrib/itest/policy/src/main/resources/Calculator.composite
deleted file mode 100644
index aed7684099..0000000000
--- a/java/sca-contrib/itest/policy/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,66 +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:sca="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://itest/policy" xmlns:sample="http://itest/policy" name="Calculator"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:ip="http://itest/policy">
-
-    <component name="CalculatorServiceComponent">
-        <implementation.java class="calculator.CalculatorServiceImpl"></implementation.java>
-        <!-- reference name="addService" target="AddServiceComponent" /-->
-        <reference name="addService">
-            <interface.java interface="calculator.AddService" />
-            <binding.ws uri="http://localhost:8085/AddServiceComponentWS" />
-        </reference>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl" requires="ip:TestIntent_3" />
-        <service name="AddService">
-            <interface.java interface="calculator.AddService" />
-            <binding.ws uri="http://localhost:8085/AddServiceComponentWS" />
-            <binding.sca/>
-        </service>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl" />
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl" />
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl" />
-    </component>
-
-    <component name="AnotherCalculatorServiceComponent">
-        <implementation.java class="calculator.CalculatorServiceImpl" />
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index a20489035b..0000000000
--- a/java/sca-contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.itest.TestPolicyProcessor;qname=http://schemas.xmlsoap.org/ws/2004/09/policy#Policy,model=org.apache.tuscany.sca.itest.Policy
diff --git a/java/sca-contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/java/sca-contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
deleted file mode 100644
index d9f144b3ff..0000000000
--- a/java/sca-contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ /dev/null
@@ -1,28 +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.

-# 

-# PolicyHandlerClasses to interpret specific PolicyModels against specific QoS infrastructures

-# handler classname;qname=<policy intent addressed>;model=<policy model class>

-calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_1,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java

-calculator.policy.TestRefPolicyHandler;intent=http://itest/policy#TestIntent_1,model=org.apache.neethi.Policy,appliesTo=sca:reference

-calculator.policy.TestSvcPolicyHandler;intent=http://itest/policy#TestIntent_1,model=org.apache.neethi.Policy,appliesTo=sca:service

-calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_1.Qualifier_1,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java

-calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_2,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java

-calculator.policy.TestRefPolicyHandler;intent=http://itest/policy#TestIntent_2,model=org.apache.neethi.Policy,appliesTo=sca:reference

-calculator.policy.TestSvcPolicyHandler;intent=http://itest/policy#TestIntent_2,model=org.apache.neethi.Policy,appliesTo=sca:service

-calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_3,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java

-calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_5,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java
\ No newline at end of file
diff --git a/java/sca-contrib/itest/policy/src/main/resources/definitions.xml b/java/sca-contrib/itest/policy/src/main/resources/definitions.xml
deleted file mode 100644
index 0009d712f3..0000000000
--- a/java/sca-contrib/itest/policy/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://itest/policy"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:calc="http://calculator"
-    xmlns:ip="http://itest/policy" >
-
-    <!-- Policy Intents -->
-    <sca:intent name="TestIntent_1" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent One</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_2" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent Two</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_3" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent Three</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_4" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent Four</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_5" constrains="sca:implementation.java sca:binding.ws">
-        <description>Test Intent Five</description>
-    </sca:intent>
-
-    <sca:intent name="TestIntent_1.Qualifier_1" />
-    <sca:intent name="TestIntent_4.Qualifier_1" />
-
-    <!-- PolicySets -->
-    <sca:policySet name="TestPolicySet_1_implementation" provides="ip:TestIntent_1"
-        appliesTo="sca:implementation.java" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="ip:TestIntent_1" default="Qualifier_1">
-            <qualifier name="Qualifier_1">
-                <wsp:Policy />
-            </qualifier>
-        </intentMap>
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_1_Qualified_implementation" provides="ip:TestIntent_1.Qualifier_1"
-        appliesTo="sca:implementation.java" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_1_reference" provides="ip:TestIntent_1" appliesTo="sca:reference"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_1_service" provides="ip:TestIntent_1" appliesTo="sca:service"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:intent name="TestIntent_4.Qualifier_1" />
-
-    <sca:policySet name="TestPolicySet_2_implementation" provides="ip:TestIntent_2"
-        appliesTo="sca:implementation.java" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_2_reference" provides="ip:TestIntent_2" appliesTo="sca:reference"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_2_service" provides="ip:TestIntent_2" appliesTo="sca:service"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-
-    <sca:policySet name="TestPolicySet_3_implementation" provides="ip:TestIntent_3"
-        appliesTo="sca:implementation.java" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-    
-    <sca:policySet name="TestPolicySet_3_reference" provides="ip:TestIntent_3" appliesTo="sca:reference"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_3_service" provides="ip:TestIntent_3" appliesTo="sca:service"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_4_implementation" provides="ip:TestIntent_4"
-        appliesTo="sca:implementation.java" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_4_service" provides="ip:TestIntent_4" appliesTo="sca:service"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_4_reference" provides="ip:TestIntent_4" appliesTo="sca:reference"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_5_implementation" provides="" appliesTo="sca:implementation.java"
-        tuscany:alwaysAppliesTo="sca:component[@name='MultiplyServiceComponent']"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_5_service" provides="ip:TestIntent_5" appliesTo="sca:service"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_5_reference" provides="ip:TestIntent_5" appliesTo="sca:reference"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-    <sca:policySet name="TestPolicySet_4_qualified_1_implementation" provides="ip:TestIntent_4"
-        appliesTo="sca:implementation.java" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="ip:TestIntent_4" default="Qualifier_1">
-            <qualifier name="Qualifier_1">
-                <wsp:Policy />
-            </qualifier>
-        </intentMap>
-    </sca:policySet>
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java b/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
deleted file mode 100644
index 885e8314ef..0000000000
--- a/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.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 org.apache.tuscany.sca.itest;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import calculator.CalculatorService;
-
-public class PoliciedCalculatorTestCase {
-    private static SCADomain domain;
-    private static CalculatorService calculatorService;
-
-    @Test
-    public void testPolicies() {
-        calculatorService.add(10, 10);
-        calculatorService.multiply(10, 10);
-        calculatorService.divide(10, 10);
-        calculatorService.subtract(10, 10);
-    }
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            domain = SCADomain.newInstance("Calculator.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        calculatorService = domain.getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-}
diff --git a/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java b/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
deleted file mode 100644
index ba17755b88..0000000000
--- a/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
+++ /dev/null
@@ -1,33 +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.itest;
-
-import javax.xml.namespace.QName;
-
-/**
- * Interface that will abstract various types of policy specifications
- * and attachments for example WS-Policy
- *
- * @version $Rev$ $Date$
- */
-public interface Policy {
-    QName getSchemaName();
-    void setUnresolved(boolean unresolved);
-    boolean isUnresolved();
-}
diff --git a/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java b/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
deleted file mode 100644
index 3aa6565c01..0000000000
--- a/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
+++ /dev/null
@@ -1,82 +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.itest;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.Policy;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- * A PolicyProcessor used for testing.
- *
- * @version $Rev$ $Date$
- */
-public class TestPolicyProcessor implements StAXArtifactProcessor<Policy> {
-    
-    public TestPolicyProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        
-    }
-
-    public QName getArtifactType() {
-        return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "Policy");
-    }
-
-    public Policy read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException {
-        return new MockPolicyImplOne();
-    }
-
-    public void write(Policy arg0, XMLStreamWriter arg1) throws ContributionWriteException,
-                                                        XMLStreamException {
-    }
-
-    public Class<Policy> getModelType() {
-        // TODO Auto-generated method stub
-        return Policy.class;
-    }
-
-    public void resolve(Policy arg0, ModelResolver arg1) throws ContributionResolveException {
-
-    }
-
-    
-    public class MockPolicyImplOne implements Policy {
-        public QName getSchemaName() {
-            return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "Policy");
-        }
-
-        public boolean isUnresolved() {
-            return false;
-        }
-
-        public void setUnresolved(boolean unresolved) {
-        }
-        
-    }
-}
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/pom.xml b/java/sca-contrib/itest/promotion-interface-missmatch/pom.xml
deleted file mode 100644
index 485bf2fdfa..0000000000
--- a/java/sca-contrib/itest/promotion-interface-missmatch/pom.xml
+++ /dev/null
@@ -1,59 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-promotion-interface-missmatch</artifactId>
-    <name>Apache Tuscany Test for Missmatched Interfaces During Promotion</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java b/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
deleted file mode 100644
index 764f31b7cd..0000000000
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
+++ /dev/null
@@ -1,43 +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 com.example;
-
-public class BusinessException extends Exception {
-
-    private String clientName;
-
-    public BusinessException(String message) {
-        super(message);
-    }
-
-    public BusinessException(String message, String clientName) {
-        super(message);
-        this.clientName = clientName;
-    }
-
-    public String getClientName() {
-        return clientName;
-    }
-
-    public void setClientName(String clientName) {
-        this.clientName = clientName;
-    }
-
-}
-
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java b/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
deleted file mode 100644
index 0c72b52ed9..0000000000
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
+++ /dev/null
@@ -1,23 +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 com.example;
-
-public interface ExampleClient {
-    void runTest();
-}
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java b/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
deleted file mode 100644
index 5e80b7bdde..0000000000
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.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 com.example;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(ExampleClient.class)
-@Scope("COMPOSITE")
-public class ExampleClientImpl implements ExampleClient {
-
-    private ExampleService myService;
-
-    @Reference
-    public void setMyService(ExampleService myService) {
-        this.myService = myService;
-    }
-
-    public void runTest() {
-        try {
-            Object result = myService.hello("John");
-            System.out.println("myService returned " + result.getClass().getName());
-        } catch (BusinessException e) {
-            System.out.println("caught exception from hello(): " + e.getMessage() + " for " + e.getClientName());
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java b/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
deleted file mode 100644
index 1e887995dd..0000000000
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
+++ /dev/null
@@ -1,27 +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 com.example;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface ExampleService {
-
-	String hello(String name) throws BusinessException;
-}
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java b/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
deleted file mode 100644
index b3b6f033e5..0000000000
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
+++ /dev/null
@@ -1,26 +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 com.example;
-
-public class ExampleServiceImpl implements ExampleService {
-    public String hello(String name) throws BusinessException {
-        throw new BusinessException("bad news", name);
-        // return "Hello, " + name;
-    }
-}
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/example.composite b/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/example.composite
deleted file mode 100644
index cddf951d65..0000000000
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/example.composite
+++ /dev/null
@@ -1,50 +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="/model/common/"
-           xmlns:hw="/model/common/"
-           name="example">
-
-    <component name="ExampleClientComponent">
-        <implementation.java class="com.example.ExampleClientImpl" />
-        <reference name="myService" />
-    </component>
-    
-    <reference name="myService"
-         promote="ExampleClientComponent/myService">
-        <!--
-         The following interface definition violates the SCA specification because it
-         uses has a different namespace ("/model/common/") than the namespace of the
-         implicit interface.java on the promoted coponent service ("http://example.com").
-         The runtime should report an error for this mismatch.
-        -->
-        <interface.wsdl interface="/model/common/#wsdl.interface(ExampleServicePortType)" />
-        <binding.ws uri="http://localhost:8085/axis2/services/ExampleService" />
-    </reference>
-
-    <component name="ExampleComponent">
-        <implementation.java class="com.example.ExampleServiceImpl"/>
-        <service name="ExampleService">
-            <interface.wsdl interface="/model/common/#wsdl.interface(ExampleServicePortType)" />
-            <binding.ws wsdlElement="/model/common/#wsdl.binding(ExampleServiceSOAP11Binding)"
-			            uri="http://localhost:8085/axis2/services/ExampleService" />
-        </service>  
-    </component>
-</composite>
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl b/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
deleted file mode 100644
index a8ccde2e11..0000000000
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
+++ /dev/null
@@ -1,133 +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.    
--->
-<!--definitions
-     name="EmpFlexFieldService"
-     targetNamespace="/model/common/"
-     xmlns="http://schemas.xmlsoap.org/wsdl/"
-     xmlns:tns="/model/common/"
-     xmlns:errors="http://xmlns.oracle.com/adf/svc/errors/"
-     xmlns:types="/model/common/types/"
-     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    -->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-				  xmlns:ns0="http://example.com"
-				  xmlns:ns2="/model/common/types/"
-				  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-				  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-				  xmlns:ns1="http://example.com/xsd"
-				  xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-				  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-				  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-				  targetNamespace="/model/common/"
-				  xmlns:tns="/model/common/">
-    <wsdl:types>
-        <xs:schema>
-            <import namespace="/model/common/types/" schemaLocation="ExampleServiceTypes.xsd"/>
-        </xs:schema>
-        <xs:schema xmlns:ns="http://example.com" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://example.com">
-            <xs:element name="BusinessException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="BusinessException" nillable="true" type="ns1:BusinessException"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:schema>
-        <xs:schema xmlns:ax21="http://example.com/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://example.com/xsd">
-            <xs:complexType name="BusinessException">
-                <xs:complexContent>
-                    <xs:extension base="tns:Exception">
-                        <xs:sequence/>
-                    </xs:extension>
-                </xs:complexContent>
-            </xs:complexType>
-        </xs:schema>
-    </wsdl:types>
-    <wsdl:message name="helloRequest">
-        <wsdl:part name="parameters" element="ns2:hello"/>
-    </wsdl:message>
-    <wsdl:message name="helloResponse">
-        <wsdl:part name="parameters" element="ns2:helloResponse"/>
-    </wsdl:message>
-    <wsdl:message name="BusinessException">
-        <wsdl:part name="parameters" element="ns0:BusinessException"/>
-    </wsdl:message>
-    <wsdl:portType name="ExampleServicePortType">
-        <wsdl:operation name="hello">
-            <wsdl:input message="tns:helloRequest" wsaw:Action="urn:hello"/>
-            <wsdl:output message="tns:helloResponse" wsaw:Action="urn:helloResponse"/>
-            <wsdl:fault message="tns:BusinessException" name="BusinessException" wsaw:Action="urn:helloBusinessException"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="ExampleServiceSOAP11Binding" type="tns:ExampleServicePortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-        <wsdl:operation name="hello">
-            <soap:operation soapAction="urn:hello" style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="BusinessException">
-                <soap:fault use="literal" name="BusinessException"/>
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="ExampleServiceSOAP12Binding" type="tns:ExampleServicePortType">
-        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-        <wsdl:operation name="hello">
-            <soap12:operation soapAction="urn:hello" style="document"/>
-            <wsdl:input>
-                <soap12:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="BusinessException">
-                <soap12:fault use="literal" name="BusinessException"/>
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="ExampleServiceHttpBinding" type="tns:ExampleServicePortType">
-        <http:binding verb="POST"/>
-        <wsdl:operation name="hello">
-            <http:operation location="ExampleService/hello"/>
-            <wsdl:input>
-                <mime:content type="text/xml" part="hello"/>
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="hello"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="ExampleService">
-        <wsdl:port name="ExampleServiceSOAP11port_http" binding="tns:ExampleServiceSOAP11Binding">
-            <soap:address location="http://localhost:8085/axis2/services/ExampleService"/>
-        </wsdl:port>
-        <wsdl:port name="ExampleServiceSOAP12port_http" binding="tns:ExampleServiceSOAP12Binding">
-            <soap12:address location="http://localhost:8085/axis2/services/ExampleService"/>
-        </wsdl:port>
-        <wsdl:port name="ExampleServiceHttpport" binding="tns:ExampleServiceHttpBinding">
-            <http:address location="http://localhost:8085/axis2/services/ExampleService"/>
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd b/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
deleted file mode 100644
index 2caec0f20d..0000000000
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
+++ /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.    
--->
-
-        <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-		           xmlns:ns="/model/common/"
-				   attributeFormDefault="qualified"
-				   elementFormDefault="qualified"
-                   xmlns:tns="/model/common/types/"
-				   targetNamespace="/model/common/types/">
-            <xs:complexType name="Exception">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="Exception" nillable="true" type="xs:anyType"/>
-                </xs:sequence>
-            </xs:complexType>
-            <xs:element name="hello">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="param0" nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="helloResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:schema>
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java b/java/sca-contrib/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
deleted file mode 100644
index 740af4f43d..0000000000
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.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 com.example;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class ExampleTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private ExampleClient client;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("example.composite");
-        client = scaDomain.getService(ExampleClient.class, "ExampleClientComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-        client.runTest();
-    }
-}
diff --git a/java/sca-contrib/itest/recursive-ws/pom.xml b/java/sca-contrib/itest/recursive-ws/pom.xml
deleted file mode 100644
index 4ff655e6b1..0000000000
--- a/java/sca-contrib/itest/recursive-ws/pom.xml
+++ /dev/null
@@ -1,87 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-recursive-ws</artifactId>
-    <name>Apache Tuscany SCA Recursive WS Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-
-    </dependencies>
-
-    <!-- Declare tuscany-host-jetty dependency in the default profile so that it can be replaced -->
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.tuscany.sca</groupId>
-                    <artifactId>tuscany-host-jetty</artifactId>
-                    <version>2.0-SNAPSHOT</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/policy/Target.java b/java/sca-contrib/itest/recursive-ws/src/main/java/policy/Target.java
deleted file mode 100644
index 2366f6542a..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/policy/Target.java
+++ /dev/null
@@ -1,26 +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 policy;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Target {
-    String hello(String arg);
-}
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/java/sca-contrib/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
deleted file mode 100644
index b2d59e925c..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
+++ /dev/null
@@ -1,33 +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 policy;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(Target.class)
-public class TargetClientImpl implements Target {
-
-    @Reference
-    protected Target targetService;
-
-    public String hello(String arg) {
-        return "Target: Hello " + targetService.hello(arg) + "!";
-    }
-}
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/java/sca-contrib/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
deleted file mode 100644
index 6f52dfb26e..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
+++ /dev/null
@@ -1,29 +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 policy;
-
-import org.oasisopen.sca.annotation.Service;
-
-@Service(Target.class)
-public class TargetServiceImpl implements Target {
-
-    public String hello(String arg) {
-        return "Target: Hello " + arg + "!";
-    }
-}
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/Composer.java b/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/Composer.java
deleted file mode 100644
index 18486115ae..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/Composer.java
+++ /dev/null
@@ -1,26 +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 recursive;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Composer {
-    public String Compose(String s);
-}
\ No newline at end of file
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
deleted file mode 100644
index 7956d153cb..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
+++ /dev/null
@@ -1,35 +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 recursive;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- *  For testing purpose
- */
-public class ComposerClient {
-
-    public final static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("Client.composite");
-        Composer composer = scaDomain.getService(Composer.class, "ClientComponent/Composer");
-        System.out.println(composer.Compose("ABC"));
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
deleted file mode 100644
index 3c432bc26a..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
+++ /dev/null
@@ -1,38 +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 recursive;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComposerClientImpl implements Composer {
-    @Reference
-    protected Composer composerWS;
-    
-    /**
-     * @see recursive.Composer#Compose(java.lang.String)
-     */
-    public String Compose(String s) {
-        return composerWS.Compose(s);
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
deleted file mode 100644
index 8b77484922..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
+++ /dev/null
@@ -1,34 +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 recursive;
-
-/**
- * Composer Component Implementation
- * 
- */
-
-public class ComposerImpl implements Composer {
-
-    public String Compose(String s) {
-        System.out.println("Composing " + s + "...");
-        return "Composed: " + s;
-
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
deleted file mode 100644
index 5035d1cbd9..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
+++ /dev/null
@@ -1,35 +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 recursive;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- *  For testing purpose
- */
-public class ComposerServer {
-
-    public final static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("Outer.composite");
-        System.out.println("Press Enter to exit...");
-        System.in.read();
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/Client.composite b/java/sca-contrib/itest/recursive-ws/src/main/resources/Client.composite
deleted file mode 100644
index 56d7c01377..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/Client.composite
+++ /dev/null
@@ -1,28 +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://client" name="Client">

-    <component name="ClientComponent">

-        <implementation.java class="recursive.ComposerClientImpl" />

-        <reference name="composerWS">

-            <binding.ws uri="http://localhost:8085/OuterService"/>

-        </reference>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/Inner.composite b/java/sca-contrib/itest/recursive-ws/src/main/resources/Inner.composite
deleted file mode 100644
index b054ae0944..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/Inner.composite
+++ /dev/null
@@ -1,26 +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://inner" name="Inner">

-    <component name="InnerComponent">

-        <implementation.java class="recursive.ComposerImpl" />

-    </component>

-    <service name="OuterService" promote="InnerComponent"/>

-</composite>

diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/Outer.composite b/java/sca-contrib/itest/recursive-ws/src/main/resources/Outer.composite
deleted file mode 100644
index 3c3f327b28..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/Outer.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" targetNamespace="http://outer" xmlns:inner="http://inner"

-    name="Outer">

-    <component name="OuterComponent">

-        <implementation.composite name="inner:Inner" />

-        <service name="OuterService">

-            <interface.java interface="recursive.Composer" />

-            <binding.ws uri="http://localhost:8085/OuterService" />

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/java/sca-contrib/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
deleted file mode 100644
index b5c180919c..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
+++ /dev/null
@@ -1,36 +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://bindingoverride"
-    xmlns:bindingoverride="http://bindingoverride"
-    name="BindingOverrideInnerComposite">
-
-   	<service name="InnerService" promote="InnerServiceComponent"> 
-            <interface.java interface="policy.Target"/>
-    </service>
-	
-    <component name="InnerServiceComponent">
-		<implementation.java class="policy.TargetServiceImpl"/> 
-        <service name="Target">
-            <interface.java interface="policy.Target"/>
-        </service>		
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/java/sca-contrib/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
deleted file mode 100644
index 891cac0b79..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
+++ /dev/null
@@ -1,40 +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://bindingoverride"
-    xmlns:bindingoverride="http://bindingoverride"
-    name="BindingOverrideOuterComposite">
-    
-    <component name="OuterClientComponent">
-        <implementation.java class="policy.TargetClientImpl"/>
-        <reference name="targetService" target="OuterServiceComponent">
-            <binding.ws/>
-        </reference>
-    </component>
-    
-    <component name="OuterServiceComponent">
-        <implementation.composite name="bindingoverride:BindingOverrideInnerComposite"/>
-        <service name="InnerService">
-            <interface.java interface="policy.Target"/>
-            <binding.ws uri="http://localhost:8085/OuterTargetServiceComponent"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
deleted file mode 100644
index 4b398743eb..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
+++ /dev/null
@@ -1,37 +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://policy"

-    xmlns:policy="http://policy"

-    name="PolicyInnerComposite">

-

-   	<service name="TargetService" promote="TargetServiceComponent"> 

-            <interface.java interface="policy.Target"/>

-    </service>

-	

-    <component name="TargetServiceComponent">

-		<implementation.java class="policy.TargetServiceImpl"/> 

-        <service name="Target">

-            <interface.java interface="policy.Target"/>

-            <binding.ws uri="http://localhost:8085/TargetServiceComponent"/>

-        </service>		

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
deleted file mode 100644
index b50bc29a1f..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
+++ /dev/null
@@ -1,41 +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://policy"
-    xmlns:policy="http://policy"
-    name="PolicyOuterComposite"
-    requires="policy:TestIntent_1">
-    
-    <component name="TargetClientComponent">
-        <implementation.java class="policy.TargetClientImpl"/>
-        <reference name="targetService" target="OuterTargetServiceComponent">
-            <binding.ws/>
-        </reference>
-    </component>
-    
-    <component name="OuterTargetServiceComponent">
-        <implementation.composite name="policy:PolicyInnerComposite"/>
-        <service name="TargetService">
-            <interface.java interface="policy.Target"/>
-            <binding.ws uri="http://localhost:8085/OuterTargetServiceComponent"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/definitions.xml b/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/definitions.xml
deleted file mode 100644
index 3ae202f4aa..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/definitions.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://policy"
-             xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:ip="http://policy" >
-
-    <!-- Policy Intents -->
-    <sca:intent name="TestIntent_1" constrains="sca:binding.ws">
-        <description>Test Intent One</description>
-    </sca:intent>
-
-    <!--  Policy Sets -->
-    <sca:policySet name="TestPolicySet_1_binding" 
-                   provides="ip:TestIntent_1" 
-                   appliesTo="sca:binding.ws"
-                   xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/java/sca-contrib/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
deleted file mode 100644
index c6e46564f0..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
+++ /dev/null
@@ -1,57 +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 bindingoverride;
-
-import junit.framework.Assert;
-
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import policy.Target;
-
-public class BindingOverrideTestCase{
-
-    private SCADomain domain;
-    private Target targetClient;
-
-    @Before
-    public void setUp() throws Exception {
-        try {
-            domain = SCADomain.newInstance("bindingoverride/OuterComposite.composite");
-            targetClient = domain.getService(Target.class, "OuterClientComponent");
-        } catch(Exception ex) {
-            System.out.println(ex.toString());
-        }
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    //@Ignore("TUSCANY-2352")
-    public void test() throws Exception {
-        Assert.assertEquals("Target: Hello Target: Hello Fred!!", targetClient.hello("Fred"));
-    }
-}
diff --git a/java/sca-contrib/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/java/sca-contrib/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
deleted file mode 100644
index 7ff34c9787..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
+++ /dev/null
@@ -1,74 +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 policy;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.impl.CompositeImpl;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.oasisopen.sca.annotation.EndsConversation;
-
-public class PolicyTestCase{
-
-    private SCADomain domain;
-    private Target targetClient;
-
-    @Before
-    public void setUp() throws Exception {
-        try {
-            domain = SCADomain.newInstance("policy/PolicyOuterComposite.composite");
-            targetClient = domain.getService(Target.class, "TargetClientComponent");
-        } catch(Exception ex) {
-            System.out.println(ex.toString());
-        }
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void test() throws Exception {
-    	//Check that the binding policy sets do flow down to the component but not down to the
-    	//component inside implementation.composite
-    	Component outerComponent = ((DefaultSCADomain)domain).getComponent("OuterTargetServiceComponent");
-    	
-    	// The outer component service bindings should have policy sets attached
-    	Assert.assertEquals(1, ((PolicySetAttachPoint)outerComponent.getServices().get(0).getBindings().get(0)).getPolicySets().size());
-    	
-    	Component component =((CompositeImpl)outerComponent.getImplementation()).getComponents().get(0);
-    	
-    	// The original inner component service binding should not have policy sets attached
-    	Assert.assertEquals(0, ((PolicySetAttachPoint)component.getServices().get(0).getBindings().get(0)).getPolicySets().size());
-        
-        // The promoted inner component service binding should have policy sets attached
-    	Assert.assertEquals(1, ((PolicySetAttachPoint)component.getServices().get(1).getBindings().get(0)).getPolicySets().size());
-    	
-        String result = targetClient.hello("Fred");
-
-        System.out.println(result);
-    }
-}
diff --git a/java/sca-contrib/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/java/sca-contrib/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
deleted file mode 100644
index 6638d65551..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.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 recursive;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import recursive.Composer;
-
-/**
- * Test case for helloworld web service client 
- */
-public class ComposerClientTestCase {
-
-    private Composer composer;
-    private SCADomain scaDomain;
-    
-    private SCATestCaseRunner server;
-
-    @Before
-    public void startClient() throws Exception {
-        try {
-            scaDomain = SCADomain.newInstance("Client.composite");
-            composer = scaDomain.getService(Composer.class, "ClientComponent/Composer");
-    
-            server =  new SCATestCaseRunner(ComposerTestServer.class);
-            server.before();
-
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Test
-    public void testWSClient() throws Exception {
-        String msg = composer.Compose("ABC");
-        Assert.assertEquals("Composed: ABC", msg);
-    }
-    
-    @After
-    public void stopClient() throws Exception {
-    	server.after();
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/java/sca-contrib/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
deleted file mode 100644
index 214379bcea..0000000000
--- a/java/sca-contrib/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.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 recursive;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Starts up the SCA runtime which starts listening for service requests
- */
-public class ComposerTestServer {
-
-    private SCADomain scaDomain;
-
-    @Before
-    public void startServer() throws Exception {
-        try {
-            scaDomain = SCADomain.newInstance("Outer.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void testPing() throws IOException {
-        new Socket("127.0.0.1", 8085);
-    }
-
-    @After
-    public void stopServer() throws Exception {
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive/pom.xml b/java/sca-contrib/itest/recursive/pom.xml
deleted file mode 100644
index 5bfd74f49d..0000000000
--- a/java/sca-contrib/itest/recursive/pom.xml
+++ /dev/null
@@ -1,45 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-recursive</artifactId>
-    <name>Apache Tuscany SCA Recursive Composition Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/recursive/src/main/java/circular/include/DemoClass.java b/java/sca-contrib/itest/recursive/src/main/java/circular/include/DemoClass.java
deleted file mode 100644
index fe42911486..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/circular/include/DemoClass.java
+++ /dev/null
@@ -1,27 +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 circular.include;
-
-public class DemoClass {
-
-    public String demo() {
-        return "hello";
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/composite/CompositeClient.java b/java/sca-contrib/itest/recursive/src/main/java/composite/CompositeClient.java
deleted file mode 100644
index 5edc305970..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/composite/CompositeClient.java
+++ /dev/null
@@ -1,42 +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 composite;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Simple client program that invokes the components that we wired together.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeClient {
-
-    public static void main(String[] args) throws Exception {
-    	SCADomain domain = SCADomain.newInstance("OuterComposite.composite");
-    	
-        Source source = domain.getService(Source.class, "SourceComponent");
-        
-        System.out.println("Main thread " + Thread.currentThread());
-        source.clientMethod("Client.main");
-        Thread.sleep(500);
-        
-        domain.close();
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/composite/Source.java b/java/sca-contrib/itest/recursive/src/main/java/composite/Source.java
deleted file mode 100644
index d0efcc1df1..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/composite/Source.java
+++ /dev/null
@@ -1,24 +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 composite;
-
-public interface Source {
-
-    void clientMethod(String arg);
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/composite/SourceCallback.java b/java/sca-contrib/itest/recursive/src/main/java/composite/SourceCallback.java
deleted file mode 100644
index baa95a8e39..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/composite/SourceCallback.java
+++ /dev/null
@@ -1,24 +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 composite;
-
-public interface SourceCallback {
-
-    void receiveResult(String result);
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/composite/SourceImpl.java b/java/sca-contrib/itest/recursive/src/main/java/composite/SourceImpl.java
deleted file mode 100644
index 8e2b347604..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/composite/SourceImpl.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 composite;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-
-@Service(Source.class)
-@Scope("COMPOSITE")
-public class SourceImpl implements Source, SourceCallback {
-
-    private Target targetReference;
-    private Target targetReference2;
-
-    @Reference
-    public void setTargetReference(Target target) {
-        this.targetReference = target;
-    }
-
-    @Reference
-    public void setTargetReference2(Target target) {
-        this.targetReference2 = target;
-    }
-
-    public void clientMethod(String arg) {
-        System.out.println("Source: " + arg + " -> Source.clientMethod");
-        targetReference.someMethod(arg + " -> Source.clientMethod");
-
-        System.out.println("Source: " + arg + " => Source.clientMethod2");
-        targetReference2.someMethod(arg + " => Source.clientMethod2");
-    }
-
-    public void receiveResult(String result) {
-        System.out.println("Work thread " + Thread.currentThread());
-        System.out.println("Result: " + result);
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/composite/Target.java b/java/sca-contrib/itest/recursive/src/main/java/composite/Target.java
deleted file mode 100644
index 703e72fc10..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/composite/Target.java
+++ /dev/null
@@ -1,30 +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 composite;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.OneWay;
-
-
-@Callback(SourceCallback.class)
-public interface Target {
-
-    @OneWay
-    void someMethod(String arg);
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/composite/TargetImpl.java b/java/sca-contrib/itest/recursive/src/main/java/composite/TargetImpl.java
deleted file mode 100644
index cd9a9746fa..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/composite/TargetImpl.java
+++ /dev/null
@@ -1,41 +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 composite;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-
-@Service(Target.class)
-@Scope("COMPOSITE")
-public class TargetImpl implements Target {
-
-    private SourceCallback sourceCallback;
-
-    @Callback
-    public void setSourceCallback(SourceCallback sourceCallback) {
-        this.sourceCallback = sourceCallback;
-    }
-
-    public void someMethod(String arg) {
-        System.out.println("Target: " + arg);
-        sourceCallback.receiveResult(arg + " -> Target.someMethod");
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/foo/A.java b/java/sca-contrib/itest/recursive/src/main/java/foo/A.java
deleted file mode 100644
index 65bf41920e..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/foo/A.java
+++ /dev/null
@@ -1,28 +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 foo;
-
-import org.oasisopen.sca.annotation.Service;
-
-@Service(I.class)
-public class A implements I {
-    public String get(int i) {
-        return A.class.getName();
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/foo/B.java b/java/sca-contrib/itest/recursive/src/main/java/foo/B.java
deleted file mode 100644
index ecc04aff4c..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/foo/B.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 foo;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(I.class)
-public class B implements I {
-    protected I i = null;
-
-    @Reference(name = "i", required = true)
-    public void setC(I c) {
-        this.i = c;
-    }
-
-    public String get(int i) {
-        return this.i.get(i);
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/foo/I.java b/java/sca-contrib/itest/recursive/src/main/java/foo/I.java
deleted file mode 100644
index f6d55baef3..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/foo/I.java
+++ /dev/null
@@ -1,23 +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 foo;
-
-public interface I {
-    String get(int i);
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/policy/Target.java b/java/sca-contrib/itest/recursive/src/main/java/policy/Target.java
deleted file mode 100644
index 2366f6542a..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/policy/Target.java
+++ /dev/null
@@ -1,26 +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 policy;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Target {
-    String hello(String arg);
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/policy/TargetClientImpl.java b/java/sca-contrib/itest/recursive/src/main/java/policy/TargetClientImpl.java
deleted file mode 100644
index b2d59e925c..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/policy/TargetClientImpl.java
+++ /dev/null
@@ -1,33 +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 policy;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(Target.class)
-public class TargetClientImpl implements Target {
-
-    @Reference
-    protected Target targetService;
-
-    public String hello(String arg) {
-        return "Target: Hello " + targetService.hello(arg) + "!";
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/policy/TargetServiceImpl.java b/java/sca-contrib/itest/recursive/src/main/java/policy/TargetServiceImpl.java
deleted file mode 100644
index 6f52dfb26e..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/policy/TargetServiceImpl.java
+++ /dev/null
@@ -1,29 +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 policy;
-
-import org.oasisopen.sca.annotation.Service;
-
-@Service(Target.class)
-public class TargetServiceImpl implements Target {
-
-    public String hello(String arg) {
-        return "Target: Hello " + arg + "!";
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentAImpl.java b/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentAImpl.java
deleted file mode 100644
index 458a7d28a3..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentAImpl.java
+++ /dev/null
@@ -1,41 +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 sample;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Service1.class)
-public class ComponentAImpl implements Service1 {
-
-    @Reference(name = "Reference1", required = false)
-    protected Service1 ref;
-
-    public String track(String source) {
-        if (ref != null) {
-            return ref.track(source + "-->ComponentA");
-        }
-        return source + "-->ComponentA";
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentCImpl.java b/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentCImpl.java
deleted file mode 100644
index f3b9fc014d..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentCImpl.java
+++ /dev/null
@@ -1,41 +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 sample;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Service1.class)
-public class ComponentCImpl implements Service1 {
-
-    @Reference(name = "Reference1", required = false)
-    protected Service1 ref;
-
-    public String track(String source) {
-        if (ref != null) {
-            return ref.track(source + "-->ComponentC");
-        }
-        return source + "-->ComponentC";
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentEImpl.java b/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentEImpl.java
deleted file mode 100644
index 445b622a72..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentEImpl.java
+++ /dev/null
@@ -1,38 +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 sample;
-
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComponentEImpl implements Service1 {
-    @Property(name = "Property1")
-    protected String prefix;
-
-    @Reference(name = "Reference1")
-    protected Service1 ref;
-
-    public String track(String source) {
-        return ref.track(source + "-->ComponentE");
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentFImpl.java b/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentFImpl.java
deleted file mode 100644
index e2de8f3dc5..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentFImpl.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.    
- */
-
-package sample;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComponentFImpl implements Service1 {
-
-    private Service1 ref;
-
-    public String track(String source) {
-        if (ref != null) {
-            return ref.track(source + "-->ComponentF");
-        } else {
-            System.err.println("Reference1 is not wired...");
-            return source + "-->ComponentF";
-        }
-    }
-
-    @Reference(name = "Reference1")
-    public void setComponentA(Service1 ref) {
-        this.ref = ref;
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/sample/Service1.java b/java/sca-contrib/itest/recursive/src/main/java/sample/Service1.java
deleted file mode 100644
index 81bdce79f1..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/sample/Service1.java
+++ /dev/null
@@ -1,27 +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 sample;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface Service1 {
-    String track(String source);
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test/Aggregator.java b/java/sca-contrib/itest/recursive/src/main/java/test/Aggregator.java
deleted file mode 100644
index 88b3bed1b2..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/test/Aggregator.java
+++ /dev/null
@@ -1,27 +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 test;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface Aggregator {
-    String getAggregatedData();
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test/AggregatorImpl.java b/java/sca-contrib/itest/recursive/src/main/java/test/AggregatorImpl.java
deleted file mode 100644
index 638219d431..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/test/AggregatorImpl.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 test;
-
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Aggregator.class)
-public class AggregatorImpl implements Aggregator {
-
-    @Reference(name = "uniSource")
-    protected Source source;
-
-    @Reference(name = "multiSource")
-    protected List<Source> sources;
-
-    public String getAggregatedData() {
-        System.out.println("uniSource: " + source.getData());
-        StringBuffer sb = new StringBuffer();
-        int i = 0;
-        for (Source s : sources) {
-            if (i != 0) {
-                sb.append(", ");
-            } else {
-                sb.append("multiSource: ");
-            }
-            sb.append(s.getData());
-            i++;
-        }
-        return sb.toString();
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test/InnerSourceImpl.java b/java/sca-contrib/itest/recursive/src/main/java/test/InnerSourceImpl.java
deleted file mode 100644
index aae9aba587..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/test/InnerSourceImpl.java
+++ /dev/null
@@ -1,34 +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 test;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Source.class)
-public class InnerSourceImpl implements Source {
-
-    public String getData() {
-        return "InnerSource";
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test/OuterSourceImpl.java b/java/sca-contrib/itest/recursive/src/main/java/test/OuterSourceImpl.java
deleted file mode 100644
index bd31498ccc..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/test/OuterSourceImpl.java
+++ /dev/null
@@ -1,34 +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 test;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Source.class)
-public class OuterSourceImpl implements Source {
-
-    public String getData() {
-        return "OuterSource";
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test/Source.java b/java/sca-contrib/itest/recursive/src/main/java/test/Source.java
deleted file mode 100644
index bcad89bf4d..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/test/Source.java
+++ /dev/null
@@ -1,30 +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 test;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface Source {
-    String getData();
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test1/composite/Target.java b/java/sca-contrib/itest/recursive/src/main/java/test1/composite/Target.java
deleted file mode 100644
index 4883e12f49..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/test1/composite/Target.java
+++ /dev/null
@@ -1,23 +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 test1.composite;
-
-public interface Target {
-    String hello(String arg);
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test1/composite/TargetOne.java b/java/sca-contrib/itest/recursive/src/main/java/test1/composite/TargetOne.java
deleted file mode 100644
index 831e3cbd7b..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/test1/composite/TargetOne.java
+++ /dev/null
@@ -1,29 +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 test1.composite;
-
-import org.oasisopen.sca.annotation.Service;
-
-@Service(Target.class)
-public class TargetOne implements Target {
-
-    public String hello(String arg) {
-        return "TargetOne: Hello " + arg + "!";
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/java/sca-contrib/itest/recursive/src/main/java/test1/composite/TargetTwo.java
deleted file mode 100644
index 8c32eca547..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/java/test1/composite/TargetTwo.java
+++ /dev/null
@@ -1,29 +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 test1.composite;
-
-import org.oasisopen.sca.annotation.Service;
-
-@Service(Target.class)
-public class TargetTwo implements Target {
-
-    public String hello(String arg) {
-        return "TargetTwo: Hello " + arg + "!";
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/AComposite.composite b/java/sca-contrib/itest/recursive/src/main/resources/AComposite.composite
deleted file mode 100644
index 1b5dee8762..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/AComposite.composite
+++ /dev/null
@@ -1,30 +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://sample"
-    xmlns:sample="http://sample"
-    name="AComposite">
-
-    <component name="AComponent">
-        <implementation.composite name="sample:BComposite"/>
-    </component>
-
-</composite>
-
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/BComposite.composite b/java/sca-contrib/itest/recursive/src/main/resources/BComposite.composite
deleted file mode 100644
index 7d4588eba4..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/BComposite.composite
+++ /dev/null
@@ -1,45 +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://sample"
-    xmlns:sample="http://sample"
-    name="BComposite">
-
-    <service name="BService" promote="BComponent">
-        <interface.java interface="sample.C"/>
-    </service>
-
-    <component name="BComponent">
-        <implementation.composite name="sample:CComposite"/>
-
-        <reference name="PromotedRefX" target="XComponent"/>
-        <reference name="PromotedRefY" target="YComponent"/>
-    </component>
-
-    <component name="XComponent">
-		<implementation.java class="sample.XImpl"/>
-    </component>
-
-    <component name="YComponent">
-        <implementation.java class="sample.YImpl"/>
-    </component>
-
-</composite>
-
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/CComposite.composite b/java/sca-contrib/itest/recursive/src/main/resources/CComposite.composite
deleted file mode 100644
index 6d7b4ec600..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/CComposite.composite
+++ /dev/null
@@ -1,44 +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://sample"
-    xmlns:sample="http://sample"
-    name="CComposite">
-
-    <service name="CService" promote="CComponent">
-        <interface.java interface="sample.C"/>
-    </service>
-
-    <reference name="PromotedRefX" promote="CComponent/refX">
-        <interface.java interface="sample.X"/>
-    </reference>
-
-    <reference name="PromotedRefY" promote="CComponent/refY">
-        <interface.java interface="sample.Y"/>
-    </reference>
-
-    <component name="CComponent">
-        <implementation.java class="sample.CImpl"/>
-        <reference name="refX"/>
-        <reference name="refY"/>
-    </component>
-
-</composite>
-
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Composite1.composite b/java/sca-contrib/itest/recursive/src/main/resources/Composite1.composite
deleted file mode 100644
index 56fd7c621f..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/Composite1.composite
+++ /dev/null
@@ -1,42 +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://sample"
-    xmlns:sample="http://sample"
-    name="Composite1">
-
-    <component name="ComponentA">
-        <implementation.java class="sample.ComponentAImpl"/>
-    </component>
-
-    <component name="ComponentB">
-        <!-- Implemented by Composite3 -->
-        <implementation.composite name="sample:Composite3"/>
-        
-        <!-- Wired to ComponentA -->
-        <reference name="Reference1" target="ComponentA"/>
-
-        <property name="Property1">ABC</property>
-    </component>
-    
-    <!-- ComponentB.Service1 is promoted -->
-    <service name="Service1" promote="ComponentB/Service1" />
-
-</composite>
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Composite2.composite b/java/sca-contrib/itest/recursive/src/main/resources/Composite2.composite
deleted file mode 100644
index 54f10673a4..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/Composite2.composite
+++ /dev/null
@@ -1,43 +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://sample"
-           xmlns:sample="http://sample"
-           name="Composite2">
-
-    <component name="ComponentC">
-        <implementation.java class="sample.ComponentCImpl" />
-
-        <!-- Wired to ComponentD.Service1 -->
-        <reference name="Reference1" target="ComponentD/Service1" />
-    </component>
-
-    <component name="ComponentD">
-        <!-- Implemented by Composite3 -->
-        <implementation.composite name="sample:Composite3" />
-        
-        <!-- The property value is "XYZ" -->
-        <property name="Property1">XYZ</property>
-    </component>
-
-    <!-- ComponentD.Reference1 is promoted -->
-    <reference name="Reference1" promote="ComponentD/Reference1" />
-
-</composite>
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Composite3.composite b/java/sca-contrib/itest/recursive/src/main/resources/Composite3.composite
deleted file mode 100644
index 040653493f..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/Composite3.composite
+++ /dev/null
@@ -1,48 +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://sample"
-           xmlns:sample="http://sample"
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-           name="Composite3">
-
-    <component name="ComponentE">
-        <implementation.java class="sample.ComponentEImpl" />
-        <reference name="Reference1" target="ComponentF/Service1" />
-        
-        <!-- The property is from the composite Property1 -->
-        <property name="Property1" source="$Property1" />
-    </component>
-
-    <component name="ComponentF">
-        <implementation.java class="sample.ComponentFImpl" />
-    </component>
-
-    <service name="Service1" promote="ComponentE/Service1" />
-
-    <reference name="Reference1" promote="ComponentF/Reference1">
-    <!-- 
-        <binding.sca />
-     -->    
-    </reference>
-
-    <property name="Property1" type="xsd:string">123</property>
-
-</composite>
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Demo1Composite.composite b/java/sca-contrib/itest/recursive/src/main/resources/Demo1Composite.composite
deleted file mode 100644
index 6b2a964b9b..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/Demo1Composite.composite
+++ /dev/null
@@ -1,27 +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:sca="http://www.osoa.org/xmlns/sca/1.0"

-    targetNamespace="http://sample" xmlns:sample="http://sample" name="Demo1Composite"

-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

-    <include name="sample:Demo2Composite" />

-    <component name="Demo1Component">

-        <implementation.java class="circular.include.DemoClass" />

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Demo2Composite.composite b/java/sca-contrib/itest/recursive/src/main/resources/Demo2Composite.composite
deleted file mode 100644
index 6b8c0a348e..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/Demo2Composite.composite
+++ /dev/null
@@ -1,28 +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:sca="http://www.osoa.org/xmlns/sca/1.0"

-    targetNamespace="http://sample" xmlns:sample="http://sample" name="Demo2Composite"

-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

-    <include name="sample:Demo1Composite" />

-    <component name="Demo2Component">

-        <implementation.java class="circular.include.DemoClass" />

-    </component>

-</composite>

-

diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Inner.composite b/java/sca-contrib/itest/recursive/src/main/resources/Inner.composite
deleted file mode 100644
index 398ebdf6e2..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/Inner.composite
+++ /dev/null
@@ -1,45 +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://test"

-    xmlns:sample="http://test"

-    name="Inner">

-

-    <component name="Aggregator">

-        <implementation.java class="test.AggregatorImpl"/>

-        <reference name="uniSource" target="InnerSource/Source"/>

-        <reference name="multiSource" target="InnerSource/Source"/>

-    </component>

-

-    <component name="InnerSource">

-        <implementation.java class="test.InnerSourceImpl"/>

-    </component>

-    

-    <reference name="uniSource" promote="Aggregator/uniSource">

-        <binding.sca/>

-    </reference>

-

-    <reference name="multiSource" promote="Aggregator/multiSource">

-        <binding.sca/>

-    </reference>

-    

-    <service name="aggregator" promote="Aggregator"/>

-    

-</composite>

diff --git a/java/sca-contrib/itest/recursive/src/main/resources/InnerComposite.composite b/java/sca-contrib/itest/recursive/src/main/resources/InnerComposite.composite
deleted file mode 100644
index 3376ac8ff5..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/InnerComposite.composite
+++ /dev/null
@@ -1,41 +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://sample"
-    xmlns:sample="http://sample"
-    name="InnerComposite">
-
-    <service name="InnerSourceService" promote="InnerSourceComponent">
-        <interface.java interface="composite.Source"/>
-    </service>
-       
-    <component name="InnerSourceComponent">
-		<implementation.java class="composite.SourceImpl"/>
-    </component>
-	    
-    <reference name="targetComponentRef" promote="InnerSourceComponent/targetReference">
-        <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
-    </reference>
-    
-    <reference name="targetComponentRef2" promote="InnerSourceComponent/targetReference2">
-        <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/InnerComposite2.composite b/java/sca-contrib/itest/recursive/src/main/resources/InnerComposite2.composite
deleted file mode 100644
index c9eff4fa9d..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/InnerComposite2.composite
+++ /dev/null
@@ -1,33 +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://sample"
-    xmlns:sample="http://sample"
-    name="InnerComposite2">
-
-    <service name="InnerTargetService" promote="InnerTargetComponent"> 
-        <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
-    </service>
-       
-    <component name="InnerTargetComponent">
-		<implementation.java class="composite.TargetImpl"/>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 289b92a3f2..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:OuterComposite"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Outer.composite b/java/sca-contrib/itest/recursive/src/main/resources/Outer.composite
deleted file mode 100644
index 987990d854..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/Outer.composite
+++ /dev/null
@@ -1,39 +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://test"

-    xmlns:test="http://test"

-    name="Outer">

-

-    <component name="OuterSource">

-        <implementation.java class="test.OuterSourceImpl"/>

-    </component>

-

-    <component name="Inner">

-        <!-- Implemented by Composite3 -->

-        <implementation.composite name="test:Inner"/>

-        

-        <reference name="uniSource" target="OuterSource"/>

-        

-        <reference name="multiSource" target="OuterSource"/>

-

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/itest/recursive/src/main/resources/OuterComposite.composite b/java/sca-contrib/itest/recursive/src/main/resources/OuterComposite.composite
deleted file mode 100644
index cb1c1e13d4..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/OuterComposite.composite
+++ /dev/null
@@ -1,39 +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://sample"
-    xmlns:sample="http://sample"
-    name="OuterComposite">
-
-    <component name="SourceComponent">
-        <implementation.composite name="sample:InnerComposite"/>
-        <reference name="targetComponentRef" target="TargetComponent"/>
-        <reference name="targetComponentRef2" target="TargetComponent2/InnerTargetService"/>
-    </component>
-
-    <component name="TargetComponent">
-		<implementation.java class="composite.TargetImpl"/>
-    </component>
-    
-    <component name="TargetComponent2">
-        <implementation.composite name="sample:InnerComposite2"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/foo/foo.png b/java/sca-contrib/itest/recursive/src/main/resources/foo/foo.png
deleted file mode 100644
index 0f2ec78aaf..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/foo/foo.png
+++ /dev/null
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/foo/o1.composite b/java/sca-contrib/itest/recursive/src/main/resources/foo/o1.composite
deleted file mode 100644
index 1d31c2f424..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/foo/o1.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" targetNamespace="http://bar" xmlns:bar="http://bar"

-    name="O1Composite">

-

-    <service name="O1Service" promote="AComponent">

-        <interface.java interface="foo.I" />

-    </service>

-

-    <component name="AComponent">

-        <implementation.java class="foo.A" />

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/foo/o2.composite b/java/sca-contrib/itest/recursive/src/main/resources/foo/o2.composite
deleted file mode 100644
index 4f21c21860..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/foo/o2.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" targetNamespace="http://bar" xmlns:bar="http://bar"

-    name="O2Composite">

-

-    <service name="O2Service" promote="O1Component/O1Service">

-        <interface.java interface="foo.I" />

-    </service>

-

-    <component name="O1Component">

-        <implementation.composite name="bar:O1Composite" />

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/foo/o3.composite b/java/sca-contrib/itest/recursive/src/main/resources/foo/o3.composite
deleted file mode 100644
index 72c732c03e..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/foo/o3.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://bar" xmlns:bar="http://bar"

-    name="O3Composite">

-

-    <service name="O3Service" promote="BComponent">

-        <interface.java interface="foo.I" />

-    </service>

-

-    <component name="BComponent">

-        <implementation.java class="foo.B" />

-    </component>

-

-    <reference name="O3Reference" promote="BComponent/i">

-        <interface.java interface="foo.I" />

-    </reference>

-

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/foo/o4.composite b/java/sca-contrib/itest/recursive/src/main/resources/foo/o4.composite
deleted file mode 100644
index f8f07eed09..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/foo/o4.composite
+++ /dev/null
@@ -1,37 +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://bar" xmlns:bar="http://bar"

-    name="O4Composite">

-

-    <service name="O4Service" promote="O3Component/O3Service">

-        <interface.java interface="foo.I" />

-    </service>

-

-    <component name="O3Component">

-        <implementation.composite name="bar:O3Composite" />

-        <reference name="O3Reference" target="O2Component/O2Service" />

-    </component>

-

-    <component name="O2Component">

-        <implementation.composite name="bar:O2Composite" />

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite b/java/sca-contrib/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
deleted file mode 100644
index 4a6df023b8..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
+++ /dev/null
@@ -1,32 +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://policy"

-    xmlns:policy="http://policy"

-    name="PolicyInnerComposite">

-

-   	<service name="TargetService" promote="TargetServiceComponent"> 

-    </service>

-	

-    <component name="TargetServiceComponent">

-		<implementation.java class="policy.TargetServiceImpl"/> 

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite b/java/sca-contrib/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
deleted file mode 100644
index 25007aebb2..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/policy/PolicyOuterComposite.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://policy"
-    xmlns:policy="http://policy"
-    requires="policy:TestIntent_1"
-    name="PolicyOuterComposite">
-    
-    <component name="TargetClientComponent">
-        <implementation.java class="policy.TargetClientImpl"/>
-        <reference name="targetService" target="OuterTargetServiceComponent"/>
-    </component>
-    
-    <component name="OuterTargetServiceComponent">
-        <implementation.composite name="policy:PolicyInnerComposite"/>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/policy/definitions.xml b/java/sca-contrib/itest/recursive/src/main/resources/policy/definitions.xml
deleted file mode 100644
index 957028e3bd..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/policy/definitions.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://policy"
-             xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:ip="http://policy" >
-
-    <!-- Policy Intents -->
-    <sca:intent name="TestIntent_1" constrains="sca:implementation">
-        <description>Test Intent One</description>
-    </sca:intent>
-
-    <!--  Policy Sets -->
-    <sca:policySet name="TestPolicySet_1_composite" 
-                   provides="ip:TestIntent_1" 
-                   appliesTo="sca:implementation.composite"
-                   xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-    
-    <sca:policySet name="TestPolicySet_1_java" 
-                   provides="ip:TestIntent_1" 
-                   appliesTo="sca:implementation.java"
-                   xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy />
-    </sca:policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/test1/InnerComposite.composite b/java/sca-contrib/itest/recursive/src/main/resources/test1/InnerComposite.composite
deleted file mode 100644
index 177fa10550..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/test1/InnerComposite.composite
+++ /dev/null
@@ -1,39 +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://sample1"
-    xmlns:sample1="http://sample1"
-    name="InnerComposite">
-
-   	<service name="Service_One" promote="ComponentOne"> 
-        <interface.java interface="test1.composite.Target"/>
-    </service>
-    <service name="Service_Two" promote="ComponentTwo"> 
-        <interface.java interface="test1.composite.Target"/>
-    </service>
-	
-    <component name="ComponentOne">
-		<implementation.java class="test1.composite.TargetOne"/>
-    </component>
-	<component name="ComponentTwo">
-		<implementation.java class="test1.composite.TargetTwo"/>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/test1/OuterComposite.composite b/java/sca-contrib/itest/recursive/src/main/resources/test1/OuterComposite.composite
deleted file mode 100644
index d05a67f45f..0000000000
--- a/java/sca-contrib/itest/recursive/src/main/resources/test1/OuterComposite.composite
+++ /dev/null
@@ -1,27 +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://sample1"

-    xmlns:sample1="http://sample1"

-    name="OuterComposite">

-    <component name="Test1TargetComponent">

-        <implementation.composite name="sample1:InnerComposite"/>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java b/java/sca-contrib/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
deleted file mode 100644
index 1f7c35dd91..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
+++ /dev/null
@@ -1,39 +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 circular.include;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.Test;
-
-public class CircularIncludeTestCase {
-
-    @Test
-    public void testCyclicInclude() {
-        SCADomain scaDomain = SCADomain.newInstance("Demo1Composite.composite");
-
-        DemoClass demoService = scaDomain.getService(DemoClass.class, "Demo1Component");
-        String demo = demoService.demo();
-        Assert.assertEquals("hello", demo);
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/composite/CompositeTestCase.java b/java/sca-contrib/itest/recursive/src/test/java/composite/CompositeTestCase.java
deleted file mode 100644
index 5482e47463..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/composite/CompositeTestCase.java
+++ /dev/null
@@ -1,51 +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 composite;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CompositeTestCase extends TestCase {
-
-    private SCADomain domain;
-    private Source source;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("OuterComposite.composite");
-        source = domain.getService(Source.class, "SourceComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-    	domain.close();
-    }
-
-    public void test() throws Exception {
-        try {
-            System.out.println("Main thread " + Thread.currentThread());
-            source.clientMethod("Client.main");
-            System.out.println("Sleeping ...");
-            Thread.sleep(1000);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/java/sca-contrib/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
deleted file mode 100644
index fb9872378d..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
+++ /dev/null
@@ -1,113 +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 composite;

-

-import java.io.File;

-import java.net.URL;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-public class LocateServiceEmbeddedSCADomainTestCase extends TestCase {

-    private ClassLoader cl;

-    private EmbeddedSCADomain domain;

-    private Contribution contribution;

-

-    @Override

-    protected void setUp() throws Exception {

-        // Create a test embedded SCA domain

-        cl = getClass().getClassLoader();

-        domain = new EmbeddedSCADomain(cl, "http://localhost");

-

-        // Start the domain

-        domain.start();

-

-        // Contribute the SCA contribution

-        ContributionService contributionService = domain.getContributionService();

-

-        File contribLocation = new File("./target/classes/");

-        URL contributionURL = contribLocation.toURL();

-        contribution = contributionService.contribute("http://contribution", contributionURL, false);

-        for (Composite deployable : contribution.getDeployables()) {

-            domain.getDomainComposite().getIncludes().add(deployable);

-            domain.buildComposite(deployable);

-        }

-

-        // Start Components from my composite

-        for (Composite deployable : contribution.getDeployables() ) {

-            domain.getCompositeActivator().activate(deployable);

-            domain.getCompositeActivator().start(deployable);

-        }

-    }

-

-    public void testValidLocateService() throws Exception {

-        Source source;

-        try {

-            source = domain.getService(Source.class, "SourceComponent");

-            assertNotNull(source);

-        } catch (Throwable t) {

-            fail("Could not locate service");

-        }

-    }

-

-    public void testInvalidLocateService() throws Exception {

-        Source source;

-        try {

-            source = domain.getService(Source.class, "SourceComponentXXX");

-            // The source proxy can be created for the remote target but it will throw exception when a method is invoked

-            source.clientMethod("ABC");

-            fail("Expected to generate org.oasisopen.sca.ServiceRuntimeException but did not when invoking service with async");

-        } catch (org.oasisopen.sca.ServiceRuntimeException e) {

-            // expected.

-        }

-    }

-    

-    public void testValidRecursiveLocateService() throws Exception {

-        Source source;

-        try {

-            source = domain.getService(Source.class, "SourceComponent/InnerSourceService");

-            assertNotNull(source);

-        } catch (Throwable t) {

-            fail("Could not locate service");

-        }

-    }

-

-    @Override

-    public void tearDown() throws Exception {

-        ContributionService contributionService = domain.getContributionService();

-

-        // Remove the contribution from the in-memory repository

-        contributionService.remove("http://contribution");

-

-        // Stop Components from my composite

-        for (Composite deployable : contribution.getDeployables() ) {

-            domain.getCompositeActivator().stop(deployable);

-            domain.getCompositeActivator().deactivate(deployable);

-        }

-

-        domain.stop();

-        domain.close();

-    }

-

-}

diff --git a/java/sca-contrib/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/java/sca-contrib/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
deleted file mode 100644
index 171f181438..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
+++ /dev/null
@@ -1,73 +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 composite;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-public class LocateServiceSCADomainTestCase extends TestCase {

-

-    private SCADomain domain;

-    

-

-    @Override

-    protected void setUp() throws Exception {

-        domain = SCADomain.newInstance("OuterComposite.composite");

-    }

-    

-    @Override

-    protected void tearDown() throws Exception {

-        domain.close();

-    }

-

-    public void testValidLocateService() throws Exception {

-        Source source;

-        try {

-            source = domain.getService(Source.class, "SourceComponent");

-            assertNotNull(source);

-        } catch (Throwable t) {

-            fail("Could not locate service");

-        }

-    }

-

-    public void testInvalidLocateService() throws Exception {

-        Source source;

-        try {

-            source = domain.getService(Source.class, "SourceComponentXXX");

-            // The source proxy can be created for the remote target but it will throw exception when a method is invoked

-            source.clientMethod("ABC");

-            fail("Expected to generate org.oasisopen.sca.ServiceRuntimeException but did not when invoking service with async");

-        } catch (org.oasisopen.sca.ServiceRuntimeException e) {

-            // expected.

-        }

-    }

-    

-    public void testValidRecursiveLocateService() throws Exception {

-        Source source;

-        try {

-            source = domain.getService(Source.class, "SourceComponent/InnerSourceService");

-            assertNotNull(source);

-        } catch (Throwable t) {

-            fail("Could not locate service");

-        }

-    }

-

-}

diff --git a/java/sca-contrib/itest/recursive/src/test/java/foo/O2TestCase.java b/java/sca-contrib/itest/recursive/src/test/java/foo/O2TestCase.java
deleted file mode 100644
index d617ec8592..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/foo/O2TestCase.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 foo;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class O2TestCase extends TestCase {
-
-    public void testGet() throws Exception {
-        SCADomain sca = SCADomain.newInstance("foo/o2.composite");
-        I i = sca.getService(I.class, "O1Component");
-        assertEquals("foo.A", i.get(0));
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/foo/O4TestCase.java b/java/sca-contrib/itest/recursive/src/test/java/foo/O4TestCase.java
deleted file mode 100644
index 15626c75ac..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/foo/O4TestCase.java
+++ /dev/null
@@ -1,39 +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 foo;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class O4TestCase extends TestCase {
-
-	public void testO3Component() throws Exception {
-		SCADomain sca = SCADomain.newInstance("foo/o4.composite");
-		I i = sca.getService(I.class, "O3Component");
-		assertEquals("foo.A", i.get(0));
-	}
-
-	public void testO2Component() throws Exception {
-		SCADomain sca = SCADomain.newInstance("foo/o4.composite");
-		I i = sca.getService(I.class, "O2Component");
-		assertEquals("foo.A", i.get(0));
-	}
-
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/policy/PolicyTestCase.java b/java/sca-contrib/itest/recursive/src/test/java/policy/PolicyTestCase.java
deleted file mode 100644
index c9cc84f7d4..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/policy/PolicyTestCase.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 policy;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.impl.CompositeImpl;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class PolicyTestCase {
-
-    private SCADomain domain;
-    private Target targetClient;
-
-    @Before
-    public void setUp() throws Exception {
-        domain = SCADomain.newInstance("policy/PolicyOuterComposite.composite");
-        targetClient = domain.getService(Target.class, "TargetClientComponent");
-    }
-   
-    @After
-    public void tearDown() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void test() throws Exception {
-        try {
-        	//Check that the implementation policy sets don't flow down to the components
-        	//implementations that are themselves composites (implementation.composite)
-        	Component outerComponent = ((DefaultSCADomain)domain).getComponent("OuterTargetServiceComponent");
-        	
-        	Assert.assertEquals(0, outerComponent.getPolicySets().size());
-        	
-        	for (Component component :((CompositeImpl)outerComponent.getImplementation()).getComponents()){
-        		Assert.assertEquals(0, component.getPolicySets().size());
-        	}
-        	
-        	// debugging
-            String result = targetClient.hello("Fred");
-
-            System.out.println(result);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/C.java b/java/sca-contrib/itest/recursive/src/test/java/sample/C.java
deleted file mode 100644
index bf8391348b..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/C.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 sample;
-
-/**
- * Simple Service
- */
-public interface C {
-
-    /**
-     * Sample operation
-     * 
-     * @return A String
-     */
-    String cOp();
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/CImpl.java b/java/sca-contrib/itest/recursive/src/test/java/sample/CImpl.java
deleted file mode 100644
index 98610e32a6..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/CImpl.java
+++ /dev/null
@@ -1,80 +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 sample;
-
-import junit.framework.Assert;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a simple service
- */
-@Service(C.class)
-public class CImpl implements C {
-
-    /**
-     * Reference to X
-     */
-    private X xRef;
-    
-    /**
-     * Reference to Y
-     */
-    private Y yRef;
-
-    /**
-     * Setter for refX
-     * 
-     * @param x Reference to X
-     */
-    @Reference(name="refX")
-    protected void setX(X x)
-    {
-        System.out.println("Setting X on CImpl to " + x);
-        xRef = x;
-    }
-    
-    /**
-     * Setter for refY
-     * 
-     * @param y Reference to Y
-     */
-    @Reference(name="refY")
-    protected void setY(Y y)
-    {
-        System.out.println("Setting Y on CImpl to " + y);
-        yRef = y;
-    }
-    
-    /**
-     * Simple operation that uses the injected references to X and Y
-     * 
-     * @return "C:cOp() - xResult = " + xRef.xOP() + " yResult = " + yRef.yOp();
-     */
-    public String cOp() {
-        Assert.assertNotNull(xRef);
-        Assert.assertNotNull(yRef);
-        
-        String xResult = xRef.xOp();
-        String yResult = yRef.yOp();
-        
-        return "C:cOp() - xResult = " + xResult + " yResult = " + yResult;
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/NestedTestCase.java b/java/sca-contrib/itest/recursive/src/test/java/sample/NestedTestCase.java
deleted file mode 100644
index fc5d251460..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/NestedTestCase.java
+++ /dev/null
@@ -1,96 +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 sample;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-
-/**
- * Test for implementation.composite using implementation.composite
- */
-public class NestedTestCase extends TestCase {
-
-    /**
-     * Reference to the domain
-     */
-    private SCADomain domain; 
-
-    /**
-     * Tear down the domain
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    /**
-     * This tests having:
-     * 
-     *   AComponent -> implementation.composite(BComposite)
-     *   BComposite -> implementation.composite(CComposite)
-     *   
-     * This test fails.
-     * 
-     * @throws Exception Failed
-     */
-    public void testAComponent() throws Exception {
-        domain = SCADomain.newInstance("AComposite.composite");
-        
-        System.out.println("Deployed names = " + domain.getComponentManager().getComponentNames());
-        
-        C c = domain.getService(C.class, "AComponent");
-
-        String result = c.cOp();
-        System.out.println("Method call returned [" + result + "]");
-        Assert.assertNotNull(result);
-        Assert.assertTrue(result.indexOf("C:cOp()") != -1);
-        Assert.assertTrue(result.indexOf("X:xOp()") != -1);
-        Assert.assertTrue(result.indexOf("Y:yOp()") != -1);
-    }
-
-
-    /**
-     * This tests having:
-     * 
-     *   BComposite -> implementation.composite(CComposite)
-     * 
-     * This test works.
-     * 
-     * @throws Exception Failed
-     */
-    public void testBComponent() throws Exception {
-        domain = SCADomain.newInstance("BComposite.composite");
-        
-        System.out.println("Deployed names = " + domain.getComponentManager().getComponentNames());
-          
-        C c = domain.getService(C.class, "BComponent");
-        
-        String result = c.cOp();
-        System.out.println("Method call returned [" + result + "]");
-        Assert.assertNotNull(result);
-        Assert.assertTrue(result.indexOf("C:cOp()") != -1);
-        Assert.assertTrue(result.indexOf("X:xOp()") != -1);
-        Assert.assertTrue(result.indexOf("Y:yOp()") != -1);
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java b/java/sca-contrib/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
deleted file mode 100644
index a543add69b..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
+++ /dev/null
@@ -1,53 +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 sample;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-//FIXME Fix this test case
-public class RecursiveCompositeTestCaseFIXME extends TestCase {
-
-    private SCADomain domain;
-    private Service1 tracker, tracker2;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("http://localhost", "/", "Composite1.composite", "Composite2.composite");
-        tracker = domain.getService(Service1.class, "ComponentC");
-        tracker2 = domain.getService(Service1.class, "ComponentB");
-
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-    public void test() throws Exception {
-        try {
-            System.out.println("Main thread " + Thread.currentThread());
-            System.out.println(tracker.track("Client"));
-            System.out.println(tracker2.track("Client"));
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/X.java b/java/sca-contrib/itest/recursive/src/test/java/sample/X.java
deleted file mode 100644
index e3a9335068..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/X.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 sample;
-
-/**
- * Simple Service
- */
-public interface X {
-
-    /**
-     * Simple Operation
-     * 
-     * @return A String
-     */
-    String xOp();
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/XImpl.java b/java/sca-contrib/itest/recursive/src/test/java/sample/XImpl.java
deleted file mode 100644
index 7f80dfccb2..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/XImpl.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 sample;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a simple service
- */
-@Service(X.class)
-public class XImpl implements X {
-
-    /**
-     * Simple operation
-     * 
-     * @return "X:xOp()"
-     */
-    public String xOp() {
-        return "X:xOp()";
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/Y.java b/java/sca-contrib/itest/recursive/src/test/java/sample/Y.java
deleted file mode 100644
index c15a4f635a..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/Y.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 sample;
-
-/**
- * Simple Service
- */
-public interface Y {
-
-    /**
-     * Simple Operation
-     * 
-     * @return A String
-     */
-    String yOp();
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/YImpl.java b/java/sca-contrib/itest/recursive/src/test/java/sample/YImpl.java
deleted file mode 100644
index b8e3a58974..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/YImpl.java
+++ /dev/null
@@ -1,38 +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 sample;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a Simple Service
- */
-@Service(Y.class)
-public class YImpl implements Y {
-
-    /**
-     * A simple operation
-     * 
-     * @return "Y:yOp()"
-     */
-    public String yOp() {
-        return "Y:yOp()";
-    }
-
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/test/InnerTestCase.java b/java/sca-contrib/itest/recursive/src/test/java/test/InnerTestCase.java
deleted file mode 100644
index ebb4bc7acb..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/test/InnerTestCase.java
+++ /dev/null
@@ -1,51 +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 test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class InnerTestCase extends TestCase {
-
-    private SCADomain domain;
-    private Aggregator aggregator;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("Inner.composite");
-        aggregator = domain.getService(Aggregator.class, "Aggregator");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-    public void test() throws Exception {
-        try {
-            String result = aggregator.getAggregatedData();
-            assertTrue(result.contains("InnerSource"));
-            assertTrue(result.contains("InnerSource"));
-            System.out.println(result);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/test/OuterTestCase.java b/java/sca-contrib/itest/recursive/src/test/java/test/OuterTestCase.java
deleted file mode 100644
index 6e95f5808b..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/test/OuterTestCase.java
+++ /dev/null
@@ -1,53 +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 test;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class OuterTestCase {
-
-    private SCADomain domain;
-    private Aggregator aggregator;
-
-    @Before
-    public void setUp() throws Exception {
-        domain = SCADomain.newInstance("Outer.composite");
-        aggregator = domain.getService(Aggregator.class, "Inner");
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        domain.close();
-    }
-
-    @Ignore("TUSCANY-2484")
-    @Test
-    public void test() throws Exception {
-        String result = aggregator.getAggregatedData();
-        Assert.assertTrue(result.contains("InnerSource"));
-        Assert.assertTrue(result.contains("OuterSource"));
-        System.out.println(result);
-    }
-}
diff --git a/java/sca-contrib/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java b/java/sca-contrib/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
deleted file mode 100644
index b3abcac06e..0000000000
--- a/java/sca-contrib/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
+++ /dev/null
@@ -1,62 +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 test1.composite;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Simple client program that invokes the components that we wired together.
- */
-public class CompositeClientTestCase extends TestCase {
-    
-    private SCADomain scaDomain;
-    private Target target;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("test1/OuterComposite.composite");
-        target = scaDomain.getService(Target.class, "Test1TargetComponent/Service_Two");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }    
-
-    public void testComposite() throws Exception {
-        String res = target.hello("Wang Feng");
-        assertEquals("TargetTwo: Hello Wang Feng!", res);
-    }
-    
-    // Test for problem in TUSCANY-2010
-    public void testURLs() throws Exception {
-        try {
-            System.out.println("Component URI: " + scaDomain.getComponentManager().getComponent("Test1TargetComponent").getURI());
-            System.out.println("  Service Name: " + scaDomain.getComponentManager().getComponent("Test1TargetComponent").getServices().get(0).getName());
-            System.out.println("    Binding Name: " + scaDomain.getComponentManager().getComponent("Test1TargetComponent").getServices().get(0).getBindings().get(0).getName());
-            System.out.println("    Binding URI: " + scaDomain.getComponentManager().getComponent("Test1TargetComponent").getServices().get(0).getBindings().get(0).getURI());
-            assertEquals("/Test1TargetComponent/Service_One", scaDomain.getComponentManager().getComponent("Test1TargetComponent").getServices().get(0).getBindings().get(0).getURI());
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/serialization/pom.xml b/java/sca-contrib/itest/serialization/pom.xml
deleted file mode 100644
index 625bcf4154..0000000000
--- a/java/sca-contrib/itest/serialization/pom.xml
+++ /dev/null
@@ -1,66 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-serialization</artifactId>
-    <name>Apache Tuscany SCA Serialization Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>       
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>  
-           
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java b/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
deleted file mode 100644
index 3c643436e9..0000000000
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
+++ /dev/null
@@ -1,81 +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.itest.servicereference;
-
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * A very simple Conversational Service
- *
- * @version $Date$ $Revision$
- */
-@Conversational
-@Callback(ConversationalServiceCallback.class)
-public interface ConversationalService {
-
-    /**
-     * Default value for the user data
-     * 
-     * @See {@link #getUserData()}
-     * @See {@link #setUserData(String)}
-     */
-    String DEFAULT_USER_DATA = "NOT SET";
-
-    /**
-     * Retrieves the conversation ID for this Service
-     * 
-     * @return The conversation ID for this Service
-     */
-    Object getConversationID();
-
-    /**
-     * Creates a self reference to this Service
-     * 
-     * @return A self reference to this Service
-     */
-    ServiceReference<ConversationalService> createSelfRef();
-
-    /**
-     * Sets some user data on the instance
-     * 
-     * @param a_Data Some data
-     * 
-     * @See {@link #getUserData()}
-     */
-    void setUserData(String a_Data);
-
-    /**
-     * Gets some user data on the instance
-     * 
-     * @return Some data
-     * 
-     * @See {@link #setUserData(String)}
-     */
-    String getUserData();
-
-    /**
-     * Method that triggers the callback.
-     * 
-     * @param msg A message to pass with the callback
-     * @throws Exception Test failed
-     */
-    void triggerCallback(String msg) throws Exception;
-}
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java b/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
deleted file mode 100644
index 4d75c68c2d..0000000000
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.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.itest.servicereference;
-
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * This is the callback for the ConversationalService.
- *
- * @version $Rev$ $Date$
- */
-@Conversational
-public interface ConversationalServiceCallback {
-
-    /**
-     * Simple callback method.
-     * 
-     * @param msg The message for the call back
-     */
-    void callback(String msg);
-}
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java b/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
deleted file mode 100644
index b129cbc4b7..0000000000
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
+++ /dev/null
@@ -1,141 +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.itest.servicereference;
-
-import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
-import org.junit.Assert;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Simple conversational Service implementation
- * 
- * @version $Date$ $Revision$
- */
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-public class ConversationalServiceImpl implements ConversationalService {
-
-    /**
-     * The Conversation ID
-     */
-    private Object m_ConversationID;
-
-    /**
-     * Injected reference to the call back.
-     */
-    @Callback
-    protected CallableReference<ConversationalServiceCallback> theCallbackRef;
-
-    /**
-     * Injected reference to the ComponentContext.
-     */
-    @Context
-    protected ComponentContext m_Ctx;
-
-    /**
-     * Some user data
-     */
-    private String m_UserData = DEFAULT_USER_DATA;
-
-    /**
-     * Constructor
-     */
-    public ConversationalServiceImpl() {
-    }
-
-    /**
-     * Used to inject the Conversation ID
-     * 
-     * @param a_ConversationID the Conversation ID
-     */
-    @ConversationID
-    public void setConversationID(Object a_ConversationID) {
-        m_ConversationID = a_ConversationID;
-    }
-
-    /**
-     * Retrieves the conversation ID for this Service
-     * 
-     * @return The conversation ID for this Service
-     */
-    public Object getConversationID() {
-        return m_ConversationID;
-    }
-
-    /**
-     * Creates a self reference to this Service
-     * 
-     * @return A self reference to this Service
-     */
-    public ServiceReference<ConversationalService> createSelfRef() {
-        return m_Ctx.createSelfReference(ConversationalService.class);
-    }
-
-    /**
-     * Sets some user data on the instance
-     * 
-     * @param a_Data Some data
-     * 
-     * @See {@link #getUserData()}
-     */
-    public void setUserData(String a_Data) {
-        m_UserData = a_Data;
-    }
-
-    /**
-     * Gets some user data on the instance
-     * 
-     * @return Some data
-     * 
-     * @See {@link #setUserData(String)}
-     */
-    public String getUserData() {
-        return m_UserData;
-    }
-
-    /**
-     * Method that triggers the callback.
-     * 
-     * @param msg A message to pass with the callback
-     * @throws Exception Test failed
-     */
-    public void triggerCallback(String msg) throws Exception {
-        Assert.assertNotNull(theCallbackRef);
-
-        // Serialize the CallableReference
-        byte[] serializedCR = ServiceReferenceUtils.serialize(theCallbackRef);
-        Assert.assertNotNull(serializedCR);
-
-        // Deserlaize the CallableReference
-        CallableReference<?> cr = ServiceReferenceUtils.deserializeCallableReference(serializedCR);
-        Assert.assertNotNull(cr);
-        CallableReference<ConversationalServiceCallback> regotCallbackRef 
-            = (CallableReference<ConversationalServiceCallback>) cr;
-
-        // Use the deseralized CallbackReference
-        regotCallbackRef.getService().callback(msg);
-    }
-}
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java b/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
deleted file mode 100644
index c268f9bda7..0000000000
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
+++ /dev/null
@@ -1,51 +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.itest.servicereference;
-
-
-/**
- * This is a test client that is used to test Serializing and Deserializing
- * ServiceReferences within a SCA Application
- * 
- * @version $Date$ $Revision$
- */
-public interface SCAManagedClient {
-
-    /**
-     * Tests Serializing a Stateless ServiceReference
-     * 
-     * @throws Exception Test failed
-     */
-    void testSerializeStatelessServiceReference() throws Exception;
-
-    /**
-     * Tests Serializing a Nested Stateless ServiceReference.
-     * 
-     * @throws Exception Test failed
-     */
-    void testSerializeNestedStatelessServiceReference() throws Exception;
-
-    /**
-     * Tests Serializing a Callback to a Stateless Service as managed
-     * SCA code
-     * 
-     * @throws Exception Test failed
-     */
-    void testSerializeCallbackToStatelessServiceInsideSCA() throws Exception;
-}
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java b/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
deleted file mode 100644
index 64c5e7e631..0000000000
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
+++ /dev/null
@@ -1,115 +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.itest.servicereference;
-
-import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This is a test client that is used to test Serializing and Deserializing
- * ServiceReferences within a SCA Application
- * 
- * @version $Date$ $Revision$
- */
-@Service(SCAManagedClient.class)
-public class SCAManagedClientImpl implements SCAManagedClient, StatelessServiceCallback {
-
-    /**
-     * Injected reference to the StatelessService
-     */
-    @Reference(name = "statelessService")
-    protected ServiceReference<StatelessService> statelessServiceRef;
-
-    /**
-     * Injected reference to the Nested StatelessService.
-     */
-    @Reference(name = "nestedStatelessService")
-    protected ServiceReference<StatelessService> nestedStatelessServiceRef;
-
-    /**
-     * Tests Serializing a Stateless ServiceReference
-     * 
-     * @throws Exception Test failed
-     */
-    public void testSerializeStatelessServiceReference() throws Exception {
-        doTestSerializeStatelessServiceReference(statelessServiceRef);
-    }
-    
-    /**
-     * Tests Serializing a Nested Stateless ServiceReference.
-     * 
-     * @throws Exception Test failed
-     */
-    public void testSerializeNestedStatelessServiceReference() throws Exception {
-        doTestSerializeStatelessServiceReference(nestedStatelessServiceRef);
-    }
-
-    /**
-     * Tests Serializing a Stateless ServiceReference.
-     * 
-     * @throws Exception Test failed
-     */
-    private void doTestSerializeStatelessServiceReference(
-            ServiceReference<StatelessService> aServiceRef) throws Exception {
-        Assert.assertNotNull(aServiceRef);
-
-        StatelessService service = aServiceRef.getService();
-        service.getCurrentTime();
-        
-        // Serialize the ServiceReference
-        byte[] serializedSR = ServiceReferenceUtils.serialize(aServiceRef);
-        Assert.assertNotNull(serializedSR);
-
-        // Deserialize the ServiceReference
-        ServiceReference<?> deserializedSR = ServiceReferenceUtils.deserializeServiceReference(serializedSR);
-        Assert.assertNotNull(deserializedSR);
-        ServiceReference<StatelessService> regotServiceRef = (ServiceReference<StatelessService>) deserializedSR;
-        Assert.assertNotNull(regotServiceRef);
-
-        // Use the ServiceReference to access the Service.
-        StatelessService regotService = regotServiceRef.getService();
-        Assert.assertNotNull(regotService);
-    }
-
-    /**
-     * Simple callback method
-     * 
-     * @param msg The call back message
-     */
-    public void callback(String msg) {
-        System.out.println("Stateless Callback with message " + msg);
-    }
-    
-    /**
-     * Tests Serializing a Callback to a Stateless Service as managed
-     * SCA code
-     * 
-     * @throws Exception Test failed
-     */
-    public void testSerializeCallbackToStatelessServiceInsideSCA() throws Exception {
-        Assert.assertNotNull(statelessServiceRef);
-
-        StatelessService service = statelessServiceRef.getService();
-        String msg = "A message for the callback " + System.currentTimeMillis();
-        service.triggerCallback(msg);
-    }
-}
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java b/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
deleted file mode 100644
index b233241514..0000000000
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.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 org.apache.tuscany.sca.itest.servicereference;
-
-import org.oasisopen.sca.annotation.Conversational;
-
-
-/**
- * This is a test client that is used to test Serializing and Deserializing
- * ServiceReferences within a SCA Application where the client that the Callback
- * is referring is actually Conversational.
- * 
- * @version $Rev$ $Date$
- */
-@Conversational
-public interface SCAManagedConversationalClient {
-
-    /**
-     * Tests Serializing a Conversational ServiceReference.
-     * 
-     * @throws Exception Test failed
-     */
-    void testSerializeConversationalServiceReference() throws Exception;
-
-    /**
-     * Tests Serializing a Nested Conversational ServiceReference.
-     * 
-     * @throws Exception Test failed
-     */
-    void testSerializeNestedConversationalServiceReference() throws Exception;
-
-    /**
-     * Tests Serializing a Callback to a Conversational Service as managed
-     * SCA code.
-     * 
-     * @throws Exception Test failed
-     */
-    void testSerializeCallbackToConversationalServiceInsideSCA() throws Exception;
-}
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java b/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
deleted file mode 100644
index 9e55eea7ee..0000000000
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
+++ /dev/null
@@ -1,132 +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.itest.servicereference;
-
-import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This is a test client that is used to test Serializing and Deserializing
- * ServiceReferences within a SCA Application
- * 
- * @version $Rev$ $Date$
- */
-@Service(SCAManagedConversationalClient.class)
-@Scope("CONVERSATION")
-public class SCAManagedConversationalClientImpl implements SCAManagedConversationalClient, ConversationalServiceCallback {
-
-    /**
-     * Injected reference to the ConversationalService.
-     */
-    @Reference(name = "conversationalService")
-    protected ServiceReference<ConversationalService> conversationalServiceRef;
-
-    /**
-     * Injected reference to the ConversationalService.
-     */
-    @Reference(name = "nestedConversationalService")
-    protected ServiceReference<ConversationalService> nestedConversationalServiceRef;
-
-    /**
-     * This is the message that we sent to the callback.
-     */
-    private String messageSentToCallback;
-
-    /**
-     * Tests Serializing a Conversational ServiceReference.
-     * 
-     * @throws Exception Test failed
-     */
-    public void testSerializeConversationalServiceReference() throws Exception {
-        doTestSerializeConversationalServiceReference(conversationalServiceRef);
-    }
-
-    /**
-     * Tests Serializing a Nested Conversational ServiceReference.
-     * 
-     * @throws Exception Test failed
-     */
-    public void testSerializeNestedConversationalServiceReference() throws Exception {
-        doTestSerializeConversationalServiceReference(nestedConversationalServiceRef);
-    }
-
-    /**
-     * Test Serializing a Conversational ServiceReference.
-     * 
-     * @param aServiceRef The Reference to Serialize
-     * @throws Exception Test failed.
-     */
-    private void doTestSerializeConversationalServiceReference(ServiceReference<ConversationalService> aServiceRef) throws Exception {
-        Assert.assertNotNull(aServiceRef);
-
-        ConversationalService service = aServiceRef.getService();
-        Object origConvID = service.getConversationID();
-        Assert.assertNotNull(origConvID);
-
-        // Serialize the ServiceReference
-        byte[] serializedSR = ServiceReferenceUtils.serialize(aServiceRef);
-        Assert.assertNotNull(serializedSR);
-
-        // Deserialize the ServiceReference
-        ServiceReference<?> deserializedSR = ServiceReferenceUtils.deserializeServiceReference(serializedSR);
-        Assert.assertNotNull(deserializedSR);
-        ServiceReference<ConversationalService> regotServiceRef = (ServiceReference<ConversationalService>) deserializedSR;
-        Assert.assertNotNull(regotServiceRef);
-
-        // Use the ServiceReference to access the Service.
-        ConversationalService regotService = regotServiceRef.getService();
-        Assert.assertNotNull(regotService);
-        Object regotConvID = regotService.getConversationID();
-        Assert.assertNotNull(regotConvID);
-
-        // Make sure we have the same Conversation ID
-        Assert.assertEquals(origConvID, regotConvID);
-    }
-
-
-    /**
-     * Tests Serializing a Callback to a Conversational Service as managed
-     * SCA code.
-     * 
-     * @throws Exception Test failed
-     */
-    public void testSerializeCallbackToConversationalServiceInsideSCA() throws Exception {
-        Assert.assertNotNull(conversationalServiceRef);
-
-        ConversationalService service = conversationalServiceRef.getService();
-        messageSentToCallback = "A message for the callback " + System.currentTimeMillis();
-        service.triggerCallback(messageSentToCallback);
-    }
-    
-    /**
-     * Simple callback method.
-     * 
-     * @param msg The call back message
-     */
-    public void callback(String msg) {
-        System.out.println("Stateless Callback with message " + msg);
-
-        // Make sure we received the message we expected
-        Assert.assertEquals(messageSentToCallback, msg);
-    }
-}
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java b/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
deleted file mode 100644
index 804debf30c..0000000000
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
+++ /dev/null
@@ -1,46 +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.itest.servicereference;
-
-import org.oasisopen.sca.annotation.Callback;
-
-
-/**
- * A very simple Stateless Service
- *
- * @version $Date$ $Revision$
- */
-@Callback(StatelessServiceCallback.class)
-public interface StatelessService {
-
-    /**
-     * Gets the current time
-     * 
-     * @return The current time
-     */
-    String getCurrentTime();
-
-    /**
-     * Method that triggers the callback
-     * 
-     * @param msg A message to pass with the callback
-     * @throws Exception Test failed
-     */
-    void triggerCallback(String msg) throws Exception;
-}
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java b/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
deleted file mode 100644
index ffe3a3b8ef..0000000000
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
+++ /dev/null
@@ -1,34 +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.itest.servicereference;
-
-/**
- * This is the callback for the StatelessService
- *
- * @version $Date$ $Revision$
- */
-public interface StatelessServiceCallback {
-
-    /**
-     * Simple callback method
-     * 
-     * @param msg The message for the call back
-     */
-    void callback(String msg);
-}
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java b/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
deleted file mode 100644
index 795f2d9c46..0000000000
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
+++ /dev/null
@@ -1,82 +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.itest.servicereference;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
-import org.junit.Assert;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Simple Stateless Service implementation
- * 
- * @version $Date$ $Revision$
- */
-@Service(StatelessService.class)
-public class StatelessServiceImpl implements StatelessService {
-
-    /**
-     * Injected reference to the call back
-     */
-    @Callback
-    protected CallableReference<StatelessServiceCallback> theCallbackRef;
-
-    /**
-     * Constructor
-     */
-    public StatelessServiceImpl() {
-    }
-
-    /**
-     * Gets the current time
-     * 
-     * @return The current time
-     */
-    public String getCurrentTime() {
-        SimpleDateFormat sdf = new SimpleDateFormat();
-        return sdf.format(new Date());
-    }
-
-    /**
-     * Method that triggers the callback
-     * 
-     * @param msg A message to pass with the callback
-     * @throws Exception Test failed
-     */
-    public void triggerCallback(String msg) throws Exception {
-        Assert.assertNotNull(theCallbackRef);
-
-        // Serialize the CallableReference
-        byte[] serializedCR = ServiceReferenceUtils.serialize(theCallbackRef);
-        Assert.assertNotNull(serializedCR);
-
-        // Deserlaize the CallableReference
-        CallableReference<?> cr = ServiceReferenceUtils.deserializeCallableReference(serializedCR);
-        Assert.assertNotNull(cr);
-        CallableReference<StatelessServiceCallback> regotCallbackRef 
-            = (CallableReference<StatelessServiceCallback>) cr;
-
-        // Use the deseralized CallbackReference
-        regotCallbackRef.getService().callback(msg);
-    }
-}
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java b/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
deleted file mode 100644
index bb8d40e788..0000000000
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
+++ /dev/null
@@ -1,127 +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.itest.servicereference.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ServiceReference;
-
-/**
- * Utility methods that are used by the ServiceReference Serialization tests
- * 
- * @version $Date $Revision$
- */
-public final class ServiceReferenceUtils {
-
-    /**
-     * Constructor
-     */
-    private ServiceReferenceUtils() {
-    }
-
-    /**
-     * Serializes the specified Object to a byte[]
-     * 
-     * @param obj The Object to Serialize
-     * @return The Serialized Object as a byte[]
-     * @throws IOException Failed to Serialize the Object
-     */
-    public static byte[] serialize(Object obj) throws IOException {
-        ByteArrayOutputStream bos = null;
-        try {
-            ObjectOutputStream oos = null;
-            bos = new ByteArrayOutputStream();
-            try {
-                oos = new ObjectOutputStream(bos);
-                oos.writeObject(obj);
-                oos.flush();
-            } finally {
-                if (oos != null) {
-                    oos.close();
-                }
-            }
-        } finally {
-            if (bos != null) {
-                bos.close();
-            }
-        }
-
-        return bos.toByteArray();
-    }
-
-    /**
-     * Deserializes the specified byte[] into a ServiceReference
-     * 
-     * @param serializedSR The Serialized ServiceReference to deserialize
-     * @return The deserialized ServiceReference
-     * @throws IOException Failed to deserialize the ServiceReference
-     * @throws ClassNotFoundException Failed to deserialize the ServiceReference
-     */
-    public static ServiceReference<?> deserializeServiceReference(byte[] serializedSR)
-            throws IOException, ClassNotFoundException {
-        return (ServiceReference<?>) deserialize(serializedSR);
-    }
-
-    /**
-     * Deserializes the specified byte[] into a CallableReference
-     * 
-     * @param callableRef The Serialized CallableReference to deserialize
-     * @return The deserialized ServiceReference
-     * @throws IOException Failed to deserialize the CallableReference
-     * @throws ClassNotFoundException Failed to deserialize the CallableReference
-     */
-    public static CallableReference<?> deserializeCallableReference(byte[] callableRef)
-            throws IOException, ClassNotFoundException {
-        return (CallableReference<?>) deserialize(callableRef);
-    }
-
-    /**
-     * Deserializes the specified byte[] into an Object
-     * 
-     * @param serializedObj The Serialized Object to deserialize
-     * @return The deserialized Object
-     * @throws IOException Failed to deserialize the Object
-     * @throws ClassNotFoundException Failed to deserialize the Object
-     */
-    public static Object deserialize(byte[] serializedSR) throws IOException, ClassNotFoundException {
-        ByteArrayInputStream bis = null;
-        try {
-            ObjectInputStream ois = null;
-            bis = new ByteArrayInputStream(serializedSR);
-            try {
-                ois = new ObjectInputStream(bis);
-                Object obj = ois.readObject();
-                return obj;
-            } finally {
-                if (ois != null) {
-                    ois.close();
-                }
-            }
-        } finally {
-            if (bis != null) {
-                bis.close();
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite b/java/sca-contrib/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
deleted file mode 100644
index 28c32d6fa4..0000000000
--- a/java/sca-contrib/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
+++ /dev/null
@@ -1,45 +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
-    * 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="ServiceReferenceSerializationTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <component name="StatelessComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.StatelessServiceImpl" />
-    </component>
-
-    <component name="ConversationalComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.ConversationalServiceImpl" />
-    </component>
-
-    <component name="SCAManagedClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.SCAManagedClientImpl" />
-        <reference name="statelessService" target="StatelessComponent"/>
-        <reference name="nestedStatelessService" target="NestedComponent/StatelessNestedService"/>
-    </component>
-
-    <component name="SCAManagedConversationalClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.SCAManagedConversationalClientImpl" />
-        <reference name="conversationalService" target="ConversationalComponent"/>
-        <reference name="nestedConversationalService" target="NestedComponent/ConversationalNestedService"/>
-    </component>
-
-    <component name="NestedComponent">
-        <implementation.composite name="foo:NestedComposite" />
-    </component>
-</composite>
diff --git a/java/sca-contrib/itest/serialization/src/main/resources/nestedcomposite.composite b/java/sca-contrib/itest/serialization/src/main/resources/nestedcomposite.composite
deleted file mode 100644
index 8e1a132b0a..0000000000
--- a/java/sca-contrib/itest/serialization/src/main/resources/nestedcomposite.composite
+++ /dev/null
@@ -1,33 +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
-    * 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="NestedComposite" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <service name="StatelessNestedService" promote = "StatelessNestedComponent"/>
-    
-    <service name="ConversationalNestedService" promote = "ConversationalNestedComponent"/>
-
-    <component name="StatelessNestedComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.StatelessServiceImpl" />
-    </component>
-
-    <component name="ConversationalNestedComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.ConversationalServiceImpl" />
-    </component>
-</composite>
diff --git a/java/sca-contrib/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java b/java/sca-contrib/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
deleted file mode 100644
index 76e77284fb..0000000000
--- a/java/sca-contrib/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
+++ /dev/null
@@ -1,145 +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.itest.servicereference;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * A test case that will attempt to Serialize and Deserialize Service References
- * 
- * @version $Date$ $Revision$
- */
-public class SerializeServiceReferenceTestCase {
-    /**
-     * Reference to the SCA Domain
-     */
-    private static SCADomain domain;
-
-    /**
-     * Initialise the SCA Domain
-     * 
-     * @throws Exception Failed to initialise the SCA Domain
-     */
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("ServiceReferenceSerializationTest.composite");
-        Assert.assertNotNull(domain);
-    }
-
-    /**
-     * Shutdown the SCA Domain
-     * 
-     * @throws Exception Failed to shutdown the SCA Domain
-     */
-    @AfterClass
-    public static void destroy() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    /**
-     * Tests Serializing a Stateless ServiceReference as managed
-     * SCA code
-     * 
-     * @throws Exception Test failed
-     */
-    @Test
-    public void testSerializeStatelessServiceReferenceInsideSCA() throws Exception {
-        SCAManagedClient client = domain.getService(
-                SCAManagedClient.class, "SCAManagedClientComponent");
-
-        client.testSerializeStatelessServiceReference();
-    }
-
-    /**
-     * Tests Serializing a Nested Stateless ServiceReference as managed
-     * SCA code.
-     * 
-     * @throws Exception Test failed
-     */
-    @Test
-    public void testSerializeNestedStatelessServiceReferenceInsideSCA() throws Exception {
-        SCAManagedClient client = domain.getService(
-                SCAManagedClient.class, "SCAManagedClientComponent");
-
-        client.testSerializeNestedStatelessServiceReference();
-    }
-
-    /**
-     * Tests Serializing a Conversational ServiceReference as managed
-     * SCA code
-     * 
-     * @throws Exception Test failed
-     */
-    @Test
-    public void testSerializeConversationalServiceReferenceInsideSCA() throws Exception {
-        SCAManagedConversationalClient client = domain.getService(
-                SCAManagedConversationalClient.class, "SCAManagedConversationalClientComponent");
-
-        client.testSerializeConversationalServiceReference();
-    }
-
-    /**
-     * Tests Serializing a Nested Conversational ServiceReference as managed
-     * SCA code.
-     * 
-     * @throws Exception Test failed
-     */
-    @Test
-    public void testSerializeNestedConversationalServiceReferenceInsideSCA() throws Exception {
-        SCAManagedConversationalClient client = domain.getService(
-                SCAManagedConversationalClient.class, "SCAManagedConversationalClientComponent");
-
-        client.testSerializeNestedConversationalServiceReference();
-    }
-
-    /**
-     * Tests Serializing a Callback to a Stateless Service as managed
-     * SCA code
-     * 
-     * @throws Exception Test failed
-     */
-    @Test
-    public void testSerializeCallbackToStatelessServiceInsideSCA() throws Exception {
-        SCAManagedClient client = domain.getService(
-                SCAManagedClient.class, "SCAManagedClientComponent");
-
-        client.testSerializeCallbackToStatelessServiceInsideSCA();
-    }
-
-    /**
-     * Tests Serializing a Callback to a Conversational Service as managed
-     * SCA code.
-     * 
-     * @throws Exception Test failed
-     */
-    @Test
-    public void testSerializeCallbackToConversationalServiceInsideSCA() throws Exception {
-        SCAManagedConversationalClient client = domain.getService(
-                SCAManagedConversationalClient.class, "SCAManagedConversationalClientComponent");
-
-        client.testSerializeCallbackToConversationalServiceInsideSCA();
-    }
-}
diff --git a/java/sca-contrib/itest/spring/pom.xml b/java/sca-contrib/itest/spring/pom.xml
deleted file mode 100644
index ce5e060d46..0000000000
--- a/java/sca-contrib/itest/spring/pom.xml
+++ /dev/null
@@ -1,105 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-spring</artifactId>
-    <name>Apache Tuscany SCA Implementation.spring Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-logging</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <!-- Spring dependencies... -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>2.5.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>2.5.5</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/java/sca-contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
deleted file mode 100644
index 833cc50f71..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ /dev/null
@@ -1,38 +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 bigbank.stockquote;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the StockQuote service.

- */

-@Service(StockQuoteService.class)

-public class StockQuoteImpl implements StockQuoteService {

-

-    public double getQuote(String symbol) {

-        double price = 104.0 + Math.random();

-        price = ((int)(price * 100)) / 100.0;

-

-        System.out.println("Getting stock quote for: " + symbol + ", value: "+ price);

-

-        return price;

-    }

-

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/java/sca-contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
deleted file mode 100644
index d6db2bd182..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ /dev/null
@@ -1,30 +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 bigbank.stockquote;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * This is the business interface of the StockQuote service.

- */

-@Remotable

-public interface StockQuoteService {

-

-    public double getQuote(String symbol);

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/AddService.java b/java/sca-contrib/itest/spring/src/main/java/calculator/AddService.java
deleted file mode 100644
index 5a1e7a638a..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The Add service interface

- */

-public interface AddService {

-

-    double add(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/itest/spring/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index a597691905..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-import java.util.logging.Level;

-import java.util.logging.Logger;

-

-/**

- * An implementation of the Add service

- */

-public class AddServiceImpl implements AddService {

-

-    public double add(double n1, double n2) {

-        Logger logger = Logger.getLogger("calculator");

-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);

-        return n1 + n2;

-    }

-

-}
\ No newline at end of file
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/itest/spring/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ad87375529..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-

-/**

- * The Calculator service interface.

- */

-public interface CalculatorService {

-

-    double add(double n1, double n2);

-

-    double subtract(double n1, double n2);

-

-    double multiply(double n1, double n2);

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 4363650e52..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,79 +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 calculator;

-

-/**

- * An implementation of the Calculator service.

- */

-public class CalculatorServiceImpl implements CalculatorService {

-

-    private AddService addService;

-    private SubtractService subtractService;

-    private MultiplyService multiplyService;

-    private DivideService divideService;

-

-    public void setAddService(AddService addService) {

-        this.addService = addService;

-    }

-    

-    public AddService getAddService() {

-        return addService;

-    }

-

-    public void setSubtractService(SubtractService subtractService) {

-        this.subtractService = subtractService;

-    }

-    

-    public SubtractService getSubtractService() {

-        return subtractService;

-    }

-    

-    public void setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-    

-    public DivideService getDivideService() {

-        return divideService;

-    }

-    

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-    

-    public MultiplyService getMultiplyService() {

-        return multiplyService;

-    }

-

-    public double add(double n1, double n2) {

-        return addService.add(n1, n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        return multiplyService.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        return divideService.divide(n1, n2);

-    }

-

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/DivideService.java b/java/sca-contrib/itest/spring/src/main/java/calculator/DivideService.java
deleted file mode 100644
index ef6a8b375b..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The divide service interface

- */

-public interface DivideService {

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/itest/spring/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index cd91935f08..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-import java.util.logging.Level;

-import java.util.logging.Logger;

-

-/**

- * An implementation of the Divide service.

- */

-public class DivideServiceImpl implements DivideService {

-

-    public double divide(double n1, double n2) {

-        Logger logger = Logger.getLogger("calculator");

-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);

-        return n1 / n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/itest/spring/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the multiply service

- */

-public interface MultiplyService {

-

-    double multiply(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c85357fcd8..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-import java.util.logging.Level;

-import java.util.logging.Logger;

-

-/**

- * An implementation of the Multiply service.

- */

-public class MultiplyServiceImpl implements MultiplyService {

-

-    public double multiply(double n1, double n2) {

-        Logger logger = Logger.getLogger("calculator");

-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);

-        return n1 * n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/SubtractService.java b/java/sca-contrib/itest/spring/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 56ee372fc4..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the multiply service

- */

-public interface SubtractService {

-

-    double subtract(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1b669084d9..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-import java.util.logging.Level;

-import java.util.logging.Logger;

-

-/**

- * An implementation of the subtract service.

- */

-public class SubtractServiceImpl implements SubtractService {

-

-    public double subtract(double n1, double n2) {

-        Logger logger = Logger.getLogger("calculator");

-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);

-        return n1 - n2;

-    }

-

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/java/sca-contrib/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
deleted file mode 100644
index b48fb90148..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ /dev/null
@@ -1,50 +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 calculator.security;

-

-import java.io.IOException;

-

-import javax.security.auth.callback.Callback;

-import javax.security.auth.callback.CallbackHandler;

-import javax.security.auth.callback.NameCallback;

-import javax.security.auth.callback.PasswordCallback;

-import javax.security.auth.callback.UnsupportedCallbackException;

-

-/**

- * @version $Rev$ $Date$

- */

-public class CalculatorCallbackHandler implements CallbackHandler {

-

-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {

-        for (int i = 0; i < callbacks.length; i++) {

-            if (callbacks[i] instanceof NameCallback) {

-                NameCallback nc = (NameCallback)callbacks[i];

-                nc.setName("CalculatorUser");

-            } else if (callbacks[i] instanceof PasswordCallback) {

-                PasswordCallback pc = (PasswordCallback)callbacks[i];

-                pc.setPassword("CalculatorUserPasswd".toCharArray());

-            } else {

-                throw new UnsupportedCallbackException

-                 (callbacks[i], "Unsupported Callback!");

-            }

-          }

-    }

-

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/security/JaasLoginModule.java b/java/sca-contrib/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
deleted file mode 100644
index fe4097640b..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
+++ /dev/null
@@ -1,178 +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 calculator.security;

-

-import java.security.Principal;

-import java.util.Map;

-

-import javax.security.auth.Subject;

-import javax.security.auth.callback.Callback;

-import javax.security.auth.callback.CallbackHandler;

-import javax.security.auth.callback.NameCallback;

-import javax.security.auth.callback.PasswordCallback;

-import javax.security.auth.login.LoginException;

-import javax.security.auth.spi.LoginModule;

-

-/**

- * @version $Rev$ $Date$

- */

-public class JaasLoginModule implements LoginModule {

-

-    private CallbackHandler callbackHandler;

-    private Subject subject;

-    private Principal userPrincipal;

-    private String userId;

-    private String password;

-    private boolean succeeded;

-    private boolean commitSucceeded;

-

-    public void initialize(Subject subject,

-                           CallbackHandler callbackHandler,

-                           Map<String, ?> sharedState,

-                           Map<String, ?> options) {

-        this.callbackHandler = callbackHandler;

-        this.subject = subject;

-    }

-

-    public boolean login() throws LoginException {

-        Callback[] callbacks = new Callback[2];

-        callbacks[0] = new NameCallback("UserId:");

-        callbacks[1] = new PasswordCallback("Password:", false);

-

-        try {

-            callbackHandler.handle(callbacks);

-            userId = ((NameCallback)callbacks[0]).getName();

-            password = new String(((PasswordCallback)callbacks[1]).getPassword());

-

-            if (userId.equals("CalculatorUser") && password.equals("CalculatorUserPasswd")) {

-                System.out.println("Successfully AUTHENTICATED!!");

-                succeeded = true;

-                return true;

-            } else {

-                System.out.println("Incorrect userId / password! AUTHENTICATION FAILED!!");

-                return false;

-            }

-        } catch (Exception e) {

-            e.printStackTrace();

-            return false;

-        }

-    }

-

-    /**

-     * <p> This method is called if the LoginContext's

-     * overall authentication succeeded

-     * (the relevant REQUIRED, REQUISITE, SUFFICIENT and OPTIONAL LoginModules

-     * succeeded).

-     *

-     * <p> If this LoginModule's own authentication attempt

-     * succeeded (checked by retrieving the private state saved by the

-     * <code>login</code> method), then this method associates a

-     * <code>UserPrincipal</code>

-     * with the <code>Subject</code> located in the

-     * <code>LoginModule</code>.  If this LoginModule's own

-     * authentication attempted failed, then this method removes

-     * any state that was originally saved.

-     *

-     * <p>

-     *

-     * @exception LoginException if the commit fails.

-     *

-     * @return true if this LoginModule's own login and commit

-     *          attempts succeeded, or false otherwise.

-     */

-    public boolean commit() throws LoginException {

-        if (succeeded == false) {

-            return false;

-        } else {

-            // add a Principal (authenticated identity) to the Subject

-

-            // assume the user we authenticated is the UserPrincipal

-            userPrincipal = new UserPrincipal(userId);

-            if (!subject.getPrincipals().contains(userPrincipal))

-                subject.getPrincipals().add(userPrincipal);

-

-            // in any case, clean out state

-            userId = null;

-            password = null;

-            commitSucceeded = true;

-            return true;

-        }

-    }

-

-    /**

-     * <p> This method is called if the LoginContext's

-     * overall authentication failed.

-     * (the relevant REQUIRED, REQUISITE, SUFFICIENT and OPTIONAL LoginModules

-     * did not succeed).

-     *

-     * <p> If this LoginModule's own authentication attempt

-     * succeeded (checked by retrieving the private state saved by the

-     * <code>login</code> and <code>commit</code> methods),

-     * then this method cleans up any state that was originally saved.

-     *

-     * <p>

-     *

-     * @exception LoginException if the abort fails.

-     *

-     * @return false if this LoginModule's own login and/or commit attempts

-     *          failed, and true otherwise.

-     */

-    public boolean abort() throws LoginException {

-        if (succeeded == false) {

-            return false;

-        } else if (succeeded == true && commitSucceeded == false) {

-            // login succeeded but overall authentication failed

-            succeeded = false;

-            userId = null;

-            password = null;

-            userPrincipal = null;

-        } else {

-            // overall authentication succeeded and commit succeeded,

-            // but someone else's commit failed

-            logout();

-        }

-        return true;

-    }

-

-    /**

-     * Logout the user.

-     *

-     * <p> This method removes the <code>SimplePrincipal</code>

-     * that was added by the <code>commit</code> method.

-     *

-     * <p>

-     *

-     * @exception LoginException if the logout fails.

-     *

-     * @return true in all cases since this <code>LoginModule</code>

-     *          should not be ignored.

-     */

-    public boolean logout() throws LoginException {

-        subject.getPrincipals().remove(userPrincipal);

-        succeeded = false;

-        succeeded = commitSucceeded;

-        userId = null;

-        if (password != null)

-            password = null;

-        userPrincipal = null;

-        return true;

-    }

-

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/security/UserPrincipal.java b/java/sca-contrib/itest/spring/src/main/java/calculator/security/UserPrincipal.java
deleted file mode 100644
index 09024197db..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/security/UserPrincipal.java
+++ /dev/null
@@ -1,66 +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 calculator.security;

-

-import java.security.Principal;

-

-/**

- * @version $Rev: 637276 $ $Date: 2008-03-15 03:05:34 +0530 (Sat, 15 Mar 2008) $

- */

-public class UserPrincipal implements Principal {

-

-    private final String name;

-

-    public UserPrincipal(String name) {

-        if (name == null)

-            throw new IllegalArgumentException("name cannot be null");

-        this.name = name;

-    }

-

-    public String getName() {

-        return name;

-    }

-

-    public String toString() {

-        return name;

-    }

-

-    @Override

-    public int hashCode() {

-        final int prime = 31;

-        int result = 1;

-        result = prime * result + ((name == null) ? 0 : name.hashCode());

-        return result;

-    }

-

-    @Override

-    public boolean equals(Object obj) {

-        if (this == obj)

-            return true;

-        if (obj == null)

-            return false;

-        if (getClass() != obj.getClass())

-            return false;

-        final UserPrincipal other = (UserPrincipal)obj;

-        if (name == null) {

-            if (other.name != null)

-                return false;

-        } else if (!name.equals(other.name))

-            return false;

-        return true;

-    }

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java b/java/sca-contrib/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
deleted file mode 100644
index dea3790494..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package context.access;

-

-import org.springframework.beans.BeansException;   

-import org.springframework.context.ApplicationContext;   

-import org.springframework.context.ApplicationContextAware;

-

-public class SCAApplicationContextProvider implements ApplicationContextAware {

-    

-    private static ApplicationContext ctx;

-    

-    public void setApplicationContext(ApplicationContext appContext) throws BeansException {

-        // Wiring the ApplicationContext into a static method           

-        ctx = appContext;      

-    }

-    

-    public static ApplicationContext getApplicationContext() {           

-        return ctx;       

-    }

-}

diff --git a/java/sca-contrib/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/java/sca-contrib/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
deleted file mode 100644
index 000b135f01..0000000000
--- a/java/sca-contrib/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,131 +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 spring.annotations;

-

-import org.oasisopen.sca.annotation.Destroy;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Service;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.ComponentName;

-

-import calculator.AddService;

-import calculator.CalculatorService;

-import calculator.DivideService;

-import calculator.MultiplyService;

-import calculator.SubtractService;

-

-/**

- * An implementation of the Calculator service.

- */

-@Service(CalculatorService.class)

-public class CalculatorServiceImpl implements AddService, SubtractService, MultiplyService, DivideService {

-    

-    public AddService addService;  // setter injection

-    

-    @Reference

-    public SubtractService subtractService;  // field injection

-    

-    @Reference(name="multiplyService", required=false)

-    public MultiplyService multiply;  // field injection (different reference and field name)

-    

-    public DivideService divide;  // setter injection (different reference and field name)

-    

-    public String message;  // setter injection

-    

-    @Property(name="message", required=false)

-    public String message2;  // field injection

-    

-    public String componentName;

-    

-    @Init

-    public void initMethod () {

-        System.out.println("Init method is sucessfully called.....");

-        // Property value should be null here.

-        System.out.println("Property Value message is...." + message);

-    }

-    

-    @Destroy

-    public void destroyMethod () {

-        System.out.println("Component Name is...." + componentName);

-        System.out.println("Property Value message is...." + message);

-        System.out.println("Property Value message2 is...." + message2);

-        System.out.println("Destroy method is sucessfully called.....");

-    }

-

-    @Reference

-    public void setAddService(AddService addService) {

-        this.addService = addService;

-    }

-    

-    public AddService getAddService() {

-        return addService;

-    }

-

-    /*public void setSubtractService(SubtractService subtractService) {

-        this.subtractService = subtractService;

-    }

-    

-    public SubtractService getSubtractService() {

-        return subtractService;

-    }*/    

-    

-    @Reference(name="divideService", required=false)

-    public void setDivideService(DivideService divide) {

-        this.divide = divide;

-    }

-    

-    public DivideService getDivideService() {

-        return divide;

-    }

-    

-    /*public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-    

-    public MultiplyService getMultiplyService() {

-        return multiplyService;

-    }*/

-    

-    @ComponentName

-    public void setComponentName(String componentName) {

-        this.componentName = componentName;

-    }

-    

-    @Property

-    public void setMessage(String message) {

-        this.message = message;

-    }    

-

-    public double add(double n1, double n2) {

-        return addService.add(n1, n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        return multiply.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        return divide.divide(n1, n2);

-    }

-}

diff --git a/java/sca-contrib/itest/spring/src/main/resources/CalculatorService-context.xml b/java/sca-contrib/itest/spring/src/main/resources/CalculatorService-context.xml
deleted file mode 100644
index 7c84965629..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/CalculatorService-context.xml
+++ /dev/null
@@ -1,39 +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.    

--->

-<beans xmlns="http://www.springframework.org/schema/beans"

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

-       xmlns:sca="http://www.springframework.org/schema/sca"

-       xsi:schemaLocation="

-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

-

-    <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl">        

-        <property name="addService" ref="addService"/>

-        <property name="subtractService" ref="subtractService"/>

-        <property name="multiplyService" ref="multiplyService"/>

-        <property name="divideService" ref="divideService"/>

-    </bean>

-

-    <sca:reference name="addService" type="calculator.AddService"/>

-    <sca:reference name="subtractService" type="calculator.SubtractService"/>   

-    <sca:reference name="multiplyService" type="calculator.MultiplyService"/>    

-    <sca:reference name="divideService" type="calculator.DivideService"/>

-

-</beans>

diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
deleted file mode 100644
index 18ab7e332d..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
+++ /dev/null
@@ -1,37 +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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="delegateBean" 
-         class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-    <bean id="testBean" 
-         class="org.apache.tuscany.sca.itest.spring.TestHelloWorldDelegatorBean" lazy-init="true">
-         <property name="delegate"><ref bean="delegateBean"/></property>
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
deleted file mode 100644
index 62e4e077b6..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ /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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
deleted file mode 100644
index 87458b99a3..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
+++ /dev/null
@@ -1,45 +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.    

--->

-<beans xmlns="http://www.springframework.org/schema/beans"

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

-       xmlns:sca="http://www.springframework.org/schema/sca"

-       xsi:schemaLocation="

-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

-  

-    <sca:service name="CalculatorService"

-        type="calculator.CalculatorService" target="CalculatorServiceBean"/>

-

-    <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl">        

-        <property name="addService" ref="addService"/>

-        <property name="subtractService" ref="subtractService"/>

-        <property name="multiplyService" ref="multiplyService"/>

-        <property name="divideService" ref="divideService"/>

-    </bean>

-    

-    <bean id="contextAccess" class="context.access.SCAApplicationContextProvider">

-    </bean>

-    

-    <sca:reference name="addService" type="calculator.AddService"/>

-    <sca:reference name="subtractService" type="calculator.SubtractService"/>   

-    <sca:reference name="multiplyService" type="calculator.MultiplyService"/>    

-    <sca:reference name="divideService" type="calculator.DivideService"/>

-

-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
deleted file mode 100644
index 7c84965629..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
+++ /dev/null
@@ -1,39 +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.    

--->

-<beans xmlns="http://www.springframework.org/schema/beans"

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

-       xmlns:sca="http://www.springframework.org/schema/sca"

-       xsi:schemaLocation="

-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

-

-    <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl">        

-        <property name="addService" ref="addService"/>

-        <property name="subtractService" ref="subtractService"/>

-        <property name="multiplyService" ref="multiplyService"/>

-        <property name="divideService" ref="divideService"/>

-    </bean>

-

-    <sca:reference name="addService" type="calculator.AddService"/>

-    <sca:reference name="subtractService" type="calculator.SubtractService"/>   

-    <sca:reference name="multiplyService" type="calculator.MultiplyService"/>    

-    <sca:reference name="divideService" type="calculator.DivideService"/>

-

-</beans>

diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
deleted file mode 100644
index 3faed92fd2..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
+++ /dev/null
@@ -1,29 +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.    

--->

-<beans xmlns="http://www.springframework.org/schema/beans"

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

-       xmlns:sca="http://www.springframework.org/schema/sca"

-       xsi:schemaLocation="

-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

-       

-    <import resource="CalculatorService-context.xml"/>

-    

-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
deleted file mode 100644
index 74473073ea..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
+++ /dev/null
@@ -1,36 +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.    

--->

-<beans xmlns="http://www.springframework.org/schema/beans"

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

-       xmlns:sca="http://www.springframework.org/schema/sca"

-       xsi:schemaLocation="

-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

-       

-    <sca:service name="StockQuoteService"

-        type="bigbank.stockquote.StockQuoteService" target="StockQuoteServiceBean"/>

-

-    <bean id="StockQuoteServiceBean" class="bigbank.stockquote.StockQuoteImpl">

-    </bean>

-    

-    <bean id="applicationContextProvider" class="context.access.SCAApplicationContextProvider">

-    </bean>

-

-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
deleted file mode 100644
index fb4be314b6..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
+++ /dev/null
@@ -1,34 +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.    

--->

-<beans xmlns="http://www.springframework.org/schema/beans"

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

-       xmlns:sca="http://www.springframework.org/schema/sca"

-       xsi:schemaLocation="

-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

-       

-    <bean id="beanRefFactory" class="org.springframework.context.support.ClassPathXmlApplicationContext">

-	   <constructor-arg>

-		  <list>

-			 <value>META-INF/sca/context-multiple/StockQuoteService-context.xml</value>

-		  </list>

-	   </constructor-arg>

-    </bean>

-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
deleted file mode 100644
index 7c84965629..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
+++ /dev/null
@@ -1,39 +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.    

--->

-<beans xmlns="http://www.springframework.org/schema/beans"

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

-       xmlns:sca="http://www.springframework.org/schema/sca"

-       xsi:schemaLocation="

-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

-

-    <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl">        

-        <property name="addService" ref="addService"/>

-        <property name="subtractService" ref="subtractService"/>

-        <property name="multiplyService" ref="multiplyService"/>

-        <property name="divideService" ref="divideService"/>

-    </bean>

-

-    <sca:reference name="addService" type="calculator.AddService"/>

-    <sca:reference name="subtractService" type="calculator.SubtractService"/>   

-    <sca:reference name="multiplyService" type="calculator.MultiplyService"/>    

-    <sca:reference name="divideService" type="calculator.DivideService"/>

-

-</beans>

diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
deleted file mode 100644
index 4110a9a7b7..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
+++ /dev/null
@@ -1,41 +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.    

--->

-<beans xmlns="http://www.springframework.org/schema/beans"

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

-       xmlns:sca="http://www.springframework.org/schema/sca"

-       xsi:schemaLocation="

-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

-

-    <bean id="CalculatorServiceBean" class="spring.annotations.CalculatorServiceImpl">        

-        <property name="addService" ref="addService"/>

-        <!-- <property name="subtractService" ref="subtractService"/>

-        <property name="multiplyService" ref="multiplyService"/> -->

-        <property name="divideService" ref="divideService"/>

-    </bean>   

-    

-    <sca:reference name="addService" type="calculator.AddService"/>

-    <sca:reference name="subtractService" type="calculator.SubtractService"/>   

-    <sca:reference name="multiplyService" type="calculator.MultiplyService"/> 

-    <sca:reference name="divideService" type="calculator.DivideService"/>

-    

-    <sca:property id="msg" name="message" type="java.lang.String"/>

-

-</beans>

diff --git a/java/sca-contrib/itest/spring/src/main/resources/context/access/Calculator.composite b/java/sca-contrib/itest/spring/src/main/resources/context/access/Calculator.composite
deleted file mode 100644
index 03116905fc..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/context/access/Calculator.composite
+++ /dev/null
@@ -1,49 +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://sample"

-           xmlns:sample="http://sample"

-           name="Calculator"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

-

-    <component name="CalculatorServiceComponent">

-        <implementation.spring location="META-INF/sca/context-access/CalculatorService-context.xml"/>

-        <reference name="addService" target="AddServiceComponent" />

-        <reference name="subtractService" target="SubtractServiceComponent" />

-        <reference name="multiplyService" target="MultiplyServiceComponent" />

-        <reference name="divideService" target="DivideServiceComponent" />

-    </component>

-

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl"/>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/spring/src/main/resources/context/imports/Calculator.composite b/java/sca-contrib/itest/spring/src/main/resources/context/imports/Calculator.composite
deleted file mode 100644
index 709de34a34..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/context/imports/Calculator.composite
+++ /dev/null
@@ -1,49 +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://sample"

-           xmlns:sample="http://sample"

-           name="Calculator"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

-

-    <component name="CalculatorServiceComponent">

-        <implementation.spring location="META-INF/sca/context-imports/SpringImport-context.xml"/>

-        <reference name="addService" target="AddServiceComponent" />

-        <reference name="subtractService" target="SubtractServiceComponent" />

-        <reference name="multiplyService" target="MultiplyServiceComponent" />

-        <reference name="divideService" target="DivideServiceComponent" />

-    </component>

-

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl"/>

-    </component>

-</composite>

diff --git a/java/sca-contrib/itest/spring/src/main/resources/context/multiple/StockQuote.composite b/java/sca-contrib/itest/spring/src/main/resources/context/multiple/StockQuote.composite
deleted file mode 100644
index 3838515055..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/context/multiple/StockQuote.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"

-	xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-	targetNamespace="http://stockquote"

-	xmlns:hw="http://stockquote"

-    name="StockQuote">

-    

-    <service name="StockQuoteService" promote="StockQuoteServiceComponent">

-        <interface.java interface="bigbank.stockquote.StockQuoteService"/>

-        <binding.ws uri="http://localhost:8081/services/StockQuoteWebService"/>

-    </service>

-

-    <component name="StockQuoteServiceComponent">

-        <implementation.spring location="META-INF/sca/context-multiple/StockQuoteService-context.xml"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/Calculator.composite b/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/Calculator.composite
deleted file mode 100644
index 0551dc60ef..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/Calculator.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"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="Calculator"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

-

-    <component name="CalculatorServiceComponent">

-        <implementation.spring location="META-INF/sca/implementation-policies/CalculatorService-context.xml">		

-			<operation name="divide" requires="tuscany:logging"/>

-			<operation name="subtract" requires="tuscany:logging"/>

-		</implementation.spring>

-        <reference name="addService" target="AddServiceComponent" />

-        <reference name="subtractService" target="SubtractServiceComponent" />

-        <reference name="multiplyService" target="MultiplyServiceComponent" />

-        <reference name="divideService" target="DivideServiceComponent" />

-    </component>

-

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl" requires="tuscany:jaasAuthentication"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl"/>

-    </component>

-    

-    <component name="AnotherCalculatorServiceComponent">

-        <implementation.spring location="META-INF/sca/implementation-policies/CalculatorService-context.xml" requires="tuscany:logging"/>		

-        <reference name="addService" target="AddServiceComponent" />

-        <reference name="subtractService" target="SubtractServiceComponent" />

-        <reference name="multiplyService" target="MultiplyServiceComponent" />

-        <reference name="divideService" target="DivideServiceComponent" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config b/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
deleted file mode 100644
index 0e7cb86633..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
+++ /dev/null
@@ -1,3 +0,0 @@
-Calculator {

-  calculator.security.JaasLoginModule required debug=true;

-};

diff --git a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
deleted file mode 100644
index f62125eaa9..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
+++ /dev/null
@@ -1,18 +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.    

-CALLING_OPERATION=Inovoking operation {0} with arguments {1}

-OPERATION_RETURNED=Returning from operation {0} with return value {1}
\ No newline at end of file
diff --git a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/definitions.xml b/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/definitions.xml
deleted file mode 100644
index 992c1b92f5..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/definitions.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"

-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-    xmlns:calc="http://calculator">

-

-    <!-- PolicySets -->

-    <policySet name="JaasPolicy" provides="tuscany:jaasAuthentication" appliesTo="sca:implementation.java"

-        xmlns="http://www.osoa.org/xmlns/sca/1.0">

-        <tuscany:jaasAuthentication>

-            <tuscany:configurationName>Calculator</tuscany:configurationName>

-            <tuscany:callbackHandler>calculator.security.CalculatorCallbackHandler</tuscany:callbackHandler>

-        </tuscany:jaasAuthentication>

-    </policySet>

-

-    <!-- PolicySets -->

-    <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.spring"

-        xmlns="http://www.osoa.org/xmlns/sca/1.0">

-        <tuscany:jdkLogger name="calculator">

-            <logLevel>FINER</logLevel>

-        </tuscany:jdkLogger>

-    </policySet>

-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
deleted file mode 100644
index 70b2d5fdab..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ /dev/null
@@ -1,32 +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"
-           name="SpringHelloWorld">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.spring.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
-    </component>
-
-    <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/SpringDelegationHelloWorld-context.xml"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
deleted file mode 100644
index bab9ecb528..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ /dev/null
@@ -1,32 +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"
-           name="SpringHelloWorld">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.spring.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
-    </component>
-
-    <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/SpringHelloWorld-context.xml"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/spring/src/main/resources/spring/annotations/Calculator.composite b/java/sca-contrib/itest/spring/src/main/resources/spring/annotations/Calculator.composite
deleted file mode 100644
index a8a1f5b703..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/spring/annotations/Calculator.composite
+++ /dev/null
@@ -1,60 +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://sample"

-           xmlns:sample="http://sample"

-           name="Calculator"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

-

-    <component name="CalculatorServiceComponent">

-        <implementation.spring location="META-INF/sca/spring-annotation/CalculatorService-context.xml"/>

-        <property name="message">HelloWorld</property>

-        <reference name="addService" target="AddServiceComponent" />

-        <reference name="subtractService" target="SubtractServiceComponent" />

-        <reference name="multiplyService" target="MultiplyServiceComponent" />

-        <reference name="divideService" target="DivideServiceComponent" />        

-    </component>

-

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl"/>

-    </component>

-    

-    <!--<component name="AnotherCalculatorServiceComponent">

-        <implementation.spring location="META-INF/sca/spring-annotation/CalculatorService-context.xml"/>

-        <property name="message">HelloWorld</property>       

-        <reference name="addService" target="AddServiceComponent" />

-        <reference name="subtractService" target="SubtractServiceComponent" />

-        <reference name="multiplyService" target="MultiplyServiceComponent" />

-        <reference name="divideService" target="DivideServiceComponent" />

-    </component>

-    

---></composite>

diff --git a/java/sca-contrib/itest/spring/src/test/java/context/access/CalculatorClient.java b/java/sca-contrib/itest/spring/src/test/java/context/access/CalculatorClient.java
deleted file mode 100644
index 9b7202d951..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/context/access/CalculatorClient.java
+++ /dev/null
@@ -1,60 +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 context.access;

-

-import java.io.File;

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.springframework.context.ApplicationContext;

-

-import context.access.SCAApplicationContextProvider;

-import calculator.CalculatorService;

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * and locate and invoke a SCA component

- */

-public class CalculatorClient {

-    public static void main(String[] args) throws Exception {        

-        

-        SCANodeFactory factory = SCANodeFactory.newInstance();

-        SCANode node = factory.createSCANode(new File("src/main/resources/context/access/Calculator.composite").toURL().toString(),

-                new SCAContribution("TestContribution", new File("src/main/resources/context/access/").toURL().toString()));

-        node.start();

-        

-        // Code: To access the Spring Application Context instance

-        ApplicationContext ctx = SCAApplicationContextProvider.getApplicationContext();

-        if (ctx.containsBean("CalculatorServiceBean"))

-            System.out.println("CalculatorServiceBean is now available for use...");

-              

-        CalculatorService calculatorService = 

-            ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");

-                

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-

-        node.stop();

-    }

-

-}

diff --git a/java/sca-contrib/itest/spring/src/test/java/context/access/ContextAccessTestCase.java b/java/sca-contrib/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
deleted file mode 100644
index 5feb293bc8..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/context/access/ContextAccessTestCase.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 context.access;

-

-import junit.framework.TestCase;

-

-/**

- * Tests out the big bank service

- *

- */

-public class ContextAccessTestCase extends TestCase {

-

-    public void testServer() throws Exception {

-        CalculatorClient.main(new String[] {""});

-    }

-}

diff --git a/java/sca-contrib/itest/spring/src/test/java/context/imports/CalculatorClient.java b/java/sca-contrib/itest/spring/src/test/java/context/imports/CalculatorClient.java
deleted file mode 100644
index d3bd190cc0..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/context/imports/CalculatorClient.java
+++ /dev/null
@@ -1,54 +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 context.imports;

-

-import java.io.File;

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

-import org.apache.tuscany.sca.node.SCAContribution;

-

-import calculator.CalculatorService;

-

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * and locate and invoke a SCA component

- */

-public class CalculatorClient {

-    public static void main(String[] args) throws Exception {        

-        

-        SCANodeFactory factory = SCANodeFactory.newInstance();

-        SCANode node = factory.createSCANode(new File("src/main/resources/context/imports/Calculator.composite").toURL().toString(),

-                new SCAContribution("TestContribution", new File("src/main/resources/context/imports/").toURL().toString()));

-        node.start();        

-              

-        CalculatorService calculatorService = 

-            ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");

-        

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-

-        node.stop();

-    }

-

-}

diff --git a/java/sca-contrib/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java b/java/sca-contrib/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
deleted file mode 100644
index 3940bf65fa..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/context/imports/ContextImportsTestCase.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 context.imports;

-

-import junit.framework.TestCase;

-

-/**

- * Tests out the big bank service

- *

- */

-public class ContextImportsTestCase extends TestCase {

-

-    public void testServer() throws Exception {

-        CalculatorClient.main(new String[] {""});

-    }

-}

diff --git a/java/sca-contrib/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java b/java/sca-contrib/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
deleted file mode 100644
index 75b296bf32..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.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 context.multiple;

-

-import junit.framework.TestCase;

-

-/**

- * Tests out the big bank service

- *

- */

-public class MultipleContextTestCase extends TestCase {

-

-    public void testServer() throws Exception {

-        StockQuoteServer.main(new String[] {"1000"});

-    }

-}

diff --git a/java/sca-contrib/itest/spring/src/test/java/context/multiple/StockQuoteServer.java b/java/sca-contrib/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
deleted file mode 100644
index ca64d5fcb9..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
+++ /dev/null
@@ -1,51 +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 context.multiple;

-

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

-import org.springframework.context.ApplicationContext;

-import context.access.SCAApplicationContextProvider;

-

-/**

- * This server program shows how to bootstrap SCA from a simple J2SE program

- * and start it which activates the StockQuote Web service endpoint.

- */

-public class StockQuoteServer {

-

-    public static void main(String[] args) throws Exception {

-

-        System.out.println("Starting the Sample SCA StockQuote Service...");

-

-        SCANodeFactory factory = SCANodeFactory.newInstance();

-        SCANode node = factory.createSCANodeFromClassLoader("context/multiple/StockQuote.composite", StockQuoteServer.class.getClassLoader());

-        node.start();

-        

-        // Method 1: To access the Spring Application Context instance

-        ApplicationContext ctx = SCAApplicationContextProvider.getApplicationContext();

-        if (ctx.containsBean("StockQuoteServiceBean"))

-            System.out.println("StockQuoteServiceBean is now available for use...");        

-        

-        System.out.println("Press Enter to Exit...");

-        Thread.sleep(1000);

-

-        node.stop();

-        System.out.println("Bye");

-    }

-}

diff --git a/java/sca-contrib/itest/spring/src/test/java/implementation/policies/CalculatorClient.java b/java/sca-contrib/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
deleted file mode 100644
index 27e634d301..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
+++ /dev/null
@@ -1,78 +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 implementation.policies;

-

-import java.io.File;

-

-import javax.security.auth.login.Configuration;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

-

-import calculator.CalculatorService;

-import calculator.CalculatorServiceImpl;

-

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * and locate and invoke a SCA component

- */

-public class CalculatorClient {

-    public static void main(String[] args) throws Exception {

-        try {

-            Configuration secConf = Configuration.getConfiguration();

-        } catch (java.lang.SecurityException e) {

-            System.setProperty("java.security.auth.login.config", CalculatorClient.class.getClassLoader()

-                .getResource("implementation/policies/CalculatorJass.config").toString());

-        }

-

-        SCANodeFactory factory = SCANodeFactory.newInstance();

-        SCANode node = factory.createSCANodeFromClassLoader("implementation/policies/Calculator.composite", CalculatorServiceImpl.class.getClassLoader());

-        node.start();        

-              

-        CalculatorService calculatorService = 

-            ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");

-

-        // Calculate

-        System.out.println("Calling CalculatorServiceComponent configured with 'logging' " +

-                "policy for subtract and divide operations...");

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-        

-        calculatorService = 

-            ((SCAClient)node).getService(CalculatorService.class, "AnotherCalculatorServiceComponent");

-

-        // Calculate

-        System.out.println("Calling CalculatorServiceComponent configured with 'logging' " +

-                "for all operations in the implementation...");

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-

-        node.stop();

-        System.out.println("Bye");

-    }

-

-}

diff --git a/java/sca-contrib/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/java/sca-contrib/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
deleted file mode 100644
index 1e759f98a0..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.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 implementation.policies;

-

-import junit.framework.TestCase;

-

-/**

- * Tests out the big bank service

- *

- */

-public class ImplementationPoliciesTestCase extends TestCase {

-

-    public void testServer() throws Exception {

-        CalculatorClient.main(new String[] {""});

-    }

-}

diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
deleted file mode 100644
index 634e3d34af..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ /dev/null
@@ -1,40 +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.itest.spring;
-
-
-/**
- * Basic "hello world" style test case for testing Spring component implementation
- *
- */
-public abstract class AbstractHelloWorldTestCase extends AbstractSCATestCase<HelloWorld> {
-
-    /**
-     * Calls the hello world service and checks that it gives the right response...
-     */
-    public void testHello() throws Exception {
-        assertEquals("Hello petra", service.sayHello("petra"));
-    }
-
-    @Override
-    protected Class<HelloWorld> getServiceClass() {
-        return HelloWorld.class;
-    }
-}
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
deleted file mode 100644
index aeb7918add..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ /dev/null
@@ -1,51 +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.itest.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public abstract class AbstractSCATestCase<T> extends TestCase {
-
-    protected SCADomain domain;
-    protected T service;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance(getCompositeName());
-        service = domain.getService(getServiceClass(), "ClientComponent");
-    }
-
-    abstract protected Class<T> getServiceClass();
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-    protected String getCompositeName() {
-        String className = this.getClass().getName();
-        String compositeName = className.substring(0, className.length() - 8).replace('.', '/') + ".composite";
-        System.out.println("Using composite: " + compositeName);
-        return compositeName;
-    }
-
-}
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
deleted file mode 100644
index 5869d344f6..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ /dev/null
@@ -1,34 +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.itest.spring;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Interface for the "hello world" service - predictably simple with a single operation
- * "sayHello"
- *
- */
-@Remotable
-public interface HelloWorld {
-
-    public String sayHello(String s);
-
-}
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
deleted file mode 100644
index 90d26dd89f..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ /dev/null
@@ -1,41 +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.itest.spring;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * A simple proxy Java class which implements the HelloWorld interface but which uses
- * a reference "delegate" to actually provide the HelloWorld service
- *
- */
-public class HelloWorldProxy implements HelloWorld {
-
-    // Here is the reference "delegate" - it implements the HelloWorld interface...
-    @Reference
-    public HelloWorld delegate;
-
-    public String sayHello(String s) {
-        // Simply call the reference to satisfy the service request...
-        System.out.println("HelloWorldProxy - calling sayHello");
-        return delegate.sayHello(s);
-    }
-
-}
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
deleted file mode 100644
index 4088691ccd..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.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.itest.spring;
-
-/**
- * A basic test case of:
- * 1) A composite containing a component with a Spring implementation
- * 2) The composite has a component with a Java POJO implementation which uses the
- * Spring implementation to satisfy a reference
- *
- */
-public class SpringDelegationHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
deleted file mode 100644
index 840bf59b73..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.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 org.apache.tuscany.sca.itest.spring;
-
-/**
- * A basic test case of:
- * 1) A composite containing a component with a Spring implementation
- * 2) The composite has a component with a Java POJO implementation which uses the
- * Spring implementation to satisfy a reference
- * 3) The Spring component delegates function to a second spring bean
- *
- */
-public class SpringHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
deleted file mode 100644
index fa7967c964..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.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 org.apache.tuscany.sca.itest.spring;
-
-/**
- * A simple test Spring bean which provides the HelloWorld service
- *
- */
-
-public class TestHelloWorldBean implements HelloWorld {
-
-    static String hello = "Hello ";
-
-    // Classic "Hello xxx" response to any input message
-    public String sayHello(String message) {
-        System.out.println("TestHelloWorldBean - sayHello called");
-        return (hello + message);
-    }
-
-} // end class TestHelloWorldBean
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
deleted file mode 100644
index b57cc7f366..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ /dev/null
@@ -1,40 +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.itest.spring;
-
-/**
- * A simple test Spring bean which delgates to another bean
- *
- */
-
-public class TestHelloWorldDelegatorBean implements HelloWorld {
-
-	HelloWorld delegate;
-	
-	public void setDelegate(HelloWorld delegate) {
-		this.delegate = delegate;
-	}
-
-    // Classic "Hello xxx" response to any input message
-    public String sayHello(String message) {
-        System.out.println("TestHelloWorldDelegatorBean - sayHello called");
-        return delegate.sayHello(message);
-    }
-
-} 
diff --git a/java/sca-contrib/itest/spring/src/test/java/spring/annotations/CalculatorClient.java b/java/sca-contrib/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
deleted file mode 100644
index c21561a962..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
+++ /dev/null
@@ -1,65 +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 spring.annotations;

-

-import java.io.File;

-

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

-

-import calculator.CalculatorService;

-import calculator.CalculatorServiceImpl;

-

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * and locate and invoke a SCA component

- */

-public class CalculatorClient {

-    public static void main(String[] args) throws Exception {        

-

-        SCANodeFactory factory = SCANodeFactory.newInstance();

-        SCANode node = factory.createSCANode(new File("src/main/resources/spring/annotations/Calculator.composite").toURL().toString(),

-                new SCAContribution("TestContribution", new File("src/main/resources/spring/annotations/").toURL().toString()));

-        node.start();        

-              

-        CalculatorService calculatorService = 

-            ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");

-        

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-        

-        /*calculatorService = 

-            ((SCAClient)node).getService(CalculatorService.class, "AnotherCalculatorServiceComponent");

-

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));*/

-

-        node.stop();

-        System.out.println("Bye");

-    }

-

-}

diff --git a/java/sca-contrib/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/java/sca-contrib/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
deleted file mode 100644
index 3a9ec4bbb2..0000000000
--- a/java/sca-contrib/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.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 spring.annotations;

-

-import junit.framework.TestCase;

-

-/**

- * Tests out the big bank service

- *

- */

-public class SpringAnnotationsTestCase extends TestCase {

-

-    public void testServer() throws Exception {

-        CalculatorClient.main(new String[] {""});

-    }

-}

diff --git a/java/sca-contrib/itest/transaction/pom.xml b/java/sca-contrib/itest/transaction/pom.xml
deleted file mode 100644
index efdd2bf5a4..0000000000
--- a/java/sca-contrib/itest/transaction/pom.xml
+++ /dev/null
@@ -1,91 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-transaction</artifactId>
-    <name>Apache Tuscany SCA Transaction Policy Integration Test</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>4.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>4.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.3.1.4</version>
-        </dependency>
-
-        <!-- 
-            <dependency>
-            <groupId>jotm</groupId>
-            <artifactId>jotm</artifactId>
-            <version>2.0.10</version>
-            <exclusions>
-            <exclusion>
-            <artifactId>jta</artifactId>
-            <groupId>javax.transaction</groupId>
-            </exclusion>
-            <exclusion>
-            <artifactId>connector</artifactId>
-            <groupId>javax.resource</groupId>
-            </exclusion>
-            </exclusions>
-            </dependency>
-        -->
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java b/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
deleted file mode 100644
index d7d18181d9..0000000000
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.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 org.apache.tuscany.sca.itest.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public class AccountNotFoundException extends Exception {
-    private static final long serialVersionUID = -4709084750220950706L;
-
-    public AccountNotFoundException() {
-        super();
-    }
-
-    public AccountNotFoundException(String message) {
-        super(message);
-    }
-
-}
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java b/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
deleted file mode 100644
index ac986dd417..0000000000
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.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.itest.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface AccountService {
-    float getBalance(String accountNumber) throws AccountNotFoundException;
-
-    void deposit(String accountNumber, float amount) throws AccountNotFoundException;
-
-    void withdraw(String accountNumber, float amount) throws OverDraftException, AccountNotFoundException;
-}
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java b/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
deleted file mode 100644
index a6ea036da7..0000000000
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
+++ /dev/null
@@ -1,70 +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.itest.transaction;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public abstract class AccountServiceImpl implements AccountService {
-    protected Map<String, Float> accounts = new HashMap<String, Float>();
-
-    /**
-     * @see org.apache.tuscany.sca.itest.transaction.AccountService#deposit(String, float)
-     */
-    public void deposit(String accountNumber, float amount) throws AccountNotFoundException {
-        float balance = getBalance(accountNumber);
-        balance += amount;
-        save(accountNumber, balance);
-        accounts.put(accountNumber, balance);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.itest.transaction.AccountService#getBalance(String)
-     */
-    public float getBalance(String accountNumber) throws AccountNotFoundException {
-        Float balance = accounts.get(accountNumber);
-        if (balance == null) {
-            balance = load(accountNumber);
-            accounts.put(accountNumber, balance);
-        }
-        return balance;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.itest.transaction.AccountService#withdraw(String, float)
-     */
-    public void withdraw(String accountNumber, float amount) throws OverDraftException, AccountNotFoundException {
-        float balance = getBalance(accountNumber);
-        if (amount > balance) {
-            throw new OverDraftException("Insufficient fund");
-        }
-        balance -= amount;
-        save(accountNumber, balance);
-        accounts.put(accountNumber, balance);
-    }
-
-    protected abstract float load(String accountNumber) throws AccountNotFoundException;
-
-    protected abstract void save(String accountNumber, float balance) throws AccountNotFoundException;
-
-}
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java b/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
deleted file mode 100644
index 776d23407a..0000000000
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
+++ /dev/null
@@ -1,143 +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.itest.transaction;
-
-import java.io.File;
-import java.util.Enumeration;
-
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.QueueBrowser;
-import javax.jms.Session;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.ActiveMQSession;
-import org.apache.activemq.broker.BrokerService;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(AccountService.class)
-@Scope("COMPOSITE")
-public class CheckingAccountServiceImpl extends AccountServiceImpl {
-    private static final String url = "tcp://localhost:61616";
-    private BrokerService broker;
-    private Queue queue;
-
-    @Init
-    public void init() throws Exception {
-        broker = new BrokerService();
-        broker.setBrokerName("localhost");
-        broker.setPersistent(false);
-        broker.addConnector(url);
-        broker.start();
-
-        ActiveMQConnectionFactory connFac = new ActiveMQConnectionFactory(url);
-        Connection conn = connFac.createConnection();
-        ActiveMQSession session = (ActiveMQSession)conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
-        queue = session.createQueue("CheckAccounts");
-        MessageProducer producer = session.createProducer(queue);
-        MapMessage map = session.createMapMessage();
-
-        for (int i = 0; i < 3; i++) {
-            String accountNumber = "C00" + (i + 1);
-            float balance = (float)(1000.0 + Math.random() * 200.0);
-            map.setStringProperty("accountNumber", accountNumber);
-            map.setFloatProperty("balance", balance);
-
-            map.setString("accountNumber", accountNumber);
-            map.setFloat("balance", balance);
-
-            producer.send(map);
-        }
-        session.commit();
-        conn.close();
-    }
-
-    @Destroy
-    public void destroy() throws Exception {
-        if (broker != null) {
-            broker.stop();
-        }
-    }
-
-    @Override
-    protected float load(String accountNumber) throws AccountNotFoundException {
-        try {
-            ActiveMQConnectionFactory connFac = new ActiveMQConnectionFactory(url);
-            Connection conn = connFac.createConnection();
-            conn.start();
-            Session session = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
-            QueueBrowser browser = session.createBrowser(queue, "accountNumber = '" + accountNumber + "'");
-            Enumeration msgs = browser.getEnumeration();
-            if (msgs.hasMoreElements()) {
-                MapMessage msg = (MapMessage)msgs.nextElement();
-                float balance = msg.getFloat("balance");
-                conn.close();
-                return balance;
-            } else {
-                conn.close();
-                throw new AccountNotFoundException(accountNumber);
-            }
-        } catch (JMSException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    @Override
-    protected void save(String accountNumber, float balance) throws AccountNotFoundException {
-        try {
-            ActiveMQConnectionFactory connFac = new ActiveMQConnectionFactory(url);
-            Connection conn = connFac.createConnection();
-            conn.start();
-            ActiveMQSession session = (ActiveMQSession)conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
-            MessageConsumer consumer = session.createConsumer(queue, "accountNumber = '" + accountNumber + "'");
-            Message msg = consumer.receive(1000);
-            if (msg == null) {
-                conn.close();
-                throw new AccountNotFoundException(accountNumber);
-            }
-            MapMessage map = session.createMapMessage();
-            map.setStringProperty("accountNumber", accountNumber);
-            map.setFloatProperty("balance", balance);
-
-            map.setString("accountNumber", accountNumber);
-            map.setFloat("balance", balance);
-
-            MessageProducer producer = session.createProducer(queue);
-            producer.send(map);
-            conn.close();
-
-        } catch (JMSException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java b/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
deleted file mode 100644
index 4d504a6a36..0000000000
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.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 org.apache.tuscany.sca.itest.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public class OverDraftException extends Exception {
-    private static final long serialVersionUID = -4709084750220950706L;
-
-    public OverDraftException() {
-        super();
-    }
-
-    public OverDraftException(String message) {
-        super(message);
-    }
-
-}
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java b/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
deleted file mode 100644
index 6010d9abad..0000000000
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
+++ /dev/null
@@ -1,133 +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.itest.transaction;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.logging.Logger;
-
-import javax.sql.XAConnection;
-
-import org.apache.derby.jdbc.EmbeddedXADataSource;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(AccountService.class)
-@Scope("COMPOSITE")
-public class SavingsAccountServiceImpl extends AccountServiceImpl {
-    private final static Logger log = Logger.getLogger(SavingsAccountServiceImpl.class.getName());
-    private EmbeddedXADataSource xads;
-
-    @Init
-    public void init() throws SQLException {
-        // Create the database and a table
-        xads = new EmbeddedXADataSource();
-        xads.setDatabaseName("target/test");
-        xads.setCreateDatabase("create");
-
-        XAConnection xaconn = xads.getXAConnection();
-        Connection conn = xaconn.getConnection();
-        PreparedStatement ps =
-            conn.prepareStatement("create table SavingsAccounts(accountNumber char(100), balance float)");
-        try {
-            ps.execute();
-        } catch (SQLException ex) {
-            log.info(ex.getMessage());
-        }
-        ps = conn.prepareStatement("delete from SavingsAccounts");
-        ps.execute();
-        
-        ps = conn.prepareStatement("insert into SavingsAccounts(accountNumber, balance) values(?, ?)");
-        for (int i = 0; i < 2; i++) {
-            ps.setString(1, "S00" + (i+1));
-            ps.setFloat(2, (float)(1000.0f + Math.random() * 500.0));
-            ps.executeUpdate();
-        }
-        conn.commit();
-        conn.close();
-    }
-
-    @Override
-    protected float load(String accountNumber) throws AccountNotFoundException {
-        try {
-            XAConnection xaconn = xads.getXAConnection();
-
-            Connection conn = xaconn.getConnection();
-            PreparedStatement ps = conn.prepareStatement("select balance from SavingsAccounts where accountNumber=?");
-            ps.setString(1, accountNumber);
-            ResultSet rs1 = ps.executeQuery();
-            boolean found = rs1.next();
-            if (found) {
-                float balance = rs1.getFloat(1);
-                conn.commit();
-                conn.close();
-                return balance;
-            } else {
-                conn.commit();
-                conn.close();
-                throw new AccountNotFoundException(accountNumber);
-            }
-        } catch (SQLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    @Override
-    protected void save(String accountNumber, float balance) throws AccountNotFoundException {
-        try {
-            XAConnection xaconn = xads.getXAConnection();
-
-            Connection conn = xaconn.getConnection();
-            PreparedStatement ps = conn.prepareStatement("update SavingsAccounts set balance=? where accountNumber=?");
-            ps.setFloat(1, balance);
-            ps.setString(2, accountNumber);
-            int rows = ps.executeUpdate();
-            conn.commit();
-            boolean found = (rows >= 1);
-            if (found) {
-                conn.close();
-            } else {
-                conn.close();
-                throw new AccountNotFoundException(accountNumber);
-            }
-        } catch (SQLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    @Destroy
-    public void destroy() throws SQLException {
-        XAConnection xaconn = xads.getXAConnection();
-        Connection conn = xaconn.getConnection();
-        PreparedStatement ps = conn.prepareStatement("drop table SavingsAccounts");
-        ps.execute();
-        conn.commit();
-        conn.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java b/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
deleted file mode 100644
index b7ea5f2663..0000000000
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.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.itest.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TransferService {
-    String[] getAccounts();
-
-    float getBalance(String accountNumber) throws AccountNotFoundException;
-
-    void transfer(String from, String to, float amount) throws OverDraftException, AccountNotFoundException;
-}
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java b/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
deleted file mode 100644
index 45a9a26c3d..0000000000
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
+++ /dev/null
@@ -1,64 +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.itest.transaction;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(TransferService.class)
-public class TransferServiceImpl implements TransferService {
-    @Reference
-    protected AccountService savings;
-
-    @Reference
-    protected AccountService checking;
-
-    /**
-     * @see org.apache.tuscany.sca.itest.transaction.TransferService#transfer(java.lang.String, java.lang.String, float)
-     */
-    public void transfer(String from, String to, float amount) throws OverDraftException, AccountNotFoundException {
-        if (from.startsWith("C")) {
-            checking.withdraw(from, amount);
-        } else {
-            savings.withdraw(from, amount);
-        }
-        if (to.startsWith("C")) {
-            checking.deposit(to, amount);
-        } else {
-            savings.deposit(to, amount);
-        }
-    }
-    
-    public float getBalance(String accountNumber) throws AccountNotFoundException {
-        if(accountNumber.startsWith("C")) {
-            return checking.getBalance(accountNumber);
-        } else {
-            return savings.getBalance(accountNumber);
-        }
-    }
-
-    public String[] getAccounts() {
-        return new String[] {"S001", "S002", "C001"};
-    }
-
-}
diff --git a/java/sca-contrib/itest/transaction/src/main/resources/accounts.composite b/java/sca-contrib/itest/transaction/src/main/resources/accounts.composite
deleted file mode 100644
index f4c6b650c7..0000000000
--- a/java/sca-contrib/itest/transaction/src/main/resources/accounts.composite
+++ /dev/null
@@ -1,43 +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://account"

-    name="Accounts" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-

-    <component name="TransferServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.transaction.TransferServiceImpl"

-            requires="managedTransaction.global" />

-        <service name="TransferService" />

-        <reference name="savings" requires="propagatesTransaction" target="SavingsAccountServiceComponent"></reference>

-        <reference name="checking" requires="propagatesTransaction" target="CheckingAccountServiceComponent"></reference>

-    </component>

-

-    <component name="SavingsAccountServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.transaction.SavingsAccountServiceImpl"

-            requires="managedTransaction.global" />

-        <service name="AccountService" requires="propagatesTransaction" />

-    </component>

-

-    <component name="CheckingAccountServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.transaction.CheckingAccountServiceImpl"

-            requires="managedTransaction.global" />

-        <service name="AccountService" requires="propagatesTransaction" />

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/transaction/src/main/resources/definitions.xml b/java/sca-contrib/itest/transaction/src/main/resources/definitions.xml
deleted file mode 100644
index 8aa6ba313a..0000000000
--- a/java/sca-contrib/itest/transaction/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <policySet name="tuscany:ManagedTransactionPolicySet" provides="managedTransaction" appliesTo="sca:implementation.java">
-        <intentMap provides="managedTransaction" default="global">
-            <qualifier name="global">
-                <tuscany:transactionPolicy transactionTimeout="1200" action="REQUIRE_GLOBAL" />
-            </qualifier>
-            <qualifier name="local">
-                <tuscany:transactionPolicy transactionTimeout="1200" action="REQUIRE_LOCAL" />
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="tuscany:NoManagedTransactionPolicySet" provides="noManagedTransaction"
-        appliesTo="implementation">
-        <tuscany:transactionPolicy action="REQUIRE_NONE" />
-    </policySet>
-
-    <policySet name="tuscany:PropagatesTransactionPolicySet" provides="propagatesTransaction" appliesTo="sca:component">
-        <tuscany:transactionPolicy action="PROPAGATE" />
-    </policySet>
-
-    <policySet name="tuscany:SuspendsTransactionPolicySet" provides="suspendsTransaction" appliesTo="sca:binding.sca">
-        <tuscany:transactionPolicy action="SUSPEND" />
-    </policySet>
-
-    <policySet name="tuscany:TransactedOneWayPolicySet" provides="transactedOneWay" appliesTo="sca:binding.sca">
-        <tuscany:transactionPolicy action="PROPAGATE" />
-    </policySet>
-
-    <policySet name="tuscany:ImmediateOneWayPolicySet" provides="immediateOneWay" appliesTo="sca:binding.sca">
-        <tuscany:transactionPolicy action="SUSPEND" />
-    </policySet>
-
-    <intent name="managedTransaction" constrains="implementation">
-        <description>Used to indicate the transaction environment desired by a component implementation.</description>
-    </intent>
-    <intent name="managedTransaction.global">
-        <description>
-            Used to indicate that a component implementation requires a managed global transaction.
-        </description>
-    </intent>
-    <intent name="managedTransaction.local">
-        <description>
-            Used to indicate that a component implementation requires a managed local transaction.
-        </description>
-    </intent>
-    <intent name="noManagedTransaction" constrains="implementation">
-        <description>
-            Used to indicate that a component implementation will manage its own transaction resources.
-        </description>
-    </intent>
-    <intent name="propagatesTransaction" constrains="binding">
-        <description>
-            Used to indicate that a reference will propagate any client transaction or that a service will be dispatched
-            under any received transaction.
-        </description>
-    </intent>
-    <intent name="suspendsTransaction" constrains="binding">
-        <description>
-            Used to indicate that a reference will not propagate any client transaction or that a service will not be
-            dispatched under any received transaction.
-        </description>
-    </intent>
-    <intent name="transactedOneWay" constrains="binding">
-        <description>
-            Used to indicate that the component requires the SCA runtime to transact OneWay send of messages as part of
-            any client global transaction or to transact oneWay message receipt as part of any service global
-            transaction.
-        </description>
-    </intent>
-    <intent name="immediateOneWay" constrains="binding">
-        <description>
-            Used to indicate that the component requires the SCA runtime to process the sending or receiving of OneWay
-            messages immediately, regardless of any transaction under which the sending/receiving component runs.
-        </description>
-    </intent>
-
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/transaction/src/main/resources/log4j.properties b/java/sca-contrib/itest/transaction/src/main/resources/log4j.properties
deleted file mode 100644
index 698ee41d7e..0000000000
--- a/java/sca-contrib/itest/transaction/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,29 +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.
-#  
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, CONSOLE
-
-# CONSOLE is set to be a ConsoleAppender.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-
-
-# Print only messages of level WARN or above in the package com.foo.
-log4j.logger.org.apache.tuscany=INFO
\ No newline at end of file
diff --git a/java/sca-contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java b/java/sca-contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
deleted file mode 100644
index c23628ff91..0000000000
--- a/java/sca-contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.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.itest.transaction;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.logging.Logger;
-
-import javax.sql.XAConnection;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-import junit.framework.TestCase;
-
-import org.apache.derby.jdbc.EmbeddedXADataSource;
-import org.apache.tuscany.sca.policy.transaction.TransactionManagerHelper;
-import org.apache.tuscany.sca.policy.transaction.TransactionManagerWrapper;
-
-public class ConcurrentXAResourceTestCase extends TestCase {
-    class TestThread extends Thread {
-        private int counter;
-
-        TestThread(int i) {
-            counter = i;
-        }
-
-        public void run() {
-            log.info(this + " running...");
-
-            EmbeddedXADataSource xads = new EmbeddedXADataSource();
-            xads.setDatabaseName("target/test" + counter);
-            xads.setCreateDatabase("create");
-            Connection conn = null;
-            try {
-
-                Transaction trans = helper.managedGlobalTransactionPreInvoke();
-
-                XAConnection xaconn = xads.getXAConnection();
-
-                trans.enlistResource(xaconn.getXAResource());
-
-                conn = xaconn.getConnection();
-                try {
-                    conn.prepareStatement("create table T1(col1 char(100))").execute();
-                } catch (SQLException ex) {
-                    log.info("table T1 exists");
-                }
-                conn.prepareStatement("insert into T1 values('kkkkkkkk')").execute();
-                ResultSet rs = conn.prepareStatement("select count(*) from T1").executeQuery();
-                rs.next();
-                log.info(String.valueOf(rs.getInt(1)));
-
-                helper.managedGlobalTransactionPostInvoke(trans, false);
-
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            } finally {
-                try {
-                    conn.close();
-                } catch (Exception _ex) {
-                    _ex.printStackTrace();
-                }
-            }
-        }
-
-    }
-    private TransactionManagerWrapper activator;
-    private TransactionManagerHelper helper;
-
-    private Logger log = Logger.getLogger(this.getClass().getName());
-
-    public void setUp() throws Exception {
-        activator = new TransactionManagerWrapper();
-        activator.start();
-        TransactionManager tm = activator.getTransactionManager();
-        helper = new TransactionManagerHelper(tm);
-    }
-
-    public void tearDown() throws Exception {
-        activator.stop();
-
-    }
-
-    public void testConcurrent() {
-        TestThread[] tts = new TestThread[5];
-        for (int i = 0; i < tts.length; i++) {
-            tts[i] = new TestThread(i);
-            tts[i].start();
-            // log.info("one TestThread started...");
-        }
-        try {
-            for (TestThread tt : tts) {
-                while (tt != null && tt.isAlive()) {
-                    // log.info("wait for...");
-                    Thread.sleep(200);
-                }
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-}
diff --git a/java/sca-contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java b/java/sca-contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
deleted file mode 100644
index 36884f6098..0000000000
--- a/java/sca-contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
+++ /dev/null
@@ -1,53 +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.itest.transaction;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class TransactionTestCase {
-    private static SCADomain domain;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("accounts.composite");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    @Test
-    public void testTransaction() throws Exception {
-        TransferService service = domain.getService(TransferService.class, "TransferServiceComponent");
-        String[] accounts = service.getAccounts();
-        for (int i = 0; i < accounts.length; i++) {
-            float balance = service.getBalance(accounts[i]);
-            System.out.println("[" + i + "] " + accounts[i] + ":" + balance);
-        }
-        service.transfer(accounts[0], accounts[2], 200.0f);
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/pom.xml b/java/sca-contrib/itest/validation/pom.xml
deleted file mode 100644
index 36026471ac..0000000000
--- a/java/sca-contrib/itest/validation/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-validation</artifactId>
-    <name>Apache Tuscany SCA Validation Integration Test</name>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                	<groupId>org.apache.openejb</groupId>
-                	<artifactId>javaee-api</artifactId>
-                </exclusion>            
-            </exclusions>            
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>  
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                	<groupId>org.apache.openejb</groupId>
-                	<artifactId>javaee-api</artifactId>
-                </exclusion>            
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-               
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/account/Customer.java b/java/sca-contrib/itest/validation/src/main/java/binding/ejb/account/Customer.java
deleted file mode 100644
index ece64ae4b0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/account/Customer.java
+++ /dev/null
@@ -1,35 +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 binding.ejb.account;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Customer {
-
-    /**
-     * This method deposits the amount. method accesses external EJB to get the 
-     * current balance and add the amount to existing balance.
-     *
-     * @param String amount to be deposited
-     * @return total amount in customer account after deposit
-     */
-    Double depositAmount(java.lang.String accountNo, Double amount);
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/java/sca-contrib/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
deleted file mode 100644
index 1a859b04d2..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
+++ /dev/null
@@ -1,57 +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 binding.ejb.account;
-
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import binding.ejb.calculator.AddService;
-
-@Service(Customer.class)
-public class CustomerImpl implements Customer {
-
-    private AddService extEJBService = null;
-
-    public AddService getExtEJBService() {
-        return extEJBService;
-    }
-
-    @Reference
-    public void setExtEJBService(AddService extEJBService) {
-        this.extEJBService = extEJBService;
-    }
-
-    // this method invokes external EJB through EJB reference binding
-    public Double depositAmount(java.lang.String accountNo, Double amount) {
-         
-        Double total = null;
-
-        System.out.println("In component implementation. Invoking external EJB through EJB reference binding  ");
-
-        try {
-            Double balance = extEJBService.add(amount.doubleValue(), 1000); //invoke external ejb through ejb reference binding 
-            total =  balance + amount; 
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-        return total;
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/calculator/AddService.java b/java/sca-contrib/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
deleted file mode 100644
index aec8998083..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
+++ /dev/null
@@ -1,27 +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 binding.ejb.calculator;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface AddService {
-    double add(double n1, double n2);
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java b/java/sca-contrib/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
deleted file mode 100644
index 5df24b6379..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.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 binding.ejb.calculator;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-public interface AddServiceHome extends EJBHome {
-
-    AddService create() throws CreateException, RemoteException;
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/java/sca-contrib/itest/validation/src/main/java/binding/jms/HelloWorldService.java
deleted file mode 100644
index 81d7d2e585..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/binding/jms/HelloWorldService.java
+++ /dev/null
@@ -1,26 +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 binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldService {
-    String sayHello(String name);
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java b/java/sca-contrib/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
deleted file mode 100644
index a6a40b0ed1..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,27 +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 binding.jms;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
-    public String sayHello(String name) {
-        return "jmsHello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddService.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddService.java
deleted file mode 100644
index 4df26ffd7b..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddService.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 calculator.warning;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The Add service interface
- */
-@Remotable
-public interface AddService {
-
-    double add(double n1, double n2);
-    String getServiceName();
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
deleted file mode 100644
index 32080df91b..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddServiceImpl.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 calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Property;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-	@Property(name="serviceName")
-	protected String serviceName = "addService";
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-    public String getServiceName(){
-	  return serviceName;
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
deleted file mode 100644
index 201726c451..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
+++ /dev/null
@@ -1,46 +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 calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the Add service
- */
-@Service(AddService.class)
-public class AddServiceImplWithServiceName implements AddService {
-
-	@Property(name="serviceName")
-	protected String serviceName = "addService";
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-    public String getServiceName(){
-	  return serviceName;
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorClient.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
deleted file mode 100644
index 185f17a5ca..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorClient.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.    
- */
-
-package calculator.warning;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
-        
-        CalculatorService calculatorService = 
-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-
-        // Calculate
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorService.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorService.java
deleted file mode 100644
index f472d6aaf6..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator.warning;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
deleted file mode 100644
index 3f93b8e8a5..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/DivideService.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/DivideService.java
deleted file mode 100644
index a93d23e61c..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator.warning;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
deleted file mode 100644
index 080594034b..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/MultiplyService.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/MultiplyService.java
deleted file mode 100644
index 20d48e93d5..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator.warning;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
deleted file mode 100644
index 96f0b55fa2..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/PropertyService.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/PropertyService.java
deleted file mode 100644
index 4f1ccc96f8..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/PropertyService.java
+++ /dev/null
@@ -1,29 +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 calculator.warning;
-
-/**
- * The Property service interface
- */
-public interface PropertyService {
-
-    String getFirstName();
-    String getLastName();
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
deleted file mode 100644
index 599c3f7bb4..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
+++ /dev/null
@@ -1,41 +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 calculator.warning;
-
-import org.oasisopen.sca.annotation.Property;
-
-/**
- * An implementation of the Property service
- */
-public class PropertyServiceImpl implements PropertyService {
-
-	@Property(name="firstName", required=false)
-	protected String firstName;
-
-	@Property(name="lastName", required=true)
-	protected String lastName;
-
-    public String getFirstName(){
-	  return firstName;
-    }
-
-    public String getLastName(){
-	  return lastName;
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractService.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractService.java
deleted file mode 100644
index 40e382dc74..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator.warning;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
deleted file mode 100644
index 8cdbe0813d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
deleted file mode 100644
index 823408908f..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
+++ /dev/null
@@ -1,38 +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 calculator.warning;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the subtract service.
- */
-@Service(SubtractService.class)
-public class SubtractServiceImplWithServiceName implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/AddService.java b/java/sca-contrib/itest/validation/src/main/java/impl/java/AddService.java
deleted file mode 100644
index 0db8ce4f5c..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/AddService.java
+++ /dev/null
@@ -1,29 +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 impl.java;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-    String getServiceName();
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/java/sca-contrib/itest/validation/src/main/java/impl/java/AddServiceImpl.java
deleted file mode 100644
index bdde8a4721..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/AddServiceImpl.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 impl.java;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Property;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-	@Property(name="serviceName")
-	protected String serviceName = "addService";
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-    public String getServiceName(){
-	  return serviceName;
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorClient.java b/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorClient.java
deleted file mode 100644
index e34ce3db26..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorClient.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.    
- */
-
-package impl.java;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
-        
-        CalculatorService calculatorService = 
-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-
-        // Calculate
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorService.java b/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorService.java
deleted file mode 100644
index 5d583fd604..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 impl.java;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
deleted file mode 100644
index 138f1a4565..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.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 impl.java;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-    
-    @Reference
-    private void add(int n1, int n2) {
-    	
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/DivideService.java b/java/sca-contrib/itest/validation/src/main/java/impl/java/DivideService.java
deleted file mode 100644
index 85ebadc9a0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/DivideService.java
+++ /dev/null
@@ -1,28 +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 impl.java;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/DivideServiceImpl.java b/java/sca-contrib/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
deleted file mode 100644
index 863c298234..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +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 impl.java;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/MultiplyService.java b/java/sca-contrib/itest/validation/src/main/java/impl/java/MultiplyService.java
deleted file mode 100644
index e1bf7fbddc..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 impl.java;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java b/java/sca-contrib/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
deleted file mode 100644
index 6346ea3582..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +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 impl.java;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/SubtractService.java b/java/sca-contrib/itest/validation/src/main/java/impl/java/SubtractService.java
deleted file mode 100644
index 57759bb496..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/SubtractService.java
+++ /dev/null
@@ -1,28 +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 impl.java;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java b/java/sca-contrib/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
deleted file mode 100644
index 16e3e6a23d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +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 impl.java;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/spring/HelloWorld.java b/java/sca-contrib/itest/validation/src/main/java/impl/spring/HelloWorld.java
deleted file mode 100644
index 0cdd72942e..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/spring/HelloWorld.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 impl.spring;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Interface for the "hello world" service - predictably simple with a single operation
- * "sayHello"
- *
- */
-@Remotable
-public interface HelloWorld {
-
-	@OneWay
-    String sayHello(String s);
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/java/sca-contrib/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
deleted file mode 100644
index 97d13c8190..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
+++ /dev/null
@@ -1,41 +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 impl.spring;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * A simple proxy Java class which implements the HelloWorld interface but which uses
- * a reference "delegate" to actually provide the HelloWorld service
- *
- */
-public class HelloWorldProxy implements HelloWorld {
-
-    // Here is the reference "delegate" - it implements the HelloWorld interface...
-    @Reference
-    public HelloWorld delegate;
-
-    public String sayHello(String s) {
-        // Simply call the reference to satisfy the service request...
-        System.out.println("HelloWorldProxy - calling sayHello");
-        return delegate.sayHello(s);
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java b/java/sca-contrib/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
deleted file mode 100644
index 87904f2a72..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.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 impl.spring;
-
-/**
- * A simple test Spring bean which provides the HelloWorld service
- *
- */
-
-public class TestHelloWorldBean implements HelloWorld {
-
-    static String hello = "Hello ";
-
-    // Classic "Hello xxx" response to any input message
-    public String sayHello(String message) {
-        System.out.println("TestHelloWorldBean - sayHello called");
-        return (hello + message);
-    }
-
-} // end class TestHelloWorldBean
diff --git a/java/sca-contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/java/sca-contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
deleted file mode 100644
index 038e2c720f..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 interfacejava.xml;
-
-import org.oasisopen.sca.annotation.OneWay;
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-    
-    @OneWay
-    double divide(double n1, double n2);
-}
diff --git a/java/sca-contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/java/sca-contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
deleted file mode 100644
index 4b67ebae97..0000000000
--- a/java/sca-contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.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 interfacejava.xml;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import calculator.warning.AddService;
-import calculator.warning.DivideService;
-import calculator.warning.MultiplyService;
-import calculator.warning.SubtractService;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
deleted file mode 100644
index b2e7da05a2..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
+++ /dev/null
@@ -1,49 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent_one" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
deleted file mode 100644
index 4ba9f0724b..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
+++ /dev/null
@@ -1,53 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-    
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-    
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>    
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
deleted file mode 100644
index b935dd194a..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
+++ /dev/null
@@ -1,55 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>  
-
-    <component name="AddServiceComponent_one">
-        <implementation.composite name="sample:dummyImplementation">
-		<property name="serviceName" type="xsd:anyURI">addService</property>
-        </implementation.composite>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite b/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
deleted file mode 100644
index 2b633f3139..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.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"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="dummyImplementation">
-
-    <property name="serviceName" type="xsd:anyURI">addService</property>
-    <property name="serviceName" type="xsd:anyURI">addService</property>
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>  
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
deleted file mode 100644
index 940e27a1e7..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
+++ /dev/null
@@ -1,56 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-
-    <component name="CalculatorServiceComponent">
- 	  <implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="CalculatorServiceComponent_one">
-		<implementation.composite name="sample:dummyImplementation">
-		    <reference name="addService" target="AddServiceComponent" />
-		</implementation.composite>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite b/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
deleted file mode 100644
index 50d78cb2a6..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
+++ /dev/null
@@ -1,32 +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://sample"
-           xmlns:sample="http://sample"
-           name="dummyImplementation">
-
-      <reference name="addService" target="AddServiceComponent" />
-	<reference name="addService" target="AddServiceComponent" />
-
-     <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-     </component> 
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
deleted file mode 100644
index bd788e47b8..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
+++ /dev/null
@@ -1,51 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <property name="serviceName" type="xsd:anyURI">addService</property>
-        <property name="serviceName" type="xsd:anyURI">addMyService</property>
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
deleted file mode 100644
index 7281878c0f..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
+++ /dev/null
@@ -1,50 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/java/sca-contrib/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
deleted file mode 100644
index 609ffed02d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ /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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="impl.spring.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
deleted file mode 100644
index 08e18decc1..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
+++ /dev/null
@@ -1,53 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-    
-    <component name="AddServiceComponent">
-	  <service name="AddService">
-		<binding.sca name="addBinding"/>
-		<binding.sca name="addBinding"/>
-	  </service>
-        <implementation.java class="calculator.warning.AddServiceImplWithServiceName"/>
-    </component>  
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImplWithServiceName"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
deleted file mode 100644
index 36e71e398b..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
+++ /dev/null
@@ -1,52 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-	  <implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-    
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="AddServiceComponent_one">
-    </component>    
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
deleted file mode 100644
index 9a46e09363..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
+++ /dev/null
@@ -1,48 +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:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-    
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
deleted file mode 100644
index 59017f0c09..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
+++ /dev/null
@@ -1,54 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent">
-            <binding.sca/>
-        </reference>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-    
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-        <service name="AddService">
-            <binding.ws uri="http://localhost:8085/AddServiceComponent"/>
-        </service>
-    </component>    
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
deleted file mode 100644
index 462a95dd02..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
+++ /dev/null
@@ -1,51 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <reference name="promotedAddReference" promote="AddService/addService"/>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
deleted file mode 100644
index 4b6c44bd58..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
+++ /dev/null
@@ -1,51 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <service name="promotedAddService" promote="AddServiceComponent_one"/>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
deleted file mode 100644
index a397e3384c..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
+++ /dev/null
@@ -1,55 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-    <component name="PropertyServiceComponent">
-        <property name="firstName" type="xsd:anyURI" mustSupply="true">Simon</property>
-        <property name="lastName" type="xsd:anyURI">Laws</property>
-        <implementation.java class="calculator.warning.PropertyServiceImpl"/>
-    </component> 
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite b/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
deleted file mode 100644
index 08fab865fa..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
+++ /dev/null
@@ -1,53 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-    <component name="PropertyServiceComponent">
-        <implementation.java class="calculator.warning.PropertyServiceImpl"/>
-    </component> 
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite b/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
deleted file mode 100644
index 3a5f59b17c..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
+++ /dev/null
@@ -1,54 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-    <component name="PropertyServiceComponent">
-        <property name="lastName" type="xsd:anyURI" many="true">Laws</property>
-        <implementation.java class="calculator.warning.PropertyServiceImpl"/>
-    </component> 
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
deleted file mode 100644
index 8221e41430..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
+++ /dev/null
@@ -1,50 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <property name="serviceName_one" type="xsd:anyURI">addService</property>
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
deleted file mode 100644
index 9c5ae7027f..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
+++ /dev/null
@@ -1,51 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent">
-		<interface.java interface="calculator.warning.SubtractService"/>
-	  </reference>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
deleted file mode 100644
index 3c85ed32e2..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
+++ /dev/null
@@ -1,49 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="SubtractServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
deleted file mode 100644
index 2d1a1e01f0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
+++ /dev/null
@@ -1,49 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" multiplicity="1..n" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
deleted file mode 100644
index efb457ac9e..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
+++ /dev/null
@@ -1,50 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService_one" target="AddServiceComponent" />
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
deleted file mode 100644
index a5beaf4ec9..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
+++ /dev/null
@@ -1,49 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService"/>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
deleted file mode 100644
index 06c3eeeaca..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
+++ /dev/null
@@ -1,54 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>   
-
-    <component name="AddServiceComponent_one">
-        <service name="AddService_one"/>
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component> 
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
deleted file mode 100644
index 821ce570c8..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
+++ /dev/null
@@ -1,54 +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://sample"
-           xmlns:sample="http://sample"
-	     xmlns:sca="http://sca"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>  
-
-    <component name="AddServiceComponent_one">
-        <implementation.composite name="sca:dummyImplementation.composite"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/XsdValidation/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/XsdValidation/Calculator.composite
deleted file mode 100644
index 63ccaa9957..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/XsdValidation/Calculator.composite
+++ /dev/null
@@ -1,51 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <binding.ws/>
-    
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
deleted file mode 100644
index da565081f3..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
+++ /dev/null
@@ -1,53 +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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </components>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
deleted file mode 100644
index 6153d40c3d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
+++ /dev/null
@@ -1,53 +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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl" requires="tuscany:logging"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
deleted file mode 100644
index a3eb60bf58..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
+++ /dev/null
@@ -1,54 +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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws wsdlElement="http://sample/calculator#wsdl.port(CalculatorService/CalculatorPort)" requires="tuscany:logging"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
deleted file mode 100644
index 6233d47d8d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
+++ /dev/null
@@ -1,55 +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:calc="http://calc"
-	targetNamespace="http://calc"

-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-	    <binding.ws/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
deleted file mode 100644
index 6a9af9e070..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
+++ /dev/null
@@ -1,54 +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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-	  <implementation.java/>
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
deleted file mode 100644
index 49b26c78f8..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
+++ /dev/null
@@ -1,54 +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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-	  <interface.java/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
deleted file mode 100644
index c34a160b61..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
+++ /dev/null
@@ -1,58 +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:calc="http://sample.calculator"
-	targetNamespace="http://calc"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator"/>
-        <binding.ws wsdli:wsdlLocation="http://tempuri.org" wsdlElement="http://sample/calculator#wsdl.binding(CalculatorBinding)"/>
-        <binding.ws wsdlElement="http://sample/calculator#wsdl.port(CalculatorService/CalculatorPort)"/>
-        <binding.ws wsdlElement="http://sample/calculator#wsdl.endpoint(CalculatorService/CalculatorEndpoint)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
deleted file mode 100644
index 293c4d725d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
+++ /dev/null
@@ -1,59 +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:calc="http://sample.calculator"
-    targetNamespace="http://calc"
-    xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-    name="Calculator-bad-wsdlElement">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws wsdlElement="http://sample/calculator#wsdl.port(CalculatorService/CalculatorPort)">
-            <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
-                <wsa:Address>http://localhost:8085/Calculator</wsa:Address>
-            </wsa:EndpointReference>
-        </binding.ws>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-        <implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl b/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
deleted file mode 100644
index 013a55b61e..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
+++ /dev/null
@@ -1,92 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapJmsBinding" name="HelloWorldSoapJmsPort">
-            <wsdlsoap:address location="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite b/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
deleted file mode 100644
index b7ff1e304f..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
+++ /dev/null
@@ -1,34 +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://helloworld"
-	xmlns:hw="http://helloworld"
-    name="helloworldws">
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl" />
-	    <service name="HelloWorldService">
-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-            <binding.ws wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapJmsBinding2)"
-                    uri="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl b/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
deleted file mode 100644
index 218dbc47c4..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
+++ /dev/null
@@ -1,92 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-	name="helloworld">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-            

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite b/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
deleted file mode 100644
index 5975c27663..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
+++ /dev/null
@@ -1,45 +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://helloworld"

-	xmlns:hw="http://helloworld"

-	name="helloworldwsclient">

-    

-    <!-- A component with an embedded reference definition connecting to an external webservice 

-         The wsdl interface for the reference is derived from the information specified by the 'wsdlElement'

-     -->

-    <component name="HelloTuscanyServiceComponent">

-      <implementation.java class="binding.jms.HelloWorldServiceImpl"/>

-      <reference name="helloWorldService">

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort2)"/>

-      </reference>

-    </component>

-    

-    <!-- A component with a reference promoted as a composite reference -->

-    <component name="HelloWorldServiceComponent">

-      <implementation.java class="binding.jms.HelloWorldServiceImpl"/>

-    </component>

-    

-    <reference name="HelloWorldService" promote="HelloWorldServiceComponent/helloWorldService">

-        <interface.java interface="binding.jms.HelloWorldService" />

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort2)"/>

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl b/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
deleted file mode 100644
index 013a55b61e..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
+++ /dev/null
@@ -1,92 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapJmsBinding" name="HelloWorldSoapJmsPort">
-            <wsdlsoap:address location="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite b/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
deleted file mode 100644
index 8cda0b007e..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
+++ /dev/null
@@ -1,34 +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://helloworld"
-	xmlns:hw="http://helloworld"
-    name="helloworldws">
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl" />
-	    <service name="HelloWorldService">
-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-            <binding.ws wsdlElement="http://helloworld#wsdl.service(HelloWorldService2)"
-                    uri="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
deleted file mode 100644
index 781319d619..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.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" name="account">
-
-    <!-- composite refrence with ejb binding. Modify host and port number in uri attribute based on where you have installed target ResumeBank EJB -->
-
-    <component name="CustomerComponent">
-        <implementation.java class="binding.ejb.account.CustomerImpl" />
-        <reference name="extEJBService">
-            <!-- To use the CosNaming, use the following URI -->
-            <!-- 
-                <binding.ejb uri="corbaname:iiop:1.2@localhost:1050#AddServiceBean" />
-            -->
-            <binding.ejb session-type="state" uri="hello-addservice/AddServiceBean/binding.ejb.calculator.AddService" />
-        </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
deleted file mode 100644
index 8a0dfac98b..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.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" name="account">
-
-    <!-- composite refrence with ejb binding. Modify host and port number in uri attribute based on where you have installed target ResumeBank EJB -->
-
-    <component name="CustomerComponent">
-        <implementation.java class="binding.ejb.account.CustomerImpl" />
-        <reference name="extEJBService">
-            <!-- To use the CosNaming, use the following URI -->
-            <!-- 
-                <binding.ejb uri="corbaname:iiop:1.2@localhost:1050#AddServiceBean" />
-            -->
-            <binding.ejb ejb-version="EJB4" uri="hello-addservice/AddServiceBean/binding.ejb.calculator.AddService" />
-        </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
deleted file mode 100644
index fcfe408582..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
+++ /dev/null
@@ -1,36 +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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-		   <activationSpec name="jms"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
deleted file mode 100644
index ede3b3fd40..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always" type="queue"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
deleted file mode 100644
index a8c89a0bf5..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
+++ /dev/null
@@ -1,36 +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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-               <headers JMSType="jms"/>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
deleted file mode 100644
index b4e56d1789..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
+++ /dev/null
@@ -1,32 +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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">         
-               <resourceAdapter name="resAdpName"/>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
deleted file mode 100644
index e68eb75d64..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-			<activationSpec name="jms"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
deleted file mode 100644
index 00c7a3f86b..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <connectionFactory name="RespQueueA"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
deleted file mode 100644
index d656d47cfd..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always" type="queue"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
deleted file mode 100644
index ad1daacfcf..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms correlationScheme="correlationScheme" initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
deleted file mode 100644
index 145aea9fbc..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
+++ /dev/null
@@ -1,36 +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"

-           name="RPCComposite">

-

-    <component name="HelloWorldService">

-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>

-        <service name="HelloWorldService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">

-               <destination name="DestQueueA" create="always"/>

-               <response>

-                  <destination name="RespQueueA" create="always"/>

-               </response>

-               <headers JMSType="jms" JMSDeliveryMode="NON_PERSISTENTS" JMSPriority="8"/>

-            </binding.jms>  

-        </service> 

-    </component>       

-

-</composite>

diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
deleted file mode 100644
index c52da84a0c..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
+++ /dev/null
@@ -1,36 +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"

-           name="RPCComposite">

-

-    <component name="HelloWorldService">

-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>

-        <service name="HelloWorldService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">

-               <destination name="DestQueueA" create="always"/>

-               <response>

-                  <destination name="RespQueueA" create="always"/>

-               </response>

-               <headers JMSType="jms" JMSDeliveryMode="NON_PERSISTENT" JMSPriority="20"/>

-            </binding.jms>  

-        </service> 

-    </component>       

-

-</composite>

diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
deleted file mode 100644
index fb35f5d1b8..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always" type="no"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
deleted file mode 100644
index fcdf25455c..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
+++ /dev/null
@@ -1,36 +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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <activationSpec name=""/>
-		   <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
deleted file mode 100644
index 14f1314a1b..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
+++ /dev/null
@@ -1,36 +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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <connectionFactory name=""/>
-		   <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
deleted file mode 100644
index 1a3cb21ac6..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
+++ /dev/null
@@ -1,36 +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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-		   <destination name="DestQueueA" create="always"/>
-               <response>
-			<activationSpec name=""/>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
deleted file mode 100644
index 80b8f9d938..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
+++ /dev/null
@@ -1,36 +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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-		   <destination name="DestQueueA" create="always"/>
-               <response>
-			<connectionFactory name=""/>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
deleted file mode 100644
index 8fd1e2f554..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
+++ /dev/null
@@ -1,36 +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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" 
-			jndiURL="tcp://localhost:61616" uri="tuscany://localhost:17171">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
deleted file mode 100644
index b74682e1bd..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
+++ /dev/null
@@ -1,38 +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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-               <resourceAdapter name="resource">
-                  <property name="resourceName" type="jms"/>
-               </resourceAdapter>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
deleted file mode 100644
index f439ab6260..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
+++ /dev/null
@@ -1,38 +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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-                  <connectionFactory name="RespQueueA">
-                     <property name="RespQueueA"/>
-                  </connectionFactory>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite b/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
deleted file mode 100644
index e22f30152e..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
+++ /dev/null
@@ -1,36 +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"
-           name="RPCComposite">
-
-    <component name="HelloWorldService">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl"/>
-        <service name="HelloWorldService">
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" 
-			jndiURL="tcp://localhost:61616" uri="jms://queue.sample?transport.jms=QueueConnectionFactory">
-               <destination name="DestQueueA" create="always"/>
-               <response>
-                  <destination name="RespQueueA" create="always"/>
-               </response>
-            </binding.jms>  
-        </service> 
-    </component>       
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
deleted file mode 100644
index 6ef7558d95..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
+++ /dev/null
@@ -1,55 +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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <export.java xmlns:ns="http://ns"/>
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
deleted file mode 100644
index 77a2715373..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
+++ /dev/null
@@ -1,55 +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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <export xmlns:ns="http://ns"/>
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
deleted file mode 100644
index 6e5fcf1286..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
+++ /dev/null
@@ -1,55 +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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <!-- export.resource xmlns:ns="http://ns"/-->
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml b/java/sca-contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
deleted file mode 100644
index d3ce4d91c1..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              xmlns:calc="http://calc">
-   <deployable composite="calc:Calculator"/>
-   <import.resource xmlns="http://www.osoa.org/xmlns/sca/1.0"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
deleted file mode 100644
index 70f91d1a7d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
+++ /dev/null
@@ -1,53 +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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml b/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
deleted file mode 100644
index 7f5eb546e0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
deleted file mode 100644
index 70f91d1a7d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
+++ /dev/null
@@ -1,53 +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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml b/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
deleted file mode 100644
index c1ff61f07c..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
+++ /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.    
--->
-
-<!-- to test TUSCANY-2631 -->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-    <deployable xmlns:ns1="http://temp"></deployable>              
-	<deployable composite="ns1:aaaa" xmlns:ns1="http://temp"></deployable>
-	<deployable xmlns:ns1="http://temp"></deployable>
-	<deployable composite="ns1:dfsdf" xmlns:ns1="x"></deployable>
-	<deployable composite="ns1:dsfs" xmlns:ns1="http://temp"></deployable> 
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
deleted file mode 100644
index 0dfe52985a..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
+++ /dev/null
@@ -1,29 +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://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hna:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
deleted file mode 100644
index d3f249720d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
+++ /dev/null
@@ -1,29 +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://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="{HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
+++ /dev/null
@@ -1,30 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="wns:HelloService" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
deleted file mode 100644
index a8eb389704..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
+++ /dev/null
@@ -1,66 +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.
-  -->
-<process name="HelloWorld"
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
-     namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
-
-   <partnerLinks>
-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="myVar" messageType="test:HelloMessage"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="hello"
-          variable="myVar"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <from variable="myVar" part="TestPart"/>
-              <to variable="tmpVar"/>
-          </copy>
-          <copy>
-              <from>concat($tmpVar,' World')</from>
-              <to variable="myVar" part="TestPart"/>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="hello"
-              variable="myVar"/>
-   </sequence>
-</process>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
deleted file mode 100644
index 575927a5de..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
+++ /dev/null
@@ -1,29 +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://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hns:HelloWorld2"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
+++ /dev/null
@@ -1,82 +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://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-    
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-           targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" 
-           xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="hello">
-                <complexType>
-                    <sequence>
-                        <element name="message" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>            
-        </schema>
-    </wsdl:types>
-    
-    <wsdl:message name="HelloMessage">
-        <wsdl:part element="tns:hello" name="TestPart"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="HelloPortType">
-        <wsdl:operation name="hello">
-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>
-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>
-        </wsdl:operation>    
-    </wsdl:portType>
-    
-
-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="hello">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="TestIn">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="TestOut">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>    
-    
-    <wsdl:service name="HelloService">
-		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>
-		</wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="HelloPartnerLinkType">
-       <plnk:role name="me" portType="tns:HelloPortType"/>
-       <plnk:role name="you" portType="tns:HelloPortType"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
+++ /dev/null
@@ -1,30 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="wns:HelloService" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
deleted file mode 100644
index a8eb389704..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
+++ /dev/null
@@ -1,66 +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.
-  -->
-<process name="HelloWorld"
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
-     namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
-
-   <partnerLinks>
-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="myVar" messageType="test:HelloMessage"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="hello"
-          variable="myVar"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <from variable="myVar" part="TestPart"/>
-              <to variable="tmpVar"/>
-          </copy>
-          <copy>
-              <from>concat($tmpVar,' World')</from>
-              <to variable="myVar" part="TestPart"/>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="hello"
-              variable="myVar"/>
-   </sequence>
-</process>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
+++ /dev/null
@@ -1,29 +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://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
+++ /dev/null
@@ -1,30 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="wns:HelloService" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
deleted file mode 100644
index 973d1f618a..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
+++ /dev/null
@@ -1,66 +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.
-  -->
-<process name="HelloWorld"
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
-     namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
-
-   <partnerLinks>
-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="myVar" messageType="test:HelloMessage"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="hello"
-          variable="myVar"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <from variable="myVar" part="TestPart"/>
-              <to variable="tmpVar"/>
-          </copy>
-          <copy>
-              <from>concat($tmpVar,' World')</from>
-              <to variable="myVar" part="TestPart"/>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="hello"
-              variable="myVar"/>
-   </sequence>
-</process>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
+++ /dev/null
@@ -1,29 +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://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
+++ /dev/null
@@ -1,82 +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://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-    
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-           targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" 
-           xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="hello">
-                <complexType>
-                    <sequence>
-                        <element name="message" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>            
-        </schema>
-    </wsdl:types>
-    
-    <wsdl:message name="HelloMessage">
-        <wsdl:part element="tns:hello" name="TestPart"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="HelloPortType">
-        <wsdl:operation name="hello">
-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>
-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>
-        </wsdl:operation>    
-    </wsdl:portType>
-    
-
-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="hello">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="TestIn">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="TestOut">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>    
-    
-    <wsdl:service name="HelloService">
-		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>
-		</wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="HelloPartnerLinkType">
-       <plnk:role name="me" portType="tns:HelloPortType"/>
-       <plnk:role name="you" portType="tns:HelloPortType"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
+++ /dev/null
@@ -1,30 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="wns:HelloService" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
deleted file mode 100644
index 5d2aeddc3d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
+++ /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.
-  -->
-<process name="HelloWorld"
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca-bpel/200801"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
-     namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
-
-   <partnerLinks>
-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" 
-      sca:service="service" sca:reference="reference"/>
-   </partnerLinks>
-    
-   <variables>
-     <variable name="myVar" messageType="test:HelloMessage"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="hello"
-          variable="myVar"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <from variable="myVar" part="TestPart"/>
-              <to variable="tmpVar"/>
-          </copy>
-          <copy>
-              <from>concat($tmpVar,' World')</from>
-              <to variable="myVar" part="TestPart"/>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="hello"
-              variable="myVar"/>
-   </sequence>
-</process>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
deleted file mode 100644
index 077df56290..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-  
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
+++ /dev/null
@@ -1,29 +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://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
+++ /dev/null
@@ -1,82 +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://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-    
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-           targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" 
-           xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="hello">
-                <complexType>
-                    <sequence>
-                        <element name="message" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>            
-        </schema>
-    </wsdl:types>
-    
-    <wsdl:message name="HelloMessage">
-        <wsdl:part element="tns:hello" name="TestPart"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="HelloPortType">
-        <wsdl:operation name="hello">
-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>
-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>
-        </wsdl:operation>    
-    </wsdl:portType>
-    
-
-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="hello">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="TestIn">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="TestOut">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>    
-    
-    <wsdl:service name="HelloService">
-		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>
-		</wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="HelloPartnerLinkType">
-       <plnk:role name="me" portType="tns:HelloPortType"/>
-       <plnk:role name="you" portType="tns:HelloPortType"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
+++ /dev/null
@@ -1,30 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="wns:HelloService" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
deleted file mode 100644
index 68df3156a8..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
+++ /dev/null
@@ -1,66 +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.
-  -->
-<process name="HelloWorld"
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld2.wsdl"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
-     namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
-
-   <partnerLinks>
-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="myVar" messageType="test:HelloMessage"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="hello"
-          variable="myVar"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <from variable="myVar" part="TestPart"/>
-              <to variable="tmpVar"/>
-          </copy>
-          <copy>
-              <from>concat($tmpVar,' World')</from>
-              <to variable="myVar" part="TestPart"/>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="hello"
-              variable="myVar"/>
-   </sequence>
-</process>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
+++ /dev/null
@@ -1,29 +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://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
+++ /dev/null
@@ -1,82 +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://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-    
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-           targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" 
-           xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="hello">
-                <complexType>
-                    <sequence>
-                        <element name="message" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>            
-        </schema>
-    </wsdl:types>
-    
-    <wsdl:message name="HelloMessage">
-        <wsdl:part element="tns:hello" name="TestPart"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="HelloPortType">
-        <wsdl:operation name="hello">
-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>
-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>
-        </wsdl:operation>    
-    </wsdl:portType>
-    
-
-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="hello">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="TestIn">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="TestOut">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>    
-    
-    <wsdl:service name="HelloService">
-		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>
-		</wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="HelloPartnerLinkType">
-       <plnk:role name="me" portType="tns:HelloPortType"/>
-       <plnk:role name="you" portType="tns:HelloPortType"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
+++ /dev/null
@@ -1,30 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="wns:HelloService" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
deleted file mode 100644
index a8eb389704..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
+++ /dev/null
@@ -1,66 +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.
-  -->
-<process name="HelloWorld"
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
-     namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
-
-   <partnerLinks>
-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="myVar" messageType="test:HelloMessage"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="hello"
-          variable="myVar"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <from variable="myVar" part="TestPart"/>
-              <to variable="tmpVar"/>
-          </copy>
-          <copy>
-              <from>concat($tmpVar,' World')</from>
-              <to variable="myVar" part="TestPart"/>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="hello"
-              variable="myVar"/>
-   </sequence>
-</process>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
+++ /dev/null
@@ -1,29 +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://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl b/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
deleted file mode 100644
index 695fd60887..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
+++ /dev/null
@@ -1,80 +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://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-    
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-           targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" 
-           xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="hello">
-                <complexType>
-                    <sequence>
-                        <element name="message" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>            
-        </schema>
-    </wsdl:types>
-    
-    <wsdl:message name="HelloMessage">
-        <wsdl:part element="tns:hello" name="TestPart"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="HelloPortType">
-        <wsdl:operation name="hello">
-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>
-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>
-        </wsdl:operation>    
-    </wsdl:portType>
-    
-
-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="hello">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="TestIn">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="TestOut">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>    
-    
-    <wsdl:service name="HelloService">
-		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>
-		</wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="HelloPartnerLinkType">
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
deleted file mode 100644
index 94ee650207..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
+++ /dev/null
@@ -1,29 +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://sample/ejb"
-	xmlns:sc="http://sample/composite"
-	name="TestEJB">
-
-    <component name="TestEJB">
-        <implementation.ejb/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
deleted file mode 100644
index f3cf93ddaa..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
+++ /dev/null
@@ -1,49 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="impl.java.CalculatorServiceImpl_one"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="impl.java.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="impl.java.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="impl.java.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="impl.java.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
deleted file mode 100644
index f9016219a5..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
+++ /dev/null
@@ -1,49 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="impl.java.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="impl.java.AddServiceImpl"/>
-    </component>   
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="impl.java.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="impl.java.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="impl.java.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType b/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
deleted file mode 100644
index 634c13b3cc..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="OSGiTestService">
-        <interface.java interface="impl.osgi.OSGiTestInterface"/>
-    </service>
-    
-    <property name="currency" type="xsd:string">GBP</property> 
-    <property name="exchangeRate" type="xsd:double">1.0</property> 
-    
-</componentType>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
deleted file mode 100644
index 0d1861f2f5..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
+++ /dev/null
@@ -1,34 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-           name="OSGiTestComposite">
-
-    <component name="OSGiTestServiceComponent">
-        <tuscany:implementation.osgi 
-            bundle="OSGiTestService" 
-            bundleSymbolicName="impl.osgi.OSGiTestInterface"/>
-  
-        <property name="currency" type="xsd:string" >USD</property> 
-        <property name="exchangeRate" type="xsd:double" >2.0</property>            
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
deleted file mode 100644
index 0d1861f2f5..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
+++ /dev/null
@@ -1,34 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-           name="OSGiTestComposite">
-
-    <component name="OSGiTestServiceComponent">
-        <tuscany:implementation.osgi 
-            bundle="OSGiTestService" 
-            bundleSymbolicName="impl.osgi.OSGiTestInterface"/>
-  
-        <property name="currency" type="xsd:string" >USD</property> 
-        <property name="exchangeRate" type="xsd:double" >2.0</property>            
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType b/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
deleted file mode 100644
index 634c13b3cc..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="OSGiTestService">
-        <interface.java interface="impl.osgi.OSGiTestInterface"/>
-    </service>
-    
-    <property name="currency" type="xsd:string">GBP</property> 
-    <property name="exchangeRate" type="xsd:double">1.0</property> 
-    
-</componentType>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
deleted file mode 100644
index 881c24854b..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
+++ /dev/null
@@ -1,36 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-           name="OSGiTestComposite">
-
-    <component name="OSGiTestServiceComponent">
-        <tuscany:implementation.osgi 
-            bundle="OSGiTestService" 
-            bundleSymbolicName="impl.osgi.OSGiTestInterface">
-        <tuscany:properties name="osgiProperties"/>
-        </tuscany:implementation.osgi>
-  
-        <property name="currency" type="xsd:string" >USD</property> 
-        <property name="exchangeRate" type="xsd:double" >2.0</property>            
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
deleted file mode 100644
index 4e680f1200..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
+++ /dev/null
@@ -1,30 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/resource"
-	xmlns:sr="http://sample/resource"
-	name="resource">
-
-    <component name="ResourceServiceComponent">
-        <tuscany:implementation.resource location="contents"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
deleted file mode 100644
index e01643ed8f..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
+++ /dev/null
@@ -1,30 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/resource"
-	xmlns:sr="http://sample/resource"
-	name="resource">
-
-    <component name="ResourceServiceComponent">
-        <tuscany:implementation.resource/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
deleted file mode 100644
index d776882ed0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
+++ /dev/null
@@ -1,27 +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"
-           name="SpringHelloWorld">
-
-    <component name="HelloWorldComponent">
-        <implementation.spring location="SpringHelloWorld-context.xml"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
deleted file mode 100644
index 0d1ffc97e4..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
+++ /dev/null
@@ -1,27 +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"
-           name="SpringHelloWorld">
-
-    <component name="HelloWorldComponent">
-        <implementation.spring/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml b/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
+++ /dev/null
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
deleted file mode 100644
index 99c529d77f..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
+++ /dev/null
@@ -1,34 +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://sample"
-           xmlns:sample="http://sample"
-           name="SpringHelloWorld">
-
-    <component name="ClientComponent">
-        <implementation.java class="impl.spring.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
-    </component>
-
-    <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/SpringHelloWorld-context.xml"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType b/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
deleted file mode 100644
index c75f209b6d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
-  <service name="CalculatorService">
-        <interface.java interface="impl.spring.HelloWorld" />
-  </service>
-  
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
deleted file mode 100644
index a5874707da..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
+++ /dev/null
@@ -1,29 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/resource"
-	xmlns:sr="http://sample/resource"
-	name="resource">
-
-    <component name="store">
-        <tuscany:implementation.widget location="content/store.html"/>
-    </component>
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
deleted file mode 100644
index 393b9fe674..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
+++ /dev/null
@@ -1,30 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/resource"
-	xmlns:sr="http://sample/resource"
-	name="resource">
-
-    <component name="store">
-        <tuscany:implementation.widget/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
deleted file mode 100644
index 1dca444938..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
+++ /dev/null
@@ -1,28 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           name="HelloWorld">
-
-    <component name="HelloWorldComponent">
-        <tuscany:implementation.xquery location="content/test.xquery"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite b/java/sca-contrib/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
deleted file mode 100644
index 9a60183c5c..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
+++ /dev/null
@@ -1,28 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           name="HelloWorld">
-
-    <component name="HelloWorldComponent">
-        <tuscany:implementation.xquery/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
deleted file mode 100644
index 70f91d1a7d..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
+++ /dev/null
@@ -1,53 +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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.warning.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType b/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
deleted file mode 100644
index bc7bf3f250..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
-  <service name="CalculatorService">
-        <interface.java interface="calculator.warning.CalculatorService_one" />
-  </service>
-  
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
deleted file mode 100644
index a1a699fc75..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
+++ /dev/null
@@ -1,53 +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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="interfacejava.xml.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="interfacejava.xml.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType b/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
deleted file mode 100644
index 7446e4f06a..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
-  <service name="CalculatorService">
-        <interface.java interface="interfacejava.xml.CalculatorService" />
-  </service>
-  
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
deleted file mode 100644
index 0bbb10706e..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
+++ /dev/null
@@ -1,54 +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:calc="http://sample.calculator"
-	targetNamespace="http://calc"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator" wsdli:wsdlLocation="http://tempuri.org"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl b/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
deleted file mode 100644
index 9d9376ad6c..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
+++ /dev/null
@@ -1,67 +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://helloworld" xmlns:tns="http://helloworld"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld"
-            xmlns="http://www.w3.org/2001/XMLSchema" xmlns:g="http://greeting">
-
-            <!-- 
-                <import namespace="http://greeting" schemaLocation="../xsd/greeting.xsd" />
-            -->
-            <include schemaLocation="../xsd/helloworld.xsd" />
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="g:Name" />
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="g:Greeting" />
-                    </sequence>
-                </complexType>
-            </element>
-
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest" />
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse" />
-        </wsdl:operation>
-    </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl b/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
deleted file mode 100644
index 3885357625..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
+++ /dev/null
@@ -1,49 +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://helloworld" xmlns:tns="http://helloworld"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">
-
-    <wsdl:import location="helloworld-interface.wsdl" namespace="http://helloworld"></wsdl:import>
-    <!-- 
-    <wsdl:import namespace="http://helloworld"></wsdl:import>
-     -->
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address
-                location="http://localhost:8085/sample-helloworldws-1.0-SNAPSHOT/services/HelloWorldWebService" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl b/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
deleted file mode 100644
index 013a55b61e..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
+++ /dev/null
@@ -1,92 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapJmsBinding" name="HelloWorldSoapJmsPort">
-            <wsdlsoap:address location="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite b/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
deleted file mode 100644
index d9252ba54f..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
+++ /dev/null
@@ -1,34 +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://helloworld"
-	xmlns:hw="http://helloworld"
-    name="helloworldws">
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="binding.jms.HelloWorldServiceImpl" />
-	    <service name="HelloWorldService">
-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld2)" />
-            <binding.ws wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapJmsBinding)"
-                    uri="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
+++ /dev/null
@@ -1,56 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml b/java/sca-contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
deleted file mode 100644
index 53d1a581f0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <!-- POLICY SETS -->
-    <policySet name="ps1" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <permitAll />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps2" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <allow roles="r1 r2" />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps3" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <denyAll />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps4" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <runAs role="admin" />
-        </securityIdentity>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps5" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <useCallerIdentity />
-        </securityIdentity>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps6" provides="authorization" appliesTo="sca:implementation">
-        <permitAll />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps7" provides="authorization" appliesTo="sca:implementation">
-        <allow roles="r1 r2" />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps8" provides="authorization" appliesTo="sca:implementation">
-        <denyAll />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps9" provides="securityIdentity" appliesTo="sca:implementation">
-        <runAs role="admin" />
-    </policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
+++ /dev/null
@@ -1,56 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml b/java/sca-contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
deleted file mode 100644
index ac45d95ce8..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <!-- POLICY SETS -->
-    <policySet name="ps1" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <permitAll />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps2" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <allow/>
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps3" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <denyAll />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps4" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <runAs role="admin" />
-        </securityIdentity>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps5" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <useCallerIdentity />
-        </securityIdentity>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps6" provides="authorization" appliesTo="sca:implementation">
-        <permitAll />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps7" provides="authorization" appliesTo="sca:implementation">
-        <allow roles="r1 r2" />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps8" provides="authorization" appliesTo="sca:implementation">
-        <denyAll />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps9" provides="securityIdentity" appliesTo="sca:implementation">
-        <runAs role="admin" />
-    </policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
+++ /dev/null
@@ -1,56 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
deleted file mode 100644
index 5cf6963a96..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- Extension Types Metadata -->
-<implementationType type="sca:implementation.java" alwaysProvides="test:logging"
-                    mayProvide="test:tracing"/>
-<bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality"
-                    mayProvide="test:integrity"/>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </intent>
- 
- <intent name="integrity" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized modification of the messages.
-             </description>
- </intent>
- 
- <intent name="authentication" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding required
-             Authentication.
-             </description>
- </intent> 
- 
- <intent name="tracing" 
-             constrains="sca:implementation.java">
-             <description>
-                Need to figure out some description for this 
-             </description>
- </intent>
- 
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
+++ /dev/null
@@ -1,56 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
deleted file mode 100644
index d31c705fb5..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- Extension Types Metadata -->
-<implementationType type="sca:implementation.java" alwaysProvides="test:logging"
-                    mayProvide="test:tracing"/>
-<bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality"
-                    mayProvide="test:integrity"/>
-                    
-<!-- qualified intents -->
- <intent name="confidentiality.transport" constrains="sca:binding"/>
- <intent name="confidentiality.message" />
- <intent name="confidentiality.message.whole" />
- <intent name="confidentiality.message.body" /> 
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </intent>
- 
- <intent name="integrity" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized modification of the messages.
-             </description>
- </intent>
- 
- <intent name="authentication" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding required
-             Authentication.
-             </description>
- </intent>
- 
- <intent name="logging" 
-             constrains="sca:implementation">
-             <description>
-                All messages to and from this implementation must be logged
-             </description>
- </intent>
- 
- <intent name="tracing" 
-             constrains="sca:implementation.java">
-             <description>
-                Need to figure out some description for this 
-             </description>
- </intent>
- 
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
+++ /dev/null
@@ -1,56 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
deleted file mode 100644
index d214a7f40a..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<sca:definitions xmlns="http://test"
-            targetNamespace="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
- <!-- qualified intents -->
- <sca:intent name="confidentiality.transport" />
- <sca:intent name="confidentiality.message" />
- <sca:intent name="confidentiality.message.whole" />
- <sca:intent name="confidentiality.message.body" /> 
- 
- <!-- POLICY SETS -->
-  <sca:policySet name="SecureReliablePolicy"
-    provides="confidentiality.transport integrity"
-    appliesTo="//sca:binding.ws | //sca:binding.sca"
-    xmlns="http://test"
-    xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:PolicyAttachment>
-            <!-- policy expression and policy subject for
-                 "basic authentication" -->
-        </wsp:PolicyAttachment>
-        <wsp:PolicyAttachment>
-            <!-- policy expression and policy subject for
-                "reliability" -->
-        </wsp:PolicyAttachment>
- </sca:policySet>
- 
- <sca:policySet name="SecureMessagingPolicies"
-     provides="confidentiality"
-     appliesTo="//sca:binding.ws"
-     xmlns="http://test"
-     xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-     <sca:intentMap provides="confidentiality_one" default="transport">
-        <sca:qualifier name="transport">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "transport" alternative -->
-                </wsp:Policy>
-            <wsp:Policy>...</wsp:Policy>
-        </sca:qualifier>
-        <sca:qualifier name="message">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "message" alternative" -->
-            </wsp:Policy>
-        </sca:qualifier>
-    </sca:intentMap>
-</sca:policySet>
-
-<sca:policySet name="SecurityPolicy" provides="confidentiality"
-    xmlns="http://test"
-    xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
-    <sca:intentMap provides="confidentiality" default="message">
-        <sca:qualifier name="message">
-            <sca:intentMap provides="message" default="whole">
-                <sca:qualifier name="body">
-                    <wsp:Policy>
-                        <!-- policy attachment for body encryption --> 
-                    </wsp:Policy>
-                </sca:qualifier>
-                <sca:qualifier name="whole">
-                    <wsp:Policy>
-                        <!-- policy attachment for whole message encryption --> 
-                    </wsp:Policy>
-                </sca:qualifier>
-            </sca:intentMap>
-        </sca:qualifier>
-        <sca:qualifier name="transport">
-            <wsp:Policy>
-                <!-- policy attachment for transport encryption --> 
-            </wsp:Policy>
-        </sca:qualifier>
-    </sca:intentMap>
-</sca:policySet>
-
-<sca:policySet name="BasicAuthMsgProtSecurity"
-     provides="authentication confidentiality"
-     appliesTo="//sca:binding.ws"
-        xmlns="http://test">
-    <sca:policySetReference name="AuthenticationPolicies"/>
-    <sca:policySetReference name="ConfidentialityPolicies"/>
-</sca:policySet>
-
-<sca:policySet name="AuthenticationPolicies"
-    provides="authentication"
-    appliesTo="//sca:binding.ws"
-    xmlns="http://test"
-    xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-    <wsp:PolicyAttachment>
-        <!-- policy expression and policy subject for "basic
-        authentication" -->
-    </wsp:PolicyAttachment>
-</sca:policySet>
-
-<sca:policySet name="ConfidentialityPolicies"
- provides="confidentiality"
- bindings="binding.ws"
- xmlns="http://test"
-    xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-    <sca:intentMap provides="confidentiality"  default="transport">
-        <sca:qualifier name="transport">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "transport"
-                alternative -->
-            </wsp:Policy>
-            <wsp:Policy>...</wsp:Policy>
-        </sca:qualifier>
-        <sca:qualifier name="message">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "message"
-                alternative" -->...
-            </wsp:Policy>
-        </sca:qualifier>
-    </sca:intentMap>
-</sca:policySet>
-
-<!-- profile intent -->
- <sca:intent name="reliableMessageProtection" 
-             constrains="sca:binding"
-             requires="messageProtection">
-             <sca:description>
-                Protect messages from unauthorized reading or modification
-             </sca:description>
- </sca:intent>
- 
- <sca:intent name="messageProtection" 
-             constrains="sca:binding"
-             requires="confidentiality integrity">
-             <sca:description>
-                Protect messages from unauthorized reading or modification
-             </sca:description>
- </sca:intent>
-
-<!-- simple intent -->
- <sca:intent name="confidentiality" 
-             constrains="sca:binding">
-             <sca:description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </sca:description>
- </sca:intent>
- 
- <sca:intent name="integrity" 
-             constrains="sca:binding">
-             <sca:description>
-             Communitcation thro this binding must prevent
-             unauthorized modification of the messages.
-             </sca:description>
- </sca:intent>
- 
- <sca:intent name="authentication" 
-             constrains="sca:binding">
-             <sca:description>
-             Communitcation thro this binding required
-             Authentication.
-             </sca:description>
- </sca:intent>
- 
-</sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
+++ /dev/null
@@ -1,56 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
deleted file mode 100644
index ede1786942..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- Extension Types Metadata -->
-<implementationType type="sca:implementation.java" alwaysProvides="test:logging"
-                    mayProvide="test:tracing"/>
-<bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality"
-                    mayProvide="test:integrity"/>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </intent>
- 
- <intent name="integrity" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized modification of the messages.
-             </description>
- </intent>
- 
- <intent name="authentication" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding required
-             Authentication.
-             </description>
- </intent>
- 
- <intent name="logging" 
-             constrains="sca:implementation">
-             <description>
-                All messages to and from this implementation must be logged
-             </description>
- </intent>
- 
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
+++ /dev/null
@@ -1,56 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
deleted file mode 100644
index fcb43c949b..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- Extension Types Metadata -->
-<implementationType type="sca:implementation.java" alwaysProvides="test:logging"
-                    mayProvide="test:tracing"/>
-<bindingType alwaysProvides="test:confidentiality"
-                    mayProvide="test:integrity"/>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </intent>
- 
- <intent name="integrity" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized modification of the messages.
-             </description>
- </intent>
- 
- <intent name="authentication" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding required
-             Authentication.
-             </description>
- </intent>
- 
- <intent name="logging" 
-             constrains="sca:implementation">
-             <description>
-                All messages to and from this implementation must be logged
-             </description>
- </intent> 
- 
- <intent name="tracing" 
-             constrains="sca:implementation.java">
-             <description>
-                Need to figure out some description for this 
-             </description>
- </intent>
- 
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
+++ /dev/null
@@ -1,56 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
deleted file mode 100644
index 8346dcc01a..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:test="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:calc="http://calculator">
-    
-    <!-- Extension Types Metadata -->
-<implementationType type="sca:implementation.java" alwaysProvides="test:logging"
-					mayProvide="test:tracing"/>
-<bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality"
-					mayProvide="test:integrity"/>
-
-    <!-- PolicySets -->
-    <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.java"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0">
-        <tuscany:jdkLogger name="calculator">
-            <logLevel>FINER</logLevel>
-        </tuscany:jdkLogger>
-    </policySet>
-    
-    <!-- Intents and Policysets to assume targetnamespace -->									
-<intent name="TestIntentOne" 
- 			 constrains="sca:binding"
- 			 >
- 			 <description>
- 			 	Test Intent
- 			 </description>
- </intent>
- 
-  <intent name="TestIntentTwo" 
- 			 constrains="sca:binding"
- 			 requires="test:TestIntentOne">
- 			 <description>
- 			 	Protect messages from unauthorized reading or modification
- 			 </description>
- </intent>
- 
- <policySet name="TestPolicySetOne"
- 	provides="test:TestIntentOne"
- 	appliesTo="sca:binding.ws"
- 	xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- 		<wsp:PolicyAttachment>
- 			<!-- policy expression and policy subject for
-				 "basic authentication" -->
-		</wsp:PolicyAttachment>
-     	<wsp:PolicyAttachment>
-		 	<!-- policy expression and policy subject for
-		 		"reliability" -->
-		</wsp:PolicyAttachment>
- </policySet>
- 
- 
- <!-- qualified intents -->
- <intent name="confidentiality.transport" />
- <intent name="confidentiality.message" />
- <intent name="confidentiality.message.whole" />
- <intent name="confidentiality.message.body" /> 
- 
- <!-- POLICY SETS -->
-  <policySet name="SecureReliablePolicy"
- 	provides="test:confidentiality.transport test:integrity"
- 	appliesTo="sca:binding.ws"
- 	xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- 		<wsp:PolicyAttachment>
- 			<!-- policy expression and policy subject for
-				 "basic authentication" -->
-		</wsp:PolicyAttachment>
-     	<wsp:PolicyAttachment>
-		 	<!-- policy expression and policy subject for
-		 		"reliability" -->
-		</wsp:PolicyAttachment>
- </policySet>
-
-<policySet name="SecurityPolicy" provides="test:confidentiality"
-    appliesTo="binding.ws"
-	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
-    <intentMap provides="test:confidentiality" default="message">
-        <qualifier name="message">
-            <intentMap provides="message" default="whole">
-                <qualifier name="body">
-                	<wsp:PolicyAttachment>
-                		<!-- policy attachment for body encryption --> 
-               		</wsp:PolicyAttachment>
-           		</qualifier>
-                <qualifier name="whole">
-                	<wsp:PolicyAttachment>
-                		<!-- policy attachment for whole message encryption --> 
-               		</wsp:PolicyAttachment>
-             	</qualifier>
-            </intentMap>
-        </qualifier>
-        <qualifier name="transport">
-        	<wsp:PolicyAttachment>
-        		<!-- policy attachment for transport encryption --> 
-       		</wsp:PolicyAttachment>
-        </qualifier>
-    </intentMap>
-</policySet>
-
-<policySet name="BasicAuthMsgProtSecurity"
-     provides="test:authentication test:confidentiality"
-     appliesTo="binding.ws"
- 		xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <policySetReference name="test:AuthenticationPolicies"/>
-    <policySetReference name="test:ConfidentialityPolicies"/>
-</policySet>
-
-<policySet name="AuthenticationPolicies"
-	provides="test:authentication"
-	appliesTo="binding.ws"
-	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-    <wsp:PolicyAttachment>
-        <!-- policy expression and policy subject for "basic
-        authentication" -->
-    </wsp:PolicyAttachment>
-</policySet>
-
-<policySet name="ConfidentialityPolicies"
- provides="test:confidentiality"
- appliesTo="binding.ws"
- xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-    <intentMap provides="test:confidentiality"  default="transport">
-        <qualifier name="transport">
-            <wsp:PolicyAttachment>
-                <!-- policy expression and policy subject for "transport"
-                alternative -->
-            </wsp:PolicyAttachment>
-            <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
-        </qualifier>
-        <qualifier name="message">
-            <wsp:PolicyAttachment>
-                <!-- policy expression and policy subject for "message"
-                alternative" -->...
-            </wsp:PolicyAttachment>
-        </qualifier>
-    </intentMap>
-</policySet>
-
-<policySet name="SecureWSPolicy"
- 	provides="test:confidentiality"
- 	appliesTo="sca:binding.ws"
- 	xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 	xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
- 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-	<wsp:Policy>
-	    <wsp:ExactlyOne>
-	      <wsp:All>
-	        <sp:SecurityToken>
-	          <sp:TokenType>sp:X509v3</sp:TokenType>
-	        </sp:SecurityToken>
-	        <sp:UsernameToken /> 
-	        <sp:SignedParts />
-	        <sp:EncryptedParts>
-	          <sp:Body />
-	        </sp:EncryptedParts>
-	        <sp:TransportBinding>
-	          <sp:IncludeTimeStamp />
-	        </sp:TransportBinding>
-	      </wsp:All>
-	    </wsp:ExactlyOne>
-  </wsp:Policy>
- </policySet>
-
-<!-- profile intent -->
- <intent name="reliableMessageProtection" 
- 			 constrains="sca:binding"
- 			 requires="test:messageProtection">
- 			 <description>
- 			 	Protect messages from unauthorized reading or modification
- 			 </description>
- </intent>
- 
- <intent name="messageProtection" 
- 			 constrains="sca:binding"
- 			 requires="test:confidentiality test:integrity">
- 			 <description>
- 			 	Protect messages from unauthorized reading or modification
- 			 </description>
- </intent>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
- 			 constrains="sca:binding">
- 			 <description>
- 			 Communitcation thro this binding must prevent
- 			 unauthorized users from reading the messages.
- 			 </description>
- </intent>
- 
- <intent name="integrity" 
- 			 constrains="sca:binding">
- 			 <description>
- 			 Communitcation thro this binding must prevent
- 			 unauthorized modification of the messages.
- 			 </description>
- </intent>
- 
- <intent name="authentication" 
- 			 constrains="sca:binding">
- 			 <description>
- 			 Communitcation thro this binding required
- 			 Authentication.
- 			 </description>
- </intent>
- 
- <intent name="logging" 
- 			 constrains="sca:implementation">
- 			 <description>
- 			 	All messages to and from this implementation must be logged
- 			 </description>
- </intent>
- 
- <intent name="tracing" 
- 			 constrains="sca:implementation.java">
- 			 <description>
- 			 	Need to figure out some description for this 
- 			 </description>
- </intent>
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
+++ /dev/null
@@ -1,56 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml b/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
deleted file mode 100644
index 60f4de5cd3..0000000000
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- Extension Types Metadata -->
-<implementationType type="sca:interface.java" alwaysProvides="test:logging"
-                    mayProvide="test:tracing"/>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </intent>
- 
- <intent name="integrity" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized modification of the messages.
-             </description>
- </intent>
- 
- <intent name="authentication" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding required
-             Authentication.
-             </description>
- </intent>
- 
- <intent name="logging" 
-             constrains="sca:implementation">
-             <description>
-                All messages to and from this implementation must be logged
-             </description>
- </intent>
- 
- <intent name="tracing" 
-             constrains="sca:implementation.java">
-             <description>
-                Need to figure out some description for this 
-             </description>
- </intent>
- 
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/java/sca-contrib/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
deleted file mode 100644
index 55999fe27d..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
+++ /dev/null
@@ -1,60 +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 assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ContributionReadException extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/ContributionReadException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/ContributionReadException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ContributionReadException", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/java/sca-contrib/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
deleted file mode 100644
index 5ab65b2f64..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
+++ /dev/null
@@ -1,60 +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 assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PolicyImplValidationException extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/PolicyImplValidationException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("PolicyImplValidationException", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/java/sca-contrib/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
deleted file mode 100644
index 52803411cf..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
+++ /dev/null
@@ -1,60 +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 assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PolicyServiceValidationException extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/PolicyServiceValidationException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("PolicyServiceValidationException", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
deleted file mode 100644
index 8adf1aa2aa..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
+++ /dev/null
@@ -1,60 +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 assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedBindingElement extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/UnexpectedBindingElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnexpectedBindingElement", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
deleted file mode 100644
index 2790cd0a6c..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
+++ /dev/null
@@ -1,60 +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 assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedImplementationElement extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/UnexpectedImplementationElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnexpectedImplementationElement", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
deleted file mode 100644
index c6daaebfe5..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.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 assembly.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedInterfaceElement extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite", 
-        			"TestContribution", "src/main/resources/assemblyxml/UnexpectedInterfaceElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("UnexpectedInterfaceElement", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
deleted file mode 100644
index 204034737b..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
+++ /dev/null
@@ -1,66 +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 binding.ejb;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnknownEJBSessionTypeTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception {
-        System.setProperty("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
-        System.setProperty("java.naming.provider.url", "ejbd://localhost:8085");
-        System.setProperty("managed", "false");
-
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/bindingejb/UnknownEJBSessionType/account.composite",
-                                          "TestContribution",
-                                          "src/main/resources/bindingejb/UnknownEJBSessionType/");
-        } catch (Exception ex) {
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        System.clearProperty("java.naming.factory.initial");
-        System.clearProperty("java.naming.provider.url");
-        System.clearProperty("managed");
-        //node.stop();
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = monitor.getLastProblem();
-
-        assertNotNull(problem);
-        assertEquals("UnknownEJBSessionType", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
deleted file mode 100644
index ff2e413ab7..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
+++ /dev/null
@@ -1,65 +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 binding.ejb;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnknownEJBVersionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception {
-    	System.setProperty("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
-        System.setProperty("java.naming.provider.url", "ejbd://localhost:8085");
-        System.setProperty("managed", "false");
-        
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingejb/UnknownEJBVersion/account.composite", 
-        			"TestContribution", "src/main/resources/bindingejb/UnknownEJBVersion/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        System.clearProperty("java.naming.factory.initial");
-        System.clearProperty("java.naming.provider.url");
-        System.clearProperty("managed");
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnknownEJBVersion", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
deleted file mode 100644
index 1632f95689..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessActivationSpecTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-               customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite", 
-                         "TestContribution", "src/main/resources/bindingjms/DoesntProcessActivationSpec/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessActivationSpec", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
deleted file mode 100644
index 054f5a6035..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessDestinationTypeTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessDestinationType/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessDestinationType", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
deleted file mode 100644
index f3f61ec04b..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
+++ /dev/null
@@ -1,61 +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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.junit.Ignore;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessHeadersTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessHeaders/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessHeaders/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    @Ignore("TUSCANY-2532")
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-//       assertEquals("DoesntProcessHeaders", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
deleted file mode 100644
index 76d8a63b51..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessResourceAdapterTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessResourceAdapter/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResourceAdapter", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
deleted file mode 100644
index 95c108e6db..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessResponseActivationSpecTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-             customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite", 
-                       "TestContribution", "src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResponseActivationSpec", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
deleted file mode 100644
index 2f66bbfe0c..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessResponseConnectionFactoryTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResponseConnectionFactory", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
deleted file mode 100644
index decf234753..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DoesntProcessResponseDestinationTypeTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite", 
-                        "TestContribution", "src/main/resources/bindingjms/DoesntProcessResponseDestinationType/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResponseDestinationType", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
deleted file mode 100644
index 445a41700b..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidCorrelationSchemeTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/InvalidCorrelationScheme/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidCorrelationScheme", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
deleted file mode 100644
index 531573a0aa..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.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 binding.jms;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.monitor.Monitor;

-import org.apache.tuscany.sca.monitor.Problem;

-

-import domain.CustomCompositeBuilder;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class InvalidJMSDeliveryModeTestCase extends TestCase {

-

-    private CustomCompositeBuilder customDomain;

-

-    @Override

-    protected void setUp() throws Exception 

-    {

-        customDomain = CustomCompositeBuilder.getInstance();

-        try {

-              customDomain.loadContribution("src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite", 

-                        "TestContribution", "src/main/resources/bindingjms/InvalidJMSDeliveryMode/");

-        } catch (Exception ex){

-            //throw ex;

-        }

-    }

-

-    @Override

-    protected void tearDown() throws Exception {

-        //node.stop();

-    }

-

-    public void testCalculator() {

-    	Monitor monitor = customDomain.getMonitorInstance();

-    	Problem problem = monitor.getLastProblem();

-        

-    	assertNotNull(problem);

-        assertEquals("InvalidJMSDeliveryMode", problem.getMessageId()); 

-    }

-}

diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
deleted file mode 100644
index 758e19d264..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.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 binding.jms;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.monitor.Monitor;

-import org.apache.tuscany.sca.monitor.Problem;

-

-import domain.CustomCompositeBuilder;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class InvalidJMSPriorityTestCase extends TestCase {

-

-    private CustomCompositeBuilder customDomain;

-

-    @Override

-    protected void setUp() throws Exception 

-    {

-        customDomain = CustomCompositeBuilder.getInstance();

-        try {

-              customDomain.loadContribution("src/main/resources/bindingjms/InvalidJMSPriority/service.composite", 

-                        "TestContribution", "src/main/resources/bindingjms/InvalidJMSPriority/");

-        } catch (Exception ex){

-            //throw ex;

-        }

-    }

-

-    @Override

-    protected void tearDown() throws Exception {

-        //node.stop();

-    }

-

-    public void testCalculator() {

-    	Monitor monitor = customDomain.getMonitorInstance();

-    	Problem problem = monitor.getLastProblem();

-        

-    	assertNotNull(problem);

-        assertEquals("InvalidJMSPriority", problem.getMessageId()); 

-    }

-}

diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
deleted file mode 100644
index 96319438b6..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidResponseDestinationTypeTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/InvalidResponseDestinationType/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidResponseDestinationType", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
deleted file mode 100644
index a2a4caa0b0..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingActivationSpecNameTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MissingActivationSpecName/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MissingActivationSpecName/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingActivationSpecName", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
deleted file mode 100644
index 0d91afd7e6..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingConnectionFactoryNameTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MissingConnectionFactoryName/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingConnectionFactoryName", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
deleted file mode 100644
index 048fcc7d43..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingResponseActivationSpecTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MissingResponseActivationSpec/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingResponseActivationSpec", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
deleted file mode 100644
index 856c9f3b27..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingResponseConnectionFactoryTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MissingResponseConnectionFactory/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingResponseConnectionFactory", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
deleted file mode 100644
index b584cb8d94..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MustStartWithSchemaTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/MustStartWithSchema/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/MustStartWithSchema/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MustStartWithSchema", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
deleted file mode 100644
index ae26008564..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedElementTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-               customDomain.loadContribution("src/main/resources/bindingjms/UnexpectedElement/service.composite", 
-                         "TestContribution", "src/main/resources/bindingjms/UnexpectedElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("UnexpectedElement", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
deleted file mode 100644
index fedc1f7530..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnexpectedResponseElementTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-               customDomain.loadContribution("src/main/resources/bindingjms/UnexpectedResponseElement/service.composite", 
-                         "TestContribution", "src/main/resources/bindingjms/UnexpectedResponseElement/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("UnexpectedResponseElement", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
deleted file mode 100644
index d94643cbc9..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.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 binding.jms;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnknownTokenInURITestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/bindingjms/UnknownTokenInURI/service.composite", 
-        			"TestContribution", "src/main/resources/bindingjms/UnknownTokenInURI/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnknownTokenInURI", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
deleted file mode 100644
index 4cbe3def2d..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
+++ /dev/null
@@ -1,60 +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 binding.wsxml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidWsdlElementAttrTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite", 
-        			"TestContribution", "src/main/resources/binding/wsxml/InvalidWsdlElementAttr/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidWsdlElementAttr", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
deleted file mode 100644
index 2fe8af318c..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
+++ /dev/null
@@ -1,60 +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 binding.wsxml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MustUseWsdlBindingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite", 
-        			"TestContribution", "src/main/resources/binding/wsxml/MustUseWsdlBinding/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MustUseWsdlBinding", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
deleted file mode 100644
index 09865ab855..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
+++ /dev/null
@@ -1,60 +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 binding.wsxml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class WsdlBindingDoesNotMatchTestCase extends TestCase {
-	
-    private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-             customDomain.loadContribution("src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite", 
-                       "TestContribution", "src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("WsdlBindingDoesNotMatch", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
deleted file mode 100644
index 3be31d5994..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.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 binding.wsxml;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.monitor.Monitor;

-import org.apache.tuscany.sca.monitor.Problem;

-

-import domain.CustomCompositeBuilder;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class WsdlPortTypeDoesNotMatchTestCase extends TestCase {

-	

-    private CustomCompositeBuilder customDomain;

-    

-    @Override

-    protected void setUp() throws Exception 

-    {

-        customDomain = CustomCompositeBuilder.getInstance();

-        try {

-             customDomain.loadContribution("src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite", 

-                       "TestContribution", "src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/");

-        } catch (Exception ex){

-            //throw ex;

-        }

-    }

-

-    @Override

-    protected void tearDown() throws Exception {

-        //node.stop();

-    }

-

-    public void testCalculator() {

-        Monitor monitor = customDomain.getMonitorInstance();

-        Problem problem = monitor.getLastProblem();

-        

-        assertNotNull(problem);

-        assertEquals("WsdlPortTypeDoesNotMatch", problem.getMessageId()); 

-    }

-}

diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
deleted file mode 100644
index 303b8299ad..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
+++ /dev/null
@@ -1,60 +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 binding.wsxml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class WsdlServiceDoesNotMatchTestCase extends TestCase {
-	
-    private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-             customDomain.loadContribution("src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite", 
-                       "TestContribution", "src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("WsdlServiceDoesNotMatch", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
deleted file mode 100644
index f4ba8eb4e6..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ComponentReferenceTargetNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/ComponentReferenceTargetNotFound").toURL().toString()));
-        
-        try {
-            node.start();
-        } catch (Exception ex){
-            // do nothing - the SCA binding throws and exception here 
-            // because the interface for the reference is not remotable
-        }
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ComponentReferenceTargetNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
deleted file mode 100644
index a7b23ed10f..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
+++ /dev/null
@@ -1,60 +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 calculator.warning;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateComponentNameTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/DuplicateComponentName/Calculator.composite", 
-                    "TestContribution", "src/main/resources/DuplicateComponentName/");
-            customDomain.buildContribution();
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateComponentName", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
deleted file mode 100644
index 96d8debd4a..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
+++ /dev/null
@@ -1,64 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateImplementationPropertyNameTestCase extends TestCase {
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/DuplicateImplementationPropertyName/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicateImplementationPropertyName").toURL().toString()));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateImplementationPropertyName", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
deleted file mode 100644
index 7246d6e0a3..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
+++ /dev/null
@@ -1,65 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateImplementationReferenceNameTestCase extends TestCase {
-
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/DuplicateImplementationReferenceName/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicateImplementationReferenceName").toURL().toString()));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateImplementationReferenceName", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
deleted file mode 100644
index 3ffd10f36f..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicatePropertyNameTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/DuplicatePropertyName/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicatePropertyName").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateComponentPropertyName", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
deleted file mode 100644
index 0e0e4cd2bd..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateReferenceNameTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/DuplicateReferenceName/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicateReferenceName").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateComponentReferenceName", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
deleted file mode 100644
index 45c7af3d1f..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MultipleBindingsForServiceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/MultipleBindingsForService/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/MultipleBindingsForService").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("MultipleBindingsForService", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
deleted file mode 100644
index ef2d13aaaa..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
+++ /dev/null
@@ -1,66 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class NoComponentImplementationTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/NoComponentImplementation/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/NoComponentImplementation").toURL().toString()));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("NoComponentImplementation", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
deleted file mode 100644
index 9014fb00e5..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class NoCompositeNamespaceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/NoCompositeNamespace/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/NoCompositeNamespace").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("NoCompositeNamespace", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
deleted file mode 100644
index 69382b0456..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
+++ /dev/null
@@ -1,72 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class NoMatchingBindingTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node =
-            nodeFactory.createNode("Calculator.composite", new Contribution("TestContribution", new File("src/main/resources/NoMatchingBinding")
-                .toURL().toString()));
-
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-
-        assertNotNull(problem);
-        assertEquals("NoMatchingBinding", problem.getMessageId());
-
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
deleted file mode 100644
index 057039b4df..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PromotedReferenceNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/PromotedReferenceNotFound/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/PromotedReferenceNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PromotedReferenceNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
deleted file mode 100644
index cda4f9cb57..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PromotedServiceNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/PromotedServiceNotFound/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/PromotedServiceNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PromotedServiceNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
deleted file mode 100644
index e8475bb865..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyAttributeMustSupplyNullTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyMustSupplyNull", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
deleted file mode 100644
index 88721a18e2..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyAttributeTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/PropertyAttribute/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyMustSupplyIncompatible", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
deleted file mode 100644
index 1a0739eaa5..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/PropertyNotFound/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
deleted file mode 100644
index c20c551d92..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyOverrideManyAttributeTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyOverrideManyAttribute", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
deleted file mode 100644
index 7ae97638ce..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceIncompatibleComponentInterfaceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceIncompatibleComponentInterface").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceIncompatibleComponentInterface", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
deleted file mode 100644
index 6e5eb41ba0..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceIncompatibleInterfaceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/ReferenceIncompatibleInterface/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceIncompatibleInterface").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceIncompatibleInterface", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
deleted file mode 100644
index 2eec73f815..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceIncompatibleMultiplicityTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceIncompatibleMultiplicity").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceIncompatibleMultiplicity", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
deleted file mode 100644
index ab2c373486..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
+++ /dev/null
@@ -1,71 +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 calculator.warning;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceNotFoundTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/ReferenceNotFound/Calculator.composite", 
-                                          "TestContribution", 
-                                          "src/main/resources/ReferenceNotFound/");
-            customDomain.buildContribution();
-        } catch (Exception ex){
-            throw ex;
-        }   
-        
-        
-        /*
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-        */
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
deleted file mode 100644
index 9b5adee7e6..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceWithoutTargetsTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/ReferenceWithoutTargets/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceWithoutTargets").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceWithoutTargets", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
deleted file mode 100644
index 1b8116a469..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
+++ /dev/null
@@ -1,70 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ServiceNotFoundForComponentServiceTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/ServiceNotFoundForComponentService/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/ServiceNotFoundForComponentService").toURL().toString()));
-        node.start();
-        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ServiceNotFoundForComponentService", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
deleted file mode 100644
index c848cbb243..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
+++ /dev/null
@@ -1,66 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnresolvedComponentImplementationTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = nodeFactory.createNode(new File("src/main/resources/UnresolvedComponentImplementation/Calculator.composite").toURL().toString(),
-        		                 new Contribution("TestContribution", 
-        		                                     new File("src/main/resources/UnresolvedComponentImplementation").toURL().toString()));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("UnresolvedComponentImplementation", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/java/sca-contrib/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
deleted file mode 100644
index a13ea84260..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
+++ /dev/null
@@ -1,67 +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 calculator.warning;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class XSDValidationTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private Node node;
-    private Exception startUpException;
-
-    @Override
-    protected void setUp() throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        try {
-            node = nodeFactory.createNode(new File("src/main/resources/XsdValidation/Calculator.composite").toURL().toString(),
-            		                 new Contribution("TestContribution", 
-            		                                     new File("src/main/resources/XsdValidation").toURL().toString()));
-            node.start();
-            calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-        } catch (Exception ex){
-            startUpException = ex;
-        }        
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (node != null){
-            node.stop();
-        }
-    }
-
-
-    public void testCalculator() throws Exception {
-        
-        assertEquals("org.oasisopen.sca.ServiceRuntimeException: Unexpected <binding> element found. It should appear inside a <service> or <reference> element.", startUpException.getMessage());
-   
-    }
- 
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/java/sca-contrib/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
deleted file mode 100644
index 60b0c51fef..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
+++ /dev/null
@@ -1,60 +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 contribution.java;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributePackageMissingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite", 
-        			"TestContribution", "src/main/resources/contribution/java/AttributePackageMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributePackageMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/java/sca-contrib/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
deleted file mode 100644
index dd38802bbe..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
+++ /dev/null
@@ -1,60 +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 contribution.namespace;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeNameSpaceMissingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite", 
-        			"TestContribution", "src/main/resources/contribution/namespace/AttributeNameSpaceMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeNameSpaceMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/java/sca-contrib/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
deleted file mode 100644
index d83a4bfed9..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
+++ /dev/null
@@ -1,60 +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 contribution.resource;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeURIMissingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite", 
-        			"TestContribution", "src/main/resources/contribution/resource/AttributeURIMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getProblems().get(0);
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeURIMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/java/sca-contrib/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
deleted file mode 100644
index b64de39c80..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
+++ /dev/null
@@ -1,60 +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 contribution.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeCompositeMissingTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite", 
-        			"TestContribution", "src/main/resources/contribution/xml/AttributeCompositeMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeCompositeMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java b/java/sca-contrib/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
deleted file mode 100644
index 0a71ea06c7..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
+++ /dev/null
@@ -1,64 +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 contribution.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MultipleCompositeErrorsTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-    
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite", 
-        			                      "TestContribution", 
-        			                      "src/main/resources/contribution/xml/MultipleCompositeErrors/");
-        } catch (Exception ex){
-            //throw ex;
-        	System.out.println("Got Exception");
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-    	assertEquals(5, monitor.getProblems().size());
-        assertEquals("AttributeCompositeMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/java/sca-contrib/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
deleted file mode 100644
index 6fd5c04671..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
+++ /dev/null
@@ -1,230 +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 domain;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBindingConfigurationBuilderImpl;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.processor.DefaultValidatingXMLInputFactory;
-import org.apache.tuscany.sca.contribution.processor.DefaultValidationSchemaExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.Definitions;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-import org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuilderImpl;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-
-public class CustomCompositeBuilder {
-    private URLArtifactProcessor<Contribution> contributionProcessor;
-    private ModelResolverExtensionPoint modelResolvers;
-    private FactoryExtensionPoint modelFactories;
-    private WorkspaceFactory workspaceFactory;
-    private AssemblyFactory assemblyFactory;
-    private XMLOutputFactory outputFactory;
-    private StAXArtifactProcessor<Object> xmlProcessor; 
-    private ContributionBuilder contributionDependencyBuilder;
-    private CompositeBuilder domainCompositeBuilder;
-    private CompositeBuilder nodeCompositeBuilder;
-    private NodeImplementationFactory nodeFactory;
-    //private AtomBindingFactory atomBindingFactory;
-    private static Workspace workspace;
-    private List<Definitions> policyDefinitions;
-    private Monitor monitor;
-        
-    private CustomCompositeBuilder() {
-        // no code req'd
-    }
-
-    public static CustomCompositeBuilder getInstance()
-    {
-      if (ref == null)
-          ref = new CustomCompositeBuilder();
-      return ref;
-    }
-
-    private static CustomCompositeBuilder ref;
-    
-    private void init() {
-        
-    	// Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        monitor = monitorFactory.createMonitor();
-        
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            activator.start(extensionPoints);
-        }
-        
-        // Get XML input/output factories
-        modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        
-        // create the validating input factory out here just so that the 
-        // monitor can be passed in
-        ValidationSchemaExtensionPoint schemas = new DefaultValidationSchemaExtensionPoint();
-        XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas, monitor);
-        modelFactories.addFactory(validatingInputFactory);
-        
-        // Get contribution workspace and assembly model factories
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        nodeFactory = modelFactories.getFactory(NodeImplementationFactory.class);
-        //atomBindingFactory = modelFactories.getFactory(AtomBindingFactory.class);
-        
-        // Create XML artifact processors
-        StAXArtifactProcessorExtensionPoint xmlProcessorExtensions = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        xmlProcessor = new ExtensibleStAXArtifactProcessor(xmlProcessorExtensions, inputFactory, outputFactory, monitor);
-        
-        // Create contribution content processor
-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
-        
-        // Get the model resolvers
-        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        
-        // Create a contribution dependency builder
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(null);
-        
-        // Create a composite builder
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
-        domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper);
-        
-        // Create a node composite builder
-        CompositeBuilder bindingConfigurationBuilder = new CompositeBindingConfigurationBuilderImpl(assemblyFactory, scaBindingFactory, contractMapper);
-        nodeCompositeBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, contractMapper, bindingConfigurationBuilder);
-    }
-    
-    public void loadContribution(String compositeURL, String sourceURI, String sourceURL) throws Exception {
-    	init();
-
-        // Create workspace model
-        workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI artifactURI = URI.create(sourceURI);
-        //URL contributionURL = FileHelper.toFile(new URL(sourceURL)).toURI().toURL();
-        URL artifactURL = new File(sourceURL).toURI().toURL();
-        URL contributionURL = new File(compositeURL).toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(contributionURL, artifactURI, artifactURL);              	
-        workspace.getContributions().add(storeContribution);
-        
-        // Build the contribution dependencies
-        Set<Contribution> resolved = new HashSet<Contribution>();
-        for (Contribution contribution: workspace.getContributions()) {
-            contributionDependencyBuilder.build(contribution, workspace, monitor);
-            
-            // Resolve contributions
-            for (Contribution dependency: contribution.getDependencies()) {
-                if (!resolved.contains(dependency)) {
-                    resolved.add(dependency);
-                   	contributionProcessor.resolve(dependency, workspace.getModelResolver());                                       
-                }
-            }
-        }
-        
-        // Create a composite model for the domain
-        /*Composite domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName(Constants.SCA10_NS, "domain"));
-        
-        // Add all deployables to it, normally the domain administrator would select
-        // the deployables to include
-        domainComposite.getIncludes().addAll(workspace.getDeployables());
-        
-        // Build the domain composite and wire the components included in it
-        domainCompositeBuilder.build(domainComposite);*/
-    }
-    
-    public Monitor getMonitorInstance() {
-    	return monitor;
-    }
-    
-    public void buildContribution() throws Exception {
-        // Create a composite model for the domain
-        Composite domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName("http://customdomain", "domain"));
-        
-        // Add all deployables to it, normally the domain administrator would select
-        // the deployables to include
-        domainComposite.getIncludes().addAll(workspace.getDeployables());
-        
-        // Build the domain composite and wire the components included in it
-        domainCompositeBuilder.build(domainComposite, null, monitor);
-    }
-    
-    public void readContribution(String compositeURL, String sourceURI, String sourceURL) throws Exception {
-    	init();
-
-        // Create workspace model
-        workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI artifactURI = URI.create(sourceURI);
-        //URL contributionURL = FileHelper.toFile(new URL(sourceURL)).toURI().toURL();
-        URL artifactURL = new File(sourceURL).toURI().toURL();
-        URL contributionURL = new File(compositeURL).toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(contributionURL, artifactURI, artifactURL);              	
-        workspace.getContributions().add(storeContribution);    	
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
deleted file mode 100644
index 690fb97a31..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeUnrecognizedNamespaceTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeUnrecognizedNamespace", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
deleted file mode 100644
index a768535fde..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AttributeWithoutNamespaceTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/AttributeWithoutNamespace/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeWithoutNamespace", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
deleted file mode 100644
index 64d41bdb48..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class BPELProcessNotFoundTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/BPELProcessNotFound/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("BPELProcessNotFound", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
deleted file mode 100644
index 585bd62027..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CannotResolveWSDLReferenceTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/CannotResolveWSDLReference/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("CannotResolveWSDLReference", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
deleted file mode 100644
index aab3529fba..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MyRolePartnerRoleNullTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/MyRolePartnerRoleNull/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MyRolePartnerRoleNull", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
deleted file mode 100644
index 4c3226f4c8..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PartnerLinkHasBothAttrTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/PartnerLinkHasBothAttr/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    private static boolean isMessageLogged(Monitor monitor, String messageId) {
-        for (Problem problem : monitor.getProblems()){
-            if (problem.getMessageId().equals(messageId)){
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	assertTrue(isMessageLogged(monitor, "PartnerLinkHasBothAttr"));
-    	/*Problem problem = monitor.getLastLoggedProblem();        
-    	assertNotNull(problem);
-        assertEquals("PartnerLinkHasBothAttr", problem.getMessageId());*/
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
deleted file mode 100644
index b9c0b68f7e..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PartnerLinkNoMatchingTypeTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/PartnerLinkNoMatchingType/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("PartnerLinkNoMatchingType", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
deleted file mode 100644
index fc32e96b52..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
+++ /dev/null
@@ -1,69 +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 impl.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PartnerLinkTypeNoRolesTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite", 
-        			"TestContribution", "src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    private static boolean isMessageLogged(Monitor monitor, String messageId) {
-        for (Problem problem : monitor.getProblems()){
-            if (problem.getMessageId().equals(messageId)){
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	assertTrue(isMessageLogged(monitor, "PartnerLinkTypeNoRoles"));
-    	/*Problem problem = monitor.getLastLoggedProblem();        
-    	assertNotNull(problem);
-        assertEquals("PartnerLinkTypeNoRoles", problem.getMessageId());*/
-        
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
deleted file mode 100644
index 4b367f85ef..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.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 impl.ejb;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class EJBLinkAttributeMissingTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite", 
-                      "TestContribution", "src/main/resources/impl/ejb/EJBLinkAttributeMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("EJBLinkAttributeMissing", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
deleted file mode 100644
index 969690acaf..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.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 impl.java;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ClassNotFoundExceptionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/impl/java/ClassNotFoundException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/impl/java/ClassNotFoundException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ClassNotFoundException", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
deleted file mode 100644
index eef964e274..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
+++ /dev/null
@@ -1,60 +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 impl.java;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ContributionResolveExceptionTestCase extends TestCase {
-	
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/java/ContributionResolveException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/impl/java/ContributionResolveException/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //nothing to do
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	
-    	assertNotNull(problem);
-        assertEquals("ContributionResolveException", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
deleted file mode 100644
index c2fd7b3410..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.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 impl.resource;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CouldNotResolveLocationTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite", 
-                      "TestContribution", "src/main/resources/impl/resource/CouldNotResolveLocation/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = monitor.getLastProblem();
-        
-        Assert.assertNotNull(problem);
-        Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
deleted file mode 100644
index c6a58d2b88..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.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 impl.resource;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class LocationAttributeMissingTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/resource/LocationAttributeMissing/resource.composite", 
-                      "TestContribution", "src/main/resources/impl/resource/LocationAttributeMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
deleted file mode 100644
index ff0b2f3589..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
+++ /dev/null
@@ -1,66 +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 impl.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ContributionResolveExceptionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/spring/ContributionResolveException/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-    
-    private static boolean isMessageLogged(Monitor monitor, String messageId) {
-        for (Problem problem : monitor.getProblems()){
-            if (problem.getMessageId().equals(messageId)){
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();        
-    	assertTrue(isMessageLogged(monitor, "ContributionResolveException"));
-        //assertEquals("ContributionResolveException", problem.getMessageId());  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
deleted file mode 100644
index 7b445960f1..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.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 impl.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class LocationAttributeMissingTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/spring/LocationAttributeMissing/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
deleted file mode 100644
index 6b4521cdc9..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.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 impl.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnableToResolveComponentTypeTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/spring/UnableToResolveComponentType/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	//assertNotNull(problem);
-        //assertEquals("UnableToResolveComponentType", problem.getMessageId());  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
deleted file mode 100644
index f46e9e4035..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.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 impl.widget;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CouldNotResolveLocationTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite", 
-                      "TestContribution", "src/main/resources/impl/widget/CouldNotResolveLocation/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = monitor.getLastProblem();
-        
-        Assert.assertNotNull(problem);
-        Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
deleted file mode 100644
index ed95bcdcf0..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.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 impl.widget;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class LocationAttributeMissingTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-            customDomain.loadContribution("src/main/resources/impl/widget/LocationAttributeMissing/widget.composite", 
-                      "TestContribution", "src/main/resources/impl/widget/LocationAttributeMissing/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = monitor.getLastProblem();
-        
-        assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
deleted file mode 100644
index bd5a6d9601..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.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 impl.xquery;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CouldNotLocateFileTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/xquery/CouldNotLocateFile/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("CouldNotLocateFile", problem.getMessageId());  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java b/java/sca-contrib/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
deleted file mode 100644
index 390eeb7e95..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.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 impl.xquery;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class LocationAttributeMissingTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite", 
-        			"TestContribution", "src/main/resources/impl/xquery/LocationAttributeMissing/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java b/java/sca-contrib/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
deleted file mode 100644
index e2bee4d2ac..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.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 interfacejava.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ClassNotFoundTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {
-        	customDomain.loadContribution("src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/interfacejava/xml/ClassNotFoundException/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ClassNotFoundException", problem.getMessageId()); 
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java b/java/sca-contrib/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
deleted file mode 100644
index 3b567da717..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.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 interfacejava.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ContributionResolveExceptionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite", 
-        			"TestContribution", "src/main/resources/interfacejava/xml/ContributionResolveException/");        	            
-        } catch (Exception ex){
-            throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	//assertNotNull(problem);
-        //assertEquals("ContributionResolveException", problem.getMessageId());  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java b/java/sca-contrib/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
deleted file mode 100644
index fc03bc25eb..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.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 interfacewsdl.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class InvalidWSDLInterfaceAttrTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite", 
-        			"TestContribution", "src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidWSDLInterfaceAttr", problem.getMessageId());  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java b/java/sca-contrib/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
deleted file mode 100644
index d41d72585f..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.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 interfacewsdl.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class WsdlInterfaceDoesNotMatchTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-             customDomain.loadContribution("src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite", 
-                       "TestContribution", "src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("WsdlInterfaceDoesNotMatch", problem.getMessageId());  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java b/java/sca-contrib/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
deleted file mode 100644
index 2d4bb3d499..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class AlwaysProvidedIntentNotFoundTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite", 
-        			"TestContribution", "src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AlwaysProvidedIntentNotFound", problem.getMessageId());  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java b/java/sca-contrib/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
deleted file mode 100644
index 5b5bfe7b37..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ErrorInPolicyIntentDefinitionTestCase extends TestCase {
-
-	private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-    	customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-        	customDomain.loadContribution("src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite", 
-        			"TestContribution", "src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ErrorInPolicyIntentDefinition", problem.getMessageId());  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java b/java/sca-contrib/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
deleted file mode 100644
index 8ef3cacc4e..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class IntentNotSpecifiedTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-             customDomain.loadContribution("src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite", 
-                       "TestContribution", "src/main/resources/policy/xml/IntentNotSpecified/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    private static boolean isMessageLogged(Monitor monitor, String messageId) {
-        for (Problem problem : monitor.getProblems()){
-            if (problem.getMessageId().equals(messageId)){
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void testCalculator() {
-       Monitor monitor = customDomain.getMonitorInstance();
-       assertTrue(isMessageLogged(monitor, "IntentNotSpecified"));
-       /*Problem problem = monitor.getLastLoggedProblem(); 
-       assertNotNull(problem);
-       assertEquals("IntentNotSpecified", problem.getMessageId());*/  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java b/java/sca-contrib/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
deleted file mode 100644
index 38d59196dd..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MayProvideIntentNotFoundTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-             customDomain.loadContribution("src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite", 
-                       "TestContribution", "src/main/resources/policy/xml/MayProvideIntentNotFound/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-       Monitor monitor = customDomain.getMonitorInstance();
-       Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("MayProvideIntentNotFound", problem.getMessageId());  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java b/java/sca-contrib/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
deleted file mode 100644
index 9671f9c983..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class RequiredAttributeMissingTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-              customDomain.loadContribution("src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite", 
-                        "TestContribution", "src/main/resources/policy/xml/RequiredAttributeMissing/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-       Monitor monitor = customDomain.getMonitorInstance();
-       Problem problem = monitor.getLastProblem();
-        
-       assertNotNull(problem);
-       assertEquals("RequiredAttributeMissing", problem.getMessageId());  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java b/java/sca-contrib/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
deleted file mode 100644
index c2ede5cd41..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
+++ /dev/null
@@ -1,64 +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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.junit.Ignore;
-import org.junit.Ignore;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnableToMapPoliciesTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-            customDomain.loadContribution("src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite", 
-                      "TestContribution", "src/main/resources/policy/xml/UnableToMapPolicies/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    @Ignore("TUSCANY-2538")
-    public void testCalculator() {
-    	//FIXME This needs to be fixed, as it was working based on processor ignoring
-    	//elements... 
-        /*
-    	Monitor monitor = customDomain.getMonitorInstance();
-        assertTrue(monitor.isMessageLogged("UnableToMapPolicies"));
-        */
-        /*Problem problem = monitor.getLastLoggedProblem();        
-        assertNotNull(problem);
-        assertEquals("UnableToMapPolicies", problem.getMessageId());*/  
-    }
-}
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java b/java/sca-contrib/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
deleted file mode 100644
index 08c27ee011..0000000000
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.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 policy.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class UnrecognizedIntentAttachPointTypeTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {        	
-            customDomain.loadContribution("src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite", 
-                      "TestContribution", "src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/");        	            
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-       Monitor monitor = customDomain.getMonitorInstance();
-       Problem problem = monitor.getLastProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("UnrecognizedIntentAttachPointType", problem.getMessageId());  
-    }
-}
diff --git a/java/sca-contrib/itest/ws-void-args-return/pom.xml b/java/sca-contrib/itest/ws-void-args-return/pom.xml
deleted file mode 100644
index 5b5f00aac1..0000000000
--- a/java/sca-contrib/itest/ws-void-args-return/pom.xml
+++ /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.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-ws-void-args-return</artifactId>

-    <name>Apache Tuscany SCA Web Services Void Args and Return Test</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-    </dependencies>

-    

-</project>

diff --git a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/Bean.java b/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
deleted file mode 100644
index 43e251369d..0000000000
--- a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
+++ /dev/null
@@ -1,39 +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 voidtest;
-
-public class Bean {
-
-    private String first;
-    private String last;
-    
-    public String getLast() {
-        return last;
-    }
-    public void setLast(String last) {
-        this.last = last;
-    }
-    public String getFirst() {
-        return first;
-    }
-    public void setFirst(String first) {
-        this.first = first;
-    }
-
-}
diff --git a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java b/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
deleted file mode 100644
index dfb7f0a474..0000000000
--- a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
+++ /dev/null
@@ -1,64 +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 voidtest;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-    public void giveGreetings(String name) {

-        System.out.println("Hello " + name);

-    }

-

-    public void giveGreetingsOneWay(String name) {

-        System.out.println("Hi " + name);

-    }

-

-    public String takeGreetings() {

-        return "Hello Stranger";

-    }

-

-    public void noGreetings() {

-        System.out.println("Hello, who's there?");

-    }

-    

-    public Bean getBean(){

-    	Bean bean = new Bean();

-    	bean.setFirst("wang");

-    	bean.setLast("feng");

-    	return bean;

-    }

-    

-    public Bean getNullBean(){

-    	return  null;

-    }

-    

-    public String getNullString(){

-    	return  null;

-    }

-

-}

diff --git a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java b/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
deleted file mode 100644
index 9bb945b71a..0000000000
--- a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
+++ /dev/null
@@ -1,47 +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 voidtest;

-

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    String getGreetings(String name);

-

-    void giveGreetings(String name);

-

-    @OneWay

-    void giveGreetingsOneWay(String name);

-

-    String takeGreetings();

-

-    void noGreetings();

-    

-    Bean getBean();

-    

-    String getNullString();

-    

-    Bean getNullBean();

-}

-

diff --git a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java b/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
deleted file mode 100644
index d549bccaf0..0000000000
--- a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
+++ /dev/null
@@ -1,23 +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 voidtest;

-

-public interface TestClient {

-    void runTest();

-}

diff --git a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java b/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
deleted file mode 100644
index 9ea0a98f95..0000000000
--- a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
+++ /dev/null
@@ -1,53 +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 voidtest;

-

-import static junit.framework.Assert.assertEquals;

-import static junit.framework.Assert.assertNull;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(TestClient.class)

-@Scope("COMPOSITE")

-public class TestClientImpl implements TestClient {

-

-    private HelloWorldService helloService;

-

-    @Reference

-    public void setHelloService(HelloWorldService helloService) {

-        this.helloService = helloService;

-    }

-

-    public void runTest() {

-        assertEquals("Hello  Smith", helloService.getGreetings(" Smith"));

-        helloService.giveGreetings("Jones");

-        helloService.giveGreetingsOneWay("Brown");

-        assertEquals("Hello Stranger", helloService.takeGreetings());

-        helloService.noGreetings();

-        

-        assertEquals("wang",helloService.getBean().getFirst());

-        assertEquals("feng",helloService.getBean().getLast());

-        

-        assertNull(helloService.getNullString());

-        

-        assertNull(helloService.getNullBean());

-    }

-}

diff --git a/java/sca-contrib/itest/ws-void-args-return/src/main/resources/voidtest.composite b/java/sca-contrib/itest/ws-void-args-return/src/main/resources/voidtest.composite
deleted file mode 100644
index 0f31c4cd2c..0000000000
--- a/java/sca-contrib/itest/ws-void-args-return/src/main/resources/voidtest.composite
+++ /dev/null
@@ -1,41 +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://voidtest"

-    xmlns:hw="http://voidtest"

-    name="voidtest">

-

-    <component name="TestClientComponent">

-        <implementation.java class="voidtest.TestClientImpl" />

-        <reference name="helloService">

-            <interface.java interface="voidtest.HelloWorldService"/>

-            <binding.ws uri="http://localhost:8085/HelloWorldServiceComponent/HelloWorldService"/>

-        </reference>

-    </component>

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="voidtest.HelloWorldImpl" />

-        <service name="HelloWorldService">

-            <interface.java interface="voidtest.HelloWorldService"/>

-            <binding.ws uri="http://localhost:8085/HelloWorldServiceComponent/HelloWorldService"/>

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java b/java/sca-contrib/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
deleted file mode 100644
index eaaa67c22c..0000000000
--- a/java/sca-contrib/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
+++ /dev/null
@@ -1,53 +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 voidtest;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests that methods with no args and/or void return type work over Web services

- */

-public class VoidArgsReturnTestCase {

-

-    private SCADomain scaDomain;

-    private TestClient client;

-

-    @Before

-    public void startServer() throws Exception {

-        scaDomain = SCADomain.newInstance("voidtest.composite");

-        client = scaDomain.getService(TestClient.class, "TestClientComponent");

-    }

-

-    @Test

-    public void testVoidCases() throws Exception {

-        client.runTest();

-        System.out.println("Sleeping...");

-        Thread.sleep(2000);

-    }

-

-    @After

-    public void stopServer() throws Exception {

-        scaDomain.close();

-    }

-

-}

diff --git a/java/sca-contrib/itest/wsdl-multiple/pom.xml b/java/sca-contrib/itest/wsdl-multiple/pom.xml
deleted file mode 100644
index b8f499a754..0000000000
--- a/java/sca-contrib/itest/wsdl-multiple/pom.xml
+++ /dev/null
@@ -1,135 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-wsdl-multiple</artifactId>
-    <name>Apache Tuscany SCA Multiple WSDL File Support Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!--plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile>
-                            <javaPackage>com.bigbank.account</javaPackage>
-                            <prefix>Account</prefix>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin-->
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java b/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
deleted file mode 100644
index c5b297cf61..0000000000
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
+++ /dev/null
@@ -1,30 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldCallback {
-
-    public void getGreetingsCallback(String name);
-}
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java b/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
deleted file mode 100644
index 1d03f42830..0000000000
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
+++ /dev/null
@@ -1,42 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate the HelloWorld service and invoke it.
- */
-@Scope("COMPOSITE")
-public class HelloWorldClientImpl implements HelloWorldService, HelloWorldCallback {
-   
-    @Reference 
-    protected HelloWorldService helloWorldService;
-
-    public void getGreetings(String name) {
-        helloWorldService.getGreetings(name);
-    }
-    
-    public void getGreetingsCallback(String name) {
-        System.out.println("Callback " + name);
-    }
-
-}
\ No newline at end of file
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index fc0e2d6122..0000000000
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.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 helloworld;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-@Callback(HelloWorldCallback.class)
-public interface HelloWorldService {
-
-    public void getGreetings(String name);
-}
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java b/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index 7f8285fa09..0000000000
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.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 helloworld;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldServiceImpl implements HelloWorldService {
-    
-    @Callback
-    protected HelloWorldCallback helloWorldCallback; 
-
-    public void getGreetings(String name) {
-        helloWorldCallback.getGreetingsCallback(name);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite b/java/sca-contrib/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
deleted file mode 100644
index 9d9ed57cc7..0000000000
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
+++ /dev/null
@@ -1,44 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance" 
-           name="autohelloworldws">
-    
-  <component name="HelloWorldClientComponent">
-    <implementation.java class="helloworld.HelloWorldClientImpl"/>
-    <reference name="helloWorldService">
-      <binding.ws uri="http://localhost:8085/HelloWorldServiceComponent"/>
-      <callback>
-        <binding.ws uri="http://localhost:8085/HelloWorldClientComponent/helloWorldService"/>        
-      </callback>
-    </reference>
-  </component>
-  
-  <component name="HelloWorldServiceComponent">
-    <implementation.java class="helloworld.HelloWorldServiceImpl"/>
-    <service name="HelloWorldService">
-      <interface.java interface="helloworld.HelloWorldService" callbackInterface="helloworld.HelloWorldCallback"/>
-      <binding.ws uri="http://localhost:8085/HelloWorldServiceComponent"/>
-      <callback>
-        <binding.ws uri="http://localhost:8085/HelloWorldClientComponent/helloWorldService"/>        
-      </callback>
-    </service>
-  </component>
-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite b/java/sca-contrib/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
deleted file mode 100644
index 0c1dc5d353..0000000000
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
+++ /dev/null
@@ -1,46 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance" 
-           name="manualhelloworldws">
-    
-  <component name="HelloWorldClientComponent">
-    <implementation.java class="helloworld.HelloWorldClientImpl"/>
-    <reference name="helloWorldService">
-      <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldServiceSOAP11port)"/>
-      <callback>
-        <binding.ws uri="http://localhost:8085/HelloWorldClientComponent/helloWorldService" 
-                    wsdlElement="http://helloworld#wsdl.binding(HelloWorldCallbackSOAP11Binding)"/>        
-      </callback>
-    </reference>
-  </component>
-  
-  <component name="HelloWorldServiceComponent">
-    <implementation.java class="helloworld.HelloWorldServiceImpl"/>
-    <service name="HelloWorldService">
-      <interface.java interface="helloworld.HelloWorldService" callbackInterface="helloworld.HelloWorldCallback"/>
-      <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldServiceSOAP11port)"/>
-      <callback>
-        <binding.ws uri="http://localhost:8085/HelloWorldClientComponent/helloWorldService"
-                    wsdlElement="http://helloworld#wsdl.binding(HelloWorldCallbackSOAP11Binding)"/>        
-      </callback>
-    </service>
-  </component>
-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl b/java/sca-contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
deleted file mode 100644
index ea2f93c3e6..0000000000
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
+++ /dev/null
@@ -1,98 +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://helloworld"
-	xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-	xmlns:ns="http://helloworld/xsd" 
-	xmlns:axis2="http://helloworld">
-	<wsdl:types>
-		<xs:schema attributeFormDefault="qualified"
-			elementFormDefault="qualified"
-			targetNamespace="http://helloworld/xsd"
-			xmlns:xs="http://www.w3.org/2001/XMLSchema">
-			<xs:element name="getGreetingsCallback">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="param0" nillable="true"
-							type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-            <xs:element name="getGreetingsCallbackResponse">
-                <xs:complexType/>
-            </xs:element>			
-		</xs:schema>
-	</wsdl:types>
-	<wsdl:message name="getGreetingsCallbackMessage">
-		<wsdl:part name="part1" element="ns:getGreetingsCallback">
-		</wsdl:part>
-	</wsdl:message>
-    <wsdl:message name="getGreetingsCallbackResponseMessage">
-        <wsdl:part name="part1" element="ns:getGreetingsCallbackResponse">
-        </wsdl:part>
-    </wsdl:message>	
-	<wsdl:portType name="HelloWorldCallbackPortType">
-		<wsdl:operation name="getGreetingsCallback">
-			<wsdl:input message="axis2:getGreetingsCallbackMessage">
-			</wsdl:input>
-            <wsdl:output message="axis2:getGreetingsCallbackResponseMessage">
-            </wsdl:output>			
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="HelloWorldCallbackSOAP11Binding"
-		type="axis2:HelloWorldCallbackPortType">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getGreetingsCallback">
-			<soap:operation soapAction="urn:getGreetingsCallback"
-				style="document" />
-			<wsdl:input>
-				<soap:body use="literal" namespace="http://helloworld" />
-			</wsdl:input>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:binding name="HelloWorldCallbackSOAP12Binding"
-		type="axis2:HelloWorldCallbackPortType">
-		<soap12:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getGreetingsCallback">
-			<soap12:operation soapAction="urn:getGreetingsCallback"
-				style="document" />
-			<wsdl:input>
-				<soap12:body use="literal" namespace="http://helloworld" />
-			</wsdl:input>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="HelloWorldCallback">
-		<wsdl:port name="HelloWorldCallbackSOAP11port"
-			binding="axis2:HelloWorldCallbackSOAP11Binding">
-			<soap:address
-				location="http://localhost:8085/axis2/services/HelloWorldCallback" />
-		</wsdl:port>
-		<wsdl:port name="HelloWorldCallbackSOAP12port"
-			binding="axis2:HelloWorldCallbackSOAP12Binding">
-			<soap12:address
-				location="http://localhost:8085/axis2/services/HelloWorldCallback" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl b/java/sca-contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
deleted file mode 100644
index 1e50e146f2..0000000000
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
+++ /dev/null
@@ -1,95 +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://helloworld"
-	xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-	xmlns:ns="http://helloworld/xsd" 
-	xmlns:axis2="http://helloworld">
-	<wsdl:types>
-		<xs:schema attributeFormDefault="qualified"
-			elementFormDefault="qualified"
-			targetNamespace="http://helloworld/xsd"
-			xmlns:xs="http://www.w3.org/2001/XMLSchema">
-			<xs:element name="getGreetings">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="param0" nillable="true" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-            <xs:element name="getGreetingsResponse">
-                <xs:complexType/>
-            </xs:element>			
-		</xs:schema>
-	</wsdl:types>
-	<wsdl:message name="getGreetingsMessage">
-		<wsdl:part name="part1" element="ns:getGreetings"></wsdl:part>
-	</wsdl:message>
-    <wsdl:message name="getGreetingsResponseMessage">
-        <wsdl:part name="part1" element="ns:getGreetingsResponse"></wsdl:part>
-    </wsdl:message>	
-	<wsdl:portType name="HelloWorldServicePortType">
-		<wsdl:operation name="getGreetings">
-			<wsdl:input message="axis2:getGreetingsMessage">
-			</wsdl:input>
-            <wsdl:output message="axis2:getGreetingsResponseMessage">
-            </wsdl:output>			
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="HelloWorldServiceSOAP12Binding"
-		type="axis2:HelloWorldServicePortType">
-		<soap12:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getGreetings">
-			<soap12:operation soapAction="urn:getGreetings"
-				style="document" />
-			<wsdl:input>
-				<soap12:body use="literal" namespace="http://helloworld" />
-			</wsdl:input>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:binding name="HelloWorldServiceSOAP11Binding"
-		type="axis2:HelloWorldServicePortType">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getGreetings">
-			<soap:operation soapAction="urn:getGreetings"
-				style="document" />
-			<wsdl:input>
-				<soap:body use="literal" namespace="http://helloworld" />
-			</wsdl:input>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="HelloWorldService">
-		<wsdl:port name="HelloWorldServiceSOAP11port"
-			binding="axis2:HelloWorldServiceSOAP11Binding">
-			<soap:address
-				location="http://localhost:8085/axis2/services/HelloWorldService" />
-		</wsdl:port>
-		<wsdl:port name="HelloWorldServiceSOAP12port"
-			binding="axis2:HelloWorldServiceSOAP12Binding">
-			<soap12:address
-				location="http://localhost:8085/axis2/services/HelloWorldService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java b/java/sca-contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
deleted file mode 100644
index 6a872faa17..0000000000
--- a/java/sca-contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
+++ /dev/null
@@ -1,65 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the behaviour of the system when multiple WSDLs appear in the contribution
- * with the same namespace
- */
-public class AutoWSDLTestCase {
-
-    private static SCADomain domain;
-    
-    @BeforeClass
-    public static void init() throws Throwable {
-        try {
-            domain = SCADomain.newInstance("auto-wsdl.composite");
-        } catch(Exception ex){
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        if ( domain != null){
-            domain.close();
-        }
-    }    
-
-    @Test
-    public void testLoadWSDL() {
-        try {
-            HelloWorldService client = domain.getService(HelloWorldService.class, "HelloWorldClientComponent/HelloWorldService");
-            client.getGreetings("petra");
-        } catch(Exception ex){
-            ex.printStackTrace();
-        }
-        //assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java b/java/sca-contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
deleted file mode 100644
index 5852f8d802..0000000000
--- a/java/sca-contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
+++ /dev/null
@@ -1,65 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the behaviour of the system when multiple WSDLs appear in the contribution
- * with the same namespace
- */
-public class ManualWSDLTestCase {
-
-    private static SCADomain domain;
-    
-    @BeforeClass
-    public static void init() throws Throwable {
-        try {
-            domain = SCADomain.newInstance("manual-wsdl.composite");
-        } catch(Exception ex){
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        if (domain != null){
-            domain.close();
-        }
-    }    
-
-    @Test
-    public void testLoadWSDL() {
-        try {
-            HelloWorldService client = domain.getService(HelloWorldService.class, "HelloWorldClientComponent/HelloWorldService");
-            client.getGreetings("petra");
-        } catch(Exception ex){
-            ex.printStackTrace();
-        }
-        //assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl/pom.xml b/java/sca-contrib/itest/wsdl/pom.xml
deleted file mode 100644
index 871653ca18..0000000000
--- a/java/sca-contrib/itest/wsdl/pom.xml
+++ /dev/null
@@ -1,135 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-wsdl</artifactId>
-    <name>Apache Tuscany SCA WSDL Support Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile>
-                            <javaPackage>com.bigbank.account</javaPackage>
-                            <prefix>Account</prefix>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
deleted file mode 100644
index f3a5873d53..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ /dev/null
@@ -1,92 +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 bigbank.account.services.accountdata;
-
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@AllowsPassByReference
-public interface AccountDataService {
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0*
-     * @param param1*
-     * @param param2
-     */
-    public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param4
-     */
-    public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param6*
-     * @param param7
-     */
-    public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param9*
-     * @param param10*
-     * @param param11
-     */
-    public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11)
-            throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param13*
-     * @param param14
-     */
-    public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param16*
-     * @param param17
-     */
-    public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param19
-     */
-    public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0
-     */
-    public com.bigbank.account.AccountLog getAccountLog(int param0) throws java.rmi.RemoteException;
-
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index f74817a0ff..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.oasisopen.sca.annotation.Service;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountSummary;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-@Service(AccountDataService.class)
-public class AccountDataServiceImpl implements AccountDataService {
-
-    public CustomerProfileData getCustomerProfile(String logonID) throws RemoteException {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int customerID) {
-
-        AccountReport report =AccountFactory.INSTANCE.createAccountReport();
-        AccountSummary summary1 = AccountFactory.INSTANCE.createAccountSummary();
-        summary1.setAccountNumber("123");
-        summary1.setAccountType("checking");
-        summary1.setBalance(1000.0f);
-        report.getAccountSummaries().add(summary1);
-        AccountSummary summary2 = AccountFactory.INSTANCE.createAccountSummary();
-        summary2.setAccountNumber("456");
-        summary2.setAccountType("savings");
-        summary2.setBalance(2000.0f);
-        report.getAccountSummaries().add(summary2);
-        
-        return report;
-    }
-
-    public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
-            throws RemoteException {
-        CustomerProfileData data = AccountFactory.INSTANCE.createCustomerProfileData();
-        data.setLoginID(customerProfile.getLoginID());
-        data.setAddress(customerProfile.getAddress());
-        data.setEmail(customerProfile.getEmail());
-        data.setFirstName(customerProfile.getFirstName());
-        data.setId(customerProfile.getId());
-        data.setLastName(customerProfile.getLastName());
-        data.setPassword(customerProfile.getPassword());
-        return data;
-    }
-
-    public float deposit(String param6, float param7) throws RemoteException {
-        
-        return 0;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary stock) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) throws RemoteException {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) throws RemoteException {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(final int customerID) throws RemoteException {
-        throw new RemoteException("This method should not be called");
-    }
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
deleted file mode 100644
index 47204b66ed..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ /dev/null
@@ -1,79 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class AccountServiceClientImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) throws RemoteException {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) throws RemoteException {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) throws RemoteException {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) throws RemoteException {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) throws RemoteException {
-        
-        return 0;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
deleted file mode 100644
index 7e18f52518..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ /dev/null
@@ -1,79 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component2aImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) throws RemoteException {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) throws RemoteException {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) throws RemoteException {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) throws RemoteException {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) throws RemoteException {
-        
-        return 0;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
deleted file mode 100644
index 231aa0f9f3..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ /dev/null
@@ -1,79 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component2bImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) throws RemoteException {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) throws RemoteException {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) throws RemoteException {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) throws RemoteException {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) throws RemoteException {
-        
-        return 0;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
deleted file mode 100644
index 254fa34af3..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ /dev/null
@@ -1,79 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component3aImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) throws RemoteException {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) throws RemoteException {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) throws RemoteException {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) throws RemoteException {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) throws RemoteException {
-        
-        return 0;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
deleted file mode 100644
index c0e39baa82..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ /dev/null
@@ -1,79 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component3bImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) throws RemoteException {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) throws RemoteException {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) throws RemoteException {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) throws RemoteException {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) throws RemoteException {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) throws RemoteException {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) throws RemoteException {
-        
-        return 0;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
deleted file mode 100644
index e747eb041f..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ /dev/null
@@ -1,98 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-/**
- * This interface allows access to a customer's id from the data service.
- */
-public interface CustomerIdService {
-
-    /*
-     * Return -1 if purchaseLotNumber not found
-     */
-    public int getCustomerIdByPurchaseLotNumber(int purchaseLotNumber) throws RemoteException;
-
-    /*
-     * Return -1 if account not found
-     */
-    public int getCustomerIdByAccount(String account) throws RemoteException;
-
-    // TODO (isilval) Fix this !!!
-    // Apparently, configuration can't deal with extends so I am adding the contents of AccountDataService here
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0*
-     * @param param1*
-     * @param param2
-     */
-    public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param4
-     */
-    public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param6*
-     * @param param7
-     */
-    public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param9*
-     * @param param10*
-     * @param param11
-     */
-    public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11)
-            throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param13*
-     * @param param14
-     */
-    public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param16*
-     * @param param17
-     */
-    public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param19
-     */
-    public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException;
-
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 5723aed35d..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(String name) {
-        return "Hi " + name;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 18f74b083f..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 6f26a02c3e..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,43 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Scope;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate the HelloWorld service and invoke it.
- */
-@Scope("COMPOSITE")
-public class HelloWorldServiceComponent implements HelloWorldService {
-   
-    HelloWorldService helloWorldService;
-
-    public String getGreetings(String name) {
-        return helloWorldService.getGreetings(name);
-    }
-
-    public HelloWorldService getHelloWorldService() {
-        return helloWorldService;
-    }
-
-    public void setHelloWorldService(HelloWorldService helloWorldService) {
-        this.helloWorldService = helloWorldService;
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
deleted file mode 100644
index 77ba127636..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ /dev/null
@@ -1,38 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class Component2aImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
deleted file mode 100644
index c2a2420181..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ /dev/null
@@ -1,39 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class Component2bImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
deleted file mode 100644
index 4eb1ba333d..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ /dev/null
@@ -1,39 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class Component3aImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
deleted file mode 100644
index dbaf1ac0a5..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ /dev/null
@@ -1,39 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class Component3bImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/java/sca-contrib/itest/wsdl/src/main/resources/SDOWSDLTest.composite
deleted file mode 100644
index 62596ee62a..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/resources/SDOWSDLTest.composite
+++ /dev/null
@@ -1,344 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance" name="SDOWSDLTest">
-
-    <!-- dbsdo:import.sdo xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
-        factory="com.bigbank.account.AccountFactory" / -->
-
-    <service name="AccountService1a2a3a4a" promote="Component2a3a4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"  uri="http://localhost:8085/AccountService1a2a3a4a"/>
-    </service>
-    <service name="AccountService1a2a3a4b" promote="Component2a3a4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3a4b"/>
-    </service>
-    <service name="AccountService1a2a3b4a" promote="Component2a3b4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3b4a"/>
-    </service>
-    <service name="AccountService1a2a3b4b" promote="Component2a3b4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3b4b"/>
-    </service>
-    <service name="AccountService1a2b3a4a" promote="Component2b3a4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3a4a"/>
-    </service>
-    <service name="AccountService1a2b3a4b" promote="Component2b3a4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3a4b"/>
-    </service>
-    <service name="AccountService1a2b3b4a" promote="Component2b3b4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3b4a"/>
-    </service>
-    <service name="AccountService1a2b3b4b" promote="Component2b3b4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3b4b"/>
-    </service>
-    <service name="AccountService1b2a3a4a" promote="Component2a3a4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3a4a"/>
-    </service>
-    <service name="AccountService1b2a3a4b" promote="Component2a3a4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3a4b"/>
-    </service>
-    <service name="AccountService1b2a3b4a" promote="Component2a3b4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3b4a"/>
-    </service>
-    <service name="AccountService1b2a3b4b" promote="Component2a3b4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3b4b"/>
-    </service>
-    <service name="AccountService1b2b3a4a" promote="Component2b3a4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3a4a"/>
-    </service>
-    <service name="AccountService1b2b3a4b" promote="Component2b3a4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3a4b"/>
-    </service>
-    <service name="AccountService1b2b3b4a" promote="Component2b3b4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3b4a"/>
-    </service>
-    <service name="AccountService1b2b3b4b" promote="Component2b3b4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3b4b"/>
-    </service>
-
-    <component name="Component2a3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3a4a"/>
-    </component>
-    <component name="Component2a3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3a4b"/>
-    </component>
-    <component name="Component2a3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3b4a"/>
-    </component>
-    <component name="Component2a3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3b4b"/>
-    </component>
-
-    <component name="Component2b3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3a4a"/>
-    </component>
-    <component name="Component2b3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3a4b"/>
-    </component>
-    <component name="Component2b3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3b4a"/>
-    </component>
-    <component name="Component2b3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3b4b"/>
-    </component>
-
-    <component name="Component3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component3aImpl" />
-    </component>
-    <reference name="Component3a4aRef" promote="Component3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService" />
-    </reference>
-
-    <component name="Component3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component3aImpl" />
-    </component>
-    <reference name="Component3a4bRef" promote="Component3a4b/accountService">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService" />
-    </reference>
-
-    <component name="Component3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component3bImpl" />
-    </component>
-    <reference name="Component3b4aRef" promote="Component3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService" />
-    </reference>
-    
-    <component name="Component3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component3bImpl" />
-    </component>
-    <reference name="Component3b4bRef" promote="Component3b4b/accountService">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService" />
-    </reference>
-
-    <!-- target service -->
-
-    <service name="AccountService" promote="AccountServiceComponent">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService"/>
-    </service>
-
-    <component name="AccountServiceComponent">
-        <implementation.java class="bigbank.account.services.accountdata.AccountDataServiceImpl" />
-    </component>
-
-    <!-- test client -->
-
-    <component name="AccountServiceClient">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="AccountServiceRef" promote="AccountServiceClient/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"/>
-    </reference>
-
-    <!-- clients -->
-
-    <component name="Client1a2a3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2a3a4a" promote="Client1a2a3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2a3a4a" />
-    </reference>
-
-    <component name="Client1a2a3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl"/>
-    </component>
-
-    <reference name="ClientRef1a2a3a4b" promote="Client1a2a3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2a3a4b" />
-    </reference>
-
-    <component name="Client1a2a3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4a" promote="Client1a2a3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2a3b4a" />
-    </reference>
-
-    <component name="Client1a2a3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4b" promote="Client1a2a3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2a3b4b" />
-    </reference>
-
-    <component name="Client1a2b3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4a" promote="Client1a2b3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2b3a4a" />
-    </reference>
-
-    <component name="Client1a2b3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4b" promote="Client1a2b3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2b3a4b" />
-    </reference>
-
-    <component name="Client1a2b3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4a" promote="Client1a2b3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2b3b4a" />
-    </reference>
-
-    <component name="Client1a2b3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4b" promote="Client1a2b3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1a2b3b4b" />
-    </reference>
-
-    <component name="Client1b2a3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4a" promote="Client1b2a3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2a3a4a" />
-    </reference>
-
-    <component name="Client1b2a3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4b" promote="Client1b2a3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2a3a4b" />
-    </reference>
-
-    <component name="Client1b2a3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4a" promote="Client1b2a3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2a3b4a" />
-    </reference>
-
-    <component name="Client1b2a3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4b" promote="Client1b2a3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2a3b4b" />
-    </reference>
-
-    <component name="Client1b2b3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4a" promote="Client1b2b3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2b3a4a" />
-    </reference>
-
-    <component name="Client1b2b3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4b" promote="Client1b2b3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2b3a4b" />
-    </reference>
-
-    <component name="Client1b2b3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4a" promote="Client1b2b3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2b3b4a" />
-    </reference>
-
-    <component name="Client1b2b3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4b" promote="Client1b2b3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
-        	uri="http://localhost:8085/AccountService1b2b3b4b" />
-    </reference>
-
-</composite>
diff --git a/java/sca-contrib/itest/wsdl/src/main/resources/WSDLTest.composite b/java/sca-contrib/itest/wsdl/src/main/resources/WSDLTest.composite
deleted file mode 100644
index 2024578dae..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/resources/WSDLTest.composite
+++ /dev/null
@@ -1,371 +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"
-
-           name="WSDLTest">
-   
-    <service name="HelloWorldService1a2a3a4a" promote="Component2a3a4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3a4a"/>
-    </service>
-    <service name="HelloWorldService1a2a3a4b" promote="Component2a3a4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3a4b"/>
-    </service>
-    <service name="HelloWorldService1a2a3b4a" promote="Component2a3b4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3b4a"/>
-    </service>
-    <service name="HelloWorldService1a2a3b4b" promote="Component2a3b4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3b4b"/>
-    </service>
-    <service name="HelloWorldService1a2b3a4a" promote="Component2b3a4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3a4a"/>
-    </service>
-    <service name="HelloWorldService1a2b3a4b" promote="Component2b3a4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3a4b"/>
-    </service>
-    <service name="HelloWorldService1a2b3b4a" promote="Component2b3b4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3b4a"/>
-    </service>
-    <service name="HelloWorldService1a2b3b4b" promote="Component2b3b4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3b4b"/>
-    </service>
-
-    <service name="HelloWorldService1b2a3a4a" promote="Component2a3a4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3a4a"/>
-    </service>
-    <service name="HelloWorldService1b2a3a4b" promote="Component2a3a4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3a4b"/>
-    </service>
-    <service name="HelloWorldService1b2a3b4a" promote="Component2a3b4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3b4a"/>
-    </service>
-    <service name="HelloWorldService1b2a3b4b" promote="Component2a3b4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3b4b"/>
-    </service>
-    <service name="HelloWorldService1b2b3a4a" promote="Component2b3a4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3a4a"/>
-    </service>
-    <service name="HelloWorldService1b2b3a4b" promote="Component2b3a4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3a4b"/>
-    </service>
-    <service name="HelloWorldService1b2b3b4a" promote="Component2b3b4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3b4a"/>
-    </service>
-    <service name="HelloWorldService1b2b3b4b" promote="Component2b3b4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3b4b"/>
-    </service>
-
-    <component name="Component2a3a4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3a4a" />
-    </component> 
-    <component name="Component2a3a4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3a4b" />
-    </component> 
-    <component name="Component2a3b4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3b4a" />
-    </component> 
-    <component name="Component2a3b4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3b4b" />
-    </component> 
-
-    <component name="Component2b3a4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3a4a" />
-    </component> 
-    <component name="Component2b3a4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3a4b" />
-    </component> 
-    <component name="Component2b3b4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3b4a" />
-    </component> 
-    <component name="Component2b3b4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3b4b" />
-    </component> 
-
-    <component name="Component3a4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3aImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3a4aRef" promote="Component3a4a/comp" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-                    uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-    <component name="Component3a4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3aImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3a4bRef" promote="Component3a4b/comp" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-                    uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-    <component name="Component3b4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3bImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3b4aRef" promote="Component3b4a/comp" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-                    uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-    <component name="Component3b4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3bImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3b4bRef" promote="Component3b4b/comp" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-                    uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-
-<!-- the servive -->    
-    
-    <service name="HelloWorldWebService"  promote="HelloWorldServiceComponent" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldWebService"/>
-    </service>
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="helloworld.HelloWorldImpl" />
-    </component>
-    
-<!-- the clients -->
-
-    <component name="Client1a2a3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3a4a" promote="Client1a2a3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2a3a4a" />
-    </reference>
-    
-    <component name="Client1a2a3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3a4b" promote="Client1a2a3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2a3a4b" />
-    </reference>
-    
-    <component name="Client1a2a3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4a" promote="Client1a2a3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2a3b4a" />
-    </reference>
-    
-    <component name="Client1a2a3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4b" promote="Client1a2a3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2a3b4b" />
-    </reference>
-    
-    <component name="Client1a2b3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4a" promote="Client1a2b3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2b3a4a" />
-    </reference>
-    
-    <component name="Client1a2b3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4b" promote="Client1a2b3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2b3a4b" />
-    </reference>
-    
-    <component name="Client1a2b3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4a" promote="Client1a2b3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2b3b4a" />
-    </reference>
-    
-    <component name="Client1a2b3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4b" promote="Client1a2b3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1a2b3b4b" />
-    </reference>
-    
-    <component name="Client1b2a3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4a" promote="Client1b2a3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2a3a4a" />
-    </reference>
-    
-    <component name="Client1b2a3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4b" promote="Client1b2a3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2a3a4b" />
-    </reference>
-    
-    <component name="Client1b2a3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4a" promote="Client1b2a3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2a3b4a" />
-    </reference>
-    
-    <component name="Client1b2a3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4b" promote="Client1b2a3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2a3b4b" />
-    </reference>
-    
-    <component name="Client1b2b3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4a" promote="Client1b2b3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2b3a4a" />
-    </reference>
-    
-    <component name="Client1b2b3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4b" promote="Client1b2b3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"/>
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2b3a4b" />
-    </reference>
-    
-    <component name="Client1b2b3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4a" promote="Client1b2b3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2b3b4a" />
-    </reference>
-    
-    <component name="Client1b2b3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4b" promote="Client1b2b3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
-			uri="http://localhost:8085/HelloWorldService1b2b3b4b" />
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index 73f9ed4bfc..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
+++ /dev/null
@@ -1,453 +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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:account="http://www.bigbank.com/account"
-	targetNamespace="http://www.bigbank.com/account"
-	name="AccountService">
-
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.bigbank.com/account"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:account="http://www.bigbank.com/account">
-			
-			<xsd:element name="getAccountReport">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID"
-							type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountReportResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountReport"
-							type="account:AccountReport" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountReport">
-				<xsd:sequence>
-					<xsd:element name="accountSummaries"
-						type="account:AccountSummary" maxOccurs="unbounded" />
-					<xsd:element name="stockSummaries"
-						type="account:StockSummary" maxOccurs="unbounded" />
-						
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="AccountSummary">
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="accountType" type="xsd:string" />
-				<xsd:attribute name="balance" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockSummary">
-			    <!-- xsd:attribute name="id" type="xsd:int" / -->
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-				<!-- unique id for this purchase -->
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="purchaseDate" type="xsd:dateTime" />
-				<xsd:attribute name="purchasePrice" type="xsd:float" />
-				<xsd:attribute name="currentPrice" type="xsd:float" />
-				<xsd:attribute name="company" type="xsd:string" />
-				<xsd:attribute name="highPrice" type="xsd:float" />
-				<xsd:attribute name="lowPrice" type="xsd:float" />
-				
-			</xsd:complexType>
-
-			<!-- Profile in data base  -->
-			<xsd:element name="getCustomerProfile">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="loginID" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="CustomerProfileData">
-				<xsd:sequence>
-					<xsd:element name="firstName" type="xsd:string" />
-					<xsd:element name="lastName" type="xsd:string" />
-					<xsd:element name="address" type="xsd:string" />
-					<xsd:element name="email" type="xsd:string" />
-					<xsd:element name="loginID" type="xsd:string" />
-					<xsd:element name="password" type="xsd:string" />
-					<xsd:element name="id" type="xsd:int" />
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:element name="getCustomerProfileResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="withdraw">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="withdrawResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="deposit">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="depositResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="id" type="xsd:int" />
-						<xsd:element name="stock" type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStockResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseSummary"
-							type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-
-
-			<xsd:element name="sellStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseLotNumber"
-							type="xsd:int" /><!-- unique id for this purchase -->
-						<xsd:element name="quantity" type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="createAccount">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-                        <xsd:element name="createSavings"
-							type="xsd:boolean" />
-                        <xsd:element name="createCheckings"
-							type="xsd:boolean" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>	
-			<xsd:element name="createAccountResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-				
-			</xsd:element>
-
-			<xsd:element name="getAccountLog">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID"
-							type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountLogResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountLog"
-							type="account:AccountLog" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountLog">
-				<xsd:sequence>
-					<xsd:element name="accountLogEntries"
-						type="account:AccountLogEntry" maxOccurs="unbounded" />
-					<xsd:element name="stockLogEntries"
-						type="account:StockLogEntry" maxOccurs="unbounded" />
-						
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:complexType name="AccountLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="amount" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-			</xsd:complexType>
-
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="getAccountReportRequest">
-		<wsdl:part element="account:getAccountReport"
-			name="getAccountReportRequest" />
-	</wsdl:message>
-	<wsdl:message name="getAccountReportResponse">
-		<wsdl:part element="account:getAccountReportResponse"
-			name="getAccountReportResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getCustomerProfileRequest">
-		<wsdl:part element="account:getCustomerProfile"
-			name="getCustomerProfile" />
-	</wsdl:message>
-	<wsdl:message name="getCustomerProfileResponse">
-		<wsdl:part element="account:getCustomerProfileResponse"
-			name="getCustomerProfileResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawRequest">
-		<wsdl:part element="account:withdraw" name="withdrawRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawResponse">
-		<wsdl:part element="account:withdrawResponse"
-			name="withdrawResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="depositRequest">
-		<wsdl:part element="account:deposit" name="depositRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="depositResponse">
-		<wsdl:part element="account:depositResponse"
-			name="depositResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockRequest">
-		<wsdl:part element="account:purchaseStock"
-			name="purchaseStockRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockResponse">
-		<wsdl:part element="account:purchaseStockResponse"
-			name="purchaseStockResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="sellStockRequest">
-		<wsdl:part element="account:sellStock" name="sellStockRequest" />
-	</wsdl:message>
-	
-	<wsdl:message name="createAccountRequest">
-		<wsdl:part element="account:createAccount" name="createAccountRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="createAccountResponse">
-		<wsdl:part element="account:createAccountResponse" name="createAccountResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getAccountLogRequest">
-		<wsdl:part element="account:getAccountLog"
-			name="getAccountLogRequest" />
-	</wsdl:message>
-	
-	<wsdl:message name="getAccountLogResponse">
-		<wsdl:part element="account:getAccountLogResponse"
-			name="getAccountLogResponse" />
-	</wsdl:message>
-
-	<wsdl:portType name="AccountService">
-		<wsdl:operation name="getAccountReport">
-			<wsdl:input message="account:getAccountReportRequest" />
-			<wsdl:output message="account:getAccountReportResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getCustomerProfile">
-			<wsdl:input message="account:getCustomerProfileRequest" />
-			<wsdl:output message="account:getCustomerProfileResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<wsdl:input message="account:withdrawRequest" />
-			<wsdl:output message="account:withdrawResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<wsdl:input message="account:depositRequest" />
-			<wsdl:output message="account:depositResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<wsdl:input message="account:purchaseStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<wsdl:input message="account:sellStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-
-		<wsdl:operation name="createAccount">
-			<wsdl:input message="account:createAccountRequest" />
-			<wsdl:output message="account:createAccountResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<wsdl:input message="account:getAccountLogRequest" />
-			<wsdl:output message="account:getAccountLogResponse" />
-		</wsdl:operation>
-
-	</wsdl:portType>
-
-
-
-	<wsdl:binding name="AccountServiceSOAP" type="account:AccountService">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getAccountReport">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountReport" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getCustomerProfile">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getCustomerProfile" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/withdraw" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/deposit" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/purchaseStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/sellStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="createAccount">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/createAccount" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountLog" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-	</wsdl:binding>
-	<wsdl:service name="AccountService">
-		<wsdl:port binding="account:AccountServiceSOAP"
-			name="AccountServiceSOAP">
-			<soap:address
-				location="http://localhost:8085/services/AccountService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/Hello.xsd b/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/Hello.xsd
deleted file mode 100644
index 108b1f393f..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/Hello.xsd
+++ /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.    
--->
-        <schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
diff --git a/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 1966acc957..0000000000
--- a/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,64 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema xmlns="http://www.w3.org/2001/XMLSchema">
-            <import namespace="http://helloworld" schemaLocation="Hello.xsd"/>
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location=""/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/java/sca-contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
deleted file mode 100644
index 12441753fb..0000000000
--- a/java/sca-contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ /dev/null
@@ -1,169 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import bigbank.account.services.accountdata.AccountDataService;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountSummary;
-import com.bigbank.account.CustomerProfileData;
-
-/**
- * Tests all the combinations of wiring services, components, and references
- * which use either interface.java or interface.wsdl.
- * 
- * The tests use a service (1) wired to a components (2) wired to another 
- * component (3) wired to a reference (4). Each of those uses either 
- * interface.java (a) or interface.wsdl (b). This results in 16 different
- * combinations 1a2a3a4a thru 1b2b3b4b.
- */
-public class SDOWSDLTestCase {
-
-    private static SCADomain domain;
-
-    @Test
-    public void testClient1a2a3a4a() throws RemoteException  {
-        doit("Client1a2a3a4a");
-    }
-
-    @Test
-    public void testClient1a2a3a4b() throws RemoteException  {
-        doit("Client1a2a3a4b");
-    }
-
-    @Test
-    public void testClient1a2a3b4a() throws RemoteException  {
-        doit("Client1a2a3b4a");
-    }
-
-    @Test
-    public void testClient1a2a3b4b() throws RemoteException  {
-        doit("Client1a2a3b4b");
-    }
-
-    @Test
-    public void testClient1a2b3a4a() throws RemoteException  {
-        doit("Client1a2b3a4a");
-    }
-
-    @Test
-    public void testClient1a2b3a4b() throws RemoteException  {
-        doit("Client1a2b3a4b");
-    }
-
-    @Test
-    public void testClient1a2b3b4a() throws RemoteException  {
-        doit("Client1a2b3b4a");
-    }
-
-    @Test
-    public void testClient1a2b3b4b() throws RemoteException  {
-        doit("Client1a2b3b4b");
-    }
-
-    @Test
-    public void testClient1b2a3a4a() throws RemoteException  {
-        doit("Client1b2a3a4a");
-    }
-
-    @Test
-    public void testClient1b2a3a4b() throws RemoteException  {
-        doit("Client1b2a3a4b");
-    }
-
-    @Test
-    public void testClient1b2a3b4a() throws RemoteException  {
-        doit("Client1b2a3b4a");
-    }
-
-    @Test
-    public void testClient1b2a3b4b() throws RemoteException  {
-        doit("Client1b2a3b4b");
-    }
-
-    @Test
-    public void testClient1b2b3a4a() throws RemoteException  {
-        doit("Client1b2b3a4a");
-    }
-
-    @Test
-    public void testClient1b2b3a4b() throws RemoteException  {
-        doit("Client1b2b3a4b");
-    }
-
-    @Test
-    public void testClient1b2b3b4a() throws RemoteException  {
-        doit("Client1b2b3b4a");
-    }
-
-    @Test
-    public void testClient1b2b3b4b() throws RemoteException  {
-        doit("Client1b2b3b4b");
-    }
-
-    private void doit(String compName) throws RemoteException {
-        AccountDataService client = domain.getService(AccountDataService.class, compName);
-        CustomerProfileData dataIn = AccountFactory.INSTANCE.createCustomerProfileData();
-        dataIn.setAddress("home");
-        dataIn.setEmail("petra@home");
-        dataIn.setFirstName("petra");
-        dataIn.setId(1);
-        dataIn.setLastName("A");
-        dataIn.setLoginID("petra");
-        dataIn.setPassword("ant");
-        
-        CustomerProfileData dataOut = client.createAccount(dataIn , false, false);
-        
-        assertEquals(dataIn.getAddress(), dataOut.getAddress());
-        assertEquals(dataIn.getEmail(), dataOut.getEmail());
-        assertEquals(dataIn.getFirstName(), dataOut.getFirstName());
-        assertEquals(dataIn.getId(), dataOut.getId());
-        assertEquals(dataIn.getLastName(), dataOut.getLastName());
-        assertEquals(dataIn.getLoginID(), dataOut.getLoginID());
-        assertEquals(dataIn.getPassword(), dataOut.getPassword());
-        
-        AccountReport report = client.getAccountReport(12345);
-        AccountSummary summary1 = (AccountSummary)report.getAccountSummaries().get(0);
-        assertEquals(summary1.getAccountType(), "checking");
-        AccountSummary summary2 = (AccountSummary)report.getAccountSummaries().get(1);
-        assertEquals(summary2.getBalance(), 2000.f);
-    }
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        domain = SCADomain.newInstance("SDOWSDLTest.composite");
-    }
-
-    @AfterClass
-    public static void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/java/sca-contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
deleted file mode 100644
index fd30d69c79..0000000000
--- a/java/sca-contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ /dev/null
@@ -1,146 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests all the combinations of wiring services, components, and references
- * which use either interface.java or interface.wsdl. The tests use a service
- * (1) wired to a components (2) wired to another component (3) wired to a
- * reference (4). Each of those uses either interface.java (a) or interface.wsdl
- * (b). This results in 16 different combinations 1a2a3a4a thru 1b2b3b4b.
- */
-public class WSDLTestCase {
-
-    private static SCADomain domain;
-
-    @Test
-    public void testClient1a2a3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2a3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2a3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2a3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @BeforeClass
-    public static void init() throws Throwable {
-        domain = SCADomain.newInstance("WSDLTest.composite");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-}
diff --git a/java/sca-contrib/itest/wsdl2java/pom.xml b/java/sca-contrib/itest/wsdl2java/pom.xml
deleted file mode 100644
index ff8ae3f8e2..0000000000
--- a/java/sca-contrib/itest/wsdl2java/pom.xml
+++ /dev/null
@@ -1,188 +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>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-itest</artifactId>
-		<version>2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<artifactId>itest-wsdl2java</artifactId>
-	<name>Apache Tuscany SCA WSDL2Java Integration Tests</name>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-embedded</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-ws-axis2</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-jetty</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sdo</groupId>
-			<artifactId>tuscany-sdo-impl</artifactId>
-			<version>1.1.1</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.0</version>
-				<executions>
-					<execution>
-						<id>add-test-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>target/sdo-source</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.1.1</version>
-				<executions>
-					<execution>
-						<id>generate-sdo-account-service</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<schemaFile>
-								${basedir}/src/test/resources/AccountService.wsdl</schemaFile>
-							<targetDirectory>
-								${basedir}/target/sdo-source</targetDirectory>
-							<javaPackage>com.bigbank.account</javaPackage>
-							<prefix>Account</prefix>
-							<noNotification>true</noNotification>
-							<noContainer>true</noContainer>
-							<noUnsettable>true</noUnsettable>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>generate-sdo-stock-exception</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<schemaFile>
-								${basedir}/src/test/resources/StockExceptionTest.wsdl</schemaFile>
-							<targetDirectory>
-								${basedir}/target/sdo-source</targetDirectory>
-							<prefix>Stock</prefix>
-							<noInterfaces>true</noInterfaces>
-							<noNotification>true</noNotification>
-							<noContainer>true</noContainer>
-							<noUnsettable>true</noUnsettable>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-					<!--execution>
-                        <id>generate-sdo-echo-service-xsd</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/test/resources/EchoService.xsd</schemaFile>
-                            <targetDirectory>${basedir}/target/sdo-source</targetDirectory>
-                            <prefix>Stock</prefix>
-                            <noInterfaces>true</noInterfaces>
-                            <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>2.0-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<configuration>
-							<wsdlFiles>
-								<wsdlFile>
-									<fileName>
-										${basedir}/src/test/resources/AccountService.wsdl</fileName>
-								</wsdlFile>
-								<wsdlFile>
-									<fileName>
-										${basedir}/src/test/resources/StockExceptionTest.wsdl</fileName>
-								</wsdlFile>
-								<!--wsdlFile>
-									<fileName>${basedir}/src/test/resources/EchoService.wsdl</fileName>
-								</wsdlFile-->
-							</wsdlFiles>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/java/sca-contrib/itest/wsdl2java/src/test/resources/AccountService.wsdl b/java/sca-contrib/itest/wsdl2java/src/test/resources/AccountService.wsdl
deleted file mode 100644
index 9e5650e7dd..0000000000
--- a/java/sca-contrib/itest/wsdl2java/src/test/resources/AccountService.wsdl
+++ /dev/null
@@ -1,479 +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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:account="http://www.bigbank.com/account"
-	targetNamespace="http://www.bigbank.com/account"
-	name="AccountServiceWithFault">
-
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.bigbank.com/account"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:account="http://www.bigbank.com/account">
-
-			<xsd:element name="getAccountReport">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID" type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountReportResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountReport"
-							type="account:AccountReport" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountReport">
-				<xsd:sequence>
-					<xsd:element name="accountSummaries"
-						type="account:AccountSummary" maxOccurs="unbounded" />
-					<xsd:element name="stockSummaries"
-						type="account:StockSummary" maxOccurs="unbounded" />
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="AccountSummary">
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="accountType" type="xsd:string" />
-				<xsd:attribute name="balance" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockSummary">
-				<!-- xsd:attribute name="id" type="xsd:int" / -->
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-				<!-- unique id for this purchase -->
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="purchaseDate" type="xsd:dateTime" />
-				<xsd:attribute name="purchasePrice" type="xsd:float" />
-				<xsd:attribute name="currentPrice" type="xsd:float" />
-				<xsd:attribute name="company" type="xsd:string" />
-				<xsd:attribute name="highPrice" type="xsd:float" />
-				<xsd:attribute name="lowPrice" type="xsd:float" />
-
-			</xsd:complexType>
-
-			<!-- Profile in data base  -->
-			<xsd:element name="getCustomerProfile">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="loginID" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="CustomerProfileData">
-				<xsd:sequence>
-					<xsd:element name="firstName" type="xsd:string" />
-					<xsd:element name="lastName" type="xsd:string" />
-					<xsd:element name="address" type="xsd:string" />
-					<xsd:element name="email" type="xsd:string" />
-					<xsd:element name="loginID" type="xsd:string" />
-					<xsd:element name="password" type="xsd:string" />
-					<xsd:element name="id" type="xsd:int" />
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:element name="getCustomerProfileResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="withdraw">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="withdrawResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<!-- @start added fault -->
-			<xsd:element name="insufficientFundsFault">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="message" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<!-- @end added fault -->
-
-			<xsd:element name="deposit">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="depositResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="id" type="xsd:int" />
-						<xsd:element name="stock"
-							type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStockResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseSummary"
-							type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-
-
-			<xsd:element name="sellStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseLotNumber"
-							type="xsd:int" /><!-- unique id for this purchase -->
-						<xsd:element name="quantity" type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="createAccount">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-						<xsd:element name="createSavings"
-							type="xsd:boolean" />
-						<xsd:element name="createCheckings"
-							type="xsd:boolean" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="createAccountResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-
-			</xsd:element>
-
-			<xsd:element name="getAccountLog">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID" type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountLogResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountLog"
-							type="account:AccountLog" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountLog">
-				<xsd:sequence>
-					<xsd:element name="accountLogEntries"
-						type="account:AccountLogEntry" maxOccurs="unbounded" />
-					<xsd:element name="stockLogEntries"
-						type="account:StockLogEntry" maxOccurs="unbounded" />
-
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:complexType name="AccountLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="amount" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-			</xsd:complexType>
-
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="getAccountReportRequest">
-		<wsdl:part element="account:getAccountReport"
-			name="getAccountReportRequest" />
-	</wsdl:message>
-	<wsdl:message name="getAccountReportResponse">
-		<wsdl:part element="account:getAccountReportResponse"
-			name="getAccountReportResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getCustomerProfileRequest">
-		<wsdl:part element="account:getCustomerProfile"
-			name="getCustomerProfile" />
-	</wsdl:message>
-	<wsdl:message name="getCustomerProfileResponse">
-		<wsdl:part element="account:getCustomerProfileResponse"
-			name="getCustomerProfileResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawRequest">
-		<wsdl:part element="account:withdraw" name="withdrawRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawResponse">
-		<wsdl:part element="account:withdrawResponse"
-			name="withdrawResponse" />
-	</wsdl:message>
-
-	<!-- @start added fault -->
-	<wsdl:message name="insufficientFundsException">
-		<wsdl:part element="account:insufficientFundsFault"
-			name="insufficientFundsFault" />
-	</wsdl:message>
-	<!-- @end added fault -->
-
-	<wsdl:message name="depositRequest">
-		<wsdl:part element="account:deposit" name="depositRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="depositResponse">
-		<wsdl:part element="account:depositResponse"
-			name="depositResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockRequest">
-		<wsdl:part element="account:purchaseStock"
-			name="purchaseStockRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockResponse">
-		<wsdl:part element="account:purchaseStockResponse"
-			name="purchaseStockResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="sellStockRequest">
-		<wsdl:part element="account:sellStock" name="sellStockRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="createAccountRequest">
-		<wsdl:part element="account:createAccount"
-			name="createAccountRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="createAccountResponse">
-		<wsdl:part element="account:createAccountResponse"
-			name="createAccountResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getAccountLogRequest">
-		<wsdl:part element="account:getAccountLog"
-			name="getAccountLogRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="getAccountLogResponse">
-		<wsdl:part element="account:getAccountLogResponse"
-			name="getAccountLogResponse" />
-	</wsdl:message>
-
-	<wsdl:portType name="AccountServiceWithFault">
-		<wsdl:operation name="getAccountReport">
-			<wsdl:input message="account:getAccountReportRequest" />
-			<wsdl:output message="account:getAccountReportResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getCustomerProfile">
-			<wsdl:input message="account:getCustomerProfileRequest" />
-			<wsdl:output message="account:getCustomerProfileResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<wsdl:input message="account:withdrawRequest" />
-			<wsdl:output message="account:withdrawResponse" />
-			<!-- @start added fault -->
-			<wsdl:fault message="account:insufficientFundsException"
-				name="insufficientFundsException" />
-			<!-- @end added fault -->
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<wsdl:input message="account:depositRequest" />
-			<wsdl:output message="account:depositResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<wsdl:input message="account:purchaseStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<wsdl:input message="account:sellStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-
-		<wsdl:operation name="createAccount">
-			<wsdl:input message="account:createAccountRequest" />
-			<wsdl:output message="account:createAccountResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<wsdl:input message="account:getAccountLogRequest" />
-			<wsdl:output message="account:getAccountLogResponse" />
-		</wsdl:operation>
-
-	</wsdl:portType>
-
-
-
-	<wsdl:binding name="AccountServiceWithFaultSOAP"
-		type="account:AccountServiceWithFault">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getAccountReport">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountReport" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getCustomerProfile">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getCustomerProfile" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/withdraw" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-			<!-- @start added fault -->
-			<wsdl:fault name="insufficientFundsException">
-				<soap:fault name="insufficientFundsException" use="literal" />
-			</wsdl:fault>
-			<!-- @end added fault -->
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/deposit" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/purchaseStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/sellStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="createAccount">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/createAccount" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountLog" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-	</wsdl:binding>
-	<wsdl:service name="AccountServiceWithFault">
-		<wsdl:port binding="account:AccountServiceWithFaultSOAP"
-			name="AccountServiceSOAP">
-			<soap:address
-				location="http://localhost:8080/sample-bigbank-account/services/AccountServiceWithFault" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/wsdl2java/src/test/resources/EchoService.wsdl b/java/sca-contrib/itest/wsdl2java/src/test/resources/EchoService.wsdl
deleted file mode 100644
index 50d580f299..0000000000
--- a/java/sca-contrib/itest/wsdl2java/src/test/resources/EchoService.wsdl
+++ /dev/null
@@ -1,64 +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.    
--->
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://test/" 
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="EchoService" 
-	targetNamespace="http://test/">
-	
-	<types>
-		<xsd:schema>
-			<xsd:import namespace="http://test/"
-				schemaLocation="EchoService.xsd" />
-		</xsd:schema>
-	</types>
-	<message name="echo">
-		<part element="tns:echo" name="parameters" />
-	</message>
-	<message name="echoResponse">
-		<part element="tns:echoResponse" name="parameters" />
-	</message>
-	<portType name="Echo">
-		<operation name="echo">
-			<input message="tns:echo" />
-			<output message="tns:echoResponse" />
-		</operation>
-	</portType>
-	<binding name="EchoPortBinding" type="tns:Echo">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<operation name="echo">
-			<soap:operation soapAction="" />
-			<input>
-				<soap:body use="literal" />
-			</input>
-			<output>
-				<soap:body use="literal" />
-			</output>
-		</operation>
-	</binding>
-	<service name="EchoService">
-		<port binding="tns:EchoPortBinding" name="EchoPort">
-			<soap:address
-				location="http://localhost:8085/w1/EchoService" />
-		</port>
-	</service>
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/wsdl2java/src/test/resources/EchoService.xsd b/java/sca-contrib/itest/wsdl2java/src/test/resources/EchoService.xsd
deleted file mode 100644
index 8069d4861f..0000000000
--- a/java/sca-contrib/itest/wsdl2java/src/test/resources/EchoService.xsd
+++ /dev/null
@@ -1,40 +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.
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-	xmlns:tns="http://test/" 
-	targetNamespace="http://test/" version="1.0">
-	
-	<xs:complexType name="echoType">
-		<xs:sequence>
-			<xs:element minOccurs="0" name="arg0" type="xs:string"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="echoResponseType">
-		<xs:sequence>
-			<xs:element minOccurs="0" name="return" type="xs:string"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:element name="echo" type="tns:echoType"/>
-	
-	<xs:element name="echoResponse" type="tns:echoResponseType"/>
-	
-</xs:schema>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl b/java/sca-contrib/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
deleted file mode 100644
index c44229c162..0000000000
--- a/java/sca-contrib/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
+++ /dev/null
@@ -1,167 +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="invalidSymbolException">
-		<wsdl:part element="tns:invalidSymbolFault" name="fault" />
-	</wsdl:message>
-
-	<wsdl:message name="marketClosedException">
-		<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:invalidSymbolException"
-				name="InvalidSymbolException" />
-
-			<wsdl:fault message="tns:marketClosedException"
-				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:8080/StockExceptionTestService/services/StockExceptionTestService" />
-
-		</wsdl:port>
-
-	</wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/wsdlless/pom.xml b/java/sca-contrib/itest/wsdlless/pom.xml
deleted file mode 100644
index 7630651bc6..0000000000
--- a/java/sca-contrib/itest/wsdlless/pom.xml
+++ /dev/null
@@ -1,202 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-wsdlless</artifactId>
-    <name>Apache Tuscany SCA WSDLless Support Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <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>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.4</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <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.bind</groupId>
-                                    <artifactId>jaxb-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>javax.xml.ws</groupId>
-                                    <artifactId>jaxws-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <!-- 
-                                <artifactItem>
-                                    <groupId>com.sun.xml.ws</groupId>
-                                    <artifactId>jaxws-rt</artifactId>
-                                    <version>2.1.4</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>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile>
-                            <javaPackage>com.bigbank.account</javaPackage>
-                            <prefix>Account</prefix>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
deleted file mode 100644
index e2c884ec74..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ /dev/null
@@ -1,95 +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 bigbank.account.services.accountdata;
-
-import javax.jws.WebService;
-import javax.xml.ws.ResponseWrapper;
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@AllowsPassByReference
-@WebService(targetNamespace="http://www.bigbank.com/account")
-public interface AccountDataService {
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0*
-     * @param param1*
-     * @param param2
-     */
-    public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param4
-     */
-    public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param6*
-     * @param param7
-     */
-    public float deposit(java.lang.String param6, float param7);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param9*
-     * @param param10*
-     * @param param11
-     */
-    public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param13*
-     * @param param14
-     */
-    @ResponseWrapper(localName="purchaseStockResponse")
-    public com.bigbank.account.StockSummary sellStock(int param13, int param14);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param16*
-     * @param param17
-     */
-    public float withdraw(java.lang.String param16, float param17);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param19
-     */
-    public com.bigbank.account.AccountReport getAccountReport(int param19);
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0
-     */
-    public com.bigbank.account.AccountLog getAccountLog(int param0);
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index c23a281b6f..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ /dev/null
@@ -1,91 +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 bigbank.account.services.accountdata;
-
-import org.oasisopen.sca.annotation.Service;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountSummary;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-@Service(AccountDataService.class)
-public class AccountDataServiceImpl implements AccountDataService {
-
-    public CustomerProfileData getCustomerProfile(String logonID) {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int customerID) {
-
-        AccountReport report =AccountFactory.INSTANCE.createAccountReport();
-        AccountSummary summary1 = AccountFactory.INSTANCE.createAccountSummary();
-        summary1.setAccountNumber("123");
-        summary1.setAccountType("checking");
-        summary1.setBalance(1000.0f);
-        report.getAccountSummaries().add(summary1);
-        AccountSummary summary2 = AccountFactory.INSTANCE.createAccountSummary();
-        summary2.setAccountNumber("456");
-        summary2.setAccountType("savings");
-        summary2.setBalance(2000.0f);
-        report.getAccountSummaries().add(summary2);
-        
-        return report;
-    }
-
-    public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
-            {
-        CustomerProfileData data = AccountFactory.INSTANCE.createCustomerProfileData();
-        data.setLoginID(customerProfile.getLoginID());
-        data.setAddress(customerProfile.getAddress());
-        data.setEmail(customerProfile.getEmail());
-        data.setFirstName(customerProfile.getFirstName());
-        data.setId(customerProfile.getId());
-        data.setLastName(customerProfile.getLastName());
-        data.setPassword(customerProfile.getPassword());
-        return data;
-    }
-
-    public float deposit(String param6, float param7) {
-        
-        return 0;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary stock) {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(final int customerID) {
-        throw new IllegalStateException("This method should not be called");
-    }
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
deleted file mode 100644
index 591e9d04d3..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ /dev/null
@@ -1,77 +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 bigbank.account.services.accountdata;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class AccountServiceClientImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) {
-        
-        return 0;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
deleted file mode 100644
index 196dd2a5ba..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ /dev/null
@@ -1,77 +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 bigbank.account.services.accountdata;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component2aImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) {
-        
-        return 0;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
deleted file mode 100644
index 00b70807a9..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ /dev/null
@@ -1,77 +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 bigbank.account.services.accountdata;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component2bImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) {
-        
-        return 0;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
deleted file mode 100644
index f74be92d8a..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ /dev/null
@@ -1,77 +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 bigbank.account.services.accountdata;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component3aImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) {
-        
-        return 0;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
deleted file mode 100644
index 1acfea21a3..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ /dev/null
@@ -1,77 +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 bigbank.account.services.accountdata;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class Component3bImpl implements AccountDataService {
-
-    AccountDataService accountService;
-    
-    @Reference
-    public void setAccountService(AccountDataService accountService) {
-        this.accountService = accountService;
-    }
-    
-    public CustomerProfileData createAccount(CustomerProfileData param9, boolean param10, boolean param11) {
-        return accountService.createAccount(param9, param10, param11);
-    }
-
-    public float deposit(String param6, float param7) {
-        
-        return 0;
-    }
-
-    public AccountLog getAccountLog(int param0) {
-        
-        return null;
-    }
-
-    public AccountReport getAccountReport(int param19) {
-        
-        return accountService.getAccountReport(param19);
-    }
-
-    public CustomerProfileData getCustomerProfile(String param4) {
-        
-        return null;
-    }
-
-    public StockSummary purchaseStock(int param0, StockSummary parm1) {
-        
-        return null;
-    }
-
-    public StockSummary sellStock(int param13, int param14) {
-        
-        return null;
-    }
-
-    public float withdraw(String param16, float param17) {
-        
-        return 0;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
deleted file mode 100644
index e747eb041f..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ /dev/null
@@ -1,98 +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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-/**
- * This interface allows access to a customer's id from the data service.
- */
-public interface CustomerIdService {
-
-    /*
-     * Return -1 if purchaseLotNumber not found
-     */
-    public int getCustomerIdByPurchaseLotNumber(int purchaseLotNumber) throws RemoteException;
-
-    /*
-     * Return -1 if account not found
-     */
-    public int getCustomerIdByAccount(String account) throws RemoteException;
-
-    // TODO (isilval) Fix this !!!
-    // Apparently, configuration can't deal with extends so I am adding the contents of AccountDataService here
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0*
-     * @param param1*
-     * @param param2
-     */
-    public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param4
-     */
-    public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param6*
-     * @param param7
-     */
-    public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param9*
-     * @param param10*
-     * @param param11
-     */
-    public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11)
-            throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param13*
-     * @param param14
-     */
-    public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param16*
-     * @param param17
-     */
-    public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException;
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param19
-     */
-    public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException;
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 78882aa1d0..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.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 helloworld;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(String name) {
-        return "Hi " + name;
-    }
-
-    public String[] getMultipleGreetings(String[] names) {
-        if(names==null) {
-            return null;
-        } 
-        String[] greetings = new String[names.length];
-        for(int i=0; i<names.length;i++) {
-            greetings[i] = "Hi "+names[i];
-        }
-        return greetings;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 6892c99e13..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldService.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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-    public String[] getMultipleGreetings(String[] names);
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 062275833e..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,47 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Scope;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate the HelloWorld service and invoke it.
- */
-@Scope("COMPOSITE")
-public class HelloWorldServiceComponent implements HelloWorldService {
-   
-    HelloWorldService helloWorldService;
-
-    public String getGreetings(String name) {
-        return helloWorldService.getGreetings(name);
-    }
-
-    public HelloWorldService getHelloWorldService() {
-        return helloWorldService;
-    }
-
-    public void setHelloWorldService(HelloWorldService helloWorldService) {
-        this.helloWorldService = helloWorldService;
-    }
-
-    public String[] getMultipleGreetings(String[] names) {
-        return helloWorldService.getMultipleGreetings(names);
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
deleted file mode 100644
index 74e2ae5d0d..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ /dev/null
@@ -1,43 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class Component2aImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-    
-    public String[] getMultipleGreetings(String[] names) {
-        return comp.getMultipleGreetings(names);
-    }
-
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
deleted file mode 100644
index 84bacd658d..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ /dev/null
@@ -1,42 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class Component2bImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-    public String[] getMultipleGreetings(String[] names) {
-        return comp.getMultipleGreetings(names);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
deleted file mode 100644
index eed10cde7c..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ /dev/null
@@ -1,42 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class Component3aImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-    public String[] getMultipleGreetings(String[] names) {
-        return comp.getMultipleGreetings(names);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
deleted file mode 100644
index 3a79f52575..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ /dev/null
@@ -1,43 +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.itest;
-
-import helloworld.HelloWorldService;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class Component3bImpl implements HelloWorldService {
-
-    private HelloWorldService comp;
-
-    @Reference
-    public void setComp(HelloWorldService comp) {
-        this.comp = comp;
-    }
-
-    public String getGreetings(String s) {
-        return comp.getGreetings(s);
-    }
-
-    public String[] getMultipleGreetings(String[] names) {
-        return comp.getMultipleGreetings(names);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/service/AnObject.java b/java/sca-contrib/itest/wsdlless/src/main/java/service/AnObject.java
deleted file mode 100644
index 65ba52f356..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/service/AnObject.java
+++ /dev/null
@@ -1,62 +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 service;
-
-public class AnObject {
-
-    private String someRetValue;
-    private Integer someOtherRetValue;
-
-    public AnObject() {
-    }
-
-    public AnObject(String someRetValue, Integer someOtherRetValue) {
-        this.someRetValue = someRetValue;
-        this.someOtherRetValue = someOtherRetValue;
-    }
-
-    /**
-     * @return the someOtherRetValue
-     */
-    public Integer getSomeOtherRetValue() {
-        return someOtherRetValue;
-    }
-
-    /**
-     * @param someOtherRetValue the someOtherRetValue to set
-     */
-    public void setSomeOtherRetValue(Integer someOtherRetValue) {
-        this.someOtherRetValue = someOtherRetValue;
-    }
-
-    /**
-     * @return the someRetValue
-     */
-    public String getSomeRetValue() {
-        return someRetValue;
-    }
-
-    /**
-     * @param someRetValue the someRetValue to set
-     */
-    public void setSomeRetValue(String someRetValue) {
-        this.someRetValue = someRetValue;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/service/MoreComplexObject.java b/java/sca-contrib/itest/wsdlless/src/main/java/service/MoreComplexObject.java
deleted file mode 100644
index 69eba6701d..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/service/MoreComplexObject.java
+++ /dev/null
@@ -1,53 +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 service;
-
-import java.io.Serializable;
-
-public class MoreComplexObject implements Serializable {
-    private static final long serialVersionUID = 43242314234123L;
-    private String stringParam;
-    private Integer intParam;
-    private String stringParam2;
-
-    public String getStringParam() {
-        return stringParam;
-    }
-
-    public void setStringParam(String stringParam) {
-        this.stringParam = stringParam;
-    }
-
-    public Integer getIntParam() {
-        return intParam;
-    }
-
-    public void setIntParam(Integer intParam) {
-        this.intParam = intParam;
-    }
-
-    public String getStringParam2() {
-        return stringParam2;
-    }
-
-    public void setStringParam2(String stringParam2) {
-        this.stringParam2 = stringParam2;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/service/SomeService.java b/java/sca-contrib/itest/wsdlless/src/main/java/service/SomeService.java
deleted file mode 100644
index 2283f8095f..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/service/SomeService.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 service;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface SomeService {
-
-    public AnObject getUsingString(String stringParam);
-
-    public AnObject getUsingMoreComplexObject(MoreComplexObject moreComplexParam);
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/service/SomeServiceImpl.java b/java/sca-contrib/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
deleted file mode 100644
index 728799c131..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
+++ /dev/null
@@ -1,42 +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 service;
-
-import org.oasisopen.sca.annotation.Service;
-
-@Service(SomeService.class)
-public class SomeServiceImpl implements SomeService {
-
-    public AnObject getUsingString(String stringParam) {
-        System.out.println("Param value:" + stringParam);
-
-        return getAnObject(stringParam);
-    }
-
-    private AnObject getAnObject(String stringParam) {
-        return new AnObject(stringParam + "123", 123);
-    }
-
-    public AnObject getUsingMoreComplexObject(MoreComplexObject moreComplexParam) {
-        System.out.println("Param value:" + moreComplexParam.getStringParam());
-
-        return getAnObject(moreComplexParam.getStringParam());
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/main/resources/SDOWSDLTest.composite b/java/sca-contrib/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
deleted file mode 100644
index 16d3806318..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
+++ /dev/null
@@ -1,321 +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:wsdli="http://www.w3.org/2006/01/wsdl-instance" name="SDOWSDLTest">
-
-    <service name="AccountService1a2a3a4a" promote="Component2a3a4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3a4a"/>
-    </service>
-    <service name="AccountService1a2a3a4b" promote="Component2a3a4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3a4b"/>
-    </service>
-    <service name="AccountService1a2a3b4a" promote="Component2a3b4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3b4a"/>
-    </service>
-    <service name="AccountService1a2a3b4b" promote="Component2a3b4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3b4b"/>
-    </service>
-    <service name="AccountService1a2b3a4a" promote="Component2b3a4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3a4a"/>
-    </service>
-    <service name="AccountService1a2b3a4b" promote="Component2b3a4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3a4b"/>
-    </service>
-    <service name="AccountService1a2b3b4a" promote="Component2b3b4a">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3b4a"/>
-    </service>
-    <service name="AccountService1a2b3b4b" promote="Component2b3b4b">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3b4b"/>
-    </service>
-    <service name="AccountService1b2a3a4a" promote="Component2a3a4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3a4a"/>
-    </service>
-    <service name="AccountService1b2a3a4b" promote="Component2a3a4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3a4b"/>
-    </service>
-    <service name="AccountService1b2a3b4a" promote="Component2a3b4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3b4a"/>
-    </service>
-    <service name="AccountService1b2a3b4b" promote="Component2a3b4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3b4b"/>
-    </service>
-    <service name="AccountService1b2b3a4a" promote="Component2b3a4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3a4a"/>
-    </service>
-    <service name="AccountService1b2b3a4b" promote="Component2b3a4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3a4b"/>
-    </service>
-    <service name="AccountService1b2b3b4a" promote="Component2b3b4a">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3b4a"/>
-    </service>
-    <service name="AccountService1b2b3b4b" promote="Component2b3b4b">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3b4b"/>
-    </service>
-
-    <component name="Component2a3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3a4a"/>
-    </component>
-    <component name="Component2a3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3a4b"/>
-    </component>
-    <component name="Component2a3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3b4a"/>
-    </component>
-    <component name="Component2a3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService" target="Component3b4b"/>
-    </component>
-
-    <component name="Component2b3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3a4a"/>
-    </component>
-    <component name="Component2b3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3a4b"/>
-    </component>
-    <component name="Component2b3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3b4a"/>
-    </component>
-    <component name="Component2b3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService" target="Component3b4b"/>
-    </component>
-
-    <component name="Component3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component3aImpl" />
-    </component>
-    <reference name="Component3a4aRef" promote="Component3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService" />
-    </reference>
-
-    <component name="Component3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component3aImpl" />
-    </component>
-    <reference name="Component3a4bRef" promote="Component3a4b/accountService">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService" />
-    </reference>
-
-    <component name="Component3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.Component3bImpl" />
-    </component>
-    <reference name="Component3b4aRef" promote="Component3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService" />
-    </reference>
-    
-    <component name="Component3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.Component3bImpl" />
-    </component>
-    <reference name="Component3b4bRef" promote="Component3b4b/accountService">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws uri="http://localhost:8085/AccountService" />
-    </reference>
-
-    <!-- target service -->
-
-    <service name="AccountService" promote="AccountServiceComponent">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService"/>
-    </service>
-
-    <component name="AccountServiceComponent">
-        <implementation.java class="bigbank.account.services.accountdata.AccountDataServiceImpl" />
-    </component>
-
-    <!-- test client -->
-
-    <component name="AccountServiceClient">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="AccountServiceRef" promote="AccountServiceClient/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/services/AccountService"/>
-    </reference>
-
-    <!-- clients -->
-
-    <component name="Client1a2a3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2a3a4a" promote="Client1a2a3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3a4a" />
-    </reference>
-
-    <component name="Client1a2a3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl"/>
-    </component>
-
-    <reference name="ClientRef1a2a3a4b" promote="Client1a2a3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3a4b" />
-    </reference>
-
-    <component name="Client1a2a3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4a" promote="Client1a2a3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3b4a" />
-    </reference>
-
-    <component name="Client1a2a3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4b" promote="Client1a2a3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2a3b4b" />
-    </reference>
-
-    <component name="Client1a2b3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4a" promote="Client1a2b3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3a4a" />
-    </reference>
-
-    <component name="Client1a2b3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4b" promote="Client1a2b3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3a4b" />
-    </reference>
-
-    <component name="Client1a2b3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4a" promote="Client1a2b3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3b4a" />
-    </reference>
-
-    <component name="Client1a2b3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4b" promote="Client1a2b3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1a2b3b4b" />
-    </reference>
-
-    <component name="Client1b2a3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4a" promote="Client1b2a3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3a4a" />
-    </reference>
-
-    <component name="Client1b2a3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4b" promote="Client1b2a3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3a4b" />
-    </reference>
-
-    <component name="Client1b2a3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4a" promote="Client1b2a3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3b4a" />
-    </reference>
-
-    <component name="Client1b2a3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4b" promote="Client1b2a3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2a3b4b" />
-    </reference>
-
-    <component name="Client1b2b3a4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4a" promote="Client1b2b3a4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3a4a" />
-    </reference>
-
-    <component name="Client1b2b3a4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4b" promote="Client1b2b3a4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3a4b" />
-    </reference>
-
-    <component name="Client1b2b3b4a">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4a" promote="Client1b2b3b4a/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3b4a" />
-    </reference>
-
-    <component name="Client1b2b3b4b">
-        <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4b" promote="Client1b2b3b4b/accountService">
-        <interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
-        <binding.ws uri="http://localhost:8085/AccountService1b2b3b4b" />
-    </reference>
-
-</composite>
diff --git a/java/sca-contrib/itest/wsdlless/src/main/resources/WSDLTest.composite b/java/sca-contrib/itest/wsdlless/src/main/resources/WSDLTest.composite
deleted file mode 100644
index e69cdbc282..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/resources/WSDLTest.composite
+++ /dev/null
@@ -1,350 +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"
-	name="WSDLTest">
-   
-    <service name="HelloWorldService1a2a3a4a" promote="Component2a3a4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3a4a"/>
-    </service>
-    <service name="HelloWorldService1a2a3a4b" promote="Component2a3a4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3a4b"/>
-    </service>
-    <service name="HelloWorldService1a2a3b4a" promote="Component2a3b4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3b4a"/>
-    </service>
-    <service name="HelloWorldService1a2a3b4b" promote="Component2a3b4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3b4b"/>
-    </service>
-    <service name="HelloWorldService1a2b3a4a" promote="Component2b3a4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3a4a"/>
-    </service>
-    <service name="HelloWorldService1a2b3a4b" promote="Component2b3a4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3a4b"/>
-    </service>
-    <service name="HelloWorldService1a2b3b4a" promote="Component2b3b4a" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3b4a"/>
-    </service>
-    <service name="HelloWorldService1a2b3b4b" promote="Component2b3b4b" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3b4b"/>
-    </service>
-
-    <service name="HelloWorldService1b2a3a4a" promote="Component2a3a4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3a4a"/>
-    </service>
-    <service name="HelloWorldService1b2a3a4b" promote="Component2a3a4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3a4b"/>
-    </service>
-    <service name="HelloWorldService1b2a3b4a" promote="Component2a3b4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3b4a"/>
-    </service>
-    <service name="HelloWorldService1b2a3b4b" promote="Component2a3b4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3b4b"/>
-    </service>
-    <service name="HelloWorldService1b2b3a4a" promote="Component2b3a4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3a4a"/>
-    </service>
-    <service name="HelloWorldService1b2b3a4b" promote="Component2b3a4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3a4b"/>
-    </service>
-    <service name="HelloWorldService1b2b3b4a" promote="Component2b3b4a" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3b4a"/>
-    </service>
-    <service name="HelloWorldService1b2b3b4b" promote="Component2b3b4b" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3b4b"/>
-    </service>
-
-    <component name="Component2a3a4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3a4a" />
-    </component> 
-    <component name="Component2a3a4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3a4b" />
-    </component> 
-    <component name="Component2a3b4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3b4a" />
-    </component> 
-    <component name="Component2a3b4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp" target="Component3b4b" />
-    </component> 
-
-    <component name="Component2b3a4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3a4a" />
-    </component> 
-    <component name="Component2b3a4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3a4b" />
-    </component> 
-    <component name="Component2b3b4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3b4a" />
-    </component> 
-    <component name="Component2b3b4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp" target="Component3b4b" />
-    </component> 
-
-    <component name="Component3a4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3aImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3a4aRef" promote="Component3a4a/comp" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-    <component name="Component3a4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3aImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3a4bRef" promote="Component3a4b/comp" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-    <component name="Component3b4a">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3bImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3b4aRef" promote="Component3b4a/comp" >
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-    <component name="Component3b4b">
-    	<implementation.java class="org.apache.tuscany.sca.itest.Component3bImpl"/>
-        <reference name="comp" />
-    </component> 
-    <reference name="Component3b4bRef" promote="Component3b4b/comp" >
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldWebService" />
-    </reference>
-
-
-<!-- the servive -->    
-    
-    <service name="HelloWorldWebService"  promote="HelloWorldServiceComponent" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws uri="http://localhost:8085/HelloWorldWebService"/>
-    </service>
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="helloworld.HelloWorldImpl" />
-    </component>
-    
-<!-- the clients -->
-
-    <component name="Client1a2a3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3a4a" promote="Client1a2a3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3a4a" />
-    </reference>
-    
-    <component name="Client1a2a3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3a4b" promote="Client1a2a3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3a4b" />
-    </reference>
-    
-    <component name="Client1a2a3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4a" promote="Client1a2a3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3b4a" />
-    </reference>
-    
-    <component name="Client1a2a3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2a3b4b" promote="Client1a2a3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2a3b4b" />
-    </reference>
-    
-    <component name="Client1a2b3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4a" promote="Client1a2b3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3a4a" />
-    </reference>
-    
-    <component name="Client1a2b3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3a4b" promote="Client1a2b3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3a4b" />
-    </reference>
-    
-    <component name="Client1a2b3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4a" promote="Client1a2b3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3b4a" />
-    </reference>
-    
-    <component name="Client1a2b3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1a2b3b4b" promote="Client1a2b3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1a2b3b4b" />
-    </reference>
-    
-    <component name="Client1b2a3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4a" promote="Client1b2a3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3a4a" />
-    </reference>
-    
-    <component name="Client1b2a3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3a4b" promote="Client1b2a3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3a4b" />
-    </reference>
-    
-    <component name="Client1b2a3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4a" promote="Client1b2a3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3b4a" />
-    </reference>
-    
-    <component name="Client1b2a3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2a3b4b" promote="Client1b2a3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2a3b4b" />
-    </reference>
-    
-    <component name="Client1b2b3a4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4a" promote="Client1b2b3a4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3a4a" />
-    </reference>
-    
-    <component name="Client1b2b3a4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3a4b" promote="Client1b2b3a4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"/>
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3a4b" />
-    </reference>
-    
-    <component name="Client1b2b3b4a">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4a" promote="Client1b2b3b4a/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3b4a" />
-    </reference>
-    
-    <component name="Client1b2b3b4b">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService" />
-    </component>
-
-    <reference name="ClientRef1b2b3b4b" promote="Client1b2b3b4b/helloWorldService" >
-        <!-- interface.java interface="helloworld.HelloWorldService" / -->
-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
-        <binding.ws uri="http://localhost:8085/HelloWorldService1b2b3b4b" />
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/itest/wsdlless/src/main/resources/some.composite b/java/sca-contrib/itest/wsdlless/src/main/resources/some.composite
deleted file mode 100644
index 1b099239d1..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/resources/some.composite
+++ /dev/null
@@ -1,33 +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://test" xmlns:test="http://test"

-    name="some">

-    <service name="SomeServices" promote="SomeServicesComponent">

-        <binding.ws uri="http://localhost:8085/SomeServices" />

-    </service>

-

-    <component name="SomeServicesComponent">

-        <implementation.java class="service.SomeServiceImpl" />

-        <service name="SomeService">

-            <interface.java interface="service.SomeService" />

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl b/java/sca-contrib/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index 73f9ed4bfc..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
+++ /dev/null
@@ -1,453 +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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:account="http://www.bigbank.com/account"
-	targetNamespace="http://www.bigbank.com/account"
-	name="AccountService">
-
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.bigbank.com/account"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:account="http://www.bigbank.com/account">
-			
-			<xsd:element name="getAccountReport">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID"
-							type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountReportResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountReport"
-							type="account:AccountReport" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountReport">
-				<xsd:sequence>
-					<xsd:element name="accountSummaries"
-						type="account:AccountSummary" maxOccurs="unbounded" />
-					<xsd:element name="stockSummaries"
-						type="account:StockSummary" maxOccurs="unbounded" />
-						
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="AccountSummary">
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="accountType" type="xsd:string" />
-				<xsd:attribute name="balance" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockSummary">
-			    <!-- xsd:attribute name="id" type="xsd:int" / -->
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-				<!-- unique id for this purchase -->
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="purchaseDate" type="xsd:dateTime" />
-				<xsd:attribute name="purchasePrice" type="xsd:float" />
-				<xsd:attribute name="currentPrice" type="xsd:float" />
-				<xsd:attribute name="company" type="xsd:string" />
-				<xsd:attribute name="highPrice" type="xsd:float" />
-				<xsd:attribute name="lowPrice" type="xsd:float" />
-				
-			</xsd:complexType>
-
-			<!-- Profile in data base  -->
-			<xsd:element name="getCustomerProfile">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="loginID" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="CustomerProfileData">
-				<xsd:sequence>
-					<xsd:element name="firstName" type="xsd:string" />
-					<xsd:element name="lastName" type="xsd:string" />
-					<xsd:element name="address" type="xsd:string" />
-					<xsd:element name="email" type="xsd:string" />
-					<xsd:element name="loginID" type="xsd:string" />
-					<xsd:element name="password" type="xsd:string" />
-					<xsd:element name="id" type="xsd:int" />
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:element name="getCustomerProfileResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="withdraw">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="withdrawResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="deposit">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="depositResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="id" type="xsd:int" />
-						<xsd:element name="stock" type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStockResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseSummary"
-							type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-
-
-			<xsd:element name="sellStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseLotNumber"
-							type="xsd:int" /><!-- unique id for this purchase -->
-						<xsd:element name="quantity" type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="createAccount">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-                        <xsd:element name="createSavings"
-							type="xsd:boolean" />
-                        <xsd:element name="createCheckings"
-							type="xsd:boolean" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>	
-			<xsd:element name="createAccountResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-				
-			</xsd:element>
-
-			<xsd:element name="getAccountLog">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID"
-							type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountLogResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountLog"
-							type="account:AccountLog" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountLog">
-				<xsd:sequence>
-					<xsd:element name="accountLogEntries"
-						type="account:AccountLogEntry" maxOccurs="unbounded" />
-					<xsd:element name="stockLogEntries"
-						type="account:StockLogEntry" maxOccurs="unbounded" />
-						
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:complexType name="AccountLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="amount" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-			</xsd:complexType>
-
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="getAccountReportRequest">
-		<wsdl:part element="account:getAccountReport"
-			name="getAccountReportRequest" />
-	</wsdl:message>
-	<wsdl:message name="getAccountReportResponse">
-		<wsdl:part element="account:getAccountReportResponse"
-			name="getAccountReportResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getCustomerProfileRequest">
-		<wsdl:part element="account:getCustomerProfile"
-			name="getCustomerProfile" />
-	</wsdl:message>
-	<wsdl:message name="getCustomerProfileResponse">
-		<wsdl:part element="account:getCustomerProfileResponse"
-			name="getCustomerProfileResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawRequest">
-		<wsdl:part element="account:withdraw" name="withdrawRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawResponse">
-		<wsdl:part element="account:withdrawResponse"
-			name="withdrawResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="depositRequest">
-		<wsdl:part element="account:deposit" name="depositRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="depositResponse">
-		<wsdl:part element="account:depositResponse"
-			name="depositResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockRequest">
-		<wsdl:part element="account:purchaseStock"
-			name="purchaseStockRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockResponse">
-		<wsdl:part element="account:purchaseStockResponse"
-			name="purchaseStockResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="sellStockRequest">
-		<wsdl:part element="account:sellStock" name="sellStockRequest" />
-	</wsdl:message>
-	
-	<wsdl:message name="createAccountRequest">
-		<wsdl:part element="account:createAccount" name="createAccountRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="createAccountResponse">
-		<wsdl:part element="account:createAccountResponse" name="createAccountResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getAccountLogRequest">
-		<wsdl:part element="account:getAccountLog"
-			name="getAccountLogRequest" />
-	</wsdl:message>
-	
-	<wsdl:message name="getAccountLogResponse">
-		<wsdl:part element="account:getAccountLogResponse"
-			name="getAccountLogResponse" />
-	</wsdl:message>
-
-	<wsdl:portType name="AccountService">
-		<wsdl:operation name="getAccountReport">
-			<wsdl:input message="account:getAccountReportRequest" />
-			<wsdl:output message="account:getAccountReportResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getCustomerProfile">
-			<wsdl:input message="account:getCustomerProfileRequest" />
-			<wsdl:output message="account:getCustomerProfileResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<wsdl:input message="account:withdrawRequest" />
-			<wsdl:output message="account:withdrawResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<wsdl:input message="account:depositRequest" />
-			<wsdl:output message="account:depositResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<wsdl:input message="account:purchaseStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<wsdl:input message="account:sellStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-
-		<wsdl:operation name="createAccount">
-			<wsdl:input message="account:createAccountRequest" />
-			<wsdl:output message="account:createAccountResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<wsdl:input message="account:getAccountLogRequest" />
-			<wsdl:output message="account:getAccountLogResponse" />
-		</wsdl:operation>
-
-	</wsdl:portType>
-
-
-
-	<wsdl:binding name="AccountServiceSOAP" type="account:AccountService">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getAccountReport">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountReport" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getCustomerProfile">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getCustomerProfile" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/withdraw" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/deposit" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/purchaseStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/sellStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="createAccount">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/createAccount" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountLog" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-	</wsdl:binding>
-	<wsdl:service name="AccountService">
-		<wsdl:port binding="account:AccountServiceSOAP"
-			name="AccountServiceSOAP">
-			<soap:address
-				location="http://localhost:8085/services/AccountService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index bc6fe0e89a..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,131 +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://helloworld"
-	xmlns:tns="http://helloworld"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">
-
-	<wsdl:types>
-		<schema elementFormDefault="qualified"
-			targetNamespace="http://helloworld"
-			xmlns="http://www.w3.org/2001/XMLSchema">
-
-			<element name="getGreetings">
-				<complexType>
-					<sequence>
-						<element name="name" type="xsd:string" />
-					</sequence>
-				</complexType>
-			</element>
-
-			<element name="getGreetingsResponse">
-				<complexType>
-					<sequence>
-						<element name="getGreetingsReturn"
-							type="xsd:string" />
-					</sequence>
-				</complexType>
-			</element>
-
-			<element name="getMultipleGreetings">
-				<complexType>
-					<sequence>
-						<element name="name" type="xsd:string"
-							maxOccurs="unbounded" />
-					</sequence>
-				</complexType>
-			</element>
-
-			<element name="getMultipleGreetingsResponse">
-				<complexType>
-					<sequence>
-						<element name="getGreetingsReturn"
-							type="xsd:string" maxOccurs="unbounded" />
-					</sequence>
-				</complexType>
-			</element>
-		</schema>
-	</wsdl:types>
-
-	<wsdl:message name="getGreetingsRequest">
-		<wsdl:part element="tns:getGreetings" name="parameters" />
-	</wsdl:message>
-
-	<wsdl:message name="getGreetingsResponse">
-		<wsdl:part element="tns:getGreetingsResponse" name="parameters" />
-	</wsdl:message>
-
-	<wsdl:message name="getMultipleGreetingsRequest">
-		<wsdl:part element="tns:getMultipleGreetings" name="parameters" />
-	</wsdl:message>
-
-	<wsdl:message name="getMultipleGreetingsResponse">
-		<wsdl:part element="tns:getMultipleGreetingsResponse"
-			name="parameters" />
-	</wsdl:message>
-
-	<wsdl:portType name="HelloWorld">
-		<wsdl:operation name="getGreetings">
-			<wsdl:input message="tns:getGreetingsRequest"
-				name="getGreetingsRequest" />
-			<wsdl:output message="tns:getGreetingsResponse"
-				name="getGreetingsResponse" />
-		</wsdl:operation>
-		<wsdl:operation name="getMultipleGreetings">
-			<wsdl:input message="tns:getMultipleGreetingsRequest"
-				name="getMultipleGreetingsRequest" />
-			<wsdl:output message="tns:getMultipleGreetingsResponse"
-				name="getMultipleGreetingsResponse" />
-		</wsdl:operation>
-
-	</wsdl:portType>
-
-	<wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-		<wsdlsoap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getGreetings">
-			<wsdlsoap:operation soapAction="" />
-			<wsdl:input name="getGreetingsRequest">
-				<wsdlsoap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output name="getGreetingsResponse">
-				<wsdlsoap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getMultipleGreetings">
-			<wsdlsoap:operation soapAction="" />
-			<wsdl:input name="getMultipleGreetingsRequest">
-				<wsdlsoap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output name="getMultipleGreetingsResponse">
-				<wsdlsoap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-
-	<wsdl:service name="HelloWorldService">
-		<wsdl:port binding="tns:HelloWorldSoapBinding"
-			name="HelloWorldSoapPort">
-			<wsdlsoap:address location="" />
-		</wsdl:port>
-	</wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/java/sca-contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
deleted file mode 100644
index 33f541b21b..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ /dev/null
@@ -1,173 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import bigbank.account.services.accountdata.AccountDataService;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountSummary;
-import com.bigbank.account.CustomerProfileData;
-
-/**
- * Tests all the combinations of wiring services, components, and references
- * which use either interface.java or interface.wsdl.
- * 
- * The tests use a service (1) wired to a components (2) wired to another 
- * component (3) wired to a reference (4). Each of those uses either 
- * interface.java (a) or interface.wsdl (b). This results in 16 different
- * combinations 1a2a3a4a thru 1b2b3b4b.
- */
-public class SDOWSDLTestCase {
-
-    private static SCADomain domain;
-
-    @Test
-    public void testClient1a2a3a4a() throws RemoteException  {
-        doit("Client1a2a3a4a");
-    }
-
-    @Test
-    public void testClient1a2a3a4b() throws RemoteException  {
-        doit("Client1a2a3a4b");
-    }
-
-    @Test
-    public void testClient1a2a3b4a() throws RemoteException  {
-        doit("Client1a2a3b4a");
-    }
-
-    @Test
-    public void testClient1a2a3b4b() throws RemoteException  {
-        doit("Client1a2a3b4b");
-    }
-
-    @Test
-    public void testClient1a2b3a4a() throws RemoteException  {
-        doit("Client1a2b3a4a");
-    }
-
-    @Test
-    public void testClient1a2b3a4b() throws RemoteException  {
-        doit("Client1a2b3a4b");
-    }
-
-    @Test
-    public void testClient1a2b3b4a() throws RemoteException  {
-        doit("Client1a2b3b4a");
-    }
-
-    @Test
-    public void testClient1a2b3b4b() throws RemoteException  {
-        doit("Client1a2b3b4b");
-    }
-
-    @Test
-    public void testClient1b2a3a4a() throws RemoteException  {
-        doit("Client1b2a3a4a");
-    }
-
-    @Test
-    public void testClient1b2a3a4b() throws RemoteException  {
-        doit("Client1b2a3a4b");
-    }
-
-    @Test
-    public void testClient1b2a3b4a() throws RemoteException  {
-        doit("Client1b2a3b4a");
-    }
-
-    @Test
-    public void testClient1b2a3b4b() throws RemoteException  {
-        doit("Client1b2a3b4b");
-    }
-
-    @Test
-    public void testClient1b2b3a4a() throws RemoteException  {
-        doit("Client1b2b3a4a");
-    }
-
-    @Test
-    public void testClient1b2b3a4b() throws RemoteException  {
-        doit("Client1b2b3a4b");
-    }
-
-    @Test
-    public void testClient1b2b3b4a() throws RemoteException  {
-        doit("Client1b2b3b4a");
-    }
-
-    @Test
-    public void testClient1b2b3b4b() throws RemoteException  {
-        doit("Client1b2b3b4b");
-    }
-
-    private void doit(String compName) throws RemoteException {
-        AccountDataService client = domain.getService(AccountDataService.class, compName);
-        CustomerProfileData dataIn = AccountFactory.INSTANCE.createCustomerProfileData();
-        dataIn.setAddress("home");
-        dataIn.setEmail("petra@home");
-        dataIn.setFirstName("petra");
-        dataIn.setId(1);
-        dataIn.setLastName("A");
-        dataIn.setLoginID("petra");
-        dataIn.setPassword("ant");
-        
-        CustomerProfileData dataOut = client.createAccount(dataIn , false, false);
-        
-        assertEquals(dataIn.getAddress(), dataOut.getAddress());
-        assertEquals(dataIn.getEmail(), dataOut.getEmail());
-        assertEquals(dataIn.getFirstName(), dataOut.getFirstName());
-        assertEquals(dataIn.getId(), dataOut.getId());
-        assertEquals(dataIn.getLastName(), dataOut.getLastName());
-        assertEquals(dataIn.getLoginID(), dataOut.getLoginID());
-        assertEquals(dataIn.getPassword(), dataOut.getPassword());
-        
-        AccountReport report = client.getAccountReport(12345);
-        AccountSummary summary1 = (AccountSummary)report.getAccountSummaries().get(0);
-        assertEquals(summary1.getAccountType(), "checking");
-        AccountSummary summary2 = (AccountSummary)report.getAccountSummaries().get(1);
-        assertEquals(summary2.getBalance(), 2000.f);
-    }
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        try {
-        domain = SCADomain.newInstance("SDOWSDLTest.composite");
-        }catch(Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/java/sca-contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
deleted file mode 100644
index 82bf7ce650..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ /dev/null
@@ -1,150 +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.itest;
-
-import static junit.framework.Assert.assertEquals;
-import helloworld.HelloWorldService;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests all the combinations of wiring services, components, and references
- * which use either interface.java or interface.wsdl. The tests use a service
- * (1) wired to a components (2) wired to another component (3) wired to a
- * reference (4). Each of those uses either interface.java (a) or interface.wsdl
- * (b). This results in 16 different combinations 1a2a3a4a thru 1b2b3b4b.
- */
-public class WSDLTestCase {
-
-    private static SCADomain domain;
-
-    @Test
-    public void testClient1a2a3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-        String[] greetings = client.getMultipleGreetings(new String[] {"John", "Smith"});
-        assertEquals(2, greetings.length);
-        assertEquals("Hi John", greetings[0]);
-        assertEquals("Hi Smith", greetings[1]);
-    }
-
-    @Test
-    public void testClient1a2a3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2a3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2a3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2a3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1a2b3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1a2b3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2a3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2a3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3a4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3a4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3a4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3a4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3b4a() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3b4a");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @Test
-    public void testClient1b2b3b4b() {
-        HelloWorldService client = domain.getService(HelloWorldService.class, "Client1b2b3b4b");
-        assertEquals("Hi petra", client.getGreetings("petra"));
-    }
-
-    @BeforeClass
-    public static void init() throws Throwable {
-        domain = SCADomain.newInstance("WSDLTest.composite");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java b/java/sca-contrib/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
deleted file mode 100644
index 7c62287c57..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
+++ /dev/null
@@ -1,83 +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 service;
-
-import static org.junit.Assert.assertEquals;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import service.generated.SomeServiceService;
-
-/**
- * @author pxk3
- *
- */
-public class SomeComponentTestCase {
-    private static SCADomain scaDomain;
-    private static SomeService someService;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("some.composite");
-        someService = scaDomain.getService(SomeService.class, "SomeServicesComponent");
-    }
-
-    @AfterClass
-    public static void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    @Test
-    public void testGetUsingMoreComplexObject() throws Exception {
-        String stringParam = "ABC";
-        URL url = new URL("http://localhost:8085/SomeServices?wsdl");
-        QName serviceQName = new QName("http://service/", "SomeServiceService");
-        SomeServiceService service = new SomeServiceService(url, serviceQName);
-        service.generated.SomeService proxy = service.getSomeServicePort();
-        service.generated.AnObject obj = proxy.getUsingString(stringParam);
-        assertEquals(stringParam + "123", obj.getSomeRetValue());
-
-        service.generated.MoreComplexObject obj2 = new service.generated.MoreComplexObject();
-        obj2.setStringParam(stringParam);
-        obj2.setStringParam2("2");
-        obj2.setIntParam(new Integer(0));
-
-        obj = proxy.getUsingMoreComplexObject(obj2);
-        assertEquals(stringParam + "123", obj.getSomeRetValue());
-    }
-
-    @Test
-    public void testLocal() {
-        String stringParam = "1234";
-        MoreComplexObject moreComplexParam = new MoreComplexObject();
-        moreComplexParam.setStringParam(stringParam);
-
-        AnObject anObject = someService.getUsingMoreComplexObject(moreComplexParam);
-
-        assertEquals(stringParam + "123", anObject.getSomeRetValue());
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/AnObject.java b/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/AnObject.java
deleted file mode 100644
index effeb3c701..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/AnObject.java
+++ /dev/null
@@ -1,100 +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 service.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anObject complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="anObject">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="someOtherRetValue" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         &lt;element name="someRetValue" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "anObject", namespace = "", propOrder = {"someOtherRetValue", "someRetValue"})
-public class AnObject {
-
-    protected Integer someOtherRetValue;
-    protected String someRetValue;
-
-    /**
-     * Gets the value of the someOtherRetValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getSomeOtherRetValue() {
-        return someOtherRetValue;
-    }
-
-    /**
-     * Sets the value of the someOtherRetValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setSomeOtherRetValue(Integer value) {
-        this.someOtherRetValue = value;
-    }
-
-    /**
-     * Gets the value of the someRetValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSomeRetValue() {
-        return someRetValue;
-    }
-
-    /**
-     * Sets the value of the someRetValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSomeRetValue(String value) {
-        this.someRetValue = value;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java b/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
deleted file mode 100644
index 284e961788..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
+++ /dev/null
@@ -1,79 +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 service.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="arg0" type="{}moreComplexObject" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {"arg0"})
-@XmlRootElement(name = "getUsingMoreComplexObject", namespace = "http://service/")
-public class GetUsingMoreComplexObject {
-
-    @XmlElementRef(name = "arg0", type = JAXBElement.class)
-    protected JAXBElement<MoreComplexObject> arg0;
-
-    /**
-     * Gets the value of the arg0 property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link MoreComplexObject }{@code >}
-     *     
-     */
-    public JAXBElement<MoreComplexObject> getArg0() {
-        return arg0;
-    }
-
-    /**
-     * Sets the value of the arg0 property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link MoreComplexObject }{@code >}
-     *     
-     */
-    public void setArg0(JAXBElement<MoreComplexObject> value) {
-        this.arg0 = ((JAXBElement<MoreComplexObject>)value);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java b/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
deleted file mode 100644
index 4113aa1a0a..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
+++ /dev/null
@@ -1,79 +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 service.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="return" type="{}anObject" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {"_return"})
-@XmlRootElement(name = "getUsingMoreComplexObjectResponse", namespace = "http://service/")
-public class GetUsingMoreComplexObjectResponse {
-
-    @XmlElementRef(name = "return", type = JAXBElement.class)
-    protected JAXBElement<AnObject> _return;
-
-    /**
-     * Gets the value of the return property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link AnObject }{@code >}
-     *     
-     */
-    public JAXBElement<AnObject> getReturn() {
-        return _return;
-    }
-
-    /**
-     * Sets the value of the return property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link AnObject }{@code >}
-     *     
-     */
-    public void setReturn(JAXBElement<AnObject> value) {
-        this._return = ((JAXBElement<AnObject>)value);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingString.java b/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
deleted file mode 100644
index 532b948b47..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
+++ /dev/null
@@ -1,79 +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 service.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {"arg0"})
-@XmlRootElement(name = "getUsingString", namespace = "http://service/")
-public class GetUsingString {
-
-    @XmlElementRef(name = "arg0", type = JAXBElement.class)
-    protected JAXBElement<String> arg0;
-
-    /**
-     * Gets the value of the arg0 property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link String }{@code >}
-     *     
-     */
-    public JAXBElement<String> getArg0() {
-        return arg0;
-    }
-
-    /**
-     * Sets the value of the arg0 property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link String }{@code >}
-     *     
-     */
-    public void setArg0(JAXBElement<String> value) {
-        this.arg0 = ((JAXBElement<String>)value);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java b/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
deleted file mode 100644
index 82bfb2d2aa..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
+++ /dev/null
@@ -1,79 +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 service.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="return" type="{}anObject" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {"_return"})
-@XmlRootElement(name = "getUsingStringResponse", namespace = "http://service/")
-public class GetUsingStringResponse {
-
-    @XmlElementRef(name = "return", type = JAXBElement.class)
-    protected JAXBElement<AnObject> _return;
-
-    /**
-     * Gets the value of the return property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link AnObject }{@code >}
-     *     
-     */
-    public JAXBElement<AnObject> getReturn() {
-        return _return;
-    }
-
-    /**
-     * Sets the value of the return property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link AnObject }{@code >}
-     *     
-     */
-    public void setReturn(JAXBElement<AnObject> value) {
-        this._return = ((JAXBElement<AnObject>)value);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java b/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
deleted file mode 100644
index 61c7c6cb19..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
+++ /dev/null
@@ -1,126 +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 service.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for moreComplexObject complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="moreComplexObject">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="intParam" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         &lt;element name="stringParam" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="stringParam2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "moreComplexObject", namespace = "", propOrder = {"intParam", "stringParam", "stringParam2"})
-public class MoreComplexObject {
-
-    protected Integer intParam;
-    protected String stringParam;
-    protected String stringParam2;
-
-    /**
-     * Gets the value of the intParam property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getIntParam() {
-        return intParam;
-    }
-
-    /**
-     * Sets the value of the intParam property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setIntParam(Integer value) {
-        this.intParam = value;
-    }
-
-    /**
-     * Gets the value of the stringParam property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStringParam() {
-        return stringParam;
-    }
-
-    /**
-     * Sets the value of the stringParam property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStringParam(String value) {
-        this.stringParam = value;
-    }
-
-    /**
-     * Gets the value of the stringParam2 property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStringParam2() {
-        return stringParam2;
-    }
-
-    /**
-     * Sets the value of the stringParam2 property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStringParam2(String value) {
-        this.stringParam2 = value;
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java b/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
deleted file mode 100644
index 1ba0c497d9..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
+++ /dev/null
@@ -1,141 +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 service.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the service.jaxws package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _GetUsingMoreComplexObjectArg0_QNAME = new QName("", "arg0");
-    private final static QName _GetUsingStringResponseReturn_QNAME = new QName("", "return");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: service.jaxws
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link AnObject }
-     * 
-     */
-    public AnObject createAnObject() {
-        return new AnObject();
-    }
-
-    /**
-     * Create an instance of {@link GetUsingStringResponse }
-     * 
-     */
-    public GetUsingStringResponse createGetUsingStringResponse() {
-        return new GetUsingStringResponse();
-    }
-
-    /**
-     * Create an instance of {@link GetUsingMoreComplexObjectResponse }
-     * 
-     */
-    public GetUsingMoreComplexObjectResponse createGetUsingMoreComplexObjectResponse() {
-        return new GetUsingMoreComplexObjectResponse();
-    }
-
-    /**
-     * Create an instance of {@link GetUsingString }
-     * 
-     */
-    public GetUsingString createGetUsingString() {
-        return new GetUsingString();
-    }
-
-    /**
-     * Create an instance of {@link GetUsingMoreComplexObject }
-     * 
-     */
-    public GetUsingMoreComplexObject createGetUsingMoreComplexObject() {
-        return new GetUsingMoreComplexObject();
-    }
-
-    /**
-     * Create an instance of {@link MoreComplexObject }
-     * 
-     */
-    public MoreComplexObject createMoreComplexObject() {
-        return new MoreComplexObject();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MoreComplexObject }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "arg0", scope = GetUsingMoreComplexObject.class)
-    public JAXBElement<MoreComplexObject> createGetUsingMoreComplexObjectArg0(MoreComplexObject value) {
-        return new JAXBElement<MoreComplexObject>(_GetUsingMoreComplexObjectArg0_QNAME, MoreComplexObject.class,
-                                                  GetUsingMoreComplexObject.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AnObject }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "return", scope = GetUsingStringResponse.class)
-    public JAXBElement<AnObject> createGetUsingStringResponseReturn(AnObject value) {
-        return new JAXBElement<AnObject>(_GetUsingStringResponseReturn_QNAME, AnObject.class,
-                                         GetUsingStringResponse.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AnObject }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "return", scope = GetUsingMoreComplexObjectResponse.class)
-    public JAXBElement<AnObject> createGetUsingMoreComplexObjectResponseReturn(AnObject value) {
-        return new JAXBElement<AnObject>(_GetUsingStringResponseReturn_QNAME, AnObject.class,
-                                         GetUsingMoreComplexObjectResponse.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "arg0", scope = GetUsingString.class)
-    public JAXBElement<String> createGetUsingStringArg0(String value) {
-        return new JAXBElement<String>(_GetUsingMoreComplexObjectArg0_QNAME, String.class, GetUsingString.class, value);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/SomeService.java b/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/SomeService.java
deleted file mode 100644
index 4a584a8da2..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/SomeService.java
+++ /dev/null
@@ -1,65 +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 service.generated;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.1 in JDK 6
- * Generated source version: 2.1
- * 
- */
-@WebService(name = "SomeService", targetNamespace = "http://service/")
-@XmlSeeAlso( {ObjectFactory.class})
-public interface SomeService {
-
-    /**
-     * 
-     * @param arg0
-     * @return
-     *     returns service.generated.AnObject
-     */
-    @WebMethod
-    @WebResult(targetNamespace = "")
-    @RequestWrapper(localName = "getUsingMoreComplexObject", targetNamespace = "http://service/", className = "service.generated.GetUsingMoreComplexObject")
-    @ResponseWrapper(localName = "getUsingMoreComplexObjectResponse", targetNamespace = "http://service/", className = "service.generated.GetUsingMoreComplexObjectResponse")
-    public AnObject getUsingMoreComplexObject(@WebParam(name = "arg0", targetNamespace = "")
-    MoreComplexObject arg0);
-
-    /**
-     * 
-     * @param arg0
-     * @return
-     *     returns service.generated.AnObject
-     */
-    @WebMethod
-    @WebResult(targetNamespace = "")
-    @RequestWrapper(localName = "getUsingString", targetNamespace = "http://service/", className = "service.generated.GetUsingString")
-    @ResponseWrapper(localName = "getUsingStringResponse", targetNamespace = "http://service/", className = "service.generated.GetUsingStringResponse")
-    public AnObject getUsingString(@WebParam(name = "arg0", targetNamespace = "")
-    String arg0);
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java b/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
deleted file mode 100644
index 44c2b67256..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
+++ /dev/null
@@ -1,81 +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 service.generated;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.1 in JDK 6
- * Generated source version: 2.1
- * 
- */
-@WebServiceClient(name = "SomeServiceService", targetNamespace = "http://service/", wsdlLocation = "file:/C:/Tuscany/java/sca/itest/wsdlless/src/main/resources/some.wsdl")
-public class SomeServiceService extends Service {
-
-    private final static URL SOMESERVICESERVICE_WSDL_LOCATION;
-
-    static {
-        URL url = null;
-        try {
-            url = new URL("file:/C:/Tuscany/java/sca/itest/wsdlless/src/main/resources/some.wsdl");
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        }
-        SOMESERVICESERVICE_WSDL_LOCATION = url;
-    }
-
-    public SomeServiceService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public SomeServiceService() {
-        super(SOMESERVICESERVICE_WSDL_LOCATION, new QName("http://service/", "SomeServiceService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns SomeService
-     */
-    @WebEndpoint(name = "SomeServicePort")
-    public SomeService getSomeServicePort() {
-        return (SomeService)super.getPort(new QName("http://service/", "SomeServicePort"), SomeService.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns SomeService
-     */
-    @WebEndpoint(name = "SomeServicePort")
-    public SomeService getSomeServicePort(WebServiceFeature... features) {
-        return (SomeService)super.getPort(new QName("http://service/", "SomeServicePort"), SomeService.class, features);
-    }
-
-}
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/package-info.java b/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/package-info.java
deleted file mode 100644
index d7b3fef82e..0000000000
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/package-info.java
+++ /dev/null
@@ -1,21 +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.    
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://service/")
-package service.generated;
-
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/LICENSE b/java/sca-contrib/modules/assembly-xml-osoa/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/META-INF/MANIFEST.MF b/java/sca-contrib/modules/assembly-xml-osoa/META-INF/MANIFEST.MF
deleted file mode 100644
index 209391fa4d..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,58 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.assembly.xml.osoa;version="2.0.0";

-  uses:="org.apache.tuscany.sca.definitions,

-   javax.xml.transform.dom,

-   org.apache.tuscany.sca.core,

-   org.apache.tuscany.sca.policy,

-   javax.xml.namespace,

-   org.apache.tuscany.sca.contribution.java,

-   javax.xml.stream,

-   org.apache.tuscany.sca.contribution.resolver,

-   org.apache.tuscany.sca.policy.util,

-   org.apache.tuscany.sca.assembly,

-   javax.xml.parsers,

-   org.apache.tuscany.sca.contribution,

-   org.apache.tuscany.sca.monitor,

-   org.w3c.dom,

-   org.apache.tuscany.sca.interfacedef,

-   org.apache.tuscany.sca.contribution.namespace,

-   javax.xml.xpath,

-   javax.xml.transform,

-   org.apache.tuscany.sca.contribution.processor,

-   org.apache.tuscany.sca.interfacedef.impl"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA 1.0 (OSOA) XML Assembly Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397124328

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA XML Assembly Model

-Import-Package: javax.xml.namespace,

- javax.xml.parsers,

- javax.xml.stream,

- javax.xml.transform,

- javax.xml.transform.dom,

- javax.xml.validation;resolution:=optional,

- javax.xml.xpath,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.builder;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.assembly.xml.osoa;version="2.0.0",

- org.apache.tuscany.sca.contribution;version="2.0.0",

- org.apache.tuscany.sca.contribution.java;version="2.0.0",

- org.apache.tuscany.sca.contribution.namespace;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.definitions;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.policy.util;version="2.0.0",

- org.w3c.dom,

- org.xml.sax;resolution:=optional

-Bundle-SymbolicName: org.apache.tuscany.sca.assembly.xml.osoa

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/NOTICE b/java/sca-contrib/modules/assembly-xml-osoa/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/pom.xml b/java/sca-contrib/modules/assembly-xml-osoa/pom.xml
deleted file mode 100644
index 1cb0907928..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/pom.xml
+++ /dev/null
@@ -1,113 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-assembly-xml-osoa</artifactId>
-    <name>Apache Tuscany SCA Assembly XML Model based on OSOA Spec</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-                        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- 
-        <dependency>
-            <groupId>javax.xml.stream</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0-2</version>
-        </dependency>
-        -->
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-            <version>1.0.1</version>
-            <scope>compile</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.4</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xsd-osoa</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/BaseAssemblyProcessor.java b/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/BaseAssemblyProcessor.java
deleted file mode 100644
index 4bb4d84316..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/BaseAssemblyProcessor.java
+++ /dev/null
@@ -1,759 +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.assembly.xml.osoa;
-
-import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
-import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.ELEMENT;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.MANY;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.MULTIPLICITY;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.MUST_SUPPLY;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.NAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.ONE_N;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.ONE_ONE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.SCA10_NS;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.TARGET;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.TYPE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.ZERO_N;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.ZERO_ONE;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.dom.DOMSource;
-
-import org.apache.tuscany.sca.assembly.AbstractContract;
-import org.apache.tuscany.sca.assembly.AbstractProperty;
-import org.apache.tuscany.sca.assembly.AbstractReference;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Base;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.assembly.Extensible;
-import org.apache.tuscany.sca.assembly.Extension;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * A base class with utility methods for the other artifact processors in this module. 
- * 
- * @version $Rev$ $Date$
- */
-abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor {
-
-    protected AssemblyFactory assemblyFactory;
-    protected PolicyFactory policyFactory;
-    protected StAXArtifactProcessor<Object> extensionProcessor;
-    protected PolicySubjectProcessor policyProcessor;
-    private DocumentBuilderFactory documentBuilderFactory;
-    private Monitor monitor;
-
-    /**
-     * Constructs a new BaseArtifactProcessor.
-     * @param assemblyFactory
-     * @param policyFactory
-     */
-    @SuppressWarnings("unchecked")
-    protected BaseAssemblyProcessor(AssemblyFactory assemblyFactory,
-                                    PolicyFactory policyFactory,
-                                    DocumentBuilderFactory documentBuilderFactory,
-                                    StAXArtifactProcessor extensionProcessor,
-                                    Monitor monitor) {
-        this.assemblyFactory = assemblyFactory;
-        this.policyFactory = policyFactory;
-        this.documentBuilderFactory = documentBuilderFactory;
-        this.extensionProcessor = (StAXArtifactProcessor<Object>)extensionProcessor;
-        this.policyProcessor = new PolicySubjectProcessor(policyFactory);
-        this.monitor = monitor;
-    }
-
-    /**
-     * @param modelFactories
-     * @param staxProcessor
-     * @param monitor
-     */
-    protected BaseAssemblyProcessor(FactoryExtensionPoint modelFactories,
-                                    StAXArtifactProcessor staxProcessor,
-                                    Monitor monitor) {
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class);
-        this.extensionProcessor = (StAXArtifactProcessor<Object>)staxProcessor;
-        this.policyProcessor = new PolicySubjectProcessor(policyFactory);
-        this.monitor = monitor;
-    }
-
-    /**
-     * Marshals warnings into the monitor
-     * 
-     * @param message
-     * @param model
-     * @param messageParameters
-     */
-    protected void warning(String message, Object model, String... messageParameters) {
-        if (monitor != null) {
-            Problem problem =
-                monitor.createProblem(this.getClass().getName(),
-                                      "assembly-xml-validation-messages",
-                                      Severity.WARNING,
-                                      model,
-                                      message,
-                                      (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    /**
-     * Marshals errors into the monitor
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    protected void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem =
-                monitor.createProblem(this.getClass().getName(),
-                                      "assembly-xml-validation-messages",
-                                      Severity.ERROR,
-                                      model,
-                                      message,
-                                      (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    /**
-     * Marshals exceptions into the monitor
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    protected void error(String message, Object model, Exception ex) {
-        if (monitor != null) {
-            Problem problem =
-                monitor.createProblem(this.getClass().getName(),
-                                      "assembly-xml-validation-messages",
-                                      Severity.ERROR,
-                                      model,
-                                      message,
-                                      ex);
-            monitor.problem(problem);
-        }
-    }
-
-    /**
-     * Start an element.
-     * @param writer
-     * @param name
-     * @param attrs
-     * @throws XMLStreamException
-     */
-    protected void writeStart(XMLStreamWriter writer, String name, XAttr... attrs) throws XMLStreamException {
-        writeStart(writer, SCA10_NS, name, attrs);
-    }
-
-    /**
-     * Start a document.
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void writeStartDocument(XMLStreamWriter writer, String name, XAttr... attrs) throws XMLStreamException {
-        writer.writeStartDocument();
-        writer.setDefaultNamespace(SCA10_NS);
-        writeStart(writer, SCA10_NS, name, attrs);
-        writer.writeDefaultNamespace(SCA10_NS);
-    }
-
-    /**
-     * Read list of reference targets
-     * @param reference
-     * @param reader
-     */
-    protected void readTargets(Reference reference, XMLStreamReader reader) {
-        String value = reader.getAttributeValue(null, TARGET);
-        ComponentService target = null;
-        if (value != null) {
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                target = assemblyFactory.createComponentService();
-                target.setUnresolved(true);
-                target.setName(tokens.nextToken());
-                reference.getTargets().add(target);
-            }
-        }
-    }
-
-    /**
-     * Write a list of targets into an attribute
-     * @param reference
-     * @return
-     */
-    protected XAttr writeTargets(Reference reference) {
-        List<String> targets = new ArrayList<String>();
-        for (Service target : reference.getTargets()) {
-            targets.add(target.getName());
-        }
-        return new XAttr(TARGET, targets);
-    }
-
-    /**
-     * Read a multiplicity attribute.
-     * @param reference
-     * @param reader
-     */
-    protected void readMultiplicity(AbstractReference reference, XMLStreamReader reader) {
-        String value = reader.getAttributeValue(null, MULTIPLICITY);
-        if (ZERO_ONE.equals(value)) {
-            reference.setMultiplicity(Multiplicity.ZERO_ONE);
-        } else if (ONE_N.equals(value)) {
-            reference.setMultiplicity(Multiplicity.ONE_N);
-        } else if (ZERO_N.equals(value)) {
-            reference.setMultiplicity(Multiplicity.ZERO_N);
-        } else if (ONE_ONE.equals(value)) {
-            reference.setMultiplicity(Multiplicity.ONE_ONE);
-        }
-    }
-
-    protected XAttr writeMultiplicity(AbstractReference reference) {
-        Multiplicity multiplicity = reference.getMultiplicity();
-        if (multiplicity != null) {
-            String value = null;
-            if (Multiplicity.ZERO_ONE.equals(multiplicity)) {
-                value = ZERO_ONE;
-            } else if (Multiplicity.ONE_N.equals(multiplicity)) {
-                value = ONE_N;
-            } else if (Multiplicity.ZERO_N.equals(multiplicity)) {
-                value = ZERO_N;
-            } else if (Multiplicity.ONE_ONE.equals(multiplicity)) {
-                value = ONE_ONE;
-                return null;
-            }
-            return new XAttr(MULTIPLICITY, value);
-        }
-        return null;
-    }
-
-    /**
-     * Returns the value of a constrainingType attribute.
-     * @param reader
-     * @return
-     */
-    protected ConstrainingType readConstrainingType(XMLStreamReader reader) {
-        QName constrainingTypeName = getQName(reader, Constants.CONSTRAINING_TYPE);
-        if (constrainingTypeName != null) {
-            ConstrainingType constrainingType = assemblyFactory.createConstrainingType();
-            constrainingType.setName(constrainingTypeName);
-            constrainingType.setUnresolved(true);
-            return constrainingType;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Reads an abstract property element.
-     * @param property
-     * @param reader
-     * @throws XMLStreamException
-     * @throws ContributionReadException
-     */
-    protected void readAbstractProperty(AbstractProperty property, XMLStreamReader reader) throws XMLStreamException,
-        ContributionReadException {
-
-        property.setName(getString(reader, NAME));
-        property.setMany(getBoolean(reader, MANY));
-        property.setMustSupply(getBoolean(reader, MUST_SUPPLY));
-        property.setXSDElement(getQName(reader, ELEMENT));
-        property.setXSDType(getQName(reader, TYPE));
-    }
-
-    /**
-     * Resolve an implementation.
-     * @param implementation
-     * @param resolver
-     * @return
-     * @throws ContributionResolveException
-     */
-    protected Implementation resolveImplementation(Implementation implementation, ModelResolver resolver)
-        throws ContributionResolveException {
-        if (implementation != null) {
-            if (implementation.isUnresolved()) {
-                implementation = resolver.resolveModel(Implementation.class, implementation);
-
-                // Lazily resolve implementations
-                if (implementation.isUnresolved()) {
-                    extensionProcessor.resolve(implementation, resolver);
-                    if (!implementation.isUnresolved()) {
-                        resolver.addModel(implementation);
-                    }
-                }
-            }
-        }
-        return implementation;
-    }
-
-    /**
-     * Resolve interface, callback interface and bindings on a list of contracts.
-     * @param contracts the list of contracts
-     * @param resolver the resolver to use to resolve models
-     */
-    protected <C extends Contract> void resolveContracts(List<C> contracts, ModelResolver resolver)
-        throws ContributionResolveException {
-        resolveContracts(null, contracts, resolver);
-    }
-
-    /**
-     * Resolve interface, callback interface and bindings on a list of contracts.
-     * @param parent element for the contracts
-     * @param contracts the list of contracts
-     * @param resolver the resolver to use to resolve models
-     */
-    protected <C extends Contract> void resolveContracts(Base parent, List<C> contracts, ModelResolver resolver)
-        throws ContributionResolveException {
-
-        String parentName =
-            (parent instanceof Composite) ? ((Composite)parent).getName().toString() : (parent instanceof Component)
-                ? ((Component)parent).getName() : "UNKNOWN";
-
-        for (Contract contract : contracts) {
-            // Resolve the interface contract
-            InterfaceContract interfaceContract = contract.getInterfaceContract();
-            if (interfaceContract != null) {
-                extensionProcessor.resolve(interfaceContract, resolver);
-            }
-
-            // Resolve bindings
-            for (int i = 0, n = contract.getBindings().size(); i < n; i++) {
-                Binding binding = contract.getBindings().get(i);
-                extensionProcessor.resolve(binding, resolver);
-
-            }
-
-            // Resolve callback bindings
-            if (contract.getCallback() != null) {
-
-                for (int i = 0, n = contract.getCallback().getBindings().size(); i < n; i++) {
-                    Binding binding = contract.getCallback().getBindings().get(i);
-                    extensionProcessor.resolve(binding, resolver);
-                }
-            }
-        }
-    }
-
-    /**
-     * Resolve interface and callback interface on a list of abstract contracts.
-     * @param contracts the list of contracts
-     * @param resolver the resolver to use to resolve models
-     */
-    protected <C extends AbstractContract> void resolveAbstractContracts(List<C> contracts, ModelResolver resolver)
-        throws ContributionResolveException {
-        for (AbstractContract contract : contracts) {
-
-            // Resolve the interface contract
-            InterfaceContract interfaceContract = contract.getInterfaceContract();
-            if (interfaceContract != null) {
-                extensionProcessor.resolve(interfaceContract, resolver);
-            }
-        }
-    }
-
-    /**
-     * Returns a constrainingType attribute.
-     * @param componentType
-     * @return
-     */
-    protected XAttr writeConstrainingType(ComponentType componentType) {
-        ConstrainingType constrainingType = componentType.getConstrainingType();
-        if (constrainingType != null)
-            return new XAttr(Constants.CONSTRAINING_TYPE, constrainingType.getName());
-        else
-            return null;
-    }
-
-    /**
-     * Read a property value into a DOM document.
-     * @param element
-     * @param type
-     * @param reader
-     * @return
-     * @throws XMLStreamException
-     * @throws ContributionReadException
-     * @throws ParserConfigurationException 
-     */
-    protected Document readPropertyValue(QName element, QName type, XMLStreamReader reader) throws XMLStreamException,
-        ContributionReadException {
-
-        Document document;
-        try {
-            if (documentBuilderFactory == null) {
-                documentBuilderFactory = DocumentBuilderFactory.newInstance();
-                documentBuilderFactory.setNamespaceAware(true);
-            }
-            document = documentBuilderFactory.newDocumentBuilder().newDocument();
-        } catch (ParserConfigurationException e) {
-            ContributionReadException ce = new ContributionReadException(e);
-            error("ContributionReadException", documentBuilderFactory, ce);
-            throw ce;
-        }
-
-        // root element has no namespace and local name "value"
-        Element root = document.createElementNS(null, "value");
-        if (type != null) {
-            org.w3c.dom.Attr xsi = document.createAttributeNS(XMLNS_ATTRIBUTE_NS_URI, "xmlns:xsi");
-            xsi.setValue(W3C_XML_SCHEMA_INSTANCE_NS_URI);
-            root.setAttributeNodeNS(xsi);
-
-            String prefix = type.getPrefix();
-            if (prefix == null || prefix.length() == 0) {
-                prefix = "ns";
-            }
-
-            declareNamespace(root, prefix, type.getNamespaceURI());
-
-            org.w3c.dom.Attr xsiType = document.createAttributeNS(W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:type");
-            xsiType.setValue(prefix + ":" + type.getLocalPart());
-            root.setAttributeNodeNS(xsiType);
-        }
-        document.appendChild(root);
-
-        loadElement(reader, root);
-        return document;
-    }
-
-    /**
-     * Create a DOM element
-     * @param document
-     * @param name
-     * @return
-     */
-    private Element createElement(Document document, QName name) {
-        String prefix = name.getPrefix();
-        String qname =
-            (prefix != null && prefix.length() > 0) ? prefix + ":" + name.getLocalPart() : name.getLocalPart();
-        return document.createElementNS(name.getNamespaceURI(), qname);
-    }
-
-    /**
-     * Declare a namespace.
-     * @param element
-     * @param prefix
-     * @param ns
-     */
-    private void declareNamespace(Element element, String prefix, String ns) {
-        if (ns == null) {
-            ns = "";
-        }
-        if (prefix == null) {
-            prefix = "";
-        }
-        String qname = null;
-        if ("".equals(prefix)) {
-            qname = "xmlns";
-        } else {
-            qname = "xmlns:" + prefix;
-        }
-        Node node = element;
-        boolean declared = false;
-        while (node != null && node.getNodeType() == Node.ELEMENT_NODE) {
-            NamedNodeMap attrs = node.getAttributes();
-            if (attrs == null) {
-                break;
-            }
-            Node attr = attrs.getNamedItem(qname);
-            if (attr != null) {
-                declared = ns.equals(attr.getNodeValue());
-                break;
-            }
-            node = node.getParentNode();
-        }
-        if (!declared) {
-            org.w3c.dom.Attr attr = element.getOwnerDocument().createAttributeNS(XMLNS_ATTRIBUTE_NS_URI, qname);
-            attr.setValue(ns);
-            element.setAttributeNodeNS(attr);
-        }
-    }
-
-    /**
-     * Load a property value specification from an StAX stream into a DOM
-     * Document. Only elements, text and attributes are processed; all comments
-     * and other whitespace are ignored.
-     * 
-     * @param reader the stream to read from
-     * @param root the DOM node to load
-     * @throws javax.xml.stream.XMLStreamException
-     */
-    private void loadElement(XMLStreamReader reader, Element root) throws XMLStreamException {
-        Document document = root.getOwnerDocument();
-        Node current = root;
-        while (true) {
-            switch (reader.next()) {
-                case XMLStreamConstants.START_ELEMENT:
-                    QName name = reader.getName();
-                    Element child = createElement(document, name);
-
-                    // push the new element and make it the current one
-                    current.appendChild(child);
-                    current = child;
-
-                    int count = reader.getNamespaceCount();
-                    for (int i = 0; i < count; i++) {
-                        String prefix = reader.getNamespacePrefix(i);
-                        String ns = reader.getNamespaceURI(i);
-                        declareNamespace(child, prefix, ns);
-                    }
-
-                    if (!"".equals(name.getNamespaceURI())) {
-                        declareNamespace(child, name.getPrefix(), name.getNamespaceURI());
-                    }
-
-                    // add the attributes for this element
-                    count = reader.getAttributeCount();
-                    for (int i = 0; i < count; i++) {
-                        String ns = reader.getAttributeNamespace(i);
-                        String prefix = reader.getAttributePrefix(i);
-                        String qname = reader.getAttributeLocalName(i);
-                        String value = reader.getAttributeValue(i);
-                        if (prefix != null && prefix.length() != 0) {
-                            qname = prefix + ":" + qname;
-                        }
-                        child.setAttributeNS(ns, qname, value);
-                        if (ns != null) {
-                            declareNamespace(child, prefix, ns);
-                        }
-                    }
-
-                    break;
-                case XMLStreamConstants.CDATA:
-                    current.appendChild(document.createCDATASection(reader.getText()));
-                    break;
-                case XMLStreamConstants.CHARACTERS:
-                    current.appendChild(document.createTextNode(reader.getText()));
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    // if we are back at the root then we are done
-                    if (current == root) {
-                        return;
-                    }
-
-                    // pop the element off the stack
-                    current = current.getParentNode();
-            }
-        }
-    }
-
-    /**
-     * Write the value of a property 
-     * @param document
-     * @param element
-     * @param type
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void writePropertyValue(Object propertyValue, QName element, QName type, XMLStreamWriter writer)
-        throws XMLStreamException {
-
-        if (propertyValue instanceof Document) {
-            Document document = (Document)propertyValue;
-            NodeList nodeList = document.getDocumentElement().getChildNodes();
-
-            for (int item = 0; item < nodeList.getLength(); ++item) {
-                Node node = nodeList.item(item);
-                int nodeType = node.getNodeType();
-                if (nodeType == Node.ELEMENT_NODE) {
-                    XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new DOMSource(node));
-
-                    while (reader.hasNext()) {
-                        switch (reader.next()) {
-                            case XMLStreamConstants.START_ELEMENT:
-                                QName name = reader.getName();
-                                writer.writeStartElement(name.getPrefix(), name.getLocalPart(), name.getNamespaceURI());
-
-                                int namespaces = reader.getNamespaceCount();
-                                for (int i = 0; i < namespaces; i++) {
-                                    String prefix = reader.getNamespacePrefix(i);
-                                    String ns = reader.getNamespaceURI(i);
-                                    writer.writeNamespace(prefix, ns);
-                                }
-
-                                if (!"".equals(name.getNamespaceURI())) {
-                                    writer.writeNamespace(name.getPrefix(), name.getNamespaceURI());
-                                }
-
-                                // add the attributes for this element
-                                namespaces = reader.getAttributeCount();
-                                for (int i = 0; i < namespaces; i++) {
-                                    String ns = reader.getAttributeNamespace(i);
-                                    String prefix = reader.getAttributePrefix(i);
-                                    String qname = reader.getAttributeLocalName(i);
-                                    String value = reader.getAttributeValue(i);
-
-                                    writer.writeAttribute(prefix, ns, qname, value);
-                                }
-
-                                break;
-                            case XMLStreamConstants.CDATA:
-                                writer.writeCData(reader.getText());
-                                break;
-                            case XMLStreamConstants.CHARACTERS:
-                                writer.writeCharacters(reader.getText());
-                                break;
-                            case XMLStreamConstants.END_ELEMENT:
-                                writer.writeEndElement();
-                                break;
-                        }
-                    }
-                } else {
-                    writer.writeCharacters(node.getTextContent());
-                }
-            }
-        }
-    }
-
-    protected void addInheritedIntents(List<Intent> sourceList, List<Intent> targetList) {
-        if (sourceList != null) {
-            targetList.addAll(sourceList);
-        }
-    }
-
-    protected void addInheritedPolicySets(List<PolicySet> sourceList, List<PolicySet> targetList) {
-        if (sourceList != null) {
-            targetList.addAll(sourceList);
-        }
-    }
-
-    /**
-     * 
-     * @param reader
-     * @param elementName
-     * @param estensibleElement
-     * @param extensionAttributeProcessor
-     * @throws ContributionReadException
-     * @throws XMLStreamException
-     */
-    protected void readExtendedAttributes(XMLStreamReader reader,
-                                          QName elementName,
-                                          Extensible estensibleElement,
-                                          StAXAttributeProcessor extensionAttributeProcessor)
-        throws ContributionReadException, XMLStreamException {
-        for (int a = 0; a < reader.getAttributeCount(); a++) {
-            QName attributeName = reader.getAttributeName(a);
-            if (attributeName.getNamespaceURI() != null && attributeName.getNamespaceURI().length() > 0) {
-                if (!elementName.getNamespaceURI().equals(attributeName.getNamespaceURI())) {
-                    Object attributeValue = extensionAttributeProcessor.read(attributeName, reader);
-                    Extension attributeExtension;
-                    if (attributeValue instanceof Extension) {
-                        attributeExtension = (Extension)attributeValue;
-                    } else {
-                        attributeExtension = assemblyFactory.createExtension();
-                        attributeExtension.setAttribute(true);
-                        attributeExtension.setQName(attributeName);
-                        attributeExtension.setValue(attributeValue);
-                    }
-                    estensibleElement.getAttributeExtensions().add(attributeExtension);
-                }
-            }
-        }
-    }
-
-    /**
-     * 
-     * @param attributeModel
-     * @param writer
-     * @param extensibleElement
-     * @param extensionAttributeProcessor
-     * @throws ContributionWriteException
-     * @throws XMLStreamException
-     */
-    protected void writeExtendedAttributes(XMLStreamWriter writer,
-                                           Extensible extensibleElement,
-                                           StAXAttributeProcessor extensionAttributeProcessor)
-        throws ContributionWriteException, XMLStreamException {
-        for (Extension extension : extensibleElement.getAttributeExtensions()) {
-            if (extension.isAttribute()) {
-                extensionAttributeProcessor.write(extension, writer);
-            }
-        }
-    }
-
-    /*protected void validatePolicySets(PolicySubject policySetAttachPoint) 
-                                                            throws ContributionResolveException {
-        validatePolicySets(policySetAttachPoint, policySetAttachPoint.getApplicablePolicySets());
-    }
-     
-    
-    protected void validatePolicySets(PolicySubject policySetAttachPoint,
-                                      List<PolicySet> applicablePolicySets) throws ContributionResolveException {
-        //Since the applicablePolicySets in a policySetAttachPoint will already have the 
-        //list of policysets that might ever be applicable to this attachPoint, just check
-        //if the defined policysets feature in the list of applicable policysets
-        ExtensionType attachPointType = policySetAttachPoint.getType();
-        for ( PolicySet definedPolicySet : policySetAttachPoint.getPolicySets() ) {
-            if ( !definedPolicySet.isUnresolved() ) {
-                if ( !applicablePolicySets.contains(definedPolicySet)) {
-                    throw new ContributionResolveException("Policy Set '" + definedPolicySet.getName()
-                                                           + "' does not apply to binding type  "
-                                                           + attachPointType.getName());
-                }
-            } else {
-                throw new ContributionResolveException("Policy Set '" + definedPolicySet.getName()
-                                                       + "' is not defined in this domain  ");
-                                                
-            
-            }
-        }
-    }*/
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ComponentTypeProcessor.java b/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ComponentTypeProcessor.java
deleted file mode 100644
index 643f5ab78d..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ComponentTypeProcessor.java
+++ /dev/null
@@ -1,383 +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.assembly.xml.osoa;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.CALLBACK;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.CALLBACK_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.COMPONENT_TYPE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.COMPONENT_TYPE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.ELEMENT;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.IMPLEMENTATION;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.MANY;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.MUST_SUPPLY;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.NAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.OPERATION_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.PROPERTY;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.PROPERTY_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.REFERENCE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.REFERENCE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.SERVICE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.SERVICE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.TYPE;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Callback;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.assembly.Extensible;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.xml.osoa.BaseAssemblyProcessor;
-import org.apache.tuscany.sca.assembly.xml.osoa.Constants;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.PolicySubject;
-import org.w3c.dom.Document;
-
-/**
- * A componentType processor.
- * 
- * @version $Rev$ $Date$
- */
-public class ComponentTypeProcessor extends BaseAssemblyProcessor implements StAXArtifactProcessor<ComponentType> {
-    
-    /**
-     * Constructs a new componentType processor.
-     * 
-     * @param modelFactories
-     * @param extensionProcessor
-     * @param extensionAttributeProcessor
-     * @param monitor
-     */
-    public ComponentTypeProcessor(FactoryExtensionPoint modelFactories,
-                                  StAXArtifactProcessor extensionProcessor,
-                                  StAXAttributeProcessor extensionAttributeProcessor,
-                                  Monitor monitor) {
-        super(modelFactories, extensionProcessor, monitor);
-    }
-    
-    public ComponentType read(XMLStreamReader reader) throws ContributionReadException {
-        ComponentType componentType = null;
-        Service service = null;
-        Reference reference = null;
-        Contract contract = null;
-        Property property = null;
-        Callback callback = null;
-        QName name = null;
-        
-        try {
-            // Read the componentType document
-            while (reader.hasNext()) {
-                int event = reader.getEventType();
-                switch (event) {
-                    case START_ELEMENT:
-                        name = reader.getName();
-    
-                        if (Constants.COMPONENT_TYPE_QNAME.equals(name)) {
-    
-                            // Read a <componentType>
-                            componentType = assemblyFactory.createComponentType();
-                            componentType.setConstrainingType(readConstrainingType(reader));
-    
-                        } else if (Constants.SERVICE_QNAME.equals(name)) {
-    
-                            // Read a <service>
-                            service = assemblyFactory.createService();
-                            contract = service;
-                            service.setName(getString(reader, Constants.NAME));
-                            componentType.getServices().add(service);
-                            policyProcessor.readPolicies(service, reader);
-    
-                        } else if (Constants.REFERENCE_QNAME.equals(name)) {
-    
-                            // Read a <reference>
-                            reference = assemblyFactory.createReference();
-                            contract = reference;
-                            reference.setName(getString(reader, Constants.NAME));
-                            reference.setWiredByImpl(getBoolean(reader, Constants.WIRED_BY_IMPL));
-                            readMultiplicity(reference, reader);
-                            readTargets(reference, reader);
-                            componentType.getReferences().add(reference);
-                            policyProcessor.readPolicies(reference, reader);
-    
-                        } else if (Constants.PROPERTY_QNAME.equals(name)) {
-    
-                            // Read a <property>
-                            property = assemblyFactory.createProperty();
-                            readAbstractProperty(property, reader);
-                            policyProcessor.readPolicies(property, reader);
-                            
-                            // Read the property value
-                            Document value = readPropertyValue(property.getXSDElement(), property.getXSDType(), reader);
-                            property.setValue(value);
-                            
-                            componentType.getProperties().add(property);
-                            
-                        } else if (Constants.IMPLEMENTATION_QNAME.equals(name)) {
-                            
-                            // Read an <implementation> element
-                            policyProcessor.readPolicies(componentType, reader);
-                            
-                        } else if (Constants.CALLBACK_QNAME.equals(name)) {
-    
-                            // Read a <callback>
-                            callback = assemblyFactory.createCallback();
-                            contract.setCallback(callback);
-                            policyProcessor.readPolicies(callback, reader);
-    
-                        } else if (OPERATION_QNAME.equals(name)) {
-    
-                            // Read an <operation>
-                            Operation operation = new OperationImpl();
-                            operation.setName(getString(reader, NAME));
-                            operation.setUnresolved(true);
-                            if (callback != null) {
-                                policyProcessor.readPolicies(callback, operation, reader);
-                            } else {
-                                policyProcessor.readPolicies(contract, operation, reader);
-                            }
-                        } else {
-    
-                            // Read an extension element
-                            Object extension = extensionProcessor.read(reader);
-                            if (extension != null) {
-                                if (extension instanceof InterfaceContract) {
-    
-                                    // <service><interface> and <reference><interface>
-                                    contract.setInterfaceContract((InterfaceContract)extension);
-    
-                                } else if (extension instanceof Binding) {
-    
-                                    // <service><binding> and <reference><binding>
-                                    if (callback != null) {
-                                        callback.getBindings().add((Binding)extension);
-                                    } else {
-                                        contract.getBindings().add((Binding)extension);
-                                    }
-                                } else {
-                                    
-                                    // Add the extension element to the current element
-                                    if (callback != null) {
-                                        callback.getExtensions().add(extension);
-                                    } else if (contract != null) {
-                                        contract.getExtensions().add(extension);
-                                    } else if (property != null) {
-                                        property.getExtensions().add(extension);
-                                    } else {
-                                        if (componentType instanceof Extensible) {
-                                            ((Extensible)componentType).getExtensions().add(extension);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        break;
-    
-                    case END_ELEMENT:
-                        name = reader.getName();
-    
-                        // Clear current state when reading reaching end element
-                        if (SERVICE_QNAME.equals(name)) {
-                            service = null;
-                            contract = null;
-                        } else if (REFERENCE_QNAME.equals(name)) {
-                            reference = null;
-                            contract = null;
-                        } else if (PROPERTY_QNAME.equals(name)) {
-                            property = null;
-                        } else if (CALLBACK_QNAME.equals(name)) {
-                            callback = null;
-                        }
-                        break;
-                }
-                
-                // Read the next element
-                if (reader.hasNext()) {
-                    reader.next();
-                }
-            }
-        }
-        catch (XMLStreamException e) {
-            ContributionReadException ex = new ContributionReadException(e);
-            error("XMLStreamException", reader, ex);
-        }
-        
-        return componentType;
-    }
-    
-    public void write(ComponentType componentType, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <componentType> element
-        writeStartDocument(writer, COMPONENT_TYPE,
-               writeConstrainingType(componentType));
-
-        // Write <service> elements
-        for (Service service : componentType.getServices()) {
-            writeStart(writer, SERVICE, new XAttr(NAME, service.getName()),
-                       policyProcessor.writePolicies(service));
-
-            if (service.getInterfaceContract() != null) {
-                extensionProcessor.write(service.getInterfaceContract(), writer);
-            }
-            
-            for (Binding binding: service.getBindings()) {
-                extensionProcessor.write(binding, writer);
-            }
-            
-            if (service.getCallback() != null) {
-                Callback callback = service.getCallback();
-                writeStart(writer, CALLBACK, policyProcessor.writePolicies(callback));
-
-                for (Binding binding: callback.getBindings()) {
-                    extensionProcessor.write(binding, writer);
-                }
-                for (Object extension: callback.getExtensions()) {
-                    extensionProcessor.write(extension, writer);
-                }
-                
-                writeEnd(writer);
-            }
-            
-            for (Object extension: service.getExtensions()) {
-                extensionProcessor.write(extension, writer);
-            }
-            
-            writeEnd(writer);
-        }
-
-        // Write <reference> elements
-        for (Reference reference : componentType.getReferences()) {
-            
-            writeStart(writer, REFERENCE,
-                  new XAttr(NAME, reference.getName()),
-                  writeMultiplicity(reference),
-                  writeTargets(reference),
-                  policyProcessor.writePolicies(reference));
-
-            extensionProcessor.write(reference.getInterfaceContract(), writer);
-            
-            for (Binding binding: reference.getBindings()) {
-                extensionProcessor.write(binding, writer);
-            }
-            
-            if (reference.getCallback() != null) {
-                Callback callback = reference.getCallback();
-                writeStart(writer, CALLBACK,
-                           policyProcessor.writePolicies(callback));
-
-                for (Binding binding: callback.getBindings()) {
-                    extensionProcessor.write(binding, writer);
-                }
-                for (Object extension: callback.getExtensions()) {
-                    extensionProcessor.write(extension, writer);
-                }
-                
-                writeEnd(writer);
-            }
-
-            for (Object extension: reference.getExtensions()) {
-                extensionProcessor.write(extension, writer);
-            }
-            
-            writeEnd(writer);
-        }
-
-        // Write <property> elements
-        for (Property property : componentType.getProperties()) {
-            writeStart(writer,
-                       PROPERTY,
-                       new XAttr(NAME, property.getName()),
-                       new XAttr(MUST_SUPPLY, property.isMustSupply()),
-                       new XAttr(MANY, property.isMany()),
-                       new XAttr(TYPE, property.getXSDType()),
-                       new XAttr(ELEMENT, property.getXSDElement()),
-                       policyProcessor.writePolicies(property));
-
-            // Write property value
-            writePropertyValue(property.getValue(), property.getXSDElement(), property.getXSDType(), writer);
-
-            // Write extensions
-            for (Object extension : property.getExtensions()) {
-                extensionProcessor.write(extension, writer);
-            }
-
-            writeEnd(writer);
-        }
-
-        // Write extension elements
-        if (componentType instanceof Extensible) {
-            for (Object extension: ((Extensible)componentType).getExtensions()) {
-                extensionProcessor.write(extension, writer);
-            }
-        }
-        
-        // Write <implementation> elements if the componentType has
-        // any intents or policySets
-        boolean writeImplementation = false;
-        if (componentType instanceof PolicySubject) {
-            if (!((PolicySubject)componentType).getRequiredIntents().isEmpty()) {
-                writeImplementation = true;
-            }
-        }
-        if (componentType instanceof PolicySubject) {
-            if (!((PolicySubject)componentType).getPolicySets().isEmpty()) {
-                writeImplementation = true;
-            }
-        }
-        if (writeImplementation) {
-            writeStart(writer, IMPLEMENTATION,
-                       policyProcessor.writePolicies(componentType));
-        }
-        
-        writeEndDocument(writer);
-    }
-    
-    public void resolve(ComponentType componentType, ModelResolver resolver) throws ContributionResolveException {
-
-        // Resolve component type services and references
-        resolveContracts(componentType.getServices(), resolver);
-        resolveContracts(componentType.getReferences(), resolver);
-    }
-    
-    public QName getArtifactType() {
-        return COMPONENT_TYPE_QNAME;
-    }
-    
-    public Class<ComponentType> getModelType() {
-        return ComponentType.class;
-    }
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/CompositeProcessor.java b/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/CompositeProcessor.java
deleted file mode 100644
index bfdd9fdac7..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/CompositeProcessor.java
+++ /dev/null
@@ -1,1031 +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.assembly.xml.osoa;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.AUTOWIRE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.CALLBACK;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.CALLBACK_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.COMPONENT;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.COMPONENT_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.COMPOSITE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.COMPOSITE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.ELEMENT;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.FILE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.IMPLEMENTATION_COMPOSITE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.IMPLEMENTATION_COMPOSITE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.INCLUDE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.INCLUDE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.LOCAL;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.MANY;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.MUST_SUPPLY;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.NAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.PROMOTE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.PROPERTY;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.PROPERTY_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.REFERENCE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.REFERENCE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.SCA10_NS;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.SERVICE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.SERVICE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.SOURCE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.TARGET;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.TARGET_NAMESPACE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.TYPE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.URI;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.WIRE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.WIRED_BY_IMPL;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.WIRE_QNAME;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Callback;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.CompositeReference;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.Wire;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ResolverExtension;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.ExtensionType;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySubject;
-import org.w3c.dom.Document;
-
-/**
- * A composite processor. 
- * 
- * @version $Rev$ $Date$
- */
-public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArtifactProcessor<Composite> {
-    private XPathFactory xPathFactory;
-    private PolicyFactory intentAttachPointTypeFactory;
-    private StAXAttributeProcessor<Object> extensionAttributeProcessor;
-    private ContributionFactory contributionFactory;
-
-    
-    /**
-     * Construct a new composite processor
-     * 
-     * @param extensionPoints
-     * @param extensionProcessor
-     */
-    public CompositeProcessor(ExtensionPointRegistry extensionPoints,
-                        StAXArtifactProcessor extensionProcessor,
-                        StAXAttributeProcessor extensionAttributeProcessor, 
-                        Monitor monitor) {
-        
-        this(modelFactories(extensionPoints), 
-                extensionProcessor, 
-                extensionAttributeProcessor, 
-                monitor(extensionPoints));
-        
-        this.extensionAttributeProcessor = extensionAttributeProcessor;
-    }
-    
-    /**
-     * Constructs a new composite processor
-     * 
-     * @param modelFactories
-     * @param extensionProcessor
-     * @param monitor
-     */
-    private CompositeProcessor(FactoryExtensionPoint modelFactories,
-             StAXArtifactProcessor extensionProcessor,
-             StAXAttributeProcessor extensionAttributeProcessor,
-             Monitor monitor) {
-        
-        super(modelFactories, extensionProcessor, monitor);
-        this.intentAttachPointTypeFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.xPathFactory = modelFactories.getFactory(XPathFactory.class);
-        this.contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        this.extensionAttributeProcessor = extensionAttributeProcessor;
-        
-    }
-    
-    public Composite read(XMLStreamReader reader) throws ContributionReadException {
-        Composite composite = null;
-        Composite include = null;
-        Component component = null;
-        Property property = null;
-        ComponentService componentService = null;
-        ComponentReference componentReference = null;
-        ComponentProperty componentProperty = null;
-        CompositeService compositeService = null;
-        CompositeReference compositeReference = null;
-        Contract contract = null;
-        Wire wire = null;
-        Callback callback = null;
-        QName name = null;
-
-        try {
-            // Read the composite document
-            while (reader.hasNext()) {
-                int event = reader.getEventType();
-                switch (event) {
-                    case START_ELEMENT:
-                        name = reader.getName();
-    
-                        if (COMPOSITE_QNAME.equals(name)) {
-    
-                            // Read a <composite>
-                            composite = assemblyFactory.createComposite();
-                            composite.setSpecVersion(SCA10_NS);
-                            
-                            composite.setName(new QName(getString(reader, TARGET_NAMESPACE), getString(reader, NAME)));
-    
-                            if(!isSet(reader, TARGET_NAMESPACE)){
-                                // spec says that a composite must have a namespace
-                                warning("NoCompositeNamespace", composite, composite.getName().toString());   
-                            }
-                            
-                            if(isSet(reader, AUTOWIRE)) {
-                                composite.setAutowire(getBoolean(reader, AUTOWIRE));
-                            }
-                            
-                            //handle extension attributes
-                            this.readExtendedAttributes(reader, name, composite, extensionAttributeProcessor);
-    
-                            composite.setLocal(getBoolean(reader, LOCAL));
-                            composite.setConstrainingType(readConstrainingType(reader));
-                            policyProcessor.readPolicies(composite, reader);
-    
-                        } else if (INCLUDE_QNAME.equals(name)) {
-    
-                            // Read an <include>
-                            include = assemblyFactory.createComposite();
-                            include.setName(getQName(reader, NAME));
-                            include.setURI(getString(reader, URI));
-                            include.setUnresolved(true);
-                            composite.getIncludes().add(include);
-    
-                        } else if (SERVICE_QNAME.equals(name)) {
-                            if (component != null) {
-    
-                                // Read a <component><service>
-                                componentService = assemblyFactory.createComponentService();
-                                contract = componentService;
-                                componentService.setName(getString(reader, NAME));
-                                
-                                //handle extension attributes
-                                this.readExtendedAttributes(reader, name, componentService, extensionAttributeProcessor);
-    
-                                component.getServices().add(componentService);
-                                policyProcessor.readPolicies(contract, reader);
-                            } else {
-    
-                                // Read a <composite><service>
-                                compositeService = assemblyFactory.createCompositeService();
-                                contract = compositeService;
-                                compositeService.setName(getString(reader, NAME));
-    
-                                String promoted = getString(reader, PROMOTE);
-                                if (promoted != null) {
-                                    String promotedComponentName;
-                                    String promotedServiceName;
-                                    int s = promoted.indexOf('/');
-                                    if (s == -1) {
-                                        promotedComponentName = promoted;
-                                        promotedServiceName = null;
-                                    } else {
-                                        promotedComponentName = promoted.substring(0, s);
-                                        promotedServiceName = promoted.substring(s + 1);
-                                    }
-        
-                                    Component promotedComponent = assemblyFactory.createComponent();
-                                    promotedComponent.setUnresolved(true);
-                                    promotedComponent.setName(promotedComponentName);
-                                    compositeService.setPromotedComponent(promotedComponent);
-        
-                                    ComponentService promotedService = assemblyFactory.createComponentService();
-                                    promotedService.setUnresolved(true);
-                                    promotedService.setName(promotedServiceName);
-                                    compositeService.setPromotedService(promotedService);
-                                }
-    
-                                //handle extension attributes
-                                this.readExtendedAttributes(reader, name, compositeService, extensionAttributeProcessor);
-    
-                                composite.getServices().add(compositeService);
-                                policyProcessor.readPolicies(contract, reader);
-                            }
-    
-                        } else if (REFERENCE_QNAME.equals(name)) {
-                            if (component != null) {
-                                // Read a <component><reference>
-                                componentReference = assemblyFactory.createComponentReference();
-                                contract = componentReference;
-                                componentReference.setName(getString(reader, NAME));
-                                readMultiplicity(componentReference, reader);
-                                if (isSet(reader, AUTOWIRE)) {
-                                    componentReference.setAutowire(getBoolean(reader, AUTOWIRE));
-                                }
-                                readTargets(componentReference, reader);
-                                componentReference.setWiredByImpl(getBoolean(reader, WIRED_BY_IMPL));
-                                
-                                //handle extension attributes
-                                this.readExtendedAttributes(reader, name, componentReference, extensionAttributeProcessor);
-    
-                                component.getReferences().add(componentReference);
-                                policyProcessor.readPolicies(contract, reader);
-                            } else {
-                                // Read a <composite><reference>
-                                compositeReference = assemblyFactory.createCompositeReference();
-                                contract = compositeReference;
-                                compositeReference.setName(getString(reader, NAME));
-                                readMultiplicity(compositeReference, reader);
-                                readTargets(compositeReference, reader);
-                                String promote = reader.getAttributeValue(null, Constants.PROMOTE);
-                                if (promote != null) {
-                                    for (StringTokenizer tokens = new StringTokenizer(promote); tokens.hasMoreTokens();) {
-                                        String refName = tokens.nextToken();
-                                        Component promotedComponent = assemblyFactory.createComponent();
-                                        int index = refName.indexOf('/');
-                                        if (index == -1) {
-                                            error("Invalid reference name", compositeReference, refName);
-                                        }
-                                        String promotedComponentName = refName.substring(0, index);
-                                        promotedComponent.setName(promotedComponentName);
-                                        promotedComponent.setUnresolved(true);
-                                        compositeReference.getPromotedComponents().add(promotedComponent);
-                                        ComponentReference promotedReference =
-                                            assemblyFactory.createComponentReference();
-                                        promotedReference.setUnresolved(true);
-                                        promotedReference.setName(refName);
-                                        compositeReference.getPromotedReferences().add(promotedReference);
-                                    }
-                                }
-                                compositeReference.setWiredByImpl(getBoolean(reader, WIRED_BY_IMPL));
-                                
-                                //handle extension attributes
-                                this.readExtendedAttributes(reader, name, compositeReference, extensionAttributeProcessor);
-    
-                                composite.getReferences().add(compositeReference);                            
-                                policyProcessor.readPolicies(contract, reader);
-                            }
-    
-                        } else if (PROPERTY_QNAME.equals(name)) {
-                            if (component != null) {
-    
-                                // Read a <component><property>
-                                componentProperty = assemblyFactory.createComponentProperty();
-                                property = componentProperty;
-                                String source = getString(reader, SOURCE);
-                                if(source!=null) {
-                                    source = source.trim();
-                                }
-                                componentProperty.setSource(source);
-                                if (source != null) {
-                                    // $<name>/...
-                                    if (source.charAt(0) == '$') {
-                                        int index = source.indexOf('/');
-                                        if (index == -1) {
-                                            // Tolerating $prop
-                                            source = source + "/";
-                                            index = source.length() - 1;
-                                        }
-                                        source = source.substring(index + 1);
-                                        if ("".equals(source)) {
-                                            source = ".";
-                                        }
-                                    }
-                                    XPath xpath = xPathFactory.newXPath();
-                                    xpath.setNamespaceContext(reader.getNamespaceContext());
-                                    try {
-                                        componentProperty.setSourceXPathExpression(xpath.compile(source));
-                                    } catch (XPathExpressionException e) {
-                                        ContributionReadException ce = new ContributionReadException(e);
-                                        error("ContributionReadException", xpath, ce);
-                                        //throw ce;
-                                    }
-                                }
-                                componentProperty.setFile(getString(reader, FILE));
-                                
-                                //handle extension attributes
-                                this.readExtendedAttributes(reader, name, componentProperty, extensionAttributeProcessor);
-    
-                                policyProcessor.readPolicies(property, reader);
-                                readAbstractProperty(componentProperty, reader);
-                                
-                                // Read the property value
-                                Document value = readPropertyValue(property.getXSDElement(), property.getXSDType(), reader);
-                                property.setValue(value);
-                                
-                                component.getProperties().add(componentProperty);
-                            } else {
-    
-                                // Read a <composite><property>
-                                property = assemblyFactory.createProperty();
-                                policyProcessor.readPolicies(property, reader);
-                                readAbstractProperty(property, reader);
-                                
-                                // Read the property value
-                                Document value = readPropertyValue(property.getXSDElement(), property.getXSDType(), reader);
-                                property.setValue(value);
-                                
-                                composite.getProperties().add(property);
-                            }
-                            
-                            // TUSCANY-1949
-                            // If the property doesn't have a value, the END_ELEMENT event is read by the readPropertyValue
-                            if (reader.getEventType() == END_ELEMENT && PROPERTY_QNAME.equals(reader.getName())) {
-                                property = null;
-                                componentProperty = null;
-                            }
-    
-                        } else if (COMPONENT_QNAME.equals(name)) {
-    
-                            // Read a <component>
-                            component = assemblyFactory.createComponent();
-                            component.setName(getString(reader, NAME));
-                            if (isSet(reader, AUTOWIRE)) {
-                                component.setAutowire(getBoolean(reader, AUTOWIRE));
-                            }
-                            if (isSet(reader, URI)) {
-                                component.setURI(getString(reader, URI));
-                            }
-                            
-                            //handle extension attributes
-                           this.readExtendedAttributes(reader, name, component, extensionAttributeProcessor);
-                            
-                            component.setConstrainingType(readConstrainingType(reader));
-                            composite.getComponents().add(component);
-                            policyProcessor.readPolicies(component, reader);
-    
-                        } else if (WIRE_QNAME.equals(name)) {
-    
-                            // Read a <wire>
-                            wire = assemblyFactory.createWire();
-                            ComponentReference source = assemblyFactory.createComponentReference();
-                            source.setUnresolved(true);
-                            source.setName(getString(reader, SOURCE));
-                            wire.setSource(source);
-    
-                            ComponentService target = assemblyFactory.createComponentService();
-                            target.setUnresolved(true);
-                            target.setName(getString(reader, TARGET));
-                            wire.setTarget(target);
-    
-                            //handle extension attributes
-                            this.readExtendedAttributes(reader, name, wire, extensionAttributeProcessor);
-    
-                            composite.getWires().add(wire);
-                            policyProcessor.readPolicies(wire, reader);
-    
-                        } else if (CALLBACK_QNAME.equals(name)) {
-    
-                            // Read a <callback>
-                            callback = assemblyFactory.createCallback();
-                            contract.setCallback(callback);
-                            
-                            //handle extension attributes
-                            this.readExtendedAttributes(reader, name, callback, extensionAttributeProcessor);
-                            
-                            policyProcessor.readPolicies(callback, reader);
-    
-                        } else if (IMPLEMENTATION_COMPOSITE_QNAME.equals(name)) {
-    
-                            // Read an implementation.composite
-                            Composite implementation = assemblyFactory.createComposite();
-                            implementation.setName(getQName(reader, NAME));
-                            implementation.setUnresolved(true);
-                            
-                            //handle extension attributes
-                            this.readExtendedAttributes(reader, name, implementation, extensionAttributeProcessor);
-    
-                            component.setImplementation(implementation);
-                            policyProcessor.readPolicies(implementation, reader);
-                        } else {
-    
-                            // Read an extension element
-                            Object extension = extensionProcessor.read(reader);
-                            if (extension != null) {
-                                if (extension instanceof InterfaceContract) {
-    
-                                    // <service><interface> and
-                                    // <reference><interface>
-                                    if (contract != null) {
-                                        contract.setInterfaceContract((InterfaceContract)extension);
-                                    } else {
-                                        if (name.getNamespaceURI().equals(SCA10_NS)) {
-                                                error("UnexpectedInterfaceElement", extension);
-                                            //throw new ContributionReadException("Unexpected <interface> element found. It should appear inside a <service> or <reference> element");
-                                        } else {
-                                            composite.getExtensions().add(extension);
-                                        }
-                                    }
-                                } else if (extension instanceof Binding) {
-                                    if ( extension instanceof PolicySubject ) {
-                                        ExtensionType bindingType = intentAttachPointTypeFactory.createBindingType();
-                                        bindingType.setType(name);
-                                        bindingType.setUnresolved(true);
-                                        ((PolicySubject)extension).setType(bindingType);
-                                    }
-                                    // <service><binding> and
-                                    // <reference><binding>
-                                    if (callback != null) {
-                                        callback.getBindings().add((Binding)extension);
-                                    } else {
-                                        if (contract != null) {
-                                            contract.getBindings().add((Binding)extension);
-                                        } else {
-                                            if (name.getNamespaceURI().equals(SCA10_NS)) {
-                                                error("UnexpectedBindingElement", extension);
-                                                //throw new ContributionReadException("Unexpected <binding> element found. It should appear inside a <service> or <reference> element");
-                                            } else {
-                                                composite.getExtensions().add(extension);
-                                            }
-                                        }
-                                    }
-    
-                                } else if (extension instanceof Implementation) {
-                                    if ( extension instanceof PolicySubject ) {
-                                        ExtensionType implType = intentAttachPointTypeFactory.createImplementationType();
-                                        implType.setType(name);
-                                        implType.setUnresolved(true);
-                                        ((PolicySubject)extension).setType(implType);
-                                    }
-                                    // <component><implementation>
-                                    if (component != null) {
-                                        component.setImplementation((Implementation)extension);
-                                    } else {
-                                        if (name.getNamespaceURI().equals(SCA10_NS)) {
-                                                error("UnexpectedImplementationElement", extension);
-                                            //throw new ContributionReadException("Unexpected <implementation> element found. It should appear inside a <component> element");
-                                        } else {
-                                            composite.getExtensions().add(extension);
-                                        }
-                                    }
-                                } else {
-    
-                                    // Add the extension element to the current
-                                    // element
-                                    if (callback != null) {
-                                        callback.getExtensions().add(extension);
-                                    } else if (contract != null) {
-                                        contract.getExtensions().add(extension);
-                                    } else if (property != null) {
-                                        property.getExtensions().add(extension);
-                                    } else if (component != null) {
-                                        component.getExtensions().add(extension);
-                                    } else {
-                                        composite.getExtensions().add(extension);
-                                    }
-                                }
-                            }
-                        }
-                        break;
-    
-                    case XMLStreamConstants.CHARACTERS:
-                        break;
-    
-                    case END_ELEMENT:
-                        name = reader.getName();
-    
-                        // Clear current state when reading reaching end element
-                        if (SERVICE_QNAME.equals(name)) {
-                            componentService = null;
-                            compositeService = null;
-                            contract = null;
-                        } else if (INCLUDE_QNAME.equals(name)) {
-                            include = null;
-                        } else if (REFERENCE_QNAME.equals(name)) {
-                            componentReference = null;
-                            compositeReference = null;
-                            contract = null;
-                        } else if (PROPERTY_QNAME.equals(name)) {
-                            componentProperty = null;
-                            property = null;
-                        } else if (COMPONENT_QNAME.equals(name)) {
-                            component = null;
-                        } else if (WIRE_QNAME.equals(name)) {
-                            wire = null;
-                        } else if (CALLBACK_QNAME.equals(name)) {
-                            callback = null;
-                        }
-                        break;
-                }
-    
-                // Read the next element
-                if (reader.hasNext()) {
-                    reader.next();
-                }
-            }
-        }
-        catch (XMLStreamException e) {
-            ContributionReadException ex = new ContributionReadException(e);
-            error("XMLStreamException", reader, ex);
-        }
-        
-        return composite;
-    }
-
-    public void write(Composite composite, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
-        // Write <composite> element
-        writeStartDocument(writer,
-                           COMPOSITE,
-                           writeConstrainingType(composite),
-                           new XAttr(TARGET_NAMESPACE, composite.getName().getNamespaceURI()),
-                           new XAttr(NAME, composite.getName().getLocalPart()),
-                           new XAttr(LOCAL, composite.isLocal() ? Boolean.TRUE : null),
-                           new XAttr(AUTOWIRE, composite.getAutowire()),
-                           policyProcessor.writePolicies(composite));
-        
-        //write extended attributes
-        this.writeExtendedAttributes(writer, composite, extensionAttributeProcessor);
-
-        // Write <include> elements
-        for (Composite include : composite.getIncludes()) {
-            String uri = include.isUnresolved()? include.getURI() : null;
-            writeStart(writer,
-                       INCLUDE,
-                       new XAttr(NAME, include.getName()),
-                       new XAttr(URI, uri));
-
-            //write extended attributes
-            this.writeExtendedAttributes(writer, include, extensionAttributeProcessor);
-            
-            writeEnd(writer);
-        }
-
-        // Write <service> elements
-        for (Service service : composite.getServices()) {
-            CompositeService compositeService = (CompositeService)service;
-            Component promotedComponent = compositeService.getPromotedComponent();
-            ComponentService promotedService = compositeService.getPromotedService();
-            String promote;
-            if (promotedService != null) {
-                if (promotedService.getName() != null) {
-                    promote = promotedComponent.getName() + '/' + promotedService.getName();
-                } else {
-                    promote = promotedComponent.getName();
-                }
-            } else {
-                promote = null;
-            }
-            writeStart(writer, SERVICE, new XAttr(NAME, service.getName()), new XAttr(PROMOTE, promote),
-                       policyProcessor.writePolicies(service));
-            
-            //write extended attributes
-            this.writeExtendedAttributes(writer, service, extensionAttributeProcessor);
-
-            
-            // Write service interface
-            extensionProcessor.write(service.getInterfaceContract(), writer);
-
-            // Write bindings
-            for (Binding binding : service.getBindings()) {
-                extensionProcessor.write(binding, writer);
-            }
-
-            // Write <callback> element
-            if (service.getCallback() != null) {
-                Callback callback = service.getCallback();
-                writeStart(writer, CALLBACK,
-                           policyProcessor.writePolicies(callback));
-            
-                //write extended attributes
-                this.writeExtendedAttributes(writer, callback, extensionAttributeProcessor);
-
-                // Write callback bindings
-                for (Binding binding : callback.getBindings()) {
-                    extensionProcessor.write(binding, writer);
-                }
-                
-                // Write extensions 
-                for (Object extension : callback.getExtensions()) {
-                    extensionProcessor.write(extension, writer);
-                }
-            
-                writeEnd(writer);
-            }
-
-            // Write extensions
-            for (Object extension : service.getExtensions()) {
-                extensionProcessor.write(extension, writer);
-            }
-            
-            writeEnd(writer);
-        }
-
-        // Write <component> elements
-        for (Component component : composite.getComponents()) {
-            writeStart(writer, COMPONENT, new XAttr(NAME, component.getName()),
-                       new XAttr(URI, component.getURI()),
-                       new XAttr(AUTOWIRE, component.getAutowire()),
-                       policyProcessor.writePolicies(component));
-            
-            //write extended attributes
-            this.writeExtendedAttributes(writer, component, extensionAttributeProcessor);
-            
-            // Write the component implementation
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                writeStart(writer, IMPLEMENTATION_COMPOSITE, new XAttr(NAME, ((Composite)implementation).getName()));
-                
-                //write extended attributes
-                this.writeExtendedAttributes(writer, (Composite)implementation, extensionAttributeProcessor);
-
-                writeEnd(writer);
-            } else {
-                extensionProcessor.write(component.getImplementation(), writer);
-            }
-            
-            for (Object extension : component.getExtensions()) {
-                extensionProcessor.write(extension, writer);
-            }            
-            
-            // Write <service> elements
-            for (ComponentService service : component.getServices()) {
-                writeStart(writer, SERVICE, new XAttr(NAME, service.getName()),
-                           policyProcessor.writePolicies(service));
-
-                //write extended attributes
-                this.writeExtendedAttributes(writer, service, extensionAttributeProcessor);
-
-                // Write service interface
-                extensionProcessor.write(service.getInterfaceContract(), writer);
-                
-                // Write bindings
-                for (Binding binding : service.getBindings()) {
-                    extensionProcessor.write(binding, writer);
-                }
-                
-                // Write <callback> element
-                if (service.getCallback() != null) {
-                    Callback callback = service.getCallback();
-                    writeStart(writer, CALLBACK, policyProcessor.writePolicies(callback));
-
-                    //write extended attributes
-                    this.writeExtendedAttributes(writer, callback, extensionAttributeProcessor);
-
-                    // Write bindings
-                    for (Binding binding : callback.getBindings()) {
-                        extensionProcessor.write(binding, writer);
-                    }
-                    
-                    // Write extensions 
-                    for (Object extension : callback.getExtensions()) {
-                        extensionProcessor.write(extension, writer);
-                    }
-                
-                    writeEnd(writer);
-                }
-                
-                // Write extensions
-                for (Object extension : service.getExtensions()) {
-                    extensionProcessor.write(extension, writer);
-                }
-                
-                writeEnd(writer);
-            }
-            
-            // Write <reference> elements
-            for (ComponentReference reference : component.getReferences()) {
-                writeStart(writer, REFERENCE, new XAttr(NAME, reference.getName()),
-                           new XAttr(AUTOWIRE, reference.getAutowire()),
-                           writeMultiplicity(reference),
-                           writeTargets(reference),
-                           policyProcessor.writePolicies(reference));
-
-                //write extended attributes
-                this.writeExtendedAttributes(writer, reference, extensionAttributeProcessor);
-
-                // Write reference interface
-                extensionProcessor.write(reference.getInterfaceContract(), writer);
-
-                // Write bindings
-                for (Binding binding : reference.getBindings()) {
-                    extensionProcessor.write(binding, writer);
-                }
-                
-                // Write callback
-                if (reference.getCallback() != null) {
-                    Callback callback = reference.getCallback();
-                    writeStart(writer, CALLBACK, policyProcessor.writePolicies(callback));
-                
-                    //write extended attributes
-                    this.writeExtendedAttributes(writer, callback, extensionAttributeProcessor);
-
-                    // Write callback bindings
-                    for (Binding binding : callback.getBindings()) {
-                        extensionProcessor.write(binding, writer);
-                    }
-                    
-                    // Write extensions
-                    for (Object extensions : callback.getExtensions()) {
-                        extensionProcessor.write(extensions, writer);
-                    }
-                
-                    writeEnd(writer);
-                }
-                
-                // Write extensions
-                for (Object extensions : reference.getExtensions()) {
-                    extensionProcessor.write(extensions, writer);
-                }
-                
-                writeEnd(writer);
-            }
-            
-            // Write <property> elements
-            for (ComponentProperty property : component.getProperties()) {
-                writeStart(writer,
-                           PROPERTY,
-                           new XAttr(NAME, property.getName()),
-                           new XAttr(MUST_SUPPLY, property.isMustSupply()),
-                           new XAttr(MANY, property.isMany()),
-                           new XAttr(TYPE, property.getXSDType()),
-                           new XAttr(ELEMENT, property.getXSDElement()),
-                           new XAttr(SOURCE, property.getSource()),
-                           new XAttr(FILE, property.getFile()),
-                           policyProcessor.writePolicies(property));
-
-                //write extended attributes
-                this.writeExtendedAttributes(writer, property, extensionAttributeProcessor);
-
-                // Write property value
-                writePropertyValue(property.getValue(), property.getXSDElement(), property.getXSDType(), writer);
-
-                // Write extensions
-                for (Object extension : property.getExtensions()) {
-                    extensionProcessor.write(extension, writer);
-                }
-
-                writeEnd(writer);
-            }
- 
-            writeEnd(writer);
-        }
-
-        // Write <reference> elements
-        for (Reference reference : composite.getReferences()) {
-            CompositeReference compositeReference = (CompositeReference)reference;
-
-            // Write list of promoted references
-            List<String> promote = new ArrayList<String>();
-            for (ComponentReference promoted: compositeReference.getPromotedReferences()) {
-                promote.add(promoted.getName());
-            }
-            
-            // Write <reference> element
-            writeStart(writer, REFERENCE, new XAttr(NAME, reference.getName()),
-                       new XAttr(PROMOTE, promote),
-                       writeMultiplicity(reference),
-                       policyProcessor.writePolicies(reference));
-
-            //write extended attributes
-            this.writeExtendedAttributes(writer, reference, extensionAttributeProcessor);
-
-            // Write reference interface
-            extensionProcessor.write(reference.getInterfaceContract(), writer);
-            
-            // Write bindings
-            for (Binding binding : reference.getBindings()) {
-                extensionProcessor.write(binding, writer);
-            }
-            
-            // Write <callback> element
-            if (reference.getCallback() != null) {
-                Callback callback = reference.getCallback();
-                writeStart(writer, CALLBACK);
-            
-                //write extended attributes
-                this.writeExtendedAttributes(writer, callback, extensionAttributeProcessor);
-
-                // Write callback bindings
-                for (Binding binding : callback.getBindings()) {
-                    extensionProcessor.write(binding, writer);
-                }
-                
-                // Write extensions
-                for (Object extension : callback.getExtensions()) {
-                    extensionProcessor.write(extension, writer);
-                }
-            
-                writeEnd(writer);
-            }
-            
-            // Write extensions
-            for (Object extension : reference.getExtensions()) {
-                extensionProcessor.write(extension, writer);
-            }
-            
-            writeEnd(writer);
-        }
-
-        // Write <property> elements
-        for (Property property : composite.getProperties()) {
-            writeStart(writer,
-                       PROPERTY,
-                       new XAttr(NAME, property.getName()),
-                       new XAttr(MUST_SUPPLY, property.isMustSupply()),
-                       new XAttr(MANY, property.isMany()),
-                       new XAttr(TYPE, property.getXSDType()),
-                       new XAttr(ELEMENT, property.getXSDElement()),
-                       policyProcessor.writePolicies(property));
-
-            //write extended attributes
-            this.writeExtendedAttributes(writer, property, extensionAttributeProcessor);
-
-            // Write property value
-            writePropertyValue(property.getValue(), property.getXSDElement(), property.getXSDType(), writer);
-
-            // Write extensions
-            for (Object extension : property.getExtensions()) {
-                extensionProcessor.write(extension, writer);
-            }
-
-            writeEnd(writer);
-        }
-
-        // Write <wire> elements
-        for (Wire wire : composite.getWires()) {
-            writeStart(writer, WIRE, new XAttr(SOURCE, wire.getSource().getName()), new XAttr(TARGET, wire
-                .getTarget().getName()));
-            
-            //write extended attributes
-            this.writeExtendedAttributes(writer, wire, extensionAttributeProcessor);
-
-            // Write extensions
-            for (Object extension : wire.getExtensions()) {
-                extensionProcessor.write(extension, writer);
-            }
-            writeEnd(writer);
-        }
-
-        for (Object extension : composite.getExtensions()) {
-                        extensionProcessor.write(extension, writer);
-        }
-        
-        writeEndDocument(writer);
-    }
-
-    public void resolve(Composite composite, ModelResolver resolver) throws ContributionResolveException {
-
-        // Resolve constraining type
-        ConstrainingType constrainingType = composite.getConstrainingType();
-        if (constrainingType != null) {
-            constrainingType = resolver.resolveModel(ConstrainingType.class, constrainingType);
-            composite.setConstrainingType(constrainingType);
-        }
-
-        // Resolve includes in the composite
-        for (int i = 0, n = composite.getIncludes().size(); i < n; i++) {
-            Composite include = composite.getIncludes().get(i);
-            if (include != null) {
-                include = resolver.resolveModel(Composite.class, include);
-                composite.getIncludes().set(i, include);
-            }
-        }
-
-        // Resolve extensions
-        for (Object extension : composite.getExtensions()) {
-            if (extension != null) {
-                extensionProcessor.resolve(extension, resolver);
-            }
-        }
-
-        //Resolve composite services and references
-        resolveContracts(composite, composite.getServices(), resolver);
-        resolveContracts(composite, composite.getReferences(), resolver);
-
-        // Resolve component implementations, services and references
-        for (Component component : composite.getComponents()) {
-            constrainingType = component.getConstrainingType();
-            if (constrainingType != null) {
-                constrainingType = resolver.resolveModel(ConstrainingType.class, constrainingType);
-                component.setConstrainingType(constrainingType);
-            }
-            
-            //resolve component services and references 
-            resolveContracts(component, component.getServices(), resolver);
-            resolveContracts(component, component.getReferences(), resolver);
-            
-            for (ComponentProperty componentProperty : component.getProperties()) {
-                if (componentProperty.getFile() != null) {
-                    Artifact artifact = contributionFactory.createArtifact();
-                    artifact.setURI(componentProperty.getFile());
-                    artifact = resolver.resolveModel(Artifact.class, artifact);
-                    if (artifact.getLocation() != null) {
-                        componentProperty.setFile(artifact.getLocation());
-                    }
-                }
-            }
-            
-            //resolve component implementation
-            Implementation implementation = component.getImplementation();
-            if (implementation != null) {
-                //now resolve the implementation so that even if there is a shared instance
-                //for this that is resolved, the specified intents and policysets are safe in the
-                //component and not lost
-                implementation = resolveImplementation(implementation, resolver);
-
-                component.setImplementation(implementation);
-            }
-
-            //add model resolver to component
-            if (component instanceof ResolverExtension) {
-                ((ResolverExtension)component).setModelResolver(resolver);
-            }
-        }
-
-        // Add model resolver to promoted components
-        for (Service service : composite.getServices()) {
-            CompositeService compositeService = (CompositeService)service;
-            Component promotedComponent = compositeService.getPromotedComponent();
-            if (promotedComponent instanceof ResolverExtension) {
-                ((ResolverExtension)promotedComponent).setModelResolver(resolver);
-            }
-        }
-    }
-    
-    public QName getArtifactType() {
-        return COMPOSITE_QNAME;
-    }
-
-    public Class<Composite> getModelType() {
-        return Composite.class;
-    }
-
-    /**
-     * Returns the model factory extension point to use.
-     * 
-     * @param extensionPoints
-     * @return
-     */
-    private static FactoryExtensionPoint modelFactories(ExtensionPointRegistry extensionPoints) {
-        return extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-    }
-    
-    /**
-     * Returns the monitor to use.
-     * 
-     * @param extensionPoints
-     * @return
-     */
-    private static Monitor monitor(ExtensionPointRegistry extensionPoints) {
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        if (utilities != null) {
-            MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-            if (monitorFactory != null) {
-                return monitorFactory.createMonitor();
-            }
-        }
-        return null;
-    }
-    
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/Constants.java b/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/Constants.java
deleted file mode 100644
index 797d0bb47a..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/Constants.java
+++ /dev/null
@@ -1,99 +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.assembly.xml.osoa;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.osoa.Constants;
-
-/**
- * Constants used in SCA assembly XML files.
- *
- * @version $Rev$ $Date$
- */
-public interface Constants {
-    String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
-    
-    String COMPONENT_TYPE = "componentType";
-    QName COMPONENT_TYPE_QNAME = new QName(SCA10_NS, COMPONENT_TYPE);
-    
-    String SERVICE = "service";
-    QName SERVICE_QNAME = new QName(SCA10_NS, SERVICE);
-    
-    String REFERENCE = "reference";
-    QName REFERENCE_QNAME = new QName(SCA10_NS, REFERENCE);
-    
-    String PROPERTY = "property";
-    QName PROPERTY_QNAME = new QName(SCA10_NS, PROPERTY);
-    
-    String CONSTRAINING_TYPE = "constrainingType";
-    QName CONSTRAINING_TYPE_QNAME = new QName(SCA10_NS, CONSTRAINING_TYPE);
-    
-    String COMPOSITE = "composite";
-    QName COMPOSITE_QNAME = new QName(SCA10_NS, COMPOSITE);
-    
-    String INCLUDE = "include";
-    QName INCLUDE_QNAME = new QName(SCA10_NS, INCLUDE); 
-    
-    String COMPONENT = "component";
-    QName COMPONENT_QNAME = new QName(SCA10_NS, COMPONENT);
-    
-    String WIRE = "wire";
-    QName WIRE_QNAME = new QName(SCA10_NS, WIRE);
-
-    String OPERATION = "operation";
-    QName OPERATION_QNAME = new QName(SCA10_NS, OPERATION);
-    
-    String CALLBACK = "callback";
-    QName CALLBACK_QNAME = new QName(SCA10_NS, CALLBACK);
-
-    String IMPLEMENTATION_COMPOSITE = "implementation.composite";
-    QName IMPLEMENTATION_COMPOSITE_QNAME = new QName(SCA10_NS, IMPLEMENTATION_COMPOSITE);
-    
-    String IMPLEMENTATION = "implementation";
-    QName IMPLEMENTATION_QNAME = new QName(SCA10_NS, IMPLEMENTATION);
-    
-    String BINDING_SCA = "binding.sca";
-    QName BINDING_SCA_QNAME = new QName(Constants.SCA10_NS, BINDING_SCA);
-    
-    String NAME = "name";
-    String TARGET_NAMESPACE = "targetNamespace";
-    String LOCAL = "local";
-    String AUTOWIRE = "autowire";
-    String REQUIRES = "requires";
-    String POLICY_SETS = "policySets"; 
-    String APPLICABLE_POLICY_SETS = "applicablePolicySets";
-    String PROMOTE = "promote";
-    String TARGET = "target";
-    String WIRED_BY_IMPL = "wiredByImpl";
-    String MULTIPLICITY = "multiplicity";
-    String TYPE = "type";
-    String ELEMENT = "element";
-    String MANY = "many";
-    String MUST_SUPPLY = "mustSupply";
-    String SOURCE = "source";
-    String FILE = "file";
-    String URI = "uri";
-    String ZERO_ONE = "0..1";
-    String ZERO_N = "0..n";
-    String ONE_ONE = "1..1";
-    String ONE_N = "1..n";
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ConstrainingTypeProcessor.java b/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ConstrainingTypeProcessor.java
deleted file mode 100644
index 125ee2970e..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ConstrainingTypeProcessor.java
+++ /dev/null
@@ -1,275 +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.assembly.xml.osoa;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.CONSTRAINING_TYPE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.CONSTRAINING_TYPE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.ELEMENT;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.MANY;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.MUST_SUPPLY;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.NAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.OPERATION_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.PROPERTY;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.PROPERTY_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.REFERENCE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.REFERENCE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.SERVICE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.SERVICE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.TARGET_NAMESPACE;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.TYPE;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AbstractContract;
-import org.apache.tuscany.sca.assembly.AbstractProperty;
-import org.apache.tuscany.sca.assembly.AbstractReference;
-import org.apache.tuscany.sca.assembly.AbstractService;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.xml.osoa.BaseAssemblyProcessor;
-import org.apache.tuscany.sca.assembly.xml.osoa.Constants;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.w3c.dom.Document;
-
-/**
- * A constrainingType processor.
- * 
- * @version $Rev$ $Date$
- */
-public class ConstrainingTypeProcessor extends BaseAssemblyProcessor implements StAXArtifactProcessor<ConstrainingType> {
-
-    /**
-     * Constructs a new constrainingType processor.
-     * 
-     * @param modelFactories
-     * @param extensionProcessor
-     */
-    public ConstrainingTypeProcessor(FactoryExtensionPoint modelFactories,
-                                     StAXArtifactProcessor extensionProcessor,
-                                     Monitor monitor) {
-        super(modelFactories, extensionProcessor, monitor);
-    }
-    
-    public ConstrainingType read(XMLStreamReader reader) throws ContributionReadException {
-        ConstrainingType constrainingType = null;
-        AbstractService abstractService = null;
-        AbstractReference abstractReference = null;
-        AbstractProperty abstractProperty = null;
-        AbstractContract abstractContract = null;
-        QName name = null;
-        
-        try {
-            // Read the constrainingType document
-            while (reader.hasNext()) {
-                int event = reader.getEventType();
-                switch (event) {
-    
-                    case START_ELEMENT:
-                        name = reader.getName();
-                        
-                        // Read a <constrainingType>
-                        if (Constants.CONSTRAINING_TYPE_QNAME.equals(name)) {
-                            constrainingType = assemblyFactory.createConstrainingType();
-                            constrainingType.setName(new QName(getString(reader, TARGET_NAMESPACE), getString(reader, NAME)));
-                            policyProcessor.readPolicies(constrainingType, reader);
-    
-                        } else if (Constants.SERVICE_QNAME.equals(name)) {
-                            
-                            // Read a <service>
-                            abstractService = assemblyFactory.createAbstractService();
-                            abstractContract = abstractService;
-                            abstractService.setName(getString(reader, Constants.NAME));
-                            constrainingType.getServices().add(abstractService);
-                            policyProcessor.readPolicies(abstractService, reader);
-    
-                        } else if (Constants.REFERENCE_QNAME.equals(name)) {
-                            
-                            // Read a <reference>
-                            abstractReference = assemblyFactory.createAbstractReference();
-                            abstractContract = abstractReference;
-                            abstractReference.setName(getString(reader, Constants.NAME));
-                            readMultiplicity(abstractReference, reader);
-                            constrainingType.getReferences().add(abstractReference);
-                            policyProcessor.readPolicies(abstractReference, reader);
-    
-                        } else if (Constants.PROPERTY_QNAME.equals(name)) {
-                            
-                            // Read a <property>
-                            abstractProperty = assemblyFactory.createAbstractProperty();
-                            readAbstractProperty(abstractProperty, reader);
-                            
-                            // Read the property value
-                            Document value = readPropertyValue(abstractProperty.getXSDElement(), abstractProperty.getXSDType(), reader);
-                            abstractProperty.setValue(value);
-                            
-                            constrainingType.getProperties().add(abstractProperty);
-                            policyProcessor.readPolicies(abstractProperty, reader);
-                            
-                        } else if (OPERATION_QNAME.equals(name)) {
-    
-                            // Read an <operation>
-                            Operation operation = new OperationImpl();
-                            operation.setName(getString(reader, NAME));
-                            operation.setUnresolved(true);
-                            policyProcessor.readPolicies(abstractContract, operation, reader);
-                            
-                        } else {
-    
-                            // Read an extension element
-                            Object extension = extensionProcessor.read(reader);
-                            if (extension instanceof InterfaceContract) {
-                                
-                                // <service><interface> and <reference><interface>
-                                abstractContract.setInterfaceContract((InterfaceContract)extension);
-                            } else {
-    
-                                // Add the extension element to the current element
-                                if (abstractContract != null) {
-                                    abstractContract.getExtensions().add(extension);
-                                } else {
-                                    constrainingType.getExtensions().add(extension);
-                                }
-                                
-                            }
-                        }
-                        break;
-    
-                    case END_ELEMENT:
-                        name = reader.getName();
-    
-                        // Clear current state when reading reaching end element
-                        if (SERVICE_QNAME.equals(name)) {
-                            abstractService = null;
-                            abstractContract = null;
-                        } else if (REFERENCE_QNAME.equals(name)) {
-                            abstractReference = null;
-                            abstractContract = null;
-                        } else if (PROPERTY_QNAME.equals(name)) {
-                            abstractProperty = null;
-                        }
-                        break;
-                }
-                if (reader.hasNext()) {
-                    reader.next();
-                }
-            }
-        }
-        catch (XMLStreamException e) {
-            ContributionReadException ex = new ContributionReadException(e);
-            error("XMLStreamException", reader, ex);
-        }
-        
-        return constrainingType;
-    }
-    
-    public void write(ConstrainingType constrainingType, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
-        // Write <constrainingType> element
-        writeStartDocument(writer, CONSTRAINING_TYPE,
-           new XAttr(TARGET_NAMESPACE, constrainingType.getName().getNamespaceURI()),
-           new XAttr(NAME, constrainingType.getName().getLocalPart()),
-           policyProcessor.writePolicies(constrainingType));
-
-        // Write <service> elements 
-        for (AbstractService service : constrainingType.getServices()) {
-            writeStart(writer, SERVICE, new XAttr(NAME, service.getName()),
-                       policyProcessor.writePolicies(service));
-            
-            extensionProcessor.write(service.getInterfaceContract(), writer);
-
-            for (Object extension: service.getExtensions()) {
-                extensionProcessor.write(extension, writer);
-            }
-            
-            writeEnd(writer);
-        }
-
-        // Write <reference> elements
-        for (AbstractReference reference : constrainingType.getReferences()) {
-            writeStart(writer, REFERENCE, new XAttr(NAME, reference.getName()),
-                       writeMultiplicity(reference),
-                       policyProcessor.writePolicies(reference));
-            
-            extensionProcessor.write(reference.getInterfaceContract(), writer);
-
-            for (Object extension: reference.getExtensions()) {
-                extensionProcessor.write(extension, writer);
-            }
-            
-            writeEnd(writer);
-        }
-
-        // Write <property> elements
-        for (AbstractProperty abstractProperty : constrainingType.getProperties()) {
-            writeStart(writer,
-                       PROPERTY,
-                       new XAttr(NAME, abstractProperty.getName()),
-                       new XAttr(MUST_SUPPLY, abstractProperty.isMustSupply()),
-                       new XAttr(MANY, abstractProperty.isMany()),
-                       new XAttr(TYPE, abstractProperty.getXSDType()),
-                       new XAttr(ELEMENT, abstractProperty.getXSDElement()),
-                       policyProcessor.writePolicies(abstractProperty));
-
-            // Write property value
-            writePropertyValue(abstractProperty.getValue(), abstractProperty.getXSDElement(), abstractProperty.getXSDType(), writer);
-
-            // Write extensions
-            for (Object extension : abstractProperty.getExtensions()) {
-                extensionProcessor.write(extension, writer);
-            }
-
-            writeEnd(writer);
-        }
-
-        // Write extension elements
-        for (Object extension: constrainingType.getExtensions()) {
-            extensionProcessor.write(extension, writer);
-        }
-        
-        writeEndDocument(writer);
-    }
-    
-    public void resolve(ConstrainingType constrainingType, ModelResolver resolver) throws ContributionResolveException {
-        // Resolve component type services and references
-        resolveAbstractContracts(constrainingType.getServices(), resolver);
-        resolveAbstractContracts(constrainingType.getReferences(), resolver);
-    }
-    
-    public QName getArtifactType() {
-        return CONSTRAINING_TYPE_QNAME;
-    }
-    
-    public Class<ConstrainingType> getModelType() {
-        return ConstrainingType.class;
-    }
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/PolicySubjectProcessor.java b/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/PolicySubjectProcessor.java
deleted file mode 100644
index adb8655447..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/PolicySubjectProcessor.java
+++ /dev/null
@@ -1,253 +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.assembly.xml.osoa;
-
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.POLICY_SETS;
-import static org.apache.tuscany.sca.assembly.xml.osoa.Constants.REQUIRES;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.xml.osoa.Constants;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySubject;
-
-/**
- * A Policy Attach Point processor.
- *
- * @version $Rev$ $Date$
- */
-public class PolicySubjectProcessor extends BaseStAXArtifactProcessor {
-    
-    private PolicyFactory policyFactory;
-    
-    public PolicySubjectProcessor(PolicyFactory policyFactory) {
-        this.policyFactory = policyFactory;
-    }
-
-    /**
-     * Read policy intents associated with an operation.
-     * @param attachPoint
-     * @param operation
-     * @param reader
-     */
-    private void readIntents(Object attachPoint, Operation operation, XMLStreamReader reader) {
-        if (!(attachPoint instanceof PolicySubject))
-            return;
-        PolicySubject intentAttachPoint = (PolicySubject)attachPoint;
-        String value = reader.getAttributeValue(null, REQUIRES);
-        if (value != null) {
-            List<Intent> requiredIntents = intentAttachPoint.getRequiredIntents();
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                QName qname = getQNameValue(reader, tokens.nextToken());
-                Intent intent = policyFactory.createIntent();
-                intent.setName(qname);
-                if (operation != null) {
-                    //FIXME Don't we need to handle intent specification
-                    // on an operation basis?
-                    //intent.getOperations().add(operation);
-                }
-                requiredIntents.add(intent);
-            }
-        }
-    }
-
-    /**
-     * Reads policy intents and policy sets associated with an operation.
-     * @param attachPoint
-     * @param operation
-     * @param reader
-     */
-    public void readPolicies(Object attachPoint, Operation operation, XMLStreamReader reader) {
-        readIntents(attachPoint, operation, reader);
-        readPolicySets(attachPoint, operation, reader);
-    }
-
-    /**
-     * Reads policy intents and policy sets.
-     * @param attachPoint
-     * @param reader
-     */
-    public void readPolicies(Object attachPoint, XMLStreamReader reader) {
-        readPolicies(attachPoint, null, reader);
-    }
-
-    /**
-     * Reads policy sets associated with an operation.
-     * @param attachPoint
-     * @param operation
-     * @param reader
-     */
-    private void readPolicySets(Object attachPoint, Operation operation, XMLStreamReader reader) {
-        if (!(attachPoint instanceof PolicySubject)) {
-            return;
-        }
-        PolicySubject policySubject = (PolicySubject)attachPoint;
-        String value = reader.getAttributeValue(null, POLICY_SETS);
-        if (value != null) {
-            List<PolicySet> policySets = policySubject.getPolicySets();
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                QName qname = getQNameValue(reader, tokens.nextToken());
-                PolicySet policySet = policyFactory.createPolicySet();
-                policySet.setName(qname);
-                if (operation != null) {
-                    //FIXME Don't we need to handle policySet specification
-                    // on an operation basis?
-                    //policySet.getOperations().add(operation);
-                }
-                policySets.add(policySet);
-            }
-        }
-    }
-    
-    /**
-     * Write policies
-     * @param attachPoint
-     * @return
-     */
-    XAttr writePolicies(Object attachPoint) throws XMLStreamException {
-        return writePolicies(attachPoint, (Operation)null);
-    }
-
-    /**
-     * Write policies
-     * @param attachPoint
-     * @return
-     */
-    public void writePolicyAttributes(Object attachPoint, XMLStreamWriter writer) throws XMLStreamException {
-        writePolicyAttributes(attachPoint, (Operation)null, writer);
-    }
-
-    /**
-     * Write policies
-     * @param attachPoint
-     * @return
-     */
-    public void writePolicyPrefixes(Object attachPoint, XMLStreamWriter writer) throws XMLStreamException {
-        writePolicyPrefixes(attachPoint, (Operation)null, writer);
-    }
-
-    /**
-     * Write policies associated with an operation
-     * @param attachPoint
-     * @param operation
-     * @return
-     */
-    XAttr writePolicies(Object attachPoint, Operation operation) {
-        List<XAttr> attrs =new ArrayList<XAttr>();
-        attrs.add(writeIntents(attachPoint, operation));
-        attrs.add(writePolicySets(attachPoint, operation));
-        return new XAttr(null, attrs);
-    }
-
-    /**
-     * Write policies
-     * @param attachPoint
-     * @return
-     */
-    public void writePolicyAttributes(Object attachPoint, Operation operation, XMLStreamWriter writer) throws XMLStreamException {
-        XAttr attr = writePolicies(attachPoint, operation);
-        attr.write(writer);
-    }
-
-    /**
-     * Write policies
-     * @param attachPoint
-     * @return
-     */
-    public void writePolicyPrefixes(Object attachPoint, Operation operation, XMLStreamWriter writer) throws XMLStreamException {
-        XAttr attr = writePolicies(attachPoint, operation);
-        attr.writePrefix(writer);
-    }
-
-    /**
-     * Write policy intents associated with an operation.
-     * @param attachPoint
-     * @param operation
-     */
-    private XAttr writeIntents(Object attachPoint, Operation operation) {
-        if (!(attachPoint instanceof PolicySubject)) {
-            return null;
-        }
-        PolicySubject intentAttachPoint = (PolicySubject)attachPoint;
-        List<QName> qnames = new ArrayList<QName>();
-        for (Intent intent: intentAttachPoint.getRequiredIntents()) {
-            qnames.add(intent.getName());
-        }
-        return new XAttr(Constants.REQUIRES, qnames);
-    }
-
-    /**
-     * Write policy sets associated with an operation.
-     * @param attachPoint
-     * @param operation
-     */
-    private XAttr writePolicySets(Object attachPoint, Operation operation) {
-        if (!(attachPoint instanceof PolicySubject)) {
-            return null;
-        }
-        PolicySubject policySetAttachPoint = (PolicySubject)attachPoint;
-        List<QName> qnames = new ArrayList<QName>();
-        for (PolicySet policySet: policySetAttachPoint.getPolicySets()) {
-            qnames.add(policySet.getName());
-        }
-        return new XAttr(Constants.POLICY_SETS, qnames);
-    }
-    
-    public void resolvePolicies(Object attachPoint, ModelResolver resolver) {
-        if ( attachPoint instanceof PolicySubject ) {
-            PolicySubject policySetAttachPoint = (PolicySubject)attachPoint;
-            
-            List<Intent> requiredIntents = new ArrayList<Intent>();
-            Intent resolvedIntent = null;
-            
-            if ( policySetAttachPoint.getRequiredIntents() != null && policySetAttachPoint.getRequiredIntents().size() > 0 ) {
-                for ( Intent intent : policySetAttachPoint.getRequiredIntents() ) {
-                    resolvedIntent = resolver.resolveModel(Intent.class, intent);
-                    requiredIntents.add(resolvedIntent);
-                }
-                policySetAttachPoint.getRequiredIntents().clear();
-                policySetAttachPoint.getRequiredIntents().addAll(requiredIntents);
-            }
-            
-            if ( policySetAttachPoint.getPolicySets() != null && policySetAttachPoint.getPolicySets().size() > 0 ) {
-                List<PolicySet> resolvedPolicySets = new ArrayList<PolicySet>();
-                PolicySet resolvedPolicySet = null;
-                for ( PolicySet policySet : policySetAttachPoint.getPolicySets() ) {
-                    resolvedPolicySet = resolver.resolveModel(PolicySet.class, policySet);
-                    resolvedPolicySets.add(resolvedPolicySet);
-                }
-                policySetAttachPoint.getPolicySets().clear();
-                policySetAttachPoint.getPolicySets().addAll(resolvedPolicySets);
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index e778ab7e3c..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,21 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.osoa.ComponentTypeProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#componentType,model=org.apache.tuscany.sca.assembly.ComponentType
-org.apache.tuscany.sca.assembly.xml.osoa.ConstrainingTypeProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#constrainingType,model=org.apache.tuscany.sca.assembly.ConstrainingType
-org.apache.tuscany.sca.assembly.xml.osoa.CompositeProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#composite,model=org.apache.tuscany.sca.assembly.Composite
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
deleted file mode 100644
index a363691a51..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ /dev/null
@@ -1,21 +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. 
-
-# Implementation class for the artifact processor extension
-# org.apache.tuscany.sca.assembly.xml.osoa.ComponentTypeDocumentProcessor;type=.componentType,model=org.apache.tuscany.sca.assembly.ComponentType
-# org.apache.tuscany.sca.assembly.xml.osoa.ConstrainingTypeDocumentProcessor;type=.constrainingType,model=org.apache.tuscany.sca.assembly.ConstrainingType
-# org.apache.tuscany.sca.assembly.xml.osoa.CompositeDocumentProcessor;type=.composite,model=org.apache.tuscany.sca.assembly.Composite
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index 05c965f40e..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ /dev/null
@@ -1,20 +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. 

-

-# org.apache.tuscany.sca.assembly.xml.osoa.CompositeModelResolver;model=org.apache.tuscany.sca.assembly.Composite

-# org.apache.tuscany.sca.assembly.xml.osoa.ConstrainingTypeModelResolver;model=org.apache.tuscany.sca.assembly.ConstrainingType

-# org.apache.tuscany.sca.assembly.xml.osoa.ComponentTypeModelResolver;model=org.apache.tuscany.sca.assembly.ComponentType

diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/assembly-xml-validation-messages.properties b/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/assembly-xml-validation-messages.properties
deleted file mode 100644
index 8cc5e5a5ec..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/assembly-xml-validation-messages.properties
+++ /dev/null
@@ -1,29 +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.
-#
-#
-NoCompositeNamespace = No namespace found: Composite = {0}
-UnexpectedInterfaceElement = Unexpected <interface> element found. It should appear inside a <service> or <reference> element.
-UnexpectedBindingElement = Unexpected <binding> element found. It should appear inside a <service> or <reference> element.
-UnexpectedImplementationElement = Unexpected <implementation> element found. It should appear inside a <component> element.
-PolicyImplValidationException = PolicyValidation exception when processing implementation of component {0} due to {1}. 
-PolicyServiceValidationException = PolicyValidation exceptions when processing service/reference {0} in {1}. Error is {2}
-ContributionReadException = ContributionReadException occured due to : {0}
-ContributionWriteException = ContributionWriteException occured due to : {0}
-XMLStreamException = XMLStreamException occured due to : {0}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/BuildPolicyTestCase.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/BuildPolicyTestCase.java
deleted file mode 100644
index 938cc7750d..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/BuildPolicyTestCase.java
+++ /dev/null
@@ -1,143 +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.assembly.xml.osoa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultURLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.Definitions;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.PolicySubject;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Test reading SCA XML assembly documents.
- *
- * @version $Rev$ $Date$
- */
-public class BuildPolicyTestCase {
-    private static URLArtifactProcessor<Object> documentProcessor;
-    private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor;
-    private static ModelResolver resolver;
-    private static CompositeBuilder compositeBuilder;
-    private static Composite composite;
-    private static Monitor monitor;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        SCABindingFactory scaBindingFactory = new TestSCABindingFactoryImpl();
-        modelFactories.addFactory(scaBindingFactory);
-        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
-
-        List<Definitions> policyDefinitions = new ArrayList<Definitions>();
-        resolver = new DefaultModelResolver();
-
-        MonitorFactory monitorFactory = new DefaultMonitorFactory();
-        monitor = monitorFactory.createMonitor();
-
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-
-        URLArtifactProcessorExtensionPoint documentProcessors = new DefaultURLArtifactProcessorExtensionPoint(extensionPoints);
-        documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
-        policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class);
-
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessors.addArtifactProcessor(new TestPolicyProcessor());
-
-        URL url = BuildPolicyTestCase.class.getResource("CalculatorComponent.constrainingType");
-        URI uri = URI.create("CalculatorComponent.constrainingType");
-        ConstrainingType constrainingType = (ConstrainingType)documentProcessor.read(null, uri, url);
-        assertNotNull(constrainingType);
-        resolver.addModel(constrainingType);
-
-        url = BuildPolicyTestCase.class.getResource("TestAllPolicyCalculator.composite");
-        uri = URI.create("TestAllCalculator.composite");
-        composite = (Composite)documentProcessor.read(null, uri, url);
-        assertNotNull(composite);
-
-        url = BuildPolicyTestCase.class.getResource("another_test_definitions.xml");
-        uri = URI.create("another_test_definitions.xml");
-        Definitions definitions = (Definitions)policyDefinitionsProcessor.read(null, uri, url);
-        assertNotNull(definitions);
-        policyDefinitions.add(definitions);
-
-        documentProcessor.resolve(definitions, resolver);
-        documentProcessor.resolve(composite, resolver);
-
-        compositeBuilder.build(composite, null, monitor);
-    }
-
-    @Test
-    @Ignore("The inheritance will be calculated differently in OASIS SCA")
-    public void testPolicyIntentInheritance() throws Exception {
-        String namespaceUri = "http://test";
-
-        PolicySubject policiedComposite = (PolicySubject)composite;
-        assertEquals(policiedComposite.getRequiredIntents().size(), 1);
-        assertEquals(policiedComposite.getRequiredIntents().get(0).getName(), new QName(namespaceUri, "tuscanyIntent_1"));
-
-        //1 defined for composite, 2 defined for the service, 1 defined and 3 inherited for the promoted service (4)
-        assertEquals(composite.getServices().get(0).getRequiredIntents().size(), 7);
-        //1 from the operation defined in this service and 2 from the operation defined in the promoted service
-        assertEquals(composite.getServices().get(0).getRequiredIntents().get(3).getName(), new QName(namespaceUri, "tuscanyIntent_3"));
-        //bindings will have only 2 intents since duplications will be cut out
-        assertEquals(((PolicySubject)composite.getServices().get(0).getBindings().get(0)).getRequiredIntents().size(), 3);
-
-        assertEquals(composite.getReferences().get(0).getRequiredIntents().size(), 5);
-        assertEquals(composite.getReferences().get(0).getRequiredIntents().get(1).getName(), new QName(namespaceUri, "tuscanyIntent_1"));
-        assertEquals(((PolicySubject)composite.getReferences().get(0).getBindings().get(0)).getRequiredIntents().size(), 3);
-
-        assertEquals(composite.getComponents().get(0).getRequiredIntents().size(), 3);
-        assertEquals(composite.getComponents().get(0).getRequiredIntents().get(2).getName(), new QName(namespaceUri, "tuscanyIntent_1"));
-        assertEquals(composite.getComponents().get(0).getServices().get(0).getRequiredIntents().size(), 4);
-        assertEquals(composite.getComponents().get(0).getServices().get(0).getCallback().getRequiredIntents().size(), 4);
-        assertEquals(composite.getComponents().get(0).getReferences().get(0).getRequiredIntents().size(), 5);
-    }
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/MultiplicityReadWriteTestCase.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/MultiplicityReadWriteTestCase.java
deleted file mode 100644
index 5d9b8e4556..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/MultiplicityReadWriteTestCase.java
+++ /dev/null
@@ -1,86 +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.assembly.xml.osoa;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test writing SCA XML assemblies.
- * 
- * TUSCANY-2662
- * 
- * @version $Rev$ $Date$
- */
-public class MultiplicityReadWriteTestCase {
-    private XMLInputFactory inputFactory;
-    private XMLOutputFactory outputFactory;
-    private ExtensibleStAXArtifactProcessor staxProcessor;
-
-
-    @Before
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        outputFactory = XMLOutputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null);
-    }
-
-
-    @Test
-    public void testReadWriteComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Multiplicity.composite");
-        Composite composite = staxProcessor.read(is, Composite.class);
-        
-        verifyComposite(composite);
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, bos);
-        bos.close();
-        
-        ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-        composite = staxProcessor.read(bis, Composite.class);
-        
-        verifyComposite(composite);
-        
-    }
-
-    
-    private void verifyComposite(Composite composite) {
-        assertEquals(composite.getComponents().get(0).getReferences().get(0).getMultiplicity(), Multiplicity.ZERO_N);
-        assertEquals(composite.getReferences().get(0).getMultiplicity(), Multiplicity.ONE_N);
-    }
-
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadAllTestCase.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadAllTestCase.java
deleted file mode 100644
index 4d981b8c4d..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadAllTestCase.java
+++ /dev/null
@@ -1,151 +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.assembly.xml.osoa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.InputStream;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-
-import org.apache.tuscany.sca.assembly.Callback;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.CompositeReference;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.policy.PolicySubject;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Test reading SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadAllTestCase {
-    private static StAXArtifactProcessor<Object> staxProcessor;
-    private static XMLInputFactory inputFactory;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        inputFactory = XMLInputFactory.newInstance();
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-    }
-
-    @Test
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("TestAllCalculator.composite");
-        Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(composite);
-        assertEquals(composite.getName(), new QName("http://calc", "TestAllCalculator"));
-        assertEquals(composite.getConstrainingType().getName(), new QName("http://calc", "CalculatorComponent"));
-        assertTrue(composite.isLocal());
-        assertFalse(composite.getAutowire() == Boolean.TRUE);
-        assertEquals(((PolicySubject)composite).getRequiredIntents().get(0).getName(), new QName("http://test",
-                                                                                "confidentiality"));
-        assertEquals(((PolicySubject)composite).getPolicySets().get(0).getName(), new QName("http://test", "SecureReliablePolicy"));
-
-        Composite include = composite.getIncludes().get(0);
-        assertEquals(include.getName(), new QName("http://calc", "TestAllDivide"));
-
-        CompositeService calcCompositeService = (CompositeService)composite.getServices().get(0);
-        assertEquals(calcCompositeService.getName(), "CalculatorService");
-        assertTrue(calcCompositeService.getPromotedService().isUnresolved());
-        assertEquals(calcCompositeService.getPromotedService().getName(),
-                     "CalculatorService");
-        assertEquals(calcCompositeService.getRequiredIntents().get(0).getName(),
-                     new QName("http://test", "confidentiality"));
-        assertEquals(calcCompositeService.getPolicySets().get(0).getName(), new QName("http://test", "SecureReliablePolicy"));
-        // TODO test operations
-        Callback calcServiceCallback = calcCompositeService.getCallback();
-        assertNotNull(calcServiceCallback);
-        assertEquals(calcServiceCallback.getRequiredIntents().get(0).getName(),
-                     new QName("http://test", "confidentiality"));
-        assertEquals(calcServiceCallback.getPolicySets().get(0).getName(), new QName("http://test", "SecureReliablePolicy"));
-        // TODO test operations
-
-        Component calcComponent = composite.getComponents().get(0);
-        assertEquals(calcComponent.getName(), "CalculatorServiceComponent");
-        assertEquals(calcComponent.getAutowire(), Boolean.FALSE);
-        assertEquals(calcComponent.getConstrainingType().getName(), new QName("http://calc",
-                                                                              "CalculatorComponent"));
-        assertEquals(calcComponent.getRequiredIntents().get(0).getName(), new QName("http://test",
-                                                                                    "confidentiality"));
-        assertEquals(calcComponent.getPolicySets().get(0).getName(), new QName("http://test", "SecureReliablePolicy"));
-
-        ComponentService calcComponentService = calcComponent.getServices().get(0);
-        assertEquals(calcComponentService.getName(), "CalculatorService");
-        assertEquals(calcComponentService.getRequiredIntents().get(0).getName(),
-                     new QName("http://test", "confidentiality"));
-        assertEquals(calcComponentService.getPolicySets().get(0).getName(), new QName("http://test", "SecureReliablePolicy"));
-        // TODO test operations
-
-        ComponentReference calcComponentReference = calcComponent.getReferences().get(0);
-        assertEquals(calcComponentReference.getName(), "addService");
-        assertEquals(calcComponentReference.getAutowire(), Boolean.FALSE);
-        assertEquals(calcComponentReference.isWiredByImpl(), false);
-        assertEquals(calcComponentReference.getRequiredIntents().get(0).getName(),
-                     new QName("http://test", "confidentiality"));
-        assertEquals(calcComponentReference.getPolicySets().get(0).getName(), new QName("http://test", "SecureReliablePolicy"));
-        // TODO test operations
-
-        Property property = calcComponent.getProperties().get(0);
-        assertEquals(property.getName(), "round");
-        Document doc = (Document) property.getValue();
-        Element element = doc.getDocumentElement();
-        String value = element.getTextContent();
-        assertEquals(value, "true");
-        assertEquals(property.getXSDType(), new QName("http://www.w3.org/2001/XMLSchema", "boolean"));
-        assertEquals(property.isMany(), false);
-
-        CompositeReference calcCompositeReference = (CompositeReference)composite.getReferences().get(0);
-        assertEquals(calcCompositeReference.getName(), "MultiplyService");
-        assertTrue(calcCompositeReference.getPromotedReferences().get(0).isUnresolved());
-        assertEquals(calcCompositeReference.getPromotedReferences().get(0).getName(),
-                     "CalculatorServiceComponent/multiplyService");
-        assertEquals(calcCompositeReference.getRequiredIntents().get(0).getName(),
-                     new QName("http://test", "confidentiality"));
-        assertEquals(calcCompositeReference.getPolicySets().get(0).getName(), new QName("http://test", "SecureReliablePolicy"));
-        // TODO test operations
-        Callback calcCallback = calcCompositeReference.getCallback();
-        assertEquals(calcCompositeReference.getRequiredIntents().get(0).getName(),
-                     new QName("http://test", "confidentiality"));
-        assertEquals(calcCompositeReference.getPolicySets().get(0).getName(), new QName("http://test", "SecureReliablePolicy"));
-        assertNotNull(calcCallback);
-        // TODO test operations
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadDocumentTestCase.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadDocumentTestCase.java
deleted file mode 100644
index 94036c50cb..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadDocumentTestCase.java
+++ /dev/null
@@ -1,225 +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.assembly.xml.osoa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.net.URI;
-import java.net.URL;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.ValidatorHandler;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.xml.CompositeDocumentProcessor;
-import org.apache.tuscany.sca.contribution.processor.DefaultValidatingXMLInputFactory;
-import org.apache.tuscany.sca.contribution.processor.DefaultValidationSchemaExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.DefaultFactoryExtensionPoint;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-
-/**
- * Test reading SCA XML assembly documents.
- *
- * @version $Rev$ $Date$
- */
-public class ReadDocumentTestCase {
-	private static final String TUSCANY_10_XSD = "tuscany-sca.xsd";
-
-    private static URLArtifactProcessor<Object> documentProcessor;
-    private static ModelResolver resolver;
-    private static XMLInputFactory inputFactory;
-    private static StAXArtifactProcessor<Object> staxProcessor;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
-
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        inputFactory = XMLInputFactory.newInstance();
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-
-        resolver = new DefaultModelResolver();
-    }
-
-    @Test
-    public void testValidateAssembly() throws Exception {
-
-        SchemaFactory schemaFactory;
-        try {
-            schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-        } catch (Error e) {
-            // Some old JDKs don't support XMLSchema validation
-            return;
-        } catch (Exception e) {
-            // Some old JDKs don't support XMLSchema validation
-            return;
-        }
-        Schema schema = schemaFactory.newSchema(getClass().getClassLoader().getResource(TUSCANY_10_XSD));
-        ValidatorHandler handler = schema.newValidatorHandler();
-
-        SAXParserFactory parserFactory = SAXParserFactory.newInstance();
-        URL url = getClass().getResource("Calculator.composite");
-        XMLReader reader = parserFactory.newSAXParser().getXMLReader();
-        reader.setFeature("http://xml.org/sax/features/namespaces", true);
-        reader.setContentHandler(handler);
-        reader.parse(new InputSource(url.openStream()));
-
-    }
-
-    @Test
-    public void testValidateImplementation() throws Exception {
-
-        SchemaFactory schemaFactory;
-        try {
-            schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-        } catch (Error e) {
-            // Some old JDKs don't support XMLSchema validation
-            return;
-        } catch (Exception e) {
-            // Some old JDKs don't support XMLSchema validation
-            return;
-        }
-        Schema schema = schemaFactory.newSchema(getClass().getClassLoader().getResource(TUSCANY_10_XSD));
-        ValidatorHandler handler = schema.newValidatorHandler();
-
-        SAXParserFactory parserFactory = SAXParserFactory.newInstance();
-        URL url = getClass().getResource("JavaScriptReference.composite");
-        XMLReader reader = parserFactory.newSAXParser().getXMLReader();
-        reader.setFeature("http://xml.org/sax/features/namespaces", true);
-        reader.setContentHandler(handler);
-        reader.parse(new InputSource(url.openStream()));
-    }
-
-    @Test
-    public void testReadImplementation() throws Exception {
-
-        ValidationSchemaExtensionPoint schemas = new DefaultValidationSchemaExtensionPoint();
-        schemas.addSchema(getClass().getClassLoader().getResource(TUSCANY_10_XSD).toString());
-        XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas, null);
-        DefaultFactoryExtensionPoint factories = new DefaultFactoryExtensionPoint(new DefaultExtensionPointRegistry());
-        factories.addFactory(validatingInputFactory);
-
-        CompositeDocumentProcessor compositeDocumentProcessor = new CompositeDocumentProcessor(factories , staxProcessor, null);
-
-        URL url = getClass().getResource("JavaScriptReference.composite");
-        URI uri = URI.create("JavaScriptReference.composite");
-        Composite composite = (Composite)compositeDocumentProcessor.read(null, uri, url);
-        assertNotNull(composite);
-    }
-
-    @Test
-    public void testValidateBinding() throws Exception {
-
-        SchemaFactory schemaFactory;
-        try {
-            schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-        } catch (Error e) {
-            // Some old JDKs don't support XMLSchema validation
-            return;
-        } catch (Exception e) {
-            // Some old JDKs don't support XMLSchema validation
-            return;
-        }
-        Schema schema = schemaFactory.newSchema(getClass().getClassLoader().getResource(TUSCANY_10_XSD));
-        ValidatorHandler handler = schema.newValidatorHandler();
-
-        SAXParserFactory parserFactory = SAXParserFactory.newInstance();
-        URL url = getClass().getResource("RMIBindingTest.composite");
-        XMLReader reader = parserFactory.newSAXParser().getXMLReader();
-        reader.setFeature("http://xml.org/sax/features/namespaces", true);
-        reader.setContentHandler(handler);
-        reader.parse(new InputSource(url.openStream()));
-    }
-
-    @Test
-    public void testReadBinding() throws Exception {
-
-        ValidationSchemaExtensionPoint schemas = new DefaultValidationSchemaExtensionPoint();
-        schemas.addSchema(getClass().getClassLoader().getResource(TUSCANY_10_XSD).toString());
-        XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas, null);
-        DefaultFactoryExtensionPoint factories = new DefaultFactoryExtensionPoint(new DefaultExtensionPointRegistry());
-        factories.addFactory(validatingInputFactory);
-        CompositeDocumentProcessor compositeDocumentProcessor = new CompositeDocumentProcessor(factories , staxProcessor, null);
-
-        URL url = getClass().getResource("RMIBindingTest.composite");
-        URI uri = URI.create("RMIBindingTest.composite");
-        Composite composite = (Composite)compositeDocumentProcessor.read(null, uri, url);
-        assertNotNull(composite);
-    }
-
-    @Test
-    public void testResolveConstrainingType() throws Exception {
-
-        URL url = getClass().getResource("CalculatorComponent.constrainingType");
-        URI uri = URI.create("CalculatorComponent.constrainingType");
-        ConstrainingType constrainingType = (ConstrainingType)documentProcessor.read(null, uri, url);
-        assertNotNull(constrainingType);
-        resolver.addModel(constrainingType);
-
-        url = getClass().getResource("TestAllCalculator.composite");
-        uri = URI.create("TestAllCalculator.composite");
-        Composite composite = (Composite)documentProcessor.read(null, uri, url);
-        assertNotNull(composite);
-
-        documentProcessor.resolve(composite, resolver);
-
-       assertEquals(composite.getConstrainingType(), constrainingType);
-        assertEquals(composite.getComponents().get(0).getConstrainingType(), constrainingType);
-    }
-
-    @Test
-    public void testResolveComposite() throws Exception {
-        URL url = getClass().getResource("Calculator.composite");
-        URI uri = URI.create("Calculator.composite");
-        Composite nestedComposite = (Composite)documentProcessor.read(null, uri, url);
-        assertNotNull(nestedComposite);
-        resolver.addModel(nestedComposite);
-
-        url = getClass().getResource("TestAllCalculator.composite");
-        uri = URI.create("TestAllCalculator.composite");
-        Composite composite = (Composite)documentProcessor.read(null, uri, url);
-
-        documentProcessor.resolve(composite, resolver);
-
-        assertEquals(composite.getComponents().get(2).getImplementation(), nestedComposite);
-    }
-
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadTestCase.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadTestCase.java
deleted file mode 100644
index 98b8c81533..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadTestCase.java
+++ /dev/null
@@ -1,91 +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.assembly.xml.osoa;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test reading SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadTestCase {
-
-    private static XMLInputFactory inputFactory;
-    private static StAXArtifactProcessor<Object> staxProcessor;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance(), null);
-    }
-
-
-    @Test
-    public void testReadComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        assertNotNull(staxProcessor.read(reader));
-        is.close();
-    }
-
-    @Test
-    public void testReadConstrainingType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        assertNotNull(staxProcessor.read(reader));
-        is.close();
-
-    }
-
-    @Test
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        assertNotNull(staxProcessor.read(reader));
-        is.close();
-
-    }
-
-    @Test
-    public void testReadCompositeAndWireIt() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        assertNotNull(staxProcessor.read(reader));
-        is.close();
-    }
-
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyAttributeTestCase.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyAttributeTestCase.java
deleted file mode 100644
index b86907579e..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyAttributeTestCase.java
+++ /dev/null
@@ -1,135 +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.assembly.xml.osoa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.ByteArrayOutputStream;
-import java.io.StringReader;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Test reading SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadWriteAnyAttributeTestCase {
-
-    private static final QName EXTENDED_ATTRIBUTE = new QName("http://test", "customAttribute");
-    
-    private static final String XML = "<?xml version='1.0' encoding='UTF-8'?>"+
-		 	 "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" " +
-		 	            "xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\" " +
-		 	            "targetNamespace=\"http://calc\" " +
-		 	            "name=\"Calculator\">"+
- 	 	 	    "<component name=\"AddServiceComponent\" xmlns:test=\"http://test\" test:customAttribute=\"customValue\">"+
- 	 	 	      "<implementation.java class=\"calculator.AddServiceImpl\" />"+
- 	 	 	    "</component>"+
- 	 	 	  "</composite>";
-    
-    private XMLInputFactory inputFactory;
-    private ExtensibleStAXArtifactProcessor staxProcessor;
-
-
-    /**
-     * Initialize the test environment
-     * This takes care to register attribute processors when provided
-     *
-     * @param attributeProcessor
-     * @throws Exception
-     */
-    private void init(StAXAttributeProcessor<?> attributeProcessor) throws Exception {
-    	ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-    	inputFactory = XMLInputFactory.newInstance();
-    	StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-
-    	if(attributeProcessor != null) {
-    		StAXAttributeProcessorExtensionPoint staxAttributeProcessors = extensionPoints.getExtensionPoint(StAXAttributeProcessorExtensionPoint.class);
-    		staxAttributeProcessors.addArtifactProcessor(attributeProcessor);
-    	}
-    	
-    	staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance(), null);
-    }
-
-    /**
-     * Read and Write a composite that has a extended attribute
-     * and a particular attribute processor
-     * @throws Exception
-     */
-    @Test
-    @Ignore("TBF: The processor needs to write the xml based on the QName of the elements")
-    public void testReadWriteCompositeWithAttributeProcessor() throws Exception {
-    	init(new TestAttributeProcessor());
-
-    	XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML));
-    	Composite composite = (Composite) staxProcessor.read(reader);
-    	assertNotNull(composite);
-    	reader.close();
-
-    	ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    	staxProcessor.write(composite, bos);
-
-    	// used for debug comparison
-    	// System.out.println(XML);
-    	// System.out.println(bos.toString());
-
-    	assertEquals(XML, bos.toString());    	
-    }
-
-    /**
-     * Read and Write a composite that has a extended attribute
-     * but no particular processor for it
-     * @throws Exception
-     */
-    @Test
-    @Ignore("TBF: The processor needs to write the xml based on the QName of the elements")
-    public void testDefaultReadWriteComposite() throws Exception {
-    	init(null);
-
-    	XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML));
-    	Composite composite = (Composite) staxProcessor.read(reader);
-    	assertNotNull(composite);
-    	reader.close();
-
-    	ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    	staxProcessor.write(composite, bos);
-
-    	// used for debug comparison
-    	// System.out.println(XML);
-    	// System.out.println(bos.toString());
-
-    	assertEquals(XML, bos.toString());
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyElementTestCase.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyElementTestCase.java
deleted file mode 100644
index d15bce9544..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyElementTestCase.java
+++ /dev/null
@@ -1,149 +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.assembly.xml.osoa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.ByteArrayOutputStream;
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class ReadWriteAnyElementTestCase {
-    private static final String XML_RECURSIVE_EXTENDED_ELEMENT =
-        "<?xml version='1.0' encoding='UTF-8'?>" +
-        "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://temp\" name=\"RecursiveExtendedElement\">" +
-         "<unknownElement>" +
-           "<subUnknownElement1 attribute=\"anyAttribute\" />" +
-           "<subUnknownElement2 />" +
-         "</unknownElement>" +
-        "</composite>";
-
-    private static final String XML_UNKNOWN_IMPL =
-        "<?xml version='1.0' encoding='UTF-8'?>" + 
-        "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://temp\" name=\"aaaa\" autowire=\"false\">" +
-         "<component name=\"unknownImpl\">" +
-           "<implementation.unknown class=\"raymond\" />" +
-           "<service name=\"service\">" +
-             "<binding.ws />" +
-           "</service>" +
-         "</component>" +
-        "</composite>";
-
-    private static final String XML_UNKNOWN_IMPL_WITH_INVALID_ATTRIBUTE =
-        "<?xml version='1.0' encoding='UTF-8'?>" + 
-        "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://temp\" name=\"aaaa\" autowire=\"false\">" +
-         "<component name=\"unknownImpl\">" +
-           "<implementation.unknown class=\"raymond\" />" +
-           "<service name=\"service\" requires=\"\">" +
-             "<binding.ws />" +
-           "</service>" +
-         "</component>" +
-        "</composite>";
-    
-    
-    private XMLInputFactory inputFactory;
-    private ExtensibleStAXArtifactProcessor staxProcessor;
-
-    @Before
-    public void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        inputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class);
-
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, XMLOutputFactory.newInstance(), null);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-    }
-
-    @Test
-    @Ignore("TBF: The processor needs to write the xml based on the QName of the elements")
-    public void testReadWriteExtendedRecursiveElement() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML_RECURSIVE_EXTENDED_ELEMENT));
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-        reader.close();
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, bos);
-
-        // used for debug comparison
-        // System.out.println(XML_RECURSIVE_EXTENDED_ELEMENT);
-        // System.out.println(bos.toString());
-
-        assertEquals(XML_RECURSIVE_EXTENDED_ELEMENT, bos.toString());
-        bos.close();
-    }
-
-    @Test
-    @Ignore("TBF: The processor needs to write the xml based on the QName of the elements")
-    public void testReadWriteUnknwonImpl() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML_UNKNOWN_IMPL));
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-        reader.close();
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, bos);
-
-        // used for debug comparison
-        // System.out.println(XML_UNKNOWN_IMPL);
-        // System.out.println(bos.toString());
-
-        assertEquals(XML_UNKNOWN_IMPL, bos.toString());
-        bos.close();
-    }
-
-    // @Test
-    @Ignore()
-    public void testReadWriteInvalidAttribute() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML_UNKNOWN_IMPL_WITH_INVALID_ATTRIBUTE));
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-        reader.close();
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, bos);
-
-        // used for debug comparison
-        // System.out.println(XML_UNKNOWN_IMPL);
-        // System.out.println(bos.toString());
-
-        assertEquals(XML_UNKNOWN_IMPL, bos.toString());
-        bos.close();
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteLocalCompositeTestCase.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteLocalCompositeTestCase.java
deleted file mode 100644
index 77a199acc9..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteLocalCompositeTestCase.java
+++ /dev/null
@@ -1,102 +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.assembly.xml.osoa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Test reading SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadWriteLocalCompositeTestCase {
-
-    private XMLInputFactory inputFactory;
-    private ExtensibleStAXArtifactProcessor staxProcessor;
-
-    private static final String LOCAL_COMPOSITE_XML = "<?xml version='1.0' encoding='UTF-8'?>"+
-    "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://localcalc\" name=\"LocalCalculator\" local=\"true\">"+
-    "</composite>";
-    
-    @Before
-    public void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-
-        StAXAttributeProcessorExtensionPoint staxAttributeProcessors = extensionPoints.getExtensionPoint(StAXAttributeProcessorExtensionPoint.class);
-        staxAttributeProcessors.addArtifactProcessor(new TestAttributeProcessor());
-        
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance(), null);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-    	
-    }
-
-    @Test
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("local.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite) staxProcessor.read(reader);
-        assertNotNull(composite);
-        assertTrue(composite.isLocal());
-        is.close();
-    }
-    
-    @Test
-    @Ignore("TBF: The processor needs to write the xml based on the QName of the elements")
-    public void testWriteComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("local.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite) staxProcessor.read(reader);
-        assertNotNull(composite);
-        assertTrue(composite.isLocal());
-        is.close();
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, bos);
-        System.out.println(bos.toString());
-        
-        assertEquals(LOCAL_COMPOSITE_XML, bos.toString());
-    }
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolvePolicyTestCase.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolvePolicyTestCase.java
deleted file mode 100644
index c242ce33fd..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolvePolicyTestCase.java
+++ /dev/null
@@ -1,171 +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.assembly.xml.osoa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.Definitions;
-import org.apache.tuscany.sca.policy.PolicySubject;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test reading SCA XML assembly documents.
- *
- * @version $Rev$ $Date$
- */
-public class ResolvePolicyTestCase {
-
-    private static URLArtifactProcessor<Object> documentProcessor;
-    private static ModelResolver resolver;
-    private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        resolver = new DefaultModelResolver();
-
-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
-        policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class);
-
-        // Create StAX processors
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessors.addArtifactProcessor(new TestPolicyProcessor());
-    }
-
-    @Test
-    public void testResolveConstrainingType() throws Exception {
-
-        URL url = getClass().getResource("CalculatorComponent.constrainingType");
-        URI uri = URI.create("CalculatorComponent.constrainingType");
-        ConstrainingType constrainingType = (ConstrainingType)documentProcessor.read(null, uri, url);
-        assertNotNull(constrainingType);
-        resolver.addModel(constrainingType);
-
-        url = getClass().getResource("TestAllCalculator.composite");
-        uri = URI.create("TestAllCalculator.composite");
-        Composite composite = (Composite)documentProcessor.read(null, uri, url);
-        assertNotNull(composite);
-
-        url = getClass().getResource("test_definitions.xml");
-        uri = URI.create("test_definitions.xml");
-        Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url);
-        assertNotNull(scaDefns);
-
-        preResolvePolicyTests(composite);
-        documentProcessor.resolve(scaDefns, resolver);
-        documentProcessor.resolve(composite, resolver);
-
-        // Comment out the post resolving test
-        // postResolvePolicyTests(composite);
-
-        assertEquals(composite.getConstrainingType(), constrainingType);
-        assertEquals(composite.getComponents().get(0).getConstrainingType(), constrainingType);
-    }
-
-    private void preResolvePolicyTests(Composite composite) {
-        assertNull(((PolicySubject)composite).getRequiredIntents().get(0).getDescription());
-        assertTrue(((PolicySubject)composite).getPolicySets().get(0).getProvidedIntents().isEmpty());
-
-        assertNull(composite.getServices().get(0).getRequiredIntents().get(0).getDescription());
-        assertTrue(composite.getServices().get(0).getPolicySets().get(0).getProvidedIntents().isEmpty());
-        assertNull(composite.getServices().get(0).getCallback().getRequiredIntents().get(0).getDescription());
-        assertTrue(composite.getServices().get(0).getCallback().getPolicySets().get(0).getProvidedIntents().isEmpty());
-
-        assertNull(composite.getComponents().get(0).getRequiredIntents().get(0).getDescription());
-        assertTrue(composite.getComponents().get(0).getPolicySets().get(0).getProvidedIntents().isEmpty());
-        assertNull(composite.getComponents().get(0).getServices().get(0).getRequiredIntents().get(0).getDescription());
-        assertTrue(composite.getComponents().get(0).getServices().get(0).getPolicySets().get(0).getProvidedIntents().isEmpty());
-        assertNull(composite.getComponents().get(0).getReferences().get(0).getRequiredIntents().get(0).getDescription());
-        assertTrue(composite.getComponents().get(0).getReferences().get(0).getPolicySets().get(0).getProvidedIntents().isEmpty());
-
-        assertNull(composite.getReferences().get(0).getRequiredIntents().get(0).getDescription());
-        assertTrue(composite.getReferences().get(0).getPolicySets().get(0).getProvidedIntents().isEmpty());
-        assertNull(composite.getReferences().get(0).getCallback().getRequiredIntents().get(0).getDescription());
-        assertTrue(composite.getReferences().get(0).getCallback().getPolicySets().get(0).getProvidedIntents().isEmpty());
-    }
-
-    private void postResolvePolicyTests(Composite composite) {
-        assertNotNull(((PolicySubject)composite).getRequiredIntents().get(0).getDescription());
-        assertFalse(((PolicySubject)composite).getPolicySets().get(0).getProvidedIntents().isEmpty());
-        assertNotNull(((PolicySubject)composite).getPolicySets().get(0).getProvidedIntents().get(1).getDescription());
-
-        assertNotNull(composite.getServices().get(0).getRequiredIntents().get(0).getDescription());
-        assertFalse(composite.getServices().get(0).getPolicySets().get(0).getProvidedIntents().isEmpty());
-        assertNotNull(composite.getServices().get(0).getPolicySets().get(0).getProvidedIntents().get(1).getDescription());
-        assertNotNull(composite.getServices().get(0).getCallback().getRequiredIntents().get(0).getDescription());
-        assertFalse(composite.getServices().get(0).getCallback().getPolicySets().get(0).getProvidedIntents().isEmpty());
-        assertNotNull(composite.getServices().get(0).getCallback().getPolicySets().get(0).getProvidedIntents().get(1).getDescription());
-
-        assertNotNull(composite.getComponents().get(0).getRequiredIntents().get(0).getDescription());
-        assertFalse(composite.getComponents().get(0).getPolicySets().get(0).getProvidedIntents().isEmpty());
-        assertNotNull(composite.getComponents().get(0).getPolicySets().get(0).getProvidedIntents().get(1).getDescription());
-        assertNotNull(composite.getComponents().get(0).getServices().get(0).getRequiredIntents().get(0).getDescription());
-        assertFalse(composite.getComponents().get(0).getServices().get(0).getPolicySets().get(0).getProvidedIntents().isEmpty());
-        assertNotNull(composite.getComponents().get(0).getServices().get(0).getPolicySets().get(0).getProvidedIntents().get(1).getDescription());
-        assertNotNull(composite.getComponents().get(0).getReferences().get(0).getRequiredIntents().get(0).getDescription());
-        assertFalse(composite.getComponents().get(0).getReferences().get(0).getPolicySets().get(0).getProvidedIntents().isEmpty());
-        assertNotNull(composite.getComponents().get(0).getReferences().get(0).getPolicySets().get(0).getProvidedIntents().get(1).getDescription());
-
-        assertNotNull(composite.getReferences().get(0).getRequiredIntents().get(0).getDescription());
-        assertFalse(composite.getReferences().get(0).getPolicySets().get(0).getProvidedIntents().isEmpty());
-        assertNotNull(composite.getReferences().get(0).getPolicySets().get(0).getProvidedIntents().get(1).getDescription());
-        assertNotNull(composite.getReferences().get(0).getCallback().getRequiredIntents().get(0).getDescription());
-        assertFalse(composite.getReferences().get(0).getCallback().getPolicySets().get(0).getProvidedIntents().isEmpty());
-        assertNotNull(composite.getReferences().get(0).getCallback().getPolicySets().get(0).getProvidedIntents().get(1).getDescription());
-
-
-    }
-
-    @Test
-    public void testResolveComposite() throws Exception {
-        URL url = getClass().getResource("Calculator.composite");
-        URI uri = URI.create("Calculator.composite");
-        Composite nestedComposite = (Composite)documentProcessor.read(null, uri, url);
-        assertNotNull(nestedComposite);
-        resolver.addModel(nestedComposite);
-
-        url = getClass().getResource("TestAllCalculator.composite");
-        uri = URI.create("TestAllCalculator.composite");
-        Composite composite = (Composite)documentProcessor.read(null, uri, url);
-
-        documentProcessor.resolve(composite, resolver);
-
-        assertEquals(composite.getComponents().get(2).getImplementation(), nestedComposite);
-    }
-
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolveTestCase.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolveTestCase.java
deleted file mode 100644
index 628cc6acd6..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolveTestCase.java
+++ /dev/null
@@ -1,103 +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.assembly.xml.osoa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-
-/**
- * Test resolving SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class ResolveTestCase {
-
-    private static XMLInputFactory inputFactory;
-    private static StAXArtifactProcessorExtensionPoint staxProcessors;
-    private static ModelResolver resolver; 
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        resolver = new DefaultModelResolver();
-    }
-
-    @Test
-    public void testResolveConstrainingType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
-        StAXArtifactProcessor<ConstrainingType> constrainingTypeReader = staxProcessors.getProcessor(Constants.CONSTRAINING_TYPE_QNAME);
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        ConstrainingType constrainingType = constrainingTypeReader.read(reader);
-        is.close();
-        assertNotNull(constrainingType);
-        resolver.addModel(constrainingType);
-
-        is = getClass().getResourceAsStream("TestAllCalculator.composite");
-        StAXArtifactProcessor<Composite> compositeReader = staxProcessors.getProcessor(Constants.COMPOSITE_QNAME);
-        reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = compositeReader.read(reader);
-        is.close();
-        assertNotNull(composite);
-        
-        compositeReader.resolve(composite, resolver);
-        
-        assertEquals(composite.getConstrainingType(), constrainingType);
-        assertEquals(composite.getComponents().get(0).getConstrainingType(), constrainingType);
-    }
-
-    @Test
-    public void testResolveComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        StAXArtifactProcessor<Composite> compositeReader = staxProcessors.getProcessor(Constants.COMPOSITE_QNAME);
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite nestedComposite = compositeReader.read(reader);
-        is.close();
-        assertNotNull(nestedComposite);
-        resolver.addModel(nestedComposite);
-
-        is = getClass().getResourceAsStream("TestAllCalculator.composite");
-        reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = compositeReader.read(reader);
-        is.close();
-        
-        compositeReader.resolve(composite, resolver);
-        
-        assertEquals(composite.getComponents().get(2).getImplementation(), nestedComposite);
-    }
-
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestAttributeProcessor.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestAttributeProcessor.java
deleted file mode 100644
index 173b987693..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestAttributeProcessor.java
+++ /dev/null
@@ -1,61 +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.assembly.xml.osoa;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A Policy Processor used for testing.
- *
- * @version $Rev$ $Date$
- */
-public class TestAttributeProcessor extends BaseStAXArtifactProcessor implements StAXAttributeProcessor<String> {
-	private static final QName ATTRIBUTE = new QName("http://test", "customAttribute");
-	
-    public QName getArtifactType() {
-        return ATTRIBUTE;
-    }
-
-    public String read(QName attributeName, XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        return reader.getAttributeValue(attributeName.getNamespaceURI(), attributeName.getLocalPart());
-    }
-
-    public void write(String value, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-    	writer.setPrefix(ATTRIBUTE.getPrefix(), ATTRIBUTE.getNamespaceURI());
-    	writer.writeAttribute(ATTRIBUTE.getLocalPart(), value);
-    } 
-
-    public Class<String> getModelType() {
-        return String.class;
-    }
-
-    public void resolve(String arg0, ModelResolver arg1) throws ContributionResolveException {
-    	
-    }
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestPolicyProcessor.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestPolicyProcessor.java
deleted file mode 100644
index 911b8b3ffd..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestPolicyProcessor.java
+++ /dev/null
@@ -1,82 +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.assembly.xml.osoa;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.policy.PolicyExpression;
-
-/**
- * A PolicyExpression Processor used for testing.
- *
- * @version $Rev$ $Date$
- */
-public class TestPolicyProcessor implements StAXArtifactProcessor<PolicyExpression> {
-
-    public QName getArtifactType() {
-        return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");
-    }
-
-    public PolicyExpression read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException {
-        return new MockPolicyImplOne();
-    }
-
-    public void write(PolicyExpression arg0, XMLStreamWriter arg1) throws ContributionWriteException,
-        XMLStreamException {
-    }
-
-    public Class<PolicyExpression> getModelType() {
-        return PolicyExpression.class;
-    }
-
-    public void resolve(PolicyExpression arg0, ModelResolver arg1) throws ContributionResolveException {
-    }
-
-    public class MockPolicyImplOne implements PolicyExpression {
-        public <T> T getPolicy() {
-            return null;
-        }
-
-        public void setName(QName name) {
-        }
-
-        public <T> void setPolicy(T policy) {
-        }
-
-        public QName getName() {
-            return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");
-        }
-
-        public boolean isUnresolved() {
-            return false;
-        }
-
-        public void setUnresolved(boolean unresolved) {
-        }
-
-    }
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingFactoryImpl.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingFactoryImpl.java
deleted file mode 100644
index 7d923d5483..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingFactoryImpl.java
+++ /dev/null
@@ -1,40 +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.assembly.xml.osoa;
-
-import org.apache.tuscany.sca.assembly.DistributedSCABinding;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-
-/**
- * A factory for the SCA binding model.
- *
- * @version $Rev$ $Date$
- */
-public class TestSCABindingFactoryImpl implements SCABindingFactory {
-    public SCABinding createSCABinding() {
-        return new TestSCABindingImpl();
-    }
-
-    public DistributedSCABinding createDistributedSCABinding() {
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingImpl.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingImpl.java
deleted file mode 100644
index 5645a6b1c9..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingImpl.java
+++ /dev/null
@@ -1,186 +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.assembly.xml.osoa;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.policy.ExtensionType;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySubject;
-
-/**
- * A test cheel for the SCA binding.
- * 
- * @version $Rev$ $Date$
- */
-public class TestSCABindingImpl implements SCABinding, OptimizableBinding, PolicySubject {
-    private String name;
-    private String uri;
-    private List<Object> extensions = new ArrayList<Object>();
-    
-    private Component targetComponent;
-    private ComponentService targetComponentService;
-    private Binding targetBinding;
-    
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private ExtensionType bindingType = new TestSCABindingType();
-
-    /**
-     * Constructs a new SCA binding.
-     */
-    protected TestSCABindingImpl() {
-    }
-    
-    public String getName() {
-        return name;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-    
-    public boolean isUnresolved() {
-        return false;
-    }
-    
-    public void setUnresolved(boolean unresolved) {
-    }
-
-    /**
-     * @see java.lang.Object#clone()
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-    /**
-     * @return the targetComponent
-     */
-    public Component getTargetComponent() {
-        return targetComponent;
-    }
-
-    /**
-     * @param targetComponent the targetComponent to set
-     */
-    public void setTargetComponent(Component targetComponent) {
-        this.targetComponent = targetComponent;
-    }
-
-    /**
-     * @return the targetComponentService
-     */
-    public ComponentService getTargetComponentService() {
-        return targetComponentService;
-    }
-
-    /**
-     * @param targetComponentService the targetComponentService to set
-     */
-    public void setTargetComponentService(ComponentService targetComponentService) {
-        this.targetComponentService = targetComponentService;
-    }
-
-    /**
-     * @return the targetBinding
-     */
-    public Binding getTargetBinding() {
-        return targetBinding;
-    }
-
-    /**
-     * @param targetBinding the targetBinding to set
-     */
-    public void setTargetBinding(Binding targetBinding) {
-        this.targetBinding = targetBinding;
-    }
-    
-    public List<PolicySet> getPolicySets() {
-        // TODO Auto-generated method stub
-        return policySets;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        // TODO Auto-generated method stub
-        return requiredIntents;
-    }
-
-    public ExtensionType getType() {
-        // TODO Auto-generated method stub
-        return bindingType;
-    }
-
-    public void setType(ExtensionType type) {
-        this.bindingType = type;
-    }
-    
-    private class TestSCABindingType implements ExtensionType {
-        private QName name = new QName("http://www.osoa.org/xmlns/sca/1.0","binding");
-        public QName getBaseType() {
-            return BINDING_BASE;
-        }
-
-        public QName getType() {
-            return name;
-        }
-
-        public void setType(QName type) {
-        }
-
-        public List<Intent> getAlwaysProvidedIntents() {
-            return Collections.emptyList();
-        }
-
-        public List<Intent> getMayProvidedIntents() {
-            return Collections.emptyList();
-        }
-
-        public boolean isUnresolved() {
-            return false;
-        }
-
-        public void setUnresolved(boolean unresolved) {
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WireTestCase.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WireTestCase.java
deleted file mode 100644
index ffc1ce9aa0..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WireTestCase.java
+++ /dev/null
@@ -1,148 +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.assembly.xml.osoa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.Definitions;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test the wiring of SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class WireTestCase {
-
-    private static XMLInputFactory inputFactory;
-    private static StAXArtifactProcessor<Object> staxProcessor;
-    private static ModelResolver resolver; 
-    private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor;
-    private static CompositeBuilder compositeBuilder;
-    private static Monitor monitor;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-        resolver = new DefaultModelResolver();
-        
-        MonitorFactory monitorFactory = new DefaultMonitorFactory();
-        monitor = monitorFactory.createMonitor();
-        
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        SCABindingFactory scaBindingFactory = new TestSCABindingFactoryImpl();
-        modelFactories.addFactory(scaBindingFactory);
-        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
-
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-
-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class);
-    }
-
-    @Test
-    public void testResolveConstrainingType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        ConstrainingType constrainingType = (ConstrainingType)staxProcessor.read(reader);
-        is.close();
-        assertNotNull(constrainingType);
-        resolver.addModel(constrainingType);
-
-        is = getClass().getResourceAsStream("TestAllCalculator.composite");
-        reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        is.close();
-        assertNotNull(composite);
-        
-        URL url = getClass().getResource("test_definitions.xml");
-        URI uri = URI.create("test_definitions.xml");
-        Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url);
-        assertNotNull(scaDefns);
-        
-        policyDefinitionsProcessor.resolve(scaDefns, resolver);
-        
-        staxProcessor.resolve(composite, resolver);
-        compositeBuilder.build(composite, null, monitor);
-        
-        assertEquals(composite.getConstrainingType(), constrainingType);
-        assertEquals(composite.getComponents().get(0).getConstrainingType(), constrainingType);
-    }
-
-    @Test
-    public void testResolveComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite nestedComposite = (Composite)staxProcessor.read(reader);
-        is.close();
-        assertNotNull(nestedComposite);
-        resolver.addModel(nestedComposite);
-
-        is = getClass().getResourceAsStream("TestAllCalculator.composite");
-        reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        is.close();
-        
-        URL url = getClass().getResource("test_definitions.xml");
-        URI uri = URI.create("test_definitions.xml");
-        Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url);
-        assertNotNull(scaDefns);
-        
-        policyDefinitionsProcessor.resolve(scaDefns, resolver);
-        
-        staxProcessor.resolve(composite, resolver);
-        compositeBuilder.build(composite, null, monitor);
-        
-        assertEquals(composite.getComponents().get(2).getImplementation(), nestedComposite);
-    }
-
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteAllTestCase.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteAllTestCase.java
deleted file mode 100644
index c7d18f94ec..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteAllTestCase.java
+++ /dev/null
@@ -1,158 +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.assembly.xml.osoa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.Definitions;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test writing SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class WriteAllTestCase {
-    private static XMLInputFactory inputFactory;
-    private static XMLOutputFactory outputFactory;
-    private static ExtensibleStAXArtifactProcessor staxProcessor;
-    private static ModelResolver resolver; 
-    private static CompositeBuilder compositeBuilder;
-    private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor;
-    private static Monitor monitor;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        outputFactory = XMLOutputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null);
-        resolver = new DefaultModelResolver();
-        
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        SCABindingFactory scaBindingFactory = new TestSCABindingFactoryImpl();
-        modelFactories.addFactory(scaBindingFactory);
-        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
-
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        
-        MonitorFactory monitorFactory = new DefaultMonitorFactory();
-        monitor = monitorFactory.createMonitor();
-        
-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class);
-    }
-
-    @Test
-    public void testReadWriteComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("TestAllCalculator.composite");
-        Composite composite = staxProcessor.read(is, Composite.class);
-        
-        verifyComposite(composite);
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, bos);
-        bos.close();
-        
-        ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-        composite = staxProcessor.read(bis, Composite.class);
-        
-        verifyComposite(composite);
-        
-    }
-
-    @Test
-    public void testReadWireWriteComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("TestAllCalculator.composite");
-        Composite composite = staxProcessor.read(is, Composite.class);
-        
-        URL url = getClass().getResource("test_definitions.xml");
-        URI uri = URI.create("test_definitions.xml");
-        Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url);
-        assertNotNull(scaDefns);
-        policyDefinitionsProcessor.resolve(scaDefns, resolver);
-        
-        staxProcessor.resolve(composite, resolver);
-        compositeBuilder.build(composite, null, monitor);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, bos);
-    }
-    
-    @Test
-    public void testReadWriteComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
-        ComponentType componentType = staxProcessor.read(is, ComponentType.class);
-        staxProcessor.resolve(componentType, resolver);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(componentType, bos);
-    }
-
-    @Test
-    public void testReadWriteConstrainingType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
-        ConstrainingType constrainingType = staxProcessor.read(is, ConstrainingType.class);
-        staxProcessor.resolve(constrainingType, resolver);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(constrainingType, bos);
-    }
-    
-    private void verifyComposite(Composite composite) {
-        assertEquals(composite.getProperties().get(0).getName(),"prop1");
-        assertEquals(composite.getProperties().get(0).isMany(), true);
-        assertEquals(composite.getProperties().get(1).getName(),"prop2");
-        assertEquals(composite.getProperties().get(1).isMustSupply(), true);
-        assertEquals(composite.getProperties().get(0).getXSDType(), new QName("http://foo", "MyComplexType"));
-        assertEquals(composite.getProperties().get(1).getXSDElement(), new QName("http://www.osoa.org/xmlns/sca/1.0", "MyComplexPropertyValue1"));
-    }
-
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteNamespacesTestCase.java b/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteNamespacesTestCase.java
deleted file mode 100644
index 66ddf3b003..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteNamespacesTestCase.java
+++ /dev/null
@@ -1,95 +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.assembly.xml.osoa;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test writing SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class WriteNamespacesTestCase {
-    private static StAXArtifactProcessor<Composite> compositeProcessor;
-    private static XMLOutputFactory outputFactory;
-    private static XMLInputFactory inputFactory;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        //outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-        inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        
-        StAXArtifactProcessorExtensionPoint artifactProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        compositeProcessor = artifactProcessors.getProcessor(Constants.COMPOSITE_QNAME);
-    }
-
-    @Test
-    public void testReadWriteComposite() throws Exception {
-        
-        // Read
-        InputStream is = getClass().getResourceAsStream("NestedCalculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = compositeProcessor.read(reader);
-        Component component = composite.getComponents().get(0);
-        Composite implementation = (Composite)component.getImplementation();
-        QName qname = implementation.getName();
-
-        // Write
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(bos);
-        compositeProcessor.write(composite, writer);
-        System.out.println(bos);
-        
-        // Read again
-        is = new ByteArrayInputStream(bos.toByteArray());
-        reader = inputFactory.createXMLStreamReader(is);
-        composite = compositeProcessor.read(reader);
-        
-        // Compare
-        component = composite.getComponents().get(0);
-        implementation = (Composite)component.getImplementation();
-        
-        assertEquals(qname, implementation.getName());
-    }
-
-}
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Calculator.composite b/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Calculator.composite
deleted file mode 100644
index 614489d2d5..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Calculator.composite
+++ /dev/null
@@ -1,59 +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:x="http://x"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-	
-	<service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.CalculatorService"/>
-    </service>
-    
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService"  multiplicity="0..1" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-    
-    <x:unknownElement uknAttr="attribute1">
-		<y:subUnknownElement1 xmlns:y="http://y" uknAttr1="attribute2"/>
-		<x:subUnknownElement2 />
-	</x:unknownElement>
-		
-</composite>
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorComponent.constrainingType b/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorComponent.constrainingType
deleted file mode 100644
index d6ec9b0ff0..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorComponent.constrainingType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<constrainingType xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="CalculatorComponent">
-
-  <service name="CalculatorService">
-        <interface.java class="calculator.CalculatorService" />
-  </service>
-
-  <reference name="divideService" multiplicity="1..1">
-        <interface.java class="calculator.DivideService" />
-  </reference>  
-
-</constrainingType>              
-       
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorImpl.componentType b/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorImpl.componentType
deleted file mode 100644
index 299eb8c197..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorImpl.componentType
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
-  <service name="CalculatorService">
-        <interface.java interface="calculator.CalculatorService" />
-  </service>
-
-  <reference name="divideService">
-        <interface.java interface="calculator.DivideService" />
-  </reference>  
-
-</componentType>              
-       
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/JavaScriptReference.composite b/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/JavaScriptReference.composite
deleted file mode 100644
index 308ad8754b..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/JavaScriptReference.composite
+++ /dev/null
@@ -1,37 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           name="JavaScriptReference">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>
-    </component>
-
-    <component name="ReferenceComponent">
-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/references/reference.js"/>
-        <reference name="ref" target="TargetComponent" />
-    </component>
-
-    <component name="TargetComponent">
-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.references.HelloWorldTarget"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Multiplicity.composite b/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Multiplicity.composite
deleted file mode 100644
index 369cbc00bf..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Multiplicity.composite
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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" name="composite1" targetNamespace="http://temp"> 
-  <component name="data7"> 
-    <implementation.java class="temp.EchoImpl"/> 
-    <service name="Echo"> 
-      <interface.wsdl interface="http://echo.webservice#wsdl.interface(Echo)"/> 
-    </service> 
-    <reference multiplicity="0..n" name="reference" requires=""/> 
-  </component> 
-
-  <reference multiplicity="1..n" name="reference" promote="" requires=""/> 
-</composite>
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/NestedCalculator.composite b/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/NestedCalculator.composite
deleted file mode 100644
index 6f71f0a7f1..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/NestedCalculator.composite
+++ /dev/null
@@ -1,29 +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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.composite xmlns:n="http://inner" name="n:InnerCalculator"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/RMIBindingTest.composite b/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/RMIBindingTest.composite
deleted file mode 100644
index 2a0bcf0f76..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/RMIBindingTest.composite
+++ /dev/null
@@ -1,43 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           name="HelloWorldRmiComposite">
-
-	<service name="HelloWorldRmiService" promote="HelloWorldServiceComponent">
-        <interface.java interface="helloworld.HelloWorldService"/>
-        <tuscany:binding.rmi uri="rmi://localhost:8099/HelloWorldRemoteService"   />
-    </service>
-      
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="helloworld.HelloWorldImpl"/>
-    </component>   
-  
-   <component name="HelloWorldRmiServiceComponent">
-        <implementation.java class="helloworld.HelloWorldRmiImpl"/>
-        <reference name="extService"></reference>
-    </component>        
-           
-  	<reference name="HelloWorldRmiReference" promote="HelloWorldRmiServiceComponent/extService">
-        <interface.java interface="helloworld.HelloWorldService"/>
-        <tuscany:binding.rmi uri="rmi://localhost:8099/HelloWorldRemoteService"   />
-    </reference>
-
-</composite>
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllCalculator.composite b/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllCalculator.composite
deleted file mode 100644
index c52c8f79a9..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllCalculator.composite
+++ /dev/null
@@ -1,123 +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 autowire="false" constrainingType="tns:CalculatorComponent" local="true" name="TestAllCalculator" policySets="sns:SecureReliablePolicy"
-    requires="cns:confidentiality" targetNamespace="http://calc" xmlns:tns="http://calc"
-    xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0 "
-    xmlns:ext="http://extension"
-    xmlns:cns="http://test" xmlns:sns="http://test">
-
-    <include name="tns:TestAllDivide"/>
-    <ext:testExtension/>
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent/CalculatorService" requires="cns:confidentiality"
-        policySets="sns:SecureReliablePolicy">
-        <ext:testExtension/>
-        <interface.java interface="calculator.CalculatorService" callbackInterface="calculator.CalculatorCallback" />
-        <operation name="add" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" />
-
-        <binding.ws name="CalculatorWS" policySets="sns:SecureReliablePolicy" port="" requires="cns:confidentiality" uri="http://calc/ws">
-        </binding.ws>
-
-        <callback policySets="sns:SecureReliablePolicy" requires="cns:confidentiality">
-	        <ext:testExtension/>
-            <binding.ws name="CalculatorCallbackWS" policySets="" port="" requires="" uri="http://calc/callback/ws">
-            </binding.ws>
-        </callback>
-    </service>
-
-    <component name="CalculatorServiceComponent" autowire="false" constrainingType="tns:CalculatorComponent"
-        policySets="sns:SecureReliablePolicy" requires="cns:confidentiality">
-        <ext:testExtension/>
-        <service name="CalculatorService" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality">
-            <interface.java interface="calculator.CalculatorService" callbackInterface="calculator.CalculatorCallback" />
-        </service>
-
-        <reference name="addService" target="AddServiceComponent/AddService" autowire="false" multiplicity="1..1"
-            policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" wiredByImpl="false">
-            <ext:testExtension/>
-            <interface.java interface="calculator.AddService" callbackInterface="calculator.AddCallback" />
-        </reference>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" />
-        <reference name="divideService" target="DivideServiceComponent" />
-
-        <property name="round" type="xsd:boolean" many="false">true</property>
-
-        <implementation.java class="calculator.CalculatorServiceImpl" policySets="" requires="" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <service name="AddService">
-            <interface.java interface="calculator.AddService" />
-        </service>
-        <implementation.java class="calculator.AddServiceImpl" />
-    </component>
-
-    <component name="NestedCompositeComponent">
-        <service name="CalculatorService">
-            <interface.java interface="calculator.CalculatorService" />
-        </service>
-        <implementation.composite name="tns:Calculator" />
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl" />
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl" />
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl" />
-    </component>
-
-    <reference name="MultiplyService" promote="CalculatorServiceComponent/multiplyService" policySets="sns:SecureReliablePolicy"
-        requires="cns:confidentiality">
-        <interface.java interface="calculator.MultiplyService" callbackInterface="calculator.MultiplyCallback" />
-
-        <binding.ws name="MultiplyWS" port="" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" uri="http://calc/ws">
-        </binding.ws>
-
-        <callback policySets="sns:SecureReliablePolicy" requires="cns:confidentiality">
-            <binding.ws name="MultiplyCallbackWS" port="" uri="http://calc/callback/ws" policySets="sns:SecureReliablePolicy"
-                requires="cns:confidentiality">
-            </binding.ws>
-        </callback>
-    </reference> 
-
-    <property name="prop1" xmlns:foo="http://foo" many="true" type="foo:MyComplexType">
-    	<ext:testExtension/>
-   	    <MyComplexPropertyValue1 xsi:type="foo:MyComplexType" attr="bar">
-            <foo:a>AValue</foo:a>
-            <bar:b xmlns:bar="http://bar">InterestingURI</bar:b>
-        </MyComplexPropertyValue1>
-        <MyComplexPropertyValue2 xsi:type="foo:MyComplexType" attr="zing">
-            <foo:a>BValue</foo:a>
-            <bar:b xmlns:bar="http://bar">BoringURI</bar:b>
-        </MyComplexPropertyValue2>
-    </property>
-    
-    <property name="prop2" xmlns:foo="http://foo" mustSupply="true" element="MyComplexPropertyValue1"/>
-
-</composite>
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllDivide.composite b/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllDivide.composite
deleted file mode 100644
index d59e69209d..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllDivide.composite
+++ /dev/null
@@ -1,56 +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 autowire="false"
-	constrainingType="tns:Calculator"
-	local="true"
-	name="TestAllDivide"
-	policySets="" requires=""
-	targetNamespace="http://calc"
-	xmlns:tns="http://calc"
-	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0 ">
-	
-  <include name="tns:CompleteDivide"/>
-  
-  <service name="DivideService" policySets="" promote="CalculatorDivideComponent/DivideService" requires="">
-    <interface.java interface="calculator.DivideService" callbackInterface="calculator.DivideCallback"/>
-    <operation name="divide" policySets="" requires=""/>
-
-    <binding.ws name="CalculatorWS" policySets="" port="" requires="" uri="http://calc/ws">
-      <operation name="divide" policySets="" requires=""/>
-    </binding.ws>
-
-    <callback policySets="" requires="">
-      <binding.ws name="CalculatorCallbackWS" policySets="" port="" requires="" uri="http://calc/callback/ws">
-        <operation name="divideCallback" policySets="" requires=""/>
-      </binding.ws>
-    </callback>
-  </service>
-  
-   <component name="CalculatorDivideComponent" autowire="false" constrainingType="tns:CalculatorServiceComponent" policySets="" requires="">
-   		<service name="DivideService" policySets="" requires="">
-   			<interface.java interface="calculator.DivideService" callbackInterface="calculator.DivideCallback"/>
-   		</service>
-		<implementation.java class="calculator.DivideImpl" policySets="" requires=""/>
-   </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllPolicyCalculator.composite b/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllPolicyCalculator.composite
deleted file mode 100644
index d0f66676e0..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllPolicyCalculator.composite
+++ /dev/null
@@ -1,126 +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 autowire="false" constrainingType="tns:CalculatorComponent" local="true" name="TestAllCalculator" 
-    requires="cns:tuscanyIntent_1" targetNamespace="http://calc" xmlns:tns="http://calc"
-    xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0 "
-    xmlns:ext="http://extension"
-    xmlns:cns="http://test" xmlns:sns="http://test">
-
-    <include name="tns:TestAllDivide"/>
-    <ext:testExtension/>
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent/CalculatorService" requires="cns:tuscanyIntent_2 cns:tuscanyIntent_1">
-        <ext:testExtension/>
-        <interface.java interface="calculator.CalculatorService" callbackInterface="calculator.CalculatorCallback" />
-        <operation name="add" requires="cns:tuscanyIntent_6"/>
-
-        <binding.ws name="CalculatorWS" port="" requires="cns:tuscanyIntent_3" uri="http://calc/ws">
-        </binding.ws>
-
-        <callback requires="cns:tuscanyIntent_4">
-	        <ext:testExtension/>
-            <binding.ws name="CalculatorCallbackWS" policySets="" port="" requires="cns:tuscanyIntent_5" uri="http://calc/callback/ws">
-            </binding.ws>
-        </callback>
-    </service>
-
-    <component name="CalculatorServiceComponent" autowire="false" constrainingType="tns:CalculatorComponent"
-        requires="cns:tuscanyIntent_2 cns:tuscanyIntent_3">
-        <ext:testExtension/>
-        <service name="CalculatorService" requires="cns:tuscanyIntent_3">
-            <interface.java interface="calculator.CalculatorService" callbackInterface="calculator.CalculatorCallback" />
-            <binding.ws name="CalculatorCallbackWS" policySets="" port="" requires="cns:tuscanyIntent_4" uri="http://calc/callback/ws">
-            </binding.ws>
-            <callback>
-           	</callback>
-        </service>
-
-        <reference name="addService" target="AddServiceComponent/AddService" autowire="false" multiplicity="1..1"
-            requires="cns:tuscanyIntent_3 cns:tuscanyIntent_2.qualified" wiredByImpl="false">
-            <ext:testExtension/>
-            <interface.java interface="calculator.AddService" callbackInterface="calculator.AddCallback" />
-            <binding.ws name="addServiceWSRef" policySets="" port="" requires="cns:tuscanyIntent_4" uri="http://calc/callback/ws">
-            </binding.ws>
-        </reference>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" />
-        <reference name="divideService" target="DivideServiceComponent" />
-
-        <property name="round" type="xsd:boolean" many="false">true</property>
-
-        <implementation.java class="calculator.CalculatorServiceImpl" policySets="" requires="cns:tuscanyIntent_4" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <service name="AddService">
-            <interface.java interface="calculator.AddService" />
-        </service>
-        <implementation.java class="calculator.AddServiceImpl" />
-    </component>
-
-    <component name="NestedCompositeComponent">
-        <service name="CalculatorService">
-            <interface.java interface="calculator.CalculatorService" />
-        </service>
-        <implementation.composite name="tns:Calculator" />
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl" />
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl" />
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl" />
-    </component>
-
-    <reference name="MultiplyService" promote="CalculatorServiceComponent/multiplyService" 
-        requires="cns:tuscanyIntent_2">
-        <interface.java interface="calculator.MultiplyService" callbackInterface="calculator.MultiplyCallback" />
-
-        <binding.ws name="MultiplyWS" port="" requires="cns:tuscanyIntent_3" uri="http://calc/ws">
-        </binding.ws>
-
-        <callback policySets="sns:SecureReliablePolicy" requires="cns:tuscanyIntent_3">
-            <binding.ws name="MultiplyCallbackWS" port="" uri="http://calc/callback/ws" 
-                requires="cns:tuscanyIntent_4">
-            </binding.ws>
-        </callback>
-    </reference>
-
-    <property name="prop1" xmlns:foo="http://foo">
-    	<ext:testExtension/>
-   	    <MyComplexPropertyValue1 xsi:type="foo:MyComplexType" attr="bar">
-            <foo:a>AValue</foo:a>
-            <bar:b xmlns:bar="http://bar">InterestingURI</bar:b>
-        </MyComplexPropertyValue1>
-        <MyComplexPropertyValue2 xsi:type="foo:MyComplexType" attr="zing">
-            <foo:a>BValue</foo:a>
-            <bar:b xmlns:bar="http://bar">BoringURI</bar:b>
-        </MyComplexPropertyValue2>
-    </property>
-
-</composite>
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/another_test_definitions.xml b/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/another_test_definitions.xml
deleted file mode 100644
index be694f289f..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/another_test_definitions.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<sca:definitions xmlns="http://test"
- 			targetNamespace="http://test"
- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- simple intent -->
- <sca:intent name="tuscanyIntent_1" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
-             <sca:qualifier name="qualified" default="true"/>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_2" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
-             <sca:qualifier name="qualified" default="true"/>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_3" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_4" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
-<sca:intent name="tuscanyIntent_5" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_6" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_7" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_8" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_9" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_10" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
-</sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/local.composite b/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/local.composite
deleted file mode 100644
index abeab18a92..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/local.composite
+++ /dev/null
@@ -1,27 +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:calc="http://localcalc"
-	xmlns:test="http://testlocal"
-	targetNamespace="http://localcalc"
-	name="LocalCalculator"
-      local="true">
-
-</composite>
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/test_definitions.xml b/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/test_definitions.xml
deleted file mode 100644
index 4616d07262..0000000000
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/test_definitions.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://test"
-    xmlns:test="http://test" xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <!-- Extension Types Metadata -->
-    <implementationType type="sca:implementation.java" alwaysProvides="test:logging" mayProvide="test:tracing" />
-    <bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality" mayProvide="test:integrity" />
-
-    <!-- Intents and Policysets to assume targetnamespace -->
-    <intent name="TestIntentOne" constrains="sca:binding">
-        <description>
-            Test Intent
-             </description>
-    </intent>
-
-    <intent name="TestIntentTwo" constrains="sca:binding" requires="test:TestIntentOne">
-        <description>
-            Protect messages from unauthorized reading or modification
-             </description>
-    </intent>
-
-    <policySet name="TestPolicySetOne" provides="test:TestIntentOne" appliesTo="sca:binding.ws"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:PolicyAttachment>
-            <!-- policy expression and policy subject for
-                 "basic authentication" -->
-        </wsp:PolicyAttachment>
-        <wsp:PolicyAttachment>
-            <!-- policy expression and policy subject for
-                "reliability" -->
-        </wsp:PolicyAttachment>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="SecureReliablePolicy" provides="test:confidentiality.transport test:integrity" appliesTo="sca:binding.ws"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:PolicyAttachment>
-            <!-- policy expression and policy subject for
-                 "basic authentication" -->
-        </wsp:PolicyAttachment>
-        <wsp:PolicyAttachment>
-            <!-- policy expression and policy subject for
-                "reliability" -->
-        </wsp:PolicyAttachment>
-    </policySet>
-
-    <policySet name="SecureMessagingPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="test:confidentiality" default="transport">
-            <qualifier name="transport">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "transport" alternative -->
-                </wsp:PolicyAttachment>
-                <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
-            </qualifier>
-            <qualifier name="message">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "message" alternative" -->
-                </wsp:PolicyAttachment>
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="SecurityPolicy" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="test:confidentiality" default="message">
-            <qualifier name="message">
-                <wsp:PolicyAttachment>
-                    <!-- policy attachment for body encryption -->
-                </wsp:PolicyAttachment>
-                <wsp:PolicyAttachment>
-                    <!-- policy attachment for whole message encryption -->
-                </wsp:PolicyAttachment>
-            </qualifier>
-            <qualifier name="transport">
-                <wsp:PolicyAttachment>
-                    <!-- policy attachment for transport encryption -->
-                </wsp:PolicyAttachment>
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="BasicAuthMsgProtSecurity" provides="test:authentication test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0">
-        <policySetReference name="test:AuthenticationPolicies" />
-        <policySetReference name="test:ConfidentialityPolicies" />
-    </policySet>
-
-    <policySet name="AuthenticationPolicies" provides="test:authentication" appliesTo="binding.ws"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:PolicyAttachment>
-            <!-- policy expression and policy subject for "basic
-        authentication" -->
-        </wsp:PolicyAttachment>
-    </policySet>
-
-    <policySet name="ConfidentialityPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="test:confidentiality" default="transport">
-            <qualifier name="transport">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "transport"
-                alternative -->
-                </wsp:PolicyAttachment>
-                <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
-            </qualifier>
-            <qualifier name="message">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "message"
-                alternative" -->
-                    ...
-                </wsp:PolicyAttachment>
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="SecureWSPolicy" provides="test:confidentiality" appliesTo="sca:binding.ws"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy>
-            <wsp:ExactlyOne>
-                <wsp:All>
-                    <sp:SecurityToken>
-                        <sp:TokenType>sp:X509v3</sp:TokenType>
-                    </sp:SecurityToken>
-                    <sp:UsernameToken />
-                    <sp:SignedParts />
-                    <sp:EncryptedParts>
-                        <sp:Body />
-                    </sp:EncryptedParts>
-                    <sp:TransportBinding>
-                        <sp:IncludeTimeStamp />
-                    </sp:TransportBinding>
-                </wsp:All>
-            </wsp:ExactlyOne>
-        </wsp:Policy>
-    </policySet>
-
-    <!-- profile intent -->
-    <intent name="reliableMessageProtection" constrains="sca:binding" requires="test:messageProtection">
-        <description>
-            Protect messages from unauthorized reading or modification
-             </description>
-    </intent>
-
-    <intent name="messageProtection" constrains="sca:binding" requires="test:confidentiality test:integrity">
-        <description>
-            Protect messages from unauthorized reading or modification
-             </description>
-    </intent>
-
-    <!-- simple intent -->
-    <intent name="confidentiality" constrains="sca:binding">
-        <description>
-            Communitcation thro this binding must prevent
-            unauthorized users from reading the messages.
-        </description>
-        <qualifier name="transport" />
-        <qualifier name="message" default="true" />
-    </intent>
-
-    <intent name="integrity" constrains="sca:binding">
-        <description>
-            Communitcation thro this binding must prevent
-            unauthorized modification of the messages.
-             </description>
-    </intent>
-
-    <intent name="authentication" constrains="sca:binding">
-        <description>
-            Communitcation thro this binding required
-            Authentication.
-             </description>
-    </intent>
-
-    <intent name="logging" constrains="sca:implementation">
-        <description>
-            All messages to and from this implementation must be logged
-             </description>
-    </intent>
-
-    <intent name="tracing" constrains="sca:implementation.java">
-        <description>
-            Need to figure out some description for this 
-             </description>
-    </intent>
-
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/LICENSE b/java/sca-contrib/modules/assembly-xsd-osoa/LICENSE
deleted file mode 100644
index 646cd58e09..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/LICENSE
+++ /dev/null
@@ -1,281 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
-===============================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================
-
-This module includes XSD files under the following SCA Collaboration license:
-
-License for the Service Component Architecture JavaDoc, Interface Definition files and XSD files.
-
-Permission to copy, make derivative works of, and distribute the Service Component Architecture 
-JavaDoc, Interface Definition Files and XSD files in any medium without fee or royalty as part 
-of a compliant implementation of the Service Component Architecture Specification is hereby granted.  
-The Service Components Architecture Specification may be found at the following location:
-
-	http://www.osoa.org/download/attachments/35/SCA_AssemblyModel_V100.pdf
-
-THE SERVICE COMPONENT ARCHITECTURE SPECIFICATION AND THE JAVADOC, INTERFACE DEFINITION FILES AND XSD FILES 
-ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS 
-SPECIFICATION OR THE JAVADOC, INTERFACE DEFINITION FILES AND XSD FILES AND THE IMPLEMENTATION OF THEIR CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE 
-SERVICE COMPONENT ARCHITECTURE SPECIFICATION OR THE JAVADOC, INTERFACE DEFINTION FILES OR XSD FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or 
-publicity pertaining to the Service Component Architecture Specification or its contents without specific, 
-written prior permission. Title to copyright in the Service Component Architecture Specification and the 
-JavaDoc, Interface Definition Files and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-===============================================================================
-
-This module includes XSD files under the following W3C(r) Software License:
-
-W3C(r) SOFTWARE NOTICE AND LICENSE
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other related items) 
-is being provided by the copyright holders under the following license. By obtaining, 
-using and/or copying this work, you (the licensee) agree that you have read, understood, 
-and will comply with the following terms and conditions.
-
-Permission to copy, modify, and distribute this software and its documentation, with or 
-without modification, for any purpose and without fee or royalty is hereby granted, provided 
-that you include the following on ALL copies of the software and documentation or portions 
-thereof, including modifications:
-
-   1. The full text of this NOTICE in a location viewable to users of the redistributed or 
-      derivative work.
-   2. Any pre-existing intellectual property disclaimers, notices, or terms and conditions. 
-      If none exist, the W3C Software Short Notice should be included (hypertext is preferred,
-      text is permitted) within the body of any redistributed or derivative code.
-   3. Notice of any changes or modifications to the files, including the date changes were 
-      made. (We recommend you provide URIs to the location from which the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO 
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES 
-OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR 
-DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER 
-RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL 
-DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or publicity 
-pertaining to the software without specific, written prior permission. Title to copyright 
-in this software and any associated documentation will at all times remain with copyright 
-holders.
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/META-INF/MANIFEST.MF b/java/sca-contrib/modules/assembly-xsd-osoa/META-INF/MANIFEST.MF
deleted file mode 100644
index 309ce0b003..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Assembly Model XML Schemas

-Bnd-LastModified: 1225397088359

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-ManifestVersion: 2

-Bundle-Description: Apache Tuscany SCA Assembly Model XML Schemas

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-DocURL: http://www.apache.org/

-Bundle-SymbolicName: org.apache.tuscany.sca.assembly.xsd.osoa

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/NOTICE b/java/sca-contrib/modules/assembly-xsd-osoa/NOTICE
deleted file mode 100644
index 91c3b75575..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/NOTICE
+++ /dev/null
@@ -1,23 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
-This product also includes software under the W3C(r) Software License
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-Copyright (c) 2004 World Wide Web Consortium (Massachusetts Institute of Technology, 
-European Research Consortium for Informatics and Mathematics, Keio University). 
-All Rights Reserved. This work is distributed under the W3C(r) Software License [1] 
-in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-    [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/pom.xml b/java/sca-contrib/modules/assembly-xsd-osoa/pom.xml
deleted file mode 100644
index 88c55f9bdd..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/pom.xml
+++ /dev/null
@@ -1,30 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-assembly-xsd-osoa</artifactId>
-    <name>Apache Tuscany SCA Assembly Model XSD Files based on OSOA spec</name>
-</project>
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
deleted file mode 100644
index 69b2701e30..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ /dev/null
@@ -1,18 +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. 
-#
-tuscany-sca.xsd
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-all.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-all.xsd
deleted file mode 100644
index 68455a3474..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-all.xsd
+++ /dev/null
@@ -1,32 +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 xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <include schemaLocation="sca.xsd"/>
-
-    <include schemaLocation="sca-binding-ejb.xsd"/>
-
-    <include schemaLocation="sca-implementation-bpel.xsd"/>
-    <include schemaLocation="sca-implementation-jee.xsd"/>
-    <include schemaLocation="sca-implementation-web.xsd"/>
-
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-ejb.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-ejb.xsd
deleted file mode 100644
index 26bedfcce5..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-ejb.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-   <include schemaLocation="sca-core.xsd"/>
-
-   <element name="binding.ejb" type="sca:EJBSessionBeanBinding" 
-            substitutionGroup="sca:binding" />
-
-    <simpleType name="BeanType">
-        <restriction base="string">
-            <enumeration value="stateless"/>
-            <enumeration value="stateful"/>
-        </restriction>
-    </simpleType>
-
-    <simpleType name="VersionValue">
-        <restriction base="string">
-            <enumeration value="EJB2"/>
-            <enumeration value="EJB3"/>
-        </restriction>
-    </simpleType>
-
-
-     <complexType name="EJBSessionBeanBinding">
-	 <complexContent>
-	  <extension base="sca:Binding">
-         <sequence>
-            <any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="homeInterface" type="NCName" use="optional"/>
-         <attribute name="ejb-link-name" type="NCName" use="optional"/>
-         <attribute name="session-type" type="sca:BeanType" use="optional" default="stateless"/>
-         <attribute name="ejb-version" type="sca:VersionValue" use="optional" default="EJB2"/>
-         <anyAttribute namespace="##any" processContents="lax"/>
-	  </extension>
-	 </complexContent>
-     </complexType>
-
-</schema>
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-sca.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-sca.xsd
deleted file mode 100644
index 02703402ef..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-sca.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 

-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 

-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-        elementFormDefault="qualified">

-

-    <include schemaLocation="sca-core.xsd"/>

-

-    <element name="binding.sca" type="sca:SCABinding" 

-    	substitutionGroup="sca:binding"/>

-    <complexType name="SCABinding">

-        <complexContent>

-            <extension base="sca:Binding">

-		    	<sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-		    	</sequence>

-                <anyAttribute namespace="##any" processContents="lax"/>

-            </extension>

-        </complexContent>

-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-webservice.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-webservice.xsd
deleted file mode 100644
index 2dd44f8e06..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-webservice.xsd
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-    xmlns:wsa="http://www.w3.org/2004/12/addressing"
-    elementFormDefault="qualified">
-    
-    <import namespace="http://www.w3.org/2004/08/wsdl-instance"
-            schemaLocation="wsdli.xsd" />
-    <!-- import namespace="http://www.w3.org/2005/08/addressing" 
-            schemaLocation="ws-addr.xsd" /-->
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.ws" type="sca:WebServiceBinding"
-             substitutionGroup="sca:binding"/>
-    <complexType name="WebServiceBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <!-- element ref="wsa:EndpointReference" minOccurs="0"
-                         maxOccurs="unbounded"/-->                  
-                    <any namespace="##other" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-			 <attribute name="wsdlElement" type="anyURI" use="optional"/>
-             <attribute ref="wsdli:wsdlLocation" use="optional"/>
-             <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-contributions.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-contributions.xsd
deleted file mode 100644
index caf5d8010f..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-contributions.xsd
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-       
-    <include schemaLocation="sca-core.xsd"/>
-       
-    <element name="contribution" type="sca:ContributionType"/>        
-    <complexType name="ContributionType">
-         <sequence>
-             <element name="deployable" type="sca:DeployableType" minOccurs="0" maxOccurs="unbounded"/>
-             <element ref="sca:import" minOccurs="0" maxOccurs="unbounded"/>
-             <element ref="sca:export" minOccurs="0" maxOccurs="unbounded"/>
-             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>        
-
-    <complexType name="DeployableType">
-         <sequence>
-             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="composite" type="QName" use="required"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>        
-
-    <element name="import" type="sca:ImportType"/>
-    <complexType name="ImportType">
-         <sequence>
-             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="namespace" type="string" use="required"/>
-        <attribute name="location" type="anyURI" use="required"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>        
-
-    <element name="export" type="sca:ExportType"/>
-    <complexType name="ExportType">
-         <sequence>
-             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="namespace" type="string" use="required"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>  
-    
-    <element name="import.resource" type="sca:ImportResourceType" substitutionGroup="sca:import"/>
-    <complexType name="ImportResourceType">
-        <complexContent>
-            <extension base="sca:ImportType">
-                 <attribute name="uri" type="anyURI" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>   
-    
-    <element name="export.resource" type="sca:ExportResourceType" substitutionGroup="sca:export"/>
-    <complexType name="ExportResourceType">
-        <complexContent>
-            <extension base="sca:ExportType">
-                <attribute name="uri" type="anyURI" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>  
-</schema> 
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-core.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-core.xsd
deleted file mode 100644
index f03d0eab01..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-core.xsd
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <element name="componentType" type="sca:ComponentType"/>
-    <complexType name="ComponentType">
-    	<sequence>
-             <choice minOccurs="0" maxOccurs="1">
-	             <element ref="sca:implementation"/>
-	             <any namespace="##other" processContents="lax"/>
-             </choice>
-        	<choice minOccurs="0" maxOccurs="unbounded">
-            	<element name="service" type="sca:ComponentService" />
-            	<element name="reference" type="sca:ComponentReference"/>
-            	<element name="property" type="sca:Property"/>
-        	</choice>
-        	<!-- 
-        	<any namespace="##other" processContents="lax" minOccurs="0" 
-        		maxOccurs="unbounded"/>  
-        	-->
-        </sequence>
-        <attribute name="constrainingType" type="QName" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-
-    <element name="composite" type="sca:Composite"/>
-    <complexType name="Composite">
-         <sequence>
-             <choice minOccurs="0" maxOccurs="unbounded">
-	             <element name="include" type="sca:Include"/>
-                 <element name="service" type="sca:Service"/>
-                 <element name="property" type="sca:Property"/>
-                 <element name="component" type="sca:Component"/>
-                 <element name="reference" type="sca:Reference"/>
-                 <element name="wire" type="sca:Wire"/>
-                 <!-- <any namespace="##other" processContents="lax"  minOccurs="0" maxOccurs="unbounded"/>  -->  
-             </choice>
-             <any namespace="##other" processContents="lax" minOccurs="0" 
-             	maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="targetNamespace" type="anyURI" use="optional"/>
-        <attribute name="local" type="boolean" use="optional" default="false"/>
-        <attribute name="autowire" type="boolean" use="optional" default="false"/>
-        <attribute name="constrainingType" type="QName" use="optional"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-    <complexType name="Service">
-    	<sequence>
-    		<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-    		<element name="operation" type="sca:Operation" minOccurs="0" 
-    			maxOccurs="unbounded" />
-    		<choice minOccurs="0" maxOccurs="unbounded">
-    			<element ref="sca:binding" />
-    			<any namespace="##other" processContents="lax"/>
-    		</choice>
-    		<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-    		<!--
-    		<any namespace="##other" processContents="lax" minOccurs="0"
-    			maxOccurs="unbounded" />
-    		-->
-    	</sequence>
-    	<attribute name="name" type="NCName" use="required" />
-    	<attribute name="promote" type="anyURI" use="required" />
-    	<attribute name="requires" type="sca:listOfQNames" use="optional" />
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax" />
-    </complexType>
-
-    <element name="interface" type="sca:Interface" abstract="true" />
-    <complexType name="Interface" abstract="true"/>
-
-    <complexType name="Reference">
-    	<sequence>
-    		<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-    		<element name="operation" type="sca:Operation" minOccurs="0" 
-    			maxOccurs="unbounded" />
-    		<choice minOccurs="0" maxOccurs="unbounded">
-    			<element ref="sca:binding" />
-    			<any namespace="##other" processContents="lax" />
-    		</choice>
-    		<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-    		<!--
-    		<any namespace="##other" processContents="lax" minOccurs="0"
-    			maxOccurs="unbounded" />
-    		-->
-    	</sequence>
-    	<attribute name="name" type="NCName" use="required" />
-    	<attribute name="target" type="sca:listOfAnyURIs" use="optional"/>
-    	<attribute name="wiredByImpl" type="boolean" use="optional" default="false"/>
-    	<attribute name="multiplicity" type="sca:Multiplicity"
-    		use="optional" default="1..1" />
-    	<attribute name="promote" type="sca:listOfAnyURIs" use="required" />
-    	<attribute name="requires" type="sca:listOfQNames" use="optional" />
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax" />
-    </complexType>
-
-    <complexType name="SCAPropertyBase" mixed="true">
-    	<!-- mixed="true" to handle simple type -->
-    	<sequence>
-    		<any namespace="##any" processContents="lax" minOccurs="0"
-    			maxOccurs="1" />
-    		<!-- NOT an extension point; This xsd:any exists to accept
-    			 the element-based or complex type property
-    			 i.e. no element-based extension point under "sca:property" -->
-    	</sequence>
-    </complexType>
-
-    <!-- complex type for sca:property declaration --> 
-    <complexType name="Property" mixed="true">
-       <complexContent>
-	       <extension base="sca:SCAPropertyBase">  
-	          <!-- extension defines the place to hold default value --> 
-	          <attribute name="name" type="NCName" use="required"/>
-	          <attribute name="type" type="QName" use="optional"/> 
-	          <attribute name="element" type="QName" use="optional"/>
-	          <attribute name="many" type="boolean" default="false" 
-	          	use="optional"/>
-	          <attribute name="mustSupply" type="boolean" default="false" 
-	          	use="optional"/>
-	          <anyAttribute namespace="##any" processContents="lax"/>
-	          <!-- an extension point ; attribute-based only --> 
-	       </extension>
-       </complexContent> 
-    </complexType>
-    
-    <complexType name="PropertyValue" mixed="true">
-       <complexContent>
-          <extension base="sca:SCAPropertyBase">
-             <attribute name="name" type="NCName" use="required"/>
-	         <attribute name="type" type="QName" use="optional"/> 
-	         <attribute name="element" type="QName" use="optional"/> 
-	         <attribute name="many" type="boolean" default="false" 
-	         	use="optional"/>            
-             <attribute name="source" type="string" use="optional"/>
-             <attribute name="file" type="anyURI" use="optional"/> 
-             <anyAttribute namespace="##any" processContents="lax"/>
-             <!-- an extension point ; attribute-based only --> 
-          </extension> 
-       </complexContent> 
-    </complexType>
-
-    <element name="binding" type="sca:Binding" abstract="true"/>
-    <complexType name="Binding" abstract="true">
-    	<sequence>      
-    		<element name="operation" type="sca:Operation" minOccurs="0" 
-    			maxOccurs="unbounded" />
-    	</sequence>
-        <attribute name="uri" type="anyURI" use="optional"/>
-        <attribute name="name" type="QName" use="optional"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    </complexType>   
-    
-    <element name="bindingType" type="sca:BindingType"/>
-    <complexType name="BindingType">
-    	<sequence minOccurs="0" maxOccurs="unbounded">
-    		<any namespace="##other" processContents="lax" />
-    	</sequence>
-    	<attribute name="type" type="QName" use="required"/>
-    	<attribute name="alwaysProvides" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="mayProvide" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-    <element name="callback" type="sca:Callback"/>
-    <complexType name="Callback">
-    	<choice minOccurs="0" maxOccurs="unbounded">
-        	<element ref="sca:binding"/>
-        	<any namespace="##other" processContents="lax"/>
-        </choice>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>  
-      
-    <complexType name="Component">
-        <sequence>
-             <choice minOccurs="0" maxOccurs="1">
-	             <element ref="sca:implementation"/>
-	             <any namespace="##other" processContents="lax"/>
-             </choice>
-             <choice minOccurs="0" maxOccurs="unbounded">
-             	<element name="service" type="sca:ComponentService"/>
-                <element name="reference" type="sca:ComponentReference"/>
-                <element name="property" type="sca:PropertyValue" />
-             </choice>
-             <!-- 
-             <any namespace="##other" processContents="lax" minOccurs="0" 
-             	maxOccurs="unbounded"/>
-             -->
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="autowire" type="boolean" use="optional" default="false"/>
-        <attribute name="constrainingType" type="QName" use="optional"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-
-    <complexType name="ComponentService">
-        <sequence>
-        	 <element ref="sca:interface" minOccurs="0" maxOccurs="1"/>
-        	 <element name="operation" type="sca:Operation" minOccurs="0" 
-  					maxOccurs="unbounded" />
-    		<choice minOccurs="0" maxOccurs="unbounded">
-    			<element ref="sca:binding" />
-    			<any namespace="##other" processContents="lax"/>
-    		</choice>
-             <element ref="sca:callback" minOccurs="0" maxOccurs="1"/>
-             <!--
-             <any namespace="##other" processContents="lax" minOccurs="0" 
-             	maxOccurs="unbounded"/>
-             -->
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="requires" type="sca:listOfQNames" 
-        	use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" 
-        	use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-
-    <complexType name="ComponentReference">
-		<sequence>
-			<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-			<element name="operation" type="sca:Operation" minOccurs="0" 
-				maxOccurs="unbounded" />
-			<choice minOccurs="0" maxOccurs="unbounded">
-				<element ref="sca:binding" />
-				<any namespace="##other" processContents="lax" />
-			</choice>
-			<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-			<!--
-			<any namespace="##other" processContents="lax" minOccurs="0" 
-				maxOccurs="unbounded" />
-			-->
-		</sequence>
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="target" type="sca:listOfAnyURIs" use="optional"/>
-		<attribute name="multiplicity" type="sca:Multiplicity" 
-			use="optional" default="1..1" />
-		<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-   		<attribute name="policySets" type="sca:listOfQNames" 
-   			use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax" />
-    </complexType>
-
-    <element name="implementation" type="sca:Implementation"
-    	abstract="true" />
-    <complexType name="Implementation" abstract="true">
-    	<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    </complexType>
-
-    <element name="implementationType" type="sca:ImplementationType"/>
-    <complexType name="ImplementationType">
-    	<sequence minOccurs="0" maxOccurs="unbounded">
-    		<any namespace="##other" processContents="lax" />
-    	</sequence>
-    	<attribute name="type" type="QName" use="required"/>
-    	<attribute name="alwaysProvides" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="mayProvide" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-    <complexType name="Wire">
-        <sequence>
-            <any namespace="##other" processContents="lax" minOccurs="0" 
-            	maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="source" type="anyURI" use="required"/>
-        <attribute name="target" type="anyURI" use="required"/>
-        <anyAttribute namespace="##any" processContents="lax"/>     
-    </complexType>
-    
-    <element name="include" type="sca:Include"/>
-    <complexType name="Include">
-		<attribute name="name" type="QName"/>
-		<anyAttribute namespace="##any" processContents="lax"/>   
-	</complexType>
-    
-    <complexType name="Operation">
-    	<attribute name="name" type="NCName" use="required"/>
-    	<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax"/>  	
-    </complexType>
-    
-    <element name="constrainingType" type="sca:ConstrainingType"/>
-    <complexType name="ConstrainingType">
-        <sequence>
-        	<choice minOccurs="0" maxOccurs="unbounded">
-                <element name="service" type="sca:ComponentService"/>
-                <element name="reference" type="sca:ComponentReference"/>
-                <element name="property" type="sca:Property" />
-            </choice>
-            <any namespace="##other" processContents="lax" minOccurs="0"
-            	maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="targetNamespace" type="anyURI"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-
-    <simpleType name="Multiplicity">
-        <restriction base="string">
-            <enumeration value="0..1"/>
-            <enumeration value="1..1"/>
-            <enumeration value="0..n"/>
-            <enumeration value="1..n"/>
-        </restriction>
-    </simpleType>
-
-    <simpleType name="OverrideOptions">
-        <restriction base="string">
-            <enumeration value="no"/>
-            <enumeration value="may"/>
-            <enumeration value="must"/>
-        </restriction>
-    </simpleType>
-    
-    <!-- Global attribute definition for @requires to permit use of intents
-         within WSDL documents -->
-    <attribute name="requires" type="sca:listOfQNames"/>
-    
-    <!-- Global attribute defintion for @endsConversation to mark operations 
-         as ending a conversation -->
-    <attribute name="endsConversation" type="boolean" default="false"/>
-    
-    <simpleType name="listOfQNames">
-    	<list itemType="QName"/>
-    </simpleType>
-    
-    <simpleType name="listOfAnyURIs">
-        <list itemType="anyURI"/>
-    </simpleType>
-
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-definitions.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-definitions.xsd
deleted file mode 100644
index 0249882a92..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-definitions.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-    <include schemaLocation="sca-policy.xsd"/>
-
-    <element name="definitions">
-       <complexType>
-          <choice minOccurs="0" maxOccurs="unbounded">
-             <element ref="sca:intent"/>
-             <element ref="sca:policySet"/>
-             <element ref="sca:binding"/>
-             <element ref="sca:bindingType"/>
-             <element ref="sca:implementationType"/>
-             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-          </choice>
-          <attribute name="targetNamespace" type="anyURI" use="optional"/>
-       </complexType>
-    </element>
-   
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-bpel.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-bpel.xsd
deleted file mode 100644
index 87b443fb36..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-bpel.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<xsd:schema xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="qualified">
-
-	<xsd:include schemaLocation="sca-core.xsd" />
-
-	<xsd:element name="implementation.bpel" type="BpelImplementation"
-		substitutionGroup="implementation" />
-
-	<xsd:complexType name="BpelImplementation">
-		<xsd:complexContent>
-			<xsd:extension base="Implementation">
-				<xsd:sequence>
-					<xsd:any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</xsd:sequence>
-				<xsd:attribute name="process" type="xsd:QName" use="required" />
-				<xsd:anyAttribute namespace="##any" processContents="lax" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:element name="interface.partnerLinkType" type="BpelPartnerLinkType"
-		substitutionGroup="interface" />
-
-	<xsd:complexType name="BpelPartnerLinkType">
-		<xsd:complexContent>
-			<xsd:extension base="Interface">
-				<xsd:sequence>
-					<xsd:any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</xsd:sequence>
-				<xsd:attribute name="type" type="xsd:QName" use="required" />
-				<xsd:attribute name="serviceRole" type="xsd:NCName" use="optional" />
-				<xsd:anyAttribute namespace="##any" processContents="lax" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-composite.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-composite.xsd
deleted file mode 100644
index 99669bc672..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-composite.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-    
-    <include schemaLocation="sca-core.xsd"/>
-    <element name="implementation.composite" type="sca:SCAImplementation"
-        substitutionGroup="sca:implementation"/>
-    <complexType name="SCAImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0"
-                        maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="name" type="QName" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-java.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-java.xsd
deleted file mode 100644
index f9d8171b8e..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-java.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.java" type="sca:JavaImplementation" 
-    	substitutionGroup="sca:implementation"/>
-    <complexType name="JavaImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="class" type="NCName" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-jee.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-jee.xsd
deleted file mode 100644
index 83e6bb75bf..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-jee.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- (c) Copyright SCA Collaboration 2006 -->

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

-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 

-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-    elementFormDefault="qualified">

-

-    <include schemaLocation="sca-core.xsd"/>

-

-	<element name="implementation.jee" type="sca:JEEImplementation" substitutionGroup="sca:implementation" />

-	<complexType name="JEEImplementation">

-		<complexContent>

-			<extension base="sca:Implementation">

-				<sequence>

-					<any namespace="##other" processContents="lax" minOccurs="0"

-						maxOccurs="unbounded" />

-				</sequence>

-				<attribute name="archive" type="string" use="required" />

-				<anyAttribute namespace="##any" processContents="lax" />

-			</extension>

-		</complexContent>

-	</complexType>

-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-web.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-web.xsd
deleted file mode 100644
index a1adf10fd9..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-web.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- (c) Copyright SCA Collaboration 2006 -->

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

-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 

-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-    elementFormDefault="qualified">

-

-    <include schemaLocation="sca-core.xsd"/>

-

-    <element name="implementation.web" type="sca:WebImplementation" 

-    	substitutionGroup="sca:implementation"/>

-    <complexType name="WebImplementation">

-        <complexContent>

-            <extension base="sca:Implementation">

-                <sequence>

-                    <any namespace="##other" processContents="lax" 

-                    	minOccurs="0" maxOccurs="unbounded"/>

-                </sequence>

-                <attribute name="web-uri" type="string" use="required"/>

-                <anyAttribute namespace="##any" processContents="lax"/>

-            </extension>

-        </complexContent>

-    </complexType>

-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-java.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-java.xsd
deleted file mode 100644
index 81f939bdb4..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-java.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="interface.java" type="sca:JavaInterface" substitutionGroup="sca:interface"/>
-    <complexType name="JavaInterface">
-        <complexContent>
-            <extension base="sca:Interface">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="interface" type="NCName" use="required"/>
-                <attribute name="callbackInterface" type="NCName" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-wsdl.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-wsdl.xsd
deleted file mode 100644
index c1fdfd8f3c..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-wsdl.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="interface.wsdl" type="sca:WSDLPortType" substitutionGroup="sca:interface"/>
-    <complexType name="WSDLPortType">
-        <complexContent>
-            <extension base="sca:Interface">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="interface" type="anyURI" use="required"/>
-                <attribute name="callbackInterface" type="anyURI" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-policy.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-policy.xsd
deleted file mode 100644
index 2c4875f36c..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-policy.xsd
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
-        elementFormDefault="qualified">
-        
-    <include schemaLocation="sca-core.xsd"/>
-		
-	<element name="intent" type="sca:Intent"/>	
-	<complexType name="Intent">
-		<sequence>
-			<element name="description" type="string" minOccurs="0" maxOccurs="1" />
-			<any namespace="##other" processContents="lax"
-				minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-        <attribute name="name" type="QName" use="required"/>
-		<attribute name="constrains" type="sca:listOfQNames" use="optional"/>
-		<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-		<attribute name="excludes" type="sca:listOfQNames" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-		
-	<element name="policySet" type="sca:PolicySet"/>
-	<complexType name="PolicySet">
-		<choice minOccurs="0" maxOccurs="unbounded">
-			<element name="policySetReference" type="sca:PolicySetReference"/>
-			<element name="intentMap" type="sca:IntentMap"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="name" type="QName" use="required"/>
-		<attribute name="provides" type="sca:listOfQNames" use="optional"/>
-		<attribute name="appliesTo" type="string" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-
-	<complexType name="PolicySetReference">
-		<attribute name="name" type="QName" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-	
-	<complexType name="IntentMap">
-		<choice minOccurs="1" maxOccurs="unbounded">
-			<element name="qualifier" type="sca:Qualifier"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="provides" type="QName" use="required"/>
-		<attribute name="default" type="string" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-	
-	<complexType name="Qualifier">
-		<choice minOccurs="1" maxOccurs="unbounded">
-			<element name="intentMap" type="sca:IntentMap"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="name" type="string" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-
-	<element name="allow" type="sca:Allow"/>
-	<complexType name="Allow">
-		<attribute name="roles" type="string" use="required"/>
-	</complexType>
-
-	<element name="permitAll" type="sca:PermitAll"/>
-	<complexType name="PermitAll"/>
-
-	<element name="denyAll" type="sca:DenyAll"/>
-	<complexType name="DenyAll"/>
-
-	<element name="runAs" type="sca:RunAs"/>
-	<complexType name="RunAs">
-		<attribute name="role" type="string" use="required"/>
-	</complexType>
-</schema>
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca.xsd
deleted file mode 100644
index a177816cdd..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <include schemaLocation="sca-interface-java.xsd"/>
-    <include schemaLocation="sca-interface-wsdl.xsd"/>
-
-    <include schemaLocation="sca-implementation-java.xsd"/>
-    <include schemaLocation="sca-implementation-composite.xsd"/>
-
-    <include schemaLocation="sca-binding-webservice.xsd"/>
-    <include schemaLocation="sca-binding-sca.xsd"/>
-
-    <include schemaLocation="sca-contributions.xsd"/>
-    
-    <include schemaLocation="sca-definitions.xsd"/>
-    <include schemaLocation="sca-policy.xsd"/>
-    
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-dwr.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-dwr.xsd
deleted file mode 100644
index 788571de7b..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-dwr.xsd
+++ /dev/null
@@ -1,41 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.dwr" type="t:DWRBinding"/>
-    
-    <complexType name="DWRBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-http.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-http.xsd
deleted file mode 100644
index bd36a8f52f..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-http.xsd
+++ /dev/null
@@ -1,41 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.http" type="t:HTTPBinding"/>
-    
-    <complexType name="HTTPBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-jsonrpc.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
deleted file mode 100644
index bacfdda781..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
+++ /dev/null
@@ -1,41 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
-    
-    <complexType name="JSONRPCBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-rmi.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-rmi.xsd
deleted file mode 100644
index 26be6feae5..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-rmi.xsd
+++ /dev/null
@@ -1,40 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.rmi" type="t:RMIBinding"/>
-    
-    <complexType name="RMIBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-implementation-node.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-implementation-node.xsd
deleted file mode 100644
index 1b5c8aece2..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-implementation-node.xsd
+++ /dev/null
@@ -1,43 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.node" type="t:NodeImplementation"/>
-    	
-    <complexType name="NodeImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="uri" type="string" use="required"/>
-                <attribute name="composite" type="QName" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca.xsd
deleted file mode 100644
index 4557cda947..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca.xsd
+++ /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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0">
-    
-    <import namespace="http://www.w3.org/2004/08/wsdl-instance" schemaLocation="wsdli.xsd"/>
-    
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-all.xsd"/>
-    
-    <include schemaLocation="tuscany-sca-binding-dwr.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-http.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-jsonrpc.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-jms.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-rmi.xsd"/>
-    
-    <include schemaLocation="tuscany-sca-implementation-node.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-resource.xsd"/> 
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/wsdli.xsd b/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/wsdli.xsd
deleted file mode 100644
index 79af5e9363..0000000000
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/wsdli.xsd
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"-->
-<!-- $Id: wsdl-instance.xsd,v 1.1 2004/08/03 16:02:04 hugo Exp $ -->
-<!-- 
-   W3C XML Schema defined in the Web Services Description (WSDL)
-    Version 2.0 specification
-     http://www.w3.org/TR/wsdl20
-
-   Copyright (c) 2004 World Wide Web Consortium,
-  
-   (Massachusetts Institute of Technology, European Research Consortium for
-   Informatics and Mathematics, Keio University). All Rights Reserved. This
-   work is distributed under the W3C(r) Software License [1] in the hope that
-   it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  
-   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance" targetNamespace="http://www.w3.org/2004/08/wsdl-instance" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified">
-
-  <xs:attribute name="wsdlLocation">
-    <xs:annotation>
-      <xs:documentation>
-      This attribute can be used to provide some hints on where
-      additional WSDL information for a given namespace can be
-      found in order to help with QName resolution
-      </xs:documentation>
-    </xs:annotation>
-    <xs:simpleType>
-      <xs:list itemType="xs:anyURI"/>
-    </xs:simpleType>
-  </xs:attribute>
-
-</xs:schema>
diff --git a/java/sca-contrib/modules/binding-atom-abdera/LICENSE b/java/sca-contrib/modules/binding-atom-abdera/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/binding-atom-abdera/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-atom-abdera/META-INF/MANIFEST.MF
deleted file mode 100644
index 85b23310e3..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,55 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.atom.collection;uses:="

- org.oasisopen.sca.annotation,org.apache.abdera.model";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.binding.atom.provider;version=

- "1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Atom Feed Binding Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397264250

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Atom Feed Binding Extension

-Import-Package: javax.activation;version="1.1";resolution:=optional,

- javax.servlet,

- javax.servlet.http,

- javax.xml.namespace,

- 

- org.apache.abdera,

- org.apache.abdera.factory,

- org.apache.abdera.i18n.iri,

- org.apache.abdera.model,

- org.apache.abdera.parser,

- org.apache.abdera.protocol;resolution:=optional,

- org.apache.abdera.protocol.client;resolution:=optional,

- org.apache.abdera.protocol.client.util;resolution:=optional,

- org.apache.abdera.writer,

- org.apache.commons.codec.binary,

- org.apache.commons.httpclient,

- org.apache.commons.httpclient.auth,

- org.apache.commons.httpclient.methods,

- org.apache.commons.httpclient.params,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.binding.atom;version="2.0.0",

- org.apache.tuscany.sca.binding.atom.collection;version="2.0.0",

- org.apache.tuscany.sca.binding.http;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.data.collection;version="2.0.0",

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.host.http;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- 

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.atom.abdera

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-atom-abdera/NOTICE b/java/sca-contrib/modules/binding-atom-abdera/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/binding-atom-abdera/ReceiptToms.gif b/java/sca-contrib/modules/binding-atom-abdera/ReceiptToms.gif
deleted file mode 100644
index bfeee9b2f4..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/ReceiptToms.gif
+++ /dev/null
diff --git a/java/sca-contrib/modules/binding-atom-abdera/ReceiptValue.jpg b/java/sca-contrib/modules/binding-atom-abdera/ReceiptValue.jpg
deleted file mode 100644
index 584f39ea8d..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/ReceiptValue.jpg
+++ /dev/null
diff --git a/java/sca-contrib/modules/binding-atom-abdera/pom.xml b/java/sca-contrib/modules/binding-atom-abdera/pom.xml
deleted file mode 100644
index b5ccbe90e8..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/pom.xml
+++ /dev/null
@@ -1,207 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-atom-abdera</artifactId>
-    <name>Apache Tuscany SCA Atom Feed Binding Extension</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-           <groupId>commons-httpclient</groupId>
-           <artifactId>commons-httpclient</artifactId>
-           <version>3.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.abdera</groupId>
-            <artifactId>abdera-core</artifactId>
-            <version>0.4.0-incubating</version> 
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-activation_1.0.2_spec</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>    
-        
-        <dependency>
-           <groupId>org.apache.abdera</groupId>
-            <artifactId>abdera-parser</artifactId>
-            <version>0.4.0-incubating</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xom</groupId>
-                    <artifactId>xom</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.ws.commons.axiom</groupId>
-                    <artifactId>axiom-impl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>           
-
-        <dependency>
-           <groupId>org.apache.ws.commons.axiom</groupId>
-           <artifactId>axiom-impl</artifactId>
-           <version>1.2.7</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.abdera</groupId>
-            <artifactId>abdera-client</artifactId>
-            <version>0.4.0-incubating</version> 
-        </dependency>            
-                
-        <dependency>
-            <groupId>org.apache.abdera</groupId>
-            <artifactId>abdera-extensions-main</artifactId>
-            <version>0.4.0-incubating</version> 
-        </dependency>            
-                
-        <dependency>
-            <groupId>org.apache.abdera</groupId>
-            <artifactId>abdera-extensions-json</artifactId>
-            <version>0.4.0-incubating</version> 
-        </dependency>            
-                
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version> 
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-           <groupId>commons-codec</groupId>
-           <artifactId>commons-codec</artifactId>
-           <version>1.3</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>commons-codec</groupId>
-                   <artifactId>commons-codec</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>
-
-        <dependency>
-           <groupId>commons-logging</groupId>
-           <artifactId>commons-logging</artifactId>
-           <version>1.1.1</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>avalon-framework</groupId>
-                   <artifactId>avalon-framework</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>          
-                
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java b/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
deleted file mode 100644
index 81ec1ddad3..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
+++ /dev/null
@@ -1,81 +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.binding.atom.collection;
-
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Provides access to a collection of resources using Atom.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface Collection {
-
-    /**
-     * Get an Atom feed for a collection of resources.
-     * 
-     * @return the Atom feed
-     */
-    Feed getFeed();
-
-    /**
-     * Get an Atom feed for a collection of resources resulting
-     * from a query.
-     * 
-     * @param queryString a query string
-     * @return the Atom feed
-     */
-    Feed query(String queryString);
-
-    /**
-     * Creates a new entry.
-     * 
-     * @param entry
-     * @return
-     */
-    Entry post(Entry entry);
-
-    /**
-     * Retrieves an entry.
-     * 
-     * @param id
-     * @return
-     */
-    Entry get(String id) throws NotFoundException;
-
-    /**
-     * Update an entry.
-     * 
-     * @param id
-     * @param entry
-     * @return
-     */
-    void put(String id, Entry entry) throws NotFoundException;
-
-    /**
-     * Delete an entry.
-     * 
-     * @param id
-     */
-    void delete(String id) throws NotFoundException;
-
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java b/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
deleted file mode 100644
index 455eef81cd..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.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 org.apache.tuscany.sca.binding.atom.collection;
-
-import java.io.InputStream;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-import org.apache.abdera.model.Entry;
-
-/**
- * Provides access to a collection of resources using Atom.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface MediaCollection extends Collection {
-
-    /**
-     * Creates a new media entry
-     * 
-     * @param title
-     * @param slug
-     * @param contentType
-     * @param media
-     */
-    Entry postMedia(String title, String slug, String contentType, InputStream media);
-
-    /**
-     * Update a media entry.
-     * 
-     * @param id
-     * @param contentType
-     * @param media
-     * @return
-     */
-    void putMedia(String id, String contentType, InputStream media) throws NotFoundException;
-
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java b/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
deleted file mode 100644
index b457840922..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.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.    
- */
-
-package org.apache.tuscany.sca.binding.atom.collection;
-
-/**
- * Indicates that a resource could not be found.
- * 
- * @version $Rev$ $Date$
- */
-public class NotFoundException extends Exception {
-    private static final long serialVersionUID = -5046027674128627383L;
-
-    public NotFoundException() {
-    }
-
-    public NotFoundException(String message) {
-        super(message);
-    }
-
-    public NotFoundException(Throwable cause) {
-        super(cause);
-    }
-
-    public NotFoundException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
deleted file mode 100644
index 84232aa3af..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
+++ /dev/null
@@ -1,485 +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.binding.atom.provider;
-
-import static org.apache.tuscany.sca.binding.atom.provider.AtomBindingUtil.entry;
-import static org.apache.tuscany.sca.binding.atom.provider.AtomBindingUtil.feedEntry;
-
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.factory.Factory;
-import org.apache.abdera.model.Document;
-import org.apache.abdera.model.Feed;
-import org.apache.abdera.parser.Parser;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.DeleteMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
-import org.apache.tuscany.sca.binding.atom.collection.NotFoundException;
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * Invoker for the Atom binding.
- * 
- * @version $Rev$ $Date$
- */
-class AtomBindingInvoker implements Invoker {
-    
-    private static final Factory abderaFactory = Abdera.getNewFactory();
-    private static final Parser abderaParser = Abdera.getNewParser();
-
-    Operation operation;
-    String uri;
-    HttpClient httpClient;
-    String authorizationHeader;
-    AtomReferenceBindingProvider provider;
-    
-    AtomBindingInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader, AtomReferenceBindingProvider bindingProvider) {
-        this.operation = operation;
-        this.uri = uri;
-        this.httpClient = httpClient;
-        this.authorizationHeader = authorizationHeader;
-        this.provider = bindingProvider;
-    }
-    
-    public Message invoke(Message msg) {
-        // Shouldn't get here, as the only supported methods are
-        // defined in the ResourceCollection interface, and implemented
-        // by specific invoker subclasses
-        throw new UnsupportedOperationException(operation.getName());
-    }
-
-    /**
-     * Get operation invoker
-     */
-    public static class GetInvoker extends AtomBindingInvoker {
-
-        public GetInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader, AtomReferenceBindingProvider bindingProvider) {
-            super(operation, uri, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @Override
-        public Message invoke(Message msg) {
-            // Get an entry
-            String id = (String)((Object[])msg.getBody())[0];
-
-            // Send an HTTP GET
-            GetMethod getMethod = new GetMethod(uri + "/" + id);
-            getMethod.setRequestHeader("Authorization", authorizationHeader);
-            boolean parsing = false;
-            try {
-                httpClient.executeMethod(getMethod);
-                int status = getMethod.getStatusCode();
-
-                // Read the Atom entry
-                if (status == 200) {
-                    Document<org.apache.abdera.model.Entry> doc = 
-                    	abderaParser.parse(new InputStreamReader(getMethod.getResponseBodyAsStream()));
-                    parsing = true;
-                    org.apache.abdera.model.Entry feedEntry = doc.getRoot();
-                    
-                    if (provider.supportsFeedEntries()) {
-                        
-                        // Return the Atom entry
-                        msg.setBody(feedEntry);
-                        
-                    } else {
-                        
-                        // Convert the feed entry to a data entry and return the data item
-                        Entry<Object, Object> entry = entry(feedEntry, provider.getItemClassType(),
-                                                            provider.getItemXMLType(), provider.getMediator());
-                        msg.setBody(entry.getData());
-                    }
-
-                } else if (status == 404) {
-                    msg.setFaultBody(new NotFoundException());
-                } else {
-                    msg.setFaultBody(new ServiceRuntimeException("HTTP status code: " + status));
-                }
-
-            } catch (Exception e) {
-                msg.setFaultBody(new ServiceRuntimeException(e));
-            } finally {
-                if (!parsing) {
-                    // Release the connection unless the Abdera parser is
-                    // parsing the response, in this case it will release it
-                    getMethod.releaseConnection();
-                }
-            }
-
-            return msg;
-        }
-    }
-
-    /**
-     * Post operation invoker
-     */
-    public static class PostInvoker extends AtomBindingInvoker {
-
-        public PostInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader, AtomReferenceBindingProvider bindingProvider) {
-            super(operation, uri, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @Override
-        public Message invoke(Message msg) {
-            // Post an entry
-            Object[] args = (Object[])msg.getBody();
-            org.apache.abdera.model.Entry feedEntry;
-            if (provider.supportsFeedEntries()) {
-                
-                // Expect an Atom entry
-                feedEntry = (org.apache.abdera.model.Entry)args[0];
-            } else {
-                
-                // Expect a key and data item
-                Entry<Object, Object> entry = new Entry<Object, Object>(args[0], args[1]);
-                feedEntry = feedEntry(entry, provider.getItemClassType(),
-                                      provider.getItemXMLType(), provider.getMediator(), abderaFactory);
-            }
-
-            // Send an HTTP POST
-            PostMethod postMethod = new PostMethod(uri);
-            postMethod.setRequestHeader("Authorization", authorizationHeader);
-            boolean parsing = false;
-            try {
-
-                // Write the Atom entry
-                StringWriter writer = new StringWriter();
-                feedEntry.writeTo(writer);
-                // postMethod.setRequestHeader("Content-type", "application/atom+xml; charset=utf-8");
-                postMethod.setRequestHeader("Content-type", "application/atom+xml;type=entry");
-                postMethod.setRequestEntity(new StringRequestEntity(writer.toString()));
-
-                httpClient.executeMethod(postMethod);
-                int status = postMethod.getStatusCode();
-
-                // Read the Atom entry
-                if (status == 200 || status == 201) {
-                    Document<org.apache.abdera.model.Entry> doc = abderaParser.parse(new InputStreamReader(postMethod.getResponseBodyAsStream()));
-                    parsing = true;
-                    org.apache.abdera.model.Entry createdEntry = doc.getRoot();
-
-                    // Returns the created Atom entry ID
-                    if (provider.supportsFeedEntries()) {
-                        
-                        // Returns the created entry
-                        msg.setBody(createdEntry);
-                        
-                    } else {
-                        
-                        // Returns the id of the created entry 
-                        msg.setBody(createdEntry.getId().toString());
-                    }
-
-                } else if (status == 404) {
-                    msg.setFaultBody(new NotFoundException());
-                } else {
-                    msg.setFaultBody(new ServiceRuntimeException("HTTP status code: " + status));
-                }
-
-            } catch (Exception e) {
-                msg.setFaultBody(new ServiceRuntimeException(e));
-            } finally {
-                if (!parsing) {
-                    // Release the connection unless the Abdera parser is
-                    // parsing the response, in this case it will release it
-                    postMethod.releaseConnection();
-                }
-            }
-
-            return msg;
-        }
-    }
-
-    /**
-     * Put operation invoker
-     */
-    public static class PutInvoker extends AtomBindingInvoker {
-
-        public PutInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader, AtomReferenceBindingProvider bindingProvider) {
-            super(operation, uri, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @Override
-        public Message invoke(Message msg) {
-            // Put an entry
-            Object[] args = (Object[])msg.getBody();
-            String id;
-            org.apache.abdera.model.Entry feedEntry;
-            if (provider.supportsFeedEntries()) {
-                
-                // Expect a key and Atom entry
-                id = (String)args[0];
-                feedEntry = (org.apache.abdera.model.Entry)args[1];
-            } else {
-                
-                // Expect a key and data item
-                id = (String)args[0];
-                Entry<Object, Object> entry = new Entry<Object, Object>(id, args[1]);
-                feedEntry = feedEntry(entry, provider.getItemClassType(),
-                                      provider.getItemXMLType(), provider.getMediator(), abderaFactory);
-            }
-
-            // Send an HTTP PUT
-            PutMethod putMethod = new PutMethod(uri + "/" + id);
-            putMethod.setRequestHeader("Authorization", authorizationHeader);
-
-            try {
-
-                // Write the Atom entry
-                StringWriter writer = new StringWriter();
-                feedEntry.writeTo(writer);
-                putMethod.setRequestHeader("Content-type", "application/atom+xml; charset=utf-8");
-                putMethod.setRequestEntity(new StringRequestEntity(writer.toString()));
-
-                httpClient.executeMethod(putMethod);
-                int status = putMethod.getStatusCode();
-                if (status == 200 || status == 201 || status == 412) {
-
-                    msg.setBody(null);
-
-                } else if (status == 404) {
-                    msg.setFaultBody(new NotFoundException());
-                } else {
-                    msg.setFaultBody(new ServiceRuntimeException("HTTP status code: " + status));
-                }
-
-            } catch (Exception e) {
-                msg.setFaultBody(new ServiceRuntimeException(e));
-            } finally {
-                putMethod.releaseConnection();
-            }
-
-            return msg;
-        }
-    }
-
-    /**
-     * Delete operation invoker
-     */
-    public static class DeleteInvoker extends AtomBindingInvoker {
-
-        public DeleteInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader, AtomReferenceBindingProvider bindingProvider) {
-            super(operation, uri, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @Override
-        public Message invoke(Message msg) {
-            // Delete an entry
-            String id = (String)((Object[])msg.getBody())[0];
-
-            // Send an HTTP DELETE
-            DeleteMethod deleteMethod = new DeleteMethod(uri + "/" + id);
-            deleteMethod.setRequestHeader("Authorization", authorizationHeader);
-            try {
-                httpClient.executeMethod(deleteMethod);
-                int status = deleteMethod.getStatusCode();
-                if (status == 200) {
-                    msg.setBody(null);
-
-                } else if (status == 404) {
-                    msg.setFaultBody(new NotFoundException());
-                } else {
-                    msg.setFaultBody(new ServiceRuntimeException("HTTP status code: " + status));
-                }
-
-            } catch (Exception e) {
-                msg.setFaultBody(new ServiceRuntimeException(e));
-            } finally {
-                deleteMethod.releaseConnection();
-            }
-
-            return msg;
-        }
-    }
-
-    /**
-     * GetAll operation invoker
-     */
-    public static class GetAllInvoker extends AtomBindingInvoker {
-
-        public GetAllInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader, AtomReferenceBindingProvider bindingProvider) {
-            super(operation, uri, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @Override
-        public Message invoke(Message msg) {
-            // Get a feed
-
-            // Send an HTTP GET
-            GetMethod getMethod = new GetMethod(uri);
-            getMethod.setRequestHeader("Authorization", authorizationHeader);
-            boolean parsing = false;
-            try {
-                httpClient.executeMethod(getMethod);
-                int status = getMethod.getStatusCode();
-                // AtomBindingInvoker.printResponseHeader( getMethod );
-
-                // Read the Atom feed
-                if (status == 200) {
-                    Document<Feed> doc = abderaParser.parse(new InputStreamReader(getMethod.getResponseBodyAsStream()));
-                    parsing = true;
-                    Feed feed = doc.getRoot();
-
-                    if (provider.supportsFeedEntries()) {
-                        
-                        // Returns the Atom feed
-                        msg.setBody(feed);
-                        
-                    } else {
-                        
-                        // Returns an array of data entries
-                        List<Entry<Object, Object>> entries = new ArrayList<Entry<Object,Object>>();
-                        for (org.apache.abdera.model.Entry feedEntry: feed.getEntries()) {
-                            Entry<Object, Object> entry = entry(feedEntry, provider.getItemClassType(),
-                                                                provider.getItemXMLType(), provider.getMediator());
-                            entries.add(entry);
-                        }
-                        msg.setBody(entries.toArray(new Entry[entries.size()]));
-                    }
-
-                } else if (status == 404) {
-                    msg.setFaultBody(new NotFoundException());
-                } else {
-                    msg.setFaultBody(new ServiceRuntimeException("HTTP status code: " + status));
-                }
-
-            } catch (Exception e) {
-                msg.setFaultBody(new ServiceRuntimeException(e));
-            } finally {
-                if (!parsing) {
-                    // Release the connection unless the Abdera parser is
-                    // parsing the response, in this case it will release it
-                    getMethod.releaseConnection();
-                }
-            }
-
-            return msg;
-        }
-    }
-
-    /**
-     * Query operation invoker
-     */
-    public static class QueryInvoker extends AtomBindingInvoker {
-
-        public QueryInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader, AtomReferenceBindingProvider bindingProvider) {
-            super(operation, uri, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @Override
-        public Message invoke(Message msg) {
-            // Get a feed from a query
-            String queryString = (String)((Object[])msg.getBody())[0];
-
-            // Send an HTTP GET
-            GetMethod getMethod = new GetMethod(uri);
-            getMethod.setRequestHeader("Authorization", authorizationHeader);
-            getMethod.setQueryString(queryString);
-            boolean parsing = false;
-            try {
-                httpClient.executeMethod(getMethod);
-                int status = getMethod.getStatusCode();
-
-                // Read the Atom feed
-                if (status == 200) {
-                    Document<Feed> doc = abderaParser.parse(new InputStreamReader(getMethod.getResponseBodyAsStream()));
-                    parsing = true;
-                    Feed feed = doc.getRoot();
-
-                    if (provider.supportsFeedEntries()) {
-                        
-                        // Returns the Atom feed
-                        msg.setBody(feed);
-                        
-                    } else {
-                        
-                        // Returns an array of data entries
-                        List<Entry<Object, Object>> entries = new ArrayList<Entry<Object,Object>>();
-                        for (org.apache.abdera.model.Entry feedEntry: feed.getEntries()) {
-                            Entry<Object, Object> entry = entry(feedEntry, provider.getItemClassType(),
-                                                                provider.getItemXMLType(), provider.getMediator());
-                            entries.add(entry);
-                        }
-                        msg.setBody(entries.toArray(new Entry[entries.size()]));
-                    }
-
-                } else if (status == 404) {
-                    msg.setFaultBody(new NotFoundException());
-                } else {
-                    msg.setFaultBody(new ServiceRuntimeException("HTTP status code: " + status));
-                }
-
-            } catch (Exception e) {
-                msg.setFaultBody(new ServiceRuntimeException(e));
-            } finally {
-                if (!parsing) {
-                    // Release the connection unless the Abdera parser is
-                    // parsing the response, in this case it will release it
-                    getMethod.releaseConnection();
-                }
-            }
-
-            return msg;
-        }
-    }
-
-    /**
-     * PostMedia operation invoker
-     */
-    public static class PostMediaInvoker extends AtomBindingInvoker {
-
-        public PostMediaInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader, AtomReferenceBindingProvider bindingProvider) {
-            super(operation, uri, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @Override
-        public Message invoke(Message msg) {
-        	// PostInvoker can detect media by content type (non-Feed, non-Entry)
-            return super.invoke(msg);
-        }
-    }
-
-    /**
-     * PutMedia operation invoker
-     */
-    public static class PutMediaInvoker extends AtomBindingInvoker {
-
-        public PutMediaInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader, AtomReferenceBindingProvider bindingProvider) {
-            super(operation, uri, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @Override
-        public Message invoke(Message msg) {
-        	// PutInvoker can detect media by content type (non-Feed, non-Entry)
-            return super.invoke(msg);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
deleted file mode 100644
index f6c713fae7..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
+++ /dev/null
@@ -1,871 +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.binding.atom.provider;
-
-import static org.apache.tuscany.sca.binding.atom.provider.AtomBindingUtil.entry;
-import static org.apache.tuscany.sca.binding.atom.provider.AtomBindingUtil.feedEntry;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.logging.Logger;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.factory.Factory;
-import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.model.Category;
-import org.apache.abdera.model.Collection;
-import org.apache.abdera.model.Document;
-import org.apache.abdera.model.Element;
-import org.apache.abdera.model.Feed;
-import org.apache.abdera.model.Link;
-import org.apache.abdera.model.Service;
-import org.apache.abdera.model.Workspace;
-import org.apache.abdera.parser.ParseException;
-import org.apache.abdera.parser.Parser;
-import org.apache.abdera.writer.WriterFactory;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.tuscany.sca.binding.http.HTTPCacheContext;
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * A resource collection binding listener, implemented as a Servlet and
- * registered in a Servlet host provided by the SCA hosting runtime.
- *
- * @version $Rev$ $Date$
- */
-class AtomBindingListenerServlet extends HttpServlet {
-    private static final Logger logger = Logger.getLogger(AtomBindingListenerServlet.class.getName());
-    private static final long serialVersionUID = 1L;
-
-    private static final Factory abderaFactory = Abdera.getNewFactory();
-    private static final Parser abderaParser = Abdera.getNewParser();
-    private static final String ETAG = "ETag";
-    private static final String LASTMODIFIED = "Last-Modified";    
-    private static final String LOCATION = "Location";    
-    private static final String CONTENTLOCATION = "Content-Location";    
-    private static final SimpleDateFormat dateFormat = new SimpleDateFormat( "EEE, dd MMM yyyy HH:mm:ss Z" ); // RFC 822 date time
-    
-    private RuntimeWire wire;
-    private Invoker getFeedInvoker;
-    private Invoker getAllInvoker;
-    private Invoker queryInvoker;
-    private Invoker getInvoker;
-    private Invoker postInvoker;
-    private Invoker postMediaInvoker;
-    private Invoker putInvoker;
-    private Invoker putMediaInvoker;
-    private Invoker deleteInvoker;
-    private MessageFactory messageFactory;
-    private String title;
-    private Mediator mediator;
-    private DataType<?> itemClassType;
-    private DataType<?> itemXMLType;
-    private boolean supportsFeedEntries;
-
-    /**
-     * Constructs a new binding listener.
-     * 
-     * @param wire
-     * @param messageFactory
-     * @param feedType
-     */
-    AtomBindingListenerServlet(RuntimeWire wire, MessageFactory messageFactory, Mediator mediator, String title) {
-        this.wire = wire;
-        this.messageFactory = messageFactory;
-        this.mediator = mediator;
-        this.title = title;
-        
-        // Get the invokers for the supported operations
-        Operation getOperation = null;
-        for (InvocationChain invocationChain : this.wire.getInvocationChains()) {
-            invocationChain.setAllowsPassByReference(true);
-            Operation operation = invocationChain.getTargetOperation();
-            String operationName = operation.getName();
-            if (operationName.equals("getFeed")) {
-                getFeedInvoker = invocationChain.getHeadInvoker();
-            } else if (operationName.equals("getAll")) {
-                getAllInvoker = invocationChain.getHeadInvoker();
-            } else if (operationName.equals("query")) {
-                queryInvoker = invocationChain.getHeadInvoker();
-            } else if (operationName.equals("get")) {
-                getInvoker = invocationChain.getHeadInvoker();
-                getOperation = operation;
-            } else if (operationName.equals("put")) {
-                putInvoker = invocationChain.getHeadInvoker();
-            } else if (operationName.equals("putMedia")) {
-                putMediaInvoker = invocationChain.getHeadInvoker();
-            } else if (operationName.equals("post")) {
-                postInvoker = invocationChain.getHeadInvoker();
-            } else if (operationName.equals("postMedia")) {
-                postMediaInvoker = invocationChain.getHeadInvoker();
-            } else if (operationName.equals("delete")) {
-                deleteInvoker = invocationChain.getHeadInvoker();
-            }
-        }
-
-        // Determine the collection item type
-        itemXMLType = new DataTypeImpl<Class<?>>(String.class.getName(), String.class, String.class);
-        Class<?> itemClass = getOperation.getOutputType().getPhysical();
-        if (itemClass == org.apache.abdera.model.Entry.class) {
-            supportsFeedEntries = true;
-        }
-        DataType<XMLType> outputType = getOperation.getOutputType();
-        QName qname = outputType.getLogical().getElementName();
-        qname = new QName(qname.getNamespaceURI(), itemClass.getSimpleName());
-        itemClassType = new DataTypeImpl<XMLType>("java:complexType", itemClass, new XMLType(qname, null));
-        
-    }
-
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-        // No authentication required for a get request
-    	
-    	// Test for any cache info in the request
- 	    HTTPCacheContext cacheContext = null;    	
-    	try { 
-    	   cacheContext = HTTPCacheContext.getCacheContextFromRequest( request );
-    	} catch ( java.text.ParseException e ) {    
-    	}
-    	// System.out.println( "AtomBindingListener.doGet cache context=" + cacheContext );
-    	
-        // Get the request path
-    	int servletPathLength = request.getContextPath().length() + request.getServletPath().length();
-        String path = URLDecoder.decode(request.getRequestURI().substring(servletPathLength), "UTF-8");
-
-        logger.fine("get " + request.getRequestURI());
-
-        // Handle an Atom request
-        if (path != null && path.equals("/atomsvc")) {
-                /*
-             <?xml version='1.0' encoding='UTF-8'?>
-             <service xmlns="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom">
-                <workspace>
-                   <atom:title type="text">resource</atom:title>
-                   <collection href="http://luck.ibm.com:8084/customer">
-                      <atom:title type="text">entries</atom:title>
-                      <accept>application/atom+xml;type=entry</accept>
-                      <categories />
-                   </collection>
-                </workspace>
-             </service>
-                 */
-                
-            // Return the Atom service document
-            response.setContentType("application/atomsvc+xml; charset=utf-8");
-            
-            String href = request.getRequestURL().toString();
-            href = href.substring(0, href.length() - "/atomsvc".length());
-
-            String workspaceURL = new String( href );
-            int pathIndex = workspaceURL.indexOf( request.getServletPath() );
-            if ( -1 != pathIndex )
-            	workspaceURL = workspaceURL.substring( 0, pathIndex ) + "/";
-
-            Service service = abderaFactory.newService();
-            //service.setText("service");
-            
-            Workspace workspace = abderaFactory.newWorkspace();
-            if ( title != null )
-                workspace.setTitle(title);
-            else
-                workspace.setTitle("workspace"); 
-            workspace.setBaseUri( new IRI( workspaceURL ));
-            
-        	Collection collection = workspace.addCollection("collection", href );
-            Feed feed = getFeed( request );
-            if ( feed != null ) {
-            	String title = feed.getTitle();
-            	if ( title != null )
-            		collection.setTitle(title);
-            	else
-                	collection.setTitle("entries");
-            	collection.addAccepts("application/atom+xml;type=feed");
-            	collection.addAccepts("application/json;type=feed");
-            	collection.addAccepts("application/atom+xml;type=entry");
-            	collection.addAccepts("application/json;type=entry");
-            	List<Category> categories = feed.getCategories();
-            	if ( categories != null ) {
-                   	collection.addCategories(categories, false, null); 
-            	} else
-                	collection.addCategories().setFixed(false);                        		
-            	
-            } else {
-            	collection.setTitle("entries");
-            	// collection.addAccepts("application/atom+xml;type=feed");
-            	collection.addAccepts("application/atom+xml; type=entry");
-            	collection.addAccepts("application/json;type=entry");
-            	collection.addCategories().setFixed(false);            
-            }
-        	workspace.addCollection(collection);
-
-            service.addWorkspace(workspace);
-
-            //FIXME add prettyPrint support
-            try {
-                service.getDocument().writeTo(response.getOutputStream());
-            } catch (IOException ioe) {
-                throw new ServletException(ioe);
-            }
-
-        } else if (path == null || path.length() == 0 || path.equals("/")) {
-
-            // Return a feed containing the entries in the collection
-            Feed feed = getFeed( request );
-            if (feed != null) {
-                String feedETag = null;
-                if (feed.getId() != null)
-                	feedETag = feed.getId().toString();
-                Date feedUpdated = feed.getUpdated();
-                // Test request for predicates.
-                String predicate = request.getHeader( "If-Match" );
-                if (( predicate != null ) && ( !predicate.equals(feedETag) )) {
-                	// No match, should short circuit
-                    response.sendError(HttpServletResponse.SC_PRECONDITION_FAILED);
-                    return;
-                }
-                predicate = request.getHeader( "If-None-Match" );
-                if (( predicate != null ) && ( predicate.equals(feedETag) )) {
-                	// Match, should short circuit
-                    response.sendError(HttpServletResponse.SC_NOT_MODIFIED);
-                    return;
-                }
-                if ( feedUpdated != null ) {
-                	predicate = request.getHeader( "If-Unmodified-Since" );                
-                	if ( predicate != null ) {
-                		try {
-                			Date predicateDate = dateFormat.parse( predicate ); 
-                			if ( predicateDate.compareTo( feedUpdated ) < 0 ) {
-                				// Match, should short circuit
-                				response.sendError(HttpServletResponse.SC_NOT_MODIFIED);
-                				return;
-                			}             		
-                		} catch ( java.text.ParseException e ) {
-                			// Ignore and move on
-                		}
-                	}
-                	predicate = request.getHeader( "If-Modified-Since" );                
-                	if ( predicate != null ) {
-                		try {
-                			Date predicateDate = dateFormat.parse( predicate ); 
-                			if ( predicateDate.compareTo( feedUpdated ) > 0 ) {
-                				// Match, should short circuit
-                				response.sendError(HttpServletResponse.SC_NOT_MODIFIED);
-                				return;
-                			}             		
-                		} catch ( java.text.ParseException e ) {
-                			// Ignore and move on
-                		}
-                	}
-                }
-                // Provide Etag based on Id and time if given.
-                // Ignore if not given. (Browser may cache if trivial ETag is given.)
-                if ( feedETag != null )
-        		   response.addHeader(ETAG, feedETag );
-        		if ( feedUpdated != null )
-        			response.addHeader(LASTMODIFIED, dateFormat.format( feedUpdated ));
-        		
-                // Content negotiation
-            	String acceptType = request.getHeader( "Accept" );
-            	String preferredType = getContentPreference( acceptType ); 
-            	if (( preferredType != null ) && ((preferredType.indexOf( "json") > -1) || (preferredType.indexOf( "JSON") > -1 ))) {
-            		// JSON response body
-                    response.setContentType("application/json;type=feed");
-                    
-                    try {
-                		Abdera abdera = new Abdera();
-                		WriterFactory wf = abdera.getWriterFactory();
-                		org.apache.abdera.writer.Writer json = wf.getWriter("json");
-                    	feed.writeTo(json, response.getWriter());
-                    } catch (Exception e) {
-                        throw new ServletException(e);
-                    }           		
-
-            	} else {
-            		// Write the Atom feed
-            		response.setContentType("application/atom+xml;type=feed");
-            		try {
-            			feed.getDocument().writeTo(response.getOutputStream());
-            		} catch (IOException ioe) {
-            			throw new ServletException(ioe);
-            		}
-            	}
-            } else {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND);
-            }
-            
-        } else if (path.startsWith("/")) {
-            // Return a specific entry in the collection
-            org.apache.abdera.model.Entry feedEntry;
-
-            // Invoke the get operation on the service implementation
-            Message requestMessage = messageFactory.createMessage();
-            String id = path.substring(1);
-            requestMessage.setBody(new Object[] {id});
-            Message responseMessage = getInvoker.invoke(requestMessage);
-            if (responseMessage.isFault()) {
-                throw new ServletException((Throwable)responseMessage.getBody());
-            }
-            if (supportsFeedEntries) {
-                // The service implementation returns a feed entry 
-                feedEntry = responseMessage.getBody();
-            } else {
-                // The service implementation only returns a data item, create an entry
-                // from it
-                Entry<Object, Object> entry = new Entry<Object, Object>(id, responseMessage.getBody()); 
-                feedEntry = feedEntry(entry, itemClassType, itemXMLType, mediator, abderaFactory);
-            }
-            // Write the Atom entry
-            if (feedEntry != null) {
-                String entryETag = null;
-                if (feedEntry.getId() != null)
-                	entryETag = feedEntry.getId().toString();
-                Date entryUpdated = feedEntry.getUpdated();
-                if ( entryUpdated != null )
-                   response.addHeader(LASTMODIFIED, dateFormat.format( entryUpdated ));
-                // TODO Check If-Modified-Since If-Unmodified-Since predicates against LASTMODIFIED. 
-                // If true return 304 and null body.
-                
-                Link link = feedEntry.getSelfLink();
-                if (link != null) {
-                    response.addHeader(LOCATION, link.getHref().toString());
-                } else {
-                   link = feedEntry.getLink( "Edit" );
-                   if (link != null) {
-                      response.addHeader(LOCATION, link.getHref().toString());
-                   }
-                }
-
-                // Test request for predicates.
-                String predicate = request.getHeader( "If-Match" );
-                if (( predicate != null ) && ( !predicate.equals(entryETag) )) {
-                	// No match, should short circuit
-                    response.sendError(HttpServletResponse.SC_PRECONDITION_FAILED);
-                    return;
-                }
-                predicate = request.getHeader( "If-None-Match" );
-                if (( predicate != null ) && ( predicate.equals(entryETag) )) {
-                	// Match, should short circuit
-                    response.sendError(HttpServletResponse.SC_NOT_MODIFIED);
-                    return;
-                }
-                if ( entryUpdated != null ) {
-                	predicate = request.getHeader( "If-Unmodified-Since" );                
-                	if ( predicate != null ) {
-                		try {
-                			Date predicateDate = dateFormat.parse( predicate ); 
-                			if ( predicateDate.compareTo( entryUpdated ) < 0 ) {
-                				// Match, should short circuit
-                				response.sendError(HttpServletResponse.SC_NOT_MODIFIED);
-                				return;
-                			}             		
-                		} catch ( java.text.ParseException e ) {
-                			// Ignore and move on
-                		}
-                	}
-                	predicate = request.getHeader( "If-Modified-Since" );                
-                	if ( predicate != null ) {
-                		try {
-                			Date predicateDate = dateFormat.parse( predicate ); 
-                			if ( predicateDate.compareTo( entryUpdated ) > 0 ) {
-                				// Match, should short circuit
-                				response.sendError(HttpServletResponse.SC_NOT_MODIFIED);
-                				return;
-                			}             		
-                		} catch ( java.text.ParseException e ) {
-                			// Ignore and move on
-                		}
-                	}
-                }
-                // Provide Etag based on Id and time if given.
-                // Ignore if not given. (Browser may cache if trivial ETag is given.)
-                if (entryETag != null)
-                	response.addHeader(ETAG, entryETag );
-                if ( entryUpdated != null )
-                	response.addHeader(LASTMODIFIED, dateFormat.format( entryUpdated ));
-        		
-                // Content negotiation
-                String acceptType = request.getHeader( "Accept" );
-            	String preferredType = getContentPreference( acceptType ); 
-            	if (( preferredType != null ) && ((preferredType.indexOf( "json") > -1) || (preferredType.indexOf( "JSON") > -1 ))) {
-            		// JSON response body
-                    response.setContentType("application/json;type=entry");
-                    try {
-                		Abdera abdera = new Abdera();
-                		WriterFactory wf = abdera.getWriterFactory();
-                		org.apache.abdera.writer.Writer json = wf.getWriter("json");
-                    	feedEntry.writeTo(json, response.getWriter());
-                    } catch (Exception e) {
-                        throw new ServletException(e);
-                    }           		
-            	} else {
-            		// XML response body 
-            		response.setContentType("application/atom+xml;type=entry");
-            		try {
-            			feedEntry.writeTo(getWriter(response));
-            		} catch (IOException ioe) {
-            			throw new ServletException(ioe);
-            		}
-            	}
-            } else {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND);
-            }
-        } else {
-            // Path doesn't match any known pattern
-            response.sendError(HttpServletResponse.SC_NOT_FOUND);
-        }
-        
-    }
-
-	protected Feed getFeed( HttpServletRequest request ) throws ServletException {
-		if (supportsFeedEntries) {
-		    // The service implementation supports feed entries, invoke its getFeed operation
-		    Message requestMessage = messageFactory.createMessage();
-		    Message responseMessage;
-		    if (request.getQueryString() != null) {
-		        requestMessage.setBody(new Object[] {request.getQueryString()});
-		        responseMessage = queryInvoker.invoke(requestMessage);
-		    } else {
-		        responseMessage = getFeedInvoker.invoke(requestMessage);
-		    }
-		    if (responseMessage.isFault()) {
-		        throw new ServletException((Throwable)responseMessage.getBody());
-		    }
-		    return (Feed)responseMessage.getBody();		    
-		} else {
-
-		    // The service implementation does not support feed entries,
-		    // invoke its getAll operation to get the data item collection, then create
-		    // feed entries from the items
-		    Message requestMessage = messageFactory.createMessage();
-		    Message responseMessage;
-		    if (request.getQueryString() != null) {
-		        requestMessage.setBody(new Object[] {request.getQueryString()});
-		        responseMessage = queryInvoker.invoke(requestMessage);
-		    } else {
-		        responseMessage = getAllInvoker.invoke(requestMessage);
-		    }
-		    if (responseMessage.isFault()) {
-		        throw new ServletException((Throwable)responseMessage.getBody());
-		    }
-		    Entry<Object, Object>[] collection =
-		        (Entry<Object, Object>[])responseMessage.getBody();
-		    if (collection != null) {
-		        
-		        // Create the feed
-		        Feed feed = abderaFactory.newFeed();
-		        
-		        // Set the feed title
-		        if (title != null) {
-		            feed.setTitle(title);
-		        } else {
-		            feed.setTitle("Feed");
-		        }
-		        // All feeds must provide Id and updated elements.
-		        // However, some do not, so provide some program protection.
-		        feed.setId( "Feed" + feed.hashCode());
-		        Date responseLastModified = new Date( 0 );
-		        
-		        // Add entries to the feed
-		        for (Entry<Object, Object> entry: collection) {
-		            org.apache.abdera.model.Entry feedEntry = feedEntry(entry, itemClassType, itemXMLType, mediator, abderaFactory);
-		            // Use the most recent entry update as the feed update
-		            Date entryUpdated = feedEntry.getUpdated();
-		            if (( entryUpdated != null ) && (entryUpdated.compareTo( responseLastModified  ) > 0 ))
-		            	responseLastModified = entryUpdated;
-		            feed.addEntry(feedEntry);
-		        }
-		        // If no entries were newly updated,
-		        if ( responseLastModified.compareTo( new Date( 0 ) ) == 0 ) 
-		        	responseLastModified = new Date();
-				return feed;
-		    }
-		}
-		return null;
-	}
-
-    @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
-        IOException {
-        // Authenticate the user
-        String user = processAuthorizationHeader(request);
-        if (user == null) {
-            unauthorized(response);
-            return;
-        }
-
-        // Get the request path
-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-
-        if (path == null || path.length() == 0 || path.equals("/")) {
-            org.apache.abdera.model.Entry createdFeedEntry = null;
-
-            // Create a new Atom entry
-            String contentType = request.getContentType();
-            if (contentType != null && contentType.startsWith("application/atom+xml")) {
-
-                // Read the entry from the request
-                org.apache.abdera.model.Entry feedEntry;
-                try {
-                        Document<org.apache.abdera.model.Entry> doc = abderaParser.parse(request.getReader());
-                        feedEntry = doc.getRoot();
-                } catch (ParseException pe) {
-                    throw new ServletException(pe);
-                }
-
-                // Let the component implementation create it
-                if (supportsFeedEntries) {
-                    
-                    // The service implementation supports feed entries, pass the entry to it
-                    Message requestMessage = messageFactory.createMessage();
-                    requestMessage.setBody(new Object[] {feedEntry});
-                    Message responseMessage = postInvoker.invoke(requestMessage);
-                    if (responseMessage.isFault()) {
-                        throw new ServletException((Throwable)responseMessage.getBody());
-                    }
-                    createdFeedEntry = responseMessage.getBody();
-                } else {
-                    
-                    // The service implementation does not support feed entries, pass the data item to it
-                    Message requestMessage = messageFactory.createMessage();
-                    Entry<Object, Object> entry = entry(feedEntry, itemClassType, itemXMLType, mediator);
-                    requestMessage.setBody(new Object[] {entry.getKey(), entry.getData()});
-                    Message responseMessage = postInvoker.invoke(requestMessage);
-                    if (responseMessage.isFault()) {
-                        throw new ServletException((Throwable)responseMessage.getBody());
-                    }
-                    entry.setKey(responseMessage.getBody());
-                    createdFeedEntry = feedEntry(entry, itemClassType, itemXMLType, mediator, abderaFactory);
-                }
-
-            } else if (contentType != null) {
-                // Create a new media entry
-
-                // Get incoming headers
-                String title = request.getHeader("Title");
-                String slug = request.getHeader("Slug");
-
-                // Let the component implementation create the media entry
-                Message requestMessage = messageFactory.createMessage();
-                requestMessage.setBody(new Object[] {title, slug, contentType, request.getInputStream()});
-                Message responseMessage = postMediaInvoker.invoke(requestMessage);
-                if (responseMessage.isFault()) {
-                    throw new ServletException((Throwable)responseMessage.getBody());
-                }
-                createdFeedEntry = responseMessage.getBody();
-                
-                // Transfer media info to response header.
-                // Summary is a comma separated list of header properties.
-                String summary = createdFeedEntry.getSummary();
-               	addPropertiesToHeader( response, summary );
-                
-            } else {
-                response.sendError(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
-            }
-
-            // A new entry for non-media was created successfully.
-            if (createdFeedEntry != null) {
-                // Set location of the created entry in the Location header
-                IRI feedId = createdFeedEntry.getId();
-                if ( feedId != null )
-                   response.addHeader(ETAG, "\"" + feedId.toString() + "\"" );
-                Date entryUpdated = createdFeedEntry.getUpdated();
-                if ( entryUpdated != null )
-                   response.addHeader(LASTMODIFIED, dateFormat.format( entryUpdated ));
-                Link link = createdFeedEntry.getSelfLink();
-                if (link != null) {
-                    response.addHeader(LOCATION, link.getHref().toString());
-                } 
-                Link editLink = createdFeedEntry.getEditLink();
-                if (editLink != null) {
-                    response.addHeader(LOCATION, editLink.getHref().toString());
-                }
-                Link editMediaLink = createdFeedEntry.getEditMediaLink();
-                if (editMediaLink != null) {
-                    response.addHeader(CONTENTLOCATION, editMediaLink.getHref().toString());
-                }
-
-                // Write the created Atom entry
-                response.setStatus(HttpServletResponse.SC_CREATED);
-                response.setContentType("application/atom+xml;type=entry");
-                try {
-                        createdFeedEntry.writeTo(getWriter(response));
-                } catch (ParseException pe) {
-                    throw new ServletException(pe);
-                }
-
-            } else {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND);
-            }
-
-        } else {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND);
-        }
-    }
-
-    private Writer getWriter(HttpServletResponse response) throws UnsupportedEncodingException, IOException {
-        Writer writer = new OutputStreamWriter(response.getOutputStream(), "UTF-8");
-        return writer;
-    }
-
-    @Override
-    protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        // Authenticate the user
-        String user = processAuthorizationHeader(request);
-        if (user == null) {
-            unauthorized(response);
-            return;
-        }
-
-        // Get the request path
-        String path = request.getRequestURI().substring(request.getServletPath().length());
-
-        if (path != null && path.startsWith("/")) {
-            String id = path.substring(1);
-
-            // Update an Atom entry
-            String contentType = request.getContentType();
-            if (contentType != null && contentType.startsWith("application/atom+xml")) {
-
-                // Read the entry from the request
-                org.apache.abdera.model.Entry feedEntry;
-                try {
-                        Document<org.apache.abdera.model.Entry> doc = abderaParser.parse(request.getReader());
-                        feedEntry = doc.getRoot();
-                } catch (ParseException pe) {
-                    throw new ServletException(pe);
-                }
-
-                // Let the component implementation create it
-                if (supportsFeedEntries) {
-                    // The service implementation supports feed entries, pass the entry to it
-                    Message requestMessage = messageFactory.createMessage();
-                    requestMessage.setBody(new Object[] {id, feedEntry});
-                    Message responseMessage = putInvoker.invoke(requestMessage);
-                    if (responseMessage.isFault()) {
-                        Object body = responseMessage.getBody();
-                        if (body.getClass().getName().endsWith(".NotFoundException")) {
-                            response.sendError(HttpServletResponse.SC_NOT_FOUND);
-                        } else {
-                            throw new ServletException((Throwable)responseMessage.getBody());
-                        }
-                    }
-                } else {
-                    // The service implementation does not support feed entries, pass the data item to it
-                    Message requestMessage = messageFactory.createMessage();
-                    Entry<Object, Object> entry = entry(feedEntry, itemClassType, itemXMLType, mediator);
-                    requestMessage.setBody(new Object[] {entry.getKey(), entry.getData()});
-                    Message responseMessage = putInvoker.invoke(requestMessage);
-                    if (responseMessage.isFault()) {
-                        Object body = responseMessage.getBody();
-                        if (body.getClass().getName().endsWith(".NotFoundException")) {
-                            response.sendError(HttpServletResponse.SC_NOT_FOUND);
-                        } else {
-                            throw new ServletException((Throwable)responseMessage.getBody());
-                        }
-                    }
-                }
-
-            } else if (contentType != null) {
-
-                // Update a media entry
-
-                // Let the component implementation create the media entry
-                Message requestMessage = messageFactory.createMessage();
-                requestMessage.setBody(new Object[] {id, contentType, request.getInputStream()});
-                Message responseMessage = putMediaInvoker.invoke(requestMessage);
-                
-                Object body = responseMessage.getBody();
-                if (responseMessage.isFault()) {
-                    if (body.getClass().getName().endsWith(".NotFoundException")) {
-                        response.sendError(HttpServletResponse.SC_NOT_FOUND);
-                    } else {
-                        throw new ServletException((Throwable)responseMessage.getBody());
-                    }
-                }
-                
-                // Transfer content to response header.
-                
-            } else {
-                response.sendError(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
-            }
-        } else {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND);
-        }
-    }
-
-    @Override
-    protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException,
-        IOException {
-
-        // Authenticate the user
-        String user = processAuthorizationHeader(request);
-        if (user == null) {
-            unauthorized(response);
-            return;
-        }
-
-        // Get the request path
-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-
-        String id;
-        if (path != null && path.startsWith("/")) {
-            id = path.substring(1);
-        } else {
-            id = "";
-        }
-
-        // Delete a specific entry from the collection
-        Message requestMessage = messageFactory.createMessage();
-        requestMessage.setBody(new Object[] {id});
-        Message responseMessage = deleteInvoker.invoke(requestMessage);
-        if (responseMessage.isFault()) {
-            Object body = responseMessage.getBody();
-            if (body.getClass().getName().endsWith(".NotFoundException")) {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND);
-            } else {
-                throw new ServletException((Throwable)responseMessage.getBody());
-            }
-        }
-    }
-
-    /**
-     * Process the authorization header
-     * 
-     * @param request
-     * @return
-     * @throws ServletException
-     */
-    private String processAuthorizationHeader(HttpServletRequest request) throws ServletException {
-        
-        // FIXME temporarily disabling this as it doesn't work with all browsers 
-        if (true)
-            return "admin";
-        
-        try {
-            String authorization = request.getHeader("Authorization");
-            if (authorization != null) {
-                StringTokenizer tokens = new StringTokenizer(authorization);
-                if (tokens.hasMoreTokens()) {
-                    String basic = tokens.nextToken();
-                    if (basic.equalsIgnoreCase("Basic")) {
-                        String credentials = tokens.nextToken();
-                        String userAndPassword = new String(Base64.decodeBase64(credentials.getBytes()));
-                        int colon = userAndPassword.indexOf(":");
-                        if (colon != -1) {
-                            String user = userAndPassword.substring(0, colon);
-                            String password = userAndPassword.substring(colon + 1);
-
-                            // Authenticate the User.
-                            if (authenticate(user, password)) {
-                                return user;
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new ServletException(e);
-        }
-        return null;
-    }
-
-    /**
-     * Authenticate a user.
-     * 
-     * @param user
-     * @param password
-     * @return
-     */
-    private boolean authenticate(String user, String password) {
-        // TODO Handle this using SCA security policies
-        return ("admin".equals(user) && "admin".equals(password));
-    }
-
-    /**
-     * Reject an unauthorized request.
-     * 
-     * @param response
-     */
-    private void unauthorized(HttpServletResponse response) throws IOException {
-        response.setHeader("WWW-Authenticate", "BASIC realm=\"Tuscany\"");
-        response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
-    }
-    
-    public static String getContentPreference( String acceptType ) {
-    	if (( acceptType == null ) || ( acceptType.length() < 1 )) {
-            return "application/atom+xml";    		
-    	}
-    	StringTokenizer st = new StringTokenizer( acceptType, "," );
-    	if ( st.hasMoreTokens() )
-    		return st.nextToken();    		
-        return "application/atom+xml";
-    }
-
-    /** Take a list of key values and add them to the header.
-     * For instance "Content-Type=image/gif,Content-Length=14201"
-     * @param response
-     * @param properties
-     */
-	public static void addPropertiesToHeader( HttpServletResponse response, String properties  ) {
-		if ( properties == null ) return; 
-    	StringTokenizer props = new StringTokenizer( properties, ",");
-    	while( props.hasMoreTokens()) {
-    		String prop = props.nextToken();
-    		StringTokenizer keyVal = new StringTokenizer( prop, "=");
-    		String key = null;
-    		String val = null;
-    		if ( keyVal.hasMoreTokens() )
-    			key = keyVal.nextToken();
-    		if ( keyVal.hasMoreTokens() )
-    			val = keyVal.nextToken();
-    		if (( key != null ) && ( val != null )) {
-                response.addHeader(key, val);                			
-    		}
-    	}
-	}
-
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java b/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
deleted file mode 100644
index 2651324ccf..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
+++ /dev/null
@@ -1,74 +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.binding.atom.provider;
-
-import org.apache.tuscany.sca.binding.atom.AtomBinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Implementation of a Binding provider factory for the Atom binding.
- *
- * @version $Rev$ $Date$
- */
-public class AtomBindingProviderFactory implements BindingProviderFactory<AtomBinding> {
-
-    private MessageFactory messageFactory;
-    private Mediator mediator;
-    private ServletHost servletHost;
-
-    public AtomBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        this.servletHost = servletHosts.getServletHosts().get(0);
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        this.messageFactory = modelFactories.getFactory(MessageFactory.class);
-        this.mediator = new MediatorImpl(extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class),
-                                         extensionPoints.getExtensionPoint(TransformerExtensionPoint.class));
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   AtomBinding binding) {
-        return new AtomReferenceBindingProvider(component, reference, binding, mediator);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               AtomBinding binding) {
-        return new AtomServiceBindingProvider(component, service, binding, servletHost, messageFactory, mediator);
-    }
-
-    public Class<AtomBinding> getModelType() {
-        return AtomBinding.class;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java b/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
deleted file mode 100644
index 62fde86122..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
+++ /dev/null
@@ -1,164 +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.binding.atom.provider;
-
-import java.util.Date;
-
-import org.apache.abdera.factory.Factory;
-import org.apache.abdera.model.Content;
-import org.apache.abdera.model.Link;
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.interfacedef.DataType;
-
-/**
- * Utility methods used in this package.
- *
- * @version $Rev$ $Date$
- */
-class AtomBindingUtil {
-
-    /**
-     * Create a data item from an Atom entry.
-     * @param feedEntry
-     * @param itemClassType
-     * @param itemXMLType
-     * @param mediator
-     * @return
-     */
-    static Entry<Object, Object> entry(org.apache.abdera.model.Entry feedEntry,
-                                       DataType<?> itemClassType, DataType<?> itemXMLType, Mediator mediator) {
-        if (feedEntry != null) {
-            if (itemClassType.getPhysical() == Item.class) {
-                String key = feedEntry.getId().toString();
-                
-                Item item = new Item();
-                item.setTitle(feedEntry.getTitle());
-                item.setContents(feedEntry.getContent());
-                
-                for (Link link : feedEntry.getLinks()) {
-                    if (link.getRel() == null || "self".equals(link.getRel())) {
-                        if (item.getLink() == null) {
-                            item.setLink(link.getHref().toString());
-                        }
-                    } else if ("related".equals(link.getRel())) {
-                        item.setRelated(link.getHref().toString());
-                    } else if ("alternate".equals(link.getRel())) {
-                        item.setAlternate(link.getHref().toString());
-                    }
-                }
-                
-                item.setDate(feedEntry.getUpdated());
-                
-                return new Entry<Object, Object>(key, item);
-                
-            } else {
-                String key = null; 
-                if ( feedEntry.getId() != null) {
-                	key = feedEntry.getId().toString();
-                }
-                
-                // Create the item from XML
-                if (feedEntry.getContentElement().getElements().size() == 0) {
-                        return null;
-                }
-                
-                String value = feedEntry.getContent();
-                Object data = mediator.mediate(value, itemXMLType, itemClassType, null);
-    
-                return new Entry<Object, Object>(key, data);
-            }
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Create an Atom entry for a key and item from a collection.
-     * @param entry
-     * @param itemClassType
-     * @param itemXMLType
-     * @param mediator
-     * @param factory
-     * @return
-     */
-    static org.apache.abdera.model.Entry feedEntry(Entry<Object, Object> entry,
-                                  DataType<?> itemClassType, DataType<?> itemXMLType, Mediator mediator,
-                                  Factory factory) {
-        Object key = entry.getKey();
-        Object data = entry.getData();
-        if (data instanceof Item) {
-            Item item = (Item)data;
-            
-            org.apache.abdera.model.Entry feedEntry = factory.newEntry();
-            if (key != null) {
-                feedEntry.setId(key.toString());
-            }
-            feedEntry.setTitle(item.getTitle());
-            feedEntry.setContentAsHtml(item.getContents());
-    
-            String href = item.getLink();
-            if (href == null && key != null) {
-                href = key.toString();
-            }
-    
-            if (href != null) {
-                feedEntry.addLink(href);
-            }
-            String related = item.getRelated();
-            if (related != null) {
-                feedEntry.addLink(related, "related");
-            }
-            String alternate = item.getAlternate();
-            if (alternate != null) {
-                feedEntry.addLink(alternate, "alternate");
-            }
-                
-            Date date = item.getDate();
-            if (date != null) {
-                feedEntry.setUpdated(date);
-            }
-            return feedEntry;
-            
-        } else if (data != null) {
-            org.apache.abdera.model.Entry feedEntry = factory.newEntry();
-             feedEntry.setId(key.toString());
-             feedEntry.setTitle("item");
-             
-             
-             // Convert the item to XML
-             String value = mediator.mediate(data, itemClassType, itemXMLType, null).toString();
-             
-             Content content = factory.newContent();
-             content.setContentType(Content.Type.XML);
-             content.setValue(value);
-             
-             feedEntry.setContentElement(content);
-    
-             feedEntry.addLink(key.toString());
-                  
-             return feedEntry;
-        } else {
-            return null;
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java b/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
deleted file mode 100644
index f2b1d1f72b..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
+++ /dev/null
@@ -1,183 +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.binding.atom.provider;
-
-import java.net.URI;
-
-import javax.xml.namespace.QName;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpConnectionManager;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.tuscany.sca.binding.atom.AtomBinding;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * Implementation of the Atom binding provider.
- *
- * @version $Rev$ $Date$
- */
-class AtomReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private RuntimeComponentReference reference;
-    private AtomBinding binding;
-    private String authorizationHeader;
-    private HttpClient httpClient;
-    private Mediator mediator;
-    private DataType<?> itemClassType;
-    private DataType<?> itemXMLType;
-    private boolean supportsFeedEntries;
-
-    /**
-     * Constructs a new AtomReferenceBindingProvider
-     * @param component
-     * @param reference
-     * @param binding
-     * @param mediator
-     */
-    AtomReferenceBindingProvider(RuntimeComponent component,
-                                        RuntimeComponentReference reference,
-                                        AtomBinding binding,
-                                        Mediator mediator) {
-        this.reference = reference;
-        this.binding = binding;
-        this.mediator = mediator;
-
-        // Prepare authorization header
-        String authorization = "admin" + ":" + "admin";
-        authorizationHeader = "Basic " + new String(Base64.encodeBase64(authorization.getBytes()));
-
-        // Create an HTTP client
-        HttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
-        connectionManager.getParams().setDefaultMaxConnectionsPerHost(10);
-        connectionManager.getParams().setConnectionTimeout(60000);
-        httpClient = new HttpClient(connectionManager);
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        
-        String operationName = operation.getName();
-        if (operationName.equals("get")) {
-            
-            // Determine the collection item type
-            itemXMLType = new DataTypeImpl<Class<?>>(String.class.getName(), String.class, String.class);
-            Class<?> itemClass = operation.getOutputType().getPhysical();
-            DataType<XMLType> outputType = operation.getOutputType();
-            QName qname = outputType.getLogical().getElementName();
-            qname = new QName(qname.getNamespaceURI(), itemClass.getSimpleName());
-            itemClassType = new DataTypeImpl<XMLType>("java:complexType", itemClass, new XMLType(qname, null));
-            if (itemClassType.getPhysical() == org.apache.abdera.model.Entry.class) {
-                supportsFeedEntries = true;
-            }
-            
-            return new AtomBindingInvoker.GetInvoker(operation, binding.getURI(), httpClient, authorizationHeader, this);
-            
-        } else if (operationName.equals("post")) {
-            return new AtomBindingInvoker.PostInvoker(operation, binding.getURI(), httpClient, authorizationHeader, this);
-        } else if (operationName.equals("put")) {
-            return new AtomBindingInvoker.PutInvoker(operation, binding.getURI(), httpClient, authorizationHeader, this);
-        } else if (operationName.equals("delete")) {
-            return new AtomBindingInvoker.DeleteInvoker(operation, binding.getURI(), httpClient, authorizationHeader, this);
-        } else if (operationName.equals("getFeed") || operationName.equals("getAll")) {
-            return new AtomBindingInvoker.GetAllInvoker(operation, binding.getURI(), httpClient, authorizationHeader, this);
-        } else if (operationName.equals("postMedia")) {
-            return new AtomBindingInvoker.PostMediaInvoker(operation, binding.getURI(), httpClient, authorizationHeader, this);
-        } else if (operationName.equals("putMedia")) {
-            return new AtomBindingInvoker.PutMediaInvoker(operation, binding.getURI(), httpClient, authorizationHeader, this);
-        } else if (operationName.equals("query")) {
-            return new AtomBindingInvoker.QueryInvoker(operation, binding.getURI(), httpClient, authorizationHeader, this);
-        }
-
-        return new AtomBindingInvoker(operation, binding.getURI(), httpClient, authorizationHeader, this);
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return reference.getInterfaceContract();
-    }
-
-    public void start() {
-
-        // Configure the HTTP client credentials
-        Credentials credentials = new UsernamePasswordCredentials("admin", "admin");
-        httpClient.getParams().setAuthenticationPreemptive(true);
-        URI uri = URI.create(binding.getURI());
-        httpClient.getState().setCredentials(new AuthScope(uri.getHost(), uri.getPort()), credentials);
-
-        // Find the get operation on the reference interface
-        if (true) {
-            return;
-        }
-    }
-
-    public void stop() {
-    	
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    /**
-     * Returns the mediator.
-     * @return
-     */
-    Mediator getMediator() {
-        return mediator;
-    }
-
-    /**
-     * Returns the item class type.
-     * @return
-     */
-    DataType<?> getItemClassType() {
-        return itemClassType;
-    }
-
-    /**
-     * Returns the item XML type.
-     * @return
-     */
-    DataType<?> getItemXMLType() {
-        return itemXMLType;
-    }
-    
-    /**
-     * Returns true if the invoker should work with Atom
-     * feed entries.
-     * @return
-     */
-    boolean supportsFeedEntries() {
-        return supportsFeedEntries;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java b/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
deleted file mode 100644
index e1d470f5a3..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
+++ /dev/null
@@ -1,87 +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.binding.atom.provider;
-
-import org.apache.tuscany.sca.binding.atom.AtomBinding;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Implementation of the Atom binding provider.
- *
- * @version $Rev$ $Date$
- */
-class AtomServiceBindingProvider implements ServiceBindingProvider {
-
-    private RuntimeComponentService service;
-    private AtomBinding binding;
-    private ServletHost servletHost;
-    private MessageFactory messageFactory;
-    private String servletMapping;
-    private Mediator mediator;
-
-    AtomServiceBindingProvider(RuntimeComponent component,
-                                      RuntimeComponentService service,
-                                      AtomBinding binding,
-                                      ServletHost servletHost,
-                                      MessageFactory messageFactory,
-                                      Mediator mediator) {
-        this.service = service;
-        this.binding = binding;
-        this.servletHost = servletHost;
-        this.messageFactory = messageFactory;
-        this.mediator = mediator;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return service.getInterfaceContract();
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-        RuntimeComponentService componentService = (RuntimeComponentService)service;
-        RuntimeWire wire = componentService.getRuntimeWire(binding);
-
-        AtomBindingListenerServlet servlet =
-            new AtomBindingListenerServlet(wire, messageFactory, mediator, binding.getTitle());
-
-        servletMapping = binding.getURI();
-        if (!servletMapping.endsWith("/")) {
-            servletMapping += "/";
-        }
-        if (!servletMapping.endsWith("*")) {
-            servletMapping += "*";
-        }
-        servletHost.addServletMapping(servletMapping, servlet);
-    }
-
-    public void stop() {
-        servletHost.removeServletMapping(servletMapping);
-    }
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca-contrib/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 1b9052299c..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.atom.provider.AtomBindingProviderFactory;model=org.apache.tuscany.sca.binding.atom.AtomBinding

diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
deleted file mode 100644
index 4e586a5510..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.apache.tuscany.sca.binding.atom;
-
-import java.util.UUID;
-
-import junit.framework.Assert;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.model.Content;
-import org.apache.abdera.model.Entry;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class AtomDeleteTestCase {
-    protected static Node consumerNode;
-    protected static Node providerNode;
-    protected static CustomerClient testService;
-    protected static Abdera abdera;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println(">>>AtomDeleteTestCase.init entry");
-            String contribution = ContributionLocationHelper.getContributionLocation(AtomDeleteTestCase.class);
-            providerNode =
-                NodeFactory.newInstance().createNode("org/apache/tuscany/sca/binding/atom/Provider.composite",
-                                                     new Contribution("provider", contribution));
-            consumerNode =
-                NodeFactory.newInstance().createNode("org/apache/tuscany/sca/binding/atom/Consumer.composite",
-                                                     new Contribution("consumer", contribution));
-            providerNode.start();
-            consumerNode.start();
-            testService = consumerNode.getService(CustomerClient.class, "CustomerClient");
-            abdera = new Abdera();
-        } catch (Exception e) {
-            e.printStackTrace();
-
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        // System.out.println(">>>AtomDeleteTestCase.destroy entry");
-        consumerNode.stop();
-        consumerNode.destroy();
-        providerNode.stop();
-        providerNode.destroy();
-    }
-
-    @Test
-    public void testPrelim() throws Exception {
-        Assert.assertNotNull(providerNode);
-        Assert.assertNotNull(consumerNode);
-        Assert.assertNotNull(testService);
-        Assert.assertNotNull(abdera);
-    }
-
-    @Test
-    public void testAtomDelete() throws Exception {
-        Collection resourceCollection = testService.getCustomerCollection();
-        Assert.assertNotNull(resourceCollection);
-
-        Entry postEntry = postEntry("Sponge Bob");
-        System.out.println(">>> post entry= " + postEntry.getTitle());
-
-        Entry newEntry = resourceCollection.post(postEntry);
-        System.out.println("<<< Entry posted for " + newEntry.getTitle());
-
-        System.out.println(">>> get id=" + newEntry.getId());
-
-        resourceCollection.delete(newEntry.getId().toString());
-
-    }
-
-    @Test
-    public void testAtomDeleteException() throws Exception {
-        Collection resourceCollection = testService.getCustomerCollection();
-        Assert.assertNotNull(resourceCollection);
-
-        try {
-            // Generates custom ID
-            String id = "urn:uuid:customer-" + UUID.randomUUID().toString();
-            resourceCollection.delete(id);
-        } catch (Exception e) {
-            // ID doesn't match with the existing IDs and NotFoundException is
-            // thrown
-            Assert.assertEquals("NotFoundException", e.getClass().getSimpleName());
-        }
-
-    }
-
-    private Entry postEntry(String value) {
-        Entry entry = abdera.newEntry();
-        entry.setTitle("customer " + value);
-
-        Content content = abdera.getFactory().newContent();
-        content.setContentType(Content.Type.TEXT);
-        content.setValue(value);
-        entry.setContentElement(content);
-
-        return entry;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
deleted file mode 100644
index eaa2bc4a97..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.apache.tuscany.sca.binding.atom;
-
-import junit.framework.Assert;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.model.Content;
-import org.apache.abdera.model.Entry;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class AtomGetTestCase {
-    protected static Node consumerNode;
-    protected static Node providerNode;
-    protected static CustomerClient testService;
-    protected static Abdera abdera;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        System.out.println(">>>AtomGetTestCase.init entry");
-        String contribution = ContributionLocationHelper.getContributionLocation(AtomDeleteTestCase.class);
-        providerNode = NodeFactory.newInstance().createNode(
-                                                               "org/apache/tuscany/sca/binding/atom/Provider.composite", new Contribution("provider", contribution));
-        consumerNode = NodeFactory.newInstance().createNode(
-                                                               "org/apache/tuscany/sca/binding/atom/Consumer.composite", new Contribution("consumer", contribution));
-        providerNode.start();
-        consumerNode.start();
-        testService = consumerNode.getService(CustomerClient.class, "CustomerClient");
-        abdera = new Abdera();
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        // System.out.println(">>>AtomGetTestCase.destroy entry");
-        consumerNode.stop();
-        consumerNode.destroy();
-        providerNode.stop();
-        providerNode.destroy();
-    }
-
-    @Test
-    public void testPrelim() throws Exception {
-        Assert.assertNotNull(providerNode);
-        Assert.assertNotNull(consumerNode);
-        Assert.assertNotNull(testService);
-        Assert.assertNotNull(abdera);
-    }
-
-    @Test
-    public void testAtomGet() throws Exception {
-        Collection resourceCollection = testService.getCustomerCollection();
-        Assert.assertNotNull(resourceCollection);
-
-        Entry postEntry = postEntry("Sponge Bob");
-        System.out.println(">>> post entry= " + postEntry.getTitle());
-
-        Entry newEntry = resourceCollection.post(postEntry);
-        System.out.println("<<< Entry posted for " + newEntry.getTitle());
-
-        System.out.println(">>> get id=" + newEntry.getId());
-
-        Entry getEntry = resourceCollection.get(newEntry.getId().toString());
-
-        Assert.assertEquals(newEntry.getTitle(), getEntry.getTitle());
-        System.out.println("<<< get id=" + getEntry.getId() + " entry=" + getEntry.getTitle());
-    }
-
-    @Test
-    public void testAtomGetException() throws Exception {
-        Collection resourceCollection = testService.getCustomerCollection();
-        Assert.assertNotNull(resourceCollection);
-
-        Entry postEntry = postEntry("Sponge Bob");
-        System.out.println(">>> post entry= " + postEntry.getTitle());
-
-        Entry newEntry = resourceCollection.post(postEntry);
-        System.out.println("<<< Entry posted for " + newEntry.getTitle());
-        System.out.println(newEntry.getId());
-
-        // Delete the entry to force the Collection to throw NotFoundException
-        resourceCollection.delete(newEntry.getId().toString());
-
-        try {
-            resourceCollection.get(newEntry.getId().toString());
-        } catch (Exception e) {
-            Assert.assertEquals("NotFoundException", e.getClass().getSimpleName());
-        }
-    }
-
-    private Entry postEntry(String value) {
-        Entry entry = abdera.newEntry();
-        entry.setTitle("customer " + value);
-
-        Content content = abdera.getFactory().newContent();
-        content.setContentType(Content.Type.TEXT);
-        content.setValue(value);
-        entry.setContentElement(content);
-
-        return entry;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
deleted file mode 100644
index ffe8a03f20..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.apache.tuscany.sca.binding.atom;
-
-import junit.framework.Assert;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.model.Content;
-import org.apache.abdera.model.Entry;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class AtomPostTestCase {
-    protected static Node consumerNode;
-    protected static Node providerNode;
-    protected static CustomerClient testService;
-    protected static Abdera abdera;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        System.out.println(">>>AtomPostTestCase.init entry");
-        String contribution = ContributionLocationHelper.getContributionLocation(AtomDeleteTestCase.class);
-        providerNode = NodeFactory.newInstance().createNode(
-                                                               "org/apache/tuscany/sca/binding/atom/Provider.composite", new Contribution("provider", contribution));
-        consumerNode = NodeFactory.newInstance().createNode(
-                                                               "org/apache/tuscany/sca/binding/atom/Consumer.composite", new Contribution("consumer", contribution));
-        providerNode.start();
-        consumerNode.start();
-        testService = consumerNode.getService(CustomerClient.class, "CustomerClient");
-        abdera = new Abdera();
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println(">>>AtomPostTestCase.destroy entry");
-        consumerNode.stop();
-        consumerNode.destroy();
-        providerNode.stop();
-        providerNode.destroy();
-    }
-
-    @Test
-    public void testPrelim() throws Exception {
-        Assert.assertNotNull(providerNode);
-        Assert.assertNotNull(consumerNode);
-        Assert.assertNotNull(testService);
-        Assert.assertNotNull(abdera);
-    }
-
-    @Test
-    public void testAtomPost() throws Exception {
-        Collection resourceCollection = testService.getCustomerCollection();
-        Assert.assertNotNull(resourceCollection);
-
-        Entry postEntry = postEntry("Sponge Bob");
-        System.out.println(">>> post entry= " + postEntry.getTitle());
-
-        Entry newEntry = resourceCollection.post(postEntry);
-
-        Assert.assertEquals(postEntry.getTitle(), newEntry.getTitle());
-
-        System.out.println("<<< new entry= " + newEntry.getTitle());
-
-    }
-
-    @Test
-    public void testAtomPostException() throws Exception {
-        Collection resourceCollection = testService.getCustomerCollection();
-        Assert.assertNotNull(resourceCollection);
-
-        Entry postEntry = postEntry("Exception_Test");
-
-        try {
-            resourceCollection.post(postEntry);
-        } catch (Exception e) {
-            Assert.assertEquals("HTTP status code: 500", e.getMessage());
-        }
-    }
-
-    private Entry postEntry(String value) {
-        Entry entry = abdera.newEntry();
-        entry.setTitle("customer " + value);
-
-        Content content = abdera.getFactory().newContent();
-        content.setContentType(Content.Type.TEXT);
-        content.setValue(value);
-        entry.setContentElement(content);
-
-        return entry;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
deleted file mode 100644
index 08c1ed7ac9..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.apache.tuscany.sca.binding.atom;
-
-import java.util.UUID;
-
-import junit.framework.Assert;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.model.Content;
-import org.apache.abdera.model.Entry;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class AtomPutTestCase {
-    protected static Node consumerNode;
-    protected static Node providerNode;
-    protected static CustomerClient testService;
-    protected static Abdera abdera;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        System.out.println(">>>AtomPutTestCase.init entry");
-        String contribution = ContributionLocationHelper.getContributionLocation(AtomDeleteTestCase.class);
-        providerNode = NodeFactory.newInstance().createNode(
-                                                               "org/apache/tuscany/sca/binding/atom/Provider.composite", new Contribution("provider", contribution));
-        consumerNode = NodeFactory.newInstance().createNode(
-                                                               "org/apache/tuscany/sca/binding/atom/Consumer.composite", new Contribution("consumer", contribution));
-        providerNode.start();
-        consumerNode.start();
-        testService = consumerNode.getService(CustomerClient.class, "CustomerClient");
-        abdera = new Abdera();
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        // System.out.println(">>>AtomPutTestCase.destroy entry");
-        consumerNode.stop();
-        consumerNode.destroy();
-        providerNode.stop();
-        providerNode.destroy();
-    }
-
-    @Test
-    public void testPrelim() throws Exception {
-        Assert.assertNotNull(providerNode);
-        Assert.assertNotNull(consumerNode);
-        Assert.assertNotNull(testService);
-        Assert.assertNotNull(abdera);
-    }
-
-    @Test
-    public void testAtomPut() throws Exception {
-        Collection resourceCollection = testService.getCustomerCollection();
-        Assert.assertNotNull(resourceCollection);
-
-        Entry postEntry = postEntry("Sponge Bob");
-        System.out.println(">>> post entry= " + postEntry.getTitle());
-
-        Entry newEntry = resourceCollection.post(postEntry);
-        System.out.println("<<< Entry posted for " + newEntry.getTitle());
-        System.out.println(newEntry.getId());
-
-        System.out.println(">>> put id=" + newEntry.getId() + " entry=" + newEntry.getTitle());
-        resourceCollection.put(newEntry.getId().toString(), updateEntry(newEntry, "James Bond"));
-        System.out.println("<<< put id=" + newEntry.getId() + " entry=" + newEntry.getTitle());
-    }
-
-    @Test
-    public void testAtomPutException() throws Exception {
-        Collection resourceCollection = testService.getCustomerCollection();
-        Assert.assertNotNull(resourceCollection);
-
-        Entry postEntry = postEntry("Sponge Bob");
-        System.out.println(">>> post entry= " + postEntry.getTitle());
-
-        // Generate random ID to pass as parameter in PUT() --
-        String id = "urn:uuid:customer-" + UUID.randomUUID().toString();
-        try {
-            // ID doesn't match with the existing IDs and NotFoundException is thrown
-            resourceCollection.put(id, updateEntry(postEntry, "James Bond"));
-        } catch (Exception e) {
-            Assert.assertEquals("NotFoundException", e.getClass().getSimpleName());
-        }
-    }
-
-    private Entry postEntry(String value) {
-        Entry entry = abdera.newEntry();
-        entry.setTitle("customer " + value);
-
-        Content content = abdera.getFactory().newContent();
-        content.setContentType(Content.Type.TEXT);
-        content.setValue(value);
-        entry.setContentElement(content);
-
-        return entry;
-    }
-
-    private Entry updateEntry(Entry entry, String value) {
-        entry.setTitle("customer " + value);
-
-        Content content = abdera.getFactory().newContent();
-        content.setContentType(Content.Type.TEXT);
-        content.setValue(value);
-        entry.setContentElement(content);
-
-        return entry;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
deleted file mode 100644
index 6beed6881f..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
+++ /dev/null
@@ -1,96 +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.binding.atom;
-
-import java.io.IOException;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.model.Base;
-import org.apache.abdera.model.Content;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.protocol.client.ClientResponse;
-import org.apache.abdera.protocol.client.RequestOptions;
-import org.apache.abdera.writer.Writer;
-import org.apache.abdera.writer.WriterFactory;
-
-/**
- * Utilities to help print and test various aspects of entity tag support.
- */
-public class AtomTestCaseUtils {
-
-    public static void prettyPrint(Abdera abdera, Base doc) throws IOException {
-        WriterFactory factory = abdera.getWriterFactory();
-        Writer writer = factory.getWriter("prettyxml");
-        writer.writeTo(doc, System.out);
-        System.out.println();
- 	}
-
-    public static void printRequestHeaders( String title, String indent, RequestOptions request ) {
-     	System.out.println( title );
-     	if ( request == null ) {
-     		System.out.println( indent + " request is null");
-     		return;
-     	}
-     	String [] headerNames = request.getHeaderNames();
-     	for ( String headerName: headerNames) {
-     		String header = request.getHeader(headerName);
-    	       System.out.println( indent + " header name,value=" + headerName + "," + header );	
-     	}    	               	           
-     }
-    
-     public static void printResponseHeaders( String title, String indent, ClientResponse response ) {
-      	System.out.println( title );
-     	if ( response == null ) {
-     		System.out.println( indent + " response is null");
-     		return;
-     	}
-     	String [] headerNames = response.getHeaderNames();
-     	for ( String headerName: headerNames) {
-     	    String header = response.getHeader(headerName);
-     	    System.out.println( indent + " header name,value=" + headerName + "," + header );
-     	}
-     	               	           
-     }
-
-	public static Entry newEntry(String value) {
-		Abdera abdera = new Abdera();
-		Entry entry = abdera.newEntry();
-		entry.setTitle("customer " + value);
-
-		Content content = abdera.getFactory().newContent();
-		content.setContentType(Content.Type.TEXT);
-		content.setValue(value);
-		entry.setContentElement(content);
-
-		return entry;
-	}
-
-	public static Entry updateEntry(Entry entry, String value) {
-		Abdera abdera = new Abdera();
-		entry.setTitle("customer " + value);
-
-		Content content = abdera.getFactory().newContent();
-		content.setContentType(Content.Type.TEXT);
-		content.setValue(value);
-		entry.setContentElement(content);
-
-		return entry;
-	}		
-	
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
deleted file mode 100644
index 5b4d995dc1..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
+++ /dev/null
@@ -1,42 +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.binding.atom;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-public class Consumer {
-
-    public static void main(String[] args) throws Exception {
-
-        String contribution = ContributionLocationHelper.getContributionLocation(AtomDeleteTestCase.class);
-        Node node = NodeFactory.newInstance().createNode(
-                                                         "org/apache/tuscany/sca/binding/atom/Consumer.composite", new Contribution("consumer", contribution));
-        node.start();
-
-        CustomerClient testService = node.getService(CustomerClient.class, "CustomerClient");
-        testService.testCustomerCollection();
-
-        node.stop();
-        node.destroy();
-    }
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
deleted file mode 100644
index 383344f3cb..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
+++ /dev/null
@@ -1,165 +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.binding.atom;
-
-import java.util.Date;
-
-import junit.framework.Assert;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.model.Content;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test case for the given package.
- */
-public class ConsumerProviderAtomTestCase {
-
-    protected static Node consumerNode;
-    protected static Node providerNode;
-    protected static CustomerClient testService;
-    protected static Abdera abdera;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        System.out.println(">>>AtomBindingIntegratedTestCase.init entry");
-        String contribution = ContributionLocationHelper.getContributionLocation(AtomDeleteTestCase.class);
-        providerNode = NodeFactory.newInstance().createNode(
-                                                               "org/apache/tuscany/sca/binding/atom/Provider.composite", new Contribution("provider", contribution));
-        consumerNode = NodeFactory.newInstance().createNode(
-                                                               "org/apache/tuscany/sca/binding/atom/Consumer.composite", new Contribution("consumer", contribution));
-        providerNode.start();
-        consumerNode.start();
-        testService = consumerNode.getService(CustomerClient.class, "CustomerClient");
-        abdera = new Abdera();
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println(">>>AtomBindingIntegratedTestCase.destroy entry");
-        consumerNode.stop();
-        consumerNode.destroy();
-        providerNode.stop();
-        providerNode.destroy();
-    }
-
-    @Test
-    public void testPrelim() throws Exception {
-        Assert.assertNotNull(providerNode);
-        Assert.assertNotNull(consumerNode);
-        Assert.assertNotNull(testService);
-        Assert.assertNotNull(abdera);
-    }
-
-    @Test
-    public void testEntry() throws Exception {
-        // System.out.println( getClass().getName() + ".testEntry entry" );
-        Entry entry = abdera.newEntry();
-        Assert.assertNotNull(entry);
-
-        String testTitle = "Sponge Bob";
-        entry.setTitle(testTitle);
-        Assert.assertEquals(testTitle, entry.getTitle());
-
-        String testContent = "This is the content";
-        entry.setContent(testContent);
-        Assert.assertEquals(testContent, entry.getContent());
-
-        Date now = new Date();
-        entry.setEdited(now);
-        Assert.assertEquals(now, entry.getEdited());
-
-        Date later = new Date();
-        entry.setPublished(later);
-        Assert.assertEquals(later, entry.getPublished());
-
-        String testSummary = "This is the summary";
-        entry.setSummary(testSummary);
-        Assert.assertEquals(testSummary, entry.getSummary());
-    }
-
-    @Test
-    public void testCustomerCollection() throws Exception {
-        System.out.println(getClass().getName() + ".testCustomerCollection entry");
-        Collection resourceCollection = testService.getCustomerCollection();
-        Assert.assertNotNull(resourceCollection);
-
-        Entry newEntry = newEntry("Sponge Bob");
-        System.out.println(">>> post entry=" + newEntry.getTitle());
-        newEntry = resourceCollection.post(newEntry);
-        System.out.println("<<< post id=" + newEntry.getId() + " entry=" + newEntry.getTitle());
-
-        newEntry = newEntry("Jane Bond");
-        System.out.println(">>> post entry=" + newEntry.getTitle());
-        newEntry = resourceCollection.post(newEntry);
-        System.out.println("<<< post id=" + newEntry.getId() + " entry=" + newEntry.getTitle());
-
-        System.out.println(">>> get id=" + newEntry.getId());
-        Entry entry = resourceCollection.get(newEntry.getId().toString());
-        System.out.println("<<< get id=" + entry.getId() + " entry=" + entry.getTitle());
-
-        System.out.println(">>> put id=" + newEntry.getId() + " entry=" + entry.getTitle());
-        resourceCollection.put(entry.getId().toString(), updateEntry(entry, "James Bond"));
-        System.out.println("<<< put id=" + entry.getId() + " entry=" + entry.getTitle());
-
-        System.out.println(">>> delete id=" + entry.getId());
-        resourceCollection.delete(entry.getId().toString());
-        System.out.println("<<< delete id=" + entry.getId());
-
-        System.out.println(">>> get collection");
-        Feed feed = resourceCollection.getFeed();
-        System.out.println("<<< get collection");
-        for (Object o : feed.getEntries()) {
-            Entry e = (Entry)o;
-            System.out.println("id = " + e.getId() + " entry = " + e.getTitle());
-        }
-    }
-
-    private Entry newEntry(String value) {
-        Entry entry = abdera.newEntry();
-        entry.setTitle("customer " + value);
-
-        Content content = abdera.getFactory().newContent();
-        content.setContentType(Content.Type.TEXT);
-        content.setValue(value);
-        entry.setContentElement(content);
-
-        return entry;
-    }
-
-    private Entry updateEntry(Entry entry, String value) {
-        entry.setTitle("customer " + value);
-
-        Content content = abdera.getFactory().newContent();
-        content.setContentType(Content.Type.TEXT);
-        content.setValue(value);
-        entry.setContentElement(content);
-
-        return entry;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
deleted file mode 100644
index 7ec9c1480e..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
+++ /dev/null
@@ -1,265 +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.binding.atom;

-

-import java.io.IOException;

-import java.io.Reader;

-import java.util.Date;

-

-import junit.framework.Assert;

-

-import org.apache.abdera.Abdera;

-import org.apache.abdera.factory.Factory;

-import org.apache.abdera.i18n.iri.IRI;

-import org.apache.abdera.model.Content;

-import org.apache.abdera.model.Document;

-import org.apache.abdera.model.Entry;

-import org.apache.abdera.model.Feed;

-import org.apache.abdera.parser.Parser;

-import org.apache.abdera.protocol.Response.ResponseType;

-import org.apache.abdera.protocol.client.AbderaClient;

-import org.apache.abdera.protocol.client.ClientResponse;

-import org.apache.abdera.protocol.client.RequestOptions;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.ContributionLocationHelper;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-/**

- * Tests use of content negotiation for Atom binding in Tuscany. Uses the SCA

- * provided Provider composite to act as a server. Uses the Abdera provided

- * Client to act as a client.

- */

-public class ContentNegotiationTest {

-    public final static String providerURI = "http://localhost:8084/customer";

-    protected static Node providerNode;

-    protected static Abdera abdera;

-    protected static AbderaClient client;

-    protected static Parser abderaParser;

-    protected static String lastId;

-

-    @BeforeClass

-    public static void init() throws Exception {

-        System.out.println(">>>ContentNegotiationTest.init");

-        String contribution = ContributionLocationHelper.getContributionLocation(AtomDeleteTestCase.class);

-        providerNode = NodeFactory.newInstance().createNode(

-                                                               "org/apache/tuscany/sca/binding/atom/Provider.composite", new Contribution("provider", contribution));

-        providerNode.start();

-        abdera = new Abdera();

-        client = new AbderaClient(abdera);

-        abderaParser = Abdera.getNewParser();

-    }

-

-    @AfterClass

-    public static void destroy() throws Exception {

-        System.out.println(">>>ContentNegotiationTest.destroy");

-        providerNode.stop();

-        providerNode.destroy();

-    }

-

-    @Test

-    public void testPrelim() throws Exception {

-        Assert.assertNotNull(providerNode);

-        Assert.assertNotNull(client);

-    }

-

-    @Test

-    public void testPost() throws Exception {

-        System.out.println(">>>ContentNegotiationTest.testPost");

-        // Testing of entry creation

-        Factory factory = abdera.getFactory();

-        String customerName = "Fred Farkle";

-        Entry entry = factory.newEntry();

-        entry.setTitle("customer " + customerName);

-        entry.setUpdated(new Date());

-        entry.addAuthor("Apache Tuscany");

-        // ID created by collection.

-        Content content = abdera.getFactory().newContent();

-        content.setContentType(Content.Type.TEXT);

-        content.setValue(customerName);

-        entry.setContentElement(content);

-

-        RequestOptions opts = new RequestOptions();

-        final String contentType = "application/atom+xml; type=entry";

-        opts.setContentType(contentType);

-        // AtomTestCaseUtils.printRequestHeaders( "Post request headers", "   ",

-        // opts );

-        IRI colUri = new IRI(providerURI).resolve("customer");

-        // res = client.post(colUri.toString() + "?test=foo", entry, opts);

-        ClientResponse res = client.post(colUri.toString(), entry, opts);

-

-        // Assert response status code is 201-OK.

-        // Assert response header Content-Type: application/atom+xml;

-        // charset=UTF-8

-        Assert.assertEquals(201, res.getStatus());

-        String returnedContentType = res.getContentType().toString().trim();

-        Assert.assertEquals(contentType, returnedContentType);

-

-        String eTag = res.getHeader("ETag");

-        if (eTag != null)

-            lastId = eTag.substring(1, eTag.length() - 1);

-

-        // AtomTestCaseUtils.printResponseHeaders(

-        // "Entry post response headers:", "   ", res );

-        // System.out.println("Entry post response content:");

-        // AtomTestCaseUtils.prettyPrint(abdera, res.getDocument());

-    }

-

-    @Test

-    public void testXMLEntryGet() throws Exception {

-        System.out.println(">>>ContentNegotiationTest.testXMLEntryGet");

-        RequestOptions opts = new RequestOptions();

-        opts.setHeader("Accept", "application/atom+xml");

-

-        IRI colUri = new IRI(providerURI).resolve("customer");

-        ClientResponse res = client.get(colUri.toString() + "/" + lastId, opts);

-        Assert.assertEquals(200, res.getStatus());

-        String returnedContentType = res.getContentType().toString().trim();

-        // Assert.assertEquals(contentType, returnedContentType );

-        res.release();

-    }

-

-    @Test

-    public void testJSONEntryGet() throws Exception {

-        System.out.println(">>>ContentNegotiationTest.testJSONEntryGet");

-        RequestOptions opts = new RequestOptions();

-        opts.setHeader("Accept", "application/json");

-

-        IRI colUri = new IRI(providerURI).resolve("customer");

-        ClientResponse res = client.get(colUri.toString() + "/" + lastId, opts);

-        try {

-            Assert.assertEquals(200, res.getStatus());

-            // Abdera 0.4 throws exception on getContentType with

-            // application/json.

-            // System.out.println(

-            // "ContentNegotiationTest.testJSONEntryGet contentType=" +

-            // res.getContentType());

-            String contentType = res.getHeader("Content-Type");

-            Assert.assertTrue(-1 < contentType.indexOf("application/json"));

-            // Following is a poor man's JSONObject test to avoid dependency on

-            // JSON libs.

-            // JSONObject jsonResp = new JSONObject(res.);

-            // Assert.assertEquals(12345, jsonResp.getInt("result"));

-            String responseBody = readResponse(res.getReader());

-            Assert.assertTrue(responseBody.startsWith("{"));

-            Assert.assertTrue(responseBody.endsWith("}"));

-            Assert.assertTrue(-1 < responseBody.indexOf("\"id\""));

-            Assert.assertTrue(-1 < responseBody.indexOf("\"title\""));

-            Assert.assertTrue(-1 < responseBody.indexOf("\"updated\""));

-            // AtomTestCaseUtils.printResponseHeaders(

-            // "JSON Entry response headers:", "   ", res );

-            // System.out.println(

-            // "ContentNegotiationTest.testJSONEntryGet JSON entry body=" +

-            // responseBody );

-        } finally {

-            res.release();

-        }

-    }

-

-    @Test

-    public void testXMLFeedGet() throws Exception {

-        System.out.println(">>>ContentNegotiationTest.testXMLFeedGet");

-        RequestOptions opts = new RequestOptions();

-        opts.setHeader("Accept", "application/atom+xml");

-

-        // Atom feed request

-        ClientResponse res = client.get(providerURI, opts);

-        Assert.assertNotNull(res);

-        try {

-            // Asser feed provided since no predicates

-            Assert.assertEquals(200, res.getStatus());

-            Assert.assertEquals(ResponseType.SUCCESS, res.getType());

-            // AtomTestCaseUtils.printResponseHeaders( "Feed response headers:",

-            // "   ", res );

-            // System.out.println("Feed response content:");

-            // AtomTestCaseUtils.prettyPrint(abdera, res.getDocument());

-

-            // Perform other tests on feed.

-            Document<Feed> doc = res.getDocument();

-            Assert.assertNotNull(doc);

-            Feed feed = doc.getRoot();

-            Assert.assertNotNull(feed);

-            // RFC 4287 requires non-null id, title, updated elements

-            Assert.assertNotNull(feed.getId());

-            Assert.assertNotNull(feed.getTitle());

-            Assert.assertNotNull(feed.getUpdated());

-            // AtomTestCaseUtils.printFeed( "Feed values", "   ", feed );

-        } finally {

-            res.release();

-        }

-    }

-

-    @Test

-    public void testJSONFeedGet() throws Exception {

-        System.out.println(">>>ContentNegotiationTest.testJSONFeedGet");

-        RequestOptions opts = new RequestOptions();

-        opts.setHeader("Accept", "application/json");

-

-        // JSON feed request

-        ClientResponse res = client.get(providerURI, opts);

-        Assert.assertNotNull(res);

-        try {

-            // Assert feed provided since no predicates

-            Assert.assertEquals(200, res.getStatus());

-            // Abdera 0.4 throws exception on getContentType with

-            // application/json.

-            // System.out.println(

-            // "ContentNegotiationTest.testJSONEntryGet contentType=" +

-            // res.getContentType());

-            String contentType = res.getHeader("Content-Type");

-            Assert.assertTrue(-1 < contentType.indexOf("application/json"));

-            // Following is a poor man's JSONObject test to avoid dependency on

-            // JSON libs.

-            // JSONObject jsonResp = new JSONObject(res.);

-            // Assert.assertEquals(12345, jsonResp.getInt("result"));

-            String responseBody = readResponse(res.getReader());

-            Assert.assertTrue(responseBody.startsWith("{"));

-            Assert.assertTrue(responseBody.endsWith("}"));

-            Assert.assertTrue(-1 < responseBody.indexOf("\"id\""));

-            Assert.assertTrue(-1 < responseBody.indexOf("\"title\""));

-            Assert.assertTrue(-1 < responseBody.indexOf("\"updated\""));

-            Assert.assertTrue(-1 < responseBody.indexOf("\"entries\""));

-            // AtomTestCaseUtils.printResponseHeaders(

-            // "JSON Entry response headers:", "   ", res );

-            // System.out.println(

-            // "ContentNegotiationTest.testJSONEntryGet JSON entry body=" +

-            // responseBody );

-        } finally {

-            res.release();

-        }

-    }

-

-    protected String readResponse(Reader responseReader) {

-        if (responseReader == null)

-            return "";

-        StringBuffer sb = new StringBuffer(1024);

-        try {

-            int charValue = 0;

-            while ((charValue = responseReader.read()) != -1) {

-                // result = result + (char) charValue;

-                sb.append((char)charValue);

-            }

-        } catch (IOException e) {

-        }

-        return sb.toString();

-    }

-}

diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
deleted file mode 100644
index bc32b91367..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
+++ /dev/null
@@ -1,29 +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.binding.atom;
-
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-
-public interface CustomerClient {
-
-    void testCustomerCollection() throws Exception;
- 
-    Collection getCustomerCollection();
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
deleted file mode 100644
index 0aefce608b..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
+++ /dev/null
@@ -1,99 +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.binding.atom;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.model.Content;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.oasisopen.sca.annotation.Reference;
-
-public class CustomerClientImpl implements CustomerClient {
-
-    protected final Abdera abdera = new Abdera();
-    
-    @Reference
-    public Collection customerCollection;
-
-    public void testCustomerCollection() throws Exception {
-
-        Entry newEntry = newEntry("Sponge Bob");
-        System.out.println(">>> post entry=" + newEntry.getTitle());
-        newEntry = customerCollection.post(newEntry);
-        System.out.println("<<< post id=" + newEntry.getId() + " entry=" + newEntry.getTitle());
-
-        newEntry = newEntry("Jane Bond");
-        System.out.println(">>> post entry=" + newEntry.getTitle());
-        newEntry = customerCollection.post(newEntry);
-        System.out.println("<<< post id=" + newEntry.getId() + " entry=" + newEntry.getTitle());
-
-        System.out.println(">>> get id=" + newEntry.getId());
-        Entry entry = customerCollection.get(newEntry.getId().toString());
-        System.out.println("<<< get id=" + entry.getId() + " entry=" + entry.getTitle());
-
-        System.out.println(">>> put id=" + newEntry.getId() + " entry=" + entry.getTitle());
-        customerCollection.put(entry.getId().toString(), updateEntry(entry, "James Bond"));
-        System.out.println("<<< put id=" + entry.getId() + " entry=" + entry.getTitle());
-
-        System.out.println(">>> delete id=" + entry.getId());
-        customerCollection.delete(entry.getId().toString());
-        System.out.println("<<< delete id=" + entry.getId());
-
-        System.out.println(">>> get collection");
-        Feed feed = customerCollection.getFeed();
-        System.out.println("<<< get collection");
-        for (Object o : feed.getEntries()) {
-            Entry e = (Entry)o;
-            System.out.println("id = " + e.getId() + " entry = " + e.getTitle());
-        }
-    }
-
-    public Collection getCustomerCollection() {
-    	return customerCollection;
-    }
-    
-    private Entry newEntry(String value) {
-
-        Entry entry = this.abdera.newEntry();
-        entry.setTitle("customer " + value);
-
-        Content content = this.abdera.getFactory().newContent();
-        content.setContentType(Content.Type.TEXT);
-        content.setValue(value);
-        
-        entry.setContentElement(content);
-
-        return entry;
-    }
-
-    private Entry updateEntry(Entry entry, String value) {
-
-        entry.setTitle("customer " + value);
-
-        Content content = this.abdera.getFactory().newContent();
-        content.setContentType(Content.Type.TEXT);
-        content.setValue(value);
-
-        entry.setContentElement(content);
-
-        return entry;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
deleted file mode 100644
index 222dc3e394..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
+++ /dev/null
@@ -1,149 +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.binding.atom;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.model.Content;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.binding.atom.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class CustomerCollectionImpl implements Collection {
-    private final Abdera abdera = new Abdera();
-    private Map<String, Entry> entries = new HashMap<String, Entry>();
-    public Date lastModified = new Date();
-    
-    /**
-     * Default constructor 
-     */
-    public CustomerCollectionImpl() {
-
-    }
-
-    public Entry post(Entry entry) {
-        System.out.println(">>> CustomerCollectionImpl.post entry=" + entry.getTitle());
-
-        if(!("Exception_Test".equalsIgnoreCase(entry.getTitle())))
-        {
-           String id = "urn:uuid:customer-" + UUID.randomUUID().toString();
-           entry.setId(id);
-
-           entry.addLink("" + id, "edit");
-           entry.addLink("" + id, "alternate");
-           Date now = new Date();
-           entry.setUpdated(now);
-           lastModified = now;
-           entries.put(id, entry);
-
-            System.out.println(">>> CustomerCollectionImpl.post return id=" + id);
-
-            return entry;
-
-        }
-        else
-        {
-        	throw new IllegalArgumentException("Exception in Post method");
-        }
-    }
-
-    public Entry get(String id) {
-        System.out.println(">>> CustomerCollectionImpl.get id=" + id);
-        return entries.get(id);
-    }
-
-    public void put(String id, Entry entry) throws NotFoundException {
-        System.out.println(">>> CustomerCollectionImpl.put id=" + id + " entry=" + entry.getTitle());
-        if(entries.containsKey(id)){
-        	Date now = new Date();
-        	entry.setUpdated(now);
-        	lastModified = now;
-            entries.put(id, entry);
-        }
-        else {
-        	throw new NotFoundException();
-        }
-     }
-
-    public void delete(String id) throws NotFoundException {
-        System.out.println(">>> CustomerCollectionImpl.delete id=" + id);
-        if(entries.containsKey(id)){
-        	entries.remove(id);
-        	lastModified = new Date();
-        }
-        else {
-        	throw new NotFoundException();
-		}
-     }
-
-    public Feed getFeed() {
-        System.out.println(">>> CustomerCollectionImpl.getFeed");
-
-        Feed feed = this.abdera.getFactory().newFeed();
-        feed.setId("customers" + this.hashCode() ); // provide unique id for feed instance.
-        feed.setTitle("customers");
-        feed.setSubtitle("This is a sample feed");
-        feed.setUpdated(lastModified);
-        feed.addLink("");
-        feed.addLink("", "self");
-
-        for (Entry entry : entries.values()) {
-            feed.addEntry(entry);
-        }
-
-        return feed;
-    }
-
-    public Feed query(String queryString) {
-        System.out.println(">>> CustomerCollectionImpl.query collection " + queryString);
-        return getFeed();
-    }
-
-    // This method used for testing.
-    protected void testPut(String value) {
-        String id = "urn:uuid:customer-" + UUID.randomUUID().toString();
-
-        Entry entry = abdera.getFactory().newEntry();
-        entry.setId(id);
-        entry.setTitle("customer " + value);
-
-        Content content = this.abdera.getFactory().newContent();
-        content.setContentType(Content.Type.TEXT);
-        content.setValue(value);
-
-        entry.setContentElement(content);
-
-        entry.addLink("" + id, "edit");
-        entry.addLink("" + id, "alternate");
-
-        entry.setUpdated(new Date());
-
-        entries.put(id, entry);
-        System.out.println(">>> id=" + id);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
deleted file mode 100644
index 41257d9a7f..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
+++ /dev/null
@@ -1,210 +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.binding.atom;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.factory.Factory;
-import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.model.Content;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.binding.atom.collection.MediaCollection;
-import org.apache.tuscany.sca.binding.atom.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class MediaCollectionImpl implements MediaCollection {
-    private final Abdera abdera = new Abdera();
-    private Map<String, Entry> entries = new HashMap<String, Entry>();
-    private Map<String, String> mediaFiles = new HashMap<String, String>();
-    public Date lastModified = new Date();
-    
-    public Entry post(Entry entry) {
-        System.out.println(">>> MediaCollectionImpl.post entry=" + entry.getTitle());
-
-        if(!("Exception_Test".equalsIgnoreCase(entry.getTitle())))
-        {
-           String id = "urn:uuid:customer-" + UUID.randomUUID().toString();
-           entry.setId(id);
-
-           entry.addLink("" + id, "edit");
-           entry.addLink("" + id, "alternate");
-           Date now = new Date();
-           entry.setUpdated(now);
-           lastModified = now;
-           entries.put(id, entry);
-
-            System.out.println(">>> MediaCollectionImpl.post return id=" + id);
-
-            return entry;
-
-        }
-        else
-        {
-        	throw new IllegalArgumentException("Exception in Post method");
-        }
-    }
-
-    public Entry get(String id) {
-        System.out.println(">>> MediaCollectionImpl.get id=" + id);
-        return entries.get(id);
-    }
-
-    public void put(String id, Entry entry) throws NotFoundException {
-        System.out.println(">>> MediaCollectionImpl.put id=" + id + " entry=" + entry.getTitle());
-        if(entries.containsKey(id)){
-        	Date now = new Date();
-        	entry.setUpdated(now);
-        	lastModified = now;
-            entries.put(id, entry);
-        }
-        else {
-        	throw new NotFoundException();
-        }
-     }
-
-    public void delete(String id) throws NotFoundException {
-        System.out.println(">>> MediaCollectionImpl.delete id=" + id);
-        if(entries.containsKey(id)){
-        	entries.remove(id);
-        	lastModified = new Date();
-        }
-        else {
-        	throw new NotFoundException();
-		}
-     }
-
-    public Feed getFeed() {
-        System.out.println(">>> MediaCollectionImpl.getFeed");
-
-        Feed feed = this.abdera.getFactory().newFeed();
-        feed.setId("customers" + this.hashCode() ); // provide unique id for feed instance.
-        feed.setTitle("customers");
-        feed.setSubtitle("This is a sample feed");
-        feed.setUpdated(lastModified);
-        feed.addLink("");
-        feed.addLink("", "self");
-
-        for (Entry entry : entries.values()) {
-            feed.addEntry(entry);
-        }
-
-        return feed;
-    }
-
-    public Feed query(String queryString) {
-        System.out.println(">>> MediaCollectionImpl.query collection " + queryString);
-        return getFeed();
-    }
-
-    // This method used for testing.
-    protected void testPut(String value) {
-        String id = "urn:uuid:customer-" + UUID.randomUUID().toString();
-
-        Entry entry = abdera.getFactory().newEntry();
-        entry.setId(id);
-        entry.setTitle("customer " + value);
-
-        Content content = this.abdera.getFactory().newContent();
-        content.setContentType(Content.Type.TEXT);
-        content.setValue(value);
-
-        entry.setContentElement(content);
-
-        entry.addLink("" + id, "edit");
-        entry.addLink("" + id, "alternate");
-
-        entry.setUpdated(new Date());
-
-        entries.put(id, entry);
-        System.out.println(">>> id=" + id);
-    }
-
-    // MediaCollection role
-    public Entry postMedia(String title, String slug, String contentType, InputStream media) {
-        System.out.println(">>> MediaCollectionImpl.postMedia title=" + title + ", slug=" + slug + ", contentType=" + contentType );
-
-        Factory factory = abdera.getFactory();
-        Entry entry = factory.newEntry();
-        // Must provide entry to media as per Atom Pub spec (http://tools.ietf.org/html/rfc5023#section-9.6)
-        // <?xml version="1.0"?>
-        // <entry xmlns="http://www.w3.org/2005/Atom">
-        //   <title>The Beach</title> (REQUIRED) 
-        //   <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id> (REQUIRED)
-        //   <updated>2005-10-07T17:17:08Z</updated>
-        //   <summary type="text" /> (REQUIRED, OPTIONAL to populate
-        //   <content type="image/png" src="http://media.example.org/the_beach.png"/>
-        // <link rel="edit-media" href="http://media.example.org/edit/the_beach.png" />
-        // <link rel="edit" href="http://example.org/media/edit/the_beach.atom" />
-        // </entry>  		
-
-        // Normalize title
-		entry.setTitle( title );
-        String normalTitle = title.replace( " ", "_" );
-        String hostURL = "http://media.example.org/";
-        int lastDelimiterPos = contentType != null ? contentType.lastIndexOf( "/" ) : -1;
-        String extension = "";
-        if ( lastDelimiterPos != -1 ) {
-        	extension = contentType.substring( lastDelimiterPos + 1 );
-        } else {
-        	extension = contentType;
-        }
-        long mediaLength = -1;
-        try {
-        	mediaLength = media.skip( Long.MAX_VALUE );
-        } catch ( IOException e ){}
-        
-        // A true implementation would store the media to a repository, e.g. file system.
-        // This implementation record's the id and the location.
-        String id = "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a-" + mediaFiles.size();
-        String reposLocation = hostURL + "edit/" + normalTitle;
-        mediaFiles.put( id, reposLocation );
-
-        // Build entry for media link.
-		entry.setUpdated( new Date() );
-		entry.setId( id );
-		// Convention. Return header properties as key values.
-		entry.setSummary( "Content-Type=" + contentType + ",Content-Length=" + mediaLength  );
-		entry.setContent( new IRI( hostURL + normalTitle + "." + extension ), contentType );
-		entry.addLink( reposLocation + ".atom", "edit" );
-		entry.addLink( reposLocation + "." + extension, "edit-media" );
-		return entry;  	
-    }
-
-    public void putMedia(String id, String contentType, InputStream media) throws NotFoundException {
-        System.out.println(">>> MediaCollectionImpl.putMedia id=" + id + ", contentType=" + contentType );
-
-        // Must responsd with success or not found as per Atom Pub spec (http://tools.ietf.org/html/rfc5023#section-9.6)
-        // Body is null.
-        if ( !id.endsWith( "0" ) )
-        	throw new NotFoundException( "Media at id=" + id + " not found." );
-        
-        // A true implementation would update the media in the media repository.
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
deleted file mode 100644
index 0aabf225a4..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
+++ /dev/null
@@ -1,287 +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.binding.atom;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import junit.framework.Assert;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.abdera.model.Document;
-import org.apache.abdera.model.Link;
-import org.apache.abdera.protocol.client.AbderaClient;
-import org.apache.abdera.protocol.client.ClientResponse;
-import org.apache.abdera.protocol.client.RequestOptions;
-import org.apache.abdera.protocol.client.util.BaseRequestEntity;
-import org.apache.abdera.util.EntityTag;
-import org.apache.abdera.parser.Parser;
-
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
-
-/**
- * Tests use of server provided entry entity tags for Atom binding in Tuscany.
- * Tests conditional gets (e.g. get if-none-match) or conditional posts (post if-match)
- * using entity tags or last modified header entries. 
- * Uses the SCA provided Provider composite to act as a server.
- * Uses the Abdera provided Client to act as a client.
- */
-public class MediaCollectionTestCase {
-	public final static String providerURI = "http://localhost:8084/receipt";
-	protected static SCADomain scaConsumerDomain;
-	protected static SCADomain scaProviderDomain;
-	protected static CustomerClient testService;
-    protected static Abdera abdera;
-    protected static AbderaClient client;
-    protected static Parser abderaParser;    
-    protected static String eTag;
-    protected static Date lastModified;
-    protected static String mediaId;
-    protected static final SimpleDateFormat dateFormat = new SimpleDateFormat( "EEE, dd MMM yyyy HH:mm:ss Z" ); // RFC 822 date time
-
-	@BeforeClass
-	public static void init() throws Exception {
-		System.out.println(">>>MediaCollectionTestCase.init");
-		scaProviderDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite");
-		abdera = new Abdera();
-		client = new AbderaClient(abdera);
-		abderaParser = Abdera.getNewParser();
-	}
-
-	@AfterClass
-	public static void destroy() throws Exception {
-		System.out.println(">>>MediaCollectionTestCase.destroy");
-		scaProviderDomain.close();
-	}
-
-	@Test
-	public void testPrelim() throws Exception {
-		Assert.assertNotNull(scaProviderDomain);
-		Assert.assertNotNull( client );
-	}
-	
-    @Test
-	public void testMediaEntryPost() throws Exception {
-    	// Pseudo Code (see APP (http://tools.ietf.org/html/rfc5023#section-9.6)
-    	// Post request 
-    	// POST /edit/ HTTP/1.1
-        // Host: media.example.org
-        // Content-Type: image/png
-        // Slug: The Beach
-        // Content-Length: nnn
-        // ...binary data...
-		
-		// Testing of entry creation
-		String receiptName = "Auto Repair Bill";
-		String fileName = "ReceiptToms.gif";
-		File input = new File( fileName );
-		boolean exists = input.exists();
-		Assert.assertTrue( exists );		
-		
-        // Prepare HTTP post
-        // PostMethod post = new PostMethod( colUri.toString() );
-        PostMethod post = new PostMethod( providerURI );
-        post.addRequestHeader( "Content-Type", "image/gif" );
-        post.addRequestHeader( "Title", "Title " + receiptName + "" );
-        post.addRequestHeader( "Slug", "Slug " + receiptName + "" );
-        post.setRequestEntity( 
-        	new InputStreamRequestEntity( new FileInputStream( input ), "image/gif" ) );
-		
-        // Get HTTP client
-        HttpClient httpclient = new HttpClient();
-        try {
-            // Execute request
-            int result = httpclient.executeMethod(post);
-            // Pseudo Code (see APP (http://tools.ietf.org/html/rfc5023#section-9.6)
-        	// Post response
-            // Tuscany responds with proper media links. Note that the media is 
-        	// stored in a different location than the media information which is
-        	// stored in the Atom feed.
-            // HTTP/1.1 201 Created
-            // Display status code
-            // System.out.println("Response status code: " + result + ", status text=" + post.getStatusText() );
-        	Assert.assertEquals(201, result );
-            // Display response
-            // System.out.println("Response body: ");
-            // System.out.println(post.getResponseBodyAsString()); // Warning: BodyAsString recommends BodyAsStream
-
-            // Location: http://example.org/media/edit/the_beach.atom (REQUIRED)
-            // System.out.println( "Response Location=" + post.getResponseHeader( "Location" ).getValue() + "." );
-        	Header header = post.getResponseHeader( "Location" );
-        	Assert.assertNotNull( header );
-        	Assert.assertNotNull( header.getValue() );
-            // ContentLocation: http://example.org/media/edit/the_beach.jpg (REQUIRED)
-            // System.out.println( "Response Content-Location=" + post.getResponseHeader( "Content-Location" ).getValue() );
-        	header = post.getResponseHeader( "Content-Location" );
-        	Assert.assertNotNull( header );
-        	Assert.assertNotNull( header.getValue() );      	
-            // Content-Type: application/atom+xml;type=entry;charset="utf-8"
-            // System.out.println( "Response Content-Type=" + post.getResponseHeader( "Content-Type" ).getValue());
-        	header = post.getResponseHeader( "Content-Type" );
-        	Assert.assertNotNull( header );
-        	Assert.assertNotNull( header.getValue() );      	
-            // Content-Length: nnn (OPTIONAL)
-            // System.out.println( "Response Content-Length=" + post.getResponseHeader( "Content-Length" ).getValue() );
-        	header = post.getResponseHeader( "Content-Length" );
-        	Assert.assertNotNull( header );
-        	Assert.assertNotNull( header.getValue() );      	
-            // <?xml version="1.0"?>
-            // <entry xmlns="http://www.w3.org/2005/Atom">
-            //   <title>The Beach</title> (REQUIRED) 
-            //   <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id> (REQUIRED)
-            //   <updated>2005-10-07T17:17:08Z</updated>
-            //   <author><name>Daffy</name></author> 
-            //   <summary type="text" /> (REQUIRED, OPTIONAL to populate
-            //   <content type="image/png" src="http://media.example.org/the_beach.png"/>
-            // <link rel="edit-media" href="http://media.example.org/edit/the_beach.png" />
-            // <link rel="edit" href="http://example.org/media/edit/the_beach.atom" />
-            // </entry>  		
-            Document<Entry> document = abderaParser.parse( post.getResponseBodyAsStream() );
-            Entry entry = document.getRoot();
-            String title = entry.getTitle();
-            // System.out.println( "mediaPost entry.title=" + title );
-            Assert.assertNotNull( title );
-            IRI id = entry.getId();
-            // System.out.println( "mediaPost entry.id=" + id );
-            Assert.assertNotNull( id );
-            mediaId = id.toString();
-            Assert.assertNotNull( mediaId ); // Save for put/update request
-            Date updated = entry.getUpdated();
-            // System.out.println( "mediaPost entry.updated=" + updated);
-            Assert.assertNotNull( updated );
-            String summary = entry.getSummary();
-            // System.out.println( "mediaPost entry.summary=" + summary);
-            Assert.assertNotNull( summary );
-            IRI contentSrc = entry.getContentSrc();
-            // System.out.println( "mediaPost entry.content.src=" + contentSrc + ", type=" + entry.getContentType());
-            Assert.assertNotNull( contentSrc );
-            Link editLink = entry.getEditLink();
-    		// System.out.println( "mediaPost entry.editLink" + " rel=" + editLink.getRel() + ", href=" +  editLink.getHref() );
-    		Assert.assertNotNull( editLink );
-    		Assert.assertNotNull( editLink.getRel() );
-    		Assert.assertNotNull( editLink.getHref() );
-            Link editMediaLink = entry.getEditMediaLink();
-    		// System.out.println( "mediaPost entry.editMediaLink" + " rel=" + editMediaLink.getRel() + ", href=" +  editMediaLink.getHref() );
-    		Assert.assertNotNull( editMediaLink );
-    		Assert.assertNotNull( editMediaLink.getRel() );
-    		Assert.assertNotNull( editMediaLink.getHref() );
-
-        } finally {
-            // Release current connection to the connection pool once you are done
-            post.releaseConnection();
-        }
-    }
-
-	@Test
-	public void testMediaEntryPutFound() throws Exception {
-    	// Pseudo Code (see APP (http://tools.ietf.org/html/rfc5023#section-9.6)
-		// Testing of entry update
-		String receiptName = "Value Autoglass Bill";
-		String fileName = "ReceiptValue.jpg";
-		File input = new File( fileName );
-		boolean exists = input.exists();
-		Assert.assertTrue( exists );		
-		
-        // Prepare HTTP put request
-	    // PUT /edit/the_beach.png HTTP/1.1
-	    // Host: media.example.org
-	    // Content-Type: image/png
-	    // Content-Length: nnn
-	    // ...binary data...
-        PutMethod put = new PutMethod( providerURI + "/" + mediaId );
-        put.addRequestHeader( "Content-Type", "image/jpg" );
-        put.addRequestHeader( "Title", "Title " + receiptName + "" );
-        put.addRequestHeader( "Slug", "Slug " + receiptName + "" );
-        put.setRequestEntity( 
-        	new InputStreamRequestEntity( new FileInputStream( input ), "image/jpg" ) );
-		
-        // Get HTTP client
-        HttpClient httpclient = new HttpClient();
-        try {
-            // Execute request
-            int result = httpclient.executeMethod(put);
-            // Pseudo Code (see APP (http://tools.ietf.org/html/rfc5023#section-9.6)
-            // Display status code
-            // System.out.println("Response status code: " + result + ", status text=" + put.getStatusText() );
-        	Assert.assertEquals(200, result );
-            // Display response. Should be empty for put.
-            // System.out.println("Response body: ");
-            // System.out.println(put.getResponseBodyAsString()); // Warning: BodyAsString recommends BodyAsStream
-        } finally {
-            // Release current connection to the connection pool once you are done
-            put.releaseConnection();
-        }
-	}
-	
-	@Test
-	public void testMediaEntryPutNotFound() throws Exception {
-    	// Pseudo Code (see APP (http://tools.ietf.org/html/rfc5023#section-9.6)
-		// Testing of entry update
-		String receiptName = "Value Autoglass Bill";
-		String fileName = "ReceiptValue.jpg";
-		File input = new File( fileName );
-		boolean exists = input.exists();
-		Assert.assertTrue( exists );		
-		
-        // Prepare HTTP put request
-	    // PUT /edit/the_beach.png HTTP/1.1
-	    // Host: media.example.org
-	    // Content-Type: image/png
-	    // Content-Length: nnn
-	    // ...binary data...
-        PutMethod put = new PutMethod( providerURI + "/" + mediaId + "-bogus" ); // Does not exist.
-        put.addRequestHeader( "Content-Type", "image/jpg" );
-        put.addRequestHeader( "Title", "Title " + receiptName + "" );
-        put.addRequestHeader( "Slug", "Slug " + receiptName + "" );
-        put.setRequestEntity( 
-        	new InputStreamRequestEntity( new FileInputStream( input ), "image/jpg" ) );
-		
-        // Get HTTP client
-        HttpClient httpclient = new HttpClient();
-        try {
-            // Execute request
-            int result = httpclient.executeMethod(put);
-            // Pseudo Code (see APP (http://tools.ietf.org/html/rfc5023#section-9.6)
-            // Display status code
-            // System.out.println("Response status code: " + result + ", status text=" + put.getStatusText() );
-        	Assert.assertEquals(404, result );
-            // Display response. Should be empty for put.
-            // System.out.println("Response body: ");
-            // System.out.println(put.getResponseBodyAsString()); // Warning: BodyAsString recommends BodyAsStream
-        } finally {
-            // Release current connection to the connection pool once you are done
-            put.releaseConnection();
-        }
-	}
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
deleted file mode 100644
index a881f2dd0a..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
+++ /dev/null
@@ -1,48 +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.binding.atom;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-public class Provider {
-
-    public static void main(String[] args) {
-
-        String contribution = ContributionLocationHelper.getContributionLocation(AtomDeleteTestCase.class);
-        Node node = NodeFactory.newInstance().createNode(
-                                                               "org/apache/tuscany/sca/binding/atom/Provider.composite", new Contribution("provider", contribution));
-        node.start();
-        System.out.println("Provider.composite ready...");
-
-        try {
-            System.in.read();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        node.stop();
-        node.destroy();
-    }
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
deleted file mode 100644
index 703419f527..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
+++ /dev/null
@@ -1,428 +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.binding.atom;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import junit.framework.Assert;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.factory.Factory;
-import org.apache.abdera.model.Base;
-import org.apache.abdera.model.Content;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.abdera.model.Document;
-import org.apache.abdera.model.Service;
-import org.apache.abdera.protocol.Response.ResponseType;
-import org.apache.abdera.protocol.client.AbderaClient;
-import org.apache.abdera.protocol.client.ClientResponse;
-import org.apache.abdera.protocol.client.RequestOptions;
-import org.apache.abdera.protocol.client.util.BaseRequestEntity;
-import org.apache.abdera.util.EntityTag;
-import org.apache.abdera.parser.Parser;
-
-/**
- * Tests use of server provided entry entity tags for Atom binding in Tuscany.
- * Tests conditional gets (e.g. get if-none-match) or conditional posts (post if-match)
- * using entity tags or last modified header entries. 
- * Uses the SCA provided Provider composite to act as a server.
- * Uses the Abdera provided Client to act as a client.
- */
-public class ProviderEntryEntityTagsTestCase {
-	public final static String providerURI = "http://localhost:8084/customer";
-	protected static SCADomain scaConsumerDomain;
-	protected static SCADomain scaProviderDomain;
-	protected static CustomerClient testService;
-    protected static Abdera abdera;
-    protected static AbderaClient client;
-    protected static Parser abderaParser;    
-    protected static String eTag;
-    protected static Date lastModified;
-    protected static final SimpleDateFormat dateFormat = new SimpleDateFormat( "EEE, dd MMM yyyy HH:mm:ss Z" ); // RFC 822 date time
-
-	@BeforeClass
-	public static void init() throws Exception {
-		System.out.println(">>>ProviderEntryEntityTagsTestCase.init");
-		scaProviderDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/atom/Provider.composite");
-		abdera = new Abdera();
-		client = new AbderaClient(abdera);
-		abderaParser = Abdera.getNewParser();
-	}
-
-	@AfterClass
-	public static void destroy() throws Exception {
-		System.out.println(">>>ProviderEntryEntityTagsTestCase.destroy");
-		scaProviderDomain.close();
-	}
-
-	@Test
-	public void testPrelim() throws Exception {
-		Assert.assertNotNull(scaProviderDomain);
-		Assert.assertNotNull( client );
-	}
-	
-    @Test
-	public void testEmptyCachePost() throws Exception {
-		// Pseudo-code
-		// 1) Example HTTP POST request (new entry put, new etag response)
-		// User client post request       
-		//        POST /myblog/entries HTTP/1.1
-		//        Slug: First Post
-		//        
-		//        <?xml version="1.0" ?>
-		//        <entry xmlns="http://www.w3.org/2005/Atom">
-		//          <title>Atom-Powered Robots Run Amok</title>
-		//          <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
-		//          <updated>2007-02-123T17:09:02Z</updated>
-		//          <author><name>Captain Lansing</name></author>
-		//          <content>It's something moving... solid metal</content>
-		//        </entry>
-
-		// Expected Atom server response (note unique ETag)
-		//       HTTP/1.1 201 Created
-		//       Date: Fri, 23 Feb 2007 21:17:11 GMT
-		//       Content-Length: nnn
-		//       Content-Type: application/atom+xml;type=entry
-		//       Location: http://example.org/edit/first-post.atom
-		//       Content-Location: http://example.org/edit/first-post.atom
-		//       ETag: "e180ee84f0671b1"
-		//       Last-Modified: Fri, 25 Jul 2008 14:36:44 -0500
-		// 
-		//        <?xml version="1.0" ?>
-		//        <entry xmlns="http://www.w3.org/2005/Atom">
-		//          <title>Atom-Powered Robots Run Amok</title>
-		//          <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
-		//          <updated>2007-02-123T17:09:02Z</updated>
-		//          <author><name>Captain Lansing</name></author>
-		//          <content>It's something moving... solid metal</content>
-		//        </entry>		
-		
-		// Testing of entry creation
-		Factory factory = abdera.getFactory();
-		String customerName = "Fred Farkle";
-		Entry entry = factory.newEntry();
-		entry.setTitle("customer " + customerName);
-		entry.setUpdated(new Date());
-		entry.addAuthor("Apache Tuscany");
-		// ID created by collection.
-        // entry.setId(id); // auto-provided
-        // entry.addLink("" + id, "edit"); // auto-provided
-        // entry.addLink("" + id, "alternate"); // auto-provided
-		Content content = abdera.getFactory().newContent();
-		content.setContentType(Content.Type.TEXT);
-		content.setValue(customerName);
-		entry.setContentElement(content);
-
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml; type=entry"; 
-		opts.setContentType(contentType);
-		// AtomTestCaseUtils.printRequestHeaders( "Post request headers", "   ", opts );
-		IRI colUri = new IRI(providerURI).resolve("customer");
-		// res = client.post(colUri.toString() + "?test=foo", entry, opts);
-		ClientResponse res = client.post(colUri.toString(), entry, opts);
-		
-	    // Assert response status code is 201-OK.
-		// Assert response header Content-Type: application/atom+xml; charset=UTF-8
-		// Assert response header Location: http://example.org/edit/first-post.atom
-		// Assert response header Content-Location: http://example.org/edit/first-post.atom
-		// Assert response header ETag: "e180ee84f0671b1"
-		// Assert response header Last-Modified: Fri, 25 Jul 2008 14:36:44 -0500	    
-	    // Assert collection size is 1.
-    	Assert.assertEquals(201, res.getStatus());
-    	Assert.assertEquals(contentType, res.getContentType().toString().trim());
-    	// Assert.assertNotNull( res.getLocation().toString() );
-    	// Assert.assertEquals( "", res.getContentLocation().toString() );
-    	// Save eTag for subsequent tests;
-    	eTag = res.getHeader( "ETag" );
-    	Assert.assertNotNull( eTag );     	
-    	lastModified = res.getLastModified();
-    	Assert.assertNotNull(lastModified);
-	}
-
-	@Test
-	public void testDirtyCachePut() throws Exception {
-		// 2) Conditional PUT request (post with etag. entry provided is stale)
-		// User client PUT request
-		//        PUT /edit/first-post.atom HTTP/1.1
-		// >      If-Match: "e180ee84f0671b1"
-		// 
-		//        <?xml version="1.0" ?>
-		//        <entry xmlns="http://www.w3.org/2005/Atom">
-		//         <title>Atom-Powered Robots Run Amok</title>
-		//         <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
-		//         <updated>2007-02-24T16:34:06Z</updated>
-		//         <author><name>Captain Lansing</name></author>
-		//         <content>Update: it's a hoax!</content>
-		//       </entry>
-		// Testing of entry creation
-		Factory factory = abdera.getFactory();
-		String customerName = "Molly Ringwald";
-		Entry entry = factory.newEntry();
-		entry.setTitle("customer " + customerName);
-		entry.setUpdated( new Date());
-		entry.addAuthor("Apache Tuscany");
-		String id = eTag.substring( 1, eTag.length()-1);
-        entry.setId(id); // auto-provided
-        // entry.addLink("" + id, "edit"); // auto-provided
-        // entry.addLink("" + id, "alternate"); // auto-provided
-		Content content = abdera.getFactory().newContent();
-		content.setContentType(Content.Type.TEXT);
-		content.setValue(customerName);
-		entry.setContentElement(content);
-
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml; type=entry"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-None-Match", eTag);
-		
-		// AtomTestCaseUtils.printRequestHeaders( "Put request headers", "   ", opts );
-		IRI colUri = new IRI(providerURI).resolve("customer");
-		// res = client.post(colUri.toString() + "?test=foo", entry, opts);
-	    id = eTag.substring( 1, eTag.length()-1);
-		// Warning. AbderaClient.put(String uri,Base base,RequestOptions options) caches on the client side.
-		// ClientResponse res = client.put(colUri.toString() + id, entry, opts);
-		ClientResponse res = client.put(colUri.toString() + "/" + id, new BaseRequestEntity( entry ), opts);
-		// Expected Atom server response (item was edited by another user)
-		// >      HTTP/1.1 412 Precondition Failed
-		//       Date: Sat, 24 Feb 2007 16:34:11 GMT
-
-	    // If-Match Assert response status code is 412. Precondition failed.
-	    // If-None-Match Assert response status code is 200. OK
-    	Assert.assertEquals(200, res.getStatus());
-    	// Put provides null body and no etags.
-    	res.release();
-	}
-	
-	@Test
-	public void testETagMissGet() throws Exception {
-		// 4) Conditional GET example (get with etag. etag not in cache)
-		// User client GET request
-		//       GET /edit/first-post.atom HTTP/1.1
-		// >      If-None-Match: "e180ee84f0671b1"
-
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml; type=entry"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-None-Match", "123456");
-		opts.setHeader( "Pragma", "no-cache"); // turn off client caching
-		
-		IRI colUri = new IRI(providerURI).resolve("customer");
-		// res = client.post(colUri.toString() + "?test=foo", entry, opts);
-		String id = eTag.substring( 1, eTag.length()-1);
-		// Warning. AbderaClient.put(String uri,Base base,RequestOptions options) caches on the client side.
-		// ClientResponse res = client.put(colUri.toString() + id, entry, opts);
-		ClientResponse res = client.get(colUri.toString() + "/" + id, opts);
-		// Expected Atom server response (item was edited by another user)
-		// >      HTTP/1.1 412 Precondition Failed
-		//       Date: Sat, 24 Feb 2007 16:34:11 GMT
-
-		// Atom server response (item was up to date)
-		// >      HTTP/1.1 200 OK
-		//        Date: Sat, 24 Feb 2007 13:17:11 GMT
-		// >      ETag: "bb4f5e86e92ddb8549604a0df0763581"
-		// >      Last-Modified: Mon, 28 Jul 2008 10:25:37 -0500
-
-	    // Assert response status code is 200 OK.
-		// Assert header Content-Type: application/atom+xml;type=entry
-		// Assert header Location: http://example.org/edit/first-post.atom
-		// Assert header Content-Location: http://example.org/edit/first-post.atom
-		// Assert header ETag: "555555" (etag response != etag request)
-		// Assert header Last-Modified: Fri, 25 Jul 2008 14:36:44 -0500
-    	Assert.assertEquals(200, res.getStatus());
-    	Assert.assertEquals(contentType, res.getContentType().toString().trim());
-    	// Assert.assertNotNull( res.getLocation().toString() );
-    	// Assert.assertEquals( "", res.getContentLocation().toString() );
-    	Assert.assertNotNull( res.getHeader( "ETag" ) );     	
-    	lastModified = res.getLastModified();
-    	Assert.assertNotNull(lastModified);
-		res.release();
-	}
-
-	@Test
-	public void testETagHitGet() throws Exception {
-		// 3) Conditional GET example (get with etag. etag match)
-		// User client GET request
-		//       GET /edit/first-post.atom HTTP/1.1
-		// >      If-None-Match: "e180ee84f0671b1"
-
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml; type=entry"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-None-Match", eTag);
-		opts.setHeader( "Pragma", "no-cache"); // turn off client caching		
-		
-		IRI colUri = new IRI(providerURI).resolve("customer");
-		// res = client.post(colUri.toString() + "?test=foo", entry, opts);
-		String id = eTag.substring( 1, eTag.length()-1);
-		// Warning. AbderaClient.put(String uri,Base base,RequestOptions options) caches on the client side.
-		// ClientResponse res = client.put(colUri.toString() + id, entry, opts);
-		ClientResponse res = client.get(colUri.toString() + "/" + id, opts);
-		// Atom server response (item was up to date)
-		// >      HTTP/1.1 304 Not Modified
-		//       Date: Sat, 24 Feb 2007 13:17:11 GMT
-
-	    // Assert response status code is 304 Not Modified.
-		// Assert header ETag: "e180ee84f0671b1"
-		// Assert header Last-Modified: Fri, 25 Jul 2008 14:36:44 -0500
-    	// Assert.assertEquals(304, res.getStatus());
-		res.release();	    
-	}
-
-
-	@Test
-	public void testUpToDateGet() throws Exception {
-		// 3) Conditional GET example (get with If-Mod. entry is up to date)
-		// User client GET request
-		//       GET /edit/first-post.atom HTTP/1.1
-		// >      If-Modified-Since: Sat, 29 Oct 2025 19:43:31 GMT
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml; type=entry"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-Modified-Since", "Sat, 29 Oct 2025 19:43:31 GMT"); // "EEE, dd MMM yyyy HH:mm:ss Z // RFC 822 Date
-		opts.setHeader( "Pragma", "no-cache"); // turn off client caching
-		
-		IRI colUri = new IRI(providerURI).resolve("customer");
-		// res = client.post(colUri.toString() + "?test=foo", entry, opts);
-		String id = eTag.substring( 1, eTag.length()-1);
-		// Warning. AbderaClient.put(String uri,Base base,RequestOptions options) caches on the client side.
-		// ClientResponse res = client.put(colUri.toString() + id, entry, opts);
-		// Warning. AbderaClient.put(String uri,Base base,RequestOptions options) caches on the client side.
-		// ClientResponse res = client.get(colUri.toString() + "/" + id, opts);
-		ClientResponse res = client.execute( "GET", colUri.toString(), (BaseRequestEntity)null, opts);
-
-		// Atom server response (item was up to date)
-		// >      HTTP/1.1 304 Not Modified
-		//       Date: Sat, 24 Feb 2007 13:17:11 GMT
-
-	    // Assert response status code is 304 Not Modified.
-    	Assert.assertEquals(304, res.getStatus());
-		res.release();	    
-	}
-
-	@Test
-	public void testOutOfDateGet() throws Exception {
-		// 4) Conditional GET example (get with If-Mod. entry is not to date)
-		// User client GET request
-		//       GET /edit/first-post.atom HTTP/1.1
-		// >      If-Modified-Since: Sat, 29 Oct 1844 19:43:31 GMT
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml; type=entry"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-Modified-Since", "Sat, 29 Oct 1844 19:43:31 GMT"); // "EEE, dd MMM yyyy HH:mm:ss Z // RFC 822 Date
-		opts.setHeader( "Pragma", "no-cache"); // turn off client caching
-		
-		IRI colUri = new IRI(providerURI).resolve("customer");
-		// res = client.post(colUri.toString() + "?test=foo", entry, opts);
-		String id = eTag.substring( 1, eTag.length()-1);
-		// Warning. AbderaClient.put(String uri,Base base,RequestOptions options) caches on the client side.
-		// ClientResponse res = client.put(colUri.toString() + id, entry, opts);
-		ClientResponse res = client.get(colUri.toString() + "/" + id, opts);
-
-		// Atom server response (item was up to date)
-		// >      HTTP/1.1 200 OK
-		//        Date: Sat, 24 Feb 2007 13:17:11 GMT
-		// >      ETag: "bb4f5e86e92ddb8549604a0df0763581"
-		// >      Last-Modified: Mon, 28 Jul 2008 10:25:37 -0500
-
-	    // Assert response status code is 200 OK.
-		// Assert header ETag: "e180ee84f0671b1"
-		// Assert header Last-Modified: Greater than If-Mod	    
-    	Assert.assertEquals(200, res.getStatus());
-    	Assert.assertEquals(contentType, res.getContentType().toString().trim());
-    	// Assert.assertNotNull( res.getLocation().toString() );
-    	// Assert.assertEquals( "", res.getContentLocation().toString() );
-    	Assert.assertNotNull( res.getHeader( "ETag" ) );     	
-    	lastModified = res.getLastModified();
-    	Assert.assertNotNull(lastModified);
-		res.release();
-	}
-	
-	@Test
-	public void testUpToDateUnModGet() throws Exception {
-		// 3) Conditional GET example (get with If-Unmod. entry is not modified (< predicate date).
-		// User client GET request
-		//       GET /edit/first-post.atom HTTP/1.1
-		// >      If-Unmodified-Since: Sat, 29 Oct 2025 19:43:31 GMT
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml; type=entry"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-Unmodified-Since", "Sat, 29 Oct 2050 19:43:31 GMT" );
-		opts.setHeader( "Pragma", "no-cache"); // turn off client caching
-		
-		IRI colUri = new IRI(providerURI).resolve("customer");
-		// res = client.post(colUri.toString() + "?test=foo", entry, opts);
-		String id = eTag.substring( 1, eTag.length()-1);
-		// Warning. AbderaClient.put(String uri,Base base,RequestOptions options) caches on the client side.
-		// ClientResponse res = client.put(colUri.toString() + id, entry, opts);
-		ClientResponse res = client.get(colUri.toString() + "/" + id, opts);
-
-		// Atom server response (item was up to date)
-		// >      HTTP/1.1 200 OK
-		//        Date: Sat, 24 Feb 2007 13:17:11 GMT
-		// >      ETag: "bb4f5e86e92ddb8549604a0df0763581"
-		// >      Last-Modified: Mon, 28 Jul 2008 10:25:37 -0500
-
-	    // Assert response status code is 200 OK.
-		// Assert header Content-Type: application/atom+xml;type=entry
-		// Assert header Location: http://example.org/edit/first-post.atom
-		// Assert header Content-Location: http://example.org/edit/first-post.atom
-		// Assert header ETag: "e180ee84f0671b1"
-		// Assert header Last-Modified: Less than If-Unmod	    
-    	Assert.assertEquals(200, res.getStatus());
-		res.release();	        
-	}
-
-	@Test
-	public void testOutOfDateUnModGet() throws Exception {
-		// 4) Conditional GET example (get with If-Unmod. entry is modified (> predicate date)
-		// User client GET request
-		//       GET /edit/first-post.atom HTTP/1.1
-		//        Host: example.org
-		// >      If-Unmodified-Since: Sat, 29 Oct 1844 19:43:31 GMT
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml; type=entry"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-Unmodified-Since", "Sat, 29 Oct 1844 19:43:31 GMT" );
-		opts.setHeader( "Pragma", "no-cache"); // turn off client caching
-		
-		IRI colUri = new IRI(providerURI).resolve("customer");
-		// res = client.post(colUri.toString() + "?test=foo", entry, opts);
-		String id = eTag.substring( 1, eTag.length()-1);
-		// Warning. AbderaClient.put(String uri,Base base,RequestOptions options) caches on the client side.
-		// ClientResponse res = client.put(colUri.toString() + id, entry, opts);
-		ClientResponse res = client.get(colUri.toString() + "/" + id, opts);
-
-		// Atom server response (item was up to date)
-		// >      HTTP/1.1 304 Not Modified
-		//       Date: Sat, 24 Feb 2007 13:17:11 GMT
-
-	    // Assert response status code is 304 Not Modified.
-    	Assert.assertEquals(304, res.getStatus());
-		res.release();	    
-	}
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
deleted file mode 100644
index 4915f7426e..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
+++ /dev/null
@@ -1,382 +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.binding.atom;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.net.Socket;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import junit.framework.Assert;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.factory.Factory;
-import org.apache.abdera.model.Base;
-import org.apache.abdera.model.Content;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.abdera.model.Document;
-import org.apache.abdera.model.Service;
-import org.apache.abdera.model.Collection;
-import org.apache.abdera.protocol.Response.ResponseType;
-import org.apache.abdera.protocol.client.AbderaClient;
-import org.apache.abdera.protocol.client.ClientResponse;
-import org.apache.abdera.protocol.client.RequestOptions;
-import org.apache.abdera.protocol.client.util.BaseRequestEntity;
-import org.apache.abdera.util.EntityTag;
-import org.apache.abdera.parser.Parser;
-
-/**
- * Tests use of server provided feed entity tags for Atom binding in Tuscany.
- * Tests conditional gets (e.g. get if-none-match) or conditional posts (post if-match)
- * using entity tags and last modified entries in headers. 
- * Uses the SCA provided Provider composite to act as a server.
- * Uses the Abdera provided Client to act as a client.
- */
-public class ProviderFeedEntityTagsTestCase {
-	public final static String providerURI = "http://localhost:8084/customer";
-	protected static SCADomain scaConsumerDomain;
-	protected static SCADomain scaProviderDomain;
-	protected static CustomerClient testService;
-    protected static Abdera abdera;
-    protected static AbderaClient client;
-    protected static Parser abderaParser;    
-    protected static String eTag;
-    protected static Date lastModified;
-    protected static final SimpleDateFormat dateFormat = new SimpleDateFormat( "EEE, dd MMM yyyy HH:mm:ss Z" ); // RFC 822 date time
-
-	@BeforeClass
-	public static void init() throws Exception {
-		System.out.println(">>>ProviderFeedEntityTagsTestCase.init");
-		scaProviderDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/atom/Provider.composite");
-		abdera = new Abdera();
-		client = new AbderaClient(abdera);
-		abderaParser = Abdera.getNewParser();
-	}
-
-	@AfterClass
-	public static void destroy() throws Exception {
-		System.out.println(">>>ProviderFeedEntityTagsTestCase.destroy");
-		scaProviderDomain.close();
-	}
-
-	@Test
-	public void testPrelim() throws Exception {
-		Assert.assertNotNull(scaProviderDomain);
-		Assert.assertNotNull( client );
-	}
-			
-	@Test
-    public void testFeedBasics() throws Exception {		
-		System.out.println(">>>ProviderFeedEntityTagsTestCase.testFeedBasics");
-		// Normal feed request
-		ClientResponse res = client.get(providerURI);
-		Assert.assertNotNull(res);
-		try {
-			// Assert feed provided since no predicates
-			Assert.assertEquals(200, res.getStatus());
-			Assert.assertEquals(ResponseType.SUCCESS, res.getType());
-	    	// AtomTestCaseUtils.printResponseHeaders( "Feed response headers:", "   ", res );
-	    	// System.out.println("Feed response content:");
-	    	// AtomTestCaseUtils.prettyPrint(abdera, res.getDocument());
-
-	    	// Perform other tests on feed.
-	    	// Warning. AbderaClient.getEntityTag is very particular on tag pattern.
-			// Document<Feed> doc = res.getDocument();
-	    	String body = read( res.getInputStream() );
-			// RFC 4287 requires non-null id, title, updated elements
-			Assert.assertTrue( -1 != body.indexOf( "</id>" ));
-			Assert.assertTrue( -1 != body.indexOf( "</title>" ));
-			Assert.assertTrue( -1 != body.indexOf( "</updated>" ));
-			
-			eTag = res.getHeader("ETag");
-			Assert.assertNotNull( eTag );
-			lastModified = res.getLastModified();
-			Assert.assertNotNull( lastModified );
-		} finally {
-			res.release();
-		}
-	}		
-
-	@Test
-    public void testUnmodifiedGetIfMatch() throws Exception {		
-		System.out.println(">>>ProviderFeedEntityTagsTestCase.testFeedUnmodifiedGetIfMatch");
-		// Feed request with predicates
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-Match", eTag);
-		
-		ClientResponse res = client.get(providerURI, opts);
-		Assert.assertNotNull(res);
-		try {
-	    	String thisETag = res.getHeader("ETag");
-			Assert.assertNotNull( thisETag );
-			Date thisLastModified = res.getLastModified();
-			Assert.assertNotNull( thisLastModified );
-                        
-			// Should return 200 - Feed provided since it matches etag.
-			Assert.assertEquals(200, res.getStatus());
-			Assert.assertEquals(ResponseType.SUCCESS, res.getType());
-	    	// AtomTestCaseUtils.printResponseHeaders( "Feed response headers:", "   ", res );
-	    	// System.out.println("Feed response content:");
-	    	// AtomTestCaseUtils.prettyPrint(abdera, res.getDocument());
-		} finally {
-			res.release();
-		}
-	}		
-
-	@Test
-    public void testUnmodifiedGetIfNoneMatch() throws Exception {		
-		System.out.println(">>>ProviderFeedEntityTagsTestCase.testFeedUnmodifiedGetIfNoneMatch");
-		// Feed request with predicates
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-None-Match", eTag);
-		
-		ClientResponse res = client.get(providerURI, opts);
-		Assert.assertNotNull(res);
-		try {
-			// Should return 304 - Feed not provided since it matches ETag.
-			Assert.assertEquals(304, res.getStatus());
-		} finally {
-			res.release();
-		}
-	}		
-
-	@Test
-    public void testUnmodifiedGetIfUnModified() throws Exception {		
-		System.out.println(">>>ProviderFeedEntityTagsTestCase.testFeedUnmodifiedGetIfUnModified");
-		// Feed request with predicates
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-Unmodified-Since", dateFormat.format( new Date() ));
-		
-		ClientResponse res = client.get(providerURI, opts);
-		Assert.assertNotNull(res);
-		try {
-			// Should return 304 - Feed not provided since feed is modified since.
-			Assert.assertEquals(304, res.getStatus());
-		} finally {
-			res.release();
-		}
-	}		
-
-	@Test
-    public void testUnmodifiedGetIfModified() throws Exception {		
-		System.out.println(">>>ProviderFeedEntityTagsTestCase.testFeedUnmodifiedGetIfModified");
-		// Feed request with predicates
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-Modified-Since", dateFormat.format( new Date( 0 ) ));
-		
-		ClientResponse res = client.get(providerURI, opts);
-		Assert.assertNotNull(res);
-		try {
-			// Should return 200 - Feed provided since feed is changed.
-			Assert.assertEquals(200, res.getStatus());
-			Assert.assertEquals(ResponseType.SUCCESS, res.getType());
-
-			String thisETag = res.getHeader("ETag");
-			Assert.assertNotNull( thisETag );
-			Date thisLastModified = res.getLastModified();
-			Assert.assertNotNull( thisLastModified );                        
-		} finally {
-			res.release();
-		}
-	}		
-
-	@Test
-    public void testModifiedGetIfNoneMatch() throws Exception {		
-		System.out.println(">>>ProviderFeedEntityTagsTestCase.testFeedModifiedGetIfNoneMatch");
-		// Post some new content to the feed.
-		Factory factory = abdera.getFactory();
-		String customerName = "Fred Farkle";
-		Entry entry = factory.newEntry();
-		entry.setTitle("customer " + customerName);
-		entry.setUpdated(new Date());
-		entry.addAuthor("Apache Tuscany");
-		Content content = abdera.getFactory().newContent();
-		content.setContentType(Content.Type.TEXT);
-		content.setValue(customerName);
-		entry.setContentElement(content);
-
-		RequestOptions opts = new RequestOptions();
-		String contentType = "application/atom+xml; type=entry"; 
-		opts.setContentType(contentType);
-		IRI colUri = new IRI(providerURI).resolve("customer");
-		ClientResponse res = client.post(colUri.toString(), entry, opts);
-			
-		// Feed request with predicates
-		opts = new RequestOptions();
-		contentType = "application/atom+xml"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-None-Match", eTag);
-		
-		res = client.get(providerURI, opts);
-		Assert.assertNotNull(res);
-		try {
-			// Should return 304 - Feed not provided since it matches ETag.
-			Assert.assertEquals(304, res.getStatus());
-	    	// AtomTestCaseUtils.printResponseHeaders( "Feed response headers:", "   ", res );
-	    	// System.out.println("Feed response content:");
-	    	// AtomTestCaseUtils.prettyPrint(abdera, res.getDocument());
-		} finally {
-			res.release();
-		}
-	}		
-
-	@Test
-    public void testModifiedGetIfMatch() throws Exception {		
-		System.out.println(">>>ProviderFeedEntityTagsTestCase.testFeedModifiedGetIfMatch");
-		// Feed request with predicates
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-Match", eTag);
-		
-		ClientResponse res = client.get(providerURI, opts);
-		Assert.assertNotNull(res);
-		try {
-	    	String thisETag = res.getHeader("ETag");
-			Assert.assertNotNull( thisETag );
-			Date thisLastModified = res.getLastModified();
-			Assert.assertNotNull( thisLastModified );
-                        
-			// Should return 200 - value since feed is changed
-			Assert.assertEquals(200, res.getStatus());
-			Assert.assertEquals(ResponseType.SUCCESS, res.getType());
-			
-	    	// AtomTestCaseUtils.printResponseHeaders( "Feed modified if-none-match response headers:", "   ", res );
-	    	// System.out.println("Feed response content:");
-	    	// AtomTestCaseUtils.prettyPrint(abdera, res.getDocument());
-		} finally {
-			res.release();
-		}
-	}		
-
-	@Test
-    public void testModifiedGetIfUnModified() throws Exception {		
-		System.out.println(">>>ProviderFeedEntityTagsTestCase.testFeedUnmodifiedGetIfUnModified");
-		// Feed request with predicates
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-Unmodified-Since", dateFormat.format( new Date() ));
-		
-		ClientResponse res = client.get(providerURI, opts);
-		Assert.assertNotNull(res);
-		try {
-			// Should return 304 - Feed not provided since feed is modified since.			
-			Assert.assertEquals(304, res.getStatus());
-		} finally {
-			res.release();
-		}
-	}		
-
-	@Test
-    public void testModifiedGetIfModified() throws Exception {		
-		System.out.println(">>>ProviderFeedEntityTagsTestCase.testFeedUnmodifiedGetIfModified");
-		// Feed request with predicates
-		RequestOptions opts = new RequestOptions();
-		final String contentType = "application/atom+xml"; 
-		opts.setContentType(contentType);
-		opts.setHeader( "If-Modified-Since", dateFormat.format( lastModified ));
-		
-		ClientResponse res = client.get(providerURI, opts);
-		Assert.assertNotNull(res);
-		try {
-			// Should return 200 - Feed provided since feed is changed.
-			Assert.assertEquals(200, res.getStatus());
-			Assert.assertEquals(ResponseType.SUCCESS, res.getType());
-
-			String thisETag = res.getHeader("ETag");
-			Assert.assertNotNull( thisETag );
-			Date thisLastModified = res.getLastModified();
-			Assert.assertNotNull( thisLastModified );                        
-		} finally {
-			res.release();
-		}
-	}		
-
-
-	public static void printFeed( String title, String indent, Feed feed ) {
-		if ( feed == null ) {
-			System.out.println( title + " feed is null");
-			return;
-		}
-			
-		System.out.println( title );
-		System.out.println( indent + "id=" + feed.getId() );
-		System.out.println( indent + "title=" + feed.getTitle() );
-		System.out.println( indent + "updated=" + feed.getUpdated() );
-		System.out.println( indent + "author=" + feed.getAuthor() );
-		Collection collection = feed.getCollection();
-		if ( collection == null ) {
-			System.out.println( indent + "collection=null" );
-		} else {
-			System.out.println( indent + "collection=" + collection );
-		}
-		// System.out.println( indent + "collection size=" + feed.getCollection() );
-		// for (Collection collection : workspace.getCollections()) {
-		//    if (collection.getTitle().equals("customers")) {
-		//       String expected = uri + "customers";
-		//       String actual = collection.getResolvedHref().toString();
-		//       assertEquals(expected, actual);
-		//    }
-		// }
-
-	}
-
-	/**
-	 * Read response ream from the given socket.
-	 * @param socket
-	 * @return
-	 * @throws IOException
-	 */
-	private static String read(InputStream inputStream) throws IOException {
-		BufferedReader reader = null;
-		try {
-			reader = new BufferedReader(new InputStreamReader( inputStream ));
-			StringBuffer sb = new StringBuffer();
-			String str;
-			while ((str = reader.readLine()) != null) {
-				sb.append(str);
-			}
-			return sb.toString();
-		} finally {
-			if (reader != null) {
-				reader.close();
-			}
-		}
-	}
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java b/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
deleted file mode 100644
index 96ea508210..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
+++ /dev/null
@@ -1,209 +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.binding.atom;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import junit.framework.Assert;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.factory.Factory;
-import org.apache.abdera.model.Content;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.abdera.model.Document;
-import org.apache.abdera.model.Service;
-import org.apache.abdera.protocol.Response.ResponseType;
-import org.apache.abdera.protocol.client.AbderaClient;
-import org.apache.abdera.protocol.client.ClientResponse;
-import org.apache.abdera.protocol.client.RequestOptions;
-import org.apache.abdera.parser.Parser;
-
-/**
- * Tests use of service documents provided by atom binding based collections.
- * Uses the SCA provided Provider composite to act as a server.
- * Uses the Abdera provided Client to act as a client.
- */
-public class ProviderServiceDocumentTestCase {
-	public final static String providerURI = "http://localhost:8084/customer";
-	protected static SCADomain scaProviderDomain;
-    protected static SCADomain scaConsumerDomain;
-    protected static CustomerClient testService;
-    protected static Abdera abdera;
-    protected static AbderaClient client;
-    protected static Parser abderaParser;    
-
-	@BeforeClass
-	public static void init() throws Exception {
-		scaProviderDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/atom/Provider.composite");
-        scaConsumerDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/atom/Consumer.composite");
-        testService = scaConsumerDomain.getService(CustomerClient.class, "CustomerClient");
-		abdera = new Abdera();
-		client = new AbderaClient(abdera);
-		abderaParser = Abdera.getNewParser();
-	}
-
-	@AfterClass
-	public static void destroy() throws Exception {
-		scaProviderDomain.close();
-	}
-
-	@Test
-	public void testPrelim() throws Exception {
-		Assert.assertNotNull(scaProviderDomain);
-		Assert.assertNotNull( client );
-	}
-			
-	@Test
-    public void testFeedBasics() throws Exception {		
-		// Normal feed request
-		ClientResponse res = client.get(providerURI);
-		Assert.assertNotNull(res);
-		try {
-			// Assert feed provided since no predicates
-			Assert.assertEquals(200, res.getStatus());
-			Assert.assertEquals(ResponseType.SUCCESS, res.getType());
-	    	// AtomTestCaseUtils.printResponseHeaders( "Feed response headers:", "   ", res );
-	    	// System.out.println("Feed response content:");
-	    	// AtomTestCaseUtils.prettyPrint(abdera, res.getDocument());
-
-	    	// Perform other tests on feed.
-	    	// Warning. AbderaClient.getEntityTag is very particular on tag pattern.
-			// Document<Feed> doc = res.getDocument();
-	    	String body = read( res.getInputStream() );
-			// RFC 4287 requires non-null id, title, updated elements
-			Assert.assertTrue( -1 != body.indexOf( "</id>" ));
-			Assert.assertTrue( -1 != body.indexOf( "</title>" ));
-			Assert.assertTrue( -1 != body.indexOf( "</updated>" ));
-		} finally {
-			res.release();
-		}
-	}		
-
-    @Test
-    public void testServiceDocumentGet() throws Exception {
-        Collection resourceCollection = testService.getCustomerCollection();
-        Assert.assertNotNull(resourceCollection);
-
-        Entry postEntry = postEntry("Sponge Bob");
-        Entry newEntry = resourceCollection.post(postEntry);
-        postEntry = postEntry("Austin Powers");
-        newEntry = resourceCollection.post(postEntry);
-        postEntry = postEntry("Count Dracula");
-        newEntry = resourceCollection.post(postEntry);
-
-		// Service document
-		ClientResponse res = client.get(providerURI + "/atomsvc");
-		Assert.assertNotNull(res);
-		try {
-			// Asser feed provided since no predicates
-			Assert.assertEquals(200, res.getStatus());
-			Assert.assertEquals(ResponseType.SUCCESS, res.getType());
-
-	    	// Perform other tests on feed.
-	    	// AtomTestCaseUtils.prettyPrint(abdera, res.getDocument());	    	
-			Document<Service> serviceDoc = res.getDocument();
-			Service service = serviceDoc.getRoot();
-			Assert.assertNotNull( service );
-			org.apache.abdera.model.Collection collection =  service.getCollection( "workspace", "customers" );
-			String title = collection.getTitle();
-			Assert.assertEquals("customers", title);
-			String href = collection.getHref().toString();
-			Assert.assertTrue( href.contains( "customer") );
-		} finally {
-			res.release();
-		}
-    }
-
-	public static void printFeed( String title, String indent, Feed feed ) {
-		if ( feed == null ) {
-			System.out.println( title + " feed is null");
-			return;
-		}
-			
-		System.out.println( title );
-		System.out.println( indent + "id=" + feed.getId() );
-		System.out.println( indent + "title=" + feed.getTitle() );
-		System.out.println( indent + "updated=" + feed.getUpdated() );
-		System.out.println( indent + "author=" + feed.getAuthor() );
-		// Collection collection = feed.getCollection();
-		// if ( collection == null ) {
-		// 	System.out.println( indent + "collection=null" );
-		// } else {
-		// 	System.out.println( indent + "collection=" + collection );
-		// }
-		// System.out.println( indent + "collection size=" + feed.getCollection() );
-		// for (Collection collection : workspace.getCollections()) {
-		//    if (collection.getTitle().equals("customers")) {
-		//       String expected = uri + "customers";
-		//       String actual = collection.getResolvedHref().toString();
-		//       assertEquals(expected, actual);
-		//    }
-		// }
-
-	}
-
-    private Entry postEntry(String value) {
-        Entry entry = abdera.newEntry();
-        entry.setTitle("customer " + value);
-
-        Content content = abdera.getFactory().newContent();
-        content.setContentType(Content.Type.TEXT);
-        content.setValue(value);
-        entry.setContentElement(content);
-
-        return entry;
-    }
-
-    /**
-	 * Read response ream from the given socket.
-	 * @param socket
-	 * @return
-	 * @throws IOException
-	 */
-	private static String read(InputStream inputStream) throws IOException {
-		BufferedReader reader = null;
-		try {
-			reader = new BufferedReader(new InputStreamReader( inputStream ));
-			StringBuffer sb = new StringBuffer();
-			String str;
-			while ((str = reader.readLine()) != null) {
-				sb.append(str);
-			}
-			return sb.toString();
-		} finally {
-			if (reader != null) {
-				reader.close();
-			}
-		}
-	}
-}
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite b/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
deleted file mode 100644
index a2c50f872e..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
+++ /dev/null
@@ -1,32 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	   targetNamespace="http://customer"
-	   name="Consumer">
-    
-    <component name="CustomerClient">
-        <implementation.java class="org.apache.tuscany.sca.binding.atom.CustomerClientImpl"/>
-        <reference name="customerCollection">
-        	<tuscany:binding.atom uri="http://localhost:8084/customer"/>
-        </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite b/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
deleted file mode 100644
index 60097ee0f7..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	   targetNamespace = "http://customer"
-	   name="Provider">

-

-	<service name="customer" promote="CustomerCollection">

-		<tuscany:binding.atom uri = "http://localhost:8084/customer"/>

-	</service>

-	

-    <component name="CustomerCollection">

-        <implementation.java class="org.apache.tuscany.sca.binding.atom.CustomerCollectionImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite b/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
deleted file mode 100644
index 71aa932a12..0000000000
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	   targetNamespace = "http://receipt"
-	   name="ReceiptProvider">

-

-	<service name="receipt" promote="MediaCollection">

-		<tuscany:binding.atom uri = "http://localhost:8084/receipt"/>

-	</service>

-	

-    <component name="MediaCollection">

-        <implementation.java class="org.apache.tuscany.sca.binding.atom.MediaCollectionImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/binding-atom/LICENSE b/java/sca-contrib/modules/binding-atom/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/binding-atom/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/binding-atom/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-atom/META-INF/MANIFEST.MF
deleted file mode 100644
index ff7fe96475..0000000000
--- a/java/sca-contrib/modules/binding-atom/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.atom;uses:="org.apache.

- tuscany.sca.assembly";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.binding.atom.impl;version="1.4

- "

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Atom Feed Binding Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397253156

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Atom Feed Binding Extension

-Import-Package: javax.xml.stream;resolution:=optional,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.binding.atom;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.monitor;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.policy;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.atom

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-atom/NOTICE b/java/sca-contrib/modules/binding-atom/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/binding-atom/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/binding-atom/pom.xml b/java/sca-contrib/modules/binding-atom/pom.xml
deleted file mode 100644
index e5a7462228..0000000000
--- a/java/sca-contrib/modules/binding-atom/pom.xml
+++ /dev/null
@@ -1,62 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-atom</artifactId>
-    <name>Apache Tuscany SCA Atom Feed Binding Extension</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-			<scope>test</scope>			
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-			<scope>test</scope>
-        </dependency>
-		
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java b/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
deleted file mode 100644
index 807d6a8971..0000000000
--- a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
+++ /dev/null
@@ -1,43 +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.binding.atom;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-/**
- * Atom binding model.
- * 
- * @version $Rev$ $Date$
- */
-public interface AtomBinding extends Binding {
-    
-    /**
-     * Returns the title of the Atom collection.
-     * @return
-     */
-    String getTitle();
-    
-    /**
-     * Sets the title of the Atom collection.
-     * @param title
-     */
-    void setTitle(String title);
-    
-}
diff --git a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java b/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
deleted file mode 100644
index 6e5623e1a2..0000000000
--- a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
+++ /dev/null
@@ -1,35 +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.binding.atom;
-
-/**
- * Factory for the Atom binding
- *
- * @version $Rev$ $Date$
- */
-public interface AtomBindingFactory {
-
-    /**
-     * Creates a new Atom binding.
-     * @return the new Atom binding
-     */
-    AtomBinding createAtomBinding();
-
-}
diff --git a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java b/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
deleted file mode 100644
index ea06625d34..0000000000
--- a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.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 org.apache.tuscany.sca.binding.atom.impl;
-
-import org.apache.tuscany.sca.binding.atom.AtomBinding;
-import org.apache.tuscany.sca.binding.atom.AtomBindingFactory;
-
-/**
- * Factory for the Atom binding model.
- *
- * @version $Rev$ $Date$
- */
-public class AtomBindingFactoryImpl implements AtomBindingFactory {
-
-    public AtomBinding createAtomBinding() {
-        return new AtomBindingImpl();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java b/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
deleted file mode 100644
index 1c68ab5bc1..0000000000
--- a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
+++ /dev/null
@@ -1,117 +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.binding.atom.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.binding.atom.AtomBinding;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * Implementation of the Atom Feed binding model.
- *
- * @version $Rev$ $Date$
- */
-class AtomBindingImpl implements AtomBinding, PolicySetAttachPoint {
-
-    private String name;
-    private String uri;
-    private String title;
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private IntentAttachPointType intentAttachPointType;
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-
-    public String getName() {
-        return name;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-    
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public boolean isUnresolved() {
-        // The binding is always resolved
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // The binding is always resolved
-    }
-
-    //Policy related getters/setters
-    
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-    
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public IntentAttachPointType getType() {
-        return intentAttachPointType;
-    }
-    
-    public void setType(IntentAttachPointType intentAttachPointType) {
-        this.intentAttachPointType = intentAttachPointType;
-    }
-
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-    
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-}
diff --git a/java/sca-contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory b/java/sca-contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
deleted file mode 100644
index a8117db8f3..0000000000
--- a/java/sca-contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the model factory
-org.apache.tuscany.sca.binding.atom.impl.AtomBindingFactoryImpl
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 52e0e916f5..0000000000
--- a/java/sca-contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.atom,model=org.apache.tuscany.sca.binding.atom.AtomBinding,factory=org.apache.tuscany.sca.binding.atom.AtomBindingFactory
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java b/java/sca-contrib/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
deleted file mode 100644
index 1477554cd1..0000000000
--- a/java/sca-contrib/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
+++ /dev/null
@@ -1,91 +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.binding.atom;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class AtomBindingProcessorTestCase {
-    
-    private static final String COMPOSITE =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-        + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\" targetNamespace=\"http://binding-atom\" name=\"binding-atom\">"
-            + " <component name=\"HelloWorldComponent\">"
-            + "   <implementation.java class=\"services.HelloWorld\"/>"
-            + "      <service name=\"HelloWorldService\">"
-            + "          <tuscany:binding.atom uri=\"http://localhost:8080/feed\" title=\"Feed Title\"/>"
-            + "      </service>"
-            + " </component>"
-            + "</composite>";
-
-    private static XMLInputFactory inputFactory;
-    private static StAXArtifactProcessor<Object> staxProcessor;
-    private static Monitor monitor;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactory();  
-        if (monitorFactory != null) {
-        	monitor = monitorFactory.createMonitor();
-        	utilities.addUtility(monitorFactory);
-        }
-        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, monitor);
-    }
-
-    /**
-     * Test parsing valid composite definition. Valid composite populated with correct values expected.
-     * @throws Exception
-     */
-    @Test
-    public void testLoadValidComposite() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(COMPOSITE));
-        
-        Composite composite = (Composite)staxProcessor.read(reader);
-        AtomBinding binding = (AtomBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
-        
-        Assert.assertNotNull(binding);
-        Assert.assertEquals("Feed Title", binding.getTitle());
-        Assert.assertEquals("http://localhost:8080/feed", binding.getURI());
-    }
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/LICENSE b/java/sca-contrib/modules/binding-corba-runtime/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/binding-corba-runtime/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-corba-runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 45b1f17ec6..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,64 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.corba.provider.service;

- uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.binding.

- corba.provider.exceptions,org.omg.CORBA,org.omg.CORBA.portable,org.ap

- ache.tuscany.sca.interfacedef,org.apache.tuscany.sca.binding.corba.pr

- ovider.types";version="2.0.0",org.apache.tuscany.sca.binding.corba.prov

- ider;uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.ass

- embly,org.apache.tuscany.sca.provider,org.apache.tuscany.sca.binding.

- corba.provider.exceptions,org.omg.CORBA,org.apache.tuscany.sca.core,o

- rg.apache.tuscany.sca.interfacedef.java,org.apache.tuscany.sca.bindin

- g.corba,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.bi

- nding.corba.provider.reference,org.apache.tuscany.sca.invocation,org.

- apache.tuscany.sca.binding.corba.provider.service,org.apache.tuscany.

- sca.host.corba,org.oasisopen.sca";version="2.0.0",org.apache.tuscany.sca.bin

- ding.corba.provider.exceptions;version="2.0.0",org.apache.tuscany.sca.b

- inding.corba.provider.types;uses:="org.apache.tuscany.sca.binding.cor

- ba.provider.exceptions";version="2.0.0",org.apache.tuscany.sca.binding.

- corba.provider.reference;uses:="net.sf.cglib.proxy,org.apache.tuscany

- .sca.binding.corba.provider.exceptions,org.omg.CORBA,org.apache.tusca

- ny.sca.binding.corba.provider.types,org.omg.CORBA.portable";version="

- 1.4"

-Private-Package: org.apache.tuscany.sca.binding.corba.provider.meta;ve

- rsion="1.4",org.apache.tuscany.sca.binding.corba.provider.types.util;

- version="2.0.0",org.apache.tuscany.sca.binding.corba.provider.util;vers

- ion="1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA CORBA Binding Runtime

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397143078

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA CORBA Binding Runtime

-Import-Package: javax.xml.namespace;resolution:=optional,

- 

- net.sf.cglib.proxy,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.binding.corba;version="2.0.0",

- org.apache.tuscany.sca.binding.corba.provider;version="2.0.0",

- org.apache.tuscany.sca.binding.corba.provider.exceptions;version="2.0.0",

- org.apache.tuscany.sca.binding.corba.provider.meta;resolution:=optional,

- org.apache.tuscany.sca.binding.corba.provider.reference;version="2.0.0",

- org.apache.tuscany.sca.binding.corba.provider.service;version="2.0.0",

- org.apache.tuscany.sca.binding.corba.provider.types;version="2.0.0",

- org.apache.tuscany.sca.binding.corba.provider.types.util;resolution:=optional,

- org.apache.tuscany.sca.binding.corba.provider.util;resolution:=optional,

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.host.corba;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- 

- org.omg.CORBA,

- org.omg.CORBA.portable,

- org.omg.CosNaming;resolution:=optional,

- org.oasisopen.sca;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.corba.runtime

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-corba-runtime/NOTICE b/java/sca-contrib/modules/binding-corba-runtime/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/binding-corba-runtime/pom.xml b/java/sca-contrib/modules/binding-corba-runtime/pom.xml
deleted file mode 100644
index 77b1a02b55..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/pom.xml
+++ /dev/null
@@ -1,130 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-binding-corba-runtime</artifactId>
-    <name>Apache Tuscany SCA CORBA Binding Runtime</name>
-
-    <dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface-java</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-    
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-corba</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-corba</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-	
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib-nodep</artifactId>
-			<version>2.2</version>
-			<scope>compile</scope>
-		</dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!-- Unfortunately the idlj maven plugin only works with SUN JDK -->
-            <!-- 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/idl-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>idlj-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <debug>true</debug>
-                    <compiler>idlj</compiler>
-                    <sources>
-                        <source>
-                            <includes>
-                                <include>tester.idl</include>
-                            </includes>
-                            <emitStubs>true</emitStubs>
-                            <emitSkeletons>true</emitSkeletons>
-                        </source>
-                    </sources>
-                    <sourceDirectory>${basedir}/src/test/resources</sourceDirectory>
-                    <outputDirectory>${project.build.directory}/idl-source</outputDirectory>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.sun</groupId>
-                        <artifactId>tools</artifactId>
-                        <version>1.5.0</version>
-                        <scope>system</scope>
-                        <systemPath>${java.home}/../lib/tools.jar</systemPath>
-                    </dependency>
-                </dependencies>
-            </plugin>
-             -->
-
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java
deleted file mode 100644
index aa1669045b..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java
+++ /dev/null
@@ -1,70 +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.binding.corba.provider;
-
-import org.apache.tuscany.sca.binding.corba.CorbaBinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint;
-import org.apache.tuscany.sca.host.corba.ExtensibleCorbaHost;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CorbaBindingProviderFactory implements BindingProviderFactory<CorbaBinding> {
-
-    private CorbaHostExtensionPoint chep;
-    private ExtensibleCorbaHost host;
-    
-    public CorbaBindingProviderFactory(ExtensionPointRegistry registry) {
-        chep = registry.getExtensionPoint(CorbaHostExtensionPoint.class);
-        host = new ExtensibleCorbaHost(chep);
-    }
-    /**
-     * @see org.apache.tuscany.sca.provider.BindingProviderFactory#createReferenceBindingProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentReference, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   CorbaBinding binding) {
-        return new CorbaReferenceBindingProvider(binding, host, reference);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.BindingProviderFactory#createServiceBindingProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentService, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               CorbaBinding binding) {
-        return new CorbaServiceBindingProvider(binding, host, service);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()
-     */
-    public Class<CorbaBinding> getModelType() {
-        return CorbaBinding.class;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java
deleted file mode 100644
index 0ad3b2240e..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java
+++ /dev/null
@@ -1,89 +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.binding.corba.provider;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import org.apache.tuscany.sca.binding.corba.provider.exceptions.RequestConfigurationException;
-import org.apache.tuscany.sca.binding.corba.provider.reference.DynaCorbaRequest;
-import org.apache.tuscany.sca.binding.corba.provider.reference.DynaCorbaResponse;
-import org.apache.tuscany.sca.binding.corba.provider.util.OperationMapper;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.omg.CORBA.Object;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CorbaInvoker implements Invoker {
-
-    private Object remoteObject;
-    private Class<?> referenceClass;
-    private Map<Method, String> operationsMap;
-    private Map<Operation, Method> operationMethodMapping;
-
-    public CorbaInvoker(RuntimeComponentReference reference, Object remoteObject, Class<?> referenceClass, Map<Method, String> operationsMap) {
-        this.remoteObject = remoteObject;
-        this.referenceClass = referenceClass;
-        this.operationsMap = operationsMap;
-        this.operationMethodMapping = OperationMapper.mapOperationToMethod(reference.getInterfaceContract().getInterface().getOperations(), referenceClass);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Invoker#invoke(org.apache.tuscany.sca.invocation.Message)
-     */
-    public Message invoke(Message msg) {
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(remoteObject, msg.getOperation().getName());
-            request.setReferenceClass(referenceClass);
-            request.setOperationsMap(operationsMap);
-            if (msg.getOperation().getOutputType() != null) {
-                Annotation[] notes = operationMethodMapping.get(msg.getOperation()).getAnnotations();
-                request.setOutputType(msg.getOperation().getOutputType().getPhysical(), notes);
-            }
-            java.lang.Object[] args = msg.getBody();
-            if (args != null) {
-                Annotation[][] notes = operationMethodMapping.get(msg.getOperation()).getParameterAnnotations();
-                for (int i = 0; i < args.length; i++) {
-                    request.addArgument(args[i], notes[i]);
-                }
-            }
-            if (msg.getOperation().getFaultTypes() != null) {
-                for (DataType<?> type : msg.getOperation().getFaultTypes()) {
-                    request.addExceptionType(type.getPhysical());
-                }
-            }
-            DynaCorbaResponse response = request.invoke();
-            msg.setBody(response.getContent());
-        } catch (RequestConfigurationException e) {
-            throw new ServiceRuntimeException(e);
-        } catch (Exception e) {
-            msg.setFaultBody(e);
-        }
-        return msg;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java
deleted file mode 100644
index e177e1912f..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java
+++ /dev/null
@@ -1,100 +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.binding.corba.provider;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.binding.corba.CorbaBinding;
-import org.apache.tuscany.sca.binding.corba.provider.util.OperationMapper;
-import org.apache.tuscany.sca.host.corba.CorbaHost;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.omg.CORBA.Object;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CorbaReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private static final Logger logger = Logger.getLogger(CorbaReferenceBindingProvider.class.getName());
-    private CorbaBinding binding;
-    private CorbaHost host;
-    private RuntimeComponentReference reference;
-    private Object remoteObject;
-    private Class<?> referenceClass;
-    private Map<Method, String> operationsMap = null; 
-
-    public CorbaReferenceBindingProvider(CorbaBinding binding, CorbaHost host, RuntimeComponentReference reference) {
-        this.binding = binding;
-        this.host = host;
-        this.reference = reference;
-        this.referenceClass = ((JavaInterface)reference.getInterfaceContract().getInterface()).getJavaClass();
-        operationsMap = OperationMapper.mapMethodToOperationName(referenceClass);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ReferenceBindingProvider#createInvoker(org.apache.tuscany.sca.interfacedef.Operation)
-     */
-    public Invoker createInvoker(Operation operation) {
-        try {
-            if (remoteObject == null) {
-                remoteObject = host.lookup(binding.getCorbaname());    
-            }
-            return new CorbaInvoker(reference, remoteObject, referenceClass, operationsMap);
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "Exception during creating CORBA invoker", e);
-        }
-        return null;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ReferenceBindingProvider#getBindingInterfaceContract()
-     */
-    public InterfaceContract getBindingInterfaceContract() {
-        return reference.getInterfaceContract();
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ReferenceBindingProvider#start()
-     */
-    public void start() {
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ReferenceBindingProvider#stop()
-     */
-    public void stop() {
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ReferenceBindingProvider#supportsOneWayInvocation()
-     */
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java
deleted file mode 100644
index a574c52703..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java
+++ /dev/null
@@ -1,92 +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.binding.corba.provider;
-
-import org.apache.tuscany.sca.binding.corba.CorbaBinding;
-import org.apache.tuscany.sca.binding.corba.provider.service.ComponentInvocationProxy;
-import org.apache.tuscany.sca.binding.corba.provider.service.DynaCorbaServant;
-import org.apache.tuscany.sca.binding.corba.provider.service.InvocationProxy;
-import org.apache.tuscany.sca.binding.corba.provider.types.util.Utils;
-import org.apache.tuscany.sca.host.corba.CorbaHost;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CorbaServiceBindingProvider implements ServiceBindingProvider {
-
-    private CorbaBinding binding;
-    private CorbaHost host;
-    private RuntimeComponentService service;
-    private DynaCorbaServant servant;
-
-    public CorbaServiceBindingProvider(CorbaBinding binding, CorbaHost host, RuntimeComponentService service) {
-        this.binding = binding;
-        this.host = host;
-        this.service = service;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ServiceBindingProvider#getBindingInterfaceContract()
-     */
-    public InterfaceContract getBindingInterfaceContract() {
-        return service.getInterfaceContract();
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ServiceBindingProvider#start()
-     */
-    public void start() {
-        try {
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(binding), javaClass);
-            servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            servant.setIds(new String[] {binding.getId()});
-            host.registerServant(binding.getCorbaname(), servant);
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ServiceBindingProvider#stop()
-     */
-    public void stop() {
-        try {
-            host.unregisterServant(binding.getCorbaname());
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ServiceBindingProvider#supportsOneWayInvocation()
-     */
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java
deleted file mode 100644
index b3569e43b9..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java
+++ /dev/null
@@ -1,34 +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.binding.corba.provider.exceptions;
-
-/**
- * @version $Rev$ $Date$ 
- * Represents CORBA SystemException
- */
-public class CorbaException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-
-    public CorbaException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java
deleted file mode 100644
index a554f56035..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java
+++ /dev/null
@@ -1,43 +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.binding.corba.provider.exceptions;
-
-/**
- * @version $Rev$ $Date$ 
- */
-public class RequestConfigurationException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-    private String objectId;
-
-    public RequestConfigurationException(String message, String objectId) {
-        super(message + ", object id was: " + objectId);
-        this.objectId = objectId;
-    }
-
-    public RequestConfigurationException(String message) {
-        super(message);
-    }
-
-    public String getType() {
-        return objectId;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java
deleted file mode 100644
index 823db1e748..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java
+++ /dev/null
@@ -1,34 +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.binding.corba.provider.meta;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- * Declares CORBA arrays lengths
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface CorbaArray {
-
-    int[] value();
-    
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java
deleted file mode 100644
index feb6627e25..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.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.binding.corba.provider.meta;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$ Declares CORBA union object
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface CorbaUnionElement {
-    
-    // number of option in switch clause
-    int optionNumber() default -1;
-    
-    // type of element
-    CorbaUnionElementType type();
-    
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java
deleted file mode 100644
index 1e7a0087e0..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java
+++ /dev/null
@@ -1,28 +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.binding.corba.provider.meta;
-
-/**
- * @version $Rev$ $Date$
- * Types for union element
- */
-public enum CorbaUnionElementType {
-    discriminator, defaultOption, option;
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java
deleted file mode 100644
index e7d0b8b91b..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java
+++ /dev/null
@@ -1,253 +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.binding.corba.provider.reference;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.binding.corba.provider.exceptions.CorbaException;
-import org.apache.tuscany.sca.binding.corba.provider.exceptions.RequestConfigurationException;
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTree;
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeCreator;
-import org.apache.tuscany.sca.binding.corba.provider.types.util.TypeHelpersProxy;
-import org.apache.tuscany.sca.binding.corba.provider.types.util.Utils;
-import org.apache.tuscany.sca.binding.corba.provider.util.MethodFinder;
-import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.Object;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.portable.ApplicationException;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.ObjectImpl;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$ Represents single CORBA request
- */
-public class DynaCorbaRequest {
-
-    private TypeTree returnTree;
-    private Map<String, TypeTree> exceptions = new HashMap<String, TypeTree>();
-    private InputStream inputStream;
-    private ObjectImpl remoteObject;
-    private String operation;
-    private List<java.lang.Object> arguments = new ArrayList<java.lang.Object>();
-    private List<TypeTree> argumentsTypes = new ArrayList<TypeTree>();
-    private Class<?> referenceClass;
-    private Map<Method, String> operationsMap;
-    
-    /**
-     * Creates request.
-     * 
-     * @param ObjectremoteObject remote object reference
-     * @param operation operation to invoke
-     * @param scaBindingRules apply SCA default binding mapping rules
-     */
-    public DynaCorbaRequest(Object remoteObject, String operation) {
-        this.remoteObject = (ObjectImpl)remoteObject;
-        this.operation = operation;
-    }
-
-    /**
-     * Sets class which will be backed by this reference request 
-     * @param referenceClass
-     */
-    public void setReferenceClass(Class<?> referenceClass) {
-        this.referenceClass = referenceClass;
-    }
-
-    /**
-     * Sets method to operation names mapping
-     * @param operationsMap
-     */
-    public void setOperationsMap(Map<Method, String> operationsMap) {
-        this.operationsMap = operationsMap;
-    }
-
-    /**
-     * Adds operation argument - stores arguments and caches its TypeTree. Annotations will be set to null by default.
-     * 
-     * @param argument
-     */
-    public void addArgument(java.lang.Object argument) throws RequestConfigurationException {
-        addArgument(argument, null);
-    }
-    
-    /**
-     * Adds operation argument - stores arguments and caches its TypeTree
-     * 
-     * @param argument
-     */
-    public void addArgument(java.lang.Object argument, Annotation[] notes) throws RequestConfigurationException {
-        TypeTree tree = TypeTreeCreator.createTypeTree(argument.getClass(), notes);
-        argumentsTypes.add(tree);
-        arguments.add(argument);
-    }
-
-    /**
-     * Passing stored arguments to CORBA communication output stream
-     * 
-     * @param outputStream
-     * @throws RequestConfigurationException
-     */
-    private void passArguments(OutputStream outputStream) throws RequestConfigurationException {
-        for (int i = 0; i < arguments.size(); i++) {
-            TypeTree tree = argumentsTypes.get(i);
-            TypeHelpersProxy.write(tree.getRootNode(), outputStream, arguments.get(i));
-        }
-    }
-
-    /**
-     * Sets return type for operation. Annotations will be set to null by default.
-     * 
-     * @param forClass
-     */
-    public void setOutputType(Class<?> forClass) throws RequestConfigurationException {
-        setOutputType(forClass, null);
-    }
-    
-    /**
-     * Sets return type for operation
-     * 
-     * @param forClass
-     */
-    public void setOutputType(Class<?> forClass, Annotation[] notes) throws RequestConfigurationException {
-        returnTree = TypeTreeCreator.createTypeTree(forClass, notes);
-    }
-
-    /**
-     * Configures possible exceptions
-     * 
-     * @param forClass
-     */
-    public void addExceptionType(Class<?> forClass) throws RequestConfigurationException {
-        TypeTree tree = TypeTreeCreator.createTypeTree(forClass, null);
-        String exceptionId = Utils.getTypeId(forClass);
-        exceptions.put(exceptionId, tree);
-    }
-
-    /**
-     * Handles application excpeition.
-     * 
-     * @param ae occured exception
-     * @throws Exception
-     */
-    private void handleApplicationException(ApplicationException ae) throws Exception {
-        try {
-            if (exceptions.size() == 0) {
-                RequestConfigurationException exception =
-                    new RequestConfigurationException(
-                                                      "ApplicationException occured, but no exception type was specified.",
-                                                      ae.getId());
-                throw exception;
-            }
-            InputStream is = ae.getInputStream();
-            String exceptionId = is.read_string();
-            TypeTree tree = exceptions.get(exceptionId);
-            if (tree == null) {
-                RequestConfigurationException exception =
-                    new RequestConfigurationException(
-                                                      "ApplicationException occured, but no such exception was defined",
-                                                      ae.getId());
-                throw exception;
-            } else {
-                Exception ex = (Exception)TypeHelpersProxy.read(tree.getRootNode(), is);
-                throw ex;
-            }
-        } catch (Exception e) {
-            throw e;
-        }
-    }
-
-    /**
-     * Handles exceptions generated by CORBA API
-     * 
-     * @param se
-     */
-    private void handleSystemException(SystemException se) throws Exception {
-        if (se instanceof BAD_OPERATION) {
-            throw new CorbaException("Bad operation name: " + operation, se);
-        } else if (se instanceof BAD_PARAM) {
-            throw new CorbaException("Bad parameter", se);
-        } else {
-            // TODO: handle more system exception types
-            throw new CorbaException(se.getMessage(), se);
-        }
-    }
-
-    /**
-     * Gets operation name which is includes mapping rules
-     * @return
-     */
-    private String getFinalOperationName() {
-        String result = operation;
-        if (referenceClass != null) {
-            Class<?>[] argumentTypes = new Class<?>[arguments.size()];
-            for (int i = 0; i < arguments.size(); i++) {
-                argumentTypes[i] = arguments.get(i).getClass();
-            }
-            Method method = MethodFinder.findMethod(referenceClass, operation, argumentTypes);
-            String newOperation = (String)operationsMap.get(method);
-            if (newOperation != null) {
-                result = newOperation;
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Invokes previously configured request
-     * 
-     * @return
-     */
-    public DynaCorbaResponse invoke() throws Exception {
-        DynaCorbaResponse response = new DynaCorbaResponse();
-        String finalOperationName = getFinalOperationName();
-        OutputStream outputStream = ((ObjectImpl)remoteObject)._request(finalOperationName, true);
-        passArguments(outputStream);
-        try {
-            inputStream = remoteObject._invoke(outputStream);
-            if (inputStream != null && returnTree != null) {
-                response.setContent(TypeHelpersProxy.read(returnTree.getRootNode(), inputStream));
-            }
-        } catch (ApplicationException ae) {
-            handleApplicationException(ae);
-        } catch (SystemException se) {
-            handleSystemException(se);
-        } catch (Exception e) {
-            throw e;
-        } finally {
-            release();
-        }
-        return response;
-    }
-
-    /**
-     * Releases request resources
-     */
-    private void release() {
-        remoteObject._releaseReply(inputStream);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java
deleted file mode 100644
index 6a01c70a38..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java
+++ /dev/null
@@ -1,39 +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.binding.corba.provider.reference;
-
-/**
- * @version $Rev$ $Date$
- * Holder for content returned from DynaCorbaRequest
- *
- */
-public class DynaCorbaResponse {
-
-    private Object content;
-
-    public Object getContent() {
-        return content;
-    }
-
-    public void setContent(Object content) {
-        this.content = content;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java
deleted file mode 100644
index 2828e09cc7..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java
+++ /dev/null
@@ -1,70 +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.binding.corba.provider.reference;
-
-import java.lang.reflect.Method;
-
-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.CallbackFilter;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.NoOp;
-
-import org.omg.CORBA.Object;
-
-/**
- * @version $Rev$ $Date$
- */
-public class InterfaceInstanceCreator {
-
-    private static final CallbackFilter FILTER = new CallbackFilter() {
-        public int accept(Method method) {
-            return 1;
-        }
-    };
-
-    /**
-     * Dynamically creates instance of user defined interface. Instance is
-     * enhanced by RemoteMethodInterceptor
-     * 
-     * @param reference
-     *            CORBA reference
-     * @param forClass
-     *            user defined interface
-     * @return dynamic implementation instance
-     */
-    public static java.lang.Object createInstance(Object reference, Class<?> forClass) {
-        java.lang.Object result = null;
-        try {
-            Enhancer enhancer = new Enhancer();
-            enhancer.setInterfaces(new Class[] {forClass});
-            enhancer.setCallbackFilter(FILTER);
-            enhancer.setCallbackTypes(new Class[] {NoOp.class, MethodInterceptor.class});
-            Class<?> newClass = enhancer.createClass();
-            Enhancer.registerStaticCallbacks(newClass, new Callback[] {NoOp.INSTANCE,
-                                                                       new InterfaceMethodInterceptor(reference, forClass)});
-            result = newClass.newInstance();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return result;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java
deleted file mode 100644
index c5c98ab27c..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java
+++ /dev/null
@@ -1,65 +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.binding.corba.provider.reference;
-
-import java.lang.reflect.Method;
-
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-
-import org.omg.CORBA.Object;
-
-/**
- * @version $Rev$ $Date$ 
- * Interceptor for CORBA reference methods
- */
-public class InterfaceMethodInterceptor implements MethodInterceptor {
-
-    private Object reference;
-    private Class<?> javaClass;
-
-    public InterfaceMethodInterceptor(Object reference, Class<?> javaClass) {
-        this.reference = reference;
-        this.javaClass = javaClass;
-    }
-
-    /**
-     * Create and execute DynaCorbaRequest instance, basing on intercepted
-     * method arguments, return types, exceptions
-     */
-    public java.lang.Object intercept(java.lang.Object object,
-                                      Method method,
-                                      java.lang.Object[] arguments,
-                                      MethodProxy arg3) throws Throwable {
-        DynaCorbaRequest request = new DynaCorbaRequest(reference, method.getName());
-        request.setReferenceClass(javaClass);
-        for (int i = 0; i < arguments.length; i++) {
-            request.addArgument(arguments[i]);
-        }
-        request.setOutputType(method.getReturnType());
-        Class<?>[] exceptions = method.getExceptionTypes();
-        for (int i = 0; i < exceptions.length; i++) {
-            request.addExceptionType(exceptions[i]);
-        }
-        DynaCorbaResponse response = request.invoke();
-        return response.getContent();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java
deleted file mode 100644
index b88c097008..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java
+++ /dev/null
@@ -1,120 +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.binding.corba.provider.service;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.binding.corba.provider.exceptions.RequestConfigurationException;
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTree;
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeCreator;
-import org.apache.tuscany.sca.binding.corba.provider.util.OperationMapper;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * @version $Rev$ $Date$
- * Invocation proxy for SCA components
- */
-public class ComponentInvocationProxy implements InvocationProxy {
-
-    private RuntimeWire wire;
-    private Map<Method, Operation> methodOperationMapping;
-    private Map<Operation, Method> operationMethodMapping;
-    private Map<String, Method> operationsMap;
-    private Map<Operation, OperationTypes> operationsCache = new HashMap<Operation, OperationTypes>();
-
-    public ComponentInvocationProxy(RuntimeComponentService service, RuntimeWire wire, Class<?> javaClass)
-        throws RequestConfigurationException {
-        this.wire = wire;
-        operationsMap = OperationMapper.mapOperationNameToMethod(javaClass);
-        operationMethodMapping = OperationMapper.mapOperationToMethod(service.getInterfaceContract().getInterface().getOperations(), javaClass);
-        methodOperationMapping = OperationMapper.mapMethodToOperation(service.getInterfaceContract().getInterface().getOperations(), javaClass);
-        cacheOperationTypes(service.getInterfaceContract().getInterface().getOperations());
-    }
-
-    /**
-     * Caches TypeTree for every operation in backed component
-     * 
-     * @param operations
-     * @throws RequestConfigurationException
-     */
-    private void cacheOperationTypes(List<Operation> operations) throws RequestConfigurationException {
-        for (Operation operation : operations) {
-            try {
-                OperationTypes operationTypes = new OperationTypes();
-                List<TypeTree> inputInstances = new ArrayList<TypeTree>();
-                // cache output type tree
-                if (operation.getOutputType() != null && operation.getOutputType().getPhysical() != null
-                    && !operation.getOutputType().getPhysical().equals(void.class)) {
-                    Annotation[] notes = operationMethodMapping.get(operation).getAnnotations();
-                    TypeTree outputType =
-                        TypeTreeCreator.createTypeTree(operation.getOutputType().getPhysical(), notes);
-                    operationTypes.setOutputType(outputType);
-                }
-                // cache input types trees
-                if (operation.getInputType() != null) {
-                    Method method = operationMethodMapping.get(operation);
-                    Annotation[][] notes = method.getParameterAnnotations();
-                    int i = 0;
-                    for (DataType<List<DataType<?>>> type : operation.getInputType().getLogical()) {
-                        Class<?> forClass = type.getPhysical();
-                        TypeTree inputType = TypeTreeCreator.createTypeTree(forClass, notes[i]);
-                        inputInstances.add(inputType);
-                        i++;
-                    }
-
-                }
-                operationTypes.setInputType(inputInstances);
-                operationsCache.put(operation, operationTypes);
-            } catch (RequestConfigurationException e) {
-                throw e;
-            }
-        }
-    }
-
-    private Operation getOperation4Name(String operationName) {
-        Method method = operationsMap.get(operationName);
-        return methodOperationMapping.get(method);
-    }
-
-    public OperationTypes getOperationTypes(String operationName) {
-        return operationsCache.get(getOperation4Name(operationName));
-    }
-
-    public Object invoke(String operationName, List<Object> arguments) throws InvocationException {
-        Object result = null;
-        try {
-            result = wire.invoke(getOperation4Name(operationName), arguments.toArray());
-        } catch (InvocationTargetException e) {
-            InvocationException exception = new InvocationException(e.getCause());
-            throw exception;
-        }
-        return result;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java
deleted file mode 100644
index d8524eaee9..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java
+++ /dev/null
@@ -1,137 +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.binding.corba.provider.service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.binding.corba.provider.exceptions.RequestConfigurationException;
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTree;
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeCreator;
-import org.apache.tuscany.sca.binding.corba.provider.types.util.TypeHelpersProxy;
-import org.apache.tuscany.sca.binding.corba.provider.types.util.Utils;
-import org.omg.CORBA.MARSHAL;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.InvokeHandler;
-import org.omg.CORBA.portable.ObjectImpl;
-import org.omg.CORBA.portable.OutputStream;
-import org.omg.CORBA.portable.ResponseHandler;
-
-/**
- * @version $Rev$ $Date$
- * General servant which provides target component implementation via CORBA
- */
-public class DynaCorbaServant extends ObjectImpl implements InvokeHandler {
-
-    private static final Logger logger = Logger.getLogger(DynaCorbaServant.class.getName());
-    
-    private String[] ids;
-    private InvocationProxy invocationProxy;
-    private String typeId;
-    
-    /**
-     * Creates servant object
-     * @param invocationProxy
-     * @param typeId
-     * @throws RequestConfigurationException
-     */
-    public DynaCorbaServant(InvocationProxy invocationProxy, String typeId) throws RequestConfigurationException {
-        this.invocationProxy = invocationProxy;
-        this.typeId = typeId;
-        setDefaultIds();
-    }
-
-    /**
-     * Sets CORBA object ID
-     * @param ids
-     */
-    public void setIds(String[] ids) {
-        for (int i = 0; i < ids.length; i++) {
-            if (ids[i] == null || ids[i].length() == 0) {
-                // if invalid id was passed then set to default 
-                setDefaultIds();
-                return;
-            }
-        }
-        this.ids = ids;
-    }
-
-    public OutputStream _invoke(String operationName, InputStream in, ResponseHandler rh) {
-        OperationTypes types = invocationProxy.getOperationTypes(operationName);
-        if (types == null) {
-            // operation wasn't found
-            throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-        } else {
-            List<Object> inputInstances = new ArrayList<Object>();
-            try {
-                // retrieving in arguments
-                for (TypeTree tree : types.getInputType()) {
-                    Object o = TypeHelpersProxy.read(tree.getRootNode(), in);
-                    inputInstances.add(o);
-                }
-            } catch (MARSHAL e) {
-                // parameter passed by user was not compatible with Java to
-                // Corba mapping
-                throw new org.omg.CORBA.BAD_PARAM(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-            }
-            try {
-                // invocation and sending result
-                Object result = invocationProxy.invoke(operationName, inputInstances);
-                OutputStream out = rh.createReply();
-                if (types.getOutputType() != null) {
-                    TypeTree tree = types.getOutputType();
-                    TypeHelpersProxy.write(tree.getRootNode(), out, result);
-                }
-                return out;
-            } catch (InvocationException ie) {
-                // handling user exception
-                try {
-                    OutputStream out = rh.createExceptionReply();
-                    Class<?> exceptionClass = ie.getTargetException().getClass();
-                    TypeTree tree = TypeTreeCreator.createTypeTree(exceptionClass, null);
-                    String exceptionId = Utils.getTypeId(exceptionClass);
-                    out.write_string(exceptionId);
-                    TypeHelpersProxy.write(tree.getRootNode(), out, ie.getTargetException());
-                    return out;
-                } catch (Exception e) {
-                    logger.log(Level.WARNING, "Exception during handling invocation exception", e);
-                }
-            } catch (Exception e) {
-                logger.log(Level.WARNING, "Unexpected exception during sending CORBA result to client", e);
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public String[] _ids() {
-        return ids;
-    }
-
-    /**
-     * Sets servant ID to default, based on Java class name
-     */
-    private void setDefaultIds() {
-        this.ids = new String[] {typeId};
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java
deleted file mode 100644
index 57e2fae9f4..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java
+++ /dev/null
@@ -1,43 +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.binding.corba.provider.service;
-
-/**
- * @version $Rev$ $Date$
- * Wrapper for exception thrown during target invocation 
- */
-public class InvocationException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-    private Throwable targetException;
-
-    public InvocationException(Throwable targetException) {
-        this.targetException = targetException;
-    }
-    
-    public Throwable getTargetException() {
-        return targetException;
-    }
-
-    public void setTargetException(Throwable target) {
-        this.targetException = target;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java
deleted file mode 100644
index 2e2066802a..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java
+++ /dev/null
@@ -1,46 +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.binding.corba.provider.service;
-
-import java.util.List;
-
-/**
- * @version $Rev$ $Date$
- * Target proxy interface for service bindings
- */
-public interface InvocationProxy {
-
-    /**
-     * Gets operations types for target
-     * @param operationName
-     * @return
-     */
-    public OperationTypes getOperationTypes(String operationName);
-    
-    /**
-     * Invokes target operation
-     * @param operationName
-     * @param arguments
-     * @return
-     * @throws InvocationException
-     */
-    public Object invoke(String operationName, List<Object> arguments) throws InvocationException;
-    
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java
deleted file mode 100644
index 766048ac64..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java
+++ /dev/null
@@ -1,51 +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.binding.corba.provider.service;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTree;
-
-/**
- * @version $Rev$ $Date$
- * Holder for Java type trees for one method  
- */
-public class OperationTypes {
-
-    private TypeTree outputType;
-    private List<TypeTree> inputType;
-
-    public TypeTree getOutputType() {
-        return outputType;
-    }
-
-    public void setOutputType(TypeTree outputType) {
-        this.outputType = outputType;
-    }
-
-    public List<TypeTree> getInputType() {
-        return inputType;
-    }
-
-    public void setInputType(List<TypeTree> inputType) {
-        this.inputType = inputType;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java
deleted file mode 100644
index ab7371bbe8..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java
+++ /dev/null
@@ -1,46 +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.binding.corba.provider.types;
-
-/**
- * Holds information retrieved from objects annotations
- */
-public class AnnotationAttributes {
-    
-    private boolean corbaArray;
-    private int[] corbaArrayLength;
-
-    public boolean isCorbaArray() {
-        return corbaArray;
-    }
-
-    public void setCorbaArray(boolean isCorbaArray) {
-        this.corbaArray = isCorbaArray;
-    }
-
-    public int[] getCorbaArrayLength() {
-        return corbaArrayLength;
-    }
-
-    public void setCorbaArrayLength(int[] corbaArrayLength) {
-        this.corbaArrayLength = corbaArrayLength;
-    }
-    
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java
deleted file mode 100644
index 706a44406b..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java
+++ /dev/null
@@ -1,28 +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.binding.corba.provider.types;
-
-/**
- * @version $Rev$ $Date$ 
- * Types of CORBA objects.
- */
-public enum NodeType {
-    primitive, struct, union, array, sequence, reference, idl_enum, exception
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java
deleted file mode 100644
index d4207ab735..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java
+++ /dev/null
@@ -1,50 +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.binding.corba.provider.types;
-
-/**
- * @version $Rev$ $Date$
- *          Helper tree for Java object hierarchy. It's closer to CORBA types
- *          structure than plain Java hierarchy - it helps reading and writing
- *          complex structures.
- */
-public class TypeTree {
-
-    private TypeTreeNode rootNode;
-
-    /**
-     * Returns root node.
-     * 
-     * @return root of type tree
-     */
-    public TypeTreeNode getRootNode() {
-        return rootNode;
-    }
-
-    /**
-     * Sets root of the type tree.
-     * 
-     * @param rootNode root node.
-     */
-    public void setRootNode(TypeTreeNode rootNode) {
-        this.rootNode = rootNode;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java
deleted file mode 100644
index 1ba4002303..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java
+++ /dev/null
@@ -1,497 +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.binding.corba.provider.types;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.tuscany.sca.binding.corba.provider.exceptions.RequestConfigurationException;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaArray;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
-
-/**
- * @version $Rev$ $Date$
- *          Creator of types tree.
- */
-public class TypeTreeCreator {
-
-    /**
-     * Helps to determine if type is a primitive.
-     */
-    private static List<Class<?>> primitives = new ArrayList<Class<?>>();
-
-    static {
-        primitives.add(boolean.class);
-        primitives.add(byte.class);
-        primitives.add(short.class);
-        primitives.add(int.class);
-        primitives.add(long.class);
-        primitives.add(double.class);
-        primitives.add(float.class);
-        primitives.add(char.class);
-        primitives.add(String.class);
-        primitives.add(Boolean.class);
-        primitives.add(Byte.class);
-        primitives.add(Short.class);
-        primitives.add(Integer.class);
-        primitives.add(Long.class);
-        primitives.add(Double.class);
-        primitives.add(Float.class);
-        primitives.add(Character.class);
-    }
-
-    /**
-     * Creates class for given string argument.
-     * 
-     * @param name name of type
-     * @return type
-     */
-    private static Class<?> createClassFromString(String name) {
-        Class<?> result = null;
-        try {
-            if (name.length() == 1) {
-                // primitives
-                switch (name.charAt(0)) {
-                    case 'Z':
-                        result = boolean.class;
-                        break;
-                    case 'C':
-                        result = char.class;
-                        break;
-                    case 'B':
-                        result = byte.class;
-                        break;
-                    case 'S':
-                        result = short.class;
-                        break;
-                    case 'I':
-                        result = int.class;
-                        break;
-                    case 'J':
-                        result = long.class;
-                        break;
-                    case 'F':
-                        result = float.class;
-                        break;
-                    case 'D':
-                        result = double.class;
-                        break;
-                }
-            } else {
-                // class
-                name = name.substring(1, name.length() - 1);
-                result = Class.forName(name);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return result;
-    }
-
-    /**
-     * Reduces dimension of array.
-     * 
-     * @param forClass array class
-     * @return reduced array
-     */
-    private static Class<?> reduceArrayDimension(Class<?> forClass) {
-        String name = forClass.getName();
-        try {
-            String reduced = name.substring(1, name.length());
-            if (reduced.startsWith("[")) {
-                // reduced class is still an array
-                return Class.forName(reduced);
-            } else {
-                // reduced class may be primitive or class
-                return createClassFromString(reduced);
-            }
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * Return given array without first element
-     * 
-     * @param array
-     * @return
-     */
-    private static int[] removeFirstElement(int[] array) {
-        int[] result = new int[array.length - 1];
-        System.arraycopy(array, 1, result, 0, result.length);
-        return result;
-    }
-
-    /**
-     * Converts objects annotations to structure which will be used by this
-     * class
-     * 
-     * @param notes
-     * @return
-     */
-    private static AnnotationAttributes createAnnotationAttributes(Annotation[] notes) {
-        AnnotationAttributes attrs = new AnnotationAttributes();
-        for (int i = 0; notes != null && i < notes.length; i++) {
-            if (notes[i].annotationType().equals(CorbaArray.class)) {
-                attrs.setCorbaArray(true);
-                attrs.setCorbaArrayLength(((CorbaArray)notes[i]).value());
-            }
-        }
-        return attrs;
-    }
-
-    /**
-     * Creates tree for given type.
-     * 
-     * @param forClass
-     * @return type tree
-     */
-    public static TypeTree createTypeTree(Class<?> forClass, Annotation[] notes) throws RequestConfigurationException {
-        TypeTree tree = new TypeTree();
-        TypeTreeNode rootNode = null;
-        AnnotationAttributes attrs = createAnnotationAttributes(notes);
-        rootNode = inspectClassHierarchy(forClass, attrs, tree);
-        tree.setRootNode(rootNode);
-        return tree;
-
-    }
-
-    /**
-     * Recurrent method which builds type tree.
-     * 
-     * @param forClass
-     * @param tree
-     * @return
-     */
-    private static TypeTreeNode inspectClassHierarchy(Class<?> forClass, AnnotationAttributes attributes, TypeTree tree)
-        throws RequestConfigurationException {
-
-        TypeTreeNode node = null;
-        node = createTypeNode(forClass, attributes);
-
-        NodeType nodeType = node.getNodeType();
-        TypeTreeNode[] children = null;
-
-        if (nodeType.equals(NodeType.primitive)) {
-            // stop condition for recurrent method
-        } else if (nodeType.equals(NodeType.array)) {
-            Class<?> reduced = reduceArrayDimension(node.getJavaClass());
-            children = new TypeTreeNode[1];
-            int[] newLengths = removeFirstElement(attributes.getCorbaArrayLength());
-            attributes.setCorbaArrayLength(newLengths);
-            children[0] = inspectClassHierarchy(reduced, attributes, tree);
-        } else if (nodeType.equals(NodeType.sequence)) {
-            // reducing sequence dimension
-            Class<?> reduced = reduceArrayDimension(node.getJavaClass());
-            children = new TypeTreeNode[1];
-            children[0] = inspectClassHierarchy(reduced, attributes, tree);
-            // System.arraycopy(src, srcPos, dest, destPos, length)
-        } else if (nodeType.equals(NodeType.struct) || nodeType.equals(NodeType.exception)) {
-            // inspect types for every structure member
-            Field[] fields = node.getJavaClass().getFields();
-            children = new TypeTreeNode[fields.length];
-            for (int i = 0; i < fields.length; i++) {
-                Class<?> field = fields[i].getType();
-                AnnotationAttributes fAttrs = createAnnotationAttributes(fields[i].getAnnotations());
-                TypeTreeNode child = inspectClassHierarchy(field, fAttrs, tree);
-                child.setName(fields[i].getName());
-                children[i] = child;
-            }
-        } else if (nodeType.equals(NodeType.idl_enum)) {
-
-        } else if (nodeType.equals(NodeType.union)) {
-            // inspect types for every structure member
-            Field[] fields = node.getJavaClass().getDeclaredFields();
-            children = new TypeTreeNode[fields.length];
-            for (int i = 0; i < fields.length; i++) {
-                Class<?> field = fields[i].getType();
-                AnnotationAttributes fAttrs = createAnnotationAttributes(fields[i].getAnnotations());
-                TypeTreeNode child = inspectClassHierarchy(field, fAttrs, tree);
-                child.setName(fields[i].getName());
-                children[i] = child;
-            }
-        } else if (nodeType.equals(NodeType.reference)) {
-            // TODO: CORBA references
-        }
-
-        node.setChildren(children);
-        return node;
-    }
-
-    /**
-     * Creating and configuring TypeTreeNode for given class.
-     * 
-     * @param forClass class
-     * @return node
-     * @throws RequestConfigurationException
-     */
-    private static TypeTreeNode createTypeNode(Class<?> forClass, AnnotationAttributes attributes)
-        throws RequestConfigurationException {
-        TypeTreeNode node = new TypeTreeNode();
-        if (forClass.isArray() && !attributes.isCorbaArray()) {
-            node.setNodeType(NodeType.sequence);
-            node.setJavaClass(forClass);
-        } else if (forClass.isArray() && attributes.isCorbaArray()) {
-            node.setNodeType(NodeType.array);
-            node.setJavaClass(forClass);
-            try {
-                // set the actual array size for further use by ArrayTypeHelper
-                node.setAttributes(attributes.getCorbaArrayLength()[0]);
-            } catch (ArrayIndexOutOfBoundsException e) {
-                RequestConfigurationException exc =
-                    new RequestConfigurationException("Annotated array size doesn't match declared arrays size");
-                throw exc;
-            }
-        } else if (primitives.contains(forClass)) {
-            node.setNodeType(NodeType.primitive);
-            node.setJavaClass(forClass);
-            node.setChildren(null);
-        } else if (forClass.isInterface()) {
-            node.setNodeType(NodeType.reference);
-            node.setJavaClass(forClass);
-            node.setChildren(null);
-        } else if (isStructType(forClass)) {
-            node.setNodeType(NodeType.struct);
-            node.setJavaClass(forClass);
-        } else if (isEnumType(forClass)) {
-            node.setNodeType(NodeType.idl_enum);
-            node.setJavaClass(forClass);
-        } else if (isUserException(forClass)) {
-            node.setNodeType(NodeType.exception);
-            node.setJavaClass(forClass);
-        } else if (isUnionType(forClass)) {
-            node.setNodeType(NodeType.union);
-            node.setJavaClass(forClass);
-            node.setAttributes(getUnionAttributes(forClass));
-        } else {
-            RequestConfigurationException e =
-                new RequestConfigurationException("User defined type which cannot be handled: " + forClass
-                    .getCanonicalName());
-            throw e;
-        }
-        return node;
-    }
-
-    /**
-     * Tells whether given class is structure
-     * 
-     * @param forClass
-     * @return
-     */
-    private static boolean isStructType(Class<?> forClass) {
-        int classMods = forClass.getModifiers();
-        if (!Modifier.isFinal(classMods)) {
-            return false;
-        }
-        boolean areCtorsValid = false;
-        Class<?>[] fieldsTypes = null;
-        Constructor<?>[] ctors = forClass.getConstructors();
-        /*
-         * Do we have 2 ctors and one of them is null ctor?
-         */
-        if (ctors.length != 2) {
-            return false;
-        }
-        for (int i = 0; i < ctors.length; i++) {
-            Class<?>[] params = ctors[i].getParameterTypes();
-            if (params.length == 0) {
-                areCtorsValid = true;
-            } else {
-                fieldsTypes = params;
-            }
-        }
-        if (!areCtorsValid) {
-            return false;
-        }
-        /*
-         * Are constructor args declared as class fields?
-         */
-        Field[] fields = forClass.getFields();
-        Set<Class<?>> fieldsSet = new HashSet<Class<?>>(Arrays.asList(fieldsTypes));
-        for (int i = 0; i < fields.length && !fieldsSet.isEmpty(); i++) {
-            int mods = fields[i].getModifiers();
-            if (Modifier.isPublic(mods) && !Modifier.isStatic(mods) && !Modifier.isFinal(mods)) {
-                fieldsSet.remove(fields[i].getType());
-            }
-
-        }
-        return fieldsSet.isEmpty();
-    }
-
-    /**
-     * Tells whether given class is enum
-     * 
-     * @param forClass
-     * @return
-     */
-    private static boolean isEnumType(Class<?> forClass) {
-        boolean isValueMethod = false;
-        boolean isFromIntMethod = false;
-        /*
-         * enum type should have value and from_int methods
-         */
-        try {
-            Method valueMet = forClass.getMethod("value", new Class[] {});
-            int modValueMet = valueMet.getModifiers();
-            if (valueMet.getReturnType().equals(int.class) && Modifier.isPublic(modValueMet)) {
-                isValueMethod = true;
-            }
-            Method fromIntMet = forClass.getMethod("from_int", new Class[] {int.class});
-            int modFromIntMet = fromIntMet.getModifiers();
-            if ((fromIntMet.getReturnType().equals(forClass) && Modifier.isPublic(modFromIntMet) && Modifier
-                .isStatic(modFromIntMet))) {
-                isFromIntMethod = true;
-            }
-        } catch (NoSuchMethodException e) {
-        }
-        if (!isFromIntMethod || !isValueMethod) {
-            return false;
-        }
-        /*
-         * enum type should also contain minimum one pair of fields: EnumType
-         * field and int _field
-         */
-        int enumCount = 0;
-        Field[] fields = forClass.getFields();
-        for (int i = 0; i < fields.length; i++) {
-            if (fields[i].getType().equals(forClass)) {
-                int modifiers = fields[i].getModifiers();
-                if (Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers) && Modifier.isFinal(modifiers)) {
-                    try {
-                        Field field = forClass.getField("_" + fields[i].getName());
-                        if (field.getType().equals(int.class)) {
-                            enumCount++;
-                        }
-                    } catch (NoSuchFieldException e) {
-                    }
-
-                }
-            }
-        }
-        return enumCount > 0;
-    }
-
-    /**
-     * Tells whether given class is CORBA user exception
-     * 
-     * @param forClass
-     * @return
-     */
-    private static boolean isUserException(Class<?> forClass) {
-        do {
-            if (forClass.equals(Exception.class)) {
-                return true;
-            } else {
-                forClass = forClass.getSuperclass();
-            }
-        } while (forClass != null && !forClass.equals(Object.class));
-        return false;
-    }
-
-    /**
-     * Tells whether given class is CORBA union. This method validates usage of
-     * unions annotations.
-     * 
-     * @param forClass
-     * @return
-     * @throws RequestConfigurationException
-     */
-    private static boolean isUnionType(Class<?> forClass) throws RequestConfigurationException {
-        int classMods = forClass.getModifiers();
-        if (!Modifier.isFinal(classMods)) {
-            return false;
-        }
-        boolean atLeastOneOption = false;
-        boolean discriminatorPresent = false;
-        for (int i = 0; i < forClass.getDeclaredFields().length; i++) {
-            CorbaUnionElement note = forClass.getDeclaredFields()[i].getAnnotation(CorbaUnionElement.class);
-            if (note != null) {
-                int fieldMod = forClass.getDeclaredFields()[i].getModifiers();
-                if (Modifier.isPrivate(fieldMod) && !Modifier.isFinal(fieldMod) && !Modifier.isStatic(fieldMod)) {
-                    if (note.type().equals(CorbaUnionElementType.discriminator)) {
-                        if (discriminatorPresent) {
-                            throw new RequestConfigurationException(
-                                                                    "More than one discriminators declared on: " + forClass);
-                        }
-                        discriminatorPresent = true;
-                    } else {
-                        atLeastOneOption = true;
-                    }
-                } else {
-                    throw new RequestConfigurationException(
-                                                            "Annotated union field should be private, not final and no static on class: " + forClass);
-                }
-            }
-        }
-        if (atLeastOneOption && !discriminatorPresent) {
-            throw new RequestConfigurationException("No discriminator annotation found on: " + forClass);
-        } else if (!atLeastOneOption && discriminatorPresent) {
-            throw new RequestConfigurationException("No union option found on: " + forClass);
-        } else if (discriminatorPresent && atLeastOneOption) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Gets union attributes - discriminator field name, option fields etc. This
-     * method relies that previously scanned class is valid (method isUnionType)
-     * 
-     * @param forClass
-     * @return
-     * @throws RequestConfigurationException
-     */
-    private static UnionAttributes getUnionAttributes(Class<?> forClass) throws RequestConfigurationException {
-        UnionAttributes attributes = new UnionAttributes();
-        for (int i = 0; i < forClass.getDeclaredFields().length; i++) {
-            CorbaUnionElement note = forClass.getDeclaredFields()[i].getAnnotation(CorbaUnionElement.class);
-            if (note != null) {
-                if (note.type().equals(CorbaUnionElementType.discriminator)) {
-                    attributes.setDiscriminatorName(forClass.getDeclaredFields()[i].getName());
-                } else if (note.type().equals(CorbaUnionElementType.defaultOption)) {
-                    attributes.setDefaultOptionName(forClass.getDeclaredFields()[i].getName());
-                } else if (note.type().equals(CorbaUnionElementType.option)) {
-                    if (attributes.getOptionsMapping().containsKey(note.optionNumber())) {
-                        throw new RequestConfigurationException("In " + forClass
-                            + ": field \""
-                            + forClass.getDeclaredFields()[i].getName()
-                            + "\" uses already used option id: "
-                            + note.optionNumber());
-                    } else {
-                        attributes.getOptionsMapping().put(note.optionNumber(),
-                                                           forClass.getDeclaredFields()[i].getName());
-                    }
-                }
-            }
-        }
-        return attributes;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java
deleted file mode 100644
index 009eac3377..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.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.binding.corba.provider.types;
-
-/**
- * @version $Rev$ $Date$
- * Represents single tree node.
- * 
- */
-public class TypeTreeNode {
-
-    private NodeType nodeType;
-    private TypeTreeNode[] children;
-    private Class<?> javaClass;
-    private String name;
-    private Object attributes;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public NodeType getNodeType() {
-        return nodeType;
-    }
-
-    public void setNodeType(NodeType nodeType) {
-        this.nodeType = nodeType;
-    }
-
-    public TypeTreeNode[] getChildren() {
-        return children;
-    }
-
-    public void setChildren(TypeTreeNode[] children) {
-        this.children = children;
-    }
-
-    public Class<?> getJavaClass() {
-        return javaClass;
-    }
-
-    public void setJavaClass(Class<?> javaClass) {
-        this.javaClass = javaClass;
-    }
-
-    public Object getAttributes() {
-        return attributes;
-    }
-
-    public void setAttributes(Object attributes) {
-        this.attributes = attributes;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java
deleted file mode 100644
index 34bee2a0e4..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.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 org.apache.tuscany.sca.binding.corba.provider.types;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- * Stores attributes for previously scanned CORBA union type 
- */
-public class UnionAttributes {
-
-    public String discriminatorName;
-    public String defaultOptionName;
-    public Map<Integer, String> optionsMapping = new HashMap<Integer, String>();
-
-    public String getDiscriminatorName() {
-        return discriminatorName;
-    }
-
-    public void setDiscriminatorName(String discriminatorName) {
-        this.discriminatorName = discriminatorName;
-    }
-
-    public String getDefaultOptionName() {
-        return defaultOptionName;
-    }
-
-    public void setDefaultOptionName(String defaultOptionName) {
-        this.defaultOptionName = defaultOptionName;
-    }
-
-    public Map<Integer, String> getOptionsMapping() {
-        return optionsMapping;
-    }
-
-    public void setOptionsMapping(Map<Integer, String> optionsMapping) {
-        this.optionsMapping = optionsMapping;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java
deleted file mode 100644
index 35a1e539d9..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java
+++ /dev/null
@@ -1,53 +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.binding.corba.provider.types.util;
-
-import java.lang.reflect.Array;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ArrayTypeHelper implements TypeHelper {
-
-    public Object read(TypeTreeNode node, InputStream is) {
-        Object array = null;
-        try {
-            int size = (Integer)node.getAttributes();
-            array = Array.newInstance(node.getChildren()[0].getJavaClass(), size);
-            for (int i = 0; i < size; i++) {
-                Array.set(array, i, TypeHelpersProxy.read(node.getChildren()[0], is));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return array;
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        for (int i = 0; i < (Integer)node.getAttributes(); i++) {
-            TypeHelpersProxy.write(node.getChildren()[0], os, Array.get(data, i));
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java
deleted file mode 100644
index bbc2012a38..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java
+++ /dev/null
@@ -1,39 +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.binding.corba.provider.types.util;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BooleanTypeHelper implements TypeHelper {
-
-    public Object read(TypeTreeNode node, InputStream is) {
-        return is.read_boolean();
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        os.write_boolean((Boolean)data);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java
deleted file mode 100644
index 761cc5d62c..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java
+++ /dev/null
@@ -1,39 +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.binding.corba.provider.types.util;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ByteTypeHelper implements TypeHelper {
-
-    public Object read(TypeTreeNode node, InputStream is) {
-        return is.read_octet();
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        os.write_octet((Byte)data);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java
deleted file mode 100644
index b2d2afd011..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java
+++ /dev/null
@@ -1,39 +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.binding.corba.provider.types.util;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CharTypeHelper implements TypeHelper {
-
-    public Object read(TypeTreeNode node, InputStream is) {
-        return is.read_char();
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        os.write_char((Character)data);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java
deleted file mode 100644
index f667123bb7..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java
+++ /dev/null
@@ -1,39 +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.binding.corba.provider.types.util;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DoubleTypeHelper implements TypeHelper {
-
-    public Object read(TypeTreeNode node, InputStream is) {
-        return is.read_double();
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        os.write_double((Double)data);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java
deleted file mode 100644
index 5661232e1e..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.provider.types.util;
-
-import java.lang.reflect.Method;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EnumTypeHelper implements TypeHelper {
-
-    private static final Logger logger = Logger.getLogger(EnumTypeHelper.class.getName());
-    
-    public Object read(TypeTreeNode node, InputStream is) {
-        int value = is.read_long();
-        Object result = null;
-        try {
-            Method method = node.getJavaClass().getMethod("from_int", new Class[] {int.class});
-            result = method.invoke(null, new Object[] {value});
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "Exception during reading CORBA enum data", e);
-            e.printStackTrace();
-        }
-        return result;
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        int value = 0;
-        try {
-            Method method = data.getClass().getMethod("value", new Class[] {});
-            value = (Integer)method.invoke(data, new Object[] {});
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "Exception during writing CORBA enum data", e);
-        }
-        os.write_long(value);
-    }
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java
deleted file mode 100644
index 7c39725012..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java
+++ /dev/null
@@ -1,39 +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.binding.corba.provider.types.util;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class FloatTypeHelper implements TypeHelper {
-
-    public Object read(TypeTreeNode node, InputStream is) {
-        return is.read_float();
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        os.write_float((Float)data);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java
deleted file mode 100644
index e903b59e50..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java
+++ /dev/null
@@ -1,39 +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.binding.corba.provider.types.util;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class IntTypeHelper implements TypeHelper {
-
-    public Object read(TypeTreeNode node, InputStream is) {
-        return is.read_long();
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        os.write_long((Integer)data);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java
deleted file mode 100644
index 79d3c0cbc8..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java
+++ /dev/null
@@ -1,39 +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.binding.corba.provider.types.util;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class LongTypeHelper implements TypeHelper {
-
-    public Object read(TypeTreeNode node, InputStream is) {
-        return is.read_longlong();
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        os.write_longlong((Long)data);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java
deleted file mode 100644
index c89a25401d..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java
+++ /dev/null
@@ -1,42 +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.binding.corba.provider.types.util;
-
-import org.apache.tuscany.sca.binding.corba.provider.reference.InterfaceInstanceCreator;
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.Object;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ReferenceTypeHelper implements TypeHelper {
-
-    public java.lang.Object read(TypeTreeNode node, InputStream is) {
-        Object reference = is.read_Object();
-        return (java.lang.Object)InterfaceInstanceCreator.createInstance(reference, node.getJavaClass());
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, java.lang.Object data) {
-        os.write_Object((Object)data);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java
deleted file mode 100644
index 911c787b11..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java
+++ /dev/null
@@ -1,70 +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.binding.corba.provider.types.util;
-
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SequenceTypeHelper implements TypeHelper {
-
-    public Object read(TypeTreeNode node, InputStream is) {
-        Object sequence = null;
-        try {
-            int size = is.read_long();
-            sequence = Array.newInstance(node.getChildren()[0].getJavaClass(), size);
-            for (int i = 0; i < size; i++) {
-                Array.set(sequence, i, TypeHelpersProxy.read(node.getChildren()[0], is));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return sequence;
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        int sum = 0;
-        // determine length of array
-        List<Object> array = new ArrayList<Object>();
-        while (true) {
-            try {
-                array.add(Array.get(data, sum));
-                sum++;
-            } catch (ArrayIndexOutOfBoundsException e) {
-                break;
-            }
-        }
-        os.write_long(sum);
-        Iterator<Object> iter = array.iterator();
-        while (iter.hasNext()) {
-            Object elem = iter.next();
-            TypeHelpersProxy.write(node.getChildren()[0], os, elem);
-        }
-
-    }
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java
deleted file mode 100644
index f4cdabc8e2..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java
+++ /dev/null
@@ -1,39 +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.binding.corba.provider.types.util;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ShortTypeHelper implements TypeHelper {
-
-    public Object read(TypeTreeNode node, InputStream is) {
-        return is.read_short();
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        os.write_short((Short)data);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java
deleted file mode 100644
index 5a4fcba221..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java
+++ /dev/null
@@ -1,39 +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.binding.corba.provider.types.util;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class StringTypeHelper implements TypeHelper {
-
-    public Object read(TypeTreeNode node, InputStream is) {
-        return is.read_string();
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        os.write_string((String)data);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java
deleted file mode 100644
index 1fc729b926..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java
+++ /dev/null
@@ -1,69 +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.binding.corba.provider.types.util;
-
-import java.lang.reflect.Field;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class StructTypeHelper implements TypeHelper {
-
-    private static final Logger logger = Logger.getLogger(StructTypeHelper.class.getName());
-    
-    public Object read(TypeTreeNode node, InputStream is) {
-        TypeTreeNode[] children = node.getChildren();
-        Object result = null;
-        if (children != null) {
-            try {
-                result = node.getJavaClass().newInstance();
-                for (int i = 0; i < children.length; i++) {
-                    Object childResult = TypeHelpersProxy.read(children[i], is);
-                    Field childField = result.getClass().getField(children[i].getName());
-                    childField.set(result, childResult);
-                }
-            } catch (Exception e) {
-                logger.log(Level.WARNING, "Exception during reading CORBA struct data", e);
-            }
-        }
-        return result;
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        TypeTreeNode[] children = node.getChildren();
-        if (children != null) {
-            try {
-                for (int i = 0; i < children.length; i++) {
-                    Field childField = node.getJavaClass().getField(children[i].getName());
-                    TypeHelpersProxy.write(children[i], os, childField.get(data));
-                }
-            } catch (Exception e) {
-                logger.log(Level.WARNING, "Exception during writing CORBA struct data", e);
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java
deleted file mode 100644
index 0f1f973f49..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java
+++ /dev/null
@@ -1,47 +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.binding.corba.provider.types.util;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TypeHelper {
-
-    /**
-     * Reads CORBA object
-     * @param node
-     * @param is
-     * @return
-     */
-    Object read(TypeTreeNode node, InputStream is);
-
-    /**
-     * Writes CORBA object
-     * @param node
-     * @param os
-     * @param data
-     */
-    void write(TypeTreeNode node, OutputStream os, Object data);
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java
deleted file mode 100644
index ded82bf12e..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.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.binding.corba.provider.types.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.NodeType;
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- * Proxies getType(), write(), read() methods to appropriate TypeHelper implementation.
- */
-public class TypeHelpersProxy {
-
-    /**
-     * Maps primitive types to its TypeHelper implementations
-     */
-    private static Map<Class<?>, TypeHelper> primitiveTypes = null;
-
-    /**
-     * Maps other types to its TypeHelper implementations
-     */
-    private static Map<NodeType, TypeHelper> complexTypes = null;
-
-    static {
-        // initiate type helpers
-        primitiveTypes = new HashMap<Class<?>, TypeHelper>();
-        complexTypes = new HashMap<NodeType, TypeHelper>();
-
-        primitiveTypes.put(boolean.class, new BooleanTypeHelper());
-        primitiveTypes.put(char.class, new CharTypeHelper());
-        primitiveTypes.put(byte.class, new ByteTypeHelper());
-        primitiveTypes.put(short.class, new ShortTypeHelper());
-        primitiveTypes.put(int.class, new IntTypeHelper());
-        primitiveTypes.put(long.class, new LongTypeHelper());
-        primitiveTypes.put(float.class, new FloatTypeHelper());
-        primitiveTypes.put(double.class, new DoubleTypeHelper());
-        primitiveTypes.put(String.class, new StringTypeHelper());
-        primitiveTypes.put(Boolean.class, primitiveTypes.get(boolean.class));
-        primitiveTypes.put(Character.class, primitiveTypes.get(char.class));
-        primitiveTypes.put(Byte.class, primitiveTypes.get(byte.class));
-        primitiveTypes.put(Short.class, primitiveTypes.get(short.class));
-        primitiveTypes.put(Integer.class, primitiveTypes.get(int.class));
-        primitiveTypes.put(Long.class, primitiveTypes.get(long.class));
-        primitiveTypes.put(Float.class, primitiveTypes.get(float.class));
-        primitiveTypes.put(Double.class, primitiveTypes.get(double.class));
-        primitiveTypes.put(String.class, primitiveTypes.get(String.class));
-        complexTypes.put(NodeType.array, new ArrayTypeHelper());
-        complexTypes.put(NodeType.struct, new StructTypeHelper());
-        complexTypes.put(NodeType.reference, new ReferenceTypeHelper());
-        complexTypes.put(NodeType.sequence, new SequenceTypeHelper());
-        complexTypes.put(NodeType.idl_enum, new EnumTypeHelper());
-        complexTypes.put(NodeType.exception, new StructTypeHelper());
-        complexTypes.put(NodeType.union, new UnionTypeHelper());
-    }
-
-    /**
-     * Gets type helper basing on given type
-     * 
-     * @param node
-     * @return
-     */
-    private static TypeHelper getTypeHelper(TypeTreeNode node) {
-        TypeHelper typeHelper = null;
-        NodeType type = node.getNodeType();
-        if (type.equals(NodeType.primitive)) {
-            typeHelper = primitiveTypes.get(node.getJavaClass());
-        } else {
-            typeHelper = complexTypes.get(type);
-        }
-        return typeHelper;
-    }
-
-    /**
-     * Proxies read method invocation to appropriate TypeHelper implementation.
-     * 
-     * @param node
-     * @param is
-     * @return
-     */
-    public static final Object read(TypeTreeNode node, InputStream is) {
-        TypeHelper helper = getTypeHelper(node);
-        return helper.read(node, is);
-    }
-
-    /**
-     * Proxies write method invocation to appropriate TypeHelper implementation.
-     * 
-     * @param node
-     * @param os
-     * @param data
-     */
-    public static final void write(TypeTreeNode node, OutputStream os, Object data) {
-        TypeHelper helper = getTypeHelper(node);
-        helper.write(node, os, data);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java
deleted file mode 100644
index df2e833fcd..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java
+++ /dev/null
@@ -1,92 +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.binding.corba.provider.types.util;
-
-import java.lang.reflect.Field;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeNode;
-import org.apache.tuscany.sca.binding.corba.provider.types.UnionAttributes;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class UnionTypeHelper implements TypeHelper {
-
-    private static final Logger logger = Logger.getLogger(UnionTypeHelper.class.getName());
-    
-    public Object read(TypeTreeNode node, InputStream is) {
-        Object result = null;
-        try {
-            int discriminator = is.read_long();
-            UnionAttributes attrs = (UnionAttributes)node.getAttributes();
-            String childName = attrs.getOptionsMapping().get(discriminator);
-            if (childName == null) {
-                // get default if option numbers field not found
-                childName = attrs.getDefaultOptionName();
-            }
-            result = node.getJavaClass().newInstance();
-            Field discField = result.getClass().getDeclaredField(attrs.getDiscriminatorName());
-            discField.setAccessible(true);
-            discField.set(result, discriminator);
-            for (int i = 0; i < node.getChildren().length; i++) {
-                if (node.getChildren()[i].getName().equals(childName)) {
-                    Object unionValue = TypeHelpersProxy.read(node.getChildren()[i], is);
-                    Field childField = result.getClass().getDeclaredField(childName);
-                    childField.setAccessible(true);
-                    childField.set(result, unionValue);
-                    break;
-                }
-            }
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "Exception during reading CORBA union data", e);
-        }
-        return result;
-    }
-
-    public void write(TypeTreeNode node, OutputStream os, Object data) {
-        try {
-            UnionAttributes attrs = (UnionAttributes)node.getAttributes();
-            Field discriminatorField = data.getClass().getDeclaredField(attrs.getDiscriminatorName());
-            discriminatorField.setAccessible(true);
-            int discriminator = discriminatorField.getInt(data);
-            os.write_long(discriminator);
-            String childName = attrs.getOptionsMapping().get(discriminator);
-            if (childName == null) {
-                // get default if option numbers field not found
-                childName = attrs.getDefaultOptionName();
-            }
-            for (int i = 0; i < node.getChildren().length; i++) {
-                if (node.getChildren()[i].getName().equals(childName)) {
-                    Field childField = data.getClass().getDeclaredField(childName);
-                    childField.setAccessible(true);
-                    TypeHelpersProxy.write(node.getChildren()[i], os, childField.get(data));
-                    break;
-                }
-            }
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "Exception during writing CORBA union data", e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java
deleted file mode 100644
index 7ccd70f69e..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java
+++ /dev/null
@@ -1,40 +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.binding.corba.provider.types.util;
-
-/**
- * @version $Rev$ $Date$
- * Class for type utilities
- */
-public class Utils {
-
-    /**
-     * Creates CORBA id for Java class
-     * @param forClass
-     * @return
-     */
-    public static String getTypeId(Class<?> forClass) {
-        String result = forClass.getName().replace('.', '/');
-        result = result.replaceAll("Package", "");
-        result = "IDL:" + result + ":1.0";
-        return result;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java
deleted file mode 100644
index f9facac0cc..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java
+++ /dev/null
@@ -1,97 +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.binding.corba.provider.util;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- * Utility for finding method in given class.
- */
-public class MethodFinder {
-
-    private static Map<Class<?>, Class<?>> boxingMapping;
-
-    static {
-        boxingMapping = new HashMap<Class<?>, Class<?>>();
-        boxingMapping.put(boolean.class, Boolean.class);
-        boxingMapping.put(byte.class, Byte.class);
-        boxingMapping.put(short.class, Short.class);
-        boxingMapping.put(char.class, Character.class);
-        boxingMapping.put(int.class, Integer.class);
-        boxingMapping.put(long.class, Long.class);
-        boxingMapping.put(float.class, Float.class);
-        boxingMapping.put(double.class, Double.class);
-    }
-
-    /**
-     * Converts primitive class to its object equivalent.
-     * 
-     * @param parameter class to convert
-     * @return object equivalent for primitive type. If parameter wasn't
-     *         primitive then returns parameter.
-     */
-    private static Class<?> normalizePrimitive(Class<?> parameter) {
-        Class<?> result = boxingMapping.get(parameter);
-        if (result != null) {
-            return result;
-        } else {
-            // not a primitive - no need to normalize
-            return parameter;
-        }
-    }
-
-    /**
-     * Finds appropriate method. This method ignores difference between
-     * primitive types and theirs object equivalents. Ie. if we want to find
-     * method "get" in java.util.List with only one parameter, which type is
-     * Integer then we'll obtain method get(int).
-     * 
-     * @param forClass class which possibly contains desired method 
-     * @param methodName desired methods name
-     * @param parameterTypes desired methods parameter types
-     * @return desired method, if no method was found then null will be returned
-     */
-    public static Method findMethod(Class<?> forClass, String methodName, Class<?>[] parameterTypes) {
-        Method[] methods = forClass.getMethods();
-        for (int i = 0; i < methods.length; i++) {
-            if (methods[i].getName().equals(methodName)) {
-                Class<?>[] methodPTypes = methods[i].getParameterTypes();
-                if (methodPTypes.length == parameterTypes.length) {
-                    boolean parameterMatch = true;
-                    for (int j = 0; j < methodPTypes.length; j++) {
-                        Class<?> nMethodPType = normalizePrimitive(methodPTypes[j]);
-                        Class<?> nParameterType = normalizePrimitive(parameterTypes[j]);
-                        if (!nMethodPType.equals(nParameterType)) {
-                            parameterMatch = false;
-                            break;
-                        }
-                    }
-                    if (parameterMatch) {
-                        return methods[i];
-                    }
-                }
-            }
-        }
-        return null;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java b/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java
deleted file mode 100644
index 414e50abf4..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java
+++ /dev/null
@@ -1,578 +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.binding.corba.provider.util;
-
-import java.lang.reflect.Method;
-import java.rmi.RemoteException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.omg.CORBA.portable.IDLEntity;
-
-/**
- * @version $Rev$ $Date$
- */
-public final class OperationMapper {
-
-    private static Set<Class<?>> getAllInterfaces(Class<?> intfClass) {
-        Set<Class<?>> allInterfaces = new LinkedHashSet<Class<?>>();
-
-        LinkedList<Class<?>> stack = new LinkedList<Class<?>>();
-        stack.addFirst(intfClass);
-
-        while (!stack.isEmpty()) {
-            Class<?> intf = stack.removeFirst();
-            allInterfaces.add(intf);
-            for (Class<?> i : intf.getInterfaces()) {
-                stack.add(0, i);
-            }
-        }
-
-        return allInterfaces;
-    }    
-    
-    /**
-     * Maps Java methods to operation names
-     * @param intfClass
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public static Map<Method, String> mapMethodToOperationName(Class<?> intfClass) {
-        return iiopMap(intfClass, false);
-    }
-
-    /**
-     * Maps operation names to Java methods
-     * @param intfClass
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public static Map<String, Method> mapOperationNameToMethod(Class<?> intfClass) {
-        return iiopMap(intfClass, true);
-    }
-
-    @SuppressWarnings("unchecked")
-    private static Map iiopMap(Class<?> intfClass, boolean operationToMethod) {
-        Method[] methods = getAllMethods(intfClass);
-
-        // find every valid getter
-        Map<Method, String> getterByMethod = new HashMap<Method, String>(methods.length);
-        Map<String, Method> getterByName = new HashMap<String, Method>(methods.length);
-        for (int i = 0; i < methods.length; i++) {
-            Method method = methods[i];
-            String methodName = method.getName();
-
-            // no arguments allowed
-            if (method.getParameterTypes().length != 0) {
-                continue;
-            }
-
-            // must start with get or is
-            String verb;
-            if (methodName.startsWith("get") && methodName.length() > 3 && method.getReturnType() != void.class) {
-                verb = "get";
-            } else if (methodName.startsWith("is") && methodName.length() > 2 && method.getReturnType() == boolean.class) {
-                verb = "is";
-            } else {
-                continue;
-            }
-
-            // must only throw Remote or Runtime Exceptions
-            boolean exceptionsValid = true;
-            Class[] exceptionTypes = method.getExceptionTypes();
-            for (int j = 0; j < exceptionTypes.length; j++) {
-                Class<?> exceptionType = exceptionTypes[j];
-                if (!RemoteException.class.isAssignableFrom(exceptionType) &&
-                        !RuntimeException.class.isAssignableFrom(exceptionType) &&
-                        !Error.class.isAssignableFrom(exceptionType)) {
-                    exceptionsValid = false;
-                    break;
-                }
-            }
-            if (!exceptionsValid) {
-                continue;
-            }
-
-            String propertyName;
-            if (methodName.length() > verb.length() + 1 && Character.isUpperCase(methodName.charAt(verb.length() + 1))) {
-                propertyName = methodName.substring(verb.length());
-            } else {
-                propertyName = Character.toLowerCase(methodName.charAt(verb.length())) + methodName.substring(verb.length() + 1);
-            }
-            getterByMethod.put(method, propertyName);
-            getterByName.put(propertyName, method);
-        }
-
-        Map<Method, String> setterByMethod = new HashMap<Method, String>(methods.length);
-        for (int i = 0; i < methods.length; i++) {
-            Method method = methods[i];
-            String methodName = method.getName();
-
-            // must have exactally one arg
-            if (method.getParameterTypes().length != 1) {
-                continue;
-            }
-
-            // must return non void
-            if (method.getReturnType() != void.class) {
-                continue;
-            }
-
-            // must start with set
-            if (!methodName.startsWith("set") || methodName.length() <= 3) {
-                continue;
-            }
-
-            // must only throw Remote or Runtime Exceptions
-            boolean exceptionsValid = true;
-            Class<?>[] exceptionTypes = method.getExceptionTypes();
-            for (int j = 0; j < exceptionTypes.length; j++) {
-                Class<?> exceptionType = exceptionTypes[j];
-                if (!RemoteException.class.isAssignableFrom(exceptionType) &&
-                        !RuntimeException.class.isAssignableFrom(exceptionType) &&
-                        !Error.class.isAssignableFrom(exceptionType)) {
-                    exceptionsValid = false;
-                    break;
-                }
-            }
-            if (!exceptionsValid) {
-                continue;
-            }
-
-            String propertyName;
-            if (methodName.length() > 4 && Character.isUpperCase(methodName.charAt(4))) {
-                propertyName = methodName.substring(3);
-            } else {
-                propertyName = Character.toLowerCase(methodName.charAt(3)) + methodName.substring(4);
-            }
-
-            // must have a matching getter
-            Method getter = (Method) getterByName.get(propertyName);
-            if (getter == null) {
-                continue;
-            }
-
-            // setter property must match getter return value
-            if (!method.getParameterTypes()[0].equals(getter.getReturnType())) {
-                continue;
-            }
-            setterByMethod.put(method, propertyName);
-        }
-
-        // index the methods by name... used to determine which methods are overloaded
-        HashMap<String, List<Method>> overloadedMethods = new HashMap<String, List<Method>>(methods.length);
-        for (int i = 0; i < methods.length; i++) {
-            Method method = methods[i];
-            if (getterByMethod.containsKey(method) || setterByMethod.containsKey(method)) {
-                continue;
-            }
-            String methodName = method.getName();
-            List<Method> methodList = overloadedMethods.get(methodName);
-            if (methodList == null) {
-                methodList = new LinkedList<Method>();
-                overloadedMethods.put(methodName, methodList);
-            }
-            methodList.add(method);
-        }
-
-        // index the methods by lower case name... used to determine which methods differ only by case
-        Map<String, Set<String>> caseCollisionMethods = new HashMap<String, Set<String>>(methods.length);
-        for (int i = 0; i < methods.length; i++) {
-            Method method = methods[i];
-            if (getterByMethod.containsKey(method) || setterByMethod.containsKey(method)) {
-                continue;
-            }
-            String lowerCaseMethodName = method.getName().toLowerCase();
-            Set<String> methodSet = caseCollisionMethods.get(lowerCaseMethodName);
-            if (methodSet == null) {
-                methodSet = new HashSet<String>();
-                caseCollisionMethods.put(lowerCaseMethodName, methodSet);
-            }
-            methodSet.add(method.getName());
-        }
-
-        String className = getClassName(intfClass);
-        Map iiopMap = new HashMap(methods.length);
-        for (int i = 0; i < methods.length; i++) {
-            Method method = methods[i];
-
-            String iiopName = (String) getterByMethod.get(method);
-            if (iiopName != null) {
-                // if we have a leading underscore prepend with J
-                if (iiopName.charAt(0) == '_') {
-                    iiopName = "J_get_" + iiopName.substring(1);
-                } else {
-                    iiopName = "_get_" + iiopName;
-                }
-            } else {
-                iiopName = (String) setterByMethod.get(method);
-                if (iiopName != null) {
-                    // if we have a leading underscore prepend with J
-                    if (iiopName.charAt(0) == '_') {
-                        iiopName = "J_set_" + iiopName.substring(1);
-                    } else {
-                        iiopName = "_set_" + iiopName;
-                    }
-                } else {
-                    iiopName = method.getName();
-
-                    // if we have a leading underscore prepend with J
-                    if (iiopName.charAt(0) == '_') {
-                        iiopName = "J" + iiopName;
-                    }
-                }
-            }
-
-            // if this name only differs by case add the case index to the end
-            Set<String> caseCollisions = caseCollisionMethods.get(method.getName().toLowerCase());
-            if (caseCollisions != null && caseCollisions.size() > 1) {
-                iiopName += upperCaseIndexString(iiopName);
-            }
-
-            // if this is an overloaded method append the parameter string
-            List<Method> overloads = overloadedMethods.get(method.getName());
-            if (overloads != null && overloads.size() > 1) {
-                iiopName += buildOverloadParameterString(method.getParameterTypes());
-            }
-
-            // if we have a leading underscore prepend with J
-            iiopName = replace(iiopName, '$', "U0024");
-
-            // if we have matched a keyword prepend with an underscore
-            if (keywords.contains(iiopName.toLowerCase())) {
-                iiopName = "_" + iiopName;
-            }
-
-            // if the name is the same as the class name, append an underscore
-            if (iiopName.equalsIgnoreCase(className)) {
-                iiopName += "_";
-            }
-
-            if (operationToMethod) {
-                iiopMap.put(iiopName, method);
-            } else {
-                iiopMap.put(method, iiopName);
-            }
-        }
-
-        return iiopMap;
-    }
-    
-    private static Method[] getAllMethods(Class<?> intfClass) {
-        List<Method> methods = new LinkedList<Method>();
-        for (Iterator<Class<?>> iterator = getAllInterfaces(intfClass).iterator(); iterator.hasNext();) {
-            Class<?> intf = iterator.next();
-            methods.addAll(Arrays.asList(intf.getDeclaredMethods()));
-        }
-
-        return (Method[]) methods.toArray(new Method[methods.size()]);
-    }
-
-    /**
-     * Return the a string containing an underscore '_' index of each uppercase
-     * character in the IIOP name. This is used for distinction of names that
-     * only differ by case, since CORBA does not support case sensitive names.
-     */
-    private static String upperCaseIndexString(String iiopName) {
-        StringBuffer stringBuffer = new StringBuffer();
-        for (int i = 0; i < iiopName.length(); i++) {
-            char c = iiopName.charAt(i);
-            if (Character.isUpperCase(c)) {
-                stringBuffer.append('_').append(i);
-            }
-        }
-        return stringBuffer.toString();
-    }
-
-    /**
-     * Replaces any occurances of the specified "oldChar" with the new string.
-     * This is used to replace occurances if '$' in CORBA names since '$' is a
-     * special character
-     */
-    private static String replace(String source, char oldChar, String newString) {
-        StringBuffer stringBuffer = new StringBuffer(source.length());
-        for (int i = 0; i < source.length(); i++) {
-            char c = source.charAt(i);
-            if (c == oldChar) {
-                stringBuffer.append(newString);
-            } else {
-                stringBuffer.append(c);
-            }
-        }
-        return stringBuffer.toString();
-    }
-
-    /**
-     * Return the a string containing a double underscore '__' list of parameter
-     * types encoded using the Java to IDL rules. This is used for distinction
-     * of methods that only differ by parameter lists.
-     */
-    private static String buildOverloadParameterString(Class<?>[] parameterTypes) {
-        String name = "";
-        if (parameterTypes.length == 0) {
-            name += "__";
-        } else {
-            for (int i = 0; i < parameterTypes.length; i++) {
-                Class<?> parameterType = parameterTypes[i];
-                name += buildOverloadParameterString(parameterType);
-            }
-        }
-        return name.replace('.', '_');
-    }
-
-    /**
-     * Returns a single parameter type encoded using the Java to IDL rules.
-     */
-    private static String buildOverloadParameterString(Class<?> parameterType) {
-        String name = "_";
-
-        int arrayDimensions = 0;
-        while (parameterType.isArray()) {
-            arrayDimensions++;
-            parameterType = parameterType.getComponentType();
-        }
-
-        // arrays start with org_omg_boxedRMI_
-        if (arrayDimensions > 0) {
-            name += "_org_omg_boxedRMI";
-        }
-
-        // IDLEntity types must be prefixed with org_omg_boxedIDL_
-        if (IDLEntity.class.isAssignableFrom(parameterType)) {
-            name += "_org_omg_boxedIDL";
-        }
-
-        // add package... some types have special mappings in corba
-        String packageName = (String)specialTypePackages.get(parameterType.getName());
-        if (packageName == null) {
-            packageName = getPackageName(parameterType.getName());
-        }
-        if (packageName.length() > 0) {
-            name += "_" + packageName;
-        }
-
-        // arrays now contain a dimension indicator
-        if (arrayDimensions > 0) {
-            name += "_" + "seq" + arrayDimensions;
-        }
-
-        // add the class name
-        String className = (String)specialTypeNames.get(parameterType.getName());
-        if (className == null) {
-            className = buildClassName(parameterType);
-        }
-        name += "_" + className;
-
-        return name;
-    }
-
-    /**
-     * Returns a string containing an encoded class name.
-     */
-    private static String buildClassName(Class<?> type) {
-        if (type.isArray()) {
-            throw new IllegalArgumentException("type is an array: " + type);
-        }
-
-        // get the classname
-        String typeName = type.getName();
-        int endIndex = typeName.lastIndexOf('.');
-        if (endIndex < 0) {
-            return typeName;
-        }
-        StringBuffer className = new StringBuffer(typeName.substring(endIndex + 1));
-
-        // for innerclasses replace the $ separator with two underscores
-        // we can't just blindly replace all $ characters since class names can
-        // contain the $ character
-        if (type.getDeclaringClass() != null) {
-            String declaringClassName = getClassName(type.getDeclaringClass());
-            assert className.toString().startsWith(declaringClassName + "$");
-            className.replace(declaringClassName.length(), declaringClassName.length() + 1, "__");
-        }
-
-        // if we have a leading underscore prepend with J
-        if (className.charAt(0) == '_') {
-            className.insert(0, "J");
-        }
-        return className.toString();
-    }
-    
-    private static String getClassName(Class<?> type) {
-        if (type.isArray()) {
-            throw new IllegalArgumentException("type is an array: " + type);
-        }
-
-        // get the classname
-        String typeName = type.getName();
-        int endIndex = typeName.lastIndexOf('.');
-        if (endIndex < 0) {
-            return typeName;
-        }
-        return typeName.substring(endIndex + 1);
-    }
-
-    private static String getPackageName(String interfaceName) {
-        int endIndex = interfaceName.lastIndexOf('.');
-        if (endIndex < 0) {
-            return "";
-        }
-        return interfaceName.substring(0, endIndex);
-    }
-
-    private static final Map<String, String> specialTypeNames;
-    private static final Map<String, String> specialTypePackages;
-    private static final Set<String> keywords;
-
-    static {
-        specialTypeNames = new HashMap<String, String>();
-        specialTypeNames.put("boolean", "boolean");
-        specialTypeNames.put("char", "wchar");
-        specialTypeNames.put("byte", "octet");
-        specialTypeNames.put("short", "short");
-        specialTypeNames.put("int", "long");
-        specialTypeNames.put("long", "long_long");
-        specialTypeNames.put("float", "float");
-        specialTypeNames.put("double", "double");
-        specialTypeNames.put("java.lang.Class", "ClassDesc");
-        specialTypeNames.put("java.lang.String", "WStringValue");
-        specialTypeNames.put("org.omg.CORBA.Object", "Object");
-
-        specialTypePackages = new HashMap<String, String>();
-        specialTypePackages.put("boolean", "");
-        specialTypePackages.put("char", "");
-        specialTypePackages.put("byte", "");
-        specialTypePackages.put("short", "");
-        specialTypePackages.put("int", "");
-        specialTypePackages.put("long", "");
-        specialTypePackages.put("float", "");
-        specialTypePackages.put("double", "");
-        specialTypePackages.put("java.lang.Class", "javax.rmi.CORBA");
-        specialTypePackages.put("java.lang.String", "CORBA");
-        specialTypePackages.put("org.omg.CORBA.Object", "");
-
-        keywords = new HashSet<String>();
-        keywords.add("abstract");
-        keywords.add("any");
-        keywords.add("attribute");
-        keywords.add("boolean");
-        keywords.add("case");
-        keywords.add("char");
-        keywords.add("const");
-        keywords.add("context");
-        keywords.add("custom");
-        keywords.add("default");
-        keywords.add("double");
-        keywords.add("enum");
-        keywords.add("exception");
-        keywords.add("factory");
-        keywords.add("false");
-        keywords.add("fixed");
-        keywords.add("float");
-        keywords.add("in");
-        keywords.add("inout");
-        keywords.add("interface");
-        keywords.add("long");
-        keywords.add("module");
-        keywords.add("native");
-        keywords.add("object");
-        keywords.add("octet");
-        keywords.add("oneway");
-        keywords.add("out");
-        keywords.add("private");
-        keywords.add("public");
-        keywords.add("raises");
-        keywords.add("readonly");
-        keywords.add("sequence");
-        keywords.add("short");
-        keywords.add("string");
-        keywords.add("struct");
-        keywords.add("supports");
-        keywords.add("switch");
-        keywords.add("true");
-        keywords.add("truncatable");
-        keywords.add("typedef");
-        keywords.add("union");
-        keywords.add("unsigned");
-        keywords.add("valuebase");
-        keywords.add("valuetype");
-        keywords.add("void");
-        keywords.add("wchar");
-        keywords.add("wstring");
-    }
-
-    @SuppressWarnings("unchecked")
-    public static Map<Operation, Method> mapOperationToMethod(List<Operation> operations, Class<?> forClass) {
-        return (Map<Operation, Method>)createMethod2OperationMapping(operations, forClass, false);
-    }
-    
-    @SuppressWarnings("unchecked")
-    public static Map<Method, Operation> mapMethodToOperation(List<Operation> operations, Class<?> forClass) {
-        return (Map<Method, Operation>)createMethod2OperationMapping(operations, forClass, true);
-    }
-    
-    /**
-     * Maps Java methods to Tuscany operations
-     */
-    @SuppressWarnings("unchecked")
-    private static Map createMethod2OperationMapping(List<Operation> operations, Class<?> forClass, boolean method2operation) {
-        // for every operation find all methods with the same name, then
-        // compare operations and methods parameters
-        Map mapping = new HashMap();
-        for (Operation operation : operations) {
-            List<DataType> inputTypes = operation.getInputType().getLogical();
-            Method[] methods = forClass.getMethods();
-            for (int i = 0; i < methods.length; i++) {
-                if (methods[i].getName().equals(operation.getName()) && inputTypes.size() == methods[i]
-                    .getParameterTypes().length) {
-                    Class<?>[] parameterTypes = methods[i].getParameterTypes();
-                    int j = 0;
-                    boolean parameterMatch = true;
-                    for (DataType dataType : inputTypes) {
-                        if (!dataType.getPhysical().equals(parameterTypes[j])) {
-                            parameterMatch = false;
-                            break;
-                        }
-                        j++;
-                    }
-                    if (parameterMatch) {
-                        // match found
-                        if (method2operation) {
-                            mapping.put(methods[i], operation);
-                        } else {
-                            mapping.put(operation, methods[i]);
-                        }
-                        break;
-                    }
-                }
-            }
-        }
-        return mapping;
-    }
-    
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca-contrib/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 9855dec8af..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.corba.provider.CorbaBindingProviderFactory;model=org.apache.tuscany.sca.binding.corba.CorbaBinding

diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
deleted file mode 100644
index 38891340f9..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
+++ /dev/null
@@ -1,564 +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.binding.corba.testing;
-
-import static junit.framework.Assert.fail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.lang.reflect.Array;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.corba.provider.exceptions.CorbaException;
-import org.apache.tuscany.sca.binding.corba.provider.exceptions.RequestConfigurationException;
-import org.apache.tuscany.sca.binding.corba.provider.reference.DynaCorbaRequest;
-import org.apache.tuscany.sca.binding.corba.provider.reference.DynaCorbaResponse;
-import org.apache.tuscany.sca.binding.corba.provider.service.ComponentInvocationProxy;
-import org.apache.tuscany.sca.binding.corba.provider.service.DynaCorbaServant;
-import org.apache.tuscany.sca.binding.corba.provider.service.InvocationProxy;
-import org.apache.tuscany.sca.binding.corba.provider.types.util.Utils;
-import org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests;
-import org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTestsHelper;
-import org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct;
-import org.apache.tuscany.sca.binding.corba.testing.enums.Color;
-import org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager;
-import org.apache.tuscany.sca.binding.corba.testing.enums.EnumManagerHelper;
-import org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc;
-import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcHelper;
-import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero;
-import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported;
-import org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter;
-import org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetterHelper;
-import org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter;
-import org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetterHelper;
-import org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct;
-import org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct;
-import org.apache.tuscany.sca.binding.corba.testing.generated.TestObject;
-import org.apache.tuscany.sca.binding.corba.testing.generated.TestObjectHelper;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.NonCorbaException;
-import org.apache.tuscany.sca.binding.corba.testing.servants.ArraysSetterServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.ArraysUnionsTuscanyServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.CalcServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.EnumManagerServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.InvalidTestObjectServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.InvalidTypesServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.NonCorbaServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.PrimitivesSetterServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.TestObjectServant;
-import org.apache.tuscany.sca.binding.corba.testing.service.mocks.TestRuntimeComponentService;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.Object;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextHelper;
-
-/**
- * @version $Rev$ $Date$
- * Tests API for dynamic CORBA servants
- */
-public class CorbaServantTestCase {
-
-    private static ORB orb;
-    private static TransientNameServer server;
-
-    @BeforeClass
-    public static void start() {
-        try {
-            server =
-                new TransientNameServer(TestConstants.TEST2_HOST, TestConstants.TEST2_PORT,
-                                        TransientNameService.DEFAULT_SERVICE_NAME);
-            Thread t = server.start();
-            if (t == null) {
-                Assert.fail("The naming server cannot be started");
-            }
-            orb = server.getORB();
-        } catch (Throwable e) {
-            e.printStackTrace();
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @AfterClass
-    public static void stop() {
-        server.stop();
-    }
-
-    /**
-     * Binds servant implementation to name
-     */
-    private void bindServant(DynaCorbaServant servant, String name) {
-        try {
-            Object nameService = orb.resolve_initial_references("NameService");
-            NamingContext namingContext = NamingContextHelper.narrow(nameService);
-
-            NameComponent nc = new NameComponent(name, "");
-            NameComponent[] path = new NameComponent[] {nc};
-            namingContext.rebind(path, servant);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Returns object reference which is binded to given name
-     * 
-     * @param name
-     * @return
-     */
-    private org.omg.CORBA.Object bindReference(String name) {
-        try {
-            org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-            NamingContext ncRef = NamingContextHelper.narrow(objRef);
-            NameComponent nc = new NameComponent(name, "");
-            NameComponent path[] = {nc};
-            return ncRef.resolve(path);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * Tests primitives (arguments, return types)
-     */
-    @Test
-    public void test_primitivesSetter() {
-        try {
-            PrimitivesSetter primitivesSetter = new PrimitivesSetterServant();
-            TestRuntimeComponentService service = new TestRuntimeComponentService(primitivesSetter);
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            DynaCorbaServant servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            String[] ids =
-                new String[] {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter:1.0"};
-            servant.setIds(ids);
-            bindServant(servant, "PrimitivesSetter");
-            PrimitivesSetter psClient = PrimitivesSetterHelper.narrow(bindReference("PrimitivesSetter"));
-            assertTrue(psClient.setBoolean(true) == true);
-            assertTrue(psClient.setChar('A') == 'A');
-            assertTrue(psClient.setString("SomeTest").equals("SomeTest"));
-            assertTrue(psClient.setDouble(2d) == 2d);
-            assertTrue(psClient.setFloat(3f) == 3f);
-            assertTrue(psClient.setLong(1) == 1);
-            assertTrue(psClient.setLongLong(0L) == 0L);
-            assertTrue(psClient.setOctet((byte)8) == (byte)8);
-            assertTrue(psClient.setShort((short)6) == (short)6);
-            assertTrue(psClient.setUnsignedLong(9) == 9);
-            assertTrue(psClient.setUnsignedLongLong(11L) == 11L);
-            assertTrue(psClient.setUnsignedShort((short)15) == (short)15);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests if array values are equal
-     */
-    private boolean areArraysEqual(java.lang.Object arr1, java.lang.Object arr2, int arrLen) {
-        try {
-            for (int i = 0; i < arrLen; i++) {
-                if (!Array.get(arr1, i).equals(Array.get(arr2, i))) {
-                    return false;
-                }
-            }
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    /**
-     * Tests arrays (arguments, return types)
-     */
-    @Test
-    public void test_arraysSetter() {
-        try {
-            ArraysSetter arraysSetter = new ArraysSetterServant();
-            TestRuntimeComponentService service = new TestRuntimeComponentService(arraysSetter);
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            DynaCorbaServant servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            String[] ids = new String[] {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter:1.0"};
-            servant.setIds(ids);
-            java.lang.Object result = null;
-            bindServant(servant, "ArraysSetter");
-            ArraysSetter asClient = ArraysSetterHelper.narrow(bindReference("ArraysSetter"));
-
-            boolean[] bArr = new boolean[] {true, false};
-            result = (java.lang.Object)asClient.setBoolean(bArr);
-            assertTrue(areArraysEqual(bArr, result, bArr.length));
-
-            byte[] byArr = new byte[] {1, 2};
-            result = (java.lang.Object)asClient.setOctet(byArr);
-            assertTrue(areArraysEqual(byArr, result, byArr.length));
-
-            short[] shArr = new short[] {1, 2};
-            result = (java.lang.Object)asClient.setShort(shArr);
-            assertTrue(areArraysEqual(shArr, result, shArr.length));
-
-            int[] iArr = new int[] {1, 2};
-            result = (java.lang.Object)asClient.setLong(iArr);
-            assertTrue(areArraysEqual(iArr, result, iArr.length));
-
-            long[] lArr = new long[] {1, 2};
-            result = (java.lang.Object)asClient.setLongLong(lArr);
-            assertTrue(areArraysEqual(lArr, result, lArr.length));
-
-            String[] strArr = new String[] {"Some", "Test"};
-            result = (java.lang.Object)asClient.setString(strArr);
-            assertTrue(areArraysEqual(strArr, result, strArr.length));
-
-            char[] chArr = new char[] {'A', 'B'};
-            result = (java.lang.Object)asClient.setChar(chArr);
-            assertTrue(areArraysEqual(chArr, result, chArr.length));
-
-            float[] flArr = new float[] {1, 2};
-            result = (java.lang.Object)asClient.setFloat(flArr);
-            assertTrue(areArraysEqual(flArr, result, flArr.length));
-
-            double[] dbArr = new double[] {1, 2};
-            result = (java.lang.Object)asClient.setDouble(dbArr);
-            assertTrue(areArraysEqual(dbArr, result, dbArr.length));
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests structures (arguments, return types)
-     */
-    @Test
-    public void test_TestObject_setStruct() {
-        try {
-            TestObject to = new TestObjectServant();
-            TestRuntimeComponentService service = new TestRuntimeComponentService(to);
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            DynaCorbaServant servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            String[] ids = new String[] {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0"};
-            servant.setIds(ids);
-            bindServant(servant, "TestObject");
-            TestObject testObject = TestObjectHelper.narrow(bindReference("TestObject"));
-            SomeStruct ss = new SomeStruct();
-            SimpleStruct inner = new SimpleStruct();
-            inner.field1 = TestConstants.STR_1;
-            inner.field2 = TestConstants.INT_1;
-            ss.innerStruct = inner;
-            ss.str = TestConstants.STR_2;
-            ss.str_list = TestConstants.STR_ARR_1;
-            ss.threeDimSeq = TestConstants.INT_ARRAY_3_DIM;
-            ss.twoDimSeq = TestConstants.INT_ARRAY_2_DIM;
-            SomeStruct result = testObject.setStruct(ss);
-            assertTrue(TestConstants.are2DimArraysEqual(result.twoDimSeq, TestConstants.INT_ARRAY_2_DIM));
-            assertTrue(TestConstants.are3DimArraysEqual(result.threeDimSeq, TestConstants.INT_ARRAY_3_DIM));
-            assertTrue(result.str.equals(ss.str));
-            assertTrue(result.innerStruct.field1.equals(ss.innerStruct.field1));
-            assertTrue(result.innerStruct.field2 == ss.innerStruct.field2);
-            assertTrue(areArraysEqual(result.str_list, ss.str_list, ss.str_list.length));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests handling BAD_OPERATION system exception
-     */
-    @Test
-    public void test_systemException_BAD_OPERATION() {
-        try {
-            TestObjectServant tos = new TestObjectServant();
-            TestRuntimeComponentService service = new TestRuntimeComponentService(tos);
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            DynaCorbaServant servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            String[] ids = new String[] {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0"};
-            servant.setIds(ids);
-            bindServant(servant, "TestObject");
-            DynaCorbaRequest request =
-                new DynaCorbaRequest(bindReference("TestObject"), "methodThatSurelyDoesNotExist");
-            request.invoke();
-            fail();
-        } catch (Exception e) {
-            if (e instanceof CorbaException) {
-                assertTrue(true);
-            } else {
-                e.printStackTrace();
-            }
-        }
-
-        try {
-            InvalidTestObjectServant tos = new InvalidTestObjectServant();
-            TestRuntimeComponentService service = new TestRuntimeComponentService(tos);
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            DynaCorbaServant servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            String[] ids = new String[] {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0"};
-            servant.setIds(ids);
-            bindServant(servant, "InvalidTestObject");
-            TestObject to = TestObjectHelper.narrow(bindReference("InvalidTestObject"));
-            SomeStruct str = new SomeStruct();
-            str.innerStruct = new SimpleStruct();
-            str.innerStruct.field1 = "Whatever";
-            str.str = "Whatever";
-            str.str_list = new String[] {};
-            str.threeDimSeq = new int[][][] {};
-            str.twoDimSeq = new int[][] {};
-            to.setStruct(str);
-        } catch (Exception e) {
-            if (e instanceof BAD_OPERATION) {
-                assertTrue(true);
-            } else {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    /**
-     * Tests handling user exceptions
-     */
-    @Test
-    public void test_userExceptions() {
-        try {
-            CalcServant calc = new CalcServant();
-            TestRuntimeComponentService service = new TestRuntimeComponentService(calc);
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            DynaCorbaServant servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            String[] ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc:1.0"};
-            servant.setIds(ids);
-            bindServant(servant, "Calc");
-            Calc calcClient = CalcHelper.narrow(bindReference("Calc"));
-            calcClient.div(1, 0);
-            fail();
-        } catch (Exception e) {
-            if (e instanceof DivByZero) {
-                assertTrue(true);
-            } else {
-                e.printStackTrace();
-                fail();
-            }
-        }
-
-        try {
-            CalcServant calc = new CalcServant();
-            TestRuntimeComponentService service = new TestRuntimeComponentService(calc);
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            DynaCorbaServant servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            String[] ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc:1.0"};
-            servant.setIds(ids);
-            bindServant(servant, "Calc");
-            Calc calcClient = CalcHelper.narrow(bindReference("Calc"));
-            calcClient.divForSmallArgs(255, 255);
-            fail();
-        } catch (Exception e) {
-            if (e instanceof NotSupported) {
-                assertTrue(true);
-            } else {
-                e.printStackTrace();
-                fail();
-            }
-        }
-    }
-
-    /**
-     * Tests enums (arguments, return types)
-     */
-    @Test
-    public void test_enums() {
-        try {
-            EnumManagerServant ems = new EnumManagerServant();
-            TestRuntimeComponentService service = new TestRuntimeComponentService(ems);
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            DynaCorbaServant servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            String[] ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager:1.0"};
-            servant.setIds(ids);
-            bindServant(servant, "Enum");
-            EnumManager em = EnumManagerHelper.narrow(bindReference("Enum"));
-            Color color = Color.red;
-            assertTrue(em.getColor(color).value() == color.value());
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    @Test
-    public void test_nonCorbaServants() {
-        try {
-            NonCorbaServant ncs = new NonCorbaServant();
-            TestRuntimeComponentService service = new TestRuntimeComponentService(ncs);
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            DynaCorbaServant servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            bindServant(servant, "NonCorbaServant");
-            // it's non corba servant so we don't have stubs to test them
-            DynaCorbaRequest request = new DynaCorbaRequest(bindReference("NonCorbaServant"), "setString");
-            request.addArgument(TestConstants.STR_1);
-            request.setOutputType(String.class);
-            DynaCorbaResponse response = request.invoke();
-            assertTrue(response.getContent().equals(TestConstants.STR_1));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-
-        try {
-            NonCorbaServant ncs = new NonCorbaServant();
-            TestRuntimeComponentService service = new TestRuntimeComponentService(ncs);
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            DynaCorbaServant servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            bindServant(servant, "NonCorbaServant");
-            // it's non corba servant so we don't have stubs to test them
-            DynaCorbaRequest request = new DynaCorbaRequest(bindReference("NonCorbaServant"), "throwException");
-            request.addExceptionType(NonCorbaException.class);
-            request.invoke();
-            fail();
-        } catch (Exception e) {
-            if (e instanceof NonCorbaException) {
-                assertTrue(true);
-            } else {
-                e.printStackTrace();
-                fail();
-            }
-        }
-    }
-
-    /**
-     * Tests handling BAD_PARAM system exception
-     */
-    @Test
-    public void test_systemException_BAD_PARAM() {
-        try {
-            CalcServant calc = new CalcServant();
-            TestRuntimeComponentService service = new TestRuntimeComponentService(calc);
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            DynaCorbaServant servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            String[] ids = new String[] {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0"};
-            servant.setIds(ids);
-            bindServant(servant, "Calc");
-            DynaCorbaRequest request = new DynaCorbaRequest(bindReference("Calc"), "div");
-            request.addArgument(2d);
-            request.setOutputType(double.class);
-            request.invoke();
-            fail();
-        } catch (Exception e) {
-            if (e instanceof CorbaException) {
-                assertTrue(true);
-            } else {
-                e.printStackTrace();
-                fail();
-            }
-        }
-    }
-
-    /**
-     * Tests handling BAD_PARAM system exception
-     */
-    @Test
-    public void test_invalidServantConfiguraion() {
-        try {
-            InvalidTypesServant its = new InvalidTypesServant();
-            TestRuntimeComponentService service = new TestRuntimeComponentService(its);
-            //expecting exception...
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            fail();
-        } catch (Exception e) {
-            if (e instanceof RequestConfigurationException) {
-                assertTrue(true);
-            } else {
-                e.printStackTrace();
-                fail();
-            }
-        }
-    }
-    
-    /**
-     * Tests serving CORBA arrays by Tuscany CORBA servants
-     */
-    @Test
-    public void test_arraysPassing() {
-        try {
-            ArraysUnionsTuscanyServant arraysUnions = new ArraysUnionsTuscanyServant();
-            TestRuntimeComponentService service = new TestRuntimeComponentService(arraysUnions);
-            Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-            InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            DynaCorbaServant servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
-            String[] ids = new String[] {"IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests:1.0"};
-            servant.setIds(ids);
-            bindServant(servant, "ArraysUnions");
-            Object reference = bindReference("ArraysUnions");
-            ArraysUnionsTests objRef = ArraysUnionsTestsHelper.narrow(reference);
-            String[][] stringArray = {{"Hello", "World"}, {"Hi", "Again"}};
-            String[][] result = objRef.passStringArray(stringArray);
-            for (int i = 0; i < stringArray.length; i++) {
-                for (int j = 0; j < stringArray[i].length; j++) {
-                    assertEquals(stringArray[i][j], result[i][j]);
-                }
-            }
-            TestStruct struct = new TestStruct();
-            String[] field1 = {"Hello", "World"};
-            int[][] field2 = { {4, 2, 2, 5}, {6, 12, 5, 8}};
-            float[][][] field3 = { { {2, 6}, {2, 7}, {9, 3}, {4, 6}}, { {3, 7}, {6, 6}, {3, 5}, {6, 2}}};
-            struct.oneDimArray = field1;
-            struct.twoDimArray = field2;
-            struct.threeDimArray = field3;
-            
-            TestStruct structResult = objRef.passTestStruct(struct);
-            for (int i = 0; i < struct.oneDimArray.length; i++) {
-                assertEquals(struct.oneDimArray[i], structResult.oneDimArray[i]);
-            }
-            for (int i = 0; i < struct.twoDimArray.length; i++) {
-                for (int j = 0; j < struct.twoDimArray[i].length; j++) {
-                    assertEquals(struct.twoDimArray[i][j], structResult.twoDimArray[i][j]);
-                }
-            }
-            for (int i = 0; i < struct.threeDimArray.length; i++) {
-                for (int j = 0; j < struct.threeDimArray[i].length; j++) {
-                    for (int k = 0; k < struct.threeDimArray[i][j].length; k++) {
-                        assertEquals(struct.threeDimArray[i][j][k], structResult.threeDimArray[i][j][k], 0.0);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
deleted file mode 100644
index 1b1754f347..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
+++ /dev/null
@@ -1,841 +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.binding.corba.testing;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.corba.provider.exceptions.CorbaException;
-import org.apache.tuscany.sca.binding.corba.provider.exceptions.RequestConfigurationException;
-import org.apache.tuscany.sca.binding.corba.provider.reference.DynaCorbaRequest;
-import org.apache.tuscany.sca.binding.corba.provider.reference.DynaCorbaResponse;
-import org.apache.tuscany.sca.binding.corba.testing.enums.Color;
-import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero;
-import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported;
-import org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct;
-import org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.ArraysTestStruct;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.DummyObject;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InnerUnion;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InvalidCorbaArray;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InvalidEnum1;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InvalidEnum2;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InvalidEnum3;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InvalidStruct1;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InvalidStruct2;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InvalidStruct3;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InvalidUnion1;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InvalidUnion2;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InvalidUnion3;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InvalidUnion4;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InvalidUnion5;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.RichUnion;
-import org.apache.tuscany.sca.binding.corba.testing.servants.ArraysSetterServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.ArraysUnionsServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.ArraysUnionsTuscanyServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.CalcServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.EnumManagerServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.ObjectManagerServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.PrimitivesSetterServant;
-import org.apache.tuscany.sca.binding.corba.testing.servants.TestObjectServant;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.Object;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextExt;
-import org.omg.CosNaming.NamingContextExtHelper;
-import org.omg.CosNaming.NamingContextHelper;
-
-/**
- * @version $Rev$ $Date$
- *          Tests API for dynamic CORBA requests. Tests handling various Java
- *          types.
- */
-public class CorbaTypesTestCase {
-    private static TransientNameServer server;
-    private static ORB orb;
-
-    private static Object refPrimitivesSetter;
-    private static Object refArraysSetter;
-    private static Object refTestObject;
-    private static Object refCalcObject;
-    private static Object refObjectManager;
-    private static Object refEnumManager;
-    private static Object refArraysUnions;
-
-    /**
-     * Spawns tnameserv process (must be in PATH). Initializes test servants and
-     * stores it's references so tests can use it.
-     */
-    @BeforeClass
-    public static void setUp() {
-        try {
-            try {
-                server =
-                    new TransientNameServer(TestConstants.TEST1_HOST, TestConstants.TEST1_PORT,
-                                            TransientNameService.DEFAULT_SERVICE_NAME);
-                Thread t = server.start();
-                if (t == null) {
-                    Assert.fail("The naming server cannot be started");
-                }
-                orb = server.getORB();
-            } catch (Throwable e) {
-                e.printStackTrace();
-                Assert.fail(e.getMessage());
-            }
-
-            Object nameService = orb.resolve_initial_references("NameService");
-            NamingContext namingContext = NamingContextHelper.narrow(nameService);
-
-            PrimitivesSetterServant singleSetter = new PrimitivesSetterServant();
-            ArraysSetterServant arraysSetter = new ArraysSetterServant();
-            TestObjectServant complexObject = new TestObjectServant();
-            CalcServant calcObject = new CalcServant();
-            ObjectManagerServant objectManager = new ObjectManagerServant();
-            EnumManagerServant enumManager = new EnumManagerServant();
-            ArraysUnionsServant arraysUnions = new ArraysUnionsServant();
-
-            orb.connect(singleSetter);
-            orb.connect(arraysSetter);
-
-            NameComponent nc;
-            NameComponent[] path;
-
-            nc = new NameComponent("PrimitivesSetter", "");
-            path = new NameComponent[] {nc};
-            namingContext.rebind(path, singleSetter);
-
-            nc = new NameComponent("ArraysSetter", "");
-            path = new NameComponent[] {nc};
-            namingContext.rebind(path, arraysSetter);
-
-            nc = new NameComponent("TestObject", "");
-            path = new NameComponent[] {nc};
-            namingContext.rebind(path, complexObject);
-
-            nc = new NameComponent("CalcObject", "");
-            path = new NameComponent[] {nc};
-            namingContext.rebind(path, calcObject);
-
-            nc = new NameComponent("ObjectManager", "");
-            path = new NameComponent[] {nc};
-            namingContext.rebind(path, objectManager);
-
-            nc = new NameComponent("EnumManager", "");
-            path = new NameComponent[] {nc};
-            namingContext.rebind(path, enumManager);
-
-            nc = new NameComponent("ArraysUnions", "");
-            path = new NameComponent[] {nc};
-            namingContext.rebind(path, arraysUnions);
-
-            NamingContextExt nce = NamingContextExtHelper.narrow(orb.resolve_initial_references("NameService"));
-
-            refArraysSetter = nce.resolve(nce.to_name("ArraysSetter"));
-            refPrimitivesSetter = nce.resolve(nce.to_name("PrimitivesSetter"));
-            refTestObject = nce.resolve(nce.to_name("TestObject"));
-            refCalcObject = nce.resolve(nce.to_name("CalcObject"));
-            refObjectManager = nce.resolve(nce.to_name("ObjectManager"));
-            refEnumManager = nce.resolve(nce.to_name("EnumManager"));
-            refArraysUnions = nce.resolve(nce.to_name("ArraysUnions"));
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void stop() {
-        server.stop();
-    }
-
-    /**
-     * Tests remote operation, basing on given reference, operation name,
-     * arguments, expected return type and content
-     * 
-     * @param ref remote object
-     * @param operationName operation to invoke
-     * @param clazz expected return type
-     * @param arguments array of operation arguments
-     * @param equalTo expected return content
-     */
-    private void dynaTestInvoker(Object ref,
-                                 String operationName,
-                                 Class<?> clazz,
-                                 java.lang.Object[] arguments,
-                                 java.lang.Object equalTo) {
-
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(ref, operationName);
-            request.setOutputType(clazz);
-            for (int i = 0; arguments != null && i < arguments.length; i++) {
-                request.addArgument(arguments[i]);
-            }
-
-            DynaCorbaResponse response = request.invoke();
-            java.lang.Object content = (java.lang.Object)response.getContent();
-            assertTrue(content.getClass().equals(clazz));
-            if (equalTo != null && equalTo.getClass().isArray()) {
-                for (int i = 0; i < Array.getLength(equalTo); i++) {
-                    assertTrue(Array.get(content, i).equals(Array.get(equalTo, i)));
-                }
-            } else {
-                assertTrue(content.equals(equalTo));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("Error while invoking " + operationName);
-        }
-    }
-
-    /**
-     * Tests passing (and getting as result) varied primitives
-     */
-    @Test
-    public void test_setPrimitives() {
-
-        dynaTestInvoker(refPrimitivesSetter, "setBoolean", Boolean.class, new Boolean[] {true}, true);
-        dynaTestInvoker(refPrimitivesSetter, "setOctet", Byte.class, new Byte[] {1}, (byte)1);
-        dynaTestInvoker(refPrimitivesSetter, "setChar", Character.class, new Character[] {'A'}, 'A');
-        dynaTestInvoker(refPrimitivesSetter, "setShort", Short.class, new Short[] {1}, (short)1);
-        dynaTestInvoker(refPrimitivesSetter, "setLong", Integer.class, new Integer[] {1}, (int)1);
-        dynaTestInvoker(refPrimitivesSetter, "setLongLong", Long.class, new Long[] {(long)1}, (long)1);
-        dynaTestInvoker(refPrimitivesSetter, "setFloat", Float.class, new Float[] {(float)1}, (float)1);
-        dynaTestInvoker(refPrimitivesSetter, "setDouble", Double.class, new Double[] {(double)1}, (double)1);
-        dynaTestInvoker(refPrimitivesSetter, "setString", String.class, new String[] {"1"}, "1");
-
-    }
-
-    /**
-     * Tests passing (and getting as result) varied types sequences
-     */
-    @Test
-    public void test_setArrays() {
-
-        dynaTestInvoker(refArraysSetter,
-                        "setBoolean",
-                        Boolean[].class,
-                        new Boolean[][] {new Boolean[] {false, true}},
-                        new Boolean[] {false, true});
-
-        dynaTestInvoker(refArraysSetter,
-                        "setChar",
-                        Character[].class,
-                        new Character[][] {new Character[] {'A', 'B'}},
-                        new Character[] {'A', 'B'});
-
-        dynaTestInvoker(refArraysSetter, "setOctet", Byte[].class, new Byte[][] {new Byte[] {1, 2}}, new Byte[] {1, 2});
-
-        dynaTestInvoker(refArraysSetter, "setShort", Short[].class, new Short[][] {new Short[] {1, 2}}, new Short[] {1,
-                                                                                                                     2});
-
-        dynaTestInvoker(refArraysSetter,
-                        "setLong",
-                        Integer[].class,
-                        new Integer[][] {new Integer[] {1, 2}},
-                        new Integer[] {1, 2});
-
-        dynaTestInvoker(refArraysSetter,
-                        "setLongLong",
-                        Long[].class,
-                        new Long[][] {new Long[] {new Long(1), new Long(2)}},
-                        new Long[] {new Long(1), new Long(2)});
-
-        dynaTestInvoker(refArraysSetter,
-                        "setFloat",
-                        Float[].class,
-                        new Float[][] {new Float[] {new Float(1.0), new Float(2.0)}},
-                        new Float[] {new Float(1.0), new Float(2.0)});
-
-        dynaTestInvoker(refArraysSetter,
-                        "setDouble",
-                        Double[].class,
-                        new Double[][] {new Double[] {new Double(1.0), new Double(2.0)}},
-                        new Double[] {new Double(1.0), new Double(2.0)});
-
-        dynaTestInvoker(refArraysSetter,
-                        "setString",
-                        String[].class,
-                        new String[][] {new String[] {"A", "B"}},
-                        new String[] {"A", "B"});
-
-    }
-
-    /**
-     * Tests passing (and getting as result) complex structure
-     */
-    @Test
-    public void test_TestObject_setStruct() {
-        DynaCorbaRequest request = new DynaCorbaRequest(refTestObject, "setStruct");
-
-        SomeStruct struct = new SomeStruct();
-        SimpleStruct inner = new SimpleStruct();
-        inner.field1 = TestConstants.STR_1;
-        inner.field2 = TestConstants.INT_1;
-        struct.innerStruct = inner;
-        struct.str_list = TestConstants.STR_ARR_2;
-        struct.twoDimSeq = TestConstants.INT_ARRAY_2_DIM;
-        struct.threeDimSeq = TestConstants.INT_ARRAY_3_DIM;
-        struct.str = TestConstants.STR_1;
-
-        try {
-            request.addArgument(struct);
-            request.setOutputType(SomeStruct.class);
-            DynaCorbaResponse response = request.invoke();
-            SomeStruct result = (SomeStruct)response.getContent();
-            assertTrue(TestConstants.are2DimArraysEqual(result.twoDimSeq, TestConstants.INT_ARRAY_2_DIM));
-            assertTrue(TestConstants.are3DimArraysEqual(result.threeDimSeq, TestConstants.INT_ARRAY_3_DIM));
-            assertEquals(TestConstants.STR_1, result.str);
-            assertEquals(TestConstants.STR_ARR_2[0], result.str_list[0]);
-            assertEquals(TestConstants.STR_ARR_2[1], result.str_list[1]);
-            assertEquals(TestConstants.STR_1, result.innerStruct.field1);
-            assertEquals(TestConstants.INT_1, result.innerStruct.field2);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("Exception occured during tests: " + e);
-        }
-    }
-
-    /**
-     * Test passing (and getting as result) simple two-field structure
-     */
-    @Test
-    public void test_TestObject_setSimpleStruct() {
-        SimpleStruct struct = new SimpleStruct();
-        struct.field1 = TestConstants.STR_1;
-        struct.field2 = TestConstants.INT_1;
-        DynaCorbaRequest request = new DynaCorbaRequest(refTestObject, "setSimpleStruct");
-        try {
-            request.setOutputType(SimpleStruct.class);
-            request.addArgument(struct);
-            DynaCorbaResponse response = request.invoke();
-            SimpleStruct retStruct = (SimpleStruct)response.getContent();
-            assertTrue(retStruct.field1.equals(struct.field1) && retStruct.field2 == struct.field2);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("Exception occured during tests: " + e);
-        }
-    }
-
-    /**
-     * Tests passing (and getting as result) two dim. sequence of long.
-     */
-    @Test
-    public void test_TestObject_setLongSeq2() {
-        int[][] arr1 = new int[2][2];
-        for (int i = 0; i < 2; i++) {
-            for (int j = 0; j < 2; j++) {
-                arr1[i][j] = (int)(Math.random() * 1000);
-            }
-        }
-        DynaCorbaRequest request = new DynaCorbaRequest(refTestObject, "setLongSeq2");
-        try {
-            request.setOutputType(arr1.getClass());
-            request.addArgument(arr1);
-            DynaCorbaResponse response = request.invoke();
-            int[][] arr2 = (int[][])response.getContent();
-            for (int i = 0; i < 2; i++) {
-                for (int j = 0; j < 2; j++) {
-                    assertEquals(arr1[i][j], arr2[i][j]);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("Exception occured during tests: " + e);
-        }
-    }
-
-    /**
-     * Tests passing multiple complex attributes.
-     */
-    @Test
-    public void test_TestObject_pickStructFromArgs() {
-        SomeStruct arg1 = new SomeStruct();
-        SomeStruct arg2 = new SomeStruct();
-        SomeStruct arg3 = new SomeStruct();
-
-        SimpleStruct inner = new SimpleStruct();
-        inner.field1 = TestConstants.STR_1;
-        inner.field2 = TestConstants.INT_1;
-
-        arg1.innerStruct = inner;
-        arg2.innerStruct = inner;
-        arg3.innerStruct = inner;
-
-        arg1.str = TestConstants.STR_1;
-        arg2.str = TestConstants.STR_2;
-        arg3.str = TestConstants.STR_3;
-
-        arg1.str_list = TestConstants.STR_ARR_1;
-        arg2.str_list = TestConstants.STR_ARR_2;
-        arg3.str_list = TestConstants.STR_ARR_2;
-
-        arg1.threeDimSeq = TestConstants.INT_ARRAY_3_DIM;
-        arg2.threeDimSeq = TestConstants.INT_ARRAY_3_DIM;
-        arg3.threeDimSeq = TestConstants.INT_ARRAY_3_DIM;
-
-        arg1.twoDimSeq = TestConstants.INT_ARRAY_2_DIM;
-        arg2.twoDimSeq = TestConstants.INT_ARRAY_2_DIM;
-        arg3.twoDimSeq = TestConstants.INT_ARRAY_2_DIM;
-
-        DynaCorbaRequest request = new DynaCorbaRequest(refTestObject, "pickStructFromArgs");
-        try {
-
-            request.setOutputType(SomeStruct.class);
-            request.addArgument(arg1);
-            request.addArgument(arg2);
-            request.addArgument(arg3);
-            request.addArgument(1);
-            DynaCorbaResponse response = request.invoke();
-            SomeStruct result = (SomeStruct)response.getContent();
-
-            // just make sure that servant returned right structure
-            assertTrue(result.str.equals(TestConstants.STR_1));
-        } catch (Exception e) {
-            fail("Exception occured during tests " + e);
-            e.printStackTrace();
-        }
-
-    }
-
-    /**
-     * Tests handling user defined remote exception (single declared)
-     */
-    @Test
-    public void test_singleException() {
-        DynaCorbaRequest request1 = new DynaCorbaRequest(refCalcObject, "div");
-        try {
-            request1.addArgument(2d);
-            request1.addArgument(2d);
-            request1.setOutputType(Double.class);
-            request1.addExceptionType(DivByZero.class);
-            request1.invoke();
-        } catch (Exception e) {
-            fail();
-        }
-
-        DynaCorbaRequest request2 = new DynaCorbaRequest(refCalcObject, "div");
-        try {
-            request2.addArgument(2d);
-            request2.addArgument(0d);
-            request2.setOutputType(Double.class);
-            request2.addExceptionType(DivByZero.class);
-            request2.invoke();
-        } catch (DivByZero e) {
-            assertTrue(e.info != null && e.arguments != null && e.arguments.arg1 == 2 && e.arguments.arg2 == 0);
-        } catch (Exception exc) {
-            exc.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests handling user defined multiple exceptions
-     */
-    @Test
-    public void test_multipleExceptions() {
-        DynaCorbaRequest request = new DynaCorbaRequest(refCalcObject, "divForSmallArgs");
-        try {
-            request.addArgument(101d);
-            request.addArgument(101d);
-            request.setOutputType(Double.class);
-            request.addExceptionType(DivByZero.class);
-            request.addExceptionType(NotSupported.class);
-            request.invoke();
-        } catch (Exception e) {
-            assertTrue(e instanceof NotSupported);
-        }
-    }
-
-    /**
-     * Tests handling exceptions while user defined no exceptions
-     */
-    @Test
-    public void test_noExceptionsDeclared() {
-        DynaCorbaRequest request = new DynaCorbaRequest(refCalcObject, "div");
-        try {
-            request.addArgument(1d);
-            request.addArgument(0d);
-            request.setOutputType(Double.class);
-            request.invoke();
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof RequestConfigurationException);
-        }
-    }
-
-    /**
-     * Tests handling exceptions while user defined no such exception
-     */
-    @Test
-    public void test_noSuchExceptionDeclared() {
-        DynaCorbaRequest request = new DynaCorbaRequest(refCalcObject, "div");
-        try {
-            request.addArgument(1d);
-            request.addArgument(0d);
-            request.addExceptionType(NotSupported.class);
-            request.setOutputType(Double.class);
-            request.invoke();
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof RequestConfigurationException);
-        }
-    }
-
-    /**
-     * Tests handling non existing operation situation
-     */
-    @Test
-    public void test_systemException_BAD_OPERATION() {
-        DynaCorbaRequest request = new DynaCorbaRequest(refCalcObject, "thisOperationSurelyDoesNotExist");
-        try {
-            request.invoke();
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof CorbaException);
-        }
-    }
-
-    /**
-     * Tests obtaining references to other objects and using them with specified
-     * user interface
-     */
-    @Test
-    @Ignore("Cause of tnameservice hang on stop")
-    public void test_enchancedReferences() {
-        DynaCorbaRequest request = null;
-        try {
-            request = new DynaCorbaRequest(refObjectManager, "getDummyObject");
-            request.setOutputType(DummyObject.class);
-            DynaCorbaResponse response = request.invoke();
-            DummyObject dummy = (DummyObject)response.getContent();
-            DummyObject dummy2 = dummy.cloneObject();
-            dummy2.cloneObject();
-            assertNotSame(dummy.getLong(), dummy2.getLong());
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Test passing enums as arguments and retrieving them as a result
-     */
-    @Test
-    public void test_enums() {
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refEnumManager, "getColor");
-            Color color = Color.green;
-            request.addArgument(color);
-            request.setOutputType(Color.class);
-            DynaCorbaResponse response = request.invoke();
-            Color result = (Color)response.getContent();
-            assertEquals(color.value(), result.value());
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests recognizing structures
-     */
-    @Test
-    public void test_structValidation() {
-        DynaCorbaRequest request = null;
-        try {
-            request = new DynaCorbaRequest(refArraysSetter, "whatever");
-            request.setOutputType(InvalidStruct1.class);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof RequestConfigurationException);
-        }
-
-        try {
-            request = new DynaCorbaRequest(refArraysSetter, "whatever");
-            request.setOutputType(InvalidStruct2.class);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof RequestConfigurationException);
-        }
-
-        try {
-            request = new DynaCorbaRequest(refArraysSetter, "whatever");
-            request.setOutputType(InvalidStruct3.class);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof RequestConfigurationException);
-        }
-
-        try {
-            request = new DynaCorbaRequest(refArraysSetter, "whatever");
-            request.setOutputType(SomeStruct.class);
-        } catch (Exception e) {
-            fail();
-        }
-    }
-
-    /**
-     * Tests recognizing enums
-     */
-    @Test
-    public void test_enumValidation() {
-        DynaCorbaRequest request = null;
-        try {
-            request = new DynaCorbaRequest(refArraysSetter, "whatever");
-            request.setOutputType(InvalidEnum1.class);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof RequestConfigurationException);
-        }
-
-        try {
-            request = new DynaCorbaRequest(refArraysSetter, "whatever");
-            request.setOutputType(InvalidEnum2.class);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof RequestConfigurationException);
-        }
-
-        try {
-            request = new DynaCorbaRequest(refArraysSetter, "whatever");
-            request.setOutputType(InvalidEnum3.class);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof RequestConfigurationException);
-        }
-
-        try {
-            request = new DynaCorbaRequest(refArraysSetter, "whatever");
-            request.setOutputType(Color.class);
-        } catch (Exception e) {
-            fail();
-        }
-    }
-
-    /**
-     * Tests handling passing wrong params
-     */
-    @Test
-    public void test_systemException_BAD_PARAM() {
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refCalcObject, "div");
-            request.setOutputType(Double.class);
-            request.addArgument(3d);
-            request.invoke();
-            fail();
-        } catch (Exception e) {
-            if (e instanceof CorbaException) {
-                assertTrue(true);
-            } else {
-                e.printStackTrace();
-                fail();
-            }
-        }
-    }
-
-    /**
-     * Tests passing CORBA arrays
-     */
-    @Test
-    public void test_arraysPassing() {
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refArraysUnions, "passStringArray");
-            Annotation[] notes =
-                ArraysUnionsTuscanyServant.class.getMethod("passStringArray", new Class<?>[] {String[][].class})
-                    .getAnnotations();
-            request.setOutputType(String[][].class, notes);
-            String[][] argument = { {"Hello", "World"}, {"Hi", "again"}};
-            request.addArgument(argument, notes);
-            DynaCorbaResponse response = request.invoke();
-            String[][] result = (String[][])response.getContent();
-            for (int i = 0; i < argument.length; i++) {
-                for (int j = 0; j < argument[i].length; j++) {
-                    assertEquals(argument[i][j], result[i][j]);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refArraysUnions, "passTestStruct");
-            ArraysTestStruct arg = new ArraysTestStruct();
-            String[] field1 = {"Hello", "World"};
-            arg.field1 = field1;
-            int[][] field2 = { {4, 2, 2, 5}, {6, 12, 5, 8}};
-            arg.field2 = field2;
-            float[][][] field3 = { { {2, 6}, {2, 7}, {9, 3}, {4, 6}}, { {3, 7}, {6, 6}, {3, 5}, {6, 2}}};
-            arg.field3 = field3;
-            request.addArgument(arg);
-            request.setOutputType(ArraysTestStruct.class);
-            DynaCorbaResponse response = request.invoke();
-            ArraysTestStruct result = (ArraysTestStruct)response.getContent();
-            for (int i = 0; i < arg.field1.length; i++) {
-                assertEquals(arg.field1[i], result.field1[i]);
-            }
-            for (int i = 0; i < arg.field2.length; i++) {
-                for (int j = 0; j < arg.field2[i].length; j++) {
-                    assertEquals(arg.field2[i][j], result.field2[i][j]);
-                }
-            }
-            for (int i = 0; i < arg.field2.length; i++) {
-                for (int j = 0; j < arg.field2[i].length; j++) {
-                    for (int k = 0; k < arg.field3[i][j].length; k++) {
-                        assertEquals(arg.field3[i][j][k], result.field3[i][j][k], 0.0);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests situation when CORBA array dimension size doesn't match
-     * CORBA array annotation arguments (which sets dimension lengths)
-     */
-    @Test
-    public void test_invalidArrayAnnotationSize() {
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refArraysUnions, "passStringArray");
-            Annotation[] notes =
-                ArraysUnionsTuscanyServant.class.getMethod("passStringArray", new Class<?>[] {String[][].class})
-                    .getAnnotations();
-            request.setOutputType(String[][][].class, notes);
-            fail();
-        } catch (RequestConfigurationException e) {
-            // expected
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refArraysUnions, "passStringArray");
-            Annotation[] notes =
-                ArraysUnionsTuscanyServant.class.getMethod("passStringArray", new Class<?>[] {String[][].class})
-                    .getAnnotations();
-            request.addArgument(new String[0][0][0], notes);
-            fail();
-        } catch (RequestConfigurationException e) {
-            // expected
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refArraysUnions, "passStringArray");
-            request.addArgument(new InvalidCorbaArray(), null);
-            fail();
-        } catch (RequestConfigurationException e) {
-            // expected
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-    
-    /**
-     * Tests passing CORBA unions
-     */
-    @Test
-    public void test_passingUnions() {
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refArraysUnions, "passRichUnion");
-            request.setOutputType(RichUnion.class);
-            RichUnion arg = new RichUnion();
-            InnerUnion argIu = new InnerUnion();
-            argIu.setX(10);
-            arg.setIu(argIu);
-            request.addArgument(arg);
-            DynaCorbaResponse response = request.invoke();
-            RichUnion result = (RichUnion)response.getContent();
-            assertEquals(arg.getIu().getX(), result.getIu().getX());
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refArraysUnions, "passRichUnion");
-            request.setOutputType(RichUnion.class);
-            RichUnion arg = new RichUnion();
-            arg.setDef(true);
-            request.addArgument(arg);
-            DynaCorbaResponse response = request.invoke();
-            RichUnion result = (RichUnion)response.getContent();
-            assertEquals(arg.isDef(), result.isDef());
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-    
-    /**
-     * Tests handling invalid union declarations
-     */
-    @Test
-    public void test_testInvalidUnionClasses() {
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refArraysUnions, "whatever");
-            request.setOutputType(InvalidUnion1.class);
-        } catch (Exception e) {
-            assertEquals(RequestConfigurationException.class, e.getClass());
-        }
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refArraysUnions, "whatever");
-            request.setOutputType(InvalidUnion2.class);
-        } catch (Exception e) {
-            assertEquals(RequestConfigurationException.class, e.getClass());
-        }
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refArraysUnions, "whatever");
-            request.setOutputType(InvalidUnion3.class);
-        } catch (Exception e) {
-            assertEquals(RequestConfigurationException.class, e.getClass());
-        }
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refArraysUnions, "whatever");
-            request.setOutputType(InvalidUnion4.class);
-        } catch (Exception e) {
-            assertEquals(RequestConfigurationException.class, e.getClass());
-        }
-        try {
-            DynaCorbaRequest request = new DynaCorbaRequest(refArraysUnions, "whatever");
-            request.setOutputType(InvalidUnion5.class);
-        } catch (Exception e) {
-            assertEquals(RequestConfigurationException.class, e.getClass());
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
deleted file mode 100644
index f0dccd9e7e..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
+++ /dev/null
@@ -1,46 +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.binding.corba.testing;
-
-/**
- * @version $Rev$ $Date$
- * Interface that can be tested for operations mapping
- */
-public interface MappingTestInterface {
-
-    int getIntField();
-
-    void setIntField(int intField);
-
-    boolean isBoolField();
-
-    void setBoolField(boolean boolField);
-
-    void overloadedName();
-
-    void overloadedName(String arg1);
-
-    void overloadedName(String arg1, int arg2);
-
-    void caseCollision();
-
-    void CaseCollision();
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
deleted file mode 100644
index 6975c62ddb..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
+++ /dev/null
@@ -1,70 +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.binding.corba.testing;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.binding.corba.provider.util.MethodFinder;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- * Various tests for MethodFinder
- */
-public class MethodFinderTestCase {
-
-    /**
-     * Tests finding existing methods
-     */
-    @Test
-    public void test_findExistingMethod() {
-        try {
-            String methodName = "rotateLeft";
-            Method sample = Integer.class.getMethod(methodName, new Class<?>[] {int.class, int.class});
-            Method m1 = MethodFinder.findMethod(Integer.class, methodName, new Class<?>[] {int.class, int.class});
-            Method m2 =
-                MethodFinder.findMethod(Integer.class, methodName, new Class<?>[] {Integer.class, Integer.class});
-            assertEquals(sample, m1);
-            assertEquals(sample, m2);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests null result value for not existing method
-     */
-    @Test
-    public void test_findNotExistingMethod() {
-        try {
-            String methodName = "rotateLeft";
-            Method method = MethodFinder.findMethod(Integer.class, methodName, new Class<?>[] {});
-            assertEquals(null, method);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
deleted file mode 100644
index 4767728db7..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
+++ /dev/null
@@ -1,67 +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.binding.corba.testing;
-
-import static org.junit.Assert.assertEquals;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import org.apache.tuscany.sca.binding.corba.provider.util.OperationMapper;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- * Various tests for OperationsMapping
- */
-public class OperationMappingTestCase {
-
-    /**
-     * Tests if Java2IDLUtil maps methods to operations correctly
-     */
-    @Test
-    public void test_mappingRules() {
-        Map<Method, String> met2op = OperationMapper.mapMethodToOperationName(MappingTestInterface.class);
-        for (Method method : met2op.keySet()) {
-            String name = method.getName();
-            String translatedName = met2op.get(method);
-            if (name.equals("getIntField")) {
-                assertEquals("_get_intField", translatedName);
-            } else if (name.equals("setIntField")) {
-                assertEquals("_set_intField", translatedName);
-            } else if (name.equals("isBoolField")) {
-                assertEquals("_get_boolField", translatedName);
-            } else if (name.equals("setBoolField")) {
-                assertEquals("_set_boolField", translatedName);
-            } else if (name.equals("overloadedName") && method.getParameterTypes().length == 0) {
-                assertEquals("overloadedName__", translatedName);
-            } else if (name.equals("overloadedName") && method.getParameterTypes().length == 1) {
-                assertEquals("overloadedName__CORBA_WStringValue", translatedName);
-            } else if (name.equals("overloadedName") && method.getParameterTypes().length == 2) {
-                assertEquals("overloadedName__CORBA_WStringValue__long", translatedName);
-            } else if (name.equals("caseCollision")) {
-                assertEquals("caseCollision_4", translatedName);
-            } else if (name.equals("CaseCollision")) {
-                assertEquals("CaseCollision_0_4", translatedName);
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
deleted file mode 100644
index 962a00d002..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
+++ /dev/null
@@ -1,87 +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.binding.corba.testing;
-
-/**
- * Some constants and utilities for module tests
- * @version $Rev$ $Date$
- */
-public class TestConstants {
-
-    public static final String STR_1 = "Hello world!";
-    public static final String STR_2 = "2nd string";
-    public static final String STR_3 = "Other string";
-    public static final String[] STR_ARR_1 = {"Hello", "World"};
-    public static final String[] STR_ARR_2 = {"Another", "string", "array"};
-    public static final int INT_1 = 0;
-
-    public static final int TEST1_PORT = 11100;
-    public static final String TEST1_HOST = "localhost";
-
-    public static final int TEST2_PORT = 11101;
-    public static final String TEST2_HOST = "localhost";
-    
-    public static final int[][] INT_ARRAY_2_DIM = { {1, 2}, {3, 4}};
-    public static final int[][][] INT_ARRAY_3_DIM = { { {1, 2}, {3, 4}}, { {5, 6}, {7, 8}}};
-
-    public static final long TNAMESERV_SPAWN_WAIT = 300;
-
-    /**
-     * Tests if given 2D arrays values are equal
-     * @param arr1
-     * @param arr2
-     * @return
-     */
-    public static boolean are2DimArraysEqual(int[][] arr1, int[][] arr2) {
-        int sum = 0;
-        int expSum = 0;
-        for (int i = 0; i < arr1.length; i++) {
-            for (int j = 0; j < arr1[i].length; j++) {
-                expSum++;
-                if (arr1[i][j] == arr2[i][j]) {
-                    sum++;
-                }
-            }
-        }
-        return sum == expSum;
-    }
-
-    /**
-     * Tests if given 3D arrays values are equal
-     * @param arr1
-     * @param arr2
-     * @return
-     */
-    public static boolean are3DimArraysEqual(int[][][] arr1, int[][][] arr2) {
-        int sum = 0;
-        int expSum = 0;
-        for (int i = 0; i < arr1.length; i++) {
-            for (int j = 0; j < arr1[i].length; j++) {
-                for (int k = 0; k < arr1[i][j].length; k++) {
-                    expSum++;
-                    if (arr1[i][j][k] == arr2[i][j][k]) {
-                        sum++;
-                    }
-                }
-            }
-        }
-        return sum == expSum;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
deleted file mode 100644
index f4ca1577f5..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-public interface ArraysUnionsTests extends ArraysUnionsTestsOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 
-{
-} // interface ArraysUnionsTests
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
deleted file mode 100644
index d10bc498b7..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-abstract public class ArraysUnionsTestsHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTestsHelper.id (), "ArraysUnionsTests");
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests read (org.omg.CORBA.portable.InputStream istream)
-  {
-    return narrow (istream.read_Object (_ArraysUnionsTestsStub.class));
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests value)
-  {
-    ostream.write_Object ((org.omg.CORBA.Object) value);
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests)
-      return (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests)obj;
-    else if (!obj._is_a (id ()))
-      throw new org.omg.CORBA.BAD_PARAM ();
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.binding.corba.testing.arrays_unions._ArraysUnionsTestsStub stub = new org.apache.tuscany.sca.binding.corba.testing.arrays_unions._ArraysUnionsTestsStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests unchecked_narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests)
-      return (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests)obj;
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      org.apache.tuscany.sca.binding.corba.testing.arrays_unions._ArraysUnionsTestsStub stub = new org.apache.tuscany.sca.binding.corba.testing.arrays_unions._ArraysUnionsTestsStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
deleted file mode 100644
index 98987c1252..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-public final class ArraysUnionsTestsHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests value = null;
-
-  public ArraysUnionsTestsHolder ()
-  {
-  }
-
-  public ArraysUnionsTestsHolder (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTestsHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTestsHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTestsHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
deleted file mode 100644
index d80adb476a..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-public interface ArraysUnionsTestsOperations 
-{
-  org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct passTestStruct (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct arg);
-  String[][] passStringArray (String[][] arg);
-  org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion passRichUnion (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion arg);
-} // interface ArraysUnionsTestsOperations
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
deleted file mode 100644
index 9f520f3c5d..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-public final class InnerUnion implements org.omg.CORBA.portable.IDLEntity
-{
-  private int ___x;
-  private float ___y;
-  private int __discriminator;
-  private boolean __uninitialized = true;
-
-  public InnerUnion ()
-  {
-  }
-
-  public int discriminator ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    return __discriminator;
-  }
-
-  public int x ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyx (__discriminator);
-    return ___x;
-  }
-
-  public void x (int value)
-  {
-    __discriminator = 1;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  public void x (int discriminator, int value)
-  {
-    verifyx (discriminator);
-    __discriminator = discriminator;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  private void verifyx (int discriminator)
-  {
-    if (discriminator != 1)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public float y ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyy (__discriminator);
-    return ___y;
-  }
-
-  public void y (float value)
-  {
-    __discriminator = 2;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  public void y (int discriminator, float value)
-  {
-    verifyy (discriminator);
-    __discriminator = discriminator;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  private void verifyy (int discriminator)
-  {
-    if (discriminator != 2)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public void _default ()
-  {
-    __discriminator = -2147483648;
-    __uninitialized = false;
-  }
-
-  public void _default (int discriminator)
-  {
-    verifyDefault( discriminator ) ;
-    __discriminator = discriminator ;
-    __uninitialized = false;
-  }
-
-  private void verifyDefault( int value )
-  {
-    switch (value) {
-      case 1:
-      case 2:
-        throw new org.omg.CORBA.BAD_OPERATION() ;
-
-      default:
-        return;
-    }
-  }
-
-} // class InnerUnion
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
deleted file mode 100644
index 11c22f1d72..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-abstract public class InnerUnionHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion/InnerUnion:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      org.omg.CORBA.TypeCode _disTypeCode0;
-      _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [2];
-      org.omg.CORBA.TypeCode _tcOf_members0;
-      org.omg.CORBA.Any _anyOf_members0;
-
-      // Branch for x (case label 1)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)1);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      _members0[0] = new org.omg.CORBA.UnionMember (
-        "x",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for y (case label 2)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)2);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float);
-      _members0[1] = new org.omg.CORBA.UnionMember (
-        "y",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-      __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.id (), "InnerUnion", _disTypeCode0, _members0);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion value = new org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion ();
-    int _dis0 = (int)0;
-    _dis0 = istream.read_long ();
-    switch (_dis0)
-    {
-      case 1:
-        int _x = (int)0;
-        _x = istream.read_long ();
-        value.x (_x);
-        break;
-      case 2:
-        float _y = (float)0;
-        _y = istream.read_float ();
-        value.y (_y);
-        break;
-      default:
-        value._default( _dis0 ) ;
-        break;
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion value)
-  {
-    ostream.write_long (value.discriminator ());
-    switch (value.discriminator ())
-    {
-      case 1:
-        ostream.write_long (value.x ());
-        break;
-      case 2:
-        ostream.write_float (value.y ());
-        break;
-    }
-  }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
deleted file mode 100644
index ca9233c77f..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-public final class InnerUnionHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion value = null;
-
-  public InnerUnionHolder ()
-  {
-  }
-
-  public InnerUnionHolder (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
deleted file mode 100644
index 1a1a36fd16..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-public final class RichUnion implements org.omg.CORBA.portable.IDLEntity
-{
-  private int ___x;
-  private float ___y;
-  private String ___z;
-  private org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion ___iu;
-  private boolean ___a;
-  private int __discriminator;
-  private boolean __uninitialized = true;
-
-  public RichUnion ()
-  {
-  }
-
-  public int discriminator ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    return __discriminator;
-  }
-
-  public int x ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyx (__discriminator);
-    return ___x;
-  }
-
-  public void x (int value)
-  {
-    __discriminator = 1;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  public void x (int discriminator, int value)
-  {
-    verifyx (discriminator);
-    __discriminator = discriminator;
-    ___x = value;
-    __uninitialized = false;
-  }
-
-  private void verifyx (int discriminator)
-  {
-    if (discriminator != 1)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public float y ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyy (__discriminator);
-    return ___y;
-  }
-
-  public void y (float value)
-  {
-    __discriminator = 2;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  public void y (int discriminator, float value)
-  {
-    verifyy (discriminator);
-    __discriminator = discriminator;
-    ___y = value;
-    __uninitialized = false;
-  }
-
-  private void verifyy (int discriminator)
-  {
-    if (discriminator != 2)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public String z ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyz (__discriminator);
-    return ___z;
-  }
-
-  public void z (String value)
-  {
-    __discriminator = 3;
-    ___z = value;
-    __uninitialized = false;
-  }
-
-  public void z (int discriminator, String value)
-  {
-    verifyz (discriminator);
-    __discriminator = discriminator;
-    ___z = value;
-    __uninitialized = false;
-  }
-
-  private void verifyz (int discriminator)
-  {
-    if (discriminator != 3)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion iu ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifyiu (__discriminator);
-    return ___iu;
-  }
-
-  public void iu (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion value)
-  {
-    __discriminator = 4;
-    ___iu = value;
-    __uninitialized = false;
-  }
-
-  public void iu (int discriminator, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion value)
-  {
-    verifyiu (discriminator);
-    __discriminator = discriminator;
-    ___iu = value;
-    __uninitialized = false;
-  }
-
-  private void verifyiu (int discriminator)
-  {
-    if (discriminator != 4)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-  public boolean a ()
-  {
-    if (__uninitialized)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-    verifya (__discriminator);
-    return ___a;
-  }
-
-  public void a (boolean value)
-  {
-    __discriminator = -2147483648;
-    ___a = value;
-    __uninitialized = false;
-  }
-
-  public void a (int discriminator, boolean value)
-  {
-    verifya (discriminator);
-    __discriminator = discriminator;
-    ___a = value;
-    __uninitialized = false;
-  }
-
-  private void verifya (int discriminator)
-  {
-    if (discriminator == 1 || discriminator == 2 || discriminator == 3 || discriminator == 4)
-      throw new org.omg.CORBA.BAD_OPERATION ();
-  }
-
-} // class RichUnion
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
deleted file mode 100644
index 7cef0ea189..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-abstract public class RichUnionHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion/RichUnion:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      org.omg.CORBA.TypeCode _disTypeCode0;
-      _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [5];
-      org.omg.CORBA.TypeCode _tcOf_members0;
-      org.omg.CORBA.Any _anyOf_members0;
-
-      // Branch for x (case label 1)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)1);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-      _members0[0] = new org.omg.CORBA.UnionMember (
-        "x",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for y (case label 2)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)2);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float);
-      _members0[1] = new org.omg.CORBA.UnionMember (
-        "y",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for z (case label 3)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)3);
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-      _members0[2] = new org.omg.CORBA.UnionMember (
-        "z",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for iu (case label 4)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_long ((int)4);
-      _tcOf_members0 = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.type ();
-      _members0[3] = new org.omg.CORBA.UnionMember (
-        "iu",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-
-      // Branch for a (Default case)
-      _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any ();
-      _anyOf_members0.insert_octet ((byte)0); // default member label
-      _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_boolean);
-      _members0[4] = new org.omg.CORBA.UnionMember (
-        "a",
-        _anyOf_members0,
-        _tcOf_members0,
-        null);
-      __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.id (), "RichUnion", _disTypeCode0, _members0);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion value = new org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion ();
-    int _dis0 = (int)0;
-    _dis0 = istream.read_long ();
-    switch (_dis0)
-    {
-      case 1:
-        int _x = (int)0;
-        _x = istream.read_long ();
-        value.x (_x);
-        break;
-      case 2:
-        float _y = (float)0;
-        _y = istream.read_float ();
-        value.y (_y);
-        break;
-      case 3:
-        String _z = null;
-        _z = istream.read_string ();
-        value.z (_z);
-        break;
-      case 4:
-        org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnion _iu = null;
-        _iu = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.read (istream);
-        value.iu (_iu);
-        break;
-      default:
-        boolean _a = false;
-        _a = istream.read_boolean ();
-        value.a (_dis0, _a);
-        break;
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion value)
-  {
-    ostream.write_long (value.discriminator ());
-    switch (value.discriminator ())
-    {
-      case 1:
-        ostream.write_long (value.x ());
-        break;
-      case 2:
-        ostream.write_float (value.y ());
-        break;
-      case 3:
-        ostream.write_string (value.z ());
-        break;
-      case 4:
-        org.apache.tuscany.sca.binding.corba.testing.arrays_unions.InnerUnionHelper.write (ostream, value.iu ());
-        break;
-      default:
-        ostream.write_boolean (value.a ());
-        break;
-    }
-  }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
deleted file mode 100644
index 5498104905..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-public final class RichUnionHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion value = null;
-
-  public RichUnionHolder ()
-  {
-  }
-
-  public RichUnionHolder (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
deleted file mode 100644
index 72beff0537..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-abstract public class StringArrayHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArray:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, String[][] that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static String[][] extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0);
-      __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode );
-      __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode );
-      __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.id (), "StringArray", __typeCode);
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static String[][] read (org.omg.CORBA.portable.InputStream istream)
-  {
-    String value[][] = null;
-    value = new String[2][];
-    for (int _o0 = 0;_o0 < (2); ++_o0)
-    {
-      value[_o0] = new String[2];
-      for (int _o1 = 0;_o1 < (2); ++_o1)
-      {
-        value[_o0][_o1] = istream.read_string ();
-      }
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, String[][] value)
-  {
-    if (value.length != (2))
-      throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    for (int _i0 = 0;_i0 < (2); ++_i0)
-    {
-      if (value[_i0].length != (2))
-        throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-      for (int _i1 = 0;_i1 < (2); ++_i1)
-      {
-        ostream.write_string (value[_i0][_i1]);
-      }
-    }
-  }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
deleted file mode 100644
index 747337597c..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-public final class StringArrayHolder implements org.omg.CORBA.portable.Streamable
-{
-  public String value[][] = null;
-
-  public StringArrayHolder ()
-  {
-  }
-
-  public StringArrayHolder (String[][] initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
deleted file mode 100644
index 2b239deadc..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-public final class TestStruct implements org.omg.CORBA.portable.IDLEntity
-{
-  public String oneDimArray[] = null;
-  public int twoDimArray[][] = null;
-  public float threeDimArray[][][] = null;
-
-  public TestStruct ()
-  {
-  } // ctor
-
-  public TestStruct (String[] _oneDimArray, int[][] _twoDimArray, float[][][] _threeDimArray)
-  {
-    oneDimArray = _oneDimArray;
-    twoDimArray = _twoDimArray;
-    threeDimArray = _threeDimArray;
-  } // ctor
-
-} // class TestStruct
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
deleted file mode 100644
index 6427d9d200..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-abstract public class TestStructHelper
-{
-  private static String  _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct/TestStruct:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  private static boolean __active = false;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      synchronized (org.omg.CORBA.TypeCode.class)
-      {
-        if (__typeCode == null)
-        {
-          if (__active)
-          {
-            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
-          }
-          __active = true;
-          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3];
-          org.omg.CORBA.TypeCode _tcOf_members0 = null;
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 );
-          _members0[0] = new org.omg.CORBA.StructMember (
-            "oneDimArray",
-            _tcOf_members0,
-            null);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 );
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (4, _tcOf_members0 );
-          _members0[1] = new org.omg.CORBA.StructMember (
-            "twoDimArray",
-            _tcOf_members0,
-            null);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float);
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 );
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (4, _tcOf_members0 );
-          _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 );
-          _members0[2] = new org.omg.CORBA.StructMember (
-            "threeDimArray",
-            _tcOf_members0,
-            null);
-          __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.id (), "TestStruct", _members0);
-          __active = false;
-        }
-      }
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct read (org.omg.CORBA.portable.InputStream istream)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct value = new org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct ();
-    value.oneDimArray = new String[2];
-    for (int _o0 = 0;_o0 < (2); ++_o0)
-    {
-      value.oneDimArray[_o0] = istream.read_string ();
-    }
-    value.twoDimArray = new int[2][];
-    for (int _o1 = 0;_o1 < (2); ++_o1)
-    {
-      value.twoDimArray[_o1] = new int[4];
-      for (int _o2 = 0;_o2 < (4); ++_o2)
-      {
-        value.twoDimArray[_o1][_o2] = istream.read_long ();
-      }
-    }
-    value.threeDimArray = new float[2][][];
-    for (int _o3 = 0;_o3 < (2); ++_o3)
-    {
-      value.threeDimArray[_o3] = new float[4][];
-      for (int _o4 = 0;_o4 < (4); ++_o4)
-      {
-        value.threeDimArray[_o3][_o4] = new float[2];
-        for (int _o5 = 0;_o5 < (2); ++_o5)
-        {
-          value.threeDimArray[_o3][_o4][_o5] = istream.read_float ();
-        }
-      }
-    }
-    return value;
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct value)
-  {
-    if (value.oneDimArray.length != (2))
-      throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    for (int _i0 = 0;_i0 < (2); ++_i0)
-    {
-      ostream.write_string (value.oneDimArray[_i0]);
-    }
-    if (value.twoDimArray.length != (2))
-      throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    for (int _i1 = 0;_i1 < (2); ++_i1)
-    {
-      if (value.twoDimArray[_i1].length != (4))
-        throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-      for (int _i2 = 0;_i2 < (4); ++_i2)
-      {
-        ostream.write_long (value.twoDimArray[_i1][_i2]);
-      }
-    }
-    if (value.threeDimArray.length != (2))
-      throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    for (int _i3 = 0;_i3 < (2); ++_i3)
-    {
-      if (value.threeDimArray[_i3].length != (4))
-        throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-      for (int _i4 = 0;_i4 < (4); ++_i4)
-      {
-        if (value.threeDimArray[_i3][_i4].length != (2))
-          throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-        for (int _i5 = 0;_i5 < (2); ++_i5)
-        {
-          ostream.write_float (value.threeDimArray[_i3][_i4][_i5]);
-        }
-      }
-    }
-  }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
deleted file mode 100644
index 94683e0327..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-public final class TestStructHolder implements org.omg.CORBA.portable.Streamable
-{
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct value = null;
-
-  public TestStructHolder ()
-  {
-  }
-
-  public TestStructHolder (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
deleted file mode 100644
index e4cac28e4f..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-public abstract class _ArraysUnionsTestsImplBase extends org.omg.CORBA.portable.ObjectImpl
-                implements org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests, org.omg.CORBA.portable.InvokeHandler
-{
-
-  // Constructors
-  public _ArraysUnionsTestsImplBase ()
-  {
-  }
-
-  private static java.util.Hashtable _methods = new java.util.Hashtable ();
-  static
-  {
-    _methods.put ("passTestStruct", new java.lang.Integer (0));
-    _methods.put ("passStringArray", new java.lang.Integer (1));
-    _methods.put ("passRichUnion", new java.lang.Integer (2));
-  }
-
-  public org.omg.CORBA.portable.OutputStream _invoke (String $method,
-                                org.omg.CORBA.portable.InputStream in,
-                                org.omg.CORBA.portable.ResponseHandler $rh)
-  {
-    org.omg.CORBA.portable.OutputStream out = null;
-    java.lang.Integer __method = (java.lang.Integer)_methods.get ($method);
-    if (__method == null)
-      throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-    switch (__method.intValue ())
-    {
-       case 0:  // org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests/passTestStruct
-       {
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct arg = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.read (in);
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct $result = null;
-         $result = this.passTestStruct (arg);
-         out = $rh.createReply();
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.write (out, $result);
-         break;
-       }
-
-       case 1:  // org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests/passStringArray
-       {
-         String arg[][] = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.read (in);
-         String $result[][] = null;
-         $result = this.passStringArray (arg);
-         out = $rh.createReply();
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.write (out, $result);
-         break;
-       }
-
-       case 2:  // org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests/passRichUnion
-       {
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion arg = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.read (in);
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion $result = null;
-         $result = this.passRichUnion (arg);
-         out = $rh.createReply();
-         org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.write (out, $result);
-         break;
-       }
-
-       default:
-         throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    }
-
-    return out;
-  } // _invoke
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-
-} // class _ArraysUnionsTestsImplBase
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
deleted file mode 100644
index 38e29c0d63..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-public class _ArraysUnionsTestsStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests
-{
-
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct passTestStruct (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct arg)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("passTestStruct", true);
-                org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.write ($out, arg);
-                $in = _invoke ($out);
-                org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct $result = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.read ($in);
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return passTestStruct (arg        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // passTestStruct
-
-  public String[][] passStringArray (String[][] arg)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("passStringArray", true);
-                org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.write ($out, arg);
-                $in = _invoke ($out);
-                String $result[][] = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.read ($in);
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return passStringArray (arg        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // passStringArray
-
-  public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion passRichUnion (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion arg)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("passRichUnion", true);
-                org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.write ($out, arg);
-                $in = _invoke ($out);
-                org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion $result = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.read ($in);
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return passRichUnion (arg        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // passRichUnion
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
-  {
-     String str = s.readUTF ();
-     String[] args = null;
-     java.util.Properties props = null;
-     org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
-     org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
-     _set_delegate (delegate);
-  }
-
-  private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
-  {
-     String[] args = null;
-     java.util.Properties props = null;
-     String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
-     s.writeUTF (str);
-  }
-} // class _ArraysUnionsTestsStub
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
deleted file mode 100644
index e3c28f8b91..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
+++ /dev/null
@@ -1,60 +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.binding.corba.testing.enums;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/enums/Color.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from enums.idl
-* czwartek, 19 czerwiec 2008 15:46:10 CEST
-*/
-
-public class Color implements org.omg.CORBA.portable.IDLEntity {
-    private int __value;
-    private static int __size = 3;
-    private static org.apache.tuscany.sca.binding.corba.testing.enums.Color[] __array =
-        new org.apache.tuscany.sca.binding.corba.testing.enums.Color[__size];
-
-    public static final int _red = 0;
-    public static final org.apache.tuscany.sca.binding.corba.testing.enums.Color red =
-        new org.apache.tuscany.sca.binding.corba.testing.enums.Color(_red);
-    public static final int _yellow = 1;
-    public static final org.apache.tuscany.sca.binding.corba.testing.enums.Color yellow =
-        new org.apache.tuscany.sca.binding.corba.testing.enums.Color(_yellow);
-    public static final int _green = 2;
-    public static final org.apache.tuscany.sca.binding.corba.testing.enums.Color green =
-        new org.apache.tuscany.sca.binding.corba.testing.enums.Color(_green);
-
-    public int value() {
-        return __value;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.enums.Color from_int(int value) {
-        if (value >= 0 && value < __size)
-            return __array[value];
-        else
-            throw new org.omg.CORBA.BAD_PARAM();
-    }
-
-    protected Color(int value) {
-        __value = value;
-        __array[__value] = this;
-    }
-} // class Color
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
deleted file mode 100644
index 775cac8e16..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
+++ /dev/null
@@ -1,69 +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.binding.corba.testing.enums;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from enums.idl
-* czwartek, 19 czerwiec 2008 15:46:10 CEST
-*/
-
-abstract public class ColorHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/enums/Color:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.enums.Color that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.enums.Color extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode =
-                org.omg.CORBA.ORB.init().create_enum_tc(org.apache.tuscany.sca.binding.corba.testing.enums.ColorHelper
-                                                            .id(),
-                                                        "Color",
-                                                        new String[] {"red", "yellow", "green"});
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.enums.Color read(org.omg.CORBA.portable.InputStream istream) {
-        return org.apache.tuscany.sca.binding.corba.testing.enums.Color.from_int(istream.read_long());
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.enums.Color value) {
-        ostream.write_long(value.value());
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
deleted file mode 100644
index 32cd9c8df6..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.enums;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from enums.idl
-* czwartek, 19 czerwiec 2008 15:46:10 CEST
-*/
-
-public final class ColorHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.enums.Color value = null;
-
-    public ColorHolder() {
-    }
-
-    public ColorHolder(org.apache.tuscany.sca.binding.corba.testing.enums.Color initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.enums.ColorHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.enums.ColorHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.enums.ColorHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
deleted file mode 100644
index 3f73557952..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.enums;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from enums.idl
-* czwartek, 19 czerwiec 2008 15:46:10 CEST
-*/
-
-public interface EnumManager extends EnumManagerOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity {
-} // interface EnumManager
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
deleted file mode 100644
index a6160a7643..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
+++ /dev/null
@@ -1,98 +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.binding.corba.testing.enums;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from enums.idl
-* czwartek, 19 czerwiec 2008 15:46:10 CEST
-*/
-
-abstract public class EnumManagerHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_interface_tc(org.apache.tuscany.sca.binding.corba.testing.enums.EnumManagerHelper.id(),
-                                         "EnumManager");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_EnumManagerStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager)
-            return (org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager)obj;
-        else if (!obj._is_a(id()))
-            throw new org.omg.CORBA.BAD_PARAM();
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.enums._EnumManagerStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.enums._EnumManagerStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager)
-            return (org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.enums._EnumManagerStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.enums._EnumManagerStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
deleted file mode 100644
index 6afa6bc806..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.enums;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from enums.idl
-* czwartek, 19 czerwiec 2008 15:46:10 CEST
-*/
-
-public final class EnumManagerHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager value = null;
-
-    public EnumManagerHolder() {
-    }
-
-    public EnumManagerHolder(org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.enums.EnumManagerHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.enums.EnumManagerHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.enums.EnumManagerHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
deleted file mode 100644
index bab0c27f77..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.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 org.apache.tuscany.sca.binding.corba.testing.enums;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from enums.idl
-* czwartek, 19 czerwiec 2008 15:46:10 CEST
-*/
-
-public interface EnumManagerOperations {
-
-    org.apache.tuscany.sca.binding.corba.testing.enums.Color getColor(org.apache.tuscany.sca.binding.corba.testing.enums.Color color);
-} // interface EnumManagerOperations
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
deleted file mode 100644
index 514627ff4b..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.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.binding.corba.testing.enums;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from enums.idl
-* czwartek, 19 czerwiec 2008 15:46:10 CEST
-*/
-
-public abstract class _EnumManagerImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _EnumManagerImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-        _methods.put("getColor", new java.lang.Integer(0));
-    }
-
-    public org.omg.CORBA.portable.OutputStream _invoke(String $method,
-                                                       org.omg.CORBA.portable.InputStream in,
-                                                       org.omg.CORBA.portable.ResponseHandler $rh) {
-        org.omg.CORBA.portable.OutputStream out = null;
-        java.lang.Integer __method = (java.lang.Integer)_methods.get($method);
-        if (__method == null)
-            throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-        switch (__method.intValue()) {
-            case 0: // org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager/getColor
-            {
-                org.apache.tuscany.sca.binding.corba.testing.enums.Color color =
-                    org.apache.tuscany.sca.binding.corba.testing.enums.ColorHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.enums.Color $result = null;
-                $result = this.getColor(color);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.enums.ColorHelper.write(out, $result);
-                break;
-            }
-
-            default:
-                throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-        }
-
-        return out;
-    } // _invoke
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _EnumManagerImplBase
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
deleted file mode 100644
index 4629ca9cff..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.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.binding.corba.testing.enums;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from enums.idl
-* czwartek, 19 czerwiec 2008 15:46:10 CEST
-*/
-
-public class _EnumManagerStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.enums.EnumManager {
-
-    public org.apache.tuscany.sca.binding.corba.testing.enums.Color getColor(org.apache.tuscany.sca.binding.corba.testing.enums.Color color) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("getColor", true);
-            org.apache.tuscany.sca.binding.corba.testing.enums.ColorHelper.write($out, color);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.enums.Color $result =
-                org.apache.tuscany.sca.binding.corba.testing.enums.ColorHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return getColor(color);
-        } finally {
-            _releaseReply($in);
-        }
-    } // getColor
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-    private void readObject(java.io.ObjectInputStream s) throws java.io.IOException {
-        String str = s.readUTF();
-        String[] args = null;
-        java.util.Properties props = null;
-        org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init(args, props).string_to_object(str);
-        org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-        _set_delegate(delegate);
-    }
-
-    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
-        String[] args = null;
-        java.util.Properties props = null;
-        String str = org.omg.CORBA.ORB.init(args, props).object_to_string(this);
-        s.writeUTF(str);
-    }
-} // class _EnumManagerStub
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
deleted file mode 100644
index aa480f93ac..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.exceptions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-public interface Calc extends CalcOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity {
-} // interface Calc
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
deleted file mode 100644
index 5ed36ca19b..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
+++ /dev/null
@@ -1,98 +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.binding.corba.testing.exceptions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-abstract public class CalcHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_interface_tc(org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcHelper.id(),
-                                         "Calc");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_CalcStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc)
-            return (org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc)obj;
-        else if (!obj._is_a(id()))
-            throw new org.omg.CORBA.BAD_PARAM();
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.exceptions._CalcStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.exceptions._CalcStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc)
-            return (org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.exceptions._CalcStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.exceptions._CalcStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
deleted file mode 100644
index ec1cfadd1e..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.exceptions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-public final class CalcHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc value = null;
-
-    public CalcHolder() {
-    }
-
-    public CalcHolder(org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
deleted file mode 100644
index 29865ace06..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.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 org.apache.tuscany.sca.binding.corba.testing.exceptions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-public interface CalcOperations {
-    double div(double arg1, double arg2)
-        throws org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero;
-
-    double divForSmallArgs(double arg1, double arg2)
-        throws org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero,
-        org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported;
-} // interface CalcOperations
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
deleted file mode 100644
index d7839ec4db..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
+++ /dev/null
@@ -1,41 +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.binding.corba.testing.exceptions.CalcPackage;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-public final class Arguments implements org.omg.CORBA.portable.IDLEntity {
-    public double arg1 = (double)0;
-    public double arg2 = (double)0;
-
-    public Arguments() {
-    } // ctor
-
-    public Arguments(double _arg1, double _arg2) {
-        arg1 = _arg1;
-        arg2 = _arg2;
-    } // ctor
-
-} // class Arguments
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
deleted file mode 100644
index c47d63208f..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.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 org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-abstract public class ArgumentsHelper {
-    private static String _id =
-        "IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc/Arguments/Arguments:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.Arguments that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.Arguments extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-    private static boolean __active = false;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            synchronized (org.omg.CORBA.TypeCode.class) {
-                if (__typeCode == null) {
-                    if (__active) {
-                        return org.omg.CORBA.ORB.init().create_recursive_tc(_id);
-                    }
-                    __active = true;
-                    org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember[2];
-                    org.omg.CORBA.TypeCode _tcOf_members0 = null;
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_double);
-                    _members0[0] = new org.omg.CORBA.StructMember("arg1", _tcOf_members0, null);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_double);
-                    _members0[1] = new org.omg.CORBA.StructMember("arg2", _tcOf_members0, null);
-                    __typeCode =
-                        org.omg.CORBA.ORB
-                            .init()
-                            .create_struct_tc(org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.ArgumentsHelper
-                                                  .id(),
-                                              "Arguments",
-                                              _members0);
-                    __active = false;
-                }
-            }
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.Arguments read(org.omg.CORBA.portable.InputStream istream) {
-        org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.Arguments value =
-            new org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.Arguments();
-        value.arg1 = istream.read_double();
-        value.arg2 = istream.read_double();
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.Arguments value) {
-        ostream.write_double(value.arg1);
-        ostream.write_double(value.arg2);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
deleted file mode 100644
index f767e8c11a..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.exceptions.CalcPackage;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-public final class ArgumentsHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.Arguments value = null;
-
-    public ArgumentsHolder() {
-    }
-
-    public ArgumentsHolder(org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.Arguments initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.ArgumentsHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.ArgumentsHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.ArgumentsHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
deleted file mode 100644
index e7cbb4b8ca..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.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 org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-public final class DivByZero extends org.omg.CORBA.UserException {
-    public org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.Arguments arguments = null;
-    public String info = null;
-
-    public DivByZero() {
-        super(DivByZeroHelper.id());
-    } // ctor
-
-    public DivByZero(org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.Arguments _arguments,
-                     String _info) {
-        super(DivByZeroHelper.id());
-        arguments = _arguments;
-        info = _info;
-    } // ctor
-
-    public DivByZero(String $reason,
-                     org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.Arguments _arguments,
-                     String _info) {
-        super(DivByZeroHelper.id() + "  " + $reason);
-        arguments = _arguments;
-        info = _info;
-    } // ctor
-
-} // class DivByZero
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
deleted file mode 100644
index 5d27f9969c..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
+++ /dev/null
@@ -1,100 +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.binding.corba.testing.exceptions.CalcPackage;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-abstract public class DivByZeroHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc/DivByZero:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-    private static boolean __active = false;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            synchronized (org.omg.CORBA.TypeCode.class) {
-                if (__typeCode == null) {
-                    if (__active) {
-                        return org.omg.CORBA.ORB.init().create_recursive_tc(_id);
-                    }
-                    __active = true;
-                    org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember[2];
-                    org.omg.CORBA.TypeCode _tcOf_members0 = null;
-                    _tcOf_members0 =
-                        org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.ArgumentsHelper.type();
-                    _members0[0] = new org.omg.CORBA.StructMember("arguments", _tcOf_members0, null);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().create_string_tc(0);
-                    _members0[1] = new org.omg.CORBA.StructMember("info", _tcOf_members0, null);
-                    __typeCode =
-                        org.omg.CORBA.ORB
-                            .init()
-                            .create_exception_tc(org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZeroHelper
-                                                     .id(),
-                                                 "DivByZero",
-                                                 _members0);
-                    __active = false;
-                }
-            }
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero read(org.omg.CORBA.portable.InputStream istream) {
-        org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero value =
-            new org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero();
-        // read and discard the repository ID
-        istream.read_string();
-        value.arguments =
-            org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.ArgumentsHelper.read(istream);
-        value.info = istream.read_string();
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero value) {
-        // write the repository ID
-        ostream.write_string(id());
-        org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.ArgumentsHelper.write(ostream,
-                                                                                                  value.arguments);
-        ostream.write_string(value.info);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
deleted file mode 100644
index ab01c66675..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.exceptions.CalcPackage;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-public final class DivByZeroHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero value = null;
-
-    public DivByZeroHolder() {
-    }
-
-    public DivByZeroHolder(org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZeroHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZeroHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZeroHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
deleted file mode 100644
index f4ea58e55e..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
+++ /dev/null
@@ -1,46 +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.binding.corba.testing.exceptions.CalcPackage;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-public final class NotSupported extends org.omg.CORBA.UserException {
-    public String info = null;
-
-    public NotSupported() {
-        super(NotSupportedHelper.id());
-    } // ctor
-
-    public NotSupported(String _info) {
-        super(NotSupportedHelper.id());
-        info = _info;
-    } // ctor
-
-    public NotSupported(String $reason, String _info) {
-        super(NotSupportedHelper.id() + "  " + $reason);
-        info = _info;
-    } // ctor
-
-} // class NotSupported
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
deleted file mode 100644
index 82609a36c1..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.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.binding.corba.testing.exceptions.CalcPackage;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-abstract public class NotSupportedHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc/NotSupported:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-    private static boolean __active = false;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            synchronized (org.omg.CORBA.TypeCode.class) {
-                if (__typeCode == null) {
-                    if (__active) {
-                        return org.omg.CORBA.ORB.init().create_recursive_tc(_id);
-                    }
-                    __active = true;
-                    org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember[1];
-                    org.omg.CORBA.TypeCode _tcOf_members0 = null;
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().create_string_tc(0);
-                    _members0[0] = new org.omg.CORBA.StructMember("info", _tcOf_members0, null);
-                    __typeCode =
-                        org.omg.CORBA.ORB
-                            .init()
-                            .create_exception_tc(org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupportedHelper
-                                                     .id(),
-                                                 "NotSupported",
-                                                 _members0);
-                    __active = false;
-                }
-            }
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported read(org.omg.CORBA.portable.InputStream istream) {
-        org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported value =
-            new org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported();
-        // read and discard the repository ID
-        istream.read_string();
-        value.info = istream.read_string();
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported value) {
-        // write the repository ID
-        ostream.write_string(id());
-        ostream.write_string(value.info);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
deleted file mode 100644
index 1389bd33d9..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.exceptions.CalcPackage;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-public final class NotSupportedHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported value = null;
-
-    public NotSupportedHolder() {
-    }
-
-    public NotSupportedHolder(org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupportedHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupportedHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupportedHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
deleted file mode 100644
index a73e252129..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
+++ /dev/null
@@ -1,102 +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.binding.corba.testing.exceptions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-public abstract class _CalcImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _CalcImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-        _methods.put("div", new java.lang.Integer(0));
-        _methods.put("divForSmallArgs", new java.lang.Integer(1));
-    }
-
-    public org.omg.CORBA.portable.OutputStream _invoke(String $method,
-                                                       org.omg.CORBA.portable.InputStream in,
-                                                       org.omg.CORBA.portable.ResponseHandler $rh) {
-        org.omg.CORBA.portable.OutputStream out = null;
-        java.lang.Integer __method = (java.lang.Integer)_methods.get($method);
-        if (__method == null)
-            throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-        switch (__method.intValue()) {
-            case 0: // org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc/div
-            {
-                try {
-                    double arg1 = in.read_double();
-                    double arg2 = in.read_double();
-                    double $result = (double)0;
-                    $result = this.div(arg1, arg2);
-                    out = $rh.createReply();
-                    out.write_double($result);
-                } catch (org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero $ex) {
-                    out = $rh.createExceptionReply();
-                    org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZeroHelper.write(out, $ex);
-                }
-                break;
-            }
-
-            case 1: // org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc/divForSmallArgs
-            {
-                try {
-                    double arg1 = in.read_double();
-                    double arg2 = in.read_double();
-                    double $result = (double)0;
-                    $result = this.divForSmallArgs(arg1, arg2);
-                    out = $rh.createReply();
-                    out.write_double($result);
-                } catch (org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero $ex) {
-                    out = $rh.createExceptionReply();
-                    org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZeroHelper.write(out, $ex);
-                } catch (org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported $ex) {
-                    out = $rh.createExceptionReply();
-                    org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupportedHelper.write(out,
-                                                                                                                 $ex);
-                }
-                break;
-            }
-
-            default:
-                throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-        }
-
-        return out;
-    } // _invoke
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _CalcImplBase
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
deleted file mode 100644
index 65ce051129..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
+++ /dev/null
@@ -1,106 +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.binding.corba.testing.exceptions;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from exceptions.idl
-* sobota, 7 czerwiec 2008 16:12:31 CEST
-*/
-
-public class _CalcStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.exceptions.Calc {
-
-    public double div(double arg1, double arg2)
-        throws org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("div", true);
-            $out.write_double(arg1);
-            $out.write_double(arg2);
-            $in = _invoke($out);
-            double $result = $in.read_double();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            if (_id.equals("IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc/DivByZero:1.0"))
-                throw org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZeroHelper.read($in);
-            else
-                throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return div(arg1, arg2);
-        } finally {
-            _releaseReply($in);
-        }
-    } // div
-
-    public double divForSmallArgs(double arg1, double arg2)
-        throws org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero,
-        org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("divForSmallArgs", true);
-            $out.write_double(arg1);
-            $out.write_double(arg2);
-            $in = _invoke($out);
-            double $result = $in.read_double();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            if (_id.equals("IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc/DivByZero:1.0"))
-                throw org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZeroHelper.read($in);
-            else if (_id.equals("IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc/NotSupported:1.0"))
-                throw org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupportedHelper.read($in);
-            else
-                throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return divForSmallArgs(arg1, arg2);
-        } finally {
-            _releaseReply($in);
-        }
-    } // divForSmallArgs
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-    private void readObject(java.io.ObjectInputStream s) throws java.io.IOException {
-        String str = s.readUTF();
-        String[] args = null;
-        java.util.Properties props = null;
-        org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init(args, props).string_to_object(str);
-        org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-        _set_delegate(delegate);
-    }
-
-    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
-        String[] args = null;
-        java.util.Properties props = null;
-        String str = org.omg.CORBA.ORB.init(args, props).object_to_string(this);
-        s.writeUTF(str);
-    }
-} // class _CalcStub
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
deleted file mode 100644
index fde204edf8..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public interface ArraysSetter extends ArraysSetterOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity {
-} // interface ArraysSetter
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
deleted file mode 100644
index 71b4fbbdb6..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
+++ /dev/null
@@ -1,100 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class ArraysSetterHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode =
-                org.omg.CORBA.ORB
-                    .init()
-                    .create_interface_tc(org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetterHelper.id(),
-                                         "ArraysSetter");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_ArraysSetterStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter)obj;
-        else if (!obj._is_a(id()))
-            throw new org.omg.CORBA.BAD_PARAM();
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.generated._ArraysSetterStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._ArraysSetterStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.generated._ArraysSetterStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._ArraysSetterStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
deleted file mode 100644
index d758a560a9..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class ArraysSetterHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter value = null;
-
-    public ArraysSetterHolder() {
-    }
-
-    public ArraysSetterHolder(org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetterHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetterHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetterHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
deleted file mode 100644
index 464c2ccbc3..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.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 org.apache.tuscany.sca.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public interface ArraysSetterOperations {
-    boolean[] setBoolean(boolean[] arg);
-
-    char[] setChar(char[] arg);
-
-    char[] setWchar(char[] arg);
-
-    byte[] setOctet(byte[] arg);
-
-    short[] setShort(short[] arg);
-
-    short[] setUnsignedShort(short[] arg);
-
-    int[] setLong(int[] arg);
-
-    int[] setUnsignedLong(int[] arg);
-
-    long[] setLongLong(long[] arg);
-
-    long[] setUnsignedLongLong(long[] arg);
-
-    float[] setFloat(float[] arg);
-
-    double[] setDouble(double[] arg);
-
-    String[] setString(String[] arg);
-
-    String[] setWstring(String[] arg);
-
-    org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] setRemoteObject(org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] obj);
-} // interface ArraysSetterOperations
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
deleted file mode 100644
index c053f12a02..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public interface PrimitivesSetter extends PrimitivesSetterOperations, org.omg.CORBA.Object,
-    org.omg.CORBA.portable.IDLEntity {
-} // interface PrimitivesSetter
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
deleted file mode 100644
index 566689960e..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
+++ /dev/null
@@ -1,100 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class PrimitivesSetterHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_interface_tc(org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetterHelper
-                                             .id(),
-                                         "PrimitivesSetter");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_PrimitivesSetterStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter)obj;
-        else if (!obj._is_a(id()))
-            throw new org.omg.CORBA.BAD_PARAM();
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.generated._PrimitivesSetterStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._PrimitivesSetterStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.generated._PrimitivesSetterStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._PrimitivesSetterStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
deleted file mode 100644
index 6564957081..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class PrimitivesSetterHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter value = null;
-
-    public PrimitivesSetterHolder() {
-    }
-
-    public PrimitivesSetterHolder(org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetterHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetterHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetterHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
deleted file mode 100644
index 26669de95a..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.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 org.apache.tuscany.sca.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public interface PrimitivesSetterOperations {
-    boolean setBoolean(boolean arg);
-
-    char setChar(char arg);
-
-    char setWchar(char arg);
-
-    byte setOctet(byte arg);
-
-    short setShort(short arg);
-
-    short setUnsignedShort(short arg);
-
-    int setLong(int arg);
-
-    int setUnsignedLong(int arg);
-
-    long setLongLong(long arg);
-
-    long setUnsignedLongLong(long arg);
-
-    float setFloat(float arg);
-
-    double setDouble(double arg);
-
-    String setString(String arg);
-
-    String setWstring(String arg);
-
-    org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject setRemoteObject(org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject obj);
-} // interface PrimitivesSetterOperations
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
deleted file mode 100644
index 5a140f5ecc..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public interface RemoteObject extends RemoteObjectOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity {
-} // interface RemoteObject
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
deleted file mode 100644
index 2a8fe73417..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
+++ /dev/null
@@ -1,100 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class RemoteObjectHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode =
-                org.omg.CORBA.ORB
-                    .init()
-                    .create_interface_tc(org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.id(),
-                                         "RemoteObject");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_RemoteObjectStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject)obj;
-        else if (!obj._is_a(id()))
-            throw new org.omg.CORBA.BAD_PARAM();
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.generated._RemoteObjectStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._RemoteObjectStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.generated._RemoteObjectStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._RemoteObjectStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
deleted file mode 100644
index 63e3926dd2..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class RemoteObjectHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject value = null;
-
-    public RemoteObjectHolder() {
-    }
-
-    public RemoteObjectHolder(org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
deleted file mode 100644
index a8231236eb..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public interface RemoteObjectOperations {
-} // interface RemoteObjectOperations
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
deleted file mode 100644
index ca86420240..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
+++ /dev/null
@@ -1,41 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class SimpleStruct implements org.omg.CORBA.portable.IDLEntity {
-    public String field1 = null;
-    public int field2 = (int)0;
-
-    public SimpleStruct() {
-    } // ctor
-
-    public SimpleStruct(String _field1, int _field2) {
-        field1 = _field1;
-        field2 = _field2;
-    } // ctor
-
-} // class SimpleStruct
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
deleted file mode 100644
index 2a8898d38f..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class SimpleStructHelper {
-    private static String _id =
-        "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct/SimpleStruct:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-    private static boolean __active = false;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            synchronized (org.omg.CORBA.TypeCode.class) {
-                if (__typeCode == null) {
-                    if (__active) {
-                        return org.omg.CORBA.ORB.init().create_recursive_tc(_id);
-                    }
-                    __active = true;
-                    org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember[2];
-                    org.omg.CORBA.TypeCode _tcOf_members0 = null;
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().create_string_tc(0);
-                    _members0[0] = new org.omg.CORBA.StructMember("field1", _tcOf_members0, null);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_long);
-                    _members0[1] = new org.omg.CORBA.StructMember("field2", _tcOf_members0, null);
-                    __typeCode =
-                        org.omg.CORBA.ORB.init()
-                            .create_struct_tc(org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper
-                                                  .id(),
-                                              "SimpleStruct",
-                                              _members0);
-                    __active = false;
-                }
-            }
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct read(org.omg.CORBA.portable.InputStream istream) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct value =
-            new org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct();
-        value.field1 = istream.read_string();
-        value.field2 = istream.read_long();
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct value) {
-        ostream.write_string(value.field1);
-        ostream.write_long(value.field2);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
deleted file mode 100644
index bed30e00ca..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class SimpleStructHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct value = null;
-
-    public SimpleStructHolder() {
-    }
-
-    public SimpleStructHolder(org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
deleted file mode 100644
index 73dbd6c198..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class SomeStruct implements org.omg.CORBA.portable.IDLEntity {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct innerStruct = null;
-    public String str = null;
-    public String str_list[] = null;
-    public int twoDimSeq[][] = null;
-    public int threeDimSeq[][][] = null;
-
-    public SomeStruct() {
-    } // ctor
-
-    public SomeStruct(org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct _innerStruct,
-                      String _str,
-                      String[] _str_list,
-                      int[][] _twoDimSeq,
-                      int[][][] _threeDimSeq) {
-        innerStruct = _innerStruct;
-        str = _str;
-        str_list = _str_list;
-        twoDimSeq = _twoDimSeq;
-        threeDimSeq = _threeDimSeq;
-    } // ctor
-
-} // class SomeStruct
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
deleted file mode 100644
index 8f524ffeb1..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
+++ /dev/null
@@ -1,146 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class SomeStructHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct/SomeStruct:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-    private static boolean __active = false;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            synchronized (org.omg.CORBA.TypeCode.class) {
-                if (__typeCode == null) {
-                    if (__active) {
-                        return org.omg.CORBA.ORB.init().create_recursive_tc(_id);
-                    }
-                    __active = true;
-                    org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember[5];
-                    org.omg.CORBA.TypeCode _tcOf_members0 = null;
-                    _tcOf_members0 = org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.type();
-                    _members0[0] = new org.omg.CORBA.StructMember("innerStruct", _tcOf_members0, null);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().create_string_tc(0);
-                    _members0[1] = new org.omg.CORBA.StructMember("str", _tcOf_members0, null);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().create_string_tc(0);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().create_sequence_tc(0, _tcOf_members0);
-                    _tcOf_members0 =
-                        org.omg.CORBA.ORB.init()
-                            .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper
-                                                 .id(),
-                                             "string_list",
-                                             _tcOf_members0);
-                    _members0[2] = new org.omg.CORBA.StructMember("str_list", _tcOf_members0, null);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_long);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().create_sequence_tc(0, _tcOf_members0);
-                    _tcOf_members0 =
-                        org.omg.CORBA.ORB.init()
-                            .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper
-                                                 .id(),
-                                             "long_seq1",
-                                             _tcOf_members0);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().create_sequence_tc(0, _tcOf_members0);
-                    _tcOf_members0 =
-                        org.omg.CORBA.ORB.init()
-                            .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper
-                                                 .id(),
-                                             "long_seq2",
-                                             _tcOf_members0);
-                    _members0[3] = new org.omg.CORBA.StructMember("twoDimSeq", _tcOf_members0, null);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_long);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().create_sequence_tc(0, _tcOf_members0);
-                    _tcOf_members0 =
-                        org.omg.CORBA.ORB.init()
-                            .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper
-                                                 .id(),
-                                             "long_seq1",
-                                             _tcOf_members0);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().create_sequence_tc(0, _tcOf_members0);
-                    _tcOf_members0 =
-                        org.omg.CORBA.ORB.init()
-                            .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper
-                                                 .id(),
-                                             "long_seq2",
-                                             _tcOf_members0);
-                    _tcOf_members0 = org.omg.CORBA.ORB.init().create_sequence_tc(0, _tcOf_members0);
-                    _tcOf_members0 =
-                        org.omg.CORBA.ORB.init()
-                            .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper
-                                                 .id(),
-                                             "long_seq3",
-                                             _tcOf_members0);
-                    _members0[4] = new org.omg.CORBA.StructMember("threeDimSeq", _tcOf_members0, null);
-                    __typeCode =
-                        org.omg.CORBA.ORB.init()
-                            .create_struct_tc(org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper
-                                                  .id(),
-                                              "SomeStruct",
-                                              _members0);
-                    __active = false;
-                }
-            }
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct read(org.omg.CORBA.portable.InputStream istream) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct value =
-            new org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct();
-        value.innerStruct = org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.read(istream);
-        value.str = istream.read_string();
-        value.str_list = org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.read(istream);
-        value.twoDimSeq = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.read(istream);
-        value.threeDimSeq = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.read(istream);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct value) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.write(ostream, value.innerStruct);
-        ostream.write_string(value.str);
-        org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.write(ostream, value.str_list);
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.write(ostream, value.twoDimSeq);
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.write(ostream, value.threeDimSeq);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
deleted file mode 100644
index 3231a136dc..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class SomeStructHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct value = null;
-
-    public SomeStructHolder() {
-    }
-
-    public SomeStructHolder(org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
deleted file mode 100644
index 28d3ecdc91..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public interface TestObject extends TestObjectOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity {
-} // interface TestObject
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
deleted file mode 100644
index 29ff2edfd2..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
+++ /dev/null
@@ -1,99 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class TestObjectHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.TestObject that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.TestObject extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_interface_tc(org.apache.tuscany.sca.binding.corba.testing.generated.TestObjectHelper.id(),
-                                         "TestObject");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.TestObject read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_TestObjectStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.TestObject value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.TestObject narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.TestObject)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.TestObject)obj;
-        else if (!obj._is_a(id()))
-            throw new org.omg.CORBA.BAD_PARAM();
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.generated._TestObjectStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._TestObjectStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.TestObject unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.generated.TestObject)
-            return (org.apache.tuscany.sca.binding.corba.testing.generated.TestObject)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.generated._TestObjectStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.generated._TestObjectStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
deleted file mode 100644
index b8aea13c8d..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class TestObjectHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.TestObject value = null;
-
-    public TestObjectHolder() {
-    }
-
-    public TestObjectHolder(org.apache.tuscany.sca.binding.corba.testing.generated.TestObject initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.TestObjectHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.TestObjectHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.TestObjectHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
deleted file mode 100644
index 0bacb6746a..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.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 org.apache.tuscany.sca.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public interface TestObjectOperations {
-    org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct pickStructFromArgs(org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg1,
-                                                                                         org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg2,
-                                                                                         org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg3,
-                                                                                         int structNumber);
-
-    org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct setStruct(org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg);
-
-    org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct setSimpleStruct(org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHolder arg);
-
-    int[] setLongSeq1(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Holder arg);
-
-    int[][] setLongSeq2(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Holder arg);
-
-    int[][][] setLongSeq3(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Holder arg);
-} // interface TestObjectOperations
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
deleted file mode 100644
index c6e8c2a4e0..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
+++ /dev/null
@@ -1,232 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public abstract class _ArraysSetterImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _ArraysSetterImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-        _methods.put("setBoolean", new java.lang.Integer(0));
-        _methods.put("setChar", new java.lang.Integer(1));
-        _methods.put("setWchar", new java.lang.Integer(2));
-        _methods.put("setOctet", new java.lang.Integer(3));
-        _methods.put("setShort", new java.lang.Integer(4));
-        _methods.put("setUnsignedShort", new java.lang.Integer(5));
-        _methods.put("setLong", new java.lang.Integer(6));
-        _methods.put("setUnsignedLong", new java.lang.Integer(7));
-        _methods.put("setLongLong", new java.lang.Integer(8));
-        _methods.put("setUnsignedLongLong", new java.lang.Integer(9));
-        _methods.put("setFloat", new java.lang.Integer(10));
-        _methods.put("setDouble", new java.lang.Integer(11));
-        _methods.put("setString", new java.lang.Integer(12));
-        _methods.put("setWstring", new java.lang.Integer(13));
-        _methods.put("setRemoteObject", new java.lang.Integer(14));
-    }
-
-    public org.omg.CORBA.portable.OutputStream _invoke(String $method,
-                                                       org.omg.CORBA.portable.InputStream in,
-                                                       org.omg.CORBA.portable.ResponseHandler $rh) {
-        org.omg.CORBA.portable.OutputStream out = null;
-        java.lang.Integer __method = (java.lang.Integer)_methods.get($method);
-        if (__method == null)
-            throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-        switch (__method.intValue()) {
-            case 0: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setBoolean
-            {
-                boolean arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.read(in);
-                boolean $result[] = null;
-                $result = this.setBoolean(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.write(out, $result);
-                break;
-            }
-
-            case 1: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setChar
-            {
-                char arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.read(in);
-                char $result[] = null;
-                $result = this.setChar(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.write(out, $result);
-                break;
-            }
-
-            case 2: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setWchar
-            {
-                char arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.read(in);
-                char $result[] = null;
-                $result = this.setWchar(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.write(out, $result);
-                break;
-            }
-
-            case 3: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setOctet
-            {
-                byte arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.read(in);
-                byte $result[] = null;
-                $result = this.setOctet(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.write(out, $result);
-                break;
-            }
-
-            case 4: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setShort
-            {
-                short arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.read(in);
-                short $result[] = null;
-                $result = this.setShort(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.write(out, $result);
-                break;
-            }
-
-            case 5: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setUnsignedShort
-            {
-                short arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.read(in);
-                short $result[] = null;
-                $result = this.setUnsignedShort(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.write(out, $result);
-                break;
-            }
-
-            case 6: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setLong
-            {
-                int arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.read(in);
-                int $result[] = null;
-                $result = this.setLong(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.write(out, $result);
-                break;
-            }
-
-            case 7: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setUnsignedLong
-            {
-                int arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.read(in);
-                int $result[] = null;
-                $result = this.setUnsignedLong(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.write(out, $result);
-                break;
-            }
-
-            case 8: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setLongLong
-            {
-                long arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.read(in);
-                long $result[] = null;
-                $result = this.setLongLong(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.write(out, $result);
-                break;
-            }
-
-            case 9: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setUnsignedLongLong
-            {
-                long arg[] =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper.read(in);
-                long $result[] = null;
-                $result = this.setUnsignedLongLong(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper
-                    .write(out, $result);
-                break;
-            }
-
-            case 10: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setFloat
-            {
-                float arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.read(in);
-                float $result[] = null;
-                $result = this.setFloat(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.write(out, $result);
-                break;
-            }
-
-            case 11: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setDouble
-            {
-                double arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.read(in);
-                double $result[] = null;
-                $result = this.setDouble(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.write(out, $result);
-                break;
-            }
-
-            case 12: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setString
-            {
-                String arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.read(in);
-                String $result[] = null;
-                $result = this.setString(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.write(out, $result);
-                break;
-            }
-
-            case 13: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setWstring
-            {
-                String arg[] = org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.read(in);
-                String $result[] = null;
-                $result = this.setWstring(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.write(out, $result);
-                break;
-            }
-
-            case 14: // org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter/setRemoteObject
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject obj[] =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject $result[] = null;
-                $result = this.setRemoteObject(obj);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.write(out, $result);
-                break;
-            }
-
-            default:
-                throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-        }
-
-        return out;
-    } // _invoke
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _ArraysSetterImplBase
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
deleted file mode 100644
index 079cc6e899..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
+++ /dev/null
@@ -1,343 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public class _ArraysSetterStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.ArraysSetter {
-
-    public boolean[] setBoolean(boolean[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setBoolean", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.write($out, arg);
-            $in = _invoke($out);
-            boolean $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setBoolean(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setBoolean
-
-    public char[] setChar(char[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setChar", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.write($out, arg);
-            $in = _invoke($out);
-            char $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setChar(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setChar
-
-    public char[] setWchar(char[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setWchar", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.write($out, arg);
-            $in = _invoke($out);
-            char $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setWchar(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setWchar
-
-    public byte[] setOctet(byte[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setOctet", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.write($out, arg);
-            $in = _invoke($out);
-            byte $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setOctet(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setOctet
-
-    public short[] setShort(short[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setShort", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.write($out, arg);
-            $in = _invoke($out);
-            short $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setShort(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setShort
-
-    public short[] setUnsignedShort(short[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setUnsignedShort", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.write($out, arg);
-            $in = _invoke($out);
-            short $result[] =
-                org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setUnsignedShort(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setUnsignedShort
-
-    public int[] setLong(int[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLong", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.write($out, arg);
-            $in = _invoke($out);
-            int $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLong
-
-    public int[] setUnsignedLong(int[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setUnsignedLong", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.write($out, arg);
-            $in = _invoke($out);
-            int $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setUnsignedLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setUnsignedLong
-
-    public long[] setLongLong(long[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLongLong", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.write($out, arg);
-            $in = _invoke($out);
-            long $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setLongLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLongLong
-
-    public long[] setUnsignedLongLong(long[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setUnsignedLongLong", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper.write($out, arg);
-            $in = _invoke($out);
-            long $result[] =
-                org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setUnsignedLongLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setUnsignedLongLong
-
-    public float[] setFloat(float[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setFloat", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.write($out, arg);
-            $in = _invoke($out);
-            float $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setFloat(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setFloat
-
-    public double[] setDouble(double[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setDouble", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.write($out, arg);
-            $in = _invoke($out);
-            double $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setDouble(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setDouble
-
-    public String[] setString(String[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setString", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.write($out, arg);
-            $in = _invoke($out);
-            String $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setString(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setString
-
-    public String[] setWstring(String[] arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setWstring", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.write($out, arg);
-            $in = _invoke($out);
-            String $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setWstring(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setWstring
-
-    public org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] setRemoteObject(org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] obj) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setRemoteObject", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.write($out, obj);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject $result[] =
-                org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setRemoteObject(obj);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setRemoteObject
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-    private void readObject(java.io.ObjectInputStream s) throws java.io.IOException {
-        String str = s.readUTF();
-        String[] args = null;
-        java.util.Properties props = null;
-        org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init(args, props).string_to_object(str);
-        org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-        _set_delegate(delegate);
-    }
-
-    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
-        String[] args = null;
-        java.util.Properties props = null;
-        String str = org.omg.CORBA.ORB.init(args, props).object_to_string(this);
-        s.writeUTF(str);
-    }
-} // class _ArraysSetterStub
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
deleted file mode 100644
index b444ce68d8..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
+++ /dev/null
@@ -1,230 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public abstract class _PrimitivesSetterImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _PrimitivesSetterImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-        _methods.put("setBoolean", new java.lang.Integer(0));
-        _methods.put("setChar", new java.lang.Integer(1));
-        _methods.put("setWchar", new java.lang.Integer(2));
-        _methods.put("setOctet", new java.lang.Integer(3));
-        _methods.put("setShort", new java.lang.Integer(4));
-        _methods.put("setUnsignedShort", new java.lang.Integer(5));
-        _methods.put("setLong", new java.lang.Integer(6));
-        _methods.put("setUnsignedLong", new java.lang.Integer(7));
-        _methods.put("setLongLong", new java.lang.Integer(8));
-        _methods.put("setUnsignedLongLong", new java.lang.Integer(9));
-        _methods.put("setFloat", new java.lang.Integer(10));
-        _methods.put("setDouble", new java.lang.Integer(11));
-        _methods.put("setString", new java.lang.Integer(12));
-        _methods.put("setWstring", new java.lang.Integer(13));
-        _methods.put("setRemoteObject", new java.lang.Integer(14));
-    }
-
-    public org.omg.CORBA.portable.OutputStream _invoke(String $method,
-                                                       org.omg.CORBA.portable.InputStream in,
-                                                       org.omg.CORBA.portable.ResponseHandler $rh) {
-        org.omg.CORBA.portable.OutputStream out = null;
-        java.lang.Integer __method = (java.lang.Integer)_methods.get($method);
-        if (__method == null)
-            throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-        switch (__method.intValue()) {
-            case 0: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setBoolean
-            {
-                boolean arg = in.read_boolean();
-                boolean $result = false;
-                $result = this.setBoolean(arg);
-                out = $rh.createReply();
-                out.write_boolean($result);
-                break;
-            }
-
-            case 1: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setChar
-            {
-                char arg = in.read_char();
-                char $result = (char)0;
-                $result = this.setChar(arg);
-                out = $rh.createReply();
-                out.write_char($result);
-                break;
-            }
-
-            case 2: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setWchar
-            {
-                char arg = in.read_wchar();
-                char $result = (char)0;
-                $result = this.setWchar(arg);
-                out = $rh.createReply();
-                out.write_wchar($result);
-                break;
-            }
-
-            case 3: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setOctet
-            {
-                byte arg = in.read_octet();
-                byte $result = (byte)0;
-                $result = this.setOctet(arg);
-                out = $rh.createReply();
-                out.write_octet($result);
-                break;
-            }
-
-            case 4: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setShort
-            {
-                short arg = in.read_short();
-                short $result = (short)0;
-                $result = this.setShort(arg);
-                out = $rh.createReply();
-                out.write_short($result);
-                break;
-            }
-
-            case 5: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setUnsignedShort
-            {
-                short arg = in.read_ushort();
-                short $result = (short)0;
-                $result = this.setUnsignedShort(arg);
-                out = $rh.createReply();
-                out.write_ushort($result);
-                break;
-            }
-
-            case 6: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setLong
-            {
-                int arg = in.read_long();
-                int $result = (int)0;
-                $result = this.setLong(arg);
-                out = $rh.createReply();
-                out.write_long($result);
-                break;
-            }
-
-            case 7: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setUnsignedLong
-            {
-                int arg = in.read_ulong();
-                int $result = (int)0;
-                $result = this.setUnsignedLong(arg);
-                out = $rh.createReply();
-                out.write_ulong($result);
-                break;
-            }
-
-            case 8: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setLongLong
-            {
-                long arg = in.read_longlong();
-                long $result = (long)0;
-                $result = this.setLongLong(arg);
-                out = $rh.createReply();
-                out.write_longlong($result);
-                break;
-            }
-
-            case 9: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setUnsignedLongLong
-            {
-                long arg = in.read_ulonglong();
-                long $result = (long)0;
-                $result = this.setUnsignedLongLong(arg);
-                out = $rh.createReply();
-                out.write_ulonglong($result);
-                break;
-            }
-
-            case 10: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setFloat
-            {
-                float arg = in.read_float();
-                float $result = (float)0;
-                $result = this.setFloat(arg);
-                out = $rh.createReply();
-                out.write_float($result);
-                break;
-            }
-
-            case 11: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setDouble
-            {
-                double arg = in.read_double();
-                double $result = (double)0;
-                $result = this.setDouble(arg);
-                out = $rh.createReply();
-                out.write_double($result);
-                break;
-            }
-
-            case 12: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setString
-            {
-                String arg = in.read_string();
-                String $result = null;
-                $result = this.setString(arg);
-                out = $rh.createReply();
-                out.write_string($result);
-                break;
-            }
-
-            case 13: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setWstring
-            {
-                String arg = in.read_wstring();
-                String $result = null;
-                $result = this.setWstring(arg);
-                out = $rh.createReply();
-                out.write_wstring($result);
-                break;
-            }
-
-            case 14: // org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter/setRemoteObject
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject obj =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject $result = null;
-                $result = this.setRemoteObject(obj);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.write(out, $result);
-                break;
-            }
-
-            default:
-                throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-        }
-
-        return out;
-    } // _invoke
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _PrimitivesSetterImplBase
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
deleted file mode 100644
index 0b08e1fb67..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
+++ /dev/null
@@ -1,341 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public class _PrimitivesSetterStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.PrimitivesSetter {
-
-    public boolean setBoolean(boolean arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setBoolean", true);
-            $out.write_boolean(arg);
-            $in = _invoke($out);
-            boolean $result = $in.read_boolean();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setBoolean(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setBoolean
-
-    public char setChar(char arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setChar", true);
-            $out.write_char(arg);
-            $in = _invoke($out);
-            char $result = $in.read_char();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setChar(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setChar
-
-    public char setWchar(char arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setWchar", true);
-            $out.write_wchar(arg);
-            $in = _invoke($out);
-            char $result = $in.read_wchar();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setWchar(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setWchar
-
-    public byte setOctet(byte arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setOctet", true);
-            $out.write_octet(arg);
-            $in = _invoke($out);
-            byte $result = $in.read_octet();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setOctet(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setOctet
-
-    public short setShort(short arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setShort", true);
-            $out.write_short(arg);
-            $in = _invoke($out);
-            short $result = $in.read_short();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setShort(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setShort
-
-    public short setUnsignedShort(short arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setUnsignedShort", true);
-            $out.write_ushort(arg);
-            $in = _invoke($out);
-            short $result = $in.read_ushort();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setUnsignedShort(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setUnsignedShort
-
-    public int setLong(int arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLong", true);
-            $out.write_long(arg);
-            $in = _invoke($out);
-            int $result = $in.read_long();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLong
-
-    public int setUnsignedLong(int arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setUnsignedLong", true);
-            $out.write_ulong(arg);
-            $in = _invoke($out);
-            int $result = $in.read_ulong();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setUnsignedLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setUnsignedLong
-
-    public long setLongLong(long arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLongLong", true);
-            $out.write_longlong(arg);
-            $in = _invoke($out);
-            long $result = $in.read_longlong();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setLongLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLongLong
-
-    public long setUnsignedLongLong(long arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setUnsignedLongLong", true);
-            $out.write_ulonglong(arg);
-            $in = _invoke($out);
-            long $result = $in.read_ulonglong();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setUnsignedLongLong(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setUnsignedLongLong
-
-    public float setFloat(float arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setFloat", true);
-            $out.write_float(arg);
-            $in = _invoke($out);
-            float $result = $in.read_float();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setFloat(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setFloat
-
-    public double setDouble(double arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setDouble", true);
-            $out.write_double(arg);
-            $in = _invoke($out);
-            double $result = $in.read_double();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setDouble(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setDouble
-
-    public String setString(String arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setString", true);
-            $out.write_string(arg);
-            $in = _invoke($out);
-            String $result = $in.read_string();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setString(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setString
-
-    public String setWstring(String arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setWstring", true);
-            $out.write_wstring(arg);
-            $in = _invoke($out);
-            String $result = $in.read_wstring();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setWstring(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setWstring
-
-    public org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject setRemoteObject(org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject obj) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setRemoteObject", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.write($out, obj);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject $result =
-                org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setRemoteObject(obj);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setRemoteObject
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-    private void readObject(java.io.ObjectInputStream s) throws java.io.IOException {
-        String str = s.readUTF();
-        String[] args = null;
-        java.util.Properties props = null;
-        org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init(args, props).string_to_object(str);
-        org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-        _set_delegate(delegate);
-    }
-
-    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
-        String[] args = null;
-        java.util.Properties props = null;
-        String str = org.omg.CORBA.ORB.init(args, props).object_to_string(this);
-        s.writeUTF(str);
-    }
-} // class _PrimitivesSetterStub
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
deleted file mode 100644
index a87534f88b..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.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 org.apache.tuscany.sca.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public abstract class _RemoteObjectImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _RemoteObjectImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-    }
-
-    public org.omg.CORBA.portable.OutputStream _invoke(String $method,
-                                                       org.omg.CORBA.portable.InputStream in,
-                                                       org.omg.CORBA.portable.ResponseHandler $rh) {
-        org.omg.CORBA.portable.OutputStream out = null;
-        java.lang.Integer __method = (java.lang.Integer)_methods.get($method);
-        if (__method == null)
-            throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-        return out;
-    } // _invoke
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _RemoteObjectImplBase
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
deleted file mode 100644
index e219dfa338..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.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 org.apache.tuscany.sca.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public class _RemoteObjectStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject {
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-    private void readObject(java.io.ObjectInputStream s) throws java.io.IOException {
-        String str = s.readUTF();
-        String[] args = null;
-        java.util.Properties props = null;
-        org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init(args, props).string_to_object(str);
-        org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-        _set_delegate(delegate);
-    }
-
-    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
-        String[] args = null;
-        java.util.Properties props = null;
-        String str = org.omg.CORBA.ORB.init(args, props).object_to_string(this);
-        s.writeUTF(str);
-    }
-} // class _RemoteObjectStub
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
deleted file mode 100644
index c0bc0d6ebd..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
+++ /dev/null
@@ -1,149 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public abstract class _TestObjectImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.TestObject, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _TestObjectImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-        _methods.put("pickStructFromArgs", new java.lang.Integer(0));
-        _methods.put("setStruct", new java.lang.Integer(1));
-        _methods.put("setSimpleStruct", new java.lang.Integer(2));
-        _methods.put("setLongSeq1", new java.lang.Integer(3));
-        _methods.put("setLongSeq2", new java.lang.Integer(4));
-        _methods.put("setLongSeq3", new java.lang.Integer(5));
-    }
-
-    public org.omg.CORBA.portable.OutputStream _invoke(String $method,
-                                                       org.omg.CORBA.portable.InputStream in,
-                                                       org.omg.CORBA.portable.ResponseHandler $rh) {
-        org.omg.CORBA.portable.OutputStream out = null;
-        java.lang.Integer __method = (java.lang.Integer)_methods.get($method);
-        if (__method == null)
-            throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-        switch (__method.intValue()) {
-            case 0: // org/apache/tuscany/sca/binding/corba/testing/generated/TestObject/pickStructFromArgs
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg1 =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg2 =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg3 =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read(in);
-                int structNumber = in.read_long();
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct $result = null;
-                $result = this.pickStructFromArgs(arg1, arg2, arg3, structNumber);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write(out, $result);
-                break;
-            }
-
-            case 1: // org/apache/tuscany/sca/binding/corba/testing/generated/TestObject/setStruct
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg =
-                    org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct $result = null;
-                $result = this.setStruct(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write(out, $result);
-                break;
-            }
-
-            case 2: // org/apache/tuscany/sca/binding/corba/testing/generated/TestObject/setSimpleStruct
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHolder arg =
-                    new org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHolder();
-                arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct $result = null;
-                $result = this.setSimpleStruct(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.write(out, $result);
-                org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.write(out, arg.value);
-                break;
-            }
-
-            case 3: // org/apache/tuscany/sca/binding/corba/testing/generated/TestObject/setLongSeq1
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Holder arg =
-                    new org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Holder();
-                arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.read(in);
-                int $result[] = null;
-                $result = this.setLongSeq1(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.write(out, $result);
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.write(out, arg.value);
-                break;
-            }
-
-            case 4: // org/apache/tuscany/sca/binding/corba/testing/generated/TestObject/setLongSeq2
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Holder arg =
-                    new org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Holder();
-                arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.read(in);
-                int $result[][] = null;
-                $result = this.setLongSeq2(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.write(out, $result);
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.write(out, arg.value);
-                break;
-            }
-
-            case 5: // org/apache/tuscany/sca/binding/corba/testing/generated/TestObject/setLongSeq3
-            {
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Holder arg =
-                    new org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Holder();
-                arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.read(in);
-                int $result[][][] = null;
-                $result = this.setLongSeq3(arg);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.write(out, $result);
-                org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.write(out, arg.value);
-                break;
-            }
-
-            default:
-                throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-        }
-
-        return out;
-    } // _invoke
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _TestObjectImplBase
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
deleted file mode 100644
index ad47595ddf..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
+++ /dev/null
@@ -1,182 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public class _TestObjectStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.generated.TestObject {
-
-    public org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct pickStructFromArgs(org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg1,
-                                                                                                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg2,
-                                                                                                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg3,
-                                                                                                int structNumber) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("pickStructFromArgs", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write($out, arg1);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write($out, arg2);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write($out, arg3);
-            $out.write_long(structNumber);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct $result =
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return pickStructFromArgs(arg1, arg2, arg3, structNumber);
-        } finally {
-            _releaseReply($in);
-        }
-    } // pickStructFromArgs
-
-    public org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct setStruct(org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setStruct", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.write($out, arg);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct $result =
-                org.apache.tuscany.sca.binding.corba.testing.generated.SomeStructHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setStruct(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setStruct
-
-    public org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct setSimpleStruct(org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHolder arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setSimpleStruct", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.write($out, arg.value);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct $result =
-                org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.read($in);
-            arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setSimpleStruct(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setSimpleStruct
-
-    public int[] setLongSeq1(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Holder arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLongSeq1", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.write($out, arg.value);
-            $in = _invoke($out);
-            int $result[] = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.read($in);
-            arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setLongSeq1(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLongSeq1
-
-    public int[][] setLongSeq2(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Holder arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLongSeq2", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.write($out, arg.value);
-            $in = _invoke($out);
-            int $result[][] = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.read($in);
-            arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setLongSeq2(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLongSeq2
-
-    public int[][][] setLongSeq3(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Holder arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("setLongSeq3", true);
-            org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.write($out, arg.value);
-            $in = _invoke($out);
-            int $result[][][] = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.read($in);
-            arg.value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return setLongSeq3(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // setLongSeq3
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/generated/TestObject:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-    private void readObject(java.io.ObjectInputStream s) throws java.io.IOException {
-        String str = s.readUTF();
-        String[] args = null;
-        java.util.Properties props = null;
-        org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init(args, props).string_to_object(str);
-        org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-        _set_delegate(delegate);
-    }
-
-    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
-        String[] args = null;
-        java.util.Properties props = null;
-        String str = org.omg.CORBA.ORB.init(args, props).object_to_string(this);
-        s.writeUTF(str);
-    }
-} // class _TestObjectStub
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
deleted file mode 100644
index f3d96e8fd7..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class boolean_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/boolean_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, boolean[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static boolean[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_boolean);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.id(),
-                                     "boolean_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static boolean[] read(org.omg.CORBA.portable.InputStream istream) {
-        boolean value[] = null;
-        int _len0 = istream.read_long();
-        value = new boolean[_len0];
-        istream.read_boolean_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, boolean[] value) {
-        ostream.write_long(value.length);
-        ostream.write_boolean_array(value, 0, value.length);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
deleted file mode 100644
index cb0ab8bcfd..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class boolean_listHolder implements org.omg.CORBA.portable.Streamable {
-    public boolean value[] = null;
-
-    public boolean_listHolder() {
-    }
-
-    public boolean_listHolder(boolean[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.boolean_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
deleted file mode 100644
index 0bde1e701c..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class char_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/char_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, char[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static char[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_char);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.id(),
-                                     "char_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static char[] read(org.omg.CORBA.portable.InputStream istream) {
-        char value[] = null;
-        int _len0 = istream.read_long();
-        value = new char[_len0];
-        istream.read_char_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, char[] value) {
-        ostream.write_long(value.length);
-        ostream.write_char_array(value, 0, value.length);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
deleted file mode 100644
index 19b2942cfe..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class char_listHolder implements org.omg.CORBA.portable.Streamable {
-    public char value[] = null;
-
-    public char_listHolder() {
-    }
-
-    public char_listHolder(char[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.char_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
deleted file mode 100644
index 8bb5a9c69d..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class double_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/double_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, double[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static double[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_double);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.id(),
-                                     "double_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static double[] read(org.omg.CORBA.portable.InputStream istream) {
-        double value[] = null;
-        int _len0 = istream.read_long();
-        value = new double[_len0];
-        istream.read_double_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, double[] value) {
-        ostream.write_long(value.length);
-        ostream.write_double_array(value, 0, value.length);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
deleted file mode 100644
index dc89e71092..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class double_listHolder implements org.omg.CORBA.portable.Streamable {
-    public double value[] = null;
-
-    public double_listHolder() {
-    }
-
-    public double_listHolder(double[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.double_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
deleted file mode 100644
index 7b71aa0a9f..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class float_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/float_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, float[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static float[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_float);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.id(),
-                                     "float_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static float[] read(org.omg.CORBA.portable.InputStream istream) {
-        float value[] = null;
-        int _len0 = istream.read_long();
-        value = new float[_len0];
-        istream.read_float_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, float[] value) {
-        ostream.write_long(value.length);
-        ostream.write_float_array(value, 0, value.length);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
deleted file mode 100644
index 513bab37cc..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class float_listHolder implements org.omg.CORBA.portable.Streamable {
-    public float value[] = null;
-
-    public float_listHolder() {
-    }
-
-    public float_listHolder(float[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.float_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
deleted file mode 100644
index c1d06e2ba9..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class long_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/long_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, int[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static int[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_long);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.id(),
-                                     "long_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static int[] read(org.omg.CORBA.portable.InputStream istream) {
-        int value[] = null;
-        int _len0 = istream.read_long();
-        value = new int[_len0];
-        istream.read_long_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, int[] value) {
-        ostream.write_long(value.length);
-        ostream.write_long_array(value, 0, value.length);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
deleted file mode 100644
index f9ad7b77ac..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class long_listHolder implements org.omg.CORBA.portable.Streamable {
-    public int value[] = null;
-
-    public long_listHolder() {
-    }
-
-    public long_listHolder(int[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.long_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
deleted file mode 100644
index cfb292fc01..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-abstract public class long_long_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/long_long_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, long[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static long[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_longlong);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.id(),
-                                     "long_long_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static long[] read(org.omg.CORBA.portable.InputStream istream) {
-        long value[] = null;
-        int _len0 = istream.read_long();
-        value = new long[_len0];
-        istream.read_longlong_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, long[] value) {
-        ostream.write_long(value.length);
-        ostream.write_longlong_array(value, 0, value.length);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
deleted file mode 100644
index 02f46a7d85..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 14:12:28 CEST
-*/
-
-public final class long_long_listHolder implements org.omg.CORBA.portable.Streamable {
-    public long value[] = null;
-
-    public long_long_listHolder() {
-    }
-
-    public long_long_listHolder(long[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.long_long_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
deleted file mode 100644
index 505aa3f026..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class long_seq1Helper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, int[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static int[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_long);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.id(),
-                                     "long_seq1",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static int[] read(org.omg.CORBA.portable.InputStream istream) {
-        int value[] = null;
-        int _len0 = istream.read_long();
-        value = new int[_len0];
-        istream.read_long_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, int[] value) {
-        ostream.write_long(value.length);
-        ostream.write_long_array(value, 0, value.length);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
deleted file mode 100644
index 5cbaa109ee..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class long_seq1Holder implements org.omg.CORBA.portable.Streamable {
-    public int value[] = null;
-
-    public long_seq1Holder() {
-    }
-
-    public long_seq1Holder(int[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
deleted file mode 100644
index 2f792888fb..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
+++ /dev/null
@@ -1,83 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class long_seq2Helper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, int[][] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static int[][] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_long);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.id(),
-                                     "long_seq1",
-                                     __typeCode);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.id(),
-                                     "long_seq2",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static int[][] read(org.omg.CORBA.portable.InputStream istream) {
-        int value[][] = null;
-        int _len0 = istream.read_long();
-        value = new int[_len0][];
-        for (int _o1 = 0; _o1 < value.length; ++_o1)
-            value[_o1] = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.read(istream);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, int[][] value) {
-        ostream.write_long(value.length);
-        for (int _i0 = 0; _i0 < value.length; ++_i0)
-            org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.write(ostream, value[_i0]);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
deleted file mode 100644
index 8b2ccc1f73..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class long_seq2Holder implements org.omg.CORBA.portable.Streamable {
-    public int value[][] = null;
-
-    public long_seq2Holder() {
-    }
-
-    public long_seq2Holder(int[][] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
deleted file mode 100644
index 67e224f0be..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
+++ /dev/null
@@ -1,89 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class long_seq3Helper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, int[][][] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static int[][][] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_long);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Helper.id(),
-                                     "long_seq1",
-                                     __typeCode);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.id(),
-                                     "long_seq2",
-                                     __typeCode);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.id(),
-                                     "long_seq3",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static int[][][] read(org.omg.CORBA.portable.InputStream istream) {
-        int value[][][] = null;
-        int _len0 = istream.read_long();
-        value = new int[_len0][][];
-        for (int _o1 = 0; _o1 < value.length; ++_o1)
-            value[_o1] = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.read(istream);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, int[][][] value) {
-        ostream.write_long(value.length);
-        for (int _i0 = 0; _i0 < value.length; ++_i0)
-            org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Helper.write(ostream, value[_i0]);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
deleted file mode 100644
index 5d4adfba2d..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class long_seq3Holder implements org.omg.CORBA.portable.Streamable {
-    public int value[][][] = null;
-
-    public long_seq3Holder() {
-    }
-
-    public long_seq3Holder(int[][][] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Helper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
deleted file mode 100644
index c7d86d9179..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class octet_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/octet_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, byte[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static byte[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_octet);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.id(),
-                                     "octet_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static byte[] read(org.omg.CORBA.portable.InputStream istream) {
-        byte value[] = null;
-        int _len0 = istream.read_long();
-        value = new byte[_len0];
-        istream.read_octet_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, byte[] value) {
-        ostream.write_long(value.length);
-        ostream.write_octet_array(value, 0, value.length);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
deleted file mode 100644
index 09b2b85c6a..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class octet_listHolder implements org.omg.CORBA.portable.Streamable {
-    public byte value[] = null;
-
-    public octet_listHolder() {
-    }
-
-    public octet_listHolder(byte[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.octet_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
deleted file mode 100644
index e88b1e06c4..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
+++ /dev/null
@@ -1,80 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class remote_object_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.type();
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper
-                                         .id(),
-                                     "remote_object_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] read(org.omg.CORBA.portable.InputStream istream) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject value[] = null;
-        int _len0 = istream.read_long();
-        value = new org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[_len0];
-        for (int _o1 = 0; _o1 < value.length; ++_o1)
-            value[_o1] = org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.read(istream);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] value) {
-        ostream.write_long(value.length);
-        for (int _i0 = 0; _i0 < value.length; ++_i0)
-            org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObjectHelper.write(ostream, value[_i0]);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
deleted file mode 100644
index d3f996c5b4..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class remote_object_listHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject value[] = null;
-
-    public remote_object_listHolder() {
-    }
-
-    public remote_object_listHolder(org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.remote_object_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
deleted file mode 100644
index 7c58d47f7c..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class short_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/short_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, short[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static short[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_short);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.id(),
-                                     "short_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static short[] read(org.omg.CORBA.portable.InputStream istream) {
-        short value[] = null;
-        int _len0 = istream.read_long();
-        value = new short[_len0];
-        istream.read_short_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, short[] value) {
-        ostream.write_long(value.length);
-        ostream.write_short_array(value, 0, value.length);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
deleted file mode 100644
index 5be5a65c43..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class short_listHolder implements org.omg.CORBA.portable.Streamable {
-    public short value[] = null;
-
-    public short_listHolder() {
-    }
-
-    public short_listHolder(short[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.short_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
deleted file mode 100644
index a40d5fa8de..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
+++ /dev/null
@@ -1,77 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class string_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/string_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, String[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static String[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().create_string_tc(0);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.id(),
-                                     "string_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static String[] read(org.omg.CORBA.portable.InputStream istream) {
-        String value[] = null;
-        int _len0 = istream.read_long();
-        value = new String[_len0];
-        for (int _o1 = 0; _o1 < value.length; ++_o1)
-            value[_o1] = istream.read_string();
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, String[] value) {
-        ostream.write_long(value.length);
-        for (int _i0 = 0; _i0 < value.length; ++_i0)
-            ostream.write_string(value[_i0]);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
deleted file mode 100644
index 76f99408f2..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class string_listHolder implements org.omg.CORBA.portable.Streamable {
-    public String value[] = null;
-
-    public string_listHolder() {
-    }
-
-    public string_listHolder(String[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.string_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
deleted file mode 100644
index d7594b0815..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class unsigned_long_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, int[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static int[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_ulong);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper
-                                         .id(),
-                                     "unsigned_long_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static int[] read(org.omg.CORBA.portable.InputStream istream) {
-        int value[] = null;
-        int _len0 = istream.read_long();
-        value = new int[_len0];
-        istream.read_ulong_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, int[] value) {
-        ostream.write_long(value.length);
-        ostream.write_ulong_array(value, 0, value.length);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
deleted file mode 100644
index e9fbcccc36..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class unsigned_long_listHolder implements org.omg.CORBA.portable.Streamable {
-    public int value[] = null;
-
-    public unsigned_long_listHolder() {
-    }
-
-    public unsigned_long_listHolder(int[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
deleted file mode 100644
index 6ef187c4e5..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
+++ /dev/null
@@ -1,78 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class unsigned_long_long_listHelper {
-    private static String _id =
-        "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, long[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static long[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_ulonglong);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB
-                    .init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper
-                                         .id(),
-                                     "unsigned_long_long_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static long[] read(org.omg.CORBA.portable.InputStream istream) {
-        long value[] = null;
-        int _len0 = istream.read_long();
-        value = new long[_len0];
-        istream.read_ulonglong_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, long[] value) {
-        ostream.write_long(value.length);
-        ostream.write_ulonglong_array(value, 0, value.length);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
deleted file mode 100644
index 59bc015c38..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class unsigned_long_long_listHolder implements org.omg.CORBA.portable.Streamable {
-    public long value[] = null;
-
-    public unsigned_long_long_listHolder() {
-    }
-
-    public unsigned_long_long_listHolder(long[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_long_long_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
deleted file mode 100644
index ec4526cebf..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class unsigned_short_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, short[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static short[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_ushort);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper
-                                         .id(),
-                                     "unsigned_short_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static short[] read(org.omg.CORBA.portable.InputStream istream) {
-        short value[] = null;
-        int _len0 = istream.read_long();
-        value = new short[_len0];
-        istream.read_ushort_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, short[] value) {
-        ostream.write_long(value.length);
-        ostream.write_ushort_array(value, 0, value.length);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
deleted file mode 100644
index 56ab28f0be..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class unsigned_short_listHolder implements org.omg.CORBA.portable.Streamable {
-    public short value[] = null;
-
-    public unsigned_short_listHolder() {
-    }
-
-    public unsigned_short_listHolder(short[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.unsigned_short_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
deleted file mode 100644
index 73a10d3b7f..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class wchar_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/wchar_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, char[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static char[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.tk_wchar);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.id(),
-                                     "wchar_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static char[] read(org.omg.CORBA.portable.InputStream istream) {
-        char value[] = null;
-        int _len0 = istream.read_long();
-        value = new char[_len0];
-        istream.read_wchar_array(value, 0, _len0);
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, char[] value) {
-        ostream.write_long(value.length);
-        ostream.write_wchar_array(value, 0, value.length);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
deleted file mode 100644
index c5c1e87756..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class wchar_listHolder implements org.omg.CORBA.portable.Streamable {
-    public char value[] = null;
-
-    public wchar_listHolder() {
-    }
-
-    public wchar_listHolder(char[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.wchar_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
deleted file mode 100644
index 3e45568f01..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
+++ /dev/null
@@ -1,77 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-abstract public class wstring_listHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/generated/wstring_list:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, String[] that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static String[] extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode = org.omg.CORBA.ORB.init().create_wstring_tc(0);
-            __typeCode = org.omg.CORBA.ORB.init().create_sequence_tc(0, __typeCode);
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_alias_tc(org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.id(),
-                                     "wstring_list",
-                                     __typeCode);
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static String[] read(org.omg.CORBA.portable.InputStream istream) {
-        String value[] = null;
-        int _len0 = istream.read_long();
-        value = new String[_len0];
-        for (int _o1 = 0; _o1 < value.length; ++_o1)
-            value[_o1] = istream.read_wstring();
-        return value;
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, String[] value) {
-        ostream.write_long(value.length);
-        for (int _i0 = 0; _i0 < value.length; ++_i0)
-            ostream.write_wstring(value[_i0]);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
deleted file mode 100644
index bdbf9d995b..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.generated;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* monday, 23 june 2008 2008 14:12:28 CEST
-*/
-
-public final class wstring_listHolder implements org.omg.CORBA.portable.Streamable {
-    public String value[] = null;
-
-    public wstring_listHolder() {
-    }
-
-    public wstring_listHolder(String[] initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.generated.wstring_listHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
deleted file mode 100644
index ba1a5c0a51..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.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.    
- */
-
-package org.apache.tuscany.sca.binding.corba.testing.hierarchy;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaArray;
-
-public final class ArraysTestStruct {
-
-    public ArraysTestStruct() {
-
-    }
-
-    public ArraysTestStruct(String[] field1, int[][] field2, float[][][] field3) {
-        this.field1 = field1;
-        this.field2 = field2;
-        this.field3 = field3;
-    }
-
-    @CorbaArray( {2})
-    public String[] field1;
-
-    @CorbaArray( {2, 4})
-    public int[][] field2;
-
-    @CorbaArray( {2, 4, 2})
-    public float[][][] field3;
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
deleted file mode 100644
index 7c33b1d449..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.hierarchy;
-
-import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero;
-
-public interface Calc {
-
-    public double div(double arg1, double arg2) throws DivByZero;
-
-    public double divForSmallArgs(double arg1, double arg2);
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
deleted file mode 100644
index d0ebff5fec..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
+++ /dev/null
@@ -1,28 +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.binding.corba.testing.hierarchy;
-
-public interface DummyObject {
-
-    int getLong();
-
-    DummyObject cloneObject();
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
deleted file mode 100644
index 6e4204b9b7..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.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 org.apache.tuscany.sca.binding.corba.testing.hierarchy;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
-
-public final class InnerUnion {
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1)
-    private int x;
-   
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 2)
-    private float y;
-    
-    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
-    @SuppressWarnings("unused")
-    private int discriminator;
-
-    public int getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        discriminator = 1;
-        this.x = x;
-    }
-
-    public float getY() {
-        return y;
-    }
-
-    public void setY(float y) {
-        discriminator = 2;
-        this.y = y;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
deleted file mode 100644
index cb3b6842c3..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
+++ /dev/null
@@ -1,38 +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.binding.corba.testing.hierarchy;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaArray;
-
-public final class InvalidCorbaArray {
-
-    // annotation argument array is not equal to declared arrays dimension 
-    @CorbaArray( {1})
-    public String[][] array;
-
-    public InvalidCorbaArray() {
-
-    }
-    
-    public InvalidCorbaArray(String[][] arg) {
-    
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
deleted file mode 100644
index 0c9de5bb31..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.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 org.apache.tuscany.sca.binding.corba.testing.hierarchy;
-
-public class InvalidEnum1 {
-
-    public static final InvalidEnum1 red = new InvalidEnum1(0);
-
-    public int value() {
-        return 0;
-    }
-
-    public static InvalidEnum1 from_int(int value) {
-        return null;
-    }
-
-    protected InvalidEnum1(int value) {
-    }
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
deleted file mode 100644
index 8746eb7f9b..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
+++ /dev/null
@@ -1,33 +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.binding.corba.testing.hierarchy;
-
-public class InvalidEnum2 {
-
-    public static final int _red = 0;
-    public static final InvalidEnum2 red = new InvalidEnum2(_red);
-
-    public static InvalidEnum2 from_int(int value) {
-        return null;
-    }
-
-    protected InvalidEnum2(int value) {
-    }
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
deleted file mode 100644
index 6d124b0485..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
+++ /dev/null
@@ -1,33 +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.binding.corba.testing.hierarchy;
-
-public class InvalidEnum3 {
-
-    public static final int _red = 0;
-    public static final InvalidEnum2 red = new InvalidEnum2(_red);
-
-    public int value() {
-        return 0;
-    }
-
-    protected InvalidEnum3(int value) {
-    }
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
deleted file mode 100644
index 8cf66e2fac..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
+++ /dev/null
@@ -1,28 +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.binding.corba.testing.hierarchy;
-
-public final class InvalidStruct1 {
-
-    public InvalidStruct1() {
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
deleted file mode 100644
index 5f361512f0..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.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.binding.corba.testing.hierarchy;
-
-public final class InvalidStruct2 {
-
-    public int f1;
-    public String f2;
-
-    public InvalidStruct2(int f1, String f2) {
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
deleted file mode 100644
index adc81ea5a2..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.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 org.apache.tuscany.sca.binding.corba.testing.hierarchy;
-
-public final class InvalidStruct3 {
-
-    public int f1;
-    public String f2;
-    public static byte f3;
-
-    public InvalidStruct3() {
-
-    }
-
-    public InvalidStruct3(int f1, String f2, byte f3) {
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
deleted file mode 100644
index 4f6d0085af..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.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.binding.corba.testing.hierarchy;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
-
-/**
- * More than one discriminators
- */
-public final class InvalidUnion1 {
-
-    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
-    @SuppressWarnings("unused")
-    private int a;
-    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
-    @SuppressWarnings("unused")
-    private int b;
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
deleted file mode 100644
index 98462bbabe..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
+++ /dev/null
@@ -1,34 +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.binding.corba.testing.hierarchy;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
-
-/**
- * Discriminator is missing
- */
-public final class InvalidUnion2 {
-
-    @CorbaUnionElement(type=CorbaUnionElementType.defaultOption)
-    @SuppressWarnings("unused")
-    private int a;
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
deleted file mode 100644
index 994ed6aea3..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
+++ /dev/null
@@ -1,35 +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.binding.corba.testing.hierarchy;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
-
-/**
- * No option, only discriminator
- */
-public final class InvalidUnion3{
-
-    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
-    @SuppressWarnings("unused")
-    private int a;
-
-}
-
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
deleted file mode 100644
index d68d903375..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
+++ /dev/null
@@ -1,39 +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.binding.corba.testing.hierarchy;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
-
-/**
- * Invalid field modifiers 
- */
-public final class InvalidUnion4{
-
-    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
-    @SuppressWarnings("unused")
-    private static int a;
-    
-    @CorbaUnionElement(type = CorbaUnionElementType.defaultOption)
-    @SuppressWarnings("unused")
-    private static int b;
-
-}
-
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
deleted file mode 100644
index d4f8b0e6fa..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
+++ /dev/null
@@ -1,42 +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.binding.corba.testing.hierarchy;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
-
-/**
- * Reused option id
- */
-public final class InvalidUnion5 {
-
-    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
-    @SuppressWarnings("unused")
-    private int a;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1)
-    @SuppressWarnings("unused")
-    private int b;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1)
-    @SuppressWarnings("unused")
-    private int c;
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
deleted file mode 100644
index a514b5e222..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
+++ /dev/null
@@ -1,28 +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.binding.corba.testing.hierarchy;
-
-public class NonCorbaException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-
-    public String someField;
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
deleted file mode 100644
index 452dee8d95..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
+++ /dev/null
@@ -1,91 +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.binding.corba.testing.hierarchy;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement;
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType;
-
-public final class RichUnion {
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1)
-    private int x;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 2)
-    private float y;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 3)
-    private String z;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 4)
-    private InnerUnion iu;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.defaultOption)
-    private boolean def;
-
-    @CorbaUnionElement(type = CorbaUnionElementType.discriminator)
-    @SuppressWarnings("unused")
-    private int discriminator = -1;
-
-    public int getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        this.discriminator = 1;
-        this.x = x;
-    }
-
-    public float getY() {
-        return y;
-    }
-
-    public void setY(float y) {
-        this.discriminator = 2;
-        this.y = y;
-    }
-
-    public String getZ() {
-        return z;
-    }
-
-    public void setZ(String z) {
-        this.discriminator = 3;
-        this.z = z;
-    }
-
-    public boolean isDef() {
-        return def;
-    }
-
-    public void setDef(boolean def) {
-        this.discriminator = -1;
-        this.def = def;
-    }
-
-    public InnerUnion getIu() {
-        return iu;
-    }
-
-    public void setIu(InnerUnion iu) {
-        this.discriminator = 4;
-        this.iu = iu;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
deleted file mode 100644
index 85ca3798f4..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.hierarchy;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SimpleStruct {
-
-    public String field1;
-    public int field2;
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
deleted file mode 100644
index d8cdf1835a..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
+++ /dev/null
@@ -1,33 +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.binding.corba.testing.hierarchy;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SomeStruct {
-
-    public SimpleStruct innerStruct;
-    public String str;
-    public String[] str_list;
-    public int[][] twoDimSeq;
-    public int[][][] threeDimSeq;
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
deleted file mode 100644
index bb72fdbbf3..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.references;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from remote_objects.idl
-* niedziela, 8 czerwiec 2008 16:43:12 CEST
-*/
-
-public interface DummyObject extends DummyObjectOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity {
-} // interface DummyObject
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
deleted file mode 100644
index 606d333bb3..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
+++ /dev/null
@@ -1,100 +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.binding.corba.testing.references;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from remote_objects.idl
-* niedziela, 8 czerwiec 2008 16:43:12 CEST
-*/
-
-abstract public class DummyObjectHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/references/DummyObject:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.references.DummyObject that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.references.DummyObject extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode =
-                org.omg.CORBA.ORB
-                    .init()
-                    .create_interface_tc(org.apache.tuscany.sca.binding.corba.testing.references.DummyObjectHelper.id(),
-                                         "DummyObject");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.references.DummyObject read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_DummyObjectStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.references.DummyObject value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.references.DummyObject narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.references.DummyObject)
-            return (org.apache.tuscany.sca.binding.corba.testing.references.DummyObject)obj;
-        else if (!obj._is_a(id()))
-            throw new org.omg.CORBA.BAD_PARAM();
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.references._DummyObjectStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.references._DummyObjectStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.references.DummyObject unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.references.DummyObject)
-            return (org.apache.tuscany.sca.binding.corba.testing.references.DummyObject)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.references._DummyObjectStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.references._DummyObjectStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
deleted file mode 100644
index 0ff9540502..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.references;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from remote_objects.idl
-* niedziela, 8 czerwiec 2008 16:43:12 CEST
-*/
-
-public final class DummyObjectHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.references.DummyObject value = null;
-
-    public DummyObjectHolder() {
-    }
-
-    public DummyObjectHolder(org.apache.tuscany.sca.binding.corba.testing.references.DummyObject initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.references.DummyObjectHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.references.DummyObjectHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.references.DummyObjectHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
deleted file mode 100644
index 912bd16f9b..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
+++ /dev/null
@@ -1,33 +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.binding.corba.testing.references;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from remote_objects.idl
-* niedziela, 8 czerwiec 2008 16:43:12 CEST
-*/
-
-public interface DummyObjectOperations {
-    int getLong();
-
-    org.apache.tuscany.sca.binding.corba.testing.references.DummyObject cloneObject();
-} // interface DummyObjectOperations
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
deleted file mode 100644
index 79f7959c72..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
+++ /dev/null
@@ -1,30 +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.binding.corba.testing.references;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from remote_objects.idl
-* niedziela, 8 czerwiec 2008 16:43:12 CEST
-*/
-
-public interface ObjectManager extends ObjectManagerOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity {
-} // interface ObjectManager
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
deleted file mode 100644
index 495a614d84..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
+++ /dev/null
@@ -1,100 +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.binding.corba.testing.references;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from remote_objects.idl
-* niedziela, 8 czerwiec 2008 16:43:12 CEST
-*/
-
-abstract public class ObjectManagerHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_interface_tc(org.apache.tuscany.sca.binding.corba.testing.references.ObjectManagerHelper
-                                             .id(),
-                                         "ObjectManager");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_ObjectManagerStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager)
-            return (org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager)obj;
-        else if (!obj._is_a(id()))
-            throw new org.omg.CORBA.BAD_PARAM();
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.references._ObjectManagerStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.references._ObjectManagerStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager)
-            return (org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.binding.corba.testing.references._ObjectManagerStub stub =
-                new org.apache.tuscany.sca.binding.corba.testing.references._ObjectManagerStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
deleted file mode 100644
index 11cfc82ac2..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
+++ /dev/null
@@ -1,51 +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.binding.corba.testing.references;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from remote_objects.idl
-* niedziela, 8 czerwiec 2008 16:43:12 CEST
-*/
-
-public final class ObjectManagerHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager value = null;
-
-    public ObjectManagerHolder() {
-    }
-
-    public ObjectManagerHolder(org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.binding.corba.testing.references.ObjectManagerHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.binding.corba.testing.references.ObjectManagerHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.binding.corba.testing.references.ObjectManagerHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
deleted file mode 100644
index e0e56d1017..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
+++ /dev/null
@@ -1,33 +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.binding.corba.testing.references;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from remote_objects.idl
-* niedziela, 8 czerwiec 2008 16:43:12 CEST
-*/
-
-public interface ObjectManagerOperations {
-    org.apache.tuscany.sca.binding.corba.testing.references.DummyObject getDummyObject();
-
-    org.apache.tuscany.sca.binding.corba.testing.references.DummyObject getObjectByArgument(org.apache.tuscany.sca.binding.corba.testing.references.DummyObject dummy);
-} // interface ObjectManagerOperations
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
deleted file mode 100644
index c706661eaa..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.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.binding.corba.testing.references;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from remote_objects.idl
-* niedziela, 8 czerwiec 2008 16:43:12 CEST
-*/
-
-public abstract class _DummyObjectImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.references.DummyObject, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _DummyObjectImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-        _methods.put("getLong", new java.lang.Integer(0));
-        _methods.put("cloneObject", new java.lang.Integer(1));
-    }
-
-    public org.omg.CORBA.portable.OutputStream _invoke(String $method,
-                                                       org.omg.CORBA.portable.InputStream in,
-                                                       org.omg.CORBA.portable.ResponseHandler $rh) {
-        org.omg.CORBA.portable.OutputStream out = null;
-        java.lang.Integer __method = (java.lang.Integer)_methods.get($method);
-        if (__method == null)
-            throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-        switch (__method.intValue()) {
-            case 0: // org/apache/tuscany/sca/binding/corba/testing/references/DummyObject/getLong
-            {
-                int $result = (int)0;
-                $result = this.getLong();
-                out = $rh.createReply();
-                out.write_long($result);
-                break;
-            }
-
-            case 1: // org/apache/tuscany/sca/binding/corba/testing/references/DummyObject/cloneObject
-            {
-                org.apache.tuscany.sca.binding.corba.testing.references.DummyObject $result = null;
-                $result = this.cloneObject();
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.references.DummyObjectHelper.write(out, $result);
-                break;
-            }
-
-            default:
-                throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-        }
-
-        return out;
-    } // _invoke
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/references/DummyObject:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _DummyObjectImplBase
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
deleted file mode 100644
index c9a31deb27..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
+++ /dev/null
@@ -1,92 +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.binding.corba.testing.references;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from remote_objects.idl
-* niedziela, 8 czerwiec 2008 16:43:12 CEST
-*/
-
-public class _DummyObjectStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.references.DummyObject {
-
-    public int getLong() {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("getLong", true);
-            $in = _invoke($out);
-            int $result = $in.read_long();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return getLong();
-        } finally {
-            _releaseReply($in);
-        }
-    } // getLong
-
-    public org.apache.tuscany.sca.binding.corba.testing.references.DummyObject cloneObject() {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("cloneObject", true);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.references.DummyObject $result =
-                org.apache.tuscany.sca.binding.corba.testing.references.DummyObjectHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return cloneObject();
-        } finally {
-            _releaseReply($in);
-        }
-    } // cloneObject
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/references/DummyObject:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-    private void readObject(java.io.ObjectInputStream s) throws java.io.IOException {
-        String str = s.readUTF();
-        String[] args = null;
-        java.util.Properties props = null;
-        org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init(args, props).string_to_object(str);
-        org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-        _set_delegate(delegate);
-    }
-
-    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
-        String[] args = null;
-        java.util.Properties props = null;
-        String str = org.omg.CORBA.ORB.init(args, props).object_to_string(this);
-        s.writeUTF(str);
-    }
-} // class _DummyObjectStub
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
deleted file mode 100644
index a6b55b8bae..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
+++ /dev/null
@@ -1,86 +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.binding.corba.testing.references;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from remote_objects.idl
-* niedziela, 8 czerwiec 2008 16:43:12 CEST
-*/
-
-public abstract class _ObjectManagerImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _ObjectManagerImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-        _methods.put("getDummyObject", new java.lang.Integer(0));
-        _methods.put("getObjectByArgument", new java.lang.Integer(1));
-    }
-
-    public org.omg.CORBA.portable.OutputStream _invoke(String $method,
-                                                       org.omg.CORBA.portable.InputStream in,
-                                                       org.omg.CORBA.portable.ResponseHandler $rh) {
-        org.omg.CORBA.portable.OutputStream out = null;
-        java.lang.Integer __method = (java.lang.Integer)_methods.get($method);
-        if (__method == null)
-            throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-        switch (__method.intValue()) {
-            case 0: // org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager/getDummyObject
-            {
-                org.apache.tuscany.sca.binding.corba.testing.references.DummyObject $result = null;
-                $result = this.getDummyObject();
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.references.DummyObjectHelper.write(out, $result);
-                break;
-            }
-
-            case 1: // org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager/getObjectByArgument
-            {
-                org.apache.tuscany.sca.binding.corba.testing.references.DummyObject dummy =
-                    org.apache.tuscany.sca.binding.corba.testing.references.DummyObjectHelper.read(in);
-                org.apache.tuscany.sca.binding.corba.testing.references.DummyObject $result = null;
-                $result = this.getObjectByArgument(dummy);
-                out = $rh.createReply();
-                org.apache.tuscany.sca.binding.corba.testing.references.DummyObjectHelper.write(out, $result);
-                break;
-            }
-
-            default:
-                throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-        }
-
-        return out;
-    } // _invoke
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _ObjectManagerImplBase
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
deleted file mode 100644
index e06a078a93..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.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 org.apache.tuscany.sca.binding.corba.testing.references;
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from remote_objects.idl
-* niedziela, 8 czerwiec 2008 16:43:12 CEST
-*/
-
-public class _ObjectManagerStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.binding.corba.testing.references.ObjectManager {
-
-    public org.apache.tuscany.sca.binding.corba.testing.references.DummyObject getDummyObject() {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("getDummyObject", true);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.references.DummyObject $result =
-                org.apache.tuscany.sca.binding.corba.testing.references.DummyObjectHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return getDummyObject();
-        } finally {
-            _releaseReply($in);
-        }
-    } // getDummyObject
-
-    public org.apache.tuscany.sca.binding.corba.testing.references.DummyObject getObjectByArgument(org.apache.tuscany.sca.binding.corba.testing.references.DummyObject dummy) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("getObjectByArgument", true);
-            org.apache.tuscany.sca.binding.corba.testing.references.DummyObjectHelper.write($out, dummy);
-            $in = _invoke($out);
-            org.apache.tuscany.sca.binding.corba.testing.references.DummyObject $result =
-                org.apache.tuscany.sca.binding.corba.testing.references.DummyObjectHelper.read($in);
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return getObjectByArgument(dummy);
-        } finally {
-            _releaseReply($in);
-        }
-    } // getObjectByArgument
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager:1.0"};
-
-    @Override
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-    private void readObject(java.io.ObjectInputStream s) throws java.io.IOException {
-        String str = s.readUTF();
-        String[] args = null;
-        java.util.Properties props = null;
-        org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init(args, props).string_to_object(str);
-        org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-        _set_delegate(delegate);
-    }
-
-    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
-        String[] args = null;
-        java.util.Properties props = null;
-        String str = org.omg.CORBA.ORB.init(args, props).object_to_string(this);
-        s.writeUTF(str);
-    }
-} // class _ObjectManagerStub
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
deleted file mode 100644
index 0aec4d278d..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
+++ /dev/null
@@ -1,89 +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.binding.corba.testing.servants;
-
-import org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject;
-import org.apache.tuscany.sca.binding.corba.testing.generated._ArraysSetterImplBase;
-
-public class ArraysSetterServant extends _ArraysSetterImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public boolean[] setBoolean(boolean[] arg) {
-        return arg;
-    }
-
-    public char[] setChar(char[] arg) {
-        return arg;
-    }
-
-    public double[] setDouble(double[] arg) {
-        return arg;
-    }
-
-    public float[] setFloat(float[] arg) {
-        return arg;
-    }
-
-    public int[] setLong(int[] arg) {
-        return arg;
-    }
-
-    public long[] setLongLong(long[] arg) {
-        return arg;
-    }
-
-    public byte[] setOctet(byte[] arg) {
-        return arg;
-    }
-
-    public RemoteObject[] setRemoteObject(RemoteObject[] obj) {
-        return obj;
-    }
-
-    public short[] setShort(short[] arg) {
-        return arg;
-    }
-
-    public String[] setString(String[] arg) {
-        return arg;
-    }
-
-    public int[] setUnsignedLong(int[] arg) {
-        return arg;
-    }
-
-    public long[] setUnsignedLongLong(long[] arg) {
-        return arg;
-    }
-
-    public short[] setUnsignedShort(short[] arg) {
-        return arg;
-    }
-
-    public char[] setWchar(char[] arg) {
-        return arg;
-    }
-
-    public String[] setWstring(String[] arg) {
-        return arg;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
deleted file mode 100644
index d9bde48a5a..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
+++ /dev/null
@@ -1,42 +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.binding.corba.testing.servants;
-
-import org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion;
-import org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct;
-import org.apache.tuscany.sca.binding.corba.testing.arrays_unions._ArraysUnionsTestsImplBase;
-
-public class ArraysUnionsServant extends _ArraysUnionsTestsImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public TestStruct passTestStruct(TestStruct arg) {
-        return arg;
-    }
-
-    public String[][] passStringArray(String[][] arg) {
-        return arg;
-    }
-
-    public RichUnion passRichUnion(RichUnion arg) {
-        return arg;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
deleted file mode 100644
index 9ff94f8313..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
+++ /dev/null
@@ -1,43 +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.binding.corba.testing.servants;
-
-import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaArray;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.ArraysTestStruct;
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.RichUnion;
-
-public class ArraysUnionsTuscanyServant {
-
-    private static final long serialVersionUID = 1L;
-
-    public ArraysTestStruct passTestStruct(ArraysTestStruct arg) {
-        return arg;
-    }
-
-    @CorbaArray( {2, 2})
-    public String[][] passStringArray(@CorbaArray( {2, 2})String[][] arg) {
-        return arg;
-    }
-    
-    public RichUnion passRichUnion(RichUnion arg) { 
-        return arg;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
deleted file mode 100644
index fd789e19cb..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.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 org.apache.tuscany.sca.binding.corba.testing.servants;
-
-import org.apache.tuscany.sca.binding.corba.testing.exceptions._CalcImplBase;
-import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.Arguments;
-import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.DivByZero;
-import org.apache.tuscany.sca.binding.corba.testing.exceptions.CalcPackage.NotSupported;
-
-public class CalcServant extends _CalcImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public double div(double arg1, double arg2) throws DivByZero {
-        if (arg2 == 0) {
-            DivByZero exception = new DivByZero();
-            exception.arguments = new Arguments(arg1, arg2);
-            exception.info = "Error occured during div: div by zero";
-            throw exception;
-        } else {
-            return arg1 / arg2;
-        }
-    }
-
-    public double divForSmallArgs(double arg1, double arg2) throws DivByZero, NotSupported {
-        if (arg1 > 100 || arg2 > 100) {
-            NotSupported exception = new NotSupported();
-            exception.info = "arg1: " + arg1 + ", arg2: " + arg2;
-            throw exception;
-        } else {
-            return div(arg1, arg2);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
deleted file mode 100644
index 2e205f1d0f..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
+++ /dev/null
@@ -1,42 +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.binding.corba.testing.servants;
-
-import org.apache.tuscany.sca.binding.corba.testing.references.DummyObject;
-import org.apache.tuscany.sca.binding.corba.testing.references._DummyObjectImplBase;
-
-public class DummyObjectServant extends _DummyObjectImplBase {
-
-    private static final long serialVersionUID = 1L;
-    private int retVal;
-
-    public DummyObjectServant() {
-        retVal = (int)System.currentTimeMillis();
-    }
-
-    public int getLong() {
-        return retVal;
-    }
-
-    public DummyObject cloneObject() {
-        return new DummyObjectServant();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
deleted file mode 100644
index 52386aeef7..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
+++ /dev/null
@@ -1,33 +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.binding.corba.testing.servants;
-
-import org.apache.tuscany.sca.binding.corba.testing.enums.Color;
-import org.apache.tuscany.sca.binding.corba.testing.enums._EnumManagerImplBase;
-
-public class EnumManagerServant extends _EnumManagerImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public Color getColor(Color color) {
-        return color;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
deleted file mode 100644
index b7fbb69627..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
+++ /dev/null
@@ -1,24 +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.binding.corba.testing.servants;
-
-public class InvalidTestObjectServant {
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
deleted file mode 100644
index dda8203f79..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
+++ /dev/null
@@ -1,34 +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.binding.corba.testing.servants;
-
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.InvalidStruct1;
-
-public class InvalidTypesServant {
-
-    public InvalidStruct1 firstMethodWithInvalidArg() {
-        return null;
-    }
-
-    public void secondMethodWithInvalidArg(InvalidStruct1 arg) {
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
deleted file mode 100644
index 20700a0392..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.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 org.apache.tuscany.sca.binding.corba.testing.servants;
-
-import org.apache.tuscany.sca.binding.corba.testing.hierarchy.NonCorbaException;
-
-public class NonCorbaServant {
-
-    public String setString(String arg) {
-        return arg;
-    }
-
-    public void throwException() throws NonCorbaException {
-        NonCorbaException e = new NonCorbaException();
-        e.someField = "test";
-        throw e;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
deleted file mode 100644
index 213c7fbd7c..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.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.binding.corba.testing.servants;
-
-import org.apache.tuscany.sca.binding.corba.testing.references.DummyObject;
-import org.apache.tuscany.sca.binding.corba.testing.references._ObjectManagerImplBase;
-
-public class ObjectManagerServant extends _ObjectManagerImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public DummyObject getObjectByArgument(DummyObject arg) {
-        return arg;
-    }
-
-    public DummyObject getDummyObject() {
-        return new DummyObjectServant();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
deleted file mode 100644
index 92e18741ae..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
+++ /dev/null
@@ -1,89 +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.binding.corba.testing.servants;
-
-import org.apache.tuscany.sca.binding.corba.testing.generated.RemoteObject;
-import org.apache.tuscany.sca.binding.corba.testing.generated._PrimitivesSetterImplBase;
-
-public class PrimitivesSetterServant extends _PrimitivesSetterImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public boolean setBoolean(boolean arg) {
-        return arg;
-    }
-
-    public char setChar(char arg) {
-        return arg;
-    }
-
-    public double setDouble(double arg) {
-        return arg;
-    }
-
-    public float setFloat(float arg) {
-        return arg;
-    }
-
-    public int setLong(int arg) {
-        return arg;
-    }
-
-    public long setLongLong(long arg) {
-        return arg;
-    }
-
-    public byte setOctet(byte arg) {
-        return arg;
-    }
-
-    public RemoteObject setRemoteObject(RemoteObject obj) {
-        return obj;
-    }
-
-    public short setShort(short arg) {
-        return arg;
-    }
-
-    public String setString(String arg) {
-        return arg;
-    }
-
-    public int setUnsignedLong(int arg) {
-        return arg;
-    }
-
-    public long setUnsignedLongLong(long arg) {
-        return arg;
-    }
-
-    public short setUnsignedShort(short arg) {
-        return arg;
-    }
-
-    public char setWchar(char arg) {
-        return arg;
-    }
-
-    public String setWstring(String arg) {
-        return arg;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
deleted file mode 100644
index 153268983f..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
+++ /dev/null
@@ -1,71 +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.binding.corba.testing.servants;
-
-import org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStruct;
-import org.apache.tuscany.sca.binding.corba.testing.generated.SimpleStructHolder;
-import org.apache.tuscany.sca.binding.corba.testing.generated.SomeStruct;
-import org.apache.tuscany.sca.binding.corba.testing.generated._TestObjectImplBase;
-import org.apache.tuscany.sca.binding.corba.testing.generated.long_seq1Holder;
-import org.apache.tuscany.sca.binding.corba.testing.generated.long_seq2Holder;
-import org.apache.tuscany.sca.binding.corba.testing.generated.long_seq3Holder;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestObjectServant extends _TestObjectImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public int[] setLongSeq1(long_seq1Holder arg) {
-        return arg.value;
-    }
-
-    public int[][] setLongSeq2(long_seq2Holder arg) {
-
-        return arg.value;
-    }
-
-    public int[][][] setLongSeq3(long_seq3Holder arg) {
-        return arg.value;
-    }
-
-    public SimpleStruct setSimpleStruct(SimpleStructHolder arg) {
-        return arg.value;
-    }
-
-    public SomeStruct setStruct(SomeStruct arg) {
-        return arg;
-    }
-
-    public SomeStruct pickStructFromArgs(SomeStruct arg1, SomeStruct arg2, SomeStruct arg3, int structNumber) {
-        switch (structNumber) {
-            case 1:
-                return arg1;
-            case 2:
-                return arg2;
-            case 3:
-                return arg3;
-            default:
-                return arg1;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
deleted file mode 100644
index 7ebc3fce85..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
+++ /dev/null
@@ -1,88 +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.binding.corba.testing.service.mocks;
-
-import java.lang.reflect.Type;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-
-/**
- * Mock DataType implementation. Only few methods needs to be implemented.
- */
-public class TestDataType<L> implements DataType<L> {
-
-    public Class<?> typeClass;
-    public L logical;
-
-    public TestDataType(Class<?> typeClass) {
-        this.typeClass = typeClass;
-    }
-
-    public TestDataType(Class<?> typeClass, L logical) {
-        this.typeClass = typeClass;
-        this.logical = logical;
-    }
-
-    public String getDataBinding() {
-        return null;
-    }
-
-    public Type getGenericType() {
-        return null;
-    }
-
-    public L getLogical() {
-        return logical;
-    }
-
-    public <T> T getMetaData(Class<T> arg0) {
-        return null;
-    }
-
-    public Class<?> getPhysical() {
-        return typeClass;
-    }
-
-    public void setDataBinding(String arg0) {
-
-    }
-
-    public void setGenericType(Type arg0) {
-
-    }
-
-    public void setLogical(L arg0) {
-
-    }
-
-    public <T> void setMetaData(Class<T> arg0, T arg1) {
-
-    }
-
-    public void setPhysical(Class<?> arg0) {
-
-    }
-
-    @Override
-    public Object clone() {
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
deleted file mode 100644
index 2c5a0d8159..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
+++ /dev/null
@@ -1,139 +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.binding.corba.testing.service.mocks;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Mock TestInterface implementation. Only few methods needs to be implemented.
- */
-public class TestInterface implements JavaInterface {
-
-    private List<Operation> operations;
-    private Class<?> javaClass;
-
-    public TestInterface(List<Operation> opearations, Class<?> javaClass) {
-        this.operations = opearations;
-        this.javaClass = javaClass;
-    }
-
-    public List<Operation> getOperations() {
-        return operations;
-    }
-
-    public boolean isConversational() {
-        return false;
-    }
-
-    public boolean isDynamic() {
-        return false;
-    }
-
-    public boolean isRemotable() {
-        return false;
-    }
-
-    public void resetDataBinding(String dataBinding) {
-
-    }
-
-    public void setConversational(boolean conversational) {
-
-    }
-
-    public void setDefaultDataBinding(String dataBinding) {
-
-    }
-
-    public void setRemotable(boolean remotable) {
-
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return null;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return null;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return null;
-    }
-
-    public IntentAttachPointType getType() {
-        return null;
-    }
-
-    public void setType(IntentAttachPointType type) {
-
-    }
-
-    @Override
-    public Object clone() {
-        return null;
-    }
-
-    public Class<?> getCallbackClass() {
-        return null;
-    }
-
-    public Class<?> getJavaClass() {
-        return javaClass;
-    }
-
-    public String getName() {
-        return null;
-    }
-
-    public QName getQName() {
-        return null;
-    }
-
-    public void setCallbackClass(Class<?> arg0) {
-    }
-
-    public void setJavaClass(Class<?> javaClass) {
-        this.javaClass = javaClass;
-    }
-
-    public void setName(String arg0) {   
-    }
-
-    public void setQName(QName arg0) {
-        
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean arg0) {   
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
deleted file mode 100644
index d691705955..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.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 org.apache.tuscany.sca.binding.corba.testing.service.mocks;
-
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-
-/**
- * Mock InterfaceContract implementation. Only few methods needs to be
- * implemented.
- */
-public class TestInterfaceContract implements InterfaceContract {
-
-    private Interface iface;
-
-    public Interface getCallbackInterface() {
-        return null;
-    }
-
-    public Interface getInterface() {
-        return iface;
-    }
-
-    public InterfaceContract makeUnidirectional(boolean isCallback) {
-        return null;
-    }
-
-    public void setCallbackInterface(Interface callbackInterface) {
-
-    }
-
-    public void setInterface(Interface callInterface) {
-        this.iface = callInterface;
-    }
-
-    @Override
-    public Object clone() {
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
deleted file mode 100644
index 90551ec25d..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
+++ /dev/null
@@ -1,174 +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.binding.corba.testing.service.mocks;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.interfacedef.ConversationSequence;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Mock Operation implementation. Only few methods needs to be implemented.
- */
-public class TestOperation implements Operation {
-
-    private DataType<List<DataType>> inputType;
-    private DataType outputType;
-    private String name;
-
-    public ConversationSequence getConversationSequence() {
-        return null;
-    }
-
-    public String getDataBinding() {
-        return null;
-    }
-
-    public Map<QName, List<DataType<XMLType>>> getFaultBeans() {
-        return null;
-    }
-
-    public List<DataType> getFaultTypes() {
-        return null;
-    }
-
-    public DataType<List<DataType>> getInputType() {
-        return inputType;
-    }
-
-    public Interface getInterface() {
-        return null;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public DataType getOutputType() {
-        return outputType;
-    }
-
-    public WrapperInfo getWrapper() {
-        return null;
-    }
-
-    public boolean isDynamic() {
-        return false;
-    }
-
-    public boolean isNonBlocking() {
-        return false;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public boolean isWrapperStyle() {
-        return false;
-    }
-
-    public void setConversationSequence(ConversationSequence sequence) {
-
-    }
-
-    public void setDataBinding(String dataBinding) {
-
-    }
-
-    public void setDynamic(boolean b) {
-
-    }
-
-    public void setFaultBeans(Map<QName, List<DataType<XMLType>>> faultBeans) {
-
-    }
-
-    public void setFaultTypes(List<DataType> faultTypes) {
-
-    }
-
-    public void setInputType(DataType<List<DataType>> inputType) {
-        this.inputType = inputType;
-    }
-
-    public void setInterface(Interface interfaze) {
-
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setNonBlocking(boolean nonBlocking) {
-
-    }
-
-    public void setOutputType(DataType outputType) {
-        this.outputType = outputType;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-
-    }
-
-    public void setWrapper(WrapperInfo wrapperInfo) {
-
-    }
-
-    public void setWrapperStyle(boolean wrapperStyle) {
-
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return null;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return null;
-    }
-
-    @Override
-    public Object clone() {
-        return null;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return null;
-    }
-
-    public IntentAttachPointType getType() {
-        return null;
-    }
-
-    public void setType(IntentAttachPointType type) {
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
deleted file mode 100644
index 6fc5f9398e..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
+++ /dev/null
@@ -1,234 +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.binding.corba.testing.service.mocks;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Callback;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Mock RuntimeComponentService implementation. Only few methods needs to be
- * implemented.
- */
-public class TestRuntimeComponentService implements RuntimeComponentService {
-
-    private InterfaceContract interfaceContract;
-    private RuntimeWire runtimeWire;
-
-    public TestRuntimeComponentService(Object invocationTarget) {
-        runtimeWire = new TestRuntimeWire(invocationTarget);
-        List<Operation> operations = new ArrayList<Operation>();
-        Method[] methods = invocationTarget.getClass().getMethods();
-        for (int i = 0; i < methods.length; i++) {
-            int mod = methods[i].getModifiers();
-            if (methods[i].getDeclaringClass().equals(invocationTarget.getClass()) && Modifier.isPublic(mod)
-                && !methods[i].getName().startsWith("_")) {
-                Operation operation = new TestOperation();
-                DataType returnType = new TestDataType(methods[i].getReturnType());
-                operation.setOutputType(returnType);
-                Class<?>[] argTypes = methods[i].getParameterTypes();
-                List<DataType> argDataTypes = new ArrayList<DataType>();
-                for (int j = 0; j < argTypes.length; j++) {
-                    argDataTypes.add(new TestDataType(argTypes[j]));
-                }
-                TestDataType<List<DataType>> inputDataType = new TestDataType<List<DataType>>(null, argDataTypes);
-                operation.setInputType(inputDataType);
-                operations.add(operation);
-                operation.setName(methods[i].getName());
-            }
-        }
-        TestInterface iface = new TestInterface(operations, invocationTarget.getClass());
-        interfaceContract = new TestInterfaceContract();
-        interfaceContract.setInterface(iface);
-    }
-
-    public void addPolicyProvider(Binding binding, PolicyProvider policyProvider) {
-
-    }
-
-    public ServiceBindingProvider getBindingProvider(Binding binding) {
-        return null;
-    }
-
-    public List<RuntimeWire> getCallbackWires() {
-        return null;
-    }
-
-    public InvocationChain getInvocationChain(Binding binding, Operation operation) {
-        return null;
-    }
-
-    public InvocationChain getInvocationChain(Binding binding, InterfaceContract interfaceContract, Operation operation) {
-        return null;
-    }
-
-    public Invoker getInvoker(Binding binding, Operation operation) {
-        return null;
-    }
-
-    public Invoker getInvoker(Binding binding, InterfaceContract interfaceContract, Operation operation) {
-        return null;
-    }
-
-    public List<PolicyProvider> getPolicyProviders(Binding binding) {
-        return null;
-    }
-
-    public RuntimeWire getRuntimeWire(Binding binding) {
-        return runtimeWire;
-    }
-
-    public RuntimeWire getRuntimeWire(Binding binding, InterfaceContract interfaceContract) {
-        return null;
-    }
-
-    public List<RuntimeWire> getRuntimeWires() {
-        return null;
-    }
-
-    public void setBindingProvider(Binding binding, ServiceBindingProvider bindingProvider) {
-
-    }
-
-    public ComponentReference getCallbackReference() {
-        return null;
-    }
-
-    public Service getService() {
-        return null;
-    }
-
-    public void setCallbackReference(ComponentReference callbackReference) {
-
-    }
-
-    public void setService(Service service) {
-
-    }
-
-    public InterfaceContract getInterfaceContract() {
-        return interfaceContract;
-    }
-
-    public InterfaceContract getInterfaceContract(Binding binding) {
-        return getInterfaceContract();
-    }     
-
-    public String getName() {
-        return null;
-    }
-
-    public boolean isCallback() {
-        return false;
-    }
-
-    public void setInterfaceContract(InterfaceContract interfaceContract) {
-        this.interfaceContract = interfaceContract;
-    }
-
-    public void setIsCallback(boolean isCallback) {
-
-    }
-
-    public void setName(String name) {
-
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-
-    }
-
-    public List<Object> getExtensions() {
-        return null;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return null;
-    }
-
-    public IntentAttachPointType getType() {
-        return null;
-    }
-
-    public void setType(IntentAttachPointType type) {
-
-    }
-
-    public List<ConfiguredOperation> getConfiguredOperations() {
-        return null;
-    }
-
-    public <B> B getBinding(Class<B> bindingClass) {
-        return null;
-    }
-
-    public List<Binding> getBindings() {
-        return null;
-    }
-
-    public Callback getCallback() {
-        return null;
-    }
-
-    public <B> B getCallbackBinding(Class<B> bindingClass) {
-        return null;
-    }
-
-    public void setCallback(Callback callback) {
-
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return null;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return null;
-    }
-
-    @Override
-    public Object clone() {
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java b/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
deleted file mode 100644
index 5b7caf1010..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
+++ /dev/null
@@ -1,107 +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.binding.corba.testing.service.mocks;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Mock RuntimeWire implementation. Only few methods needs to be implemented.
- */
-public class TestRuntimeWire implements RuntimeWire {
-    private Object invocationTarget;
-
-    public TestRuntimeWire(Object invocationTarget) {
-        this.invocationTarget = invocationTarget;
-    }
-
-    public InvocationChain getInvocationChain(Operation arg0) {
-        return null;
-    }
-
-    public List<InvocationChain> getInvocationChains() {
-        return null;
-    }
-
-    public EndpointReference getSource() {
-        return null;
-    }
-
-    public EndpointReference getTarget() {
-        return null;
-    }
-
-    public Object invoke(Operation operation, Object[] args) throws InvocationTargetException {
-        Class<?>[] types = new Class<?>[args.length];
-        for (int i = 0; i < args.length; i++) {
-            types[i] = args[i].getClass();
-        }
-        Object result = null;
-        try {
-            Method[] methods = invocationTarget.getClass().getMethods();
-            for (int i = 0; i < methods.length; i++) {
-                if (methods[i].getName().equals(operation.getName())) {
-                    result = methods[i].invoke(invocationTarget, args);
-                    break;
-                }
-            }
-        } catch (InvocationTargetException e) {
-            throw e;
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
-        return result;
-    }
-
-    public Object invoke(Operation operation, Message arg1) throws InvocationTargetException {
-
-        return null;
-    }
-    
-    public Object invoke(Message arg1) throws InvocationTargetException {
-
-        return null;
-    }    
-
-    public void rebuild() {
-
-    }
-
-    public void setTarget(EndpointReference arg0) {
-
-    }
-
-    @Override
-    public Object clone() {
-        return null;
-    }
-
-    public InvocationChain getBindingInvocationChain() {
-        return null;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl b/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
deleted file mode 100644
index 0f4ed03b4e..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
+++ /dev/null
@@ -1,69 +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.    

- */

-

-/*

- * compile by

- * idlj -fall -oldImplBase arrays_unions.idl

- */

-

-module org {

-	module apache {

-		module tuscany {

-			module sca {

-				module binding {

-					module corba {

-						module testing {

-							module arrays_unions {

-								

-								struct TestStruct {

-									string oneDimArray[2];

-									long twoDimArray[2][4];

-									float threeDimArray[2][4][2];

-								};

-								

-								typedef string StringArray[2][2];

-								

-								union InnerUnion switch (long) {

-									case 1: long x;

-									case 2: float y;

-								};

-								

-								union RichUnion switch (long) {

-								    case 1: long x;

-									case 2: float y;

-								    case 3: string z;

-								    case 4: InnerUnion iu;

-								    default: boolean a;

-								};

-								

-								interface ArraysUnionsTests {

-									TestStruct passTestStruct(in TestStruct arg);

-									StringArray passStringArray(in StringArray arg);

-									RichUnion passRichUnion(in RichUnion arg);

-								};

-								

-							};

-						};

-					};

-				};

-			};

-		};

-	};

-};

-

diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/enums.idl b/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/enums.idl
deleted file mode 100644
index 2e4e829b0f..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/enums.idl
+++ /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.    

- */

-

-/*

- * compile by

- * idlj -fall -oldImplBase enums.idl

- */

-

-module org {

-	module apache {

-		module tuscany {

-			module sca {

-				module binding {

-					module corba {

-						module testing {

-							module enums {

-								enum Color {red, yellow, green};

-								interface EnumManager {

-									Color getColor(in Color color);		

-								};

-							};

-						};

-					};

-				};

-			};

-		};

-	};

-};

diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/exceptions.idl b/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/exceptions.idl
deleted file mode 100644
index b34ec46458..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/exceptions.idl
+++ /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.    

- */

-

-/*

- * compile by

- * idlj -fall -oldImplBase exceptions.idl

- */

-

-module org {

-	module apache {

-		module tuscany {

-			module sca {

-				module binding {

-					module corba {

-						module testing {

-							module exceptions {

-								interface Calc {

-									struct Arguments {

-										double arg1;

-										double arg2;

-									};

-							

-									exception DivByZero{ 

-										Arguments arguments;

-										string info;

-									};

-									

-									exception NotSupported {

-										string info;

-									};

-							

-									double div(in double arg1, in double arg2) raises(DivByZero);

-									double divForSmallArgs(in double arg1, in double arg2) raises(DivByZero, NotSupported);

-								};

-							};

-						};

-					};

-				};

-			};

-		};

-	};

-};

diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/general_tests.idl b/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/general_tests.idl
deleted file mode 100644
index db253338c3..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/general_tests.idl
+++ /dev/null
@@ -1,124 +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.    

- */

-

-/*

- * compile by

- * idlj -fall -oldImplBase general_tests.idl

- */

- 

-module org {

-	module apache {

-		module tuscany {

-			module sca {

-				module binding {

-					module corba {

-						module testing {

-								module generated {

-

-									interface RemoteObject {

-								

-									};

-								

-									typedef sequence<RemoteObject> remote_object_list;

-									typedef sequence<boolean> boolean_list;

-									typedef sequence<char> char_list;

-									typedef sequence<wchar> wchar_list;

-									typedef sequence<octet> octet_list;

-									typedef sequence<short> short_list;

-									typedef sequence<unsigned short> unsigned_short_list;

-									typedef sequence<long> long_list;

-									typedef sequence<unsigned long> unsigned_long_list;

-									typedef sequence<long long> long_long_list;

-									typedef sequence<unsigned long long> unsigned_long_long_list;

-									typedef sequence<float> float_list;

-									typedef sequence<double> double_list;

-									typedef sequence<string> string_list;

-									typedef sequence<wstring> wstring_list;

-								

-									interface PrimitivesSetter {

-										boolean setBoolean(in boolean arg);

-										char setChar(in char arg);

-										wchar setWchar(in wchar arg);

-										octet setOctet(in octet arg);

-										short setShort(in short arg);

-										unsigned short setUnsignedShort(in unsigned short arg);

-										long setLong(in long arg);

-										unsigned long setUnsignedLong(in unsigned long arg);

-										long long setLongLong(in long long arg);

-										unsigned long long setUnsignedLongLong(in unsigned long long arg);

-										float setFloat(in float arg);

-										double setDouble(in double arg);

-										string setString(in string arg);

-										wstring setWstring(in wstring arg);

-										RemoteObject setRemoteObject(in RemoteObject obj);

-									};

-								

-									interface ArraysSetter {

-										boolean_list setBoolean(in boolean_list arg);

-										char_list setChar(in char_list arg);

-										wchar_list setWchar(in wchar_list arg);

-										octet_list setOctet(in octet_list arg);

-										short_list setShort(in short_list arg);

-										unsigned_short_list setUnsignedShort(in unsigned_short_list arg);

-										long_list setLong(in long_list arg);

-										unsigned_long_list setUnsignedLong(in unsigned_long_list arg);

-										long_long_list setLongLong(in long_long_list arg);

-										unsigned_long_long_list setUnsignedLongLong(in unsigned_long_long_list arg);

-										float_list setFloat(in float_list arg);

-										double_list setDouble(in double_list arg);

-										string_list setString(in string_list arg);

-										wstring_list setWstring(in wstring_list arg);

-										remote_object_list setRemoteObject(in remote_object_list obj);

-									};

-								

-									typedef sequence<long> long_seq1;

-									typedef sequence<long_seq1> long_seq2;

-									typedef sequence<long_seq2> long_seq3;

-								

-									struct SimpleStruct {

-										string field1;

-										long field2;

-									};

-								

-								

-									struct SomeStruct {

-										SimpleStruct innerStruct;

-										string str;

-										string_list str_list;

-										long_seq2 twoDimSeq;

-										long_seq3 threeDimSeq;

-									};

-								

-									interface TestObject {

-										SomeStruct pickStructFromArgs(in SomeStruct arg1, in SomeStruct arg2, in SomeStruct arg3, in long structNumber);

-										SomeStruct setStruct(in SomeStruct arg);

-										SimpleStruct setSimpleStruct(inout SimpleStruct arg);

-										long_seq1 setLongSeq1(inout long_seq1 arg);

-										long_seq2 setLongSeq2(inout long_seq2 arg);

-										long_seq3 setLongSeq3(inout long_seq3 arg);

-									};

-								

-								};

-						};

-					};

-				};

-			};

-		};

-	};

-};

diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/references.idl b/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/references.idl
deleted file mode 100644
index 72b58806e6..0000000000
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/references.idl
+++ /dev/null
@@ -1,50 +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.    

- */

-

-/*

- * compile by

- * idlj -fall -oldImplBase remote_objects.idl

- */

-

-module org {

-	module apache {

-		module tuscany {

-			module sca {

-				module binding {

-					module corba {

-						module testing {

-							module references {

-								

-								interface DummyObject {

-									long getLong();

-									DummyObject cloneObject();

-								};

-

-								interface ObjectManager {

-									DummyObject getDummyObject();

-									DummyObject getObjectByArgument(in DummyObject dummy);

-								};

-							};

-						};

-					};

-				};

-			};

-		};

-	};

-};

diff --git a/java/sca-contrib/modules/binding-corba/LICENSE b/java/sca-contrib/modules/binding-corba/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/binding-corba/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/binding-corba/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-corba/META-INF/MANIFEST.MF
deleted file mode 100644
index d41630838c..0000000000
--- a/java/sca-contrib/modules/binding-corba/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.corba;uses:="org.apache

- .tuscany.sca.assembly,javax.xml.namespace";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.binding.corba.impl;version="1.

- 4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA CORBA Binding Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397128062

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA CORBA Binding Extension

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0",

- org.apache.tuscany.sca.binding.corba;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.host.corba;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.corba

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-corba/NOTICE b/java/sca-contrib/modules/binding-corba/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/binding-corba/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/binding-corba/pom.xml b/java/sca-contrib/modules/binding-corba/pom.xml
deleted file mode 100644
index fd6a3d12ff..0000000000
--- a/java/sca-contrib/modules/binding-corba/pom.xml
+++ /dev/null
@@ -1,53 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-binding-corba</artifactId>
-    <name>Apache Tuscany SCA CORBA Binding Extension</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-	<dependency>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-host-corba</artifactId>
-		<version>2.0-SNAPSHOT</version>
-	</dependency>
-	
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java b/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
deleted file mode 100644
index 8ccce730cf..0000000000
--- a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
+++ /dev/null
@@ -1,47 +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.binding.corba;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface CorbaBinding extends Binding {
-    String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
-    String BINDING_CORBA = "binding.corba";
-    QName BINDING_CORBA_QNAME = new QName(SCA10_TUSCANY_NS, BINDING_CORBA);
-
-    String getHost();
-
-    void setHost(String host);
-
-    int getPort();
-
-    void setPort(int port);
-    
-    String getId();
-    
-    void setId(String id);
-    
-    String getCorbaname();
-}
diff --git a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java b/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
deleted file mode 100644
index 67e3bdcf74..0000000000
--- a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.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.binding.corba;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface CorbaBindingFactory {
-    /**
-     * Create a CorbaBinding model
-     * @return The CorbaBinding model
-     */
-    CorbaBinding createCorbaBinding();
-}
diff --git a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java b/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
deleted file mode 100644
index cecb4fb567..0000000000
--- a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.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.binding.corba.impl;
-
-import org.apache.tuscany.sca.binding.corba.CorbaBinding;
-import org.apache.tuscany.sca.binding.corba.CorbaBindingFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CorbaBindingFactoryImpl implements CorbaBindingFactory {
-
-    /**
-     * @see org.apache.tuscany.sca.binding.corba.CorbaBindingFactory#createCorbaBinding()
-     */
-    public CorbaBinding createCorbaBinding() {
-        return new CorbaBindingImpl();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java b/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
deleted file mode 100644
index 54e98d4117..0000000000
--- a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
+++ /dev/null
@@ -1,132 +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.binding.corba.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.corba.CorbaBinding;
-import org.apache.tuscany.sca.host.corba.CorbaHostUtils;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CorbaBindingImpl implements CorbaBinding, PolicySetAttachPoint {
-    private String name;
-    private String uri;
-    private String host;
-    private int port;
-    private String id;
-    
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private IntentAttachPointType intentAttachPointType;
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public IntentAttachPointType getType() {
-        return intentAttachPointType;
-    }
-
-    public void setType(IntentAttachPointType intentAttachPointType) {
-        this.intentAttachPointType = intentAttachPointType;
-    }
-
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets;
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCorbaname() {
-        return CorbaHostUtils.isValidCorbanameURI(getURI()) ? getURI(): CorbaHostUtils.createCorbanameURI(getHost(), getPort(), getName());
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java b/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
deleted file mode 100644
index 930a8d39d9..0000000000
--- a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
+++ /dev/null
@@ -1,133 +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.binding.corba.impl;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
-import org.apache.tuscany.sca.binding.corba.CorbaBinding;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CorbaBindingProcessor implements StAXArtifactProcessor<CorbaBinding> {
-    private PolicyFactory policyFactory;
-    private PolicyAttachPointProcessor policyProcessor;
-
-    public CorbaBindingProcessor(FactoryExtensionPoint modelFactories) {
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor#getArtifactType()
-     */
-    public QName getArtifactType() {
-        return CorbaBinding.BINDING_CORBA_QNAME;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor#read(javax.xml.stream.XMLStreamReader)
-     */
-    public CorbaBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        CorbaBinding binding = new CorbaBindingImpl();
-
-        // Read the policies 
-        policyProcessor.readPolicies(binding, reader);
-
-        binding.setHost(reader.getAttributeValue(null, "host"));
-        String port = reader.getAttributeValue(null, "port");
-        if (port != null) {
-            binding.setPort(Integer.parseInt(port));
-        }
-
-        // Read the name
-        String name = reader.getAttributeValue(null, "name");
-        if (name != null) {
-            binding.setName(name);
-        }
-
-        // Read binding URI
-        String uri = reader.getAttributeValue(null, "uri");
-        if (uri != null) {
-            binding.setURI(uri);
-        }
-        
-        // Read CORBA id
-        String id = reader.getAttributeValue(null, "id");
-        if (id != null) {
-            binding.setId(id);
-        }
-        return binding;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor#write(java.lang.Object, javax.xml.stream.XMLStreamWriter)
-     */
-    public void write(CorbaBinding model, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        // Write a <binding.corba>
-        writer.writeStartElement(CorbaBinding.SCA10_TUSCANY_NS, CorbaBinding.BINDING_CORBA);
-
-        if (model.getName() != null) {
-            writer.writeAttribute("name", model.getName());
-        }
-
-        if (model.getURI() != null) {
-            writer.writeAttribute("uri", model.getURI());
-        }
-
-        if (model.getHost() != null) {
-            writer.writeAttribute("host", model.getHost());
-        }
-
-        if (model.getPort() != -1) {
-            writer.writeAttribute("port", String.valueOf(model.getPort()));
-        }
-        
-        if (model.getId() != null) {
-            writer.writeAttribute("id", model.getId());
-        }
-        writer.writeEndElement();
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.contribution.processor.ArtifactProcessor#getModelType()
-     */
-    public Class<CorbaBinding> getModelType() {
-        return CorbaBinding.class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.contribution.processor.ArtifactProcessor#resolve(java.lang.Object, org.apache.tuscany.sca.contribution.resolver.ModelResolver)
-     */
-    public void resolve(CorbaBinding model, ModelResolver resolver) throws ContributionResolveException {
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory b/java/sca-contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
deleted file mode 100644
index 57959840d4..0000000000
--- a/java/sca-contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the model factory

-org.apache.tuscany.sca.binding.corba.impl.CorbaBindingFactoryImpl
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 71d14bc077..0000000000
--- a/java/sca-contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the artifact processor extension

-org.apache.tuscany.sca.binding.corba.impl.CorbaBindingProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.corba,model=org.apache.tuscany.sca.binding.corba.CorbaBinding,factory=org.apache.tuscany.sca.binding.corba.CorbaBindingFactory

diff --git a/java/sca-contrib/modules/binding-dwr-runtime/LICENSE b/java/sca-contrib/modules/binding-dwr-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/binding-dwr-runtime/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/NOTICE b/java/sca-contrib/modules/binding-dwr-runtime/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/java/sca-contrib/modules/binding-dwr-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/pom.xml b/java/sca-contrib/modules/binding-dwr-runtime/pom.xml
deleted file mode 100644
index a32135306d..0000000000
--- a/java/sca-contrib/modules/binding-dwr-runtime/pom.xml
+++ /dev/null
@@ -1,95 +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>
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>1.5-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-dwr</artifactId>
-    <name>Apache Tuscany SCA AJAX DWR Binding Extension</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extension-helper</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.directwebremoting</groupId>
-            <artifactId>dwr</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>                                      
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.binding.dwr</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.dwr*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java b/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
deleted file mode 100644
index ae5cf327ab..0000000000
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.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.binding.dwr;
-
-/**
- * The runtime representation of the <binding.dwr> SCDL
- *
- * @version $Rev$ $Date$
- */
-public class DWRBinding {
-
-    // Empty as <binding.dwr> doesn't use any additional attributes or elements (yet).
-    
-}
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java b/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
deleted file mode 100644
index d14751f235..0000000000
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
+++ /dev/null
@@ -1,56 +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.binding.dwr;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.extension.helper.BindingActivator;
-import org.apache.tuscany.sca.extension.helper.ComponentLifecycle;
-import org.apache.tuscany.sca.extension.helper.InvokerFactory;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * The Binding Activator for the DWR Binding.
- *
- * @version $Rev$ $Date$
- */
-public class DWRBindingActivator implements BindingActivator<DWRBinding>{
-
-    private ServletHost servletHost;
-    
-    public DWRBindingActivator(ServletHost servletHost) {
-        this.servletHost = servletHost;
-    }
-
-    public Class<DWRBinding> getBindingClass() {
-        return DWRBinding.class;
-    }
-
-    public InvokerFactory createInvokerFactory(RuntimeComponent rc, RuntimeComponentReference rcr, Binding b, DWRBinding ab) {
-        return new DWRInvokerFactory(rc, rcr, b, ab, servletHost);
-    }
-
-    public ComponentLifecycle createService(RuntimeComponent rc, RuntimeComponentService rcs, Binding b, DWRBinding ab) {
-        return new DWRService(rc, rcs, b, ab, servletHost);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java b/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
deleted file mode 100644
index 24e6dbbcd4..0000000000
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.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.binding.dwr;
-
-import java.util.Collection;
-
-import org.apache.tuscany.sca.core.invocation.MessageImpl;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.directwebremoting.ScriptBuffer;
-import org.directwebremoting.WebContext;
-import org.directwebremoting.WebContextFactory;
-import org.directwebremoting.proxy.dwr.Util;
-
-/**
- * The invoker for a DWR Binding.
- *
- * @version $Rev$ $Date$
- */
-public class DWRInvoker implements Invoker {
-
-    private String referenceFunction;
-    
-    public DWRInvoker(String referenceName, Operation operation) {
-        this.referenceFunction = referenceName + "." + operation.getName();
-    }
-
-    public Message invoke(Message requestMsg) {
-
-        invoke((Object[])requestMsg.getBody());
-
-        // DWR references can not return anything 
-        return new MessageImpl();
-    }
-
-    public void invoke(Object[] args) {
-
-        // TODO: this only works if its the same thread as request
-        WebContext wctx = WebContextFactory.get();
-        String currentPage = wctx.getCurrentPage();
-
-        // Get a DWR Util proxy for all the browsers on the current page:
-        Collection sessions = wctx.getScriptSessionsByPage(currentPage);
-        Util utilAll = new Util(sessions);
-
-        ScriptBuffer referenceInvoke = getInvokeFragment(args, wctx);
-
-        // add the reference call to the Util proxy which will cause DWR to 
-        // asynchronously send it to be run on each active browser client
-        utilAll.addScript(referenceInvoke);
-    }
-
-    /**
-     * Creates a fragment of JavaScript code to invoke the reference function
-     * Eg: "<referenceName>.<operationName>(arg1, arg2,...);"
-     */
-    protected ScriptBuffer getInvokeFragment(Object[] args, WebContext wctx) {
-
-        ScriptBuffer sb = new ScriptBuffer();
-        sb.appendScript(referenceFunction);
-        sb.appendScript("(");
-        if (args != null) {
-            for (int i = 0; i < args.length; i++) {
-                sb.appendData(args[i]);
-                if (i < (args.length - 1)) {
-                    sb.appendScript(", ");
-                }
-            }
-        }
-        sb.appendScript(");");
-
-        return sb;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java b/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
deleted file mode 100644
index 1d073c9ecf..0000000000
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
+++ /dev/null
@@ -1,67 +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.binding.dwr;
-
-import static org.apache.tuscany.sca.binding.dwr.DWRService.SERVLET_PATH;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.extension.helper.ComponentLifecycle;
-import org.apache.tuscany.sca.extension.helper.InvokerFactory;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * InvokerFactory for the DWRBinding.
- *
- * @version $Rev$ $Date$
- */
-public class DWRInvokerFactory implements InvokerFactory, ComponentLifecycle {
-
-    private Binding binding;
-    private ServletHost servletHost;
-    
-    public DWRInvokerFactory(RuntimeComponent rc, RuntimeComponentReference rcr, Binding b, DWRBinding ab, ServletHost servletHost) {
-        this.binding = b;
-        this.servletHost = servletHost;
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        return new DWRInvoker(binding.getName(), operation);
-    }
-
-    public void start() {
-
-        DWRServlet servlet = (DWRServlet) servletHost.getServletMapping(SERVLET_PATH);
-        if (servlet == null) {
-            servlet = new DWRServlet();
-            servletHost.addServletMapping(SERVLET_PATH, servlet);
-        }
-        
-        servlet.addReference(binding.getName());
-    }
-
-    public void stop() {
-        servletHost.removeServletMapping(SERVLET_PATH);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java b/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
deleted file mode 100644
index 7d5a7f1677..0000000000
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
+++ /dev/null
@@ -1,81 +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.binding.dwr;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.extension.helper.ComponentLifecycle;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * DWR Service.
- *
- * @version $Rev$ $Date$
- */
-public class DWRService implements ComponentLifecycle {
-
-    private RuntimeComponent rc;
-    private RuntimeComponentService rcs;
-    private Binding binding;
-    private ServletHost servletHost;
-    
-    static final String SERVLET_PATH = "/SCADomain/*";
-
-    public DWRService(RuntimeComponent rc, RuntimeComponentService rcs, Binding binding, DWRBinding ab, ServletHost servletHost) {
-        this.rc = rc;
-        this.rcs = rcs;
-        this.binding = binding;
-        this.servletHost = servletHost;
-    }
-
-    public void start() {
-        
-        DWRServlet servlet = (DWRServlet) servletHost.getServletMapping(SERVLET_PATH);
-        if (servlet == null) {
-            servlet = new DWRServlet();
-            servletHost.addServletMapping(SERVLET_PATH, servlet);
-        }
-        
-        // Create a Java proxy to the target service
-        Class<?> type = ((JavaInterface)rcs.getInterfaceContract().getInterface()).getJavaClass();
-        Object proxy = Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new InvocationHandler() {
-            public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-                RuntimeWire wire = rcs.getRuntimeWire(binding);
-                Operation op = JavaInterfaceUtil.findOperation(method, rcs.getInterfaceContract().getInterface().getOperations());
-                return wire.invoke(op, args);
-            }});
-
-        servlet.addService(binding.getName(), type, proxy);
-    }
-
-    public void stop() {
-        servletHost.removeServletMapping(SERVLET_PATH);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java b/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
deleted file mode 100644
index 3a2471d8f3..0000000000
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
+++ /dev/null
@@ -1,247 +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.binding.dwr;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.directwebremoting.Container;
-import org.directwebremoting.create.AbstractCreator;
-import org.directwebremoting.extend.CreatorManager;
-import org.directwebremoting.extend.Handler;
-import org.directwebremoting.extend.Remoter;
-import org.directwebremoting.servlet.DwrServlet;
-import org.directwebremoting.servlet.EngineHandler;
-import org.directwebremoting.servlet.PathConstants;
-import org.directwebremoting.servlet.UrlProcessor;
-
-/**
- * Tuscany customized DWR Servlet to implement support for the DWR binding
- * 
- * Handles requests for SCA services and references that use <binding.dwr>,
- * and also the HTTP GET for the Tuscany DWR system script "scaDomain.js"  
- *
- * @version $Rev$ $Date$
- */
-public class DWRServlet extends DwrServlet {
-    private static final long serialVersionUID = 1L;
-
-    private transient Map<String, ServiceHolder> services;
-    private transient List<String> referenceNames;
-    private transient boolean initialized;
-    private transient Map<String, String> initParams;
-
-    private static final String SCADOMAIN_SCRIPT_PATH = "/scaDomain.js";
-
-    public DWRServlet() {
-        this.services = new HashMap<String, ServiceHolder>();
-        this.referenceNames = new ArrayList<String>();
-
-        this.initParams = new HashMap<String, String>();
-        // maybe use <binding.dwr> attributes to define the init params
-        initParams.put("activeReverseAjaxEnabled", "true");
-    }
-
-    @Override
-    public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {
-        super.service(req, res);
-    }
-
-    /**
-     * Initialize the Servlet
-     * There is a single instance of this Servlet which is registered
-     * for multiple path mappings, but the init should only run once.
-     */
-    @Override
-    public void init(ServletConfig servletConfig) throws ServletException {
-        if (!initialized) {
-            super.init(patchConfig(servletConfig));
-            addScriptHandler();
-            initServices();
-            initialized = true;
-        }
-    }
-
-    /**
-     * Add in the handler to process the HTTP get for /sca/scaDomain.js
-     * 
-     * This wrappers the DWR Engine handler which returns the DWR engine.js script,
-     * this wrappers that handler so as to add Tuscany specific header and footer code
-     * to the DWR engine.js to define the Tuscany SCADomain control functions and
-     * functions for each SCA service and reference that use <binding.dwr>.
-     */
-    private void addScriptHandler() {
-
-        UrlProcessor urlProcessor = (UrlProcessor)getContainer().getBean(UrlProcessor.class.getName());
-
-        final EngineHandler engineHandler =
-            (EngineHandler)getContainer().getBean(PathConstants.URL_PREFIX + "/engine.js");
-
-        final Handler scaDomainScriptHandler = new Handler() {
-            public void handle(HttpServletRequest request, HttpServletResponse response) throws IOException {
-                PrintWriter out = response.getWriter();
-                out.println("/** Apache Tuscany scaDomain.js Header */");
-
-                engineHandler.handle(request, response);
-
-                tuscanyFooter(request, out);
-            }
-
-        };
-
-        // add the scaDomainScriptHandler to the urlProcessor
-        // bit of a hack, there's probably cleaner way to get it registered
-        urlProcessor.afterContainerSetup(new Container() {
-            public Object getBean(String name) {
-                return scaDomainScriptHandler;
-            }
-            public Collection getBeanNames() {
-                return Arrays.asList(new String[] {PathConstants.URL_PREFIX + SCADOMAIN_SCRIPT_PATH});
-            }
-        });
-    }
-
-    /**
-     * Adds the JavaScript defining SCADomain, its control functions,
-     * and functions for all the available SCA services and references.
-     */
-    private void tuscanyFooter(HttpServletRequest request, PrintWriter out) {
-        out.println("/** Apache Tuscany scaDomain.js Footer */");
-        out.println();
-        out.println("function scaDomain() { }");
-        out.println();
-        out.println("// SCA services");
-
-        // Use the DWR remoter to generate the JavaScipt function for each SCA service        
-        Remoter remoter = (Remoter)getContainer().getBean(Remoter.class.getName());
-
-        String path = request.getContextPath() + request.getServletPath();
-
-        for (String serviceName : services.keySet()) {
-            String serviceScript = remoter.generateInterfaceScript(serviceName, path);
-            out.println(serviceScript);
-        }
-        
-        if (referenceNames.size() > 0) {
-
-            out.println("// SCA reverse ajax control functions");
-            out.println();
-            out.println("scaDomain.open = function() { dwr.engine.setActiveReverseAjax(true); };");
-            out.println("scaDomain.close = function() { dwr.engine.setActiveReverseAjax(false); };");
-
-            out.println();
-            out.println("// SCA references");
-            out.println();
-           
-            // the JavaScript function for SCA references has an 
-            // empty impl as it uses DWR severside "push" 
-            for (String referenceName : referenceNames) {
-                out.println("function " + referenceName + "() { }");
-            }
-        }
-
-        out.println();
-        out.println("/** End of Apache Tuscany scaDomain.js */");
-        out.println();
-    }
-
-    /**
-     * Add an SCA reference to be added to the DWR runtime 
-     */
-    public void addReference(String name) {
-        referenceNames.add(name);
-    }
-
-    /**
-     * Add an SCA service to be added to the DWR runtime
-     */
-    public void addService(String name, final Class type, final Object instance) {
-        ServiceHolder holder = new ServiceHolder();
-        holder.name = name;
-        holder.type = type;
-        holder.instance = instance;
-        services.put(name, holder);
-    }
-
-    /**
-     * Defines each SCA service proxy instance to DWR 
-     */
-    private void initServices() {
-        CreatorManager creatorManager = (CreatorManager)getContainer().getBean(CreatorManager.class.getName());
-
-        for (final ServiceHolder holder : services.values()) {
-            creatorManager.addCreator(holder.name, new AbstractCreator() {
-                public Class getType() {
-                    return holder.type;
-                }
-
-                public Object getInstance() throws InstantiationException {
-                    return holder.instance;
-                }
-            });
-        }
-    }
-
-    // utility class to aid passing around services
-    private class ServiceHolder {
-        String name;
-        Class type;
-        Object instance;
-    }
-
-    /**
-     * Patch the ServletConfig to enable setting init params for DWR
-     * and so DWR can't see the Tuscany servlet's init params.
-     */
-    private ServletConfig patchConfig(final ServletConfig servletConfig) {
-        ServletConfig patchedContext = new ServletConfig() {
-            public String getInitParameter(String name) {
-                return initParams.get(name);
-            }
-            public Enumeration getInitParameterNames() {
-                return Collections.enumeration(initParams.keySet());
-            }
-            public ServletContext getServletContext() {
-                return servletConfig.getServletContext();
-            }
-            public String getServletName() {
-                return servletConfig.getServletName();
-            }
-        };
-        return patchedContext;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/java/sca-contrib/modules/binding-dwr-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
deleted file mode 100644
index 1a9f91fab2..0000000000
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
+++ /dev/null
@@ -1,19 +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.

-# Implementation class for the ExtensionActivator

-org.apache.tuscany.sca.binding.dwr.DWRBindingActivator

-

diff --git a/java/sca-contrib/modules/binding-dwr/LICENSE b/java/sca-contrib/modules/binding-dwr/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/binding-dwr/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/binding-dwr/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-dwr/META-INF/MANIFEST.MF
deleted file mode 100644
index cb22353d1e..0000000000
--- a/java/sca-contrib/modules/binding-dwr/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.dwr;version="2.0.0";uses:="org.apache.tuscany.sca.assembly"

-Private-Package: org.apache.tuscany.sca.binding.dwr.impl;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA DWR Binding Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397320062

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA DWR Binding Model

-Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.binding.dwr;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.dwr

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca-contrib/modules/binding-dwr/NOTICE b/java/sca-contrib/modules/binding-dwr/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/binding-dwr/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/binding-dwr/pom.xml b/java/sca-contrib/modules/binding-dwr/pom.xml
deleted file mode 100644
index b2a5d2fa8e..0000000000
--- a/java/sca-contrib/modules/binding-dwr/pom.xml
+++ /dev/null
@@ -1,41 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-binding-dwr</artifactId>

-    <name>Apache Tuscany SCA DWR Binding Model</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-assembly</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-    </dependencies>

-

-</project>

diff --git a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java b/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
deleted file mode 100644
index 02a5748fd8..0000000000
--- a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
+++ /dev/null
@@ -1,29 +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.binding.dwr;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-/**
- * DRW Binding model
- */
-public interface DWRBinding extends Binding {
-
-}
diff --git a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingFactory.java b/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingFactory.java
deleted file mode 100644
index fefe8dffbe..0000000000
--- a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingFactory.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.binding.dwr;

-

-/**

- * Factory to create DWRBinding instances

- */

-public interface DWRBindingFactory {

-

-    /**

-     * Create DWRBinding model

-     */

-    DWRBinding createRMIBinding();

-}

diff --git a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingFactoryImpl.java b/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingFactoryImpl.java
deleted file mode 100644
index cfd85d2e13..0000000000
--- a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingFactoryImpl.java
+++ /dev/null
@@ -1,34 +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.binding.dwr.impl;

-

-import org.apache.tuscany.sca.binding.dwr.DWRBinding;

-import org.apache.tuscany.sca.binding.dwr.DWRBindingFactory;

-

-/**

- * Factory implementation to create DWR Models

- */

-public class DWRBindingFactoryImpl implements DWRBindingFactory {

-

-    public DWRBinding createRMIBinding() {

-        return new DWRBindingImpl();

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingImpl.java b/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingImpl.java
deleted file mode 100644
index 3e89d00a07..0000000000
--- a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingImpl.java
+++ /dev/null
@@ -1,60 +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.binding.dwr.impl;

-

-import org.apache.tuscany.sca.binding.dwr.DWRBinding;

-

-/**

- * Represents a binding to an DWR service.

- */

-public class DWRBindingImpl implements DWRBinding {

-

-    private String name;

-    private String uri;

-

-    public String getName() {

-        return name;

-    }

-

-    public String getURI() {

-        return uri;

-    }

-

-    public void setURI(String uri) {

-        this.uri = uri;

-    }

-

-    public void setName(String name) {

-        this.name = name;

-    }

-

-    public boolean isUnresolved() {

-        return false;

-    }

-

-    public void setUnresolved(boolean unresolved) {

-        // The sample binding is always resolved

-    }

-

-    @Override

-    public Object clone() throws CloneNotSupportedException {

-        return super.clone();

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.dwr.DWRBindingFactory b/java/sca-contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.dwr.DWRBindingFactory
deleted file mode 100644
index 889fcafae2..0000000000
--- a/java/sca-contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.dwr.DWRBindingFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for model factory
-org.apache.tuscany.sca.binding.rmi.impl.RMIBindingFactoryImpl
diff --git a/java/sca-contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 833b241aac..0000000000
--- a/java/sca-contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the artifact processor extension

-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.dwr,model=org.apache.tuscany.sca.binding.dwr.DWRBinding,factory=org.apache.tuscany.sca.binding.dwr.DWRBindingFactory

diff --git a/java/sca-contrib/modules/binding-ejb-runtime/LICENSE b/java/sca-contrib/modules/binding-ejb-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 6adfd6cb93..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,42 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.binding.ejb.corba;version="1.4

- ",org.apache.tuscany.sca.binding.ejb.provider;version="2.0.0",org.apach

- e.tuscany.sca.binding.ejb.util;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA EJB Binding Runtime

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397250828

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA EJB Binding Runtime

-Import-Package: javax.ejb,

- javax.ejb.spi,

- javax.naming,

- javax.rmi,

- javax.rmi.CORBA,

- 

- net.sf.cglib.core,

- net.sf.cglib.proxy,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.binding.ejb;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.omg.CORBA,

- org.omg.CORBA.portable,

- org.omg.CORBA_2_3.portable,

- org.omg.CosNaming,

- org.omg.IOP,

- org.omg.PortableInterceptor,

- org.omg.stub.java.rmi,

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.ejb.runtime

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-ejb-runtime/NOTICE b/java/sca-contrib/modules/binding-ejb-runtime/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/pom.xml b/java/sca-contrib/modules/binding-ejb-runtime/pom.xml
deleted file mode 100644
index 357ecf9206..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/pom.xml
+++ /dev/null
@@ -1,170 +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>
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-ejb-runtime</artifactId>
-    <name>Apache Tuscany SCA EJB Binding Runtime</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <version>2.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb</artifactId>
-            <version>2.0.2</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.modules</groupId>
-                    <artifactId>geronimo-connector</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.modules</groupId>
-                    <artifactId>geronimo-persistence-jpa10</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-ejbd</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-server</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-loader</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-jee</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-ejbd</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-javaagent</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>asm</groupId>
-                    <artifactId>asm-commons</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-all</artifactId>
-            <version>3.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-           <groupId>org.apache.geronimo.specs</groupId>
-           <artifactId>geronimo-jms_1.1_spec</artifactId>
-           <version>1.1</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.apache.geronimo.specs</groupId>
-                   <artifactId>geronimo-jms_1.1_spec</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>         
-
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>geronimo-repository</id>
-            <name>Geronimo Repository</name>
-            <url>http://svn.apache.org/repos/asf/geronimo/server/tags/2.0.2/repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
deleted file mode 100644
index c65868c23b..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
+++ /dev/null
@@ -1,365 +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.binding.ejb.corba;
-
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Utility class for loading classes by a variety of name variations.
- * <p/>
- * Supported names types are:
- * <p/>
- * 1)  Fully qualified class name (e.g., "java.lang.String", "org.apache.geronimo.kernel.ClassLoading"
- * 2)  Method signature encoding ("Ljava.lang.String;", "J", "I", etc.)
- * 3)  Primitive type names ("int", "boolean", etc.)
- * 4)  Method array signature strings ("[I", "[Ljava.lang.String")
- * 5)  Arrays using Java code format ("int[]", "java.lang.String[][]")
- * <p/>
- * The classes are loaded using the provided class loader.  For the basic types, the primitive
- * reflection types are returned.
- *
- * @version $Rev$ $Date$
- */
-public class ClassLoadingUtil {
-
-    /**
-     * Table for mapping primitive class names/signatures to the implementing
-     * class object
-     */
-    private static final HashMap PRIMITIVE_CLASS_MAP = new HashMap();
-
-    /**
-     * Table for mapping primitive classes back to their name signature type, which
-     * allows a reverse mapping to be performed from a class object into a resolvable
-     * signature.
-     */
-    private static final HashMap CLASS_TO_SIGNATURE_MAP = new HashMap();
-
-
-    /**
-     * Setup the primitives map.  We make any entry for each primitive class using both the
-     * human readable name and the method signature shorthand type.
-     */
-    static {
-        PRIMITIVE_CLASS_MAP.put("boolean", boolean.class);
-        PRIMITIVE_CLASS_MAP.put("Z", boolean.class);
-        PRIMITIVE_CLASS_MAP.put("byte", byte.class);
-        PRIMITIVE_CLASS_MAP.put("B", byte.class);
-        PRIMITIVE_CLASS_MAP.put("char", char.class);
-        PRIMITIVE_CLASS_MAP.put("C", char.class);
-        PRIMITIVE_CLASS_MAP.put("short", short.class);
-        PRIMITIVE_CLASS_MAP.put("S", short.class);
-        PRIMITIVE_CLASS_MAP.put("int", int.class);
-        PRIMITIVE_CLASS_MAP.put("I", int.class);
-        PRIMITIVE_CLASS_MAP.put("long", long.class);
-        PRIMITIVE_CLASS_MAP.put("J", long.class);
-        PRIMITIVE_CLASS_MAP.put("float", float.class);
-        PRIMITIVE_CLASS_MAP.put("F", float.class);
-        PRIMITIVE_CLASS_MAP.put("double", double.class);
-        PRIMITIVE_CLASS_MAP.put("D", double.class);
-        PRIMITIVE_CLASS_MAP.put("void", void.class);
-        PRIMITIVE_CLASS_MAP.put("V", void.class);
-
-        // Now build a reverse mapping table.  The table above has a many-to-one mapping for
-        // class names.  To do the reverse, we need to pick just one.  As long as the
-        // returned name supports "round tripping" of the requests, this will work fine.
-
-        CLASS_TO_SIGNATURE_MAP.put(boolean.class, "Z");
-        CLASS_TO_SIGNATURE_MAP.put(byte.class, "B");
-        CLASS_TO_SIGNATURE_MAP.put(char.class, "C");
-        CLASS_TO_SIGNATURE_MAP.put(short.class, "S");
-        CLASS_TO_SIGNATURE_MAP.put(int.class, "I");
-        CLASS_TO_SIGNATURE_MAP.put(long.class, "J");
-        CLASS_TO_SIGNATURE_MAP.put(float.class, "F");
-        CLASS_TO_SIGNATURE_MAP.put(double.class, "D");
-        CLASS_TO_SIGNATURE_MAP.put(void.class, "V");
-    }
-
-
-    /**
-     * Load a class that matches the requested name, using the provided class loader context.
-     * <p/>
-     * The class name may be a standard class name, the name of a primitive type Java
-     * reflection class (e.g., "boolean" or "int"), or a type in method type signature
-     * encoding.  Array classes in either encoding form are also processed.
-     *
-     * @param className The name of the required class.
-     * @param classLoader The class loader used to resolve the class object.
-     * @return The Class object resolved from "className".
-     * @throws ClassNotFoundException When unable to resolve the class object.
-     * @throws IllegalArgumentException If either argument is null.
-     */
-    public static Class loadClass(String className, ClassLoader classLoader) throws ClassNotFoundException {
-
-        // the tests require IllegalArgumentExceptions for null values on either of these.
-        if (className == null) {
-            throw new IllegalArgumentException("className is null");
-        }
-
-        if (classLoader == null) {
-            throw new IllegalArgumentException("classLoader is null");
-        }
-        // The easiest case is a proper class name.  We just have the class loader resolve this.
-        // If the class loader throws a ClassNotFoundException, then we need to check each of the
-        // special name encodings we support.
-        try {
-            return classLoader.loadClass(className);
-        } catch (ClassNotFoundException ignore) {
-            // if not found, continue on to the other name forms.
-        }
-
-
-        // The second easiest version to resolve is a direct map to a primitive type name
-        // or method signature.  Check our name-to-class map for one of those.
-        Class resolvedClass = (Class) PRIMITIVE_CLASS_MAP.get(className);
-        if (resolvedClass != null) {
-            return resolvedClass;
-        }
-
-        // Class names in method signature have the format "Lfully.resolved.name;",
-        // so if it ends in a semicolon and begins with an "L", this must be in
-        // this format.  Have the class loader try to load this.  There are no other
-        // options if this fails, so just allow the class loader to throw the
-        // ClassNotFoundException.
-        if (className.endsWith(";") && className.startsWith("L")) {
-            // pick out the name portion
-            String typeName = className.substring(1, className.length() - 1);
-            // and delegate the loading to the class loader.
-            return classLoader.loadClass(typeName);
-        }
-
-        // All we have left now are the array types.  Method signature array types
-        // have a series of leading "[" characters to specify the number of dimensions.
-        // The other array type we handle uses trailing "[]" for the dimensions, just
-        // like the Java language syntax.
-
-        // first check for the signature form ([[[[type).
-        if (className.charAt(0) == '[') {
-            // we have at least one array marker, now count how many leading '['s we have
-            // to get the dimension count.
-            int count = 0;
-            int nameLen = className.length();
-
-            while (count < nameLen && className.charAt(count) == '[') {
-                count++;
-            }
-
-            // pull of the name subtype, which is everything after the last '['
-            String arrayTypeName = className.substring(count, className.length());
-            // resolve the type using a recursive call, which will load any of the primitive signature
-            // types as well as class names.
-            Class arrayType = loadClass(arrayTypeName, classLoader);
-
-            // Resolving array types require a little more work.  The array classes are
-            // created dynamically when the first instance of a given dimension and type is
-            // created.  We need to create one using reflection to do this.
-            return getArrayClass(arrayType, count);
-        }
-
-
-        // ok, last chance.  Now check for an array specification in Java language
-        // syntax.  This will be a type name followed by pairs of "[]" to indicate
-        // the number of dimensions.
-        if (className.endsWith("[]")) {
-            // get the base component class name and the arrayDimensions
-            int count = 0;
-            int position = className.length();
-
-            while (position > 1 && className.substring(position - 2, position).equals("[]")) {
-                // count this dimension
-                count++;
-                // and step back the probe position.
-                position -= 2;
-            }
-
-            // position now points at the location of the last successful test.  This makes it
-            // easy to pick off the class name.
-
-            String typeName = className.substring(0, position);
-
-            // load the base type, again, doing this recursively
-            Class arrayType = loadClass(typeName, classLoader);
-            // and turn this into the class object
-            return getArrayClass(arrayType, count);
-        }
-
-        throw new ClassNotFoundException("Could not load class " + className + " from unknown classloader; " + classLoader);
-    }
-
-
-    /**
-     * Map a class object back to a class name.  The returned class object
-     * must be "round trippable", which means
-     * <p/>
-     * type == ClassLoading.loadClass(ClassLoading.getClassName(type), classLoader)
-     * <p/>
-     * must be true.  To ensure this, the class name is always returned in
-     * method signature format.
-     *
-     * @param type The class object we convert into name form.
-     * @return A string representation of the class name, in method signature
-     *         format.
-     */
-    public static String getClassName(Class type) {
-        StringBuffer name = new StringBuffer();
-
-        // we test these in reverse order from the resolution steps,
-        // first handling arrays, then primitive types, and finally
-        // "normal" class objects.
-
-        // First handle arrays.  If a class is an array, the type is
-        // element stored at that level.  So, for a 2-dimensional array
-        // of ints, the top-level type will be "[I".  We need to loop
-        // down the hierarchy until we hit a non-array type.
-        while (type.isArray()) {
-            // add another array indicator at the front of the name,
-            // and continue with the next type.
-            name.append('[');
-            type = type.getComponentType();
-        }
-
-        // we're down to the base type.  If this is a primitive, then
-        // we poke in the single-character type specifier.
-        if (type.isPrimitive()) {
-            name.append((String) CLASS_TO_SIGNATURE_MAP.get(type));
-        }
-        // a "normal" class.  This gets expressing using the "Lmy.class.name;" syntax.
-        else {
-            name.append('L');
-            name.append(type.getName());
-            name.append(';');
-        }
-        return name.toString();
-    }
-
-    private static Class getArrayClass(Class type, int dimension) {
-        // Array.newInstance() requires an array of the requested number of dimensions
-        // that gives the size for each dimension.  We just request 0 in each of the
-        // dimensions, which is not unlike a black hole singularity.
-        int[] dimensions = new int[dimension];
-        // create an instance and return the associated class object.
-        return Array.newInstance(type, dimensions).getClass();
-    }
-
-    public static Set getAllTypes(Class type) {
-        Set allTypes = new LinkedHashSet();
-        allTypes.add(type);
-        allTypes.addAll(getAllSuperClasses(type));
-        allTypes.addAll(getAllInterfaces(type));
-        return allTypes;
-    }
-
-    private static Set getAllSuperClasses(Class clazz) {
-        Set allSuperClasses = new LinkedHashSet();
-        for (Class superClass = clazz.getSuperclass(); superClass != null; superClass = superClass.getSuperclass()) {
-            allSuperClasses.add(superClass);
-        }
-        return allSuperClasses;
-    }
-
-    private static Set getAllInterfaces(Class clazz) {
-        Set allInterfaces = new LinkedHashSet();
-        LinkedList stack = new LinkedList();
-        stack.addAll(Arrays.asList(clazz.getInterfaces()));
-        while (!stack.isEmpty()) {
-            Class intf = (Class) stack.removeFirst();
-            if (!allInterfaces.contains(intf)) {
-                allInterfaces.add(intf);
-                stack.addAll(Arrays.asList(intf.getInterfaces()));
-            }
-        }
-        return allInterfaces;
-    }
-
-    public static Set reduceInterfaces(Set source) {
-        Class[] classes = (Class[]) source.toArray(new Class[source.size()]);
-        classes = reduceInterfaces(classes);
-        return new LinkedHashSet(Arrays.asList(classes));
-    }
-
-    /**
-     * If there are multiple interfaces, and some of them extend each other,
-     * eliminate the superclass in favor of the subclasses that extend them.
-     *
-     * If one of the entries is a class (not an interface), make sure it's
-     * the first one in the array.  If more than one of the entries is a
-     * class, throws an IllegalArgumentException
-     *
-     * @param source the original list of interfaces
-     * @return the equal or smaller list of interfaces
-     */
-    public static Class[] reduceInterfaces(Class[] source) {
-        // use a copy of the source array
-        source = (Class[]) source.clone();
-
-        for (int leftIndex = 0; leftIndex < source.length-1; leftIndex++) {
-            Class left = source[leftIndex];
-            if(left == null) {
-                continue;
-            }
-
-            for (int rightIndex = leftIndex +1; rightIndex < source.length; rightIndex++) {
-                Class right = source[rightIndex];
-                if(right == null) {
-                    continue;
-                }
-
-                if(left == right || right.isAssignableFrom(left)) {
-                    // right is the same as class or a sub class of left
-                    source[rightIndex] = null;
-                } else if(left.isAssignableFrom(right)) {
-                    // left is the same as class or a sub class of right
-                    source[leftIndex] = null;
-
-                    // the left has been eliminated; move on to the next left
-                    break;
-                }
-            }
-        }
-
-        Class clazz = null;
-        for (int i = 0; i < source.length; i++) {
-            if (source[i] != null && !source[i].isInterface()) {
-                if (clazz != null) {
-                    throw new IllegalArgumentException("Source contains two classes which are not subclasses of each other: " + clazz.getName() + ", " + source[i].getName());
-                }
-                clazz = source[i];
-                source[i] = null;
-            }
-        }
-
-        List list = new ArrayList(source.length);
-        if (clazz != null) list.add(clazz);
-        for (int i = 0; i < source.length; i++) {
-            if(source[i] != null) {
-                list.add(source[i]);
-            }
-        }
-        return (Class[]) list.toArray(new Class[list.size()]);
-    }
-}
-
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
deleted file mode 100644
index 82554a1c8f..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
+++ /dev/null
@@ -1,150 +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.binding.ejb.corba;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-
-import javax.rmi.CORBA.Stub;
-
-import net.sf.cglib.core.NamingPolicy;
-import net.sf.cglib.core.Predicate;
-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.CallbackFilter;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.FixedValue;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.NoOp;
-
-/**
- * @version $Revision$ $Date$
- */
-public class DynamicStubClassLoader extends ClassLoader {
-    private static final String PACKAGE_PREFIX = "org.omg.stub.";
-
-    @Override
-    public synchronized Class loadClass(final String name) throws ClassNotFoundException {
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-
-        // check if the stub already exists first
-        try {
-            return classLoader.loadClass(name);
-        } catch (ClassNotFoundException e) {
-        }
-
-        // if this is not a class from the org.omg.stub name space don't attempt to generate
-        if (!name.startsWith(PACKAGE_PREFIX)) {
-            throw new ClassNotFoundException("Could not load class: " + name);
-        }
-
-        // load the interfaces class we are attempting to create a stub for
-        Class iface = loadStubInterfaceClass(name, classLoader);
-
-        // create the stub builder
-        try {
-            Enhancer enhancer = new Enhancer();
-            enhancer.setSuperclass(Stub.class);
-            enhancer.setInterfaces(new Class[] {iface});
-            enhancer.setCallbackFilter(FILTER);
-            enhancer.setCallbackTypes(new Class[] {NoOp.class, MethodInterceptor.class, FixedValue.class});
-            enhancer.setUseFactory(false);
-            enhancer.setClassLoader(classLoader);
-            enhancer.setNamingPolicy(new NamingPolicy() {
-                public String getClassName(String s, String s1, Object o, Predicate predicate) {
-                    return name;
-                }
-            });
-
-            // generate the class
-            Class result = enhancer.createClass();
-            assert result != null;
-
-            StubMethodInterceptor interceptor = new StubMethodInterceptor(iface);
-            Ids ids = new Ids(iface);
-            Enhancer.registerStaticCallbacks(result, new Callback[] {NoOp.INSTANCE, interceptor, ids});
-
-            return result;
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Error e) {
-            throw e;
-        }
-    }
-
-    private Class loadStubInterfaceClass(String name, ClassLoader classLoader) throws ClassNotFoundException {
-        try {
-            int begin = name.lastIndexOf('.') + 1;
-            String iPackage = name.substring(13, begin);
-            String iName = iPackage + name.substring(begin + 1, name.length() - 5);
-
-            return classLoader.loadClass(iName);
-        } catch (ClassNotFoundException e) {
-            // don't log exceptions from CosNaming because it attempts to load every
-            // class bound into the name server
-            
-            //FIXME this variable is never read, can we remove the
-            // whole block of code??
-            //boolean shouldLog = true;
-            StackTraceElement[] stackTrace = e.getStackTrace();
-            for (int i = 0; i < stackTrace.length; i++) {
-                StackTraceElement stackTraceElement = stackTrace[i];
-                if (stackTraceElement.getClassName().equals("org.omg.CosNaming.NamingContextExtPOA") && stackTraceElement
-                    .getMethodName().equals("_invoke")) {
-                    //shouldLog = false;
-                    break;
-                }
-            }
-
-            throw new ClassNotFoundException("Unable to generate stub", e);
-        }
-    }
-
-    private static final CallbackFilter FILTER = new CallbackFilter() {
-        public int accept(Method method) {
-            // we don't intercept non-public methods like finalize
-            if (!Modifier.isPublic(method.getModifiers())) {
-                return 0;
-            }
-
-            if (method.getReturnType().equals(String[].class) && method.getParameterTypes().length == 0
-                && method.getName().equals("_ids")) {
-                return 2;
-            }
-
-            if (Modifier.isAbstract(method.getModifiers())) {
-                return 1;
-            }
-
-            return 0;
-        }
-    };
-
-    private static final class Ids implements FixedValue {
-        private final String[] typeIds;
-
-        public Ids(Class type) {
-            typeIds = Java2IDLUtil.createCorbaIds(type);
-        }
-
-        public Object loadObject() throws Exception {
-            return typeIds;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
deleted file mode 100644
index de8090c45b..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
+++ /dev/null
@@ -1,811 +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.binding.ejb.corba;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Method;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.UnexpectedException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.ejb.spi.HandleDelegate;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
-
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.portable.IDLEntity;
-import org.omg.CORBA.portable.ResponseHandler;
-import org.omg.CORBA.portable.UnknownException;
-import org.omg.CORBA_2_3.portable.InputStream;
-import org.omg.CORBA_2_3.portable.OutputStream;
-import org.omg.IOP.Codec;
-import org.omg.IOP.CodecFactory;
-import org.omg.IOP.ENCODING_CDR_ENCAPS;
-import org.omg.IOP.Encoding;
-
-/**
- * Various utility functions.
- * <p/>
- * Note: #getORB() and #getCodec() rely on UtilInitializer to initialize the ORB and codec.
- *
- * @version $Rev$ $Date$
- * @see UtilInitializer
- */
-public final class Java2IDLUtil {
-    private static ORB orb;
-    private static Codec codec;
-    private static HandleDelegate handleDelegate;
-    
-    public static ORB getORB() {
-        assert orb != null;
-        return orb;
-    }
-    
-  
-
-    public static void setORB(ORB orb) throws UserException {
-        if (Java2IDLUtil.orb == null) {
-            Java2IDLUtil.orb = orb;
-            CodecFactory factory = (CodecFactory) Java2IDLUtil.orb.resolve_initial_references("CodecFactory");
-            codec = factory.create_codec(new Encoding(ENCODING_CDR_ENCAPS.value, (byte) 1, (byte) 2));
-        }
-    }
-
-    public static Codec getCodec() {
-        assert codec != null;
-        return codec;
-    }
-
-    public static HandleDelegate getHandleDelegate() throws NamingException {
-        if (handleDelegate == null) {
-            InitialContext ic = new InitialContext();
-            handleDelegate = (HandleDelegate) ic.lookup("java:comp/HandleDelegate");
-        }
-        return handleDelegate;
-    }
-    
-    private static final Pattern SCOPED_NAME_EXTRACTION_PATTERN = Pattern.compile("(\\\\\\\\)|(\\\\@)|(@)|(\\z)");
-
-    /**
-     * See csiv2 Specification 16.2.5 par. 63-64.  We extract the username if any and un-escape any
-     * escaped \ and @ characters.
-     * 
-     * @param scopedNameBytes
-     * @return
-     * @throws UnsupportedEncodingException
-     */
-    public static String extractUserNameFromScopedName(byte[] scopedNameBytes) throws UnsupportedEncodingException {
-        String scopedUserName = new String(scopedNameBytes, "UTF8");
-        return extractUserNameFromScopedName(scopedUserName);
-    }
-
-    public static String extractUserNameFromScopedName(String scopedUserName) {
-        Matcher m = SCOPED_NAME_EXTRACTION_PATTERN.matcher(scopedUserName);
-        StringBuffer buf = new StringBuffer();
-        while (m.find()) {
-            m.appendReplacement(buf, "");
-            if (m.group(1) != null) {
-                buf.append('\\');
-            } else if (m.group(2) != null) {
-                buf.append("@");
-            } else if (m.group(3) != null) {
-                break;
-            }
-        }
-        return buf.toString();
-    }
-
-    private static final Pattern SCOPED_NAME_ESCAPE_PATTERN = Pattern.compile("(\\\\)|(@)");
-
-    public static String buildScopedUserName(String user, String domain) {
-        StringBuffer buf = new StringBuffer();
-        if (user != null) {
-            escape(user, buf);
-        }
-        if (domain != null) {
-            buf.append('@');
-            escape(domain, buf);
-        }
-        return buf.toString();
-    }
-
-    private static void escape(String s, StringBuffer buf) {
-        Matcher m = SCOPED_NAME_ESCAPE_PATTERN.matcher(s);
-        while (m.find()) {
-            m.appendReplacement(buf, "");
-            if (m.group(1) != null) {
-                buf.append("\\\\");
-            } else if (m.group(2) != null) {
-                buf.append("\\@");
-            }
-        }
-        m.appendTail(buf);
-    }
-
-
-    public static String byteToString(byte[] data) {
-        StringBuffer buffer = new StringBuffer();
-        for (int i = 0; i < data.length; i++) {
-            buffer.append(HEXCHAR[(data[i] >>> 4) & 0x0F]);
-            buffer.append(HEXCHAR[(data[i]) & 0x0F]);
-        }
-        return buffer.toString();
-
-    }
-
-    private static final char[] HEXCHAR = {
-        '0', '1', '2', '3', '4', '5', '6', '7',
-        '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-    };
-
-    public static void writeObject(Class type, Object object, OutputStream out) {
-        if (type == Void.TYPE) {
-            // do nothing for a void
-        } else if (type == Boolean.TYPE) {
-            out.write_boolean(((Boolean) object).booleanValue());
-        } else if (type == Byte.TYPE) {
-            out.write_octet(((Byte) object).byteValue());
-        } else if (type == Character.TYPE) {
-            out.write_wchar(((Character) object).charValue());
-        } else if (type == Double.TYPE) {
-            out.write_double(((Double) object).doubleValue());
-        } else if (type == Float.TYPE) {
-            out.write_float(((Float) object).floatValue());
-        } else if (type == Integer.TYPE) {
-            out.write_long(((Integer) object).intValue());
-        } else if (type == Long.TYPE) {
-            out.write_longlong(((Long) object).longValue());
-        } else if (type == Short.TYPE) {
-            out.write_short(((Short) object).shortValue());
-        }  else {
-            // object types must be written in the context of the CORBA application server
-            // which properly write replaces our objects for CORBA
-            // ApplicationServer oldApplicationServer = ServerFederation.getApplicationServer();
-            try {
-                // ServerFederation.setApplicationServer(corbaApplicationServer);
-
-                // todo check if
-                // copy the result to force replacement
-                // CORBA does not call writeReplace on remote proxies
-                //
-                // HOWEVER, if this is an array, then we don't want to do the replacement 
-                // because we can end up with a replacement element that's not compatible with the 
-                // original array type, which results in an ArrayStoreException.  Fortunately, 
-                // the Yoko RMI support appears to be able to sort this out for us correctly. 
-                if (object instanceof Serializable && !object.getClass().isArray()) {
-                    try {
-                        object = copyObj(Thread.currentThread().getContextClassLoader(), object);
-                    } catch (Exception e) {
-                        throw new UnknownException(e);
-                    }
-                }
-
-                if (type == Object.class || type == Serializable.class) {
-                    javax.rmi.CORBA.Util.writeAny(out, object);
-                } else if (org.omg.CORBA.Object.class.isAssignableFrom(type)) {
-                    out.write_Object((org.omg.CORBA.Object) object);
-                } else if (Remote.class.isAssignableFrom(type)) {
-                    javax.rmi.CORBA.Util.writeRemoteObject(out, object);
-                } else if (type.isInterface() && Serializable.class.isAssignableFrom(type)) {
-                    javax.rmi.CORBA.Util.writeAbstractObject(out, object);
-                } else {
-                    out.write_value((Serializable) object, type);
-                }
-            } finally {
-                // ServerFederation.setApplicationServer(oldApplicationServer);
-            }
-        }
-    }
-
-    private static Object copyObj(ClassLoader classLoader, Object object) throws IOException, ClassNotFoundException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ObjectOutputStream oos = new ObjectOutputStream(baos);
-        oos.writeObject(object);
-        oos.flush();
-        oos.close();
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-        ObjectInputStreamExt ois = new ObjectInputStreamExt(bais, classLoader);
-        return ois.readObject();
-    }
-
-    public static Object readObject(Class type, InputStream in) {
-        if (type == Void.TYPE) {
-            return null;
-        } else if (type == Boolean.TYPE) {
-            return new Boolean(in.read_boolean());
-        } else if (type == Byte.TYPE) {
-            return new Byte(in.read_octet());
-        } else if (type == Character.TYPE) {
-            return new Character(in.read_wchar());
-        } else if (type == Double.TYPE) {
-            return new Double(in.read_double());
-        } else if (type == Float.TYPE) {
-            return new Float(in.read_float());
-        } else if (type == Integer.TYPE) {
-            return new Integer(in.read_long());
-        } else if (type == Long.TYPE) {
-            return new Long(in.read_longlong());
-        } else if (type == Short.TYPE) {
-            return new Short(in.read_short());
-        } else if (type == Object.class || type == Serializable.class) {
-            return javax.rmi.CORBA.Util.readAny(in);
-        } else if (org.omg.CORBA.Object.class.isAssignableFrom(type)) {
-            return in.read_Object(type);
-        } else if (Remote.class.isAssignableFrom(type)) {
-            return PortableRemoteObject.narrow(in.read_Object(), type);
-        } else if (type.isInterface() && Serializable.class.isAssignableFrom(type)) {
-            return in.read_abstract_interface();
-        } else {
-            return in.read_value(type);
-        }
-    }
-
-    public static void throwException(Method method, InputStream in) throws Throwable {
-        // read the exception id
-        final String id = in.read_string();
-
-        // get the class name from the id
-        if (!id.startsWith("IDL:")) {
-            return;
-        }
-
-        Class[] exceptionTypes = method.getExceptionTypes();
-        for (int i = 0; i < exceptionTypes.length; i++) {
-            Class exceptionType = exceptionTypes[i];
-
-            String exceptionId = getExceptionId(exceptionType);
-            if (id.equals(exceptionId)) {
-                throw (Throwable) in.read_value(exceptionType);
-            }
-        }
-        throw new UnexpectedException(id);
-    }
-
-    public static OutputStream writeUserException(Method method, ResponseHandler reply, Exception exception) throws Exception {
-        if (exception instanceof RuntimeException || exception instanceof RemoteException) {
-            throw exception;
-        }
-
-        Class[] exceptionTypes = method.getExceptionTypes();
-        for (int i = 0; i < exceptionTypes.length; i++) {
-            Class exceptionType = exceptionTypes[i];
-            if (!exceptionType.isInstance(exception)) {
-                continue;
-            }
-
-            OutputStream out = (OutputStream) reply.createExceptionReply();
-            String exceptionId = getExceptionId(exceptionType);
-            out.write_string(exceptionId);
-            out.write_value(exception);
-            return out;
-        }
-        throw exception;
-    }
-
-    public static String getExceptionId(Class exceptionType) {
-        String exceptionName = exceptionType.getName().replace('.', '/');
-        if (exceptionName.endsWith("Exception")) {
-            exceptionName = exceptionName.substring(0, exceptionName.length() - "Exception".length());
-        }
-        exceptionName += "Ex";
-        String exceptionId = "IDL:" + exceptionName + ":1.0";
-        return exceptionId;
-    }
-
-    public static String[] createCorbaIds(Class type) {
-        List ids = new LinkedList();
-        for (Iterator iterator = getAllInterfaces(type).iterator(); iterator.hasNext();) {
-            Class superInterface = (Class) iterator.next();
-            if (Remote.class.isAssignableFrom(superInterface) && superInterface != Remote.class) {
-                ids.add("RMI:" + superInterface.getName() + ":0000000000000000");
-            }
-        }
-        return (String[]) ids.toArray(new String[ids.size()]);
-    }
-
-    private static Set getAllInterfaces(Class intfClass) {
-        Set allInterfaces = new LinkedHashSet();
-
-        LinkedList stack = new LinkedList();
-        stack.addFirst(intfClass);
-
-        while (!stack.isEmpty()) {
-            Class intf = (Class) stack.removeFirst();
-            allInterfaces.add(intf);
-            stack.addAll(0, Arrays.asList(intf.getInterfaces()));
-        }
-
-        return allInterfaces;
-    }
-
-    public static Map mapMethodToOperation(Class intfClass) {
-        return iiopMap(intfClass, false);
-    }
-
-    public static Map mapOperationToMethod(Class intfClass) {
-        return iiopMap(intfClass, true);
-    }
-
-    private static Map iiopMap(Class intfClass, boolean operationToMethod) {
-        Method[] methods = getAllMethods(intfClass);
-
-        // find every valid getter
-        HashMap getterByMethod = new HashMap(methods.length);
-        HashMap getterByName = new HashMap(methods.length);
-        for (int i = 0; i < methods.length; i++) {
-            Method method = methods[i];
-            String methodName = method.getName();
-
-            // no arguments allowed
-            if (method.getParameterTypes().length != 0) {
-                continue;
-            }
-
-            // must start with get or is
-            String verb;
-            if (methodName.startsWith("get") && methodName.length() > 3 && method.getReturnType() != void.class) {
-                verb = "get";
-            } else if (methodName.startsWith("is") && methodName.length() > 2 && method.getReturnType() == boolean.class) {
-                verb = "is";
-            } else {
-                continue;
-            }
-
-            // must only throw Remote or Runtime Exceptions
-            boolean exceptionsValid = true;
-            Class[] exceptionTypes = method.getExceptionTypes();
-            for (int j = 0; j < exceptionTypes.length; j++) {
-                Class exceptionType = exceptionTypes[j];
-                if (!RemoteException.class.isAssignableFrom(exceptionType) &&
-                        !RuntimeException.class.isAssignableFrom(exceptionType) &&
-                        !Error.class.isAssignableFrom(exceptionType)) {
-                    exceptionsValid = false;
-                    break;
-                }
-            }
-            if (!exceptionsValid) {
-                continue;
-            }
-
-            String propertyName;
-            if (methodName.length() > verb.length() + 1 && Character.isUpperCase(methodName.charAt(verb.length() + 1))) {
-                propertyName = methodName.substring(verb.length());
-            } else {
-                propertyName = Character.toLowerCase(methodName.charAt(verb.length())) + methodName.substring(verb.length() + 1);
-            }
-            getterByMethod.put(method, propertyName);
-            getterByName.put(propertyName, method);
-        }
-
-        HashMap setterByMethod = new HashMap(methods.length);
-        for (int i = 0; i < methods.length; i++) {
-            Method method = methods[i];
-            String methodName = method.getName();
-
-            // must have exactally one arg
-            if (method.getParameterTypes().length != 1) {
-                continue;
-            }
-
-            // must return non void
-            if (method.getReturnType() != void.class) {
-                continue;
-            }
-
-            // must start with set
-            if (!methodName.startsWith("set") || methodName.length() <= 3) {
-                continue;
-            }
-
-            // must only throw Remote or Runtime Exceptions
-            boolean exceptionsValid = true;
-            Class[] exceptionTypes = method.getExceptionTypes();
-            for (int j = 0; j < exceptionTypes.length; j++) {
-                Class exceptionType = exceptionTypes[j];
-                if (!RemoteException.class.isAssignableFrom(exceptionType) &&
-                        !RuntimeException.class.isAssignableFrom(exceptionType) &&
-                        !Error.class.isAssignableFrom(exceptionType)) {
-                    exceptionsValid = false;
-                    break;
-                }
-            }
-            if (!exceptionsValid) {
-                continue;
-            }
-
-            String propertyName;
-            if (methodName.length() > 4 && Character.isUpperCase(methodName.charAt(4))) {
-                propertyName = methodName.substring(3);
-            } else {
-                propertyName = Character.toLowerCase(methodName.charAt(3)) + methodName.substring(4);
-            }
-
-            // must have a matching getter
-            Method getter = (Method) getterByName.get(propertyName);
-            if (getter == null) {
-                continue;
-            }
-
-            // setter property must match getter return value
-            if (!method.getParameterTypes()[0].equals(getter.getReturnType())) {
-                continue;
-            }
-            setterByMethod.put(method, propertyName);
-        }
-
-        // index the methods by name... used to determine which methods are overloaded
-        HashMap overloadedMethods = new HashMap(methods.length);
-        for (int i = 0; i < methods.length; i++) {
-            Method method = methods[i];
-            if (getterByMethod.containsKey(method) || setterByMethod.containsKey(method)) {
-                continue;
-            }
-            String methodName = method.getName();
-            List methodList = (List) overloadedMethods.get(methodName);
-            if (methodList == null) {
-                methodList = new LinkedList();
-                overloadedMethods.put(methodName, methodList);
-            }
-            methodList.add(method);
-        }
-
-        // index the methods by lower case name... used to determine which methods differ only by case
-        HashMap caseCollisionMethods = new HashMap(methods.length);
-        for (int i = 0; i < methods.length; i++) {
-            Method method = methods[i];
-            if (getterByMethod.containsKey(method) || setterByMethod.containsKey(method)) {
-                continue;
-            }
-            String lowerCaseMethodName = method.getName().toLowerCase();
-            Set methodSet = (Set) caseCollisionMethods.get(lowerCaseMethodName);
-            if (methodSet == null) {
-                methodSet = new HashSet();
-                caseCollisionMethods.put(lowerCaseMethodName, methodSet);
-            }
-            methodSet.add(method.getName());
-        }
-
-        String className = getClassName(intfClass);
-        Map iiopMap = new HashMap(methods.length);
-        for (int i = 0; i < methods.length; i++) {
-            Method method = methods[i];
-
-            String iiopName = (String) getterByMethod.get(method);
-            if (iiopName != null) {
-                // if we have a leading underscore prepend with J
-                if (iiopName.charAt(0) == '_') {
-                    iiopName = "J_get_" + iiopName.substring(1);
-                } else {
-                    iiopName = "_get_" + iiopName;
-                }
-            } else {
-                iiopName = (String) setterByMethod.get(method);
-                if (iiopName != null) {
-                    // if we have a leading underscore prepend with J
-                    if (iiopName.charAt(0) == '_') {
-                        iiopName = "J_set_" + iiopName.substring(1);
-                    } else {
-                        iiopName = "_set_" + iiopName;
-                    }
-                } else {
-                    iiopName = method.getName();
-
-                    // if we have a leading underscore prepend with J
-                    if (iiopName.charAt(0) == '_') {
-                        iiopName = "J" + iiopName;
-                    }
-                }
-            }
-
-            // if this name only differs by case add the case index to the end
-            Set caseCollisions = (Set) caseCollisionMethods.get(method.getName().toLowerCase());
-            if (caseCollisions != null && caseCollisions.size() > 1) {
-                iiopName += upperCaseIndexString(iiopName);
-            }
-
-            // if this is an overloaded method append the parameter string
-            List overloads = (List) overloadedMethods.get(method.getName());
-            if (overloads != null && overloads.size() > 1) {
-                iiopName += buildOverloadParameterString(method.getParameterTypes());
-            }
-
-            // if we have a leading underscore prepend with J
-            iiopName = replace(iiopName, '$', "U0024");
-
-            // if we have matched a keyword prepend with an underscore
-            if (keywords.contains(iiopName.toLowerCase())) {
-                iiopName = "_" + iiopName;
-            }
-
-            // if the name is the same as the class name, append an underscore
-            if (iiopName.equalsIgnoreCase(className)) {
-                iiopName += "_";
-            }
-
-            if (operationToMethod) {
-                iiopMap.put(iiopName, method);
-            } else {
-                iiopMap.put(method, iiopName);
-            }
-        }
-
-        return iiopMap;
-    }
-
-    private static Method[] getAllMethods(Class intfClass) {
-        LinkedList methods = new LinkedList();
-        for (Iterator iterator = getAllInterfaces(intfClass).iterator(); iterator.hasNext();) {
-            Class intf = (Class) iterator.next();
-            methods.addAll(Arrays.asList(intf.getDeclaredMethods()));
-        }
-
-        return (Method[]) methods.toArray(new Method[methods.size()]);
-    }
-
-    /**
-     * Return the a string containing an underscore '_' index of each uppercase character in the IIOP name.
-     *
-     * This is used for distinction of names that only differ by case, since CORBA does not support case sensitive names.
-     */
-    private static String upperCaseIndexString(String iiopName) {
-        StringBuffer stringBuffer = new StringBuffer();
-        for (int i = 0; i < iiopName.length(); i++) {
-            char c = iiopName.charAt(i);
-            if (Character.isUpperCase(c)) {
-                stringBuffer.append('_').append(i);
-            }
-        }
-        return stringBuffer.toString();
-    }
-
-    /**
-     * Replaces any occurances of the specified "oldChar" with the new string.
-     *
-     * This is used to replace occurances if '$' in CORBA names since '$' is a special character
-     */
-    private static String replace(String source, char oldChar, String newString) {
-        StringBuffer stringBuffer = new StringBuffer(source.length());
-        for (int i = 0; i < source.length(); i++) {
-            char c = source.charAt(i);
-            if (c == oldChar) {
-                stringBuffer.append(newString);
-            } else {
-                stringBuffer.append(c);
-            }
-        }
-        return stringBuffer.toString();
-    }
-
-    /**
-     * Return the a string containing a double underscore '__' list of parameter types encoded using the Java to IDL rules.
-     *
-     * This is used for distinction of methods that only differ by parameter lists.
-     */
-    private static String buildOverloadParameterString(Class[] parameterTypes) {
-        String name = "";
-        if (parameterTypes.length ==0) {
-            name += "__";
-        } else {
-            for (int i = 0; i < parameterTypes.length; i++) {
-                Class parameterType = parameterTypes[i];
-                name += buildOverloadParameterString(parameterType);
-            }
-        }
-        return name.replace('.', '_');
-    }
-
-    /**
-     * Returns a single parameter type encoded using the Java to IDL rules.
-     */
-    private static String buildOverloadParameterString(Class parameterType) {
-        String name = "_";
-
-        int arrayDimensions = 0;
-        while (parameterType.isArray()) {
-            arrayDimensions++;
-            parameterType = parameterType.getComponentType();
-        }
-
-        // arrays start with org_omg_boxedRMI_
-        if (arrayDimensions > 0) {
-            name += "_org_omg_boxedRMI";
-        }
-
-        // IDLEntity types must be prefixed with org_omg_boxedIDL_
-        if (IDLEntity.class.isAssignableFrom(parameterType)) {
-            name += "_org_omg_boxedIDL";
-        }
-
-        // add package... some types have special mappings in corba
-        String packageName = (String) specialTypePackages.get(parameterType.getName());
-        if (packageName == null) {
-            packageName = getPackageName(parameterType.getName());
-        }
-        if (packageName.length() > 0) {
-            name += "_" + packageName;
-        }
-
-        // arrays now contain a dimension indicator
-        if (arrayDimensions > 0) {
-            name += "_" + "seq" + arrayDimensions;
-        }
-
-        // add the class name
-        String className = (String) specialTypeNames.get(parameterType.getName());
-        if (className == null) {
-            className = buildClassName(parameterType);
-        }
-        name += "_" + className;
-
-        return name;
-    }
-
-    /**
-     * Returns a string containing an encoded class name.
-     */
-    private static String buildClassName(Class type) {
-        if (type.isArray()) {
-            throw new IllegalArgumentException("type is an array: " + type);
-        }
-
-        // get the classname
-        String typeName = type.getName();
-        int endIndex = typeName.lastIndexOf('.');
-        if (endIndex < 0) {
-            return typeName;
-        }
-        StringBuffer className = new StringBuffer(typeName.substring(endIndex + 1));
-
-        // for innerclasses replace the $ separator with two underscores
-        // we can't just blindly replace all $ characters since class names can contain the $ character
-        if (type.getDeclaringClass() != null) {
-            String declaringClassName = getClassName(type.getDeclaringClass());
-            assert className.toString().startsWith(declaringClassName + "$");
-            className.replace(declaringClassName.length(), declaringClassName.length() + 1, "__");
-        }
-
-        // if we have a leading underscore prepend with J
-        if (className.charAt(0) == '_') {
-            className.insert(0, "J");
-        }
-        return className.toString();
-    }
-
-    private static String getClassName(Class type) {
-        if (type.isArray()) {
-            throw new IllegalArgumentException("type is an array: " + type);
-        }
-
-        // get the classname
-        String typeName = type.getName();
-        int endIndex = typeName.lastIndexOf('.');
-        if (endIndex < 0) {
-            return typeName;
-        }
-        return typeName.substring(endIndex + 1);
-    }
-
-    private static String getPackageName(String interfaceName) {
-        int endIndex = interfaceName.lastIndexOf('.');
-        if (endIndex < 0) {
-            return "";
-        }
-        return interfaceName.substring(0, endIndex);
-    }
-
-    private static final Map specialTypeNames;
-    private static final Map specialTypePackages;
-    private static final Set keywords;
-
-    static {
-       specialTypeNames = new HashMap();
-       specialTypeNames.put("boolean", "boolean");
-       specialTypeNames.put("char", "wchar");
-       specialTypeNames.put("byte", "octet");
-       specialTypeNames.put("short", "short");
-       specialTypeNames.put("int", "long");
-       specialTypeNames.put("long", "long_long");
-       specialTypeNames.put("float", "float");
-       specialTypeNames.put("double", "double");
-       specialTypeNames.put("java.lang.Class", "ClassDesc");
-       specialTypeNames.put("java.lang.String", "WStringValue");
-       specialTypeNames.put("org.omg.CORBA.Object", "Object");
-
-       specialTypePackages = new HashMap();
-       specialTypePackages.put("boolean", "");
-       specialTypePackages.put("char", "");
-       specialTypePackages.put("byte", "");
-       specialTypePackages.put("short", "");
-       specialTypePackages.put("int", "");
-       specialTypePackages.put("long", "");
-       specialTypePackages.put("float", "");
-       specialTypePackages.put("double", "");
-       specialTypePackages.put("java.lang.Class", "javax.rmi.CORBA");
-       specialTypePackages.put("java.lang.String", "CORBA");
-       specialTypePackages.put("org.omg.CORBA.Object", "");
-
-       keywords = new HashSet();
-       keywords.add("abstract");
-       keywords.add("any");
-       keywords.add("attribute");
-       keywords.add("boolean");
-       keywords.add("case");
-       keywords.add("char");
-       keywords.add("const");
-       keywords.add("context");
-       keywords.add("custom");
-       keywords.add("default");
-       keywords.add("double");
-       keywords.add("enum");
-       keywords.add("exception");
-       keywords.add("factory");
-       keywords.add("false");
-       keywords.add("fixed");
-       keywords.add("float");
-       keywords.add("in");
-       keywords.add("inout");
-       keywords.add("interface");
-       keywords.add("long");
-       keywords.add("module");
-       keywords.add("native");
-       keywords.add("object");
-       keywords.add("octet");
-       keywords.add("oneway");
-       keywords.add("out");
-       keywords.add("private");
-       keywords.add("public");
-       keywords.add("raises");
-       keywords.add("readonly");
-       keywords.add("sequence");
-       keywords.add("short");
-       keywords.add("string");
-       keywords.add("struct");
-       keywords.add("supports");
-       keywords.add("switch");
-       keywords.add("true");
-       keywords.add("truncatable");
-       keywords.add("typedef");
-       keywords.add("union");
-       keywords.add("unsigned");
-       keywords.add("valuebase");
-       keywords.add("valuetype");
-       keywords.add("void");
-       keywords.add("wchar");
-       keywords.add("wstring");
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
deleted file mode 100644
index 1be4a98a48..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
+++ /dev/null
@@ -1,61 +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.binding.ejb.corba;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamClass;
-import java.lang.reflect.Proxy;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ObjectInputStreamExt extends ObjectInputStream {
-
-    private ClassLoader classloader;
-
-    public ObjectInputStreamExt(InputStream in, ClassLoader loader) throws IOException {
-        super(in);
-        this.classloader = loader;
-    }
-
-    @Override
-    protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
-        return ClassLoadingUtil.loadClass(classDesc.getName(), classloader);
-    }
-
-    @Override
-    protected Class resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException {
-        Class[] cinterfaces = new Class[interfaces.length];
-        for (int i = 0; i < interfaces.length; i++)
-            cinterfaces[i] = classloader.loadClass(interfaces[i]);
-
-        try {
-            return Proxy.getProxyClass(classloader, cinterfaces);
-        } catch (IllegalArgumentException e) {
-            throw new ClassNotFoundException(null, e);
-        }
-    }
-
-    ClassLoader getClassloader() {
-        return classloader;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
deleted file mode 100644
index 3ff0ed552a..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
+++ /dev/null
@@ -1,154 +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.binding.ejb.corba;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.Map;
-
-import javax.ejb.EJBObject;
-import javax.rmi.CORBA.Stub;
-import javax.rmi.CORBA.Util;
-
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.portable.ApplicationException;
-import org.omg.CORBA.portable.RemarshalException;
-import org.omg.CORBA.portable.ServantObject;
-import org.omg.CORBA_2_3.portable.InputStream;
-import org.omg.CORBA_2_3.portable.OutputStream;
-
-/**
- * @version $Revision$ $Date$
- */
-public class StubMethodInterceptor implements MethodInterceptor {
-    private static final Method ISIDENTICAL;
-
-    static {
-        try {
-            ISIDENTICAL = EJBObject.class.getMethod("isIdentical", new Class[]{EJBObject.class});
-        } catch (NoSuchMethodException e) {
-            throw new ExceptionInInitializerError(e);
-        }
-    }
-
-    private final Class type;
-    private final Map operations;
-
-    public StubMethodInterceptor(Class type) {
-        this.type = type;
-        this.operations = Collections.unmodifiableMap(org.apache.tuscany.sca.binding.ejb.corba.Java2IDLUtil.mapMethodToOperation(type));
-    }
-
-    public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
-        Stub stub = (Stub) proxy;
-
-        // handle is identical in stub to avoid unnecessary round trip
-        if (method.equals(ISIDENTICAL)) {
-            org.omg.CORBA.Object otherObject = (org.omg.CORBA.Object) args[0];
-            return new Boolean(stub._is_equivalent(otherObject));
-        }
-
-        // get the operation name object
-        String operationName = (String) operations.get(method);
-        if (operationName == null) {
-            throw new IllegalStateException("Unknown method: " + method);
-        }
-
-        while (true) {
-            // if this is a stub to a remote object we invoke over the wire
-            if (!Util.isLocal(stub)) {
-
-                InputStream in = null;
-                try {
-                    // create the request output stream
-                    OutputStream out = (OutputStream) stub._request(operationName, true);
-
-                    // write the arguments
-                    Class[] parameterTypes = method.getParameterTypes();
-                    for (int i = 0; i < parameterTypes.length; i++) {
-                        Class parameterType = parameterTypes[i];
-                        org.apache.tuscany.sca.binding.ejb.corba.Java2IDLUtil.writeObject(parameterType, args[i], out);
-                    }
-
-                    // send the invocation
-                    in = (InputStream) stub._invoke(out);
-
-                    // read the result
-                    Object result = org.apache.tuscany.sca.binding.ejb.corba.Java2IDLUtil.readObject(method.getReturnType(), in);
-                    return result;
-                } catch (RemarshalException exception) {
-                    continue;
-                } catch (ApplicationException exception) {
-                    org.apache.tuscany.sca.binding.ejb.corba.Java2IDLUtil.throwException(method, (InputStream) exception.getInputStream());
-                } catch (SystemException e) {
-                    throw Util.mapSystemException(e);
-                } finally {
-                    stub._releaseReply(in);
-                }
-            } else {
-                // get the servant
-                ServantObject servantObject = stub._servant_preinvoke(operationName, type);
-                if (servantObject == null) {
-                    continue;
-                }
-
-                try {
-                    // copy the arguments
-                    Object[] argsCopy = Util.copyObjects(args, stub._orb());
-
-                    // invoke the servant
-                    Object result = null;
-                    try {
-                        result = method.invoke(servantObject.servant, argsCopy);
-                    } catch (InvocationTargetException e) {
-                        if (e.getCause() != null) {
-                            throw e.getCause();
-                        }
-                        throw e;
-                    }
-
-                    // copy the result
-                    result = Util.copyObject(result, stub._orb());
-
-                    return result;
-                } catch (Throwable throwable) {
-                    // copy the exception
-                    Throwable throwableCopy = (Throwable) Util.copyObject(throwable, stub._orb());
-
-                    // if it is one of my exception rethrow it
-                    Class[] exceptionTypes = method.getExceptionTypes();
-                    for (int i = 0; i < exceptionTypes.length; i++) {
-                        Class exceptionType = exceptionTypes[i];
-                        if (exceptionType.isInstance(throwableCopy)) {
-                            throw throwableCopy;
-                        }
-                    }
-
-                    throw Util.wrapException(throwableCopy);
-                } finally {
-                    stub._servant_postinvoke(servantObject);
-                }
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
deleted file mode 100644
index f9aa9ffa22..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
+++ /dev/null
@@ -1,69 +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.binding.ejb.corba;
-
-import org.omg.CORBA.LocalObject;
-import org.omg.PortableInterceptor.ORBInitInfo;
-import org.omg.PortableInterceptor.ORBInitializer;
-
-/**
- * The sole purpose of this initializer is to register a non-singleton ORB
- * with the class <code>Util</code>.
- *
- * @version $Revision$ $Date$
- * @see Java2IDLUtil
- */
-public class UtilInitializer extends LocalObject implements ORBInitializer {
-
-    private static final long serialVersionUID = 4901857563505370955L;
-
-    /**
-     * Called during ORB initialization.  If it is expected that initial
-     * services registered by an interceptor will be used by other
-     * interceptors, then those initial services shall be registered at
-     * this point via calls to
-     * <code>ORBInitInfo.register_initial_reference</code>.
-     *
-     * @param info provides initialization attributes and operations by
-     *             which Interceptors can be registered.
-     */
-    public void pre_init(ORBInitInfo info) {
-    }
-
-    /**
-     * Called during ORB initialization. If a service must resolve initial
-     * references as part of its initialization, it can assume that all
-     * initial references will be available at this point.
-     * <p/>
-     * Calling the <code>post_init</code> operations is not the final
-     * task of ORB initialization. The final task, following the
-     * <code>post_init</code> calls, is attaching the lists of registered
-     * interceptors to the ORB. Therefore, the ORB does not contain the
-     * interceptors during calls to <code>post_init</code>. If an
-     * ORB-mediated call is made from within <code>post_init</code>, no
-     * request interceptors will be invoked on that call.
-     * Likewise, if an operation is performed which causes an IOR to be
-     * created, no IOR interceptors will be invoked.
-     *
-     * @param info provides initialization attributes and
-     *             operations by which Interceptors can be registered.
-     */
-    public void post_init(ORBInitInfo info) {
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
deleted file mode 100644
index 9247c1d3db..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
+++ /dev/null
@@ -1,92 +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.binding.ejb.provider;
-
-import org.apache.tuscany.sca.binding.ejb.EJBBinding;
-import org.apache.tuscany.sca.binding.ejb.util.EJBHandler;
-import org.apache.tuscany.sca.binding.ejb.util.NamingEndpoint;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-
-/**
- * EJBTargetInvoker
- *
- * @version $Rev$ $Date$
- */
-public class EJBBindingInvoker implements Invoker, DataExchangeSemantics {
-
-    private Operation operation;
-    private String location;
-    private Class serviceInterface;
-
-    public EJBBindingInvoker(EJBBinding ejbBinding, Class serviceInterface, Operation operation) {
-        this.serviceInterface = serviceInterface;
-        this.location = ejbBinding.getURI();
-        this.operation = operation;
-    }
-
-    public Message invoke(Message msg) {
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            Thread.currentThread().setContextClassLoader(serviceInterface.getClassLoader());
-            Object resp = doInvoke(msg.getBody());
-            msg.setBody(resp);
-        } catch (Throwable e) {
-            e.printStackTrace();
-            msg.setFaultBody(e);
-        } finally {
-            Thread.currentThread().setContextClassLoader(tccl);
-        }
-        return msg;
-    }
-
-    /**
-     * Invoke a EJB operation
-     * 
-     * @param payload
-     * @return
-     */
-    public Object doInvoke(final Object payload) {
-
-        // construct NamingendPoint
-        NamingEndpoint endpoint = getNamingEndpoint();
-
-        // lookup home and ejb stub
-        EJBHandler ejbHandler = new EJBHandler(endpoint, serviceInterface);
-
-        String methodName = operation.getName();
-
-        // invoke business method on ejb
-        Object response = ejbHandler.invoke(methodName, (Object[])payload);
-
-        return response;
-    }
-
-    protected NamingEndpoint getNamingEndpoint() {
-        return new NamingEndpoint(location);
-    }
-    
-    public boolean allowsPassByReference() {
-        // EJB RMI/IIOP always pass by value
-        return true;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
deleted file mode 100644
index a6ea583d0b..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
+++ /dev/null
@@ -1,56 +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.binding.ejb.provider;
-
-import org.apache.tuscany.sca.binding.ejb.EJBBinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * A factory from creating the EJB binding provider.
- *
- * @version $Rev$ $Date$
- */
-public class EJBBindingProviderFactory implements BindingProviderFactory<EJBBinding> {
-
-    public EJBBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   EJBBinding binding) {
-        return new EJBBindingReferenceBindingProvider(component, reference, binding);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               EJBBinding binding) {
-        return null;
-        //throw new EJBBindingException("Service Binding not supported for EJB Binding");
-    }
-
-    public Class<EJBBinding> getModelType() {
-        return EJBBinding.class;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
deleted file mode 100644
index 2a02bf0d08..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
+++ /dev/null
@@ -1,86 +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.binding.ejb.provider;
-
-import org.apache.tuscany.sca.binding.ejb.EJBBinding;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * Implementation of the ReferenceBindingProvider for the EJBBinding.
- *
- * @version $Rev$ $Date$
- */
-public class EJBBindingReferenceBindingProvider implements ReferenceBindingProvider {
-    private EJBBinding ejbBinding;
-    private RuntimeComponentReference reference;
-
-    /**
-     * Constructor
-     * 
-     * @param component
-     * @param reference
-     * @param binding
-     */
-    public EJBBindingReferenceBindingProvider(RuntimeComponent component,
-                                              RuntimeComponentReference reference,
-                                              EJBBinding binding) {
-        this.reference = reference;
-        this.ejbBinding = binding;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Invoker createInvoker(Operation operation) {
-        return new EJBBindingInvoker(ejbBinding, ((JavaInterface)reference.getInterfaceContract().getInterface())
-            .getJavaClass(), operation);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public InterfaceContract getBindingInterfaceContract() {
-        return reference.getInterfaceContract();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void start() {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void stop() {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean supportsOneWayInvocation() {
-        return true;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
deleted file mode 100644
index c7c0f90710..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
+++ /dev/null
@@ -1,338 +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.binding.ejb.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.rmi.RemoteException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ejb.EJBObject;
-import javax.rmi.CORBA.Util;
-
-import org.apache.tuscany.sca.binding.ejb.corba.ClassLoadingUtil;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.portable.ApplicationException;
-import org.omg.CORBA.portable.ObjectImpl;
-import org.omg.CORBA.portable.RemarshalException;
-import org.omg.CORBA.portable.ServantObject;
-import org.omg.CORBA_2_3.portable.InputStream;
-import org.omg.CORBA_2_3.portable.OutputStream;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * EJBMessageHandler
- *
- * @version $Rev$ $Date$
- */
-public class EJBHandler {
-    private static final Map<String, Class> PRIMITIVE_TYPES = new HashMap<String, Class>();
-    static {
-        PRIMITIVE_TYPES.put("boolean", boolean.class);
-        PRIMITIVE_TYPES.put("byte", byte.class);
-        PRIMITIVE_TYPES.put("char", char.class);
-        PRIMITIVE_TYPES.put("short", short.class);
-        PRIMITIVE_TYPES.put("int", int.class);
-        PRIMITIVE_TYPES.put("long", long.class);
-        PRIMITIVE_TYPES.put("float", float.class);
-        PRIMITIVE_TYPES.put("double", double.class);
-        PRIMITIVE_TYPES.put("void", void.class);
-    }
-
-    private Object ejbStub;
-
-    private InterfaceInfo interfaceInfo;
-    private Class ejbInterface;
-
-    public EJBHandler(NamingEndpoint namingEndpoint, Class ejbInterface) {
-        this(namingEndpoint, InterfaceInfo.getInstance(ejbInterface));
-        this.ejbInterface = ejbInterface;
-    }
-
-    // locates the stub
-    private EJBHandler(NamingEndpoint namingEndpoint, InterfaceInfo ejbInterface) {
-        try {
-            this.ejbStub = EJBStubHelper.lookup(namingEndpoint, ejbInterface);
-            this.interfaceInfo = ejbInterface;
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    private static Class loadClass(final String name) {
-        try {
-            return ClassLoadingUtil.loadClass(name, Thread.currentThread().getContextClassLoader());
-        } catch (ClassNotFoundException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    // invokes EJB method
-    public Object invoke(String methodName, Object[] args) {
-        Object response = null;
-        try {
-            if (ejbStub instanceof ObjectImpl) {
-                ObjectImpl objectImpl = (ObjectImpl)ejbStub;
-                // TODO: If the Java 2 security is turned on, then
-                // the ORB will try to create proxy
-                // from the interfaces defined on the stub
-                if (System.getSecurityManager() == null && objectImpl._is_local()) {
-                    /*
-                     * CORBA.Stub is what the object from JNDI will be for a
-                     * remote EJB in the same JVM as the client, but with no
-                     * stub classes available on the client
-                     */
-                    response = invokeLocalCORBACall(objectImpl, methodName, args);
-                } else {
-                    /*
-                     * _EJBObject_Stub is what the object from JNDI will be for
-                     * a remote EJB with no stub classes available on the client
-                     */
-                    response = invokeRemoteCORBACall(objectImpl, methodName, args);
-                }
-            } else {
-                /*
-                 * A generated ejb stub or it must be an EJB in the same ear as
-                 * the client or an AppServer with a single ClassLoader, so
-                 * reflection can be used directly on the JNDI
-                 */
-                JavaReflectionAdapter reflectionAdapter =
-                    JavaReflectionAdapter.createJavaReflectionAdapter(ejbStub.getClass());
-                try {
-                    Method method = reflectionAdapter.getMethod(methodName);
-                    response = method.invoke(ejbStub, args);
-                } catch (InvocationTargetException e) {
-                    Throwable t = e.getTargetException();
-                    // FIXME need to throw really a business exception.
-                    // ServiceBusinessException?
-                    // Tuscany core doesn't have ServiceBusinessException
-                    throw new ServiceRuntimeException(t);
-                }
-            }
-
-            return response;
-        } catch (Exception e) {
-            // FIXME this be business exception? Tuscany core doesn't have
-            // ServiceBusinessException
-            throw new ServiceRuntimeException(e);
-
-        } catch (Throwable e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    /**
-     * Get the IDL operation name for a java method
-     * 
-     * @param methodName java method name
-     * @return The IDL operation name
-     */
-    private String getOperation(String methodName) {
-        if (interfaceInfo == null) {
-            return methodName;
-        }
-        MethodInfo methodInfo = interfaceInfo.getMethod(methodName);
-        if (methodInfo != null) {
-            return methodInfo.getIDLName();
-        } else {
-            return null;
-        }
-    }
-
-    /*
-     * Derive the EJB interface name from the Stub When loading a stub class
-     * corresponding to an interface or class <packagename>.<typename>, the
-     * class <packagename>._<typename>_Stub shall be used if it exists;
-     * otherwise, the class org.omg.stub.<packagename>._<typename>_Stub shall
-     * be used.
-     */
-    private static String getInterface(String stubName) {
-        int index = stubName.lastIndexOf('.');
-        String packageName = null;
-        String typeName = stubName;
-        if (index != -1) {
-            packageName = stubName.substring(0, index);
-            if (packageName.startsWith("org.omg.stub.")) {
-                packageName = packageName.substring("org.omg.stub.".length());
-            }
-            typeName = stubName.substring(index + 1);
-        }
-        if (typeName.startsWith("_") && typeName.endsWith("_Stub")) {
-            typeName = typeName.substring(1, typeName.length() - "_Stub".length());
-        }
-        if (packageName != null)
-            return packageName + "." + typeName;
-        else
-            return typeName;
-    }
-
-    /**
-     * Invoke a method on the local CORBA object
-     * 
-     * @param stub
-     * @param methodName
-     * @param args
-     * @return
-     * @throws RemoteException
-     * @throws ServiceBusinessException
-     */
-    private Object invokeLocalCORBACall(final ObjectImpl stub, String methodName, Object[] args)
-        throws RemoteException {
-
-        final String operation = getOperation(methodName);
-
-        Class type = loadClass(getInterface(stub.getClass().getName()));
-        if (type == null)
-            type = (ejbInterface != null) ? ejbInterface : EJBObject.class;
-
-        ServantObject so = stub._servant_preinvoke(operation, type);
-        if (so == null) {
-            // The Servant is not local any more
-            return invokeRemoteCORBACall(stub, methodName, args);
-        }
-        Object[] newArgs = null;
-        ORB orb = stub._orb();
-        try {
-            if (args != null)
-                newArgs = Util.copyObjects(args, orb);
-            JavaReflectionAdapter reflectionAdapter =
-                JavaReflectionAdapter.createJavaReflectionAdapter(so.servant.getClass());
-            Method method = reflectionAdapter.getMethod(methodName);
-            Object obj = reflectionAdapter.invoke(method, so.servant, newArgs);
-            Object result = Util.copyObject(obj, orb);
-            return result;
-
-        } catch (InvocationTargetException e) {
-            Throwable exCopy = (Throwable)Util.copyObject(e.getTargetException(), orb);
-            MethodInfo methodInfo = interfaceInfo.getMethod(methodName);
-            String[] exceptionTypes = methodInfo.getExceptionTypes();
-            for (int i = 0; i < exceptionTypes.length; i++) {
-                Class exceptionType =
-                    methodInfo.getMethod() != null ? methodInfo.getMethod().getExceptionTypes()[i]
-                        : loadClass(exceptionTypes[i]);
-                if (exceptionType.isAssignableFrom(exCopy.getClass()))
-                    throw new ServiceRuntimeException(exCopy); // FIXME should
-                // be business
-                // exception?
-            }
-            throw Util.wrapException(exCopy);
-        } catch (Throwable e) {
-            // Other exceptions thrown from "invoke"
-            throw new ServiceRuntimeException(e);
-        } finally {
-            stub._servant_postinvoke(so);
-        }
-    }
-
-    /**
-     * Invoke a method on a remote CORBA object
-     * 
-     * @param stub The remote stub
-     * @param methodName The name of the method
-     * @param args Argument list
-     * @return
-     * @throws RemoteException
-     * @throws ServiceBusinessException
-     */
-    private Object invokeRemoteCORBACall(ObjectImpl stub, String methodName, Object[] args) throws RemoteException {
-
-        try {
-            String operation = getOperation(methodName);
-
-            MethodInfo methodInfo = interfaceInfo.getMethod(methodName);
-            if (methodInfo == null) {
-                throw new ServiceRuntimeException("Invalid Method " + methodName);
-            }
-            Class[] parameterTypes = null;
-            Class returnType = null;
-            if (methodInfo.getMethod() != null) {
-                parameterTypes = methodInfo.getMethod().getParameterTypes();
-                returnType = methodInfo.getMethod().getReturnType();
-            } else {
-                String[] types = methodInfo.getParameterTypes();
-                if (args != null) {
-                    if (types.length != args.length)
-                        throw new ServiceRuntimeException(
-                                                          "The argument list doesn't match the method signature of " + methodName);
-                }
-
-                parameterTypes = new Class[types.length];
-                for (int i = 0; i < types.length; i++) {
-                    parameterTypes[i] = loadClass(types[i]);
-                }
-                returnType = loadClass(methodInfo.getReturnType());
-            }
-
-            InputStream in = null;
-            try {
-                OutputStream out = (OutputStream)stub._request(operation, true);
-
-                for (int i = 0; i < parameterTypes.length; i++) {
-                    // Object arg = (args.length < i) ? null : args[i];
-                    writeValue(out, args[i], parameterTypes[i]);
-                }
-                if (returnType == void.class) {
-                    // void return
-                    stub._invoke(out);
-                    return null;
-                } else {
-                    // read the return value
-                    in = (InputStream)stub._invoke(out);
-                    Object response = readValue(in, returnType);
-                    return response;
-                }
-
-            } catch (ApplicationException ex) {
-                in = (InputStream)ex.getInputStream();
-                try {
-                    org.apache.tuscany.sca.binding.ejb.corba.Java2IDLUtil.throwException(methodInfo.getMethod(), in);
-                    return null;
-                } catch (Throwable e) {
-                    throw new RemoteException(e.getMessage(), e);
-                }
-            } catch (RemarshalException ex) {
-                return invokeRemoteCORBACall(stub, methodName, args);
-            } finally {
-                stub._releaseReply(in);
-            }
-        } catch (SystemException ex) {
-            throw Util.mapSystemException(ex);
-        }
-    }
-
-    /**
-     * @param out
-     * @param value
-     * @param type
-     */
-    private void writeValue(OutputStream out, Object value, Class type) {
-        org.apache.tuscany.sca.binding.ejb.corba.Java2IDLUtil.writeObject(type, value, out);
-    }
-
-    /**
-     * @param in
-     * @param type
-     * @return
-     */
-    private Object readValue(InputStream in, Class type) {
-        return org.apache.tuscany.sca.binding.ejb.corba.Java2IDLUtil.readObject(type, in);
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
deleted file mode 100644
index 0b97f42746..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
+++ /dev/null
@@ -1,483 +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.binding.ejb.util;
-
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.omg.CORBA.ORB;
-import org.omg.CosNaming.NamingContextExt;
-
-/**
- * CosNaming utility
- *
- * @version $Rev$ $Date$
- */
-class EJBLocator {
-
-    /*
-     * Root Context Initial Reference Key ------------
-     * ----------------------------------- Server Root NameServiceServerRoot
-     * Cell Persistent Root NameServiceCellPersistentRoot Cell Root
-     * NameServiceCellRoot, NameService Node Root NameServiceNodeRoot
-     */
-    public static final String SERVER_ROOT = "NameServiceServerRoot";
-    public static final String CELL_PERSISTENT_ROOT = "NameServiceCellPersistentRoot";
-    public static final String CELL_ROOT = "NameServiceCellRoot";
-    public static final String NODE_ROOT = "NameServiceNodeRoot";
-    public static final String DEFAULT_ROOT = "NameService"; // Same as
-    // CELL_ROOT
-
-    public static final String DEFAULT_HOST = "127.0.0.1"; // Default host name
-    // or IP address for
-    // WebSphere
-    public static final int DEFAULT_NAMING_PORT = 2809; // Default port
-    public static final String NAMING_SERVICE = "NameService"; // The name of
-    // the naming
-    // service
-    private static final Set<String> ROOTS =
-        new HashSet<String>(Arrays.asList(new String[] {SERVER_ROOT, CELL_PERSISTENT_ROOT, CELL_ROOT, DEFAULT_ROOT,
-                                                        NODE_ROOT}));
-
-    // private static final String CHARS_TO_ESCAPE = "\\/.";
-    private static final String RFC2396 =
-        "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789;/:?@&=+$,-_.!~*'()";
-    private static final String HEX = "0123456789ABCDEF";
-
-    private String hostName = DEFAULT_HOST;
-    private int port = DEFAULT_NAMING_PORT;
-    private String root = SERVER_ROOT;
-
-    private ORB orb = null;
-    private ObjectLocator locator = null;
-    private boolean managed = true;
-
-    EJBLocator(boolean managed) {
-        this.managed = managed;
-        if (!managed) {
-            String url = AccessController.doPrivileged(new PrivilegedAction<String>() {
-                public String run() {
-                    return System.getProperty(Context.PROVIDER_URL);
-                }
-            });
-            processCorbaURL(url);
-        }
-    }
-
-    EJBLocator(String hostName, int port) {
-        this.hostName = (hostName == null) ? DEFAULT_HOST : hostName;
-        this.port = port > 0 ? port : DEFAULT_NAMING_PORT;
-        this.root = SERVER_ROOT;
-    }
-
-    EJBLocator(String hostName, int port, String root) {
-        this(hostName, port);
-        if (ROOTS.contains(root)) {
-            this.root = root;
-        } else {
-            throw new IllegalArgumentException(root + " is not a legal root");
-        }
-    }
-
-    EJBLocator(String corbaName, boolean managed) {
-        this.managed = managed;
-        if (corbaName.startsWith("corbaname:iiop:")) {
-            processCorbaURL(corbaName);
-        } else {
-            throw new IllegalArgumentException(corbaName + " is not a legal corbaname");
-        }
-    }
-
-    private void processCorbaURL(String url) {
-        if (url != null && (url.startsWith("corbaname:iiop:") || url.startsWith("corbaloc:iiop:"))) {
-            /**
-             * corbaname:iiop:<hostName>:<port>/<root>#name corbaloc:iiop:<hostname>:<port>/<root>
-             * For example,
-             * "corbaname:iiop:localhost:2809/NameServiceServerRoot#ejb/MyEJBHome";
-             * or "corbaloc:iiop:myhost:2809/NameServiceServerRoot"
-             */
-            String[] parts = url.split("(:|/|#)");
-            if (parts.length > 2 && parts[2].length() > 0) {
-                hostName = parts[2]; // The host name
-                int index = hostName.lastIndexOf('@'); // version@hostname
-                if (index != -1) {
-                    hostName = hostName.substring(index + 1);
-                }
-            }
-            if (parts.length > 3 && parts[3].length() > 0) {
-                port = Integer.parseInt(parts[3]); // The port number
-            }
-            if (parts.length > 4 && parts[4].length() > 0) {
-                root = parts[4]; // The root of naming
-            }
-        }
-    }
-
-    /**
-     * The corbaloc and corbaname formats enable you to provide a URL to access
-     * CORBA objects. Use the corbaloc format for resolving to a particular
-     * CORBAservice without going through a naming service. Use the corbaname
-     * format to resolve a stringified name from a specific naming context.
-     */
-
-    /**
-     * corbaname Syntax The full corbaname BNF is: &lt;corbaname&gt; =
-     * "corbaname:"&lt;corbaloc_obj&gt;["#"&lt;string_name&gt;]
-     * &lt;corbaloc_obj&gt; = &lt;obj_addr_list&gt; ["/"&lt;key_string&gt;]
-     * &lt;obj_addr_list&gt; = as defined in a corbaloc URL &lt;key_string&gt; =
-     * as defined in a corbaloc URL &lt;string_name&gt;= stringified Name
-     * empty_string Where:
-     * <ul>
-     * <li>corbaloc_obj: portion of a corbaname URL that identifies the naming
-     * context. The syntax is identical to its use in a corbaloc URL.
-     * <li>obj_addr_list: as defined in a corbaloc URL
-     * <li>key_string: as defined in a corbaloc URL.
-     * <li>string_name: a stringified Name with URL escapes as defined below.
-     * </ul>
-     * 
-     * @param hostName The host name or IP address of the naming server
-     * @param port The port number of the naming service
-     * @param root The root of the namespace
-     * @param name The JNDI name
-     */
-    private static String getCorbaname(String hostName, int port, String root, String name) {
-        if (name == null) {
-            return "corbaname:iiop:" + hostName + ":" + port + "/" + root;
-        } else {
-            return "corbaname:iiop:" + hostName + ":" + port + "/" + root + "#" + toCorbaname(name);
-        }
-    }
-
-    String getCorbaname(String name) {
-        return getCorbaname(hostName, port, root, name);
-    }
-
-    /**
-     * Connect to the ORB.
-     */
-
-    // FIXME. May need to change the IBM classes if this binding is contributed
-    // to Tuscany
-    public ORB connect() {
-        if (orb == null) {
-            Properties props = new Properties();
-            /*
-             * This code is for IBM JVM props.put("org.omg.CORBA.ORBClass",
-             * "com.ibm.CORBA.iiop.ORB");
-             * props.put("com.ibm.CORBA.ORBInitRef.NameService",
-             * getCorbaloc(NAMING_SERVICE));
-             * props.put("com.ibm.CORBA.ORBInitRef.NameServiceServerRoot",
-             * getCorbaloc("NameServiceServerRoot"));
-             */
-            orb = ORB.init((String[])null, props);
-        }
-        return orb;
-    }
-
-    /**
-     * Replace substrings
-     * 
-     * @param source The source string.
-     * @param match The string to search for within the source string.
-     * @param replace The replacement for any matching components.
-     * @return
-     */
-    private static String replace(String source, String match, String replace) {
-        int index = source.indexOf(match, 0);
-        if (index >= 0) {
-
-            // We have at least one match, so got to do the
-            // work...
-
-            StringBuffer result = new StringBuffer(source.length() + 16);
-            int matchLength = match.length();
-            int startIndex = 0;
-
-            while (index >= 0) {
-                result.append(source.substring(startIndex, index));
-                result.append(replace);
-                startIndex = index + matchLength;
-                index = source.indexOf(match, startIndex);
-            }
-
-            // Grab the last piece, if any...
-            if (startIndex < source.length()) {
-                result.append(source.substring(startIndex));
-            }
-
-            return result.toString();
-
-        } else {
-            // No matches, just return the source...
-            return source;
-        }
-    }
-
-    /**
-     * Resolved the JNDI name from the initial CosNaming context
-     * 
-     * @param jndiName
-     * @return resolved CORBA object
-     * @throws NamingException
-     */
-    private static org.omg.CORBA.Object resovleString(NamingContextExt initCtx, String jndiName) throws NamingException {
-        try {
-            String name = stringify(jndiName);
-            return initCtx.resolve_str(name);
-        } catch (Exception e) {
-            NamingException ne = new NamingException(e.getMessage());
-            ne.setRootCause(e);
-            throw ne;
-        }
-    }
-
-    /**
-     * Look up a CORBA object by its JNDI name
-     * 
-     * @param jndiName
-     * @return
-     * @throws NamingException
-     */
-    org.omg.CORBA.Object stringToObject(String jndiName) throws NamingException {
-        /*
-         * Using an existing ORB and invoking string_to_object with a CORBA
-         * object URL with multiple name server addresses to get an initial
-         * context CORBA object URLs can contain more than one bootstrap server
-         * address. Use this feature when attempting to obtain an initial
-         * context from a server cluster. You can specify the bootstrap server
-         * addresses for all servers in the cluster in the URL. The operation
-         * will succeed if at least one of the servers is running, eliminating a
-         * single point of failure. There is no guarantee of any particular
-         * order in which the address list will be processed. For example, the
-         * second bootstrap server address may be used to obtain the initial
-         * context even though the first bootstrap server in the list is
-         * available. An example of a corbaloc URL with multiple addresses
-         * follows. obj =
-         * orb.string_to_object("corbaloc::myhost1:9810,:myhost1:9811,:myhost2:9810/NameService");
-         */
-        String corbaName = null;
-        if (jndiName.startsWith("corbaloc:") || jndiName.startsWith("corbaname:")) {
-            // Keep the qualified URL
-            corbaName = jndiName;
-        } else {
-            // Create a corbaname URL
-            corbaName = getCorbaname(jndiName);
-        }
-
-        connect();
-        org.omg.CORBA.Object obj = orb.string_to_object(corbaName);
-        return obj;
-    }
-
-    private boolean isJndiConfigured() {
-        if (managed)
-            return true;
-        Boolean provided = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
-            public Boolean run() {
-                String initCtxFactory = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
-                if (initCtxFactory == null) {
-                    URL file = Thread.currentThread().getContextClassLoader().getResource("jndi.properties");
-                    if (file != null) {
-                        return Boolean.TRUE;
-                    } else {
-                        return Boolean.FALSE;
-                    }
-                } else {
-                    return Boolean.TRUE;
-                }
-            }
-        });
-        return provided.booleanValue();
-    }
-
-    /**
-     * The character escape rules for the stringified name portion of an
-     * corbaname are: US-ASCII alphanumeric characters are not escaped.
-     * Characters outside this range are escaped, except for the following: ; / : ? @ & = + $ , - _ . ! ~ * ' ( )
-     * corbaname Escape Mechanism The percent '%' character is used as an
-     * escape. If a character that requires escaping is present in a name
-     * component it is encoded as two hexadecimal digits following a "%"
-     * character to represent the octet. (The first hexadecimal character
-     * represent the highorder nibble of the octet, the second hexadecimal
-     * character represents the low-order nibble.) If a '%' is not followed by
-     * two hex digits, the stringified name is syntactically invalid.
-     * @param s
-     * @return RFC2396-encoded stringified name
-     */
-    static String encode2396(String s) {
-        if (s == null) {
-            return null;
-        }
-        StringBuffer encoded = new StringBuffer(s);
-        for (int i = 0; i < encoded.length(); i++) {
-            char c = encoded.charAt(i);
-            if (RFC2396.indexOf(c) == -1) {
-                encoded.setCharAt(i, '%');
-                char[] ac = Integer.toHexString(c).toCharArray();
-                if (ac.length == 2) {
-                    encoded.insert(i + 1, ac);
-                } else if (ac.length == 1) {
-                    encoded.insert(i + 1, '0');
-                    encoded.insert(i + 2, ac[0]);
-                } else {
-                    throw new IllegalArgumentException("Invalid character '" + c + "' in \"" + s + "\"");
-                }
-                i += 2; // NOPMD
-            }
-        }
-        return encoded.toString();
-    }
-
-    /**
-     * Decode an RFC2396-encoded string
-     * 
-     * @param s
-     * @return Plain string
-     */
-    static String decode2396(String s) {
-        if (s == null) {
-            return null;
-        }
-        StringBuffer decoded = new StringBuffer(s);
-        for (int i = 0; i < decoded.length(); i++) {
-            char c = decoded.charAt(i);
-            if (c == '%') {
-                if (i + 2 >= decoded.length()) {
-                    throw new IllegalArgumentException("Incomplete key_string escape sequence");
-                }
-                int j;
-                j = HEX.indexOf(decoded.charAt(i + 1)) * 16 + HEX.indexOf(decoded.charAt(i + 2));
-                decoded.setCharAt(i, (char)j);
-                decoded.delete(i + 1, i + 3);
-            } else if (RFC2396.indexOf(c) == -1) {
-                throw new IllegalArgumentException("Invalid key_string character '" + c + "'");
-            }
-        }
-        return decoded.toString();
-    }
-
-    /**
-     * The backslash '\' character escapes the reserved meaning of '/', '.', and
-     * '\' in a stringified name.
-     * 
-     * @param jndiName
-     * @return Escaped stringified name for CosNaming
-     */
-    private static String stringify(String jndiName) {
-        // Escape . into \. since it's an INS naming delimiter
-        return replace(encode2396(jndiName), ".", "\\.");
-    }
-
-    /**
-     * Escape the "." into "%5C%2E"
-     * 
-     * @param jndiName
-     * @return corbaname treating "." as a literal
-     */
-    private static String toCorbaname(String jndiName) {
-        // Escape . into %5C%2E (\.) since it's an INS naming delimiter
-        // For example, sca.sample.StockQuote --->
-        // sca%5C%2Esample%5C%2EStockQuote/StockQuote
-        return replace(encode2396(jndiName), ".", "%5C%2E");
-    }
-
-    private ObjectLocator getObjectLocator() throws NamingException {
-        if (locator != null) {
-            return locator;
-        }
-        /*
-         * For managed env, JNDI is assumed to be configured by default For
-         * unmanaged environment, JNDI could have configured through
-         * jndi.properties file
-         */
-        if (isJndiConfigured()) {
-            locator = new JndiLocator();
-        } else { // this is definitely JSE env without JNDI configured. Use
-            // CORBA.
-            locator = new CosNamingLocator();
-        }
-        return locator;
-    }
-
-    public Object locate(String jndiName) throws NamingException {
-
-        Object result = getObjectLocator().locate(jndiName);
-        return result;
-    }
-
-    private static interface ObjectLocator {
-        Object locate(String name) throws NamingException;
-    }
-
-    private final class JndiLocator implements ObjectLocator {
-        private Context context;
-
-        private JndiLocator() throws NamingException {
-            /*
-            final Properties props = AccessController.doPrivileged(new PrivilegedAction<Properties>() {
-                public Properties run() {
-                    return System.getProperties();
-                }
-            });
-            Properties properties = new Properties();
-            for (Map.Entry e : props.entrySet()) {
-                String name = (String)e.getKey();
-                if (name.startsWith("java.naming.")) {
-                    properties.setProperty(name, (String)e.getValue());
-                }
-            }
-            // System.out.println(properties);
-            this.context = new InitialContext(properties);
-            */
-            this.context = new InitialContext();
-        }
-
-        public Object locate(String name) throws NamingException {
-            return context.lookup(name);
-        }
-    }
-
-    private final class CosNamingLocator implements ObjectLocator {
-        private NamingContextExt context;
-
-        private CosNamingLocator() {
-        }
-
-        public Object locate(String name) throws NamingException {
-            if (context != null) {
-                return resovleString(context, name);
-            } else {
-                return stringToObject(name);
-            }
-        }
-    }
-
-    public void setHostEnv(boolean managed) {
-        this.managed = managed;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
deleted file mode 100644
index 119282adb9..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
+++ /dev/null
@@ -1,209 +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.binding.ejb.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.rmi.RemoteException;
-import java.rmi.UnexpectedException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-import javax.naming.NamingException;
-import javax.rmi.CORBA.Util;
-
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.portable.ApplicationException;
-import org.omg.CORBA.portable.ObjectImpl;
-import org.omg.CORBA.portable.RemarshalException;
-import org.omg.stub.java.rmi._Remote_Stub;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * Factor class that is used to create EJB Proxies.
- *
- * @version $Rev$ $Date$
- */
-final class EJBObjectFactory {
-
-    private EJBObjectFactory() {
-    }
-
-    /**
-     * Get either a generated of dynamic EJB stub using the specified JNDI
-     * properties.
-     * <p>
-     * The returned stub will implement the specified stubInterface Interface.
-     * If the underlying EJB stub is not assignable from the specified
-     * stubInterface then a proxy is used to convert between the two.
-     * <p>
-     * The returned EJB stub may be either the pregenerated EJB stub or a
-     * dynamic stub. This allows a client to invoke an EJB without requiring any
-     * of the pregenerated EJB stub classes be available in the classpath.
-     * <p>
-     */
-    static Object createStub(NamingEndpoint namingEndpoint, InterfaceInfo ejbInterface) throws NamingException,
-        RemoteException, CreateException {
-
-        EJBLocator locator = namingEndpoint.getLocator();
-        Object homeObject = locator.locate(namingEndpoint.getJndiName());
-        /*
-         * The type of the object returned from the lookup is as follows: If the
-         * generated stub exists on the classpath, it's an instance of that
-         * type, otherwise, "org.omg.stub.java.rmi._Remote_Stub" or
-         * "org.omg.stub.javax.ejb._EJBHome_Stub"
-         */
-        Object stub = getEJBStub(homeObject, ejbInterface);
-        // Cache dynamic stub only
-        return stub;
-    }
-
-    /**
-     * @param homeObject
-     * @param ejbHomeClass
-     * @return
-     * @throws RemoteException
-     */
-    private static Object getEJBStub(Object homeObject, InterfaceInfo ejbInterface) throws RemoteException,
-        CreateException {
-
-        Object stub = null;
-
-        // Get the business interface of the EJB 
-        Class ejbInterfaceClass = null;
-        try {
-            ejbInterfaceClass = Thread.currentThread().getContextClassLoader().loadClass(ejbInterface.getName());
-        } catch (ClassNotFoundException e) {
-            // ignore
-        }
-
-        if (ejbInterfaceClass != null && ejbInterfaceClass.isInstance(homeObject)) {
-            // EJB 3
-            stub = homeObject;
-        } else if (homeObject instanceof EJBLocalHome) {
-            // Local EJB
-            stub = createEJBLocalObject(homeObject);
-        } else {
-            // Handle dynamic stub
-            if (homeObject instanceof ObjectImpl) {
-                ObjectImpl objectImpl = (ObjectImpl)homeObject;
-                stub = createEJBObject(objectImpl);
-            }/**
-                       	* Above checks will be satisfied if Bean is running on servers like WebSphere. With this 
-                       	* logic, client (SCA composite with EJB ref binding) doesn't need to include home class or 
-                       	* client stubs.
-                       	* 
-                       	* Below check is needed SCA composite with EJB ref binding is accessing openEJB implementation. 
-                       	* For e.g if the bean is running on Geronimo. 
-                       	*/
-            else if ((javax.rmi.PortableRemoteObject.narrow(homeObject, javax.ejb.EJBHome.class)) instanceof javax.ejb.EJBHome) {
-                stub = createEJBObjectFromHome(homeObject);
-            } else
-                throw new ServiceRuntimeException("Invalid stub type: " + homeObject.getClass());
-        }
-        return stub;
-    }
-
-    /**
-     * Create a pre-generated EJB stub
-     * 
-     * @param homeObject
-     * @return
-     * @throws RemoteException
-     */
-    static private Object createEJBLocalObject(Object homeObject) throws RemoteException {
-
-        Object stub = null;
-        try {
-            // Find the "create()" method
-            Method createMethod = homeObject.getClass().getMethod("create", null);
-            // Create an EJB object
-            stub = createMethod.invoke(homeObject, null);
-        } catch (NoSuchMethodException e) {
-            // "create()" method not found, it's still a dynamic stub
-            stub = null;
-        } catch (InvocationTargetException e) {
-            throw new RemoteException(e.getTargetException().toString());
-        } catch (Exception e) {
-            throw new RemoteException(e.toString());
-        }
-        return stub;
-    }
-
-    /**
-     * Here homeObject is instance of EJBHome
-     * 
-     * @param homeObject
-     * @return
-     * @throws RemoteException
-     */
-    private static Object createEJBObjectFromHome(Object homeObject) throws RemoteException {
-
-        Object stub = null;
-        try {
-            // Find the "create()" method
-            Method createMethod = homeObject.getClass().getMethod("create", null);
-            // Create an EJB object
-            stub = createMethod.invoke(homeObject, null);
-        } catch (NoSuchMethodException e) {
-            // "create()" method not found, it's still a dynamic stub
-            stub = null;
-        } catch (InvocationTargetException e) {
-            throw new RemoteException(e.getTargetException().toString());
-        } catch (Exception e) {
-            throw new RemoteException(e.toString());
-        }
-        return stub;
-    }
-
-    /**
-     * Create an EJBObject using RMI/IIOP APIs
-     * 
-     * @param ejbHomeObject
-     * @return The EJBObject remote stub
-     * @throws CreateException
-     * @throws RemoteException
-     */
-    private static Object createEJBObject(ObjectImpl ejbHomeObject) throws CreateException, RemoteException {
-
-        try {
-            org.omg.CORBA_2_3.portable.InputStream in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream out = ejbHomeObject._request("create", true);
-                in = (org.omg.CORBA_2_3.portable.InputStream)ejbHomeObject._invoke(out);
-                // The Remote stub should be available in JDK
-                // TODO: [rfeng] Work around an issue in Apache Yoko which doesn't understand the org.omg.stub.*
-                return in.read_Object(_Remote_Stub.class);
-            } catch (ApplicationException ex) {
-                in = (org.omg.CORBA_2_3.portable.InputStream)ex.getInputStream();
-                String id = in.read_string();
-                if (id.equals("IDL:javax/ejb/CreateEx:1.0")) {
-                    throw (CreateException)in.read_value(CreateException.class);
-                }
-                throw new UnexpectedException(id);
-            } catch (RemarshalException ex) {
-                return createEJBObject(ejbHomeObject);
-            } finally {
-                ejbHomeObject._releaseReply(in);
-            }
-        } catch (SystemException ex) {
-            throw Util.mapSystemException(ex);
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
deleted file mode 100644
index 72f7dc9e43..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
+++ /dev/null
@@ -1,69 +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.binding.ejb.util;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.naming.NamingException;
-
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.ServiceUnavailableException;
-
-final class EJBStubHelper {
-
-    private static Object stub;
-    private static ServiceRuntimeException exception;
-
-    private EJBStubHelper() {
-    }
-
-    /**
-     * @param owner
-     * @param jndiName
-     * @return
-     */
-
-    static Object lookup(NamingEndpoint endpoint, InterfaceInfo ejbInterface) {
-        return getStub(endpoint, ejbInterface);
-    }
-
-    private static Object getStub(NamingEndpoint namingEndpoint, InterfaceInfo ejbInterface) {
-        try {
-            stub = EJBObjectFactory.createStub(namingEndpoint, ejbInterface);
-        } catch (NamingException e) {
-            exception = new ServiceUnavailableException(e);
-            e.printStackTrace();
-            throw (ServiceUnavailableException)exception;
-        } catch (CreateException e) {
-            exception = new ServiceUnavailableException(e);
-            throw (ServiceUnavailableException)exception;
-        } catch (RemoteException e) {
-            exception = new ServiceRuntimeException(e);
-            throw (ServiceRuntimeException)exception;
-        }
-
-        if (exception == null) {
-            return stub; // Normal result
-        } else {
-            throw exception; // Throw the exception
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
deleted file mode 100644
index e60e526e01..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
+++ /dev/null
@@ -1,117 +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.binding.ejb.util;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import org.apache.tuscany.sca.binding.ejb.corba.Java2IDLUtil;
-
-/**
- * The signature for a java interface
- *
- * @version $Rev$ $Date$
- */
-class InterfaceInfo implements Serializable {
-
-    private static final Map<Class, InterfaceInfo> INTERFACES =
-        Collections.synchronizedMap(new WeakHashMap<Class, InterfaceInfo>());
-
-    private static final long serialVersionUID = 2314533906465094860L;
-    private String name;
-
-    private Map<String, MethodInfo> methods = new HashMap<String, MethodInfo>();
-
-    InterfaceInfo(final Class iface) {
-        super();
-        if (iface == null) {
-            throw new IllegalArgumentException("The interface cannot be null");
-        }
-        this.name = iface.getName();
-        // SECURITY
-        /*
-         * Permission: accessDeclaredMembers : Access denied
-         * (java.lang.RuntimePermission accessDeclaredMembers)
-         */
-        Map idlNames = AccessController.doPrivileged(new PrivilegedAction<Map>() {
-            public Map run() {
-                return Java2IDLUtil.mapMethodToOperation(iface);
-            }
-        });
-        Iterator i = idlNames.entrySet().iterator();
-        while (i.hasNext()) {
-            Map.Entry entry = (Map.Entry)i.next();
-            Method method = (Method)entry.getKey();
-            MethodInfo methodInfo = new MethodInfo(method);
-            methodInfo.setIDLName((String) entry.getValue());
-            methods.put(method.getName(), methodInfo);
-            methods.put(methodInfo.getIDLName(), methodInfo);
-        }
-    }
-
-    static final synchronized InterfaceInfo getInstance(final Class iface) {
-        InterfaceInfo info = (InterfaceInfo)INTERFACES.get(iface);
-        if (info == null) {
-            info = new InterfaceInfo(iface);
-            INTERFACES.put(iface, info);
-        }
-        return info;
-    }
-
-    /**
-     * @return
-     */
-    Map<String, MethodInfo> getMethods() {
-        return methods;
-    }
-
-    /**
-     * @return
-     */
-    MethodInfo getMethod(String name) {
-        return (MethodInfo)methods.get(name);
-    }
-
-    /**
-     * @return
-     */
-    String getName() {
-        return name;
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append("interface ").append(name).append("{ \n");
-        Iterator i = methods.values().iterator();
-        while (i.hasNext()) {
-            MethodInfo methodInfo = (MethodInfo)i.next();
-            sb.append("\t").append(methodInfo).append("\n");
-        }
-        sb.append("};\n");
-        return sb.toString();
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
deleted file mode 100644
index 651c967aad..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
+++ /dev/null
@@ -1,157 +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.binding.ejb.util;
-
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * An adapter for java classes, indexes the methods by name and provides an
- * invoke method that takes a method name.
- *
- * @version $Rev$ $Date$
- */
-final class JavaReflectionAdapter {
-
-    private static Map<Class, JavaReflectionAdapter> adapters =
-        Collections.synchronizedMap(new WeakHashMap<Class, JavaReflectionAdapter>());
-
-    private static final Map<Class, Object> DEFAULT_VALUES = new HashMap<Class, Object>();
-    static {
-        DEFAULT_VALUES.put(boolean.class, Boolean.FALSE);
-        DEFAULT_VALUES.put(byte.class, new Byte((byte)0));
-        DEFAULT_VALUES.put(char.class, new Character((char)0));
-        DEFAULT_VALUES.put(short.class, new Short((short)0));
-        DEFAULT_VALUES.put(int.class, Integer.valueOf(0));
-        DEFAULT_VALUES.put(long.class, new Long(0));
-        DEFAULT_VALUES.put(float.class, new Float(0.0));
-        DEFAULT_VALUES.put(double.class, new Double(0.0));
-    }
-
-    private Map<String, Method> methodMap = new HashMap<String, Method>();
-
-    /**
-     * Constructor
-     * 
-     * @param clazz
-     */
-    private JavaReflectionAdapter(final Class clazz) {
-        // Index the methods on the implementation class
-        // FIXME J2 Security - promote this to callers of this method
-        Method[] methods = AccessController.doPrivileged(new PrivilegedAction<Method[]>() {
-            public Method[] run() {
-                return clazz.getMethods();
-            }
-        });
-        for (int i = 0; i < methods.length; i++) {
-            methodMap.put(methods[i].getName(), methods[i]);
-        }
-    }
-
-    /**
-     * Create a java reflection adapter
-     * 
-     * @param clazz
-     */
-    static synchronized JavaReflectionAdapter createJavaReflectionAdapter(Class clazz) {
-        JavaReflectionAdapter adapter = (JavaReflectionAdapter)adapters.get(clazz);
-        if (adapter == null) {
-            adapter = new JavaReflectionAdapter(clazz);
-            adapters.put(clazz, adapter);
-        }
-        return adapter;
-    }
-
-    /**
-     * Return the specified method
-     * 
-     * @param methodName
-     * @return
-     * @throws NoSuchMethodException
-     */
-    Method getMethod(String methodName) throws NoSuchMethodException {
-
-        Method method = (Method)methodMap.get(methodName);
-        if (method == null) {
-            throw new NoSuchMethodException(methodName);
-        }
-        return method;
-    }
-
-    /**
-     * Returns a map containing the methods on the class, keyed by name
-     * 
-     * @return
-     */
-    Map getMethods() {
-        return methodMap;
-    }
-
-    /**
-     * Invoke a method using Java reflection.
-     * 
-     * @param method
-     * @param object
-     * @param args
-     * @return
-     * @throws InvocationTargetException
-     * @throws IllegalAccessException
-     */
-    Object invoke(Method method, Object object, Object[] args) throws InvocationTargetException,
-        IllegalAccessException {
-        Class[] parameterTypes = method.getParameterTypes();
-        for (int i = 0; i < parameterTypes.length; i++) {
-            Class parameterType = parameterTypes[i];
-            if (args[i] == null && parameterType.isPrimitive()) {
-                args[i] = DEFAULT_VALUES.get(parameterType);
-            }
-        }
-        return method.invoke(object, args);
-    }
-
-    /**
-     * Set the java bean property
-     * 
-     * @param bean
-     * @param propertyName
-     * @param value
-     * @return
-     */
-    boolean setProperty(Object bean, String propertyName, Object value) {
-        try {
-            PropertyDescriptor propertyDescriptor = new PropertyDescriptor(propertyName, bean.getClass());
-            Method writeMethod = propertyDescriptor.getWriteMethod();
-            writeMethod.invoke(bean, new Object[] {value});
-            return true;
-        } catch (InvocationTargetException e) {
-            throw new ServiceRuntimeException(e.getTargetException());
-        } catch (Exception e) {
-            return false;
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
deleted file mode 100644
index e7ea7c9077..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
+++ /dev/null
@@ -1,189 +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.binding.ejb.util;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * MetaData for a java method
- *
- * @version $Rev$ $Date$
- */
-class MethodInfo implements Serializable {
-
-    /** Automatically generated javadoc for: serialVersionUID */
-    private static final long serialVersionUID = -5557260979514687514L;
-    private String name;
-    private String returnType;
-    private String[] parameterTypes;
-    private String[] exceptionTypes;
-
-    private String IDLName;
-    
-    private transient Method method;
-
-    /**
-     * Type Signature Java Type -------------- --------- Z boolean B byte C char
-     * S short I int J long F float D double L fully-qualified-class ;
-     * fully-qualified-class [ type type[] ( arg-types ) ret-type method type
-     */
-    private static final Map signatures = new HashMap();
-    static {
-        signatures.put("Z", boolean.class);
-        signatures.put("B", byte.class);
-        signatures.put("C", char.class);
-        signatures.put("S", short.class);
-        signatures.put("I", int.class);
-        signatures.put("J", long.class);
-        signatures.put("F", float.class);
-        signatures.put("D", double.class);
-        signatures.put("V", void.class);
-    }
-
-    MethodInfo(Method method) {
-        this.method = method;
-        this.name = method.getName();
-        // this.declaringClass = method.getDeclaringClass().getName();
-        this.returnType = method.getReturnType().getName();
-        Class[] types = method.getParameterTypes();
-        this.parameterTypes = new String[types.length];
-        for (int i = 0; i < types.length; i++) {
-            this.parameterTypes[i] = types[i].getName();
-        }
-        types = method.getExceptionTypes();
-        this.exceptionTypes = new String[types.length];
-        for (int i = 0; i < types.length; i++) {
-            this.exceptionTypes[i] = types[i].getName();
-        }
-        IDLName = this.name;
-    }
-
-    MethodInfo(String name, String returnType, String[] parameterTypes, String[] exceptionTypes) {
-        this.name = name;
-        this.returnType = returnType;
-        this.parameterTypes = parameterTypes;
-        this.exceptionTypes = exceptionTypes;
-        this.IDLName = name;
-    }
-
-    /**
-     * Parse the class name from the internal signature Sample signatures: int
-     * ---> I; int[] ---> [I Object ---> java/lang/Object Object[] --->
-     * [Ljava/lang/Object;
-     * 
-     * @param value
-     * @return
-     */
-    private static String getName(String signature) {
-        String name = signature;
-        // Remove leading ARRAY ([) signatures
-        int index = name.lastIndexOf('[');
-        if (index != -1)
-            name = name.substring(index + 1);
-
-        // Remove L<...>;
-        if (name.charAt(0) == 'L' && name.charAt(name.length() - 1) == ';')
-            name = name.substring(1, name.length() - 1);
-
-        // Primitive types
-        Class primitiveClass = (Class)signatures.get(name);
-        if (primitiveClass != null) {
-            name = primitiveClass.getName();
-        }
-
-        for (int i = 0; i < index + 1; i++) {
-            name = name + "[]";
-        }
-        return name;
-    }
-
-    /**
-     * @return
-     */
-    String getName() {
-        return name;
-    }
-
-    /**
-     * @return
-     */
-    String[] getParameterTypes() {
-        return parameterTypes;
-    }
-
-    /**
-     * @return
-     */
-    String getReturnType() {
-        return returnType;
-    }
-
-    /**
-     * @return
-     */
-    String[] getExceptionTypes() {
-        return exceptionTypes;
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append(getName(returnType)).append(" ").append(name).append("(");
-        for (int j = 0; j < parameterTypes.length; j++) {
-            sb.append(getName(parameterTypes[j])).append(" ").append("arg" + j);
-            if (j < (parameterTypes.length - 1))
-                sb.append(", ");
-        }
-        sb.append(")");
-        if (exceptionTypes.length > 0) {
-            sb.append(" throws ");
-            for (int k = 0; k < exceptionTypes.length; k++) {
-                sb.append(exceptionTypes[k]);
-                if (k < (exceptionTypes.length - 1))
-                    sb.append(", ");
-            }
-        }
-        sb.append(";");
-        return sb.toString();
-    }
-
-    /**
-     * @return Returns the iDLName.
-     */
-    String getIDLName() {
-        return IDLName;
-    }
-
-    /**
-     * @param name The iDLName to set.
-     */
-    void setIDLName(String name) {
-        IDLName = name;
-    }
-
-    /**
-     * @return the method
-     */
-    Method getMethod() {
-        return method;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java b/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
deleted file mode 100644
index 346b7c5cf6..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
+++ /dev/null
@@ -1,124 +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.binding.ejb.util;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-public class NamingEndpoint {
-    private String jndiName;
-    private EJBLocator locator;
-    private boolean managed = true;
-
-    public NamingEndpoint(String hostName, int port, String jndiName) {
-        this.jndiName = jndiName;
-        this.locator = new EJBLocator(hostName, port);
-    }
-
-    public NamingEndpoint(String name) {
-
-        /**
-         * by default it's a managed environment means SCA composite with ref
-         * binding is running on an AppServer. If running on J2SE, pass
-         * -Dmanaged=false for the VM
-         */
-        final String managedEnv = AccessController.doPrivileged(new PrivilegedAction<String>() {
-            public String run() {
-                return System.getProperty("managed");
-            }
-        });
-
-        if (managedEnv != null) {
-            managed = Boolean.valueOf(managedEnv);
-        }
-
-        if ((!managed) && name.startsWith("corbaname:iiop:")) {
-            /**
-             * if (name.startsWith("corbaname:iiop:")) { corbaname:iiop:<hostName>:<port>/<root>#name
-             * For example,
-             * "corbaname:iiop:localhost:2809/NameServiceServerRoot#ejb/MyEJBHome";
-             */
-
-            String[] parts = split(name, '#');
-            if (parts.length != 2) {
-                throw new IllegalArgumentException("Invalid corbaname: " + name);
-            }    
-
-            this.jndiName = name; // The logical JNDI name
-            this.locator = new EJBLocator(parts[0], managed);
-
-        } else {
-            this.jndiName = name;
-            this.locator = new EJBLocator(managed);
-        }
-
-    }
-
-    private static String[] split(String str, char ch) {
-        int index = str.lastIndexOf(ch);
-        if (index == -1) {
-            return new String[] {str, ""};
-        } else {
-            return new String[] {str.substring(0, index), str.substring(index + 1)};
-        }
-    }
-
-    /**
-     * @return Returns the jndiName.
-     */
-    public String getJndiName() {
-        return jndiName;
-    }
-
-    public EJBLocator getLocator() {
-        return locator;
-    }
-
-    public String getCorbaname() {
-        return locator.getCorbaname(jndiName);
-    }
-
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof NamingEndpoint) {
-            NamingEndpoint endpoint = (NamingEndpoint)obj;
-            return jndiName.equals(endpoint.jndiName);
-        }
-        return false;
-    }
-
-    /**
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        return jndiName.hashCode();
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return jndiName;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca-contrib/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index a89f711da9..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.ejb.provider.EJBBindingProviderFactory;model=org.apache.tuscany.sca.binding.ejb.EJBBinding

diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties b/java/sca-contrib/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
deleted file mode 100644
index 28477dd3ac..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
+++ /dev/null
@@ -1,23 +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.
-#
-#
-UnknownEJBSessionType = Unknown EJB Session Type of {0} for {1}
-UnknownEJBVersion = Unknown EJB Version of {0} for {1}
-
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java b/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
deleted file mode 100644
index 337bb004b5..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
+++ /dev/null
@@ -1,33 +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 account;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- *
- * Compatible EJB interface
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface BankManagerFacade {
-    Double getAccountBalance( String accountNo );
-    void changeAccountBalance( String accountNo, Double balance );
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/Customer.java b/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/Customer.java
deleted file mode 100644
index 8585301868..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/Customer.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 account;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Customer {
-
-    /**
-     * This method deposits the amount. method accesses external EJB to get the 
-     * current balance and add the amount to existing balance.
-     *
-     * @param accountNo The number of the account into which to deposit the money
-     * @param amount The amount to be deposited
-     * @return total amount in customer account after deposit
-     */
-    Double depositAmount(java.lang.String accountNo, Double amount);
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java b/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
deleted file mode 100644
index 7406b9bd37..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
+++ /dev/null
@@ -1,57 +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 account;
-
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import calculator.AddService;
-
-@Service(Customer.class)
-public class CustomerImpl implements Customer {
-
-    private AddService extEJBService = null;
-
-    public AddService getExtEJBService() {
-        return extEJBService;
-    }
-
-    @Reference
-    public void setExtEJBService(AddService extEJBService) {
-        this.extEJBService = extEJBService;
-    }
-
-    // this method invokes external EJB through EJB reference binding
-    public Double depositAmount(java.lang.String accountNo, Double amount) {
-         
-        Double total = null;
-
-        System.out.println("In component implementation. Invoking external EJB through EJB reference binding  ");
-
-        try {
-            Double balance = extEJBService.add(amount.doubleValue(), 1000); //invoke external ejb through ejb reference binding 
-            total =  balance + amount; 
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-        return total;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java b/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
deleted file mode 100644
index 7cefba530a..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
+++ /dev/null
@@ -1,27 +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 calculator;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface AddService {
-    double add(double n1, double n2);
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java b/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
deleted file mode 100644
index 799bcaa672..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.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 calculator;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-public interface AddServiceHome extends EJBHome {
-
-    AddService create() throws CreateException, RemoteException;
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java b/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
deleted file mode 100644
index e480e648d9..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.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.
- */
-
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.apache.geronimo.samples.bank.ejb;
-
-// copied from the Geronimo Bank sample: http://cwiki.apache.org/GMOxDOC11/ejb-sample-application.html#EJBsampleapplication-overview
-
-/**
- * Remote interface for BankManagerFacadeBean.
- * @xdoclet-generated at ${TODAY}
- * @copyright The XDoclet Team
- *
- * @version $Rev$ $Date$
- */
-public interface BankManagerFacade
-   extends javax.ejb.EJBObject
-{
-
-   void changeAccountBalance( java.lang.String accountNo,java.lang.Double balance )
-      throws java.rmi.RemoteException;
-
-   java.lang.Double getAccountBalance( java.lang.String accountNo )
-      throws java.rmi.RemoteException;
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java b/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
deleted file mode 100644
index 0d02be3b95..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.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.
- */
-
-/*
- * Generated by XDoclet - Do not edit!
- */
-
-// copied from the Geronimo Bank sample: http://cwiki.apache.org/GMOxDOC11/ejb-sample-application.html#EJBsampleapplication-overview
-
-package org.apache.geronimo.samples.bank.ejb;
-
-/**
- * Home interface for BankManagerFacadeBean.
- * @xdoclet-generated at ${TODAY}
- * @copyright The XDoclet Team
- *
- * @version $Rev$ $Date$
- */
-public interface BankManagerFacadeHome
-   extends javax.ejb.EJBHome
-{
-   String COMP_NAME="java:comp/env/ejb/BankManagerFacadeBean";
-   String JNDI_NAME="org.apache.geronimo.samples.bank.ejb.BankManagerFacadeBean";
-
-   org.apache.geronimo.samples.bank.ejb.BankManagerFacade create()
-      throws javax.ejb.CreateException,java.rmi.RemoteException;
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java b/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
deleted file mode 100644
index 87616330dc..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
+++ /dev/null
@@ -1,73 +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.binding.ejb.tests;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import account.Customer;
-
-/**
- * Invokes the component which calls the reference using the EJB binding 
- *
- * @version $Rev$ $Date$
- */
-public class EJBReferenceTestCase extends TestCase {
-    private static final int MOCK_PORT = 8085;
-    private Node node;
-
-    @Override
-    protected void setUp() throws Exception {
-        System.setProperty("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
-        System.setProperty("java.naming.provider.url", "ejbd://localhost:" + MOCK_PORT);
-        System.setProperty("managed", "false");
-
-        String contribution = ContributionLocationHelper.getContributionLocation(EJBReferenceTestCase.class);
-        node = NodeFactory.newInstance().createNode("account/account.composite", new Contribution("account", contribution));
-        node.start();
-
-        // To capture the network traffic for the MockServer, uncomment the next line
-        // new Thread(new SocketTracer(MOCK_PORT, OPENEJB_PORT)).start();
-
-        // Start the mock server to simulate the remote EJB
-        new Thread(new MockServer(MOCK_PORT)).start();
-        
-        // Wait enough for the server to be started
-        Thread.sleep(500);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-        node.destroy();
-    }
-
-    public void testCalculator() throws Exception {
-        Customer customer = node.getService(Customer.class, "CustomerComponent");
-        // This is one of the customer numbers in bank application running on Geronimo
-        String accountNo = "1234567890";
-        Double balance = customer.depositAmount(accountNo, new Double(100));
-        // System.out.println("Balance amount for account " + accountNo + " is $" + balance);
-        assertEquals(1200.0, balance);
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java b/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
deleted file mode 100644
index 48e87fb6d1..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
+++ /dev/null
@@ -1,151 +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.binding.ejb.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-public class MockServer implements Runnable {
-
-    private int listen;
-    byte[][] seq =
-        {
-         {79, 69, 74, 80, 47, 51, 46, 48, 1, -84, -19, 0, 5, 119, 58, 1, 27, 0, 54, 47, 104, 101, 108, 108, 111, 45,
-          97, 100, 100, 115, 101, 114, 118, 105, 99, 101, 47, 65, 100, 100, 83, 101, 114, 118, 105, 99, 101, 66, 101,
-          97, 110, 47, 99, 97, 108, 99, 117, 108, 97, 116, 111, 114, 46, 65, 100, 100, 83, 101, 114, 118, 105, 99, 101,
-          112},
-
-         {79, 69, 74, 80, 47, 50, 46, 48, -84, -19, 0, 5, 119, 3, 1, 13, 1, 118, 114, 0, 25, 99, 97, 108, 99, 117, 108,
-          97, 116, 111, 114, 46, 65, 100, 100, 83, 101, 114, 118, 105, 99, 101, 72, 111, 109, 101, 0, 0, 0, 0, 0, 0, 0,
-          0, 0, 0, 0, 120, 112, 118, 114, 0, 21, 99, 97, 108, 99, 117, 108, 97, 116, 111, 114, 46, 65, 100, 100, 83,
-          101, 114, 118, 105, 99, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, 112, 112, 112, 119, 38, 7, 0, 31, 104,
-          101, 108, 108, 111, 45, 97, 100, 100, 115, 101, 114, 118, 105, 99, 101, 47, 65, 100, 100, 83, 101, 114, 118,
-          105, 99, 101, 66, 101, 97, 110, -1, -1, 0, 0},
-
-         {79, 69, 74, 80, 47, 51, 46, 48, 0, -84, -19, 0, 5, 119, 1, 10, 116, 0, 31, 104, 101, 108, 108, 111, 45, 97,
-          100, 100, 115, 101, 114, 118, 105, 99, 101, 47, 65, 100, 100, 83, 101, 114, 118, 105, 99, 101, 66, 101, 97,
-          110, 119, 2, -1, -1, 112, 119, 1, 1, 112, 118, 114, 0, 25, 99, 97, 108, 99, 117, 108, 97, 116, 111, 114, 46,
-          65, 100, 100, 83, 101, 114, 118, 105, 99, 101, 72, 111, 109, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, 112,
-          119, 9, 0, 6, 99, 114, 101, 97, 116, 101, 0},
-         {79, 69, 74, 80, 47, 50, 46, 48, -84, -19, 0, 5, 119, 2, 1, 4, 112},
-
-         {79, 69, 74, 80, 47, 51, 46, 48, 0, -84, -19, 0, 5, 119, 1, 23, 116, 0, 31, 104, 101, 108, 108, 111, 45, 97,
-          100, 100, 115, 101, 114, 118, 105, 99, 101, 47, 65, 100, 100, 83, 101, 114, 118, 105, 99, 101, 66, 101, 97,
-          110, 119, 2, -1, -1, 112, 119, 1, 1, 112, 118, 114, 0, 21, 99, 97, 108, 99, 117, 108, 97, 116, 111, 114, 46,
-          65, 100, 100, 83, 101, 114, 118, 105, 99, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, 112, 119, 24, 0, 3, 97,
-          100, 100, 2, 4, 64, 89, 0, 0, 0, 0, 0, 0, 4, 64, -113, 64, 0, 0, 0, 0, 0},
-         {79, 69, 74, 80, 47, 50, 46, 48, -84, -19, 0, 5, 119, 2, 1, 4, 115, 114, 0, 16, 106, 97, 118, 97, 46, 108, 97,
-          110, 103, 46, 68, 111, 117, 98, 108, 101, -128, -77, -62, 74, 41, 107, -5, 4, 2, 0, 1, 68, 0, 5, 118, 97,
-          108, 117, 101, 120, 114, 0, 16, 106, 97, 118, 97, 46, 108, 97, 110, 103, 46, 78, 117, 109, 98, 101, 114,
-          -122, -84, -107, 29, 11, -108, -32, -117, 2, 0, 0, 120, 112, 64, -111, 48, 0, 0, 0, 0, 0}
-
-        };
-
-    public MockServer(int listen) {
-        this.listen = listen;
-    }
-
-    public void run() {
-        try {
-            ServerSocket ss = new ServerSocket(listen);
-            for (int i = 0; i < seq.length; i += 2) {
-                // System.out.println("Processing request[" + i/2 + "]");
-                doExchange(ss.accept(), seq[i], seq[i + 1]);
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void doExchange(Socket socket, byte[] read, byte[] write) throws IOException, InterruptedException {
-        Thread t2 = readBytes(socket, read.length);
-        Thread t1 = writeBytes(socket, write);
-        t1.join();
-        t2.join();
-        socket.close();
-    }
-
-    private Thread readBytes(Socket socket, int x) throws IOException, InterruptedException {
-        byte[] buf = new byte[x];
-        Thread t = new Reader(socket, buf);
-        t.start();
-        return t;
-    }
-
-    private Thread writeBytes(Socket socket, byte[] bs) throws IOException, InterruptedException {
-        Thread t = new Writer(socket, bs);
-        t.start();
-        return t;
-    }
-
-    private static class Reader extends Thread {
-
-        private InputStream is;
-        private byte[] buf;
-
-        Reader(Socket socket, byte[] buf) throws IOException {
-            this.is = socket.getInputStream();
-            this.buf = buf;
-        }
-
-        @Override
-        public void run() {
-            try {
-                int totalSize = buf.length;
-                int readSize = 0;
-                int offset = 0;
-                while (totalSize > 0 && (readSize = is.read(buf, offset, totalSize)) != -1) {
-                    offset += readSize;
-                    totalSize -= readSize;
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-    }
-
-    private static class Writer extends Thread {
-
-        private OutputStream os;
-        private byte[] buf;
-
-        Writer(Socket socket, byte[] buf) throws IOException {
-            this.os = socket.getOutputStream();
-            this.buf = buf;
-        }
-
-        @Override
-        public void run() {
-            try {
-                os.write(buf);
-                os.flush();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java b/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
deleted file mode 100644
index 66b3feb458..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
+++ /dev/null
@@ -1,138 +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.binding.ejb.tests;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-/**
- * Displays the bytes flowing across a Socket connection.
- * Used to get the read count and reply data for the MockServer
- *
- * @version $Rev$ $Date$
- */
-public class SocketTracer implements Runnable {
-
-    private int listen;
-    private int send;
-
-    SocketTracer(int listen, int send) {
-        this.listen = listen;
-        this.send = send;
-    }
-
-    public void run() {
-        try {
-            ServerSocket ss = new ServerSocket(listen);
-            while (true) {
-                Socket sin = ss.accept();
-
-                Socket sout = new Socket("localhost", send);
-
-                Thread st = new Thread(new Send(sin, sout));
-                st.start();
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    /**
-     * @param buf
-     * @param count
-     */
-    static synchronized void dump(String str, byte[] buf, int count) {
-        // System.out.println(Thread.currentThread());
-        System.out.print(str+"{");
-        for (int j = 0; j < count; j++) {
-            if (j == count - 1) {
-                System.out.println(buf[j] + "}, ");
-            } else {
-                System.out.print(buf[j] + ", ");
-            }
-        }
-    }
-}
-
-
-class Send implements Runnable {
-
-    Socket sin;
-    Socket sout;
-
-    Send(Socket sin, Socket sout) {
-        this.sin = sin;
-        this.sout = sout;
-    }
-
-    public void run() {
-        try {
-
-            Reply rr = new Reply(sout.getInputStream(), sin.getOutputStream());
-            Thread rt = new Thread(rr);
-            rt.start();
-
-            OutputStream outout = sout.getOutputStream();
-            InputStream is = sin.getInputStream();
-            byte[] buf = new byte[4096];
-            int i = 0;
-            int count = 0;
-            while ((i = is.read()) != -1) {
-                buf[count++] = (byte)i;
-                outout.write(i);
-            }
-            SocketTracer.dump("Req: ", buf, count);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-}
-
-class Reply implements Runnable {
-
-    InputStream is;
-    OutputStream outout;
-
-    Reply(InputStream is, OutputStream outout) {
-        this.is = is;
-        this.outout = outout;
-    }
-
-    public void run() {
-        try {
-            byte[] buf = new byte[4096];
-            int i = 0;
-            int count = 0;
-            while ((i = is.read()) != -1) {
-                buf[count++] = (byte)i;
-                outout.write(i);
-            }
-            SocketTracer.dump("Res: ", buf, count);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/resources/account/account.composite b/java/sca-contrib/modules/binding-ejb-runtime/src/test/resources/account/account.composite
deleted file mode 100644
index 14f77eed08..0000000000
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/resources/account/account.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" name="account">

-

-    <!-- composite refrence with ejb binding. Modify host and port number in uri attribute based on where you have installed target ResumeBank EJB -->

-

-    <component name="CustomerComponent">

-        <implementation.java class="account.CustomerImpl" />

-        <reference name="extEJBService">

-            <!-- To use the CosNaming, use the following URI -->

-            <!-- 

-                <binding.ejb uri="corbaname:iiop:1.2@localhost:1050#AddServiceBean" />

-            -->

-            <binding.ejb uri="hello-addservice/AddServiceBean/calculator.AddService" />

-        </reference>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/binding-ejb/LICENSE b/java/sca-contrib/modules/binding-ejb/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/binding-ejb/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/binding-ejb/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-ejb/META-INF/MANIFEST.MF
deleted file mode 100644
index 5aa1b50c93..0000000000
--- a/java/sca-contrib/modules/binding-ejb/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.ejb;uses:="org.apache.t

- uscany.sca.assembly,javax.xml.namespace";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.binding.ejb.impl;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA EJB Binding Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397146656

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA EJB Binding Model

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0",

- org.apache.tuscany.sca.binding.ejb;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.ejb

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-ejb/NOTICE b/java/sca-contrib/modules/binding-ejb/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/binding-ejb/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/binding-ejb/pom.xml b/java/sca-contrib/modules/binding-ejb/pom.xml
deleted file mode 100644
index 7fa7b2d6c3..0000000000
--- a/java/sca-contrib/modules/binding-ejb/pom.xml
+++ /dev/null
@@ -1,66 +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>
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-ejb</artifactId>
-    <name>Apache Tuscany SCA EJB Binding Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java b/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
deleted file mode 100644
index 271a113429..0000000000
--- a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.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 org.apache.tuscany.sca.binding.ejb;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Base;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-
-/**
- * An implementation of EJBBinding.
- *
- * @version $Rev$ $Date$
- */
-public interface EJBBinding extends Binding, Base {
-    // Constants used when describing the EJB binding
-    // model and for setting up defaults
-    String BINDING_EJB = "binding.ejb";
-    QName BINDING_EJB_QNAME = new QName(Constants.SCA10_NS, BINDING_EJB);
-
-    // Constants for the XML describing the EJB Binding
-    String HOME_INTERFACE = "homeInterface";
-    String EJB_LINK_NAME = "ejb-link-name";
-    String SESSION_TYPE = "session-type";
-    String EJB_VERSION = "ejb-version";
-    String NAME = "name";
-    String POLICY_SETS = "policySets";
-    String REQUIRES = "requires";
-    String URI = "uri";
-
-    // Enums for the EJB Binding
-    enum EJBVersion {
-        EJB2, EJB3
-    };
-
-    enum SessionType {
-        STATEFUL, STATELESS
-    };
-
-    /**
-     * Gets the homeInterface.
-     * 
-     * @return home interface of the service binding
-     */
-    String getHomeInterface();
-
-    /**
-     * Set homeInterface
-     * 
-     * @param homeInterface
-     */
-    void setHomeInterface(String homeInterface);
-
-    /**
-     * get ejb-link-name
-     * 
-     * @return ejb-link-name
-     */
-    String getEjbLinkName();
-
-    /**
-     * Set ejb-link-name
-     * 
-     * @param ejb-link-name
-     */
-    void setEjbLinkName(String ejbLinkName);
-
-    SessionType getSessionType();
-    void setSessionType(SessionType sessionType);
-
-    EJBVersion getEjbVersion();
-    void setEjbVersion(EJBVersion ejbVersion);
-
-    // FIXME: Should use Intent instead of String
-    String getRequires();
-    void setRequires(String requires);
-}
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java b/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
deleted file mode 100644
index 6e2c8d358f..0000000000
--- a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
+++ /dev/null
@@ -1,56 +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.binding.ejb;
-
-/**
- * Exception for the EJB Binding
- *
- * @version $Rev$ $Date$
- */
-public class EJBBindingException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * {@inheritDoc}
-     */
-    public EJBBindingException() {
-        super();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public EJBBindingException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public EJBBindingException(String message) {
-        super(message);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public EJBBindingException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java b/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
deleted file mode 100644
index 13b069a6bb..0000000000
--- a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
+++ /dev/null
@@ -1,35 +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.binding.ejb;
-
-/**
- * Factory for the EJB binding
- *
- * @version $Rev$ $Date$
- */
-public interface EJBBindingFactory {
-
-    /**
-     * Creates a new EJB binding.
-     * @return the new EJB binding
-     */
-    EJBBinding createEJBBinding();
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java b/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
deleted file mode 100644
index e84de86eca..0000000000
--- a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.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 org.apache.tuscany.sca.binding.ejb.impl;
-
-import org.apache.tuscany.sca.binding.ejb.EJBBinding;
-import org.apache.tuscany.sca.binding.ejb.EJBBindingFactory;
-
-/**
- * Factory class for building EJBBindings.
- *
- * @version $Rev$ $Date$
- *
- */
-public class EJBBindingFactoryImpl implements EJBBindingFactory {
-
-    public EJBBinding createEJBBinding() {
-        return new EJBBindingImpl();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java b/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
deleted file mode 100644
index 4abed80aa3..0000000000
--- a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
+++ /dev/null
@@ -1,183 +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.binding.ejb.impl;
-
-import org.apache.tuscany.sca.binding.ejb.EJBBinding;
-
-/**
- * An implementation of EJBBinding.
- *
- * @version $Rev$ $Date$
- */
-public class EJBBindingImpl implements EJBBinding {
-
-    /**
-     * CORBA location For example,
-     * "corbaname:iiop:localhost:2809/NameServiceServerRoot#ejb/MyEJBHome"
-     */
-    private String uri;
-
-    /**
-     * homeInterface. remote or local
-     */
-    private String homeInterface;
-
-    /**
-     * The ejb-link-name attribute allows a SCA client to bind to an EJB that is
-     * packaged in the same JEE EAR file as the SCA client. This is functionally
-     * equivalent to using the <ejb-link/> subelement of the <ejb-ref/> element
-     * in s EJB deployment descriptor. Used only for Service binding
-     */
-    private String ejbLinkName;
-
-    /**
-     * The name of this binding
-     */
-    private String name;
-
-    /**
-     * Whether the binding is unresolved
-     */
-    private boolean unresolved;
-    
-    /**
-     * Clone the binding
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }    
-
-    /**
-     * The type of session for this EJB Binding 
-     */
-    private SessionType sessionType;
-
-    /**
-     * The EJB version for this EJB Binding 
-     */
-    private EJBVersion ejbVersion;
-
-    private String requires;
-
-    /**
-     * Constructor
-     */
-    public EJBBindingImpl() {
-        super();
-        unresolved = true;
-    }
-
-    /**
-     * Gets the homeInterface.
-     * 
-     * @return home interface of the service binding
-     */
-    public String getHomeInterface() {
-        return homeInterface;
-    }
-
-    /**
-     * Set homeInterface
-     * 
-     * @param homeInterface
-     */
-    public void setHomeInterface(String homeInterface) {
-        this.homeInterface = homeInterface;
-    }
-
-    /**
-     * get ejb-link-name
-     * 
-     * @return ejb-link-name
-     */
-    public String getEjbLinkName() {
-        return ejbLinkName;
-    }
-
-    /**
-     * Set ejb-link-name
-     * 
-     * @param ejb-link-name
-     */
-    public void setEjbLinkName(String ejbLinkName) {
-        this.ejbLinkName = ejbLinkName;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getURI() {
-        return uri;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public boolean isUnresolved() {
-        return this.unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-
-    public void setSessionType(SessionType ejb_version_enum) {
-        this.sessionType = ejb_version_enum;
-    }
-
-    public void setEjbVersion(EJBVersion ejb_version_enum) {
-        this.ejbVersion = ejb_version_enum;
-    }
-
-    public void setRequires(String requires) {
-        this.requires = requires;
-
-    }
-
-    public SessionType getSessionType() {
-        return sessionType;
-    }
-
-    public EJBVersion getEjbVersion() {
-        return ejbVersion;
-    }
-
-    public String getRequires() {
-        return requires;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java b/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
deleted file mode 100644
index 0320142dde..0000000000
--- a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
+++ /dev/null
@@ -1,184 +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.binding.ejb.impl;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
-import org.apache.tuscany.sca.binding.ejb.EJBBinding;
-import org.apache.tuscany.sca.binding.ejb.EJBBindingFactory;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- * A processor to read the XML that describes the EJB binding...
- * 
- * <binding.ejb
- *  homeInterface="NCName"?
- *  ejb-link-name="NCName"?
- *  session-type="stateful or stateless"?
- *  ejb-version="EJB2 or EJB3"?
- *  name="NCName"?
- *  policySets=" sca:listOfQNames"?
- *  requires="sca:listOfQNames"?
- *  uri="anyURI"?
- * >
- *
- *  <!-- additional elements here -->
- *  
- * </binding.ejb>
- *
- * @version $Rev$ $Date$
- */
-public class EJBBindingProcessor implements StAXArtifactProcessor<EJBBinding> {
-    private PolicyFactory policyFactory;
-    private PolicyAttachPointProcessor policyProcessor;
-    private Monitor monitor;
-    private EJBBindingFactory ejbBindingFactory;
-
-    public EJBBindingProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.ejbBindingFactory = modelFactories.getFactory(EJBBindingFactory.class);
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-     private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-    		 Problem problem = monitor.createProblem(this.getClass().getName(), "binding-ejb-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-    	     monitor.problem(problem);
-    	 }        
-     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public QName getArtifactType() {
-        return EJBBinding.BINDING_EJB_QNAME;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public EJBBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        EJBBinding ejbBinding = ejbBindingFactory.createEJBBinding();
-
-        // Read the policies 
-        policyProcessor.readPolicies(ejbBinding, reader);
-
-        // Read the name
-        String name = reader.getAttributeValue(null, EJBBinding.NAME);
-        if (name != null) {
-            ejbBinding.setName(name);
-        }
-
-        // Read binding URI
-        String uri = reader.getAttributeValue(null, EJBBinding.URI);
-        if (uri != null) {
-            ejbBinding.setURI(uri);
-        }
-
-        String homeInterface = reader.getAttributeValue(null, EJBBinding.HOME_INTERFACE);
-        if (homeInterface != null) {
-            ejbBinding.setHomeInterface(homeInterface);
-        }
-
-        String ejbLinkName = reader.getAttributeValue(null, EJBBinding.EJB_LINK_NAME);
-        if (ejbLinkName != null) {
-            ejbBinding.setEjbLinkName(ejbLinkName);
-        }
-
-        String sessionType = reader.getAttributeValue(null, EJBBinding.SESSION_TYPE);
-        if (sessionType != null) {
-            if (sessionType.equals("stateless")) {
-                ejbBinding.setSessionType(EJBBinding.SessionType.STATELESS);
-            } else if (sessionType.equals("stateful")) {
-                ejbBinding.setSessionType(EJBBinding.SessionType.STATEFUL);
-            } else {
-            	error("UnknownEJBSessionType", reader, sessionType, name);            	
-                //throw new ContributionReadException("Unknown EJB Session Type of " + sessionType + " for " + name);
-            }
-        }
-
-        String ejbVersion = reader.getAttributeValue(null, EJBBinding.EJB_VERSION);
-        if (ejbVersion != null) {
-            if (ejbVersion.equals("EJB2")) {
-                ejbBinding.setEjbVersion(EJBBinding.EJBVersion.EJB2);
-            } else if (ejbVersion.equals("EJB3")) {
-                ejbBinding.setEjbVersion(EJBBinding.EJBVersion.EJB3);
-            } else {
-            	error("UnknownEJBVersion", reader, ejbVersion, name);
-                //throw new ContributionReadException("Unknown EJB Version of " + ejbVersion + " for " + name);
-            }
-        }
-
-        // TODO: Read requires
-        String requires = reader.getAttributeValue(null, EJBBinding.REQUIRES);
-        if (requires != null) {
-            ejbBinding.setRequires(requires);
-        }
-
-        return ejbBinding;
-    }
-
-    public void write(EJBBinding ejbBinding, XMLStreamWriter writer) throws ContributionWriteException,
-        XMLStreamException {
-        // Write a <binding.ejb>
-        writer.writeStartElement(Constants.SCA10_NS, EJBBinding.BINDING_EJB);
-
-        if (ejbBinding.getName() != null){
-            writer.writeAttribute(EJBBinding.NAME, ejbBinding.getName());
-        }
-        
-        if (ejbBinding.getURI() != null){
-            writer.writeAttribute(EJBBinding.URI, ejbBinding.getURI());
-        }        
-        
-        
-        // FIXME Implement the rest
-
-        writer.writeEndElement();
-    }
-
-    public Class<EJBBinding> getModelType() {
-        return EJBBinding.class;
-    }
-
-    public void resolve(EJBBinding ejbBinding, ModelResolver modelResolver) throws ContributionResolveException {
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory b/java/sca-contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
deleted file mode 100644
index c445a82ecb..0000000000
--- a/java/sca-contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for model factory
-org.apache.tuscany.sca.binding.ejb.impl.EJBBindingFactoryImpl
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 82e85ef067..0000000000
--- a/java/sca-contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the artifact processor extension

-org.apache.tuscany.sca.binding.ejb.impl.EJBBindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.ejb,model=org.apache.tuscany.sca.binding.ejb.EJBBinding

diff --git a/java/sca-contrib/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties b/java/sca-contrib/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
deleted file mode 100644
index 28477dd3ac..0000000000
--- a/java/sca-contrib/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
+++ /dev/null
@@ -1,23 +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.
-#
-#
-UnknownEJBSessionType = Unknown EJB Session Type of {0} for {1}
-UnknownEJBVersion = Unknown EJB Version of {0} for {1}
-
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/LICENSE b/java/sca-contrib/modules/binding-gdata-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 41d0fbf451..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,48 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.gdata.collection;uses:=

- "org.oasisopen.sca.annotation,com.google.gdata.client,com.google.gdata.da

- ta";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.binding.gdata.provider;version

- ="1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Gdata Binding Extension Runtime GSOC

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397270375

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Gdata Binding Extension Runtime

-  GSOC

-Import-Package: com.google.gdata.client,

- com.google.gdata.data,

- com.google.gdata.util,

- com.google.gdata.util.common.xml,

- javax.servlet,

- javax.servlet.http,

- javax.xml.namespace,

- org.apache.commons.codec.binary,

- org.apache.commons.httpclient,

- org.apache.commons.httpclient.auth,

- org.apache.commons.httpclient.methods,

- org.apache.commons.httpclient.params,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.binding.gdata;version="2.0.0",

- org.apache.tuscany.sca.binding.gdata.collection;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.data.collection;version="2.0.0",

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.host.http;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.gdata.runtime

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-gdata-runtime/NOTICE b/java/sca-contrib/modules/binding-gdata-runtime/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/pom.xml b/java/sca-contrib/modules/binding-gdata-runtime/pom.xml
deleted file mode 100644
index 2670493cfe..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/pom.xml
+++ /dev/null
@@ -1,169 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-gdata-runtime</artifactId>
-    <name>Apache Tuscany SCA Gdata Binding Extension Runtime GSOC</name>
-
-    <repositories>
-        <repository>
-            <id>com.google.gdata</id>
-            <url>http://people.apache.org/~lresende/google-gdata/maven/
-            </url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-gdata</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.gdata</groupId>
-            <artifactId>gdata-client</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.gdata</groupId>
-            <artifactId>gdata-client-meta</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.gdata</groupId>
-            <artifactId>gdata-core</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.gdata</groupId>
-            <artifactId>gdata-media</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-codec</groupId>
-                    <artifactId>commons-codec</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>avalon-framework</groupId>
-                    <artifactId>avalon-framework</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java b/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
deleted file mode 100644
index b3d672b9d4..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
+++ /dev/null
@@ -1,79 +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.binding.gdata.collection;
-
-import com.google.gdata.client.Query;
-import com.google.gdata.data.Entry;
-import com.google.gdata.data.Feed;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Provides access to a collection of resources using Gdata.
- */
-@Remotable
-public interface Collection {
-
-    /**
-     * Get a GData feed for a collection of resources.
-     * 
-     * @return the GData feed
-     */
-    Feed getFeed();
-
-    /**
-     * Get a GData feed for a collection of resources resulting from a query.
-     * 
-     * @param queryString a query string
-     * @return the GData feed
-     */
-    Feed query(Query query);
-
-    /**
-     * Creates a new entry.
-     * 
-     * @param entry
-     * @return
-     */
-    Entry post(Entry entry);
-
-    /**
-     * Retrieves an entry.
-     * 
-     * @param id
-     * @return
-     */
-    Entry get(String id) throws NotFoundException;
-
-    /**
-     * Update an entry.
-     * 
-     * @param id
-     * @param entry
-     * @return
-     */
-    void put(String id, Entry entry) throws NotFoundException;
-
-    /**
-     * Delete an entry.
-     * 
-     * @param id
-     */
-    void delete(String id) throws NotFoundException;
-
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java b/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
deleted file mode 100644
index 174efef1bc..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.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 org.apache.tuscany.sca.binding.gdata.collection;
-
-import java.io.InputStream;
-
-import org.oasisopen.sca.annotation.Remotable; 
-
-import com.google.gdata.data.Entry;
-
-/**
- * Provides access to a collection of resources using Atom.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface MediaCollection extends Collection {
-
-    /**
-     * Creates a new media entry
-     * 
-     * @param title
-     * @param slug
-     * @param contentType
-     * @param media
-     */
-    Entry postMedia(String title, String slug, String contentType, InputStream media);
-
-    /**
-     * Update a media entry.
-     * 
-     * @param id
-     * @param contentType
-     * @param media
-     * @return
-     */
-    void putMedia(String id, String contentType, InputStream media) throws NotFoundException;
-
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java b/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
deleted file mode 100644
index 91e3616ad9..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.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.    
- */
-
-package org.apache.tuscany.sca.binding.gdata.collection;
-
-/**
- * Indicates that a resource could not be found.
- * 
- * @version $Rev$ $Date$
- */
-
-public class NotFoundException extends Exception {
-    private static final long serialVersionUID = -5046027674128627383L;
-
-    public NotFoundException() {
-    }
-
-    public NotFoundException(String message) {
-        super(message);
-    }
-
-    public NotFoundException(Throwable cause) {
-        super(cause);
-    }
-
-    public NotFoundException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java b/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
deleted file mode 100644
index 312c1fe641..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
+++ /dev/null
@@ -1,425 +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.binding.gdata.provider;
-
-import static org.apache.tuscany.sca.binding.gdata.provider.GdataBindingUtil.entry;
-import static org.apache.tuscany.sca.binding.gdata.provider.GdataBindingUtil.feedEntry;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.DeleteMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.tuscany.sca.binding.gdata.collection.NotFoundException;
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-import com.google.gdata.client.GoogleService;
-import com.google.gdata.client.Query;
-import com.google.gdata.data.Feed;
-import com.google.gdata.util.ResourceNotFoundException;
-import com.google.gdata.util.ServiceException;
-
-/**
- * Invoker for the GData binding.
- * 
- * @version $Rev$ $Date$
- */
-class GdataBindingInvoker implements Invoker, DataExchangeSemantics {
-
-    Operation operation;
-    String uri;
-    HttpClient httpClient;
-    String authorizationHeader;
-    GdataReferenceBindingProvider provider;
-    GoogleService googleService;
-
-    GdataBindingInvoker(Operation operation,
-                        String uri,
-                        GoogleService googleService,
-                        HttpClient httpClient,
-                        String authorizationHeader,
-                        GdataReferenceBindingProvider bindingProvider) {
-        this.operation = operation;
-        this.uri = uri;
-        this.googleService = googleService;
-        this.httpClient = httpClient;
-        this.authorizationHeader = authorizationHeader;
-        this.provider = bindingProvider;
-
-    }
-
-
-    public boolean allowsPassByReference() {
-        return true;
-    }
-
-    public Message invoke(Message msg) {
-        // Shouldn't get here, as the only supported methods are
-        // defined in the ResourceCollection interface, and implemented
-        // by specific invoker subclasses
-        throw new UnsupportedOperationException(operation.getName());
-    }
-
-   
-    /**
-     * Get operation invoker
-     */
-    public static class GetInvoker extends GdataBindingInvoker {
-        
-        public GetInvoker(Operation operation,
-                          String uri,
-                          GoogleService googleService,
-                          HttpClient httpClient,
-                          String authorizationHeader,
-                          GdataReferenceBindingProvider bindingProvider) {
-            super(operation, uri, googleService, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @SuppressWarnings("finally")
-        @Override
-        public Message invoke(Message msg) {
-
-            // Get the entry id from the message body
-            String id = (String)((Object[])msg.getBody())[0];
-
-            // Send an HTTP GET
-            GetMethod getMethod = new GetMethod(uri + "/" + id);
-            getMethod.setRequestHeader("Authorization", authorizationHeader);
-
-            try {
-                URL entryURL = new URL(uri + "/" + id);
-                com.google.gdata.data.Entry feedEntry = googleService.getEntry(entryURL, com.google.gdata.data.Entry.class);
-                msg.setBody(feedEntry);
-            } catch (IOException ex) {
-                msg.setFaultBody(new ServiceRuntimeException(ex));
-            } catch (ServiceException ex) {
-                msg.setFaultBody(new ServiceRuntimeException(ex));
-            } finally {
-                return msg;
-            }
-
-        }
-    }
-
-    /**
-     * Post operation invoker
-     */
-    public static class PostInvoker extends GdataBindingInvoker {
-
-        public PostInvoker(Operation operation,
-                           String uri,
-                           GoogleService googleService,
-                           HttpClient httpClient,
-                           String authorizationHeader,
-                           GdataReferenceBindingProvider bindingProvider) {
-            super(operation, uri, googleService, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @SuppressWarnings("finally")
-        @Override
-        public Message invoke(Message msg) {
-
-            System.out.println("[Debug Info]GdataBindingInvoker.PostInvoker --- invoke method reached");
-            // Post an entry
-            Object[] args = (Object[])msg.getBody();
-            com.google.gdata.data.Entry feedEntry = null;
-
-            if (provider.supportsFeedEntries()) {
-
-                // Expect an GData entry
-
-                System.out.println("[Debug Info]GdataBindingInvoker.PostInvoker --- supportsFeedEntries: " + provider.supportsFeedEntries());
-                feedEntry = (com.google.gdata.data.Entry)args[0];
-
-                System.out.println("[Debug Info]GdataBindingInvoker.PostInvoker --- feedEntry title: " + feedEntry.getTitle().getPlainText());
-
-            } else {
-                // Expect a key and data item
-                Entry<Object, Object> entry = new Entry<Object, Object>(args[0], args[1]);
-
-                // FIXME: this needs to be examinated more....
-                feedEntry = feedEntry(entry, provider.getItemClassType(), provider.getItemXMLType(), provider.getMediator());
-            }
-
-            try {
-               
-                com.google.gdata.data.Entry createdEntry = googleService.insert(new URL(uri), feedEntry);
-
-                msg.setBody(createdEntry);
-
-            } catch (IOException ex) {
-                msg.setFaultBody(new ServiceRuntimeException(ex));
-            } catch (ServiceException ex) {
-                msg.setFaultBody(new ServiceRuntimeException(ex));
-            } finally {
-                return msg;
-            }
-        }
-    }
-
-    
-    
-    /**
-     * Put operation invoker
-     */
-    public static class PutInvoker extends GdataBindingInvoker {
-
-        public PutInvoker(Operation operation,
-                          String uri,
-                          GoogleService googleService,
-                          HttpClient httpClient,
-                          String authorizationHeader,
-                          GdataReferenceBindingProvider bindingProvider) {
-            super(operation, uri, googleService, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @SuppressWarnings("finally")
-        @Override
-        public Message invoke(Message msg) {
-
-            // Put an entry
-            Object[] args = (Object[])msg.getBody();
-            String id;
-            com.google.gdata.data.Entry feedEntry = null;
-            if (provider.supportsFeedEntries()) {
-                // Expect a key and GData entry
-                id = (String)args[0];
-                feedEntry = (com.google.gdata.data.Entry)args[1];
-            } else {
-
-                // Expect a key and data item
-                id = (String)args[0];
-                Entry<Object, Object> entry = new Entry<Object, Object>(id, args[1]);
-
-            }
-
-            // Send an HTTP PUT <Localhost>
-            PutMethod putMethod = new PutMethod(uri + "/" + id);
-            putMethod.setRequestHeader("Authorization", authorizationHeader);
-            try {
-                URL entryURL = new URL(uri + "/" + id);
-                
-                com.google.gdata.data.Entry toUpdateEntry = googleService.getEntry(entryURL, com.google.gdata.data.Entry.class);
-                
-                System.out.println("EditHtml:" + toUpdateEntry.getEditLink().getHref());
-                
-                URL editURL = new URL(toUpdateEntry.getEditLink().getHref());
-                
-                com.google.gdata.data.Entry updatedEntry = googleService.update(editURL, feedEntry);
-
-                msg.setBody(updatedEntry);
-
-            } catch (IOException ex) {
-                msg.setFaultBody(new ServiceRuntimeException(ex));
-            } catch (ServiceException ex) {
-                msg.setFaultBody(new ServiceRuntimeException(ex));
-            } finally {
-                return msg;
-            }    }
-    }
-
-    /**
-     * Delete operation invoker
-     */
-    public static class DeleteInvoker extends GdataBindingInvoker {
-
-        public DeleteInvoker(Operation operation,
-                             String uri,
-                             GoogleService googleService,
-                             HttpClient httpClient,
-                             String authorizationHeader,
-                             GdataReferenceBindingProvider bindingProvider) {
-            super(operation, uri, googleService, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @SuppressWarnings("finally")
-        @Override
-        public Message invoke(Message msg) {
-
-            // Delete an entry
-            String id = (String)((Object[])msg.getBody())[0];
-
-            // Send an HTTP DELETE(Localhost)
-            DeleteMethod deleteMethod = new DeleteMethod(uri + "/" + id);
-            deleteMethod.setRequestHeader("Authorization", authorizationHeader);
-
-            try {
-               URL entryURL = new URL(uri + "/" + id);
-                
-               com.google.gdata.data.Entry toUpdateEntry = googleService.getEntry(entryURL, com.google.gdata.data.Entry.class);
-                
-               System.out.println("EditHtml:" + toUpdateEntry.getEditLink().getHref());
-                
-               URL editURL = new URL(toUpdateEntry.getEditLink().getHref());
-    
-               googleService.delete(editURL);
-
-              } catch (IOException ex) {
-                    msg.setFaultBody(new ServiceRuntimeException(ex));
-                } catch (ServiceException ex) {
-                    msg.setFaultBody(new ServiceRuntimeException(ex));
-                } finally {
-                    return msg;
-                }
-            }
-
-    }
-
-   
-    /**
-     * GetAll operation invoker
-     */
-    public static class GetAllInvoker extends GdataBindingInvoker {
-
-        public GetAllInvoker(Operation operation,
-                             String uri,
-                             GoogleService googleService,
-                             HttpClient httpClient,
-                             String authorizationHeader,
-                             GdataReferenceBindingProvider bindingProvider) {
-            super(operation, uri, googleService, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @SuppressWarnings("finally")
-                @Override
-        public Message invoke(Message msg) {
-
-            // Send an HTTP GET
-            GetMethod getMethod = new GetMethod(uri);
-            getMethod.setRequestHeader("Authorization", authorizationHeader);
-
-            System.out.println("[Debug Info] GdataBindingInvoker.GetAllInvoker.invoke---feedURL: " + uri);
-
-            try {
-
-                Feed feed = googleService.getFeed(new URL(uri), Feed.class);
-                msg.setBody(feed);
-
-            } catch (ResourceNotFoundException ex) {
-                msg.setFaultBody(new ResourceNotFoundException("Invalid Resource at " + uri));
-            } catch (ServiceException ex) {
-                msg.setFaultBody(new ServiceRuntimeException(ex));
-            } catch (Exception ex) {
-                msg.setFaultBody(new ServiceRuntimeException(ex));
-            } finally {
-                return msg;
-            }
-
-        }
-    }
-
-    /**
-     * Query operation invoker
-     */
-    public static class QueryInvoker extends GdataBindingInvoker {
-
-        public QueryInvoker(Operation operation,
-                            String uri,
-                            GoogleService googleService,
-                            HttpClient httpClient,
-                            String authorizationHeader,
-                            GdataReferenceBindingProvider bindingProvider) {
-            super(operation, uri, googleService, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @SuppressWarnings("finally")
-                @Override
-        public Message invoke(Message msg) {
-
-            // Send an HTTP GET
-            GetMethod getMethod = new GetMethod(uri);
-            getMethod.setRequestHeader("Authorization", authorizationHeader);
-
-            Object[] args = (Object[])msg.getBody();
-            Query myQuery = (Query)args[0];
-            
-            System.out.println("[Debug Info] GdataBindingInvoker.QueryInvoker.invoke---feedURL: " + uri);
-
-            try {
-
-                Feed resultFeed = googleService.query(myQuery, Feed.class);
-                msg.setBody(resultFeed);
-
-            } catch (ResourceNotFoundException ex) {
-                msg.setFaultBody(new ResourceNotFoundException("Invalid Resource at " + uri));
-            } catch (ServiceException ex) {
-                msg.setFaultBody(new ServiceRuntimeException(ex));
-            } catch (Exception ex) {
-                msg.setFaultBody(new ServiceRuntimeException(ex));
-            } finally {
-                return msg;
-            }
-
-        
-        }
-    }
-
-    
-    
-    /**
-     * PostMedia operation invoker
-     */
-    public static class PostMediaInvoker extends GdataBindingInvoker {
-
-        public PostMediaInvoker(Operation operation,
-                                String uri,
-                                GoogleService googleService,
-                                HttpClient httpClient,
-                                String authorizationHeader,
-                                GdataReferenceBindingProvider bindingProvider) {
-            super(operation, uri, googleService, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @Override
-        public Message invoke(Message msg) {
-            // TODO implement
-            return super.invoke(msg);
-        }
-    }
-
-    /**
-     * PutMedia operation invoker
-     */
-    public static class PutMediaInvoker extends GdataBindingInvoker {
-
-        public PutMediaInvoker(Operation operation,
-                               String uri,
-                               GoogleService googleService,
-                               HttpClient httpClient,
-                               String authorizationHeader,
-                               GdataReferenceBindingProvider bindingProvider) {
-            super(operation, uri, googleService, httpClient, authorizationHeader, bindingProvider);
-        }
-
-        @Override
-        public Message invoke(Message msg) {
-            // TODO implement
-            return super.invoke(msg);
-        }
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java b/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
deleted file mode 100644
index 4fa89fc634..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
+++ /dev/null
@@ -1,736 +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.binding.gdata.provider;
-
-import static org.apache.tuscany.sca.binding.gdata.provider.GdataBindingUtil.entry;
-import static org.apache.tuscany.sca.binding.gdata.provider.GdataBindingUtil.feedEntry;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-import java.util.logging.Logger;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-import com.google.gdata.data.ExtensionProfile;
-import com.google.gdata.data.ParseSource;
-import com.google.gdata.data.PlainTextConstruct;
-import com.google.gdata.util.ParseException;
-import com.google.gdata.util.ServiceException;
-
-
-/**
- * A resource collection binding listener, implemented as a Servlet and
- * registered in a Servlet host provided by the SCA hosting runtime.
- * 
- * @version $Rev$ $Date$
- */
-class GdataBindingListenerServlet extends HttpServlet {
-    private static final Logger logger = Logger.getLogger(GdataBindingListenerServlet.class.getName());
-    private static final long serialVersionUID = 1L;
-     
-    private RuntimeWire wire;
-    private Invoker getFeedInvoker;
-    private Invoker getAllInvoker;
-    private Invoker queryInvoker;
-    private Invoker getInvoker;
-    private Invoker postInvoker;
-    private Invoker postMediaInvoker;
-    private Invoker putInvoker;
-    private Invoker putMediaInvoker;
-    private Invoker deleteInvoker;
-    private MessageFactory messageFactory;
-    private String title;
-    private Mediator mediator;
-    private DataType<?> itemClassType;
-    private DataType<?> itemXMLType;
-    private boolean supportsFeedEntries;
-
-    /**
-     * Constructs a new binding listener.
-     * 
-     * @param wire
-     * @param messageFactory
-     * @param feedType
-     */
-    GdataBindingListenerServlet(RuntimeWire wire, MessageFactory messageFactory, Mediator mediator, String title) {
-        this.wire = wire;
-        this.messageFactory = messageFactory;
-        this.mediator = mediator;
-        this.title = title;
-
-        // Get the invokers for the supported operations
-        Operation getOperation = null;
-        for (InvocationChain invocationChain : this.wire.getInvocationChains()) {
-            invocationChain.setAllowsPassByReference(true);
-            Operation operation = invocationChain.getTargetOperation();
-            String operationName = operation.getName();
-           
-            if (operationName.equals("getFeed")) {
-
-                //System.out.println("[Debug Info]GdataBindingListenerServlet constructor --- operation: getFeed");
-                getFeedInvoker = invocationChain.getHeadInvoker();
-
-            } else if (operationName.equals("getAll")) {
-
-                getAllInvoker = invocationChain.getHeadInvoker();
-
-            } else if (operationName.equals("query")) {
-                
-                queryInvoker = invocationChain.getHeadInvoker();
-                
-            } else if (operationName.equals("get")) {
-                
-                //System.out.println("[Debug Info]GdataBindingListenerServlet Constructor --- opeartion: get");
-                getInvoker = invocationChain.getHeadInvoker();
-                getOperation = operation;
-                
-            } else if (operationName.equals("put")) {
-                
-                putInvoker = invocationChain.getHeadInvoker();
-                
-            } else if (operationName.equals("putMedia")) {
-                
-                putMediaInvoker = invocationChain.getHeadInvoker();
-                
-            } else if (operationName.equals("post")) {
-
-                //System.out.println("[Debug Info]GdataBindingListenerServlet Constructor --- opeartion: post");
-                postInvoker = invocationChain.getHeadInvoker();
-
-            } else if (operationName.equals("postMedia")) {
-                postMediaInvoker = invocationChain.getHeadInvoker();
-            } else if (operationName.equals("delete")) {
-                deleteInvoker = invocationChain.getHeadInvoker();
-            }
-        }
-
-        //System.out.println("[Debug Info]GdataBindingListenerServlet constructor --- I am good here 00");
-
-        // Determine the collection item type
-        itemXMLType = new DataTypeImpl<Class<?>>(String.class.getName(), String.class, String.class);
-        Class<?> itemClass = getOperation.getOutputType().getPhysical();
-       
-        if (itemClass == com.google.gdata.data.Entry.class) {
-            supportsFeedEntries = true;
-        }
-        DataType<XMLType> outputType = getOperation.getOutputType();
-        QName qname = outputType.getLogical().getElementName();
-        qname = new QName(qname.getNamespaceURI(), itemClass.getSimpleName());
-        itemClassType = new DataTypeImpl<XMLType>("java:complexType", itemClass, new XMLType(qname, null));
-
-        System.out.println("[Debug Info]GdataBindingListenerServlet --- initilized!");
-    }
-
-    
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-        // No authentication required for a get request
-        System.out.println("[Debug Info]GdataBindingListenerServlet doGet() --- I am good here 00");
-
-        // Get the request path
-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-
-        System.out.println("[Debug Info]GdataBindingListenerServlet doGet() --- request.getRequestURI():  " + request
-            .getRequestURI());
-        System.out.println("[Debug Info]GdataBindingListenerServlet doGet()--- path: " + path);
-
-        // FIXME: Log this get http request, commented out for testing
-        logger.fine("get " + request.getRequestURI());
-
-        // Handle an Atom request
-        if (path != null && path.equals("/atomsvc")) {
-
-            //FIXME: This needs to be fixed, for /atomsvc
-            
-            /*            
-            System.out.println("GdataBindingListenerServlet doGet(): I am good here brach 01");
-            // Return the Atom service document
-            response.setContentType("application/atomsvc+xml; charset=utf-8");
-            Service service = abderaFactory.newService();
-            // service.setText("service");
-
-            Workspace workspace = abderaFactory.newWorkspace();
-            workspace.setTitle("resource");
-
-            String href = request.getRequestURL().toString();
-            href = href.substring(0, href.length() - "/atomsvc".length());
-
-            Collection collection = workspace.addCollection("collection", "atom/feed");
-            collection.setTitle("entries");
-            collection.setAttributeValue("href", href);
-            collection.setAccept("entry");
-            collection.addCategories().setFixed(false);
-
-            workspace.addCollection(collection);
-
-            service.addWorkspace(workspace);
-
-            // FIXME add prettyPrint support
-            try {
-                service.getDocument().writeTo(response.getOutputStream());
-            } catch (IOException ioe) {
-                throw new ServletException(ioe);
-            }
-            */
-
-        } else if (path == null || path.length() == 0 || path.equals("/")) {
-
-            // get HTTP request asking for a feed
-
-            System.out.println("[Debug Info]GdataBindingListenerServlet doGet() --- I am good here brach 02");
-
-            // Return a feed containing the entries in the collection
-            com.google.gdata.data.Feed feed = null;
-
-            if (supportsFeedEntries) {
-
-                System.out.println("[Debug Info]GdataBindingListenerServlet doGet() --- supportsFeedEntries: " + supportsFeedEntries);
-
-                // The service implementation supports feed entries, invoke its
-                // getFeed operation
-                Message requestMessage = messageFactory.createMessage();
-                Message responseMessage;
-                if (request.getQueryString() != null) {
-                    System.out.println("getQueryString != null");
-                    requestMessage.setBody(new Object[] {request.getQueryString()});
-                    responseMessage = queryInvoker.invoke(requestMessage);
-                } else {
-                    System.out.println("getQueryString == null");
-                    responseMessage = getFeedInvoker.invoke(requestMessage);
-                }
-                if (responseMessage.isFault()) {
-                    throw new ServletException((Throwable)responseMessage.getBody());
-                }
-
-                //System.out.println("response msg class:" + responseMessage.getBody().getClass());
-
-                feed = (com.google.gdata.data.Feed)responseMessage.getBody();
-
-                System.out.println("feed title: " + feed.getTitle().getPlainText());
-
-            } else {
-
-                System.out.println("GdataBindingListenerServlet doGet(): do not supportsFeedEntries");
-
-                // The service implementation does not support feed entries,
-                // invoke its getAll operation to get the data item collection,
-                // then create
-                // feed entries from the items
-                Message requestMessage = messageFactory.createMessage();
-                Message responseMessage;
-                if (request.getQueryString() != null) {
-                    requestMessage.setBody(new Object[] {request.getQueryString()});
-                    responseMessage = queryInvoker.invoke(requestMessage);
-                } else {
-                    responseMessage = getAllInvoker.invoke(requestMessage);
-
-                    //System.out
-                    //    .println("GdataBindingListner.doGet(): get msg from getAllInvoker.invoke()" + responseMessage
-                    //        .getBody().toString());
-
-                }
-                if (responseMessage.isFault()) {
-                    throw new ServletException((Throwable)responseMessage.getBody());
-                }
-                Entry<Object, Object>[] collection = (Entry<Object, Object>[])responseMessage.getBody();
-                if (collection != null) {
-
-                    // Create the feed
-                    feed = new com.google.gdata.data.Feed();
-
-                    // Set the feed title
-                    if (title != null) {
-                        feed.setTitle(new PlainTextConstruct(title));
-                    } else {
-                        feed.setTitle(new PlainTextConstruct("Feed title"));
-                    }
-
-                    // Add entries to the feed
-                    ArrayList<com.google.gdata.data.Entry> entries = new ArrayList<com.google.gdata.data.Entry>();
-                    for (Entry<Object, Object> entry : collection) {
-                        com.google.gdata.data.Entry feedEntry = feedEntry(entry, itemClassType, itemXMLType, mediator);
-                        entries.add(feedEntry);
-                    }
-                    feed.setEntries(entries);
-
-                }
-            }
-            if (feed != null) {
-
-                // //System.out.println("feed(from the http response)is not
-                // null");
-
-                // Write a GData feed using Atom representation
-                response.setContentType("application/atom+xml; charset=utf-8");
-
-                // Generate the corresponding Atom representation of the feed
-                StringWriter stringWriter = new StringWriter();
-                com.google.gdata.util.common.xml.XmlWriter w =
-                    new com.google.gdata.util.common.xml.XmlWriter(stringWriter);
-                feed.generateAtom(w, new ExtensionProfile());
-                w.flush();
-
-                // Write the Atom representation(XML) into Http response content
-                OutputStreamWriter osw = new OutputStreamWriter(response.getOutputStream());
-                PrintWriter out = new PrintWriter(response.getOutputStream());
-                out.println(stringWriter.toString());
-                out.close();
-
-                System.out.println("Feed content in plain text:" + stringWriter.toString());
-            } else {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND);
-            }
-
-        } else if (path.startsWith("/")) {
-
-            // get HTTP request asking for an entry
-
-            // Return a specific entry in the collection
-            com.google.gdata.data.Entry feedEntry = null;
-
-            // Invoke the get operation on the service implementation
-            Message requestMessage = messageFactory.createMessage();
-            String id = path.substring(1);
-            requestMessage.setBody(new Object[] {id});
-            Message responseMessage = getInvoker.invoke(requestMessage);
-            if (responseMessage.isFault()) {
-                throw new ServletException((Throwable)responseMessage.getBody());
-            }
-
-            if (supportsFeedEntries) {
-                // The service implementation returns a feed entry
-                feedEntry = (com.google.gdata.data.Entry)responseMessage.getBody();
-
-                System.out.println("entry title: " + feedEntry.getTitle().getPlainText());
-
-            } else {
-                // The service implementation only returns a data item, create
-                // an entry
-                // from it
-                Entry<Object, Object> entry = new Entry<Object, Object>(id, responseMessage.getBody());
-                // FIXME The line below needs to be fixed
-                // feedEntry = feedEntry(entry, itemClassType, itemXMLType,
-                // mediator, abderaFactory);
-            }
-
-            // Write the Gdata entry
-            if (feedEntry != null) {
-
-                // Write a GData entry using Atom representation
-                response.setContentType("application/atom+xml; charset=utf-8");
-
-                // Generate the corresponding Atom representation of the feed
-                StringWriter stringWriter = new StringWriter();
-                com.google.gdata.util.common.xml.XmlWriter w =
-                    new com.google.gdata.util.common.xml.XmlWriter(stringWriter);
-                feedEntry.generateAtom(w, new ExtensionProfile());
-                w.flush();
-
-                // Write the Atom representation(XML) into Http response content
-                OutputStreamWriter osw = new OutputStreamWriter(response.getOutputStream());
-                PrintWriter out = new PrintWriter(response.getOutputStream());
-                out.println(stringWriter.toString());
-                out.close();
-
-            } else {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND);
-            }
-        } else {
-            // Path doesn't match any known pattern
-            response.sendError(HttpServletResponse.SC_NOT_FOUND);
-        }
-
-    }
-
-    @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
-        IOException {
-
-        System.out.println("[Debug Info]GdataBindingListenerServlet doPost() --- reached");
-
-        // Authenticate the user
-        String user = processAuthorizationHeader(request);
-        if (user == null) {
-            unauthorized(response);
-            return;
-        }
-
-        // Get the request path
-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-
-        System.out.println("[Debug Info]GdataBindingListenerServlet path --- " + path);
-
-        if (path == null || path.length() == 0 || path.equals("/")) {
-            // Create a new Gdata entry
-            com.google.gdata.data.Entry createdFeedEntry = null;
-            String contentType = request.getContentType();
-
-            if (contentType != null && contentType.startsWith("application/atom+xml")) {
-
-                // Read the entry from the request
-                com.google.gdata.data.Entry feedEntry = null;
-                try {
-                    ParseSource source = new ParseSource(request.getReader());
-                    feedEntry = com.google.gdata.data.Entry.readEntry(source, com.google.gdata.data.Entry.class, null);
-                } catch (com.google.gdata.util.ParseException pe) {
-                    throw new ServletException(pe);
-                } catch (ServiceException e) {
-                    throw new ServletException(e);
-                }
-
-                // Let the component implementation create it
-                if (supportsFeedEntries) {
-
-                    // The service implementation supports feed entries, pass
-                    // the entry to it
-                    Message requestMessage = messageFactory.createMessage();
-
-                    requestMessage.setBody(new Object[] {feedEntry});
-
-                    Message responseMessage = postInvoker.invoke(requestMessage);
-                    if (responseMessage.isFault()) {
-                        throw new ServletException((Throwable)responseMessage.getBody());
-                    }
-                    createdFeedEntry = responseMessage.getBody();
-                } else {
-
-                    // The service implementation does not support feed entries,
-                    // pass the data item to it
-                    Message requestMessage = messageFactory.createMessage();
-                    Entry<Object, Object> entry = entry(feedEntry, itemClassType, itemXMLType, mediator);
-                    requestMessage.setBody(new Object[] {entry.getKey(), entry.getData()});
-                    Message responseMessage = postInvoker.invoke(requestMessage);
-                    if (responseMessage.isFault()) {
-                        throw new ServletException((Throwable)responseMessage.getBody());
-                    }
-                    entry.setKey(responseMessage.getBody());
-
-                    createdFeedEntry = feedEntry(entry, itemClassType, itemXMLType, mediator);
-                }
-
-            } else if (contentType != null) {
-
-                // Create a new media entry
-
-                // Get incoming headers
-                String title = request.getHeader("Title");
-                String slug = request.getHeader("Slug");
-
-                // Let the component implementation create the media entry
-                Message requestMessage = messageFactory.createMessage();
-                requestMessage.setBody(new Object[] {title, slug, contentType, request.getInputStream()});
-                Message responseMessage = postMediaInvoker.invoke(requestMessage);
-                if (responseMessage.isFault()) {
-                    throw new ServletException((Throwable)responseMessage.getBody());
-                }
-                createdFeedEntry = responseMessage.getBody();
-            } else {
-                response.sendError(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
-            }
-
-            // A new entry was created successfully
-            if (createdFeedEntry != null) {
-
-                // Set location of the created entry in the Location header
-                // Link link = createdFeedEntry.getSelfLink();
-                // if (link != null) {
-                // response.addHeader("Location", link.getHref().toString());
-                // }
-
-                // Write the created Atom entry
-                response.setStatus(HttpServletResponse.SC_CREATED);
-                response.setContentType("application/atom+xml; charset=utf-8");
-
-                // Generate the corresponding Atom representation of the
-                // feed
-                StringWriter stringWriter = new StringWriter();
-                com.google.gdata.util.common.xml.XmlWriter w =
-                    new com.google.gdata.util.common.xml.XmlWriter(stringWriter);
-                createdFeedEntry.generateAtom(w, new ExtensionProfile());
-                w.flush();
-
-                // Write the Atom representation(XML) into Http response
-                // content
-                OutputStreamWriter osw = new OutputStreamWriter(response.getOutputStream());
-                PrintWriter out = new PrintWriter(response.getOutputStream());
-                out.println(stringWriter.toString());
-                out.close();
-
-            } else {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND);
-            }
-
-        } else {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND);
-        }
-    }
-
-    private Writer getWriter(HttpServletResponse response) throws UnsupportedEncodingException, IOException {
-        Writer writer = new OutputStreamWriter(response.getOutputStream(), "UTF-8");
-        return writer;
-    }
-
-    
-    @Override
-    protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-        // Authenticate the user
-        String user = processAuthorizationHeader(request);
-        if (user == null) {
-            unauthorized(response);
-            return;
-        }
-
-        // Get the request path
-        String path = request.getRequestURI().substring(request.getServletPath().length());
-
-        System.out.println("[Debug Info] localServlet doPut --- path: " + path);
-        
-        if (path != null && path.startsWith("/")) {
-            String id = path.substring(1);
-
-            // Update an Atom entry
-            String contentType = request.getContentType();
-            if (contentType != null && contentType.startsWith("application/atom+xml")) {
-
-                // Read the entry from the request
-                com.google.gdata.data.Entry feedEntry = null;
-                try {
-                    ParseSource source = new ParseSource(request.getReader());
-                    feedEntry = com.google.gdata.data.Entry.readEntry(source, com.google.gdata.data.Entry.class, null);
-                
-                    System.out.println("[Debug Info] localServlet doPut --- feedEntry title: " + feedEntry.getTitle().getPlainText());
-                } catch (com.google.gdata.util.ParseException pe) {
-                    throw new ServletException(pe);
-                } catch (ServiceException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                }
-                
-                
-
-                // Let the component implementation create it
-                if (supportsFeedEntries) {
-
-                    System.out.println("[Debug Info] localServlet doPut --- supportsFeedEntries: " + supportsFeedEntries);
-                    
-                    // The service implementation supports feed entries, pass
-                    // the entry to it
-                    Message requestMessage = messageFactory.createMessage();
-                    requestMessage.setBody(new Object[] {id, feedEntry});
-                    Message responseMessage = putInvoker.invoke(requestMessage);
-                    if (responseMessage.isFault()) {
-                        Object body = responseMessage.getBody();
-                        if (body.getClass().getName().endsWith(".NotFoundException")) {
-                            response.sendError(HttpServletResponse.SC_NOT_FOUND);
-                        } else {
-                            throw new ServletException((Throwable)responseMessage.getBody());
-                        }
-                    }
-                } else {
-
-                    // The service implementation does not support feed entries,
-                    // pass the data item to it
-                    Message requestMessage = messageFactory.createMessage();
-                    Entry<Object, Object> entry = entry(feedEntry, itemClassType, itemXMLType, mediator);
-                    requestMessage.setBody(new Object[] {entry.getKey(), entry.getData()});
-                    Message responseMessage = putInvoker.invoke(requestMessage);
-                    if (responseMessage.isFault()) {
-                        Object body = responseMessage.getBody();
-                        if (body.getClass().getName().endsWith(".NotFoundException")) {
-                            response.sendError(HttpServletResponse.SC_NOT_FOUND);
-                        } else {
-                            throw new ServletException((Throwable)responseMessage.getBody());
-                        }
-                    }
-                }
-                
-                // Write the Gdata entry
-                if (feedEntry != null) {
-
-                    // Write a GData entry using Atom representation
-                    response.setContentType("application/atom+xml; charset=utf-8");
-
-                    // Generate the corresponding Atom representation of the feed
-                    StringWriter stringWriter = new StringWriter();
-                    com.google.gdata.util.common.xml.XmlWriter w =
-                        new com.google.gdata.util.common.xml.XmlWriter(stringWriter);
-                    feedEntry.generateAtom(w, new ExtensionProfile());
-                    w.flush();
-
-                    // Write the Atom representation(XML) into Http response content
-                    OutputStreamWriter osw = new OutputStreamWriter(response.getOutputStream());
-                    PrintWriter out = new PrintWriter(response.getOutputStream());
-                    out.println(stringWriter.toString());
-                    out.close();
-
-                }
-
-            } else if (contentType != null) {
-
-                // Updated a media entry
-
-                // Let the component implementation create the media entry
-                Message requestMessage = messageFactory.createMessage();
-                requestMessage.setBody(new Object[] {id, contentType, request.getInputStream()});
-                Message responseMessage = putMediaInvoker.invoke(requestMessage);
-                Object body = responseMessage.getBody();
-                if (responseMessage.isFault()) {
-                    if (body.getClass().getName().endsWith(".NotFoundException")) {
-                        response.sendError(HttpServletResponse.SC_NOT_FOUND);
-                    } else {
-                        throw new ServletException((Throwable)responseMessage.getBody());
-                    }
-                }
-            } else {
-                response.sendError(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
-            }
-        } else {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND);
-        }
-    }
-    
-    
-    
-
-    @Override
-    protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException,
-        IOException {
-
-        // Authenticate the user
-        String user = processAuthorizationHeader(request);
-        if (user == null) {
-            unauthorized(response);
-            return;
-        }
-
-        // Get the request path
-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-
-        String id;
-        if (path != null && path.startsWith("/")) {
-            id = path.substring(1);
-        } else {
-            id = "";
-        }
-
-        // Delete a specific entry from the collection
-        Message requestMessage = messageFactory.createMessage();
-        requestMessage.setBody(new Object[] {id});
-        Message responseMessage = deleteInvoker.invoke(requestMessage);
-        if (responseMessage.isFault()) {
-            Object body = responseMessage.getBody();
-            if (body.getClass().getName().endsWith(".NotFoundException")) {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND);
-            } else {
-                throw new ServletException((Throwable)responseMessage.getBody());
-            }
-        }
-    }
-
-    
-    
-    /**
-     * Process the authorization header
-     * 
-     * @param request
-     * @return
-     * @throws ServletException
-     */
-    private String processAuthorizationHeader(HttpServletRequest request) throws ServletException {
-
-        // FIXME temporarily disabling this as it doesn't work with all browsers
-        if (true)
-            return "admin";
-
-        try {
-            String authorization = request.getHeader("Authorization");
-            if (authorization != null) {
-                StringTokenizer tokens = new StringTokenizer(authorization);
-                if (tokens.hasMoreTokens()) {
-                    String basic = tokens.nextToken();
-                    if (basic.equalsIgnoreCase("Basic")) {
-                        String credentials = tokens.nextToken();
-                        String userAndPassword = new String(Base64.decodeBase64(credentials.getBytes()));
-                        int colon = userAndPassword.indexOf(":");
-                        if (colon != -1) {
-                            String user = userAndPassword.substring(0, colon);
-                            String password = userAndPassword.substring(colon + 1);
-
-                            // Authenticate the User.
-                            if (authenticate(user, password)) {
-                                return user;
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new ServletException(e);
-        }
-        return null;
-    }
-
-    /**
-     * Authenticate a user.
-     * 
-     * @param user
-     * @param password
-     * @return
-     */
-    private boolean authenticate(String user, String password) {
-        // TODO Handle this using SCA security policies
-        return ("admin".equals(user) && "admin".equals(password));
-    }
-
-    /**
-     * Reject an unauthorized request.
-     * 
-     * @param response
-     */
-    private void unauthorized(HttpServletResponse response) throws IOException {
-        response.setHeader("WWW-Authenticate", "BASIC realm=\"Tuscany\"");
-        response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
-    }
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java b/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
deleted file mode 100644
index 9de4772a70..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
+++ /dev/null
@@ -1,83 +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.binding.gdata.provider;
-
-import org.apache.tuscany.sca.binding.gdata.GdataBinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-import com.google.gdata.util.AuthenticationException;
-
-/**
- * Implementation of a Binding provider factory for the Atom binding.
- * 
- * @version $Rev$ $Date$
- */
-public class GdataBindingProviderFactory implements BindingProviderFactory<GdataBinding> {
-
-    private MessageFactory messageFactory;
-    private Mediator mediator;
-    private ServletHost servletHost;
-
-    public GdataBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        this.servletHost = servletHosts.getServletHosts().get(0);
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        this.messageFactory = modelFactories.getFactory(MessageFactory.class);
-        this.mediator =
-            new MediatorImpl(extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class), extensionPoints
-                .getExtensionPoint(TransformerExtensionPoint.class));
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   GdataBinding binding) {
-        try {
-            return new GdataReferenceBindingProvider(component, reference, binding, mediator);
-        } catch (AuthenticationException e) {
-            e.printStackTrace();
-            return null; //Google authentication error! : This exception needs to be handled into a better way
-        }
-        
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               GdataBinding binding) {
-        return new GdataServiceBindingProvider(component, service, binding, servletHost, messageFactory, mediator);
-    }
-
-    public Class<GdataBinding> getModelType() {
-        return GdataBinding.class;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java b/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
deleted file mode 100644
index 3d476df764..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
+++ /dev/null
@@ -1,171 +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.binding.gdata.provider;
-
-import java.util.Date;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.interfacedef.DataType;
-
-import com.google.gdata.data.DateTime;
-import com.google.gdata.data.PlainTextConstruct;
-import com.google.gdata.data.TextContent;
-
-/**
- * Utility methods used in this package.
- * 
- * @version $Rev$ $Date$
- */
-class GdataBindingUtil {
-
-    /**
-     * Create a data item from an GData entry.
-     * 
-     * @param feedEntry
-     * @param itemClassType
-     * @param itemXMLType
-     * @param mediator
-     * @return
-     */
-    static Entry<Object, Object> entry(com.google.gdata.data.Entry feedEntry,
-                                       DataType<?> itemClassType,
-                                       DataType<?> itemXMLType,
-                                       Mediator mediator) {
-        if (feedEntry != null) {
-            if (itemClassType.getPhysical() == Item.class) {
-                String key = feedEntry.getId().toString();
-
-                Item item = new Item();
-                item.setTitle(feedEntry.getTitle().toString());
-                TextContent content = (TextContent)feedEntry.getContent();
-                item.setContents(content.getContent().getPlainText());
-
-                for (com.google.gdata.data.Link link : feedEntry.getLinks()) {
-                    if (link.getRel() == null || "self".equals(link.getRel())) {
-                        if (item.getLink() == null) {
-                            item.setLink(link.getHref().toString());
-                        }
-                    } else if ("related".equals(link.getRel())) {
-                        item.setRelated(link.getHref().toString());
-                    } else if ("alternate".equals(link.getRel())) {
-                        item.setAlternate(link.getHref().toString());
-                    }
-                }
-
-                Date date = new Date(feedEntry.getUpdated().getValue());
-                item.setDate(date);
-                return new Entry<Object, Object>(key, item);
-
-            } else {
-                String key = null;
-                if (feedEntry.getId() != null) {
-                    key = feedEntry.getId();
-                }
-
-                // Create the item from XML
-                if (feedEntry.getContent() == null) {
-                    return null;
-                }
-
-                TextContent content = (TextContent)feedEntry.getContent();
-                String value = content.getContent().getPlainText();
-                Object data = mediator.mediate(value, itemXMLType, itemClassType, null);
-                return new Entry<Object, Object>(key, data);
-            }
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Create an Gdata entry for a key and item from a collection.
-     * 
-     * @param entry
-     * @param itemClassType
-     * @param itemXMLType
-     * @param mediator
-     * @param factory
-     * @return
-     */
-    static com.google.gdata.data.Entry feedEntry(Entry<Object, Object> entry,
-                                                 DataType<?> itemClassType,
-                                                 DataType<?> itemXMLType,
-                                                 Mediator mediator) {
-
-        Object key = entry.getKey();
-        Object data = entry.getData();
-        if (data instanceof Item) {
-            Item item = (Item)data;
-
-            com.google.gdata.data.Entry feedEntry = new com.google.gdata.data.Entry();
-            if (key != null) {
-                feedEntry.setId(key.toString());
-            }
-            feedEntry.setTitle(new PlainTextConstruct(item.getTitle()));
-            feedEntry.setContent(new PlainTextConstruct(item.getContents()));
-
-            String href = item.getLink();
-            if (href == null && key != null) {
-                href = key.toString();
-            }
-
-            if (href != null) {
-                feedEntry.addHtmlLink(href, "", "");
-            }
-            String related = item.getRelated();
-            if (related != null) {
-                feedEntry.addHtmlLink(related, "", "related");
-            }
-            String alternate = item.getAlternate();
-            if (alternate != null) {
-                feedEntry.addHtmlLink(alternate, "", "alternate");
-            }
-
-            Date date = item.getDate();
-            if (date != null) {
-                DateTime datetime = new DateTime(date);
-                feedEntry.setUpdated(datetime);
-            }
-            return feedEntry;
-
-        } else if (data != null) {
-
-            com.google.gdata.data.Entry feedEntry = new com.google.gdata.data.Entry();
-            feedEntry.setId(key.toString());
-            feedEntry.setTitle(new PlainTextConstruct("item"));
-
-            // Convert the item to XML
-            String value = mediator.mediate(data, itemClassType, itemXMLType, null).toString();
-
-            // Might be wrong because the example uses XML datatype, I am using
-            // plainText here
-            feedEntry.setContent(new PlainTextConstruct(value));
-
-            feedEntry.addHtmlLink(key.toString(), "", "");
-            return feedEntry;
-
-        } else {
-            return null;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java b/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
deleted file mode 100644
index c20e44f7da..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
+++ /dev/null
@@ -1,229 +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.binding.gdata.provider;
-
-import java.net.URI;
-
-import javax.xml.namespace.QName;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpConnectionManager;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.tuscany.sca.binding.gdata.GdataBinding;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-import com.google.gdata.client.GoogleService;
-import com.google.gdata.util.AuthenticationException;
-
-/**
- * Implementation of the Atom binding provider.
- * 
- * @version $Rev$ $Date$
- */
-class GdataReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private RuntimeComponentReference reference;
-    private GdataBinding binding;
-    private String authorizationHeader;
-    private GoogleService googleService;
-    private HttpClient httpClient;
-    private Mediator mediator;
-    private DataType<?> itemClassType;
-    private DataType<?> itemXMLType;
-    private boolean supportsFeedEntries;
-
-    /**
-     * Constructs a new AtomReferenceBindingProvider
-     * 
-     * @param component
-     * @param reference
-     * @param binding
-     * @param mediator
-     * @throws AuthenticationException 
-     */
-    GdataReferenceBindingProvider(RuntimeComponent component,
-                                  RuntimeComponentReference reference,
-                                  GdataBinding binding,
-                                  Mediator mediator) throws AuthenticationException {
-        this.reference = reference;
-        this.binding = binding;
-        this.mediator = mediator;
-
-        // Prepare authorization header
-        String authorization = "admin" + ":" + "admin";
-        authorizationHeader = "Basic " + new String(Base64.encodeBase64(authorization.getBytes()));
-        
-        // Prepare gdata header
-        String serviceType = binding.getServiceType();
-        String usernane = binding.getUsername();
-        String password = binding.getPassword();
-        
-        System.out.println("[Debug Info] binding.getServiceType()" + serviceType);
-        System.out.println("[Debug Info] binding.getName()" +usernane);
-        System.out.println("[Debug Info] binding.getPassword()" + password);    
-        
-        googleService = new GoogleService(serviceType, "");
-        if(binding.getUsername().equals("admin") == false && binding.getPassword().equals("admin")==false){
-            googleService.setUserCredentials(binding.getUsername(),binding.getPassword());     
-        }
-
-        // Create an HTTP client
-        HttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
-        connectionManager.getParams().setDefaultMaxConnectionsPerHost(10);
-        connectionManager.getParams().setConnectionTimeout(60000);
-        httpClient = new HttpClient(connectionManager);
-    }
-
-    public Invoker createInvoker(Operation operation) {
-
-        String operationName = operation.getName();
-
-        if (operationName.equals("get")) {
-
-            // Determine the collection item type
-            itemXMLType = new DataTypeImpl<Class<?>>(String.class.getName(), String.class, String.class);
-            Class<?> itemClass = operation.getOutputType().getPhysical();
-            DataType<XMLType> outputType = operation.getOutputType();
-            QName qname = outputType.getLogical().getElementName();
-            qname = new QName(qname.getNamespaceURI(), itemClass.getSimpleName());
-            itemClassType = new DataTypeImpl<XMLType>("java:complexType", itemClass, new XMLType(qname, null));
-
-            if (itemClassType.getPhysical() == com.google.gdata.data.Entry.class) {
-                supportsFeedEntries = true;
-            }
-
-            String entryURI = this.binding.getURI();
-            if(entryURI.contains("picasaweb.google.com/data/feed/api/")){
-                entryURI = entryURI.replace("picasaweb.google.com/data/feed/api/", "picasaweb.google.com/data/entry/api/");
-            }
-
-            return new GdataBindingInvoker.GetInvoker(operation, entryURI, googleService, httpClient, authorizationHeader, this);
-
-        } else if (operationName.equals("post")) {
-
-            return new GdataBindingInvoker.PostInvoker(operation, binding.getURI(), googleService, httpClient, authorizationHeader, this);
-
-        } else if (operationName.equals("put")) {
-
-            String entryURI = this.binding.getURI();
-            if(entryURI.contains("picasaweb.google.com/data/feed/api/")){
-                entryURI = entryURI.replace("picasaweb.google.com/data/feed/api/", "picasaweb.google.com/data/entry/api/");
-            }
-
-            return new GdataBindingInvoker.PutInvoker(operation, entryURI,  googleService, httpClient, authorizationHeader, this);
-            
-        } else if (operationName.equals("delete")) {
-
-                String entryURI = this.binding.getURI();
-            if(entryURI.contains("picasaweb.google.com/data/feed/api/")){
-                entryURI = entryURI.replace("picasaweb.google.com/data/feed/api/", "picasaweb.google.com/data/entry/api/");
-            }
-            return new GdataBindingInvoker.DeleteInvoker(operation, entryURI,  googleService, httpClient, authorizationHeader, this);
-            
-        } else if (operationName.equals("getFeed") || operationName.equals("getAll")) {
-
-            return new GdataBindingInvoker.GetAllInvoker(operation, binding.getURI(),  googleService, httpClient, authorizationHeader, this);
-
-        } else if (operationName.equals("postMedia")) {
-            
-                return new GdataBindingInvoker.PostMediaInvoker(operation, binding.getURI(),  googleService, httpClient, authorizationHeader, this);
-                
-        } else if (operationName.equals("putMedia")) {
-                
-            return new GdataBindingInvoker.PutMediaInvoker(operation, binding.getURI(),  googleService, httpClient, authorizationHeader, this);
-            
-        } else if (operationName.equals("query")) {
-                
-            return new GdataBindingInvoker.QueryInvoker(operation, binding.getURI(),  googleService, httpClient, authorizationHeader, this);
-        }
-
-        return new GdataBindingInvoker(operation, binding.getURI(),  googleService, httpClient, authorizationHeader, this);
-    }
-    
-    public InterfaceContract getBindingInterfaceContract() {
-        return reference.getInterfaceContract();
-    }
-
-    public void start() {
-        // Configure the HTTP client credentials
-        Credentials credentials = new UsernamePasswordCredentials("admin", "admin");
-        httpClient.getParams().setAuthenticationPreemptive(true);
-        URI uri = URI.create(binding.getURI());
-        httpClient.getState().setCredentials(new AuthScope(uri.getHost(), uri.getPort()), credentials);
-    }
-
-    public void stop() {
-
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    /**
-     * Returns the mediator.
-     * 
-     * @return
-     */
-    Mediator getMediator() {
-        return mediator;
-    }
-
-    /**
-     * Returns the item class type.
-     * 
-     * @return
-     */
-    DataType<?> getItemClassType() {
-        return itemClassType;
-    }
-
-    /**
-     * Returns the item XML type.
-     * 
-     * @return
-     */
-    DataType<?> getItemXMLType() {
-        return itemXMLType;
-    }
-
-    /**
-     * Returns true if the invoker should work with Atom feed entries.
-     * 
-     * @return
-     */
-    boolean supportsFeedEntries() {
-        return supportsFeedEntries;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java b/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
deleted file mode 100644
index 10faf74371..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
+++ /dev/null
@@ -1,90 +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.binding.gdata.provider;
-
-import org.apache.tuscany.sca.binding.gdata.GdataBinding;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Implementation of the Atom binding provider.
- * 
- * @version $Rev$ $Date$
- */
-class GdataServiceBindingProvider implements ServiceBindingProvider {
-
-    private RuntimeComponentService service;
-    private GdataBinding binding;
-    private ServletHost servletHost;
-    private MessageFactory messageFactory;
-    private String servletMapping;
-    private Mediator mediator;
-
-    GdataServiceBindingProvider(RuntimeComponent component,
-                                RuntimeComponentService service,
-                                GdataBinding binding,
-                                ServletHost servletHost,
-                                MessageFactory messageFactory,
-                                Mediator mediator) {
-        this.service = service;
-        this.binding = binding;
-        this.servletHost = servletHost;
-        this.messageFactory = messageFactory;
-        this.mediator = mediator;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return service.getInterfaceContract();
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-        RuntimeComponentService componentService = (RuntimeComponentService)service;
-        RuntimeWire wire = componentService.getRuntimeWire(binding);
-
-        GdataBindingListenerServlet servlet =
-            new GdataBindingListenerServlet(wire, messageFactory, mediator, binding.getTitle());
-
-        servletMapping = binding.getURI();
-        if (!servletMapping.endsWith("/")) {
-            servletMapping += "/";
-        }
-        if (!servletMapping.endsWith("*")) {
-            servletMapping += "*";
-        }
-        servletHost.addServletMapping(servletMapping, servlet);
-
-        // Save the actual binding URI in the binding
-        binding.setURI(servletHost.getURLMapping(binding.getURI()).toString());
-    }
-
-    public void stop() {
-        servletHost.removeServletMapping(servletMapping);
-    }
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca-contrib/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 5e380eb4e0..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the binding extension
-org.apache.tuscany.sca.binding.gdata.provider.GdataBindingProviderFactory;model=org.apache.tuscany.sca.binding.gdata.GdataBinding
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd b/java/sca-contrib/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd
deleted file mode 100644
index 5148e2ef2d..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd
+++ /dev/null
@@ -1,36 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://echo" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:e="http://echo" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0"/>
-
-    <element name="binding.gdata" type="e:GdataBinding"/>
-    
-    <complexType name="GdataBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java b/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
deleted file mode 100644
index 50a3ec3886..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
+++ /dev/null
@@ -1,66 +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.binding.gdata;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import com.google.gdata.data.Entry;
-import com.google.gdata.data.Feed;
-import com.google.gdata.data.PlainTextConstruct;
-
-public class Consumer {
-
-    public static void main(String[] args) throws Exception {
-
-        //Initialize the GData client service (Reference Binding test)
-        String contribution = ContributionLocationHelper.getContributionLocation(Consumer.class);
-        Node node = NodeFactory.newInstance().createNode(
-                                                     "org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite", new Contribution("consumer", contribution));
-        node.start();
-        CustomerClient testService = node.getService(CustomerClient.class, "CustomerClient");          
-        
-        
-        Feed feed = testService.clientGetFeed();
-        
-        System.out.println("#Entries(Before post): "+ testService.clientGetFeed().getEntries().size());
-        
-        /*
-        String entryID = "tag:blogger.com,1999:blog-4520949313432095990.post-973462497533349425";
-        Entry entry = testService.clientGetEntry(entryID);
-        System.out.println("Entry id: " + entry.getId());
-        */
-        
-        Entry myEntry = new Entry();
-        myEntry.setTitle(new PlainTextConstruct("titleByConsumer2"));
-        myEntry.setContent(new PlainTextConstruct("contentByConsmer2"));
-        testService.clientPost(myEntry);
-        
-        System.out.println("#Entries(After post): "+ testService.clientGetFeed().getEntries().size());
-        
-        String entryID = "tag:blogger.com,1999:blog-4520949313432095990.post-973462497533349425";
-        Entry entry = testService.clientGetEntry(entryID);
-        System.out.println("Entry id: " + entry.getId());
-
-       
-    }
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java b/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
deleted file mode 100644
index e4d502357d..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
+++ /dev/null
@@ -1,153 +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.binding.gdata;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.gdata.data.Entry;
-import com.google.gdata.data.Feed;
-import com.google.gdata.data.PlainTextConstruct;
-
-public class ConsumerProviderTestCase extends TestCase {
-
-    private Node providerNode = null;
-    private Node consumerNode = null;
-    private CustomerClient testService = null;
-
-    @Before
-    @Override
-    public void setUp() throws Exception {
-        System.out.println("Method Test Start-----------------------------------------------------------------------");
-
-        // Setup the local GData servlet (Service Binding test)
-        String contribution = ContributionLocationHelper.getContributionLocation(ConsumerProviderTestCase.class);
-        providerNode = NodeFactory.newInstance().createNode(
-                                                     "org/apache/tuscany/sca/binding/gdata/Provider.composite", new Contribution("provider", contribution));
-        providerNode.start();
-        System.out.println("[Debug Info] Provider.composite ready...");
-
-        // Initialize the GData client service (Reference Binding test)
-        consumerNode = NodeFactory.newInstance().createNode(
-                                                                    "org/apache/tuscany/sca/binding/gdata/Consumer.composite", new Contribution("consumer", contribution));
-        consumerNode.start();
-        testService = consumerNode.getService(CustomerClient.class, "CustomerClient");
-    }
-
-    @After
-    @Override
-    public void tearDown() {
-        providerNode.stop();
-        providerNode.destroy();
-        consumerNode.stop();
-        consumerNode.destroy();
-        System.out.println("Method Test End------------------------------------------------------------------------");
-        System.out.println("\n\n");
-    }
-    
-        
-    @Test
-    public void testClientGetFeed() throws Exception {
-        Feed feed = testService.clientGetFeed();
-        System.out.println(feed.getTitle().getPlainText());
-        assertNotNull(feed);
-        // Given we are testing on the localhost providing feed, we know the
-        // feed title is "Feedtitle(LocalHostServlet)"
-        assertEquals("Feedtitle(LocalHostServlet)", feed.getTitle().getPlainText());
-    }
-
-    @Test
-    public void testClientGetEntry() throws Exception {
-        String entryID = "urn:uuid:customer-0";
-        Entry entry = testService.clientGetEntry(entryID);
-        System.out.println("entryID in testcase: " + entry.getId());
-        assertEquals(entryID, entry.getId());
-    }
-
-    @Test
-    public void testClientPost() throws Exception {
-        Entry newEntry = new Entry();
-        newEntry.setTitle(new PlainTextConstruct("NewEntry title by Post"));
-        newEntry.setContent(new PlainTextConstruct("NewEntry Content by Post"));        
-        Entry postedEntry = testService.clientPost(newEntry);        
-        assertEquals("NewEntry title by Post", postedEntry.getTitle().getPlainText());
-    }
-    
-  
-    
-    @Test
-    public void testClientPut() throws Exception {
-        String newTitleValue = "newTitleValueByPut";
-        String entryID = "urn:uuid:customer-0";
-        System.out.println("Before clientPut");
-        testService.clientPut(entryID, newTitleValue);
-        System.out.println("After clientPut");
-        Entry updatedEntry = testService.clientGetEntry(entryID);
-        System.out.println("title: "+ updatedEntry.getTitle().getPlainText());
-        assertEquals(newTitleValue, updatedEntry.getTitle().getPlainText());
-    }
-    
-
-
-    @Test
-    public void testClientDelete() throws Exception {
-
-        // We first create a new entry, then delete it
-
-        // Post a new entry
-        Entry newEntry = new Entry();
-        newEntry.setTitle(new PlainTextConstruct("NewEntry title to be deleted"));
-        newEntry.setContent(new PlainTextConstruct("NewEntry Content to be delted"));
-        Entry confirmedNewEntry = testService.clientPost(newEntry);
-
-        Thread.sleep(300);
-       
-        Feed feed00 = testService.clientGetFeed();
-        int entryNum00 = feed00.getEntries().size(); // The number of entries
-                                                        // before deleting
-        System.out.println("entryNum00:" + entryNum00);
-                
-        // Delete this newly created entry
-        String entryID = confirmedNewEntry.getId();
-        Thread.sleep(300);
-        
-        System.out.println("confirmed entry ID: " + confirmedNewEntry.getId());
-        System.out.println("confirmed entry title: " + confirmedNewEntry.getTitle().getPlainText());
-        
-        System.out.println("Before test clientDelete");
-        testService.clientDelete(entryID);
-        System.out.println("After test clientDelete");
-        
-        Feed feed01 = testService.clientGetFeed();
-        int entryNum01 = feed01.getEntries().size();
-        System.out.println("entryNum01:" + entryNum01); // The number of entries after deleting
-        
-        //assertEquals(1, entryNum00 - entryNum01);
-    }
-    
-
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java b/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
deleted file mode 100644
index 7aa0a8961c..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
+++ /dev/null
@@ -1,40 +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.binding.gdata;
-
-import com.google.gdata.client.Query;
-import com.google.gdata.data.Entry;
-import com.google.gdata.data.Feed;
-
-public interface CustomerClient {
-
-    Feed clientGetFeed() throws Exception;
-
-    Entry clientGetEntry(String entryID) throws Exception;
-    
-    Entry clientPost(Entry entry) throws Exception;
-    
-    void clientDelete(String entryID) throws Exception;
-    
-    void clientPut(String entryID, String newTitle) throws Exception;
-    
-    Feed clientQuery(Query query) throws Exception;
-
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java b/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
deleted file mode 100644
index 488bfa0f71..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
+++ /dev/null
@@ -1,123 +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.binding.gdata;
-
-import com.google.gdata.client.Query;
-import com.google.gdata.data.Feed;
-import com.google.gdata.data.Entry;
-import com.google.gdata.data.PlainTextConstruct;
-
-import org.apache.tuscany.sca.binding.gdata.collection.Collection;
-import org.apache.tuscany.sca.binding.gdata.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Reference;
-
-public class CustomerClientImpl implements CustomerClient {
-
-    @Reference
-    public Collection resourceCollection;
-
-    // Call Collection.getFeed()
-    public Feed clientGetFeed() throws Exception {
-        // Get all the entries from the provider, return in a single feed
-        System.out.println(">>> get the feed from the provider service");
-        Feed feed = resourceCollection.getFeed();
-        System.out.println("\n\n!!! Fetched feed title:  " + feed.getTitle().getPlainText());
-        int i = 0;
-        for (Object o : feed.getEntries()) {
-            com.google.gdata.data.Entry e = (com.google.gdata.data.Entry)o;
-            System.out.print("Entry" + i + "\t");
-            System.out.println(" id = " + e.getId() + "\t title = " + e.getTitle().getPlainText());
-            i++;
-        }
-        return feed;
-    }
-        
-    
-    // Call Collection.get(entryID)
-    public Entry clientGetEntry(String entryID) throws Exception {
-        // Get an existing entry based on its id
-        System.out.println(">>> get an existing entry from the provider service");
-        Entry entry = resourceCollection.get(entryID);
-        System.out.println("\n\n!!! Entry retrieved with id=" + entry.getId()
-            + " title="
-            + entry.getTitle().getPlainText());
-        return entry;
-    }
-
-       
-    // Call Collection.post(newEntry)
-    public Entry clientPost(Entry newEntry) throws Exception {
-        // Put a new entry to the provider
-        System.out.println(">>> post a new entry to the provider service");
-        Entry confirmedNewEntry = resourceCollection.post(newEntry);
-        System.out.println("!!! New entry posted with id=" + confirmedNewEntry.getId()
-            + " title="
-            + confirmedNewEntry.getTitle().getPlainText());        
-        System.out.println("\n");
-        return confirmedNewEntry;
-    }
-
-    
-    // Call Collection.delete(newEntry)
-    public void clientDelete(String entryID) throws Exception {
-        // Put a new entry to the provider
-        System.out.println(">>> delete an existing entry from the provider service");
-        System.out.println(">>> delete id=" + "urn:uuid:customer-1");
-        resourceCollection.delete(entryID);
-        System.out.println("!!! entry with id" + entryID);
-        System.out.println("\n");
-    }
-    
-    
-    
-    // Call Collection.put(entry, updatedTitle)
-    public void clientPut(String entryID, String newTitle) throws Exception {
-
-        System.out.println("clientPut");
-        // Put a new entry to the provider
-        System.out.println(">>> put id=" + entryID + " title=" + newTitle);
-        Entry entry = resourceCollection.get(entryID);
-        
-        //change the title of this entry
-        entry.setTitle(new PlainTextConstruct(newTitle));
-        resourceCollection.put(entryID, entry);
-        System.out.println("!!! Updated entry with id=" + entry.getId() + " title=" + entry.getTitle());
-        System.out.println("\n");
-    }
-
-    
-
-    // Call Collection.getFeed()
-    public Feed clientQuery(Query query) throws Exception {
-        // Get all the entries from the provider, return in a single feed
-        System.out.println(">>> query the service");
-        Feed feed = resourceCollection.query(query);
-        System.out.println("\n\n!!! Query result feed title:  " + feed.getTitle().getPlainText());
-        int i = 0;
-        for (Object o : feed.getEntries()) {
-            com.google.gdata.data.Entry e = (com.google.gdata.data.Entry)o;
-            System.out.print("Entry" + i + "\t");
-            System.out.println(" id = " + e.getId() + "\t title = " + e.getTitle().getPlainText());
-            i++;
-        }
-        return feed;
-    }
-   
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java b/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
deleted file mode 100644
index e283b6e023..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
+++ /dev/null
@@ -1,143 +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.binding.gdata;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import com.google.gdata.client.Query;
-import com.google.gdata.data.DateTime;
-import com.google.gdata.data.Entry;
-import com.google.gdata.data.Feed;
-import com.google.gdata.data.Link;
-import com.google.gdata.data.PlainTextConstruct;
-
-import org.apache.tuscany.sca.binding.gdata.collection.Collection;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class CustomerCollectionImpl implements Collection {
-
-
-    private Map<String, Entry> entries = new HashMap<String, Entry>();
-
-    /**
-     * Default constructor that initializes collection with couple customer
-     * entries
-     */
-    public CustomerCollectionImpl() {
-
-        for (int i = 0; i < 4; i++) {
-            // id is supposed to be generated in a random way, but for the
-            // purpose of testing, we just make them as static ids  
-        	
-            // String id = "urn:uuid:customer-" + UUID.randomUUID().toString();
-
-            String id = "urn:uuid:customer-" + String.valueOf(i);
-            Entry entry = new Entry();
-            entry.setId(id);
-            entry.setTitle(new PlainTextConstruct("EntryTitle_" + i));
-            entry.setContent(new PlainTextConstruct("content_" + i));
-            entry.setUpdated(DateTime.now());
-            // FIXME: The following three lines of code need to be fixed to add
-            // HTML links.            
-            Link link = new Link();
-            link.setType(Link.Type.ATOM);
-            link.setRel(Link.Rel.ENTRY_EDIT);
-            link.setHref("http://localhost:8084/customer"  + "/" +  id);        
-            entry.getLinks().add(link);
-            
-            // entry.addHtmlLink(""+id, "", "edit");
-            // entry.addHtmlLink(""+id, "", "alternate");
-            entries.put(id, entry);
-            System.out.println(">>> id=" + id);
-        }
-    }
-
-    public Entry post(Entry entry) {
-        System.out.println(">>> ResourceCollectionImpl.post entry=" + entry.getTitle());
-
-        String id = "urn:uuid:customer-" + UUID.randomUUID().toString();
-        entry.setId(id);
-
-        Link link = new Link();
-        link.setType(Link.Type.ATOM);
-        link.setRel(Link.Rel.ENTRY_EDIT);
-        link.setHref("http://localhost:8084/customer"  + "/" +  id);        
-        entry.getLinks().add(link);
-        
-        //entry.addLink("" + id, "edit"); entry.addLink("" + id, "alternate");
-        entry.setUpdated(DateTime.now());
-        
-        // entry.addHtmlLink("http://www.google.com", "languageType", "edit");
-        // entry.addHtmlLink("http://www.google.com", "languageType",
-        // "alternate");
-
-        entries.put(id, entry);
-        System.out.println(">>> ResourceCollectionImpl.post return id=" + id);
-        return entry;
-    }
-
-    public Entry get(String id) {
-        System.out.println(">>> ResourceCollectionImpl.get id= " + id);
-        return entries.get(id);
-    }
-
-    public void put(String id, Entry entry) {
-        System.out.println(">>> ResourceCollectionImpl.put id=" + id + " entry=" + entry.getTitle().getPlainText());
-        entry.setUpdated(DateTime.now());
-        entries.put(id, entry);
-    }
-    
-
-    public void delete(String id) {
-        System.out.println(">>> ResourceCollectionImpl.delete id=" + id);
-        entries.remove(id);
-    }
-
-    
-    public Feed getFeed() {
-        System.out.println(">>> ResourceCollectionImpl.get collection");
-        
-        Feed feed = new Feed();
-        feed.setTitle(new PlainTextConstruct("Feedtitle(LocalHostServlet)"));
-        feed.setSubtitle(new PlainTextConstruct("Subtitle: This is a sample feed"));
-        feed.setUpdated(DateTime.now());
-        // FIXME: The following two lines of code need to be fixed
-        // feed.addHtmlLink("", "", "");
-        // feed.addHtmlLink("", "languageType", "self");
-        ArrayList<Entry> entryList = new ArrayList<Entry>();
-        for (Entry entry : entries.values()) {
-            entryList.add(entry);
-        }
-        feed.setEntries(entryList);
-
-        return feed;
-    }
-
-    //FIXME: need to be modified 
-    public Feed query(Query query) {
-        System.out.println(">>> ResourceCollectionImpl.query collection ");
-        return getFeed();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java b/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
deleted file mode 100644
index 902d251200..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
+++ /dev/null
@@ -1,156 +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.binding.gdata;
-
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.gdata.client.Query;
-import com.google.gdata.data.DateTime;
-import com.google.gdata.data.Entry;
-import com.google.gdata.data.Feed;
-import com.google.gdata.data.PlainTextConstruct;
-
-public class GoogleBloggerServiceTestCase extends TestCase{
-
-    private Node consumerNode = null;
-    private CustomerClient testService = null;    
-    
-    public GoogleBloggerServiceTestCase(){
-    }
-    
-    @Before
-    @Override
-    public void setUp() throws Exception {
-        System.out.println("Method Test Start-----------------------------------------------------------------------");
-        
-        //Initialize the GData client service (Reference Binding test)
-        String contribution = ContributionLocationHelper.getContributionLocation(GoogleBloggerServiceTestCase.class);
-        consumerNode = NodeFactory.newInstance().createNode(
-                                                     "org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite", new Contribution("consumer", contribution));
-        consumerNode.start();
-        testService = consumerNode.getService(CustomerClient.class, "CustomerClient");  
-    }
-
-    @After
-    @Override
-    public void tearDown(){
-        System.out.println("Method Test End------------------------------------------------------------------------");
-        System.out.println("\n\n");
-        consumerNode.stop();
-        consumerNode.destroy();
-    }        
-    
-    @Test
-    public void testClientGetFeed() throws Exception {
-        Feed feed = testService.clientGetFeed();
-        System.out.println("feed title: " + feed.getTitle().getPlainText());        
-        assertEquals("gdata binding tuscany test", feed.getTitle().getPlainText());
-     }
-    
-    
-    @Test
-    public void testClientGetEntry() throws Exception {
-        String entryID = "8308734583601887890";
-        Entry blogEntry = testService.clientGetEntry(entryID);
-        System.out.println("Entry ID: " + blogEntry.getId());
-        assertTrue(blogEntry.getId().endsWith(entryID));
-        System.out.println("------------------------------------------------------------\n\n");
-    }
-    
-    
-    @Test
-    public void testClientPut() throws Exception {  
-        String entryID = "2889832689497686762";          
-        String newBlogEntryTitle = "updatedTitleByTestCase2";
-        testService.clientPut(entryID, newBlogEntryTitle);      //update the title
-        Thread.sleep(300);            
-        Entry updatedEntry = testService.clientGetEntry(entryID);         
-        assertEquals(newBlogEntryTitle, updatedEntry.getTitle().getPlainText());
-    }
-    
-    
-
-    @Test
-    public void testClientPost() throws Exception {
-        String blogEntryTitle = "titleByBloogerTestcase000";
-        Entry newEntry = new Entry();
-        newEntry.setTitle(new PlainTextConstruct(blogEntryTitle));
-        newEntry.setContent(new PlainTextConstruct("contentByBloggerTestCase000"));
-        Entry postedEntry = testService.clientPost(newEntry);        
-        assertEquals(blogEntryTitle, postedEntry.getTitle().getPlainText());
-    }
-
-    
-    @Test
-    public void testClientDelete() throws Exception {
-        
-        //This test case might fail
-        //because Google blogger service has limitation on new posts allowed everyday/every hour?
-        
-        System.out.println("testClientDelete");
-        //We create a new post, and then delete it
-        Entry newEntry = new Entry();
-        newEntry.setTitle(new PlainTextConstruct("blogEntryShouldNotApear"));
-        newEntry.setContent(new PlainTextConstruct("contentByBloggerShouldNotAppear"));
-        Entry postedEntry = testService.clientPost(newEntry);
-        Thread.sleep(300);        
-        int idStartPosition = postedEntry.getId().lastIndexOf("-");
-        String postedEntryID = postedEntry.getId().substring(idStartPosition+1);        
-        System.out.println("postedEntryID: " + postedEntryID );
-        
-        //Before deletion
-        Entry entry00 = testService.clientGetEntry(postedEntryID);
-        System.out.println("Before Deleteion: " + entry00.getId());
-        
-        //Delete this entry
-        testService.clientDelete(postedEntryID);
-
-        //Worked: this newly posted entry did not appear in the blogspot website,
-        //But we need a Junit assertion here
-        //Link:  http://haibotuscany.blogspot.com/feeds/posts/default/
-        //FIXME: Need an assertion here
-        //Assert(....);
-    }
-    
-    
-    @Test
-    public void testClientQuery() throws Exception {
-        Query myQuery = new Query(new URL("http://haibotuscany.blogspot.com/feeds/posts/default"));
-        myQuery.setMaxResults(100);
-        //myQuery.setUpdatedMin(startTime);
-        myQuery.setUpdatedMax(DateTime.now());
-        Feed resultFeed = testService.clientQuery(myQuery);        
-        System.out.println("Query result feed title: " + resultFeed.getTitle().getPlainText());    
-        System.out.println("Query result entry number: "+ resultFeed.getEntries().size());
-        //assertEquals("gdata binding tuscany test", resultFeed.getTitle().getPlainText());
-     }
-
-
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java b/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
deleted file mode 100644
index 749dd41710..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
+++ /dev/null
@@ -1,164 +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.binding.gdata;
-
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.gdata.client.Query;
-import com.google.gdata.data.DateTime;
-import com.google.gdata.data.Entry;
-import com.google.gdata.data.Feed;
-import com.google.gdata.data.PlainTextConstruct;
-
-public class GoogleCalendarServiceTestCase extends TestCase{
-
-    private Node consumerNode = null;
-    private CustomerClient testService = null;    
-    
-    public GoogleCalendarServiceTestCase(){
-    }
-    
-    @Before
-    @Override
-    public void setUp() throws Exception {
-        System.out.println("Method Test Start-----------------------------------------------------------------------");
-        
-        //Initialize the GData client service (Reference Binding test)
-        String contribution = ContributionLocationHelper.getContributionLocation(GoogleCalendarServiceTestCase.class);
-        consumerNode = NodeFactory.newInstance().createNode(
-                                                     "org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite", new Contribution("consumer", contribution));
-        consumerNode.start();
-        testService = consumerNode.getService(CustomerClient.class, "CustomerClient");  
-    }
-
-    @After
-    @Override
-    public void tearDown(){
-        System.out.println("Method Test End------------------------------------------------------------------------");
-        System.out.println("\n\n");
-        consumerNode.stop();
-        consumerNode.destroy();
-    }        
-    
-    @Test
-    public void testClientGetFeed() throws Exception {
-        Feed feed = testService.clientGetFeed();
-        System.out.println("feed title: " + feed.getTitle().getPlainText());        
-        assertEquals("gsoc gosc", feed.getTitle().getPlainText());
-     }
-    
-    
-    @Test
-    public void testClientGetEntry() throws Exception {
-        String entryID = "1c76lcl70jg9r0fm18rcbneea8";
-        Entry blogEntry = testService.clientGetEntry(entryID);
-        System.out.println("Entry ID: " + blogEntry.getId());
-        assertTrue(blogEntry.getId().endsWith(entryID));
-        System.out.println("------------------------------------------------------------\n\n");
-    }
-    
-    
-    @Test
-    public void testClientPut() throws Exception {  
-        String entryID = "1c76lcl70jg9r0fm18rcbneea8";          
-        String newBlogEntryTitle = "updatedTitleByGoogleContactsConsumerTestCase";
-        testService.clientPut(entryID, newBlogEntryTitle);      //update the title
-        Thread.sleep(300);            
-        Entry updatedEntry = testService.clientGetEntry(entryID);         
-        assertEquals(newBlogEntryTitle, updatedEntry.getTitle().getPlainText());
-    }
-    
-    
-
-    @Test
-    public void testClientPost() throws Exception {
-        String blogEntryTitle = "titleByGoogleCalendarTestcase";
-        Entry newEntry = new Entry();
-        newEntry.setTitle(new PlainTextConstruct(blogEntryTitle));
-        newEntry.setContent(new PlainTextConstruct("contentByGoogleCalendarTestCase"));
-        Entry postedEntry = testService.clientPost(newEntry);        
-        assertEquals(blogEntryTitle, postedEntry.getTitle().getPlainText());
-    }
-
-    
-    @Test
-    public void testClientDelete() throws Exception {
-        
-        //This test case might fail
-        //because Google blogger service has limitation on new posts allowed everyday/every hour?
-        
-        System.out.println("testClientDelete");
-        //We create a new post, and then delete it
-        Entry newEntry = new Entry();
-        newEntry.setTitle(new PlainTextConstruct("calendarEntryShouldNotApear"));
-        newEntry.setContent(new PlainTextConstruct("calendarByBloggerShouldNotAppear"));
-        Entry postedEntry = testService.clientPost(newEntry);
-        Thread.sleep(300); 
-        
-        System.out.println("ID: " + postedEntry.getId());
-        
-        int idStartPosition = postedEntry.getId().lastIndexOf("/");
-        String postedEntryID = postedEntry.getId().substring(idStartPosition+1);        
-        System.out.println("postedEntryID: " + postedEntryID );
-        
-        //Before deletion
-        Entry entry00 = testService.clientGetEntry(postedEntryID);
-        System.out.println("Before Deleteion: " + entry00.getId());
-        
-        //Delete this entry
-        testService.clientDelete(postedEntryID);
-
-        //Worked: this newly posted entry did not appear in the contact list
-        //But we need a Junit assertion here
-        //Link:  http://haibotuscany.blogspot.com/feeds/posts/default/
-        //FIXME: Need an assertion here
-        //Assert(....);
-    }
-    
-    
-    @Test
-    public void testClientQuery() throws Exception {
-        Query myQuery = new Query(new URL("http://www.google.com/calendar/feeds/haibotuscany@gmail.com/private/full"));
-        myQuery.setMaxResults(100);
-        //myQuery.setUpdatedMin(startTime);
-        myQuery.setUpdatedMax(DateTime.now());
-        
-        //Google Calendar service supports full-text search
-        String queryString = "event0";
-        myQuery.setFullTextQuery(queryString);
-        
-        Feed resultFeed = testService.clientQuery(myQuery);        
-        System.out.println("Query result feed title: " + resultFeed.getTitle().getPlainText());    
-        System.out.println("Query result entry number: "+ resultFeed.getEntries().size());
-        //assertEquals("gdata binding tuscany test", resultFeed.getTitle().getPlainText());
-     }
-
-
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java b/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
deleted file mode 100644
index cab7196a69..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
+++ /dev/null
@@ -1,160 +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.binding.gdata;
-
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.gdata.client.Query;
-import com.google.gdata.data.DateTime;
-import com.google.gdata.data.Entry;
-import com.google.gdata.data.Feed;
-import com.google.gdata.data.PlainTextConstruct;
-
-public class GoogleContactsServiceTestCase extends TestCase{
-
-    private Node consumerNode = null;
-    private CustomerClient testService = null;    
-    
-    public GoogleContactsServiceTestCase(){
-
-    }
-    
-    @Before
-    @Override
-    public void setUp() throws Exception {
-        System.out.println("Method Test Start-----------------------------------------------------------------------");
-        
-        //Initialize the GData client service (Reference Binding test)
-        String contribution = ContributionLocationHelper.getContributionLocation(GoogleContactsServiceTestCase.class);
-        consumerNode = NodeFactory.newInstance().createNode(
-                                                     "org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite", new Contribution("consumer", contribution));
-        consumerNode.start();
-        testService = consumerNode.getService(CustomerClient.class, "CustomerClient");  
-    }
-
-    @After
-    @Override
-    public void tearDown(){
-        System.out.println("Method Test End------------------------------------------------------------------------");
-        System.out.println("\n\n");
-        consumerNode.stop();
-        consumerNode.destroy();
-    }        
-    
-    @Test
-    public void testClientGetFeed() throws Exception {
-        Feed feed = testService.clientGetFeed();
-        System.out.println("feed title: " + feed.getTitle().getPlainText());        
-        assertEquals("Haibo Zhao's Contacts", feed.getTitle().getPlainText());
-     }
-    
-    
-    @Test
-    public void testClientGetEntry() throws Exception {
-        String entryID = "12feeeb38ab87365";
-        Entry contactEntry = testService.clientGetEntry(entryID);
-        System.out.println("Entry ID: " + contactEntry.getId());
-        assertTrue(contactEntry.getId().endsWith(entryID));
-        System.out.println("------------------------------------------------------------\n\n");
-    }
-    
-    
-    @Test
-    public void testClientPut() throws Exception {  
-        String entryID = "12feeeb38ab87365";          
-        String newBlogEntryTitle = "updatedTitleByGoogleContactsConsumerTestCase";
-        testService.clientPut(entryID, newBlogEntryTitle);      //update the title
-        Thread.sleep(300);            
-        Entry updatedEntry = testService.clientGetEntry(entryID);         
-        assertEquals(newBlogEntryTitle, updatedEntry.getTitle().getPlainText());
-    }
-    
-    
-
-    @Test
-    public void testClientPost() throws Exception {
-        String blogEntryTitle = "titleByGoogleContactsTestcase";
-        Entry newEntry = new Entry();
-        newEntry.setTitle(new PlainTextConstruct(blogEntryTitle));
-        newEntry.setContent(new PlainTextConstruct("contentByGoogleContactsTestCase"));
-        Entry postedEntry = testService.clientPost(newEntry);        
-        assertEquals(blogEntryTitle, postedEntry.getTitle().getPlainText());
-    }
-
-    
-    @Test
-    public void testClientDelete() throws Exception {
-        
-        //This test case might fail
-        //because Google blogger service has limitation on new posts allowed everyday/every hour?
-        
-        System.out.println("testClientDelete");
-        //We create a new post, and then delete it
-        Entry newEntry = new Entry();
-        newEntry.setTitle(new PlainTextConstruct("contactEntryShouldNotApear"));
-        newEntry.setContent(new PlainTextConstruct("contactByBloggerShouldNotAppear"));
-        Entry postedEntry = testService.clientPost(newEntry);
-        Thread.sleep(300); 
-        
-        System.out.println("ID: " + postedEntry.getId());
-        
-        int idStartPosition = postedEntry.getId().lastIndexOf("/");
-        String postedEntryID = postedEntry.getId().substring(idStartPosition+1);        
-        System.out.println("postedEntryID: " + postedEntryID );
-        
-        //Before deletion
-        Entry entry00 = testService.clientGetEntry(postedEntryID);
-        System.out.println("Before Deleteion: " + entry00.getId());
-        
-        //Delete this entry
-        testService.clientDelete(postedEntryID);
-
-        //Worked: this newly posted entry did not appear in the contact list
-        //But we need a Junit assertion here
-        //Link:  http://haibotuscany.blogspot.com/feeds/posts/default/
-        //FIXME: Need an assertion here
-        //Assert(....);
-    }
-    
-    
-    @Test
-    public void testClientQuery() throws Exception {
-        Query myQuery = new Query(new URL("http://www.google.com/m8/feeds/contacts/default/base"));
-        myQuery.setMaxResults(100);
-        //myQuery.setUpdatedMin(startTime);
-        myQuery.setUpdatedMax(DateTime.now());
-        Feed resultFeed = testService.clientQuery(myQuery);        
-        System.out.println("Query result feed title: " + resultFeed.getTitle().getPlainText());    
-        System.out.println("Query result entry number: "+ resultFeed.getEntries().size());
-        //assertEquals("gdata binding tuscany test", resultFeed.getTitle().getPlainText());
-     }
-
-
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java b/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
deleted file mode 100644
index a9b12c3d32..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
+++ /dev/null
@@ -1,48 +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.binding.gdata;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-public class Provider {
-
-    public static void main(String[] args) {
-
-        String contribution = ContributionLocationHelper.getContributionLocation(Provider.class);
-        Node node = NodeFactory.newInstance().createNode(
-                                                     "org/apache/tuscany/sca/binding/gdata/Provider.composite", new Contribution("provider", contribution));
-        node.start();
-        System.out.println("Provider.composite ready...");
-
-        try {
-            System.in.read();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        node.stop();
-        node.destroy();
-    }
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java b/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
deleted file mode 100644
index 141f641575..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
+++ /dev/null
@@ -1,48 +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.binding.gdata;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-public class StartLocalhostServlet {
-
-    public static void main(String[] args) {
-
-        String contribution = ContributionLocationHelper.getContributionLocation(Provider.class);
-        Node node = NodeFactory.newInstance().createNode(
-                                                     "org/apache/tuscany/sca/binding/gdata/Provider.composite", new Contribution("provider", contribution));
-        node.start();
-        System.out.println("Provider.composite ready...");
-
-        try {
-            System.in.read();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        node.stop();
-        node.destroy();
-    }
-}
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/log4j.properties b/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/log4j.properties
deleted file mode 100644
index 33eaf11c1f..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,25 +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.
-#
-
-# Set root logger level to WARN and its only appender to CONSOLE
-log4j.rootLogger=INFO, CONSOLE
-
-
-# Console appender
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %x - %m\n
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite b/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
deleted file mode 100644
index a7941a2056..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
+++ /dev/null
@@ -1,32 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	   targetNamespace="http://customer"
-	   name="Consumer">
-    
-    <component name="CustomerClient">
-        <implementation.java class="org.apache.tuscany.sca.binding.gdata.CustomerClientImpl"/>
-        <reference name="resourceCollection">
-        	<tuscany:binding.gdata uri="http://localhost:8084/customer" serviceType="localServiceBinding" username="admin" password="admin"/>
-        </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite b/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
deleted file mode 100644
index 078873c44f..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
+++ /dev/null
@@ -1,32 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	   targetNamespace="http://customer"
-	   name="Consumer">
-    
-    <component name="CustomerClient">
-        <implementation.java class="org.apache.tuscany.sca.binding.gdata.CustomerClientImpl"/>
-        <reference name="resourceCollection">
-        	<tuscany:binding.gdata uri="http://haibotuscany.blogspot.com/feeds/posts/default" serviceType="blogger" username="haibotuscany@gmail.com" password="gsocgsocgsoc"/>
-        </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite b/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
deleted file mode 100644
index 7e0c925482..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
+++ /dev/null
@@ -1,32 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	   targetNamespace="http://customer"
-	   name="Consumer">
-    
-    <component name="CustomerClient">
-        <implementation.java class="org.apache.tuscany.sca.binding.gdata.CustomerClientImpl"/>
-        <reference name="resourceCollection">
-        	<tuscany:binding.gdata uri="http://www.google.com/calendar/feeds/haibotuscany@gmail.com/private/full" serviceType="cl" username="haibotuscany@gmail.com" password="gsocgsocgsoc"/>
-        </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite b/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
deleted file mode 100644
index bc1ea7a8a9..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
+++ /dev/null
@@ -1,32 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	   targetNamespace="http://customer"
-	   name="Consumer">
-    
-    <component name="CustomerClient">
-        <implementation.java class="org.apache.tuscany.sca.binding.gdata.CustomerClientImpl"/>
-        <reference name="resourceCollection">
-        	<tuscany:binding.gdata uri="http://www.google.com/m8/feeds/contacts/default/base" serviceType="cp" username="haibotuscany@gmail.com" password="gsocgsocgsoc"/>
-        </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite b/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
deleted file mode 100644
index a4cf00dc84..0000000000
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	   targetNamespace = "http://customer"
-	   name="Provider">
-
-	<service name="customer" promote="CustomerCollection">
-		<tuscany:binding.gdata uri = "http://localhost:8084/customer"/>
-	</service>
-	
-    <component name="CustomerCollection">
-        <implementation.java class="org.apache.tuscany.sca.binding.gdata.CustomerCollectionImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/binding-gdata/LICENSE b/java/sca-contrib/modules/binding-gdata/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/java/sca-contrib/modules/binding-gdata/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/java/sca-contrib/modules/binding-gdata/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-gdata/META-INF/MANIFEST.MF
deleted file mode 100644
index 6d5d52037e..0000000000
--- a/java/sca-contrib/modules/binding-gdata/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.gdata;uses:="org.apache

- .tuscany.sca.assembly";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.binding.gdata.impl;version="1.

- 4",org.apache.tuscany.sca.binding.gdata.xml;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Gdata Binding Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397266640

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Gdata Binding Extension

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.assembly;version="2.0.0",org.apache.tuscany.sca.binding.gdata;ver

- sion="1.4",org.apache.tuscany.sca.contribution.processor;version="1.4

- ",org.apache.tuscany.sca.contribution.resolver;version="2.0.0",org.apac

- he.tuscany.sca.core;version="2.0.0",org.apache.tuscany.sca.policy;versi

- on="1.4"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.gdata

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-gdata/NOTICE b/java/sca-contrib/modules/binding-gdata/NOTICE
deleted file mode 100644
index 841fb69681..0000000000
--- a/java/sca-contrib/modules/binding-gdata/NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-
-
diff --git a/java/sca-contrib/modules/binding-gdata/pom.xml b/java/sca-contrib/modules/binding-gdata/pom.xml
deleted file mode 100644
index 299e24e619..0000000000
--- a/java/sca-contrib/modules/binding-gdata/pom.xml
+++ /dev/null
@@ -1,60 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-gdata</artifactId>
-    <name>Apache Tuscany SCA Gdata Binding Extension</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java b/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
deleted file mode 100644
index a3a0b834cd..0000000000
--- a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
+++ /dev/null
@@ -1,78 +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.binding.gdata;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-/**
- * Gdata binding model.
- * 
- * @version $Rev$ $Date$
- */
-public interface GdataBinding extends Binding {
-    
-    /**
-     * Returns the title of the GData collection.
-     * @return
-     */
-    String getTitle();
-    
-    /**
-     * Sets the title of the GData collection.
-     * @param title
-     */
-    void setTitle(String title);
-    
-    /**
-     * Returns the username to be used when authenticating with GData Services
-     * @return
-     */
-    String getUsername();    
-    
-    /**
-     * Sets the username to be used when authenticating with GData Services
-     * @param username
-     */
-    void setUsername(String username);
-    
-    /**
-     * Returns the password to be used when authenticating with GData Services
-     * @return
-     */
-    String getPassword();  
-    
-    /**
-     * Sets the password to be used when authenticating with GData Services
-     * @param password
-     */
-    void setPassword(String password);   
-    
-    /**
-     * Returns the type os service being used
-     * @return
-     */
-    String getServiceType();
-    
-    /**
-     * Sets the type of service being used
-     * @param serviceType
-     */
-    void setServiceType(String serviceType);  
-}
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java b/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
deleted file mode 100644
index 5cfc688dcb..0000000000
--- a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
+++ /dev/null
@@ -1,35 +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.binding.gdata;
-
-/**
- * Factory for the GData binding
- *
- * @version $Rev$ $Date$
- */
-public interface GdataBindingFactory {
-
-    /**
-     * Creates a new GData binding.
-     * @return the new GData binding
-     */
-    GdataBinding createGdataBinding();
-
-}
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java b/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
deleted file mode 100644
index 87f3597248..0000000000
--- a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.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 org.apache.tuscany.sca.binding.gdata.impl;
-
-import org.apache.tuscany.sca.binding.gdata.GdataBinding;
-import org.apache.tuscany.sca.binding.gdata.GdataBindingFactory;
-
-/**
- * Factory for the GData binding model.
- *
- * @version $Rev$ $Date$
- */
-public class GdataBindingFactoryImpl implements GdataBindingFactory {
-
-    public GdataBinding createGdataBinding() {
-        return new GdataBindingImpl();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java b/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
deleted file mode 100644
index 409fd497ac..0000000000
--- a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
+++ /dev/null
@@ -1,141 +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.binding.gdata.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.gdata.GdataBinding;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * Implementation of the GData binding model.
- *
- * @version $Rev$ $Date$
- */
-class GdataBindingImpl implements GdataBinding, PolicySetAttachPoint {
-
-    private String name;
-    private String uri;
-    private String title;
-    private String username;
-    private String password;
-    private String serviceType;
-    
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private IntentAttachPointType intentAttachPointType;
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-
-    public String getName() {
-        return name;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-    
-    public String getTitle() {
-        return title;
-    }
-    
-    public String getUsername(){
-        return username;
-    }
-    
-    public String getPassword(){
-        return password;
-    }
-    
-    public String getServiceType(){
-        return serviceType;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-    
-    public void setUsername(String username) {
-        this.username = username;
-    }
-    
-    public void setPassword(String password) {
-        this.password = password;
-    }
-    
-    public void setServiceType(String serviceType) {
-        this.serviceType = serviceType;
-    }
-
-    public boolean isUnresolved() {
-        // The binding is always resolved
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // The binding is always resolved
-    }
-
-    //Policy related getters/setters
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-    
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-    
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public IntentAttachPointType getType() {
-        return intentAttachPointType;
-    }
-    
-    public void setType(IntentAttachPointType intentAttachPointType) {
-        this.intentAttachPointType = intentAttachPointType;
-    }
-
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-    
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java b/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java
deleted file mode 100644
index 660b96243e..0000000000
--- a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java
+++ /dev/null
@@ -1,121 +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.binding.gdata.xml;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.binding.gdata.GdataBinding;
-import org.apache.tuscany.sca.binding.gdata.GdataBindingFactory;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-
-/**
- * A processor for <binding.gdata> elements.
- * 
- * @version $Rev$ $Date$
- */
-public class GdataBindingProcessor implements StAXArtifactProcessor<GdataBinding> {
-
-    private QName BINDING_GDATA = new QName("http://tuscany.apache.org/xmlns/sca/1.0", "binding.gdata");
-    
-    private final GdataBindingFactory factory;
-    
-    public GdataBindingProcessor(FactoryExtensionPoint modelFactories) {
-        this.factory = modelFactories.getFactory(GdataBindingFactory.class);
-        System.out.println("[Debug Info]GdataBindingProcessor reached");
-    }
-
-    public QName getArtifactType() {
-        return BINDING_GDATA;
-    }
-
-    public Class<GdataBinding> getModelType() {
-        return GdataBinding.class;
-    }
-
-    public GdataBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        GdataBinding gdataBinding = factory.createGdataBinding();
-
-        String name = reader.getAttributeValue(null, "name");
-        if (name != null) {
-                gdataBinding.setName(name);
-        }
-
-        String uri = reader.getAttributeValue(null, "uri");
-        if (uri != null) {
-                gdataBinding.setURI(uri);
-        }
-
-        String serviceType = reader.getAttributeValue(null, "serviceType");
-        if (serviceType != null) {
-                gdataBinding.setServiceType(serviceType);
-        }
-
-        String username = reader.getAttributeValue(null, "username");
-        if (username != null) {
-                gdataBinding.setUsername(username);
-        }
-
-        String password = reader.getAttributeValue(null, "password");
-        if (password != null) {
-                gdataBinding.setPassword(password);
-        }        
-
-
-        return gdataBinding;
-    }
-    
-    public void write(GdataBinding gdataBinding, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        writer.writeStartElement(BINDING_GDATA.getNamespaceURI(), BINDING_GDATA.getLocalPart());
-
-        if (gdataBinding.getName() != null) {
-                writer.writeAttribute("name", gdataBinding.getName());
-        }
-
-        if (gdataBinding.getURI() != null) {
-                writer.writeAttribute("uri", gdataBinding.getURI());
-        }
-
-        if (gdataBinding.getServiceType() != null) {
-                writer.writeAttribute("serviceType", gdataBinding.getServiceType());
-        }
-
-        if (gdataBinding.getUsername() != null) {
-                writer.writeAttribute("username", gdataBinding.getUsername());
-        }
-
-        if (gdataBinding.getPassword() != null) {
-                writer.writeAttribute("password", gdataBinding.getPassword());
-        }
-
-        writer.writeEndElement();
-    }
-
-    
-    public void resolve(GdataBinding gdataBinding, ModelResolver resolver) throws ContributionResolveException {
-
-    }
-}
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory b/java/sca-contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
deleted file mode 100644
index 21688a62a6..0000000000
--- a/java/sca-contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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. 
-
-# Implementation class for the model factory
-org.apache.tuscany.sca.binding.gdata.impl.GdataBindingFactoryImpl
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index e7c37c44fe..0000000000
--- a/java/sca-contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.gdata.xml.GdataBindingProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.gdata,model=org.apache.tuscany.sca.binding.gdata.GdataBinding,factory=org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-http-runtime/LICENSE b/java/sca-contrib/modules/binding-http-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/binding-http-runtime/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-http-runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 38d5bca016..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.binding.http.provider;version=

- "1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA HTTP Binding Runtime

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397277718

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA HTTP Binding Runtime

-Import-Package: javax.servlet,

- javax.servlet.http,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.binding.http;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.host.http;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.policy.authentication.basic;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.http.runtime

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-http-runtime/NOTICE b/java/sca-contrib/modules/binding-http-runtime/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/binding-http-runtime/pom.xml b/java/sca-contrib/modules/binding-http-runtime/pom.xml
deleted file mode 100644
index c78837d5cb..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/pom.xml
+++ /dev/null
@@ -1,100 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-http-runtime</artifactId>
-    <name>Apache Tuscany SCA HTTP Binding Runtime</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java b/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
deleted file mode 100644
index 084f52026f..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
+++ /dev/null
@@ -1,516 +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.binding.http.provider;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.OutputStream;

-import java.net.URLDecoder;

-import java.text.ParseException;

-import java.util.List;

-

-import javax.servlet.ServletException;

-import javax.servlet.ServletResponse;

-import javax.servlet.http.HttpServlet;

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.assembly.Binding;

-import org.apache.tuscany.sca.binding.http.HTTPCacheContext;

-import org.apache.tuscany.sca.binding.http.util.HTTPHeadersParser;

-import org.apache.tuscany.sca.invocation.Invoker;

-import org.apache.tuscany.sca.invocation.Message;

-import org.apache.tuscany.sca.invocation.MessageFactory;

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.PolicySet;

-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;

-import org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicy;

-

-/**

- * Servlet responsible for dispatching HTTP requests to the

- * target component implementation.

- *

- * @version $Rev$ $Date$

- */

-public class HTTPBindingListenerServlet extends HttpServlet {

-    private static final long serialVersionUID = 2865466417329430610L;

-    

-    private static final QName AUTEHTICATION_INTENT = new QName("http://www.osoa.org/xmlns/sca/1.0","authentication");

-    

-    transient private Binding binding;

-

-    transient private boolean requiresAuthentication = false;

-    transient private BasicAuthenticationPolicy basicAuthenticationPolicy = null;

-

-    private MessageFactory messageFactory;

-    private Invoker getInvoker;

-    private Invoker conditionalGetInvoker;

-    private Invoker putInvoker;

-    private Invoker conditionalPutInvoker;

-    private Invoker postInvoker;

-    private Invoker conditionalPostInvoker;

-    private Invoker deleteInvoker;

-    private Invoker conditionalDeleteInvoker;

-    

-    /**

-     * Constructs a new HTTPServiceListenerServlet.

-     */

-    public HTTPBindingListenerServlet(Binding binding, MessageFactory messageFactory) {

-        this.binding = binding;

-        this.messageFactory = messageFactory;

-        

-

-        // find out which policies are active

-        if (binding instanceof PolicySetAttachPoint) {

-            List<Intent> intents = ((PolicySetAttachPoint)binding).getRequiredIntents();

-            for(Intent intent : intents) {

-                if(intent.getName().equals(AUTEHTICATION_INTENT)) {

-                    requiresAuthentication = true;

-                }

-            }

-

-

-            List<PolicySet> policySets = ((PolicySetAttachPoint)binding).getApplicablePolicySets();

-            for (PolicySet ps : policySets) {

-                for (Object p : ps.getPolicies()) {

-                    if (BasicAuthenticationPolicy.class.isInstance(p)) {

-                        basicAuthenticationPolicy = (BasicAuthenticationPolicy)p;

-                    } else {

-                        // etc. check for other types of policy being present

-                    }

-                }

-            }

-        }        

-    }

-

-    

-    @Override

-    protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

-

-        if(requiresAuthentication) {

-            if(! hasAuthenticationHeader(request, response)) {

-                response.setHeader("WWW-Authenticate", "BASIC realm=\"Tuscany\"");

-                response.sendError(HttpServletResponse.SC_UNAUTHORIZED);

-            }

-        }

-        

-        super.service(request, response);

-    }    

-    

-    @Override

-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

-        // Get the request path

-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");

-        if (path.length() ==0) {            

-            // Redirect to a URL ending with / to make relative hrefs work

-            // relative to the served resource.

-            response.sendRedirect(request.getRequestURL().append('/').toString());

-            return;

-        }

-

-        // Invoke the get operation on the service implementation

-        Message requestMessage = messageFactory.createMessage();

-

-        //store http headers to message

-        requestMessage.getHeaders().addAll(HTTPHeadersParser.getHeaders(request));

-        

-        String id = path.substring(1);

-        

-        Message responseMessage = null;

-        HTTPCacheContext cacheContext = null;

-        try { 

-           cacheContext = HTTPCacheContext.getCacheContextFromRequest(request);

-        } catch (ParseException e) {        	

-        }

-

-        // Route message based on availability of cache info and cache methods

-        if (( cacheContext != null ) && (cacheContext.isEnabled()) && (conditionalGetInvoker != null )) {        

-        	requestMessage.setBody(new Object[] {id, cacheContext});

-        	responseMessage = conditionalGetInvoker.invoke(requestMessage);

-        } else {

-        	requestMessage.setBody(new Object[] {id});

-        	responseMessage = getInvoker.invoke(requestMessage);

-        }

-        if (responseMessage.isFault()) {

-        	Object body = responseMessage.getBody();

-        	

-        	int index = -1;

-        	if ( -1 < (index = body.getClass().getName().indexOf( "NotModifiedException")) ) {

-        		if ( index > -1 ) 

-            		response.sendError( HttpServletResponse.SC_NOT_MODIFIED, body.toString().substring( index ));

-        		else

-            		response.sendError( HttpServletResponse.SC_NOT_MODIFIED );

-        		return;

-        	} else if ( -1 < (index = body.getClass().getName().indexOf( "PreconditionFailedException")) ) {

-        		if ( index > -1 ) 

-            		response.sendError( HttpServletResponse.SC_PRECONDITION_FAILED, body.toString().substring( index ));

-        		else

-            		response.sendError( HttpServletResponse.SC_PRECONDITION_FAILED );

-        		return;            		

-            }

-        		        	

-            throw new ServletException((Throwable)responseMessage.getBody());

-        }

-        

-        // Write the response from the service implementation to the response

-        // output stream

-        InputStream is = (InputStream)responseMessage.getBody();

-        OutputStream os = response.getOutputStream(); 

-        byte[] buffer = new byte[2048];

-        for (;;) {

-            int n = is.read(buffer);

-            if (n <= 0)

-                break;

-            os.write(buffer, 0, n);

-        }

-        os.flush();

-        os.close();        

-    }

-

-    @Override

-    protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

-        // Get the request path

-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");

-        if (path.length() ==0) {            

-            // Redirect to a URL ending with / to make relative hrefs work

-            // relative to the served resource.

-            response.sendRedirect(request.getRequestURL().append('/').toString());

-            return;

-        }

-

-        // Invoke the get operation on the service implementation

-        Message requestMessage = messageFactory.createMessage();

-        String id = path.substring(1);

-        

-        Message responseMessage = null;

-        HTTPCacheContext cacheContext = null;

-        try { 

-           cacheContext = HTTPCacheContext.getCacheContextFromRequest(request);

-        } catch (ParseException e) {        	

-        }

-        

-        // Route message based on availability of cache info and cache methods

-        if (( cacheContext != null ) && (cacheContext.isEnabled()) && (conditionalDeleteInvoker != null )) {        

-        	requestMessage.setBody(new Object[] {id, cacheContext});

-        	responseMessage = conditionalDeleteInvoker.invoke(requestMessage);

-        } else {

-        	requestMessage.setBody(new Object[] {id});

-        	responseMessage = deleteInvoker.invoke(requestMessage);

-        }

-        if (responseMessage.isFault()) {

-        	Object body = responseMessage.getBody();

-        	

-        	int index = -1;

-        	if ( -1 < (index = body.getClass().getName().indexOf( "NotModifiedException")) ) {

-        		if ( index > -1 ) 

-            		response.sendError( HttpServletResponse.SC_NOT_MODIFIED, body.toString().substring( index ));

-        		else

-            		response.sendError( HttpServletResponse.SC_NOT_MODIFIED );

-        		return;

-        	} else if ( -1 < (index = body.getClass().getName().indexOf( "PreconditionFailedException")) ) {

-        		if ( index > -1 ) 

-            		response.sendError( HttpServletResponse.SC_PRECONDITION_FAILED, body.toString().substring( index ));

-        		else

-            		response.sendError( HttpServletResponse.SC_PRECONDITION_FAILED );

-        		return;            		

-            }        		

-        	

-            throw new ServletException((Throwable)responseMessage.getBody());

-        }

-        

-        // Write the response from the service implementation to the response

-        // output stream

-        InputStream is = (InputStream)responseMessage.getBody();

-        OutputStream os = response.getOutputStream(); 

-        byte[] buffer = new byte[2048];

-        for (;;) {

-            int n = is.read(buffer);

-            if (n <= 0)

-                break;

-            os.write(buffer, 0, n);

-        }

-        os.flush();

-        os.close();        

-    }

-

-    @Override

-    protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

-        // Get the request path

-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");

-        if (path.length() ==0) {            

-            // Redirect to a URL ending with / to make relative hrefs work

-            // relative to the served resource.

-            response.sendRedirect(request.getRequestURL().append('/').toString());

-            return;

-        }

-

-        // Invoke the get operation on the service implementation

-        Message requestMessage = messageFactory.createMessage();

-        String id = path.substring(1);

-        

-        Message responseMessage = null;

-        HTTPCacheContext cacheContext = null;

-        try { 

-           cacheContext = HTTPCacheContext.getCacheContextFromRequest(request);

-        } catch (ParseException e) {        	

-        }

-        

-        // Route message based on availability of cache info and cache methods

-        if (( cacheContext != null ) && (cacheContext.isEnabled()) && (conditionalPutInvoker != null )) {        

-        	requestMessage.setBody(new Object[] {id, cacheContext});

-        	responseMessage = conditionalPutInvoker.invoke(requestMessage);

-        } else {

-        	requestMessage.setBody(new Object[] {id});

-        	responseMessage = putInvoker.invoke(requestMessage);

-        }

-        if (responseMessage.isFault()) {

-        	Object body = responseMessage.getBody();

-        	

-        	int index = -1;

-        	if ( -1 < (index = body.getClass().getName().indexOf( "NotModifiedException")) ) {

-        		if ( index > -1 ) 

-            		response.sendError( HttpServletResponse.SC_NOT_MODIFIED, body.toString().substring( index ));

-        		else

-            		response.sendError( HttpServletResponse.SC_NOT_MODIFIED );

-        		return;

-        	} else if ( -1 < (index = body.getClass().getName().indexOf( "PreconditionFailedException")) ) {

-        		if ( index > -1 ) 

-            		response.sendError( HttpServletResponse.SC_PRECONDITION_FAILED, body.toString().substring( index ));

-        		else

-            		response.sendError( HttpServletResponse.SC_PRECONDITION_FAILED );

-        		return;            		

-            }        		

-        	

-            throw new ServletException((Throwable)responseMessage.getBody());

-        }

-        

-        // Write the response from the service implementation to the response

-        // output stream

-        InputStream is = (InputStream)responseMessage.getBody();

-        OutputStream os = response.getOutputStream(); 

-        byte[] buffer = new byte[2048];

-        for (;;) {

-            int n = is.read(buffer);

-            if (n <= 0)

-                break;

-            os.write(buffer, 0, n);

-        }

-        os.flush();

-        os.close();        

-    }

-

-    @Override

-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

-        // Get the request path

-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");

-        if (path.length() ==0) {            

-            // Redirect to a URL ending with / to make relative hrefs work

-            // relative to the served resource.

-            response.sendRedirect(request.getRequestURL().append('/').toString());

-            return;

-        }

-

-        // Invoke the get operation on the service implementation

-        Message requestMessage = messageFactory.createMessage();

-        // String id = path.substring(1);

-        

-        Message responseMessage = null;

-        HTTPCacheContext cacheContext = null;

-        try { 

-           cacheContext = HTTPCacheContext.getCacheContextFromRequest(request);

-        } catch (ParseException e) {        	

-        }

-        

-        // Route message based on availability of cache info and cache methods

-        if (( cacheContext != null ) && (cacheContext.isEnabled()) && (conditionalPostInvoker != null )) {        

-        	requestMessage.setBody(new Object[] {cacheContext});

-        	responseMessage = conditionalPostInvoker.invoke(requestMessage);

-        } else {

-        	requestMessage.setBody(new Object[] {});

-        	responseMessage = postInvoker.invoke(requestMessage);

-        }

-        if (responseMessage.isFault()) {

-        	Object body = responseMessage.getBody();

-        	

-        	int index = -1;

-        	if ( -1 < (index = body.getClass().getName().indexOf( "NotModifiedException")) ) {

-        		if ( index > -1 ) 

-            		response.sendError( HttpServletResponse.SC_NOT_MODIFIED, body.toString().substring( index ));

-        		else

-            		response.sendError( HttpServletResponse.SC_NOT_MODIFIED );

-        		return;

-        	} else if ( -1 < (index = body.getClass().getName().indexOf( "PreconditionFailedException")) ) {

-        		if ( index > -1 ) 

-            		response.sendError( HttpServletResponse.SC_PRECONDITION_FAILED, body.toString().substring( index ));

-        		else

-            		response.sendError( HttpServletResponse.SC_PRECONDITION_FAILED );

-        		return;            		

-            }        		

-        	

-            throw new ServletException((Throwable)responseMessage.getBody());

-        }

-

-

-        // Test if the ETag and LastModified are returned as a cache context.

-    	Object body = responseMessage.getBody();

-    	if ( body.getClass() == HTTPCacheContext.class ) {

-    		// Transfer to header if so.

-    		HTTPCacheContext cc = (HTTPCacheContext)responseMessage.getBody();

-    		if (( cc != null ) && ( cc.isEnabled() )) {

-    			String eTag = cc.getETag();

-            	if ( eTag != null )

-            		response.setHeader( "ETag", cc.getETag() );

-            	String lastModified = cc.getLastModified();

-            	if ( lastModified != null)

-            		response.setHeader( "LastModified", cc.getLastModified() );

-    		}

-    	}

-    }

-

-    /**

-     * @return the getInvoker

-     */

-    public Invoker getGetInvoker() {

-        return getInvoker;

-    }

-

-    /**

-     * @param getInvoker the getInvoker to set

-     */

-    public void setGetInvoker(Invoker getInvoker) {

-        this.getInvoker = getInvoker;

-    }

-

-    /**

-     * @return the conditionalGetInvoker

-     */

-    public Invoker getConditionalGetInvoker() {

-        return conditionalGetInvoker;

-    }

-

-    /**

-     * @param conditionalGetInvoker the conditionalGetInvoker to set

-     */

-    public void setConditionalGetInvoker(Invoker conditionalGetInvoker) {

-        this.conditionalGetInvoker = conditionalGetInvoker;

-    }

-

-    /**

-     * @return the putInvoker

-     */

-    public Invoker getPutInvoker() {

-        return putInvoker;

-    }

-

-    /**

-     * @param putInvoker the putInvoker to set

-     */

-    public void setPutInvoker(Invoker putInvoker) {

-        this.putInvoker = putInvoker;

-    }

-

-    /**

-     * @return the conditionalPutInvoker

-     */

-    public Invoker getConditionalPutInvoker() {

-        return conditionalPutInvoker;

-    }

-

-    /**

-     * @param conditionalPutInvoker the conditionalPutInvoker to set

-     */

-    public void setConditionalPutInvoker(Invoker conditionalPutInvoker) {

-        this.conditionalPutInvoker = conditionalPutInvoker;

-    }

-

-    /**

-     * @return the postInvoker

-     */

-    public Invoker getPostInvoker() {

-        return postInvoker;

-    }

-

-    /**

-     * @param postInvoker the postInvoker to set

-     */

-    public void setPostInvoker(Invoker postInvoker) {

-        this.postInvoker = postInvoker;

-    }

-

-    /**

-     * @return the conditionalPostInvoker

-     */

-    public Invoker getConditionalPostInvoker() {

-        return conditionalPostInvoker;

-    }

-

-    /**

-     * @param conditionalPostInvoker the conditionalPostInvoker to set

-     */

-    public void setConditionalPostInvoker(Invoker conditionalPostInvoker) {

-        this.conditionalPostInvoker = conditionalPostInvoker;

-    }

-

-    /**

-     * @return the deleteInvoker

-     */

-    public Invoker getDeleteInvoker() {

-        return deleteInvoker;

-    }

-

-    /**

-     * @param deleteInvoker the deleteInvoker to set

-     */

-    public void setDeleteInvoker(Invoker deleteInvoker) {

-        this.deleteInvoker = deleteInvoker;

-    }

-

-    /**

-     * @return the conditionalDeleteInvoker

-     */

-    public Invoker getConditionalDeleteInvoker() {

-        return conditionalDeleteInvoker;

-    }

-

-    /**

-     * @param conditionalDeleteInvoker the conditionalDeleteInvoker to set

-     */

-    public void setConditionalDeleteInvoker(Invoker conditionalDeleteInvoker) {

-        this.conditionalDeleteInvoker = conditionalDeleteInvoker;

-    }

-

-    

-    /** 

-     * Utility Methods related to Policy

-     */

-    

-

-    private boolean hasAuthenticationHeader(HttpServletRequest request, ServletResponse response) {

-        boolean result = false;

-        if(request.getHeader("Authorization") != null) {

-            result = true;

-        }

-        

-        return result;

-    }

-

-

-}

diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java b/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
deleted file mode 100644
index eb496f2421..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
+++ /dev/null
@@ -1,64 +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.binding.http.provider;
-
-import org.apache.tuscany.sca.binding.http.HTTPBinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-
-/**
- * Factory for HTTP binding providers. 
- *
- * @version $Rev$ $Date$
- */
-public class HTTPBindingProviderFactory implements BindingProviderFactory<HTTPBinding> {
-
-    private MessageFactory messageFactory;
-    private ServletHost servletHost;
-    
-    public HTTPBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        this.servletHost = servletHosts.getServletHosts().get(0);
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        messageFactory = modelFactories.getFactory(MessageFactory.class);
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, HTTPBinding binding) {
-        return null;
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, HTTPBinding binding) {
-        return new HTTPServiceBindingProvider(component, service, binding, messageFactory, servletHost);
-    }
-    
-    public Class<HTTPBinding> getModelType() {
-        return HTTPBinding.class;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java b/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
deleted file mode 100644
index e20d420d49..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.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 org.apache.tuscany.sca.binding.http.provider;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URLDecoder;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-
-/**
- * Servlet responsible for dispatching HTTP GET requests to the
- * target component implementation.
- *
- * @version $Rev$ $Date$
- */
-public class HTTPGetListenerServlet extends HttpServlet {
-    private static final long serialVersionUID = 2865466417329430610L;
-    
-    private MessageFactory messageFactory;
-    private Invoker getInvoker;
-    
-    /**
-     * Constructs a new HTTPServiceListenerServlet.
-     */
-    public HTTPGetListenerServlet(Invoker getInvoker, MessageFactory messageFactory) {
-        this.getInvoker = getInvoker;
-        this.messageFactory = messageFactory;
-    }
-
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-        // Get the request path
-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-        if (path.length() ==0) {
-            
-            // Redirect to a URL ending with / to make relative hrefs work
-            // relative to the served resource.
-            response.sendRedirect(request.getRequestURL().append('/').toString());
-            return;
-        }
-
-        // Invoke the get operation on the service implementation
-        Message requestMessage = messageFactory.createMessage();
-        String id = path.substring(1);
-        requestMessage.setBody(new Object[] {id});
-        Message responseMessage = getInvoker.invoke(requestMessage);
-        if (responseMessage.isFault()) {
-            throw new ServletException((Throwable)responseMessage.getBody());
-        }
-        
-        // Write the response from the service implementation to the response
-        // output stream
-        InputStream is = (InputStream)responseMessage.getBody();
-        OutputStream os = response.getOutputStream(); 
-        byte[] buffer = new byte[2048];
-        for (;;) {
-            int n = is.read(buffer);
-            if (n <= 0)
-                break;
-            os.write(buffer, 0, n);
-        }
-        os.flush();
-        os.close();
-        
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java b/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
deleted file mode 100644
index 8f91ff4343..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
+++ /dev/null
@@ -1,137 +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.binding.http.provider;
-
-import javax.servlet.Servlet;
-
-import org.apache.tuscany.sca.binding.http.HTTPBinding;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Implementation of an HTTP binding provider.
- *
- * @version $Rev$ $Date$
- */
-public class HTTPServiceBindingProvider implements ServiceBindingProvider {
-    private RuntimeComponentService service;  
-    private HTTPBinding binding;
-    private MessageFactory messageFactory;
-    
-    private ServletHost servletHost;
-    private String servletMapping;
-    private HTTPBindingListenerServlet bindingListenerServlet;
-   
-    public HTTPServiceBindingProvider(RuntimeComponent component,
-                                              RuntimeComponentService service,
-                                              HTTPBinding binding,
-                                              MessageFactory messageFactory,
-                                              ServletHost servletHost) {
-        this.service = service;
-        this.binding = binding;
-        this.messageFactory = messageFactory;
-        this.servletHost = servletHost;
-    }
-
-    public void start() {
-        // Get the invokers for the supported operations
-        RuntimeComponentService componentService = (RuntimeComponentService) service;
-        RuntimeWire wire = componentService.getRuntimeWire(binding);
-        Servlet servlet = null;
-        bindingListenerServlet = new HTTPBindingListenerServlet(binding, messageFactory );
-        for (InvocationChain invocationChain : wire.getInvocationChains()) {
-            Operation operation = invocationChain.getTargetOperation();
-            String operationName = operation.getName();
-            if (operationName.equals("get")) { 
-                Invoker getInvoker = invocationChain.getHeadInvoker();
-               	bindingListenerServlet.setGetInvoker(getInvoker);
-                servlet = bindingListenerServlet;
-            } else if (operationName.equals("conditionalGet")) {
-                Invoker conditionalGetInvoker = invocationChain.getHeadInvoker();
-               	bindingListenerServlet.setConditionalGetInvoker(conditionalGetInvoker);
-                servlet = bindingListenerServlet;
-            } else if (operationName.equals("delete")) {
-                Invoker deleteInvoker = invocationChain.getHeadInvoker();
-               	bindingListenerServlet.setDeleteInvoker(deleteInvoker);
-                servlet = bindingListenerServlet;
-            } else if (operationName.equals("conditionalDelete")) {
-                Invoker conditionalDeleteInvoker = invocationChain.getHeadInvoker();
-               	bindingListenerServlet.setConditionalDeleteInvoker(conditionalDeleteInvoker);
-                servlet = bindingListenerServlet;
-            } else if (operationName.equals("put")) {
-                Invoker putInvoker = invocationChain.getHeadInvoker();
-               	bindingListenerServlet.setPutInvoker(putInvoker);
-                servlet = bindingListenerServlet;
-            } else if (operationName.equals("conditionalPut")) {
-                Invoker conditionalPutInvoker = invocationChain.getHeadInvoker();
-               	bindingListenerServlet.setConditionalPutInvoker(conditionalPutInvoker);
-                servlet = bindingListenerServlet;
-            } else if (operationName.equals("post")) {
-                Invoker postInvoker = invocationChain.getHeadInvoker();
-               	bindingListenerServlet.setPostInvoker(postInvoker);
-                servlet = bindingListenerServlet;
-            } else if (operationName.equals("conditionalPost")) {
-                Invoker conditionalPostInvoker = invocationChain.getHeadInvoker();
-               	bindingListenerServlet.setConditionalPostInvoker(conditionalPostInvoker);
-                servlet = bindingListenerServlet;
-            } else if (operationName.equals("service")) {
-                Invoker serviceInvoker = invocationChain.getHeadInvoker();
-                servlet = new HTTPServiceListenerServlet(binding, serviceInvoker, messageFactory);
-                break;
-            }
-        }
-        if (servlet == null) {
-            throw new IllegalStateException("No get or service method found on the service");
-        }
-                
-        // Create our HTTP service listener Servlet and register it with the
-        // Servlet host
-        servletMapping = binding.getURI();
-        if (!servletMapping.endsWith("/")) {
-            servletMapping += "/";
-        }
-        if (!servletMapping.endsWith("*")) {
-            servletMapping += "*";
-        }
-        servletHost.addServletMapping(servletMapping, servlet);
-    }
-
-    public void stop() {        
-        // Unregister the Servlet from the Servlet host
-        servletHost.removeServletMapping(servletMapping);
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return null;
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java b/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
deleted file mode 100644
index 493255655d..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
+++ /dev/null
@@ -1,136 +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.binding.http.provider;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicy;
-
-/**
- * Servlet responsible for dispatching HTTP service requests to the
- * target component implementation.
- *
- * @version $Rev$ $Date$
- */
-public class HTTPServiceListenerServlet implements Servlet {
-    private static final QName AUTEHTICATION_INTENT = new QName("http://www.osoa.org/xmlns/sca/1.0","authentication");
-    
-    transient private Binding binding;
-    transient private ServletConfig config;
-    transient private MessageFactory messageFactory;
-    transient private Invoker serviceInvoker;
-    
-    transient private boolean requiresAuthentication = false;
-    transient private BasicAuthenticationPolicy basicAuthenticationPolicy = null;
-
-    /**
-     * Constructs a new HTTPServiceListenerServlet.
-     */
-    public HTTPServiceListenerServlet(Binding binding, Invoker serviceInvoker, MessageFactory messageFactory) {
-        this.binding = binding;
-        this.serviceInvoker = serviceInvoker;
-        this.messageFactory = messageFactory;
-        
-        // find out which policies are active
-        if (binding instanceof PolicySetAttachPoint) {
-            List<Intent> intents = ((PolicySetAttachPoint)binding).getRequiredIntents();
-            for(Intent intent : intents) {
-                if(intent.getName().equals(AUTEHTICATION_INTENT)) {
-                    requiresAuthentication = true;
-                }
-            }
-
-
-            List<PolicySet> policySets = ((PolicySetAttachPoint)binding).getApplicablePolicySets();
-            for (PolicySet ps : policySets) {
-                for (Object p : ps.getPolicies()) {
-                    if (BasicAuthenticationPolicy.class.isInstance(p)) {
-                        basicAuthenticationPolicy = (BasicAuthenticationPolicy)p;
-                    } else {
-                        // etc. check for other types of policy being present
-                    }
-                }
-            }
-        }        
-    }
-
-    public ServletConfig getServletConfig() {
-        return config;
-    }
-
-    public String getServletInfo() {
-        return "";
-    }
-
-    public void init(ServletConfig config) throws ServletException {
-        this.config = config;
-    }
-
-    public void destroy() {
-        
-    }
-
-    public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-        
-        if(requiresAuthentication) {
-            if(! hasAuthenticationHeader((HttpServletRequest)request, (HttpServletResponse)response)) {
-                ((HttpServletResponse)response).sendError(HttpServletResponse.SC_UNAUTHORIZED);
-            }
-        }
-        
-        // Dispatch the service interaction to the service invoker
-        Message requestMessage = messageFactory.createMessage();
-        requestMessage.setBody(new Object[]{request, response});
-        Message responseMessage = serviceInvoker.invoke(requestMessage);
-        if (responseMessage.isFault()) {            
-            // Turn a fault into an exception
-            //throw new ServletException((Throwable)responseMessage.getBody());
-            Throwable e = (Throwable)responseMessage.getBody();
-            ((HttpServletResponse)response).sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
-        }
-    }
-
-    
-    private boolean hasAuthenticationHeader(HttpServletRequest request, ServletResponse response) {
-        boolean result = false;
-        if(request.getHeader("Authorization") != null) {
-            result = true;
-        }
-        
-        return result;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java b/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java
deleted file mode 100644
index 1fe4600e31..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java
+++ /dev/null
@@ -1,50 +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.binding.http.util;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.tuscany.sca.binding.http.HTTPHeader;
-
-public class HTTPHeadersParser {
-
-	/**
-	 * Parse http request headers to a map
-	 * 
-	 * @param request
-	 * @return
-	 */
-	public static List<HTTPHeader> getHeaders(HttpServletRequest request) {
-		List<HTTPHeader> headers = new ArrayList<HTTPHeader>();
-
-		Enumeration<?> headerNames =  request.getHeaderNames();
-		while (headerNames.hasMoreElements()) {
-		    String headerName = (String) headerNames.nextElement();
-		    Object headerValue = request.getHeader(headerName);
-		    HTTPHeader header = new HTTPHeader(headerName, headerValue);
-		    headers.add(header);
-		}
-		return headers;
-	}
-}
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca-contrib/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 0fa8d44c08..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.http.provider.HTTPBindingProviderFactory;model=org.apache.tuscany.sca.binding.http.HTTPBinding

diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCaseFIXME.java b/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCaseFIXME.java
deleted file mode 100644
index d4aac125e5..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCaseFIXME.java
+++ /dev/null
@@ -1,853 +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.binding.http;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.text.MessageFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import junit.framework.TestCase;
-
-/**
- * HTTP binding unit tests.
- * 
- * @version $Rev$ $Date$
- */
-public class HTTPBindingCacheTestCaseFIXME extends TestCase {
-	// RFC 822 date time
-	protected static final SimpleDateFormat dateFormat = new SimpleDateFormat(
-			"EEE, dd MMM yyyy HH:mm:ss Z");
-
-	// Request with no predicates in header.
-	private static final String REQUEST1 = "{0} /httpbinding/{1} HTTP/1.0\n"
-			+ "Host: localhost\n" + "Content-Type: text/xml\n"
-			+ "Connection: close\n" + "Content-Length: {2}" + "\n\n{3}";
-
-	// Request with predicates in header
-	private static final String REQUEST2 = "{0} /httpbinding/{1} HTTP/1.0\n"
-			+ "Host: localhost\n" + "Content-Type: text/xml\n" + "{2}: {3}\n" // predicate (If-Match, If-None-Match, If-Modified-Since, If-NotModified-Since): value (date or ETag)
-			+ "Connection: close\n" + "Content-Length: {4}" + "\n\n{5}";
-
-	private static final int HTTP_PORT = 8085;
-
-//	private SCADomain scaDomain;
-//
-//	@Override
-//	protected void setUp() throws Exception {
-//		scaDomain = SCADomain.newInstance("testCache.composite");
-//	}
-//
-//	@Override
-//	protected void tearDown() throws Exception {
-//		scaDomain.close();
-//	}
-
-	/**
-	 * Test invoking a POJO get method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testGet() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST1, "GET", index, content
-				.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		assertTrue(document.indexOf("<body><p>item=" + index) != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalGetIfModifiedNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "GET", index,
-				"If-Modified-Since", dateFormat.format(new Date(0)), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		assertTrue(document.indexOf("<body><p>item=" + index) != -1);
-		// Should return code 304 Not Modified.
-		// assertTrue(document.indexOf("HTTP/1.1 304") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalGetIfModifiedPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "GET", index,
-				"If-Modified-Since", dateFormat.format(new Date(0)), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("<body><p>item=" + index) != -1);
-		// Should return code 304 Not Modified.
-		assertTrue(document.indexOf("HTTP/1.1 304") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalGetIfUnmodifiedNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "GET", index,
-				"If-Unmodified-Since", dateFormat.format(new Date()), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		assertTrue(document.indexOf("<body><p>item=" + index) != -1);
-		// Should return code 304 Not Modified.
-		// assertTrue(document.indexOf("HTTP/1.1 304") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalGetIfUnmodifiedPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "GET", index,
-				"If-Unmodified-Since", dateFormat.format(new Date(0)), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("<body><p>item=" + index) != -1);
-		// Should return code 412 PreconditionFailed.
-		assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalGetIfMatchNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "GET", index,
-				"If-Match", "eTagXXX", content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("<body><p>item=" + index) != -1);
-		// Should return code 412 precondition failed.
-		assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalGetIfMatchPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "GET", index,
-				"If-Match", "eTagXXX", content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		assertTrue(document.indexOf("<body><p>item=" + index) != -1);
-		// Should return code 412 PreconditionFailed.
-		// assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalGetIfNoneMatchNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "GET", index,
-				"If-None-Match", "eTagXXX", content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		assertTrue(document.indexOf("<body><p>item=" + index) != -1);
-		// Should return code 412 precondition failed.
-		// assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalGetIfNoneMatchPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "GET", index,
-				"If-None-Match", "eTagXXX", content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("<body><p>item=" + index) != -1);
-		// Should return code 412 PreconditionFailed.
-		assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a POJO get method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testDelete() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST1, "DELETE", index,
-				content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		assertTrue(document.indexOf("deleted item=" + index) != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalDeleteIfModifiedNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "DELETE", index,
-				"If-Modified-Since", dateFormat.format(new Date(0)), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		assertTrue(document.indexOf("deleted item=" + index) != -1);
-		// Should return code 304 Not Modified.
-		// assertTrue(document.indexOf("HTTP/1.1 304") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalDeleteIfModifiedPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "DELETE", index,
-				"If-Modified-Since", dateFormat.format(new Date(0)), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("deleted item=" + index) != -1);
-		// Should return code 304 Not Modified.
-		assertTrue(document.indexOf("HTTP/1.1 304") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalDeleteIfUnmodifiedNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "DELETE", index,
-				"If-Unmodified-Since", dateFormat.format(new Date()), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		assertTrue(document.indexOf("deleted item=" + index) != -1);
-		// Should return code 304 Not Modified.
-		// assertTrue(document.indexOf("HTTP/1.1 304") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalDeleteIfUnmodifiedPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "DELETE", index,
-				"If-Unmodified-Since", dateFormat.format(new Date(0)), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("deleted item=" + index) != -1);
-		// Should return code 412 PreconditionFailed.
-		assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalDeleteIfMatchNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "DELETE", index,
-				"If-Match", "eTagXXX", content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("deleted item=" + index) != -1);
-		// Should return code 412 precondition failed.
-		assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalDeleteIfMatchPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "DELETE", index,
-				"If-Match", "eTagXXX", content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		assertTrue(document.indexOf("deleted item=" + index) != -1);
-		// Should return code 412 PreconditionFailed.
-		// assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalDeleteIfNoneMatchNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "DELETE", index,
-				"If-None-Match", "eTagXXX", content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		assertTrue(document.indexOf("deleted item=" + index) != -1);
-		// Should return code 412 precondition failed.
-		// assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalDeleteIfNoneMatchPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "DELETE", index,
-				"If-None-Match", "eTagXXX", content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("deleted item=" + index) != -1);
-		// Should return code 412 PreconditionFailed.
-		assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a POJO get method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testPost() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST1, "POST", index, content
-				.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		assertTrue(document.indexOf("HTTP/1.1 200 OK") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPostIfModifiedNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "POST", index,
-				"If-Modified-Since", dateFormat.format(new Date()), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return code 200 OK
-		// assertTrue(document.indexOf("posted item=" + index) != -1);
-		assertTrue(document.indexOf("HTTP/1.1 200 OK") != -1);
-		// Should return code 304 Not Modified.
-		// assertTrue(document.indexOf("HTTP/1.1 304") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPostIfModifiedPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "POST", index,
-				"If-Modified-Since", dateFormat.format(new Date(0)), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("posted item=" + index) != -1);
-		// Should return code 304 Not Modified.
-		assertTrue(document.indexOf("HTTP/1.1 304") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPostIfUnmodifiedNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "POST", index,
-				"If-Unmodified-Since", dateFormat.format(new Date()), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return code 200 OK
-		assertTrue(document.indexOf("HTTP/1.1 200 OK") != -1);
-		// Should return code 304 Not Modified.
-		// assertTrue(document.indexOf("HTTP/1.1 304") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPostIfUnmodifiedPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "POST", index,
-				"If-Unmodified-Since", dateFormat.format(new Date(0)), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("posted item=" + index) != -1);
-		// Should return code 412 PreconditionFailed.
-		assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPostIfMatchNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "POST", index,
-				"If-Match", "eTagMatch", content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return code 200 OK.
-		assertTrue(document.indexOf("HTTP/1.1 200 OK") != -1);
-		// Should return code 412 precondition failed.
-		// assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPostIfMatchPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat
-				.format(REQUEST2, "POST", index, "If-Match", "eTagNoneMatch",
-						content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("posted item=" + index) != -1);
-		// Should return code 412 PreconditionFailed.
-		assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPostIfNoneMatchNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "POST", index,
-				"If-None-Match", "eTagNoneMatch", content.getBytes().length,
-				content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return code 200 OK
-		assertTrue(document.indexOf("HTTP/1.1 200 OK") != -1);
-		// Should return code 412 precondition failed.
-		// assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPostIfNoneMatchPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "POST", index,
-				"If-None-Match", "eTagMatch", content.getBytes().length,
-				content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("posted item=" + index) != -1);
-		// Should return code 412 PreconditionFailed.
-		assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a POJO get method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testPut() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST1, "PUT", index, content
-				.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		assertTrue(document.indexOf("updated item=" + index) != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPutIfModifiedNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "PUT", index,
-				"If-Modified-Since", dateFormat.format(new Date(0)), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		assertTrue(document.indexOf("updated item=" + index) != -1);
-		// Should return code 304 Not Modified.
-		// assertTrue(document.indexOf("HTTP/1.1 304") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPutIfModifiedPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "PUT", index,
-				"If-Modified-Since", dateFormat.format(new Date(0)), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("updated item=" + index) != -1);
-		// Should return code 304 Not Modified.
-		assertTrue(document.indexOf("HTTP/1.1 304") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPutIfUnmodifiedNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "PUT", index,
-				"If-Unmodified-Since", dateFormat.format(new Date()), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		assertTrue(document.indexOf("updated item=" + index) != -1);
-		// Should return code 304 Not Modified.
-		// assertTrue(document.indexOf("HTTP/1.1 304") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPutIfUnmodifiedPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "PUT", index,
-				"If-Unmodified-Since", dateFormat.format(new Date(0)), content
-						.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("updated item=" + index) != -1);
-		// Should return code 412 PreconditionFailed.
-		assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPutIfMatchNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "PUT", index,
-				"If-Match", "eTagXXX", content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("updated item=" + index) != -1);
-		// Should return code 412 precondition failed.
-		assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPutIfMatchPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "PUT", index,
-				"If-Match", "eTagXXX", content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		assertTrue(document.indexOf("updated item=" + index) != -1);
-		// Should return code 412 PreconditionFailed.
-		// assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPutIfNoneMatchNegative() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 1;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "PUT", index,
-				"If-None-Match", "eTagXXX", content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		assertTrue(document.indexOf("updated item=" + index) != -1);
-		// Should return code 412 precondition failed.
-		// assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Test invoking a conditional method implementation using the HTTP binding. 
-	 * @throws Exception
-	 */
-	public void testConditionalPutIfNoneMatchPositive() throws Exception {
-		Socket client = new Socket("127.0.0.1", HTTP_PORT);
-		OutputStream os = client.getOutputStream();
-		int index = 0;
-		String content = "";
-		String request = MessageFormat.format(REQUEST2, "PUT", index,
-				"If-None-Match", "eTagXXX", content.getBytes().length, content);
-		os.write(request.getBytes());
-		os.flush();
-
-		String document = read(client);
-		// Should return item
-		// assertTrue(document.indexOf("updated item=" + index) != -1);
-		// Should return code 412 PreconditionFailed.
-		assertTrue(document.indexOf("HTTP/1.1 412") != -1);
-	}
-
-	/**
-	 * Read response stream from the given socket.
-	 * @param socket
-	 * @return
-	 * @throws IOException
-	 */
-	private static String read(Socket socket) throws IOException {
-		BufferedReader reader = null;
-		try {
-			reader = new BufferedReader(new InputStreamReader(socket
-					.getInputStream()));
-			StringBuffer sb = new StringBuffer();
-			String str;
-			while ((str = reader.readLine()) != null) {
-				sb.append(str);
-			}
-			return sb.toString();
-		} finally {
-			if (reader != null) {
-				reader.close();
-			}
-		}
-	}
-}
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java b/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
deleted file mode 100644
index c6a5d64ce7..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
+++ /dev/null
@@ -1,153 +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.binding.http;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.text.MessageFormat;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import junit.framework.TestCase;
-
-/**
- * HTTP binding unit tests.
- * 
- * @version $Rev$ $Date$
- */
-public class HTTPBindingTestCase extends TestCase {
-
-    private static final String REQUEST1_HEADER =
-        "GET /httpservice/test HTTP/1.0\n" + "Host: localhost\n"
-            + "Content-Type: text/xml\n"
-            + "Connection: close\n"
-            + "Content-Length: ";
-    private static final String REQUEST1_CONTENT = "";
-    private static final String REQUEST1 =
-        REQUEST1_HEADER + REQUEST1_CONTENT.getBytes().length + "\n\n" + REQUEST1_CONTENT;
-
-    private static final String REQUEST2_HEADER =
-        "GET /webcontent/test.html HTTP/1.0\n" + "Host: localhost\n"
-            + "Content-Type: text/xml\n"
-            + "Connection: close\n"
-            + "Content-Length: ";
-    private static final String REQUEST2_CONTENT = "";
-    private static final String REQUEST2 =
-        REQUEST2_HEADER + REQUEST2_CONTENT.getBytes().length + "\n\n" + REQUEST2_CONTENT;
-
-    private static final String REQUEST3_HEADER =
-        "GET /httpget/{0} HTTP/1.0\n" + "Host: localhost\n"
-            + "Content-Type: text/xml\n"
-            + "Connection: close\n"
-            + "Content-Length: ";
-    private static final String REQUEST3_CONTENT = "";
-    private static final String REQUEST3 =
-        REQUEST3_HEADER + REQUEST3_CONTENT.getBytes().length + "\n\n" + REQUEST3_CONTENT;
-
-    private static final int HTTP_PORT = 8085;
-
-    private Node node;
-    
-    @Override
-    protected void setUp() throws Exception {
-        String contribution = ContributionLocationHelper.getContributionLocation(HTTPBindingCacheTestCaseFIXME.class);
-        node = NodeFactory.newInstance().createNode("test.composite", new Contribution("test", contribution));
-        node.start();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-        node.destroy();
-    }
-
-    /**
-     * Test invoking a POJO service implementation using the HTTP binding. 
-     * @throws Exception
-     */
-    public void testServiceImplementation() throws Exception {
-        Socket client = new Socket("127.0.0.1", HTTP_PORT);
-        OutputStream os = client.getOutputStream();
-        os.write(REQUEST1.getBytes());
-        os.flush();
-        
-        String document = read(client);
-        assertTrue(document.indexOf("<body><p>hey</body>") != -1);
-    }
-
-    /**
-     * Test invoking a POJO get method implementation using the HTTP binding. 
-     * @throws Exception
-     */
-    public void testGetImplementation() throws Exception {
-        Socket client = new Socket("127.0.0.1", HTTP_PORT);
-        OutputStream os = client.getOutputStream();
-        int index = 0;
-        String request = MessageFormat.format( REQUEST3, index ); 
-        os.write( request.getBytes());
-        os.flush();
-        
-        String document = read(client);
-        assertTrue(document.indexOf("<body><p>item=" + index) != -1);
-    }
-
-    /**
-     * Test getting a static resource provided using the HTTP binding. 
-     * @throws Exception
-     */
-    public void testStaticResourceImplementation() throws Exception {
-        Socket client = new Socket("127.0.0.1", HTTP_PORT);
-        OutputStream os = client.getOutputStream();
-        os.write(REQUEST2.getBytes());
-        os.flush();
-        
-        String document = read(client);
-        assertTrue(document.indexOf("<body><p>hello</body>") != -1);
-    }
-
-    /**
-     * Read response stream from the given socket.
-     * @param socket
-     * @return
-     * @throws IOException
-     */
-    private static String read(Socket socket) throws IOException {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
-            StringBuffer sb = new StringBuffer();
-            String str;
-            while ((str = reader.readLine()) != null) {
-                sb.append(str);
-            }
-            return sb.toString();
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java b/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
deleted file mode 100644
index 1d6efea2a1..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.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 org.apache.tuscany.sca.binding.http;
-
-/**
- * Indicates that a resource was not modified.
- * 
- * @version $Rev$ $Date$
- */
-public class NotModifiedException extends Exception {
-    private static final long serialVersionUID = -5046027674128627383L;
-
-    public NotModifiedException() {
-    }
-
-    public NotModifiedException(String message) {
-        super(message);
-    }
-
-    public NotModifiedException(Throwable cause) {
-        super(cause);
-    }
-
-    public NotModifiedException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java b/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
deleted file mode 100644
index 5728899ebe..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.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 org.apache.tuscany.sca.binding.http;
-
-/**
- * Indicates that a resource was not modified.
- * 
- * @version $Rev$ $Date$
- */
-public class PreconditionFailedException extends Exception {
-    private static final long serialVersionUID = -5046027674128627383L;
-
-    public PreconditionFailedException() {
-    }
-
-    public PreconditionFailedException(String message) {
-        super(message);
-    }
-
-    public PreconditionFailedException(Throwable cause) {
-        super(cause);
-    }
-
-    public PreconditionFailedException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java b/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
deleted file mode 100644
index f2456f3175..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
+++ /dev/null
@@ -1,241 +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.binding.http;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Date;
-
-/**
- * Test service implementation that implements a various conditional HTTP
- * methods. For testing, the id==0 items are very old (Date(0)), not modified,
- * and always match ETags and the id==1 items are always brand new (Date()),
- * modified, and never match ETags. Using these ids one can test the
- * LastModified and ETag headers of the requests.
- * 
- * @version $Rev$ $Date$
- */
-public class TestBindingCacheImpl {
-
-	/**
-	 * Implements the HTTP get method of the collection implementation.
-	 * @param id
-	 * @return
-	 */
-	public InputStream get(String id) {
-		return new ByteArrayInputStream(
-				("<html><body><p>item=" + id + "</body></html>").getBytes());
-	}
-
-	/**
-	 * Implements the HTTP conditional get method of the collection implementation.
-	 * @param id
-	 * @return
-	 */
-	public InputStream conditionalGet(String id, HTTPCacheContext cacheContext)
-			throws NotModifiedException, PreconditionFailedException {
-
-		if (cacheContext != null) {
-			if (cacheContext.ifModifiedSince) {
-				if ((id.equals("1"))
-						&& (0 > cacheContext.lastModifiedDate
-								.compareTo(new Date())))
-					throw new NotModifiedException("item 1 was modified on "
-							+ new Date());
-			}
-			if (cacheContext.ifUnmodifiedSince) {
-				if ((id.equals("0"))
-						&& (0 > cacheContext.lastModifiedDate
-								.compareTo(new Date())))
-					throw new PreconditionFailedException(
-							"item 0 was modified on " + new Date(0));
-			}
-			if (cacheContext.ifMatch) {
-				if (id.equals("1"))
-					throw new PreconditionFailedException(
-							"item 1 eTag does not match "
-									+ cacheContext.getETag());
-			}
-			if (cacheContext.ifNoneMatch) {
-				if (id.equals("0"))
-					throw new PreconditionFailedException(
-							"item 0 eTag matches " + cacheContext.getETag());
-			}
-		}
-		return new ByteArrayInputStream(
-				("<html><body><p>item=" + id + "</body></html>").getBytes());
-	}
-
-	/**
-	 * Implements the HTTP delete method of the collection implementation.
-	 * @param id
-	 * @return
-	 */
-	public InputStream delete(String id) {
-		return new ByteArrayInputStream(
-				("<html><body><p>deleted item=" + id + "</body></html>")
-						.getBytes());
-	}
-
-	/**
-	 * Implements the HTTP conditional delete method of the collection implementation.
-	 * @param id
-	 * @return
-	 */
-	public InputStream conditionalDelete(String id, HTTPCacheContext cacheContext)
-			throws NotModifiedException, PreconditionFailedException {
-
-		if (cacheContext != null) {
-			if (cacheContext.ifModifiedSince) {
-				if ((id.equals("1"))
-						&& (0 > cacheContext.lastModifiedDate
-								.compareTo(new Date())))
-					throw new NotModifiedException("item 1 was modified on "
-							+ new Date());
-			}
-			if (cacheContext.ifUnmodifiedSince) {
-				if ((id.equals("0"))
-						&& (0 > cacheContext.lastModifiedDate
-								.compareTo(new Date())))
-					throw new PreconditionFailedException(
-							"item 0 was modified on " + new Date(0));
-			}
-			if (cacheContext.ifMatch) {
-				if (id.equals("1"))
-					throw new PreconditionFailedException(
-							"item 1 eTag does not match "
-									+ cacheContext.getETag());
-			}
-			if (cacheContext.ifNoneMatch) {
-				if (id.equals("0"))
-					throw new PreconditionFailedException(
-							"item 0 eTag matches " + cacheContext.getETag());
-			}
-		}
-		return new ByteArrayInputStream(
-				("<html><body><p>deleted item=" + id + "</body></html>")
-						.getBytes());
-	}
-
-	/**
-	 * Implements the HTTP post method of the collection implementation.
-	 * @param id
-	 * @return
-	 */
-	public InputStream post() {
-		int id = (new java.util.Random()).nextInt(Integer.MAX_VALUE);
-		return new ByteArrayInputStream(
-				("<html><body><p>posted item=" + id + "</body></html>")
-						.getBytes());
-	}
-
-	/**
-	 * Implements the HTTP conditional post method of the collection implementation.
-	 * @param id
-	 * @return
-	 */
-	public HTTPCacheContext conditionalPost(HTTPCacheContext cacheContext)
-			throws NotModifiedException, PreconditionFailedException {
-		String id = "" + (new java.util.Random()).nextInt(Integer.MAX_VALUE);
-
-		if (cacheContext != null) {
-			if (cacheContext.ifModifiedSince) {
-				if (0 >= cacheContext.lastModifiedDate.compareTo(new Date(0)))
-					throw new NotModifiedException("item was modified on "
-							+ new Date());
-			}
-			if (cacheContext.ifUnmodifiedSince) {
-				if ((0 >= cacheContext.lastModifiedDate.compareTo(new Date(0))))
-					throw new PreconditionFailedException(
-							"item was modified on " + new Date(0));
-			}
-			if (cacheContext.ifMatch) {
-				if (cacheContext.getETag().equalsIgnoreCase("ETagNoneMatch"))
-					throw new PreconditionFailedException(
-							"item eTag does not match "
-									+ cacheContext.getETag());
-			}
-			if (cacheContext.ifNoneMatch) {
-				if (cacheContext.getETag().equalsIgnoreCase("ETagMatch"))
-					throw new PreconditionFailedException("item eTag matches "
-							+ cacheContext.getETag());
-			}
-		}
-
-		// Return the ETag and LastModfied fields by serialize to a byte array
-		HTTPCacheContext returnContext = new HTTPCacheContext();
-		returnContext.setETag( "ETag" + (new java.util.Random()).nextInt(Integer.MAX_VALUE) );
-		returnContext.setLastModified( new Date() );
-		return returnContext;
-	}
-
-	/**
-	 * Implements the HTTP update/put method of the collection implementation.
-	 * @param id
-	 * @return
-	 */
-	public InputStream put(String id) {
-		return new ByteArrayInputStream(
-				("<html><body><p>updated item=" + id + "</body></html>")
-						.getBytes());
-	}
-
-	/**
-	 * Implements the HTTP conditional update/put method of the collection implementation.
-	 * @param id
-	 * @return
-	 */
-	public InputStream conditionalPut(String id, HTTPCacheContext cacheContext)
-			throws NotModifiedException, PreconditionFailedException {
-
-		if (cacheContext != null) {
-			if (cacheContext.ifModifiedSince) {
-				if ((id.equals("1"))
-						&& (0 > cacheContext.lastModifiedDate
-								.compareTo(new Date())))
-					throw new NotModifiedException("item 1 was modified on "
-							+ new Date());
-			}
-			if (cacheContext.ifUnmodifiedSince) {
-				if ((id.equals("0"))
-						&& (0 > cacheContext.lastModifiedDate
-								.compareTo(new Date())))
-					throw new PreconditionFailedException(
-							"item 0 was modified on " + new Date(0));
-			}
-			if (cacheContext.ifMatch) {
-				if (id.equals("1"))
-					throw new PreconditionFailedException(
-							"item 1 eTag does not match "
-									+ cacheContext.getETag());
-			}
-			if (cacheContext.ifNoneMatch) {
-				if (id.equals("0"))
-					throw new PreconditionFailedException(
-							"item 0 eTag matches " + cacheContext.getETag());
-			}
-		}
-		
-		return new ByteArrayInputStream(
-				("<html><body><p>updated item=" + id + "</body></html>")
-						.getBytes());
-	}
-
-}
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java b/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
deleted file mode 100644
index 333bacbab3..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.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.binding.http;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-/**
- * Test service implementation that implements a get method.
- *
- * @version $Rev$ $Date$
- */
-public class TestGetImpl {
-    
-    public InputStream get(String id) {
-        return new ByteArrayInputStream(("<html><body><p>item=" + id + "</body></html>").getBytes());
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java b/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
deleted file mode 100644
index 9dbd6724b0..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
+++ /dev/null
@@ -1,61 +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.binding.http;
-
-import java.io.IOException;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Test service implementation.
- *
- * @version $Rev$ $Date$
- */
-
-@Service(Servlet.class)
-public class TestServiceCacheImpl implements Servlet {
-
-    public void init(ServletConfig config) throws ServletException {
-    }
-
-    public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-        //HttpServletResponse httpResponse = (HttpServletResponse)response;   	
-        response.getOutputStream().print("<html><body><p>hey</body></html>");
-    }
-
-    public void destroy() {
-    }
-
-    public ServletConfig getServletConfig() {
-        return null;
-    }
-
-    public String getServletInfo() {
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java b/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
deleted file mode 100644
index 90cca27655..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
+++ /dev/null
@@ -1,61 +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.binding.http;
-
-import java.io.IOException;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Test service implementation.
- *
- * @version $Rev$ $Date$
- */
-
-@Service(Servlet.class)
-public class TestServiceImpl implements Servlet {
-
-    public void init(ServletConfig config) throws ServletException {
-    }
-
-    public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-        //HttpServletResponse httpResponse = (HttpServletResponse)response;   	
-        response.getOutputStream().print("<html><body><p>hey</body></html>");
-    }
-
-    public void destroy() {
-    }
-
-    public ServletConfig getServletConfig() {
-        return null;
-    }
-
-    public String getServletInfo() {
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/resources/content/test.html b/java/sca-contrib/modules/binding-http-runtime/src/test/resources/content/test.html
deleted file mode 100644
index f4b79d7f01..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/resources/content/test.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<!--
-    * 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.    
--->
-<body><p>hello</body>
-</html>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/resources/test.composite b/java/sca-contrib/modules/binding-http-runtime/src/test/resources/test.composite
deleted file mode 100644
index 62c4af4e22..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/resources/test.composite
+++ /dev/null
@@ -1,47 +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://sample/test"
-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	xmlns:sr="http://sample/test"
-	name="test">
-
-    <component name="ResourceServiceComponent">
-        <tuscany:implementation.resource location="content"/>
-    	<service name="Resource">
-    		<tuscany:binding.http uri="http://localhost:8085/webcontent"/>
-    	</service>
-    </component>
-
-    <component name="HTTPServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.binding.http.TestServiceImpl"/>
-    	<service name="Servlet">
-    		<tuscany:binding.http uri="http://localhost:8085/httpservice"/>
-    	</service>
-    </component>
-
-    <component name="HTTPGetComponent">
-        <implementation.java class="org.apache.tuscany.sca.binding.http.TestGetImpl"/>
-    	<service name="TestGetImpl">
-    		<tuscany:binding.http uri="http://localhost:8085/httpget"/>
-    	</service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/resources/testCache.composite b/java/sca-contrib/modules/binding-http-runtime/src/test/resources/testCache.composite
deleted file mode 100644
index d805402c4f..0000000000
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/resources/testCache.composite
+++ /dev/null
@@ -1,33 +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://sample/test"

-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	xmlns:sr="http://sample/test"

-	name="test">

-

-    <component name="HTTPBindingComponent">

-        <implementation.java class="org.apache.tuscany.sca.binding.http.TestBindingCacheImpl"/>

-    	<service name="TestBindingCacheImpl">

-    		<tuscany:binding.http uri="http://localhost:8085/httpbinding"/>

-    	</service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/binding-http/LICENSE b/java/sca-contrib/modules/binding-http/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/binding-http/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/binding-http/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-http/META-INF/MANIFEST.MF
deleted file mode 100644
index a68b0c1e8d..0000000000
--- a/java/sca-contrib/modules/binding-http/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.http;uses:="org.apache.

- tuscany.sca.assembly,javax.servlet.http";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.binding.http.impl;version="1.4

- "

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA HTTP Binding Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397256703

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA HTTP Binding Model

-Import-Package: javax.servlet.http,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0",

- org.apache.tuscany.sca.binding.http;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.http

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-http/NOTICE b/java/sca-contrib/modules/binding-http/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/binding-http/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/binding-http/pom.xml b/java/sca-contrib/modules/binding-http/pom.xml
deleted file mode 100644
index a841f26df4..0000000000
--- a/java/sca-contrib/modules/binding-http/pom.xml
+++ /dev/null
@@ -1,72 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-http</artifactId>
-    <name>Apache Tuscany SCA HTTP Binding Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
deleted file mode 100644
index 6192b92dfe..0000000000
--- a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.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.binding.http;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-
-/**
- * HTTP binding model.
- * 
- * @version $Rev$ $Date$
-*/
-public interface HTTPBinding extends Binding {
-}
diff --git a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
deleted file mode 100644
index e66896c68e..0000000000
--- a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
+++ /dev/null
@@ -1,35 +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.binding.http;
-
-/**
- * Factory for the HTTP binding model.
- *
- * @version $Rev$ $Date$
- */
-public interface HTTPBindingFactory {
-    
-    /**
-     * Creates a new HTTP binding.
-     * @return a new HTTP binding
-     */
-    HTTPBinding createHTTPBinding();
-
-}
diff --git a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java b/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
deleted file mode 100644
index 023423f0eb..0000000000
--- a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
+++ /dev/null
@@ -1,257 +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.binding.http;

-

-import java.text.SimpleDateFormat;

-import java.util.Date;

-

-import javax.servlet.http.HttpServletRequest;

-

-/**

- * A class to store cache settings for Atom and HTTP requests and responses.

- * 

- * Predicates are statements that work in conjunction with

- * ETags and LastModified dates to determine if a precondition

- * or postcondition is satisfied.

- * See HTTP specification for how predicates wrk:

- * http://tools.ietf.org/html/rfc2616

- * Example predicates in HTTP include If-Match, If-None-Match,

- * If-Modified-Since, If-Unmodified-Since, If-Range.

-

- */

-public class HTTPCacheContext {

-    public static final SimpleDateFormat RFC822DateFormat = new SimpleDateFormat( "EEE, dd MMM yyyy HH:mm:ss Z" ); // RFC 822 date time

-    

-    public boolean enabled;

-	public String eTag;

-	public String lastModified;

-	public Date lastModifiedDate;

-	public boolean ifModifiedSince;

-	public boolean ifUnmodifiedSince;

-	public boolean ifMatch;

-	public boolean ifNoneMatch;

-	public boolean ifRange;

-

-	/**

-	 * An ETag is a unique ID for an item. It changes when

-	 * a field in the item or the update date changes.

-	 * See HTTP specification for how ETags work:

-	 * http://tools.ietf.org/html/rfc2616

-	 * @return the eTag

-	 */

-	public String getETag() {

-		return eTag;

-	}

-	/**

-	 * @param tag the eTag to set

-	 */

-	public void setETag(String tag) {

-		eTag = tag;

-		enabled = true;

-	}

-	/**

-	 * The LastModified date is the time the item was last 

-	 * changed. See HTTP specification for how ETags work:

-	 * http://tools.ietf.org/html/rfc2616

-	 * @return the lastModified

-	 */

-	public String getLastModified() {

-		return lastModified;

-	}

-	/**

-	 * The LastModified date is the time the item was last 

-	 * changed. See HTTP specification for how ETags work:

-	 * http://tools.ietf.org/html/rfc2616

-	 * @return the lastModified

-	 */

-	public Date getLastModifiedAsDate() {

-		return lastModifiedDate;

-	}

-	/**

-	 * @param lastModified the lastModified to set

-	 */

-	public void setLastModified(String lastModified) throws java.text.ParseException {

-		this.lastModified = lastModified;

-		// Catch date formatting on input to help debugging.

-  		lastModifiedDate = RFC822DateFormat.parse( lastModified );

-		enabled = true;

-	}

-	

-	/**

-	 * @param lastModified the lastModified to set

-	 */

-	public void setLastModified(Date updated) {

-		this.lastModified = RFC822DateFormat.format( updated );

-  		lastModifiedDate = updated;

-		enabled = true;

-	}

-	

-	/**

-	 * @return the ifModifedSince

-	 */

-	public boolean isIfModifiedSince() {

-		return ifModifiedSince;

-	}

-	/**

-	 * @param ifModifedSince the ifModifedSince to set

-	 */

-	public void setIfModifiedSince(boolean ifModifiedSince) {

-		this.ifModifiedSince = ifModifiedSince;

-		if ( ifModifiedSince )

-			enabled = true;

-	}

-	/**

-	 * @return the ifUnModifiedSince

-	 */

-	public boolean isIfUnmodifiedSince() {

-		return ifUnmodifiedSince;

-	}

-	/**

-	 * @param ifUnModifiedSince the ifUnModifiedSince to set

-	 */

-	public void setIfUnmodifiedSince(boolean ifUnmodifiedSince) {

-		this.ifUnmodifiedSince = ifUnmodifiedSince;

-		if ( ifUnmodifiedSince )

-			enabled = true;

-	}

-	/**

-	 * @return the ifMatch

-	 */

-	public boolean isIfMatch() {

-		return ifMatch;

-	}

-	/**

-	 * @param ifMatch the ifMatch to set

-	 */

-	public void setIfMatch(boolean ifMatch) {

-		this.ifMatch = ifMatch;

-		if ( ifMatch )

-			enabled = true;

-	}

-	/**

-	 * @return the ifNoneMatch

-	 */

-	public boolean isIfNoneMatch() {

-		return ifNoneMatch;

-	}

-	/**

-	 * @param ifNoneMatch the ifNoneMatch to set

-	 */

-	public void setIfNoneMatch(boolean ifNoneMatch) {

-		this.ifNoneMatch = ifNoneMatch;

-		if ( ifNoneMatch )

-			enabled = true;

-	}

-	/**

-	 * @return the ifRange

-	 */

-	public boolean isIfRange() {

-		return ifRange;

-	}

-	/**

-	 * @param ifRange the ifRange to set

-	 */

-	public void setIfRange(boolean ifRange) {

-		this.ifRange = ifRange;

-		if ( ifRange )

-			enabled = true;

-	}

-

-    public String toString() {

-    	final String PREDPREFIX = ", predicates=";

-		StringBuffer sb = new StringBuffer(PREDPREFIX);

-		if ( ifMatch || ifNoneMatch || ifModifiedSince || ifUnmodifiedSince || ifRange ) {

-			if ( ifMatch ) {

-				if ( sb.length() > PREDPREFIX.length() ) sb.append( ", ");

-				sb.append("If-Match");

-			}

-			if ( ifNoneMatch ) {

-				if ( sb.length() > PREDPREFIX.length() ) sb.append( ", ");

-				sb.append("If-None-Match");

-			}

-			if ( ifModifiedSince ) {

-				if ( sb.length() > PREDPREFIX.length() ) sb.append( ", ");

-				sb.append("If-Modified-Since");

-			}

-			if ( ifUnmodifiedSince ) {

-				if ( sb.length() > PREDPREFIX.length() ) sb.append( ", ");

-				sb.append("If-UnModified-Since");

-			}

-			if ( ifRange ) {

-				if ( sb.length() > PREDPREFIX.length() ) sb.append( ", ");

-				sb.append("If-Range");

-			}

-		} else {

-			sb.append("null");

-		}

-

-		return "eTag=" + eTag + ", lastModified=" + lastModified

-				+ sb.toString();

-	}

-

-    /**

-     * Gets the cache context information (ETag, LastModified, predicates) from the Http request.

-     * @param request

-     * @return

-     */

-    public static HTTPCacheContext getCacheContextFromRequest( HttpServletRequest request ) throws java.text.ParseException {

-    	HTTPCacheContext context = new HTTPCacheContext();

-    	

-    	String eTag = request.getHeader( "If-Match" );    	

-    	if ( eTag != null ) {

-    	   context.setETag( eTag );

-    	   context.setIfMatch( true );

-    	}

-    	eTag = request.getHeader( "If-None-Match" );    	

-    	if ( eTag != null ) {

-    	   context.setETag( eTag );

-    	   context.setIfNoneMatch( true );

-    	}

-        String lastModifiedString = request.getHeader( "If-Modified-Since" );        

-    	if ( lastModifiedString != null ) {

-     	   context.setLastModified( lastModifiedString );

-    	   context.setIfModifiedSince( true );

-     	}

-        lastModifiedString = request.getHeader( "If-Unmodified-Since" );        

-    	if ( lastModifiedString != null ) {

-     	   context.setLastModified( lastModifiedString );

-    	   context.setIfUnmodifiedSince( true );

-     	}

-        lastModifiedString = request.getHeader( "If-Range" );        

-    	if ( lastModifiedString != null ) {

-     	   context.setLastModified( lastModifiedString );

-    	   context.setIfRange( true );

-     	}

-    	return context;

-    }

-	/**

-	 * Enabled is true whenever ETag, LastModified, or predicate is set.

-	 * @return the enabled

-	 */

-	public boolean isEnabled() {

-		return enabled;

-	}

-	/**

-	 * @param enabled the enabled to set

-	 */

-	public void setEnabled(boolean enabled) {

-		this.enabled = enabled;

-	}

-}

diff --git a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java b/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java
deleted file mode 100644
index 69e44cf35c..0000000000
--- a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java
+++ /dev/null
@@ -1,51 +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.binding.http;
-
-public class HTTPHeader {
-    private String name;
-    private Object value;
-    
-    public HTTPHeader() {
-        
-    }
-    
-    public HTTPHeader(String name, Object value) {
-        this.name = name;
-        this.value = value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public void setValue(Object value) {
-        this.value = value;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
deleted file mode 100644
index 678cd1a426..0000000000
--- a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.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 org.apache.tuscany.sca.binding.http.impl;
-
-import org.apache.tuscany.sca.binding.http.HTTPBinding;
-import org.apache.tuscany.sca.binding.http.HTTPBindingFactory;
-
-/**
- * Factory for the HTTP binding model.
- *
- * @version $Rev$ $Date$
- */
-public class HTTPBindingFactoryImpl implements HTTPBindingFactory {
-
-    public HTTPBinding createHTTPBinding() {
-        return new HTTPBindingImpl();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java b/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
deleted file mode 100644
index 6d4bf92adc..0000000000
--- a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
+++ /dev/null
@@ -1,108 +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.binding.http.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.http.HTTPBinding;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-
-/**
- * Implementation of the HTTP binding model.
- * 
- * @version $Rev$ $Date$
- */
-class HTTPBindingImpl implements HTTPBinding, PolicySetAttachPoint {
-    
-    private String name;
-    private String uri;
-    
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private IntentAttachPointType intentAttachPointType;
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-
-
-    public String getName() {
-        return name;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // The sample binding is always resolved
-    }
-    
-    //Policy related getters/setters
-    
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-    
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public IntentAttachPointType getType() {
-        return intentAttachPointType;
-    }
-    
-    public void setType(IntentAttachPointType intentAttachPointType) {
-        this.intentAttachPointType = intentAttachPointType;
-    }
-
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }    
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-    
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }     
-
-}
diff --git a/java/sca-contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory b/java/sca-contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
deleted file mode 100644
index 44da6b166c..0000000000
--- a/java/sca-contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for model factory
-org.apache.tuscany.sca.binding.http.impl.HTTPBindingFactoryImpl
diff --git a/java/sca-contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index cc07784cb7..0000000000
--- a/java/sca-contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.http,model=org.apache.tuscany.sca.binding.http.HTTPBinding,factory=org.apache.tuscany.sca.binding.http.HTTPBindingFactory
diff --git a/java/sca-contrib/modules/binding-jms-policy/LICENSE b/java/sca-contrib/modules/binding-jms-policy/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/binding-jms-policy/NOTICE b/java/sca-contrib/modules/binding-jms-policy/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/binding-jms-policy/pom.xml b/java/sca-contrib/modules/binding-jms-policy/pom.xml
deleted file mode 100644
index 56d79557b7..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/pom.xml
+++ /dev/null
@@ -1,94 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-binding-jms-policy</artifactId>
-    <name>Apache Tuscany Policy Model for JMS binding</name>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-           <groupId>org.apache.geronimo.specs</groupId>
-           <artifactId>geronimo-jms_1.1_spec</artifactId>
-           <version>1.1</version>
-           <scope>provided</scope>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.apache.geronimo.specs</groupId>
-                   <artifactId>geronimo-jms_1.1_spec</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-reliability</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>       
-    </dependencies>
-		
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.binding.jms.policy</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.jms.policy*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java b/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java
deleted file mode 100644
index de54545f7e..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java
+++ /dev/null
@@ -1,66 +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.binding.jms.policy;
-
-import java.net.URI;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
-
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
-
-/**
- * Provider for Policy Intents and PolicySet definitions for the JMS binding
- *
- * @version $Rev$ $Date$
- */
-public class JMSBindingDefinitionsProvider implements SCADefinitionsProvider {
-    private String definitionsFile = "org/apache/tuscany/sca/binding/jms/policy/definitions.xml";
-    URLArtifactProcessor urlArtifactProcessor = null;
-    
-    public JMSBindingDefinitionsProvider(ExtensionPointRegistry registry) {
-        URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
-    }
-
-    public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
-        final URL definitionsFileUrl = getClass().getClassLoader().getResource(definitionsFile);
-        SCADefinitions scaDefn = null;
-        try {
-            final URI uri = new URI(definitionsFile);
-            // Allow bindings to read properties. Requires PropertyPermission read in security policy. 
-            scaDefn = AccessController.doPrivileged(new PrivilegedExceptionAction<SCADefinitions>() {
-                public SCADefinitions run() throws ContributionReadException {
-                    return (SCADefinitions)urlArtifactProcessor.read(null, uri, definitionsFileUrl);
-                }
-            });
-        } catch (Exception e) {
-            throw new SCADefinitionsProviderException(e);
-        }
-        return scaDefn;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java b/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
deleted file mode 100644
index 16ed2a53a4..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
+++ /dev/null
@@ -1,56 +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.binding.jms.policy.authentication.token;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.policy.Policy;
-
-/**
- * Implementation for policies that could be injected as parameter
- * into the axis2config.
- *
- * @version $Rev$ $Date$
- */
-public class JMSTokenAuthenticationPolicy implements Policy {
-    public static final QName JMS_TOKEN_AUTHENTICATION_POLICY_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "jmsTokenAuthentication");
-    public static final String JMS_TOKEN_AUTHENTICATION_TOKEN_NAME = "tokenName";
-
-    private QName tokenName;
-
-    public QName getTokenName() {
-        return tokenName;
-    }
-    
-    public void setTokenName(QName tokenName) {
-        this.tokenName = tokenName;
-    }
-    
-    public QName getSchemaName() {
-        return JMS_TOKEN_AUTHENTICATION_POLICY_QNAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java b/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
deleted file mode 100644
index 11747914da..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
+++ /dev/null
@@ -1,112 +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.binding.jms.policy.authentication.token;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicy;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JMSTokenAuthenticationPolicyProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<JMSTokenAuthenticationPolicy> {
-    
-    public QName getArtifactType() {
-        return JMSTokenAuthenticationPolicy.JMS_TOKEN_AUTHENTICATION_POLICY_QNAME;
-    }
-    
-    public JMSTokenAuthenticationPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-    }
-
-    
-    public JMSTokenAuthenticationPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        JMSTokenAuthenticationPolicy policy = new JMSTokenAuthenticationPolicy();
-        int event = reader.getEventType();
-        QName name = null;
-        
-        while (reader.hasNext()) {
-            event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT : {
-                    name = reader.getName();
-                    if ( name.equals(getArtifactType()) ) {
-                        policy.setTokenName(getQName(reader, JMSTokenAuthenticationPolicy.JMS_TOKEN_AUTHENTICATION_TOKEN_NAME));
-                    } 
-                    break;
-                }
-            }
-            
-            if ( event == END_ELEMENT ) {
-                if ( getArtifactType().equals(reader.getName()) ) {
-                    break;
-                } 
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-         
-        return policy;
-    }
-
-    public void write(JMSTokenAuthenticationPolicy policy, XMLStreamWriter writer) 
-        throws ContributionWriteException, XMLStreamException {
-        String prefix = "tuscany";
-        writer.writeStartElement(prefix, 
-                                 getArtifactType().getLocalPart(),
-                                 getArtifactType().getNamespaceURI());
-        writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS);
-
-        if ( policy.getTokenName() != null ) {
-            writer.writeAttribute(prefix,
-                                  getArtifactType().getNamespaceURI(),
-                                  JMSTokenAuthenticationPolicy.JMS_TOKEN_AUTHENTICATION_TOKEN_NAME, 
-                                  policy.getTokenName().toString());
-        }      
-        
-        writer.writeEndElement();
-    }
-
-    public Class<JMSTokenAuthenticationPolicy> getModelType() {
-        return JMSTokenAuthenticationPolicy.class;
-    }
-
-    public void resolve(JMSTokenAuthenticationPolicy arg0, ModelResolver arg1) throws ContributionResolveException {
-
-    }
-    
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java b/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java
deleted file mode 100644
index fd77e57418..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.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.binding.jms.policy.authentication.token;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JMSTokenAuthenticationPolicyProviderFactory implements PolicyProviderFactory<JMSTokenAuthenticationPolicy> {
-    private ExtensionPointRegistry registry;
-    
-    public JMSTokenAuthenticationPolicyProviderFactory(ExtensionPointRegistry registry) {
-        super();
-        this.registry = registry;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createImplementationPolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.assembly.Implementation)
-     */
-    public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) {
-        return null;//new TokenAuthenticationImplementationPolicyProvider(component, implementation);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createReferencePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentReference, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public PolicyProvider createReferencePolicyProvider(RuntimeComponent component,
-                                                        RuntimeComponentReference reference,
-                                                        Binding binding) {
-        return new JMSTokenAuthenticationReferencePolicyProvider(component, reference, binding);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createServicePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentService, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public PolicyProvider createServicePolicyProvider(RuntimeComponent component,
-                                                      RuntimeComponentService service,
-                                                      Binding binding) {
-        return new JMSTokenAuthenticationServicePolicyProvider(component, service, binding);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()
-     */
-    public Class getModelType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java b/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java
deleted file mode 100644
index 17b5da42be..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java
+++ /dev/null
@@ -1,89 +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.binding.jms.policy.authentication.token;
-
-
-import javax.security.auth.Subject;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.SecurityUtil;
-import org.apache.tuscany.sca.policy.authentication.token.TokenPrincipal;
-
-/**
- * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
- *
- * @version $Rev$ $Date$
- */
-public class JMSTokenAuthenticationReferencePolicyInterceptor implements Interceptor {
-
-    private Invoker next;
-    private Operation operation;
-    private PolicySet policySet = null;
-    private String context;
-    private JMSTokenAuthenticationPolicy policy;
-
-    public JMSTokenAuthenticationReferencePolicyInterceptor(String context, Operation operation, PolicySet policySet) {
-        super();
-        this.operation = operation;
-        this.policySet = policySet;
-        this.context = context;
-        init();
-    }
-
-    private void init() {
-        if (policySet != null) {
-            for (Object policyObject : policySet.getPolicies()){
-                if (policyObject instanceof JMSTokenAuthenticationPolicy){
-                    policy = (JMSTokenAuthenticationPolicy)policyObject;
-                    break;
-                }
-            }
-        }
-    }
-
-    public Message invoke(Message msg) {
-        // could call out here to some 3rd party system to get credentials
-        
-        if ( policy.getTokenName() != null){
-    
-            Subject subject = SecurityUtil.getSubject(msg);
-            TokenPrincipal principal = SecurityUtil.getPrincipal(subject, TokenPrincipal.class);
-            
-            if (principal == null){
-                principal = new TokenPrincipal("SomeJMSAuthorizationToken");
-                subject.getPrincipals().add(principal);
-            }
-        }
-        
-        return getNext().invoke(msg);
-    }
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java b/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
deleted file mode 100644
index 610bf758d1..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
+++ /dev/null
@@ -1,90 +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.binding.jms.policy.authentication.token;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JMSTokenAuthenticationReferencePolicyProvider implements PolicyProvider {
-    private RuntimeComponent component;
-    private RuntimeComponentReference reference;
-    private Binding binding;
-
-    public JMSTokenAuthenticationReferencePolicyProvider(RuntimeComponent component,
-                                             RuntimeComponentReference reference,
-                                             Binding binding) {
-        super();
-        this.component = component;
-        this.reference = reference;
-        this.binding = binding;
-    }
-
-    private PolicySet findPolicySet() {
-        if (binding instanceof PolicySetAttachPoint) {
-            List<PolicySet> policySets = ((PolicySetAttachPoint)binding).getApplicablePolicySets();
-            for (PolicySet ps : policySets) {
-                for (Object p : ps.getPolicies()) {
-                    if (JMSTokenAuthenticationPolicy.class.isInstance(p)) {
-                        return ps;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    private String getContext() {
-        return "component.reference: " + component.getURI()
-            + "#"
-            + reference.getName()
-            + "("
-            + binding.getClass().getName()
-            + ")";
-    }
-    
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation)
-     */
-    public Interceptor createInterceptor(Operation operation) {
-        PolicySet ps = findPolicySet();
-        return ps == null ? null : new JMSTokenAuthenticationReferencePolicyInterceptor(getContext(), operation, ps);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase()
-     */
-    public String getPhase() {
-        return Phase.REFERENCE_POLICY;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java b/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java
deleted file mode 100644
index ec3be6e165..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java
+++ /dev/null
@@ -1,89 +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.binding.jms.policy.authentication.token;
-
-
-import java.security.Principal;
-
-import javax.security.auth.Subject;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.SecurityUtil;
-import org.apache.tuscany.sca.policy.authentication.token.TokenPrincipal;
-
-/**
- * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
- *
- * @version $Rev$ $Date$
- */
-public class JMSTokenAuthenticationServicePolicyInterceptor implements Interceptor {
-    private Invoker next;
-    private Operation operation;
-    private PolicySet policySet = null;
-    private String context;
-    private JMSTokenAuthenticationPolicy policy;
-
-    public JMSTokenAuthenticationServicePolicyInterceptor(String context, Operation operation, PolicySet policySet) {
-        super();
-        this.operation = operation;
-        this.policySet = policySet;
-        this.context = context;
-        init();
-    }
-
-    private void init() {
-        if (policySet != null) {
-            for (Object policyObject : policySet.getPolicies()){
-                if (policyObject instanceof JMSTokenAuthenticationPolicy){
-                    policy = (JMSTokenAuthenticationPolicy)policyObject;
-                    break;
-                }
-            }
-        }
-    }
-
-    public Message invoke(Message msg) {
-        Subject subject = SecurityUtil.getSubject(msg);
-        TokenPrincipal principal = SecurityUtil.getPrincipal(subject, TokenPrincipal.class);
-        
-        if (principal != null) {
-            System.out.println("Token: " + principal.getName());
-            
-            // call out here to some 3rd party system to do whatever you 
-            // need to authenticate the principal
-        }
-    
-        return getNext().invoke(msg);
-    }
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java b/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
deleted file mode 100644
index 4278c1e595..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
+++ /dev/null
@@ -1,88 +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.binding.jms.policy.authentication.token;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JMSTokenAuthenticationServicePolicyProvider implements PolicyProvider {
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private Binding binding;
-
-    public JMSTokenAuthenticationServicePolicyProvider(RuntimeComponent component, RuntimeComponentService service, Binding binding) {
-        super();
-        this.component = component;
-        this.service = service;
-        this.binding = binding;
-    }
-
-    private PolicySet findPolicySet() {
-        if (binding instanceof PolicySetAttachPoint) {
-            List<PolicySet> policySets = ((PolicySetAttachPoint)binding).getApplicablePolicySets();
-            for (PolicySet ps : policySets) {
-                for (Object p : ps.getPolicies()) {
-                    if (JMSTokenAuthenticationPolicy.class.isInstance(p)) {
-                        return ps;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    private String getContext() {
-        return "component.service: " + component.getURI()
-            + "#"
-            + service.getName()
-            + "("
-            + binding.getClass().getName()
-            + ")";
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation)
-     */
-    public Interceptor createInterceptor(Operation operation) {
-        PolicySet ps = findPolicySet();
-        return ps == null ? null : new JMSTokenAuthenticationServicePolicyInterceptor(getContext(), operation, ps);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase()
-     */
-    public String getPhase() {
-        return Phase.SERVICE_POLICY;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java b/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
deleted file mode 100644
index 1c16e3fa1b..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
+++ /dev/null
@@ -1,131 +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.binding.jms.policy.header;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.policy.Policy;
-
-/**
- * Implementation for policies that could be injected as parameter
- * into the axis2config.
- *
- * @version $Rev$ $Date$
- */
-public class JMSHeaderPolicy implements Policy {
-    public static final QName JMS_HEADER_POLICY_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "jmsHeader");
-    public static final String JMS_HEADER_JMS_TYPE = "JMSType";
-    public static final String JMS_HEADER_JMS_CORRELATION_ID = "JMSCorrelationID";
-    public static final String JMS_HEADER_JMS_DELIVERY_MODE = "JMSDeliveryMode";
-    public static final String JMS_HEADER_JMS_TIME_TO_LIVE = "JMSTimeToLive";
-    public static final String JMS_HEADER_JMS_PRIORITY = "JMSPriority";
-    public static final String JMS_HEADER_JMS_PROPERTY = "property";
-    public static final String JMS_HEADER_JMS_PROPERTY_NAME = "name";
-
-    private String jmsType = null;
-    private String jmsCorrelationId = null;
-    private Boolean deliveryModePersistent = null;
-    private Long timeToLive = null;
-    private Integer jmsPriority = null;
-    private Map<String, String> properties = new Hashtable<String, String>();
-    
-    public String getJmsType() {
-        return jmsType;
-    }
-    
-    public void setJmsType(String jmsType) {
-        this.jmsType = jmsType;
-    }
-    
-    public String getJmsCorrelationId() {
-        return jmsCorrelationId;
-    }
-    
-    public void setJmsCorrelationId(String jmsCorrelationId) {
-        this.jmsCorrelationId = jmsCorrelationId;
-    }
-    
-    public Boolean getDeliveryModePersistent() {
-        return deliveryModePersistent;
-    }
-    
-    public void setDeliveryModePersistent(Boolean deliveryModePersistent) {
-        this.deliveryModePersistent = deliveryModePersistent;
-    }
-    
-    public Long getTimeToLive() {
-        return timeToLive;
-    }
-    
-    public void setTimeToLive(Long timeToLive) {
-        this.timeToLive = timeToLive;
-    }
-    
-    public Integer getJmsPriority() {
-        return jmsPriority;
-    }
-    
-    public void setJmsPriority(Integer jmsPriority) {
-        this.jmsPriority = jmsPriority;
-    }
-    
-    public Map<String, String> getProperties() {
-        return properties;
-    }
-  
-    public QName getSchemaName() {
-        return JMS_HEADER_POLICY_QNAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-    
-    @Override
-    public String toString() {
-        String result = "jmsHeader";
-        
-        result += " JMSType ";
-        result += getJmsType();
-        result += " JMSDeliveryMode ";
-        result += getJmsCorrelationId();
-        result += " JMSDeliveryMode ";
-        result += getDeliveryModePersistent();
-        result += " JMSTimeToLive ";
-        result += getTimeToLive();
-        result += " JMSPriority ";
-        result += getJmsPriority();
-        
-        for (String propertyName : properties.keySet()){
-            result += " property ";
-            result += propertyName;
-            result += " ";
-            result += properties.get(propertyName);
-        }
-        
-        return result;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java b/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
deleted file mode 100644
index d6167b4895..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
+++ /dev/null
@@ -1,210 +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.binding.jms.policy.header;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.logging.Level;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JMSHeaderPolicyProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<JMSHeaderPolicy> {
-    
-    private Monitor monitor;
-    
-    public QName getArtifactType() {
-        return JMSHeaderPolicy.JMS_HEADER_POLICY_QNAME;
-    }
-    
-    public JMSHeaderPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Marshals warnings into the monitor
-     * 
-     * @param message
-     * @param model
-     * @param messageParameters
-     */
-    protected void warning(String message, Object model, String... messageParameters) {
-        if (monitor != null){
-            Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-xml-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-    
-    /**
-     * Marshals errors into the monitor
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    protected void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }    
-
-    
-    public JMSHeaderPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        JMSHeaderPolicy policy = new JMSHeaderPolicy();
-        int event = reader.getEventType();
-        QName name = null;
-        
-        while (reader.hasNext()) {
-            event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT : {
-                    name = reader.getName();
-                    if ( name.equals(getArtifactType()) ) {
-                        
-                        policy.setJmsType(getString(reader, JMSHeaderPolicy.JMS_HEADER_JMS_TYPE));
-                        policy.setJmsCorrelationId(getString(reader, JMSHeaderPolicy.JMS_HEADER_JMS_CORRELATION_ID));
-                        
-                        String deliveryMode = getString(reader, JMSHeaderPolicy.JMS_HEADER_JMS_DELIVERY_MODE);
-                        if (deliveryMode != null){
-                            if (deliveryMode.equals("PERSISTENT")) {
-                                policy.setDeliveryModePersistent(true);
-                            } else if (deliveryMode.equals("NON_PERSISTENT")){
-                                policy.setDeliveryModePersistent(false);
-                            } else {
-                                error("InvalidDeliveryMode", policy, deliveryMode);
-                            }  
-                        }
-                        
-                        String timeToLive = getString(reader, JMSHeaderPolicy.JMS_HEADER_JMS_TIME_TO_LIVE);
-                        
-                        if ( timeToLive != null){
-                            try {
-                                policy.setTimeToLive(Long.valueOf(timeToLive));
-                            } catch (NumberFormatException ex){
-                                error("InvalidTimeToLive", policy, timeToLive);
-                            }
-                        }
-                        
-                        String priority = getString(reader, JMSHeaderPolicy.JMS_HEADER_JMS_PRIORITY);
-                        
-                        if ( priority != null){
-                            try {
-                                policy.setJmsPriority(Integer.valueOf(priority));
-                            } catch (NumberFormatException ex){
-                                error("InvalidPriority", policy, priority);
-                            }                                
-                        }
-                    } else if (name.getLocalPart().equals(JMSHeaderPolicy.JMS_HEADER_JMS_PROPERTY)) {
-                        String propertyName = getString(reader, JMSHeaderPolicy.JMS_HEADER_JMS_PROPERTY_NAME);
-                        String propertyValue = reader.getElementText();
-                        policy.getProperties().put(propertyName, propertyValue);
-                    } 
-                    break;
-                }
-            }
-            
-            if ( event == END_ELEMENT ) {
-                if ( getArtifactType().equals(reader.getName()) ) {
-                    break;
-                } 
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-         
-        return policy;
-    }
-
-    public void write(JMSHeaderPolicy policy, XMLStreamWriter writer) 
-        throws ContributionWriteException, XMLStreamException {
-        String prefix = "tuscany";
-        writer.writeStartElement(prefix, 
-                                 getArtifactType().getLocalPart(),
-                                 getArtifactType().getNamespaceURI());
-        writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS);
-        
-        if (policy.getJmsType() != null){
-            writer.writeAttribute(JMSHeaderPolicy.JMS_HEADER_JMS_TYPE, policy.getJmsType());
-        }
-        
-        if (policy.getJmsCorrelationId() != null){
-            writer.writeAttribute(JMSHeaderPolicy.JMS_HEADER_JMS_CORRELATION_ID, policy.getJmsCorrelationId());
-        } 
-        
-        if (policy.getDeliveryModePersistent() == true){
-            writer.writeAttribute(JMSHeaderPolicy.JMS_HEADER_JMS_DELIVERY_MODE, "PERSISTENT");
-        } else {
-            writer.writeAttribute(JMSHeaderPolicy.JMS_HEADER_JMS_DELIVERY_MODE, "NON_PERSISTENT");
-        }
-        
-        if (policy.getTimeToLive()!= null){
-            writer.writeAttribute(JMSHeaderPolicy.JMS_HEADER_JMS_TIME_TO_LIVE, policy.getTimeToLive().toString());
-        }    
-        
-        if (policy.getJmsPriority()!= null){
-            writer.writeAttribute(JMSHeaderPolicy.JMS_HEADER_JMS_PRIORITY, policy.getJmsPriority().toString());
-        }          
-        
-        for (String propertyName : policy.getProperties().keySet()){
-            writer.writeStartElement(prefix, 
-                                     JMSHeaderPolicy.JMS_HEADER_JMS_PROPERTY,
-                                     getArtifactType().getNamespaceURI());
-            writer.writeAttribute(JMSHeaderPolicy.JMS_HEADER_JMS_PROPERTY_NAME, propertyName);
-            writer.writeCharacters(policy.getProperties().get(propertyName));
-            writer.writeEndElement();
-        }    
-        
-        writer.writeEndElement();
-    }
-
-    public Class<JMSHeaderPolicy> getModelType() {
-        return JMSHeaderPolicy.class;
-    }
-
-    public void resolve(JMSHeaderPolicy arg0, ModelResolver arg1) throws ContributionResolveException {
-
-    }
-    
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java b/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java
deleted file mode 100644
index ded3da05b9..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.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.binding.jms.policy.header;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JMSHeaderPolicyProviderFactory implements PolicyProviderFactory<JMSHeaderPolicy> {
-    private ExtensionPointRegistry registry;
-    
-    public JMSHeaderPolicyProviderFactory(ExtensionPointRegistry registry) {
-        super();
-        this.registry = registry;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createImplementationPolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.assembly.Implementation)
-     */
-    public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) {
-        return null;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createReferencePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentReference, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public PolicyProvider createReferencePolicyProvider(RuntimeComponent component,
-                                                        RuntimeComponentReference reference,
-                                                        Binding binding) {
-        return new JMSHeaderReferencePolicyProvider(component, reference, binding);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createServicePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentService, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public PolicyProvider createServicePolicyProvider(RuntimeComponent component,
-                                                      RuntimeComponentService service,
-                                                      Binding binding) {
-        return null;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()
-     */
-    public Class getModelType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java b/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
deleted file mode 100644
index 19069378ef..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
+++ /dev/null
@@ -1,130 +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.binding.jms.policy.header;
-
-
-import java.util.Map;
-
-import javax.jms.DeliveryMode;
-import javax.jms.JMSException;
-import javax.security.auth.Subject;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.policy.JMSBindingDefinitionsProvider;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.SecurityUtil;
-import org.apache.tuscany.sca.policy.authentication.token.TokenPrincipal;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
- *
- * @version $Rev$ $Date$
- */
-public class JMSHeaderReferencePolicyInterceptor implements Interceptor {
-
-    private Invoker next;
-    private RuntimeComponent component;
-    private RuntimeComponentReference reference;
-    private JMSBinding jmsBinding;
-    private PolicySet policySet = null;
-    private String context;
-    private JMSHeaderPolicy jmsHeaderPolicy;
-
-    public JMSHeaderReferencePolicyInterceptor(String context, RuntimeComponent component, RuntimeComponentReference reference, Binding binding, PolicySet policySet) {
-        super();
-        this.component = component;
-        this.reference = reference;
-        this.jmsBinding = (JMSBinding)binding;
-        this.policySet = policySet;
-        this.context = context;
-        
-        init();
-    }
-
-    private void init() {
-        if (policySet != null) {
-            for (Object policyObject : policySet.getPolicies()){
-                if (policyObject instanceof JMSHeaderPolicy){
-                    jmsHeaderPolicy = (JMSHeaderPolicy)policyObject;
-                    break;
-                }
-            }
-        }
-    }
-
-    public Message invoke(Message msg) {
-        try {
-            javax.jms.Message jmsMsg = msg.getBody();
-            String operationName = msg.getOperation().getName();
-    
-            if ((jmsHeaderPolicy != null) && 
-                (jmsHeaderPolicy.getDeliveryModePersistent() != null)) {
-                if (jmsHeaderPolicy.getDeliveryModePersistent()) {
-                    jmsMsg.setJMSDeliveryMode(DeliveryMode.PERSISTENT);
-                } else {
-                    jmsMsg.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT);
-                }
-                
-            } 
-    
-            if ((jmsHeaderPolicy != null) && 
-                (jmsHeaderPolicy.getJmsCorrelationId() != null)) {
-                jmsMsg.setJMSCorrelationID(jmsHeaderPolicy.getJmsCorrelationId());
-            } 
-    
-            if ((jmsHeaderPolicy != null) && 
-                (jmsHeaderPolicy.getJmsPriority() != null)) {
-                jmsMsg.setJMSPriority(jmsHeaderPolicy.getJmsPriority());
-            } 
-    
-            if ((jmsHeaderPolicy != null) && 
-                (jmsHeaderPolicy.getJmsType() != null)) {
-                jmsMsg.setJMSType(jmsHeaderPolicy.getJmsType());
-            } 
-           
-            if (jmsHeaderPolicy != null){
-                for (String propName : jmsHeaderPolicy.getProperties().keySet()) {
-                    jmsMsg.setObjectProperty(propName, jmsHeaderPolicy.getProperties().get(propName));
-                }
-            }
-                        
-            return getNext().invoke(msg);
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        } 
-    }
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java b/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
deleted file mode 100644
index 7a9318407e..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
+++ /dev/null
@@ -1,95 +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.binding.jms.policy.header;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderRRB;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JMSHeaderReferencePolicyProvider implements PolicyProviderRRB {
-    private RuntimeComponent component;
-    private RuntimeComponentReference reference;
-    private Binding binding;
-
-    public JMSHeaderReferencePolicyProvider(RuntimeComponent component,
-                                             RuntimeComponentReference reference,
-                                             Binding binding) {
-        super();
-        this.component = component;
-        this.reference = reference;
-        this.binding = binding;
-    }
-
-    private PolicySet findPolicySet() {
-        if (binding instanceof PolicySetAttachPoint) {
-            List<PolicySet> policySets = ((PolicySetAttachPoint)binding).getApplicablePolicySets();
-            for (PolicySet ps : policySets) {
-                for (Object p : ps.getPolicies()) {
-                    if (JMSHeaderPolicy.class.isInstance(p)) {
-                        return ps;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    private String getContext() {
-        return "component.reference: " + component.getURI()
-            + "#"
-            + reference.getName()
-            + "("
-            + binding.getClass().getName()
-            + ")";
-    }
-    
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation)
-     */
-    public Interceptor createInterceptor(Operation operation) {
-        return null;
-    }
-    
-    public Interceptor createBindingInterceptor() {
-        PolicySet ps = findPolicySet();
-        return ps == null ? null : new JMSHeaderReferencePolicyInterceptor(getContext(), component, reference, binding, ps);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase()
-     */
-    public String getPhase() {
-        return Phase.REFERENCE_BINDING_POLICY;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index e6f22e327c..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,20 +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. 

-

-# Implementation class for the artifact processor extension

-org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#jmsTokenAuthentication,model=org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy

-org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#jmsHeader,model=org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicy
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
deleted file mode 100644
index b04c71d8e3..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the policy extension

-org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicyProviderFactory;model=org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
deleted file mode 100644
index 0598cdc368..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for SCA Definitions Providers

-org.apache.tuscany.sca.binding.jms.policy.JMSBindingDefinitionsProvider
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties b/java/sca-contrib/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties
deleted file mode 100644
index fd43b2c4e9..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties
+++ /dev/null
@@ -1,23 +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.
-#
-#
-InvalidDeliveryMode = JMSDeliveryMode must be either PERSISTENT or NON_PERSISTENT but found {0}
-InvalidTimeToLive = JMSTimeToLive must be a long integer but found {0}
-InvalidPriority = JMSPriority must be a integer but found {0}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml b/java/sca-contrib/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
deleted file mode 100644
index 66ec011844..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 			 targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- 			 xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <!-- intents not yet enabled -->
-    <!--sca:bindingType type="sca:binding.jms"  
-                     alwaysProvides="JMS"
-                     mayProvide="atLeastOnce atMostOnce ordered conversation" /-->
-
-    <!-- PolicyIntents defined by the SCA Runtime Extension for JMS Binding -->
-    
-    <sca:intent name="JMS" constrains="sca:binding.jms">
-        <sca:description>
-            Communication through this binding requires JMS
-        </sca:description>
-    </sca:intent>
-    
-    <!-- delivery mode -->
-    <intent name="deliveryMode" 
-            constrains="sca:binding.jms">
-        <description>
-            This intent is used to indicate the deliver mode
-            of the sent message
-        </description>
-    </intent>
-    
-    <intent name="deliveryMode.persistent">
-        <description>
-            Message are sent persistently
-        </description>
-    </intent>
-    
-    <intent name="deliveryMode.nonPersistent">
-        <description>
-            Message are sent persistently
-        </description>
-    </intent>
-        
-    <!-- priority -->
-	<intent name="priority" 
-	 		constrains="sca:binding.jms">
-		<description>
-            This intent is used to indicate the priority of the 
-            sent message
-		</description>
-	</intent>
-    
-    <intent name="priority.high">
-        <description>
-            Messages are high priority
-        </description>
-    </intent>   
-    
-    <intent name="priority.medium">
-        <description>
-            Messages are meduim priority
-        </description>
-    </intent>
-	  
-    <intent name="priority.low">
-        <description>
-            Messages are low priority
-        </description>
-    </intent>      
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java b/java/sca-contrib/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
deleted file mode 100644
index a9da07ca7d..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
+++ /dev/null
@@ -1,91 +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.binding.jms.policy;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy;
-import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicyProcessor;
-import org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicy;
-import org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicyProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.policy.Policy;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PolicyProcessorTestCase {
-    private final static List<String> SEQ =
-        Arrays.asList("<tuscany:jmsHeader xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\" JMSType=\"ABC\" JMSDeliveryMode=\"PERSISTENT\" JMSTimeToLive=\"123\" JMSPriority=\"4\"><tuscany:property name=\"aProperty\">property value</tuscany:property></tuscany:jmsHeader>",
-                      "<tuscany:jmsTokenAuthentication xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\" tuscany:tokenName=\"{http://tuscany.apache.org/foo}myname\" />");
-    
-    @Test
-    public void testRead() throws Exception {
-        List<String> results = new ArrayList<String>();
-        Map<QName, StAXArtifactProcessor> processors = new HashMap<QName, StAXArtifactProcessor>();
-        processors.put(JMSHeaderPolicy.JMS_HEADER_POLICY_QNAME, new JMSHeaderPolicyProcessor(null, null));
-        processors.put(JMSTokenAuthenticationPolicy.JMS_TOKEN_AUTHENTICATION_POLICY_QNAME, new JMSTokenAuthenticationPolicyProcessor(null, null));
-        
-        InputStream is = getClass().getResourceAsStream("mock_policy_definitions.xml");
-        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        
-        XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
-        
-        while (true) {
-            int event = reader.getEventType();
-            if (event == XMLStreamConstants.START_ELEMENT) {
-                if ("policySet".equals(reader.getName().getLocalPart())) {
-                    reader.nextTag();
-                    StAXArtifactProcessor processor = processors.get(reader.getName());
-                    Policy policy = (Policy)processor.read(reader);
-
-                    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                    XMLStreamWriter writer = outputFactory.createXMLStreamWriter(outputStream);
-                    processor.write(policy, writer);
-                    writer.flush();
-                    results.add(outputStream.toString());
-                }
-            }
-            if (reader.hasNext()) {
-                reader.next();
-            } else {
-                break;
-            }
-        }
-        Assert.assertEquals(SEQ, results);
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml b/java/sca-contrib/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml
deleted file mode 100644
index 3631c682aa..0000000000
--- a/java/sca-contrib/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-             targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-             
-    <!-- POLICY SETS -->
-    <policySet name="ps1" provides="authorization" appliesTo="sca:implementation">
-        <tuscany:jmsHeader JMSType="ABC" 
-                           JMSCorrelattionID="DEF"
-                           JMSDeliveryMode="PERSISTENT"
-                           JMSTimeToLive="123"
-                           JMSPriority="4">
-            <property name="aProperty">property value</property>
-        </tuscany:jmsHeader>
-    </policySet>
-    
-    <policySet name="ps2" provides="authorization" appliesTo="sca:implementation">
-        <tuscany:jmsTokenAuthentication xmlns:foo="http://tuscany.apache.org/foo" tokenName="foo:myname"/>
-    </policySet>
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-jms-runtime/LICENSE b/java/sca-contrib/modules/binding-jms-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/binding-jms-runtime/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-jms-runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 183f1446a6..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.jms.provider;uses:="org

- .apache.tuscany.sca.runtime,javax.jms,org.apache.tuscany.sca.provider

- ,org.apache.tuscany.sca.core,org.apache.axiom.om,javax.xml.stream,org

- .apache.tuscany.sca.binding.jms,org.apache.tuscany.sca.core.assembly,

- org.oasisopen.sca,org.apache.tuscany.sca.core.invocation,javax.naming,org.

- apache.tuscany.sca.assembly,org.apache.tuscany.sca.binding.ws.wsdlgen

- ,org.apache.axiom.om.impl.builder,org.apache.tuscany.sca.interfacedef

- .java,org.apache.tuscany.sca.monitor,org.apache.tuscany.sca.interface

- def,org.apache.tuscany.sca.invocation,org.apache.tuscany.sca.binding.

- ws,org.apache.tuscany.sca.work";version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA JMS Binding Runtime

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397307750

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA JMS Binding Runtime

-Import-Package: javax.jms,

- javax.naming,

- javax.xml.stream,

- org.apache.axiom.om,

- org.apache.axiom.om.impl.builder,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.binding.jms;version="2.0.0",

- org.apache.tuscany.sca.binding.jms.provider;version="2.0.0",

- org.apache.tuscany.sca.binding.jms.xml;version="2.0.0",

- org.apache.tuscany.sca.binding.ws;version="2.0.0",

- org.apache.tuscany.sca.binding.ws.wsdlgen;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.core.assembly;version="2.0.0",

- org.apache.tuscany.sca.core.invocation;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.apache.tuscany.sca.work;version="2.0.0",

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.jms.runtime

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-jms-runtime/NOTICE b/java/sca-contrib/modules/binding-jms-runtime/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/binding-jms-runtime/pom.xml b/java/sca-contrib/modules/binding-jms-runtime/pom.xml
deleted file mode 100644
index e4322210af..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/pom.xml
+++ /dev/null
@@ -1,123 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-binding-jms-runtime</artifactId>
-    <name>Apache Tuscany SCA JMS Binding Runtime</name>
-
-    <dependencies>
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-policy</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-        <dependency>
-           <groupId>org.apache.geronimo.specs</groupId>
-           <artifactId>geronimo-jms_1.1_spec</artifactId>
-           <version>1.1</version>
-           <scope>provided</scope>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.apache.geronimo.specs</groupId>
-                   <artifactId>geronimo-jms_1.1_spec</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-    </dependencies>
-    
-</project>
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
deleted file mode 100644
index bc2e783569..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
+++ /dev/null
@@ -1,82 +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.binding.jms.context;
-
-import javax.jms.Destination;
-import javax.jms.Message;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-
-
-/**
- * Context that the JMS binding puts on the Tuscany wire
- *
- * @version $Rev$ $Date$
- */
-public class JMSBindingContext {
-
-    private Message jmsMsg;
-    private Session jmsSession;
-    private Destination requestDestination;
-    private Destination replyToDestination;
-    private JMSResourceFactory jmsResourceFactory;
-
-    public Message getJmsMsg() {
-        return jmsMsg;
-    }
-    
-    public void setJmsMsg(Message jmsMsg) {
-        this.jmsMsg = jmsMsg;
-    }
-    
-    public Session getJmsSession() {
-        return jmsSession;
-    }
-    
-    public void setJmsSession(Session jmsSession) {
-        this.jmsSession = jmsSession;
-    }
-    
-    public Destination getRequestDestination() {
-        return requestDestination;
-    }
-    
-    public void setRequestDestination(Destination requestDestination) {
-        this.requestDestination = requestDestination;
-    }
-    
-    public Destination getReplyToDestination() {
-        return replyToDestination;
-    }
-    
-    public void setReplyToDestination(Destination replyToDestination) {
-        this.replyToDestination = replyToDestination;
-    }
-    
-    // TODO - difficult to get the resource factory into all the JMS providers
-    //        so it's here for the moment
-    public JMSResourceFactory getJmsResourceFactory() {
-        return jmsResourceFactory;
-    }
-    
-    public void setJmsResourceFactory(JMSResourceFactory jmsResourceFactory) {
-        this.jmsResourceFactory = jmsResourceFactory;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
deleted file mode 100644
index 8a73627ba3..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
+++ /dev/null
@@ -1,174 +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.binding.jms.headers;
-
-
-
-
-import java.util.Map;
-
-import javax.jms.DeliveryMode;
-import javax.jms.JMSException;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.provider.JMSBindingServiceBindingProvider;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class HeaderReferenceInterceptor implements Interceptor {
-
-    private Invoker next;
-    private RuntimeWire runtimeWire;
-    private JMSResourceFactory jmsResourceFactory;
-    private JMSBinding jmsBinding;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-    private String correlationScheme;
-    private WireFormat requestWireFormat;
-    private WireFormat responseWireFormat;
-
-    public HeaderReferenceInterceptor(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeWire runtimeWire) {
-        super();
-        this.jmsBinding = jmsBinding;
-        this.runtimeWire = runtimeWire;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-        this.correlationScheme = jmsBinding.getCorrelationScheme();
-        
-    }
-
-    public Message invoke(Message msg) {
-        
-        return next.invoke(invokeRequest(msg));
-
-    }
-    
-    public Message invokeRequest(Message tuscanyMsg) {
-        try {
-            // get the jms context
-            JMSBindingContext context = (JMSBindingContext)tuscanyMsg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-            javax.jms.Message jmsMsg = (javax.jms.Message)tuscanyMsg.getBody();
-            
-            Operation operation = tuscanyMsg.getOperation();
-            String operationName = operation.getName();
-            RuntimeComponentReference reference = (RuntimeComponentReference)runtimeWire.getSource().getContract();
-            
-            requestMessageProcessor.setOperationName(jmsBinding.getNativeOperationName(operationName), jmsMsg);
-    
-            if (jmsBinding.getOperationJMSDeliveryMode(operationName) != null) {
-                if (jmsBinding.getOperationJMSDeliveryMode(operationName)) {
-                    jmsMsg.setJMSDeliveryMode(DeliveryMode.PERSISTENT);
-                } else {
-                    jmsMsg.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT);
-                }
-            }
-    
-            if (jmsBinding.getOperationJMSCorrelationId(operationName) != null) {
-                jmsMsg.setJMSCorrelationID(jmsBinding.getOperationJMSCorrelationId(operationName));
-            }
-    
-            if (jmsBinding.getOperationJMSPriority(operationName) != null) {
-                jmsMsg.setJMSPriority(jmsBinding.getOperationJMSPriority(operationName));
-            }
-    
-            if (jmsBinding.getOperationJMSType(operationName) != null) {
-                jmsMsg.setJMSType(jmsBinding.getOperationJMSType(operationName));
-            }
-    
-            ReferenceParameters parameters = tuscanyMsg.getFrom().getReferenceParameters();
-    
-            Object conversationID = parameters.getConversationID();
-            if (conversationID != null) {
-                jmsMsg.setStringProperty(JMSBindingConstants.CONVERSATION_ID_PROPERTY, conversationID.toString());
-            }
-    
-            if (tuscanyMsg.getFrom().getCallbackEndpoint() != null) {
-    
-                if (parameters.getCallbackID() != null) {
-                    jmsMsg.setStringProperty(JMSBindingConstants.CALLBACK_ID_PROPERTY, parameters.getCallbackID().toString());
-                }
-    
-                String callbackDestName = getCallbackDestinationName(reference);
-                if (callbackDestName != null) {
-                    jmsMsg.setStringProperty(JMSBindingConstants.CALLBACK_Q_PROPERTY, callbackDestName);
-                }
-            }
-            
-            for (String propName : jmsBinding.getPropertyNames()) {
-                Object value = jmsBinding.getProperty(propName);
-                jmsMsg.setObjectProperty(propName, value);
-            }
-    
-            Map<String, Object> operationProperties = jmsBinding.getOperationProperties(operationName);
-            if (operationProperties != null) {
-                for (String propName : operationProperties.keySet()) {
-                    Object value = operationProperties.get(propName);
-                    jmsMsg.setObjectProperty(propName, value);
-                }
-            }
-            
-            return tuscanyMsg;
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        } 
-    }
- 
-    
-    protected String getCallbackDestinationName(RuntimeComponentReference reference) {
-        RuntimeComponentService s = (RuntimeComponentService)reference.getCallbackService();
-        JMSBinding b = s.getBinding(JMSBinding.class);
-        if (b != null) {
-            JMSBindingServiceBindingProvider bp = (JMSBindingServiceBindingProvider)s.getBindingProvider(b);
-            return bp.getDestinationName();
-        }
-        return null;
-    }  
-      
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-    
-  
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProviderFactory.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProviderFactory.java
deleted file mode 100644
index a4d0ccafb3..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProviderFactory.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 org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.OperationSelectorProvider;
-import org.apache.tuscany.sca.provider.OperationSelectorProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class OperationSelectorJMSDefaultProviderFactory implements OperationSelectorProviderFactory<OperationSelectorJMSDefault> {
-    private ExtensionPointRegistry registry;
-    
-    public OperationSelectorJMSDefaultProviderFactory(ExtensionPointRegistry registry) {
-        super();
-        this.registry = registry;
-    }
-    
-    /**
-     */
-    public OperationSelectorProvider createReferenceOperationSelectorProvider(RuntimeComponent component,
-                                                        RuntimeComponentReference reference,
-                                                        Binding binding) {
-        return null;
-    }
-
-    /**
-      */
-    public OperationSelectorProvider createServiceOperationSelectorProvider(RuntimeComponent component,
-                                                              RuntimeComponentService service,
-                                                              Binding binding) {
-        return new OperationSelectorJMSDefaultServiceProvider(component, service, binding);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()
-     */
-    public Class getModelType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceInterceptor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceInterceptor.java
deleted file mode 100644
index d765e08d79..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceInterceptor.java
+++ /dev/null
@@ -1,167 +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.binding.jms.operationselector.jmsdefault;
-
-import java.util.List;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.Topic;
-
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
- *
- * @version $Rev$ $Date$
- */
-public class OperationSelectorJMSDefaultServiceInterceptor implements Interceptor {
-    
-    private static final String ON_MESSAGE_METHOD_NAME = "onMessage";
-    
-    private Invoker next;
-    private RuntimeWire runtimeWire;
-    private JMSResourceFactory jmsResourceFactory;
-    private JMSBinding jmsBinding;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-    private RuntimeComponentService service;
-    private List<Operation> serviceOperations;
-    
-
-    public OperationSelectorJMSDefaultServiceInterceptor(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeWire runtimeWire) {
-        super();
-        this.jmsBinding = jmsBinding;
-        this.runtimeWire = runtimeWire;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-        this.service = (RuntimeComponentService)runtimeWire.getTarget().getContract();
-        this.serviceOperations = service.getInterfaceContract().getInterface().getOperations();
-    }
-    
-    public Message invoke(Message msg) {
-        return next.invoke(invokeRequest(msg));
-    }    
-    
-    public Message invokeRequest(Message msg) { 
-        try {
-            // get the jms context
-            JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-            javax.jms.Message jmsMsg = context.getJmsMsg();
-            
-            String operationName = requestMessageProcessor.getOperationName(jmsMsg);
-            Operation operation = getTargetOperation(operationName);
-            msg.setOperation(operation);
-            
-            ReferenceParameters parameters = msg.getFrom().getReferenceParameters();
-            
-            if (service.getInterfaceContract().getCallbackInterface() != null) {
-                
-                String callbackdestName = jmsMsg.getStringProperty(JMSBindingConstants.CALLBACK_Q_PROPERTY);
-                if (callbackdestName == null && msg.getOperation().isNonBlocking()) {
-                    // if the request has a replyTo but this service operation is oneway but the service uses callbacks
-                    // then use the replyTo as the callback destination
-                    Destination replyTo = jmsMsg.getJMSReplyTo();
-                    if (replyTo != null) {
-                        callbackdestName = (replyTo instanceof Queue) ? ((Queue)replyTo).getQueueName() : ((Topic)replyTo).getTopicName();
-                    }
-                }
-    
-                if (callbackdestName != null) {
-                    // append "jms:" to make it an absolute uri so the invoker can determine it came in on the request
-                    // as otherwise the invoker should use the uri from the service callback binding
-                    parameters.setCallbackReference(new EndpointReferenceImpl("jms:" + callbackdestName));
-                }
-    
-                String callbackID = jmsMsg.getStringProperty(JMSBindingConstants.CALLBACK_ID_PROPERTY);
-                if (callbackID != null) {
-                    parameters.setCallbackID(callbackID);
-                }
-            }        
-            
-            return msg;
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }  
-    
-    protected Operation getTargetOperation(String operationName) {
-        Operation operation = null;
-
-        if (serviceOperations.size() == 1) {
-
-            // SCA JMS Binding Specification - Rule 1.5.1 line 203
-            operation = serviceOperations.get(0);
-
-        } else if (operationName != null) {
-
-            // SCA JMS Binding Specification - Rule 1.5.1 line 205
-            for (Operation op : serviceOperations) {
-                if (op.getName().equals(operationName)) {
-                    operation = op;
-                    break;
-                }
-            }
-
-        } else {
-
-            // SCA JMS Binding Specification - Rule 1.5.1 line 207
-            for (Operation op : serviceOperations) {
-                if (op.getName().equals(ON_MESSAGE_METHOD_NAME)) {
-                    operation = op;
-                    break;
-                }
-            }
-        }
-
-        if (operation == null) {
-            throw new JMSBindingException("Can't find operation " + (operationName != null ? operationName : ON_MESSAGE_METHOD_NAME));
-        }
-
-        return operation;
-    }
-    
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }    
-   
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceProvider.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceProvider.java
deleted file mode 100644
index 54c3eb54eb..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceProvider.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 org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.provider.OperationSelectorProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class OperationSelectorJMSDefaultServiceProvider implements OperationSelectorProvider {
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private Binding binding;
-
-    public OperationSelectorJMSDefaultServiceProvider(RuntimeComponent component, RuntimeComponentService service, Binding binding) {
-        super();
-        this.component = component;
-        this.service = service;
-        this.binding = binding;
-    }
-
-    /**
-     */
-    public Interceptor createInterceptor() {
-        return new OperationSelectorJMSDefaultServiceInterceptor((JMSBinding)binding,
-                                                                 null,
-                                                                 service.getRuntimeWire(binding));
-    }
-
-    /**
-     */
-    public String getPhase() {
-        return Phase.SERVICE_BINDING_OPERATION_SELECTOR;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
deleted file mode 100644
index d73b51e9ae..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
+++ /dev/null
@@ -1,117 +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.binding.jms.provider;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.binding.jms.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.xml.JMSBindingConstants;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * Base MessageProcessor for the JMSBinding.
- * 
- * @version $Rev$ $Date$
- */
-public abstract class AbstractMessageProcessor implements JMSMessageProcessor {
-
-    protected String operationPropertyName;
-    protected boolean xmlFormat = true;
-
-    public AbstractMessageProcessor(JMSBinding jmsBinding) {
-        this.operationPropertyName = jmsBinding.getOperationSelectorPropertyName();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.binding.jms.OperationAndDataBinding#getOperationName(javax.jms.Message)
-     */
-    public String getOperationName(Message message) {
-        try {
-
-            return message.getStringProperty(operationPropertyName);
-
-        } catch (JMSException e) {
-            throw new JMSBindingException("Exception retreiving operation name from message", e);
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.binding.jms.OperationAndDataBinding#setOperationName(javax.jms.Message, java.lang.String)
-     */
-    public void setOperationName(String operationName, Message message) {
-        try {
-
-            message.setStringProperty(operationPropertyName, operationName);
-
-        } catch (JMSException e) {
-            throw new JMSBindingException("Exception setting the operation name on message", e);
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.binding.jms.OperationAndDataBinding#extractPayload(javax.jms.Session, java.lang.Object)
-     */
-    public Message insertPayloadIntoJMSMessage(Session session, Object o) {
-        return createJMSMessage(session, o);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.binding.jms.OperationAndDataBinding#extractPayload(javax.jms.Message)
-     */
-    public Object extractPayloadFromJMSMessage(Message msg) {
-        try {
-            if (msg.getBooleanProperty(JMSBindingConstants.FAULT_PROPERTY)) {
-                throw new ServiceRuntimeException("remote service exception, see nested exception", (Throwable)((ObjectMessage)msg).getObject());
-            }
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-        return extractPayload(msg);
-    }
-
-    public Message createFaultMessage(Session session, Throwable o) {
-        try {
-
-            ObjectMessage message = session.createObjectMessage();
-            message.setObject(o);
-            message.setBooleanProperty(JMSBindingConstants.FAULT_PROPERTY, true);
-            return message;
-
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-
-    protected abstract Object[] extractPayload(Message msg);
-
-    protected abstract Message createJMSMessage(Session session, Object o);
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
deleted file mode 100644
index 44b2e3b990..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.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.binding.jms.provider;
-
-import javax.jms.BytesMessage;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-
-/**
- * MessageProcessor for sending/receiving javax.jms.BytesMessage with the JMSBinding.
- * 
- * @version $Rev$ $Date$
- */
-public class BytesMessageProcessor extends AbstractMessageProcessor {
-
-    public BytesMessageProcessor(JMSBinding jmsBinding) {
-        super(jmsBinding);
-    }
-
-    @Override
-    protected Object[] extractPayload(Message msg) {
-        try {
-
-            if (!(msg instanceof BytesMessage)) {
-                throw new IllegalStateException("expecting JMS BytesMessage: " + msg);
-            }
-            
-            long noOfBytes = ((BytesMessage)msg).getBodyLength();
-            byte [] bytes = new byte[(int)noOfBytes];
-            ((BytesMessage)msg).readBytes(bytes);
-            return new Object[] {bytes};
-
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-
-    @Override
-    protected Message createJMSMessage(Session session, Object o) {
-        try {
-
-            // TODO - an experiment. How to enforce a single
-            //        byte array parameter
-            BytesMessage message = session.createBytesMessage();
-            byte [] bytes = (byte[])((Object[])o)[0];
-            message.writeBytes(bytes); 
-            return message;
-
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSBindingListener.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSBindingListener.java
deleted file mode 100644
index 9b8bee92c9..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSBindingListener.java
+++ /dev/null
@@ -1,266 +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.binding.jms.provider;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.naming.NamingException;
-import javax.security.auth.Subject;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy;
-import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
-import org.apache.tuscany.sca.core.invocation.MessageImpl;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.SecurityUtil;
-import org.apache.tuscany.sca.policy.authentication.token.TokenPrincipal;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Listener for the JMSBinding.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultJMSBindingListener implements MessageListener {
-
-    private static final Logger logger = Logger.getLogger(DefaultJMSBindingListener.class.getName());
-
-    private static final String ON_MESSAGE_METHOD_NAME = "onMessage";
-    private JMSBinding jmsBinding;
-    private Binding targetBinding;
-    private JMSResourceFactory jmsResourceFactory;
-    private RuntimeComponentService service;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-    private String correlationScheme;
-    private List<Operation> serviceOperations;
-    protected JMSTokenAuthenticationPolicy jmsTokenAuthenticationPolicy = null;
-
-    public DefaultJMSBindingListener(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeComponentService service, Binding targetBinding) throws NamingException {
-        this.jmsBinding = jmsBinding;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.service = service;
-        this.targetBinding = targetBinding;
-        requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-        correlationScheme = jmsBinding.getCorrelationScheme();
-        serviceOperations = service.getInterfaceContract().getInterface().getOperations();
-        
-        // find out which policies are active
-        if (jmsBinding instanceof PolicySetAttachPoint) {
-            List<PolicySet> policySets = ((PolicySetAttachPoint)jmsBinding).getApplicablePolicySets();
-            for (PolicySet ps : policySets) {
-                for (Object p : ps.getPolicies()) {
-                    if (JMSTokenAuthenticationPolicy.class.isInstance(p)) {
-                        jmsTokenAuthenticationPolicy = (JMSTokenAuthenticationPolicy)p;
-                    }else {
-                        // etc. check for other types of policy being present
-                    }
-                }
-            }
-        }        
-
-    }
-
-    public void onMessage(Message requestJMSMsg) {
-        logger.log(Level.FINE, "JMS service '" + service.getName() + "' received message " + requestJMSMsg);
-        try {
-            Object responsePayload = invokeService(requestJMSMsg);
-            sendReply(requestJMSMsg, responsePayload, false);
-        } catch (Throwable e) {
-            logger.log(Level.SEVERE, "Exception invoking service '" + service.getName(), e);
-            sendReply(requestJMSMsg, e, true);
-        }
-    }
-
-    /**
-     * Turn the JMS message back into a Tuscany message and invoke the target component
-     * 
-     * @param requestJMSMsg
-     * @return
-     * @throws JMSException
-     * @throws InvocationTargetException
-     */
-    protected Object invokeService(Message requestJMSMsg) throws JMSException, InvocationTargetException {
-
-        String operationName = requestMessageProcessor.getOperationName(requestJMSMsg);
-        Operation operation = getTargetOperation(operationName);
-
-        MessageImpl tuscanyMsg = new MessageImpl();
-        tuscanyMsg.setOperation(operation);
-        if ("onMessage".equals(operation.getName())) {
-            tuscanyMsg.setBody(new Object[]{requestJMSMsg});
-        } else {
-            Object requestPayload = requestMessageProcessor.extractPayloadFromJMSMessage(requestJMSMsg);
-            tuscanyMsg.setBody(requestPayload);
-        }
-
-        setHeaderProperties(requestJMSMsg, tuscanyMsg, operation);
-
-        return service.getRuntimeWire(targetBinding).invoke(operation, tuscanyMsg);
-    }
-
-    protected Operation getTargetOperation(String operationName) {
-        Operation operation = null;
-
-        if (serviceOperations.size() == 1) {
-
-            // SCA JMS Binding Specification - Rule 1.5.1 line 203
-            operation = serviceOperations.get(0);
-
-        } else if (operationName != null) {
-
-            // SCA JMS Binding Specification - Rule 1.5.1 line 205
-            for (Operation op : serviceOperations) {
-                if (op.getName().equals(operationName)) {
-                    operation = op;
-                    break;
-                }
-            }
-
-        } else {
-
-            // SCA JMS Binding Specification - Rule 1.5.1 line 207
-            for (Operation op : serviceOperations) {
-                if (op.getName().equals(ON_MESSAGE_METHOD_NAME)) {
-                    operation = op;
-                    break;
-                }
-            }
-        }
-
-        if (operation == null) {
-            throw new JMSBindingException("Can't find operation " + (operationName != null ? operationName : ON_MESSAGE_METHOD_NAME));
-        }
-
-        return operation;
-    }
-
-    protected void setHeaderProperties(Message requestJMSMsg, MessageImpl tuscanyMsg, Operation operation) throws JMSException {
-
-        EndpointReference from = new EndpointReferenceImpl(null);
-        tuscanyMsg.setFrom(from);
-        from.setCallbackEndpoint(new EndpointReferenceImpl("/")); // TODO: whats this for?
-        ReferenceParameters parameters = from.getReferenceParameters();
-
-        String conversationID = requestJMSMsg.getStringProperty(JMSBindingConstants.CONVERSATION_ID_PROPERTY);
-        if (conversationID != null) {
-            parameters.setConversationID(conversationID);
-        }
-
-        if (service.getInterfaceContract().getCallbackInterface() != null) {
-
-            String callbackdestName = requestJMSMsg.getStringProperty(JMSBindingConstants.CALLBACK_Q_PROPERTY);
-            if (callbackdestName == null && operation.isNonBlocking()) {
-                // if the request has a replyTo but this service operation is oneway but the service uses callbacks
-                // then use the replyTo as the callback destination
-                Destination replyTo = requestJMSMsg.getJMSReplyTo();
-                if (replyTo != null) {
-                    callbackdestName = (replyTo instanceof Queue) ? ((Queue)replyTo).getQueueName() : ((Topic)replyTo).getTopicName();
-                }
-            }
-
-            if (callbackdestName != null) {
-                // append "jms:" to make it an absolute uri so the invoker can determine it came in on the request
-                // as otherwise the invoker should use the uri from the service callback binding
-                parameters.setCallbackReference(new EndpointReferenceImpl("jms:" + callbackdestName));
-            }
-
-            String callbackID = requestJMSMsg.getStringProperty(JMSBindingConstants.CALLBACK_ID_PROPERTY);
-            if (callbackID != null) {
-                parameters.setCallbackID(callbackID);
-            }
-        }
-        
-        if (jmsTokenAuthenticationPolicy != null) {
-            String token = requestJMSMsg.getStringProperty(jmsTokenAuthenticationPolicy.getTokenName().toString());
-            
-            Subject subject = SecurityUtil.getSubject(tuscanyMsg);
-            TokenPrincipal principal = SecurityUtil.getPrincipal(subject, TokenPrincipal.class);
-            
-            if (principal == null){
-                principal = new TokenPrincipal(token);
-                subject.getPrincipals().add(principal);
-            }
-
-        }
-    }
-
-    protected void sendReply(Message requestJMSMsg, Object responsePayload, boolean isFault) {
-        try {
-
-            if (requestJMSMsg.getJMSReplyTo() == null) {
-                // assume no reply is expected
-                if (responsePayload != null) {
-                    logger.log(Level.FINE, "JMS service '" + service.getName() + "' dropped response as request has no replyTo");
-                }
-                return;
-            }
-
-            Session session = jmsResourceFactory.createSession();
-            Message replyJMSMsg;
-            if (isFault) {
-                replyJMSMsg = responseMessageProcessor.createFaultMessage(session, (Throwable)responsePayload);
-            } else {
-                replyJMSMsg = responseMessageProcessor.insertPayloadIntoJMSMessage(session, responsePayload);
-            }
-
-            replyJMSMsg.setJMSDeliveryMode(requestJMSMsg.getJMSDeliveryMode());
-            replyJMSMsg.setJMSPriority(requestJMSMsg.getJMSPriority());
-
-            if (correlationScheme == null || JMSBindingConstants.CORRELATE_MSG_ID.equalsIgnoreCase(correlationScheme)) {
-                replyJMSMsg.setJMSCorrelationID(requestJMSMsg.getJMSMessageID());
-            } else if (JMSBindingConstants.CORRELATE_CORRELATION_ID.equalsIgnoreCase(correlationScheme)) {
-                replyJMSMsg.setJMSCorrelationID(requestJMSMsg.getJMSCorrelationID());
-            }
-
-            Destination destination = requestJMSMsg.getJMSReplyTo();
-            MessageProducer producer = session.createProducer(destination);
-
-            producer.send(replyJMSMsg);
-
-            producer.close();
-            session.close();
-
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        } catch (NamingException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
deleted file mode 100644
index 499f69a24b..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
+++ /dev/null
@@ -1,30 +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.binding.jms.provider;

-

-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;

-

-public class DefaultJMSResourceFactoryExtensionPoint implements JMSResourceFactoryExtensionPoint {

-

-    public JMSResourceFactory createJMSResourceFactory(JMSBinding binding) {

-        return new JMSResourceFactoryImpl(binding.getConnectionFactoryName(), binding.getInitialContextFactoryName(), binding.getJndiURL());

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
deleted file mode 100644
index 998ac904a8..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
+++ /dev/null
@@ -1,467 +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.binding.jms.provider;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.Map;
-
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.naming.NamingException;
-import javax.security.auth.Subject;
-
-import org.apache.tuscany.sca.binding.jms.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.xml.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy;
-import org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicy;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.SecurityUtil;
-import org.apache.tuscany.sca.policy.authentication.token.TokenPrincipal;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * Invoker for the JMS binding.
- * 
- * @version $Rev$ $Date$
- */
-public class JMSBindingInvoker implements Invoker, DataExchangeSemantics {
-
-    protected Operation operation;
-    protected String operationName;
-
-    protected JMSBinding jmsBinding;
-    protected JMSResourceFactory jmsResourceFactory;
-    protected JMSMessageProcessor requestMessageProcessor;
-    protected JMSMessageProcessor responseMessageProcessor;
-    protected Destination bindingRequestDest;
-    protected Destination bindingReplyDest;
-    protected RuntimeComponentReference reference;
-    protected JMSTokenAuthenticationPolicy jmsTokenAuthenticationPolicy = null;
-    protected JMSHeaderPolicy jmsHeaderPolicy = null;
-
-    public JMSBindingInvoker(JMSBinding jmsBinding, Operation operation, JMSResourceFactory jmsResourceFactory, RuntimeComponentReference reference) {
-
-        this.operation = operation;
-        operationName = operation.getName();
-
-        this.jmsBinding = jmsBinding;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.reference = reference;
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-
-        // find out which policies are active
-        if (jmsBinding instanceof PolicySetAttachPoint) {
-            List<PolicySet> policySets = ((PolicySetAttachPoint)jmsBinding).getApplicablePolicySets();
-            for (PolicySet ps : policySets) {
-                for (Object p : ps.getPolicies()) {
-                    if (JMSTokenAuthenticationPolicy.class.isInstance(p)) {
-                        jmsTokenAuthenticationPolicy = (JMSTokenAuthenticationPolicy)p;
-                    }else if (JMSTokenAuthenticationPolicy.class.isInstance(p)) {
-                        jmsHeaderPolicy = (JMSHeaderPolicy)p;
-                    } else {
-                        // etc. check for other types of policy being present
-                    }
-                }
-            }
-        }
-        
-        try {
-
-            bindingRequestDest = lookupDestination();
-            bindingReplyDest = lookupResponseDestination();
-
-        } catch (NamingException e) {
-            throw new JMSBindingException(e);
-        }
-
-    }
-
-    /**
-     * Looks up the Destination Queue for the JMS Binding
-     * 
-     * @return The Destination Queue
-     * @throws NamingException Failed to lookup Destination Queue
-     * @throws JMSBindingException Failed to lookup Destination Queue
-     * @see #lookupDestinationQueue(boolean)
-     */
-    protected Destination lookupDestination() throws NamingException, JMSBindingException {
-        return lookupDestinationQueue(false);
-    }
-
-    /**
-     * Looks up the Destination Response Queue for the JMS Binding
-     * 
-     * @return The Destination Response Queue
-     * @throws NamingException Failed to lookup Destination Response Queue
-     * @throws JMSBindingException Failed to lookup Destination Response Queue
-     * @see #lookupDestinationQueue(boolean)
-     */
-    protected Destination lookupResponseDestination() throws NamingException, JMSBindingException {
-        return lookupDestinationQueue(true);
-    }
-
-    /**
-     * Looks up the Destination Queue for the JMS Binding.
-     * <p>
-     * What happens in the look up will depend on the create mode specified for the JMS Binding:
-     * <ul>
-     * <li>always - the JMS queue is always created. It is an error if the queue already exists
-     * <li>ifnotexist - the JMS queue is created if it does not exist. It is not an error if the queue already exists
-     * <li>never - the JMS queue is never created. It is an error if the queue does not exist
-     * </ul>
-     * See the SCA JMS Binding specification for more information.
-     * <p>
-     * 
-     * @param isReponseQueue <code>true</code> if we are creating a response queue. 
-     *                       <code>false</code> if we are creating a request queue
-     * @return The Destination queue.
-     * @throws NamingException Failed to lookup JMS queue
-     * @throws JMSBindingException Failed to lookup JMS Queue. Probable cause is that 
-     *         the JMS queue's current existence/non-existence is not compatible with 
-     *         the create mode specified on the binding
-     */
-    protected Destination lookupDestinationQueue(boolean isReponseQueue) throws NamingException, JMSBindingException {
-        String queueName;
-        String queueType;
-        String qCreateMode;
-
-        if (isReponseQueue) {
-            queueName = jmsBinding.getResponseDestinationName();
-            queueType = "JMS Response Destination ";
-            qCreateMode = jmsBinding.getResponseDestinationCreate();
-            if (JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME.equals(queueName)) {
-                return null;
-            }
-        } else {
-            queueName = jmsBinding.getDestinationName();
-            queueType = "JMS Destination ";
-            qCreateMode = jmsBinding.getDestinationCreate();
-        }
-
-        Destination dest = jmsResourceFactory.lookupDestination(queueName);
-
-        if (qCreateMode.equals(JMSBindingConstants.CREATE_ALWAYS)) {
-            // In this mode, the queue must not already exist as we are creating it
-            if (dest != null) {
-                throw new JMSBindingException(queueType + queueName
-                    + " already exists but has create mode of \""
-                    + qCreateMode
-                    + "\" while registering binding "
-                    + jmsBinding.getName()
-                    + " invoker");
-            }
-            // Create the queue
-            dest = jmsResourceFactory.createDestination(queueName);
-
-        } else if (qCreateMode.equals(JMSBindingConstants.CREATE_IF_NOT_EXIST)) {
-            // In this mode, the queue may nor may not exist. It will be created if it does not exist
-            if (dest == null) {
-                dest = jmsResourceFactory.createDestination(queueName);
-            }
-
-        } else if (qCreateMode.equals(JMSBindingConstants.CREATE_NEVER)) {
-            // In this mode, the queue must have already been created.
-            if (dest == null) {
-                throw new JMSBindingException(queueType + queueName
-                    + " not found but create mode of \""
-                    + qCreateMode
-                    + "\" while registering binding "
-                    + jmsBinding.getName()
-                    + " invoker");
-            }
-        }
-
-        // Make sure we ended up with a queue
-        if (dest == null) {
-            throw new JMSBindingException(queueType + queueName
-                + " not found with create mode of \""
-                + qCreateMode
-                + "\" while registering binding "
-                + jmsBinding.getName()
-                + " invoker");
-        }
-
-        return dest;
-    }
-
-    public org.apache.tuscany.sca.invocation.Message invoke(org.apache.tuscany.sca.invocation.Message tuscanyMsg) {
-        try {
-
-            Object resp = invokeTarget(tuscanyMsg);
-            tuscanyMsg.setBody(resp);
-
-        } catch (InvocationTargetException e) {
-            tuscanyMsg.setFaultBody(e.getCause());
-        } catch (ServiceRuntimeException e) {
-            if (e.getCause() instanceof InvocationTargetException) {
-                if ((e.getCause().getCause() instanceof RuntimeException)) {
-                    tuscanyMsg.setFaultBody(e.getCause());
-                } else {
-                    tuscanyMsg.setFaultBody(e.getCause().getCause());
-                }
-            } else {
-                tuscanyMsg.setFaultBody(e);
-            }
-        } catch (Throwable e) {
-            tuscanyMsg.setFaultBody(e);
-        }
-        return tuscanyMsg;
-    }
-
-    protected Object invokeTarget(org.apache.tuscany.sca.invocation.Message tuscanyMsg) throws InvocationTargetException {
-        try {
-            Session session = jmsResourceFactory.createSession();
-            try {
-
-                Destination replyToDest = getReplyToDestination(session);
-
-                Message requestMsg = sendRequest(tuscanyMsg, session, replyToDest);
-
-                if (replyToDest == null) {
-                    return null;
-                } else {
-                    Message replyMsg = receiveReply(session, replyToDest, requestMsg.getJMSMessageID());
-                    Object[] response = (Object[])responseMessageProcessor.extractPayloadFromJMSMessage(replyMsg);
-                    return (response != null && response.length > 0) ? response[0] : null;
-                }
-
-            } finally {
-                session.close();
-            }
-        } catch (JMSException e) {
-            throw new InvocationTargetException(e);
-        } catch (NamingException e) {
-            throw new InvocationTargetException(e);
-        }
-    }
-
-    protected Destination getReplyToDestination(Session session) throws JMSException, JMSBindingException, NamingException {
-        Destination replyToDest;
-        if (operation.isNonBlocking()) {
-            replyToDest = null;
-        } else {
-            if (bindingReplyDest != null) {
-                replyToDest = bindingReplyDest;
-            } else {
-                replyToDest = session.createTemporaryQueue();
-            }
-        }
-        return replyToDest;
-    }
-
-    protected Message sendRequest(org.apache.tuscany.sca.invocation.Message tuscanyMsg, Session session, Destination replyToDest) throws JMSException, JMSBindingException,
-        NamingException {
-
-        Message requestMsg = requestMessageProcessor.insertPayloadIntoJMSMessage(session, tuscanyMsg.getBody());
-
-        setHeaders(tuscanyMsg, requestMsg);
-
-        requestMsg.setJMSReplyTo(replyToDest);
-
-        Destination requestDest = getRequestDestination(tuscanyMsg, session);
-
-        MessageProducer producer = session.createProducer(requestDest);
-
-        if (jmsBinding.getOperationJMSTimeToLive(operationName) != null) {
-            producer.setTimeToLive(jmsBinding.getOperationJMSTimeToLive(operationName));
-        }
-
-        try {
-            producer.send(requestMsg);
-        } finally {
-            producer.close();
-        }
-        return requestMsg;
-    }
-
-    protected Destination getRequestDestination(org.apache.tuscany.sca.invocation.Message tuscanyMsg, Session session) throws JMSBindingException, NamingException, JMSException {
-        Destination requestDestination;
-        if (reference.isCallback()) {
-            String toURI = tuscanyMsg.getTo().getURI();
-            if (toURI != null && toURI.startsWith("jms:")) {
-                // the msg to uri contains the callback destination name 
-                // this is an jms physical name not a jndi name so need to use session.createQueue
-                requestDestination = session.createQueue(toURI.substring(4));
-            } else {
-                requestDestination = lookupDestination();
-            }
-        } else {
-            requestDestination = bindingRequestDest;
-        }
-
-        return requestDestination;
-    }
-
-    protected void setHeaders(org.apache.tuscany.sca.invocation.Message tuscanyMsg, Message jmsMsg) throws JMSException {
-
-        requestMessageProcessor.setOperationName(jmsBinding.getNativeOperationName(operationName), jmsMsg);
-
-        if ((jmsHeaderPolicy != null) && 
-            (jmsHeaderPolicy.getDeliveryModePersistent() != null)) {
-            if (jmsHeaderPolicy.getDeliveryModePersistent()) {
-                jmsMsg.setJMSDeliveryMode(DeliveryMode.PERSISTENT);
-            } else {
-                jmsMsg.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT);
-            }
-            
-        } else if (jmsBinding.getOperationJMSDeliveryMode(operationName) != null) {
-            if (jmsBinding.getOperationJMSDeliveryMode(operationName)) {
-                jmsMsg.setJMSDeliveryMode(DeliveryMode.PERSISTENT);
-            } else {
-                jmsMsg.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT);
-            }
-        }
-
-        if ((jmsHeaderPolicy != null) && 
-            (jmsHeaderPolicy.getJmsCorrelationId() != null)) {
-            jmsMsg.setJMSCorrelationID(jmsHeaderPolicy.getJmsCorrelationId());
-        } else if (jmsBinding.getOperationJMSCorrelationId(operationName) != null) {
-            jmsMsg.setJMSCorrelationID(jmsBinding.getOperationJMSCorrelationId(operationName));
-        }
-
-        if ((jmsHeaderPolicy != null) && 
-            (jmsHeaderPolicy.getJmsPriority() != null)) {
-            jmsMsg.setJMSPriority(jmsHeaderPolicy.getJmsPriority());
-        } else if (jmsBinding.getOperationJMSPriority(operationName) != null) {
-            jmsMsg.setJMSPriority(jmsBinding.getOperationJMSPriority(operationName));
-        }
-
-        if ((jmsHeaderPolicy != null) && 
-            (jmsHeaderPolicy.getJmsType() != null)) {
-            jmsMsg.setJMSType(jmsHeaderPolicy.getJmsType());
-        } else if (jmsBinding.getOperationJMSType(operationName) != null) {
-            jmsMsg.setJMSType(jmsBinding.getOperationJMSType(operationName));
-        }
-
-        ReferenceParameters parameters = tuscanyMsg.getFrom().getReferenceParameters();
-
-        Object conversationID = parameters.getConversationID();
-        if (conversationID != null) {
-            jmsMsg.setStringProperty(JMSBindingConstants.CONVERSATION_ID_PROPERTY, conversationID.toString());
-        }
-
-        if (hasCallback()) {
-
-            if (parameters.getCallbackID() != null) {
-                jmsMsg.setStringProperty(JMSBindingConstants.CALLBACK_ID_PROPERTY, parameters.getCallbackID().toString());
-            }
-
-            String callbackDestName = getCallbackDestinationName(reference);
-            if (callbackDestName != null) {
-                jmsMsg.setStringProperty(JMSBindingConstants.CALLBACK_Q_PROPERTY, callbackDestName);
-            }
-        }
-        
-        if (jmsHeaderPolicy != null){
-            for (String propName : jmsHeaderPolicy.getProperties().keySet()) {
-                jmsMsg.setObjectProperty(propName, jmsHeaderPolicy.getProperties().get(propName));
-            }
-        }
-        
-        for (String propName : jmsBinding.getPropertyNames()) {
-            Object value = jmsBinding.getProperty(propName);
-            jmsMsg.setObjectProperty(propName, value);
-        }
-
-        Map<String, Object> operationProperties = jmsBinding.getOperationProperties(operationName);
-        if (operationProperties != null) {
-            for (String propName : operationProperties.keySet()) {
-                Object value = operationProperties.get(propName);
-                jmsMsg.setObjectProperty(propName, value);
-            }
-        }
-        
-        if (jmsTokenAuthenticationPolicy != null) {
-            Subject subject = SecurityUtil.getSubject(tuscanyMsg);
-            TokenPrincipal principal = SecurityUtil.getPrincipal(subject, TokenPrincipal.class);
-            if (principal != null){
-                jmsMsg.setStringProperty(jmsTokenAuthenticationPolicy.getTokenName().toString(), principal.getName());
-            }
-        }
-    }
-
-    protected boolean hasCallback() {
-        if (operation.getInterface() instanceof JavaInterface) {
-            JavaInterface jiface = (JavaInterface)operation.getInterface();
-            if (jiface.getCallbackClass() != null) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    protected Message receiveReply(Session session, Destination replyToDest, String requestMsgId) throws JMSException, NamingException {
-        String msgSelector = "JMSCorrelationID = '" + requestMsgId + "'";
-        MessageConsumer consumer = session.createConsumer(replyToDest, msgSelector);
-      
-        long receiveWait;
-        if ((jmsHeaderPolicy != null) && 
-            (jmsHeaderPolicy.getTimeToLive() != null)) {
-            receiveWait = jmsHeaderPolicy.getTimeToLive();
-        } else if (jmsBinding.getOperationJMSTimeToLive(operationName) != null) {
-            receiveWait = jmsBinding.getOperationJMSTimeToLive(operationName) * 2;        
-        } else {
-            receiveWait = JMSBindingConstants.DEFAULT_TIME_TO_LIVE;
-        }
-        
-        Message replyMsg;
-        try {
-            jmsResourceFactory.startConnection();
-            replyMsg = consumer.receive(receiveWait);
-        } finally {
-            consumer.close();
-        }
-        if (replyMsg == null) {
-            throw new JMSBindingException("No reply message received on " + replyToDest + " for message id " + requestMsgId);
-        }
-        return replyMsg;
-    }
-
-    protected String getCallbackDestinationName(RuntimeComponentReference reference) {
-        RuntimeComponentService s = (RuntimeComponentService)reference.getCallbackService();
-        JMSBinding b = s.getBinding(JMSBinding.class);
-        if (b != null) {
-            JMSBindingServiceBindingProvider bp = (JMSBindingServiceBindingProvider)s.getBindingProvider(b);
-            return bp.getDestinationName();
-        }
-        return null;
-    }
-
-    public boolean allowsPassByReference() {
-        // JMS always pass by value
-        return true;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
deleted file mode 100644
index adadc51a66..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
+++ /dev/null
@@ -1,69 +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.binding.jms.provider;
-
-import org.apache.tuscany.sca.binding.jms.JMSBinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- * A factory from creating the JMS binding provider.
- * 
- * @version $Rev$ $Date$
- */
-public class JMSBindingProviderFactory implements BindingProviderFactory<JMSBinding> {
-
-    private WorkScheduler workScheduler;
-    private ExtensionPointRegistry extensionPoints;
-    private JMSResourceFactoryExtensionPoint jmsRFEP;
-
-    public JMSBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        workScheduler = utilities.getUtility(WorkScheduler.class);
-
-        jmsRFEP = (JMSResourceFactoryExtensionPoint)extensionPoints.getExtensionPoint(JMSResourceFactoryExtensionPoint.class);
-        if (jmsRFEP == null) {
-            jmsRFEP = new DefaultJMSResourceFactoryExtensionPoint();
-            extensionPoints.addExtensionPoint(jmsRFEP);
-        }
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, JMSBinding binding) {
-        JMSResourceFactory jmsRF = jmsRFEP.createJMSResourceFactory(binding);
-        return new JMSBindingReferenceBindingProvider(component, reference, binding, extensionPoints, jmsRF);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, JMSBinding binding) {
-        JMSResourceFactory jmsRF = jmsRFEP.createJMSResourceFactory(binding);
-        return new JMSBindingServiceBindingProvider(component, service, binding, binding, workScheduler, extensionPoints, jmsRF);
-    }
-
-    public Class<JMSBinding> getModelType() {
-        return JMSBinding.class;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
deleted file mode 100644
index aa66542f38..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
+++ /dev/null
@@ -1,170 +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.binding.jms.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jms.JMSException;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.binding.jms.headers.HeaderReferenceInterceptor;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.OperationSelectorJMSDefault;
-import org.apache.tuscany.sca.binding.jms.transport.TransportReferenceInterceptor;
-import org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml.WireFormatJMSTextXML;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.provider.OperationSelectorProvider;
-import org.apache.tuscany.sca.provider.OperationSelectorProviderFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ReferenceBindingProviderRRB;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.provider.WireFormatProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Implementation of the JMS reference binding provider.
- * 
- * @version $Rev$ $Date$
- */
-public class JMSBindingReferenceBindingProvider implements ReferenceBindingProviderRRB {
-
-    private RuntimeComponentReference reference;
-    private JMSBinding jmsBinding;
-    private List<JMSBindingInvoker> jmsBindingInvokers = new ArrayList<JMSBindingInvoker>();
-    private JMSResourceFactory jmsResourceFactory;
-    private RuntimeComponent component;
-    private InterfaceContract interfaceContract; 
-    private ExtensionPointRegistry extensions;
-    
-    private ProviderFactoryExtensionPoint providerFactories;
-       
-    private WireFormatProviderFactory requestWireFormatProviderFactory;
-    private WireFormatProvider requestWireFormatProvider;
-    
-    private WireFormatProviderFactory responseWireFormatProviderFactory;
-    private WireFormatProvider responseWireFormatProvider;
-
-    public JMSBindingReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, JMSBinding binding,  ExtensionPointRegistry extensions, JMSResourceFactory jmsResourceFactory) {
-        this.reference = reference;
-        this.jmsBinding = binding;
-        this.extensions = extensions;
-        this.component = component;
-        this.jmsResourceFactory = jmsResourceFactory;
-        
-        // Get the factories/providers for operation selection        
-        this.providerFactories = extensions.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-        
-        // Get the factories/providers for wire format
-         this.requestWireFormatProviderFactory = 
-            (WireFormatProviderFactory)providerFactories.getProviderFactory(jmsBinding.getRequestWireFormat().getClass());
-        if (this.requestWireFormatProviderFactory != null){
-            this.requestWireFormatProvider = requestWireFormatProviderFactory.createReferenceWireFormatProvider(component, reference, jmsBinding);
-        }
-        
-        this.responseWireFormatProviderFactory = 
-            (WireFormatProviderFactory)providerFactories.getProviderFactory(jmsBinding.getResponseWireFormat().getClass());
-        if (this.responseWireFormatProviderFactory != null){
-            this.responseWireFormatProvider = responseWireFormatProviderFactory.createReferenceWireFormatProvider(component, reference, jmsBinding);
-        }      
-    }
-
-    public Invoker createInvoker(Operation operation) {
-
-        if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) {
-            if (!reference.isCallback()) {
-                throw new JMSBindingException("No destination specified for reference " + reference.getName());
-            }
-        }
-
-        Invoker invoker = null;
-        invoker = new RRBJMSBindingInvoker(jmsBinding, operation, jmsResourceFactory, reference);
-       
-        return invoker;
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return true;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        if (interfaceContract == null){
-            interfaceContract = this.requestWireFormatProvider.getWireFormatInterfaceContract();
-        }
-        return interfaceContract;
-    }
-
-    public void start() {
-
-    }
-
-    public void stop() {
-        try {
-            jmsResourceFactory.closeConnection();
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-    
-    /*
-     * set up the reference binding wire with the right set of jms reference
-     * interceptors
-     */
-    public void configureBindingChain(RuntimeWire runtimeWire) {
-        
-        InvocationChain bindingChain = runtimeWire.getBindingInvocationChain();
-        
-        // add transport interceptor
-        bindingChain.addInterceptor(Phase.REFERENCE_BINDING_TRANSPORT, 
-                                    new TransportReferenceInterceptor(jmsBinding,
-                                                                      jmsResourceFactory,
-                                                                      runtimeWire) );
-        
-        // add request wire format 
-        bindingChain.addInterceptor(requestWireFormatProvider.getPhase(), 
-                                    requestWireFormatProvider.createInterceptor());
-        
-        // add response wire format, but only add it if it's different from the request
-        if (!jmsBinding.getRequestWireFormat().equals(jmsBinding.getResponseWireFormat())){
-            bindingChain.addInterceptor(responseWireFormatProvider.getPhase(), 
-                                        responseWireFormatProvider.createInterceptor());
-        }
-        
-        // add the header processor that comes after the wire formatter
-        bindingChain.addInterceptor(Phase.REFERENCE_BINDING_WIREFORMAT, 
-                                    new HeaderReferenceInterceptor(jmsBinding,
-                                                                   jmsResourceFactory,
-                                                                   runtimeWire) );
-    }    
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
deleted file mode 100644
index da6c6d260d..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
+++ /dev/null
@@ -1,359 +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.binding.jms.provider;
-
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.naming.NamingException;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.OperationSelector;
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.OperationSelectorJMSDefault;
-import org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.OperationSelectorJMSDefaultServiceInterceptor;
-import org.apache.tuscany.sca.binding.jms.transport.TransportReferenceInterceptor;
-import org.apache.tuscany.sca.binding.jms.transport.TransportServiceInterceptor;
-import org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml.WireFormatJMSTextXML;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.OperationSelectorProvider;
-import org.apache.tuscany.sca.provider.OperationSelectorProviderFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProviderRRB;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.provider.WireFormatProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- * Implementation of the JMS service binding provider.
- * 
- * @version $Rev$ $Date$
- */
-public class JMSBindingServiceBindingProvider implements ServiceBindingProviderRRB {
-    private static final Logger logger = Logger.getLogger(JMSBindingServiceBindingProvider.class.getName());
-
-    private RuntimeComponentService service;
-    private Binding targetBinding;
-    private JMSBinding jmsBinding;
-    private JMSResourceFactory jmsResourceFactory;
-    private MessageConsumer consumer;
-    private WorkScheduler workScheduler;
-    private boolean running;
-
-    private Destination destination;
-
-    private ExtensionPointRegistry extensionPoints;
-
-    private RuntimeComponent component;
-    private InterfaceContract wsdlInterfaceContract;
-    
-
-    private ProviderFactoryExtensionPoint providerFactories;
-    private ModelFactoryExtensionPoint modelFactories;
-    
-    private MessageFactory messageFactory;
-    
-    private OperationSelectorProviderFactory operationSelectorProviderFactory;
-    private OperationSelectorProvider operationSelectorProvider;
-    
-    private WireFormatProviderFactory requestWireFormatProviderFactory;
-    private WireFormatProvider requestWireFormatProvider;
-    
-    private WireFormatProviderFactory responseWireFormatProviderFactory;
-    private WireFormatProvider responseWireFormatProvider;
-
-    public JMSBindingServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, Binding targetBinding, JMSBinding binding, WorkScheduler workScheduler, ExtensionPointRegistry extensionPoints, JMSResourceFactory jmsResourceFactory) {
-        this.component = component;
-        this.service = service;
-        this.jmsBinding = binding;
-        this.workScheduler = workScheduler;
-        this.targetBinding = targetBinding;
-        this.extensionPoints = extensionPoints;
-        this.jmsResourceFactory = jmsResourceFactory;
-
-        if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) {
-            if (!service.isCallback()) {
-                // use the SCA service name as the default destination name
-                jmsBinding.setDestinationName(service.getName());
-            }
-        }
-        
-        // Get Message factory
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        messageFactory = modelFactories.getFactory(MessageFactory.class);
-
-        // Get the factories/providers for operation selection       
-        this.providerFactories = extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-        this.operationSelectorProviderFactory =
-            (OperationSelectorProviderFactory)providerFactories.getProviderFactory(jmsBinding.getOperationSelector().getClass());
-        if (this.operationSelectorProviderFactory != null){
-            this.operationSelectorProvider = operationSelectorProviderFactory.createServiceOperationSelectorProvider(component, service, jmsBinding);
-        }
-        
-        // Get the factories/providers for wire format        
-        this.requestWireFormatProviderFactory = 
-            (WireFormatProviderFactory)providerFactories.getProviderFactory(jmsBinding.getRequestWireFormat().getClass());
-        if (this.requestWireFormatProviderFactory != null){
-            this.requestWireFormatProvider = requestWireFormatProviderFactory.createServiceWireFormatProvider(component, service, jmsBinding);
-        }
-        
-        this.responseWireFormatProviderFactory = 
-            (WireFormatProviderFactory)providerFactories.getProviderFactory(jmsBinding.getResponseWireFormat().getClass());
-        if (this.responseWireFormatProviderFactory != null){
-            this.responseWireFormatProvider = responseWireFormatProviderFactory.createServiceWireFormatProvider(component, service, jmsBinding);
-        }
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return requestWireFormatProvider.getWireFormatInterfaceContract();
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return true;
-    }
-
-    public void start() {
-        this.running = true;
-
-        try {
-            registerListerner();
-        } catch (Exception e) {
-            throw new JMSBindingException("Error starting JMSServiceBinding", e);
-        }
-    }
-
-    public void stop() {
-        this.running = false;
-        try {
-            consumer.close();
-            jmsResourceFactory.closeConnection();
-        } catch (Exception e) {
-            // if using an embedded broker then when shutting down Tuscany the broker may get closed
-            // before this stop method is called. I can't see how to detect that so for now just
-            // ignore the exception if the message is that the transport is already disposed
-            if (!"Transport disposed.".equals(e.getMessage())) {
-                throw new JMSBindingException("Error stopping JMSServiceBinding", e);
-            }
-        }
-    }
-
-    private void registerListerner() throws NamingException, JMSException {
-
-        Session session = jmsResourceFactory.createSession();
-        destination = lookupDestinationQueue();
-        if (destination == null) {
-            destination = session.createTemporaryQueue();
-        }
-
-        if (jmsBinding.getJMSSelector() != null) {
-            consumer = session.createConsumer(destination, jmsBinding.getJMSSelector());
-        } else {
-            consumer = session.createConsumer(destination);
-        }
-
-        MessageListener tmpListener = null;
-        
-        /*
-         * TODO turn on RRB version of JMS binding
-         */
-        tmpListener = new RRBJMSBindingListener(jmsBinding, jmsResourceFactory, service, targetBinding, messageFactory);
-        //tmpListener = new DefaultJMSBindingListener(jmsBinding, jmsResourceFactory, service, targetBinding);
-    
-        final MessageListener listener = tmpListener;
-        
-        try {
-
-            consumer.setMessageListener(listener);
-            jmsResourceFactory.startConnection();
-
-        } catch (javax.jms.IllegalStateException e) {
-
-            // setMessageListener not allowed in JEE container so use Tuscany threads
-
-            jmsResourceFactory.startConnection();
-            workScheduler.scheduleWork(new Runnable() {
-                public void run() {
-                    try {
-                        while (running) {
-                            final Message msg = consumer.receive();
-                            workScheduler.scheduleWork(new Runnable() {
-                                public void run() {
-                                    try {
-                                        listener.onMessage(msg);
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                    }
-                                }
-                            });
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            });
-        }
-        logger.log(Level.INFO, "JMS " + (service.isCallback() ? "callback service" : "service")
-            + " '"
-            + service.getName()
-            + "' listening on destination "
-            + ((destination instanceof Queue) ? ((Queue)destination).getQueueName() : ((Topic)destination).getTopicName()));
-    }
-
-    /**
-     * Looks up the Destination Queue for the JMS Binding.
-     * <p>
-     * What happens in the look up will depend on the create mode specified for the JMS Binding:
-     * <ul>
-     * <li>always - the JMS queue is always created. It is an error if the queue already exists
-     * <li>ifnotexist - the JMS queue is created if it does not exist. It is not an error if the queue already exists
-     * <li>never - the JMS queue is never created. It is an error if the queue does not exist
-     * </ul>
-     * See the SCA JMS Binding specification for more information.
-     * <p>
-     * 
-     * @return The Destination queue.
-     * @throws NamingException Failed to lookup JMS queue
-     * @throws JMSBindingException Failed to lookup JMS Queue. Probable cause is that the JMS queue's current existence/non-existence is not
-     *                 compatible with the create mode specified on the binding
-     */
-    private Destination lookupDestinationQueue() throws NamingException, JMSBindingException {
-
-        if (service.isCallback() && JMSBindingConstants.DEFAULT_DESTINATION_NAME.equals(jmsBinding.getDestinationName())) {
-            // if its a callback service returning null indicates to use a temporary queue
-            return null;
-        }
-
-        Destination destination = jmsResourceFactory.lookupDestination(jmsBinding.getDestinationName());
-
-        String qCreateMode = jmsBinding.getDestinationCreate();
-        if (qCreateMode.equals(JMSBindingConstants.CREATE_ALWAYS)) {
-            // In this mode, the queue must not already exist as we are creating it
-            if (destination != null) {
-                throw new JMSBindingException("JMS Destination " + jmsBinding.getDestinationName()
-                    + " already exists but has create mode of \""
-                    + qCreateMode
-                    + "\" while registering service "
-                    + service.getName()
-                    + " listener");
-            }
-
-            // Create the queue
-            destination = jmsResourceFactory.createDestination(jmsBinding.getDestinationName());
-
-        } else if (qCreateMode.equals(JMSBindingConstants.CREATE_IF_NOT_EXIST)) {
-            // In this mode, the queue may nor may not exist. It will be created if it does not exist
-            if (destination == null) {
-                destination = jmsResourceFactory.createDestination(jmsBinding.getDestinationName());
-            }
-
-        } else if (qCreateMode.equals(JMSBindingConstants.CREATE_NEVER)) {
-            // In this mode, the queue must have already been created.
-            if (destination == null) {
-                throw new JMSBindingException("JMS Destination " + jmsBinding.getDestinationName()
-                    + " not found but create mode of \""
-                    + qCreateMode
-                    + "\" while registering service "
-                    + service.getName()
-                    + " listener");
-            }
-        }
-
-        // Make sure we ended up with a queue
-        if (destination == null) {
-            throw new JMSBindingException("JMS Destination " + jmsBinding.getDestinationName()
-                + " not found with create mode of \""
-                + qCreateMode
-                + "\" while registering service "
-                + service.getName()
-                + " listener");
-        }
-
-        return destination;
-    }
-
-    public String getDestinationName() {
-        try {
-            if (destination instanceof Queue) {
-                return ((Queue)destination).getQueueName();
-            } else if (destination instanceof Topic) {
-                return ((Topic)destination).getTopicName();
-            } else {
-                return null;
-            }
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-    
-    /*
-     * RRB test methods
-     */
-    public void configureBindingChain(RuntimeWire runtimeWire) {
-        
-        InvocationChain bindingChain = runtimeWire.getBindingInvocationChain();
-        
-        // add transport interceptor
-        bindingChain.addInterceptor(Phase.SERVICE_BINDING_TRANSPORT, 
-                                    new TransportServiceInterceptor(jmsBinding,
-                                                                    jmsResourceFactory,
-                                                                    runtimeWire) );
-
-        // add operation selector interceptor
-        bindingChain.addInterceptor(operationSelectorProvider.getPhase(), 
-                                    operationSelectorProvider.createInterceptor());
-        
-        // add request wire format
-        bindingChain.addInterceptor(requestWireFormatProvider.getPhase(), 
-                                    requestWireFormatProvider.createInterceptor());
-        
-        // add response wire format, but only add it if it's different from the request
-        if (!jmsBinding.getRequestWireFormat().equals(jmsBinding.getResponseWireFormat())){
-            bindingChain.addInterceptor(responseWireFormatProvider.getPhase(), 
-                                        responseWireFormatProvider.createInterceptor());
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
deleted file mode 100644
index 821b9d7873..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.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 org.apache.tuscany.sca.binding.jms.provider;
-
-import javax.jms.Message;
-import javax.jms.Session;
-
-/**
- * Interface for a component that does operation selection and message payload processing
- * 
- * @version $Rev$ $Date$
- */
-public interface JMSMessageProcessor {
-
-    /**
-     * Get the operation name from a JMS Message
-     */
-    String getOperationName(Message message);
-
-    /**
-     * Set the operation name on a JMS Message
-     */
-    void setOperationName(String operationName, Message message);
-
-    /**
-     * Extracts the payload from a JMS Message
-     */
-    Object extractPayloadFromJMSMessage(Message msg);
-
-    /**
-     * Create a JMS Message containing the payload
-     */
-    Message insertPayloadIntoJMSMessage(Session session, Object payload);
-
-    /**
-     * Create a JMS Message for reporting an exception
-     */
-    Message createFaultMessage(Session session, Throwable responsePayload);
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
deleted file mode 100644
index 09fe7310e6..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.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.binding.jms.provider;
-
-import java.lang.reflect.Constructor;
-
-import org.apache.tuscany.sca.binding.jms.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.JMSBindingException;
-
-/**
- * Utility methods to load JMS message processors.
- * 
- * @version $Rev: $ $Date: $
- */
-public class JMSMessageProcessorUtil {
-
-    /**
-     * Used to create instances of the JMSResourceFactory and RequestMessageProcessor and ResponseMessageProcessor from 
-     * string based class name provided in the configuration
-     * 
-     * @param cl ClassLoader
-     * @param className the string based class name to load and instantiate
-     * @return the new object
-     */
-    private static Object instantiate(ClassLoader cl, String className, JMSBinding binding) {
-        Object instance;
-        if (cl == null) {
-            cl = binding.getClass().getClassLoader();
-        }
-
-        try {
-            Class<?> clazz;
-
-            try {
-                clazz = cl.loadClass(className);
-            } catch (ClassNotFoundException e) {
-                clazz = binding.getClass().getClassLoader().loadClass(className);
-            }
-
-            Constructor<?> constructor = clazz.getDeclaredConstructor(new Class[] {JMSBinding.class});
-            instance = constructor.newInstance(binding);
-
-        } catch (Throwable e) {
-            throw new JMSBindingException("Exception instantiating OperationAndDataBinding class", e);
-        }
-
-        return instance;
-    }
-
-    public static JMSMessageProcessor getRequestMessageProcessor(JMSBinding binding) {
-        return (JMSMessageProcessor)instantiate(null, binding.getRequestMessageProcessorName(), binding);
-    }
-
-    public static JMSMessageProcessor getResponseMessageProcessor(JMSBinding binding) {
-        return (JMSMessageProcessor)instantiate(null, binding.getResponseMessageProcessorName(), binding);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
deleted file mode 100644
index 773be84c7f..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
+++ /dev/null
@@ -1,67 +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.binding.jms.provider;

-

-import javax.jms.Connection;

-import javax.jms.Destination;

-import javax.jms.JMSException;

-import javax.jms.Session;

-import javax.naming.NamingException;

-

-public interface JMSResourceFactory {

-

-    /*

-     * This is a simple implementation where a connection is created per binding Ideally the resource factory should be

-     * able to leverage the host environment to provide connection pooling if it can. E.g. if Tuscany is running inside 

-     * an AppServer Then we could leverage the JMS resources it provides

-     * 

-     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#getConnection()

-     */

-    public abstract Connection getConnection() throws NamingException, JMSException;

-

-    /*

-     * (non-Javadoc)

-     * 

-     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#createSession()

-     */

-    public abstract Session createSession() throws JMSException, NamingException;

-

-    /*

-     * (non-Javadoc)

-     * 

-     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#startConnection()

-     */

-    public abstract void startConnection() throws JMSException, NamingException;

-

-    /*

-     * (non-Javadoc)

-     * 

-     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#closeConnection()

-     */

-    public abstract void closeConnection() throws JMSException;

-

-    public abstract Destination lookupDestination(String destName) throws NamingException;

-

-    /**

-     * You can create a destination in ActiveMQ (and have it appear in JNDI) by putting "dynamicQueues/" in front of the queue name being looked up

-     */

-    public abstract Destination createDestination(String jndiName) throws NamingException;

-

-}

diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
deleted file mode 100644
index 57fbfb3215..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
+++ /dev/null
@@ -1,28 +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.binding.jms.provider;

-

-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;

-

-public interface JMSResourceFactoryExtensionPoint {

-    

-    JMSResourceFactory createJMSResourceFactory(JMSBinding binding);

-

-}

diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
deleted file mode 100644
index d0624fb52e..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
+++ /dev/null
@@ -1,223 +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.binding.jms.provider;
-
-import java.util.Properties;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Session;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-
-/**
- * Abstracts away any JMS provide specific feature from the JMS binding
- * 
- * @version $Rev$ $Date$
- */
-public class JMSResourceFactoryImpl implements JMSResourceFactory {
-
-    protected String initialContextFactoryName;
-    protected String connectionFactoryName = "ConnectionFactory";
-    protected String jndiURL;
-
-    protected Connection connection;
-    protected Context context;
-    protected boolean isConnectionStarted;
-
-    public JMSResourceFactoryImpl(String connectionFactoryName, String initialContextFactoryName, String jndiURL) {
-        if (connectionFactoryName != null && connectionFactoryName.trim().length() > 0) {
-            this.connectionFactoryName = connectionFactoryName.trim();
-        }
-        if (initialContextFactoryName != null && initialContextFactoryName.trim().length() > 0) {
-            this.initialContextFactoryName = initialContextFactoryName.trim();
-        }
-        if (jndiURL != null) {
-            this.jndiURL = jndiURL.trim();
-        }
-    }
-
-    /*
-     * This is a simple implementation where a connection is created per binding Ideally the resource factory should be
-     * able to leverage the host environment to provide connection pooling if it can. E.g. if Tuscany is running inside 
-     * an AppServer Then we could leverage the JMS resources it provides
-     * 
-     * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#getConnection()
-     */
-    public Connection getConnection() throws NamingException, JMSException {
-        if (connection == null) {
-            createConnection();
-        }
-        return connection;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#createSession()
-     */
-    public Session createSession() throws JMSException, NamingException {
-        return getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#startConnection()
-     */
-    public void startConnection() throws JMSException, NamingException {
-        if (!isConnectionStarted) {
-            getConnection().start();
-            isConnectionStarted = true;
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#closeConnection()
-     */
-    public void closeConnection() throws JMSException {
-        if (connection != null) {
-            try {
-                connection.close();
-            } catch (JMSException e) {
-                // if using an embedded broker then when shutting down Tuscany the broker may get closed
-                // before this stop method is called. I can't see how to detect that so for now just
-                // ignore the exception if the message is that the transport is already disposed
-                if (!e.getMessage().contains("disposed")) {
-                    throw e;
-                }
-            }
-        }
-    }
-
-    protected void createConnection() throws NamingException, JMSException {
-        ConnectionFactory connectionFactory = (ConnectionFactory)jndiLookUp(connectionFactoryName);
-        if (connectionFactory == null) {
-            throw new JMSBindingException("connection factory not found: " + connectionFactoryName);
-        }
-        connection = connectionFactory.createConnection();
-    }
-
-    protected synchronized Context getInitialContext() throws NamingException {
-        if (context == null) {
-            Properties props = new Properties();
-
-            if (initialContextFactoryName != null) {
-                props.setProperty(Context.INITIAL_CONTEXT_FACTORY, initialContextFactoryName);
-            }
-            if (jndiURL != null) {
-                props.setProperty(Context.PROVIDER_URL, jndiURL);
-            }
-
-            initJREEnvironment(props);
-
-            context = new InitialContext(props);
-        }
-        return context;
-    }
-
-    /**
-     * If using the WAS JMS Client with a non-IBM JRE then an additional
-     * environment property needs to be set to initialize the ORB correctly. 
-     * See: http://www-1.ibm.com/support/docview.wss?uid=swg24012804
-     */
-    protected void initJREEnvironment(Properties props) {
-        if ("com.ibm.websphere.naming.WsnInitialContextFactory".equals(props.get(Context.INITIAL_CONTEXT_FACTORY))) {
-            String vendor = System.getProperty("java.vendor");
-            if (vendor == null || !vendor.contains("IBM")) {
-                props.setProperty("com.ibm.CORBA.ORBInit", "com.ibm.ws.sib.client.ORB");
-            }
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#lookupDestination(java.lang.String)
-     */
-    public Destination lookupDestination(String destName) throws NamingException {
-        if (JMSBindingConstants.DEFAULT_DESTINATION_NAME.equals(destName)) {
-            return null;
-        }
-        
-        Destination dest = (Destination)jndiLookUp(destName);
-        if (dest == null) {
-            dest = lookupPhysical(destName);
-        }
-        return dest;
-    }
-
-    protected Destination lookupPhysical(String jndiName) {
-
-        // TODO: the SCA JMS spec says a destination name may be a non-jndi plain destination name 
-        
-//        Session session = null;
-//        try {
-//
-//            Destination dest;
-//            session = createSession();
-//            dest = session.createQueue(jndiName);
-//            return dest;
-//
-//        } catch (JMSException e) {
-//            throw new JMSBindingException(e);
-//        } catch (NamingException e) {
-//            throw new JMSBindingException(e);
-//        } finally {
-//            if (session != null) {
-//                try {
-//                    session.close();
-//                } catch (JMSException e) {
-//                    throw new JMSBindingException(e);
-//                }
-//            }
-//        }
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#createDestination(java.lang.String)
-     */
-    public Destination createDestination(String jndiName) throws NamingException {
-        return lookupDestination("dynamicQueues/" + jndiName);
-    }
-
-    protected Object jndiLookUp(String name) {
-        Object o = null;
-        try {
-            o = getInitialContext().lookup("java:comp/env/" + name);
-        } catch (Exception ex) {
-            // ignore
-        }
-        if (o == null) {
-            try {
-                o = getInitialContext().lookup(name);
-            } catch (NamingException ex) {
-                // ignore
-            }
-        }
-        return o;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
deleted file mode 100644
index 477ec2c2ae..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.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.binding.jms.provider;
-
-import java.io.Serializable;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.binding.jms.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.JMSBindingException;
-
-/**
- * MessageProcessor for sending/receiving Serializable objects with the JMSBinding.
- * 
- * @version $Rev$ $Date$
- */
-public class ObjectMessageProcessor extends AbstractMessageProcessor {
-
-    public ObjectMessageProcessor(JMSBinding jmsBinding) {
-        super(jmsBinding);
-    }
-
-    @Override
-    protected Object[] extractPayload(Message msg) {
-        try {
-
-            Object o = ((ObjectMessage)msg).getObject();
-            if (o != null && o.getClass().isArray()) {
-                return (Object[])o;
-            } else {
-                return new Object[] { o};
-            }
-
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-
-    @Override
-    protected Message createJMSMessage(Session session, Object o) {
-        try {
-
-            if (!(o instanceof Serializable)) {
-                throw new IllegalStateException("JMS ObjectMessage payload not Serializable: " + o);
-            }
-
-            ObjectMessage message = session.createObjectMessage();
-            message.setObject((Serializable)o);
-            return message;
-
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
deleted file mode 100644
index 33d4366fe6..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
+++ /dev/null
@@ -1,279 +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.binding.jms.provider;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.Map;
-
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.naming.NamingException;
-import javax.security.auth.Subject;
-
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy;
-import org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicy;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.SecurityUtil;
-import org.apache.tuscany.sca.policy.authentication.token.TokenPrincipal;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * Invoker for the JMS binding.
- * 
- * @version $Rev$ $Date$
- */
-public class RRBJMSBindingInvoker implements Invoker, DataExchangeSemantics {
-
-    protected Operation operation;
-    protected String operationName;
-
-    protected JMSBinding jmsBinding;
-    protected JMSResourceFactory jmsResourceFactory;
-    protected JMSMessageProcessor requestMessageProcessor;
-    protected JMSMessageProcessor responseMessageProcessor;
-    protected Destination bindingRequestDest;
-    protected Destination bindingReplyDest;
-    protected RuntimeComponentReference reference;
-    protected RuntimeWire runtimeWire;
-
-    public RRBJMSBindingInvoker(JMSBinding jmsBinding, Operation operation, JMSResourceFactory jmsResourceFactory, RuntimeComponentReference reference) {
-
-        this.operation = operation;
-        operationName = operation.getName();
-
-        this.jmsBinding = jmsBinding;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.reference = reference;
-        this.runtimeWire = reference.getRuntimeWire(jmsBinding);
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-        
-        try {
-            bindingRequestDest = lookupDestination();
-            bindingReplyDest = lookupResponseDestination();
-        } catch (NamingException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-
-    /**
-     * Looks up the Destination Queue for the JMS Binding
-     * 
-     * @return The Destination Queue
-     * @throws NamingException Failed to lookup Destination Queue
-     * @throws JMSBindingException Failed to lookup Destination Queue
-     * @see #lookupDestinationQueue(boolean)
-     */
-    protected Destination lookupDestination() throws NamingException, JMSBindingException {
-        return lookupDestinationQueue(false);
-    }
-
-    /**
-     * Looks up the Destination Response Queue for the JMS Binding
-     * 
-     * @return The Destination Response Queue
-     * @throws NamingException Failed to lookup Destination Response Queue
-     * @throws JMSBindingException Failed to lookup Destination Response Queue
-     * @see #lookupDestinationQueue(boolean)
-     */
-    protected Destination lookupResponseDestination() throws NamingException, JMSBindingException {
-        return lookupDestinationQueue(true);
-    }
-
-    /**
-     * Looks up the Destination Queue for the JMS Binding.
-     * <p>
-     * What happens in the look up will depend on the create mode specified for the JMS Binding:
-     * <ul>
-     * <li>always - the JMS queue is always created. It is an error if the queue already exists
-     * <li>ifnotexist - the JMS queue is created if it does not exist. It is not an error if the queue already exists
-     * <li>never - the JMS queue is never created. It is an error if the queue does not exist
-     * </ul>
-     * See the SCA JMS Binding specification for more information.
-     * <p>
-     * 
-     * @param isReponseQueue <code>true</code> if we are creating a response queue. 
-     *                       <code>false</code> if we are creating a request queue
-     * @return The Destination queue.
-     * @throws NamingException Failed to lookup JMS queue
-     * @throws JMSBindingException Failed to lookup JMS Queue. Probable cause is that 
-     *         the JMS queue's current existence/non-existence is not compatible with 
-     *         the create mode specified on the binding
-     */
-    protected Destination lookupDestinationQueue(boolean isReponseQueue) throws NamingException, JMSBindingException {
-        String queueName;
-        String queueType;
-        String qCreateMode;
-
-        if (isReponseQueue) {
-            queueName = jmsBinding.getResponseDestinationName();
-            queueType = "JMS Response Destination ";
-            qCreateMode = jmsBinding.getResponseDestinationCreate();
-            if (JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME.equals(queueName)) {
-                return null;
-            }
-        } else {
-            queueName = jmsBinding.getDestinationName();
-            queueType = "JMS Destination ";
-            qCreateMode = jmsBinding.getDestinationCreate();
-        }
-
-        Destination dest = jmsResourceFactory.lookupDestination(queueName);
-
-        if (qCreateMode.equals(JMSBindingConstants.CREATE_ALWAYS)) {
-            // In this mode, the queue must not already exist as we are creating it
-            if (dest != null) {
-                throw new JMSBindingException(queueType + queueName
-                    + " already exists but has create mode of \""
-                    + qCreateMode
-                    + "\" while registering binding "
-                    + jmsBinding.getName()
-                    + " invoker");
-            }
-            // Create the queue
-            dest = jmsResourceFactory.createDestination(queueName);
-
-        } else if (qCreateMode.equals(JMSBindingConstants.CREATE_IF_NOT_EXIST)) {
-            // In this mode, the queue may nor may not exist. It will be created if it does not exist
-            if (dest == null) {
-                dest = jmsResourceFactory.createDestination(queueName);
-            }
-
-        } else if (qCreateMode.equals(JMSBindingConstants.CREATE_NEVER)) {
-            // In this mode, the queue must have already been created.
-            if (dest == null) {
-                throw new JMSBindingException(queueType + queueName
-                    + " not found but create mode of \""
-                    + qCreateMode
-                    + "\" while registering binding "
-                    + jmsBinding.getName()
-                    + " invoker");
-            }
-        }
-
-        // Make sure we ended up with a queue
-        if (dest == null) {
-            throw new JMSBindingException(queueType + queueName
-                + " not found with create mode of \""
-                + qCreateMode
-                + "\" while registering binding "
-                + jmsBinding.getName()
-                + " invoker");
-        }
-
-        return dest;
-    }
-
-    public org.apache.tuscany.sca.invocation.Message invoke(org.apache.tuscany.sca.invocation.Message tuscanyMsg) {
-        try {
-            // create a jms session to cover the creation and sending of the message
-            Session session = jmsResourceFactory.createSession();
-            
-            // populate the message context with JMS binding information
-            JMSBindingContext context = new JMSBindingContext();
-            tuscanyMsg.getHeaders().add(JMSBindingConstants.MSG_CTXT_POSITION, context);
-            
-            context.setJmsSession(session);
-            context.setRequestDestination(getRequestDestination(tuscanyMsg, session));
-            context.setReplyToDestination(getReplyToDestination(session));
-            context.setJmsResourceFactory(jmsResourceFactory);
-            
-            try {
-                tuscanyMsg = runtimeWire.getBindingInvocationChain().getHeadInvoker().invoke(tuscanyMsg);
-            } catch (ServiceRuntimeException e) {
-                if (e.getCause() instanceof InvocationTargetException) {
-                    if ((e.getCause().getCause() instanceof RuntimeException)) {
-                        tuscanyMsg.setFaultBody(e.getCause());
-                    } else {
-                        tuscanyMsg.setFaultBody(e.getCause().getCause());
-                    }
-                } else {
-                    tuscanyMsg.setFaultBody(e);
-                }
-            } catch (IllegalStateException e) {
-                tuscanyMsg.setFaultBody(e);
-            } catch (Throwable e) {
-                tuscanyMsg.setFaultBody(e);
-            } finally {
-                session.close();
-            }
-            
-            return tuscanyMsg;
-        } catch (Exception e) {
-            throw new JMSBindingException(e);
-        }   
-    }
-    
-    protected Destination getRequestDestination(org.apache.tuscany.sca.invocation.Message tuscanyMsg, Session session) throws JMSBindingException, NamingException, JMSException {
-        Destination requestDestination;
-        if (reference.isCallback()) {
-            String toURI = tuscanyMsg.getTo().getURI();
-            if (toURI != null && toURI.startsWith("jms:")) {
-                // the msg to uri contains the callback destination name 
-                // this is an jms physical name not a jndi name so need to use session.createQueue
-                requestDestination = session.createQueue(toURI.substring(4));
-            } else {
-                requestDestination = lookupDestination();
-            }
-        } else {
-            requestDestination = bindingRequestDest;
-        }
-
-        return requestDestination;
-    }    
-    
-    protected Destination getReplyToDestination(Session session) throws JMSException, JMSBindingException, NamingException {
-        Destination replyToDest;
-        if (operation.isNonBlocking()) {
-            replyToDest = null;
-        } else {
-            if (bindingReplyDest != null) {
-                replyToDest = bindingReplyDest;
-            } else {
-                replyToDest = session.createTemporaryQueue();
-            }
-        }
-        return replyToDest;
-    }  
-    
-    public boolean allowsPassByReference() {
-        // JMS always pass by value
-        return true;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java
deleted file mode 100644
index 5306e050e7..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java
+++ /dev/null
@@ -1,122 +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.binding.jms.provider;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.naming.NamingException;
-import javax.security.auth.Subject;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy;
-import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.SecurityUtil;
-import org.apache.tuscany.sca.policy.authentication.token.TokenPrincipal;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * TODO RRB experiement
- * Listener for the JMSBinding.
- * 
- * @version $Rev$ $Date$
- */
-public class RRBJMSBindingListener implements MessageListener {
-
-    private static final Logger logger = Logger.getLogger(RRBJMSBindingListener.class.getName());
-
-    private JMSBinding jmsBinding;
-    private Binding targetBinding;
-    private JMSResourceFactory jmsResourceFactory;
-    private RuntimeComponentService service;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-    private String correlationScheme;
-    private List<Operation> serviceOperations;
-    private MessageFactory messageFactory;
-    
-
-    public RRBJMSBindingListener(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeComponentService service, Binding targetBinding, MessageFactory messageFactory) throws NamingException {
-        this.jmsBinding = jmsBinding;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.service = service;
-        this.targetBinding = targetBinding;
-        this.messageFactory = messageFactory;
-        
-        requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-        correlationScheme = jmsBinding.getCorrelationScheme();
-        serviceOperations = service.getInterfaceContract().getInterface().getOperations();
-        
-    }
-
-    public void onMessage(Message requestJMSMsg) {
-        logger.log(Level.FINE, "JMS service '" + service.getName() + "' received message " + requestJMSMsg);
-        try {
-            invokeService(requestJMSMsg);
-        } catch (Throwable e) {
-            logger.log(Level.SEVERE, "Exception send fault response '" + service.getName(), e);
-        }
-    }
-
-    protected void invokeService(Message requestJMSMsg) throws JMSException, InvocationTargetException {
-
-        // create the tuscany message
-        org.apache.tuscany.sca.invocation.Message tuscanyMsg = messageFactory.createMessage();
-        
-        // populate the message context with JMS binding information
-        JMSBindingContext context = new JMSBindingContext();
-        tuscanyMsg.getHeaders().add(context);
-        
-        context.setJmsMsg(requestJMSMsg);
-        context.setJmsResourceFactory(jmsResourceFactory);
-        context.setReplyToDestination(requestJMSMsg.getJMSReplyTo());
-        
-        // set the message body
-        tuscanyMsg.setBody(requestJMSMsg);
-        
-        // call the runtime wire - the response is handled by the 
-        // transport interceptor
-        service.getRuntimeWire(targetBinding).invoke(tuscanyMsg);
-            
-    }   
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
deleted file mode 100644
index 32d024ec32..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.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 org.apache.tuscany.sca.binding.jms.provider;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-import org.apache.tuscany.sca.binding.jms.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.JMSBindingException;
-
-/**
- * MessageProcessor for sending/receiving javax.jms.TextMessage with the JMSBinding.
- * 
- * @version $Rev$ $Date$
- */
-public class TextMessageProcessor extends AbstractMessageProcessor {
-
-    public TextMessageProcessor(JMSBinding jmsBinding) {
-        super(jmsBinding);
-    }
-
-    @Override
-    protected Object[] extractPayload(Message msg) {
-        try {
-
-            if (!(msg instanceof TextMessage)) {
-                throw new IllegalStateException("expecting JMS TextMessage: " + msg);
-            }
-
-            return new Object[] {((TextMessage)msg).getText()};
-
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-
-    @Override
-    protected Message createJMSMessage(Session session, Object o) {
-        try {
-
-            TextMessage message = session.createTextMessage();
-            message.setText(String.valueOf(o));
-            return message;
-
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
deleted file mode 100644
index 6e5556df01..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
+++ /dev/null
@@ -1,90 +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.binding.jms.provider;
-
-import java.io.StringReader;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.tuscany.sca.binding.jms.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.JMSBindingException;
-
-/**
- * MessageProcessor for sending/receiving XML javax.jms.TextMessage with the JMSBinding.
- * 
- * @version $Rev$ $Date$
- */
-public class XMLTextMessageProcessor extends AbstractMessageProcessor {
-
-    public XMLTextMessageProcessor(JMSBinding jmsBinding) {
-        super(jmsBinding);
-    }
-
-    @Override
-    protected Object[] extractPayload(Message msg) {
-        try {
-
-            String xml = ((TextMessage)msg).getText();
-            Object[] os;
-            if (xml != null) {
-                XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xml));
-                StAXOMBuilder builder = new StAXOMBuilder(reader);
-                os = new Object[] {builder.getDocumentElement()};
-            } else {
-                os = new Object[] {};
-            }
-            return os;
-
-        } catch (XMLStreamException e) {
-            throw new JMSBindingException(e);
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-
-    @Override
-    protected Message createJMSMessage(Session session, Object o) {
-        try {
-
-            TextMessage message = session.createTextMessage();
-
-            if (o instanceof OMElement) {
-                message.setText(o.toString());
-            } else if ((o instanceof Object[]) && ((Object[])o)[0] instanceof OMElement) {
-                message.setText(((Object[])o)[0].toString());
-            } else if (o != null) {
-                throw new IllegalStateException("expecting OMElement payload: " + o);
-            }
-
-            return message;
-
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
deleted file mode 100644
index e84279cae1..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
+++ /dev/null
@@ -1,186 +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.binding.jms.transport;
-
-import java.util.List;
-
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.naming.NamingException;
-
-
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy;
-import org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicy;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
- *
- * @version $Rev$ $Date$
- */
-public class TransportReferenceInterceptor implements Interceptor {
-    
-    private static final String ON_MESSAGE_METHOD_NAME = "onMessage";
-    
-    private Invoker next;
-    private RuntimeWire runtimeWire;
-    private JMSResourceFactory jmsResourceFactory;
-    private JMSBinding jmsBinding;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-    private RuntimeComponentReference reference; 
-    protected JMSHeaderPolicy jmsHeaderPolicy = null;
-    
-
-    public TransportReferenceInterceptor(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeWire runtimeWire) {
-        super();
-        this.jmsBinding = jmsBinding;
-        this.runtimeWire = runtimeWire;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-        this.reference = (RuntimeComponentReference)runtimeWire.getSource().getContract();
-        
-        // find out if the header policy is active
-        if (jmsBinding instanceof PolicySetAttachPoint) {
-            List<PolicySet> policySets = ((PolicySetAttachPoint)jmsBinding).getApplicablePolicySets();
-            for (PolicySet ps : policySets) {
-                for (Object p : ps.getPolicies()) {
-                    if (JMSHeaderPolicy.class.isInstance(p)) {
-                        jmsHeaderPolicy = (JMSHeaderPolicy)p;
-                    } 
-                }
-            }
-        }        
-    }
-    
-    public Message invoke(Message msg) {
-        Message responseMsg = invokeRequest(msg);
-        
-        // get the jms context
-        JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-        
-        if (context.getReplyToDestination() == null) {
-            responseMsg.setBody(null);
-        } else {
-            responseMsg = invokeResponse(msg);
-        }
-        
-        return responseMsg;
-    }
-    
-    public Message invokeRequest(Message msg) {
-        try {        
-            // get the jms context
-            JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-            Session session = context.getJmsSession();
-            
-            MessageProducer producer = session.createProducer(context.getRequestDestination());
-    
-            if (jmsBinding.getOperationJMSTimeToLive(msg.getOperation().getName()) != null) {
-                producer.setTimeToLive(jmsBinding.getOperationJMSTimeToLive(msg.getOperation().getName()));
-            }
-    
-            try {
-                producer.send((javax.jms.Message)msg.getBody());
-            } finally {
-                producer.close();
-            }
-            return msg;
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        } 
-    }
-    
-    public Message invokeResponse(Message msg) {
-        try {
-            // get the jms context
-            JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-            Session session = context.getJmsSession();
-            
-            javax.jms.Message requestMessage = (javax.jms.Message)msg.getBody();
-            
-            String operationName = msg.getOperation().getName();
-            
-            String msgSelector = "JMSCorrelationID = '" + 
-                                 requestMessage.getJMSMessageID() + 
-                                 "'";
-            MessageConsumer consumer = session.createConsumer(context.getReplyToDestination(), msgSelector);
-          
-            long receiveWait;
- 
-            if ((jmsHeaderPolicy != null) && 
-                (jmsHeaderPolicy.getTimeToLive() != null)) {
-                receiveWait = jmsHeaderPolicy.getTimeToLive();
-            } else if (jmsBinding.getOperationJMSTimeToLive(operationName) != null) {
-                receiveWait = jmsBinding.getOperationJMSTimeToLive(operationName) * 2;        
-            } else {   
-                receiveWait = JMSBindingConstants.DEFAULT_TIME_TO_LIVE;        
-            }       
-            
-            javax.jms.Message replyMsg;
-            try {
-                context.getJmsResourceFactory().startConnection();
-                //jmsResourceFactory.startConnection();
-                replyMsg = consumer.receive(receiveWait);
-            } finally {
-                consumer.close();
-            }
-            if (replyMsg == null) {
-                throw new JMSBindingException("No reply message received on " + 
-                                              context.getReplyToDestination() + 
-                                              " for message id " + 
-                                              requestMessage.getJMSMessageID());
-            }
-            
-            msg.setBody(replyMsg);
-            return msg;
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        } catch (NamingException e) {
-            throw new JMSBindingException(e);
-        } 
-    } 
-    
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
deleted file mode 100644
index ed17140ac3..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
+++ /dev/null
@@ -1,170 +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.binding.jms.transport;
-
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.naming.NamingException;
-import javax.security.auth.Subject;
-
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.provider.DefaultJMSBindingListener;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.SecurityUtil;
-import org.apache.tuscany.sca.policy.authentication.token.TokenPrincipal;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
- *
- * @version $Rev$ $Date$
- */
-public class TransportServiceInterceptor implements Interceptor {
-    private static final Logger logger = Logger.getLogger(TransportServiceInterceptor.class.getName());
-      
-    private Invoker next;
-    private RuntimeWire runtimeWire;
-    private JMSResourceFactory jmsResourceFactory;
-    private JMSBinding jmsBinding;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-    private RuntimeComponentService service;
-    private String correlationScheme;
-    
-
-    public TransportServiceInterceptor(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeWire runtimeWire) {
-        super();
-        this.jmsBinding = jmsBinding;
-        this.runtimeWire = runtimeWire;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-        this.service = (RuntimeComponentService)runtimeWire.getTarget().getContract();
-        this.correlationScheme = jmsBinding.getCorrelationScheme();
-    }
-    
-    public Message invoke(Message msg) {
-        try {
-            return invokeResponse(next.invoke(invokeRequest(msg)));
-        } catch (Throwable e) {
-            logger.log(Level.SEVERE, "Exception invoking service '" + service.getName(), e);
-            JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-            javax.jms.Message replyJMSMsg = responseMessageProcessor.createFaultMessage(context.getJmsSession(), 
-                                                                                        (Throwable)e);
-            msg.setBody(replyJMSMsg);
-            invokeResponse(msg);
-            return msg;
-        }
-    }    
-    
-    public Message invokeRequest(Message msg) { 
-        try {
-            JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-            javax.jms.Message requestJMSMsg = context.getJmsMsg();
-            context.setJmsSession(context.getJmsResourceFactory().createSession());
-            
-            EndpointReference from = new EndpointReferenceImpl(null);
-            msg.setFrom(from);
-            from.setCallbackEndpoint(new EndpointReferenceImpl("/")); // TODO: whats this for?
-            ReferenceParameters parameters = from.getReferenceParameters();
-    
-            String conversationID = requestJMSMsg.getStringProperty(JMSBindingConstants.CONVERSATION_ID_PROPERTY);
-            if (conversationID != null) {
-                parameters.setConversationID(conversationID);
-            }
-            
-            return msg;
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        } catch (NamingException e) {
-            throw new JMSBindingException(e);
-        } 
-    }
-    
-    public Message invokeResponse(Message msg) { 
-        try {
-            JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-            Session session = context.getJmsSession();
-            javax.jms.Message requestJMSMsg = context.getJmsMsg();
-            javax.jms.Message responseJMSMsg = msg.getBody();
-            
-
-            if (requestJMSMsg.getJMSReplyTo() == null) {
-                // assume no reply is expected
-                if (msg.getBody() != null) {
-                    logger.log(Level.FINE, "JMS service '" + service.getName() + "' dropped response as request has no replyTo");
-                }
-                return msg;
-            }
-            
-            responseJMSMsg.setJMSDeliveryMode(requestJMSMsg.getJMSDeliveryMode());
-            responseJMSMsg.setJMSPriority(requestJMSMsg.getJMSPriority());
-    
-            if (correlationScheme == null || 
-                JMSBindingConstants.CORRELATE_MSG_ID.equalsIgnoreCase(correlationScheme)) {
-                responseJMSMsg.setJMSCorrelationID(requestJMSMsg.getJMSMessageID());
-            } else if (JMSBindingConstants.CORRELATE_CORRELATION_ID.equalsIgnoreCase(correlationScheme)) {
-                responseJMSMsg.setJMSCorrelationID(requestJMSMsg.getJMSCorrelationID());
-            }                
-                       
-            MessageProducer producer = session.createProducer(context.getReplyToDestination());
-    
-            producer.send((javax.jms.Message)msg.getBody());
-    
-            producer.close();
-            session.close();
-            
-            return msg;
-    
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        } 
-    }    
-    
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }    
-   
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProviderFactory.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProviderFactory.java
deleted file mode 100644
index 9f554b50e9..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProviderFactory.java
+++ /dev/null
@@ -1,65 +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.binding.jms.wireformat.jmsbytes;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.provider.WireFormatProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSBytesProviderFactory implements WireFormatProviderFactory<WireFormatJMSBytes> {
-    private ExtensionPointRegistry registry;
-    
-    public WireFormatJMSBytesProviderFactory(ExtensionPointRegistry registry) {
-        super();
-        this.registry = registry;
-    }
-
-    /**
-     */
-    public WireFormatProvider createReferenceWireFormatProvider(RuntimeComponent component,
-                                                        RuntimeComponentReference reference,
-                                                        Binding binding) {
-        return new WireFormatJMSBytesReferenceProvider(registry, component, reference, binding);
-    }
-
-    /**
-      */
-    public WireFormatProvider createServiceWireFormatProvider(RuntimeComponent component,
-                                                              RuntimeComponentService service,
-                                                              Binding binding) {
-        return new WireFormatJMSBytesServiceProvider(registry, component, service, binding);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()
-     */
-    public Class getModelType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceInterceptor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceInterceptor.java
deleted file mode 100644
index f990a9a0ba..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceInterceptor.java
+++ /dev/null
@@ -1,111 +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.binding.jms.wireformat.jmsbytes;
-
-
-import javax.jms.JMSException;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSBytesReferenceInterceptor implements Interceptor {
-
-    private Invoker next;
-    private RuntimeWire runtimeWire;
-    private JMSResourceFactory jmsResourceFactory;
-    private JMSBinding jmsBinding;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-
-    public WireFormatJMSBytesReferenceInterceptor(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeWire runtimeWire) {
-        super();
-        this.jmsBinding = jmsBinding;
-        this.runtimeWire = runtimeWire;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding); 
-    }
-
-    public Message invoke(Message msg) {
-        if (jmsBinding.getRequestWireFormat() instanceof WireFormatJMSBytes){
-            msg = invokeRequest(msg);
-        }
-        
-        msg = getNext().invoke(msg);
-        
-        if (jmsBinding.getResponseWireFormat() instanceof WireFormatJMSBytes){
-            msg = invokeResponse(msg);
-        }
-        
-        return msg;
-    }
-    
-    public Message invokeRequest(Message msg) {
-        try {
-            // get the jms context
-            JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-            Session session = context.getJmsSession();
-            
-            javax.jms.Message requestMsg = requestMessageProcessor.insertPayloadIntoJMSMessage(session, msg.getBody());
-            msg.setBody(requestMsg);
-            
-            requestMsg.setJMSReplyTo(context.getReplyToDestination());
-            
-            return msg;
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        } 
-    }
-    
-    public Message invokeResponse(Message msg) {
-        if (msg.getBody() != null){
-            Object[] response = (Object[])responseMessageProcessor.extractPayloadFromJMSMessage((javax.jms.Message)msg.getBody());
-            if (response != null && response.length > 0){
-                msg.setBody(response[0]);
-            } else {
-                msg.setBody(null);
-            }
-        }
-
-        return msg;
-    }     
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceProvider.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceProvider.java
deleted file mode 100644
index 65de548e58..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceProvider.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 org.apache.tuscany.sca.binding.jms.wireformat.jmsbytes;
-
-import java.util.List;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml.WireFormatJMSTextXML;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSBytesReferenceProvider implements WireFormatProvider {
-    private ExtensionPointRegistry registry;
-    private RuntimeComponent component;
-    private RuntimeComponentReference reference;
-    private JMSBinding binding;
-    private InterfaceContract interfaceContract; 
-
-    public WireFormatJMSBytesReferenceProvider(ExtensionPointRegistry registry,
-                                               RuntimeComponent component,
-                                               RuntimeComponentReference reference,
-                                               Binding binding) {
-        super();
-        this.registry = registry;
-        this.component = component;
-        this.reference = reference;
-        this.binding = (JMSBinding)binding;
-        
-        // configure the reference based on this wire format
-        
-        // currently maintaining the message processor structure which 
-        // contains the details of jms message processing however overried 
-        // any message processors specied in the SCDL in this case
-        this.binding.setRequestMessageProcessorName(JMSBindingConstants.BYTES_MP_CLASSNAME);
-        this.binding.setResponseMessageProcessorName(JMSBindingConstants.BYTES_MP_CLASSNAME);
-        
-        // just point to the reference interface contract so no 
-        // databinding transformation takes place
-        interfaceContract = reference.getInterfaceContract();
-    }
-    
-    public InterfaceContract getWireFormatInterfaceContract() {
-        return interfaceContract;
-    }
-
-    public Interceptor createInterceptor() {
-        return new WireFormatJMSBytesReferenceInterceptor(binding, 
-                                                          null, 
-                                                          reference.getRuntimeWire(binding));
-    }
-
-    public String getPhase() {
-        return Phase.REFERENCE_BINDING_WIREFORMAT;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceInterceptor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceInterceptor.java
deleted file mode 100644
index 7c7c622fbc..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceInterceptor.java
+++ /dev/null
@@ -1,111 +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.binding.jms.wireformat.jmsbytes;
-
-import javax.jms.JMSException;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSBytesServiceInterceptor implements Interceptor {
-    private Invoker next;
-    private RuntimeWire runtimeWire;
-    private JMSResourceFactory jmsResourceFactory;
-    private JMSBinding jmsBinding;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-
-    public WireFormatJMSBytesServiceInterceptor(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeWire runtimeWire) {
-        super();
-        this.jmsBinding = jmsBinding;
-        this.runtimeWire = runtimeWire;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-    }
-
-    public Message invoke(Message msg) {
-        if (jmsBinding.getRequestWireFormat() instanceof WireFormatJMSBytes){
-            msg = invokeRequest(msg);
-        }
-        
-        msg = getNext().invoke(msg);
-        
-        if (jmsBinding.getResponseWireFormat() instanceof WireFormatJMSBytes){
-            msg = invokeResponse(msg);
-        }
-        
-        return msg;
-    }
-    
-    public Message invokeRequest(Message msg) {
-        // get the jms context
-        JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-        javax.jms.Message jmsMsg = context.getJmsMsg();
-
-        Object requestPayload = requestMessageProcessor.extractPayloadFromJMSMessage(jmsMsg);
-        msg.setBody(requestPayload);
-                 
-        return msg;
-    }
-    
-    public Message invokeResponse(Message msg) {
-        // get the jms context
-        JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-        javax.jms.Message requestJMSMsg = context.getJmsMsg();
-        Session session = context.getJmsSession();
-
-        javax.jms.Message responseJMSMsg;
-        if (msg.isFault()) {
-            responseJMSMsg = responseMessageProcessor.createFaultMessage(session, (Throwable)msg.getBody());
-        } else {
-            Object[] response = {msg.getBody()};
-            responseJMSMsg = responseMessageProcessor.insertPayloadIntoJMSMessage(session, response);
-        } 
-    
-        msg.setBody(responseJMSMsg);
-        
-        return msg;
-    }        
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceProvider.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceProvider.java
deleted file mode 100644
index 60ea1c7ff4..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceProvider.java
+++ /dev/null
@@ -1,91 +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.binding.jms.wireformat.jmsbytes;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSBytesServiceProvider implements WireFormatProvider {
-    private ExtensionPointRegistry registry;
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private JMSBinding binding;
-    private InterfaceContract interfaceContract; 
-
-    public WireFormatJMSBytesServiceProvider(ExtensionPointRegistry registry,
-                                             RuntimeComponent component, 
-                                             RuntimeComponentService service, 
-                                             Binding binding) {
-        super();
-        this.registry = registry;
-        this.component = component;
-        this.service = service;
-        this.binding = (JMSBinding)binding;
-        
-        // configure the service based on this wire format
-        
-        // currently maintaining the message processor structure which 
-        // contains the details of jms message processing however overried 
-        // any message processors specied in the SCDL in this case
-        this.binding.setRequestMessageProcessorName(JMSBindingConstants.BYTES_MP_CLASSNAME);
-        this.binding.setResponseMessageProcessorName(JMSBindingConstants.BYTES_MP_CLASSNAME);
-        
-        // just point to the reference interface contract so no 
-        // databinding transformation takes place
-        interfaceContract = service.getInterfaceContract();
-    }
-    
-    public InterfaceContract getWireFormatInterfaceContract() {
-        return interfaceContract;
-    }
-
-    /**
-     */
-    public Interceptor createInterceptor() {
-        return new WireFormatJMSBytesServiceInterceptor((JMSBinding)binding,
-                                                         null,
-                                                        service.getRuntimeWire(binding));
-    }
-
-    /**
-     */
-    public String getPhase() {
-        return Phase.SERVICE_BINDING_WIREFORMAT;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProviderFactory.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProviderFactory.java
deleted file mode 100644
index 5811ca53e0..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProviderFactory.java
+++ /dev/null
@@ -1,65 +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.binding.jms.wireformat.jmsobject;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.provider.WireFormatProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSObjectProviderFactory implements WireFormatProviderFactory<WireFormatJMSObject> {
-    private ExtensionPointRegistry registry;
-    
-    public WireFormatJMSObjectProviderFactory(ExtensionPointRegistry registry) {
-        super();
-        this.registry = registry;
-    }
-
-    /**
-     */
-    public WireFormatProvider createReferenceWireFormatProvider(RuntimeComponent component,
-                                                        RuntimeComponentReference reference,
-                                                        Binding binding) {
-        return new WireFormatJMSObjectReferenceProvider(registry, component, reference, binding);
-    }
-
-    /**
-      */
-    public WireFormatProvider createServiceWireFormatProvider(RuntimeComponent component,
-                                                              RuntimeComponentService service,
-                                                              Binding binding) {
-        return new WireFormatJMSObjectServiceProvider(registry, component, service, binding);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()
-     */
-    public Class getModelType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceInterceptor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceInterceptor.java
deleted file mode 100644
index 9653c0d51e..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceInterceptor.java
+++ /dev/null
@@ -1,111 +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.binding.jms.wireformat.jmsobject;
-
-
-import javax.jms.JMSException;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSObjectReferenceInterceptor implements Interceptor {
-
-    private Invoker next;
-    private RuntimeWire runtimeWire;
-    private JMSResourceFactory jmsResourceFactory;
-    private JMSBinding jmsBinding;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-
-    public WireFormatJMSObjectReferenceInterceptor(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeWire runtimeWire) {
-        super();
-        this.jmsBinding = jmsBinding;
-        this.runtimeWire = runtimeWire;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding); 
-    }
-
-    public Message invoke(Message msg) {
-        if (jmsBinding.getRequestWireFormat() instanceof WireFormatJMSObject){
-            msg = invokeRequest(msg);
-        }
-        
-        msg = getNext().invoke(msg);
-        
-        if (jmsBinding.getResponseWireFormat() instanceof WireFormatJMSObject){
-            msg = invokeResponse(msg);
-        }
-        
-        return msg;
-    }
-    
-    public Message invokeRequest(Message msg) {
-        try {
-            // get the jms context
-            JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-            Session session = context.getJmsSession();
-            
-            javax.jms.Message requestMsg = requestMessageProcessor.insertPayloadIntoJMSMessage(session, msg.getBody());
-            msg.setBody(requestMsg);
-            
-            requestMsg.setJMSReplyTo(context.getReplyToDestination());
-            
-            return msg;
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        } 
-    }
-    
-    public Message invokeResponse(Message msg) {
-        if (msg.getBody() != null){
-            Object[] response = (Object[])responseMessageProcessor.extractPayloadFromJMSMessage((javax.jms.Message)msg.getBody());
-            if (response != null && response.length > 0){
-                msg.setBody(response[0]);
-            } else {
-                msg.setBody(null);
-            }
-        }
-
-        return msg;
-    }     
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceProvider.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceProvider.java
deleted file mode 100644
index b993ae9067..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceProvider.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 org.apache.tuscany.sca.binding.jms.wireformat.jmsobject;
-
-import java.util.List;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml.WireFormatJMSTextXML;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSObjectReferenceProvider implements WireFormatProvider {
-    private ExtensionPointRegistry registry;
-    private RuntimeComponent component;
-    private RuntimeComponentReference reference;
-    private JMSBinding binding;
-    private InterfaceContract interfaceContract; 
-
-    public WireFormatJMSObjectReferenceProvider(ExtensionPointRegistry registry,
-                                               RuntimeComponent component,
-                                               RuntimeComponentReference reference,
-                                               Binding binding) {
-        super();
-        this.registry = registry;
-        this.component = component;
-        this.reference = reference;
-        this.binding = (JMSBinding)binding;
-        
-        // configure the reference based on this wire format
-        
-        // currently maintaining the message processor structure which 
-        // contains the details of jms message processing however overried 
-        // any message processors specied in the SCDL in this case
-        this.binding.setRequestMessageProcessorName(JMSBindingConstants.OBJECT_MP_CLASSNAME);
-        this.binding.setResponseMessageProcessorName(JMSBindingConstants.OBJECT_MP_CLASSNAME);
-        
-        // just point to the reference interface contract so no 
-        // databinding transformation takes place
-        interfaceContract = reference.getInterfaceContract();
-    }
-    
-    public InterfaceContract getWireFormatInterfaceContract() {
-        return interfaceContract;
-    }
-
-    public Interceptor createInterceptor() {
-        return new WireFormatJMSObjectReferenceInterceptor(binding, 
-                                                          null, 
-                                                          reference.getRuntimeWire(binding));
-    }
-
-    public String getPhase() {
-        return Phase.REFERENCE_BINDING_WIREFORMAT;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceInterceptor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceInterceptor.java
deleted file mode 100644
index 4bfbd2be0e..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceInterceptor.java
+++ /dev/null
@@ -1,111 +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.binding.jms.wireformat.jmsobject;
-
-import javax.jms.JMSException;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSObjectServiceInterceptor implements Interceptor {
-    private Invoker next;
-    private RuntimeWire runtimeWire;
-    private JMSResourceFactory jmsResourceFactory;
-    private JMSBinding jmsBinding;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-
-    public WireFormatJMSObjectServiceInterceptor(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeWire runtimeWire) {
-        super();
-        this.jmsBinding = jmsBinding;
-        this.runtimeWire = runtimeWire;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-    }
-
-    public Message invoke(Message msg) {
-        if (jmsBinding.getRequestWireFormat() instanceof WireFormatJMSObject){
-            msg = invokeRequest(msg);
-        }
-        
-        msg = getNext().invoke(msg);
-        
-        if (jmsBinding.getResponseWireFormat() instanceof WireFormatJMSObject){
-            msg = invokeResponse(msg);
-        }
-        
-        return msg;
-    }
-    
-    public Message invokeRequest(Message msg) {
-        // get the jms context
-        JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-        javax.jms.Message jmsMsg = context.getJmsMsg();
-
-        Object requestPayload = requestMessageProcessor.extractPayloadFromJMSMessage(jmsMsg);
-        msg.setBody(requestPayload);
-                 
-        return msg;
-    }
-    
-    public Message invokeResponse(Message msg) {
-        // get the jms context
-        JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-        javax.jms.Message requestJMSMsg = context.getJmsMsg();
-        Session session = context.getJmsSession();
-
-        javax.jms.Message responseJMSMsg;
-        if (msg.isFault()) {
-            responseJMSMsg = responseMessageProcessor.createFaultMessage(session, (Throwable)msg.getBody());
-        } else {
-            Object[] response = {msg.getBody()};
-            responseJMSMsg = responseMessageProcessor.insertPayloadIntoJMSMessage(session, response);
-        } 
-    
-        msg.setBody(responseJMSMsg);
-        
-        return msg;
-    }        
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceProvider.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceProvider.java
deleted file mode 100644
index 9def71a6e0..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceProvider.java
+++ /dev/null
@@ -1,91 +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.binding.jms.wireformat.jmsobject;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSObjectServiceProvider implements WireFormatProvider {
-    private ExtensionPointRegistry registry;
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private JMSBinding binding;
-    private InterfaceContract interfaceContract; 
-
-    public WireFormatJMSObjectServiceProvider(ExtensionPointRegistry registry,
-                                             RuntimeComponent component, 
-                                             RuntimeComponentService service, 
-                                             Binding binding) {
-        super();
-        this.registry = registry;
-        this.component = component;
-        this.service = service;
-        this.binding = (JMSBinding)binding;
-        
-        // configure the service based on this wire format
-        
-        // currently maintaining the message processor structure which 
-        // contains the details of jms message processing however overried 
-        // any message processors specied in the SCDL in this case
-        this.binding.setRequestMessageProcessorName(JMSBindingConstants.OBJECT_MP_CLASSNAME);
-        this.binding.setResponseMessageProcessorName(JMSBindingConstants.OBJECT_MP_CLASSNAME);
-
-        // just point to the reference interface contract so no 
-        // databinding transformation takes place
-        interfaceContract = service.getInterfaceContract();
-    }
-    
-    public InterfaceContract getWireFormatInterfaceContract() {
-        return interfaceContract;
-    }
-
-    /**
-     */
-    public Interceptor createInterceptor() {
-        return new WireFormatJMSObjectServiceInterceptor((JMSBinding)binding,
-                                                         null,
-                                                        service.getRuntimeWire(binding));
-    }
-
-    /**
-     */
-    public String getPhase() {
-        return Phase.SERVICE_BINDING_WIREFORMAT;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProviderFactory.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProviderFactory.java
deleted file mode 100644
index 5480cc8165..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProviderFactory.java
+++ /dev/null
@@ -1,65 +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.binding.jms.wireformat.jmstext;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.provider.WireFormatProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSTextProviderFactory implements WireFormatProviderFactory<WireFormatJMSText> {
-    private ExtensionPointRegistry registry;
-    
-    public WireFormatJMSTextProviderFactory(ExtensionPointRegistry registry) {
-        super();
-        this.registry = registry;
-    }
-
-    /**
-     */
-    public WireFormatProvider createReferenceWireFormatProvider(RuntimeComponent component,
-                                                        RuntimeComponentReference reference,
-                                                        Binding binding) {
-        return new WireFormatJMSTextReferenceProvider(registry, component, reference, binding);
-    }
-
-    /**
-      */
-    public WireFormatProvider createServiceWireFormatProvider(RuntimeComponent component,
-                                                              RuntimeComponentService service,
-                                                              Binding binding) {
-        return new WireFormatJMSTextServiceProvider(registry, component, service, binding);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()
-     */
-    public Class getModelType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceInterceptor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceInterceptor.java
deleted file mode 100644
index e317f42266..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceInterceptor.java
+++ /dev/null
@@ -1,112 +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.binding.jms.wireformat.jmstext;
-
-
-import javax.jms.JMSException;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml.WireFormatJMSTextXML;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSTextReferenceInterceptor implements Interceptor {
-
-    private Invoker next;
-    private RuntimeWire runtimeWire;
-    private JMSResourceFactory jmsResourceFactory;
-    private JMSBinding jmsBinding;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-
-    public WireFormatJMSTextReferenceInterceptor(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeWire runtimeWire) {
-        super();
-        this.jmsBinding = jmsBinding;
-        this.runtimeWire = runtimeWire;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-    }
-
-    public Message invoke(Message msg) {
-        if (jmsBinding.getRequestWireFormat() instanceof WireFormatJMSText){
-            msg = invokeRequest(msg);
-        }
-        
-        msg = getNext().invoke(msg);
-        
-        if (jmsBinding.getResponseWireFormat() instanceof WireFormatJMSText){
-            msg = invokeResponse(msg);
-        }
-        
-        return msg;
-    }
-    
-    public Message invokeRequest(Message msg) {
-        try {
-            // get the jms context
-            JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-            Session session = context.getJmsSession();
-            
-            javax.jms.Message requestMsg = requestMessageProcessor.insertPayloadIntoJMSMessage(session, msg.getBody());
-            msg.setBody(requestMsg);
-            
-            requestMsg.setJMSReplyTo(context.getReplyToDestination());
-            
-            return msg;
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        } 
-    }
-    
-    public Message invokeResponse(Message msg) {
-        if (msg.getBody() != null){
-            Object[] response = (Object[])responseMessageProcessor.extractPayloadFromJMSMessage((javax.jms.Message)msg.getBody());
-            if (response != null && response.length > 0){
-                msg.setBody(response[0]);
-            } else {
-                msg.setBody(null);
-            }
-        }
-
-        return msg;
-    }     
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceProvider.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceProvider.java
deleted file mode 100644
index 7e749a96d6..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceProvider.java
+++ /dev/null
@@ -1,95 +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.binding.jms.wireformat.jmstext;
-
-import java.util.List;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml.WireFormatJMSTextXML;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSTextReferenceProvider implements WireFormatProvider {
-    private ExtensionPointRegistry registry;
-    private RuntimeComponent component;
-    private RuntimeComponentReference reference;
-    private JMSBinding binding;
-    private InterfaceContract interfaceContract; 
-
-    public WireFormatJMSTextReferenceProvider(ExtensionPointRegistry registry,
-                                               RuntimeComponent component,
-                                               RuntimeComponentReference reference,
-                                               Binding binding) {
-        super();
-        this.registry = registry;
-        this.component = component;
-        this.reference = reference;
-        this.binding = (JMSBinding)binding;
-        
-        // configure the reference based on this wire format
-        
-        // currently maintaining the message processor structure which 
-        // contains the details of jms message processing however overried 
-        // any message processors specied in the SCDL in this case
-        this.binding.setRequestMessageProcessorName(JMSBindingConstants.TEXT_MP_CLASSNAME);
-        this.binding.setResponseMessageProcessorName(JMSBindingConstants.TEXT_MP_CLASSNAME);
-
-        
-        // just point to the reference interface contract so no 
-        // databinding transformation takes place
-        interfaceContract = reference.getInterfaceContract();
-    }
-    
-    public InterfaceContract getWireFormatInterfaceContract() {
-        return interfaceContract;
-    }
-
-    public Interceptor createInterceptor() {
-        return new WireFormatJMSTextReferenceInterceptor(binding, 
-                                                          null, 
-                                                          reference.getRuntimeWire(binding));
-    }
-
-    public String getPhase() {
-        return Phase.REFERENCE_BINDING_WIREFORMAT;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceInterceptor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceInterceptor.java
deleted file mode 100644
index 3dc2d0199d..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceInterceptor.java
+++ /dev/null
@@ -1,111 +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.binding.jms.wireformat.jmstext;
-
-import javax.jms.JMSException;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSTextServiceInterceptor implements Interceptor {
-    private Invoker next;
-    private RuntimeWire runtimeWire;
-    private JMSResourceFactory jmsResourceFactory;
-    private JMSBinding jmsBinding;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-
-    public WireFormatJMSTextServiceInterceptor(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeWire runtimeWire) {
-        super();
-        this.jmsBinding = jmsBinding;
-        this.runtimeWire = runtimeWire;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-    }
-
-    public Message invoke(Message msg) {
-        if (jmsBinding.getRequestWireFormat() instanceof WireFormatJMSText){
-            msg = invokeRequest(msg);
-        }
-        
-        msg = getNext().invoke(msg);
-        
-        if (jmsBinding.getResponseWireFormat() instanceof WireFormatJMSText){
-            msg = invokeResponse(msg);
-        }
-        
-        return msg;
-    }
-    
-    public Message invokeRequest(Message msg) {
-        // get the jms context
-        JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-        javax.jms.Message jmsMsg = context.getJmsMsg();
-
-        Object requestPayload = requestMessageProcessor.extractPayloadFromJMSMessage(jmsMsg);
-        msg.setBody(requestPayload);
-                 
-        return msg;
-    }
-    
-    public Message invokeResponse(Message msg) {
-        // get the jms context
-        JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-        javax.jms.Message requestJMSMsg = context.getJmsMsg();
-        Session session = context.getJmsSession();
-
-        javax.jms.Message responseJMSMsg;
-        if (msg.isFault()) {
-            responseJMSMsg = responseMessageProcessor.createFaultMessage(session, (Throwable)msg.getBody());
-        } else {
-            Object[] response = {msg.getBody()};
-            responseJMSMsg = responseMessageProcessor.insertPayloadIntoJMSMessage(session, response);
-        }  
-    
-        msg.setBody(responseJMSMsg);
-        
-        return msg;
-    }        
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceProvider.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceProvider.java
deleted file mode 100644
index 6f9f0c9da9..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceProvider.java
+++ /dev/null
@@ -1,91 +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.binding.jms.wireformat.jmstext;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSTextServiceProvider implements WireFormatProvider {
-    private ExtensionPointRegistry registry;
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private JMSBinding binding;
-    private InterfaceContract interfaceContract; 
-
-    public WireFormatJMSTextServiceProvider(ExtensionPointRegistry registry,
-                                             RuntimeComponent component, 
-                                             RuntimeComponentService service, 
-                                             Binding binding) {
-        super();
-        this.registry = registry;
-        this.component = component;
-        this.service = service;
-        this.binding = (JMSBinding)binding;
-        
-        // configure the service based on this wire format
-        
-        // currently maintaining the message processor structure which 
-        // contains the details of jms message processing however overried 
-        // any message processors specied in the SCDL in this case
-        this.binding.setRequestMessageProcessorName(JMSBindingConstants.TEXT_MP_CLASSNAME);
-        this.binding.setResponseMessageProcessorName(JMSBindingConstants.TEXT_MP_CLASSNAME);
-        
-        // just point to the reference interface contract so no 
-        // databinding transformation takes place
-        interfaceContract = service.getInterfaceContract();
-    }
-    
-    public InterfaceContract getWireFormatInterfaceContract() {
-        return interfaceContract;
-    }
-
-    /**
-     */
-    public Interceptor createInterceptor() {
-        return new WireFormatJMSTextServiceInterceptor((JMSBinding)binding,
-                                                         null,
-                                                        service.getRuntimeWire(binding));
-    }
-
-    /**
-     */
-    public String getPhase() {
-        return Phase.SERVICE_BINDING_WIREFORMAT;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProviderFactory.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProviderFactory.java
deleted file mode 100644
index 6bef4e8160..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProviderFactory.java
+++ /dev/null
@@ -1,72 +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.binding.jms.wireformat.jmstextxml;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactoryExtensionPoint;
-import org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml.WireFormatJMSTextXML;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.provider.WireFormatProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSTextXMLProviderFactory implements WireFormatProviderFactory<WireFormatJMSTextXML> {
-    private ExtensionPointRegistry registry;
-    private JMSResourceFactoryExtensionPoint jmsRFEP;
-    
-    public WireFormatJMSTextXMLProviderFactory(ExtensionPointRegistry registry) {
-        super();
-        this.registry = registry;
-        jmsRFEP = (JMSResourceFactoryExtensionPoint)registry.getExtensionPoint(JMSResourceFactoryExtensionPoint.class);
-    }
-
-    /**
-     */
-    public WireFormatProvider createReferenceWireFormatProvider(RuntimeComponent component,
-                                                        RuntimeComponentReference reference,
-                                                        Binding binding) {
-        return new WireFormatJMSTextXMLReferenceProvider(registry, component, reference, binding);
-    }
-
-    /**
-      */
-    public WireFormatProvider createServiceWireFormatProvider(RuntimeComponent component,
-                                                              RuntimeComponentService service,
-                                                              Binding binding) {
-        JMSResourceFactory jmsRF = jmsRFEP.createJMSResourceFactory((JMSBinding)binding);
-        return new WireFormatJMSTextXMLServiceProvider(registry, component, service, binding, jmsRF);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()
-     */
-    public Class getModelType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceInterceptor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceInterceptor.java
deleted file mode 100644
index 86a5bbb4b2..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceInterceptor.java
+++ /dev/null
@@ -1,125 +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.binding.jms.wireformat.jmstextxml;
-
-
-
-
-import java.util.Map;
-
-import javax.jms.DeliveryMode;
-import javax.jms.JMSException;
-import javax.jms.Session;
-
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.provider.JMSBindingServiceBindingProvider;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml.WireFormatJMSTextXML;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSTextXMLReferenceInterceptor implements Interceptor {
-
-    private Invoker next;
-    private RuntimeWire runtimeWire;
-    private JMSResourceFactory jmsResourceFactory;
-    private JMSBinding jmsBinding;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-
-
-    public WireFormatJMSTextXMLReferenceInterceptor(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeWire runtimeWire) {
-        super();
-        this.jmsBinding = jmsBinding;
-        this.runtimeWire = runtimeWire;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-    }
-
-    public Message invoke(Message msg) {
-        if (jmsBinding.getRequestWireFormat() instanceof WireFormatJMSTextXML){
-            msg = invokeRequest(msg);
-        }
-        
-        msg = getNext().invoke(msg);
-        
-        if (jmsBinding.getResponseWireFormat() instanceof WireFormatJMSTextXML){
-            msg = invokeResponse(msg);
-        }
-        
-        return msg;
-    }
-    
-    public Message invokeRequest(Message msg) {
-        try {
-            // get the jms context
-            JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-            Session session = context.getJmsSession();
-            
-            javax.jms.Message requestMsg = requestMessageProcessor.insertPayloadIntoJMSMessage(session, msg.getBody());
-            msg.setBody(requestMsg);
-            
-            requestMsg.setJMSReplyTo(context.getReplyToDestination());
-            
-            return msg;
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        } 
-    }
-    
-    public Message invokeResponse(Message msg) {
-        if (msg.getBody() != null){
-            Object[] response = (Object[])responseMessageProcessor.extractPayloadFromJMSMessage((javax.jms.Message)msg.getBody());
-            if (response != null && response.length > 0){
-                msg.setBody(response[0]);
-            } else {
-                msg.setBody(null);
-            }
-        }
-
-        return msg;
-    }    
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }    
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceProvider.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceProvider.java
deleted file mode 100644
index b97084b5ad..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceProvider.java
+++ /dev/null
@@ -1,110 +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.binding.jms.wireformat.jmstextxml;
-
-import java.util.List;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSTextXMLReferenceProvider implements WireFormatProvider {
-    private ExtensionPointRegistry registry;
-    private RuntimeComponent component;
-    private RuntimeComponentReference reference;
-    private JMSBinding binding;
-    private InterfaceContract interfaceContract; 
-
-    public WireFormatJMSTextXMLReferenceProvider(ExtensionPointRegistry registry,
-                                                 RuntimeComponent component,
-                                                 RuntimeComponentReference reference,
-                                                 Binding binding) {
-        super();
-        this.registry = registry;
-        this.component = component;
-        this.reference = reference;
-        this.binding = (JMSBinding)binding;
-        
-        // configure the reference based on this wire format
-        
-        // currently maintaining the message processor structure which 
-        // contains the details of jms message processing so set the message
-        // type here if not set explicitly in SCDL
-        if (this.binding.getRequestMessageProcessorName().equals(JMSBindingConstants.XML_MP_CLASSNAME) ){
-            this.binding.setRequestMessageProcessorName(JMSBindingConstants.XML_MP_CLASSNAME);
-            this.binding.setResponseMessageProcessorName(JMSBindingConstants.XML_MP_CLASSNAME);
-        }
-        
-        // set the binding interface contract to represent the WSDL for the 
-        // xml messages that will be sent
-        if (reference.getInterfaceContract() != null &&
-            !isOnMessage()) {
-            WebServiceBindingFactory wsFactory = registry.getExtensionPoint(WebServiceBindingFactory.class);
-            WebServiceBinding wsBinding = wsFactory.createWebServiceBinding();
-            BindingWSDLGenerator.generateWSDL(component, reference, wsBinding, registry, null);
-            interfaceContract = wsBinding.getBindingInterfaceContract();
-            interfaceContract.getInterface().resetDataBinding(OMElement.class.getName());  
-        } else {
-            interfaceContract = reference.getInterfaceContract();
-        }
-    }
-    
-    protected boolean isOnMessage() {
-        InterfaceContract ic = reference.getInterfaceContract();
-        if (ic.getInterface().getOperations().size() != 1) {
-            return false;
-        }
-        return "onMessage".equals(ic.getInterface().getOperations().get(0).getName());
-    }
-    
-    public InterfaceContract getWireFormatInterfaceContract() {
-        return interfaceContract;
-    }
-    
-    public Interceptor createInterceptor() {
-        return new WireFormatJMSTextXMLReferenceInterceptor((JMSBinding)binding, 
-                                                            null, 
-                                                            reference.getRuntimeWire(binding));
-    }
-
-    public String getPhase() {
-        return Phase.REFERENCE_BINDING_WIREFORMAT;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceInterceptor.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceInterceptor.java
deleted file mode 100644
index ffec9d67f8..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceInterceptor.java
+++ /dev/null
@@ -1,118 +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.binding.jms.wireformat.jmstextxml;
-
-import javax.jms.JMSException;
-import javax.jms.Session;
-import javax.naming.NamingException;
-
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorUtil;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml.WireFormatJMSTextXML;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSTextXMLServiceInterceptor implements Interceptor {
-    private Invoker next;
-    private RuntimeWire runtimeWire;
-    private JMSResourceFactory jmsResourceFactory;
-    private JMSBinding jmsBinding;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-
-    public WireFormatJMSTextXMLServiceInterceptor(JMSBinding jmsBinding, JMSResourceFactory jmsResourceFactory, RuntimeWire runtimeWire) {
-        super();
-        this.jmsBinding = jmsBinding;
-        this.runtimeWire = runtimeWire;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.requestMessageProcessor = JMSMessageProcessorUtil.getRequestMessageProcessor(jmsBinding);
-        this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
-    }
-    
-    public Message invoke(Message msg) {
-
-        if (jmsBinding.getRequestWireFormat() instanceof WireFormatJMSTextXML){
-            msg = invokeRequest(msg);
-        }
-        
-        msg = getNext().invoke(msg);
-        
-        if (jmsBinding.getResponseWireFormat() instanceof WireFormatJMSTextXML){
-            msg = invokeResponse(msg);
-        }
-        
-        return msg;
-    }
-
-    public Message invokeRequest(Message msg) {
-        // get the jms context
-        JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-        javax.jms.Message jmsMsg = context.getJmsMsg();
-        
-        if ("onMessage".equals(msg.getOperation().getName())) {
-            msg.setBody(new Object[]{jmsMsg});
-        } else {
-            Object requestPayload = requestMessageProcessor.extractPayloadFromJMSMessage(jmsMsg);
-            msg.setBody(requestPayload);
-        }
-                
-        return msg;
-    }
-    
-    public Message invokeResponse(Message msg) {
-        
-        // get the jms context
-        JMSBindingContext context = (JMSBindingContext)msg.getHeaders().get(JMSBindingConstants.MSG_CTXT_POSITION);
-        javax.jms.Message requestJMSMsg = context.getJmsMsg();
-        Session session = context.getJmsSession();
-
-        javax.jms.Message responseJMSMsg;
-        if (msg.isFault()) {
-            responseJMSMsg = responseMessageProcessor.createFaultMessage(session, (Throwable)msg.getBody());
-        } else {
-            responseJMSMsg = responseMessageProcessor.insertPayloadIntoJMSMessage(session, msg.getBody());
-        }
-    
-        msg.setBody(responseJMSMsg);
-        
-        return msg;
-    }    
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceProvider.java b/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceProvider.java
deleted file mode 100644
index 651a96f596..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceProvider.java
+++ /dev/null
@@ -1,113 +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.binding.jms.wireformat.jmstextxml;
-
-import java.util.List;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSTextXMLServiceProvider implements WireFormatProvider {
-    private ExtensionPointRegistry registry;
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private JMSBinding binding;
-    private JMSResourceFactory jmsResourceFactory;
-    private InterfaceContract interfaceContract; 
-
-    public WireFormatJMSTextXMLServiceProvider(ExtensionPointRegistry registry, 
-                                               RuntimeComponent component, 
-                                               RuntimeComponentService service, 
-                                               Binding binding, 
-                                               JMSResourceFactory jmsResourceFactory) {
-        super();
-        this.component = component;
-        this.service = service;
-        this.binding = (JMSBinding)binding;
-        this.jmsResourceFactory = jmsResourceFactory;
-        
-        // configure the service based on this wire format
-        
-        // currently maintaining the message processor structure which 
-        // contains the details of jms message processing so set the message
-        // type here if not set explicitly in SCDL
-        if (this.binding.getRequestMessageProcessorName().equals(JMSBindingConstants.XML_MP_CLASSNAME) ){
-            this.binding.setRequestMessageProcessorName(JMSBindingConstants.XML_MP_CLASSNAME);
-            this.binding.setResponseMessageProcessorName(JMSBindingConstants.XML_MP_CLASSNAME);
-        }
-        
-        // set the binding interface contract to represent the WSDL for the 
-        // xml messages that will be sent
-        if (service.getInterfaceContract() != null &&
-            !isOnMessage()) {
-            WebServiceBindingFactory wsFactory = registry.getExtensionPoint(WebServiceBindingFactory.class);
-            WebServiceBinding wsBinding = wsFactory.createWebServiceBinding();
-            BindingWSDLGenerator.generateWSDL(component, service, wsBinding, registry, null);
-            interfaceContract = wsBinding.getBindingInterfaceContract();
-            interfaceContract.getInterface().resetDataBinding(OMElement.class.getName());   
-        } else {
-            interfaceContract = service.getInterfaceContract();
-        }
-    }
-    
-    protected boolean isOnMessage() {
-        InterfaceContract ic = service.getInterfaceContract();
-        if (ic.getInterface().getOperations().size() != 1) {
-            return false;
-        }
-        return "onMessage".equals(ic.getInterface().getOperations().get(0).getName());
-    }
-        
-    public InterfaceContract getWireFormatInterfaceContract() {
-        return interfaceContract;
-    }
-
-    public Interceptor createInterceptor() {
-        return new WireFormatJMSTextXMLServiceInterceptor((JMSBinding)binding,
-                                                          jmsResourceFactory,
-                                                          service.getRuntimeWire(binding));
-    }
-
-    public String getPhase() {
-        return Phase.SERVICE_BINDING_WIREFORMAT;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 4cb8e90b7a..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.jms.provider.JMSBindingProviderFactory;model=org.apache.tuscany.sca.binding.jms.JMSBinding

diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory b/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
deleted file mode 100644
index 50dfcdf9a0..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.OperationSelectorJMSDefaultProviderFactory;model=org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.OperationSelectorJMSDefault

diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory b/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
deleted file mode 100644
index c82d4e7cab..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
+++ /dev/null
@@ -1,22 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml.WireFormatJMSTextXMLProviderFactory;model=org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml.WireFormatJMSTextXML

-org.apache.tuscany.sca.binding.jms.wireformat.jmsbytes.WireFormatJMSBytesProviderFactory;model=org.apache.tuscany.sca.binding.jms.wireformat.jmsbytes.WireFormatJMSBytes

-org.apache.tuscany.sca.binding.jms.wireformat.jmstext.WireFormatJMSTextProviderFactory;model=org.apache.tuscany.sca.binding.jms.wireformat.jmstext.WireFormatJMSText

-org.apache.tuscany.sca.binding.jms.wireformat.jmsobject.WireFormatJMSObjectProviderFactory;model=org.apache.tuscany.sca.binding.jms.wireformat.jmsobject.WireFormatJMSObject

diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
deleted file mode 100644
index a3a2f0bf1e..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ /dev/null
@@ -1,43 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- *
- * @version $Rev$ $Date$
- */
-@Service(HelloWorldService.class)
-public class HelloWorldClientImpl implements HelloWorldService {
-
-    private HelloWorldService serviceA;
-
-    @Reference
-    public void setServiceA(HelloWorldService service) {
-        this.serviceA = service;
-    }
-
-    public String sayHello(String name) {
-        return serviceA.sayHello(name);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
deleted file mode 100644
index d68270f7df..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Interface for the HelloWorld Service.
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface HelloWorldService {
-    String sayHello(String name);
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
deleted file mode 100644
index a8808c1bd1..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.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 org.apache.tuscany.sca.binding.jms;
-
-/**
- * Implementation of the HelloWorldService.
- *
- * @version $Rev$ $Date$
- */
-public class HelloWorldServiceImpl implements HelloWorldService {
-
-    public String sayHello(String name) {
-        return "jmsHello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/test/resources/simple/client.composite b/java/sca-contrib/modules/binding-jms-runtime/src/test/resources/simple/client.composite
deleted file mode 100644
index dcea428493..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/test/resources/simple/client.composite
+++ /dev/null
@@ -1,38 +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"

-           name="RPCComposite">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>

-        <reference name="serviceA" />

-    </component>

-

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

-        <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

-        <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">

-            <destination name="DestQueueA"/>

-            <response>

-               <destination name="RespQueueA"/>

-            </response>

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/test/resources/simple/service.composite b/java/sca-contrib/modules/binding-jms-runtime/src/test/resources/simple/service.composite
deleted file mode 100644
index 44b7b29610..0000000000
--- a/java/sca-contrib/modules/binding-jms-runtime/src/test/resources/simple/service.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"

-           name="RPCComposite">

-

-    <component name="HelloWorldService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

-        <service name="HelloWorldService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">

-               <destination name="DestQueueA" create="always"/>

-               <response>

-                  <destination name="RespQueueA" create="always"/>

-               </response>

-            </binding.jms>  

-        </service> 

-    </component>       

-

-</composite>

diff --git a/java/sca-contrib/modules/binding-jms/LICENSE b/java/sca-contrib/modules/binding-jms/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/binding-jms/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/binding-jms/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-jms/META-INF/MANIFEST.MF
deleted file mode 100644
index 0eb40a9005..0000000000
--- a/java/sca-contrib/modules/binding-jms/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.jms;version="2.0.0";uses:="org.apache.tuscany.sca.assembly",

- org.apache.tuscany.sca.binding.jms.xml;version="2.0.0"

-Private-Package: org.apache.tuscany.sca.binding.jms.impl;version="2.0.0"

- ,org.apache.tuscany.sca.binding.jms.xml;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA JMS Binding Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397280359

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA JMS Binding Model

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- 

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0",

- org.apache.tuscany.sca.binding.jms;version="2.0.0",

- org.apache.tuscany.sca.binding.jms.xml;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.jms

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-jms/NOTICE b/java/sca-contrib/modules/binding-jms/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/binding-jms/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/binding-jms/pom.xml b/java/sca-contrib/modules/binding-jms/pom.xml
deleted file mode 100644
index ba4bb7763e..0000000000
--- a/java/sca-contrib/modules/binding-jms/pom.xml
+++ /dev/null
@@ -1,48 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-binding-jms</artifactId>
-    <name>Apache Tuscany SCA JMS Binding Model</name>
-
-    <dependencies>
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
deleted file mode 100644
index ddc41a463a..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
+++ /dev/null
@@ -1,241 +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.binding.jms;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-/**
- * Models a binding to a JMS resource.
- *
- * @version $Rev$ $Date$
- */
-
-public interface JMSBinding extends Binding {
-
-    public Object clone() throws CloneNotSupportedException;
-
-    /**
-     * Returns the binding URI.
-     * 
-     * @return the binding URI
-     */
-    public String getURI();
-
-    /**
-     * Sets the binding URI.
-     * 
-     * @param uri the binding URI
-     */
-    public void setURI(String uri);
-
-    /**
-     * Returns the binding name.
-     * 
-     * @return the binding name
-     */
-    public String getName();
-
-    /**
-     * Sets the binding name.
-     * 
-     * @param name the binding name
-     */
-    public void setName(String name);
-
-    public boolean isUnresolved();
-
-    public void setUnresolved(boolean unresolved);
-
-    public List<Object> getExtensions();
-
-    // Methods for getting/setting JMS binding model information
-    // as derived from the XML of the binding.jms element
-
-    public void setCorrelationScheme(String correlationScheme);
-
-    public String getCorrelationScheme();
-
-    public String getInitialContextFactoryName();
-
-    public void setInitialContextFactoryName(String initialContextFactoryName);
-
-    public String getJndiURL();
-
-    public void setJndiURL(String jndiURL);
-
-    public String getDestinationName();
-
-    public void setDestinationName(String destinationName);
-
-    public String getDestinationType();
-
-    public void setDestinationType(String destinationType);
-
-    public String getDestinationCreate();
-
-    public void setDestinationCreate(String create);
-
-    public String getConnectionFactoryName();
-
-    public void setConnectionFactoryName(String connectionFactoryName);
-
-    public String getConnectionFactoryCreate();
-
-    public void setConnectionFactoryCreate(String create);
-
-    public String getActivationSpecName();
-
-    public void setActivationSpecName(String activationSpecName);
-
-    public String getActivationSpecCreate();
-
-    public void setActivationSpecCreate(String create);
-
-    public String getResponseDestinationName();
-
-    public void setResponseDestinationName(String name);
-
-    public String getResponseDestinationType();
-
-    public void setResponseDestinationType(String type);
-
-    public String getResponseDestinationCreate();
-
-    public void setResponseDestinationCreate(String create);
-
-    public String getResponseConnectionFactoryName();
-
-    public void setResponseConnectionFactoryName(String connectionFactoryName);
-
-    public String getResponseConnectionFactoryCreate();
-
-    public void setResponseConnectionFactoryCreate(String create);
-
-    public String getResponseActivationSpecName();
-
-    public void setResponseActivationSpecName(String activationSpecName);
-
-    public String getResponseActivationSpecCreate();
-
-    public void setResponseActivationSpecCreate(String create);
-
-    public String getJmsResourceFactoryName();
-
-    public void setJmsResourceFactoryName(String jmsResourceFactoryName);
-
-    public void setRequestMessageProcessorName(String name);
-
-    public String getRequestMessageProcessorName();
-
-    public void setResponseMessageProcessorName(String name);
-
-    public String getResponseMessageProcessorName();
-
-    public String getOperationSelectorPropertyName();
-
-    public void setOperationSelectorPropertyName(String operationSelectorPropertyName);
-
-    public String getOperationSelectorName();
-
-    public void setOperationSelectorName(String operationSelectorName);
-
-    public String getReplyTo();
-
-    public void setReplyTo(String replyTo);
-
-    public String getJMSType();
-
-    public void setJMSType(String jmsType);
-
-    public String getJMSCorrelationId();
-
-    public void setJMSCorrelationId(String jmsCorrelationId);
-
-    public Boolean isdeliveryModePersistent();
-
-    public void setJMSDeliveryMode(boolean persistent);
-
-    public Integer getJMSPriority();
-
-    public void setJMSPriority(int jmsPriority);
-
-    public Long getJMSTimeToLive();
-
-    public void setJMSTimeToLive(long timeToLive);
-
-    public Set<String> getPropertyNames();
-
-    public Object getProperty(String name);
-
-    public void setProperty(String name, Object value);
-
-    public Map<String, Object> getOperationProperties(String opName);
-
-    public void setOperationProperty(String opName, String propName, Object value);
-
-    public boolean hasNativeOperationName(String opName);
-
-    public String getNativeOperationName(String opName);
-
-    public void setNativeOperationName(String opName, String nativeOpName);
-
-    public String getOperationJMSType(String opName);
-
-    public void setOperationJMSType(String opName, String jmsType);
-
-    public String getOperationJMSCorrelationId(String opName);
-
-    public void setOperationJMSCorrelationId(String opName, String jmsCorrelationId);
-
-    public Boolean getOperationJMSDeliveryMode(String opName);
-
-    public void setOperationJMSDeliveryMode(String opName, boolean b);
-
-    public Long getOperationJMSTimeToLive(String opName);
-
-    public void setOperationJMSTimeToLive(String opName, Long ttl);
-
-    public Integer getOperationJMSPriority(String opName);
-
-    public void setOperationJMSPriority(String opName, int p);
-
-    public String getJMSSelector();
-
-    public void setJMSSelector(String jmsSelector);
-
-    public String getRequestConnectionName();
-
-    public void setRequestConnectionName(String requestConnectionName);
-
-    public void setResponseConnectionName(String responseConnectionName);
-
-    public String getResponseConnectionName();
-
-    public void setRequestConnectionBinding(JMSBinding binding);
-
-    public JMSBinding getRequestConnectionBinding();
-
-    public void setResponseConnectionBinding(JMSBinding binding);
-
-    public JMSBinding getResponseConnectionBinding();
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java
deleted file mode 100644
index 74f030ca21..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.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.    
- */
-package org.apache.tuscany.sca.binding.jms;
-
-/**
- * Base exception for the JMSBinding.
- *
- * @version $Rev$ $Date$
- */
-public class JMSBindingException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public JMSBindingException() {
-        super();
-    }
-
-    public JMSBindingException(String arg0, Throwable arg1) {
-        super(arg0, arg1);
-    }
-
-    public JMSBindingException(String arg0) {
-        super(arg0);
-    }
-
-    public JMSBindingException(Throwable arg0) {
-        super(arg0);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java
deleted file mode 100644
index d96dadf8c5..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.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.binding.jms;
-
-/**
- * Factroy interface to create JMSBinding model
- *
- */
-public interface JMSBindingFactory {
-    /**
-     * Create an instance of JMSBinding
-     * @return A new instance of JMSBinding
-     */
-    JMSBinding createJMSBinding();
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingFactoryImpl.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingFactoryImpl.java
deleted file mode 100644
index b67ee97eb3..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingFactoryImpl.java
+++ /dev/null
@@ -1,34 +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.binding.jms.impl;
-
-import org.apache.tuscany.sca.binding.jms.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.JMSBindingFactory;
-
-/**
- * Default implementation of JMSBindingFactory
- *
- */
-public class JMSBindingFactoryImpl implements JMSBindingFactory {
-
-    public JMSBinding createJMSBinding() {
-        return new JMSBindingImpl();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingImpl.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingImpl.java
deleted file mode 100644
index b6bb6fe67c..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingImpl.java
+++ /dev/null
@@ -1,573 +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.binding.jms.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sca.binding.jms.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.xml.JMSBindingConstants;
-
-/**
- * Models a binding to a JMS resource.
- *
- * @version $Rev$ $Date$
- */
-
-public class JMSBindingImpl implements JMSBinding {
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-    // properties required to implement the Tuscany binding extension SPI
-    private String uri = null;
-    private String name = null;
-    private boolean unresolved = false;
-    private List<Object> extensions = new ArrayList<Object>();
-
-    // Properties required to describe the JMS binding model
-
-    private String correlationScheme = JMSBindingConstants.CORRELATE_MSG_ID;
-    private String initialContextFactoryName;
-    private String jndiURL;
-
-    private String destinationName = JMSBindingConstants.DEFAULT_DESTINATION_NAME;
-    private String destinationType = JMSBindingConstants.DESTINATION_TYPE_QUEUE;
-    private String destinationCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
-
-    private String connectionFactoryName = JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME;
-    private String connectionFactoryCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
-
-    private String activationSpecName = null;
-    private String activationSpecCreate = null;
-
-    private String responseActivationSpecName = null;
-    private String responseActivationSpecCreate = null;
-
-    private String responseDestinationName = JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME;
-    private String responseDestinationType = JMSBindingConstants.DESTINATION_TYPE_QUEUE;
-    private String responseDestinationCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
-
-    private String responseConnectionFactoryName = JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME;
-    private String responseConnectionFactoryCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
-
-    // Provides the name of the factory that interfaces to the JMS API for us.
-    private String jmsResourceFactoryName = JMSBindingConstants.DEFAULT_RF_CLASSNAME;
-
-    // Message processors used to deal with the request and response messages
-    public String requestMessageProcessorName = JMSBindingConstants.DEFAULT_MP_CLASSNAME;
-    public String responseMessageProcessorName = JMSBindingConstants.DEFAULT_MP_CLASSNAME;
-
-    // The JMS message property used to hold the name of the operation being called
-    private String operationSelectorPropertyName = JMSBindingConstants.DEFAULT_OPERATION_PROP_NAME;
-
-    // If the operation selector is derived automatically from the service interface it's stored here
-    private String operationSelectorName = null;
-
-    private String replyTo;
-    private String jmsType;
-    private String jmsCorrelationId;
-    private Boolean deliveryModePersistent;
-    private Long timeToLive;
-    private Integer jmsPriority;
-
-    private Map<String, Object> properties = new HashMap<String, Object>();
-    private Map<String, Map<String, Object>> operationProperties = new HashMap<String, Map<String,Object>>();
-    private Map<String, String> nativeOperationNames = new HashMap<String, String>();
-    private Map<String, String> operationJMSTypes = new HashMap<String, String>();
-    private Map<String, String> operationJMSCorrelationIds = new HashMap<String, String>();
-    private Map<String, Boolean> operationJMSDeliveryModes = new HashMap<String, Boolean>();
-    private Map<String, Long> operationJMSTimeToLives = new HashMap<String, Long>();
-    private Map<String, Integer> operationJMSPriorities = new HashMap<String, Integer>();
-    private String jmsSelector;
-    private String requestConnectionName;
-    private String responseConnectionName;
-    private JMSBinding requestConnectionBinding;
-    private JMSBinding responseConnectionBinding;
-    
-    public JMSBindingImpl() {
-        super();
-    }
-
-    /**
-     * Returns the binding URI.
-     * 
-     * @return the binding URI
-     */
-    public String getURI() {
-        return this.uri;
-    }
-
-    /**
-     * Sets the binding URI.
-     * 
-     * @param uri the binding URI
-     */
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    /**
-     * Returns the binding name.
-     * 
-     * @return the binding name
-     */
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * Sets the binding name.
-     * 
-     * @param name the binding name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public boolean isUnresolved() {
-        return this.unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-
-    // Methods for getting/setting JMS binding model information
-    // as derived from the XML of the binding.jms element
-
-    public void setCorrelationScheme(String correlationScheme) {
-        this.correlationScheme = correlationScheme;
-    }
-
-    public String getCorrelationScheme() {
-        return correlationScheme;
-    }
-
-    public String getInitialContextFactoryName() {
-        return initialContextFactoryName;
-    }
-
-    public void setInitialContextFactoryName(String initialContextFactoryName) {
-        this.initialContextFactoryName = initialContextFactoryName;
-    }
-
-    public String getJndiURL() {
-        return this.jndiURL;
-    }
-
-    public void setJndiURL(String jndiURL) {
-        this.jndiURL = jndiURL;
-    }
-
-    public String getDestinationName() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getDestinationName() != null) {
-            return requestConnectionBinding.getDestinationName();
-        } else {
-            return destinationName;
-        }
-    }
-
-    public void setDestinationName(String destinationName) {
-        this.destinationName = destinationName;
-    }
-
-    public String getDestinationType() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getDestinationType() != null) {
-            return requestConnectionBinding.getDestinationType();
-        } else {
-            return destinationType;
-        }
-    }
-
-    public void setDestinationType(String destinationType) {
-        this.destinationType = destinationType;
-    }
-
-    public String getDestinationCreate() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getDestinationCreate() != null) {
-            return requestConnectionBinding.getDestinationCreate();
-        } else {
-            return this.destinationCreate;
-        }
-    }
-
-    public void setDestinationCreate(String create) {
-        this.destinationCreate = create;
-    }
-
-    public String getConnectionFactoryName() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getConnectionFactoryName() != null) {
-            return requestConnectionBinding.getConnectionFactoryName();
-        } else {
-            return connectionFactoryName;
-        }
-    }
-
-    public void setConnectionFactoryName(String connectionFactoryName) {
-        this.connectionFactoryName = connectionFactoryName;
-    }
-
-    public String getConnectionFactoryCreate() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getConnectionFactoryCreate() != null) {
-            return requestConnectionBinding.getConnectionFactoryCreate();
-        } else {
-            return this.connectionFactoryCreate;
-        }
-    }
-
-    public void setConnectionFactoryCreate(String create) {
-        this.connectionFactoryCreate = create;
-    }
-
-    public String getActivationSpecName() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getActivationSpecName() != null) {
-            return requestConnectionBinding.getActivationSpecName();
-        } else {
-            return activationSpecName;
-        }
-    }
-
-    public void setActivationSpecName(String activationSpecName) {
-        this.activationSpecName = activationSpecName;
-    }
-
-    public String getActivationSpecCreate() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getActivationSpecCreate() != null) {
-            return requestConnectionBinding.getActivationSpecCreate();
-        } else {
-            return this.activationSpecCreate;
-        }
-    }
-
-    public void setActivationSpecCreate(String create) {
-        this.activationSpecCreate = create;
-    }
-
-    public String getResponseDestinationName() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getResponseDestinationName() != null) {
-            return requestConnectionBinding.getResponseDestinationName();
-        } else {
-            return this.responseDestinationName;
-        }
-    }
-
-    public void setResponseDestinationName(String name) {
-        this.responseDestinationName = name;
-    }
-
-    public String getResponseDestinationType() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getResponseDestinationType() != null) {
-            return requestConnectionBinding.getResponseDestinationType();
-        } else {
-            return this.responseDestinationType;
-        }
-    }
-
-    public void setResponseDestinationType(String type) {
-        this.responseDestinationType = type;
-    }
-
-    public String getResponseDestinationCreate() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getResponseDestinationCreate() != null) {
-            return requestConnectionBinding.getResponseDestinationCreate();
-        } else {
-            return this.responseDestinationCreate;
-        }
-    }
-
-    public void setResponseDestinationCreate(String create) {
-        this.responseDestinationCreate = create;
-    }
-
-    public String getResponseConnectionFactoryName() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getResponseConnectionFactoryName() != null) {
-            return requestConnectionBinding.getResponseConnectionFactoryName();
-        } else {
-            return responseConnectionFactoryName;
-        }
-    }
-
-    public void setResponseConnectionFactoryName(String connectionFactoryName) {
-        this.responseConnectionFactoryName = connectionFactoryName;
-    }
-
-    public String getResponseConnectionFactoryCreate() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getResponseConnectionFactoryCreate() != null) {
-            return requestConnectionBinding.getResponseConnectionFactoryCreate();
-        } else {
-            return this.responseConnectionFactoryCreate;
-        }
-    }
-
-    public void setResponseConnectionFactoryCreate(String create) {
-        this.responseConnectionFactoryCreate = create;
-    }
-
-    public String getResponseActivationSpecName() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getResponseActivationSpecName() != null) {
-            return requestConnectionBinding.getResponseActivationSpecName();
-        } else {
-            return responseActivationSpecName;
-        }
-    }
-
-    public void setResponseActivationSpecName(String activationSpecName) {
-        this.responseActivationSpecName = activationSpecName;
-    }
-
-    public String getResponseActivationSpecCreate() {
-        if (requestConnectionBinding != null && requestConnectionBinding.getResponseActivationSpecCreate() != null) {
-            return requestConnectionBinding.getResponseActivationSpecCreate();
-        } else {
-            return this.responseActivationSpecCreate;
-        }
-    }
-
-    public void setResponseActivationSpecCreate(String create) {
-        this.responseActivationSpecCreate = create;
-    }
-
-    public String getJmsResourceFactoryName() {
-        return jmsResourceFactoryName;
-    }
-
-    public void setJmsResourceFactoryName(String jmsResourceFactoryName) {
-        this.jmsResourceFactoryName = jmsResourceFactoryName;
-    }
-
-    public void setRequestMessageProcessorName(String name) {
-        this.requestMessageProcessorName = name;
-    }
-
-    public String getRequestMessageProcessorName() {
-        return requestMessageProcessorName;
-    }
-
-    public void setResponseMessageProcessorName(String name) {
-        this.responseMessageProcessorName = name;
-    }
-
-    public String getResponseMessageProcessorName() {
-        return responseMessageProcessorName;
-    }
-
-    public String getOperationSelectorPropertyName() {
-        return operationSelectorPropertyName;
-    }
-
-    public void setOperationSelectorPropertyName(String operationSelectorPropertyName) {
-        this.operationSelectorPropertyName = operationSelectorPropertyName;
-    }
-
-    public String getOperationSelectorName() {
-        return operationSelectorName;
-    }
-
-    public void setOperationSelectorName(String operationSelectorName) {
-        this.operationSelectorName = operationSelectorName;
-    }
-
-    public String getReplyTo() {
-        return replyTo;
-    }
-
-    public void setReplyTo(String replyTo) {
-        this.replyTo = replyTo;
-    }
-
-    public String getJMSType() {
-        return jmsType;
-    }
-    public void setJMSType(String jmsType) {
-        this.jmsType = jmsType;
-    }
-
-    public String getJMSCorrelationId() {
-        return jmsCorrelationId;
-    }
-    
-    public void setJMSCorrelationId(String jmsCorrelationId) {
-        this.jmsCorrelationId = jmsCorrelationId;
-    }
-
-    public Boolean isdeliveryModePersistent() {
-        return deliveryModePersistent;
-    }
-    public void setJMSDeliveryMode(boolean persistent) {
-        this.deliveryModePersistent = Boolean.valueOf(persistent);
-    }
-
-    public Integer getJMSPriority() {
-        return jmsPriority;
-    }
-
-    public void setJMSPriority(int jmsPriority) {
-        this.jmsPriority = Integer.valueOf(jmsPriority);
-    }
-
-    public Long getJMSTimeToLive() {
-        return timeToLive.longValue();
-    }
-
-    public void setJMSTimeToLive(long timeToLive) {
-        this.timeToLive = Long.valueOf(timeToLive);
-    }
-
-    public Set<String> getPropertyNames() {
-        return properties.keySet();
-    }
-
-    public Object getProperty(String name) {
-        return properties.get(name);
-    }
-
-    public void setProperty(String name, Object value) {
-        properties.put(name, value);
-    }
-
-    public Map<String, Object> getOperationProperties(String opName) {
-        return operationProperties.get(opName);
-    }
-
-    public void setOperationProperty(String opName, String propName, Object value) {
-        Map<String, Object> props = operationProperties.get(opName);
-        if (props == null) {
-            props = new HashMap<String, Object>();
-            operationProperties.put(opName, props);
-        }
-        props.put(propName, value);
-    }
-
-    public boolean hasNativeOperationName(String opName) {
-        return nativeOperationNames.containsKey(opName);
-    }
-
-    public String getNativeOperationName(String opName) {
-        if (nativeOperationNames.containsKey(opName)) {
-            return nativeOperationNames.get(opName);
-        } else {
-            return opName;
-        }
-    }
-
-    public void setNativeOperationName(String opName, String nativeOpName) {
-        this.nativeOperationNames .put(opName, nativeOpName);
-    }
-
-    public String getOperationJMSType(String opName) {
-        if (operationJMSTypes.containsKey(opName)) {
-            return operationJMSTypes.get(opName);
-        } else {
-            return jmsType;
-        }
-    }
-    public void setOperationJMSType(String opName, String jmsType) {
-        this.operationJMSTypes.put(opName, jmsType);
-    }
-
-    public String getOperationJMSCorrelationId(String opName) {
-        if (operationJMSCorrelationIds.containsKey(opName)) {
-            return operationJMSCorrelationIds.get(opName);
-        } else {
-            return jmsCorrelationId;
-        }
-    }
-    public void setOperationJMSCorrelationId(String opName, String jmsCorrelationId) {
-        operationJMSCorrelationIds.put(opName, jmsCorrelationId);
-    }
-
-    public Boolean getOperationJMSDeliveryMode(String opName) {
-        if (operationJMSDeliveryModes.containsKey(opName)) {
-            return operationJMSDeliveryModes.get(opName);
-        } else {
-            return deliveryModePersistent;
-        }
-    }
-    public void setOperationJMSDeliveryMode(String opName, boolean b) {
-        operationJMSDeliveryModes.put(opName, b);
-    }
-
-    public Long getOperationJMSTimeToLive(String opName) {
-        if (operationJMSTimeToLives.containsKey(opName)) {
-            return operationJMSTimeToLives.get(opName);
-        } else {
-            return timeToLive;
-        }
-    }
-    public void setOperationJMSTimeToLive(String opName, Long ttl) {
-        operationJMSTimeToLives.put(opName, ttl);
-    }
-
-    public Integer getOperationJMSPriority(String opName) {
-        if (operationJMSPriorities.containsKey(opName)) {
-            return operationJMSPriorities.get(opName);
-        } else {
-            return jmsPriority;
-        }
-    }
-    public void setOperationJMSPriority(String opName, int p) {
-        operationJMSPriorities.put(opName, p);
-    }
-
-    public String getJMSSelector() {
-        return jmsSelector;
-    }
-    public void setJMSSelector(String jmsSelector) {
-        this.jmsSelector = jmsSelector;
-    }
-
-    public String getRequestConnectionName() {
-        return requestConnectionName;
-    }
-
-    public void setRequestConnectionName(String requestConnectionName) {
-        this.requestConnectionName = requestConnectionName;
-    }
-
-    public void setResponseConnectionName(String responseConnectionName) {
-        this.responseConnectionName = responseConnectionName;
-    }
-    public String getResponseConnectionName() {
-        return responseConnectionName;
-    }
-
-    public void setRequestConnectionBinding(JMSBinding binding) {
-        this.requestConnectionBinding = binding;
-    }
-    public JMSBinding getRequestConnectionBinding() {
-        return requestConnectionBinding;
-    }
-
-    public void setResponseConnectionBinding(JMSBinding binding) {
-        this.responseConnectionBinding = binding;
-    }
-    public JMSBinding getResponseConnectionBinding() {
-        return responseConnectionBinding;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java
deleted file mode 100644
index 71d1298c9b..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.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.    
- */
-package org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.assembly.OperationSelector;
-
-/**
- * Implementation for policies that could be injected as parameter
- * into the axis2config.
- *
- * @version $Rev$ $Date$
- */
-public class OperationSelectorJMSDefault implements OperationSelector {
-    public static final QName OPERATION_SELECTOR_JMS_DEFAULT_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "operationSelector.JMSDefault");
-    
-    public QName getSchemaName() {
-        return OPERATION_SELECTOR_JMS_DEFAULT_QNAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java
deleted file mode 100644
index 4a8e4a1bd2..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.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.binding.jms.operationselector.jmsdefault;
-
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class OperationSelectorJMSDefaultProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<OperationSelectorJMSDefault> {
-    
-    public QName getArtifactType() {
-        return OperationSelectorJMSDefault.OPERATION_SELECTOR_JMS_DEFAULT_QNAME;
-    }
-    
-    public OperationSelectorJMSDefaultProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-    }
-
-    
-    public OperationSelectorJMSDefault read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        OperationSelectorJMSDefault wireFormat = new OperationSelectorJMSDefault();
-         
-        return wireFormat;
-    }
-
-    public void write(OperationSelectorJMSDefault wireFormat, XMLStreamWriter writer) 
-        throws ContributionWriteException, XMLStreamException {
-        String prefix = "tuscany";
-        writer.writeStartElement(prefix, 
-                                 getArtifactType().getLocalPart(),
-                                 getArtifactType().getNamespaceURI());
-        writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS); 
-        
-        writer.writeEndElement();
-    }
-
-    public Class<OperationSelectorJMSDefault> getModelType() {
-        return OperationSelectorJMSDefault.class;
-    }
-
-    public void resolve(OperationSelectorJMSDefault arg0, ModelResolver arg1) throws ContributionResolveException {
-
-    }
-    
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
deleted file mode 100644
index 84d1a2740f..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.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.    
- */
-package org.apache.tuscany.sca.binding.jms.wireformat.jmsbytes;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.assembly.WireFormat;
-
-/**
- * Implementation for policies that could be injected as parameter
- * into the axis2config.
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSBytes implements WireFormat {
-    public static final QName WIRE_FORMAT_JMS_BYTES_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "wireFormat.jmsBytes");
-    
-    public QName getSchemaName() {
-        return WIRE_FORMAT_JMS_BYTES_QNAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java
deleted file mode 100644
index 2d807d49cb..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java
+++ /dev/null
@@ -1,78 +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.binding.jms.wireformat.jmsbytes;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSBytesProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<WireFormatJMSBytes> {
-    
-    public QName getArtifactType() {
-        return WireFormatJMSBytes.WIRE_FORMAT_JMS_BYTES_QNAME;
-    }
-    
-    public WireFormatJMSBytesProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-    }
-
-    
-    public WireFormatJMSBytes read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        WireFormatJMSBytes wireFormat = new WireFormatJMSBytes();
-         
-        return wireFormat;
-    }
-
-    public void write(WireFormatJMSBytes wireFormat, XMLStreamWriter writer) 
-        throws ContributionWriteException, XMLStreamException {
-        String prefix = "tuscany";
-        writer.writeStartElement(prefix, 
-                                 getArtifactType().getLocalPart(),
-                                 getArtifactType().getNamespaceURI());
-        writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS); 
-        
-        writer.writeEndElement();
-    }
-
-    public Class<WireFormatJMSBytes> getModelType() {
-        return WireFormatJMSBytes.class;
-    }
-
-    public void resolve(WireFormatJMSBytes arg0, ModelResolver arg1) throws ContributionResolveException {
-
-    }
-    
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
deleted file mode 100644
index 7e39f696bd..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.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.    
- */
-package org.apache.tuscany.sca.binding.jms.wireformat.jmsobject;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.assembly.WireFormat;
-
-/**
- * Implementation for policies that could be injected as parameter
- * into the axis2config.
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSObject implements WireFormat {
-    public static final QName WIRE_FORMAT_JMS_BYTES_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "wireFormat.jmsObject");
-    
-    public QName getSchemaName() {
-        return WIRE_FORMAT_JMS_BYTES_QNAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java
deleted file mode 100644
index 806b713931..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java
+++ /dev/null
@@ -1,78 +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.binding.jms.wireformat.jmsobject;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSObjectProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<WireFormatJMSObject> {
-    
-    public QName getArtifactType() {
-        return WireFormatJMSObject.WIRE_FORMAT_JMS_BYTES_QNAME;
-    }
-    
-    public WireFormatJMSObjectProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-    }
-
-    
-    public WireFormatJMSObject read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        WireFormatJMSObject wireFormat = new WireFormatJMSObject();
-         
-        return wireFormat;
-    }
-
-    public void write(WireFormatJMSObject wireFormat, XMLStreamWriter writer) 
-        throws ContributionWriteException, XMLStreamException {
-        String prefix = "tuscany";
-        writer.writeStartElement(prefix, 
-                                 getArtifactType().getLocalPart(),
-                                 getArtifactType().getNamespaceURI());
-        writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS); 
-        
-        writer.writeEndElement();
-    }
-
-    public Class<WireFormatJMSObject> getModelType() {
-        return WireFormatJMSObject.class;
-    }
-
-    public void resolve(WireFormatJMSObject arg0, ModelResolver arg1) throws ContributionResolveException {
-
-    }
-    
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
deleted file mode 100644
index fff33df1f4..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.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.    
- */
-package org.apache.tuscany.sca.binding.jms.wireformat.jmstext;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.assembly.WireFormat;
-
-/**
- * Implementation for policies that could be injected as parameter
- * into the axis2config.
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSText implements WireFormat {
-    public static final QName WIRE_FORMAT_JMS_BYTES_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "wireFormat.jmsText");
-    
-    public QName getSchemaName() {
-        return WIRE_FORMAT_JMS_BYTES_QNAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java
deleted file mode 100644
index 9b675df290..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java
+++ /dev/null
@@ -1,78 +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.binding.jms.wireformat.jmstext;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSTextProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<WireFormatJMSText> {
-    
-    public QName getArtifactType() {
-        return WireFormatJMSText.WIRE_FORMAT_JMS_BYTES_QNAME;
-    }
-    
-    public WireFormatJMSTextProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-    }
-
-    
-    public WireFormatJMSText read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        WireFormatJMSText wireFormat = new WireFormatJMSText();
-         
-        return wireFormat;
-    }
-
-    public void write(WireFormatJMSText wireFormat, XMLStreamWriter writer) 
-        throws ContributionWriteException, XMLStreamException {
-        String prefix = "tuscany";
-        writer.writeStartElement(prefix, 
-                                 getArtifactType().getLocalPart(),
-                                 getArtifactType().getNamespaceURI());
-        writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS); 
-        
-        writer.writeEndElement();
-    }
-
-    public Class<WireFormatJMSText> getModelType() {
-        return WireFormatJMSText.class;
-    }
-
-    public void resolve(WireFormatJMSText arg0, ModelResolver arg1) throws ContributionResolveException {
-
-    }
-    
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java
deleted file mode 100644
index 23a53b9d96..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java
+++ /dev/null
@@ -1,48 +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.binding.jms.wireformat.jmstextxml;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.assembly.WireFormat;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSTextXML implements WireFormat {
-    public static final QName WIRE_FORMAT_JMS_DEFAULT_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "wireFormat.jmsTextXML");
-    
-    public QName getSchemaName() {
-        return WIRE_FORMAT_JMS_DEFAULT_QNAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        return this.getClass() == obj.getClass();
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java
deleted file mode 100644
index 8248fc771a..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java
+++ /dev/null
@@ -1,78 +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.binding.jms.wireformat.jmstextxml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class WireFormatJMSTextXMLProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<WireFormatJMSTextXML> {
-    
-    public QName getArtifactType() {
-        return WireFormatJMSTextXML.WIRE_FORMAT_JMS_DEFAULT_QNAME;
-    }
-    
-    public WireFormatJMSTextXMLProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-    }
-
-    
-    public WireFormatJMSTextXML read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        WireFormatJMSTextXML wireFormat = new WireFormatJMSTextXML();
-         
-        return wireFormat;
-    }
-
-    public void write(WireFormatJMSTextXML wireFormat, XMLStreamWriter writer) 
-        throws ContributionWriteException, XMLStreamException {
-        String prefix = "tuscany";
-        writer.writeStartElement(prefix, 
-                                 getArtifactType().getLocalPart(),
-                                 getArtifactType().getNamespaceURI());
-        writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS); 
-        
-        writer.writeEndElement();
-    }
-
-    public Class<WireFormatJMSTextXML> getModelType() {
-        return WireFormatJMSTextXML.class;
-    }
-
-    public void resolve(WireFormatJMSTextXML arg0, ModelResolver arg1) throws ContributionResolveException {
-
-    }
-    
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingConstants.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingConstants.java
deleted file mode 100644
index e299e54cbe..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingConstants.java
+++ /dev/null
@@ -1,72 +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.binding.jms.xml;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-
-/**
- * Constants for the JMS binding.
- *
- * @version $Rev$ $Date$
- */
-public interface JMSBindingConstants {
-
-    // Constants used when describing the JMS binding
-    // model and for setting up defaults
-    String BINDING_JMS = "binding.jms";
-    QName BINDING_JMS_QNAME = new QName(Constants.SCA10_NS, BINDING_JMS);
-    String CORRELATE_MSG_ID = "requestmsgidtocorrelid";
-    String CORRELATE_CORRELATION_ID = "requestcorrelidtocorrelid";
-    String CORRELATE_NONE = "none";
-    List<String> VALID_CORRELATION_SCHEMES =
-        Arrays.asList(new String[] {CORRELATE_MSG_ID, CORRELATE_CORRELATION_ID, CORRELATE_NONE});
-    String DESTINATION_TYPE_QUEUE = "queue"; // 0
-    String DESTINATION_TYPE_TOPIC = "topic"; // 1
-    List<String> VALID_DESTINATION_TYPES =
-        Arrays.asList(new String[] {DESTINATION_TYPE_QUEUE, DESTINATION_TYPE_TOPIC});
-    String CREATE_ALWAYS = "always";
-    String CREATE_NEVER = "never";
-    String CREATE_IF_NOT_EXIST = "ifnotexist";
-    String DEFAULT_DESTINATION_NAME = "NODESTINATION";
-    String DEFAULT_RESPONSE_DESTINATION_NAME = "NORESPONSEDESTINATION";
-    String DEFAULT_CONNECTION_FACTORY_NAME = "ConnectionFactory";
-    String DEFAULT_CONTEXT_FACTORY_NAME = "org.apache.activemq.jndi.ActiveMQInitialContextFactory";
-    String DEFAULT_JNDI_URL = "tcp://localhost:61616";
-    int DEFAULT_TIME_TO_LIVE = 20000; // in milliseconds
-    int DEFAULT_PRIORITY = 1;
-    int NON_PERSISTENT = 1; // Maps to javax.jms.DeliveryMode
-    String DEFAULT_RF_CLASSNAME = "org.apache.tuscany.sca.host.jms.activemq.JMSResourceFactoryImpl";
-    String XML_MP_CLASSNAME = "org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor";
-    String TEXT_MP_CLASSNAME = "org.apache.tuscany.sca.binding.jms.provider.TextMessageProcessor";
-    String OBJECT_MP_CLASSNAME = "org.apache.tuscany.sca.binding.jms.provider.ObjectMessageProcessor";
-    String DEFAULT_MP_CLASSNAME = XML_MP_CLASSNAME;
-    String DEFAULT_OPERATION_PROP_NAME = "scaOperationName";
-
-    String FAULT_PROPERTY = "org_apache_tuscany_sca_fault";
-    
-    String CALLBACK_ID_PROPERTY = "CallbackID";
-    String CALLBACK_Q_PROPERTY = "scaCallbackQueue ";
-    String CONVERSATION_ID_PROPERTY = "scaConversationId";
-
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingProcessor.java b/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingProcessor.java
deleted file mode 100644
index 6b39a9d8d1..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingProcessor.java
+++ /dev/null
@@ -1,688 +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.binding.jms.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
-import org.apache.tuscany.sca.binding.jms.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.JMSBindingFactory;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- * A processor to read the XML that describes the JMS binding...
- * 
- * <binding.jms correlationScheme="string"?
- *              initialContextFactory="xs:anyURI"?
- *              jndiURL="xs:anyURI"?
- *              requestConnection="QName"?
- *              responseConnection="QName"?
- *              operationProperties="QName"?
- *              ...>
- * 
- *     <destination name="xs:anyURI" type="string"? create="string"?>
- *         <property name="NMTOKEN" type="NMTOKEN">*
- *     </destination>?
- * 
- *     <connectionFactory name="xs:anyURI" create="string"?>
- *         <property name="NMTOKEN" type="NMTOKEN">*
- *     </connectionFactory>?
- * 
- *     <activationSpec name="xs:anyURI" create="string"?>
- *         <property name="NMTOKEN" type="NMTOKEN">*
- *     </activationSpec>?
- * 
- *     <response>
- *         <destination name="xs:anyURI" type="string"? create="string"?>
- *             <property name="NMTOKEN" type="NMTOKEN">*
- *         </destination>?
- * 
- *         <connectionFactory name="xs:anyURI" create="string"?>
- *             <property name="NMTOKEN" type="NMTOKEN">*
- *         </connectionFactory>?
- * 
- *         <activationSpec name="xs:anyURI" create="string"?>
- *             <property name="NMTOKEN" type="NMTOKEN">*
- *         </activationSpec>?
- *     </response>?
- * 
- *     <complexType name="SubscriptionHeaders"> 
- *         <attribute name="JMSSelector" type="string"/> 
- *     </complexType>
- *
- *     <resourceAdapter name="NMTOKEN">?
- *         <property name="NMTOKEN" type="NMTOKEN">*
- *     </resourceAdapter>?
- * 
- *     <headers JMSType="string"?
- *              JMSCorrelationId="string"?
- *              JMSDeliveryMode="string"?
- *              JMSTimeToLive="int"?
- *              JMSPriority="string"?>
- *         <property name="NMTOKEN" type="NMTOKEN">*
- *     </headers>?
- * 
- *     <operationProperties name="string" nativeOperation="string"?>
- *         <property name="NMTOKEN" type="NMTOKEN">*
- *         <headers JMSType="string"?
- *                  JMSCorrelationId="string"?
- *                  JMSDeliveryMode="string"?
- *                  JMSTimeToLive="int"?
- *                  JMSPriority="string"?>
- *             <property name="NMTOKEN" type="NMTOKEN">*
- *         </headers>?
- *     </operationProperties>*
- * </binding.jms>
- *
- * @version $Rev$ $Date$
- */
-
-public class JMSBindingProcessor implements StAXArtifactProcessor<JMSBinding> {
-
-    private PolicyFactory policyFactory;
-    private PolicyAttachPointProcessor policyProcessor;
-    private Monitor monitor;
-    private JMSBindingFactory jmsBindingFactory;
-
-    public JMSBindingProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-        this.jmsBindingFactory = modelFactories.getFactory(JMSBindingFactory.class);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-    */
-    private void warning(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = monitor.createProblem(this.getClass().getName(), "binding-jms-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-    	    monitor.problem(problem);
-        }        
-    }
-     
-    /**
-      * Report a error.
-      * 
-      * @param problems
-      * @param message
-      * @param model
-    */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = monitor.createProblem(this.getClass().getName(), "binding-jms-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-     	    monitor.problem(problem);
-        }        
-    }
-
-    public QName getArtifactType() {
-        return JMSBindingConstants.BINDING_JMS_QNAME;
-    }
-
-    public Class<JMSBinding> getModelType() {
-        return JMSBinding.class;
-    }
-
-    public JMSBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        JMSBinding jmsBinding = jmsBindingFactory.createJMSBinding();
-
-        // Read policies
-        policyProcessor.readPolicies(jmsBinding, reader);
-
-        // Read binding name
-        String name = reader.getAttributeValue(null, "name");
-        if (name != null) {
-            jmsBinding.setName(name);
-        }
-
-        // Read binding URI
-        String uri = reader.getAttributeValue(null, "uri");
-        if (uri != null && uri.length() > 0) {
-            parseURI(uri, jmsBinding);
-        }
-
-        // Read correlation scheme
-        String correlationScheme = reader.getAttributeValue(null, "correlationScheme");
-        if (correlationScheme != null && correlationScheme.length() > 0) {
-            if (JMSBindingConstants.VALID_CORRELATION_SCHEMES.contains(correlationScheme.toLowerCase())) {
-                jmsBinding.setCorrelationScheme(correlationScheme);
-            } else {
-            	error("InvalidCorrelationScheme", reader, correlationScheme);
-            }
-        }
-
-        // Read initial context factory
-        String initialContextFactory = reader.getAttributeValue(null, "initialContextFactory");
-        if (initialContextFactory != null && initialContextFactory.length() > 0) {
-            jmsBinding.setInitialContextFactoryName(initialContextFactory);
-        }
-
-        // Read JNDI URL
-        String jndiURL = reader.getAttributeValue(null, "jndiURL");
-        if (jndiURL != null && jndiURL.length() > 0) {
-            jmsBinding.setJndiURL(jndiURL);
-        }
-
-        // Read message processor class name
-        String messageProcessorName = reader.getAttributeValue(null, "messageProcessor");
-        if (messageProcessorName != null && messageProcessorName.length() > 0) {
-            if ("XMLTextMessage".equalsIgnoreCase(messageProcessorName)) {
-                messageProcessorName = JMSBindingConstants.XML_MP_CLASSNAME;
-            } else if ("TextMessage".equalsIgnoreCase(messageProcessorName)) {
-                messageProcessorName = JMSBindingConstants.TEXT_MP_CLASSNAME;
-            } else if ("ObjectMessage".equalsIgnoreCase(messageProcessorName)) {
-                messageProcessorName = JMSBindingConstants.OBJECT_MP_CLASSNAME;
-            }
-            jmsBinding.setRequestMessageProcessorName(messageProcessorName);
-            jmsBinding.setResponseMessageProcessorName(messageProcessorName);
-
-        }
-
-        String requestConnectionName = reader.getAttributeValue(null, "requestConnection");
-        if (requestConnectionName != null && requestConnectionName.length() > 0) {
-            jmsBinding.setRequestConnectionName(requestConnectionName);
-        }
-        String responseConnectionName = reader.getAttributeValue(null, "responseConnection");
-        if (responseConnectionName != null && responseConnectionName.length() > 0) {
-            jmsBinding.setResponseConnectionName(responseConnectionName);
-        }
-
-        // Read sub-elements of binding.jms
-        boolean endFound = false;
-        while (!endFound) {
-            int fg = reader.next();
-            switch (fg) {
-                case START_ELEMENT:
-                    String elementName = reader.getName().getLocalPart();
-                    if ("destination".equals(elementName)) {
-                        parseDestination(reader, jmsBinding);
-                    } else if ("connectionFactory".equals(elementName)) {
-                        parseConnectionFactory(reader, jmsBinding);
-                    } else if ("activationSpec".equals(elementName)) {
-                        parseActivationSpec(reader, jmsBinding);
-                    } else if ("response".equals(elementName)) {
-                        parseResponse(reader, jmsBinding);
-                    } else if ("resourceAdapter".equals(elementName)) {
-                        parseResourceAdapter(reader, jmsBinding);
-                    } else if ("headers".equals(elementName)) {
-                        parseHeaders(reader, jmsBinding);
-                    } else if ("operationProperties".equals(elementName)) {
-                        parseOperationProperties(reader, jmsBinding);
-                    } else if ("SubscriptionHeaders".equals(elementName)) {
-                        parseSubscriptionHeaders(reader, jmsBinding);
-                    }
-                    reader.next();
-                    break;
-                case END_ELEMENT:
-                    QName x = reader.getName();
-                    if (x.equals(JMSBindingConstants.BINDING_JMS_QNAME)) {
-                        endFound = true;
-                    } else {
-                    	error("UnexpectedElement", reader, x.toString());
-                    }
-            }
-        }
-
-        validate();
-
-        return jmsBinding;
-    }
-
-    protected void parseURI(String uri, JMSBinding jmsBinding) {
-        if (!uri.startsWith("jms:")) {
-        	error("MustStartWithSchema", jmsBinding, uri);
-        	return;
-        }
-        int i = uri.indexOf('?');            
-        if (i >= 0) {
-        	StringTokenizer st = new StringTokenizer(uri.substring(i+1),"&");
-        	while (st.hasMoreTokens()) {
-        	    String s = st.nextToken();
-        	    if (s.startsWith("connectionFactoryName=")) {
-        	        jmsBinding.setConnectionFactoryName(s.substring(22));
-        	    } else {
-        	        error("UnknownTokenInURI", jmsBinding, s, uri);
-        	        //throw new JMSBindingException("unknown token '" + s + "' in uri: " + uri);
-                 	return;
-        	     }
-        	}
-        	jmsBinding.setDestinationName(uri.substring(4, i));
-        } else {
-           jmsBinding.setDestinationName(uri.substring(4));
-        }
-    }
-
-    public void resolve(JMSBinding model, ModelResolver resolver) throws ContributionResolveException {
-        if (model.getRequestConnectionName() != null) {
-            model.setRequestConnectionBinding(getConnectionBinding(model.getRequestConnectionName(), resolver));
-        }
-        if (model.getResponseConnectionName() != null) {
-            model.setResponseConnectionBinding(getConnectionBinding(model.getResponseConnectionName(), resolver));
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private JMSBinding getConnectionBinding(String bindingName, ModelResolver resolver) {
-        if (resolver instanceof ExtensibleModelResolver) {
-            DefaultModelResolver dr = (DefaultModelResolver)((ExtensibleModelResolver) resolver).getDefaultModelResolver();
-            Map models = dr.getModels();
-            for (Object o : models.keySet()) {
-                if (o instanceof JMSBinding) {
-                    JMSBinding binding = (JMSBinding) o;
-                    if (bindingName.equals(binding.getName())) {
-                        return binding;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    public void write(JMSBinding rmiBinding, XMLStreamWriter writer) throws ContributionWriteException,
-        XMLStreamException {
-        // Write a <binding.jms>
-        writer.writeStartElement(Constants.SCA10_NS, JMSBindingConstants.BINDING_JMS);
-
-        // FIXME Implement
-
-        writer.writeEndElement();
-    }
-
-    private void parseDestination(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
-        String name = reader.getAttributeValue(null, "name");
-        if (name != null && name.length() > 0) {
-            jmsBinding.setDestinationName(name);
-        }
-
-        String type = reader.getAttributeValue(null, "type");                
-        if (type != null && type.length() > 0) {
-        	warning("DoesntProcessDestinationType", jmsBinding);
-            if (JMSBindingConstants.DESTINATION_TYPE_QUEUE.equalsIgnoreCase(type)) {
-                jmsBinding.setDestinationType(JMSBindingConstants.DESTINATION_TYPE_QUEUE);
-            } else if (JMSBindingConstants.DESTINATION_TYPE_TOPIC.equalsIgnoreCase(type)) {
-                jmsBinding.setDestinationType(JMSBindingConstants.DESTINATION_TYPE_TOPIC);
-            } else {
-            	warning("InvalidDestinationType", reader, type);
-            }            
-        }
-
-        String create = reader.getAttributeValue(null, "create");
-        if (create != null && create.length() > 0) {
-            jmsBinding.setDestinationCreate(create);
-        }
-    }
-
-    private void parseConnectionFactory(XMLStreamReader reader, JMSBinding jmsBinding) {
-        String name = reader.getAttributeValue(null, "name");
-        if (name != null && name.length() > 0) {
-            jmsBinding.setConnectionFactoryName(name);
-        } else {
-        	error("MissingConnectionFactoryName", reader);
-        }
-    }
-
-    private void parseActivationSpec(XMLStreamReader reader, JMSBinding jmsBinding) {
-        String name = reader.getAttributeValue(null, "name");        
-        if (name != null && name.length() > 0) {
-        	warning("DoesntProcessActivationSpec", jmsBinding);
-            jmsBinding.setActivationSpecName(name);            
-        } else {
-        	warning("MissingActivationSpecName", reader);
-        }
-    }
-
-    private void parseResponseDestination(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
-        String name = reader.getAttributeValue(null, "name");
-        if (name != null && name.length() > 0) {
-            jmsBinding.setResponseDestinationName(name);
-        }
-
-        String type = reader.getAttributeValue(null, "type");        
-        if (type != null && type.length() > 0) {
-        	warning("DoesntProcessResponseDestinationType", jmsBinding);
-        	if (JMSBindingConstants.DESTINATION_TYPE_QUEUE.equalsIgnoreCase(type)) {
-                jmsBinding.setResponseDestinationType(JMSBindingConstants.DESTINATION_TYPE_QUEUE);
-            } else if (JMSBindingConstants.DESTINATION_TYPE_TOPIC.equalsIgnoreCase(type)) {
-                jmsBinding.setResponseDestinationType(JMSBindingConstants.DESTINATION_TYPE_TOPIC);
-            } else {
-            	warning("InvalidResponseDestinationType", reader, type);
-            }            
-        }
-
-        String create = reader.getAttributeValue(null, "create");
-        if (create != null && create.length() > 0) {
-            jmsBinding.setResponseDestinationCreate(create);
-        }
-    }
-
-    private void parseResponseConnectionFactory(XMLStreamReader reader, JMSBinding jmsBinding) {
-        String name = reader.getAttributeValue(null, "name");
-        if (name != null && name.length() > 0) {
-        	warning("DoesntProcessResponseConnectionFactory", jmsBinding);
-            jmsBinding.setResponseConnectionFactoryName(name);            
-        } else {
-        	warning("MissingResponseConnectionFactory", reader);
-        }
-    }
-
-    private void parseResponseActivationSpec(XMLStreamReader reader, JMSBinding jmsBinding) {
-        String name = reader.getAttributeValue(null, "name");
-        if (name != null && name.length() > 0) {
-        	warning("DoesntProcessResponseActivationSpec", jmsBinding);
-            jmsBinding.setResponseActivationSpecName(name);            
-        } else {
-        	warning("MissingResponseActivationSpec", reader);
-        }
-    }
-
-    private void parseResponse(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
-        // Read sub-elements of response
-        while (true) {
-            switch (reader.next()) {
-                case START_ELEMENT:
-                    String elementName = reader.getName().getLocalPart();
-                    if ("destination".equals(elementName)) {
-                        parseResponseDestination(reader, jmsBinding);
-                    } else if ("connectionFactory".equals(elementName)) {
-                        parseResponseConnectionFactory(reader, jmsBinding);
-                    } else if ("activationSpec".equals(elementName)) {
-                        parseResponseActivationSpec(reader, jmsBinding);
-                    }
-                    reader.next();
-                    break;
-                case END_ELEMENT:
-                    QName x = reader.getName();
-                    if (x.getLocalPart().equals("response")) {
-                        return;
-                    } else {
-                    	error("UnexpectedResponseElement", reader, x.toString());
-                    }
-            }
-        }
-    }
-
-    private void parseResourceAdapter(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
-    	warning("DoesntProcessResourceAdapter", jmsBinding);
-    }
-
-    /**
-     * <headers JMSType=�string�?
-     *          JMSCorrelationID=�string�?
-     *          JMSDeliveryMode=�PERSISTENT or NON_PERSISTENT�?
-     *          JMSTimeToLive=�long�?      
-     *          JMSPriority=�0 .. 9�?>
-     *     <property name=�NMTOKEN� type=�NMTOKEN�?>*    
-     * </headers>?
-     */
-    private void parseHeaders(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
-        
-        String jmsType = reader.getAttributeValue(null, "JMSType");
-        if (jmsType != null && jmsType.length() > 0) {
-            jmsBinding.setJMSType(jmsType);
-        }
-
-        String jmsCorrelationId = reader.getAttributeValue(null, "JMSCorrelationID");
-        if (jmsCorrelationId != null && jmsCorrelationId.length() > 0) {
-            jmsBinding.setJMSCorrelationId(jmsCorrelationId);
-        }
-
-        String jmsDeliveryMode = reader.getAttributeValue(null, "JMSDeliveryMode");
-        if (jmsDeliveryMode != null && jmsDeliveryMode.length() > 0) {
-            if ("PERSISTENT".equalsIgnoreCase(jmsDeliveryMode)) {
-                jmsBinding.setJMSDeliveryMode(true);
-            } else if ("NON_PERSISTENT".equalsIgnoreCase(jmsDeliveryMode)) {
-                jmsBinding.setJMSDeliveryMode(false);
-            } else {
-                warning("InvalidJMSDeliveryMode", jmsBinding, jmsDeliveryMode);
-            }
-        }
-
-        String jmsTimeToLive = reader.getAttributeValue(null, "JMSTimeToLive");
-        if (jmsTimeToLive != null && jmsTimeToLive.length() > 0) {
-            jmsBinding.setJMSTimeToLive(Long.parseLong(jmsTimeToLive));
-        }
-
-        String jmsPriority = reader.getAttributeValue(null, "JMSPriority");
-        if (jmsPriority != null && jmsPriority.length() > 0) {
-            int p = Integer.parseInt(jmsPriority);
-            if (p >= 0 && p <= 9) {
-                jmsBinding.setJMSPriority(p);
-            } else {
-                warning("InvalidJMSPriority", jmsBinding, jmsPriority);
-            }
-        }
-
-        while (true) {
-            switch (reader.next()) {
-                case START_ELEMENT:
-                    if (reader.getName().getLocalPart().equals("property")) {
-                        parseProperty(reader, jmsBinding);
-                    }
-                    break;
-                case END_ELEMENT:
-                    QName x = reader.getName();
-                    if (x.getLocalPart().equals("headers")) {
-                        return;
-                    } else {
-                        error("UnexpectedResponseElement", reader, x.toString());
-                    }
-            }
-        }
-    }
-    
-    private void parseProperty(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
-        String name = reader.getAttributeValue(null, "name");
-        String type = reader.getAttributeValue(null, "type");
-        if (name != null && name.length() > 0) {
-            Object value = reader.getElementText();
-            if ("boolean".equalsIgnoreCase(type)) {
-                value = Boolean.parseBoolean((String)value);
-            } else if ("byte".equalsIgnoreCase(type)) {
-                value = Byte.parseByte(((String)value));
-            } else if ("short".equalsIgnoreCase(type)) {
-                value = Short.parseShort((String)value);
-            } else if ("int".equalsIgnoreCase(type)) {
-                value = Integer.parseInt((String)value);
-            } else if ("long".equalsIgnoreCase(type)) {
-                value = Long.parseLong((String)value);
-            } else if ("float".equalsIgnoreCase(type)) {
-                value = Float.parseFloat((String)value);
-            } else if ("double".equalsIgnoreCase(type)) {
-                value = Double.parseDouble((String)value);
-            } else if ("String".equalsIgnoreCase(type)) {
-                // its already a string
-            }
-            jmsBinding.setProperty(name, value);
-        }
-    }
-
-    /**
-     * <operationProperties name=�string� nativeOperation=�string�?>
-     *   <property name=�NMTOKEN� type=�NMTOKEN�?>*
-     *   <headers JMSType=�string�?
-     *            JMSCorrelationId=�string�?
-     *            JMSDeliveryMode=�PERSISTENT or NON_PERSISTENT�?
-     *            JMSTimeToLive=�long�?
-     *            JMSPriority=�0 .. 9�?>
-     *       <property name=�NMTOKEN� type=�NMTOKEN�?>*
-     *   </headers>?
-     * </operationProperties>*
-     */
-    private void parseOperationProperties(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
-        String opName = reader.getAttributeValue(null, "name");
-        if (opName == null || opName.length() < 1) {
-            warning("MissingJMSOperationPropertyName", jmsBinding);
-            return;
-        }
-        String nativeOpName = reader.getAttributeValue(null, "nativeOperation");
-        if (nativeOpName != null && nativeOpName.length() > 0) {
-            jmsBinding.setNativeOperationName(opName, nativeOpName);
-        }
-
-        while (true) {
-            switch (reader.next()) {
-                case START_ELEMENT:
-                    if (reader.getName().getLocalPart().equals("headers")) {
-                        parseOperationHeaders(reader, jmsBinding, opName);
-                    }
-                    break;
-                case END_ELEMENT:
-                    QName x = reader.getName();
-                    if (x.getLocalPart().equals("operationProperties")) {
-                        return;
-                    } else {
-                        error("UnexpectedResponseElement", reader, x.toString());
-                    }
-            }
-        }
-    }
-
-    private void parseOperationHeaders(XMLStreamReader reader, JMSBinding jmsBinding, String opName) throws XMLStreamException {
-        String jmsType = reader.getAttributeValue(null, "JMSType");
-        if (jmsType != null && jmsType.length() > 0) {
-            jmsBinding.setOperationJMSType(opName, jmsType);
-        }
-
-        String jmsCorrelationId = reader.getAttributeValue(null, "JMSCorrelationID");
-        if (jmsCorrelationId != null && jmsCorrelationId.length() > 0) {
-            jmsBinding.setOperationJMSCorrelationId(opName, jmsCorrelationId);
-        }
-
-        String jmsDeliveryMode = reader.getAttributeValue(null, "JMSDeliveryMode");
-        if (jmsDeliveryMode != null && jmsDeliveryMode.length() > 0) {
-            if ("PERSISTENT".equalsIgnoreCase(jmsDeliveryMode)) {
-                jmsBinding.setJMSDeliveryMode(true);
-            } else if ("NON_PERSISTENT".equalsIgnoreCase(jmsDeliveryMode)) {
-                jmsBinding.setOperationJMSDeliveryMode(opName, false);
-            } else {
-                warning("InvalidOPJMSDeliveryMode", jmsBinding, jmsDeliveryMode);
-            }
-        }
-
-        String jmsTimeToLive = reader.getAttributeValue(null, "JMSTimeToLive");
-        if (jmsTimeToLive != null && jmsTimeToLive.length() > 0) {
-            jmsBinding.setOperationJMSTimeToLive(opName, Long.parseLong(jmsTimeToLive));
-        }
-
-        String jmsPriority = reader.getAttributeValue(null, "JMSPriority");
-        if (jmsPriority != null && jmsPriority.length() > 0) {
-            int p = Integer.parseInt(jmsPriority);
-            if (p >= 0 && p <= 9) {
-                jmsBinding.setOperationJMSPriority(opName, p);
-            } else {
-                warning("InvalidOPJMSPriority", jmsBinding, jmsPriority);
-            }
-        }
-
-        while (true) {
-            switch (reader.next()) {
-                case START_ELEMENT:
-                    if (reader.getName().getLocalPart().equals("property")) {
-                        parseOperationPropertyProperties(reader, jmsBinding, opName);
-                    }
-                    break;
-                case END_ELEMENT:
-                    QName x = reader.getName();
-                    if (x.getLocalPart().equals("headers")) {
-                        return;
-                    } else {
-                        error("UnexpectedResponseElement", reader, x.toString());
-                    }
-            }
-        }
-    }
-
-    private void parseOperationPropertyProperties(XMLStreamReader reader, JMSBinding jmsBinding, String opName) throws XMLStreamException {
-        String propName = reader.getAttributeValue(null, "name");
-        String type = reader.getAttributeValue(null, "type");
-        if (propName != null && propName.length() > 0) {
-            Object value = reader.getElementText();
-            if ("boolean".equalsIgnoreCase(type)) {
-                value = Boolean.parseBoolean((String)value);
-            } else if ("byte".equalsIgnoreCase(type)) {
-                value = Byte.parseByte(((String)value));
-            } else if ("short".equalsIgnoreCase(type)) {
-                value = Short.parseShort((String)value);
-            } else if ("int".equalsIgnoreCase(type)) {
-                value = Integer.parseInt((String)value);
-            } else if ("long".equalsIgnoreCase(type)) {
-                value = Long.parseLong((String)value);
-            } else if ("float".equalsIgnoreCase(type)) {
-                value = Float.parseFloat((String)value);
-            } else if ("double".equalsIgnoreCase(type)) {
-                value = Double.parseDouble((String)value);
-            } else if ("String".equalsIgnoreCase(type)) {
-                // its already a string
-            }
-            jmsBinding.setOperationProperty(opName, propName, value);
-        }
-    }
-
-    private void parseSubscriptionHeaders(XMLStreamReader reader, JMSBinding jmsBinding) {
-        String jmsSelector = reader.getAttributeValue(null, "JMSSelector");
-        if (jmsSelector != null && jmsSelector.length() > 0) {
-            jmsBinding.setJMSSelector(jmsSelector);
-        }
-    }
-
-    /**
-     * The validation rules for the JMS model are relatively complicated to they all live together here
-     */
-    public void validate() throws JMSBindingException {
-        /*
-         * first fix up anything now the model has been read
-         */
-
-        /*
-         * Now some cross field validation
-         */
-
-        // connection factory doesn't contradict destination type
-        // connection factory and activation Specification are mutually exclusive
-        // TODO check Specification for all validations
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jms.JMSBindingFactory b/java/sca-contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jms.JMSBindingFactory
deleted file mode 100644
index f2d2c4bce1..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jms.JMSBindingFactory
+++ /dev/null
@@ -1,17 +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. 

-org.apache.tuscany.sca.binding.jms.impl.JMSBindingFactoryImpl
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index e5b8a96783..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,25 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.jms.impl.JMSBindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.jms,model=org.apache.tuscany.sca.binding.jms.impl.JMSBinding
-org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml.WireFormatJMSTextXMLProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#wireFormat.jmsTextXML,model=org.apache.tuscany.sca.binding.jms.wireformat.jmstextxml.WireFormatJMSTextXML
-org.apache.tuscany.sca.binding.jms.wireformat.jmsbytes.WireFormatJMSBytesProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#wireFormat.jmsBytes,model=org.apache.tuscany.sca.binding.jms.wireformat.jmsbytes.WireFormatJMSBytes
-org.apache.tuscany.sca.binding.jms.wireformat.jmstext.WireFormatJMSTextProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#wireFormat.jmsText,model=org.apache.tuscany.sca.binding.jms.wireformat.jmstext.WireFormatJMSText
-org.apache.tuscany.sca.binding.jms.wireformat.jmsobject.WireFormatJMSObjectProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#wireFormat.jmsObject,model=org.apache.tuscany.sca.binding.jms.wireformat.jmsobject.WireFormatJMSObject
-org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.OperationSelectorJMSDefaultProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#operationSelector.jmsDefault,model=org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.OperationSelectorJMSDefault
-
diff --git a/java/sca-contrib/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties b/java/sca-contrib/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
deleted file mode 100644
index 2f1048e601..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
+++ /dev/null
@@ -1,47 +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.
-#
-#
-DoesntProcessOperationProperties = JMS Binding doesn't process operationProperties yet
-DoesntProcessHeaders = JMS Binding doesn't process headers yet
-DoesntProcessResourceAdapter = JMS Binding doesn't process resourceAdapter yet
-DoesntProcessResponseConnectionFactory = JMS Binding doesn't process response connectionFactory yet
-DoesntProcessResponseActivationSpec = JMS Binding doesn't process response activationSpec yet
-DoesntProcessResponseDestinationType = JMS Binding doesn't process response destination type yet
-DoesntProcessActivationSpec = JMS Binding doesn't process activationSpec yet
-DoesntProcessDestinationType = JMS Binding doesn't process destination type yet
-MissingConnectionFactoryName = Missing ConnectionFactory Name
-MissingResponseConnectionFactory = Missing response connectionFactory name
-InvalidResponseDestinationType = Invalid response destination type: {0}
-InvalidDestinationType = Invalid destination type: {0}
-MissingActivationSpecName = Missing ActivationSpec Name
-MissingResponseActivationSpec = Missing response ActivationSpec name
-UnknownTokenInURI = Unknown token {0} in uri: {1}
-MustStartWithSchema = URI must start with the scheme 'jms:' for uri: {0}
-InvalidCorrelationScheme = Invalid correlationScheme: {0}
-UnexpectedElement = Incomplete binding.jms definition found unexpected element: {0}
-UnexpectedResponseElement = Incomplete binding.jms/response definition found unexpected element: {0}
-InvalidJMSDeliveryMode = Invalid JMSDeliveryMode: {0}
-InvalidJMSPriority = Invalid JMSPriority: {0}
-MissingJMSOperationPropertyName = Missing JMSOperationProperty Name
-InvalidOPJMSDeliveryMode = Invalid OPJMSDeliveryMode: {0}
-InvalidOPJMSPriority = Invalid OPJMSPriority: {0}
-
-
-
diff --git a/java/sca-contrib/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java b/java/sca-contrib/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
deleted file mode 100644
index 6d59e41534..0000000000
--- a/java/sca-contrib/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
+++ /dev/null
@@ -1,211 +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.binding.jms.impl;

-

-import java.io.StringReader;

-import java.util.Map;

-

-import javax.xml.stream.XMLInputFactory;

-import javax.xml.stream.XMLStreamReader;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;

-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;

-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

-import org.apache.tuscany.sca.core.UtilityExtensionPoint;

-import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;

-import org.apache.tuscany.sca.monitor.Monitor;

-import org.apache.tuscany.sca.monitor.MonitorFactory;

-

-/**

- * Tests for JMS binding xml

- */

-public class JMSBindingProcessorTestCase extends TestCase {

-    

-    private static final String COMPOSITE =

-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

-            + " <component name=\"HelloWorldComponent\">"

-            + "   <implementation.java class=\"services.HelloWorld\"/>"

-            + "      <service name=\"HelloWorldService\">"

-            + "          <binding.jms uri=\"jms:testQueue\" />"

-            + "      </service>"

-            + " </component>"

-            + "</composite>";

-

-    private static final String HEADERS1 =

-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

-            + " <component name=\"HelloWorldComponent\">"

-            + "   <implementation.java class=\"services.HelloWorld\"/>"

-            + "      <service name=\"HelloWorldService\">"

-            + "          <binding.jms uri=\"jms:testQueue\" >"

-            + "             <headers JMSType=\"myType\" JMSCorrelationID=\"myCorrelId\" JMSDeliveryMode=\"PERSISTENT\" JMSTimeToLive=\"54321\" JMSPriority=\"5\" >"

-            + "             </headers>" 

-            + "          </binding.jms>"

-            + "      </service>"

-            + " </component>"

-            + "</composite>";

-

-    private static final String PROPERTIES1 =

-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

-            + " <component name=\"HelloWorldComponent\">"

-            + "   <implementation.java class=\"services.HelloWorld\"/>"

-            + "      <service name=\"HelloWorldService\">"

-            + "          <binding.jms uri=\"jms:testQueue\" >"

-            + "             <headers>"

-            + "                <property name=\"p1\">bla</property>"

-            + "                <property name=\"intProp\" type=\"int\">42</property>"

-            + "             </headers>" 

-            + "          </binding.jms>"

-            + "      </service>"

-            + " </component>"

-            + "</composite>";

-    

-    private static final String OP_PROPERTIES1 =

-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

-            + " <component name=\"HelloWorldComponent\">"

-            + "   <implementation.java class=\"services.HelloWorld\"/>"

-            + "      <service name=\"HelloWorldService\">"

-            + "          <binding.jms uri=\"jms:testQueue\" >"

-            + "             <operationProperties name=\"op1\">"

-            + "                <headers JMSType=\"op1Type\" >"

-            + "                   <property name=\"p1\">bla</property>"

-            + "                   <property name=\"intProp\" type=\"int\">42</property>"

-            + "                </headers>" 

-            + "             </operationProperties >" 

-            + "             <operationProperties name=\"op2\" nativeOperation=\"nativeOp2\" >"

-            + "                <headers JMSType=\"op2Type\">"

-            + "                   <property name=\"p2\">op2bla</property>"

-            + "                   <property name=\"intProp\" type=\"int\">77</property>"

-            + "                </headers>" 

-            + "             </operationProperties >" 

-            + "          </binding.jms>"

-            + "      </service>"

-            + " </component>"

-            + "</composite>";

-

-    private static final String SELECTOR =

-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

-            + " <component name=\"HelloWorldComponent\">"

-            + "   <implementation.java class=\"services.HelloWorld\"/>"

-            + "      <service name=\"HelloWorldService\">"

-            + "          <binding.jms uri=\"jms:testQueue\" >"

-            + "             <SubscriptionHeaders JMSSelector=\"prop1 = 2\" />"

-            + "          </binding.jms>"

-            + "      </service>"

-            + " </component>"

-            + "</composite>";

-

-    private XMLInputFactory inputFactory;

-    private StAXArtifactProcessor<Object> staxProcessor;

-    private Monitor monitor;

-

-    @Override

-    protected void setUp() throws Exception {

-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

-        inputFactory = XMLInputFactory.newInstance();

-        // Create a monitor

-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);

-        MonitorFactory monitorFactory = new DefaultMonitorFactory();  

-        if (monitorFactory != null) {

-        	monitor = monitorFactory.createMonitor();

-        	utilities.addUtility(monitorFactory);

-        }

-        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);

-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, monitor);

-    }

-

-    /**

-     * Test parsing valid composite definition. Valid composite populated with correct values expected.

-     * @throws Exception

-     */

-    public void testLoadValidComposite() throws Exception {

-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(COMPOSITE));

-        

-        Composite composite = (Composite)staxProcessor.read(reader);

-        JMSBindingImpl binding = (JMSBindingImpl)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

-        

-        assertNotNull(binding);

-        assertEquals("testQueue", binding.getDestinationName());

-    }

-

-    public void testHeaders1() throws Exception {

-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(HEADERS1));

-        

-        Composite composite = (Composite)staxProcessor.read(reader);

-        JMSBindingImpl binding = (JMSBindingImpl)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

-        

-        assertNotNull(binding);

-        assertEquals("myType", binding.getJMSType());

-        assertEquals("myCorrelId", binding.getJMSCorrelationId());

-        assertTrue(binding.isdeliveryModePersistent());

-        assertEquals(54321, binding.getJMSTimeToLive().longValue());

-        assertEquals(5, binding.getJMSPriority().intValue());

-    }

-

-    public void testProperties1() throws Exception {

-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(PROPERTIES1));

-        

-        Composite composite = (Composite)staxProcessor.read(reader);

-        JMSBindingImpl binding = (JMSBindingImpl)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

-        

-        assertNotNull(binding);

-        assertEquals("bla", binding.getProperty("p1"));

-        assertEquals(42, ((Integer)binding.getProperty("intProp")).intValue());

-    }

-

-    public void testOpProperties1() throws Exception {

-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(OP_PROPERTIES1));

-        

-        Composite composite = (Composite)staxProcessor.read(reader);

-        JMSBindingImpl binding = (JMSBindingImpl)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

-        

-        assertNotNull(binding);

-

-        Map<String, Object> op1Props = binding.getOperationProperties("op1");

-        assertEquals("op1Type", binding.getOperationJMSType("op1"));

-        assertEquals("bla", op1Props.get("p1"));

-        assertEquals(42, ((Integer)op1Props.get("intProp")).intValue());

-        

-        assertEquals("op2Type", binding.getOperationJMSType("op2"));

-        Map<String, Object> op2Props = binding.getOperationProperties("op2");

-        assertEquals("op2bla", op2Props.get("p2"));

-        assertEquals(77, ((Integer)op2Props.get("intProp")).intValue());

-    }

-

-    public void testSubscriptionHeaders () throws Exception {

-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(SELECTOR));

-        

-        Composite composite = (Composite)staxProcessor.read(reader);

-        JMSBindingImpl binding = (JMSBindingImpl)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

-        

-        assertNotNull(binding);

-

-        assertEquals("prop1 = 2", binding.getJMSSelector());

-    }

-}

diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/LICENSE b/java/sca-contrib/modules/binding-jsonrpc-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 6bfa1e2eea..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,41 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.jsonrpc.provider;uses:=

- "org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assembly,org.a

- pache.tuscany.sca.provider,org.json,org.apache.tuscany.sca.core,org.a

- pache.tuscany.sca.interfacedef.java,org.apache.tuscany.sca.interfaced

- ef,javax.servlet,org.apache.tuscany.sca.invocation,com.metaparadigm.j

- sonrpc,org.apache.tuscany.sca.binding.jsonrpc,org.apache.tuscany.sca.

- host.http,org.oasisopen.sca,javax.servlet.http";version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA JSON-RPC Binding Runtime

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397318078

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA JSON-RPC Binding Runtime

-Import-Package: com.metaparadigm.jsonrpc,

- javax.servlet,

- javax.servlet.http,

- 

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.binding.jsonrpc;version="2.0.0",

- org.apache.tuscany.sca.binding.jsonrpc.provider;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",

- org.apache.tuscany.sca.databinding.json;version="2.0.0",

- org.apache.tuscany.sca.host.http;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.json,

- 

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonrpc.runtime

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/NOTICE b/java/sca-contrib/modules/binding-jsonrpc-runtime/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/pom.xml b/java/sca-contrib/modules/binding-jsonrpc-runtime/pom.xml
deleted file mode 100644
index c799bd309a..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/pom.xml
+++ /dev/null
@@ -1,136 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-    <name>Apache Tuscany SCA JSON-RPC Binding Runtime</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>com.metaparadigm</groupId>
-            <artifactId>json-rpc</artifactId>
-            <version>1.0</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-           <groupId>commons-logging</groupId>
-           <artifactId>commons-logging</artifactId>
-           <version>1.1.1</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>commons-logging</groupId>
-                   <artifactId>commons-logging</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>          
-
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-	        <groupId>httpunit</groupId>
-	        <artifactId>httpunit</artifactId>
-	        <version>1.6.1</version>
-	        <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
deleted file mode 100644
index a9fff462fa..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.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.    
- */
-
-package org.apache.tuscany.sca.binding.jsonrpc.provider;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-/**
- * Invoker for the JSONRPC Binding
- * 
- * @version $Rev$ $Date$
- */
-public class JSONRPCBindingInvoker implements Invoker {
-    Operation operation;
-    String uri;
-
-    public JSONRPCBindingInvoker(Operation operation, String uri) {
-        this.operation = operation;
-        this.uri = uri;        
-    }
-    
-    public Message invoke(Message msg) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
deleted file mode 100644
index eb85453bbb..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
+++ /dev/null
@@ -1,64 +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.binding.jsonrpc.provider;
-
-import org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * JSON-RPC Provider Factory
- * 
- * @version $Rev$ $Date$ 
- */
-public class JSONRPCBindingProviderFactory implements BindingProviderFactory<JSONRPCBinding> {
-
-    private ServletHost servletHost;
-    
-    public JSONRPCBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        this.servletHost = servletHosts.getServletHosts().get(0);
-    }
-    
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   JSONRPCBinding binding) {
-        
-        return new JSONRPCReferenceBindingProvider(component, reference, binding);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               JSONRPCBinding binding) {
-        return new JSONRPCServiceBindingProvider(component, service, binding, servletHost);
-    }
-
-    public Class<JSONRPCBinding> getModelType() {
-        return JSONRPCBinding.class;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
deleted file mode 100644
index e2528f59e5..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
+++ /dev/null
@@ -1,70 +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.binding.jsonrpc.provider;
-
-import org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * Implementation of the JSONRPC Binding Provider for References
- * 
- * @version $Rev$ $Date$
- */
-public class JSONRPCReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private RuntimeComponentReference reference;
-    private JSONRPCBinding binding;
-    
-    public JSONRPCReferenceBindingProvider(RuntimeComponent component,
-                                           RuntimeComponentReference reference,
-                                           JSONRPCBinding binding) {
-           this.reference = reference;
-           this.binding = binding;
-        
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return reference.getInterfaceContract();
-    }
-    
-    public Invoker createInvoker(Operation operation) {
-        return new JSONRPCBindingInvoker(operation, binding.getURI());
-    }
-
-    public void start() {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void stop() {
-        // TODO Auto-generated method stub
-
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
deleted file mode 100644
index 8d9f8193e9..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
+++ /dev/null
@@ -1,184 +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.binding.jsonrpc.provider;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding;
-import org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;
-import org.apache.tuscany.sca.databinding.json.JSONDataBinding;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Implementation of the JSONRPC Binding Provider for Services
- * 
- * @version $Rev$ $Date$
- */
-public class JSONRPCServiceBindingProvider implements ServiceBindingProvider {
-    
-    // Path to the scaDomain.js script 
-    // Note: this is the same as the Ajax binding to keep the client code
-    //       the same for clients using either the ajax or jsonrpc binding
-    private static final String SCA_DOMAIN_SCRIPT = "/SCADomain/scaDomain.js";
-    
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private InterfaceContract serviceContract;
-    private JSONRPCBinding binding;
-    private ServletHost servletHost;
-    private List<String> servletMappings = new ArrayList<String>();
-    private String domainScriptMapping;
-
-    public JSONRPCServiceBindingProvider(RuntimeComponent component,
-                                         RuntimeComponentService service,
-                                         JSONRPCBinding binding,
-                                         ServletHost servletHost) {
-        this.component = component;
-        this.service = service;
-        this.binding = binding;
-        this.servletHost = servletHost;
-        
-        //clone the service contract to avoid databinding issues
-        try {
-            this.serviceContract = (InterfaceContract)service.getInterfaceContract().clone();
-        } catch(CloneNotSupportedException e) {
-            this.serviceContract = service.getInterfaceContract();
-        }
-        
-        setDataBinding(serviceContract.getInterface());
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return service.getInterfaceContract();
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-    
-    public void start() {
-        // Set default databinding to json
-        serviceContract.getInterface().resetDataBinding(JSONDataBinding.NAME);
-
-        // Determine the service business interface
-        Class<?> serviceInterface = getTargetJavaClass(serviceContract.getInterface());
-
-        // Create a Java proxy to the target service
-		Object proxy = component.getComponentContext().createSelfReference(serviceInterface, service).getService();
-
-        // Create and register a Servlet for this service
-        JSONRPCServiceServlet serviceServlet =
-            new JSONRPCServiceServlet(binding, service, serviceContract, serviceInterface, proxy);
-        String mapping = binding.getURI();
-        if (!mapping.endsWith("/")) {
-            mapping += "/";
-        }
-        if (!mapping.endsWith("*")) {
-            mapping += "*";
-        }
-                
-        servletHost.addServletMapping(mapping, serviceServlet);
-        servletMappings.add(mapping);
-        servletHost.addServletMapping(binding.getURI(), serviceServlet);
-        servletMappings.add(binding.getURI());
-        
-        // Register service to scaDomain.js
-        int port;
-        URI uri = URI.create(servletHost.getURLMapping(binding.getURI()).toString());
-        port = uri.getPort();
-        if (port == -1) {
-            port = servletHost.getDefaultPort();
-        }
-        
-        // get the ScaDomainScriptServlet, if it doesn't yet exist create one
-        // this uses removeServletMapping / addServletMapping as there is no getServletMapping facility
-        domainScriptMapping = URI.create("http://localhost:" + port + SCA_DOMAIN_SCRIPT).toString();
-        ScaDomainScriptServlet scaDomainServlet =
-            (ScaDomainScriptServlet)servletHost.getServletMapping(domainScriptMapping);
-        if (scaDomainServlet == null) {
-            scaDomainServlet = new ScaDomainScriptServlet();
-            servletHost.addServletMapping(domainScriptMapping, scaDomainServlet);
-        }
-
-        // Add this service to the SCA Domain Script Servlet
-        scaDomainServlet.addService(binding.getName());
-    }
-
-    public void stop() {
-
-        // Remove the Servlet mappings we've added
-        for (String mapping: servletMappings) {
-            servletHost.removeServletMapping(mapping);
-        }
-
-        // Unregister the service from the SCA Domain Script Servlet
-        ScaDomainScriptServlet scaDomainServlet = (ScaDomainScriptServlet) servletHost.getServletMapping(domainScriptMapping);
-        if (scaDomainServlet != null) {
-            scaDomainServlet.removeService(binding.getName());
-
-            // Remove the Servlet if there's no more registered services
-            if (scaDomainServlet.getServiceNames().isEmpty()) {
-                servletHost.removeServletMapping(domainScriptMapping);
-            }
-        }
-
-    }
-
-    private Class<?> getTargetJavaClass(Interface targetInterface) {
-        // TODO: right now assume that the target is always a Java
-        // Implementation. Need to figure out how to generate Java
-        // Interface in cases where the target is not a Java Implementation
-        return ((JavaInterface)targetInterface).getJavaClass();
-    }
-    
-    private void setDataBinding(Interface interfaze) {
-        List<Operation> operations = interfaze.getOperations();
-        for (Operation operation : operations) {
-            operation.setDataBinding(JSONDataBinding.NAME);
-            DataType<List<DataType>> inputType = operation.getInputType();
-            if (inputType != null) {
-                List<DataType> logical = inputType.getLogical();
-                for (DataType inArg : logical) {
-                    if (!SimpleJavaDataBinding.NAME.equals(inArg.getDataBinding())) {
-                        inArg.setDataBinding(JSONDataBinding.NAME);
-                    } 
-                }
-            }
-            DataType outputType = operation.getOutputType();
-            if (outputType != null) {
-                if (!SimpleJavaDataBinding.NAME.equals(outputType.getDataBinding())) {
-                    outputType.setDataBinding(JSONDataBinding.NAME);
-                }
-            }
-        }
-    }
-
-
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
deleted file mode 100644
index 37a598e1ac..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
+++ /dev/null
@@ -1,282 +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.binding.jsonrpc.provider;
-
-import java.io.BufferedReader;
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-import com.metaparadigm.jsonrpc.JSONRPCBridge;
-import com.metaparadigm.jsonrpc.JSONRPCResult;
-import com.metaparadigm.jsonrpc.JSONRPCServlet;
-
-/**
- * Servlet that handles JSON-RPC requests invoking SCA services.
- * 
- * There is an instance of this Servlet for each <binding.jsonrpc>
- *
- * @version $Rev$ $Date$
- */
-public class JSONRPCServiceServlet extends JSONRPCServlet {
-    private static final long serialVersionUID = 1L;
-
-    transient Binding binding;
-    transient String serviceName;
-    transient Object serviceInstance;
-    transient RuntimeComponentService componentService;
-    transient InterfaceContract serviceContract;
-    transient Class<?> serviceInterface;
-
-    public JSONRPCServiceServlet(Binding binding,
-                                 RuntimeComponentService componentService,
-                                 InterfaceContract serviceContract,
-                                 Class<?> serviceInterface,
-                                 Object serviceInstance) {
-        this.binding = binding;
-        this.serviceName = binding.getName();
-        this.componentService = componentService;
-        this.serviceContract = serviceContract;
-        this.serviceInterface = serviceInterface;
-        this.serviceInstance = serviceInstance;
-    }
-
-    /**
-     * Override to do nothing as the JSONRPCServlet is setup by the
-     * service method in this class.
-     */
-    @Override
-    public void init(ServletConfig config) {
-    }
-
-    @Override
-    public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        if ("smd".equals(request.getQueryString())) {
-            handleSMDRequest(request, response);
-        } else {
-            try {
-                handleServiceRequest(request, response);
-            } finally {
-                HttpSession session = request.getSession(false);
-                if (session != null) {
-                    session.removeAttribute("JSONRPCBridge");
-                }
-            }
-        }
-    }
-
-    private void handleServiceRequest(HttpServletRequest request, HttpServletResponse response)
-        throws IOException {
-        // Encode using UTF-8, although We are actually ASCII clean as
-        // all unicode data is JSON escaped using backslash u. This is
-        // less data efficient for foreign character sets but it is
-        // needed to support naughty browsers such as Konqueror and Safari
-        // which do not honour the charset set in the response
-        response.setContentType("text/plain;charset=utf-8");
-        OutputStream out = response.getOutputStream();
-
-        // Decode using the charset in the request if it exists otherwise
-        // use UTF-8 as this is what all browser implementations use.
-        // The JSON-RPC-Java JavaScript client is ASCII clean so it
-        // although here we can correctly handle data from other clients
-        // that do not escape non ASCII data
-        String charset = request.getCharacterEncoding();
-        if (charset == null) {
-            charset = "UTF-8";
-        }
-        BufferedReader in = new BufferedReader(new InputStreamReader(request.getInputStream(), charset));
-
-        // Read the request
-        CharArrayWriter data = new CharArrayWriter();
-        char[] buf = new char[4096];
-        int ret;
-        while ((ret = in.read(buf, 0, 4096)) != -1) {
-            data.write(buf, 0, ret);
-        }
-
-        JSONObject jsonReq = null;
-        String method = null;
-        try {
-            jsonReq = new JSONObject(data.toString());
-            method = jsonReq.getString("method");
-        } catch (Exception e) {
-            //FIXME Exceptions are not handled correctly here
-            // They should be reported to the client JavaScript as proper
-            // JavaScript exceptions.
-            throw new RuntimeException("Unable to parse request", e);
-        }
-
-        
-        // check if it's a system request 
-        // or a method invocation
-        byte[] bout;
-        if (method.startsWith("system.")) {
-            bout = handleJSONRPCSystemInvocation(request, response, data.toString());
-        } else {
-            bout = handleJSONRPCMethodInvocation(request, response, jsonReq);
-        }
-
-        // Send response to client
-        out.write(bout);
-        out.flush();
-        out.close();
-    }
-
-    /**
-     * handles requests for the SMD descriptor for a service
-     */
-    protected void handleSMDRequest(HttpServletRequest request, HttpServletResponse response) throws IOException,
-        UnsupportedEncodingException {
-        String serviceUrl = request.getRequestURL().toString();
-        String smd = JavaToSmd.interfaceToSmd(serviceInterface, serviceUrl);
-
-        response.setContentType("text/plain;charset=utf-8");
-        OutputStream out = response.getOutputStream();
-        byte[] bout = smd.getBytes("UTF-8");
-        out.write(bout);
-        out.flush();
-        out.close();
-    }
-    
-    protected byte[] handleJSONRPCSystemInvocation(HttpServletRequest request, HttpServletResponse response, String requestData) throws IOException,
-    UnsupportedEncodingException {
-        /*
-         * Create a new bridge for every request to avoid all the problems with 
-         * JSON-RPC-Java storing the bridge in the session
-         */
-        HttpSession session = request.getSession();
-
-        JSONRPCBridge jsonrpcBridge = new JSONRPCBridge();
-        jsonrpcBridge.registerObject("Service", serviceInstance, serviceInterface);
-        session.setAttribute("JSONRPCBridge", jsonrpcBridge);
-        
-        org.json.JSONObject jsonReq = null;
-        com.metaparadigm.jsonrpc.JSONRPCResult jsonResp = null;
-        try {
-            jsonReq = new org.json.JSONObject(requestData);
-        } catch (java.text.ParseException e) {
-            throw new RuntimeException("Unable to parse request", e);
-        }
-
-        String method = jsonReq.getString("method");
-        if ((method != null) && (method.indexOf('.') < 0)) {
-            jsonReq.putOpt("method", "Service" + "." + method);
-        }
-
-        // invoke the request
-        jsonResp = jsonrpcBridge.call(new Object[] {request}, jsonReq);
-
-        return jsonResp.toString().getBytes("UTF-8");
-    }
-    
-    protected byte[] handleJSONRPCMethodInvocation(HttpServletRequest request, HttpServletResponse response, JSONObject jsonReq) throws IOException,
-    UnsupportedEncodingException {
-
-        String method = null;
-        Object[] args = null;
-        Object id = null;
-        try {
-            // Extract the method
-            method = jsonReq.getString("method");
-            if ((method != null) && (method.indexOf('.') < 0)) {
-                jsonReq.putOpt("method", "Service" + "." + method);
-            }
-            
-            // Extract the arguments
-            JSONArray array = jsonReq.getJSONArray("params");
-            args = new Object[array.length()];
-            for (int i = 0; i < args.length; i++) {
-                args[i] = array.get(i);
-            }
-            id = jsonReq.get("id");
-
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to find json method name", e);
-        }
-
-        // invoke the request
-        RuntimeWire wire = componentService.getRuntimeWire(binding, serviceContract);
-        Operation jsonOperation = findOperation(method);
-        Object result = null;
-      
-        try {
-        	JSONObject jsonResponse = new JSONObject();
-        	result = wire.invoke(jsonOperation, args);
-
-        	try {
-                jsonResponse.put("result", result);
-                jsonResponse.putOpt("id", id);
-                //get response to send to client
-                return jsonResponse.toString().getBytes("UTF-8");
-            } catch (Exception e) {
-                throw new ServiceRuntimeException("Unable to create JSON response", e);
-            }
-        } catch (InvocationTargetException e) {
-           	 JSONRPCResult errorResult = new JSONRPCResult(JSONRPCResult.CODE_REMOTE_EXCEPTION, id, e.getCause() );
-             return errorResult.toString().getBytes("UTF-8");
-        } catch(RuntimeException e) {
-             JSONRPCResult errorResult = new JSONRPCResult(JSONRPCResult.CODE_REMOTE_EXCEPTION, id, e.getCause());
-             return errorResult.toString().getBytes("UTF-8");
-        }
-   }
-
-    /**
-     * Find the operation from the component service contract
-     * @param componentService
-     * @param method
-     * @return
-     */
-    private Operation findOperation(String method) {
-        if (method.contains(".")) {
-            method = method.substring(method.lastIndexOf(".") + 1);
-        }
-    
-        List<Operation> operations = serviceContract.getInterface().getOperations();
-            //componentService.getBindingProvider(binding).getBindingInterfaceContract().getInterface().getOperations();
-
-        
-        Operation result = null;
-        for (Operation o : operations) {
-            if (o.getName().equalsIgnoreCase(method)) {
-                result = o;
-                break;
-            }
-        }
-
-        return result;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
deleted file mode 100644
index 64339fda7b..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
+++ /dev/null
@@ -1,56 +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.binding.jsonrpc.provider;
-
-import java.lang.reflect.Method;
-
-/**
- * Utility class to create a Simple Method Description (SMD) descriptor
- * from a Java class. See http://dojo.jot.com/SMD.
- * 
- * TODO: Change to work from the Tuscany Interface instead of a Java class
- * 
- * @version $Rev$ $Date$
- */
-class JavaToSmd {
-    
-    static String interfaceToSmd(Class<?> klazz, String serviceUrl) {
-        String name = klazz.getSimpleName();
-        Method[] methods = klazz.getMethods();
-        
-        StringBuffer smdSb = new StringBuffer();
-        smdSb.append("{\"SMDVersion\":\".1\",\"objectName\":\"" + name + "\",\"serviceType\":\"JSON-RPC\",\"serviceURL\":\""+ serviceUrl + "\",\"methods\":[");
-        for (int i = 0; i < methods.length; i++) {
-            if (i != 0) smdSb.append(",");
-            Class<?>[] params = methods[i].getParameterTypes();            
-            smdSb.append("{\"name\":\""+methods[i].getName() + "\",\"parameters\":[");
-            for (int j = 0; j < params.length; j++) {
-                if (j != 0) smdSb.append(",");
-                // right now Dojo doesn't look at the type value, so we'll default it to STRING
-                // also, since we can't introspect the method parameter names we'll just create an incrementing parameter name
-                smdSb.append("{\"name\":\"param" + j + "\",\"type\":\"STRING\"}");  
-            }
-            smdSb.append("]}");
-        }
-        smdSb.append("]}");
-        
-        return smdSb.toString();        
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
deleted file mode 100644
index 999588abf1..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
+++ /dev/null
@@ -1,114 +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.binding.jsonrpc.provider;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Servlet to handle requests for the scaDomain.js script.
- * 
- * This script wrappers the JSON-RPC-Java jsonrpc.js script
- * adding in at the bottom the JavaScript to create and initialize
- * the variables representing the SCA services.
- * 
- * @version $Rev$ $Date$
- */
-public class ScaDomainScriptServlet extends HttpServlet {
-    private static final long serialVersionUID = 1L;
-
-    protected transient List<String> serviceNames;
-
-    public ScaDomainScriptServlet() {
-        serviceNames = new ArrayList<String>();
-    }
-
-    @Override
-    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
-
-        ServletOutputStream os = response.getOutputStream();
-
-        os.println();
-        os.println("/* Apache Tuscany scaDomain.js Header */");
-        os.println();
-
-        writeJSONRPCJavaScript(os);
-        writeScaDomainCode(os, request.getServletPath());
-    }
-
-    /**
-     * Creates a JavaScript variable within the scaDomain script for each SCA service and
-     * initializes its value with the JSON-RPC client to invoke the serverside service.
-     */
-    protected void writeScaDomainCode(ServletOutputStream out, String path) throws IOException {
-        out.println();
-        out.println("/* Apache Tuscany scaDomain.js Footer  */");
-        out.println();
-        out.println("function scaDomain() {}");
-
-        // remove the leading slash '/' character
-        path = path.substring(1);
-
-        for (String serviceName : serviceNames) {
-            out.println();
-
-            // A slight hack to make the service function available with a variable named 'serviceName'
-            // to do that the JSONRpcClient is added to the scaDomain and then the service function is got from that
-            out.println("scaDomain." + serviceName + " = " + "new JSONRpcClient(\"" + serviceName + "\");");
-            out.println(serviceName + " = scaDomain." + serviceName + ".Service;");
-        }
-
-        out.println();
-        out.println("/** End of Apache Tuscany scaDomain.js */");
-        out.println();
-    }
-
-    /**
-     * Reads the jsonrpc.js script from the classpath and adds its contents to the output stream.
-     */
-    protected void writeJSONRPCJavaScript(ServletOutputStream os) throws IOException {
-        URL url = getClass().getResource("jsonrpc.js");
-        InputStream is = url.openStream();
-        int i;
-        while ((i = is.read()) != -1) {
-            os.write(i);
-        }
-    }
-
-    public void addService(String serviceName) {
-        serviceNames.add(serviceName);
-    }
-
-    public void removeService(String serviceName) {
-        serviceNames.remove(serviceName);
-    }
-
-    public List<String> getServiceNames() {
-        return serviceNames;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 4767358e7a..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.jsonrpc.provider.JSONRPCBindingProviderFactory;model=org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding

diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
deleted file mode 100644
index d837bab91c..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
+++ /dev/null
@@ -1,493 +0,0 @@
-/*
- * JSON-RPC JavaScript client
- *
- * $Id: jsonrpc.js,v 1.36.2.3 2006/03/08 15:09:37 mclark Exp $
- *
- * Copyright (c) 2003-2004 Jan-Klaas Kollhof
- * Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
- *
- * This code is based on Jan-Klaas' JavaScript o lait library (jsolait).
- *
- * Licensed 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.
- *
- */
-
-/*
- * Modifications for Apache Tuscany:
- * - JSONRpcClient_createMethod changed so callback is last arg
- */
-
-/* escape a character */
-
-escapeJSONChar =
-function escapeJSONChar(c)
-{
-    if(c == "\"" || c == "\\") return "\\" + c;
-    else if (c == "\b") return "\\b";
-    else if (c == "\f") return "\\f";
-    else if (c == "\n") return "\\n";
-    else if (c == "\r") return "\\r";
-    else if (c == "\t") return "\\t";
-    var hex = c.charCodeAt(0).toString(16);
-    if(hex.length == 1) return "\\u000" + hex;
-    else if(hex.length == 2) return "\\u00" + hex;
-    else if(hex.length == 3) return "\\u0" + hex;
-    else return "\\u" + hex;
-};
-
-
-/* encode a string into JSON format */
-
-escapeJSONString =
-function escapeJSONString(s)
-{
-    /* The following should suffice but Safari's regex is b0rken
-       (doesn't support callback substitutions)
-       return "\"" + s.replace(/([^\u0020-\u007f]|[\\\"])/g,
-       escapeJSONChar) + "\"";
-    */
-
-    /* Rather inefficient way to do it */
-    var parts = s.split("");
-    for(var i=0; i < parts.length; i++) {
-	var c =parts[i];
-	if(c == '"' ||
-	   c == '\\' ||
-	   c.charCodeAt(0) < 32 ||
-	   c.charCodeAt(0) >= 128)
-	    parts[i] = escapeJSONChar(parts[i]);
-    }
-    return "\"" + parts.join("") + "\"";
-};
-
-
-/* Marshall objects to JSON format */
-
-toJSON = function toJSON(o)
-{
-    if(o == null) {
-	return "null";
-    } else if(o.constructor == String) {
-	return escapeJSONString(o);
-    } else if(o.constructor == Number) {
-	return o.toString();
-    } else if(o.constructor == Boolean) {
-	return o.toString();
-    } else if(o.constructor == Date) {
-	return '{javaClass: "java.util.Date", time: ' + o.valueOf() +'}';
-    } else if(o.constructor == Array) {
-	var v = [];
-	for(var i = 0; i < o.length; i++) v.push(toJSON(o[i]));
-	return "[" + v.join(", ") + "]";
-    } else {
-	var v = [];
-	for(attr in o) {
-	    if(o[attr] == null) v.push("\"" + attr + "\": null");
-	    else if(typeof o[attr] == "function"); /* skip */
-	    else v.push(escapeJSONString(attr) + ": " + toJSON(o[attr]));
-	}
-	return "{" + v.join(", ") + "}";
-    }
-};
-
-
-/* JSONRpcClient constructor */
-
-JSONRpcClient =
-function JSONRpcClient_ctor(serverURL, user, pass, objectID)
-{
-    this.serverURL = serverURL;
-    this.user = user;
-    this.pass = pass;
-    this.objectID = objectID;
-
-    /* Add standard methods */
-    if(this.objectID) {
-	this._addMethods(["listMethods"]);
-	var req = this._makeRequest("listMethods", []);
-    } else {
-	this._addMethods(["system.listMethods"]);
-	var req = this._makeRequest("system.listMethods", []);
-    }
-    var m = this._sendRequest(req);
-    this._addMethods(m);
-};
-
-
-/* JSONRpcCLient.Exception */
-
-JSONRpcClient.Exception =
-function JSONRpcClient_Exception_ctor(code, message, javaStack)
-{
-    this.code = code;
-    var name;
-    if(javaStack) {
-	this.javaStack = javaStack;
-	var m = javaStack.match(/^([^:]*)/);
-	if(m) name = m[0];
-    }
-    if(name) this.name = name;
-    else this.name = "JSONRpcClientException";
-    this.message = message;
-};
-
-JSONRpcClient.Exception.CODE_REMOTE_EXCEPTION = 490;
-JSONRpcClient.Exception.CODE_ERR_CLIENT = 550;
-JSONRpcClient.Exception.CODE_ERR_PARSE = 590;
-JSONRpcClient.Exception.CODE_ERR_NOMETHOD = 591;
-JSONRpcClient.Exception.CODE_ERR_UNMARSHALL = 592;
-JSONRpcClient.Exception.CODE_ERR_MARSHALL = 593;
-
-JSONRpcClient.Exception.prototype = new Error();
-
-JSONRpcClient.Exception.prototype.toString =
-function JSONRpcClient_Exception_toString(code, msg)
-{
-    return this.name + ": " + this.message;
-};
-
-
-/* Default top level exception handler */
-
-JSONRpcClient.default_ex_handler =
-function JSONRpcClient_default_ex_handler(e) { alert(e); };
-
-
-/* Client settable variables */
-
-JSONRpcClient.toplevel_ex_handler = JSONRpcClient.default_ex_handler;
-JSONRpcClient.profile_async = false;
-JSONRpcClient.max_req_active = 1;
-JSONRpcClient.requestId = 1;
-
-
-/* JSONRpcClient implementation */
-
-JSONRpcClient.prototype._createMethod =
-function JSONRpcClient_createMethod(methodName)
-{
-    var fn=function()
-    {
-	var args = [];
-	var callback = null;
-	for(var i=0;i<arguments.length;i++) args.push(arguments[i]);
-
-/*	TUSCANY change callback to be last arg instead of first to match binding.ajax
-	if(typeof args[0] == "function") callback = args.shift();
-*/
-	if(typeof args[arguments.length-1] == "function") callback = args.pop();
-
-	var req = fn.client._makeRequest.call(fn.client, fn.methodName,
-					      args, callback);
-	if(callback == null) {
-	    return fn.client._sendRequest.call(fn.client, req);
-	} else {
-	    JSONRpcClient.async_requests.push(req);
-	    JSONRpcClient.kick_async();
-	    return req.requestId;
-	}
-    };
-    fn.client = this;
-    fn.methodName = methodName;
-    return fn;
-};
-
-JSONRpcClient.prototype._addMethods =
-function JSONRpcClient_addMethods(methodNames)
-{
-    for(var i=0; i<methodNames.length; i++) {
-	var obj = this;
-	var names = methodNames[i].split(".");
-	for(var n=0; n<names.length-1; n++) {
-	    var name = names[n];
-	    if(obj[name]) {
-		obj = obj[name];
-	    } else {
-		obj[name]  = new Object();
-		obj = obj[name];
-	    }
-	}
-	var name = names[names.length-1];
-	if(!obj[name]) {
-	    var method = this._createMethod(methodNames[i]);
-	    obj[name] = method;
-	}
-    }
-};
-
-JSONRpcClient._getCharsetFromHeaders =
-function JSONRpcClient_getCharsetFromHeaders(http)
-{
-    try {
-	var contentType = http.getResponseHeader("Content-type");
-	var parts = contentType.split(/\s*;\s*/);
-	for(var i =0; i < parts.length; i++) {
-	    if(parts[i].substring(0, 8) == "charset=")
-		return parts[i].substring(8, parts[i].length);
-	}
-    } catch (e) {}
-    return "UTF-8"; /* default */
-};
-
-/* Async queue globals */
-JSONRpcClient.async_requests = [];
-JSONRpcClient.async_inflight = {};
-JSONRpcClient.async_responses = [];
-JSONRpcClient.async_timeout = null;
-JSONRpcClient.num_req_active = 0;
-
-JSONRpcClient._async_handler =
-function JSONRpcClient_async_handler()
-{
-    JSONRpcClient.async_timeout = null;
-
-    while(JSONRpcClient.async_responses.length > 0) {
-	var res = JSONRpcClient.async_responses.shift();
-	if(res.canceled) continue;
-	if(res.profile) res.profile.dispatch = new Date();
-	try {
-	    res.cb(res.result, res.ex, res.profile);
-	} catch(e) {
-	    JSONRpcClient.toplevel_ex_handler(e);
-	}
-    }
-
-    while(JSONRpcClient.async_requests.length > 0 &&
-	  JSONRpcClient.num_req_active < JSONRpcClient.max_req_active) {
-	var req = JSONRpcClient.async_requests.shift();
-	if(req.canceled) continue;
-	req.client._sendRequest.call(req.client, req);
-    }
-};
-
-JSONRpcClient.kick_async =
-function JSONRpcClient_kick_async()
-{
-    if(JSONRpcClient.async_timeout == null)
-	JSONRpcClient.async_timeout =
-	    setTimeout(JSONRpcClient._async_handler, 0);
-};
-
-JSONRpcClient.cancelRequest =
-function JSONRpcClient_cancelRequest(requestId)
-{
-    /* If it is in flight then mark it as canceled in the inflight map
-       and the XMLHttpRequest callback will discard the reply. */
-    if(JSONRpcClient.async_inflight[requestId]) {
-	JSONRpcClient.async_inflight[requestId].canceled = true;
-	return true;
-    }
-
-    /* If its not in flight yet then we can just mark it as canceled in
-       the the request queue and it will get discarded before being sent. */
-    for(var i in JSONRpcClient.async_requests) {
-	if(JSONRpcClient.async_requests[i].requestId == requestId) {
-	    JSONRpcClient.async_requests[i].canceled = true;
-	    return true;
-	}
-    }
-
-    /* It may have returned from the network and be waiting for its callback
-       to be dispatched, so mark it as canceled in the response queue
-       and the response will get discarded before calling the callback. */
-    for(var i in JSONRpcClient.async_responses) {
-	if(JSONRpcClient.async_responses[i].requestId == requestId) {
-	    JSONRpcClient.async_responses[i].canceled = true;
-	    return true;
-	}
-    }
-
-    return false;
-};
-
-JSONRpcClient.prototype._makeRequest =
-function JSONRpcClient_makeRequest(methodName, args, cb)
-{
-    var req = {};
-    req.client = this;
-    req.requestId = JSONRpcClient.requestId++;
-
-    var obj = {};
-    obj.id = req.requestId;
-    if (this.objectID)
-	obj.method = ".obj#" + this.objectID + "." + methodName;
-    else
-	obj.method = methodName;
-    obj.params = args;
-
-    if (cb) req.cb = cb;
-    if (JSONRpcClient.profile_async)
-	req.profile = { "submit": new Date() };
-    req.data = toJSON(obj);
-
-    return req;
-};
-
-JSONRpcClient.prototype._sendRequest =
-function JSONRpcClient_sendRequest(req)
-{
-    if(req.profile) req.profile.start = new Date();
-
-    /* Get free http object from the pool */
-    var http = JSONRpcClient.poolGetHTTPRequest();
-    JSONRpcClient.num_req_active++;
-
-    /* Send the request */
-    if (typeof(this.user) == "undefined") {
-	http.open("POST", this.serverURL, (req.cb != null));
-    } else {
-	http.open("POST", this.serverURL, (req.cb != null), this.user, this.pass);
-    }
-
-    /* setRequestHeader is missing in Opera 8 Beta */
-    try { http.setRequestHeader("Content-type", "text/plain"); } catch(e) {}
-
-    /* Construct call back if we have one */
-    if(req.cb) {
-	var self = this;
-	http.onreadystatechange = function() {
-	    if(http.readyState == 4) {
-		http.onreadystatechange = function () {};
-		var res = { "cb": req.cb, "result": null, "ex": null};
-		if (req.profile) {
-		    res.profile = req.profile;
-		    res.profile.end = new Date();
-		}
-		try { res.result = self._handleResponse(http); }
-		catch(e) { res.ex = e; }
-		if(!JSONRpcClient.async_inflight[req.requestId].canceled)
-		    JSONRpcClient.async_responses.push(res);
-		delete JSONRpcClient.async_inflight[req.requestId];
-		JSONRpcClient.kick_async();
-	    }
-	};
-    } else {
-	http.onreadystatechange = function() {};
-    }
-
-    JSONRpcClient.async_inflight[req.requestId] = req;
-	
-    try {
-	http.send(req.data);
-    } catch(e) {
-	JSONRpcClient.poolReturnHTTPRequest(http);
-	JSONRpcClient.num_req_active--;
-	throw new JSONRpcClient.Exception
-	    (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
-    }
-
-    if(!req.cb) return this._handleResponse(http);
-};
-
-JSONRpcClient.prototype._handleResponse =
-function JSONRpcClient_handleResponse(http)
-{
-    /* Get the charset */
-    if(!this.charset) {
-	this.charset = JSONRpcClient._getCharsetFromHeaders(http);
-    }
-
-    /* Get request results */
-    var status, statusText, data;
-    try {
-	status = http.status;
-	statusText = http.statusText;
-	data = http.responseText;
-    } catch(e) {
-	JSONRpcClient.poolReturnHTTPRequest(http);
-	JSONRpcClient.num_req_active--;
-	JSONRpcClient.kick_async();
-	throw new JSONRpcClient.Exception
-	    (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
-    }
-
-    /* Return http object to the pool; */
-    JSONRpcClient.poolReturnHTTPRequest(http);
-    JSONRpcClient.num_req_active--;
-
-    /* Unmarshall the response */
-    if(status != 200) {
-	throw new JSONRpcClient.Exception(status, statusText);
-    }
-    var obj;
-    try {
-	eval("obj = " + data);
-    } catch(e) {
-	throw new JSONRpcClient.Exception(550, "error parsing result");
-    }
-    if(obj.error)
-	throw new JSONRpcClient.Exception(obj.error.code, obj.error.msg,
-					  obj.error.trace);
-    var res = obj.result;
-
-    /* Handle CallableProxy */
-    if(res && res.objectID && res.JSONRPCType == "CallableReference")
-	return new JSONRpcClient(this.serverURL, this.user,
-				 this.pass, res.objectID);
-
-    return res;
-};
-
-
-/* XMLHttpRequest wrapper code */
-
-/* XMLHttpRequest pool globals */
-JSONRpcClient.http_spare = [];
-JSONRpcClient.http_max_spare = 8;
-
-JSONRpcClient.poolGetHTTPRequest =
-function JSONRpcClient_pool_getHTTPRequest()
-{
-    if(JSONRpcClient.http_spare.length > 0) {
-	return JSONRpcClient.http_spare.pop();
-    }
-    return JSONRpcClient.getHTTPRequest();
-};
-
-JSONRpcClient.poolReturnHTTPRequest =
-function JSONRpcClient_poolReturnHTTPRequest(http)
-{
-    if(JSONRpcClient.http_spare.length >= JSONRpcClient.http_max_spare)
-	delete http;
-    else
-	JSONRpcClient.http_spare.push(http);
-};
-
-JSONRpcClient.msxmlNames = [ "MSXML2.XMLHTTP.5.0",
-			     "MSXML2.XMLHTTP.4.0",
-			     "MSXML2.XMLHTTP.3.0",
-			     "MSXML2.XMLHTTP",
-			     "Microsoft.XMLHTTP" ];
-
-JSONRpcClient.getHTTPRequest =
-function JSONRpcClient_getHTTPRequest()
-{
-    /* Mozilla XMLHttpRequest */
-    try {
-	JSONRpcClient.httpObjectName = "XMLHttpRequest";
-	return new XMLHttpRequest();
-    } catch(e) {}
-
-    /* Microsoft MSXML ActiveX */
-    for (var i=0;i < JSONRpcClient.msxmlNames.length; i++) {
-	try {
-	    JSONRpcClient.httpObjectName = JSONRpcClient.msxmlNames[i];
-	    return new ActiveXObject(JSONRpcClient.msxmlNames[i]);
-	} catch (e) {}
-    }
-
-    /* None found */
-    JSONRpcClient.httpObjectName = null;
-    throw new JSONRpcClient.Exception(0, "Can't create XMLHttpRequest object");
-};
-
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
deleted file mode 100644
index 4b159fb563..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
+++ /dev/null
@@ -1,51 +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 bean;
-
-public class TestBean {
-    private String testString;
-    private String[] testStringArray;
-    private int testInt;
-    
-
-    public String getTestString() {
-        return testString;
-    }
-
-    public void setTestString(String testString) {
-        this.testString = testString;
-    }
-
-    public String[] getTestStringArray() {
-    	return testStringArray;
-    }
-    
-    public void setStringArray(String[] stringArray) {
-    	this.testStringArray = stringArray;
-    }
-    
-    public int getTestInt() {
-        return testInt;
-    }
-
-    public void setTestInt(int testInt) {
-        this.testInt = testInt;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
deleted file mode 100644
index c46e5698d1..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
+++ /dev/null
@@ -1,62 +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.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-import bean.TestBean;
-
-/**
- * Interface of our sample JSONRPC service.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface Echo {
-    
-    String echo(String msg);
-    
-    void echoRuntimeException() throws RuntimeException;
-    
-    void echoBusinessException() throws EchoBusinessException;
-    
-    int echoInt(int param);
-    
-    boolean echoBoolean(boolean param);
-    
-    Map echoMap(HashMap map);
-    
-    TestBean echoBean(TestBean testBean);
-    
-    List echoList(ArrayList list);
-    
-    String [] echoArrayString(String[] stringArray);
-    
-    int [] echoArrayInt(int[] intArray);
-    
-    Set echoSet(HashSet set);
-    
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
deleted file mode 100644
index bf8c7d2c8a..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
+++ /dev/null
@@ -1,29 +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;
-
-public class EchoBusinessException extends Exception {
-    private static final long serialVersionUID = 7234119326657905710L;
-
-    public EchoBusinessException(String message)
-	{
-		super(message);
-	}
-
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
deleted file mode 100644
index 3e7b848221..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
+++ /dev/null
@@ -1,98 +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.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import bean.TestBean;
-
-/**
- * A simple client component that uses a reference with an JSONRPC binding.
- * 
- * @version $Rev$ $Date$
- */
-public class EchoComponentImpl implements Echo {    
-
-    public String echo(String msg) {        
-        System.out.println("Echo: "+ msg);
-        return "echo: " + msg;
-    }
-
-	public void echoBusinessException() throws EchoBusinessException {
-		throw new EchoBusinessException("Business Exception");
-		
-	}
-
-	public void echoRuntimeException() throws RuntimeException {
-		throw new RuntimeException("Runtime Exception");
-	}
-	
-	public int echoInt(int param) {
-		int value = param;
-		return value;
-	}
-	
-	public boolean echoBoolean(boolean param) {
-		boolean value = param;
-		return value;
-	}
-	
-	public Map echoMap(HashMap param) {
-		Map map = new HashMap();
-		map = param;
-		return map;
-	}
-	
-	public TestBean echoBean(TestBean testBean1) {
-		TestBean testBean = new TestBean();
-		testBean.setTestString(testBean1.getTestString());
-		testBean.setTestInt(testBean1.getTestInt());
-		return testBean;
-	}
-	
-	public List echoList(ArrayList param){
-		List list = new ArrayList();
-		for(Iterator itr = param.iterator();itr.hasNext();)
-		{
-			list.add(itr.next());
-		}
-		return list;
-	}
-	
-	public String[] echoArrayString(String[] stringArray) {
-		return stringArray;
-	}
-	
-	public int[] echoArrayInt(int[] intArray) {
-		return intArray;
-	}
-	
-	public Set echoSet(HashSet param){
-		Set set = new HashSet();
-		set  = param;
-		return set;
-		
-	}
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
deleted file mode 100644
index 47ce8f4433..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
+++ /dev/null
@@ -1,180 +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.binding.jsonrpc;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.json.JSONObject;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.meterware.httpunit.PostMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JSONRPCDataTypeTestCase {
-
-    private static final String SERVICE_PATH = "/EchoService";
-    private static final String SERVICE_URL = "http://localhost:8085/SCADomain" + SERVICE_PATH;
-    private Node node;
-
-    @Before
-    public void setUp() throws Exception {
-        String contribution = ContributionLocationHelper.getContributionLocation(getClass());
-        node = NodeFactory.newInstance().createNode("JSONRPCBinding.composite", new Contribution("test", contribution));
-        node.start();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        node.stop();
-        node.destroy();
-    }
-
-    @Test
-    public void testInt() throws Exception {
-        JSONObject jsonRequest = new JSONObject("{ \"method\": \"echoInt\", \"params\": [12345], \"id\": 4}");
-
-        WebConversation wc = new WebConversation();
-        WebRequest request = new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-
-        JSONObject jsonResp = new JSONObject(response.getText());
-
-        Assert.assertEquals(12345, jsonResp.getInt("result"));
-    }
-
-    @Test
-    public void testBoolean() throws Exception {
-        JSONObject jsonRequest = new JSONObject("{ \"method\": \"echoBoolean\", \"params\": [true], \"id\": 5}");
-
-        WebConversation wc = new WebConversation();
-        WebRequest request = new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-
-        JSONObject jsonResp = new JSONObject(response.getText());
-
-        Assert.assertEquals(true, jsonResp.getBoolean("result"));
-    }
-
-    @Test
-    public void testMap() throws Exception {
-        JSONObject jsonRequest = new JSONObject("{ \"method\": \"echoMap\", \"params\": [ {\"javaClass\": \"java.util.HashMap\", \"map\": { \"Binding\": \"JSON-RPC\"}}], \"id\": 6}");
-
-        WebConversation wc = new WebConversation();
-        WebRequest request = new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-
-        JSONObject jsonResp = new JSONObject(response.getText());
-
-        Assert.assertEquals("JSON-RPC", jsonResp.getJSONObject("result").getJSONObject("map").getString("Binding"));
-    }
-
-    @Test
-    public void testBean() throws Exception {
-        JSONObject jsonRequest = new JSONObject("{ \"method\": \"echoBean\", \"params\": [ {\"javaClass\": \"bean.TestBean\", \"testString\": \"JSON-RPC\", \"testInt\":1234}], \"id\": 7}");
-
-        WebConversation wc = new WebConversation();
-        WebRequest request = new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-
-        JSONObject jsonResp = new JSONObject(response.getText());
-
-        Assert.assertEquals("JSON-RPC", jsonResp.getJSONObject("result").getString("testString"));
-    }
-
-    @Test
-    public void testList() throws Exception {
-        JSONObject jsonRequest = new JSONObject("{ \"method\": \"echoList\", \"params\": [ {\"javaClass\": \"java.util.ArrayList\", \"list\": [0,1,2,3,4]}], \"id\": 8}");
-
-        WebConversation wc = new WebConversation();
-        WebRequest request = new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-
-        JSONObject jsonResp = new JSONObject(response.getText());
-
-        Assert.assertEquals(0, jsonResp.getJSONObject("result").getJSONArray("list").get(0));
-    }
-
-    @Test
-    public void testArrayString() throws Exception {
-        JSONObject jsonRequest = new JSONObject("{\"params\":[[\"1\",\"2\"]],\"method\":\"echoArrayString\",\"id\":9}");
-
-        WebConversation wc = new WebConversation();
-        WebRequest request = new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-
-        JSONObject jsonResp = new JSONObject(response.getText());
-
-        Assert.assertEquals(1, jsonResp.getJSONArray("result").getInt(0));
-    }
-
-    @Test
-    public void testArrayInt() throws Exception {
-        JSONObject jsonRequest = new JSONObject("{\"params\":[[1,2]],\"method\":\"echoArrayInt\",\"id\":10}");
-
-        WebConversation wc = new WebConversation();
-        WebRequest request = new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-
-        JSONObject jsonResp = new JSONObject(response.getText());
-
-        Assert.assertEquals(1, jsonResp.getJSONArray("result").getInt(0));
-    }
-
-    @Test
-    public void testSet() throws Exception {
-        JSONObject jsonRequest = new JSONObject("{ \"method\": \"echoSet\", \"params\": [ {\"javaClass\": \"java.util.HashSet\", \"set\": {\"1\": \"red\", \"2\": \"blue\"}}],\"id\": 11}");
-
-        WebConversation wc = new WebConversation();
-        WebRequest request = new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-
-        JSONObject jsonResp = new JSONObject(response.getText());
-
-        Assert.assertEquals("red", jsonResp.getJSONObject("result").getJSONObject("set").getString("red"));
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
deleted file mode 100644
index 0619831c06..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
+++ /dev/null
@@ -1,92 +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.binding.jsonrpc;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.json.JSONObject;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.meterware.httpunit.PostMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JSONRPCExceptionTestCase{
-
-    private static final String SERVICE_PATH = "/EchoService";
-
-    private static final String SERVICE_URL = "http://localhost:8085/SCADomain" + SERVICE_PATH;
-
-    private Node node;
-
-    @Before
-    public void setUp() throws Exception {
-        String contribution = ContributionLocationHelper.getContributionLocation(getClass());
-        node = NodeFactory.newInstance().createNode("JSONRPCBinding.composite", new Contribution("test", contribution));
-        node.start();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-    	node.stop();
-    	node.destroy();
-    }
-    
-    @Test
-    public void testRuntimeException() throws Exception{
-    	JSONObject jsonRequest = new JSONObject("{ \"method\": \"echoRuntimeException\", \"params\": [], \"id\": 2}");
-    	
-    	WebConversation wc = new WebConversation();
-        WebRequest request   = new PostMethodWebRequest( SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),"application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-        
-        JSONObject jsonErr = new JSONObject(response.getText()).getJSONObject("error");
-        
-        Assert.assertEquals("Runtime Exception", jsonErr.getString("msg"));
-    }
-    
-    @Test
-    public void testBusinessException() throws Exception{
-    	JSONObject jsonRequest = new JSONObject("{ \"method\": \"echoBusinessException\", \"params\": [], \"id\": 3}");
-    	
-    	WebConversation wc = new WebConversation();
-        WebRequest request   = new PostMethodWebRequest( SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),"application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-        
-        JSONObject jsonErr = new JSONObject(response.getText()).getJSONObject("error");
-        
-        Assert.assertEquals("Business Exception", jsonErr.getString("msg"));
-    }   
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
deleted file mode 100644
index ed73766202..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.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.binding.jsonrpc;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.json.JSONObject;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.meterware.httpunit.PostMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JSONRPCServiceTestCase{
-
-    private static final String SERVICE_PATH = "/EchoService";
-
-    private static final String SERVICE_URL = "http://localhost:8085/SCADomain" + SERVICE_PATH;
-
-    private Node node;
-
-    @Before
-    public void setUp() throws Exception {
-        String contribution = ContributionLocationHelper.getContributionLocation(getClass());
-        node = NodeFactory.newInstance().createNode("JSONRPCBinding.composite", new Contribution("test", contribution));
-        node.start();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-    	node.stop();
-    	node.destroy();
-    }
-
-    @Test
-    public void testJSONRPCBinding() throws Exception {
-        JSONObject jsonRequest = new JSONObject("{ \"method\": \"echo\", \"params\": [\"Hello JSON-RPC\"], \"id\": 1}");
-
-        WebConversation wc = new WebConversation();
-        WebRequest request   = new PostMethodWebRequest( SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),"application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-        
-        JSONObject jsonResp = new JSONObject(response.getText());
-        Assert.assertEquals("echo: Hello JSON-RPC", jsonResp.getString("result"));
-    }   
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite b/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
deleted file mode 100644
index 978fdcfa7f..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.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"

-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://jsonrpc"

-	xmlns:jsonrpc="http://jsonrpc"

-	name="JSONRPCBinding">

-

-    <service name="EchoService" promote="EchoComponent">

-        <interface.java interface="echo.Echo"/>

-        <tuscany:binding.jsonrpc uri="http://localhost:8085/SCADomain/EchoService"/>

-    </service>

-

-    <component name="EchoComponent">

-        <implementation.java class="echo.EchoComponentImpl"/>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/modules/binding-jsonrpc/LICENSE b/java/sca-contrib/modules/binding-jsonrpc/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/binding-jsonrpc/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-jsonrpc/META-INF/MANIFEST.MF
deleted file mode 100644
index 925adb7118..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.jsonrpc;uses:="org.apac

- he.tuscany.sca.assembly,org.apache.tuscany.sca.policy";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.binding.jsonrpc.impl;version="

- 1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA JSON-RPC Binding Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397309921

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA JSON-RPC Binding Model

-Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",org.apac

- he.tuscany.sca.assembly.xml;version="2.0.0",org.apache.tuscany.sca.bind

- ing.jsonrpc;version="2.0.0",org.apache.tuscany.sca.policy;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonrpc

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca-contrib/modules/binding-jsonrpc/NOTICE b/java/sca-contrib/modules/binding-jsonrpc/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/binding-jsonrpc/pom.xml b/java/sca-contrib/modules/binding-jsonrpc/pom.xml
deleted file mode 100644
index f3f41200a3..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc/pom.xml
+++ /dev/null
@@ -1,59 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-jsonrpc</artifactId>
-    <name>Apache Tuscany SCA JSON-RPC Binding Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
deleted file mode 100644
index 3eefe697ac..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.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.binding.jsonrpc;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-/**
- * A model for the JSONRPC binding.
- * 
- * @version $Rev$ $Date$
- */
-public interface JSONRPCBinding extends Binding {
-
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java b/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
deleted file mode 100644
index 707a9d7103..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
+++ /dev/null
@@ -1,35 +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.binding.jsonrpc;
-
-
-/**
- * Factory for the JSON RPC binding model.
- * 
- * @version $Rev$ $Date$
-*/
-public interface JSONRPCBindingFactory {
-
-    /**
-     * Creates a new JSON RPC Binding
-     * @return a new JSON RPC Binding
-     */
-    JSONRPCBinding createJSONRPCBinding();
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java b/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
deleted file mode 100644
index 625457a668..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
+++ /dev/null
@@ -1,38 +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.binding.jsonrpc.impl;
-
-import org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding;
-import org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory;
-
-
-/**
- * Factory for the JSON RPC binding model.
- * 
- * @version $Rev$ $Date$
-*/
-public class JSONRPCBindingFactoryImpl implements JSONRPCBindingFactory {
-
-    public JSONRPCBinding createJSONRPCBinding() {
-        return new JSONRPCBindingImpl();
-    }
-
-    
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java b/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
deleted file mode 100644
index b94a0015a7..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
+++ /dev/null
@@ -1,62 +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.binding.jsonrpc.impl;
-
-import org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding;
-
-/**
- * A model for the JSONRPC binding.
- *
- * @version $Rev$ $Date$
- */
-public class JSONRPCBindingImpl implements JSONRPCBinding {
-    private String name;
-    private String uri;
-
-    public String getName() {
-        return name;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public boolean isUnresolved() {
-        // The binding is always resolved
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // The binding is always resolved
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-}
diff --git a/java/sca-contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory b/java/sca-contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
deleted file mode 100644
index 8b9662997d..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for model factory

-org.apache.tuscany.sca.binding.jsonrpc.impl.JSONRPCBindingFactoryImpl

diff --git a/java/sca-contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 317e4940a4..0000000000
--- a/java/sca-contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the artifact processor extension

-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.jsonrpc,model=org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding,factory=org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory

diff --git a/java/sca-contrib/modules/binding-rest-runtime/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-rest-runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 41ae005380..0000000000
--- a/java/sca-contrib/modules/binding-rest-runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.rest.runtime;version="2.0.0";uses:="org.apache.tuscany.sca.assembly"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA REST Binding Runtime

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397320062

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA REST Binding Model

-Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.binding.jsonp.runtime;version="2.0.0",

- org.apache.tuscany.sca.binding.jsonp;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.rest.runtime

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6

diff --git a/java/sca-contrib/modules/binding-rest-runtime/pom.xml b/java/sca-contrib/modules/binding-rest-runtime/pom.xml
deleted file mode 100644
index 5fb8fb12e2..0000000000
--- a/java/sca-contrib/modules/binding-rest-runtime/pom.xml
+++ /dev/null
@@ -1,154 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-binding-rest-runtime</artifactId>

-    <name>Apache Tuscany SCA REST Binding Runtime</name>

-

-    <repositories>

-        <repository>

-            <id>maven2-repository.dev.java.net</id>

-            <name>Java.net Repository for Maven</name>

-            <url>http://download.java.net/maven/2/</url>

-            <layout>default</layout>

-        </repository> 

-        <repository>

-            <id>maven-repository.dev.java.net</id>

-            <name>Java.net Maven 1 Repository (legacy)</name>

-            <url>http://download.java.net/maven/1</url>

-            <layout>legacy</layout>

-        </repository>

-    </repositories>

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rest</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>com.sun.jersey</groupId>

-            <artifactId>jersey-bundle</artifactId>

-            <version>1.0.3</version>

-            <scope>compile</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-core-spi</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-core</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-databinding</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-http</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.5</version> <!-- was originally 2.4 -->  

-            <scope>provided</scope>

-        </dependency>

-        

-        <dependency>

-           <groupId>commons-logging</groupId>

-           <artifactId>commons-logging</artifactId>

-           <version>1.1.1</version>

-           <exclusions>

-               <exclusion>

-                   <groupId>commons-logging</groupId>

-                   <artifactId>commons-logging</artifactId>

-               </exclusion>

-               <exclusion>

-                   <groupId>javax.servlet</groupId>

-                   <artifactId>servlet-api</artifactId>

-               </exclusion>

-           </exclusions>

-        </dependency>          

-

-

-        <!-- Test Dependencies -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-	        <groupId>httpunit</groupId>

-	        <artifactId>httpunit</artifactId>

-	        <version>1.6.1</version>

-	        <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-

-    <build>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingForJersey.java b/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingForJersey.java
deleted file mode 100644
index c25a629829..0000000000
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingForJersey.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.apache.tuscany.sca.binding.rest;

-

-import java.lang.reflect.InvocationTargetException;

-import java.lang.reflect.Method;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.apache.tuscany.sca.assembly.Binding;

-import org.apache.tuscany.sca.binding.rest.provider.RESTServiceServlet;

-

-import org.apache.tuscany.sca.interfacedef.InterfaceContract;

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.runtime.RuntimeComponentService;

-import org.apache.tuscany.sca.runtime.RuntimeWire;

-

-import com.sun.jersey.tuscany.common.CommonInterface;

-

-public class RESTBindingForJersey implements CommonInterface{

-

-	/**

-	 * This map will save the mappings between the serviceInterface

-	 * and the HttpServlet instance which will be passed by RESTServiceServlet  

-	 *

-	 */

-	private static HashMap<String, RESTServiceServlet> interfacenameServletMap = new HashMap<String, RESTServiceServlet>();

-

-	/**

-	 * This is used to store the contextPath for the web application.

-	 * It will be set in RESTServiceServlet

-	 * It is currently being used by org.apache.tuscany.sca.implementation.java.invocation.JavaImplementationInvoker

-	 * 

-	 */

-	private static String contextPath;

-

-	/**

-	 * updateInterfacenameServletMap() is called from RESTServiceServlet.

-	 */

-	public static void updateInterfacenameServletMap(String interfaceName, RESTServiceServlet restServiceServlet){

-

-		//check if the class name already exists. if it does, do not add it.

-		Set set = interfacenameServletMap.entrySet();

-		Iterator hashIt = set.iterator();

-		boolean classFoundFlag = false;

-		while(hashIt.hasNext()){ 

-			Map.Entry me = (Map.Entry)hashIt.next();

-			if(interfaceName.equals( (String)me.getKey() )){

-				classFoundFlag = true;

-			}

-		}

-

-		//if it is not already in map, add it to the map

-		if(classFoundFlag == false){

-			interfacenameServletMap.put(interfaceName, restServiceServlet);

-		}

-

-	}

-

-	/**

-	 * @param clazz The class whose method has been invoked

-	 * @return restServiceServlet

-	 * Find the matching interface for the class in the hashMap and return the corresponding RESTServiceServlet instance

-	 */

-	public static RESTServiceServlet findRESTServiceServletFromClass(Class clazz){

-		RESTServiceServlet restServiceServlet = null;

-		Set set = interfacenameServletMap.entrySet();

-		Iterator hashIt = set.iterator();

-		while(hashIt.hasNext()){ 

-			Map.Entry me = (Map.Entry)hashIt.next();

-			if( (clazz.getSimpleName()).equals( (String)me.getKey() ) )

-			{

-				restServiceServlet = (RESTServiceServlet)me.getValue();

-				break;

-			}

-		}

-		return restServiceServlet;

-	}

-

-	/**

-	 * @param interfaceList This will contain the list of all the interfaces the class (which declares the method) implements

-	 * @return restServiceServlet

-	 * Go through the interfaceList array and find the matching interface in the hashMap and return the corresponding RESTServiceServlet instance

-	 */

-

-	public static RESTServiceServlet findRESTServiceServletFromInterfaceList(Class[] interfaceList){

-		RESTServiceServlet restServiceServlet = null;

-		Set set = interfacenameServletMap.entrySet();

-		Iterator hashIt = set.iterator();

-		//label the outer for loop so that when a match is found, just break out of the whole thing

-		outerForLoop:

-			for(int i=0; i<interfaceList.length; i++){

-				//if the name of the interface matches any key in the map, return the corresponding servlet

-				while(hashIt.hasNext()){ 

-					Map.Entry me = (Map.Entry)hashIt.next();

-					if( (interfaceList[i].getSimpleName()).equals( (String)me.getKey() ) )

-					{

-						restServiceServlet = (RESTServiceServlet)me.getValue();

-						break outerForLoop;

-					}

-				}

-			}

-		return restServiceServlet;

-	}

-

-

-	/**

-	 * Prateek: This class implements CommonInterface. 

-	 * com.sun.jersey.impl.model.method.dispatch.EntityParamDispatchProvider (in Jersey) 

-	 * also implements this CommonInterface.

-	 * EntityParamDispatchProvider invokes returnResult using a handle to the interface.

-	 */

-	public Object returnResult(Method meth, Object[] params) throws InvocationTargetException{

-		

-		//from the meth object, get the name of the class and then the interface

-		// look up interfacenameServletMap to get the HttpServlet instance and use the 

-		//'componentService, binding, serviceContract from there

-		Class clazz = meth.getDeclaringClass();

-

-		Class[] interfaceList = clazz.getInterfaces();

-		RESTServiceServlet restServiceServlet = findRESTServiceServletFromInterfaceList(interfaceList);

-

-		//if the SCA service interface is not a Java Interface but a Java class, then restServiceServlet above will be null

-		//In that case the map will have the mapping of the Java Class and the RESTServiceServlet instance. 

-		if(restServiceServlet == null){

-			restServiceServlet = findRESTServiceServletFromClass(clazz);

-		}

-

-		Binding binding = restServiceServlet.getBinding();

-		RuntimeComponentService componentService = restServiceServlet.getComponentService();

-		InterfaceContract serviceContract = restServiceServlet.getServiceContract();

-

-		String method = "Service." + meth.getName();

-

-		//invoke the request

-		RuntimeWire wire = componentService.getRuntimeWire(binding, serviceContract);

-		Operation restOperation = findOperation(method, serviceContract);

-

-		Object result = null;

-

-		try {

-			result = wire.invoke(restOperation, params);

-			return result;

-		} catch (InvocationTargetException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-			throw e;

-		}       

-	}

-

-	private static Operation findOperation(String method,InterfaceContract serviceContract) {

-		if (method.contains(".")) {

-			method = method.substring(method.lastIndexOf(".") + 1);

-		}

-

-		List<Operation> operations = serviceContract.getInterface().getOperations();

-		//componentService.getBindingProvider(binding).getBindingInterfaceContract().getInterface().getOperations();

-

-

-		Operation result = null;

-		for (Operation o : operations) {

-			if (o.getName().equalsIgnoreCase(method)) {

-				result = o;

-				break;

-			}

-		}

-

-		return result;

-	}

-

-	public static String getContextPath() {

-		return contextPath;

-	}

-

-	public static void setContextPath(String contextPath) {

-		RESTBindingForJersey.contextPath = contextPath;

-	}

-

-}

-

diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java b/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
deleted file mode 100644
index 9b3f78133d..0000000000
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.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.    

- */

-

-package org.apache.tuscany.sca.binding.rest.provider;

-

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.Invoker;

-import org.apache.tuscany.sca.invocation.Message;

-

-/**

- * Invoker for the REST Binding

- * 

- * @version $Rev: 665897 $ $Date: 2008-06-09 22:31:03 +0100 (Mon, 09 Jun 2008) $

- */

-public class RESTBindingInvoker implements Invoker {

-    Operation operation;

-    String uri;

-

-    public RESTBindingInvoker(Operation operation, String uri) {

-        this.operation = operation;

-        this.uri = uri;        

-    }

-    

-    public Message invoke(Message msg) {

-        // TODO Auto-generated method stub

-        return null;

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java b/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java
deleted file mode 100644
index cf6b51e5bf..0000000000
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java
+++ /dev/null
@@ -1,64 +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.binding.rest.provider;

-

-import org.apache.tuscany.sca.binding.rest.RESTBinding;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.apache.tuscany.sca.host.http.ServletHost;

-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;

-import org.apache.tuscany.sca.provider.BindingProviderFactory;

-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;

-import org.apache.tuscany.sca.provider.ServiceBindingProvider;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;

-import org.apache.tuscany.sca.runtime.RuntimeComponentService;

-

-/**

- * REST Provider Factory

- * 

- * @version $Rev: 665897 $ $Date: 2008-06-09 22:31:03 +0100 (Mon, 09 Jun 2008) $ 

- */

-public class RESTBindingProviderFactory implements BindingProviderFactory<RESTBinding> {

-

-    private ServletHost servletHost;

-    

-    public RESTBindingProviderFactory(ExtensionPointRegistry extensionPoints) {

-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);

-        this.servletHost = servletHosts.getServletHosts().get(0);

-    }

-    

-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,

-                                                                   RuntimeComponentReference reference,

-                                                                   RESTBinding binding) {

-        

-        return new RESTReferenceBindingProvider(component, reference, binding);

-    }

-

-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,

-                                                               RuntimeComponentService service,

-                                                               RESTBinding binding) {

-        return new RESTServiceBindingProvider(component, service, binding, servletHost);

-    }

-

-    public Class<RESTBinding> getModelType() {

-        return RESTBinding.class;

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTReferenceBindingProvider.java b/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTReferenceBindingProvider.java
deleted file mode 100644
index 0770934769..0000000000
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTReferenceBindingProvider.java
+++ /dev/null
@@ -1,70 +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.binding.rest.provider;

-

-import org.apache.tuscany.sca.binding.rest.RESTBinding;

-import org.apache.tuscany.sca.interfacedef.InterfaceContract;

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.Invoker;

-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;

-

-/**

- * Implementation of the REST Binding Provider for References

- * 

- * @version $Rev: 665897 $ $Date: 2008-06-09 22:31:03 +0100 (Mon, 09 Jun 2008) $

- */

-public class RESTReferenceBindingProvider implements ReferenceBindingProvider {

-

-    private RuntimeComponentReference reference;

-    private RESTBinding binding;

-    

-    public RESTReferenceBindingProvider(RuntimeComponent component,

-                                           RuntimeComponentReference reference,

-                                           RESTBinding binding) {

-           this.reference = reference;

-           this.binding = binding;

-        

-    }

-

-    public InterfaceContract getBindingInterfaceContract() {

-        return reference.getInterfaceContract();

-    }

-    

-    public Invoker createInvoker(Operation operation) {

-        return new RESTBindingInvoker(operation, binding.getURI());

-    }

-

-    public void start() {

-        // TODO Auto-generated method stub

-

-    }

-

-    public void stop() {

-        // TODO Auto-generated method stub

-

-    }

-

-    public boolean supportsOneWayInvocation() {

-        return false;

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java b/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java
deleted file mode 100644
index 67604832fc..0000000000
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java
+++ /dev/null
@@ -1,148 +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.binding.rest.provider;

-

-import java.net.URI;

-import java.util.ArrayList;

-import java.util.List;

-

-import org.apache.tuscany.sca.binding.rest.RESTBinding;

-import org.apache.tuscany.sca.host.http.ServletHost;

-import org.apache.tuscany.sca.interfacedef.Interface;

-import org.apache.tuscany.sca.interfacedef.InterfaceContract;

-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;

-import org.apache.tuscany.sca.provider.ServiceBindingProvider;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-import org.apache.tuscany.sca.runtime.RuntimeComponentService;

-

-/**

- * Implementation of the REST Binding Provider for Services

- * 

- * @version $Rev: 683451 $ $Date: 2008-08-07 00:59:24 +0100 (Thu, 07 Aug 2008) $

- */

-public class RESTServiceBindingProvider implements ServiceBindingProvider {

-    

-    

-        

-    

-    private RuntimeComponent component;

-    private RuntimeComponentService service;

-    private InterfaceContract serviceContract;

-    private RESTBinding binding;

-    private ServletHost servletHost;

-    private List<String> servletMappings = new ArrayList<String>();

-

-    public RESTServiceBindingProvider(RuntimeComponent component,

-                                         RuntimeComponentService service,

-                                         RESTBinding binding,

-                                         ServletHost servletHost) {

-    	this.component = component;

-        this.service = service;

-        this.binding = binding;

-        this.servletHost = servletHost;

-        

-        //clone the service contract to avoid databinding issues

-        try {

-            this.serviceContract = (InterfaceContract)service.getInterfaceContract().clone();

-        } catch(CloneNotSupportedException e) {

-            this.serviceContract = service.getInterfaceContract();

-        }

-

-    }

-

-    public InterfaceContract getBindingInterfaceContract() {

-        return service.getInterfaceContract();

-    }

-

-    public boolean supportsOneWayInvocation() {

-        return false;

-    }

-    

-    public void start() {

-

-        // Determine the service business interface

-        Class<?> serviceInterface = getTargetJavaClass(serviceContract.getInterface());

-

-        // Create a Java proxy to the target service

-        //ProxyFactory proxyFactory = new JDKProxyFactory();

-        Object proxy = component.getComponentContext().createSelfReference(serviceInterface, service).getService();

-        //Object proxy = proxyFactory.createProxy(serviceInterface, service.getRuntimeWire(binding));

-

-        // Create and register a servlet for this service

-        RESTServiceServlet serviceServlet =

-            new RESTServiceServlet(binding, service, serviceContract, serviceInterface, proxy);

-			

-		//Prateek: to add 'rest/' before the name of the service so that it could be added to url-pattern for the filter

-//		String tempURI = binding.getURI();

-//		binding.setURI("rest" + tempURI);

-		

-        String mapping = binding.getURI();

-        if (!mapping.endsWith("/")) {

-            mapping += "/";

-        }

-        if (!mapping.endsWith("*")) {

-        	mapping += "*";

-        }

-

-        servletHost.addServletMapping(mapping, serviceServlet);

-        servletMappings.add(mapping);

-        servletHost.addServletMapping(binding.getURI(), serviceServlet);

-        servletMappings.add(binding.getURI());

-        

-        //Prateek: add /rest for reverse-compatibility

-        servletHost.addServletMapping("/rest" + mapping, serviceServlet);

-        servletMappings.add("/rest" + mapping);

-        servletHost.addServletMapping("/rest" + binding.getURI(), serviceServlet);

-        servletMappings.add("/rest" + binding.getURI());

-        

-        // Save the actual binding URI

-        binding.setURI(servletHost.getURLMapping(binding.getURI()).toString());

-

-        // Register service to scaDomain.js

-        int port;

-        URI uri = URI.create(binding.getURI());

-        port = uri.getPort();

-        if (port == -1) {

-            port = servletHost.getDefaultPort();

-        }

-     }

-

-    public void stop() {

-

-        // Remove the servlet mappings we've added

-        for (String mapping: servletMappings) {

-            servletHost.removeServletMapping(mapping);

-            

-            //Prateek: for /rest

-            servletHost.removeServletMapping("/rest" + mapping);

-        }

-

-    }

-

-    private Class<?> getTargetJavaClass(Interface targetInterface) {

-        // TODO: right now assume that the target is always a Java

-        // Implementation. Need to figure out how to generate Java

-        // Interface in cases where the target is not a Java Implementation

-        return ((JavaInterface)targetInterface).getJavaClass();

-    }

-    

-

-

-}

diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceServlet.java b/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceServlet.java
deleted file mode 100644
index 6a73f55649..0000000000
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceServlet.java
+++ /dev/null
@@ -1,138 +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.binding.rest.provider;

-

-import java.io.IOException;

-

-import javax.servlet.ServletConfig;

-import javax.servlet.ServletContext;

-import javax.servlet.ServletException;

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

-import javax.servlet.http.HttpServlet;

-

-import org.apache.tuscany.sca.assembly.Binding;

-import org.apache.tuscany.sca.binding.rest.RESTBindingForJersey;

-import org.apache.tuscany.sca.host.webapp.WebAppServletHost;

-import org.apache.tuscany.sca.interfacedef.InterfaceContract;

-import org.apache.tuscany.sca.runtime.RuntimeComponentService;

-

-

-import com.sun.jersey.impl.container.servlet.ServletAdaptor;

-

-import com.sun.jersey.tuscany.common.CommonDataStructures;

-import com.sun.jersey.tuscany.common.CommonInterface;

-/**

- * Servlet that handles REST requests invoking SCA services.

- * 

- * There is an instance of this Servlet for each <binding.rest>

- */

-public class RESTServiceServlet extends HttpServlet {

-    private static final long serialVersionUID = 1L;

-

-    transient Binding binding;

-    transient String serviceName;

-    transient Object serviceInstance;

-    transient RuntimeComponentService componentService;

-    transient InterfaceContract serviceContract;

-    transient Class<?> serviceInterface;

-    

-	private ServletConfig servletConfig;

-	private ServletContext servletContext;

-    

-    private static ServletAdaptor jerseyServletContainer;

-

-    public RESTServiceServlet(Binding binding,

-                                 RuntimeComponentService componentService,

-                                 InterfaceContract serviceContract,

-                                 Class<?> serviceInterface,

-                                 Object serviceInstance) {

-        this.binding = binding;

-        this.serviceName = binding.getName();

-        this.componentService = componentService;

-        this.serviceContract = serviceContract;

-        this.serviceInterface = serviceInterface;

-        this.serviceInstance = serviceInstance;

-        

-        //The interface name will be stored in a HashMap in the RESTBindingForJersey class along with a

-		//reference to this servlet

-        RESTBindingForJersey.updateInterfacenameServletMap(serviceInterface.getSimpleName(), this);

-        

-    }

-

-   

-    /* (non-Javadoc)

-     * @see javax.servlet.GenericServlet#init(javax.servlet.ServletConfig)

-     */

-    @Override

-    public void init(ServletConfig config) {

-    	try{

-			

-			servletConfig = config;	        

-	        servletContext = servletConfig.getServletContext();

-	        String contextPath = servletContext.getContextPath();

-			RESTBindingForJersey.setContextPath(contextPath);

-			

-			//The following code has been moved to the host-webapp modlue. 

-			//(org.apache.tuscany.sca.host.webapp.WebAppServletHost)

-			

-			//jerseyServletContainer.init(config);

-			

-			//Setting the reference below in CommonDataStructures for

-			//com.sun.jersey.impl.model.method.dispatch.EntityParamDispatchProvider

-			//to be able to invoke the method returnResult() method.

-			CommonInterface commonInterface = new RESTBindingForJersey();

-			CommonDataStructures.setCommonInterface(commonInterface);

-			

-		}catch(Exception e){

-			e.printStackTrace(System.out);

-		}

-    }

-

-    @Override

-    public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {

-    	try{

-    		jerseyServletContainer = WebAppServletHost.getJerseyServletContainer();

-			jerseyServletContainer.service(request, response);			

-		}catch(ServletException e){

-			e.printStackTrace(System.out);

-		}

-    }

-    

-	public Binding getBinding() {

-		return binding;

-	}

-

-

-	public RuntimeComponentService getComponentService() {

-		return componentService;

-	}

-

-

-	public InterfaceContract getServiceContract() {

-		return serviceContract;

-	}

-

-

-	public static void setJerseyServletContainer(

-			ServletAdaptor jerseyServletContainer) {

-		RESTServiceServlet.jerseyServletContainer = jerseyServletContainer;

-	}

-    

-}

diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca-contrib/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 4a682c1cb6..0000000000
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.rest.provider.RESTBindingProviderFactory;model=org.apache.tuscany.sca.binding.rest.RESTBinding

diff --git a/java/sca-contrib/modules/binding-rest/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-rest/META-INF/MANIFEST.MF
deleted file mode 100644
index bd8e7e4972..0000000000
--- a/java/sca-contrib/modules/binding-rest/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.rest;version="2.0.0";uses:="org.apache.tuscany.sca.assembly"

-Private-Package: org.apache.tuscany.sca.binding.rest.impl;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA REST Binding Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397320062

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA REST Binding Model

-Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.binding.jsonp;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.rest

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6

diff --git a/java/sca-contrib/modules/binding-rest/pom.xml b/java/sca-contrib/modules/binding-rest/pom.xml
deleted file mode 100644
index 26ddb173d2..0000000000
--- a/java/sca-contrib/modules/binding-rest/pom.xml
+++ /dev/null
@@ -1,62 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-binding-rest</artifactId>

-    <name>Apache Tuscany SCA REST Binding Model</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-assembly</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-policy</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface-java</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java b/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java
deleted file mode 100644
index 6a3df42cc0..0000000000
--- a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.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.binding.rest;

-

-import org.apache.tuscany.sca.assembly.Binding;

-

-/**

- * A model for the REST binding.

- * 

- * @version $Rev: 705760 $ $Date: 2008-10-17 22:29:28 +0100 (Fri, 17 Oct 2008) $

- */

-public interface RESTBinding extends Binding {

-

-}

diff --git a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java b/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java
deleted file mode 100644
index 0db1c827a1..0000000000
--- a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java
+++ /dev/null
@@ -1,35 +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.binding.rest;

-

-

-/**

- * Factory for the REST binding model.

- * 

- * @version $Rev: 705760 $ $Date: 2008-10-17 22:29:28 +0100 (Fri, 17 Oct 2008) $

-*/

-public interface RESTBindingFactory {

-

-    /**

-     * Creates a new REST Binding

-     * @return a new REST Binding

-     */

-    RESTBinding createRESTBinding();

-}

diff --git a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java b/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java
deleted file mode 100644
index 3e68bc1cbd..0000000000
--- a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java
+++ /dev/null
@@ -1,38 +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.binding.rest.impl;

-

-import org.apache.tuscany.sca.binding.rest.RESTBinding;

-import org.apache.tuscany.sca.binding.rest.RESTBindingFactory;

-

-

-/**

- * Factory for the REST binding model.

- * 

- * @version $Rev: 705760 $ $Date: 2008-10-17 22:29:28 +0100 (Fri, 17 Oct 2008) $

-*/

-public class RESTBindingFactoryImpl implements RESTBindingFactory {

-

-    public RESTBinding createRESTBinding() {

-        return new RESTBindingImpl();

-    }

-

-    

-}

diff --git a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java b/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java
deleted file mode 100644
index f7903c3842..0000000000
--- a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java
+++ /dev/null
@@ -1,62 +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.binding.rest.impl;

-

-import org.apache.tuscany.sca.binding.rest.RESTBinding;

-

-/**

- * A model for the REST binding.

- *

- * @version $Rev: 705760 $ $Date: 2008-10-17 22:29:28 +0100 (Fri, 17 Oct 2008) $

- */

-public class RESTBindingImpl implements RESTBinding {

-    private String name;

-    private String uri;

-

-    public String getName() {

-        return name;

-    }

-

-    public String getURI() {

-        return uri;

-    }

-

-    public void setURI(String uri) {

-        this.uri = uri;

-    }

-

-    public void setName(String name) {

-        this.name = name;

-    }

-

-    public boolean isUnresolved() {

-        // The binding is always resolved

-        return false;

-    }

-

-    public void setUnresolved(boolean unresolved) {

-        // The binding is always resolved

-    }

-

-    @Override

-    public Object clone() throws CloneNotSupportedException {

-        return super.clone();

-    }

-}

diff --git a/java/sca-contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.RESTBindingFactory b/java/sca-contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.RESTBindingFactory
deleted file mode 100644
index 8b3c1c1420..0000000000
--- a/java/sca-contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.RESTBindingFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for model factory

-org.apache.tuscany.sca.binding.rest.impl.RESTBindingFactoryImpl

diff --git a/java/sca-contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 1a922c4621..0000000000
--- a/java/sca-contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the artifact processor extension

-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.rest,model=org.apache.tuscany.sca.binding.rest.RESTBinding,factory=org.apache.tuscany.sca.binding.rest.RESTBindingFactory

diff --git a/java/sca-contrib/modules/binding-rss-rome/LICENSE b/java/sca-contrib/modules/binding-rss-rome/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/binding-rss-rome/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-rss-rome/META-INF/MANIFEST.MF
deleted file mode 100644
index 95f62ad91d..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,39 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.binding.rss.collection;version

- ="1.4",org.apache.tuscany.sca.binding.rss.provider;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA RSS Feed Binding Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397329562

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA RSS Feed Binding Extension

-Import-Package: com.sun.syndication.feed.atom,

- com.sun.syndication.feed.synd,

- com.sun.syndication.io,

- javax.servlet,

- javax.servlet.http,

- javax.xml.namespace,

- org.apache.commons.codec.binary,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.binding.rss;version="2.0.0",

- org.apache.tuscany.sca.binding.rss.collection;resolution:=optional,

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.data.collection;version="2.0.0",

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.host.http;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.jdom;version="1.0.0",

- org.oasisopen.sca.annotation;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.rss.rome

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-rss-rome/NOTICE b/java/sca-contrib/modules/binding-rss-rome/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/binding-rss-rome/pom.xml b/java/sca-contrib/modules/binding-rss-rome/pom.xml
deleted file mode 100644
index f46851dbec..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/pom.xml
+++ /dev/null
@@ -1,151 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-rss-rome</artifactId>
-    <name>Apache Tuscany SCA RSS Feed Binding Extension</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-           <groupId>commons-httpclient</groupId>
-           <artifactId>commons-httpclient</artifactId>
-           <version>3.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>rome</groupId>
-            <artifactId>rome</artifactId>
-            <version>0.9</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version> 
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-           <groupId>commons-codec</groupId>
-           <artifactId>commons-codec</artifactId>
-           <version>1.3</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>commons-codec</groupId>
-                   <artifactId>commons-codec</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>
-
-        <dependency>
-           <groupId>commons-logging</groupId>
-           <artifactId>commons-logging</artifactId>
-           <version>1.1.1</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>avalon-framework</groupId>
-                   <artifactId>avalon-framework</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>          
-                
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java b/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
deleted file mode 100644
index 1124348158..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.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 org.apache.tuscany.sca.binding.rss.collection;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-import com.sun.syndication.feed.synd.SyndFeed;
-
-
-/**
- * Provides access to a collection of resources using RSS.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface Collection {
-
-    /**
-     * Get an RSS feed for a collection of resources.
-     * 
-     * @return the RSS feed
-     */
-    SyndFeed getFeed();
-
-    /**
-     * Get an RSS feed for a collection of resources resulting from a query.
-     * 
-     * @param queryString the query string
-     * @return the RSS feed
-     */
-    SyndFeed query(String queryString);
-
-}
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java b/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
deleted file mode 100644
index a2b83465da..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.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 org.apache.tuscany.sca.binding.rss.collection;
-
-import java.io.InputStream;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-import com.sun.syndication.feed.atom.Entry;
-
-/**
- * Provides access to a collection of resources using Atom.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface MediaCollection extends Collection {
-
-    /**
-     * Creates a new media entry
-     * 
-     * @param title
-     * @param slug
-     * @param contentType
-     * @param media
-     */
-    Entry postMedia(String title, String slug, String contentType, InputStream media);
-
-    /**
-     * Update a media entry.
-     * 
-     * @param id
-     * @param contentType
-     * @param media
-     * @return
-     */
-    void putMedia(String id, String contentType, InputStream media) throws NotFoundException;
-
-}
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java b/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
deleted file mode 100644
index 0912878938..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.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.    
- */
-
-package org.apache.tuscany.sca.binding.rss.collection;
-
-/**
- * Indicates that a resource could not be found.
- * 
- * @version $Rev$ $Date$
- */
-public class NotFoundException extends Exception {
-    private static final long serialVersionUID = -5046027674128627383L;
-
-    public NotFoundException() {
-    }
-
-    public NotFoundException(String message) {
-        super(message);
-    }
-
-    public NotFoundException(Throwable cause) {
-        super(cause);
-    }
-
-    public NotFoundException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java b/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
deleted file mode 100644
index e3a177198c..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.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.binding.rss.provider;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.XmlReader;
-
-/**
- * Invoker for the RSS binding.
- *
- * @version $Rev$ $Date$
- */
-class RSSBindingInvoker implements Invoker , DataExchangeSemantics {
-    private static final Logger logger = Logger.getLogger(RSSBindingInvoker.class.getName());
-    
-    private String uri;
-
-    RSSBindingInvoker(String uri, String feedType) {
-        this.uri = uri;
-    }
-
-    public Message invoke(Message msg) {
-        try {
-            logger.fine("invoke " + uri);
-
-            // Read an RSS feed into a Synd feed
-            SyndFeedInput input = new SyndFeedInput();
-            SyndFeed feed = input.build(new XmlReader(new URL(uri)));
-            
-            //FIXME Support conversion to data-api entries
-            
-            msg.setBody(feed);
-
-        } catch (MalformedURLException e) {
-            msg.setFaultBody(e);
-        } catch (IllegalArgumentException e) {
-            msg.setFaultBody(e);
-        } catch (FeedException e) {
-            msg.setFaultBody(e);
-        } catch (IOException e) {
-            msg.setFaultBody(e);
-        }
-        return msg;
-    }
-
-    public boolean allowsPassByReference() {
-        return true;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java b/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
deleted file mode 100644
index 7eb5aeb3df..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
+++ /dev/null
@@ -1,394 +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.binding.rss.provider;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.logging.Logger;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-import com.sun.syndication.feed.synd.SyndContent;
-import com.sun.syndication.feed.synd.SyndContentImpl;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndEntryImpl;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
-import com.sun.syndication.feed.synd.SyndLink;
-import com.sun.syndication.feed.synd.SyndLinkImpl;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.SyndFeedOutput;
-
-/**
- * An RSS binding listener, implemented as a Servlet and
- * registered in a Servlet host provided by the SCA hosting runtime.
- *
- * @version $Rev$ $Date$
- */
-class RSSBindingListenerServlet extends HttpServlet {
-    private static final Logger logger = Logger.getLogger(RSSBindingListenerServlet.class.getName());
-    private static final long serialVersionUID = 1L;
-
-    private RuntimeWire wire;
-    private Invoker getFeedInvoker;
-    private Invoker getAllInvoker;
-    private Invoker queryInvoker;
-    private MessageFactory messageFactory;
-    private Mediator mediator;
-    private DataType<?> itemClassType;
-    private DataType<?> itemXMLType;
-    private boolean supportsFeedEntries;
-
-    /**
-     * Constructs a new binding listener.
-     * 
-     * @param wire
-     * @param messageFactory
-     */
-    RSSBindingListenerServlet(RuntimeWire wire, MessageFactory messageFactory, Mediator mediator) {
-        this.wire = wire;
-        this.messageFactory = messageFactory;
-        this.mediator = mediator;
-
-        // Get the invokers for the supported operations
-        Operation getOperation = null;
-        for (InvocationChain invocationChain : this.wire.getInvocationChains()) {
-            invocationChain.setAllowsPassByReference(true);
-            Operation operation = invocationChain.getTargetOperation();
-            String operationName = operation.getName();
-            if (operationName.equals("getFeed")) {
-                getFeedInvoker = invocationChain.getHeadInvoker();
-            } else if (operationName.equals("getAll")) {
-                getAllInvoker = invocationChain.getHeadInvoker();
-            } else if (operationName.equals("query")) {
-                queryInvoker = invocationChain.getHeadInvoker();
-            } else if (operationName.equals("get")) {
-                getOperation = operation;
-            }
-        }
-
-        // Determine the collection item type
-        itemXMLType = new DataTypeImpl<Class<?>>(String.class.getName(), String.class, String.class);
-        Class<?> itemClass = getOperation.getOutputType().getPhysical();
-        if (itemClass == SyndEntry.class) {
-            supportsFeedEntries = true;
-        }
-        DataType<XMLType> outputType = getOperation.getOutputType();
-        QName qname = outputType.getLogical().getElementName();
-        qname = new QName(qname.getNamespaceURI(), itemClass.getSimpleName());
-        itemClassType = new DataTypeImpl<XMLType>("java:complexType", itemClass, new XMLType(qname, null));
-        
-    }
-
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-        // No authentication required for a get request
-
-        // Get the request path
-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-
-        logger.fine("get " + request.getRequestURI());
-
-        // Handle an RSS request
-        if (path == null || path.length() == 0 || path.equals("/")) {
-
-            // Return an RSS feed containing the entries in the collection
-            SyndFeed feed = null;
-            if (supportsFeedEntries) {
-
-                // The service implementation supports feed entries, invoke its getFeed operation
-                Message requestMessage = messageFactory.createMessage();
-                Message responseMessage = getFeedInvoker.invoke(requestMessage);
-                if (responseMessage.isFault()) {
-                    throw new ServletException((Throwable)responseMessage.getBody());
-                }
-                feed = (SyndFeed)responseMessage.getBody();
-                
-            } else {
-
-                // The service implementation does not support feed entries, invoke its
-                // getAll operation to get the data item collection. then create feed entries
-                // from the data items
-                Message requestMessage = messageFactory.createMessage();
-                Message responseMessage;
-                if (request.getQueryString() != null) {
-                    requestMessage.setBody(new Object[] {request.getQueryString()});
-                    responseMessage = queryInvoker.invoke(requestMessage);
-                } else {
-                    responseMessage = getAllInvoker.invoke(requestMessage);
-                }
-                if (responseMessage.isFault()) {
-                    throw new ServletException((Throwable)responseMessage.getBody());
-                }
-                org.apache.tuscany.sca.data.collection.Entry<Object, Object>[] collection =
-                    (org.apache.tuscany.sca.data.collection.Entry<Object, Object>[])responseMessage.getBody();
-                if (collection != null) {
-                    // Create the feed
-                    feed = new SyndFeedImpl();
-                    feed.setTitle("Feed");
-                    
-                    for (org.apache.tuscany.sca.data.collection.Entry<Object, Object> entry: collection) {
-                        SyndEntry feedEntry = createFeedEntry(entry);
-                        feed.getEntries().add(feedEntry);
-                    }
-                }
-            }
-
-            // Convert to an RSS feed
-            if (feed != null) {
-                response.setContentType("application/rss+xml; charset=utf-8");
-                feed.setFeedType("rss_2.0");
-                feed.setLink(path);
-                SyndFeedOutput syndOutput = new SyndFeedOutput();
-                try {
-                    syndOutput.output(feed, getWriter(response));
-                } catch (FeedException e) {
-                    throw new ServletException(e);
-                }
-            } else {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND);
-            }
-        } else {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND);
-        }
-
-    }
-
-    /**
-     * Create an Atom entry from a data collection entry.
-     * @param entry 
-     * @return
-     */
-    private SyndEntry createFeedEntry(org.apache.tuscany.sca.data.collection.Entry<Object, Object> entry) {
-        Object key = entry.getKey();
-        Object data = entry.getData();
-        if (data instanceof Item) {
-            Item item = (Item)data;
-            
-            SyndEntry feedEntry = new SyndEntryImpl();
-            feedEntry.setUri(key.toString());
-            feedEntry.setTitle(item.getTitle());
-    
-            String value = item.getContents();
-            if (value != null) {
-                SyndContent content = new SyndContentImpl();
-                content.setType("text/xml");
-                content.setValue(value);
-                List<SyndContent> contents = new ArrayList<SyndContent>();
-                contents.add(content);
-                feedEntry.setContents(contents);
-            }
-    
-            String href = item.getLink();
-            if (href == null) {
-                href = key.toString();
-            }
-            SyndLink link = new SyndLinkImpl();
-            link.setRel("edit");
-            link.setHref(href);
-            feedEntry.getLinks().add(link);
-            link = new SyndLinkImpl();
-            link.setRel("alternate");
-            link.setHref(href);
-            feedEntry.getLinks().add(link);
-    
-            Date date = item.getDate();
-            if (date == null) {
-                date = new Date();
-            }
-            feedEntry.setPublishedDate(date);
-            return feedEntry;
-            
-        } else if (data != null) {
-            SyndEntry feedEntry = new SyndEntryImpl();
-            feedEntry.setUri(key.toString());
-            feedEntry.setTitle("item");
-    
-            // Convert the item to XML
-            String value = mediator.mediate(data, itemClassType, itemXMLType, null).toString();
-            
-            SyndContent content = new SyndContentImpl();
-            content.setType("text/xml");
-            content.setValue(value);
-            List<SyndContent> contents = new ArrayList<SyndContent>();
-            contents.add(content);
-            feedEntry.setContents(contents);
-    
-            SyndLink link = new SyndLinkImpl();
-            link.setRel("edit");
-            link.setHref(key.toString());
-            feedEntry.getLinks().add(link);
-            link = new SyndLinkImpl();
-            link.setRel("alternate");
-            link.setHref(key.toString());
-            feedEntry.getLinks().add(link);
-    
-            feedEntry.setPublishedDate(new Date());
-            return feedEntry;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Create a data collection entry from an RSS entry.
-     * @param feedEntry
-     * @return
-     */
-    private org.apache.tuscany.sca.data.collection.Entry<Object, Object> createEntry(SyndEntry feedEntry) {
-        if (feedEntry != null) {
-            if (itemClassType.getPhysical() == Item.class) {
-                String key = feedEntry.getUri();
-                
-                Item item = new Item();
-                item.setTitle(feedEntry.getTitle());
-                
-                List<?> contents = feedEntry.getContents();
-                if (!contents.isEmpty()) {
-                    SyndContent content = (SyndContent)contents.get(0);
-                    String value = content.getValue();
-                    item.setContents(value);
-                }
-                
-                for (Object l : feedEntry.getLinks()) {
-                    SyndLink link = (SyndLink)l;
-                    if (link.getRel() == null || "edit".equals(link.getRel())) {
-                        String href = link.getHref();
-                        if (href.startsWith("null/")) {
-                            href = href.substring(5);
-                        }
-                        item.setLink(href);
-                        break;
-                    }
-                }
-                
-                item.setDate(feedEntry.getPublishedDate());
-                
-                return new org.apache.tuscany.sca.data.collection.Entry<Object, Object>(key, item);
-                
-            } else {
-                String key = feedEntry.getUri();
-                
-                // Create the item from XML
-                List<?> contents = feedEntry.getContents();
-                if (contents.isEmpty()) {
-                    return null;
-                }
-                SyndContent content = (SyndContent)contents.get(0);
-                String value = content.getValue();
-                Object data = mediator.mediate(value, itemXMLType, itemClassType, null);
-
-                return new org.apache.tuscany.sca.data.collection.Entry<Object, Object>(key, data);
-            }
-        } else {
-            return null;
-        }
-    }
-
-
-    private Writer getWriter(HttpServletResponse response) throws UnsupportedEncodingException, IOException {
-        Writer writer = new OutputStreamWriter(response.getOutputStream(), "UTF-8");
-        return writer;
-    }
-
-    /**
-     * Process the authorization header
-     * 
-     * @param request
-     * @return
-     * @throws ServletException
-     */
-    private String processAuthorizationHeader(HttpServletRequest request) throws ServletException {
-        try {
-            String authorization = request.getHeader("Authorization");
-            if (authorization != null) {
-                StringTokenizer tokens = new StringTokenizer(authorization);
-                if (tokens.hasMoreTokens()) {
-                    String basic = tokens.nextToken();
-                    if (basic.equalsIgnoreCase("Basic")) {
-                        String credentials = tokens.nextToken();
-                        String userAndPassword = new String(Base64.decodeBase64(credentials.getBytes()));
-                        int colon = userAndPassword.indexOf(":");
-                        if (colon != -1) {
-                            String user = userAndPassword.substring(0, colon);
-                            String password = userAndPassword.substring(colon + 1);
-
-                            // Authenticate the User.
-                            if (authenticate(user, password)) {
-                                return user;
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new ServletException(e);
-        }
-        return null;
-    }
-
-    /**
-     * Authenticate a user.
-     * 
-     * @param user
-     * @param password
-     * @return
-     */
-    private boolean authenticate(String user, String password) {
-
-        // TODO Handle this using SCA security policies
-        //FIXME Why are we using endsWith instead of equals here??
-        return ("admin".endsWith(user) && "admin".equals(password));
-    }
-
-    /**
-     * Reject an unauthorized request.
-     * 
-     * @param response
-     */
-    private void unauthorized(HttpServletResponse response) throws IOException {
-        response.setHeader("WWW-Authenticate", "BASIC realm=\"Tuscany\"");
-        response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
-    }
-}
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java b/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
deleted file mode 100644
index 216d8f3abe..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
+++ /dev/null
@@ -1,74 +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.binding.rss.provider;
-
-import org.apache.tuscany.sca.binding.rss.RSSBinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Implementation of the RSS binding provider factory.
- *
- * @version $Rev$ $Date$
- */
-public class RSSBindingProviderFactory implements BindingProviderFactory<RSSBinding> {
-
-    private MessageFactory messageFactory;
-    private Mediator mediator;
-    private ServletHost servletHost;
-
-    public RSSBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        this.servletHost = servletHosts.getServletHosts().get(0);
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        this.messageFactory = modelFactories.getFactory(MessageFactory.class);
-        this.mediator = new MediatorImpl(extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class),
-                                         extensionPoints.getExtensionPoint(TransformerExtensionPoint.class));
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   RSSBinding binding) {
-        return new RSSReferenceBindingProvider(component, reference, binding);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               RSSBinding binding) {
-        return new RSSServiceBindingProvider(component, service, binding, servletHost, messageFactory, mediator);
-    }
-
-    public Class<RSSBinding> getModelType() {
-        return RSSBinding.class;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java b/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
deleted file mode 100644
index 8a30e9d3fb..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
+++ /dev/null
@@ -1,65 +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.binding.rss.provider;
-
-import org.apache.tuscany.sca.binding.rss.RSSBinding;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * Implementation of the RSS binding provider.
- *
- * @version $Rev$ $Date$
- */
-class RSSReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private RuntimeComponentReference reference;
-    private RSSBinding binding;
-
-    RSSReferenceBindingProvider(RuntimeComponent component,
-                                       RuntimeComponentReference reference,
-                                       RSSBinding binding) {
-        this.reference = reference;
-        this.binding = binding;
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        return new RSSBindingInvoker(binding.getURI(), "rss_2.0");
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return reference.getInterfaceContract();
-    }
-    
-    public void start() {
-    }
-
-    public void stop() {
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java b/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
deleted file mode 100644
index 4e5429ac83..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
+++ /dev/null
@@ -1,85 +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.binding.rss.provider;
-
-import org.apache.tuscany.sca.binding.rss.RSSBinding;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Implementation of the RSS binding provider.
- *
- * @version $Rev$ $Date$
- */
-class RSSServiceBindingProvider implements ServiceBindingProvider {
-
-    private RuntimeComponentService service;
-    private RSSBinding binding;
-    private ServletHost servletHost;
-    private MessageFactory messageFactory;
-    private String servletMapping;
-    private Mediator mediator;
-
-    RSSServiceBindingProvider(RuntimeComponent component,
-                                     RuntimeComponentService service,
-                                     RSSBinding binding,
-                                     ServletHost servletHost,
-                                     MessageFactory messageFactory,
-                                     Mediator mediator) {
-        this.service = service;
-        this.binding = binding;
-        this.servletHost = servletHost;
-        this.messageFactory = messageFactory;
-        this.mediator = mediator;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return service.getInterfaceContract();
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-        RuntimeComponentService componentService = (RuntimeComponentService)service;
-        RuntimeWire wire = componentService.getRuntimeWire(binding);
-
-        RSSBindingListenerServlet servlet =
-            new RSSBindingListenerServlet(wire, messageFactory, mediator);
-
-        servletMapping = binding.getURI();
-        servletHost.addServletMapping(servletMapping, servlet);
-        
-        // Save the actual binding URI in the binding
-        binding.setURI(servletHost.getURLMapping(binding.getURI()).toString());
-    }
-
-    public void stop() {
-        servletHost.removeServletMapping(servletMapping);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca-contrib/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index e60dc2855a..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.rss.provider.RSSBindingProviderFactory;model=org.apache.tuscany.sca.binding.rss.RSSBinding

diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java b/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
deleted file mode 100644
index 489631ae3b..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
+++ /dev/null
@@ -1,41 +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.binding.rss;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-public class Consumer {
-
-    public static void main(String[] args) throws Exception {
-
-        String contribution = ContributionLocationHelper.getContributionLocation(Consumer.class);
-        Node node = NodeFactory.newInstance().createNode("org/apache/tuscany/sca/binding/feed/Consumer.composite", new Contribution("test", contribution));
-        node.start();
-
-        CustomerClient testService = node.getService(CustomerClient.class, "CustomerClient");
-        testService.testCustomerCollection();
-
-        node.stop();
-        node.destroy();
-    }
-}
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java b/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
deleted file mode 100644
index af87155f45..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
+++ /dev/null
@@ -1,25 +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.binding.rss;
-
-public interface CustomerClient {
-
-    void testCustomerCollection() throws Exception;
-}
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java b/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
deleted file mode 100644
index a80f721136..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.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.    
- */
-
-package org.apache.tuscany.sca.binding.rss;
-
-import org.apache.tuscany.sca.binding.rss.collection.Collection;
-import org.oasisopen.sca.annotation.Reference;
-
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-
-
-public class CustomerClientImpl implements CustomerClient {
-
-    @Reference
-    public Collection resourceCollection;
-
-    public void testCustomerCollection() throws Exception {
-
-        System.out.println(">>> get collection");
-        SyndFeed feed = resourceCollection.getFeed();
-        System.out.println("<<< get collection");
-        for (Object o : feed.getEntries()) {
-            SyndEntry e = (SyndEntry)o;
-            System.out.println("id = " + e.getUri() + " entry = " + e.getTitle());
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java b/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
deleted file mode 100644
index 505a9cdee3..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
+++ /dev/null
@@ -1,103 +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.binding.rss;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.tuscany.sca.binding.rss.collection.Collection;
-import org.oasisopen.sca.annotation.Scope;
-
-import com.sun.syndication.feed.atom.Content;
-import com.sun.syndication.feed.synd.SyndContent;
-import com.sun.syndication.feed.synd.SyndContentImpl;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndEntryImpl;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
-import com.sun.syndication.feed.synd.SyndLink;
-import com.sun.syndication.feed.synd.SyndLinkImpl;
-
-@Scope("COMPOSITE")
-public class CustomerCollectionImpl implements Collection {
-
-    private Map<String, SyndEntry> entries = new HashMap<String, SyndEntry>();
-
-    public CustomerCollectionImpl() {
-
-        for (int i = 0; i < 4; i++) {
-            String id = "urn:uuid:customer-" + UUID.randomUUID().toString();
-
-            SyndEntry entry = new SyndEntryImpl();
-            entry.setTitle("customer " + "Jane Doe_" + String.valueOf(i));
-            entry.setUri(id);
-
-            SyndContent content = new SyndContentImpl();
-            content.setValue("Jane Doe_" + String.valueOf(i));
-            content.setType(Content.TEXT);
-            entry.setContents(Collections.singletonList(content));
-
-            List<SyndLink> links = new ArrayList<SyndLink>();
-            SyndLink link = new SyndLinkImpl();
-            link.setRel("edit");
-            link.setHref("" + id);
-            links.add(link);
-            entry.setLinks(links);
-
-            links = new ArrayList<SyndLink>();
-            link = new SyndLinkImpl();
-            link.setRel("alternate");
-            link.setHref("" + id);
-            links.add(link);
-            entry.setLinks(links);
-
-            entry.setPublishedDate(new Date());
-
-            entries.put(id, entry);
-            System.out.println(">>> id=" + id);
-        }
-    }
-
-    public SyndFeed getFeed() {
-        System.out.println(">>> CustomerCollectionImpl.getFeed");
-
-        SyndFeed feed = new SyndFeedImpl();
-        feed.setTitle("customers");
-        feed.setDescription("This is a sample feed");
-        feed.getEntries().addAll(entries.values());
-        return feed;
-    }
-
-    public SyndFeed query(String queryString) {
-        System.out.println(">>> CustomerCollectionImpl.query");
-
-        SyndFeed feed = new SyndFeedImpl();
-        feed.setTitle("customers");
-        feed.setDescription("This is a sample feed");
-        feed.getEntries().addAll(entries.values());
-        return feed;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java b/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
deleted file mode 100644
index 42d64ef957..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
+++ /dev/null
@@ -1,47 +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.binding.rss;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-public class Provider {
-
-    public static void main(String[] args) {
-
-        String contribution = ContributionLocationHelper.getContributionLocation(Consumer.class);
-        Node node = NodeFactory.newInstance().createNode("org/apache/tuscany/sca/binding/feed/Provider.composite", new Contribution("test", contribution));
-        node.start();
-        System.out.println("Provider.composite ready...");
-
-        try {
-            System.in.read();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        node.stop();
-        node.destroy();
-    }
-}
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite b/java/sca-contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
deleted file mode 100644
index 43cd5e00b9..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
+++ /dev/null
@@ -1,32 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	   targetNamespace="http://customer"
-	   name="Consumer">
-    
-    <component name="CustomerClient">
-        <implementation.java class="org.apache.tuscany.sca.binding.feed.CustomerClientImpl"/>
-        <reference name="resourceCollection">
-        	<tuscany:binding.rss uri="http://localhost:8084/customer"/>
-        </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite b/java/sca-contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
deleted file mode 100644
index 5ffcb50eb8..0000000000
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	   targetNamespace = "http://customer"
-	   name="Provider">

-

-	<service name="customer" promote="CustomerCollection">

-		<tuscany:binding.rss uri = "http://localhost:8084/customer"/>

-	</service>

-	

-    <component name="CustomerCollection">

-        <implementation.java class="org.apache.tuscany.sca.binding.feed.CustomerCollectionImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/binding-rss/LICENSE b/java/sca-contrib/modules/binding-rss/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/binding-rss/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/binding-rss/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-rss/META-INF/MANIFEST.MF
deleted file mode 100644
index 51294d796d..0000000000
--- a/java/sca-contrib/modules/binding-rss/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.rss;uses:="org.apache.t

- uscany.sca.assembly";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.binding.rss.impl;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA RSS Feed Binding Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397326765

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA RSS Feed Binding Extension

-Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",org.apac

- he.tuscany.sca.binding.rss;version="2.0.0",org.apache.tuscany.sca.polic

- y;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.rss

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-rss/NOTICE b/java/sca-contrib/modules/binding-rss/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/binding-rss/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/binding-rss/pom.xml b/java/sca-contrib/modules/binding-rss/pom.xml
deleted file mode 100644
index 0b1bf698ec..0000000000
--- a/java/sca-contrib/modules/binding-rss/pom.xml
+++ /dev/null
@@ -1,79 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-rss</artifactId>
-    <name>Apache Tuscany SCA RSS Feed Binding Extension</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java b/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
deleted file mode 100644
index 2b4989264c..0000000000
--- a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
+++ /dev/null
@@ -1,28 +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.binding.rss;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-/**
- * RSS Feed binding model.
- */
-public interface RSSBinding extends Binding {
-}
diff --git a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java b/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
deleted file mode 100644
index 3e691e636e..0000000000
--- a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
+++ /dev/null
@@ -1,35 +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.binding.rss;
-
-/**
- * Factory for the RSS binding
- *
- * @version $Rev$ $Date$
- */
-public interface RSSBindingFactory {
-
-    /**
-     * Creates a new RSS binding.
-     * @return the new RSS binding
-     */
-    RSSBinding createRSSBinding();
-
-}
diff --git a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java b/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
deleted file mode 100644
index a4e6a8283d..0000000000
--- a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.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 org.apache.tuscany.sca.binding.rss.impl;
-
-import org.apache.tuscany.sca.binding.rss.RSSBinding;
-import org.apache.tuscany.sca.binding.rss.RSSBindingFactory;
-
-/**
- * Factory for the RSS binding model.
- *
- * @version $Rev$ $Date$
- */
-public class RSSBindingFactoryImpl implements RSSBindingFactory {
-
-    public RSSBinding createRSSBinding() {
-        return new RSSBindingImpl();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java b/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
deleted file mode 100644
index 6158752e7c..0000000000
--- a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
+++ /dev/null
@@ -1,99 +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.binding.rss.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.rss.RSSBinding;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * Implementation of the RSS Feed binding model.
- */
-class RSSBindingImpl implements RSSBinding, PolicySetAttachPoint {
-
-    private String name;
-    private String uri;
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private IntentAttachPointType intentAttachPointType;
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // The binding is always resolved
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-    
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public IntentAttachPointType getType() {
-        return intentAttachPointType;
-    }
-    
-    public void setType(IntentAttachPointType intentAttachPointType) {
-        this.intentAttachPointType = intentAttachPointType;
-    }
-    
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }     
-}
diff --git a/java/sca-contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory b/java/sca-contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
deleted file mode 100644
index 73c47a3f41..0000000000
--- a/java/sca-contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the model factory
-org.apache.tuscany.sca.binding.rss.impl.RSSBindingFactoryImpl
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 2d0597ff01..0000000000
--- a/java/sca-contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.rss,model=org.apache.tuscany.sca.binding.rss.RSSBinding,factory=org.apache.tuscany.sca.binding.rss.RSSBindingFactory
diff --git a/java/sca-contrib/modules/binding-sca-axis2/LICENSE b/java/sca-contrib/modules/binding-sca-axis2/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/binding-sca-axis2/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-sca-axis2/META-INF/MANIFEST.MF
deleted file mode 100644
index b9357df32d..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.binding.sca.axis2.impl;version

- ="1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Axis2-based Default Binding Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397360421

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Axis2-based Default Binding Ext

- ension

-Import-Package: org.apache.axiom.om,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.binding.sca;version="2.0.0",

- org.apache.tuscany.sca.binding.ws;version="2.0.0",

- org.apache.tuscany.sca.binding.ws.axis2;version="2.0.0",

- org.apache.tuscany.sca.binding.ws.wsdlgen;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.core.assembly;version="2.0.0",

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.endpointresolver;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.host.http;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy.util;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.axis2

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-sca-axis2/NOTICE b/java/sca-contrib/modules/binding-sca-axis2/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/binding-sca-axis2/pom.xml b/java/sca-contrib/modules/binding-sca-axis2/pom.xml
deleted file mode 100644
index eb02b3abdf..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/pom.xml
+++ /dev/null
@@ -1,83 +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>

-

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-binding-sca-axis2</artifactId>

-    <name>Apache Tuscany SCA Axis2-based Default Binding Extension</name>

-

-    <dependencies>

-       

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>      

-        

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.5</version>

-        </dependency>       

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-endpoint</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>         

-

-    </dependencies>

-

-</project>

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java b/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
deleted file mode 100644
index 88a4b63637..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
+++ /dev/null
@@ -1,100 +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.binding.sca.axis2.impl;

-

-import java.util.logging.Logger;

-

-import org.apache.tuscany.sca.invocation.Interceptor;

-import org.apache.tuscany.sca.invocation.Invoker;

-import org.apache.tuscany.sca.invocation.Message;

-import org.apache.tuscany.sca.runtime.EndpointReference;

-import org.oasisopen.sca.ServiceUnavailableException;

-

-

-/**

- * A wrapper for the Axis2BindingInvoker that ensures that the URL of the target

- * service is correct by looking it up in the service registry if it is not provided

- * 

- * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $

- */

-public class Axis2SCABindingInvoker implements Interceptor {

-    

-    private static final Logger logger = Logger.getLogger(Axis2SCABindingInvoker.class.getName());    

-    

-    private Invoker axis2Invoker;

-    private Axis2SCAReferenceBindingProvider provider;

-

-    public Axis2SCABindingInvoker(Axis2SCAReferenceBindingProvider provider, Invoker axis2Invoker) {

-        this.axis2Invoker = axis2Invoker;

-        this.provider = provider;

-    }

-

-    public void setNext(Invoker next) {

-    }

-

-    public Invoker getNext() {

-        return null;

-    }

-

-    /**

-     * Fix up the URL for the message. The "to" EndPoint comes from the wire

-     * target and needs to be replaced with the endpoint from the registry. 

-     * The default URL for an Endpoint URI where there is no 

-     * target component or service information, as in the case of a 

-     * wire crossing a node boundary, is "/"

-     */

-    public Message invoke(Message msg) {

-

-        // make sure that the epr of the target service is set in the TO

-        // field of the message

-        EndpointReference to = msg.getTo();

-

-        // check to see if we either don't have an endpoint set or if the URI 

-        // is dynamic or the target service is marked as unresolved

-        if ((to == null) || (to.getURI().equals("/") || (to.getContract() == null) || (to.getContract().isUnresolved()))) {

-

-            EndpointReference eprTo = provider.getServiceEndpoint();

-

-            if ( (eprTo == null) || (eprTo.getURI() == null)) {

-                throw new ServiceUnavailableException("Endpoint for service: " + provider.getSCABinding().getURI()

-                    + " can't be found for component: "

-                    + provider.getComponent().getName()

-                    + " reference: "

-                    + provider.getComponentReference().getName());

-            }

-            msg.setTo(eprTo);

-        }

-

-        // make sure that the epr of the callback service (if there is one) is set

-        // in the callbackReference field of the message. 

-        EndpointReference callbackEPR = msg.getFrom().getReferenceParameters().getCallbackReference();

-

-        if ((callbackEPR == null) || (callbackEPR.getURI().equals("/"))) {

-

-            callbackEPR = provider.getCallbackEndpoint();

-

-            if (callbackEPR != null) {

-                msg.getFrom().getReferenceParameters().setCallbackReference(callbackEPR);

-            }

-        }

-

-        // do the axis2 stuff

-        return axis2Invoker.invoke(msg);

-    }

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java b/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
deleted file mode 100644
index b105696b5d..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
+++ /dev/null
@@ -1,67 +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.binding.sca.axis2.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerDefinitionsLoader;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * The factory for the Axis2 based implementation of the distributed sca binding
- * 
- * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $
- */
-public class Axis2SCABindingProviderFactory implements BindingProviderFactory<DistributedSCABinding> {
-    
-    private ExtensionPointRegistry extensionPoints;
-    private List<PolicyHandlerTuple> policyHandlerClassnames = null;
-
-    public Axis2SCABindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;
-        policyHandlerClassnames = PolicyHandlerDefinitionsLoader.loadPolicyHandlerClassnames();
-    }    
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   DistributedSCABinding binding) {
-        return new Axis2SCAReferenceBindingProvider(component, reference, binding,
-                                                    extensionPoints, policyHandlerClassnames);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               DistributedSCABinding binding) {
-        return new Axis2SCAServiceBindingProvider(component, service, binding,
-                                                  extensionPoints, policyHandlerClassnames);
-    }
-
-    public Class<DistributedSCABinding> getModelType() {
-        return DistributedSCABinding.class;
-    }  
-}
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java b/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
deleted file mode 100644
index 59e0aa6494..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
+++ /dev/null
@@ -1,184 +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.binding.sca.axis2.impl;
-
-import java.net.URI;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.axis2.Axis2ReferenceBindingProvider;
-import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * The reference binding provider for the remote sca binding implementation. Relies on the 
- * binding-ws-axis implementation for sending messages to remote services to this provider
- * just uses the ws-axis provider. 
- * 
- * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $
- */
-public class Axis2SCAReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private static final Logger logger = Logger.getLogger(Axis2SCAReferenceBindingProvider.class.getName());
-    
-    private RuntimeComponent component;
-    private RuntimeComponentReference reference;
-    private SCABinding binding;
-    private Axis2ReferenceBindingProvider axisReferenceBindingProvider;
-    private WebServiceBinding wsBinding;
-    
-    private EndpointReference serviceEPR = null;
-    private EndpointReference callbackEPR = null;
-
-    public Axis2SCAReferenceBindingProvider(RuntimeComponent component,
-                                            RuntimeComponentReference reference,
-                                            DistributedSCABinding binding,
-                                            ExtensionPointRegistry extensionPoints,
-                                            List<PolicyHandlerTuple> policyHandlerClassnames) {
-
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        ServletHost servletHost = servletHosts.getServletHosts().get(0);
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        DataBindingExtensionPoint dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class);
-
-        this.component = component;
-        this.reference = reference;
-        this.binding = binding.getSCABinding();
-        wsBinding = modelFactories.getFactory(WebServiceBindingFactory.class).createWebServiceBinding();
-        wsBinding.setName(this.binding.getName());         
-       
-        // Turn the java interface contract into a WSDL interface contract
-        BindingWSDLGenerator.generateWSDL(component, reference, wsBinding, extensionPoints, null);
-        
-        // Set to use the Axiom data binding
-        InterfaceContract contract = wsBinding.getBindingInterfaceContract();
-        contract.getInterface().resetDataBinding(OMElement.class.getName());
-        
-        axisReferenceBindingProvider = new Axis2ReferenceBindingProvider(component,
-                                                                         reference,
-                                                                         wsBinding,
-                                                                         modelFactories,
-                                                                         policyHandlerClassnames,
-                                                                         dataBindings);
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return wsBinding.getBindingInterfaceContract();
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        return new Axis2SCABindingInvoker(this, axisReferenceBindingProvider.createInvoker(operation));
-    }
-
-    /**
-     * Uses the distributed domain service discovery feature to locate remote
-     * service endpoints
-     * 
-     * @return An EPR for the target service that this reference refers to 
-     */
-    public EndpointReference getServiceEndpoint(){
-      
-        if (serviceEPR == null){
-            String endpointURL = null;
-            
-            if (binding.getURI() != null) {
-                // check if the binding URI is already resolved if it is use is if not 
-                try {
-                    URI uri = new URI(binding.getURI());
-                     if (uri.isAbsolute()) {
-                         endpointURL = binding.getURI();
-                     } 
-                } catch(Exception ex) {
-                    // do nothing
-                } 
-            }
-            
-            serviceEPR = new EndpointReferenceImpl(endpointURL);
-        }
-        
-        return serviceEPR;
-    }
-    
-    
-    /**
-     * Retrieves the URI of the callback service (that this reference has created)
-     * returns null if there is no callback service for the sca binding
-     * 
-     * @return the callback endpoint
-     */
-    public EndpointReference getCallbackEndpoint(){
-        if (callbackEPR == null) {
-            if (reference.getCallbackService() != null) {
-                for (Binding callbackBinding : reference.getCallbackService().getBindings()) {
-                    if (callbackBinding instanceof SCABinding) {
-                        callbackEPR = new EndpointReferenceImpl(reference.getName() + "/" + callbackBinding.getName());
-                        continue;
-                    }
-                }
-            }    
-        }
-        return callbackEPR;
-    }
-    
-    
-    public SCABinding getSCABinding () {
-        return binding;
-    }
-    
-    public RuntimeComponent getComponent () {
-        return component;
-    }
-    
-    public RuntimeComponentReference getComponentReference () {
-        return reference;
-    }    
-
-    public void start() {
-        axisReferenceBindingProvider.start();
-    }
-
-    public void stop() {
-        axisReferenceBindingProvider.stop();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java b/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
deleted file mode 100644
index f1aaa9188a..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
+++ /dev/null
@@ -1,122 +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.binding.sca.axis2.impl;
-
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvider;
-import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * The service binding provider for the remote sca binding implementation. Relies on the 
- * binding-ws-axis implementation for providing a remote message endpoint for this service
- * 
- * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $
- */
-public class Axis2SCAServiceBindingProvider implements ServiceBindingProvider {
-    
-    private static final Logger logger = Logger.getLogger(Axis2SCAServiceBindingProvider.class.getName());
-
-    private SCABinding binding;
-    private Axis2ServiceProvider axisProvider;
-    private WebServiceBinding wsBinding;
-    
-    private boolean started = false;
-
-
-    public Axis2SCAServiceBindingProvider(RuntimeComponent component,
-                                          RuntimeComponentService service,
-                                          DistributedSCABinding binding,
-                                          ExtensionPointRegistry extensionPoints,
-                                          List<PolicyHandlerTuple> policyHandlerClassnames) {
-
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        ServletHost servletHost = servletHosts.getServletHosts().get(0);
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        MessageFactory messageFactory = modelFactories.getFactory(MessageFactory.class); 
-        DataBindingExtensionPoint dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class);
-
-        this.binding = binding.getSCABinding();
-        wsBinding = modelFactories.getFactory(WebServiceBindingFactory.class).createWebServiceBinding();
-        wsBinding.setName(this.binding.getName());         
-        wsBinding.setURI(this.binding.getURI());
-       
-        // Turn the java interface contract into a WSDL interface contract
-        BindingWSDLGenerator.generateWSDL(component, service, wsBinding, extensionPoints, null);
-
-        // Set to use the Axiom data binding
-        InterfaceContract contract = wsBinding.getBindingInterfaceContract();
-        contract.getInterface().resetDataBinding(OMElement.class.getName());
-        
-        axisProvider = new Axis2SCAServiceProvider(component, 
-                                                   service, 
-                                                   this.binding,
-                                                   wsBinding,
-                                                   servletHost,
-                                                   messageFactory,
-                                                   policyHandlerClassnames);
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return wsBinding.getBindingInterfaceContract();
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-        if (started) {
-            return;
-        } else {
-            started = true;
-        }
-        
-        axisProvider.start();
-    }
-
-    public void stop() {
-        if (!started) {
-            return;
-        } else {
-            started = false;
-        }
-        
-        axisProvider.stop();
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java b/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
deleted file mode 100644
index cf13d821f7..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.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.binding.sca.axis2.impl;

-

-import java.util.List;

-

-import org.apache.tuscany.sca.assembly.Binding;

-import org.apache.tuscany.sca.assembly.SCABinding;

-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;

-import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvider;

-import org.apache.tuscany.sca.host.http.ServletHost;

-import org.apache.tuscany.sca.invocation.MessageFactory;

-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-import org.apache.tuscany.sca.runtime.RuntimeComponentService;

-

-/**

- * A specialization of the Axis2BindingProvider that just switches in the SCABinding model

- * element when it is required. The SCABinding is required as the service binding provider

- * finds the service wire based in the binding 

- * 

- * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $

- */

-public class Axis2SCAServiceProvider extends Axis2ServiceProvider {

-

-    private SCABinding binding;

-    

-    /**

-     * Switch in the fake ws binding

-     * 

-     * @param component

-     * @param service

-     * @param binding

-     * @param wsBinding

-     * @param servletHost

-     * @param messageFactory

-     */

-    public Axis2SCAServiceProvider(RuntimeComponent component,

-                                   RuntimeComponentService service,

-                                   SCABinding binding,

-                                   WebServiceBinding wsBinding,

-                                   ServletHost servletHost,

-                                   MessageFactory messageFactory,

-                                   List<PolicyHandlerTuple> policyHandlerClassnames)  {

-        

-        super(component, 

-                service, 

-                wsBinding, 

-                servletHost,

-                messageFactory,

-                policyHandlerClassnames);

-

-        this.binding = binding;

-    }

-    

-    /**

-     * Return the sca binding as wires will be registered against this rather

-     * than against the wsBinding that the Axis2SCAServiceProvider is 

-     * expecting

-     * 

-     * @return the binding

-     */

-    @Override

-    protected Binding getBinding(){

-        return binding;

-    }    

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca-contrib/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 1b369cde06..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.sca.axis2.impl.Axis2SCABindingProviderFactory;model=org.apache.tuscany.sca.binding.sca.DistributedSCABinding

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
deleted file mode 100644
index 0ae3c68f99..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
+++ /dev/null
@@ -1,80 +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.binding.sca.axis2;

-

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class AsynchTestCase {

-    

-    public static Node nodeG;

-    public static Node nodeH;

-

-    @BeforeClass

-    public static void init() throws Exception {

-        System.out.println("Setting up nodes");

-

-        try {

-            // create and start domains

-            NodeFactory nodeFactory = NodeFactory.newInstance();

-            ClassLoader cl = AsynchTestCase.class.getClassLoader();

-            nodeG = nodeFactory.createNode("HelloWorld.composite", new Contribution("http://calculator", cl.getResource("nodeG").toString()));

-            nodeH = nodeFactory.createNode("HelloWorld.composite", new Contribution("http://calculator", cl.getResource("nodeH").toString()));

-

-            nodeG.start();

-            nodeH.start();

-

-        } catch (Exception ex) {

-            System.err.println("Exception when creating domain " + ex.getMessage());

-            ex.printStackTrace(System.err);

-            throw ex;

-        }     

-    }

-

-    @AfterClass

-    public static void destroy() throws Exception {

-        nodeG.stop();

-        nodeG.destroy();

-        nodeH.stop();

-        nodeG.destroy();

-    }    

-    

-    @Test

-    public void testHelloWorldAsynch() throws Exception {        

-        HelloWorldClient helloWorldClientB;

-        helloWorldClientB = nodeG.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote");

-        helloWorldClientB.getGreetings("fred");

-        System.out.println("Sleeping ...");

-        Thread.sleep(2000);

-        System.out.println("... Done");

-        Assert.assertEquals("callback fred", HelloWorldClientCallbackOnewayRemoteImpl.result );

-        

-    }      

-       

-    

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
deleted file mode 100644
index b345e563e3..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
+++ /dev/null
@@ -1,50 +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.binding.sca.axis2;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory;
-
-/**
- * The factory for creating endpoint Binding providers
- * 
- * @version $Rev$ $Date$
- */
-public class BindingScaEndpointResolverFactoryImpl implements EndpointResolverFactory<SCABinding> {
-    
-    private ExtensionPointRegistry extensionPoints;
-    
-    public BindingScaEndpointResolverFactoryImpl(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;     
-    } 
-    
-    public EndpointResolver createEndpointResolver(Endpoint endpoint, Binding binding) {
-              
-        return  new BindingScaEndpointResolverImpl(extensionPoints, endpoint, binding);
-    }
-
-    public Class<SCABinding> getModelType() {
-        return SCABinding.class;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
deleted file mode 100644
index 472e85116e..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
+++ /dev/null
@@ -1,69 +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.binding.sca.axis2;
-
-
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
-
-/** 
- * The endpoint resolver allows unresolved endpoints to be plumbed into
- * the runtime start and message send processing as a hook to late resolution
- * of target services
- * 
- * @version $Rev$ $Date$
- */
-public class BindingScaEndpointResolverImpl implements EndpointResolver {
-
-    private final static Logger logger = Logger.getLogger(BindingScaEndpointResolverImpl.class.getName());
-
-    private Endpoint endpoint;
-    private SCABinding binding;
-
-    public BindingScaEndpointResolverImpl(ExtensionPointRegistry extensionPoints,
-                                          Endpoint endpoint, 
-                                          Binding binding) {
-        this.endpoint = endpoint;
-        this.binding = (SCABinding)binding;
-    }
-
-    public void start(){
-        // do nothing
-    } 
-    
-    public void resolve() {
-        if (endpoint.isUnresolved()){
-            // pretend to resolve the endpoint. In this test case to what we know 
-            // it should be
-            logger.info("Fixing up endpoint soure binding");
-            endpoint.setSourceBinding(endpoint.getCandidateBindings().get(0));
-            endpoint.getSourceBinding().setURI("http://localhost:8085/BHelloWorldServiceRemote");
-        }
-    }
-    
-    public void stop(){
-        // do nothing
-    }    
-}
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
deleted file mode 100644
index 5a68b6c3d9..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.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.binding.sca.axis2;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class CallbackTestCase {

-    

-    public static Node nodeE;

-    public static Node nodeF;

-

-    @BeforeClass

-    public static void init() throws Exception {

-        System.out.println("Setting up nodes");

-

-        try {

-            // create and start domains

-            NodeFactory nodeFactory = NodeFactory.newInstance();

-            ClassLoader cl = AsynchTestCase.class.getClassLoader();

-            nodeE = nodeFactory.createNode("HelloWorld.composite", new Contribution("http://calculator", cl.getResource("nodeE").toString()));

-            nodeF = nodeFactory.createNode("HelloWorld.composite", new Contribution("http://calculator", cl.getResource("nodeF").toString()));

-

-            nodeE.start();

-            nodeF.start();

-

-        } catch (Exception ex) {

-            System.err.println("Exception when creating domain " + ex.getMessage());

-            ex.printStackTrace(System.err);

-            throw ex;

-        }     

-    }

-

-    @AfterClass

-    public static void destroy() throws Exception {

-        nodeE.stop();

-        nodeE.destroy();

-        nodeF.stop();

-        nodeF.destroy();

-    } 

-    

-    //@Test

-    public void testKeepServerRunning() throws Exception {

-        System.out.println("press enter to continue");

-        System.in.read();

-    } 

-    

-    @Test

-    public void testHelloWorldCallbackLocal() throws Exception {  

-        HelloWorldClient helloWorldClientB;

-        helloWorldClientB = nodeF.getService(HelloWorldClient.class, "BHelloWorldClientCallbackLocal");

-        Assert.assertEquals("Hello callback fred", helloWorldClientB.getGreetings("fred"));  

-    }     

-    

-    @Test

-    public void testHelloWorldCallbackRemote() throws Exception {  

-        HelloWorldClient helloWorldClientA;

-        helloWorldClientA = nodeE.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote");

-        Assert.assertEquals("Hello callback fred", helloWorldClientA.getGreetings("fred"));

-    }    

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
deleted file mode 100644
index 3f48f1d465..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
+++ /dev/null
@@ -1,73 +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.binding.sca.axis2;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class PromotionTestCase {

-    

-    public static Node nodeC;

-    public static Node nodeD;

-

-    @BeforeClass

-    public static void init() throws Exception {

-        System.out.println("Setting up nodes");

-

-        try {

-            // create and start domains

-            NodeFactory nodeFactory = NodeFactory.newInstance();

-            ClassLoader cl = AsynchTestCase.class.getClassLoader();

-            nodeC = nodeFactory.createNode("HelloWorld.composite", new Contribution("http://calculator", cl.getResource("nodeC").toString()));

-            nodeD = nodeFactory.createNode("HelloWorld.composite", new Contribution("http://calculator", cl.getResource("nodeD").toString()));

-

-            nodeC.start();

-            nodeD.start();

-

-        } catch (Exception ex) {

-            System.err.println("Exception when creating domain " + ex.getMessage());

-            ex.printStackTrace(System.err);

-            throw ex;

-        }     

-    }

-

-    @AfterClass

-    public static void destroy() throws Exception {

-        nodeC.stop();

-        nodeC.destroy();

-        nodeD.stop();

-        nodeD.destroy();

-    }     

-    

-    @Test

-    public void testHelloWorldPromotion() throws Exception {  

-        HelloWorldClient helloWorldClientA;

-        helloWorldClientA = nodeC.getService(HelloWorldClient.class, "AHelloWorldClientRemotePromotion");

-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");

-

-    }      

-  

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
deleted file mode 100644
index 7196118775..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
+++ /dev/null
@@ -1,112 +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.binding.sca.axis2;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-import org.oasisopen.sca.ServiceUnavailableException;

-

-public class SimpleTestCase {

-    

-    public static Node nodeA;

-    public static Node nodeB;

-

-    @BeforeClass

-    public static void init() throws Exception {

-        System.out.println("Setting up nodes");

-

-        try {

-            // create and start domains

-            NodeFactory nodeFactory = NodeFactory.newInstance();

-            ClassLoader cl = AsynchTestCase.class.getClassLoader();

-            nodeA = nodeFactory.createNode("HelloWorld.composite", new Contribution("http://calculator", cl.getResource("nodeA").toString()));

-            nodeB = nodeFactory.createNode("HelloWorld.composite", new Contribution("http://calculator", cl.getResource("nodeB").toString()));

-

-            nodeA.start();

-            nodeB.start();

-

-        } catch (Exception ex) {

-            System.err.println("Exception when creating domain " + ex.getMessage());

-            ex.printStackTrace(System.err);

-            throw ex;

-        }     

-    }

-

-    @AfterClass

-    public static void destroy() throws Exception {

-        nodeA.stop();

-        nodeA.destroy();

-        nodeB.stop();

-        nodeB.destroy();

-    }    

-    

-    @Test

-    public void testHelloWorldLocal() throws Exception {  

-        HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocal");

-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");

-        

-    }

-        

-    @Test

-    public void testHelloWorldRemote() throws Exception { 

-        

-        HelloWorldClient helloWorldClientA;

-        helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemote");

-        

-        try {

-            helloWorldClientA.getGreetings("fred");

-        } catch (ServiceUnavailableException ex){

-            Assert.fail(); 

-        }

-    }     

-    

-    @Test

-    public void testHelloWorldLocalAndRemote() throws Exception {

-        HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocalAndRemote"); 

-        HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientLocalAndRemote"); 

-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");

-        Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred");

-    }   

-    

-    @Test

-    public void testHelloWorldMultipleServices() throws Exception {

-        HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices"); 

-        HelloWorldClient helloWorldClientA2 = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices2");

-        HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientMultipleServices");        

-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");

-        Assert.assertEquals(helloWorldClientA2.getGreetings("fred"), "Hello fred");

-        Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred");

-    }   

-    

-    @Test

-    public void testHelloWorldMultipleBindings() throws Exception {  

-        HelloWorldClient helloWorldClientA;

-        helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleBindings");

-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");

-        

-    }   

-  

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
deleted file mode 100644
index 0de092052f..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
+++ /dev/null
@@ -1,29 +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.binding.sca.axis2.helloworld;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface HelloWorldCallbackRemote {

-    

-    String getGreetingsCallbackRemote(String s);

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
deleted file mode 100644
index e4d36ac78b..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
+++ /dev/null
@@ -1,27 +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.binding.sca.axis2.helloworld;

-

-

-public interface HelloWorldClient {

-    

-    String getGreetings(String s);

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
deleted file mode 100644
index 5b2f73f9e2..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ /dev/null
@@ -1,33 +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.binding.sca.axis2.helloworld;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-@Callback(HelloWorldCallbackRemote.class)

-public interface HelloWorldServiceCallbackOnewayRemote {

-    

-    @OneWay

-    void getGreetingsRemote(String s);

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
deleted file mode 100644
index f4c4354a39..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.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.binding.sca.axis2.helloworld;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-@Callback(HelloWorldCallbackRemote.class)

-public interface HelloWorldServiceCallbackRemote {

-    

-    String getGreetingsRemote(String s);

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
deleted file mode 100644
index 7b8e00eb2a..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
+++ /dev/null
@@ -1,27 +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.binding.sca.axis2.helloworld;

-

-

-public interface HelloWorldServiceLocal {

-    

-    String getGreetingsLocal(String s);

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
deleted file mode 100644
index 2cec5893a9..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
+++ /dev/null
@@ -1,29 +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.binding.sca.axis2.helloworld;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface HelloWorldServiceRemote {

-    

-    String getGreetingsRemote(String s);

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
deleted file mode 100644
index f4029e0ad5..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
+++ /dev/null
@@ -1,29 +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.binding.sca.axis2.helloworld;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface HelloWorldServiceRemote2 {

-    

-    String getGreetingsRemote2(String s);

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
deleted file mode 100644
index 00fe836512..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ /dev/null
@@ -1,43 +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.binding.sca.axis2.helloworld.impl;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackOnewayRemote;

-import org.oasisopen.sca.annotation.Reference;

-

-public class HelloWorldClientCallbackOnewayRemoteImpl implements HelloWorldClient {

-    

-    public static String result;

-

-    @Reference

-    public HelloWorldServiceCallbackOnewayRemote helloWorldService;

-    

-    public String getGreetings(String s) {

-        helloWorldService.getGreetingsRemote(s);

-        return null;

-    }

-    

-    public String getGreetingsCallbackRemote(String s) {

-        result =  "callback " + s;

-        return result;

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
deleted file mode 100644
index df9a09c5fb..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ /dev/null
@@ -1,42 +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.binding.sca.axis2.helloworld.impl;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote;

-import org.oasisopen.sca.annotation.Reference;

-

-public class HelloWorldClientCallbackRemoteImpl implements HelloWorldClient {

-    

-    public static String result;

-

-    @Reference

-    public HelloWorldServiceCallbackRemote helloWorldService;

-    

-    public String getGreetings(String s) {

-        return helloWorldService.getGreetingsRemote(s);

-    }

-    

-    public String getGreetingsCallbackRemote(String s) {

-        result =  "callback " + s;

-        return result;

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
deleted file mode 100644
index dcefef52e7..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
+++ /dev/null
@@ -1,35 +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.binding.sca.axis2.helloworld.impl;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal;

-import org.oasisopen.sca.annotation.Reference;

-

-public class HelloWorldClientLocalImpl implements HelloWorldClient {

-

-    @Reference

-    public HelloWorldServiceLocal helloWorldService;

-    

-    public String getGreetings(String s) {

-        return helloWorldService.getGreetingsLocal(s);

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
deleted file mode 100644
index 628434108e..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ /dev/null
@@ -1,35 +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.binding.sca.axis2.helloworld.impl;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote2;

-import org.oasisopen.sca.annotation.Reference;

-

-public class HelloWorldClientRemote2Impl implements HelloWorldClient {

-

-    @Reference

-    public HelloWorldServiceRemote2 helloWorldService;

-    

-    public String getGreetings(String s) {

-        return helloWorldService.getGreetingsRemote2(s);

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
deleted file mode 100644
index 0dbb58272c..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ /dev/null
@@ -1,35 +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.binding.sca.axis2.helloworld.impl;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote;

-import org.oasisopen.sca.annotation.Reference;

-

-public class HelloWorldClientRemoteImpl implements HelloWorldClient {

-

-    @Reference

-    public HelloWorldServiceRemote helloWorldService;

-    

-    public String getGreetings(String s) {

-        return helloWorldService.getGreetingsRemote(s);

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
deleted file mode 100644
index 2d2fe0146d..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.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 org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldCallbackRemote;

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackOnewayRemote;

-import org.oasisopen.sca.annotation.Callback;

-

-

-public class HelloWorldServiceCallbackOnewayRemoteImpl implements HelloWorldServiceCallbackOnewayRemote {

-

-    @Callback

-    protected HelloWorldCallbackRemote theCallback;

-

-    public void getGreetingsRemote(String s) {

-        theCallback.getGreetingsCallbackRemote(s);

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
deleted file mode 100644
index 219525e62d..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ /dev/null
@@ -1,35 +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.binding.sca.axis2.helloworld.impl;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldCallbackRemote;

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote;

-import org.oasisopen.sca.annotation.Callback;

-

-public class HelloWorldServiceCallbackRemoteImpl implements HelloWorldServiceCallbackRemote {

-    

-    @Callback

-    protected HelloWorldCallbackRemote theCallback;

-

-    public String getGreetingsRemote(String s) {

-        return "Hello " + theCallback.getGreetingsCallbackRemote(s);

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
deleted file mode 100644
index 20dd97b74a..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ /dev/null
@@ -1,30 +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.binding.sca.axis2.helloworld.impl;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal;

-

-public class HelloWorldServiceLocalImpl implements HelloWorldServiceLocal {

-

-    public String getGreetingsLocal(String s) {

-        return "Hello " + s;

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
deleted file mode 100644
index b34d809958..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ /dev/null
@@ -1,41 +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.binding.sca.axis2.helloworld.impl;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal;

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote;

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote2;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(interfaces={HelloWorldServiceRemote.class, HelloWorldServiceRemote2.class, HelloWorldServiceLocal.class} )

-public class HelloWorldServiceMultipleServicesImpl implements HelloWorldServiceLocal, HelloWorldServiceRemote, HelloWorldServiceRemote2  {

-

-    public String getGreetingsLocal(String s) {

-        return "Hello " + s;

-    }

-    

-    public String getGreetingsRemote(String s) {

-        return "Hello " + s;

-    }    

-

-    public String getGreetingsRemote2(String s) {

-        return "Hello " + s;

-    } 

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
deleted file mode 100644
index b25aebd9df..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ /dev/null
@@ -1,30 +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.binding.sca.axis2.helloworld.impl;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote;

-

-public class HelloWorldServiceRemoteImpl implements HelloWorldServiceRemote {

-

-    public String getGreetingsRemote(String s) {

-        return "Hello " + s;

-    }

-

-}

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
deleted file mode 100644
index 5e4fd566c3..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.sca.axis2.BindingScaEndpointResolverFactoryImpl;model=org.apache.tuscany.sca.assembly.SCABinding

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
deleted file mode 100644
index 093258051e..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
+++ /dev/null
@@ -1,75 +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://sample"

-           xmlns:sample="http://sample"

-           name="HelloWorld">

-

-	

-    <!-- local only wire -->

-    <component name="AHelloWorldClientLocal">

-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientLocalImpl"/>

-        <reference name="helloWorldService" target="AHelloWorldServiceLocal" />

-    </component>

-    

-    <component name="AHelloWorldServiceLocal">

-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceLocalImpl" />

-    </component> 

-    

-    <!-- unresolved remote wire -->   

-    <component name="AHelloWorldClientRemote">

-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />

-        <reference name="helloWorldService" target="BHelloWorldServiceRemote" />

-    </component>

-    

-    <!-- local and remote wires -->    

-    <component name="AHelloWorldClientLocalAndRemote">

-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />

-        <reference name="helloWorldService">

-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceLocalAndRemote"/>

-        </reference>

-    </component>  

-    

-    <!-- multiple services -->

-    <component name="AHelloWorldClientMultipleServices">

-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />

-        <reference name="helloWorldService">

-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>

-        </reference>

-    </component>  

-    

-    <component name="AHelloWorldClientMultipleServices2">

-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemote2Impl" />

-        <reference name="helloWorldService">

-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>

-        </reference>        

-    </component> 

-    

-    <!-- multiple bindings -->   

-    <component name="AHelloWorldClientMultipleBindings">

-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />

-        <reference name="helloWorldService" >

-            <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote" />        

-            <binding.sca uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-scabinding"/>

-            <binding.ws/>

-        </reference>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:HelloWorld"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
deleted file mode 100644
index 8cf7230ed5..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
+++ /dev/null
@@ -1,84 +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://sample"

-           xmlns:sample="http://sample"

-           name="HelloWorld">

-           

-

-    <!-- local only wire -->

-     

-     

-    <!-- unresolved remote wire --> 

-    <component name="BHelloWorldServiceRemote">

-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" />

-        <service name="HelloWorldServiceRemote">

-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemote"/>

-        </service>

-    </component>

-    

-    <!-- local and remote wires -->

-    <component name="BHelloWorldServiceLocalAndRemote">

-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" />

-        <service name="HelloWorldServiceRemote">

-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceLocalAndRemote"/>

-        </service>

-    </component>

-    

-    <component name="BHelloWorldClientLocalAndRemote">

-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />

-        <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote" />

-    </component>

-    

-    <!-- multiple services -->

-    <component name="BHelloWorldServiceMultipleServices">

-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceMultipleServicesImpl" />

-        <service name="HelloWorldServiceLocal">

-        </service>        

-        <service name="HelloWorldServiceRemote">

-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>

-        </service>        

-        <service name="HelloWorldServiceRemote2">

-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>

-        </service>

-    </component>

-    

-    <component name="BHelloWorldClientMultipleServices">

-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientLocalImpl" />

-        <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceLocal" />

-    </component>

-    

-    <!-- multiple bindings --> 

-    <component name="BHelloWorldMultipleBindings">

-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" />

-        <service name="HelloWorldServiceRemote">

-            <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote" />

-            <binding.ws uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-wsbinding"/>

-            <binding.sca uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-scabinding"/>

-        </service>

-    </component>

-     

-    

-    <!-- Dynamic interfaces -->

-    <!--component name="BHelloWorldServiceScript">

-        <implementation.script script="calculator/AddServiceImpl.js"/>

-    </component--> 

-    

-</composite>

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:HelloWorld"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
deleted file mode 100644
index 066727f76d..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.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://sample"

-           xmlns:sample="http://sample"

-           name="HelloWorld">

-

-    

-    <!-- composite hierarchy -->

-    <component name="AHelloWorldClientRemotePromotion">

-		<implementation.composite name="sample:HelloWorldComponent" />

-		<reference name="AHelloWorldClientRemoteReference">

-		    <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemotePromotion"/>

-		</reference>

-    </component>

-    

-

-</composite>

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
deleted file mode 100644
index 485e0815d2..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
+++ /dev/null
@@ -1,37 +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://sample"

-           xmlns:sample="http://sample"

-           name="HelloWorldComponent">

-

-    <service name="AHelloWorldClientRemoteService" promote="AHelloWorldClientRemoteComponent">

-        <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient"/>

-    </service>

-    

-    <reference name="AHelloWorldClientRemoteReference" promote="AHelloWorldClientRemoteComponent/helloWorldService">

-        <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote"/>

-    </reference>

-    

-    <component name="AHelloWorldClientRemoteComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl"/>

-    </component>

-   

-</composite>

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:HelloWorld"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
deleted file mode 100644
index a5a4f04cb5..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.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://sample"

-           xmlns:sample="http://sample"

-           name="HelloWorld">

-           

-

-    <!-- composite hierarchy -->

-    <component name="BHelloWorldServiceRemotePromotion">

-		<implementation.composite name="sample:HelloWorldComponent" />

-		<service name="BHelloWorldServiceRemoteService">

-		    <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemotePromotion"/>

-		</service>

-    </component>   

-

-    

-</composite>

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
deleted file mode 100644
index bf30bdf42d..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
+++ /dev/null
@@ -1,37 +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://sample"

-           xmlns:sample="http://sample"

-           name="HelloWorldComponent">

-

-    <service name="BHelloWorldServiceRemoteService" 

-               promote="BHelloWorldServiceRemoteComponent/HelloWorldServiceRemote"/>

-    

-    <component name="BHelloWorldServiceRemoteComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl"/>

-    </component>

-    

-    <component name="BHelloWorldServiceLocalAndRemoteNested">

-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" />

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:HelloWorld"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
deleted file mode 100644
index b519793290..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
+++ /dev/null
@@ -1,36 +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://sample"

-           xmlns:sample="http://sample"

-           name="HelloWorld">

-   

-    <!-- callback remote wire -->   

-    <component name="AHelloWorldClientCallbackRemote">

-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackRemoteImpl" />

-        <reference name="helloWorldService" >

-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>

-            <callback>

-                <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>

-            </callback>

-        </reference>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:HelloWorld"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
deleted file mode 100644
index 20a6c54e6e..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
+++ /dev/null
@@ -1,43 +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://sample"

-           xmlns:sample="http://sample"

-           name="HelloWorld">

-            

-     

-    <!-- callback remote wire --> 

-    <component name="BHelloWorldServiceCallbackRemote">

-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceCallbackRemoteImpl" />

-        <service name="HelloWorldServiceCallbackRemote">

-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>

-            <callback>

-                <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>

-            </callback>            

-        </service>

-    </component>

-    

-    <!-- callback local wire -->   

-    <component name="BHelloWorldClientCallbackLocal">

-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackRemoteImpl" />

-        <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:HelloWorld"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
deleted file mode 100644
index a76008d0c5..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
+++ /dev/null
@@ -1,36 +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://sample"

-           xmlns:sample="http://sample"

-           name="HelloWorld">

-   

-    <!-- callback remote wire -->   

-    <component name="AHelloWorldClientCallbackRemote">

-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl" />

-        <reference name="helloWorldService" >

-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>

-            <callback>

-                <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>

-            </callback>

-        </reference>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:HelloWorld"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
deleted file mode 100644
index 0c22af22ab..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
+++ /dev/null
@@ -1,38 +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://sample"

-           xmlns:sample="http://sample"

-           name="HelloWorld">

-            

-     

-    <!-- callback remote wire --> 

-    <component name="BHelloWorldServiceCallbackRemote">

-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceCallbackOnewayRemoteImpl" />

-        <service name="HelloWorldServiceCallbackOnewayRemote">

-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>

-            <callback>

-                <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>

-            </callback>            

-        </service>

-    </component>

-    

-

-</composite>

diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml b/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:HelloWorld"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-sca-corba/LICENSE b/java/sca-contrib/modules/binding-sca-corba/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/binding-sca-corba/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/binding-sca-corba/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-sca-corba/META-INF/MANIFEST.MF
deleted file mode 100644
index ede93bb946..0000000000
--- a/java/sca-contrib/modules/binding-sca-corba/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,39 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.binding.sca.corba.impl;version

- ="1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA CORBA-based Default Binding Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397364015

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA CORBA-based Default Binding Ext

- ension

-Import-Package: javax.xml.namespace;version="1.0",

- javax.xml.stream,

- org.apache.axiom.om,

- org.apache.axiom.om.impl.builder,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.binding.corba.provider.exceptions;version="2.0.0",

- org.apache.tuscany.sca.binding.corba.provider.reference;version="2.0.0",

- org.apache.tuscany.sca.binding.corba.provider.service;version="2.0.0",

- org.apache.tuscany.sca.binding.corba.provider.types;version="2.0.0",

- org.apache.tuscany.sca.binding.sca;version="2.0.0",

- org.apache.tuscany.sca.binding.ws;version="2.0.0",

- org.apache.tuscany.sca.binding.ws.wsdlgen;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.host.corba;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.omg.CORBA,

- org.oasisopen.sca;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.corba

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/binding-sca-corba/NOTICE b/java/sca-contrib/modules/binding-sca-corba/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/binding-sca-corba/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/binding-sca-corba/pom.xml b/java/sca-contrib/modules/binding-sca-corba/pom.xml
deleted file mode 100644
index c7ae956137..0000000000
--- a/java/sca-contrib/modules/binding-sca-corba/pom.xml
+++ /dev/null
@@ -1,88 +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>
-
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-modules</artifactId>
-		<version>2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>tuscany-binding-sca-corba</artifactId>
-	<name>
-		Apache Tuscany SCA CORBA-based Default Binding Extension
-	</name>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-sca</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-corba</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-corba-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-corba</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-	</dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java b/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
deleted file mode 100644
index 2eee714de6..0000000000
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
+++ /dev/null
@@ -1,64 +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.binding.sca.corba.impl;
-
-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.host.corba.CorbaHost;
-import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint;
-import org.apache.tuscany.sca.host.corba.ExtensibleCorbaHost;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Binding provider factory for SCA default binding over CORBA binding
- */
-public class CorbaSCABindingProviderFactory implements BindingProviderFactory<DistributedSCABinding> {
-
-    private CorbaHostExtensionPoint chep;
-    private CorbaHost host;
-    private ExtensionPointRegistry extensions;
-
-    public CorbaSCABindingProviderFactory(ExtensionPointRegistry extensions) {
-        this.extensions = extensions;
-        chep = extensions.getExtensionPoint(CorbaHostExtensionPoint.class);
-        host = new ExtensibleCorbaHost(chep);
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   DistributedSCABinding binding) {
-        return new CorbaSCAReferenceBindingProvider(binding.getSCABinding(), host, component, reference, extensions);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               DistributedSCABinding binding) {
-        return new CorbaSCAServiceBindingProvider(binding.getSCABinding(), host, component, service, extensions);
-    }
-
-    public Class<DistributedSCABinding> getModelType() {
-        return DistributedSCABinding.class;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java b/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
deleted file mode 100644
index 257be80807..0000000000
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
+++ /dev/null
@@ -1,111 +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.binding.sca.corba.impl;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.stream.XMLStreamException;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.binding.corba.provider.exceptions.RequestConfigurationException;
-import org.apache.tuscany.sca.binding.corba.provider.service.InvocationException;
-import org.apache.tuscany.sca.binding.corba.provider.service.InvocationProxy;
-import org.apache.tuscany.sca.binding.corba.provider.service.OperationTypes;
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTree;
-import org.apache.tuscany.sca.binding.corba.provider.types.TypeTreeCreator;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.FaultException;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Invocation proxy for SCA default binding over CORBA binding
- */
-public class CorbaSCAInvocationProxy implements InvocationProxy {
-
-    private static final Logger logger = Logger.getLogger(CorbaSCAInvocationProxy.class.getName());
-    private RuntimeWire wire;
-    private Interface componentInterface;
-    private OperationTypes types = new OperationTypes();
-    private MessageFactory messageFactory;
-
-    public CorbaSCAInvocationProxy(RuntimeWire wire, Interface componentInterface, MessageFactory messageFactory) {
-        this.wire = wire;
-        this.componentInterface = componentInterface;
-        this.messageFactory = messageFactory;
-        try {
-            List<TypeTree> inputType = new ArrayList<TypeTree>();
-            inputType.add(TypeTreeCreator.createTypeTree(String.class, null));
-            types.setInputType(inputType);
-            types.setOutputType(TypeTreeCreator.createTypeTree(String.class, null));
-        } catch (RequestConfigurationException e) {
-            // ignore - string type should not cause this exception
-        }
-    }
-
-    public Object invoke(String operationName, List<Object> arguments) throws InvocationException {
-        try {
-            OMElement omContent = CorbaSCAInvoker.stringToOM((String)arguments.get(0));
-            String componentOperationName = omContent.getQName().getLocalPart();
-            Operation componentOperation = null;
-            for (Operation operation : componentInterface.getOperations()) {
-                if (operation.getName().equals(componentOperationName)) {
-                    componentOperation = operation;
-                    break;
-                }
-            }
-            if (componentOperation != null) {
-                Message msg = messageFactory.createMessage();
-                msg.setOperation(componentOperation);
-                Object[] args = new Object[1];
-                args[0] = omContent;
-                msg.setBody(args);
-                OMElement omResult = (OMElement)wire.invoke(componentOperation, msg);
-                return omResult.toStringWithConsume();
-            }
-        } catch (XMLStreamException e) {
-            logger.log(Level.WARNING, "XMLStreamException during handling invocation target exception", e);
-        } catch (InvocationTargetException e) {
-            OMElement omException = (OMElement)((FaultException)e.getCause()).getFaultInfo();
-            try {
-                WrappedSCAException wrappedException = new WrappedSCAException(omException.toStringWithConsume());
-                InvocationException exception = new InvocationException(wrappedException);
-                throw exception;
-            } catch (XMLStreamException xmle) {
-                logger.log(Level.WARNING, "XMLStreamException during handling invocation target exception", xmle);
-            }
-            
-        }
-
-        return null;
-    }
-
-    public OperationTypes getOperationTypes(String operationName) {
-        // ignoring operationName - only one operation for this proxy is allowed
-        return types;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java b/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
deleted file mode 100644
index 1cb532a46b..0000000000
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
+++ /dev/null
@@ -1,97 +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.binding.sca.corba.impl;
-
-import java.io.ByteArrayInputStream;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import javax.xml.stream.XMLStreamException;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.tuscany.sca.binding.corba.provider.exceptions.RequestConfigurationException;
-import org.apache.tuscany.sca.binding.corba.provider.reference.DynaCorbaRequest;
-import org.apache.tuscany.sca.binding.corba.provider.reference.DynaCorbaResponse;
-import org.apache.tuscany.sca.interfacedef.util.FaultException;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.omg.CORBA.Object;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-public class CorbaSCAInvoker implements Invoker {
-
-    private Object remoteObject;
-    private Class<?> referenceClass;
-
-    public CorbaSCAInvoker(Object remoteObject,
-                           Class<?> referenceClass,
-                           Map<Method, String> operationsMap,
-                           boolean scaBindingRules) {
-        this.remoteObject = remoteObject;
-        this.referenceClass = referenceClass;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Invoker#invoke(org.apache.tuscany.sca.invocation.Message)
-     */
-    public Message invoke(Message msg) {
-        try { 
-            DynaCorbaRequest request = new DynaCorbaRequest(remoteObject, "scaService");
-            request.setReferenceClass(referenceClass);
-            request.setOutputType(String.class);
-            request.addExceptionType(WrappedSCAException.class);
-            java.lang.Object[] args = msg.getBody();
-            OMElement omElement = (OMElement)args[0];
-            String arg = omElement.toStringWithConsume();
-            request.addArgument(arg);
-            DynaCorbaResponse response = request.invoke();
-            OMElement responseOM = stringToOM((String)response.getContent());
-            msg.setBody(responseOM);
-        } catch (WrappedSCAException e) {
-            try {
-                OMElement exceptionOM = stringToOM(e.getFault());
-                FaultException f = new FaultException(e.getMessage(), exceptionOM, e);
-                f.setFaultName(exceptionOM.getQName());
-                msg.setFaultBody(f);
-            } catch (XMLStreamException e1) {
-            }
-        } catch (RequestConfigurationException e) {
-            throw new ServiceRuntimeException(e);
-        } catch (Exception e) {
-            msg.setFaultBody(e);
-        }
-        return msg;
-    }
-    
-    /**
-     * This will help you to create an OMElement from an xml fragment which you have as a string.
-     *
-     * @param xmlFragment - the well-formed xml fragment
-     * @return The OMElement created out of the string xml fragment.
-     * @throws XMLStreamException
-     */
-    static OMElement stringToOM(String xmlFragment) throws XMLStreamException {
-        if (xmlFragment != null) {
-            return new StAXOMBuilder(new ByteArrayInputStream(xmlFragment.getBytes())).getDocumentElement();
-        }
-        return null;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java b/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
deleted file mode 100644
index c578f8bdf4..0000000000
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
+++ /dev/null
@@ -1,95 +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.binding.sca.corba.impl;
-
-import java.util.logging.Logger;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.host.corba.CorbaHost;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.omg.CORBA.Object;
-
-/**
- * Reference binding provider for SCA default binding over CORBA binding
- */
-public class CorbaSCAReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private static final Logger logger = Logger.getLogger(CorbaSCAReferenceBindingProvider.class.getName());
-
-    private SCABinding binding;
-    private CorbaHost host;
-    private Object remoteObject;
-    private Class<?> referenceClass;
-    private InterfaceContract wsdlInterfaceContract; 
-
-    public CorbaSCAReferenceBindingProvider(SCABinding binding,
-                                            CorbaHost host,
-                                            RuntimeComponent component,
-                                            RuntimeComponentReference reference,
-                                            ExtensionPointRegistry extensions) {
-        this.binding = binding;
-        this.host = host;
-        
-        WebServiceBindingFactory wsFactory = extensions.getExtensionPoint(WebServiceBindingFactory.class);
-        WebServiceBinding wsBinding = wsFactory.createWebServiceBinding();
-        BindingWSDLGenerator.generateWSDL(component, reference, wsBinding, extensions, null);
-        wsdlInterfaceContract = wsBinding.getBindingInterfaceContract();
-        wsdlInterfaceContract.getInterface().resetDataBinding(OMElement.class.getName());
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return wsdlInterfaceContract;
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        try {
-            if (remoteObject == null) {
-                remoteObject = host.lookup(binding.getURI());
-            }
-            return new CorbaSCAInvoker(remoteObject, referenceClass, null, true);
-        } catch (Exception e) {
-            logger.warning(e.getMessage());
-        }
-        return null;
-    }
-
-    public void start() {
-
-    }
-
-    public void stop() {
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java b/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
deleted file mode 100644
index e8a76050e2..0000000000
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
+++ /dev/null
@@ -1,97 +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.binding.sca.corba.impl;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.binding.corba.provider.service.DynaCorbaServant;
-import org.apache.tuscany.sca.binding.corba.provider.service.InvocationProxy;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.host.corba.CorbaHost;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * Service binding provider for SCA default binding over CORBA binding
- */
-public class CorbaSCAServiceBindingProvider implements ServiceBindingProvider {
-
-    private SCABinding binding;
-    private CorbaHost host;
-    private RuntimeComponentService service;
-    private DynaCorbaServant servant;
-    private MessageFactory messageFactory;
-    private InterfaceContract wsdlInterfaceContract;
-
-    public CorbaSCAServiceBindingProvider(SCABinding binding,
-                                          CorbaHost host,
-                                          RuntimeComponent component,
-                                          RuntimeComponentService service,
-                                          ExtensionPointRegistry extensions) {
-        this.binding = binding;
-        this.host = host;
-        this.service = service;
-        
-        messageFactory = extensions.getExtensionPoint(MessageFactory.class);
-
-        WebServiceBindingFactory wsFactory = extensions.getExtensionPoint(WebServiceBindingFactory.class);
-        WebServiceBinding wsBinding = wsFactory.createWebServiceBinding();
-        BindingWSDLGenerator.generateWSDL(component, service, wsBinding, extensions, null);
-        wsdlInterfaceContract = wsBinding.getBindingInterfaceContract();
-        wsdlInterfaceContract.getInterface().resetDataBinding(OMElement.class.getName());
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return wsdlInterfaceContract;
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-        try {
-            InvocationProxy proxy =
-                new CorbaSCAInvocationProxy(service.getRuntimeWire(binding), service.getInterfaceContract()
-                    .getInterface(), messageFactory);
-            servant = new DynaCorbaServant(proxy, "IDL:org/apache/tuscany/sca/binding/sca/corba/Service:1.0");
-            host.registerServant(binding.getURI(), servant);
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public void stop() {
-        try {
-            host.unregisterServant(binding.getURI());
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java b/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
deleted file mode 100644
index 128d5ef159..0000000000
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
+++ /dev/null
@@ -1,56 +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.binding.sca.corba.impl;
-
-/**
- * Exception holder for SCA default binding over CORBA. Holds fault message in
- * XML
- */
-public class WrappedSCAException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-    public String fault;
-
-    /**
-     * Creates exception holder with null fault message. This no argument
-     * constructor is needed by CORBA binding.
-     */
-    public WrappedSCAException() {
-
-    }
-
-    /**
-     * Creates exception holder with fault message
-     * 
-     * @param fault XML fault message
-     */
-    public WrappedSCAException(String fault) {
-        this.fault = fault;
-    }
-
-    public String getFault() {
-        return fault;
-    }
-
-    public void setFault(String fault) {
-        this.fault = fault;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca-contrib/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index e07a7cbb95..0000000000
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.sca.corba.impl.CorbaSCABindingProviderFactory;model=org.apache.tuscany.sca.binding.sca.DistributedSCABinding

diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/LICENSE b/java/sca-contrib/modules/binding-sca-xml-osoa/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-sca-xml-osoa/META-INF/MANIFEST.MF
deleted file mode 100644
index c37d874ae7..0000000000
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.binding.sca.impl;version="2.0.0"

- ,org.apache.tuscany.sca.binding.sca.provider;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Default Binding Model OSOA processors

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397165593

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Default Binding Model

-Import-Package: javax.xml.namespace,

- javax.xml.stream;resolution:=optional,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.builder;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.assembly.xml.osoa;version="2.0.0",

- org.apache.tuscany.sca.binding.sca.impl,

- org.apache.tuscany.sca.contribution;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.definitions;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.oasisopen.sca;version="2.0.0"

-Bundle-SymbolicName: xorg.apache.tuscany.sca.binding.sca.xml.osoa

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/NOTICE b/java/sca-contrib/modules/binding-sca-xml-osoa/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/pom.xml b/java/sca-contrib/modules/binding-sca-xml-osoa/pom.xml
deleted file mode 100644
index 580982c52e..0000000000
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/pom.xml
+++ /dev/null
@@ -1,57 +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>
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-sca-xml-osoa</artifactId>
-    <name>Apache Tuscany SCA Default Binding XML Model based on OSOA Spec</name>
-
-    <dependencies>
-
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml-osoa</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>      
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>   
-              
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/src/main/java/org/apache/tuscany/sca/binding/sca/xml/osoa/SCABindingProcessor.java b/java/sca-contrib/modules/binding-sca-xml-osoa/src/main/java/org/apache/tuscany/sca/binding/sca/xml/osoa/SCABindingProcessor.java
deleted file mode 100644
index ba1ec6484f..0000000000
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/src/main/java/org/apache/tuscany/sca/binding/sca/xml/osoa/SCABindingProcessor.java
+++ /dev/null
@@ -1,132 +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.binding.sca.xml.osoa;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor;
-import org.apache.tuscany.sca.assembly.xml.osoa.Constants;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.policy.ExtensionType;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySubject;
-
-/**
- * A processor to read the XML that describes the SCA binding.
- *
- * @version $Rev$ $Date$
- */
-
-public class SCABindingProcessor implements StAXArtifactProcessor<SCABinding> {
-	private static final String NAME = "name";
-	private static final String URI = "uri";
-	
-    private static final String BINDING_SCA = "binding.sca";
-    private static final QName BINDING_SCA_QNAME = new QName(Constants.SCA10_NS, BINDING_SCA);
-    
-    private PolicyFactory policyFactory;       
-    private SCABindingFactory scaBindingFactory;
-    private PolicySubjectProcessor policyProcessor;
-    private PolicyFactory  intentAttachPointTypeFactory;
-
-
-    public SCABindingProcessor(FactoryExtensionPoint modelFactories) {
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        policyProcessor = new PolicySubjectProcessor(policyFactory);
-        this.intentAttachPointTypeFactory = modelFactories.getFactory(PolicyFactory.class);
-    }
-
-    public QName getArtifactType() {
-        return BINDING_SCA_QNAME;
-    }
-
-    public Class<SCABinding> getModelType() {
-        return SCABinding.class;
-    }
-
-    public SCABinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        SCABinding scaBinding = scaBindingFactory.createSCABinding();
-        ExtensionType bindingType = intentAttachPointTypeFactory.createBindingType();
-        bindingType.setType(getArtifactType());
-        bindingType.setUnresolved(true);
-        ((PolicySubject)scaBinding).setType(bindingType);
-        
-        // Read policies
-        policyProcessor.readPolicies(scaBinding, reader);
-        
-        // Read binding name
-        String name = reader.getAttributeValue(null, NAME);
-        if (name != null) {
-            scaBinding.setName(name);
-        }
-
-        // Read binding URI
-        String uri = reader.getAttributeValue(null, URI);
-        if (uri != null) {
-            scaBinding.setURI(uri);
-        }
-
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && BINDING_SCA_QNAME.equals(reader.getName())) {
-                break;
-            }
-        }
-        return scaBinding;
-    }
-    
-    public void resolve(SCABinding model, ModelResolver resolver) throws ContributionResolveException {
-        policyProcessor.resolvePolicies(model, resolver);
-    }    
-
-    public void write(SCABinding scaBinding, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
-        // Write <binding.sca>
-        policyProcessor.writePolicyPrefixes(scaBinding, writer);
-        writer.writeStartElement(Constants.SCA10_NS, BINDING_SCA);
-        policyProcessor.writePolicyAttributes(scaBinding, writer);
-
-        // Write binding name
-        if (scaBinding.getName() != null) {
-            writer.writeAttribute(NAME, scaBinding.getName());
-        }
-        
-        // Write binding URI
-        if (scaBinding.getURI() != null) {
-            writer.writeAttribute(URI, scaBinding.getURI());
-        }
-        
-        writer.writeEndElement();
-    }
-    
-}
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/binding-sca-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 6099dadbde..0000000000
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.sca.xml.osoa.SCABindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.sca,model=org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/src/test/resources/Calculator.composite b/java/sca-contrib/modules/binding-sca-xml-osoa/src/test/resources/Calculator.composite
deleted file mode 100644
index 0be16ec536..0000000000
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/src/test/resources/Calculator.composite
+++ /dev/null
@@ -1,59 +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:calc="http://calc"
-        targetNamespace="http://calc"
-        name="Calculator">
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.CalculatorService"/>
-        <binding.sca/>
-   </service>
-
-   <component name="CalculatorServiceComponent">
-        <implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent">
-            <binding.sca/>
-        </reference>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-    <implementation.java class="calculator.AddServiceImpl"/>
-    <service name="AddService">
-        <interface.java interface="calculator.AddService"/>
-            <binding.sca/>
-    </service>        
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
- 
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/src/test/resources/CalculatorServiceImpl.componentType b/java/sca-contrib/modules/binding-sca-xml-osoa/src/test/resources/CalculatorServiceImpl.componentType
deleted file mode 100644
index 55e8926504..0000000000
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/src/test/resources/CalculatorServiceImpl.componentType
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
-  <service name="CalculatorService">
-        <interface.java interface="calculator.CalculatorService" />
-        <binding.sca/>
-  </service>
-
-  <reference name="addService">
-        <interface.java interface="calculator.AddService" />
-        <binding.sca/>
-  </reference>  
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/LICENSE b/java/sca-contrib/modules/binding-ws-jaxws/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/binding-ws-jaxws/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/META-INF/MANIFEST.MF b/java/sca-contrib/modules/binding-ws-jaxws/META-INF/MANIFEST.MF
deleted file mode 100644
index a095f0d289..0000000000
--- a/java/sca-contrib/modules/binding-ws-jaxws/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,54 +0,0 @@
-Manifest-Version: 1.0

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA JAXWS-based WS Binding Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397353000

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA JAXWS-based WS Binding Extensio

- n

-Import-Package: javax.security.auth.callback;resolution:=optional,

- javax.servlet,

- javax.servlet.http,

- javax.wsdl,

- javax.wsdl.extensions,

- javax.wsdl.extensions.soap,

- javax.wsdl.extensions.soap12,

- javax.wsdl.factory;resolution:=optional,

- javax.wsdl.xml;resolution:=optional,

- javax.xml.namespace,

- javax.xml.soap,

- javax.xml.stream,

- javax.xml.transform,

- javax.xml.transform.dom,

- javax.xml.ws,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.binding.ws;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.core.assembly;version="2.0.0",

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.definitions;version="2.0.0",

- org.apache.tuscany.sca.host.http;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.policy.authentication.basic;version="2.0.0",

- org.apache.tuscany.sca.policy.security;version="2.0.0",

- org.apache.tuscany.sca.policy.util;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.apache.tuscany.sca.xsd;version="2.0.0",

- org.apache.tuscany.sca.xsd.xml;version="2.0.0",

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,

- org.w3c.dom,

- org.xml.sax

-Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.jaxws

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/NOTICE b/java/sca-contrib/modules/binding-ws-jaxws/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/binding-ws-jaxws/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/pom.xml b/java/sca-contrib/modules/binding-ws-jaxws/pom.xml
deleted file mode 100644
index 88c88d77a9..0000000000
--- a/java/sca-contrib/modules/binding-ws-jaxws/pom.xml
+++ /dev/null
@@ -1,272 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-ws-jaxws</artifactId>
-    <name>Apache Tuscany SCA JAXWS-based WS Binding Extension</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!-- comment out the following to build offline -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <executions>
-                    <execution>
-                        <id>install-wsdl</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${basedir}/src/test/resources/wsdl/" />
-                                <get src="http://www.webservicex.net/WeatherForecast.asmx?wsdl"
-                                    dest="${basedir}/src/test/resources/wsdl/WeatherForecast.wsdl" verbose="true"
-                                    usetimestamp="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- end of offline excluded section -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <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.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.11</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>wsimport</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.example.weather</packageName>
-                            <wsdlDirectory>${basedir}/src/test/resources/wsdl</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>WeatherForecast.wsdl</wsdlFile>
-                            </wsdlFiles>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                    <target>2.1</target>
-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                    <verbose>false</verbose>
-                    <xnocompile>true</xnocompile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java b/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
deleted file mode 100644
index ecb3b4f87b..0000000000
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
+++ /dev/null
@@ -1,181 +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.binding.ws.jaxws;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.wsdl.extensions.soap12.SOAP12Operation;
-import javax.xml.namespace.QName;
-import javax.xml.soap.Detail;
-import javax.xml.soap.DetailEntry;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFault;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.soap.SOAPPart;
-import javax.xml.ws.Dispatch;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
-import javax.xml.ws.soap.SOAPFaultException;
-
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.w3c.dom.Node;
-
-/**
- * Axis2BindingInvoker uses an Axis2 OperationClient to invoke a remote web service
- *
- * @version $Rev$ $Date$
- */
-public class JAXWSBindingInvoker implements Invoker, DataExchangeSemantics {
-    private final static String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
-
-    public static final String TUSCANY_PREFIX = "tuscany";
-    public static final QName CALLBACK_ID_REFPARM_QN = new QName(SCA11_TUSCANY_NS, "CallbackID", TUSCANY_PREFIX);
-    public static final QName CONVERSATION_ID_REFPARM_QN =
-        new QName(SCA11_TUSCANY_NS, "ConversationID", TUSCANY_PREFIX);
-
-    private Dispatch<SOAPMessage> dispatch;
-    private MessageFactory messageFactory;
-    private Operation operation;
-    private WebServiceBinding wsBinding;
-
-    public JAXWSBindingInvoker(Operation operation,
-                               WebServiceFeature[] features,
-                               MessageFactory messageFactory,
-                               WebServiceBinding wsBinding) {
-        this.messageFactory = messageFactory;
-        this.operation = operation;
-        this.wsBinding = wsBinding;
-        this.dispatch = createDispatch(wsBinding);
-    }
-
-    private Dispatch<SOAPMessage> createDispatch(WebServiceBinding wsBinding) {
-        // FIXME: What should we do if the WSDL is generated in memory?
-        URL wsdlLocation = null;
-        try {
-            wsdlLocation = new URL(wsBinding.getWSDLDocument().getDocumentBaseURI());
-        } catch (MalformedURLException e) {
-            try {
-                wsdlLocation = wsBinding.getWSDLDefinition().getLocation().toURL();
-            } catch (MalformedURLException e1) {
-                // TODO Auto-generated catch block
-                e1.printStackTrace();
-            }
-        }
-        Service service = Service.create(wsdlLocation, wsBinding.getServiceName());
-        return service.createDispatch(new QName(wsBinding.getServiceName().getNamespaceURI(), wsBinding.getPortName()),
-                                      SOAPMessage.class,
-                                      Service.Mode.MESSAGE);
-    }
-
-    public Message invoke(Message msg) {
-        try {
-            SOAPMessage resp = invokeTarget(msg);
-            SOAPBody body = resp.getSOAPBody();
-            if (body != null) {
-                SOAPFault fault = body.getFault();
-                if (fault != null) {
-                    setFault(msg, fault);
-                } else {
-                    // The 1st child element
-                    msg.setBody(body.getChildElements().next());
-                }
-
-            }
-        } catch (SOAPFaultException e) {
-            e.printStackTrace();
-            setFault(msg, e.getFault());
-        } catch (WebServiceException e) {
-            msg.setFaultBody(e);
-        } catch (SOAPException e) {
-            msg.setFaultBody(e);
-        } catch (Throwable e) {
-            msg.setFaultBody(e);
-        }
-
-        return msg;
-    }
-
-    private void setFault(Message msg, SOAPFault fault) {
-        Detail detail = fault.getDetail();
-        if (detail == null) {
-            return;
-        }
-        for (Iterator i = detail.getDetailEntries(); i.hasNext();) {
-            DetailEntry entry = (DetailEntry)i.next();
-            msg.setFaultBody(entry);
-        }
-    }
-
-    protected String getSOAPAction(String operationName) {
-        Binding binding = wsBinding.getBinding();
-        if (binding != null) {
-            for (Object o : binding.getBindingOperations()) {
-                BindingOperation bop = (BindingOperation)o;
-                if (bop.getName().equalsIgnoreCase(operationName)) {
-                    for (Object o2 : bop.getExtensibilityElements()) {
-                        if (o2 instanceof SOAPOperation) {
-                            return ((SOAPOperation)o2).getSoapActionURI();
-                        } else if (o2 instanceof SOAP12Operation) {
-                            return ((SOAP12Operation)o2).getSoapActionURI();
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    protected SOAPMessage invokeTarget(Message msg) throws SOAPException {
-        SOAPMessage soapMessage = messageFactory.createMessage();
-        SOAPPart soapPart = soapMessage.getSOAPPart();
-        javax.xml.soap.SOAPEnvelope envelope = soapPart.getEnvelope();
-        javax.xml.soap.SOAPBody body = envelope.getBody();
-        Object[] args = (Object[])msg.getBody();
-        body.addDocument(((Node)args[0]).getOwnerDocument());
-        soapMessage.saveChanges();
-        if (operation.isNonBlocking()) {
-            dispatch.invokeOneWay(soapMessage);
-            return null;
-        }
-
-        // FIXME: We need to find out the soapAction
-        String action = getSOAPAction(operation.getName());
-        if (action != null) {
-            dispatch.getRequestContext().put(Dispatch.SOAPACTION_URI_PROPERTY, action);
-        }
-        SOAPMessage response = dispatch.invoke(soapMessage);
-        return response;
-    }
-
-    public boolean allowsPassByReference() {
-        return true;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProviderFactory.java b/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProviderFactory.java
deleted file mode 100644
index 056f6de88b..0000000000
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProviderFactory.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.binding.ws.jaxws;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Axis2BindingProviderFactory
- *
- * @version $Rev$ $Date$
- */
-
-public class JAXWSBindingProviderFactory implements BindingProviderFactory<WebServiceBinding> {
-
-    private FactoryExtensionPoint modelFactories;
-    private ServletHost servletHost;
-    private DataBindingExtensionPoint dataBindings;
-
-    public JAXWSBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        List<ServletHost> hosts = servletHosts.getServletHosts();
-        if (!hosts.isEmpty()) {
-            this.servletHost = hosts.get(0);
-        }
-        modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class);
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   WebServiceBinding binding) {
-        return new JAXWSReferenceBindingProvider(component, reference, binding,
-                                                 modelFactories, dataBindings);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               WebServiceBinding binding) {
-        return new JAXWSServiceBindingProvider(component, service, binding,
-                                               servletHost, modelFactories,
-                                               dataBindings);
-    }
-    
-    public Class<WebServiceBinding> getModelType() {
-        return WebServiceBinding.class;
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSReferenceBindingProvider.java b/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSReferenceBindingProvider.java
deleted file mode 100644
index 13f38044af..0000000000
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSReferenceBindingProvider.java
+++ /dev/null
@@ -1,77 +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.binding.ws.jaxws;
-
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.w3c.dom.Node;
-
-public class JAXWSReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private javax.xml.soap.MessageFactory messageFactory;
-    private WebServiceBinding wsBinding;
-
-    public JAXWSReferenceBindingProvider(RuntimeComponent component,
-                                         RuntimeComponentReference reference,
-                                         WebServiceBinding wsBinding,
-                                         FactoryExtensionPoint modelFactories,
-                                         DataBindingExtensionPoint dataBindings) {
-
-        this.messageFactory = modelFactories.getFactory(javax.xml.soap.MessageFactory.class);
-        this.wsBinding = wsBinding;
-
-        // A WSDL document should always be present in the binding
-        if (wsBinding.getWSDLDocument() == null) {
-            throw new ServiceRuntimeException("No WSDL document for " + component.getName() + "/" + reference.getName());
-        }
-
-        // Set to use the Axiom data binding
-        InterfaceContract contract = wsBinding.getBindingInterfaceContract();
-        if (contract.getInterface() != null) {
-            contract.getInterface().resetDataBinding(Node.class.getName());
-        }
-    }
-
-    public void start() {
-    }
-
-    public void stop() {
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return wsBinding.getBindingInterfaceContract();
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return true;
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        return new JAXWSBindingInvoker(operation, null, messageFactory, wsBinding);
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSServiceBindingProvider.java b/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSServiceBindingProvider.java
deleted file mode 100644
index c93fcb267a..0000000000
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSServiceBindingProvider.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.binding.ws.jaxws;
-
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Provider;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.Service.Mode;
-
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.w3c.dom.Node;
-
-@WebServiceProvider
-@ServiceMode(Mode.MESSAGE)
-public class JAXWSServiceBindingProvider implements ServiceBindingProvider, Provider<SOAPMessage> {
-
-    private WebServiceBinding wsBinding;
-    private Provider<SOAPMessage> provider;
-    private Endpoint endpoint;
-
-    public JAXWSServiceBindingProvider(RuntimeComponent component,
-                                       RuntimeComponentService service,
-                                       WebServiceBinding wsBinding,
-                                       ServletHost servletHost,
-                                       FactoryExtensionPoint modelFactories,
-                                       DataBindingExtensionPoint dataBindings) {
-
-        if (servletHost == null) {
-            throw new ServiceRuntimeException("No Servlet host is avaible for HTTP web services");
-        }
-
-        this.wsBinding = wsBinding;
-
-        // A WSDL document should always be present in the binding
-        if (wsBinding.getWSDLDocument() == null) {
-            throw new ServiceRuntimeException("No WSDL document for " + component.getName() + "/" + service.getName());
-        }
-
-        // Set to use the Axiom data binding
-        InterfaceContract contract = wsBinding.getBindingInterfaceContract();
-        contract.getInterface().resetDataBinding(Node.class.getName());
-
-    }
-
-    public void start() {
-        endpoint = Endpoint.create(this);
-        endpoint.publish(wsBinding.getURI());
-    }
-
-    public void stop() {
-        endpoint.stop();
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return wsBinding.getBindingInterfaceContract();
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return true;
-    }
-
-    public SOAPMessage invoke(SOAPMessage request) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca-contrib/modules/binding-ws-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 278db67112..0000000000
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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.

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.ws.jaxws.JAXWSBindingProviderFactory;model=org.apache.tuscany.sca.binding.ws.WebServiceBinding

diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastClient.java b/java/sca-contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastClient.java
deleted file mode 100644
index 38dc930f10..0000000000
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastClient.java
+++ /dev/null
@@ -1,67 +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 weather;
-
-import java.io.StringWriter;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import com.example.weather.GetWeatherByZipCodeResponse;
-import com.example.weather.WeatherForecastSoap;
-import com.example.weather.WeatherForecasts;
-
-/**
- * This client program to invoke the Mortgage LoanApproval service
- */
-public class WeatherForecastClient {
-
-    public static void main(String[] args) throws Exception {
-
-        String location = ContributionLocationHelper.getContributionLocation(WeatherForecastImpl.class);
-        Node node = NodeFactory.newInstance().createNode("WeatherForecast.composite", new Contribution("c1", location));
-        node.start();
-        WeatherForecastSoap weatherService = node.getService(WeatherForecastSoap.class, "WeatherForecastService");
-
-        WeatherForecasts result = weatherService.getWeatherByZipCode("94555");
-
-        // Dump the result as XML
-
-        // Wrap the result so that it can be marshaled
-        GetWeatherByZipCodeResponse response = new GetWeatherByZipCodeResponse();
-        response.setGetWeatherByZipCodeResult(result);
-
-        // Marshal the JAXB object into XML
-        JAXBContext context = JAXBContext.newInstance(GetWeatherByZipCodeResponse.class);
-        StringWriter writer = new StringWriter();
-        Marshaller marshaller = context.createMarshaller();
-        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-        marshaller.marshal(response, writer);
-
-        String xml = writer.toString();
-        System.out.println(xml);
-
-        node.stop();
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastImpl.java b/java/sca-contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastImpl.java
deleted file mode 100644
index d3b44450a7..0000000000
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastImpl.java
+++ /dev/null
@@ -1,43 +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 weather;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.example.weather.WeatherForecastSoap;
-import com.example.weather.WeatherForecasts;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(WeatherForecastSoap.class)
-public class WeatherForecastImpl implements WeatherForecastSoap{
-    @Reference
-    protected WeatherForecastSoap weatherForecast;
-
-    public WeatherForecasts getWeatherByPlaceName(String placeName) {
-        return weatherForecast.getWeatherByPlaceName(placeName);
-    }
-
-    public WeatherForecasts getWeatherByZipCode(String zipCode) {
-        return weatherForecast.getWeatherByZipCode(zipCode);
-    }
-}
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/test/resources/META-INF/sca-contribution.xml b/java/sca-contrib/modules/binding-ws-jaxws/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index db85bb2316..0000000000
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-              xmlns:w="http://weather">
-   <deployable composite="w:WeatherForecast"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/test/resources/WeatherForecast.composite b/java/sca-contrib/modules/binding-ws-jaxws/src/test/resources/WeatherForecast.composite
deleted file mode 100644
index ff9692b982..0000000000
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/test/resources/WeatherForecast.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://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://weather"

-           name="WeatherForecast">

-

-    <component name="WeatherForecastService">

-        <implementation.java class="weather.WeatherForecastImpl" />

-        <reference name="weatherForecast">

-            <binding.ws wsdlElement="http://www.webservicex.net#wsdl.port(WeatherForecast/WeatherForecastSoap)" />

-        </reference>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/common-xml/META-INF/MANIFEST.MF b/java/sca-contrib/modules/common-xml/META-INF/MANIFEST.MF
deleted file mode 100644
index ad4d6bd487..0000000000
--- a/java/sca-contrib/modules/common-xml/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Common XML

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397108125

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Core SPI

-Import-Package: javax.xml.namespace,

- javax.xml.xpath,

- javax.xml.datatype,

- javax.xml.parsers,

- javax.xml.stream,

- javax.xml.stream.util,

- javax.xml.transform,

- javax.xml.transform.dom,

- javax.xml.transform.sax,

- javax.xml.transform.stream,

- org.w3c.dom,

- org.xml.sax,

- org.xml.sax.ext,

- org.xml.sax.helpers,

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.extensibility;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.common.xml

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/common-xml/pom.xml b/java/sca-contrib/modules/common-xml/pom.xml
deleted file mode 100644
index 4b7a6df1d0..0000000000
--- a/java/sca-contrib/modules/common-xml/pom.xml
+++ /dev/null
@@ -1,66 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-common-xml</artifactId>
-    <name>Apache Tuscany SCA Common XML</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-                
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.4</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>xmlunit</groupId>
-            <artifactId>xmlunit</artifactId>
-            <version>1.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/SimpleTypeMapper.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/SimpleTypeMapper.java
deleted file mode 100644
index 8bdb8ae2df..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/SimpleTypeMapper.java
+++ /dev/null
@@ -1,210 +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.common.xml;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-/**
- * Simple type mapper that maps from XSD types to Java Classes and Java Classes to XSD types.
- *
- * @version $Rev$ $Date$
- */
-public class SimpleTypeMapper extends XSDDataTypeConverter {
-
-    public static final Map<Class<?>, String> JAVA2XML = new HashMap<Class<?>, String>();
-
-    public static final String URI_2001_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
-
-    public static final Map<QName, Class<?>> XML2JAVA = new HashMap<QName, Class<?>>();
-
-    public static final QName XSD_ANY = new QName(URI_2001_SCHEMA_XSD, "any");
-
-    public static final QName XSD_ANYSIMPLETYPE = new QName(URI_2001_SCHEMA_XSD, "anySimpleType");
-
-    public static final QName XSD_ANYTYPE = new QName(URI_2001_SCHEMA_XSD, "anyType");
-
-    public static final QName XSD_ANYURI = new QName(URI_2001_SCHEMA_XSD, "anyURI");
-
-    public static final QName XSD_BASE64 = new QName(URI_2001_SCHEMA_XSD, "base64Binary");
-
-    public static final QName XSD_BOOLEAN = new QName(URI_2001_SCHEMA_XSD, "boolean");
-
-    public static final QName XSD_BYTE = new QName(URI_2001_SCHEMA_XSD, "byte");
-
-    public static final QName XSD_DATE = new QName(URI_2001_SCHEMA_XSD, "date");
-
-    public static final QName XSD_DATETIME = new QName(URI_2001_SCHEMA_XSD, "dateTime");
-
-    public static final QName XSD_DAY = new QName(URI_2001_SCHEMA_XSD, "gDay");
-
-    public static final QName XSD_DECIMAL = new QName(URI_2001_SCHEMA_XSD, "decimal");
-
-    public static final QName XSD_DOUBLE = new QName(URI_2001_SCHEMA_XSD, "double");
-
-    public static final QName XSD_DURATION = new QName(URI_2001_SCHEMA_XSD, "duration");
-
-    public static final QName XSD_ENTITIES = new QName(URI_2001_SCHEMA_XSD, "ENTITIES");
-
-    public static final QName XSD_ENTITY = new QName(URI_2001_SCHEMA_XSD, "ENTITY");
-
-    public static final QName XSD_FLOAT = new QName(URI_2001_SCHEMA_XSD, "float");
-
-    public static final QName XSD_HEXBIN = new QName(URI_2001_SCHEMA_XSD, "hexBinary");
-
-    public static final QName XSD_IDREF = new QName(URI_2001_SCHEMA_XSD, "IDREF");
-
-    public static final QName XSD_IDREFS = new QName(URI_2001_SCHEMA_XSD, "IDREFS");
-
-    public static final QName XSD_INT = new QName(URI_2001_SCHEMA_XSD, "int");
-
-    public static final QName XSD_INTEGER = new QName(URI_2001_SCHEMA_XSD, "integer");
-
-    public static final QName XSD_LONG = new QName(URI_2001_SCHEMA_XSD, "long");
-
-    public static final QName XSD_MONTH = new QName(URI_2001_SCHEMA_XSD, "gMonth");
-
-    public static final QName XSD_MONTHDAY = new QName(URI_2001_SCHEMA_XSD, "gMonthDay");
-
-    public static final QName XSD_NAME = new QName(URI_2001_SCHEMA_XSD, "Name");
-
-    public static final QName XSD_NCNAME = new QName(URI_2001_SCHEMA_XSD, "NCName");
-
-    public static final QName XSD_NEGATIVEINTEGER = new QName(URI_2001_SCHEMA_XSD, "negativeInteger");
-
-    public static final QName XSD_NMTOKEN = new QName(URI_2001_SCHEMA_XSD, "NMTOKEN");
-
-    public static final QName XSD_NMTOKENS = new QName(URI_2001_SCHEMA_XSD, "NMTOKENS");
-
-    public static final QName XSD_NONNEGATIVEINTEGER = new QName(URI_2001_SCHEMA_XSD, "nonNegativeInteger");
-
-    public static final QName XSD_NONPOSITIVEINTEGER = new QName(URI_2001_SCHEMA_XSD, "nonPositiveInteger");
-
-    public static final QName XSD_NORMALIZEDSTRING = new QName(URI_2001_SCHEMA_XSD, "normalizedString");
-
-    public static final QName XSD_NOTATION = new QName(URI_2001_SCHEMA_XSD, "NOTATION");
-
-    public static final QName XSD_POSITIVEINTEGER = new QName(URI_2001_SCHEMA_XSD, "positiveInteger");
-
-    public static final QName XSD_QNAME = new QName(URI_2001_SCHEMA_XSD, "QName");
-
-    public static final QName XSD_SHORT = new QName(URI_2001_SCHEMA_XSD, "short");
-
-    public static final QName XSD_STRING = new QName(URI_2001_SCHEMA_XSD, "string");
-
-    public static final QName XSD_TIME = new QName(URI_2001_SCHEMA_XSD, "time");
-
-    public static final QName XSD_TOKEN = new QName(URI_2001_SCHEMA_XSD, "token");
-
-    public static final QName XSD_UNSIGNEDBYTE = new QName(URI_2001_SCHEMA_XSD, "unsignedByte");
-
-    public static final QName XSD_UNSIGNEDINT = new QName(URI_2001_SCHEMA_XSD, "unsignedInt");
-
-    public static final QName XSD_UNSIGNEDLONG = new QName(URI_2001_SCHEMA_XSD, "unsignedLong");
-
-    public static final QName XSD_UNSIGNEDSHORT = new QName(URI_2001_SCHEMA_XSD, "unsignedShort");
-
-    public static final QName XSD_YEAR = new QName(URI_2001_SCHEMA_XSD, "gYear");
-
-    public static final QName XSD_YEARMONTH = new QName(URI_2001_SCHEMA_XSD, "gYearMonth");
-
-    static {
-        JAVA2XML.put(boolean.class, "boolean");
-        JAVA2XML.put(byte.class, "byte");
-        JAVA2XML.put(short.class, "short");
-        JAVA2XML.put(int.class, "int");
-        JAVA2XML.put(long.class, "long");
-        JAVA2XML.put(float.class, "float");
-        JAVA2XML.put(double.class, "double");
-        JAVA2XML.put(Boolean.class, "boolean");
-        JAVA2XML.put(Byte.class, "byte");
-        JAVA2XML.put(Short.class, "short");
-        JAVA2XML.put(Integer.class, "int");
-        JAVA2XML.put(Long.class, "long");
-        JAVA2XML.put(Float.class, "float");
-        JAVA2XML.put(Double.class, "double");
-        JAVA2XML.put(java.lang.String.class, "string");
-        JAVA2XML.put(java.math.BigInteger.class, "integer");
-        JAVA2XML.put(java.math.BigDecimal.class, "decimal");
-        JAVA2XML.put(java.util.Calendar.class, "dateTime");
-        JAVA2XML.put(java.util.Date.class, "dateTime");
-        JAVA2XML.put(javax.xml.namespace.QName.class, "QName");
-        JAVA2XML.put(java.net.URI.class, "string");
-        JAVA2XML.put(javax.xml.datatype.XMLGregorianCalendar.class, "anySimpleType");
-        JAVA2XML.put(javax.xml.datatype.Duration.class, "duration");
-        JAVA2XML.put(java.lang.Object.class, "anyType");
-        JAVA2XML.put(java.awt.Image.class, "base64Binary");
-        JAVA2XML.put(byte[].class, "base64Binary");
-        // java2XSD.put(javax.activation.DataHandler.class, "base64Binary");
-        JAVA2XML.put(javax.xml.transform.Source.class, "base64Binary");
-        JAVA2XML.put(java.util.UUID.class, "string");
-    }
-
-    static {
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "string"), java.lang.String.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "integer"), java.math.BigInteger.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "int"), int.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "long"), long.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "short"), short.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "decimal"), java.math.BigDecimal.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "float"), float.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "double"), double.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "boolean"), boolean.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "byte"), byte.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "QName"), javax.xml.namespace.QName.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "dateTime"), javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "base64Binary"), byte[].class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "hexBinary"), byte[].class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "unsignedInt"), long.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "unsignedShort"), int.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "unsignedByte"), short.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "time"), javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "date"), javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "gDay"), javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "gMonth"), javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "gYear"), javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "gYearMonth"), javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "gMonthDay"), javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "anySimpleType"), java.lang.Object.class); // For elements
-        // XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "anySimpleType"), java.lang.String.class); // For
-        // attributes
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "duration"), javax.xml.datatype.Duration.class);
-        XML2JAVA.put(new QName(URI_2001_SCHEMA_XSD, "NOTATION"), javax.xml.namespace.QName.class);
-    }
-
-    public SimpleTypeMapper() {
-        super();
-    }
-
-    public static Class<?> getJavaType(QName xmlType) {
-        if (xmlType != null && URI_2001_SCHEMA_XSD.equals(xmlType.getNamespaceURI())) {
-            return XML2JAVA.get(xmlType.getLocalPart());
-        } else {
-            return null;
-        }
-    }
-
-    public static QName getXMLType(Class<?> javaType) {
-        return new QName(URI_2001_SCHEMA_XSD, JAVA2XML.get(javaType));
-    }
-
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XSDDataTypeConverter.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XSDDataTypeConverter.java
deleted file mode 100644
index 895e4e476c..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XSDDataTypeConverter.java
+++ /dev/null
@@ -1,945 +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.common.xml;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.text.FieldPosition;
-import java.text.Format;
-import java.text.ParsePosition;
-import java.util.Calendar;
-import java.util.TimeZone;
-
-import javax.xml.XMLConstants;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.Duration;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-
-/**
- * Utility class for XSD data type conversions
- *
- * @version $Rev$ $Date$
- */
-public class XSDDataTypeConverter {
-    public static final class Base64Binary {
-        private static final char[] S_BASE64CHAR =
-        {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
-            'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
-            'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4',
-            '5', '6', '7', '8', '9', '+', '/'};
-
-        private static final char S_BASE64PAD = '=';
-
-        private static final byte[] S_DECODETABLE = new byte[128];
-
-        static {
-            for (int i = 0; i < S_DECODETABLE.length; i++) {
-                S_DECODETABLE[i] = Byte.MAX_VALUE; // 127
-            }
-            for (int i = 0; i < S_BASE64CHAR.length; i++) {
-                // 0 to 63
-                S_DECODETABLE[S_BASE64CHAR[i]] = (byte) i;
-            }
-        }
-
-        private Base64Binary() {
-        }
-
-        /**
-         * 
-         */
-        public static byte[] decode(char[] data, int off, int len) {
-            char[] ibuf = new char[4];
-            int ibufcount = 0;
-            byte[] obuf = new byte[len / 4 * 3 + 3];
-            int obufcount = 0;
-            for (int i = off; i < off + len; i++) {
-                char ch = data[i];
-                if (ch == S_BASE64PAD || ch < S_DECODETABLE.length && S_DECODETABLE[ch] != Byte.MAX_VALUE) {
-                    ibuf[ibufcount++] = ch;
-                    if (ibufcount == ibuf.length) {
-                        ibufcount = 0;
-                        obufcount += decode0(ibuf, obuf, obufcount);
-                    }
-                }
-            }
-            if (obufcount == obuf.length) {
-                return obuf;
-            }
-            byte[] ret = new byte[obufcount];
-            System.arraycopy(obuf, 0, ret, 0, obufcount);
-            return ret;
-        }
-
-        /**
-         * 
-         */
-        public static void decode(char[] data, int off, int len, OutputStream ostream) throws IOException {
-            char[] ibuf = new char[4];
-            int ibufcount = 0;
-            byte[] obuf = new byte[3];
-            for (int i = off; i < off + len; i++) {
-                char ch = data[i];
-                if (ch == S_BASE64PAD || ch < S_DECODETABLE.length && S_DECODETABLE[ch] != Byte.MAX_VALUE) {
-                    ibuf[ibufcount++] = ch;
-                    if (ibufcount == ibuf.length) {
-                        ibufcount = 0;
-                        int obufcount = decode0(ibuf, obuf, 0);
-                        ostream.write(obuf, 0, obufcount);
-                    }
-                }
-            }
-        }
-
-        /**
-         * 
-         */
-        public static byte[] decode(String data) {
-            char[] ibuf = new char[4];
-            int ibufcount = 0;
-            byte[] obuf = new byte[data.length() / 4 * 3 + 3];
-            int obufcount = 0;
-            for (int i = 0; i < data.length(); i++) {
-                char ch = data.charAt(i);
-                if (ch == S_BASE64PAD || ch < S_DECODETABLE.length && S_DECODETABLE[ch] != Byte.MAX_VALUE) {
-                    ibuf[ibufcount++] = ch;
-                    if (ibufcount == ibuf.length) {
-                        ibufcount = 0;
-                        obufcount += decode0(ibuf, obuf, obufcount);
-                    }
-                }
-            }
-            if (obufcount == obuf.length) {
-                return obuf;
-            }
-            byte[] ret = new byte[obufcount];
-            System.arraycopy(obuf, 0, ret, 0, obufcount);
-            return ret;
-        }
-
-        /**
-         * 
-         */
-        public static void decode(String data, OutputStream ostream) throws IOException {
-            char[] ibuf = new char[4];
-            int ibufcount = 0;
-            byte[] obuf = new byte[3];
-            for (int i = 0; i < data.length(); i++) {
-                char ch = data.charAt(i);
-                if (ch == S_BASE64PAD || ch < S_DECODETABLE.length && S_DECODETABLE[ch] != Byte.MAX_VALUE) {
-                    ibuf[ibufcount++] = ch;
-                    if (ibufcount == ibuf.length) {
-                        ibufcount = 0;
-                        int obufcount = decode0(ibuf, obuf, 0);
-                        ostream.write(obuf, 0, obufcount);
-                    }
-                }
-            }
-        }
-
-        private static int decode0(char[] ibuf, byte[] obuf, int index) {
-            int wp = index;
-            int outlen = 3;
-            if (ibuf[3] == S_BASE64PAD) {
-                outlen = 2;
-            }
-            if (ibuf[2] == S_BASE64PAD) {
-                outlen = 1;
-            }
-            int b0 = S_DECODETABLE[ibuf[0]];
-            int b1 = S_DECODETABLE[ibuf[1]];
-            int b2 = S_DECODETABLE[ibuf[2]];
-            int b3 = S_DECODETABLE[ibuf[3]];
-            switch (outlen) {
-                case 1:
-                    obuf[wp] = (byte) (b0 << 2 & 0xfc | b1 >> 4 & 0x3);
-                    return 1;
-                case 2:
-                    obuf[wp++] = (byte) (b0 << 2 & 0xfc | b1 >> 4 & 0x3);
-                    obuf[wp] = (byte) (b1 << 4 & 0xf0 | b2 >> 2 & 0xf);
-                    return 2;
-                case 3:
-                    obuf[wp++] = (byte) (b0 << 2 & 0xfc | b1 >> 4 & 0x3);
-                    obuf[wp++] = (byte) (b1 << 4 & 0xf0 | b2 >> 2 & 0xf);
-                    obuf[wp] = (byte) (b2 << 6 & 0xc0 | b3 & 0x3f);
-                    return 3;
-                default:
-                    throw new IllegalArgumentException("The character sequence is not base64 encoded.");
-            }
-        }
-
-        /**
-         * Returns base64 representation of specified byte array.
-         */
-        public static String encode(byte[] data) {
-            return encode(data, 0, data.length);
-        }
-
-        /**
-         * Returns base64 representation of specified byte array.
-         */
-        public static String encode(byte[] data, int off, int len) {
-            if (len <= 0) {
-                return "";
-            }
-            char[] out = new char[len / 3 * 4 + 4];
-            int rindex = off;
-            int windex = 0;
-            int rest = len - off;
-            while (rest >= 3) {
-                int i =
-                    ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8)
-                        + (data[rindex + 2] & 0xff);
-                out[windex++] = S_BASE64CHAR[i >> 18];
-                out[windex++] = S_BASE64CHAR[(i >> 12) & 0x3f];
-                out[windex++] = S_BASE64CHAR[(i >> 6) & 0x3f];
-                out[windex++] = S_BASE64CHAR[i & 0x3f];
-                rindex += 3;
-                rest -= 3;
-            }
-            if (rest == 1) {
-                int i = data[rindex] & 0xff;
-                out[windex++] = S_BASE64CHAR[i >> 2];
-                out[windex++] = S_BASE64CHAR[(i << 4) & 0x3f];
-                out[windex++] = S_BASE64PAD;
-                out[windex++] = S_BASE64PAD;
-            } else if (rest == 2) {
-                int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff);
-                out[windex++] = S_BASE64CHAR[i >> 10];
-                out[windex++] = S_BASE64CHAR[(i >> 4) & 0x3f];
-                out[windex++] = S_BASE64CHAR[(i << 2) & 0x3f];
-                out[windex++] = S_BASE64PAD;
-            }
-            return new String(out, 0, windex);
-        }
-
-        /**
-         * Outputs base64 representation of the specified byte array to a byte stream.
-         */
-        public static void encode(byte[] data, int off, int len, OutputStream ostream) throws IOException {
-            if (len <= 0) {
-                return;
-            }
-            byte[] out = new byte[4];
-            int rindex = off;
-            int rest = len - off;
-            while (rest >= 3) {
-                int i =
-                    ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8)
-                        + (data[rindex + 2] & 0xff);
-                out[0] = (byte) S_BASE64CHAR[i >> 18];
-                out[1] = (byte) S_BASE64CHAR[(i >> 12) & 0x3f];
-                out[2] = (byte) S_BASE64CHAR[(i >> 6) & 0x3f];
-                out[3] = (byte) S_BASE64CHAR[i & 0x3f];
-                ostream.write(out, 0, 4);
-                rindex += 3;
-                rest -= 3;
-            }
-            if (rest == 1) {
-                int i = data[rindex] & 0xff;
-                out[0] = (byte) S_BASE64CHAR[i >> 2];
-                out[1] = (byte) S_BASE64CHAR[(i << 4) & 0x3f];
-                out[2] = (byte) S_BASE64PAD;
-                out[3] = (byte) S_BASE64PAD;
-                ostream.write(out, 0, 4);
-            } else if (rest == 2) {
-                int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff);
-                out[0] = (byte) S_BASE64CHAR[i >> 10];
-                out[1] = (byte) S_BASE64CHAR[(i >> 4) & 0x3f];
-                out[2] = (byte) S_BASE64CHAR[(i << 2) & 0x3f];
-                out[3] = (byte) S_BASE64PAD;
-                ostream.write(out, 0, 4);
-            }
-        }
-
-        /**
-         * Outputs base64 representation of the specified byte array to a character stream.
-         */
-        public static void encode(byte[] data, int off, int len, Writer writer) throws IOException {
-            if (len <= 0) {
-                return;
-            }
-            char[] out = new char[4];
-            int rindex = off;
-            int rest = len - off;
-            int output = 0;
-            while (rest >= 3) {
-                int i =
-                    ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8)
-                        + (data[rindex + 2] & 0xff);
-                out[0] = S_BASE64CHAR[i >> 18];
-                out[1] = S_BASE64CHAR[(i >> 12) & 0x3f];
-                out[2] = S_BASE64CHAR[(i >> 6) & 0x3f];
-                out[3] = S_BASE64CHAR[i & 0x3f];
-                writer.write(out, 0, 4);
-                rindex += 3;
-                rest -= 3;
-                output += 4;
-                if (output % 76 == 0) {
-                    writer.write("\n");
-                }
-            }
-            if (rest == 1) {
-                int i = data[rindex] & 0xff;
-                out[0] = S_BASE64CHAR[i >> 2];
-                out[1] = S_BASE64CHAR[(i << 4) & 0x3f];
-                out[2] = S_BASE64PAD;
-                out[3] = S_BASE64PAD;
-                writer.write(out, 0, 4);
-            } else if (rest == 2) {
-                int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff);
-                out[0] = S_BASE64CHAR[i >> 10];
-                out[1] = S_BASE64CHAR[(i >> 4) & 0x3f];
-                out[2] = S_BASE64CHAR[(i << 2) & 0x3f];
-                out[3] = S_BASE64PAD;
-                writer.write(out, 0, 4);
-            }
-        }
-    }
-
-    /**
-     * <p/>
-     * Utility class for xs:hexbinary. </p>
-     */
-    public static final class HexBinary {
-        private HexBinary() {
-        }
-
-        /**
-         * Converts the string <code>pValue</code> into an array of hex bytes.
-         */
-        public static byte[] decode(String pValue) {
-            if ((pValue.length() % 2) != 0) {
-                throw new IllegalArgumentException("A HexBinary string must have even length.");
-            }
-            byte[] result = new byte[pValue.length() / 2];
-            int j = 0;
-            int i = 0;
-            while (i < pValue.length()) {
-                byte b;
-                char c = pValue.charAt(i++);
-                char d = pValue.charAt(i++);
-                if (c >= '0' && c <= '9') {
-                    b = (byte) ((c - '0') << 4);
-                } else if (c >= 'A' && c <= 'F') {
-                    b = (byte) ((c - 'A' + 10) << 4);
-                } else if (c >= 'a' && c <= 'f') {
-                    b = (byte) ((c - 'a' + 10) << 4);
-                } else {
-                    throw new IllegalArgumentException("Invalid hex digit: " + c);
-                }
-                if (d >= '0' && d <= '9') {
-                    b += (byte) (d - '0');
-                } else if (d >= 'A' && d <= 'F') {
-                    b += (byte) (d - 'A' + 10);
-                } else if (d >= 'a' && d <= 'f') {
-                    b += (byte) (d - 'a' + 10);
-                } else {
-                    throw new IllegalArgumentException("Invalid hex digit: " + d);
-                }
-                result[j++] = b;
-            }
-            return result;
-        }
-
-        /**
-         * Converts the byte array <code>pHexBinary</code> into a string.
-         */
-        public static String encode(byte[] pHexBinary) {
-            StringBuffer result = new StringBuffer();
-            for (int i = 0; i < pHexBinary.length; i++) {
-                byte b = pHexBinary[i];
-                byte c = (byte) ((b & 0xf0) >> 4);
-                if (c <= 9) {
-                    result.append((char) ('0' + c));
-                } else {
-                    result.append((char) ('A' + c - 10));
-                }
-                c = (byte) (b & 0x0f);
-                if (c <= 9) {
-                    result.append((char) ('0' + c));
-                } else {
-                    result.append((char) ('A' + c - 10));
-                }
-            }
-            return result.toString();
-        }
-
-        /**
-         * Creates a clone of the given byte array.
-         */
-        public static byte[] getClone(byte[] pHexBinary) {
-            byte[] result = new byte[pHexBinary.length];
-            System.arraycopy(pHexBinary, 0, result, 0, pHexBinary.length);
-            return result;
-        }
-    }
-
-    public class XSDDateFormat extends XSDDateTimeFormat {
-        private static final long serialVersionUID = -1629412916827246627L;
-
-        /**
-         * Creates a new instance.
-         */
-        public XSDDateFormat() {
-            super(true, false);
-        }
-    }
-
-    /**
-     * <p/>
-     * An instance of {@link java.text.Format}, which may be used to parse and format <code>xs:dateTime</code> values.
-     * </p>
-     */
-    public static class XSDDateTimeFormat extends Format {
-        private static final long serialVersionUID = -1148332471737068969L;
-
-        final boolean parseDate;
-
-        final boolean parseTime;
-
-        /**
-         * Creates a new instance.
-         */
-        public XSDDateTimeFormat() {
-            this(true, true);
-        }
-
-        XSDDateTimeFormat(boolean pParseDate, boolean pParseTime) {
-            parseDate = pParseDate;
-            parseTime = pParseTime;
-        }
-
-        private void append(StringBuffer pBuffer, int pNum, int pMinLen) {
-            String s = Integer.toString(pNum);
-            for (int i = s.length(); i < pMinLen; i++) {
-                pBuffer.append('0');
-            }
-            pBuffer.append(s);
-        }
-
-        @Override
-        public StringBuffer format(Object pCalendar, StringBuffer pBuffer, FieldPosition pPos) {
-            assert pCalendar != null : "The Calendar argument must not be null.";
-            assert pBuffer != null : "The StringBuffer argument must not be null.";
-            assert pPos != null : "The FieldPosition argument must not be null.";
-
-            Calendar cal = (Calendar) pCalendar;
-            if (parseDate) {
-                int year = cal.get(Calendar.YEAR);
-                if (year < 0) {
-                    pBuffer.append('-');
-                    year = -year;
-                }
-                append(pBuffer, year, 4);
-                pBuffer.append('-');
-                append(pBuffer, cal.get(Calendar.MONTH) + 1, 2);
-                pBuffer.append('-');
-                append(pBuffer, cal.get(Calendar.DAY_OF_MONTH), 2);
-                if (parseTime) {
-                    pBuffer.append('T');
-                }
-            }
-            if (parseTime) {
-                append(pBuffer, cal.get(Calendar.HOUR_OF_DAY), 2);
-                pBuffer.append(':');
-                append(pBuffer, cal.get(Calendar.MINUTE), 2);
-                pBuffer.append(':');
-                append(pBuffer, cal.get(Calendar.SECOND), 2);
-                int millis = cal.get(Calendar.MILLISECOND);
-                if (millis > 0) {
-                    pBuffer.append('.');
-                    append(pBuffer, millis, 3);
-                }
-            }
-            TimeZone tz = cal.getTimeZone();
-            // JDK 1.4: int offset = tz.getOffset(cal.getTimeInMillis());
-            int offset = cal.get(Calendar.ZONE_OFFSET);
-            if (tz.inDaylightTime(cal.getTime())) {
-                offset += cal.get(Calendar.DST_OFFSET);
-            }
-            if (offset == 0) {
-                pBuffer.append('Z');
-            } else {
-                if (offset < 0) {
-                    pBuffer.append('-');
-                    offset = -offset;
-                } else {
-                    pBuffer.append('+');
-                }
-                int minutes = offset / (60 * 1000);
-                int hours = minutes / 60;
-                minutes -= hours * 60;
-                append(pBuffer, hours, 2);
-                pBuffer.append(':');
-                append(pBuffer, minutes, 2);
-            }
-            return pBuffer;
-        }
-
-        private int parseInt(String pString, int offset, StringBuffer pDigits) {
-            int length = pString.length();
-            int pOffset = offset;
-            pDigits.setLength(0);
-            while (pOffset < length) {
-                char c = pString.charAt(pOffset);
-                if (Character.isDigit(c)) {
-                    pDigits.append(c);
-                    ++pOffset;
-                } else {
-                    break;
-                }
-            }
-            return pOffset;
-        }
-
-        @Override
-        public Object parseObject(String pString, ParsePosition pParsePosition) {
-            assert pString != null : "The String argument must not be null.";
-            assert pParsePosition != null : "The ParsePosition argument must not be null.";
-            int offset = pParsePosition.getIndex();
-            int length = pString.length();
-
-            boolean isMinus = false;
-            StringBuffer digits = new StringBuffer();
-            int year = 0;
-            int month = 0;
-            int mday = 0;
-            if (parseDate) {
-                // Sign
-                if (offset < length) {
-                    char c = pString.charAt(offset);
-                    if (c == '+') {
-                        ++offset;
-                    } else if (c == '-') {
-                        ++offset;
-                        isMinus = true;
-                    }
-                }
-
-                offset = parseInt(pString, offset, digits);
-                if (digits.length() < 4) {
-                    pParsePosition.setErrorIndex(offset);
-                    return null;
-                }
-                year = Integer.parseInt(digits.toString());
-
-                if (offset < length && pString.charAt(offset) == '-') {
-                    ++offset;
-                } else {
-                    pParsePosition.setErrorIndex(offset);
-                    return null;
-                }
-
-                offset = parseInt(pString, offset, digits);
-                if (digits.length() != 2) {
-                    pParsePosition.setErrorIndex(offset);
-                    return null;
-                }
-                month = Integer.parseInt(digits.toString());
-
-                if (offset < length && pString.charAt(offset) == '-') {
-                    ++offset;
-                } else {
-                    pParsePosition.setErrorIndex(offset);
-                    return null;
-                }
-
-                offset = parseInt(pString, offset, digits);
-                if (digits.length() != 2) {
-                    pParsePosition.setErrorIndex(offset);
-                    return null;
-                }
-                mday = Integer.parseInt(digits.toString());
-
-                if (parseTime) {
-                    if (offset < length && pString.charAt(offset) == 'T') {
-                        ++offset;
-                    } else {
-                        pParsePosition.setErrorIndex(offset);
-                        return null;
-                    }
-                }
-            } else {
-                year = month = mday = 0;
-            }
-
-            int hour = 0;
-            int minute = 0;
-            int second = 0;
-            int millis = 0;
-            if (parseTime) {
-                offset = parseInt(pString, offset, digits);
-                if (digits.length() != 2) {
-                    pParsePosition.setErrorIndex(offset);
-                    return null;
-                }
-                hour = Integer.parseInt(digits.toString());
-
-                if (offset < length && pString.charAt(offset) == ':') {
-                    ++offset;
-                } else {
-                    pParsePosition.setErrorIndex(offset);
-                    return null;
-                }
-
-                offset = parseInt(pString, offset, digits);
-                if (digits.length() != 2) {
-                    pParsePosition.setErrorIndex(offset);
-                    return null;
-                }
-                minute = Integer.parseInt(digits.toString());
-
-                if (offset < length && pString.charAt(offset) == ':') {
-                    ++offset;
-                } else {
-                    pParsePosition.setErrorIndex(offset);
-                    return null;
-                }
-
-                offset = parseInt(pString, offset, digits);
-                if (digits.length() != 2) {
-                    pParsePosition.setErrorIndex(offset);
-                    return null;
-                }
-                second = Integer.parseInt(digits.toString());
-
-                if (offset < length && pString.charAt(offset) == '.') {
-                    ++offset;
-                    offset = parseInt(pString, offset, digits);
-                    if (digits.length() > 0) {
-                        millis = Integer.parseInt(digits.toString());
-                    } else {
-                        millis = 0;
-                    }
-                } else {
-                    millis = 0;
-                }
-            } else {
-                hour = minute = second = millis = 0;
-            }
-
-            digits.setLength(0);
-            digits.append("GMT");
-            if (offset < length) {
-                char c = pString.charAt(offset);
-                if (c == 'Z') {
-                    // Ignore UTC, it is the default
-                    ++offset;
-                } else if (c == '+' || c == '-') {
-                    digits.append(c);
-                    ++offset;
-                    for (int i = 0; i < 5; i++) {
-                        if (offset >= length) {
-                            pParsePosition.setErrorIndex(offset);
-                            return null;
-                        }
-                        c = pString.charAt(offset);
-                        if ((i != 2 && Character.isDigit(c)) || (i == 2 && c == ':')) {
-                            digits.append(c);
-                        } else {
-                            pParsePosition.setErrorIndex(offset);
-                            return null;
-                        }
-                        ++offset;
-                    }
-                }
-            }
-
-            Calendar cal = Calendar.getInstance(TimeZone.getTimeZone(digits.toString()));
-            cal.set(isMinus ? -year : year, parseDate ? month - 1 : month, mday, hour, minute, second);
-            cal.set(Calendar.MILLISECOND, millis);
-            pParsePosition.setIndex(offset);
-            return cal;
-        }
-    }
-
-    public static class XSDTimeFormat extends XSDDateTimeFormat {
-        private static final long serialVersionUID = 1346506860724640517L;
-
-        /**
-         * Creates a new instance.
-         */
-        public XSDTimeFormat() {
-            super(false, true);
-        }
-    }
-
-    private static final long MAX_UNSIGNED_INT = (((long) Integer.MAX_VALUE) * 2) + 1;
-
-    private static final int MAX_UNSIGNED_SHORT = Short.MAX_VALUE * 2 + 1;
-
-    public String parseAnySimpleType(String value) {
-        return value;
-    }
-
-    public byte[] parseBase64Binary(String value) {
-        return Base64Binary.decode(value);
-    }
-
-    public boolean parseBoolean(String value) {
-        return Boolean.valueOf(value).booleanValue();
-    }
-
-    public byte parseByte(String value) {
-        return Byte.parseByte(value);
-    }
-
-    public Calendar parseDate(String value) {
-        XSDDateFormat format = new XSDDateFormat();
-        ParsePosition pos = new ParsePosition(0);
-        Calendar cal = (Calendar) format.parseObject(value, pos);
-        if (cal == null) {
-            throw new IllegalArgumentException("Failed to parse date " + value + " at:"
-                + value.substring(pos.getErrorIndex()));
-        }
-        return cal;
-    }
-
-    public Calendar parseDateTime(String value) {
-        XSDDateTimeFormat format = new XSDDateTimeFormat();
-        ParsePosition pos = new ParsePosition(0);
-        Calendar cal = (Calendar) format.parseObject(value, pos);
-        if (cal == null) {
-            throw new IllegalArgumentException("Failed to parse dateTime " + value + " at:"
-                + value.substring(pos.getErrorIndex()));
-        }
-        return cal;
-    }
-
-    public BigDecimal parseDecimal(String value) {
-        return new BigDecimal(value);
-    }
-
-    public double parseDouble(String value) {
-        if ("INF".equals(value)) {
-            return Double.POSITIVE_INFINITY;
-        } else if ("-INF".equals(value)) {
-            return Double.NEGATIVE_INFINITY;
-        } else if ("NaN".equals(value)) {
-            return Double.NaN;
-        } else {
-            return Double.parseDouble(value);
-        }
-    }
-
-    public Duration parseDuration(String pDuration) {
-        try {
-            return DatatypeFactory.newInstance().newDuration(pDuration);
-        } catch (DatatypeConfigurationException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    public float parseFloat(String value) {
-        if ("INF".equals(value)) {
-            return Float.POSITIVE_INFINITY;
-        } else if ("-INF".equals(value)) {
-            return Float.NEGATIVE_INFINITY;
-        } else if ("NaN".equals(value)) {
-            return Float.NaN;
-        } else {
-            return Float.parseFloat(value);
-        }
-    }
-
-    public byte[] parseHexBinary(String value) {
-        return HexBinary.decode(value);
-    }
-
-    public int parseInt(String value) {
-        return Integer.parseInt(value);
-    }
-
-    public BigInteger parseInteger(String value) {
-        return new BigInteger(value);
-    }
-
-    public long parseLong(String value) {
-        return Long.parseLong(value);
-    }
-
-    public QName parseQName(String value, NamespaceContext context) {
-        int offset = value.indexOf(':');
-        String uri;
-        String localName;
-        switch (offset) {
-            case -1:
-                localName = value;
-                uri = context.getNamespaceURI("");
-                if (uri == null) {
-                    // Should not happen, indicates an error in the
-                    // NamespaceContext
-                    // implementation
-                    throw new IllegalArgumentException("The default prefix is not bound.");
-                }
-                break;
-            case 0:
-                throw new IllegalArgumentException("Default prefix must be indicated by not using a colon: "
-                    + value);
-            default:
-                String prefix = value.substring(0, offset);
-                localName = value.substring(offset + 1);
-                uri = context.getNamespaceURI(prefix);
-                if (uri == null) {
-                    throw new IllegalArgumentException("The prefix " + prefix + " is not bound.");
-                }
-        }
-        return new QName(uri, localName);
-    }
-
-    public short parseShort(String value) {
-        return Short.parseShort(value);
-    }
-
-    public String parseString(String value) {
-        return value;
-    }
-
-    public Calendar parseTime(String value) {
-        XSDTimeFormat format = new XSDTimeFormat();
-        ParsePosition pos = new ParsePosition(0);
-        Calendar cal = (Calendar) format.parseObject(value, pos);
-        if (cal == null) {
-            throw new IllegalArgumentException("Failed to parse time " + value + " at:"
-                + value.substring(pos.getErrorIndex()));
-        }
-        return cal;
-    }
-
-    public long parseUnsignedInt(String value) {
-        long l = Long.parseLong(value);
-        if (l < 0) {
-            throw new IllegalArgumentException("Failed to parse UnsignedInt " + value
-                + ": result is negative");
-        }
-        if (l > MAX_UNSIGNED_INT) {
-            throw new IllegalArgumentException("Failed to parse UnsignedInt " + value
-                + ": result exceeds maximum value " + MAX_UNSIGNED_INT);
-        }
-        return l;
-    }
-
-    public int parseUnsignedShort(String value) {
-        int i = Integer.parseInt(value);
-        if (i < 0) {
-            throw new IllegalArgumentException("Failed to parse UnsignedShort " + value
-                + ": result is negative");
-        }
-        if (i > MAX_UNSIGNED_SHORT) {
-            throw new IllegalArgumentException("Failed to parse UnsignedShort " + value
-                + ": result exceeds maximum value " + MAX_UNSIGNED_SHORT);
-        }
-        return i;
-    }
-
-    public String printAnySimpleType(String value) {
-        return value;
-    }
-
-    public String printBase64Binary(byte[] value) {
-        return Base64Binary.encode(value);
-    }
-
-    public String printBoolean(boolean value) {
-        return (value ? Boolean.TRUE : Boolean.FALSE).toString();
-    }
-
-    public String printByte(byte value) {
-        return Byte.toString(value);
-    }
-
-    public String printDate(Calendar value) {
-        return new XSDDateFormat().format(value);
-    }
-
-    public String printDateTime(Calendar value) {
-        return new XSDDateTimeFormat().format(value);
-    }
-
-    public String printDecimal(BigDecimal value) {
-        return value.toString();
-    }
-
-    public String printDouble(double value) {
-        return Double.toString(value);
-    }
-
-    public String printDuration(Duration pDuration) {
-        return pDuration.toString();
-    }
-
-    public String printFloat(float value) {
-        return Float.toString(value);
-    }
-
-    public String printHexBinary(byte[] value) {
-        return HexBinary.encode(value);
-    }
-
-    public String printInt(int value) {
-        return Integer.toString(value);
-    }
-
-    public String printInteger(BigInteger value) {
-        return value.toString();
-    }
-
-    public String printLong(long value) {
-        return Long.toString(value);
-    }
-
-    public String printQName(QName value, NamespaceContext context) {
-        String prefix = context.getPrefix(value.getNamespaceURI());
-        if (prefix == null) {
-            throw new IllegalArgumentException("The namespace URI " + value.getNamespaceURI()
-                + " is not bound.");
-        } else if (XMLConstants.DEFAULT_NS_PREFIX.equals(prefix)) {
-            return value.getLocalPart();
-        } else {
-            return prefix + ":" + value.getLocalPart();
-        }
-    }
-
-    public String printShort(short value) {
-        return Short.toString(value);
-    }
-
-    public String printString(String value) {
-        return value;
-    }
-
-    public String printTime(Calendar value) {
-        return new XSDTimeFormat().format(value);
-    }
-
-    public String printUnsignedInt(long value) {
-        return Long.toString(value);
-    }
-
-    public String printUnsignedShort(int value) {
-        return Integer.toString(value);
-    }
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java
deleted file mode 100644
index db2ce906e1..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java
+++ /dev/null
@@ -1,115 +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.common.xml.dom;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * Helper for DOM
- *
- * @version $Rev$ $Date$
- */
-public final class DOMHelper {
-    private static DocumentBuilderFactory FACTORY;
-
-    private DOMHelper() {
-    }
-
-    public static Document newDocument() throws ParserConfigurationException {
-        return newDocumentBuilder().newDocument();
-    }
-
-    public static DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {
-        init();
-        return FACTORY.newDocumentBuilder();
-    }
-
-    /**
-     * 
-     */
-    private static synchronized void init() {
-        if (FACTORY == null) {
-            FACTORY = DocumentBuilderFactory.newInstance();
-            FACTORY.setNamespaceAware(true);
-        }
-    }
-
-    public static QName getQName(Node node) {
-        String ns = node.getNamespaceURI();
-        if (ns == null) {
-            ns = "";
-        }
-        // node.getLocalName() will return null if it is created using DOM Level
-        // 1 method
-        // such as createElement()
-        return new QName(ns, node.getNodeName());
-    }
-
-    public static Element createElement(Document document, QName name) {
-        String prefix = name.getPrefix();
-        String qname =
-            (prefix != null && prefix.length() > 0) ? prefix + ":" + name.getLocalPart() : name.getLocalPart();
-        return document.createElementNS(name.getNamespaceURI(), qname);
-    }
-
-    /**
-     * Wrap an element as a DOM document
-     * @param node
-     * @return
-     */
-    public static Document promote(Node node) {
-        if (node instanceof Document) {
-            return (Document)node;
-        }
-        Element element = (Element)node;
-        Document doc = element.getOwnerDocument();
-        if (doc.getDocumentElement() == element) {
-            return doc;
-        }
-        doc = (Document)element.getOwnerDocument().cloneNode(false);
-        Element schema = (Element)doc.importNode(element, true);
-        doc.appendChild(schema);
-        Node parent = element.getParentNode();
-        while (parent instanceof Element) {
-            Element root = (Element)parent;
-            NamedNodeMap nodeMap = root.getAttributes();
-            for (int i = 0; i < nodeMap.getLength(); i++) {
-                Attr attr = (Attr)nodeMap.item(i);
-                String name = attr.getName();
-                if ("xmlns".equals(name) || name.startsWith("xmlns:")) {
-                    if (schema.getAttributeNode(name) == null) {
-                        schema.setAttributeNodeNS((Attr)doc.importNode(attr, true));
-                    }
-                }
-            }
-            parent = parent.getParentNode();
-        }
-        return doc;
-    }
-
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/SAX2DOMAdapter.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/SAX2DOMAdapter.java
deleted file mode 100644
index 6b721583aa..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/SAX2DOMAdapter.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.common.xml.dom;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
-
-/**
- * SAX2DOM adapter
- *
- * @version $Rev$ $Date$
- */
-public class SAX2DOMAdapter implements ContentHandler, LexicalHandler {
-    public static final String EMPTYSTRING = "";
-    public static final String XML_PREFIX = "xml";
-    public static final String XMLNS_PREFIX = "xmlns";
-    public static final String XMLNS_STRING = "xmlns:";
-    public static final String XMLNS_URI = "http://www.w3.org/2000/xmlns/";
-
-    private Node root;
-
-    private Document document;
-
-    private Node nextSibling;
-
-    private Stack<Node> nodeStk = new Stack<Node>();
-
-    private List<String> namespaceDecls;
-
-    private Node lastSibling;
-
-    public SAX2DOMAdapter() throws ParserConfigurationException {
-        this.document = DOMHelper.newDocument();
-        this.root = document;
-    }
-
-    public SAX2DOMAdapter(Node root, Node nextSibling) throws ParserConfigurationException {
-        this.root = root;
-        if (root instanceof Document) {
-            this.document = (Document)root;
-        } else if (root != null) {
-            this.document = root.getOwnerDocument();
-        } else {
-            this.document = DOMHelper.newDocument();
-            this.root = document;
-        }
-
-        this.nextSibling = nextSibling;
-    }
-
-    public SAX2DOMAdapter(Node root) throws ParserConfigurationException {
-        this(root, null);
-    }
-
-    public Node getDOM() {
-        return root;
-    }
-
-    public void characters(char[] ch, int start, int length) {
-        final Node last = nodeStk.peek();
-
-        // No text nodes can be children of root (DOM006 exception)
-        if (last != document) {
-            final String text = new String(ch, start, length);
-            if (lastSibling != null && lastSibling.getNodeType() == Node.TEXT_NODE) {
-                ((Text)lastSibling).appendData(text);
-            } else if (last == root && nextSibling != null) {
-                lastSibling = last.insertBefore(document.createTextNode(text), nextSibling);
-            } else {
-                lastSibling = last.appendChild(document.createTextNode(text));
-            }
-
-        }
-    }
-
-    public void startDocument() {
-        nodeStk.push(root);
-    }
-
-    public void endDocument() {
-        nodeStk.pop();
-    }
-
-    public void startElement(String namespace, String localName, String qName, Attributes attrs) {
-        final Element tmp = document.createElementNS(namespace, qName);
-
-        // Add namespace declarations first
-        if (namespaceDecls != null) {
-            final int nDecls = namespaceDecls.size();
-            for (int i = 0; i < nDecls; i++) {
-                final String prefix = namespaceDecls.get(i++);
-
-                if (prefix == null || prefix.equals(EMPTYSTRING)) {
-                    tmp.setAttributeNS(XMLNS_URI, XMLNS_PREFIX, namespaceDecls.get(i));
-                } else {
-                    tmp.setAttributeNS(XMLNS_URI, XMLNS_STRING + prefix, namespaceDecls.get(i));
-                }
-            }
-            namespaceDecls.clear();
-        }
-
-        // Add attributes to element
-        final int nattrs = attrs.getLength();
-        for (int i = 0; i < nattrs; i++) {
-            if (attrs.getLocalName(i) == null) {
-                tmp.setAttribute(attrs.getQName(i), attrs.getValue(i));
-            } else {
-                tmp.setAttributeNS(attrs.getURI(i), attrs.getQName(i), attrs.getValue(i));
-            }
-        }
-
-        // Append this new node onto current stack node
-        Node last = nodeStk.peek();
-
-        // If the SAX2DOM is created with a non-null next sibling node,
-        // insert the result nodes before the next sibling under the root.
-        if (last == root && nextSibling != null) {
-            last.insertBefore(tmp, nextSibling);
-        } else {
-            last.appendChild(tmp);
-        }
-
-        // Push this node onto stack
-        nodeStk.push(tmp);
-        lastSibling = null;
-    }
-
-    public void endElement(String namespace, String localName, String qName) {
-        nodeStk.pop();
-        lastSibling = null;
-    }
-
-    public void startPrefixMapping(String prefix, String uri) {
-        if (namespaceDecls == null) {
-            namespaceDecls = new ArrayList<String>(2);
-        }
-        namespaceDecls.add(prefix);
-        namespaceDecls.add(uri);
-    }
-
-    public void endPrefixMapping(String prefix) {
-        // do nothing
-    }
-
-    /**
-     * This class is only used internally so this method should never be called.
-     */
-    public void ignorableWhitespace(char[] ch, int start, int length) {
-    }
-
-    /**
-     * adds processing instruction node to DOM.
-     */
-    public void processingInstruction(String target, String data) {
-        final Node last = nodeStk.peek();
-        ProcessingInstruction pi = document.createProcessingInstruction(target, data);
-        if (pi != null) {
-            if (last == root && nextSibling != null) {
-                last.insertBefore(pi, nextSibling);
-            } else {
-                last.appendChild(pi);
-            }
-
-            lastSibling = pi;
-        }
-    }
-
-    /**
-     * This class is only used internally so this method should never be called.
-     */
-    public void setDocumentLocator(Locator locator) {
-    }
-
-    /**
-     * This class is only used internally so this method should never be called.
-     */
-    public void skippedEntity(String name) {
-    }
-
-    /**
-     * Lexical Handler method to create comment node in DOM tree.
-     */
-    public void comment(char[] ch, int start, int length) {
-        final Node last = nodeStk.peek();
-        Comment comment = document.createComment(new String(ch, start, length));
-        if (comment != null) {
-            if (last == root && nextSibling != null) {
-                last.insertBefore(comment, nextSibling);
-            } else {
-                last.appendChild(comment);
-            }
-
-            lastSibling = comment;
-        }
-    }
-
-    // Lexical Handler methods- not implemented
-    public void startCDATA() {
-    }
-
-    public void endCDATA() {
-    }
-
-    public void startEntity(java.lang.String name) {
-    }
-
-    public void endDTD() {
-    }
-
-    public void endEntity(String name) {
-    }
-
-    public void startDTD(String name, String publicId, String systemId) throws SAXException {
-    }
-
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXMLStreamReader.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXMLStreamReader.java
deleted file mode 100644
index 4a5d4aaa6a..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXMLStreamReader.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 org.apache.tuscany.sca.common.xml.stax;
-
-import org.w3c.dom.Node;
-
-public class DOMXMLStreamReader extends XmlTreeStreamReaderImpl {
-
-    public DOMXMLStreamReader(Node node) {
-        super(new DOMXmlNodeImpl(node));
-        switch (node.getNodeType()) {
-            case Node.DOCUMENT_NODE:
-                break;
-            case Node.ELEMENT_NODE:
-                break;
-            default:
-                throw new IllegalArgumentException("Illegal node type: " + node);
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXmlNodeImpl.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXmlNodeImpl.java
deleted file mode 100644
index 83ff31000d..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXmlNodeImpl.java
+++ /dev/null
@@ -1,156 +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.common.xml.stax;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DOMXmlNodeImpl implements XmlNode {
-    private Node node;
-    private Map<String, String> namespaces;
-    private Type type;
-
-    /**
-     * @param element
-     */
-    public DOMXmlNodeImpl(Node element) {
-        super();
-        if (element.getNodeType() == Node.DOCUMENT_NODE) {
-            this.node = ((Document)element).getDocumentElement();
-        } else {
-            this.node = element;
-        }
-        switch (node.getNodeType()) {
-            case Node.CDATA_SECTION_NODE:
-                this.type = Type.CHARACTERS;
-                break;
-            case Node.ELEMENT_NODE:
-                this.type = Type.ELEMENT;
-                break;
-            case Node.TEXT_NODE:
-                this.type = Type.CHARACTERS;
-                break;
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.common.xml.stax.databinding.xml.XmlNode#attributes()
-     */
-    public List<XmlNode> attributes() {
-        if (type != Type.ELEMENT) {
-            return null;
-        }
-        NamedNodeMap attrs = node.getAttributes();
-        List<XmlNode> xmlAttrs = new ArrayList<XmlNode>();
-        for (int i = 0; i < attrs.getLength(); i++) {
-            Attr attr = (Attr)attrs.item(i);
-            if (!attr.getName().equals("xmlns") && !attr.getName().startsWith("xmlns:")) {
-                xmlAttrs.add(new SimpleXmlNodeImpl(getQName(attr), attr.getValue(), XmlNode.Type.ATTRIBUTE));
-            }
-        }
-        return xmlAttrs;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.common.xml.stax.databinding.xml.XmlNode#children()
-     */
-    public Iterator<XmlNode> children() {
-        if (type != Type.ELEMENT) {
-            return null;
-        }
-        NodeList nodes = node.getChildNodes();
-        List<XmlNode> xmlNodes = new ArrayList<XmlNode>();
-        for (int i = 0; i < nodes.getLength(); i++) {
-            Node child = (Node)nodes.item(i);
-            int nodeType = child.getNodeType();
-            if (nodeType == Node.ELEMENT_NODE || nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE) {
-                xmlNodes.add(new DOMXmlNodeImpl(child));
-            }
-        }
-        return xmlNodes.iterator();
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.common.xml.stax.databinding.xml.XmlNode#getName()
-     */
-    public QName getName() {
-        return getQName(node);
-    }
-
-    private static QName getQName(Node node) {
-        int type = node.getNodeType();
-        if (type == Node.ELEMENT_NODE || type == Node.ATTRIBUTE_NODE) {
-            String ns = node.getNamespaceURI();
-            String prefix = node.getPrefix();
-            String localName = node.getLocalName();
-            return new QName(ns == null ? "" : ns, localName, prefix == null ? "" : prefix);
-        }
-        return null;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.common.xml.stax.databinding.xml.XmlNode#getValue()
-     */
-    public String getValue() {
-        return node.getNodeValue();
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.common.xml.stax.databinding.xml.XmlNode#namespaces()
-     */
-    public Map<String, String> namespaces() {
-        if (type != Type.ELEMENT) {
-            return null;
-        }
-        if (namespaces == null) {
-            namespaces = new HashMap<String, String>();
-            NamedNodeMap attrs = node.getAttributes();
-            for (int i = 0; i < attrs.getLength(); i++) {
-                Attr attr = (Attr)attrs.item(i);
-                if ("xmlns".equals(attr.getPrefix())) {
-                    namespaces.put(attr.getLocalName(), attr.getValue());
-                }
-                if ("xmlns".equals(attr.getName())) {
-                    namespaces.put("", attr.getValue());
-                }
-            }
-        }
-        return namespaces;
-    }
-
-    public Type getType() {
-        return type;
-    }
-
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DelegatingNamespaceContext.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DelegatingNamespaceContext.java
deleted file mode 100644
index 21a857491b..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DelegatingNamespaceContext.java
+++ /dev/null
@@ -1,310 +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.common.xml.stax;
-
-import java.util.ArrayList;
-import java.util.EmptyStackException;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.NamespaceContext;
-
-public class DelegatingNamespaceContext implements NamespaceContext {
-    private static int count;
-
-    private class WrappingIterator implements Iterator {
-
-        private Iterator containedIterator;
-
-        public WrappingIterator(Iterator containedIterator) {
-            this.containedIterator = containedIterator;
-        }
-
-        public Iterator getContainedIterator() {
-            return containedIterator;
-        }
-
-        public boolean hasNext() {
-            return containedIterator.hasNext();
-        }
-
-        public Object next() {
-            return containedIterator.next();
-        }
-
-        /**
-         * As per the contract on the API of Namespace context the returned iterator should be immutable
-         */
-        public void remove() {
-            throw new UnsupportedOperationException();
-        }
-
-        public void setContainedIterator(Iterator containedIterator) {
-            this.containedIterator = containedIterator;
-        }
-    }
-
-    private NamespaceContext parentNsContext;
-
-    private FastStack<String> prefixStack = new FastStack<String>();
-
-    // Keep two ArrayLists for the prefixes and namespaces. They should be in
-    // sync
-    // since the index of the entry will be used to relate them
-    // use the minimum initial capacity to let things handle memory better
-
-    private FastStack<String> uriStack = new FastStack<String>();
-
-    /**
-     * Generates a unique namespace prefix that is not in the scope of the NamespaceContext
-     * 
-     * @return string
-     */
-    public String generateUniquePrefix() {
-        String prefix = "p" + count++;
-        // null should be returned if the prefix is not bound!
-        while (getNamespaceURI(prefix) != null) {
-            prefix = "p" + count++;
-        }
-
-        return prefix;
-    }
-
-    public String getNamespaceURI(String prefix) {
-        // do the corrections as per the Javadoc
-        int index = prefixStack.search(prefix);
-        if (index != -1) {
-            return uriStack.get(index);
-        }
-        if (parentNsContext != null) {
-            return parentNsContext.getPrefix(prefix);
-        }
-        return null;
-    }
-
-    public NamespaceContext getParentNsContext() {
-        return parentNsContext;
-    }
-
-    public String getPrefix(String uri) {
-        // do the corrections as per the Javadoc
-        int index = uriStack.search(uri);
-        if (index != -1) {
-            return prefixStack.get(index);
-        }
-
-        if (parentNsContext != null) {
-            return parentNsContext.getPrefix(uri);
-        }
-        return null;
-    }
-
-    public Iterator getPrefixes(String uri) {
-        // create an ArrayList that contains the relevant prefixes
-        String[] uris = uriStack.toArray(new String[uriStack.size()]);
-        List<String> tempList = new ArrayList<String>();
-        for (int i = uris.length - 1; i >= 0; i--) {
-            if (uris[i].equals(uri)) {
-                tempList.add(prefixStack.get(i));
-                // we assume that array conversion preserves the order
-            }
-        }
-        // by now all the relevant prefixes are collected
-        // make a new iterator and provide a wrapper iterator to
-        // obey the contract on the API
-        return new WrappingIterator(tempList.iterator());
-    }
-
-    /**
-     * Pop a namespace
-     */
-    public void popNamespace() {
-        prefixStack.pop();
-        uriStack.pop();
-    }
-
-    /**
-     * Register a namespace in this context
-     * 
-     * @param prefix
-     * @param uri
-     */
-    public void pushNamespace(String prefix, String uri) {
-        prefixStack.push(prefix);
-        uriStack.push(uri);
-
-    }
-
-    public void setParentNsContext(NamespaceContext parentNsContext) {
-        this.parentNsContext = parentNsContext;
-    }
-
-    /**
-     * An implementation of the {@link java.util.Stack} API that is based on an <code>ArrayList</code> instead of a
-     * <code>Vector</code>, so it is not synchronized to protect against multi-threaded access. The implementation is
-     * therefore operates faster in environments where you do not need to worry about multiple thread contention.
-     * <p>
-     * The removal order of an <code>ArrayStack</code> is based on insertion order: The most recently added element is
-     * removed first. The iteration order is <i>not</i> the same as the removal order. The iterator returns elements
-     * from the bottom up, whereas the {@link #remove()} method removes them from the top down.
-     * <p>
-     * Unlike <code>Stack</code>, <code>ArrayStack</code> accepts null entries.
-     */
-    public static class FastStack<T> extends ArrayList<T> {
-
-        /** Ensure Serialization compatibility */
-        private static final long serialVersionUID = 2130079159931574599L;
-
-        /**
-         * Constructs a new empty <code>ArrayStack</code>. The initial size is controlled by <code>ArrayList</code>
-         * and is currently 10.
-         */
-        public FastStack() {
-            super();
-        }
-
-        /**
-         * Constructs a new empty <code>ArrayStack</code> with an initial size.
-         * 
-         * @param initialSize the initial size to use
-         * @throws IllegalArgumentException if the specified initial size is negative
-         */
-        public FastStack(int initialSize) {
-            super(initialSize);
-        }
-
-        /**
-         * Return <code>true</code> if this stack is currently empty.
-         * <p>
-         * This method exists for compatibility with <code>java.util.Stack</code>. New users of this class should use
-         * <code>isEmpty</code> instead.
-         * 
-         * @return true if the stack is currently empty
-         */
-        public boolean empty() {
-            return isEmpty();
-        }
-
-        /**
-         * Returns the top item off of this stack without removing it.
-         * 
-         * @return the top item on the stack
-         * @throws EmptyStackException if the stack is empty
-         */
-        public T peek() throws EmptyStackException {
-            int n = size();
-            if (n <= 0) {
-                throw new EmptyStackException();
-            } else {
-                return get(n - 1);
-            }
-        }
-
-        /**
-         * Returns the n'th item down (zero-relative) from the top of this stack without removing it.
-         * 
-         * @param n the number of items down to go
-         * @return the n'th item on the stack, zero relative
-         * @throws EmptyStackException if there are not enough items on the stack to satisfy this request
-         */
-        public T peek(int n) throws EmptyStackException {
-            int m = (size() - n) - 1;
-            if (m < 0) {
-                throw new EmptyStackException();
-            } else {
-                return get(m);
-            }
-        }
-
-        /**
-         * Pops the top item off of this stack and return it.
-         * 
-         * @return the top item on the stack
-         * @throws EmptyStackException if the stack is empty
-         */
-        public T pop() throws EmptyStackException {
-            int n = size();
-            if (n <= 0) {
-                throw new EmptyStackException();
-            } else {
-                return remove(n - 1);
-            }
-        }
-
-        /**
-         * Pushes a new item onto the top of this stack. The pushed item is also returned. This is equivalent to calling
-         * <code>add</code>.
-         * 
-         * @param item the item to be added
-         * @return the item just pushed
-         */
-        public Object push(T item) {
-            add(item);
-            return item;
-        }
-
-        /**
-         * Returns the top-most index for the object in the stack
-         * 
-         * @param object the object to be searched for
-         * @return top-most index, or -1 if not found
-         */
-        public int search(T object) {
-            int i = size() - 1; // Current index
-            while (i >= 0) {
-                T current = get(i);
-                if ((object == null && current == null) || (object != null && object.equals(current))) {
-                    return i;
-                }
-                i--;
-            }
-            return -1;
-        }
-
-        /**
-         * Returns the element on the top of the stack.
-         * 
-         * @return the element on the top of the stack
-         * @throws EmptyStackException if the stack is empty
-         */
-        public T get() {
-            int size = size();
-            if (size == 0) {
-                throw new EmptyStackException();
-            }
-            return get(size - 1);
-        }
-
-        /**
-         * Removes the element on the top of the stack.
-         * 
-         * @return the removed element
-         * @throws EmptyStackException if the stack is empty
-         */
-        public T remove() {
-            int size = size();
-            if (size == 0) {
-                throw new EmptyStackException();
-            }
-            return remove(size - 1);
-        }
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValueArrayStreamReader.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValueArrayStreamReader.java
deleted file mode 100644
index 5942f23d20..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValueArrayStreamReader.java
+++ /dev/null
@@ -1,404 +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.common.xml.stax;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamException;
-
-
-public class NameValueArrayStreamReader implements XMLFragmentStreamReader {
-
-    private static final int START_ELEMENT_STATE = 0;
-    private static final int TEXT_STATE = 1;
-    private static final int END_ELEMENT_STATE = 2;
-    private static final int FINAL_END_ELEMENT_STATE = 3;
-    private static final int START_ELEMENT_STATE_WITH_NULL = 4;
-
-    private DelegatingNamespaceContext namespaceContext = new DelegatingNamespaceContext();
-    // the index of the array
-    private int arrayIndex;
-
-    private QName name;
-    private String[] values;
-
-    // start element is the default state
-    private int state = START_ELEMENT_STATE;
-
-    public NameValueArrayStreamReader(QName name, String[] values) {
-        this.name = name;
-        this.values = values;
-    }
-
-    public void setParentNamespaceContext(NamespaceContext nsContext) {
-        this.namespaceContext.setParentNsContext(nsContext);
-    }
-
-    public void init() {
-        // TODO what if the QName namespace has not been declared
-    }
-
-    public Object getProperty(String string) throws IllegalArgumentException {
-        return null;
-    }
-
-    /**
-     * @throws XMLStreamException
-     */
-    public int next() throws XMLStreamException {
-        switch (state) {
-            case START_ELEMENT_STATE:
-                if (values.length > 0) {
-                    state = TEXT_STATE;
-                    return CHARACTERS;
-                } else {
-                    state = FINAL_END_ELEMENT_STATE;
-                    return END_ELEMENT;
-                }
-
-            case START_ELEMENT_STATE_WITH_NULL:
-                if (arrayIndex == (values.length - 1)) {
-                    state = FINAL_END_ELEMENT_STATE;
-                } else {
-                    state = END_ELEMENT_STATE;
-                }
-                return END_ELEMENT;
-            case FINAL_END_ELEMENT_STATE:
-                // oops, not supposed to happen!
-                throw new XMLStreamException("end already reached!");
-            case END_ELEMENT_STATE:
-                // we've to have more values since this is not the
-                // last value
-                // increment the counter
-                arrayIndex++;
-                if (values[arrayIndex] == null) {
-                    state = START_ELEMENT_STATE_WITH_NULL;
-                } else {
-                    state = START_ELEMENT_STATE;
-                }
-                return START_ELEMENT;
-            case TEXT_STATE:
-                if (arrayIndex == (values.length - 1)) {
-                    state = FINAL_END_ELEMENT_STATE;
-                    return END_ELEMENT;
-                } else {
-                    state = END_ELEMENT_STATE;
-                    return END_ELEMENT;
-                }
-
-            default:
-                throw new XMLStreamException("unknown event type!");
-        }
-    }
-
-    public void require(int i, String string, String string1) throws XMLStreamException {
-        // nothing done here
-    }
-
-    public String getElementText() throws XMLStreamException {
-        return null; // not implemented
-    }
-
-    public int nextTag() throws XMLStreamException {
-        return 0; // not implemented
-    }
-
-    public String getAttributeValue(String string, String string1) {
-        if (state == TEXT_STATE) {
-            // TODO something
-            return null;
-        } else {
-            return null;
-        }
-
-    }
-
-    public int getAttributeCount() {
-        if (state == START_ELEMENT_STATE_WITH_NULL) {
-            return 1;
-        }
-        if (state == START_ELEMENT_STATE) {
-            return 0;
-        } else {
-            throw new IllegalStateException();
-        }
-
-    }
-
-    public QName getAttributeName(int i) {
-        if (state == START_ELEMENT_STATE_WITH_NULL && i == 0) {
-            return NIL_QNAME;
-        }
-        if (state == START_ELEMENT_STATE) {
-            return null;
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeNamespace(int i) {
-        if (state == START_ELEMENT_STATE_WITH_NULL && i == 0) {
-            return NIL_QNAME.getNamespaceURI();
-        }
-        if (state == START_ELEMENT_STATE) {
-            return null;
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeLocalName(int i) {
-        if (state == START_ELEMENT_STATE_WITH_NULL && i == 0) {
-            return NIL_QNAME.getLocalPart();
-        }
-        if (state == START_ELEMENT_STATE) {
-            return null;
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributePrefix(int i) {
-        if (state == START_ELEMENT_STATE_WITH_NULL && i == 0) {
-            return NIL_QNAME.getPrefix();
-        }
-        if (state == START_ELEMENT_STATE) {
-            return null;
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeType(int i) {
-        return null; // not implemented
-    }
-
-    public String getAttributeValue(int i) {
-        if (state == START_ELEMENT_STATE_WITH_NULL && i == 0) {
-            return NIL_VALUE_TRUE;
-        }
-        if (state == START_ELEMENT_STATE) {
-            return null;
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public boolean isAttributeSpecified(int i) {
-        return false; // not supported
-    }
-
-    public int getNamespaceCount() {
-        if (state == START_ELEMENT_STATE_WITH_NULL && isXsiNamespacePresent()) {
-            return 1;
-        } else {
-            return 0;
-        }
-
-    }
-
-    public String getNamespacePrefix(int i) {
-        if (state == START_ELEMENT_STATE_WITH_NULL && isXsiNamespacePresent() && i == 0) {
-            return NIL_QNAME.getPrefix();
-        } else {
-            return null;
-        }
-    }
-
-    public String getNamespaceURI(int i) {
-        if (state == START_ELEMENT_STATE_WITH_NULL && isXsiNamespacePresent() && i == 0) {
-            return NIL_QNAME.getNamespaceURI();
-        } else {
-            return null;
-        }
-    }
-
-    public NamespaceContext getNamespaceContext() {
-        return this.namespaceContext;
-    }
-
-    public boolean isDone() {
-        return state == FINAL_END_ELEMENT_STATE;
-    }
-
-    public int getEventType() {
-        switch (state) {
-            case START_ELEMENT_STATE:
-                return START_ELEMENT;
-            case END_ELEMENT_STATE:
-                return END_ELEMENT;
-            case TEXT_STATE:
-                return CHARACTERS;
-            case FINAL_END_ELEMENT_STATE:
-                return END_ELEMENT;
-            default:
-                throw new UnsupportedOperationException();
-                // we've no idea what this is!!!!!
-        }
-
-    }
-
-    public String getText() {
-        if (state == TEXT_STATE) {
-            return values[arrayIndex];
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public char[] getTextCharacters() {
-        if (state == TEXT_STATE) {
-            return values[arrayIndex].toCharArray();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
-        // not implemented
-        throw new UnsupportedOperationException();
-    }
-
-    public int getTextStart() {
-        if (state == TEXT_STATE) {
-            return 0;
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextLength() {
-        if (state == TEXT_STATE) {
-            return values[arrayIndex].length();
-        } else {
-            throw new IllegalStateException();
-        }
-
-    }
-
-    public String getEncoding() {
-        return null;
-    }
-
-    public boolean hasText() {
-        return state == TEXT_STATE;
-    }
-
-    public Location getLocation() {
-        return null; // not supported
-    }
-
-    public QName getName() {
-        if (state != TEXT_STATE) {
-            return name;
-        } else {
-            return null;
-        }
-    }
-
-    public String getLocalName() {
-        if (state != TEXT_STATE) {
-            return name.getLocalPart();
-        } else {
-            return null;
-        }
-    }
-
-    public boolean hasName() {
-        return state != TEXT_STATE;
-
-    }
-
-    public String getNamespaceURI() {
-        if (state != TEXT_STATE) {
-            return name.getNamespaceURI();
-        } else {
-            return null;
-        }
-
-    }
-
-    public String getPrefix() {
-        if (state != TEXT_STATE) {
-            return name.getPrefix();
-        } else {
-            return null;
-        }
-    }
-
-    public String getVersion() {
-        return null; // TODO 1.0 ?
-    }
-
-    public boolean isStandalone() {
-        return false;
-    }
-
-    public boolean standaloneSet() {
-        return false;
-    }
-
-    public String getCharacterEncodingScheme() {
-        return null;
-    }
-
-    public String getPITarget() {
-        return null;
-    }
-
-    public String getPIData() {
-        return null;
-    }
-
-    public boolean hasNext() throws XMLStreamException {
-        return state != FINAL_END_ELEMENT_STATE;
-    }
-
-    public void close() throws XMLStreamException {
-        // Do nothing - we've nothing to free here
-    }
-
-    public String getNamespaceURI(String prefix) {
-        return namespaceContext.getNamespaceURI(prefix);
-    }
-
-    public boolean isStartElement() {
-        return state == START_ELEMENT_STATE;
-    }
-
-    public boolean isEndElement() {
-        return state == END_ELEMENT_STATE;
-    }
-
-    public boolean isCharacters() {
-        return state == TEXT_STATE;
-    }
-
-    public boolean isWhiteSpace() {
-        return false; // no whitespaces here
-    }
-
-    /**
-     * Test whether the xsi namespace is present
-     */
-    private boolean isXsiNamespacePresent() {
-        return namespaceContext.getNamespaceURI(NIL_QNAME.getPrefix()) != null;
-    }
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValuePairStreamReader.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValuePairStreamReader.java
deleted file mode 100644
index b4b655d541..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValuePairStreamReader.java
+++ /dev/null
@@ -1,348 +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.common.xml.stax;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamException;
-
-
-
-public class NameValuePairStreamReader implements XMLFragmentStreamReader {
-
-    private static final int START_ELEMENT_STATE = 0;
-    private static final int TEXT_STATE = 1;
-    private static final int END_ELEMENT_STATE = 2;
-
-    private DelegatingNamespaceContext namespaceContext = new DelegatingNamespaceContext();
-
-    private QName name;
-    private String value;
-
-    private int state = START_ELEMENT_STATE;
-    // initiate at the start element state
-
-    // keeps track whether the namespace is declared
-    // false by default
-    private boolean nsDeclared;
-
-    public NameValuePairStreamReader(QName name, String value) {
-        this.name = name;
-        this.value = value;
-    }
-
-    public Object getProperty(String key) throws IllegalArgumentException {
-        return null;
-    }
-
-    public int next() throws XMLStreamException {
-        // no need to handle null here. it should have been handled
-        // already
-        switch (state) {
-            case START_ELEMENT_STATE:
-                state = TEXT_STATE;
-                return CHARACTERS;
-            case END_ELEMENT_STATE:
-                // oops, not supposed to happen!
-                throw new XMLStreamException("end already reached!");
-            case TEXT_STATE:
-                state = END_ELEMENT_STATE;
-                return END_ELEMENT;
-            default:
-                throw new XMLStreamException("unknown event type!");
-        }
-    }
-
-    public void require(int i, String string, String string1) throws XMLStreamException {
-        // not implemented
-    }
-
-    public String getElementText() throws XMLStreamException {
-        if (state == START_ELEMENT) {
-            // move to the end state and return the value
-            state = END_ELEMENT_STATE;
-            return value;
-        } else {
-            throw new XMLStreamException();
-        }
-
-    }
-
-    public int nextTag() throws XMLStreamException {
-        return 0; // TODO
-    }
-
-    public boolean hasNext() throws XMLStreamException {
-        return state != END_ELEMENT_STATE;
-    }
-
-    public void close() throws XMLStreamException {
-        // Do nothing - we've nothing to free here
-    }
-
-    public String getNamespaceURI(String prefix) {
-        return namespaceContext.getNamespaceURI(prefix);
-    }
-
-    public boolean isStartElement() {
-        return state == START_ELEMENT_STATE;
-    }
-
-    public boolean isEndElement() {
-        return state == END_ELEMENT_STATE;
-    }
-
-    public boolean isCharacters() {
-        return state == TEXT_STATE;
-    }
-
-    public boolean isWhiteSpace() {
-        return false; // no whitespaces here
-    }
-
-    public String getAttributeValue(String string, String string1) {
-        return null;
-    }
-
-    public int getAttributeCount() {
-        return 0;
-    }
-
-    public QName getAttributeName(int i) {
-        return null;
-    }
-
-    public String getAttributeNamespace(int i) {
-        return null;
-    }
-
-    public String getAttributeLocalName(int i) {
-        return null;
-    }
-
-    public String getAttributePrefix(int i) {
-        return null;
-    }
-
-    public String getAttributeType(int i) {
-        return null;
-    }
-
-    public String getAttributeValue(int i) {
-        return null;
-    }
-
-    public boolean isAttributeSpecified(int i) {
-        return false; // no attributes here
-    }
-
-    public int getNamespaceCount() {
-        return nsDeclared ? 1 : 0;
-    }
-
-    public String getNamespacePrefix(int i) {
-        return (nsDeclared && i == 0) ? name.getPrefix() : null;
-    }
-
-    public String getNamespaceURI(int i) {
-        return (nsDeclared && i == 0) ? name.getNamespaceURI() : null;
-    }
-
-    public NamespaceContext getNamespaceContext() {
-        return this.namespaceContext;
-    }
-
-    public int getEventType() {
-        switch (state) {
-            case START_ELEMENT_STATE:
-                return START_ELEMENT;
-            case END_ELEMENT_STATE:
-                return END_ELEMENT;
-            case TEXT_STATE:
-                return CHARACTERS;
-            default:
-                throw new UnsupportedOperationException();
-                // we've no idea what this is!!!!!
-        }
-
-    }
-
-    public String getText() {
-        if (state == TEXT_STATE) {
-            return value;
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public char[] getTextCharacters() {
-        if (state == TEXT_STATE) {
-            return value.toCharArray();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
-        // not implemented
-        throw new UnsupportedOperationException();
-    }
-
-    public int getTextStart() {
-        if (state == TEXT_STATE) {
-            return 0;
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextLength() {
-        if (state == TEXT_STATE) {
-            return value.length();
-        } else {
-            throw new IllegalStateException();
-        }
-
-    }
-
-    public String getEncoding() {
-        return null;
-    }
-
-    public boolean hasText() {
-        return state == TEXT_STATE;
-    }
-
-    public Location getLocation() {
-        return new Location() {
-            public int getLineNumber() {
-                return 0;
-            }
-
-            public int getColumnNumber() {
-                return 0;
-            }
-
-            public int getCharacterOffset() {
-                return 0;
-            }
-
-            public String getPublicId() {
-                return null;
-            }
-
-            public String getSystemId() {
-                return null;
-            }
-        };
-    }
-
-    public QName getName() {
-        if (state != TEXT_STATE) {
-            return name;
-        } else {
-            return null;
-        }
-    }
-
-    public String getLocalName() {
-        if (state != TEXT_STATE) {
-            return name.getLocalPart();
-        } else {
-            return null;
-        }
-    }
-
-    public boolean hasName() {
-        return state != TEXT_STATE;
-
-    }
-
-    public String getNamespaceURI() {
-        if (state != TEXT_STATE) {
-            return name.getNamespaceURI();
-        } else {
-            return null;
-        }
-
-    }
-
-    public String getPrefix() {
-        if (state != TEXT_STATE) {
-            return name.getPrefix();
-        } else {
-            return null;
-        }
-    }
-
-    public String getVersion() {
-        return null; // TODO 1.0 ?
-    }
-
-    public boolean isStandalone() {
-        return false;
-    }
-
-    public boolean standaloneSet() {
-        return false;
-    }
-
-    public String getCharacterEncodingScheme() {
-        return null;
-    }
-
-    public String getPITarget() {
-        return null;
-    }
-
-    public String getPIData() {
-        return null;
-    }
-
-    public boolean isDone() {
-        return state == END_ELEMENT_STATE;
-    }
-
-    public void setParentNamespaceContext(NamespaceContext nsContext) {
-        this.namespaceContext.setParentNsContext(nsContext);
-    }
-
-    public void init() {
-        // just add the current elements namespace and prefix to the this
-        // elements nscontext
-        addToNsMap(name.getPrefix(), name.getNamespaceURI());
-
-    }
-
-    /**
-     * @param prefix
-     * @param uri
-     */
-    private void addToNsMap(String prefix, String uri) {
-        // TODO - need to fix this up to cater for cases where
-        // namespaces are having no prefixes
-        if (!uri.equals(namespaceContext.getNamespaceURI(prefix))) {
-            // this namespace is not there. Need to declare it
-            namespaceContext.pushNamespace(prefix, uri);
-            nsDeclared = true;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NamedProperty.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NamedProperty.java
deleted file mode 100644
index 2ddcd4baa5..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NamedProperty.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 org.apache.tuscany.sca.common.xml.stax;
-
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-/**
- * A named property
- * 
- * @version $Rev$ $Date$
- */
-public class NamedProperty implements Map.Entry<QName, Object> {
-    private QName key;
-
-    private Object value;
-
-    public NamedProperty(QName key, Object value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    public NamedProperty(String key, Object value) {
-        this.key = new QName(key);
-        this.value = value;
-    }
-    
-    public QName getKey() {
-        return key;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public Object setValue(Object value) {
-        Object v = this.value;
-        this.value = value;
-        return v;
-    }
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NilElementStreamReader.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NilElementStreamReader.java
deleted file mode 100644
index fc78807cdb..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NilElementStreamReader.java
+++ /dev/null
@@ -1,279 +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.common.xml.stax;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamException;
-
-public class NilElementStreamReader implements XMLFragmentStreamReader {
-
-    private static final int END_ELEMENT_STATE = 2;
-
-    private static final int START_ELEMENT_STATE = 1;
-    private int currentState = START_ELEMENT;
-
-    private QName elementQName;
-
-    public NilElementStreamReader(QName elementQName) {
-        this.elementQName = elementQName;
-    }
-
-    public void setParentNamespaceContext(NamespaceContext nsContext) {
-        // NOOP
-    }
-
-    public void close() throws XMLStreamException {
-        // do nothing
-    }
-
-    public int getAttributeCount() {
-        return 1;
-    }
-
-    public String getAttributeLocalName(int i) {
-        return (i == 0) ? NIL_QNAME.getLocalPart() : null;
-    }
-
-    public QName getAttributeName(int i) {
-        return (i == 0) ? NIL_QNAME : null;
-    }
-
-    public String getAttributeNamespace(int i) {
-        return (i == 0) ? NIL_QNAME.getNamespaceURI() : null;
-    }
-
-    public String getAttributePrefix(int i) {
-        return (i == 0) ? NIL_QNAME.getPrefix() : null;
-    }
-
-    public String getAttributeType(int i) {
-        throw new UnsupportedOperationException();
-    }
-
-    public String getAttributeValue(int i) {
-        return (i == 0) ? NIL_VALUE_TRUE : null;
-    }
-
-    public String getAttributeValue(String string, String string1) {
-        if (string == null && NIL_QNAME.getLocalPart().equals(string1)) {
-            return NIL_VALUE_TRUE;
-        }
-        return null;
-    }
-
-    public String getCharacterEncodingScheme() {
-        throw new UnsupportedOperationException();
-    }
-
-    public String getElementText() throws XMLStreamException {
-        return null;
-    }
-
-    public String getEncoding() {
-        return null;
-    }
-
-    public int getEventType() {
-        int returnEvent = START_DOCUMENT;
-        switch (currentState) {
-            case START_ELEMENT_STATE:
-                returnEvent = START_ELEMENT;
-                break;
-            case END_ELEMENT_STATE:
-                returnEvent = END_ELEMENT;
-                break;
-        }
-        return returnEvent;
-    }
-
-    public String getLocalName() {
-        return elementQName.getLocalPart();
-    }
-
-    public Location getLocation() {
-        return new Location() {
-            public int getCharacterOffset() {
-                return 0;
-            }
-
-            public int getColumnNumber() {
-                return 0;
-            }
-
-            public int getLineNumber() {
-                return 0;
-            }
-
-            public String getPublicId() {
-                return null;
-            }
-
-            public String getSystemId() {
-                return null;
-            }
-        };
-    }
-
-    public QName getName() {
-        return elementQName;
-    }
-
-    public NamespaceContext getNamespaceContext() {
-        throw new UnsupportedOperationException();
-    }
-
-    public int getNamespaceCount() {
-        return 0;
-    }
-
-    public String getNamespacePrefix(int i) {
-        return null;
-    }
-
-    public String getNamespaceURI() {
-        return elementQName.getNamespaceURI();
-    }
-
-    public String getNamespaceURI(int i) {
-        return null;
-    }
-
-    public String getNamespaceURI(String string) {
-        if (elementQName.getPrefix() != null && elementQName.getPrefix().equals(string)) {
-            return elementQName.getNamespaceURI();
-        } else {
-            return null;
-        }
-    }
-
-    public String getPIData() {
-        throw new UnsupportedOperationException();
-    }
-
-    public String getPITarget() {
-        throw new UnsupportedOperationException();
-    }
-
-    public String getPrefix() {
-        return elementQName.getPrefix();
-    }
-
-    public Object getProperty(String key) throws IllegalArgumentException {
-        // since optimization is a global property
-        // we've to implement it everywhere
-        return null;
-    }
-
-    public String getText() {
-        return null;
-    }
-
-    public char[] getTextCharacters() {
-        return new char[0]; 
-    }
-
-    public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
-        return 0;
-    }
-
-    public int getTextLength() {
-        return 0;
-    }
-
-    public int getTextStart() {
-        return 0;
-    }
-
-    public String getVersion() {
-        throw new UnsupportedOperationException();
-    }
-
-    public boolean hasName() {
-        return true;
-    }
-
-    public boolean hasNext() throws XMLStreamException {
-        return currentState != END_ELEMENT_STATE;
-
-    }
-
-    public boolean hasText() {
-        return false;
-    }
-
-    public void init() {
-        // NOOP
-    }
-
-    public boolean isAttributeSpecified(int i) {
-        return i == 0;
-    }
-
-    public boolean isCharacters() {
-        return false;
-    }
-
-    public boolean isDone() {
-        return currentState == END_ELEMENT_STATE;
-    }
-
-    public boolean isEndElement() {
-        return currentState == END_ELEMENT_STATE;
-    }
-
-    public boolean isStandalone() {
-        throw new UnsupportedOperationException();
-    }
-
-    public boolean isStartElement() {
-        return currentState == START_ELEMENT_STATE;
-    }
-
-    public boolean isWhiteSpace() {
-        return false;
-    }
-
-    public int next() throws XMLStreamException {
-        int returnEvent = START_DOCUMENT;
-        switch (currentState) {
-            case START_ELEMENT_STATE:
-                currentState = END_ELEMENT_STATE;
-                returnEvent = END_ELEMENT;
-                break;
-            case END_ELEMENT_STATE:
-                throw new XMLStreamException("parser completed!");
-
-        }
-        return returnEvent;
-    }
-
-    public int nextTag() throws XMLStreamException {
-        throw new UnsupportedOperationException();
-    }
-
-    public void require(int i, String string, String string1) throws XMLStreamException {
-        // nothing
-    }
-
-    public boolean standaloneSet() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/SimpleXmlNodeImpl.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/SimpleXmlNodeImpl.java
deleted file mode 100644
index a28705cff2..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/SimpleXmlNodeImpl.java
+++ /dev/null
@@ -1,112 +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.common.xml.stax;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SimpleXmlNodeImpl implements XmlNode {
-    private static final String XSI_PREFIX = "xsi";
-    private static final String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
-    private static final QName XSI_NIL = new QName(XSI_NS, "nil", XSI_PREFIX);
-    private static final Map<String, String> NS_MAP = new HashMap<String, String>();
-    static {
-        NS_MAP.put(XSI_PREFIX, XSI_NS);
-    }
-
-    protected Type type;
-    protected QName name;
-    protected Object value;
-
-    public SimpleXmlNodeImpl(QName name, Object value) {
-        this(name, value, name != null ? Type.ELEMENT : Type.CHARACTERS);
-    }
-
-    public SimpleXmlNodeImpl(QName name, Object value, Type type) {
-        super();
-        this.type = type;
-        this.name = name;
-        this.value = value;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.common.xml.stax.databinding.xml.XmlNode#attributes()
-     */
-    public List<XmlNode> attributes() {
-        if (type == Type.ELEMENT && value == null) {
-            // Nil element
-            XmlNode attr = new SimpleXmlNodeImpl(XSI_NIL, "true");
-            return Arrays.asList(attr);
-        }
-        return null;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.common.xml.stax.databinding.xml.XmlNode#children()
-     */
-    public Iterator<XmlNode> children() {
-        if (type == Type.ELEMENT && value != null) {
-            // Nil element
-            XmlNode node = new SimpleXmlNodeImpl(null, value);
-            return Arrays.asList(node).iterator();
-        }
-        return null;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.common.xml.stax.databinding.xml.XmlNode#getName()
-     */
-    public QName getName() {
-        return name;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.common.xml.stax.databinding.xml.XmlNode#getValue()
-     */
-    public String getValue() {
-        return value == null ? null : String.valueOf(value);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.common.xml.stax.databinding.xml.XmlNode#namespaces()
-     */
-    public Map<String, String> namespaces() {
-        if (type == Type.ELEMENT && value == null) {
-            return NS_MAP;
-        }
-        return null;
-    }
-
-    public Type getType() {
-        return type;
-    }
-
-    public void setType(Type type) {
-        this.type = type;
-    }
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAX2SAXAdapter.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAX2SAXAdapter.java
deleted file mode 100644
index 12550781d3..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAX2SAXAdapter.java
+++ /dev/null
@@ -1,256 +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.common.xml.stax;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-/**
- * Adapter that converts from StAX to SAX event streams. Currently the following
- * SAX events are not generated:
- * <ul>
- * <li>ignorableWhitespace</li>
- * <li>skippedEntity</li>
- * <ul>
- * Also the following StAX events are not mapped:
- * <ul>
- * <li>CDATA</li>
- * <li>COMMENT</li>
- * <li>DTD</li>
- * <li>ENTITY_DECLARATION</li>
- * <li>ENTITY_REFERENCE</li>
- * <li>NOTATION_DECLARATION</li>
- * <li>SPACE</li>
- * </ul>
- * StAX ATTRIBUTE events are ignored but the equivalent attributes (derived from
- * the START_ELEMENT event) are supplied in the SAX startElement event's
- * Attributes parameter. If the adaptor is configured to pass namespace prefixes
- * then namespace information will also be included in the Attributes; StAX
- * NAMESPACE events are ignored. <p/> Another issue is namespace processing. If
- * the reader is positioned at a sub-node, we cannot capture all the in-scope
- * namespace bindings. Therefore we cannot re-create a proper SAX event stream
- * from a StAX parser. <p/> For example <p/> &lt;a:root xmlns:a="foo"
- * xmlns:b="bar"&gt;&lt;b:sub&gt;a:foo&lt;/b:sub&gt;&lt;/a:root&gt; <p/> And if
- * you are handed a parser at &lt;b:sub&gt;, then your SAX events should look
- * like: <p/> &lt;b:sub xmlns:a="foo" xmlns:b="bar"&gt;a:foo&lt;/b:sub&gt; <p/>
- * not: <p/> &lt;b:sub&gt;a:foo&lt;/b:sub&gt; <p/> <p/> Proposal: we change the
- * receiver of SAX events (SDOXMLResourceImpl) so that it uses NamespaceContext
- * to resolve prefix (as opposed to record start/endPrefixMappings and use it
- * for resolution.)
- * 
- * @version $Rev$ $Date$
- */
-public class StAX2SAXAdapter {
-    private final boolean namespacePrefixes;
-
-    /**
-     * Construct a new StAX to SAX adapter that will convert a StAX event stream
-     * into a SAX event stream.
-     * 
-     * @param namespacePrefixes whether xmlns attributes should be included in
-     *            startElement events;
-     */
-    public StAX2SAXAdapter(boolean namespacePrefixes) {
-        this.namespacePrefixes = namespacePrefixes;
-    }
-
-    /**
-     * Pull events from the StAX stream and dispatch to the SAX ContentHandler.
-     * The StAX stream would typically be located on a START_DOCUMENT or
-     * START_ELEMENT event and when this method returns it will be located on
-     * the associated END_DOCUMENT or END_ELEMENT event. Behaviour with other
-     * start events is undefined.
-     * 
-     * @param reader StAX event source to read
-     * @param handler SAX ContentHandler for processing events
-     * @throws XMLStreamException if there was a problem reading the stream
-     * @throws SAXException passed through from the ContentHandler
-     */
-    public void parse(XMLStreamReader reader, ContentHandler handler) throws XMLStreamException, SAXException {
-        handler.setDocumentLocator(new LocatorAdaptor(reader.getLocation()));
-
-        // remembers the nest level of elements to know when we are done
-        int level = 0;
-        int event = reader.getEventType();
-        while (true) {
-            switch (event) {
-                case XMLStreamConstants.START_DOCUMENT:
-                    level++;
-                    handler.startDocument();
-                    break;
-                case XMLStreamConstants.START_ELEMENT:
-                    level++;
-                    handleStartElement(reader, handler);
-                    break;
-                case XMLStreamConstants.PROCESSING_INSTRUCTION:
-                    handler.processingInstruction(reader.getPITarget(), reader.getPIData());
-                    break;
-                case XMLStreamConstants.CHARACTERS:
-                    handler.characters(reader.getTextCharacters(), reader.getTextStart(), reader
-                        .getTextLength());
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    handleEndElement(reader, handler);
-                    level--;
-                    if (level == 0) {
-                        return;
-                    }
-                    break;
-                case XMLStreamConstants.END_DOCUMENT:
-                    handler.endDocument();
-                    return;
-                    /*
-                     * uncomment to handle all events rather than just mapped
-                     * ones // StAX events that are not mapped to SAX case
-                     * XMLStreamConstants.COMMENT: case
-                     * XMLStreamConstants.SPACE: case
-                     * XMLStreamConstants.ENTITY_REFERENCE: case
-                     * XMLStreamConstants.DTD: case XMLStreamConstants.CDATA:
-                     * case XMLStreamConstants.NOTATION_DECLARATION: case
-                     * XMLStreamConstants.ENTITY_DECLARATION: break; // StAX
-                     * events handled in START_ELEMENT case
-                     * XMLStreamConstants.ATTRIBUTE: case
-                     * XMLStreamConstants.NAMESPACE: break; default: throw new
-                     * AssertionError("Unknown StAX event: " + event);
-                     */
-            }
-            event = reader.next();
-        }
-    }
-
-    private void handleStartElement(XMLStreamReader reader, ContentHandler handler) throws SAXException {
-        // send startPrefixMapping events immediately before startElement event
-        int nsCount = reader.getNamespaceCount();
-        for (int i = 0; i < nsCount; i++) {
-            String prefix = reader.getNamespacePrefix(i);
-            if (prefix == null) { // true for default namespace
-                prefix = "";
-            }
-            handler.startPrefixMapping(prefix, reader.getNamespaceURI(i));
-        }
-
-        // fire startElement
-        QName qname = reader.getName();
-        String prefix = qname.getPrefix();
-        String rawname;
-        if (prefix == null || prefix.length() == 0) {
-            rawname = qname.getLocalPart();
-        } else {
-            rawname = prefix + ':' + qname.getLocalPart();
-        }
-        Attributes attrs = getAttributes(reader);
-        handler.startElement(qname.getNamespaceURI(), qname.getLocalPart(), rawname, attrs);
-    }
-
-    private static void handleEndElement(XMLStreamReader reader, ContentHandler handler) throws SAXException {
-        // fire endElement
-        QName qname = reader.getName();
-        handler.endElement(qname.getNamespaceURI(), qname.getLocalPart(), qname.toString());
-
-        // send endPrefixMapping events immediately after endElement event
-        // we send them in the opposite order to that returned but this is not
-        // actually required by SAX
-        int nsCount = reader.getNamespaceCount();
-        for (int i = nsCount - 1; i >= 0; i--) {
-            String prefix = reader.getNamespacePrefix(i);
-            if (prefix == null) { // true for default namespace
-                prefix = "";
-            }
-            handler.endPrefixMapping(prefix);
-        }
-    }
-
-    /**
-     * Get the attributes associated with the current START_ELEMENT event.
-     * 
-     * @return the StAX attributes converted to org.xml.sax.Attributes
-     */
-    private Attributes getAttributes(XMLStreamReader reader) {
-        assert reader.getEventType() == XMLStreamConstants.START_ELEMENT;
-
-        AttributesImpl attrs = new AttributesImpl();
-
-        // add namespace declarations if required
-        if (namespacePrefixes) {
-            for (int i = 0; i < reader.getNamespaceCount(); i++) {
-                String prefix = reader.getNamespacePrefix(i);
-                String uri = reader.getNamespaceURI(i);
-                attrs.addAttribute(null, prefix, "xmlns:" + prefix, "CDATA", uri);
-            }
-        }
-
-        // Regular attributes
-        for (int i = 0; i < reader.getAttributeCount(); i++) {
-            String uri = reader.getAttributeNamespace(i);
-            if (uri == null) {
-                uri = "";
-            }
-            String localName = reader.getAttributeLocalName(i);
-            String prefix = reader.getAttributePrefix(i);
-            String qname;
-            if (prefix == null || prefix.length() == 0) {
-                qname = localName;
-            } else {
-                qname = prefix + ':' + localName;
-            }
-            String type = reader.getAttributeType(i);
-            String value = reader.getAttributeValue(i);
-
-            attrs.addAttribute(uri, localName, qname, type, value);
-        }
-
-        return attrs;
-    }
-
-    /**
-     * Adaptor for mapping Locator information.
-     */
-    private static final class LocatorAdaptor implements Locator {
-        private final Location location;
-
-        private LocatorAdaptor(Location location) {
-            this.location = location;
-        }
-
-        public int getColumnNumber() {
-            return location == null ? 0 : location.getColumnNumber();
-        }
-
-        public int getLineNumber() {
-            return location == null ? 0 : location.getLineNumber();
-        }
-
-        public String getPublicId() {
-            return location == null ? "" : location.getPublicId();
-        }
-
-        public String getSystemId() {
-            return location == null ? "" : location.getSystemId();
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java
deleted file mode 100644
index 444d6ccabf..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java
+++ /dev/null
@@ -1,87 +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.common.xml.stax;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.Source;
-
-
-
-public final class StAXHelper {
-    private static final XMLInputFactory INPUT_FACTORY = XMLInputFactory.newInstance();
-    private static final XMLOutputFactory OUTPUT_FACTORY = XMLOutputFactory.newInstance();
-
-    private StAXHelper() {
-    }
-
-    public static XMLStreamReader createXMLStreamReader(InputStream inputStream) throws XMLStreamException {
-        return INPUT_FACTORY.createXMLStreamReader(inputStream);
-    }
-
-    public static XMLStreamReader createXMLStreamReader(Reader reader) throws XMLStreamException {
-        return INPUT_FACTORY.createXMLStreamReader(reader);
-    }
-
-    public static XMLStreamReader createXMLStreamReader(Source source) throws XMLStreamException {
-        return INPUT_FACTORY.createXMLStreamReader(source);
-    }
-
-    public static XMLStreamReader createXMLStreamReader(String string) throws XMLStreamException {
-        StringReader reader = new StringReader(string);
-        return createXMLStreamReader(reader);
-    }
-
-    public static String save(XMLStreamReader reader) throws XMLStreamException {
-        StringWriter writer = new StringWriter();
-        save(reader, writer);
-        return writer.toString();
-    }
-
-    public static void save(XMLStreamReader reader, OutputStream outputStream) throws XMLStreamException {
-        XMLStreamSerializer serializer = new XMLStreamSerializer();
-        XMLStreamWriter streamWriter = OUTPUT_FACTORY.createXMLStreamWriter(outputStream);
-        serializer.serialize(reader, streamWriter);
-        streamWriter.flush();
-    }
-
-    public static void save(XMLStreamReader reader, Writer writer) throws XMLStreamException {
-        XMLStreamSerializer serializer = new XMLStreamSerializer();
-        XMLStreamWriter streamWriter = OUTPUT_FACTORY.createXMLStreamWriter(writer);
-        serializer.serialize(reader, streamWriter);
-        streamWriter.flush();
-    }
-
-    public static void save(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
-        XMLStreamSerializer serializer = new XMLStreamSerializer();
-        serializer.serialize(reader, writer);
-        writer.flush();
-    }
-
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/WrappingXMLStreamReader.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/WrappingXMLStreamReader.java
deleted file mode 100644
index a237bb457e..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/WrappingXMLStreamReader.java
+++ /dev/null
@@ -1,100 +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.common.xml.stax;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.util.StreamReaderDelegate;
-
-public class WrappingXMLStreamReader extends StreamReaderDelegate implements XMLFragmentStreamReader {
-
-    private boolean done;
-    private int level;
-
-    public WrappingXMLStreamReader(XMLStreamReader realReader) throws XMLStreamException {
-        super(realReader);
-        if (realReader == null) {
-            throw new UnsupportedOperationException("Reader cannot be null");
-        }
-
-        if (realReader instanceof XMLFragmentStreamReader) {
-            ((XMLFragmentStreamReader)realReader).init();
-        }
-
-        if (realReader.getEventType() == START_DOCUMENT) {
-            // Position to the 1st element
-            realReader.nextTag();
-        }
-        if (realReader.getEventType() != START_ELEMENT) {
-            throw new IllegalStateException("The reader is not positioned at START_DOCUMENT or START_ELEMENT");
-        }
-        this.done = false;
-        this.level = 1;
-    }
-
-    @Override
-    public boolean hasNext() throws XMLStreamException {
-        return !done && super.hasNext();
-    }
-
-    @Override
-    public int next() throws XMLStreamException {
-        if (!hasNext()) {
-            throw new IllegalStateException("No more events");
-        }
-        int event = super.next();
-        if (!super.hasNext()) {
-            done = true;
-        }
-        if (event == START_ELEMENT) {
-            level++;
-        } else if (event == END_ELEMENT) {
-            level--;
-            if (level == 0) {
-                done = true;
-            }
-        }
-        return event;
-    }
-
-    @Override
-    public int nextTag() throws XMLStreamException {
-        int event = 0;
-        while (true) {
-            event = next();
-            if (event == START_ELEMENT || event == END_ELEMENT) {
-                return event;
-            }
-        }
-    }
-    
-    public void setParentNamespaceContext(NamespaceContext nsContext) {
-        // nothing to do here
-    }
-
-    public void init() {
-        // Nothing to do here
-    }
-    
-    public boolean isDone() {
-        return done;
-    }
-
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLDocumentStreamReader.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLDocumentStreamReader.java
deleted file mode 100644
index 8ee9ea2242..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLDocumentStreamReader.java
+++ /dev/null
@@ -1,482 +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.common.xml.stax;
-
-import java.util.NoSuchElementException;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-/**
- * This class is derived from Apache Axis2 class
- * org.apache.axis2.util.StreamWrapper</a>. It's used wrap a XMLStreamReader to
- * create a XMLStreamReader representing a document and it will produce
- * START_DOCUMENT, END_DOCUMENT events.
- *
- * @version $Rev$ $Date$
- */
-public class XMLDocumentStreamReader implements XMLStreamReader {
-    private static final int STATE_COMPLETE_AT_NEXT = 2; // The wrapper
-    // will produce
-    // END_DOCUMENT
-
-    private static final int STATE_COMPLETED = 3; // Done
-
-    private static final int STATE_INIT = 0; // The wrapper will produce
-    // START_DOCUMENT
-
-    private static final int STATE_SWITCHED = 1; // The real reader will
-    // produce events
-
-    private XMLStreamReader realReader;
-    private boolean fragment;
-    private int level = 1;
-
-    private int state = STATE_INIT;
-
-    public XMLDocumentStreamReader(XMLStreamReader realReader) {
-        if (realReader == null) {
-            throw new UnsupportedOperationException("Reader cannot be null");
-        }
-
-        this.realReader = realReader;
-        
-        if (realReader instanceof XMLFragmentStreamReader) {
-            ((XMLFragmentStreamReader)realReader).init();
-        }
-
-        // If the real reader is positioned at START_DOCUMENT, always use
-        // the real reader
-        if (realReader.getEventType() == START_DOCUMENT) {
-            fragment = false;
-            state = STATE_SWITCHED;
-        }
-    }
-
-    public void close() throws XMLStreamException {
-        realReader.close();
-    }
-
-    public int getAttributeCount() {
-        if (isDelegating()) {
-            return realReader.getAttributeCount();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeLocalName(int i) {
-        if (isDelegating()) {
-            return realReader.getAttributeLocalName(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public QName getAttributeName(int i) {
-        if (isDelegating()) {
-            return realReader.getAttributeName(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeNamespace(int i) {
-        if (isDelegating()) {
-            return realReader.getAttributeNamespace(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributePrefix(int i) {
-        if (isDelegating()) {
-            return realReader.getAttributePrefix(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeType(int i) {
-        if (isDelegating()) {
-            return realReader.getAttributeType(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeValue(int i) {
-        if (isDelegating()) {
-            return realReader.getAttributeValue(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeValue(String s, String s1) {
-        if (isDelegating()) {
-            return realReader.getAttributeValue(s, s1);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getCharacterEncodingScheme() {
-        return realReader.getCharacterEncodingScheme();
-    }
-
-    public String getElementText() throws XMLStreamException {
-        if (isDelegating()) {
-            return realReader.getElementText();
-        } else {
-            throw new XMLStreamException();
-        }
-    }
-
-    public String getEncoding() {
-        return realReader.getEncoding();
-    }
-
-    public int getEventType() {
-        int event = -1;
-        switch (state) {
-            case STATE_SWITCHED:
-            case STATE_COMPLETE_AT_NEXT:
-                event = realReader.getEventType();
-                break;
-            case STATE_INIT:
-                event = START_DOCUMENT;
-                break;
-            case STATE_COMPLETED:
-                event = END_DOCUMENT;
-                break;
-        }
-        return event;
-    }
-
-    public String getLocalName() {
-        if (isDelegating()) {
-            return realReader.getLocalName();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public Location getLocation() {
-        if (isDelegating()) {
-            return realReader.getLocation();
-        } else {
-            return null;
-        }
-    }
-
-    public QName getName() {
-        if (isDelegating()) {
-            return realReader.getName();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public NamespaceContext getNamespaceContext() {
-        return realReader.getNamespaceContext();
-    }
-
-    public int getNamespaceCount() {
-        if (isDelegating()) {
-            return realReader.getNamespaceCount();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getNamespacePrefix(int i) {
-        if (isDelegating()) {
-            return realReader.getNamespacePrefix(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getNamespaceURI() {
-        if (isDelegating()) {
-            return realReader.getNamespaceURI();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getNamespaceURI(int i) {
-        if (isDelegating()) {
-            return realReader.getNamespaceURI(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getNamespaceURI(String s) {
-        if (isDelegating()) {
-            return realReader.getNamespaceURI(s);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getPIData() {
-        if (isDelegating()) {
-            return realReader.getPIData();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getPITarget() {
-        if (isDelegating()) {
-            return realReader.getPITarget();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getPrefix() {
-        if (isDelegating()) {
-            return realReader.getPrefix();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public Object getProperty(String s) throws IllegalArgumentException {
-        if (isDelegating()) {
-            return realReader.getProperty(s);
-        } else {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    public String getText() {
-        if (isDelegating()) {
-            return realReader.getText();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public char[] getTextCharacters() {
-        if (isDelegating()) {
-            return realReader.getTextCharacters();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
-        if (isDelegating()) {
-            return realReader.getTextCharacters(i, chars, i1, i2);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextLength() {
-        if (isDelegating()) {
-            return realReader.getTextLength();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextStart() {
-        if (isDelegating()) {
-            return realReader.getTextStart();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getVersion() {
-        if (isDelegating()) {
-            return realReader.getVersion();
-        } else {
-            return null;
-        }
-    }
-
-    public boolean hasName() {
-        if (isDelegating()) {
-            return realReader.hasName();
-        } else {
-            return false;
-        }
-    }
-
-    public boolean hasNext() throws XMLStreamException {
-        if (state == STATE_COMPLETE_AT_NEXT) {
-            return true;
-        } else if (state == STATE_COMPLETED) {
-            return false;
-        } else if (state == STATE_SWITCHED) {
-            return realReader.hasNext();
-        } else {
-            return true;
-        }
-    }
-
-    public boolean hasText() {
-        if (isDelegating()) {
-            return realReader.hasText();
-        } else {
-            return false;
-        }
-    }
-
-    public boolean isAttributeSpecified(int i) {
-        if (isDelegating()) {
-            return realReader.isAttributeSpecified(i);
-        } else {
-            return false;
-        }
-    }
-
-    public boolean isCharacters() {
-        if (isDelegating()) {
-            return realReader.isCharacters();
-        } else {
-            return false;
-        }
-    }
-
-    private boolean isDelegating() {
-        return state == STATE_SWITCHED || state == STATE_COMPLETE_AT_NEXT;
-    }
-
-    public boolean isEndElement() {
-        if (isDelegating()) {
-            return realReader.isEndElement();
-        } else {
-            return false;
-        }
-    }
-
-    public boolean isStandalone() {
-        if (isDelegating()) {
-            return realReader.isStandalone();
-        } else {
-            return false;
-        }
-    }
-
-    public boolean isStartElement() {
-        if (isDelegating()) {
-            return realReader.isStartElement();
-        } else {
-            return false;
-        }
-    }
-
-    public boolean isWhiteSpace() {
-        if (isDelegating()) {
-            return realReader.isWhiteSpace();
-        } else {
-            return false;
-        }
-    }
-
-    public int next() throws XMLStreamException {
-        int returnEvent;
-
-        switch (state) {
-            case STATE_SWITCHED:
-                returnEvent = realReader.next();
-                if (returnEvent == END_DOCUMENT) {
-                    state = STATE_COMPLETED;
-                } else if (!realReader.hasNext()) {
-                    state = STATE_COMPLETE_AT_NEXT;
-                } 
-                if (fragment && returnEvent == END_ELEMENT) {
-                    level--;
-                    if (level == 0) {
-                        // We are now at the end of the top-level element in the fragment
-                        state = STATE_COMPLETE_AT_NEXT;
-                    }
-                }
-                if (fragment && returnEvent == START_ELEMENT) {
-                    level++;
-                }
-                break;
-            case STATE_INIT:
-                state = STATE_SWITCHED;
-                returnEvent = realReader.getEventType();
-                if (returnEvent == START_ELEMENT) {
-                    // The real reader is positioned at the top-level element in the fragment
-                    level = 0;
-                    fragment = true;
-                }
-                break;
-            case STATE_COMPLETE_AT_NEXT:
-                state = STATE_COMPLETED;
-                returnEvent = END_DOCUMENT;
-                break;
-            case STATE_COMPLETED:
-                // oops - no way we can go beyond this
-                throw new NoSuchElementException("End of stream has reached.");
-            default:
-                throw new UnsupportedOperationException();
-        }
-
-        return returnEvent;
-    }
-
-    public int nextTag() throws XMLStreamException {
-        if (isDelegating()) {
-            int returnEvent = realReader.nextTag();
-            if (fragment && returnEvent == END_ELEMENT) {
-                level--;
-                if (level == 0) {
-                    // We are now at the end of the top-level element in the fragment
-                    state = STATE_COMPLETE_AT_NEXT;
-                }
-            }
-            if (fragment && returnEvent == START_ELEMENT) {
-                level++;
-            }
-            return returnEvent;
-        } else {
-            throw new XMLStreamException();
-        }
-    }
-
-    public void require(int i, String s, String s1) throws XMLStreamException {
-        if (isDelegating()) {
-            realReader.require(i, s, s1);
-        }
-    }
-
-    public boolean standaloneSet() {
-        if (isDelegating()) {
-            return realReader.standaloneSet();
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReader.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReader.java
deleted file mode 100644
index defe3595be..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReader.java
+++ /dev/null
@@ -1,53 +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.common.xml.stax;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-
-public interface XMLFragmentStreamReader extends XMLStreamReader {
-    QName NIL_QNAME = new QName("http://www.w3.org/2001/XMLSchema-instance", "nil", "xsi");
-    String NIL_VALUE_TRUE = "true";
-
-    /**
-     * this will help to handle Text within the current element. user should
-     * pass the element text to the property list as this ELEMENT_TEXT as the
-     * key. This key deliberately has a space in it so that it is not a valid
-     * XML name
-     */
-    String ELEMENT_TEXT = "Element Text";
-
-    /**
-     * Extra method to query the state of the pullparser
-     */
-    boolean isDone();
-
-    /**
-     * add the parent namespace context to this parser
-     */
-    void setParentNamespaceContext(NamespaceContext nsContext);
-
-    /**
-     * Initiate the parser - this will do whatever the needed tasks to initiate
-     * the parser and must be called before attempting any specific parsing
-     * using this parser
-     */
-    void init();
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReaderImpl.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReaderImpl.java
deleted file mode 100644
index 2e42ac868f..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReaderImpl.java
+++ /dev/null
@@ -1,858 +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.common.xml.stax;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-
-/**
- * This is the new implementation of the XMLFramentStreamReader. The approach
- * here is simple When the pull parser needs to generate events for a particular
- * name-value(s) pair it always hands over (delegates) the task to another pull
- * parser which knows how to deal with it The common types of name value pairs
- * we'll come across are
- * <ul>
- * <li> String name/QName name - String value
- * <li> String name/QName name - String[] value
- * <li> QName name/String name - XMLStreamReader value
- * <li> QName name/String name - XMLStreamable value
- * <li> QName name/String name - Java bean
- * <li> QName name/String name - Datahandler
- * 
- * </ul>
- * <p/> As for the attributes, these are the possible combinations in the array
- * <ul>
- * <li> String name/QName name - String value
- * </ul>
- * Note that certain array methods have been deliberately removed to avoid
- * complications. The generated code will take the trouble to lay the elements
- * of the array in the correct order <p/> <p/> Hence there will be a parser impl
- * that knows how to handle these types, and this parent parser will always
- * delegate these tasks to the child pullparasers in effect this is one huge
- * state machine that has only a few states and delegates things down to the
- * child parsers whenever possible <p/>
- * 
- * @version $Rev$ $Date$
- */
-public class XMLFragmentStreamReaderImpl implements XMLFragmentStreamReader {
-
-    private static final int DELEGATED_STATE = 2;
-    private static final int END_ELEMENT_STATE = 1;
-    // states for this pullparser - it can only have four states
-    private static final int START_ELEMENT_STATE = 0;
-    private static final int TEXT_STATE = 3;
-
-    protected NamedProperty[] attributes;
-
-    // reference to the child reader
-    protected XMLFragmentStreamReader childReader;
-    // current property index
-    // initialized at zero
-    protected int index;
-    protected Map<String, String> declaredNamespaceMap = new HashMap<String, String>();
-    protected QName elementQName;
-
-    // we always create a new namespace context
-    protected DelegatingNamespaceContext namespaceContext = new DelegatingNamespaceContext();
-
-    protected NamedProperty[] elements;
-
-    // integer field that keeps the state of this
-    // parser.
-    protected int state = START_ELEMENT_STATE;
-
-    /*
-     * we need to pass in a namespace context since when delegated, we've no
-     * idea of the current namespace context. So it needs to be passed on here!
-     */
-    public XMLFragmentStreamReaderImpl(QName elementQName, NamedProperty[] elements, NamedProperty[] attributes) {
-        // validate the lengths, since both the arrays are supposed
-        // to have
-        this.elements = elements == null ? new NamedProperty[0] : elements;
-        this.elementQName = elementQName;
-        this.attributes = attributes == null ? new NamedProperty[0] : attributes;
-    }
-
-    protected XMLFragmentStreamReaderImpl(QName elementQName) {
-        this.elementQName = elementQName;
-    }
-
-    /**
-     * add the namespace context
-     */
-
-    public void setParentNamespaceContext(NamespaceContext nsContext) {
-        // register the namespace context passed in to this
-        this.namespaceContext.setParentNsContext(nsContext);
-
-    }
-
-    protected NamedProperty[] getElements() {
-        return elements;
-    }
-
-    protected NamedProperty[] getAttributes() {
-        return attributes;
-    }
-    
-    protected QName[] getNamespaces() {
-        return new QName[0];
-    }
-
-    /**
-     * @param prefix
-     * @param uri
-     */
-    protected void addToNsMap(String prefix, String uri) {
-        if (!uri.equals(namespaceContext.getNamespaceURI(prefix))) {
-            namespaceContext.pushNamespace(prefix, uri);
-            declaredNamespaceMap.put(prefix, uri);
-        }
-    }
-
-    public void close() throws XMLStreamException {
-        // do nothing here - we have no resources to free
-    }
-
-    public int getAttributeCount() {
-        return (state == DELEGATED_STATE) ? childReader.getAttributeCount() : (state == START_ELEMENT_STATE
-            ? getAttributes().length : 0);
-    }
-
-    public String getAttributeLocalName(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getAttributeLocalName(i);
-        } else if (state == START_ELEMENT_STATE) {
-            QName name = getAttributeName(i);
-            if (name == null) {
-                return null;
-            } else {
-                return name.getLocalPart();
-            }
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    /**
-     * @param i
-     */
-    public QName getAttributeName(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getAttributeName(i);
-        } else if (state == START_ELEMENT_STATE) {
-            if ((i >= (getAttributes().length)) || i < 0) { // out of range
-                return null;
-            } else {
-                // get the attribute pointer
-                QName attribPointer = getAttributes()[i].getKey();
-                // case one - attrib name is null
-                // this should be the pointer to the OMAttribute then
-                if (attribPointer == null) {
-                    throw new UnsupportedOperationException();
-                } else if (attribPointer instanceof QName) {
-                    return attribPointer;
-                } else {
-                    return null;
-                }
-            }
-        } else {
-            throw new IllegalStateException(); // as per the API contract
-        }
-
-    }
-
-    public String getAttributeNamespace(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getAttributeNamespace(i);
-        } else if (state == START_ELEMENT_STATE) {
-            QName name = getAttributeName(i);
-            if (name == null) {
-                return null;
-            } else {
-                return name.getNamespaceURI();
-            }
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributePrefix(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getAttributePrefix(i);
-        } else if (state == START_ELEMENT_STATE) {
-            QName name = getAttributeName(i);
-            if (name == null) {
-                return null;
-            } else {
-                return name.getPrefix();
-            }
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeType(int i) {
-        return null; // not supported
-    }
-
-    public String getAttributeValue(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getAttributeValue(i);
-        } else if (state == START_ELEMENT_STATE) {
-            if ((i >= (getAttributes().length)) || i < 0) { // out of range
-                return null;
-            } else {
-                // get the attribute pointer
-                QName attribPointer = getAttributes()[i].getKey();
-                Object omAttribObj = getAttributes()[i].getValue();
-                // case one - attrib name is null
-                // this should be the pointer to the OMAttribute then
-                if (attribPointer == null) {
-                    throw new UnsupportedOperationException();
-                } else if (attribPointer instanceof QName) {
-                    return (String)omAttribObj;
-                } else {
-                    return null;
-                }
-            }
-        } else {
-            throw new IllegalStateException();
-        }
-
-    }
-
-    public String getAttributeValue(String nsUri, String localName) {
-
-        int attribCount = getAttributeCount();
-        String returnValue = null;
-        QName attribQualifiedName;
-        for (int i = 0; i < attribCount; i++) {
-            attribQualifiedName = getAttributeName(i);
-            if (nsUri == null) {
-                if (localName.equals(attribQualifiedName.getLocalPart())) {
-                    returnValue = getAttributeValue(i);
-                    break;
-                }
-            } else {
-                if (localName.equals(attribQualifiedName.getLocalPart()) && nsUri.equals(attribQualifiedName
-                    .getNamespaceURI())) {
-                    returnValue = getAttributeValue(i);
-                    break;
-                }
-            }
-
-        }
-
-        return returnValue;
-    }
-
-    public String getCharacterEncodingScheme() {
-        return null; // TODO - should we return something for this ?
-    }
-
-    /**
-     * TODO implement the right contract for this
-     * 
-     * @throws XMLStreamException
-     */
-    public String getElementText() throws XMLStreamException {
-        if (state == DELEGATED_STATE) {
-            return childReader.getElementText();
-        } else {
-            return null;
-        }
-
-    }
-
-    // /////////////////////////////////////////////////////////////////////////
-    // / attribute handling
-    // /////////////////////////////////////////////////////////////////////////
-
-    public String getEncoding() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getEncoding();
-        } else {
-            // we've no idea what the encoding is going to be in this case
-            // perhaps we ought to return some constant here, which the user
-            // might
-            // have access to change!
-            return null;
-        }
-    }
-
-    public int getEventType() {
-        if (state == START_ELEMENT_STATE) {
-            return START_ELEMENT;
-        } else if (state == END_ELEMENT_STATE) {
-            return END_ELEMENT;
-        } else if (state == TEXT_STATE) {
-            return CHARACTERS;
-        } else { // this is the delegated state
-            return childReader.getEventType();
-        }
-    }
-
-    public String getLocalName() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getLocalName();
-        } else if (state != TEXT_STATE) {
-            return elementQName.getLocalPart();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    /**
-     */
-    public Location getLocation() {
-        // return a default location
-        return new Location() {
-            public int getCharacterOffset() {
-                return 0;
-            }
-
-            public int getColumnNumber() {
-                return 0;
-            }
-
-            public int getLineNumber() {
-                return 0;
-            }
-
-            public String getPublicId() {
-                return null;
-            }
-
-            public String getSystemId() {
-                return null;
-            }
-        };
-    }
-
-    public QName getName() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getName();
-        } else if (state != TEXT_STATE) {
-            return elementQName;
-        } else {
-            throw new IllegalStateException();
-        }
-
-    }
-
-    public NamespaceContext getNamespaceContext() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getNamespaceContext();
-        } else {
-            return namespaceContext;
-        }
-
-    }
-
-    public int getNamespaceCount() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getNamespaceCount();
-        } else {
-            return declaredNamespaceMap.size();
-        }
-    }
-
-    /**
-     * @param i
-     */
-    public String getNamespacePrefix(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getNamespacePrefix(i);
-        } else if (state != TEXT_STATE) {
-            // order the prefixes
-            String[] prefixes = makePrefixArray();
-            if ((i >= prefixes.length) || (i < 0)) {
-                return null;
-            } else {
-                return prefixes[i];
-            }
-
-        } else {
-            throw new IllegalStateException();
-        }
-
-    }
-
-    public String getNamespaceURI() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getNamespaceURI();
-        } else if (state == TEXT_STATE) {
-            return null;
-        } else {
-            return elementQName.getNamespaceURI();
-        }
-    }
-
-    // /////////////////////////////////////////////////////////////////////////
-    // //////////// end of attribute handling
-    // /////////////////////////////////////////////////////////////////////////
-
-    // //////////////////////////////////////////////////////////////////////////
-    // //////////// namespace handling
-    // //////////////////////////////////////////////////////////////////////////
-
-    public String getNamespaceURI(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getNamespaceURI(i);
-        } else if (state != TEXT_STATE) {
-            String namespacePrefix = getNamespacePrefix(i);
-            return namespacePrefix == null ? null : (String)declaredNamespaceMap.get(namespacePrefix);
-        } else {
-            throw new IllegalStateException();
-        }
-
-    }
-
-    public String getNamespaceURI(String prefix) {
-        return namespaceContext.getNamespaceURI(prefix);
-    }
-
-    public String getPIData() {
-        throw new UnsupportedOperationException("Yet to be implemented !!");
-    }
-
-    public String getPITarget() {
-        throw new UnsupportedOperationException("Yet to be implemented !!");
-    }
-
-    public String getPrefix() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getPrefix();
-        } else if (state == TEXT_STATE) {
-            return null;
-        } else {
-            String prefix = elementQName.getPrefix();
-            return "".equals(prefix) ? null : prefix;
-        }
-    }
-
-    // /////////////////////////////////////////////////////////////////////////
-    // /////// end of namespace handling
-    // /////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param key
-     * @throws IllegalArgumentException
-     */
-    public Object getProperty(String key) throws IllegalArgumentException {
-        if (state == START_ELEMENT_STATE || state == END_ELEMENT_STATE) {
-            return null;
-        } else if (state == TEXT_STATE) {
-            return null;
-        } else if (state == DELEGATED_STATE) {
-            return childReader.getProperty(key);
-        } else {
-            return null;
-        }
-
-    }
-
-    public String getText() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getText();
-        } else if (state == TEXT_STATE) {
-            return (String)getElements()[index - 1].getValue();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public char[] getTextCharacters() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getTextCharacters();
-        } else if (state == TEXT_STATE) {
-            return getElements()[index - 1].getValue() == null ? new char[0] : ((String)getElements()[index - 1]
-                .getValue()).toCharArray();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    private int copy(int sourceStart, char[] target, int targetStart, int length) {
-        char[] source = getTextCharacters();
-        if (sourceStart > source.length) {
-            throw new IndexOutOfBoundsException("source start > source length");
-        }
-        int sourceLen = source.length - sourceStart;
-        if (length > sourceLen) {
-            length = sourceLen;
-        }
-        System.arraycopy(source, sourceStart, target, targetStart, length);
-        return sourceLen;
-    }
-
-    public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
-        if (state == DELEGATED_STATE) {
-            return childReader.getTextCharacters(i, chars, i1, i2);
-        } else if (state == TEXT_STATE) {
-            return copy(i, chars, i1, i2);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextLength() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getTextLength();
-        } else if (state == TEXT_STATE) {
-            return getTextCharacters().length; 
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextStart() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getTextStart();
-        } else if (state == TEXT_STATE) {
-            return 0; // assume text always starts at 0
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getVersion() {
-        return null;
-    }
-
-    public boolean hasName() {
-        // since this parser always has a name, the hasName
-        // has to return true if we are still navigating this element
-        // if not we should ask the child reader for it.
-        if (state == DELEGATED_STATE) {
-            return childReader.hasName();
-        } else {
-            return state != TEXT_STATE;
-        }
-    }
-
-    /**
-     * @throws XMLStreamException
-     */
-    public boolean hasNext() throws XMLStreamException {
-        if (state == DELEGATED_STATE) {
-            if (childReader.isDone()) {
-                // the child reader is done. We shouldn't be getting the
-                // hasNext result from the child pullparser then
-                return true;
-            } else {
-                return childReader.hasNext();
-            }
-        } else {
-            return state == START_ELEMENT_STATE || state == TEXT_STATE;
-
-        }
-    }
-
-    /**
-     * check the validity of this implementation
-     */
-    public boolean hasText() {
-        if (state == DELEGATED_STATE) {
-            return childReader.hasText();
-        } else {
-            return state == TEXT_STATE;
-        }
-
-    }
-
-    /**
-     * we need to split out the calling to the populate namespaces separately
-     * since this needs to be done *after* setting the parent namespace context.
-     * We cannot assume it will happen at construction!
-     */
-    public void init() {
-        // here we have an extra issue to attend to. we need to look at the
-        // prefixes and URIs (the combination) and populate a HashMap of
-        // namespaces. The HashMap of namespaces will be used to serve the
-        // namespace context
-
-        populateNamespaceContext();
-    }
-
-    public boolean isAttributeSpecified(int i) {
-        return false; // not supported
-    }
-
-    public boolean isCharacters() {
-        if (state == START_ELEMENT_STATE || state == END_ELEMENT_STATE) {
-            return false;
-        }
-        return childReader.isCharacters();
-    }
-
-    /**
-     * are we done ?
-     */
-    public boolean isDone() {
-        return state == END_ELEMENT_STATE;
-    }
-
-    public boolean isEndElement() {
-        if (state == START_ELEMENT_STATE) {
-            return false;
-        } else if (state == END_ELEMENT_STATE) {
-            return true;
-        }
-        return childReader.isEndElement();
-    }
-
-    public boolean isStandalone() {
-        return true;
-    }
-
-    public boolean isStartElement() {
-        if (state == START_ELEMENT_STATE) {
-            return true;
-        } else if (state == END_ELEMENT_STATE) {
-            return false;
-        }
-        return childReader.isStartElement();
-    }
-
-    public boolean isWhiteSpace() {
-        if (state == START_ELEMENT_STATE || state == END_ELEMENT_STATE) {
-            return false;
-        }
-        return childReader.isWhiteSpace();
-    }
-
-    /**
-     * Get the prefix list from the HashTable and take that into an array
-     */
-    private String[] makePrefixArray() {
-        String[] prefixes = declaredNamespaceMap.keySet().toArray(new String[declaredNamespaceMap.size()]);
-        Arrays.sort(prefixes);
-        return prefixes;
-    }
-
-    /**
-     * By far this should be the most important method in this class this method
-     * changes the state of the parser
-     */
-    public int next() throws XMLStreamException {
-        int returnEvent = -1; // invalid state is the default state
-        switch (state) {
-            case START_ELEMENT_STATE:
-                // current element is start element. We should be looking at the
-                // property list and making a pullparser for the property value
-                if (getElements() == null || getElements().length == 0) {
-                    // no properties - move to the end element state
-                    // straight away
-                    state = END_ELEMENT_STATE;
-                    returnEvent = END_ELEMENT;
-                } else {
-                    // there are properties. now we should delegate this task to
-                    // a
-                    // child reader depending on the property type
-                    returnEvent = processProperties();
-
-                }
-                break;
-            case END_ELEMENT_STATE:
-                // we've reached the end element already. If the user tries to
-                // push
-                // further ahead then it is an exception
-                throw new XMLStreamException("Trying to go beyond the end of the pullparser");
-
-            case DELEGATED_STATE:
-                if (childReader.isDone()) {
-                    // we've reached the end!
-                    if (index > (getElements().length - 1)) {
-                        state = END_ELEMENT_STATE;
-                        returnEvent = END_ELEMENT;
-                    } else {
-                        returnEvent = processProperties();
-                    }
-                } else {
-                    returnEvent = childReader.next();
-                }
-                break;
-
-            case TEXT_STATE:
-                // if there are any more event we should be delegating to
-                // processProperties. if not we just return an end element
-                if (index > (getElements().length - 1)) {
-                    state = END_ELEMENT_STATE;
-                    returnEvent = END_ELEMENT;
-                } else {
-                    returnEvent = processProperties();
-                }
-                break;
-        }
-        return returnEvent;
-    }
-
-    // /////////////////////////////////////////////////////////////////////////
-    // / Other utility methods
-    // ////////////////////////////////////////////////////////////////////////
-
-    /**
-     * TODO implement this
-     * 
-     * @throws XMLStreamException
-     */
-    public int nextTag() throws XMLStreamException {
-        return 0;
-    }
-
-    /**
-     * Populates a namespace context
-     */
-    private void populateNamespaceContext() {
-
-        // first add the current element namespace to the namespace context
-        // declare it if not found
-        addToNsMap(elementQName.getPrefix(), elementQName.getNamespaceURI());
-        
-        for (QName n : getNamespaces()) {
-            addToNsMap(n.getPrefix(), n.getNamespaceURI());
-        }
-
-        // traverse through the attributes and populate the namespace context
-        // the attrib list can be of many combinations
-        // the valid combinations are
-        // String - String
-        // QName - QName
-        // null - OMAttribute
-
-        for (int i = 0; i < getAttributes().length; i++) { // jump in two
-            QName attrQName = getAttributes()[i].getKey();
-            if (!"".equals(attrQName.getNamespaceURI())) {
-                addToNsMap(attrQName.getPrefix(), attrQName.getNamespaceURI());
-            }
-        }
-    }
-
-    /**
-     * A convenient method to reuse the properties
-     * 
-     * @return event to be thrown
-     * @throws XMLStreamException
-     */
-    private int processProperties() throws XMLStreamException {
-        // move to the next property depending on the current property
-        // index
-        QName propertyQName = getElements()[index].getKey();
-        boolean textFound = false;
-        if (propertyQName == null) {
-            throw new XMLStreamException("property key cannot be null!");
-        } else if (ELEMENT_TEXT.equals(propertyQName.getLocalPart())) {
-            // propPointer being a String has a special case
-            // that is it can be a the special constant ELEMENT_TEXT that
-            // says this text event
-            textFound = true;
-        }
-
-        // OK! we got the key. Now look at the value
-        Object propertyValue = getElements()[index].getValue();
-        // cater for the special case now
-        if (textFound) {
-            // no delegation here - make the parser null and immediately
-            // return with the event characters
-            childReader = null;
-            state = TEXT_STATE;
-            ++index;
-            return CHARACTERS;
-        } else if (propertyValue == null) {
-            // if the value is null we delegate the work to a nullable
-            // parser
-            childReader = new NilElementStreamReader(propertyQName);
-            childReader.setParentNamespaceContext(this.namespaceContext);
-            childReader.init();
-        } else if (propertyValue instanceof String) {
-            // strings are handled by the NameValuePairStreamReader
-            childReader = new NameValuePairStreamReader(propertyQName, (String)propertyValue);
-            childReader.setParentNamespaceContext(this.namespaceContext);
-            childReader.init();
-        } else if (propertyValue instanceof String[]) {
-            // string[] are handled by the NameValueArrayStreamReader
-            // if the array is empty - skip it
-            if (((String[])propertyValue).length == 0) {
-                // advance the index
-                ++index;
-                return processProperties();
-            } else {
-                childReader = new NameValueArrayStreamReader(propertyQName, (String[])propertyValue);
-                childReader.setParentNamespaceContext(this.namespaceContext);
-                childReader.init();
-            }
-
-        } else if (propertyValue instanceof XMLStreamable) {
-            // ADBbean has it's own method to get a reader
-            XMLStreamReader reader = ((XMLStreamable)propertyValue).getXMLStreamReader(propertyQName);
-            // we know for sure that this is an ADB XMLStreamreader.
-            // However we need to make sure that it is compatible
-            if (reader instanceof XMLFragmentStreamReader) {
-                childReader = (XMLFragmentStreamReader)reader;
-                childReader.setParentNamespaceContext(this.namespaceContext);
-                childReader.init();
-            } else {
-                // wrap it to make compatible
-                childReader = new WrappingXMLStreamReader(reader);
-            }
-        } else if (propertyValue instanceof XMLStreamReader) {
-            XMLStreamReader reader = (XMLStreamReader)propertyValue;
-            if (reader instanceof XMLFragmentStreamReader) {
-                childReader = (XMLFragmentStreamReader)reader;
-                childReader.setParentNamespaceContext(this.namespaceContext);
-                childReader.init();
-            } else {
-                // wrap it to make compatible
-                childReader = new WrappingXMLStreamReader(reader);
-            }
-
-        } else {
-            // all special possibilities has been tried! Let's treat
-            // the thing as a bean and try generating events from it
-            throw new UnsupportedOperationException("Property type is not supported");
-            // we cannot register the namespace context here
-        }
-
-        // set the state here
-        state = DELEGATED_STATE;
-        // we are done with the delegation
-        // increment the property index
-        ++index;
-        return childReader.getEventType();
-    }
-
-    public void require(int i, String string, String string1) throws XMLStreamException {
-        throw new UnsupportedOperationException();
-    }
-
-    public boolean standaloneSet() {
-        return true;
-    }
-
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamSerializer.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamSerializer.java
deleted file mode 100644
index 2a86611fcb..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamSerializer.java
+++ /dev/null
@@ -1,287 +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.common.xml.stax;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-/**
- * The XMLStreamSerializer pulls events from the XMLStreamReader and dumps into the XMLStreamWriter
- *
- * @version $Rev$ $Date$
- */
-public class XMLStreamSerializer implements XMLStreamConstants {
-    public static final String NAMESPACE_PREFIX = "ns";
-    private static int namespaceSuffix;
-
-    /*
-     * The behavior of the Serializer is such that it returns when it encounters the starting element for the second
-     * time. The depth variable tracks the depth of the Serializer and tells it when to return. Note that it is assumed
-     * that this Serialization starts on an Element.
-     */
-
-    /**
-     * Field depth
-     */
-    private int depth;
-
-    /**
-     * Generates a unique namespace prefix that is not in the scope of the NamespaceContext
-     * 
-     * @param nsCtxt
-     * @return string
-     */
-    private String generateUniquePrefix(NamespaceContext nsCtxt) {
-        String prefix = NAMESPACE_PREFIX + namespaceSuffix++;
-        // null should be returned if the prefix is not bound!
-        while (nsCtxt.getNamespaceURI(prefix) != null) {
-            prefix = NAMESPACE_PREFIX + namespaceSuffix++;
-        }
-
-        return prefix;
-    }
-
-    /**
-     * Method serialize.
-     * 
-     * @param node
-     * @param writer
-     * @throws XMLStreamException
-     */
-    public void serialize(XMLStreamReader node, XMLStreamWriter writer) throws XMLStreamException {
-        serializeNode(node, writer);
-    }
-
-    /**
-     * @param reader
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeAttributes(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
-        int count = reader.getAttributeCount();
-        String prefix;
-        String namespaceName;
-        String writerPrefix;
-        for (int i = 0; i < count; i++) {
-            prefix = reader.getAttributePrefix(i);
-            namespaceName = reader.getAttributeNamespace(i);
-            /*
-             * Due to parser implementations returning null as the namespace URI (for the empty namespace) we need to
-             * make sure that we deal with a namespace name that is not null. The best way to work around this issue is
-             * to set the namespace URI to "" if it is null
-             */
-            if (namespaceName == null) {
-                namespaceName = "";
-            }
-
-            writerPrefix = writer.getPrefix(namespaceName);
-
-            if (!"".equals(namespaceName)) {
-                // prefix has already being declared but this particular
-                // attrib has a
-                // no prefix attached. So use the prefix provided by the
-                // writer
-                if (writerPrefix != null && (prefix == null || prefix.equals(""))) {
-                    writer.writeAttribute(writerPrefix, namespaceName, reader.getAttributeLocalName(i), reader
-                        .getAttributeValue(i));
-
-                    // writer prefix is available but different from the
-                    // current
-                    // prefix of the attrib. We should be declaring the new
-                    // prefix
-                    // as a namespace declaration
-                } else if (prefix != null && !"".equals(prefix) && !prefix.equals(writerPrefix)) {
-                    writer.writeNamespace(prefix, namespaceName);
-                    writer.writeAttribute(prefix, namespaceName, reader.getAttributeLocalName(i), reader
-                        .getAttributeValue(i));
-
-                    // prefix is null (or empty), but the namespace name is
-                    // valid! it has not
-                    // being written previously also. So we need to generate
-                    // a prefix
-                    // here
-                } else if (prefix == null || prefix.equals("")) {
-                    prefix = generateUniquePrefix(writer.getNamespaceContext());
-                    writer.writeNamespace(prefix, namespaceName);
-                    writer.writeAttribute(prefix, namespaceName, reader.getAttributeLocalName(i), reader
-                        .getAttributeValue(i));
-                } else {
-                    writer.writeAttribute(prefix, namespaceName, reader.getAttributeLocalName(i), reader
-                        .getAttributeValue(i));
-                }
-            } else {
-                // empty namespace is equal to no namespace!
-                writer.writeAttribute(reader.getAttributeLocalName(i), reader.getAttributeValue(i));
-            }
-
-        }
-    }
-
-    /**
-     * Method serializeCData.
-     * 
-     * @param reader
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeCData(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
-        writer.writeCData(reader.getText());
-    }
-
-    /**
-     * Method serializeComment.
-     * 
-     * @param reader
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeComment(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
-        writer.writeComment(reader.getText());
-    }
-
-    /**
-     * @param reader
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeElement(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
-        String prefix = reader.getPrefix();
-        String nameSpaceName = reader.getNamespaceURI();
-        if (nameSpaceName != null) {
-            String writerPrefix = writer.getPrefix(nameSpaceName);
-            if (writerPrefix != null) {
-                writer.writeStartElement(nameSpaceName, reader.getLocalName());
-            } else {
-                if (prefix != null) {
-                    writer.writeStartElement(prefix, reader.getLocalName(), nameSpaceName);
-                    writer.writeNamespace(prefix, nameSpaceName);
-                    // writer.setPrefix(prefix, nameSpaceName);
-                } else {
-                    // [rfeng] We need to set default NS 1st before calling writeStateElement
-                    writer.setDefaultNamespace(nameSpaceName);
-                    writer.writeStartElement(nameSpaceName, reader.getLocalName());
-                    writer.writeDefaultNamespace(nameSpaceName);
-                }
-            }
-        } else {
-            writer.writeStartElement(reader.getLocalName());
-        }
-
-        // add the namespaces
-        int count = reader.getNamespaceCount();
-        String namespacePrefix;
-        for (int i = 0; i < count; i++) {
-            namespacePrefix = reader.getNamespacePrefix(i);
-            // [rfeng] The following is commented out to allow to default ns
-            // if (namespacePrefix != null && namespacePrefix.length() == 0) {
-            // continue;
-            // }
-
-            serializeNamespace(namespacePrefix, reader.getNamespaceURI(i), writer);
-        }
-
-        // add attributes
-        serializeAttributes(reader, writer);
-
-    }
-
-    /**
-     * Method serializeEndElement.
-     * 
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeEndElement(XMLStreamWriter writer) throws XMLStreamException {
-        writer.writeEndElement();
-    }
-
-    /**
-     * Method serializeNamespace.
-     * 
-     * @param prefix
-     * @param uri
-     * @param writer
-     * @throws XMLStreamException
-     */
-    private void serializeNamespace(String prefix, String uri, XMLStreamWriter writer) throws XMLStreamException {
-        String prefix1 = writer.getPrefix(uri);
-        if (prefix1 == null) {
-            writer.writeNamespace(prefix, uri);
-            // writer.setPrefix(prefix, uri);
-        }
-    }
-
-    /**
-     * Method serializeNode.
-     * 
-     * @param reader
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeNode(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
-        while (true) {
-            int event = reader.getEventType();
-            if (event == START_ELEMENT) {
-                serializeElement(reader, writer);
-                depth++;
-            } else if (event == ATTRIBUTE) {
-                serializeAttributes(reader, writer);
-            } else if (event == CHARACTERS) {
-                serializeText(reader, writer);
-            } else if (event == COMMENT) {
-                serializeComment(reader, writer);
-            } else if (event == CDATA) {
-                serializeCData(reader, writer);
-            } else if (event == END_ELEMENT) {
-                serializeEndElement(writer);
-                depth--;
-            } else if (event == START_DOCUMENT) {
-                depth++; // if a start document is found then increment
-                writer.writeStartDocument();
-                // the depth
-            } else if (event == END_DOCUMENT) {
-                if (depth != 0) {
-                    depth--; // for the end document - reduce the depth
-                }
-                writer.writeEndDocument();
-            }
-            if (depth == 0) {
-                break;
-            }
-            if (reader.hasNext()) {
-                reader.next();
-            } else {
-                break;
-            }
-        }
-    }
-
-    /**
-     * @param reader
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeText(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
-        writer.writeCharacters(reader.getText());
-    }
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamable.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamable.java
deleted file mode 100644
index b4b1a24f9d..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamable.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.common.xml.stax;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-
-/**
- * An interface represents data that can be read using StAX streaming
- * 
- * @version $Rev$ $Date$
- */
-public interface XMLStreamable {
-    /**
-     * Get the XMLStreamReader for StAX processing
-     * 
-     * @param rootElementName the name of the element to be generated 
-     * @return Returns a pull parser.
-     */
-    XMLStreamReader getXMLStreamReader(QName rootElementName);
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNode.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNode.java
deleted file mode 100644
index 75a820a620..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNode.java
+++ /dev/null
@@ -1,69 +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.common.xml.stax;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface XmlNode {
-    enum Type {ELEMENT, ATTRIBUTE, CHARACTERS, READER};
-    /**
-     * Returns the children of the receiver as an <code>Iterator</code>.
-     */
-    Iterator<XmlNode> children();
-
-    /**
-     * Returns the attributes of the element as an <code>List</code>. Namespace declarations 
-     * should be excluded.
-     * 
-     * @return
-     */
-    List<XmlNode> attributes();
-    
-    /**
-     * Returns a map of prefix to namespace URI
-     * @return
-     */
-    Map<String, String> namespaces();
-
-    /**
-     * Return the QName of the element. If it's for a text node, the name is null.
-     * @return
-     */
-    QName getName();
-
-    /**
-     * Return the text value of the leaf element
-     * @return
-     */
-    <T> T getValue();
-    
-    /**
-     * Return the type of the XML node
-     * @return
-     */
-    Type getType();
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNodeIterator.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNodeIterator.java
deleted file mode 100644
index 080f9c21e0..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNodeIterator.java
+++ /dev/null
@@ -1,355 +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.common.xml.stax;
-
-import java.util.ArrayList;
-import java.util.EmptyStackException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.NamespaceContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XmlNodeIterator implements Iterator<XmlNode> {
-    public static final int START = 0;
-    public static final int END = 1;
-
-    protected FastStack<ElementHolder> stack;
-    protected int state;
-    protected NamespaceContextImpl nsContext;
-
-    public XmlNodeIterator(XmlNode rootNode) {
-        super();
-        List<XmlNode> v = new ArrayList<XmlNode>(1);
-        v.add(rootNode);
-        stack = new FastStack<ElementHolder>();
-        Iterator<XmlNode> i = v.iterator();
-        stack.push(new ElementHolder(null, i));
-        this.state = START;
-        this.nsContext = new NamespaceContextImpl(null);
-    }
-
-    public boolean hasNext() {
-        return !(stack.empty() || (state == END && stack.peek().parent == null));
-    }
-
-    public XmlNode next() {
-        this.state = START;
-        ElementHolder element = stack.peek();
-        Iterator<XmlNode> it = element.children;
-        if (it == null || (!it.hasNext())) {
-            // End of the children, return END event of parent
-            stack.pop();
-            this.state = END;
-            this.nsContext = (NamespaceContextImpl)nsContext.getParent();
-            return element.parent;
-        }
-        XmlNode node = it.next();
-        stack.push(new ElementHolder(node, node.children()));
-        this.nsContext = new NamespaceContextImpl(this.nsContext);
-        populateNamespaces(node);
-        return node;
-    }
-
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-
-    public int getState() {
-        return state;
-    }
-
-    public NamespaceContext getNamespaceContext() {
-        return nsContext;
-    }
-
-    private void populateNamespaces(XmlNode element) {
-        if (element.getName() != null) {
-            if (element.namespaces() != null) {
-                for (Map.Entry<String, String> e : element.namespaces().entrySet()) {
-                    nsContext.register(e.getKey(), e.getValue());
-                }
-            }
-        }
-    }
-
-    private static class ElementHolder {
-        private XmlNode parent;
-        private Iterator<XmlNode> children;
-
-        public ElementHolder(XmlNode parent, Iterator<XmlNode> children) {
-            this.parent = parent;
-            this.children = children;
-        }
-    }
-
-    private static class NamespaceContextImpl implements NamespaceContext {
-        private NamespaceContext parent;
-        private Map<String, String> map = new HashMap<String, String>();
-
-        /**
-         * @param parent
-         */
-        public NamespaceContextImpl(NamespaceContext parent) {
-            super();
-            this.parent = parent;
-            if (parent == null) {
-                map.put("xml", "http://www.w3.org/XML/1998/namespace");
-                map.put("xmlns", "http://www.w3.org/2000/xmlns/");
-            }
-        }
-
-        public String getNamespaceURI(String prefix) {
-            if (prefix == null) {
-                throw new IllegalArgumentException("Prefix is null");
-            }
-
-            String ns = (String)map.get(prefix);
-            if (ns != null) {
-                return ns;
-            }
-            if (parent != null) {
-                return parent.getNamespaceURI(prefix);
-            }
-            return null;
-        }
-
-        public String getPrefix(String nsURI) {
-            if (nsURI == null)
-                throw new IllegalArgumentException("Namespace is null");
-            for (Iterator<Map.Entry<String, String>> i = map.entrySet().iterator(); i.hasNext();) {
-                Map.Entry<String, String> entry = i.next();
-                if (entry.getValue().equals(nsURI)) {
-                    return entry.getKey();
-                }
-            }
-            if (parent != null) {
-                return parent.getPrefix(nsURI);
-            }
-            return null;
-        }
-
-        public Iterator getPrefixes(String nsURI) {
-            List<String> prefixList = new ArrayList<String>();
-            for (Iterator<Map.Entry<String, String>> i = map.entrySet().iterator(); i.hasNext();) {
-                Map.Entry<String, String> entry = i.next();
-                if (entry.getValue().equals(nsURI)) {
-                    prefixList.add(entry.getKey());
-                }
-            }
-            final Iterator<String> currentIterator = prefixList.iterator();
-            final Iterator parentIterator = parent != null ? null : parent.getPrefixes(nsURI);
-            return new Iterator() {
-
-                public boolean hasNext() {
-                    return currentIterator.hasNext() || (parentIterator != null && parentIterator.hasNext());
-                }
-
-                public Object next() {
-                    if (!hasNext()) {
-                        throw new IllegalStateException("End of iterator has reached");
-                    }
-                    return currentIterator.hasNext() ? currentIterator.next() : parentIterator.next();
-                }
-
-                public void remove() {
-                    throw new UnsupportedOperationException();
-                }
-
-            };
-
-        }
-
-        public void register(String prefix, String ns) {
-            map.put(prefix, ns);
-        }
-
-        public NamespaceContext getParent() {
-            return parent;
-        }
-
-        @Override
-        public String toString() {
-            StringBuffer sb = new StringBuffer(map.toString());
-            if (parent != null) {
-                sb.append("\nParent: ");
-                sb.append(parent);
-            }
-            return sb.toString();
-        }
-    }
-
-    /**
-     * An implementation of the {@link java.util.Stack} API that is based on an <code>ArrayList</code> instead of a
-     * <code>Vector</code>, so it is not synchronized to protect against multi-threaded access. The implementation is
-     * therefore operates faster in environments where you do not need to worry about multiple thread contention.
-     * <p>
-     * The removal order of an <code>ArrayStack</code> is based on insertion order: The most recently added element is
-     * removed first. The iteration order is <i>not</i> the same as the removal order. The iterator returns elements
-     * from the bottom up, whereas the {@link #remove()} method removes them from the top down.
-     * <p>
-     * Unlike <code>Stack</code>, <code>ArrayStack</code> accepts null entries.
-     */
-    public static class FastStack<T> extends ArrayList<T> {
-
-        /** Ensure Serialization compatibility */
-        private static final long serialVersionUID = 2130079159931574599L;
-
-        /**
-         * Constructs a new empty <code>ArrayStack</code>. The initial size is controlled by <code>ArrayList</code>
-         * and is currently 10.
-         */
-        public FastStack() {
-            super();
-        }
-
-        /**
-         * Constructs a new empty <code>ArrayStack</code> with an initial size.
-         * 
-         * @param initialSize the initial size to use
-         * @throws IllegalArgumentException if the specified initial size is negative
-         */
-        public FastStack(int initialSize) {
-            super(initialSize);
-        }
-
-        /**
-         * Return <code>true</code> if this stack is currently empty.
-         * <p>
-         * This method exists for compatibility with <code>java.util.Stack</code>. New users of this class should use
-         * <code>isEmpty</code> instead.
-         * 
-         * @return true if the stack is currently empty
-         */
-        public boolean empty() {
-            return isEmpty();
-        }
-
-        /**
-         * Returns the top item off of this stack without removing it.
-         * 
-         * @return the top item on the stack
-         * @throws EmptyStackException if the stack is empty
-         */
-        public T peek() throws EmptyStackException {
-            int n = size();
-            if (n <= 0) {
-                throw new EmptyStackException();
-            } else {
-                return get(n - 1);
-            }
-        }
-
-        /**
-         * Returns the n'th item down (zero-relative) from the top of this stack without removing it.
-         * 
-         * @param n the number of items down to go
-         * @return the n'th item on the stack, zero relative
-         * @throws EmptyStackException if there are not enough items on the stack to satisfy this request
-         */
-        public T peek(int n) throws EmptyStackException {
-            int m = (size() - n) - 1;
-            if (m < 0) {
-                throw new EmptyStackException();
-            } else {
-                return get(m);
-            }
-        }
-
-        /**
-         * Pops the top item off of this stack and return it.
-         * 
-         * @return the top item on the stack
-         * @throws EmptyStackException if the stack is empty
-         */
-        public T pop() throws EmptyStackException {
-            int n = size();
-            if (n <= 0) {
-                throw new EmptyStackException();
-            } else {
-                return remove(n - 1);
-            }
-        }
-
-        /**
-         * Pushes a new item onto the top of this stack. The pushed item is also returned. This is equivalent to calling
-         * <code>add</code>.
-         * 
-         * @param item the item to be added
-         * @return the item just pushed
-         */
-        public Object push(T item) {
-            add(item);
-            return item;
-        }
-
-        /**
-         * Returns the top-most index for the object in the stack
-         * 
-         * @param object the object to be searched for
-         * @return top-most index, or -1 if not found
-         */
-        public int search(T object) {
-            int i = size() - 1; // Current index
-            while (i >= 0) {
-                T current = get(i);
-                if ((object == null && current == null) || (object != null && object.equals(current))) {
-                    return i;
-                }
-                i--;
-            }
-            return -1;
-        }
-
-        /**
-         * Returns the element on the top of the stack.
-         * 
-         * @return the element on the top of the stack
-         * @throws EmptyStackException if the stack is empty
-         */
-        public T get() {
-            int size = size();
-            if (size == 0) {
-                throw new EmptyStackException();
-            }
-            return get(size - 1);
-        }
-
-        /**
-         * Removes the element on the top of the stack.
-         * 
-         * @return the removed element
-         * @throws EmptyStackException if the stack is empty
-         */
-        public T remove() {
-            int size = size();
-            if (size == 0) {
-                throw new EmptyStackException();
-            }
-            return remove(size - 1);
-        }
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderImpl.java b/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderImpl.java
deleted file mode 100644
index 93295b3d43..0000000000
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderImpl.java
+++ /dev/null
@@ -1,531 +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.common.xml.stax;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-/**
- * 
- * @version $Rev$ $Date$
- */
-public class XmlTreeStreamReaderImpl implements XMLStreamReader {
-
-    protected int state;
-    protected XmlNodeIterator iterator;
-    protected XmlNode current;
-
-    protected XMLStreamReader reader;
-
-    /*
-     * we need to pass in a namespace context since when delegated, we've no
-     * idea of the current namespace context. So it needs to be passed on here!
-     */
-    public XmlTreeStreamReaderImpl(XmlNode root) {
-        this.iterator = new XmlNodeIterator(root);
-        this.current = null;
-        this.state = START_DOCUMENT;
-        this.reader = null;
-    }
-
-    public void close() throws XMLStreamException {
-        if (reader != null) {
-            reader.close();
-        }
-    }
-
-    private void checkElementState() {
-        if (getEventType() != START_ELEMENT && getEventType() != END_ELEMENT) {
-            throw new IllegalStateException();
-        }
-    }
-
-    private List<XmlNode> getAttributes() {
-        if (current != null && current.attributes() != null) {
-            return current.attributes();
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    public int getAttributeCount() {
-        checkElementState();
-        if (reader != null) {
-            return reader.getAttributeCount();
-        }
-        return getAttributes().size();
-    }
-
-    public String getAttributeLocalName(int i) {
-        checkElementState();
-        if (reader != null) {
-            return reader.getAttributeLocalName(i);
-        }
-        return getAttributes().get(i).getName().getLocalPart();
-    }
-
-    /**
-     * @param i
-     */
-    public QName getAttributeName(int i) {
-        checkElementState();
-        if (reader != null) {
-            return reader.getAttributeName(i);
-        }
-        return getAttributes().get(i).getName();
-    }
-
-    public String getAttributeNamespace(int i) {
-        checkElementState();
-        if (reader != null) {
-            return reader.getAttributeNamespace(i);
-        }
-        return getAttributes().get(i).getName().getNamespaceURI();
-    }
-
-    public String getAttributePrefix(int i) {
-        checkElementState();
-        if (reader != null) {
-            return reader.getAttributePrefix(i);
-        }
-        return getAttributes().get(i).getName().getPrefix();
-    }
-
-    public String getAttributeType(int i) {
-        if (reader != null) {
-            return reader.getAttributeType(i);
-        }
-        return null; // not supported
-    }
-
-    public String getAttributeValue(int i) {
-        checkElementState();
-        if (reader != null) {
-            return reader.getAttributeValue(i);
-        }
-        return getAttributes().get(i).getValue();
-    }
-
-    public String getAttributeValue(String nsUri, String localName) {
-        checkElementState();
-        if (reader != null) {
-            return reader.getAttributeValue(nsUri, localName);
-        }
-        int count = getAttributeCount();
-        String value = null;
-        QName attrQName;
-        for (int i = 0; i < count; i++) {
-            attrQName = getAttributeName(i);
-            if (nsUri == null) {
-                if (localName.equals(attrQName.getLocalPart())) {
-                    value = getAttributeValue(i);
-                    break;
-                }
-            } else {
-                if (localName.equals(attrQName.getLocalPart()) && nsUri.equals(attrQName.getNamespaceURI())) {
-                    value = getAttributeValue(i);
-                    break;
-                }
-            }
-
-        }
-
-        return value;
-    }
-
-    public String getCharacterEncodingScheme() {
-        if (reader != null) {
-            return reader.getCharacterEncodingScheme();
-        }
-        return "UTF-8";
-    }
-
-    public String getElementText() throws XMLStreamException {
-        checkElementState();
-        if (reader != null) {
-            return reader.getElementText();
-        }
-        return current.getValue();
-    }
-
-    public String getEncoding() {
-        if (reader != null) {
-            return reader.getEncoding();
-        }
-        return "UTF-8";
-    }
-
-    public int getEventType() {
-        return state;
-    }
-
-    public String getLocalName() {
-        checkElementState();
-        if (reader != null) {
-            return reader.getLocalName();
-        }
-        return current.getName().getLocalPart();
-    }
-
-    /**
-     */
-    public Location getLocation() {
-        if (reader != null) {
-            return reader.getLocation();
-        }
-        // return a default location
-        return new Location() {
-            public int getCharacterOffset() {
-                return 0;
-            }
-
-            public int getColumnNumber() {
-                return 0;
-            }
-
-            public int getLineNumber() {
-                return 0;
-            }
-
-            public String getPublicId() {
-                return null;
-            }
-
-            public String getSystemId() {
-                return null;
-            }
-        };
-    }
-
-    public QName getName() {
-        checkElementState();
-        if (reader != null) {
-            return reader.getName();
-        }
-        return current.getName();
-    }
-
-    public NamespaceContext getNamespaceContext() {
-        if (reader != null) {
-            return reader.getNamespaceContext();
-        }
-        return iterator.getNamespaceContext();
-    }
-
-    private Map<String, String> getNamespaces() {
-        if (current != null && current.namespaces() != null) {
-            return current.namespaces();
-        } else {
-            return Collections.emptyMap();
-        }
-    }
-
-    public int getNamespaceCount() {
-        checkElementState();
-        if (reader != null) {
-            return reader.getNamespaceCount();
-        }
-        return getNamespaces().size();
-    }
-
-    /**
-     * @param i
-     */
-    public String getNamespacePrefix(int i) {
-        checkElementState();
-        if (reader != null) {
-            return reader.getNamespacePrefix(i);
-        }
-        return new ArrayList<Map.Entry<String, String>>(getNamespaces().entrySet()).get(i).getKey();
-    }
-
-    public String getNamespaceURI() {
-        checkElementState();
-        if (reader != null) {
-            return reader.getNamespaceURI();
-        }
-        return current.getName().getNamespaceURI();
-    }
-
-    public String getNamespaceURI(int i) {
-        checkElementState();
-        if (reader != null) {
-            return reader.getNamespaceURI(i);
-        }
-        return new ArrayList<Map.Entry<String, String>>(getNamespaces().entrySet()).get(i).getValue();
-    }
-
-    public String getNamespaceURI(String prefix) {
-        if (reader != null) {
-            return reader.getNamespaceURI(prefix);
-        }
-        return getNamespaceContext().getNamespaceURI(prefix);
-    }
-
-    public String getPIData() {
-        if (reader != null) {
-            return reader.getPIData();
-        }
-        throw new UnsupportedOperationException("Yet to be implemented !!");
-    }
-
-    public String getPITarget() {
-        if (reader != null) {
-            return reader.getPITarget();
-        }
-        throw new UnsupportedOperationException("Yet to be implemented !!");
-    }
-
-    public String getPrefix() {
-        if (reader != null) {
-            return reader.getPrefix();
-        }
-        if (state == START_ELEMENT || state == END_ELEMENT) {
-            String prefix = current.getName().getPrefix();
-            return "".equals(prefix) ? null : prefix;
-        } else if (state == START_DOCUMENT) {
-            return null;
-        } else {
-            throw new IllegalStateException("State==" + state);
-        }
-    }
-
-    /**
-     * @param key
-     * @throws IllegalArgumentException
-     */
-    public Object getProperty(String key) throws IllegalArgumentException {
-        if (reader != null) {
-            return reader.getProperty(key);
-        }
-        return null;
-    }
-
-    public String getText() {
-        if (reader != null) {
-            return reader.getText();
-        }
-        return current.getValue();
-    }
-
-    public char[] getTextCharacters() {
-        if (reader != null) {
-            return reader.getTextCharacters();
-        }
-        String value = current.getValue();
-        return value == null ? new char[0] : value.toCharArray();
-    }
-
-    private int copy(int sourceStart, char[] target, int targetStart, int length) {
-        char[] source = getTextCharacters();
-        if (sourceStart > source.length) {
-            throw new IndexOutOfBoundsException("source start > source length");
-        }
-        int sourceLen = source.length - sourceStart;
-        if (length > sourceLen) {
-            length = sourceLen;
-        }
-        System.arraycopy(source, sourceStart, target, targetStart, length);
-        return sourceLen;
-    }
-
-    public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
-        if (reader != null) {
-            return reader.getTextCharacters(i, chars, i1, i2);
-        }
-        return copy(i, chars, i1, i2);
-    }
-
-    public int getTextLength() {
-        if (reader != null) {
-            return reader.getTextLength();
-        }
-        return getTextCharacters().length;
-    }
-
-    public int getTextStart() {
-        if (reader != null) {
-            return reader.getTextStart();
-        }
-        return 0;
-    }
-
-    public String getVersion() {
-        return "1.0";
-    }
-
-    public boolean hasName() {
-        if (reader != null) {
-            return reader.hasName();
-        }
-        return current.getName() != null;
-    }
-
-    /**
-     * @throws XMLStreamException
-     */
-    public boolean hasNext() throws XMLStreamException {
-        return iterator.hasNext() || state != END_DOCUMENT || (reader != null && reader.hasNext());
-    }
-
-    public boolean hasText() {
-        if (reader != null) {
-            return reader.hasText();
-        }
-        return current.getType() == XmlNode.Type.CHARACTERS;
-    }
-
-    public boolean isAttributeSpecified(int i) {
-        if (reader != null) {
-            return reader.isAttributeSpecified(i);
-        }
-        return false; // not supported
-    }
-
-    public boolean isCharacters() {
-        if (reader != null) {
-            return reader.isCharacters();
-        }
-        return current.getType() == XmlNode.Type.CHARACTERS;
-    }
-
-    public boolean isEndElement() {
-        if (reader != null) {
-            return reader.isEndElement();
-        }
-        return getEventType() == END_ELEMENT;
-    }
-
-    public boolean isStandalone() {
-        return true;
-    }
-
-    public boolean isStartElement() {
-        if (reader != null) {
-            return reader.isStartElement();
-        }
-        return getEventType() == START_ELEMENT;
-    }
-
-    public boolean isWhiteSpace() {
-        if (reader != null) {
-            return reader.isWhiteSpace();
-        }
-        return false;
-    }
-
-    /**
-     * By far this should be the most important method in this class this method
-     * changes the state of the parser
-     */
-    public int next() throws XMLStreamException {
-        if (!hasNext()) {
-            throw new IllegalStateException("No more events");
-        }
-        if (reader != null) {
-            if (!reader.hasNext()) {
-                this.reader = null;
-            } else {
-                // Go to the delegation mode
-                state = reader.next();
-                return state;
-            }
-        }
-        if (!iterator.hasNext()) {
-            state = END_DOCUMENT;
-            current = null;
-            return state;
-        }
-        current = iterator.next();
-        XmlNode.Type type = current.getType();
-
-        int itState = iterator.getState();
-        if (itState == XmlNodeIterator.END) {
-            if (type == XmlNode.Type.ELEMENT) {
-                state = END_ELEMENT;
-            } else {
-                // Ignore the pop
-                state = next();
-            }
-        }
-        if (itState == XmlNodeIterator.START) {
-            if (type == XmlNode.Type.ELEMENT) {
-                state = START_ELEMENT;
-            } else if (type == XmlNode.Type.CHARACTERS) {
-                state = CHARACTERS;
-            } else if (type == XmlNode.Type.READER) {
-                XMLStreamReader value = current.getValue();
-                this.reader = new WrappingXMLStreamReader(value);
-                state = reader.getEventType();
-                return state;
-            }
-        }
-        return state;
-    }
-
-    /**
-     * TODO implement this
-     * 
-     * @throws XMLStreamException
-     */
-    public int nextTag() throws XMLStreamException {
-        while (true) {
-            int event = next();
-            if (event == START_ELEMENT || event == END_ELEMENT) {
-                return event;
-            }
-        }
-    }
-
-    public void require(int i, String ns, String localPart) throws XMLStreamException {
-        if (reader != null) {
-            reader.require(i, ns, localPart);
-            return;
-        }
-        int event = getEventType();
-        if (event != i) {
-            throw new IllegalStateException("Event type is " + event + " (!=" + i + ")");
-        }
-        QName name = getName();
-        String ns1 = name.getNamespaceURI();
-        String localName1 = name.getLocalPart();
-
-        if (ns != null && !ns.equals(ns1)) {
-            throw new IllegalStateException("Namespace URI is " + ns1 + " (!=" + ns + ")");
-        }
-
-        if (localPart != null && !localPart.equals(localName1)) {
-            throw new IllegalStateException("Local name is " + localName1 + " (!=" + localPart + ")");
-        }
-
-    }
-
-    public boolean standaloneSet() {
-        return true;
-    }
-
-}
diff --git a/java/sca-contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java b/java/sca-contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java
deleted file mode 100644
index 220febe656..0000000000
--- a/java/sca-contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.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 org.apache.tuscany.sca.common.xml.stax;
-
-import static org.junit.Assert.assertNotNull;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.custommonkey.xmlunit.XMLAssert;
-import org.junit.Test;
-
-/**
- * Test Case for StAXHelper
- *
- * @version $Rev$ $Date$
- */
-public class StAXHelperTestCase {
-    private static final String XML =
-        "<a:foo xmlns:a='http://a' name='foo'><bar name='bar'>" 
-            + "<doo a:name='doo' xmlns:a='http://doo'/>"
-            + "</bar></a:foo>";
-
-    @Test
-    public void testHelper() throws Exception {
-        XMLStreamReader reader = StAXHelper.createXMLStreamReader(XML);
-        String xml = StAXHelper.save(reader);
-        XMLAssert.assertXMLEqual(XML, xml);
-        reader = StAXHelper.createXMLStreamReader(xml);
-        assertNotNull(reader);
-    }
-
-}
diff --git a/java/sca-contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderTestCase.java b/java/sca-contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderTestCase.java
deleted file mode 100644
index 4063314f3e..0000000000
--- a/java/sca-contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderTestCase.java
+++ /dev/null
@@ -1,204 +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.common.xml.stax;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.custommonkey.xmlunit.XMLAssert;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XmlTreeStreamReaderTestCase {
-    private static final String IPO_XML =
-        "<?xml version=\"1.0\"?>" + "<ipo:purchaseOrder"
-            + "  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-            + "  xmlns:ipo=\"http://www.example.com/IPO\""
-            + "  xsi:schemaLocation=\"http://www.example.com/IPO ipo.xsd\""
-            + "  orderDate=\"1999-12-01\">"
-            + "  <shipTo exportCode=\"1\" xsi:type=\"ipo:UKAddress\">"
-            + "    <name>Helen Zoe</name>"
-            + "    <street>47 Eden Street</street>"
-            + "    <city>Cambridge</city>"
-            + "    <postcode>CB1 1JR</postcode>"
-            + "  </shipTo>"
-            + "  <billTo xsi:type=\"ipo:USAddress\">"
-            + "    <name>Robert Smith</name>"
-            + "    <street>8 Oak Avenue</street>"
-            + "    <city>Old Town</city>"
-            + "    <state>PA</state>"
-            + "    <zip>95819</zip>"
-            + "  </billTo>"
-            + "  <items>"
-            + "    <item partNum=\"833-AA\">"
-            + "      <productName>Lapis necklace</productName>"
-            + "      <quantity>1</quantity>"
-            + "      <USPrice>99.95</USPrice>"
-            + "      <ipo:comment>Want this for the holidays</ipo:comment>"
-            + "      <shipDate>1999-12-05</shipDate>"
-            + "    </item>"
-            + "  </items>"
-            + "</ipo:purchaseOrder>";
-
-    private static final String XML_RESULT =
-        "<?xml version='1.0' encoding='UTF-8'?>" + "<p1:e1 xmlns:p1=\"http://ns\">"
-            + "<p2:e11 xmlns:p2=\"http://ns1\">MyText</p2:e11>"
-            + "<p1:e12><p1:e121 /></p1:e12>"
-            + "<ipo:purchaseOrder xmlns:ipo=\"http://www.example.com/IPO\" "
-            + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
-            + "xsi:schemaLocation=\"http://www.example.com/IPO ipo.xsd\" orderDate=\"1999-12-01\">  "
-            + "<shipTo exportCode=\"1\" xsi:type=\"ipo:UKAddress\">    "
-            + "<name>Helen Zoe</name>    <street>47 Eden Street</street>    "
-            + "<city>Cambridge</city>    <postcode>CB1 1JR</postcode>  </shipTo>  "
-            + "<billTo xsi:type=\"ipo:USAddress\">    <name>Robert Smith</name>    "
-            + "<street>8 Oak Avenue</street>    <city>Old Town</city>    <state>PA</state>    "
-            + "<zip>95819</zip>  </billTo>  <items>    <item partNum=\"833-AA\">      "
-            + "<productName>Lapis necklace</productName>      <quantity>1</quantity>      "
-            + "<USPrice>99.95</USPrice>      <ipo:comment>Want this for the holidays</ipo:comment>      "
-            + "<shipDate>1999-12-05</shipDate>    </item>  </items></ipo:purchaseOrder></p1:e1>";
-    private XmlNodeImpl root;
-
-    @Before
-    public void setUp() throws Exception {
-        root = new XmlNodeImpl();
-        root.name = new QName("http://ns", "e1", "p1");
-
-        XmlNodeImpl e11 = new XmlNodeImpl();
-        e11.name = new QName("http://ns1", "e11", "p2");
-
-        XmlNodeImpl e12 = new XmlNodeImpl();
-        e12.name = new QName("http://ns", "e12");
-
-        root.children.add(e11);
-        root.children.add(e12);
-
-        XmlNodeImpl e121 = new XmlNodeImpl();
-        e121.name = new QName("http://ns", "e121");
-        e12.children.add(e121);
-
-        XmlNodeImpl e111 = new XmlNodeImpl();
-        e111.value = "MyText";
-        e11.children.add(e111);
-
-        XmlNodeImpl e13 = new XmlNodeImpl();
-        e13.value = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(IPO_XML));
-        root.children.add(e13);
-
-    }
-
-    @Test
-    public void testIterator() {
-        List<QName> elements = new ArrayList<QName>();
-        XmlNodeIterator i = new XmlNodeIterator(root);
-        for (; i.hasNext();) {
-            XmlNode e = i.next();
-            elements.add(e.getName());
-        }
-        // System.out.println(elements);
-        QName[] names =
-            {new QName("http://ns", "e1"), new QName("http://ns1", "e11"), null, null, new QName("http://ns1", "e11"),
-             new QName("http://ns", "e12"), new QName("http://ns", "e121"), new QName("http://ns", "e121"),
-             new QName("http://ns", "e12"), null, null, new QName("http://ns", "e1")};
-        Assert.assertEquals(Arrays.asList(names), elements);
-    }
-
-    @Test
-    public void testReader() throws Exception {
-        XmlTreeStreamReaderImpl reader = new XmlTreeStreamReaderImpl(root);
-        XMLStreamSerializer serializer = new XMLStreamSerializer();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(sw);
-        serializer.serialize(reader, writer);
-        String xml = sw.toString();
-        XMLAssert.assertXMLEqual(XML_RESULT, xml);
-    }
-
-    private static class XmlNodeImpl implements XmlNode {
-        private List<XmlNode> children = new ArrayList<XmlNode>();
-        private List<XmlNode> attrs = new ArrayList<XmlNode>();
-        private Map<String, String> namespaces = new HashMap<String, String>();
-        private QName name;
-        private Object value = "123";
-
-        /**
-         * @see org.apache.tuscany.sca.databinding.xml.XmlNode#attributes()
-         */
-        public List<XmlNode> attributes() {
-            return attrs;
-        }
-
-        /**
-         * @see org.apache.tuscany.sca.databinding.xml.XmlNode#children()
-         */
-        public Iterator<XmlNode> children() {
-            return children.iterator();
-        }
-
-        /**
-         * @see org.apache.tuscany.sca.databinding.xml.XmlNode#getName()
-         */
-        public QName getName() {
-            return name;
-        }
-
-        /**
-         * @see org.apache.tuscany.sca.databinding.xml.XmlNode#getValue()
-         */
-        public <T> T getValue() {
-            return (T)value;
-        }
-
-        /**
-         * @see org.apache.tuscany.sca.databinding.xml.XmlNode#namespaces()
-         */
-        public Map<String, String> namespaces() {
-            return namespaces;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(name);
-        }
-
-        public Type getType() {
-            if (value instanceof XMLStreamReader) {
-                return Type.READER;
-            }
-            return name == null ? Type.CHARACTERS : Type.ELEMENT;
-        }
-
-    }
-}
diff --git a/java/sca-contrib/modules/compact-base/META-INF/MANIFEST.MF b/java/sca-contrib/modules/compact-base/META-INF/MANIFEST.MF
deleted file mode 100644
index f6590e5bb6..0000000000
--- a/java/sca-contrib/modules/compact-base/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0

-Built-By: ant

-Build-Jdk: 1.5.0_15

-Bundle-Description: Apache Tuscany SCA Compact Base Jar

-Bundle-SymbolicName: org.apache.tuscany.sca.compact.base

-Bundle-Version: 2.0-SNAPSHOT

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Export-Package: org.apache.tuscany.sca*

-Extension-Name: tuscany-compact-base

-Main-Class: org.apache.tuscany.sca.node.DynamicNodeMain

-Implementation-Title: Apache Tuscany SCA Compact Base Jar

-Class-Path: activemq-all-5.1.0.jar geronimo-commonj_1.1_spec-1.0.jar j

- axb-api-2.1.jar jaxb-impl-2.1.3.jar jaxws-api-2.1.jar jsr181-api-1.0-

- MR1.jar stax-api-1.0.1.jar stax-api-1.0-2.jar wstx-asl-3.2.1.jar

-

diff --git a/java/sca-contrib/modules/compact-base/pom.xml b/java/sca-contrib/modules/compact-base/pom.xml
deleted file mode 100644
index 628bf299a9..0000000000
--- a/java/sca-contrib/modules/compact-base/pom.xml
+++ /dev/null
@@ -1,527 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-compact-base</artifactId>

-    <name>Apache Tuscany SCA Compact Base Jar</name>

-

-    <properties>

-        <maven.test.skip>true</maven.test.skip>

-        <tuscany.version>${pom.version}</tuscany.version>

-    </properties>

-

-    <dependencies>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-assembly</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-assembly-xsd</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-binding-sca</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-binding-sca-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-contribution</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-contribution-java</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-contribution-namespace</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-contribution-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-core</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-core-databinding</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-core-spi</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-databinding</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-databinding-jaxb</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-definitions</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-definitions-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-endpoint</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-extensibility</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-host-http</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency> 

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-implementation-java</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-implementation-java-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-implementation-node</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-interface</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-interface-java</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-interface-java-jaxws</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-interface-java-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-monitor</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-policy</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-policy-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-workspace</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-workspace-impl</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>${pom.groupId}</groupId>

-            <artifactId>tuscany-workspace-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-  <!-- dependencies to keep in the shaded pom.xml -->

-

-        <dependency>

-            <groupId>cglib</groupId>

-            <artifactId>cglib-nodep</artifactId>

-            <version>2.1_3</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>asm</groupId>

-            <artifactId>asm-all</artifactId>

-            <version>3.1</version>

-        </dependency>

-

-        <!-- dependency>

-            <groupId>org.apache.ws.commons.schema</groupId>

-            <artifactId>XmlSchema</artifactId>

-            <version>1.4.2</version>

-        </dependency -->

-

-  <!-- these remaining dependencies are not required when using JDK6, maybe make them optional -->

-

-<!--

-        <dependency>

-            <groupId>org.apache.geronimo.specs</groupId>

-            <artifactId>geronimo-commonj_1.1_spec</artifactId>

-            <version>1.0</version>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.xml.stream</groupId>

-            <artifactId>stax-api</artifactId>

-            <version>1.0-2</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.codehaus.woodstox</groupId>

-            <artifactId>wstx-asl</artifactId>

-            <version>3.2.4</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.xml.ws</groupId>

-            <artifactId>jaxws-api</artifactId>

-            <version>2.1</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>javax.xml.soap</groupId>

-                    <artifactId>saaj-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.xml.bind</groupId>

-            <artifactId>jaxb-api</artifactId>

-            <version>2.1</version>

-        </dependency>

-

-        <dependency>

-            <groupId>com.sun.xml.bind</groupId>

-            <artifactId>jaxb-impl</artifactId>

-            <version>2.1.7</version>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.jws</groupId>

-            <artifactId>jsr181-api</artifactId>

-            <version>1.0-MR1</version>

-        </dependency>

--->

-    </dependencies>

-

-    <build>

-        <resources>

-            <resource>

-                <directory>src/main/resources</directory>

-                <includes>

-                    <include>**/*</include>

-                </includes>

-            </resource>

-        </resources>

-

-        <plugins>

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-shade-plugin</artifactId>

-                <executions>

-

-                    <execution>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>shade</goal>

-                        </goals>

-                        <configuration>

-                            <shadedGroupFilter>org.apache.tuscany.sca</shadedGroupFilter>

-                            <shadedArtifactAttached>false</shadedArtifactAttached>

-                            <createSourcesJar>${createSourcesJar}</createSourcesJar>

-                            <promoteTransitiveDependencies>false</promoteTransitiveDependencies>

-                            <createDependencyReducedPom>true</createDependencyReducedPom>

-                            <filters>

-              <filter>

-                <artifact>org.apache.tuscany.sca:tuscany-interface-java-jaxws</artifact>

-                <excludes>

-                   <exclude>com/example/**</exclude>

-                </excludes>

-              </filter>

-              <filter>

-                <artifact>org.apache.tuscany.sca:tuscany-databinding-jaxb</artifact>

-                <excludes>

-                   <exclude>com/example/**</exclude>

-                </excludes>

-              </filter>

-              <filter>

-                <artifact>org.apache.tuscany.sca:tuscany-databinding-sdo</artifact>

-                <excludes>

-                   <exclude>com/example/**</exclude>

-                </excludes>

-              </filter>

-                                <filter>

-                                    <artifact>${project.groupId}:${project.artifactId}</artifact>

-

-                                    <excludes>

-                                        <exclude>org/**</exclude>

-                                    </excludes>

-                                </filter>

-                            </filters>

-

-                            <transformers>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.core.ModuleActivator</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.databinding.DataBinding</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.work.WorkScheduler</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory</resource>

-                                </transformer>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">

-                                    <resource>META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider</resource>

-                                </transformer>

-                            </transformers>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-<!-- 

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <mainClass>org.apache.tuscany.sca.node.DynamicNodeMain</mainClass>

-                        </manifest>

-                        <manifestEntries>

-                            <Class-Path>activemq-all-5.1.0.jar geronimo-commonj_1.1_spec-1.0.jar jaxb-api-2.1.jar jaxb-impl-2.1.3.jar jaxws-api-2.1.jar jsr181-api-1.0-MR1.jar stax-api-1.0.1.jar stax-api-1.0-2.jar wstx-asl-3.2.1.jar</Class-Path>

-                            <Bundle-Version>${tuscany.version}</Bundle-Version>

-                            <Bundle-SymbolicName>org.apache.tuscany.sca.compact.base</Bundle-SymbolicName>

-                            <Bundle-Description>${pom.name}</Bundle-Description>

-                            <Export-Package>org.apache.tuscany.sca*</Export-Package>

-                        </manifestEntries>

-                    </archive>

-                </configuration>

-            </plugin>

--->

-

-        </plugins>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/modules/contribution-osgi/LICENSE b/java/sca-contrib/modules/contribution-osgi/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/contribution-osgi/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/contribution-osgi/NOTICE b/java/sca-contrib/modules/contribution-osgi/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/contribution-osgi/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/contribution-osgi/pom.xml b/java/sca-contrib/modules/contribution-osgi/pom.xml
deleted file mode 100644
index 71c90ca4ef..0000000000
--- a/java/sca-contrib/modules/contribution-osgi/pom.xml
+++ /dev/null
@@ -1,78 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-contribution-osgi</artifactId>
-    <name>Apache Tuscany SCA Contribution Service OSGi </name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.main</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-
-
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.4</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java b/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
deleted file mode 100644
index 0bbb8b707a..0000000000
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
+++ /dev/null
@@ -1,161 +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.contribution.osgi;
-
-
-/**
- * A weak reference to a class, which should be used to register classes
- * with an ArtifactResolver and resolve these classes later.
- *
- * @version $Rev$ $Date$
- */
-public class BundleReference {
-
-    /**
-     * The bundle.
-     */
-    private Object bundle;
-
-    /**
-     * The bundle name.
-     */
-    private String bundleName;
-
-    /**
-     * The bundle version.
-     */
-    private String bundleVersion;
-
-    /**
-     * The bundle name and version.
-     */
-    private String bundleUniqueName;
-
-    /**
-     * The bundle relative path.
-     */
-    private String bundleRelativePath;
-
-    /**
-     * Constructs a new BundleReference.
-     * 
-     * @param bundle The bundle reference
-     * @param bundleName The bundle name
-     * @param bundleVersion The bundle version
-     * @param bundleRelativePath The relative path for the bundle
-     */
-    public BundleReference(Object bundle, String bundleName, String bundleVersion, String bundleRelativePath) {
-        this.bundle = bundle;
-        this.bundleName = bundleName;
-        this.bundleVersion = bundleVersion;       
-        this.bundleRelativePath = bundleRelativePath;
-        this.bundleUniqueName = bundleName + "(" + (bundleVersion == null?"0.0.0":bundleVersion) + ")";
-    }
-    
-    /**
-     * Constructs a new BundleReference.
-     * 
-     * @param bundleName The bundle name
-     * @param bundleVersion The bundle version
-     */
-    public BundleReference(String bundleName, String bundleVersion) {
-        this.bundleName = bundleName;
-        this.bundleVersion = bundleVersion;
-        this.bundleUniqueName = bundleName + "(" + (bundleVersion == null?"0.0.0":bundleVersion) + ")";
-    }
-    
-    /**
-     * Get the referenced bundle.
-     * 
-     * @return The referenced bundle
-     */
-    public Object getBundle() {
-        return bundle;
-    }
-    
-    /**
-     * Get the referenced bundle name.
-     * 
-     * @return The bundle name
-     */
-    public String getBundleName() {
-        return bundleName;
-    }
-    
-    /**
-     * Get the referenced bundle version.
-     * 
-     * @return The bundle version
-     */
-    public String getBundleVersion() {
-        return bundleVersion;
-    }
-    
-    /**
-     * Get the referenced bundle name and version.
-     * 
-     * @return The bundle name
-     */
-    public String getBundleUniqueName() {
-        return bundleUniqueName;
-    }
-    
-    /**
-     * Get the relative location of the bundle inside its contribution.
-     * 
-     * @return The bundle path
-     */
-    public String getBundleRelativePath() {
-        return bundleRelativePath;
-    }
-    
-    
-    
-    /**
-     * Returns true if the bundle reference is unresolved.
-     * 
-     * @return Whether or not the bundle has been resolved
-     */
-    public boolean isUnresolved() {
-        return bundle == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return bundleUniqueName.hashCode();
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else {
-            if (obj instanceof BundleReference) {
-                BundleReference ref = (BundleReference)obj;
-                return bundleName.equals(ref.bundleName) &&
-                       (bundleVersion == null || ref.bundleVersion == null ||
-                        bundleVersion.equals(ref.bundleVersion));
-            } else {
-                return false;
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java b/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
deleted file mode 100644
index 5033d7eefc..0000000000
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
+++ /dev/null
@@ -1,161 +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.contribution.osgi.impl;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.MalformedURLException;

-import java.net.URI;

-import java.net.URL;

-import java.util.ArrayList;

-import java.util.Enumeration;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-import java.util.jar.JarEntry;

-import java.util.jar.JarInputStream;

-

-import org.apache.tuscany.sca.contribution.PackageType;

-import org.apache.tuscany.sca.contribution.processor.PackageProcessor;

-import org.apache.tuscany.sca.contribution.service.ContributionException;

-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;

-import org.osgi.framework.Bundle;

-

-/**

- * Bundle Contribution package processor.

- *

- * @version $Rev$ $Date$

- */

-public class OSGiBundleContributionProcessor implements PackageProcessor {

-

-    public OSGiBundleContributionProcessor() {

-    }

-

-    public String getPackageType() {

-        return PackageType.BUNDLE;

-    }

-

-    public URL getArtifactURL(URL sourceURL, URI artifact) throws MalformedURLException {

-        Bundle bundle = null;

-        try {

-            bundle = OSGiRuntime.findInstalledBundle(sourceURL);

-            if (bundle != null) {

-                URL url = bundle.getResource(artifact.getPath());

-                if (url == null)

-                    System.out.println("Could not load resource " + artifact);

-                return url;

-            }

-        } catch (Exception e) {

-        }

-        return null;

-    }

-    

-    public List<URI> getJarArtifacts(URL packageSourceURL, InputStream inputStream) throws ContributionException,

-    IOException {

-    if (packageSourceURL == null) {

-        throw new IllegalArgumentException("Invalid null package source URL.");

-    }

-

-    if (inputStream == null) {

-        throw new IllegalArgumentException("Invalid null source inputstream.");

-    }

-

-    // Assume the root is a jar file

-    JarInputStream jar = new JarInputStream(inputStream);

-    try {

-        Set<String> names = new HashSet<String>();

-        while (true) {

-            JarEntry entry = jar.getNextJarEntry();

-            if (entry == null) {

-                // EOF

-                break;

-            }

-

-            // FIXME: Maybe we should externalize the filter as a property

-            String name = entry.getName(); 

-            if (!name.startsWith(".") && !entry.isDirectory()) {

-                

-                // Trim trailing /

-                if (name.endsWith("/")) {

-                    name = name.substring(0, name.length() - 1);

-                }

-

-                // Add the entry name

-                if (!names.contains(name) && name.length() > 0) {

-                    names.add(name);

-                    

-                }

-            }

-        }

-        

-        // Return list of URIs

-        List<URI> artifacts = new ArrayList<URI>();

-        for (String name: names) {

-            artifacts.add(URI.create(name));

-        }

-        return artifacts;

-        

-    } finally {

-        jar.close();

-    }

-}

-

-    public List<URI> getArtifacts(URL packageSourceURL, InputStream inputStream) throws ContributionException,

-        IOException {

-        

-        Bundle bundle = null;

-        try {

-            bundle = OSGiRuntime.findInstalledBundle(packageSourceURL);

-        } catch (Exception e) {

-        }

-        

-        if (bundle == null) {

-            throw new IllegalArgumentException("Could not find OSGi bundle " + packageSourceURL);

-        }

-        

-        if (packageSourceURL == null) {

-            throw new IllegalArgumentException("Invalid null package source URL.");

-        }

-

-        List<URI> artifacts = new ArrayList<URI>();

-

-        try {

-            Enumeration entries = bundle.findEntries("/", "*", true);

-            while (entries.hasMoreElements()) {

-                URL entry = (URL)entries.nextElement();

-                String entryName = entry.getPath();

-                if (entryName.startsWith("/"))

-                    entryName = entryName.substring(1);

-                artifacts.add(new URI(entryName));

-                

-                if (entryName.endsWith(".jar")) {

-

-                    URL jarResource = bundle.getResource(entryName);

-                    artifacts.addAll(getJarArtifacts(jarResource, jarResource.openStream()));

-                }

-            

-            }

-        } catch (Exception e) {

-            throw new RuntimeException(e);

-        }

-

-        return artifacts;

-    }

-}

diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
deleted file mode 100644
index b3c2302f60..0000000000
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
+++ /dev/null
@@ -1,141 +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.contribution.osgi.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.List;
-import java.util.jar.Attributes;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.osgi.BundleReference;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-/**
- * OSGi bundle processor
- *
- * @version $Rev$ $Date$
- */
-public class OSGiBundleProcessor {
-
-    private boolean initializedOSGi;
-    private OSGiRuntime osgiRuntime;
-
-    public OSGiBundleProcessor() {
-    }
-
-    public Object installContributionBundle(Contribution contribution) {
-
-        JarInputStream jar = null;
-        Object bundle = null;
-
-        try {
-
-            URL contribURL = new URL(contribution.getLocation());
-            jar = new JarInputStream(contribURL.openStream());
-
-            Manifest manifest = jar.getManifest();
-            if (manifest != null && manifest.getMainAttributes()
-                .containsKey(new Attributes.Name("Bundle-SymbolicName"))) {
-
-                initialize();
-                if (osgiRuntime != null)
-                    bundle = osgiRuntime.installBundle(contribURL.toString(), null);
-            }
-        } catch (Exception e) {
-            // If OSGi cannot process the jar, treat the bundle as a plain jar file.
-        } finally {
-
-            try {
-                if (jar != null)
-                    jar.close();
-            } catch (IOException e) {
-            }
-        }
-
-        return bundle;
-    }
-
-    public BundleReference installNestedBundle(Contribution contribution,
-                                               String bundleSymbolicName,
-                                               String bundleVersion) {
-
-        BundleReference bundleReference = null;
-
-        initialize();
-        if (osgiRuntime == null)
-            return null;
-
-        List<Artifact> artifacts = contribution.getArtifacts();
-        for (Artifact a : artifacts) {
-            if (a.getURI().endsWith(".jar")) {
-
-                InputStream stream;
-                JarInputStream jar = null;
-                Object name;
-                Object version;
-                try {
-
-                    URL artifactURL = new URL(a.getLocation());
-                    stream = artifactURL.openStream();
-                    jar = new JarInputStream(artifactURL.openStream());
-                    Manifest manifest = jar.getManifest();
-                    name = manifest.getMainAttributes().get(new Attributes.Name("Bundle-SymbolicName"));
-                    version = manifest.getMainAttributes().get(new Attributes.Name("Bundle-Version"));
-
-                    if (bundleSymbolicName.equals(name) && (bundleVersion == null || version == null || bundleVersion
-                        .equals(version))) {
-
-                        Object bundle = osgiRuntime.installBundle(a.getLocation(), stream);
-
-                        bundleReference = new BundleReference(bundle, bundleSymbolicName, bundleVersion, a.getURI());
-
-                        break;
-                    }
-
-                } catch (Exception e) {
-
-                    // If OSGi cannot process the jar, treat the bundle as a plain jar file.
-                } finally {
-                    try {
-                        if (jar != null)
-                            jar.close();
-                    } catch (IOException e) {
-                    }
-                }
-            }
-        }
-        return bundleReference;
-    }
-
-    private void initialize() {
-        try {
-            if (!initializedOSGi) {
-                initializedOSGi = true;
-                osgiRuntime = OSGiRuntime.getRuntime();
-            }
-        } catch (Exception e) {
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
deleted file mode 100644
index 07e80f66f3..0000000000
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
+++ /dev/null
@@ -1,154 +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.contribution.osgi.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.osgi.BundleReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-import org.osgi.framework.Bundle;
-
-/**
- * A Model Resolver for BundleReferences.
- *
- * @version $Rev$ $Date$
- */
-public class OSGiBundleReferenceModelResolver implements ModelResolver {
-    private Contribution contribution;
-    private Map<String, BundleReference> map = new HashMap<String, BundleReference>();
-    
-    OSGiRuntime osgiRuntime;
-    private OSGiBundleProcessor bundleProcessor;
-    
-    public OSGiBundleReferenceModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
-        this.contribution = contribution;
-        this.bundleProcessor = new OSGiBundleProcessor();
-    }
-
-    public void addModel(Object resolved) {
-        BundleReference bundleRef = (BundleReference)resolved;
-        map.put(bundleRef.getBundleUniqueName(), bundleRef);
-    }
-    
-    public Object removeModel(Object resolved) {
-        return map.remove(((BundleReference)resolved).getBundleUniqueName());
-    }
-    
-    /**
-     * Handle artifact resolution when the specific class reference is imported from another contribution
-     * @param unresolved
-     * @return
-     */
-    private BundleReference resolveImportedModel(BundleReference unresolved) {
-        BundleReference resolved = unresolved;
-
-        if( this.contribution != null) {
-            for (Import import_ : this.contribution.getImports()) {
-                
-                resolved = import_.getModelResolver().resolveModel(BundleReference.class, unresolved);
-                if (resolved != unresolved)
-                        break;
-            }
-            
-        }
-        return resolved;
-    }
-    
-    
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        Object resolved = map.get(unresolved);
-        
-        if (resolved != null ){
-            return modelClass.cast(resolved);
-        } 
-        
-        try {
-            if (osgiRuntime == null)
-                osgiRuntime = OSGiRuntime.getRuntime();
-        } catch (Exception e) {
-        }
-        if (osgiRuntime == null)
-            return unresolved;
-
-        //Load a class on demand
-        Object bundle = null;
-        String bundleName = ((BundleReference)unresolved).getBundleName();
-        String bundleVersion = ((BundleReference)unresolved).getBundleVersion();
-        
-        bundle = osgiRuntime.findBundle(bundleName, bundleVersion);
-        BundleReference bundleReference;
-        
-        if (bundle == null)
-            bundleReference = bundleProcessor.installNestedBundle(contribution, bundleName, bundleVersion);
-        else {
-            bundleReference = new BundleReference(bundle, 
-                    ((BundleReference)unresolved).getBundleName(),
-                    bundleVersion,
-                    getBundleFileName(bundle)
-                    );
-        }
-                
-        
-        if (bundleReference != null) {
-            //if we load the class            
-            
-            map.put(((BundleReference)unresolved).getBundleUniqueName(), bundleReference);
-            
-            // Return the resolved BundleReference
-            return modelClass.cast(bundleReference);            
-        } else {
-            //delegate resolution of the class
-            resolved = this.resolveImportedModel((BundleReference)unresolved);
-            return modelClass.cast(resolved);
-        }
-        
-
-    }
-    
-    
-    private String getBundleFileName(Object bundle) {
-        if (bundle instanceof Bundle) {
-            String path = ((Bundle)bundle).getLocation();
-            if (path.endsWith("/"))
-                path = path.substring(0, path.length()-1);
-            if (path.startsWith(contribution.getLocation())) {
-                if (path.equals(contribution.getLocation())) {
-                    int index = path.lastIndexOf('/');
-                    if (index > 0 && index < path.length()-1)
-                        path = path.substring(index+1);
-                } else {
-                    path = path.substring(contribution.getLocation().length());
-                    if (path.startsWith("/"))
-                        path = path.substring(1);
-                }
-            } else if (path.lastIndexOf('/') >= 0)
-                path = path.substring(path.lastIndexOf('/')+1);
-            return path;
-        }
-        return null;
-            
-    }
-    
-}
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java b/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
deleted file mode 100644
index 528a287328..0000000000
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
+++ /dev/null
@@ -1,137 +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.contribution.osgi.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-import org.osgi.framework.Bundle;
-
-/**
- * A Model Resolver for ClassReferences.
- *
- * @version $Rev$ $Date$
- */
-public class OSGiClassReferenceModelResolver implements ModelResolver {
-    private Contribution contribution;
-    private Map<String, ClassReference> map = new HashMap<String, ClassReference>();
-    private Bundle bundle;
-    private boolean initialized;
-    private boolean useOSGi;
-
-    public OSGiClassReferenceModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
-        this.contribution = contribution;
-    }
-
-    public void addModel(Object resolved) {
-        ClassReference clazz = (ClassReference)resolved;
-        map.put(clazz.getClassName(), clazz);
-    }
-
-    public Object removeModel(Object resolved) {
-        return map.remove(((ClassReference)resolved).getClassName());
-    }
-
-    /**
-     * Handle artifact resolution when the specific class reference is imported from another contribution
-     * @param unresolved
-     * @return
-     */
-    private ClassReference resolveImportedModel(ClassReference unresolved) {
-        ClassReference resolved = unresolved;
-
-        if (this.contribution != null) {
-            for (Import import_ : this.contribution.getImports()) {
-
-                if (resolved == unresolved && bundle != null) {
-                    resolved = import_.getModelResolver().resolveModel(ClassReference.class, unresolved);
-                    if (resolved != unresolved)
-                        break;
-                }
-            }
-
-        }
-        return resolved;
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        Object resolved = map.get(unresolved);
-
-        if (resolved != null) {
-            return modelClass.cast(resolved);
-        }
-        initialize();
-        if (!useOSGi)
-            return unresolved;
-
-        //Load a class on demand
-        Class clazz = null;
-        if (bundle != null) {
-            try {
-                clazz = bundle.loadClass(((ClassReference)unresolved).getClassName());
-            } catch (Exception e) {
-                // we will later try to delegate to imported model resolvers
-            }
-        }
-
-        if (clazz != null) {
-            //if we load the class            
-            // Store a new ClassReference wrapping the loaded class
-            ClassReference classReference = new ClassReference(clazz);
-            map.put(getPackageName(classReference), classReference);
-
-            // Return the resolved ClassReference
-            return modelClass.cast(classReference);
-        } else {
-            //delegate resolution of the class
-            resolved = this.resolveImportedModel((ClassReference)unresolved);
-            return modelClass.cast(resolved);
-        }
-
-    }
-
-    /***************
-     * Helper methods
-     ***************/
-
-    private String getPackageName(ClassReference clazz) {
-        int pos = clazz.getClassName().lastIndexOf(".");
-        return clazz.getClassName().substring(0, pos - 1);
-    }
-
-    private void initialize() {
-        if (initialized)
-            return;
-
-        initialized = true;
-        try {
-            bundle = OSGiRuntime.findInstalledBundle(contribution.getLocation());
-            useOSGi = bundle != null;
-        } catch (Throwable e) {
-            // Ignore errors, default to ClassReferenceModelResolver
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java b/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
deleted file mode 100644
index 15ad0bd948..0000000000
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
+++ /dev/null
@@ -1,215 +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.contribution.osgi.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.java.JavaExport;
-import org.apache.tuscany.sca.contribution.java.JavaImport;
-import org.apache.tuscany.sca.contribution.service.ContributionListener;
-import org.apache.tuscany.sca.contribution.service.ContributionRepository;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-/**
- * Namespace Import/Export contribution listener
- * The listener would process all import/export from a given contribution 
- * and initialize the model resolvers properly
- * 
- * @version $Rev$ $Date$
- */
-public class OSGiImportExportListener implements ContributionListener {
-
-    private OSGiBundleProcessor bundleProcessor;
-
-    public OSGiImportExportListener() {
-        bundleProcessor = new OSGiBundleProcessor();
-    }
-
-    /**
-     * Initialize the import/export model resolvers
-     * Export model resolvers are same as Contribution model resolver
-     * Import model resolvers are matched to a specific contribution if a location URI is specified, 
-     *    otherwise it try to resolve against all the other contributions
-     */
-    public void contributionAdded(ContributionRepository repository, Contribution contribution) {
-
-        OSGiRuntime osgiRuntime = null;
-        try {
-            if (bundleProcessor.installContributionBundle(contribution) == null) {
-                return;
-            } else {
-                osgiRuntime = OSGiRuntime.getRuntime();
-            }
-        } catch (Exception e) {
-            return;
-        }
-
-        HashSet<Contribution> bundlesToInstall = new HashSet<Contribution>();
-        // Initialize the contribution imports
-        for (Import import_ : contribution.getImports()) {
-            boolean initialized = false;
-
-            if (import_ instanceof JavaImport) {
-                JavaImport javaImport = (JavaImport)import_;
-                String packageName = javaImport.getPackage();
-
-                //Find a matching contribution
-                if (javaImport.getLocation() != null) {
-                    Contribution targetContribution = repository.getContribution(javaImport.getLocation());
-                    if (targetContribution != null) {
-
-                        // Find a matching contribution export
-                        for (Export export : targetContribution.getExports()) {
-                            if (export instanceof JavaExport) {
-                                JavaExport javaExport = (JavaExport)export;
-                                if (packageName.equals(javaExport.getPackage())) {
-
-                                    if (osgiRuntime.findBundle(targetContribution.getLocation()) == null)
-                                        bundlesToInstall.add(targetContribution);
-
-                                    initialized = true;
-
-                                }
-                            }
-                            if (initialized)
-                                break;
-                        }
-                    }
-                }
-            }
-            if (!initialized) {
-                for (Contribution c : repository.getContributions()) {
-
-                    // Go over all exports in the contribution
-                    for (Export export : c.getExports()) {
-                        // If the export matches our namespace, try to the resolve the model object
-                        if (import_.match(export) && osgiRuntime.findBundle(c.getLocation()) == null) {
-                            bundlesToInstall.add(c);
-                        }
-                    }
-                }
-            }
-        }
-        for (Contribution c : bundlesToInstall) {
-            try {
-                installDummyBundle(osgiRuntime, c);
-            } catch (Exception e) {
-            }
-        }
-
-    }
-
-    public void contributionRemoved(ContributionRepository repository, Contribution contribution) {
-
-    }
-
-    public void contributionUpdated(ContributionRepository repository,
-                                    Contribution oldContribution,
-                                    Contribution contribution) {
-
-    }
-
-    private void installDummyBundle(OSGiRuntime osgiRuntime, Contribution contribution) throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-        String EOL = System.getProperty("line.separator");
-
-        String bundleName = contribution.getURI();
-        URL contribURL = new URL(contribution.getLocation());
-        String contribName = contribURL.getPath();
-        if (contribName.endsWith("/")) 
-            contribName = contribName.substring(0, contribName.length()-1);
-        if (contribName.lastIndexOf("/") >= 0)
-            contribName = contribName.substring(contribName.lastIndexOf("/")+1);            
-
-        StringBuffer exportPackageNames = new StringBuffer();
-        for (Export export : contribution.getExports()) {
-            if (export instanceof JavaExport) {
-                if (exportPackageNames.length() > 0)
-                    exportPackageNames.append(",");
-                exportPackageNames.append(((JavaExport)export).getPackage());
-            }
-        }
-        StringBuffer importPackageNames = new StringBuffer();
-        for (Import import_ : contribution.getImports()) {
-            if (import_ instanceof JavaImport) {
-                if (importPackageNames.length() > 0)
-                    importPackageNames.append(",");
-                importPackageNames.append(((JavaImport)import_).getPackage());
-            }
-        }
-
-        String manifestStr =
-            "Manifest-Version: 1.0" + EOL
-                + "Bundle-ManifestVersion: 2"
-                + EOL
-                + "Bundle-Name: "
-                + bundleName
-                + EOL
-                + "Bundle-SymbolicName: "
-                + bundleName
-                + EOL
-                + "Bundle-Version: "
-                + "1.0.0"
-                + EOL
-                + "Bundle-Localization: plugin"
-                + EOL;
-
-        StringBuilder manifestBuf = new StringBuilder();
-        manifestBuf.append(manifestStr);
-        manifestBuf.append("Export-Package: " + exportPackageNames + EOL);
-        manifestBuf.append("Import-Package: " + importPackageNames + EOL);
-        manifestBuf.append("Bundle-ClassPath: .," + contribName + EOL);
-
-        ByteArrayInputStream manifestStream = new ByteArrayInputStream(manifestBuf.toString().getBytes());
-        Manifest manifest = new Manifest();
-        manifest.read(manifestStream);
-
-        JarOutputStream jarOut = new JarOutputStream(out, manifest);
-
-        ZipEntry ze = new ZipEntry(contribName);
-        jarOut.putNextEntry(ze);
-        InputStream stream = contribURL.openStream();
-
-        byte[] bytes = new byte[stream.available()];
-        stream.read(bytes);
-        jarOut.write(bytes);
-        stream.close();
-
-        jarOut.close();
-        out.close();
-
-        ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-
-        osgiRuntime.installBundle("file://" + bundleName + ".jar", in);
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java b/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
deleted file mode 100644
index e624b1d3b5..0000000000
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.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.contribution.osgi.impl;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.osgi.BundleReference;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.osgi.framework.Bundle;
-
-/**
- * An implementation of an artifact resolver for OSGi bundles.
- *
- * @version $Rev$ $Date$
- */
-public class OSGiModelResolverImpl implements ModelResolver {
-    private static final long serialVersionUID = -7826976465762296634L;
-    
-    private Map<Object, Object> map = new HashMap<Object, Object>();
-    
-    private Hashtable<String, Bundle>  bundles;
-    public OSGiModelResolverImpl(Hashtable<String, Bundle> bundles) {
-        this.bundles = bundles;
-    }
-    
-    
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        Object resolved = map.get(unresolved);
-        if (resolved != null) {
-            
-            // Return the resolved object
-            return modelClass.cast(resolved);
-            
-        } else if (unresolved instanceof ClassReference) {
-            
-            // Load a class on demand
-            ClassReference classReference = (ClassReference)unresolved;
-            Class clazz = null;
-            for (Bundle bundle : bundles.values()) {
-                try {
-                    clazz = bundle.loadClass(classReference.getClassName());
-                } catch (ClassNotFoundException e) {
-                    continue;
-                }
-                break;
-            }
-            if (clazz == null) {
-
-                // Return the unresolved object
-                return unresolved;
-            }
-            
-            // Store a new ClassReference wrapping the loaded class
-            resolved = new ClassReference(clazz);
-            map.put(resolved, resolved);
-            
-            // Return the resolved ClassReference
-            return modelClass.cast(resolved);
-                
-        } else if (unresolved instanceof BundleReference) {
-            for (String bundlePath: bundles.keySet()) {
-                Bundle bundle = bundles.get(bundlePath);
-                BundleReference bundleRef = (BundleReference)unresolved;
-                String bundleVersion = (String)bundle.getHeaders().get("Bundle-Version");
-                if (bundle.getSymbolicName().equals(bundleRef.getBundleName())&&
-                    (bundleVersion == null || bundleRef.getBundleVersion() == null ||
-                    bundleVersion.equals(bundleRef.getBundleVersion()))) {
-                    
-                    resolved = new BundleReference(bundle, 
-                            bundle.getSymbolicName(), 
-                            bundleVersion,
-                            bundlePath);
-                    map.put(resolved, resolved);
-                    
-                    // Return the resolved BundleReference
-                    return modelClass.cast(resolved);
-                    
-                }
-            }
-        } 
-            
-        // Return the unresolved object
-        return unresolved;
-    }
-    
-    public void addModel(Object resolved) {
-        map.put(resolved, resolved);
-    }
-    
-    public Object removeModel(Object resolved) {
-        return map.remove(resolved);
-    }
-    
-    public Collection<Object> getModels() {
-        return map.values();
-    }
-    
-}
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
deleted file mode 100644
index 632d135cb5..0000000000
--- a/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.contribution.osgi.impl.OSGiBundleContributionProcessor;type=application/osgi.bundle

diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index 02e8b411eb..0000000000
--- a/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.contribution.osgi.impl.OSGiBundleReferenceModelResolver;model=org.apache.tuscany.sca.contribution.osgi.BundleReference

diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
deleted file mode 100644
index 8dec190930..0000000000
--- a/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.contribution.osgi.impl.OSGiImportExportListener

diff --git a/java/sca-contrib/modules/contribution-resource/META-INF/MANIFEST.MF b/java/sca-contrib/modules/contribution-resource/META-INF/MANIFEST.MF
deleted file mode 100644
index 364c48b8bc..0000000000
--- a/java/sca-contrib/modules/contribution-resource/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.contribution.resource;uses:="or

- g.apache.tuscany.sca.contribution";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.contribution.resource.impl;ver

- sion="1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Resource Import/Export Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397365937

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Resource Import/Export Model

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.contribution;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.contribution.resource;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.contribution.resource

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/contribution-resource/pom.xml b/java/sca-contrib/modules/contribution-resource/pom.xml
deleted file mode 100644
index 14cf357291..0000000000
--- a/java/sca-contrib/modules/contribution-resource/pom.xml
+++ /dev/null
@@ -1,58 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-contribution-resource</artifactId>
-    <name>Apache Tuscany SCA Resource Import/Export Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.4</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java b/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
deleted file mode 100644
index 0bd30c19dd..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
+++ /dev/null
@@ -1,46 +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.contribution.resource;
-
-import org.apache.tuscany.sca.contribution.Export;
-
-
-/**
- * The representation of an resource export.
- * 
- * @version $Rev$ $Date$
- */
-public interface ResourceExport extends Export {
-
-    /**
-     * Get Resource URI that identifies the export.
-     * 
-     * @return The exported resource URI
-     */
-    String getURI();
-
-    /**
-     * Set Resource URI that identifies the export.
-     * 
-     * @param uri The exported resource URI
-     */
-    void setURI(String uri);
-    
-}
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java b/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
deleted file mode 100644
index 07eac9d843..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.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 org.apache.tuscany.sca.contribution.resource;
-
-import org.apache.tuscany.sca.contribution.Import;
-
-/**
- * The representation of an resource import.
- * 
- * @version $Rev$ $Date$
- */
-public interface ResourceImport extends Import {
-
-    /**
-     * Get the location used to resolve the definitions for this import
-     * 
-     * @return The import location
-     */
-    String getLocation();
-
-    /**
-     * Set the location used to resolve the definitions for this import
-     * 
-     * @param location The import location
-     */
-    void setLocation(String location);
-
-    /**
-     * Get URI that identifies the resource import
-     * 
-     * @return The URI
-     */
-    String getURI();
-
-    /**
-     * Set URI that identifies the resource import
-     * 
-     * @param uri The resource URI
-     */
-    void setURI(String uri);
-    
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java b/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
deleted file mode 100644
index 4119c344ce..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
+++ /dev/null
@@ -1,42 +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.contribution.resource;
-
-/**
- * Base Resource import/export model factory
- * 
- * @version $Rev$ $Date$
- */
-public interface ResourceImportExportFactory {
-
-    /**
-     * Create a resource import model object
-     * 
-     * @return The new ResourceImport model object
-     */
-    ResourceImport createResourceImport();
-    
-    /**
-     * Create a resource export model object
-     * 
-     * @return The new ResourceExport model object
-     */
-    ResourceExport createResourceExport();
-}
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java b/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
deleted file mode 100644
index 5c6bb5e245..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
+++ /dev/null
@@ -1,86 +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.contribution.resource.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceImport;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-
-/**
- * A Model Resolver for contribution artifacts.
- *
- * @version $Rev$ $Date$
- */
-public class ArtifactModelResolver implements ModelResolver {
-    private Contribution contribution;
-    private Map<String, Artifact> map = new HashMap<String, Artifact>();
-    
-    public ArtifactModelResolver(Contribution contribution, FactoryExtensionPoint modelFactories) {
-    	this.contribution = contribution;
-    }
-
-    public void addModel(Object resolved) {
-    	Artifact artifact = (Artifact)resolved;
-        map.put(artifact.getURI(), artifact);
-    }
-    
-    public Object removeModel(Object resolved) {
-        return map.remove(((Artifact)resolved).getURI());
-    }
-    
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-
-    	// Get the artifact URI
-        String uri = ((Artifact)unresolved).getURI();
-        if (uri == null) {
-        	return (T)unresolved;
-        }
-        
-        // Lookup the artifact
-        Artifact resolved = (Artifact) map.get(uri);
-        if (resolved != null) {
-            return modelClass.cast(resolved);
-        } 
-        
-        // If not found, delegate the resolution to the imports (in this case based on the resource imports)
-        for (Import import_ : this.contribution.getImports()) {
-            if (import_ instanceof ResourceImport) {
-            	ResourceImport resourceImport = (ResourceImport)import_;
-            	//check the import location against the computed package name from the componentType URI
-                if (resourceImport.getURI().equals(uri)) {
-                    // Delegate the resolution to the import resolver
-                    resolved = resourceImport.getModelResolver().resolveModel(Artifact.class, (Artifact)unresolved);
-                    if (!resolved.isUnresolved()) {
-                        return modelClass.cast(resolved);
-                    }
-                }
-            }
-        }
-
-        return (T)unresolved;
-    }
-    
-}
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java b/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
deleted file mode 100644
index c2d525dfef..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.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 org.apache.tuscany.sca.contribution.resource.impl;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceExport;
-
-/**
- * The representation of an export for the contribution
- * 
- * @version $Rev$ $Date$
- */
-public class ResourceExportImpl implements ResourceExport {
-    /**
-     * The resource URI to be exported
-     */	
-    private String uri; 
-    
-    private ModelResolver modelResolver;
-    
-    protected ResourceExportImpl() {
-        super();
-    }
-    
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-    
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-    
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-    
-}
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java b/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
deleted file mode 100644
index fd568e533d..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
+++ /dev/null
@@ -1,65 +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.contribution.resource.impl;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceExport;
-
-/**
- * A model resolver for resource exports.
- *
- * @version $Rev$ $Date$
- */
-public class ResourceExportModelResolver implements ModelResolver {
-
-    private ResourceExport export;
-    private ModelResolver resolver;
-    
-    public ResourceExportModelResolver(ResourceExport export, ModelResolver resolver) {
-        this.export = export;
-        this.resolver = resolver;
-    }
-    
-    public void addModel(Object resolved) {
-        throw new IllegalStateException();
-    }
-
-    public Object removeModel(Object resolved) {
-        throw new IllegalStateException();
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        
-        // Filter based on the artifact URI
-        Artifact artifact = (Artifact)unresolved;
-        if (export.getURI().equals(artifact.getURI())) {
-            
-            // The artifact URI matches the exported URI, delegate to the
-            // contribution's resolver
-            return resolver.resolveModel(modelClass, unresolved);
-        } else {
-            
-            // The artifact URI is not exported, return the unresolved object
-            return unresolved;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java b/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
deleted file mode 100644
index 885427e92c..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
+++ /dev/null
@@ -1,161 +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.contribution.resource.impl;
-
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceExport;
-import org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * Artifact processor for Resource export
- * 
- * @version $Rev$ $Date$
- */
-public class ResourceExportProcessor implements StAXArtifactProcessor<ResourceExport> {
-
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    private static final QName EXPORT_RESOURCE = new QName(SCA10_NS, "export.resource");
-    private static final String URI = "uri";
-    
-    private final ResourceImportExportFactory factory;
-    private final Monitor monitor;
-    
-    public ResourceExportProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.factory = modelFactories.getFactory(ResourceImportExportFactory.class);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-     private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-	        Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-resource-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-     }
-     
-     /**
-      * Report a exception.
-      * 
-      * @param problems
-      * @param message
-      * @param model
-      */
-     private void error(String message, Object model, Exception ex) {
-         if (monitor != null) {
-             Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-resource-validation-messages", Severity.ERROR, model, message, ex);
-             monitor.problem(problem);
-         }
-     }
-
-    public QName getArtifactType() {
-        return EXPORT_RESOURCE;
-    }
-    
-    public Class<ResourceExport> getModelType() {
-        return ResourceExport.class;
-    }
-    
-    /**
-     * Process <export.resource uri=""/>
-     */
-    public ResourceExport read(XMLStreamReader reader) throws ContributionReadException {
-    	ResourceExport resourceExport = this.factory.createResourceExport();
-        QName element = null;
-        
-        try {
-            while (reader.hasNext()) {
-                int event = reader.getEventType();
-                switch (event) {
-                    case START_ELEMENT:
-                        element = reader.getName();
-                        
-                        // Read <export.resource>
-                        if (EXPORT_RESOURCE.equals(element)) {
-                            String uri = reader.getAttributeValue(null, URI);
-                            if (uri == null) {
-                            	error("AttributeURIMissing", reader);
-                                //throw new ContributionReadException("Attribute 'uri' is missing");
-                            } else
-                                resourceExport.setURI(uri);
-                        } 
-                        
-                        break;
-                    case XMLStreamConstants.END_ELEMENT:
-                        if (EXPORT_RESOURCE.equals(reader.getName())) {
-                            return resourceExport;
-                        }
-                        break;        
-                }
-                
-                // Read the next element
-                if (reader.hasNext()) {
-                    reader.next();
-                }
-            }
-        }
-        catch (XMLStreamException e) {
-            ContributionReadException ex = new ContributionReadException(e);
-            error("XMLStreamException", reader, ex);
-        }
-        
-        return resourceExport;
-    }
-
-    public void write(ResourceExport resourceExport, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <export.resource>
-        writer.writeStartElement(EXPORT_RESOURCE.getNamespaceURI(), EXPORT_RESOURCE.getLocalPart());
-        
-        if (resourceExport.getURI() != null) {
-            writer.writeAttribute(URI, resourceExport.getURI());
-        }
-        
-        writer.writeEndElement();
-    }
-
-    public void resolve(ResourceExport resourceExport, ModelResolver resolver) throws ContributionResolveException {
-        
-        if (resourceExport.getURI() != null)
-            // Initialize the export's model resolver
-            resourceExport.setModelResolver(new ResourceExportModelResolver(resourceExport, resolver));
-    }
-}
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java b/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
deleted file mode 100644
index 880f5f5786..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
+++ /dev/null
@@ -1,41 +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.contribution.resource.impl;
-
-import org.apache.tuscany.sca.contribution.resource.ResourceExport;
-import org.apache.tuscany.sca.contribution.resource.ResourceImport;
-import org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory;
-
-/**
- * Resource Import/Export model factory implementation
- * 
- * @version $Rev$ $Date$
- */
-public class ResourceImportExportFactoryImpl implements ResourceImportExportFactory {
-
-    public ResourceImport createResourceImport() {
-        return new ResourceImportImpl();
-    }
-    
-    public ResourceExport createResourceExport() {
-        return new ResourceExportImpl();
-    }
-
-}
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java b/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
deleted file mode 100644
index cd33f1290f..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
+++ /dev/null
@@ -1,107 +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.contribution.resource.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceExport;
-import org.apache.tuscany.sca.contribution.resource.ResourceImport;
-
-/**
- * The representation of an import for the contribution
- * 
- * @version $Rev$ $Date$
- */
-public class ResourceImportImpl implements ResourceImport {
-    /**
-     * The resource URI to be imported
-     */
-    private String uri; 
-    
-	private ModelResolver modelResolver;
-    private List<Contribution> exportContributions;
-
-    /**
-     * Optional location URI pointing to a Contribution that exports the resource
-     */
-    private String location;
-
-    
-    protected ResourceImportImpl() {
-        super();
-    }
-    
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-    
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-    
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-    
-    public List<Contribution> getExportContributions() {
-        return exportContributions;
-    }
-
-    public void setExportContributions(List<Contribution> contributions) {
-        this.exportContributions = contributions;
-    }
-
-    /**
-     * Match a ResourceImport to a given ResourceExport based on :
-     *    location is not provided
-     *    import and export resource URI match
-     */
-    public boolean match(Export export) {
-        if (export instanceof ResourceExport) {
-            if (this.getLocation() == null || this.getLocation().length() == 0) {
-                if (this.getURI().equals(((ResourceExport)export).getURI())) {
-                    return true;
-                }
-            }
-            
-        }
-        return false;
-    }
-    
-    @Override
-    public String toString() {
-        return String.valueOf(uri);
-    }
-}
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java b/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
deleted file mode 100644
index 865ab8ff25..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
+++ /dev/null
@@ -1,167 +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.contribution.resource.impl;
-
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceImport;
-import org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * Artifact processor for Namespace import
- * 
- * @version $Rev$ $Date$
- */
-public class ResourceImportProcessor  implements StAXArtifactProcessor<ResourceImport> {
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    
-    private static final QName IMPORT_RESOURCE = new QName(SCA10_NS, "import.resource");
-
-    private static final String URI = "uri";
-    private static final String LOCATION = "location";
-    
-    private final ResourceImportExportFactory factory;
-    private final Monitor monitor;
-    
-    public ResourceImportProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.factory = modelFactories.getFactory(ResourceImportExportFactory.class);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a warning.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-     private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-	        Problem problem = monitor.createProblem(this.getClass().getName(), "contribution-resource-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-     }
-     
-     /**
-      * Report a exception.
-      * 
-      * @param problems
-      * @param message
-      * @param model
-      */
-     private void error(String message, Object model, Exception ex) {
-         if (monitor != null) {
-             Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-resource-validation-messages", Severity.ERROR, model, message, ex);
-             monitor.problem(problem);
-         }
-     }
-    
-    public QName getArtifactType() {
-        return IMPORT_RESOURCE;
-    }
-    
-    public Class<ResourceImport> getModelType() {
-        return ResourceImport.class;
-    }
-
-    /**
-     * Process <import.resource uri="" location=""/>
-     */
-    public ResourceImport read(XMLStreamReader reader) throws ContributionReadException {
-    	ResourceImport resourceImport = this.factory.createResourceImport();
-        QName element;
-        
-        try {
-            while (reader.hasNext()) {
-                int event = reader.getEventType();
-                switch (event) {
-                    case START_ELEMENT:
-                        element = reader.getName();
-    
-                        // Read <import>
-                        if (IMPORT_RESOURCE.equals(element)) {
-                            String uri = reader.getAttributeValue(null, URI);
-                            if (uri == null) {
-                            	error("AttributeURIMissing", reader);
-                                //throw new ContributionReadException("Attribute 'uri' is missing");
-                            } else
-                                resourceImport.setURI(uri);
-    
-                            String location = reader.getAttributeValue(null, LOCATION);
-                            if (location != null) {
-                                resourceImport.setLocation(location);
-                            }
-                        }
-                        break;
-                    case XMLStreamConstants.END_ELEMENT:
-                        if (IMPORT_RESOURCE.equals(reader.getName())) {
-                            return resourceImport;
-                        }
-                        break;        
-                }
-                
-                // Read the next element
-                if (reader.hasNext()) {
-                    reader.next();
-                }
-            }
-        }
-        catch (XMLStreamException e) {
-            ContributionReadException ex = new ContributionReadException(e);
-            error("XMLStreamException", reader, ex);
-        }
-        
-        return resourceImport;
-    }
-
-    public void write(ResourceImport resourceImport, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <import>
-        writer.writeStartElement(IMPORT_RESOURCE.getNamespaceURI(), IMPORT_RESOURCE.getLocalPart());
-        
-        if (resourceImport.getURI() != null) {
-            writer.writeAttribute(URI, resourceImport.getURI());
-        }
-        if (resourceImport.getLocation() != null) {
-            writer.writeAttribute(LOCATION, resourceImport.getLocation());
-        }
-        
-        writer.writeEndElement();
-    }
-
-
-    public void resolve(ResourceImport model, ModelResolver resolver) throws ContributionResolveException {
-    }
-}
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 14eb81546d..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-org.apache.tuscany.sca.contribution.resource.impl.ResourceImportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#import.resource,model=org.apache.tuscany.sca.contribution.resource.ResourceImport
-org.apache.tuscany.sca.contribution.resource.impl.ResourceExportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#export.resource,model=org.apache.tuscany.sca.contribution.resource.ResourceExport
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index 08d2b1c338..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.contribution.resource.impl.ArtifactModelResolver;model=org.apache.tuscany.sca.contribution.Artifact
\ No newline at end of file
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory b/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
deleted file mode 100644
index d39a5065c2..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.contribution.resource.impl.ResourceImportExportFactoryImpl

diff --git a/java/sca-contrib/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties b/java/sca-contrib/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
deleted file mode 100644
index 9df66cce52..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
+++ /dev/null
@@ -1,23 +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.
-#
-#
-AttributeURIMissing = Attribute 'uri' is missing
-XMLStreamException = XMLStreamException occured due to : {0}
-
diff --git a/java/sca-contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java b/java/sca-contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
deleted file mode 100644
index 52ec0b4cfc..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
+++ /dev/null
@@ -1,106 +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.contribution.resource.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resource.ResourceExport;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test NamespaceExportProcessorTestCase
- *  
- * @version $Rev$ $Date$
- */
-public class ResourceExportProcessorTestCase {
-
-    private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<export.resource xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" uri=\"helloworld/HelloWorldService.componentType\"/>";
-
-    private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<export.resource xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\"/>";
-
-    private static XMLInputFactory inputFactory;
-    private static StAXArtifactProcessor<Object> staxProcessor;
-    private static Monitor monitor;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactory();
-        if (monitorFactory != null) {
-            monitor = monitorFactory.createMonitor();
-            utilities.addUtility(monitorFactory);
-        }
-        StAXArtifactProcessorExtensionPoint staxProcessors =
-            extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-    }
-
-    /**
-     * Test loading a valid export element from a contribution metadata stream
-     * @throws Exception
-     */
-    @Test
-    public void testLoad() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML));
-        ResourceExport resourceExport = (ResourceExport)staxProcessor.read(reader);
-        assertEquals("helloworld/HelloWorldService.componentType", resourceExport.getURI());
-    }
-
-    /**
-     * Test loading an INVALID export element from a contribution metadata stream
-     * @throws Exception
-     */
-    @Test
-    public void testLoadInvalid() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(INVALID_XML));
-        /*try {
-            staxProcessor.read(reader);
-            fail("readerException should have been thrown");
-        } catch (ContributionReadException e) {
-            assertTrue(true);
-        }*/
-        staxProcessor.read(reader);
-        Problem problem = monitor.getLastProblem();
-        assertNotNull(problem);
-        assertEquals("AttributeURIMissing", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java b/java/sca-contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
deleted file mode 100644
index 1fc439f073..0000000000
--- a/java/sca-contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
+++ /dev/null
@@ -1,107 +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.contribution.resource.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resource.ResourceImport;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test NamespaceImportProcessorTestCase
- * 
- * @version $Rev$ $Date$
- */
-public class ResourceImportProcessorTestCase {
-
-    private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<import.resource xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" uri=\"helloworld/HelloWorldService.componentType\" location=\"sca://contributions/001\"/>";
-
-    private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<import.resource xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
-
-    private static XMLInputFactory inputFactory;
-    private static StAXArtifactProcessor<Object> staxProcessor;
-    private static Monitor monitor;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactory();
-        if (monitorFactory != null) {
-            monitor = monitorFactory.createMonitor();
-            utilities.addUtility(monitorFactory);
-        }
-        StAXArtifactProcessorExtensionPoint staxProcessors =
-            extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-    }
-
-    /**
-     * Test loading a valid import element from a contribution metadata stream
-     * @throws Exception
-     */
-    @Test
-    public void testLoad() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML));
-        ResourceImport namespaceImport = (ResourceImport)staxProcessor.read(reader);
-        assertEquals("helloworld/HelloWorldService.componentType", namespaceImport.getURI());
-        assertEquals("sca://contributions/001", namespaceImport.getLocation());
-    }
-
-    /**
-     * Test loading a INVALID import element from a contribution metadata stream
-     * @throws Exception
-     */
-    @Test
-    public void testLoadInvalid() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(INVALID_XML));
-        /*try {
-            staxProcessor.read(reader);
-            fail("readerException should have been thrown");
-        } catch (ContributionReadException e) {
-            assertTrue(true);
-        }*/
-        staxProcessor.read(reader);
-        Problem problem = monitor.getLastProblem();
-        assertNotNull(problem);
-        assertEquals("AttributeURIMissing", problem.getMessageId());
-    }
-}
diff --git a/java/sca-contrib/modules/data-api/LICENSE b/java/sca-contrib/modules/data-api/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/data-api/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/data-api/META-INF/MANIFEST.MF b/java/sca-contrib/modules/data-api/META-INF/MANIFEST.MF
deleted file mode 100644
index 39743da4f3..0000000000
--- a/java/sca-contrib/modules/data-api/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.data.collection;uses:="org.oasisopen

- .sca.annotations";version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Data API

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397254562

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Data API

-Import-Package: org.apache.tuscany.sca.data.collection;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.data.api

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/data-api/NOTICE b/java/sca-contrib/modules/data-api/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/data-api/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/data-api/pom.xml b/java/sca-contrib/modules/data-api/pom.xml
deleted file mode 100644
index 392c2871bf..0000000000
--- a/java/sca-contrib/modules/data-api/pom.xml
+++ /dev/null
@@ -1,39 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-data-api</artifactId>

-    <name>Apache Tuscany SCA Data API</name>

-

-	<dependencies>

-		<dependency>

-			<groupId>org.apache.tuscany.sca</groupId>

-			<artifactId>tuscany-sca-api</artifactId>

-			<version>2.0-SNAPSHOT</version>

-		</dependency>

-	</dependencies>

-

-</project>

diff --git a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java b/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
deleted file mode 100644
index f1841c975e..0000000000
--- a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
+++ /dev/null
@@ -1,78 +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.data.collection;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Provides access to a collection of data items.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface Collection <K, D> {
-
-    /**
-     * Get the whole collection.
-     * 
-     * @return the whole collection.
-     */
-    Entry<K, D>[] getAll();
-
-    /**
-     * Returns a collection resulting from a query.
-     * 
-     * @return the collection.
-     */
-    Entry<K, D>[] query(String queryString);
-
-    /**
-     * Creates a new item.
-     * 
-     * @param key
-     * @param item
-     * @return
-     */
-    K post(K key, D item);
-
-    /**
-     * Retrieves an item.
-     * 
-     * @param key
-     * @return
-     */
-    D get(K key) throws NotFoundException;
-
-    /**
-     * Updates an item.
-     * 
-     * @param key
-     * @param item
-     * @return
-     */
-    void put(K key, D item) throws NotFoundException;
-
-    /**
-     * Delete an item.
-     * 
-     * @param key
-     */
-    void delete(K key) throws NotFoundException;
-
-}
diff --git a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java b/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
deleted file mode 100644
index 5903fd95a4..0000000000
--- a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
+++ /dev/null
@@ -1,85 +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.data.collection;
-
-
-/**
- * Represents a key/data pair in a data collection.
- * 
- * @version $Rev$ $Date$
- */
-public class Entry <K, D> {
-
-    private K key;
-    private D data;
-    
-    /**
-     * Constructs a new entry.
-     */
-    public Entry() {
-    }
-    
-    /**
-     * Constructs a new entry.
-     * @param key the entry key
-     * @param data the entry data
-     */
-    public Entry(K key, D data) {
-        this.key = key;
-        this.data = data;
-    }
-    
-    /**
-     * Returns the entry key.
-     * @return the key
-     */
-    public K getKey() {
-        return key;
-    }
-    
-    /**
-     * Sets the entry key.
-     * @param key the key
-     */
-    public void setKey(K key) {
-        this.key = key;
-    }
-    
-    /**
-     * Returns the entry data.
-     * @return the entry data
-     */
-    public D getData() {
-        return data;
-    }
-    
-    /**
-     * Sets the entry data
-     * @param data the entry data
-     */
-    public void setData(D data) {
-        this.data = data;
-    }
-
-    //FIXME Temporary methods to make JAXB register the Item
-    // class when the Entry class is registered in a JAXB context  
-    public void setDummy(Item item) {}
-    public Item getDummy() { return null; }
-    
-}
diff --git a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java b/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
deleted file mode 100644
index 37042c0895..0000000000
--- a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
+++ /dev/null
@@ -1,159 +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.data.collection;
-
-import java.util.Date;
-
-
-/**
- * Represents a data item.
- * 
- * @version $Rev$ $Date$
- */
-public class Item {
-
-    private String title;
-    private String contents;
-    private String link;
-    private String related;
-    private String alternate;
-    private Date date;
-    
-    /**
-     * Constructs a new item.
-     */
-    public Item() {
-    }
-
-    /**
-     * Constructs a new item.
-     * @param title the item title
-     * @param contents the item contents
-     * @param link the item link to a web resource
-     * @param related the item link to a related web resource
-     * @param date the item date
-     */
-    public Item(String title, String contents, String link, String related, Date date) {
-        this.title = title;
-        this.contents = contents;
-        this.link = link;
-        this.related = related;
-        this.date = date;
-    }
-
-    /**
-     * Returns the item title.
-     * @return the item title
-     */
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * Sets the item title.
-     * @param title the item title
-     */
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    /**
-     * Returns the item contents
-     * @return the item contents
-     */
-    public String getContents() {
-        return contents;
-    }
-
-    /**
-     * Sets the item contents
-     * @param contents the item contents
-     */
-    public void setContents(String contents) {
-        this.contents = contents;
-    }
-
-    /**
-     * Returns the item link to a web resource
-     * @return the item link to a web resource
-     */
-    public String getLink() {
-        return link;
-    }
-
-    /**
-     * Sets the item link to a web resource
-     * @param link the item link to a web resource
-     */
-    public void setLink(String link) {
-        this.link = link;
-    }
-
-    /**
-     * Returns the item link to a related web resource
-     * @return the item link to a related web resource
-     */
-    public String getRelated() {
-        return related;
-    }
-
-    /**
-     * Sets the item link to a related web resource.
-     *
-     * @param related the item link to a related web resource
-     */
-    public void setRelated(String related) {
-        this.related = related;
-    }
-
-    /**
-     * Returns the item link to an alternate web resource
-     * @return the item link to an alternate web resource
-     */
-    public String getAlternate() {
-        return alternate;
-    }
-
-    /**
-     * Sets the item link to an alternate web resource.
-     *
-     * @param alternate the item link to an alternate web resource
-     */
-    public void setAlternate(String alternate) {
-        this.alternate = alternate;
-    }
-
-    /**
-     * Returns the item date
-     * @return the item date
-     */
-    public Date getDate() {
-        return date;
-    }
-
-    /**
-     * Sets the item date
-     * @param date the item date
-     */
-    public void setDate(Date date) {
-        this.date = date;
-    }
-
-    
-}
diff --git a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java b/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
deleted file mode 100644
index 229b29f5cd..0000000000
--- a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
+++ /dev/null
@@ -1,30 +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.data.collection;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Provides access to a collection of data items.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface ItemCollection extends Collection<String, Item> {
-}
diff --git a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java b/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
deleted file mode 100644
index 69512058b7..0000000000
--- a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
+++ /dev/null
@@ -1,28 +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.data.collection;
-
-
-/**
- * Provides access to a collection of data items.
- * 
- * @version $Rev$ $Date$
- */
-public interface LocalItemCollection extends Collection<String, Item> {
-}
diff --git a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java b/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
deleted file mode 100644
index 7f13db5228..0000000000
--- a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.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.    
- */
-
-package org.apache.tuscany.sca.data.collection;
-
-/**
- * Indicates that an item could not be found in a collection.
- * 
- * @version $Rev$ $Date$
- */
-public class NotFoundException extends Exception {
-    private static final long serialVersionUID = 6792367409396084646L;
-
-    public NotFoundException() {
-    }
-
-    public NotFoundException(String message) {
-        super(message);
-    }
-
-    public NotFoundException(Throwable cause) {
-        super(cause);
-    }
-
-    public NotFoundException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/LICENSE b/java/sca-contrib/modules/databinding-fastinfoset/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/META-INF/MANIFEST.MF b/java/sca-contrib/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
deleted file mode 100644
index 8fc38ffe23..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.databinding.fastinfoset;versio

- n="1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany Data Binding for FastInfoset

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397405343

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany Data Binding for FastInfoset

-Import-Package: com.sun.xml.fastinfoset,

- com.sun.xml.fastinfoset.dom,

- com.sun.xml.fastinfoset.sax,

- com.sun.xml.fastinfoset.stax,

- javax.xml.parsers,

- javax.xml.stream,

- 

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.databinding.xml;version="2.0.0",

- org.w3c.dom,

- org.xml.sax,

- org.xml.sax.helpers

-Bundle-SymbolicName: org.apache.tuscany.sca.databinding.fastinfoset

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/databinding-fastinfoset/NOTICE b/java/sca-contrib/modules/databinding-fastinfoset/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/pom.xml b/java/sca-contrib/modules/databinding-fastinfoset/pom.xml
deleted file mode 100644
index 955f9d615e..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/pom.xml
+++ /dev/null
@@ -1,70 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-databinding-fastinfoset</artifactId>
-    <name>Apache Tuscany Data Binding for FastInfoset</name>
-    <description>Tuscany FastInfoset Data Binding</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.fastinfoset</groupId>
-            <artifactId>FastInfoset</artifactId>
-            <version>1.2.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java b/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
deleted file mode 100644
index 2e0aa629f3..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
+++ /dev/null
@@ -1,70 +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.databinding.fastinfoset;
-
-import java.io.InputStream;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-import com.sun.xml.fastinfoset.dom.DOMDocumentParser;
-
-/**
- * @version $Rev$ $Date$
- */
-public class FastInfoset2Node extends BaseTransformer<InputStream, Node> implements
-    PullTransformer<InputStream, Node> {
-    
-    @Override
-    protected Class<InputStream> getSourceType() {
-        return InputStream.class;
-    }
-
-    @Override
-    protected Class<Node> getTargetType() {
-        return Node.class;
-    }
-
-    public Node transform(InputStream source, TransformationContext context) {
-        try {
-            DOMDocumentParser parser = new DOMDocumentParser();
-            Document doc = DOMHelper.newDocument();
-            parser.parse(doc, source);
-            return doc.getDocumentElement();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        } 
-    }
-
-    @Override
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return "xml:fastinfoset:java.io.InputStream";
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java b/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
deleted file mode 100644
index 77f6b77636..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
+++ /dev/null
@@ -1,71 +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.databinding.fastinfoset;
-
-import java.io.InputStream;
-
-import org.apache.tuscany.sca.databinding.PushTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.xml.sax.ContentHandler;
-
-import com.sun.xml.fastinfoset.sax.SAXDocumentParser;
-
-/**
- * @version $Rev$ $Date$
- */
-public class FastInfoset2SAX extends BaseTransformer<InputStream, ContentHandler> implements
-    PushTransformer<InputStream, ContentHandler> {
-
-    @Override
-    protected Class<InputStream> getSourceType() {
-        return InputStream.class;
-    }
-
-    @Override
-    protected Class<ContentHandler> getTargetType() {
-        return ContentHandler.class;
-    }
-
-    
-    /**
-     * @see org.apache.tuscany.sca.databinding.PushTransformer#transform(java.lang.Object, java.lang.Object, org.apache.tuscany.sca.databinding.TransformationContext)
-     */
-    public void transform(InputStream source, ContentHandler target, TransformationContext context) {
-        try {
-            SAXDocumentParser parser = new SAXDocumentParser();
-            parser.setContentHandler(target);
-            parser.parse(source);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        } 
-    }
-
-    @Override
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return "xml:fastinfoset:java.io.InputStream";
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java b/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
deleted file mode 100644
index 73d549f4f8..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
+++ /dev/null
@@ -1,67 +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.databinding.fastinfoset;
-
-import java.io.InputStream;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-import com.sun.xml.fastinfoset.stax.StAXDocumentParser;
-
-/**
- * @version $Rev$ $Date$
- */
-public class FastInfoset2XMLStreamReader extends BaseTransformer<InputStream, XMLStreamReader> implements
-    PullTransformer<InputStream, XMLStreamReader> {
-    
-    @Override
-    protected Class<InputStream> getSourceType() {
-        return InputStream.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getTargetType() {
-        return XMLStreamReader.class;
-    }
-
-    public XMLStreamReader transform(InputStream source, TransformationContext context) {
-        try {
-            StAXDocumentParser parser = new StAXDocumentParser(source);
-            return parser;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        } 
-    }
-
-    @Override
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return "xml:fastinfoset:java.io.InputStream";
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java b/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
deleted file mode 100644
index 1c12a5dcad..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
+++ /dev/null
@@ -1,71 +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.databinding.fastinfoset;
-
-import java.io.OutputStream;
-
-import org.apache.tuscany.sca.databinding.PushTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.w3c.dom.Node;
-
-import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Node2FastInfoset extends BaseTransformer<Node, OutputStream> implements
-    PushTransformer<Node, OutputStream> {
-
-    @Override
-    protected Class<Node> getSourceType() {
-        return Node.class;
-    }
-
-    @Override
-    protected Class<OutputStream> getTargetType() {
-        return OutputStream.class;
-    }
-
-    
-    /**
-     * @see org.apache.tuscany.sca.databinding.PushTransformer#transform(java.lang.Object, java.lang.Object, org.apache.tuscany.sca.databinding.TransformationContext)
-     */
-    public void transform(Node source, OutputStream target, TransformationContext context) {
-        try {
-            DOMDocumentSerializer serializer = new DOMDocumentSerializer();
-            serializer.setOutputStream(target);
-            serializer.serialize(source);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        } 
-    }
-
-    @Override
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return "xml:fastinfoset:java.io.OutputStream";
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java b/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
deleted file mode 100644
index b0d56b3bb6..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
+++ /dev/null
@@ -1,89 +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.databinding.fastinfoset;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.tuscany.sca.databinding.PushTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-import com.sun.xml.fastinfoset.sax.SAXDocumentSerializer;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XMLInputStream2FastInfoset extends BaseTransformer<InputStream, OutputStream> implements
-    PushTransformer<InputStream, OutputStream> {
-
-    @Override
-    protected Class<InputStream> getSourceType() {
-        return InputStream.class;
-    }
-
-    @Override
-    protected Class<OutputStream> getTargetType() {
-        return OutputStream.class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.PushTransformer#transform(java.lang.Object, java.lang.Object, org.apache.tuscany.sca.databinding.TransformationContext)
-     */
-    public void transform(InputStream source, OutputStream target, TransformationContext context) {
-        try {
-
-            // Create Fast Infoset SAX serializer
-            SAXDocumentSerializer saxDocumentSerializer = new SAXDocumentSerializer();
-            // Set the output stream
-            saxDocumentSerializer.setOutputStream(target);
-
-            // Instantiate JAXP SAX parser factory
-            SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
-            /* Set parser to be namespace aware
-             * Very important to do otherwise invalid FI documents will be
-             * created by the SAXDocumentSerializer
-             */
-            saxParserFactory.setNamespaceAware(true);
-            // Instantiate the JAXP SAX parser
-            SAXParser saxParser = saxParserFactory.newSAXParser();
-            // Set the lexical handler
-            saxParser.setProperty("http://xml.org/sax/properties/lexical-handler", saxDocumentSerializer);
-            // Parse the XML document and convert to a fast infoset document
-            saxParser.parse(source, saxDocumentSerializer);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return "xml:fastinfoset:java.io.OutputStream";
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java b/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
deleted file mode 100644
index d18206600c..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.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.databinding.fastinfoset;
-
-import java.io.OutputStream;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.PushTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.xml.XMLStreamSerializer;
-
-import com.sun.xml.fastinfoset.stax.StAXDocumentSerializer;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XMLStreamReader2FastInfoset extends BaseTransformer<XMLStreamReader, OutputStream> implements
-    PushTransformer<XMLStreamReader, OutputStream> {
-
-    @Override
-    protected Class<XMLStreamReader> getSourceType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    protected Class<OutputStream> getTargetType() {
-        return OutputStream.class;
-    }
-
-    
-    /**
-     * @see org.apache.tuscany.sca.databinding.PushTransformer#transform(java.lang.Object, java.lang.Object, org.apache.tuscany.sca.databinding.TransformationContext)
-     */
-    public void transform(XMLStreamReader source, OutputStream target, TransformationContext context) {
-        try {
-            StAXDocumentSerializer serializer = new StAXDocumentSerializer(target);
-            XMLStreamSerializer streamSerializer = new XMLStreamSerializer();
-            streamSerializer.serialize(source, serializer);
-            serializer.flush();
-            source.close();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        } 
-    }
-
-    @Override
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return "xml:fastinfoset:java.io.OutputStream";
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/java/sca-contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index ea47ee7191..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /dev/null
@@ -1,22 +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.
-
-# Implementation classes for the transformers
-org.apache.tuscany.sca.databinding.fastinfoset.FastInfoset2Node;source=xml:fastinfoset:java.io.InputStream,target=org.w3c.dom.Node,weight=100
-org.apache.tuscany.sca.databinding.fastinfoset.FastInfoset2XMLStreamReader;source=xml:fastinfoset:java.io.InputStream,target=javax.xml.stream.XMLStreamReader,weight=80
-
-
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/java/sca-contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
deleted file mode 100644
index 1610b4f54d..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ /dev/null
@@ -1,22 +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.
-
-# Implementation classes for the transformers
-org.apache.tuscany.sca.databinding.fastinfoset.FastInfoset2SAX;source=xml:fastinfoset:java.io.InputStream,target=org.xml.sax.ContentHandler ,weight=80
-org.apache.tuscany.sca.databinding.fastinfoset.Node2FastInfoset;source=org.w3c.dom.Node,target=xml:fastinfoset:java.io.OutputStream,weight=100
-org.apache.tuscany.sca.databinding.fastinfoset.XMLInputStream2FastInfoset;source=java.io.InputStream,target=xml:fastinfoset:java.io.OutputStream,weight=120
-org.apache.tuscany.sca.databinding.fastinfoset.XMLStreamReader2FastInfoset;source=javax.xml.stream.XMLStreamReader,target=xml:fastinfoset:java.io.OutputStream,weight=70
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java b/java/sca-contrib/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
deleted file mode 100644
index bb8adf39be..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
+++ /dev/null
@@ -1,127 +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.databinding.fastinfoset;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.xml.InputStream2Node;
-import org.apache.tuscany.sca.databinding.xml.Node2OutputStream;
-import org.apache.tuscany.sca.databinding.xml.Node2String;
-import org.w3c.dom.Node;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class FastInfosetTransformerTestCase extends TestCase {
-    private static final String IPO_XML =
-        "<?xml version=\"1.0\"?>" + "<ipo:purchaseOrder"
-            + "  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-            + "  xmlns:ipo=\"http://www.example.com/IPO\""
-            + "  xsi:schemaLocation=\"http://www.example.com/IPO ipo.xsd\""
-            + "  orderDate=\"1999-12-01\">"
-            + "  <shipTo exportCode=\"1\" xsi:type=\"ipo:UKAddress\">"
-            + "    <name>Helen Zoe</name>"
-            + "    <street>47 Eden Street</street>"
-            + "    <city>Cambridge</city>"
-            + "    <postcode>CB1 1JR</postcode>"
-            + "  </shipTo>"
-            + "  <billTo xsi:type=\"ipo:USAddress\">"
-            + "    <name>Robert Smith</name>"
-            + "    <street>8 Oak Avenue</street>"
-            + "    <city>Old Town</city>"
-            + "    <state>PA</state>"
-            + "    <zip>95819</zip>"
-            + "  </billTo>"
-            + "  <items>"
-            + "    <item partNum=\"833-AA\">"
-            + "      <productName>Lapis necklace</productName>"
-            + "      <quantity>1</quantity>"
-            + "      <USPrice>99.95</USPrice>"
-            + "      <ipo:comment>Want this for the holidays</ipo:comment>"
-            + "      <shipDate>1999-12-05</shipDate>"
-            + "    </item>"
-            + "  </items>"
-            + "</ipo:purchaseOrder>";
-
-    public void testXML2FastInfoset() throws Exception {
-        XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(IPO_XML));
-        XMLStreamReader2FastInfoset t1 = new XMLStreamReader2FastInfoset();
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
-        t1.transform(reader, bos, null);
-        // System.out.println(bos.toString());
-
-        ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-        FastInfoset2Node t2 = new FastInfoset2Node();
-        Node node = t2.transform(bis, null);
-        String xml = new Node2String().transform(node, null);
-
-        // System.out.println(xml);
-
-    }
-
-    public void testPerf() throws Exception {
-        byte[] str = IPO_XML.getBytes();
-        ByteArrayInputStream bis = new ByteArrayInputStream(str);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        XMLInputStream2FastInfoset t = new XMLInputStream2FastInfoset();
-        t.transform(bis, bos, null);
-        byte[] fast = bos.toByteArray();
-        System.out.println(str.length + ".vs." + fast.length);
-
-        long d1 = 0L;
-        long d2 = 0L;
-        for (int i = 0; i < 100; i++) {
-            InputStream2Node t1 = new InputStream2Node();
-            FastInfoset2Node t2 = new FastInfoset2Node();
-            InputStream is1 = new ByteArrayInputStream(str);
-            InputStream is2 = new ByteArrayInputStream(fast);
-            long s1 = System.currentTimeMillis();
-            Node n1 = t1.transform(is1, null);
-            long s2 = System.currentTimeMillis();
-            Node n2 = t2.transform(is2, null);
-            long s3 = System.currentTimeMillis();
-            d1 += s2 - s1; // from plain xml
-            d2 += s3 - s2; // from fastinfoset
-            Node2OutputStream t3 = new Node2OutputStream();
-            Node2FastInfoset t4 = new Node2FastInfoset();
-            ByteArrayOutputStream os1 = new ByteArrayOutputStream();
-            ByteArrayOutputStream os2 = new ByteArrayOutputStream();
-            long s4 = System.currentTimeMillis();
-            t3.transform(n1, os1, null);
-            long s5 = System.currentTimeMillis();
-            t4.transform(n2, os2, null);
-            long s6 = System.currentTimeMillis();
-            d1 += s5 - s4; // to plain xml
-            d2 += s6 - s5; // to fastinfoset
-        }
-        System.out.println("POX " + d1 + ".vs. FIS " + d2);
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/test/resources/ipo.xsd b/java/sca-contrib/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
deleted file mode 100644
index 5a493e1746..0000000000
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
+++ /dev/null
@@ -1,136 +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.    
--->
-<schema targetNamespace="http://www.example.com/IPO"
-	xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:ipo="http://www.example.com/IPO">
-
-	<annotation>
-		<documentation xml:lang="en">
-			International Purchase order schema for Example.com
-			Copyright 2000 Example.com. All rights reserved.
-		</documentation>
-	</annotation>
-
-
-	<element name="purchaseOrder" type="ipo:PurchaseOrderType" />
-
-	<element name="comment" type="string" />
-
-	<complexType name="PurchaseOrderType">
-		<sequence>
-			<element name="shipTo" type="ipo:Address" />
-			<element name="billTo" type="ipo:Address" />
-			<element ref="ipo:comment" minOccurs="0" />
-			<element name="items" type="ipo:Items" />
-		</sequence>
-		<attribute name="orderDate" type="date" />
-	</complexType>
-
-	<complexType name="Items">
-		<sequence>
-			<element name="item" minOccurs="0" maxOccurs="unbounded">
-				<complexType>
-					<sequence>
-						<element name="productName" type="string" />
-						<element name="quantity">
-							<simpleType>
-								<restriction base="positiveInteger">
-									<maxExclusive value="100" />
-								</restriction>
-							</simpleType>
-						</element>
-						<element name="USPrice" type="decimal" />
-						<element ref="ipo:comment" minOccurs="0" />
-						<element name="shipDate" type="date"
-							minOccurs="0" />
-					</sequence>
-					<attribute name="partNum" type="ipo:SKU"
-						use="required" />
-				</complexType>
-			</element>
-		</sequence>
-	</complexType>
-
-	<simpleType name="SKU">
-		<restriction base="string">
-			<pattern value="\d{3}-[A-Z]{2}" />
-		</restriction>
-	</simpleType>
-
-	<complexType name="Address">
-		<sequence>
-			<element name="name" type="string" />
-			<element name="street" type="string" />
-			<element name="city" type="string" />
-		</sequence>
-	</complexType>
-
-	<complexType name="USAddress">
-		<complexContent>
-			<extension base="ipo:Address">
-				<sequence>
-					<element name="state" type="ipo:USState" />
-					<element name="zip" type="positiveInteger" />
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<complexType name="UKAddress">
-		<complexContent>
-			<extension base="ipo:Address">
-				<sequence>
-					<element name="postcode" type="ipo:UKPostcode" />
-				</sequence>
-				<attribute name="exportCode" type="positiveInteger"
-					fixed="1" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<!-- other Address derivations for more countries -->
-
-	<simpleType name="USState">
-		<restriction base="string">
-			<enumeration value="AK" />
-			<enumeration value="AL" />
-			<enumeration value="AR" />
-			<enumeration value="CA" />
-			<enumeration value="PA" />
-			<!-- and so on ... -->
-		</restriction>
-	</simpleType>
-
-	<simpleType name="Postcode">
-		<restriction base="string">
-			<length value="7" fixed="true" />
-		</restriction>
-	</simpleType>
-
-
-	<simpleType name="UKPostcode">
-		<restriction base="ipo:Postcode">
-			<pattern value="[A-Z]{2}\d\s\d[A-Z]{2}" />
-		</restriction>
-	</simpleType>
-
-
-
-</schema>
-
diff --git a/java/sca-contrib/modules/databinding-json/LICENSE b/java/sca-contrib/modules/databinding-json/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/java/sca-contrib/modules/databinding-json/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/java/sca-contrib/modules/databinding-json/META-INF/MANIFEST.MF b/java/sca-contrib/modules/databinding-json/META-INF/MANIFEST.MF
deleted file mode 100644
index 8826f3b1b0..0000000000
--- a/java/sca-contrib/modules/databinding-json/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.databinding.json;version="2.0.0"

- ,org.apache.tuscany.sca.databinding.json.axiom;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Data Binding for JSON

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397312078

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Data Binding for JSON

-Import-Package: com.metaparadigm.jsonrpc,

- javax.xml.namespace,

- javax.xml.stream,

- org.apache.axiom.om,

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",

- org.apache.tuscany.sca.databinding.json;version="2.0.0",

- org.apache.tuscany.sca.databinding.xml;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.codehaus.jettison.badgerfish,

- org.codehaus.jettison.json,

- org.codehaus.jettison.mapped,

- org.json,

- 

- org.oasisopen.sca.annotation;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.databinding.json

-Bundle-DocURL: http://www.apache.org/

-Export-Package: org.apache.tuscany.sca.databinding.json;version="2.0.0"

-

diff --git a/java/sca-contrib/modules/databinding-json/NOTICE b/java/sca-contrib/modules/databinding-json/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/databinding-json/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/databinding-json/pom.xml b/java/sca-contrib/modules/databinding-json/pom.xml
deleted file mode 100644
index d1961bcdb6..0000000000
--- a/java/sca-contrib/modules/databinding-json/pom.xml
+++ /dev/null
@@ -1,118 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-databinding-json</artifactId>
-    <name>Apache Tuscany SCA Data Binding for JSON</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.metaparadigm</groupId>
-            <artifactId>json-rpc</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.codehaus.jettison</groupId>
-            <artifactId>jettison</artifactId>
-            <version>1.0.1</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <version>1.2.7</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.mail</groupId>
-                    <artifactId>mail</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>                 
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.7</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-           <groupId>commons-logging</groupId>
-           <artifactId>commons-logging</artifactId>
-           <version>1.1.1</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>commons-logging</groupId>
-                   <artifactId>commons-logging</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>          
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java b/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
deleted file mode 100644
index b1813c9eab..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
+++ /dev/null
@@ -1,73 +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.databinding.json;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;
-
-import com.metaparadigm.jsonrpc.JSONSerializer;
-import com.metaparadigm.jsonrpc.SerializerState;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JSON2JavaBean implements PullTransformer<Object, Object> {
-    private JSONSerializer serializer;
-
-    public JSON2JavaBean() {
-        super();
-        serializer = new JSONSerializer();
-        try {
-            serializer.registerDefaultSerializers();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-        serializer.setMarshallClassHints(true);
-        serializer.setMarshallNullAttributes(true);
-    }
-
-    public Object transform(Object source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-
-        try {
-            SerializerState state = new SerializerState();
-            return serializer.unmarshall(state, context.getTargetDataType().getPhysical(), source);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-
-    }
-
-    public String getSourceDataBinding() {
-        return JSONDataBinding.NAME;
-    }
-
-    public String getTargetDataBinding() {
-        return JavaBeansDataBinding.NAME;
-    }
-
-    public int getWeight() {
-        return 5000;
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java b/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
deleted file mode 100644
index 4e08384f09..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
+++ /dev/null
@@ -1,61 +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.databinding.json;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JSON2String extends BaseTransformer<Object, String> implements
-    PullTransformer<Object, String> {
-    
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    @Override
-    protected Class<String> getTargetType() {
-        return String.class;
-    }
-
-    public String transform(Object source, TransformationContext context) {
-        try {
-            return source.toString();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        } 
-    }
-
-    @Override
-    public int getWeight() {
-        return 500;
-    }
-    
-    @Override
-    public String getSourceDataBinding() {
-        return JSONDataBinding.NAME;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java b/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
deleted file mode 100644
index b70f772696..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
+++ /dev/null
@@ -1,65 +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.databinding.json;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.codehaus.jettison.badgerfish.BadgerFishXMLStreamReader;
-import org.codehaus.jettison.json.JSONObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JSON2XMLStreamReader extends BaseTransformer<Object, XMLStreamReader> implements
-    PullTransformer<Object, XMLStreamReader> {
-    
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getTargetType() {
-        return XMLStreamReader.class;
-    }
-
-    public XMLStreamReader transform(Object source, TransformationContext context) {
-        try {
-            JSONObject json = JSONHelper.toJettison(source);
-            return new BadgerFishXMLStreamReader(json);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        } 
-    }
-
-    @Override
-    public int getWeight() {
-        return 500;
-    }
-    @Override
-    public String getSourceDataBinding() {
-        return JSONDataBinding.NAME;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
deleted file mode 100644
index 28cadc6666..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
+++ /dev/null
@@ -1,74 +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.databinding.json;
-
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.codehaus.jettison.json.JSONObject;
-
-/**
- * JAXB DataBinding
- *
- * @version $Rev$ $Date$
- */
-public class JSONDataBinding extends BaseDataBinding {
-    public static final String NAME = "JSON";
-
-    public static final String ROOT_NAMESPACE = "http://tuscany.apache.org/xmlns/sca/databinding/json/1.0";
-    public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "root");
-
-    public JSONDataBinding() {
-        super(NAME, org.json.JSONObject.class);
-    }
-
-    @Override
-    public boolean introspect(DataType type, Operation operation) {
-        assert type != null;
-        Class cls = type.getPhysical();
-        if (JSONObject.class.isAssignableFrom(cls) || org.json.JSONObject.class.isAssignableFrom(cls)) {
-            type.setDataBinding(getName());
-            if (type.getLogical() == null) {
-                type.setLogical(XMLType.UNKNOWN);
-            }
-            return true;
-        }
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Object copy(Object arg, DataType dataType, Operation operation) {
-        if (arg == null) {
-            return null;
-        }
-        try {
-            Class type = arg != null ? arg.getClass() : null;
-            return JSONHelper.toJSON(arg.toString(), type);
-        } catch (Exception e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
deleted file mode 100644
index fb29710506..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
+++ /dev/null
@@ -1,91 +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.databinding.json;
-
-import java.text.ParseException;
-
-import org.codehaus.jettison.json.JSONException;
-import org.codehaus.jettison.json.JSONObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JSONHelper {
-    private JSONHelper() {
-
-    }
-
-    /**
-     * Convert to Jettison JSONObject
-     * @param source
-     * @return
-     */
-    public static JSONObject toJettison(Object source) {
-        JSONObject json = null;
-        if (source instanceof JSONObject) {
-            json = (JSONObject)source;
-        } else if (source instanceof org.json.JSONObject) {
-            try {
-                json = new JSONObject(((org.json.JSONObject)source).toString());
-            } catch (JSONException e) {
-                throw new IllegalArgumentException(e);
-            }
-        }
-        return json;
-    }
-
-    /**
-     * Convert to org.json.JSONObject
-     * @param source
-     * @return
-     */
-    public static org.json.JSONObject toJSONOrg(Object source) {
-        org.json.JSONObject json = null;
-        if (source instanceof JSONObject) {
-            try {
-                json = new org.json.JSONObject(((JSONObject)source).toString());
-            } catch (ParseException e) {
-                throw new IllegalArgumentException(e);
-            }
-        } else if (source instanceof org.json.JSONObject) {
-            json = (org.json.JSONObject)source;
-        }
-        return json;
-    }
-
-    public static <T> T toJSON(String json, Class<T> type) {
-        if (type == JSONObject.class) {
-            try {
-                return type.cast(new JSONObject(json));
-            } catch (JSONException e) {
-                throw new IllegalArgumentException(e);
-            }
-        } else {
-            if (type == null) {
-                type = (Class<T>)org.json.JSONObject.class;
-            }
-            try {
-                return type.cast(new org.json.JSONObject(json));
-            } catch (ParseException e) {
-                throw new IllegalArgumentException(e);
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java b/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
deleted file mode 100644
index a928deef22..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
+++ /dev/null
@@ -1,82 +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.databinding.json;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;
-
-import com.metaparadigm.jsonrpc.JSONSerializer;
-import com.metaparadigm.jsonrpc.SerializerState;
-
-public class JavaBean2JSON extends BaseTransformer<Object, Object> implements PullTransformer<Object, Object> {
-    private JSONSerializer serializer;
-    
-    public JavaBean2JSON() {
-        serializer = new JSONSerializer();
-        try {
-            serializer.registerDefaultSerializers();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-        serializer.setMarshallClassHints(true);
-        serializer.setMarshallNullAttributes(true);
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return JavaBeansDataBinding.NAME;
-    }
-
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return JSONDataBinding.NAME;
-    }
-
-    @Override
-    protected Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    public Object toJSON(Object source) throws Exception {
-        if (source == null) {
-            return org.json.JSONObject.NULL;
-        }
-
-        SerializerState state = new SerializerState();
-        return serializer.marshall(state, source);
-    }
-
-    public Object transform(Object source, TransformationContext context) {
-        try {
-            return toJSON(source);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java b/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
deleted file mode 100644
index de023157bc..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
+++ /dev/null
@@ -1,139 +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.databinding.json;
-
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
-import org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;
-import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-import org.codehaus.jettison.json.JSONArray;
-import org.codehaus.jettison.json.JSONObject;
-
-public class JavaBean2JSONObject extends BaseTransformer<Object, Object> implements PullTransformer<Object, Object> {
-    private static final Comparator<PropertyDescriptor> COMPARATOR = new Comparator<PropertyDescriptor>() {
-        public int compare(PropertyDescriptor o1, PropertyDescriptor o2) {
-            return o1.getName().compareTo(o2.getName());
-        }
-    };
-
-    private static final SimpleTypeMapperImpl MAPPER = new SimpleTypeMapperImpl();
-    private static final Object[] NULL = null;
-
-    private static String getStringValue(Object o) {
-        if (o == null) {
-            return null;
-        }
-        TypeInfo info = SimpleTypeMapperImpl.getXMLType(o.getClass());
-        if (info != null) {
-            return MAPPER.toXMLLiteral(info.getQName(), o, null);
-        } else {
-            return String.valueOf(o);
-        }
-    }
-
-    private static boolean isSimpleType(Class<?> javaType) {
-        return SimpleTypeMapperImpl.getXMLType(javaType) != null;
-    }
-
-    public JavaBean2JSONObject() {
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return JavaBeansDataBinding.NAME;
-    }
-
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return JSONDataBinding.NAME;
-    }
-
-    @Override
-    protected Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    public Object toJSON(Object source) throws Exception {
-        if (source == null) {
-            return JSONObject.NULL;
-        }
-        Class<?> type = source.getClass();
-        if (isSimpleType(type)) {
-            return source;
-        } else if (type.isArray()) {
-            JSONArray array = new JSONArray();
-            int i1 = Array.getLength(source);
-            for (int j = 0; j < i1; j++) {
-                Object o = Array.get(source, j);
-                array.put(toJSON(o));
-            }
-            return array;
-        } else if (Collection.class.isAssignableFrom(type)) {
-            Collection c = (Collection)source;
-            JSONArray array = new JSONArray();
-            for (Object element : c) {
-                array.put(toJSON(element));
-            }
-            return array;
-        }
-        JSONObject json = new JSONObject();
-        BeanInfo beanInfo = Introspector.getBeanInfo(type);
-        PropertyDescriptor[] propDescs = beanInfo.getPropertyDescriptors();
-        Collections.sort(Arrays.asList(propDescs), COMPARATOR);
-
-        for (int i = 0; i < propDescs.length; i++) {
-            PropertyDescriptor propDesc = propDescs[i];
-            Class<?> pType = propDesc.getPropertyType();
-            if ("class".equals(propDesc.getName())) {
-                continue;
-            }
-            Object pValue = propDesc.getReadMethod().invoke(source, NULL);
-            json.put(propDesc.getName(), toJSON(pValue));
-        }
-        return json;
-
-    }
-
-    public Object transform(Object source, TransformationContext context) {
-        try {
-            return toJSON(source);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java b/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
deleted file mode 100644
index ff5968bccd..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
+++ /dev/null
@@ -1,64 +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.databinding.json;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-/**
- * @version $Rev$ $Date$
- */
-public class String2JSON extends BaseTransformer<String, Object> implements PullTransformer<String, Object> {
-
-    @Override
-    protected Class<String> getSourceType() {
-        return String.class;
-    }
-
-    @Override
-    protected Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    public Object transform(String source, TransformationContext context) {
-        try {
-            Class type = null;
-            if (context != null && context.getTargetDataType() != null) {
-                type = context.getTargetDataType().getPhysical();
-            }
-            return JSONHelper.toJSON(source, type);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    public int getWeight() {
-        return 500;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return JSONDataBinding.NAME;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java b/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
deleted file mode 100644
index aa75afc9d4..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
+++ /dev/null
@@ -1,77 +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.databinding.json;
-
-import java.io.StringWriter;
-
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.xml.XMLStreamSerializer;
-import org.codehaus.jettison.badgerfish.BadgerFishXMLStreamWriter;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XMLStreamReader2JSON extends BaseTransformer<XMLStreamReader, Object> implements
-    PullTransformer<XMLStreamReader, Object> {
-    
-    @Override
-    protected Class<XMLStreamReader> getSourceType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    protected Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    public Object transform(XMLStreamReader source, TransformationContext context) {
-        try {
-            StringWriter writer = new StringWriter();
-            XMLStreamWriter jsonWriter = new BadgerFishXMLStreamWriter(writer);
-            XMLStreamSerializer serializer = new XMLStreamSerializer();
-            serializer.serialize(source, jsonWriter);
-            source.close();
-            Class type = null;
-            if (context != null && context.getTargetDataType() != null) {
-                type = context.getTargetDataType().getPhysical();
-            }
-            return JSONHelper.toJSON(writer.toString(), type);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        } 
-    }
-
-    @Override
-    public int getWeight() {
-        return 500;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return JSONDataBinding.NAME;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
deleted file mode 100644
index fb02d27b05..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.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 org.apache.tuscany.sca.databinding.json.axiom;
-
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.Transformer;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.json.JSONDataBinding;
-import org.apache.tuscany.sca.databinding.json.JSONHelper;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.codehaus.jettison.json.JSONObject;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Transformer.class)
-public class JSON2OMElement extends BaseTransformer<Object, OMElement> implements PullTransformer<Object, OMElement> {
-
-    private OMFactory factory = OMAbstractFactory.getOMFactory();
-
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    @Override
-    protected Class<OMElement> getTargetType() {
-        return OMElement.class;
-    }
-
-    public OMElement transform(Object source, TransformationContext context) {
-        try {
-            JSONObject json = JSONHelper.toJettison(source);
-            if (json == null) {
-                return null;
-            }
-            String ns = JSONDataBinding.ROOT_ELEMENT.getNamespaceURI();
-            String name = JSONDataBinding.ROOT_ELEMENT.getLocalPart();
-            if (context != null) {
-                DataType<?> dataType = context.getTargetDataType();
-                Object logical = dataType.getLogical();
-                if (logical instanceof XMLType) {
-                    XMLType xmlType = (XMLType)logical;
-                    if (xmlType.isElement()) {
-                        ns = xmlType.getElementName().getNamespaceURI();
-                        name = xmlType.getElementName().getLocalPart();
-                    }
-                }
-            }
-            JSONBadgerfishDataSource ds = new JSONBadgerfishDataSource(json);
-            OMNamespace namespace = factory.createOMNamespace(ns, "");
-            return factory.createOMElement(ds, name, namespace);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    public int getWeight() {
-        return 500;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return JSONDataBinding.NAME;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java b/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
deleted file mode 100644
index adc38772be..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
+++ /dev/null
@@ -1,57 +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.databinding.json.axiom;
-
-import javax.xml.stream.XMLStreamException;
-
-import org.codehaus.jettison.badgerfish.BadgerFishXMLStreamReader;
-import org.codehaus.jettison.json.JSONException;
-import org.codehaus.jettison.json.JSONObject;
-
-/**
- * JSONDataSource keeps the JSON String inside and consumes it when needed. This is to be kept in the
- * OMSourcedElementImpl and can be used either to expand the tree or get the JSON String directly without expanding.
- * This uses the "Badgerfish" JSON convention.
- * 
- * @version $Rev$ $Date$
- */
-
-public class JSONBadgerfishDataSource extends JSONDataSource {
-
-    public JSONBadgerfishDataSource(JSONObject json) {
-        super(json);
-    }
-
-    /**
-     * Gives the StAX reader using the "Badgerfish" formatted input JSON String.
-     * 
-     * @return The XMLStreamReader according to the JSON String.
-     * @throws javax.xml.stream.XMLStreamException if there is an error while making the StAX reader.
-     */
-    @Override
-    public javax.xml.stream.XMLStreamReader getReader() throws XMLStreamException {
-        try {
-            return new BadgerFishXMLStreamReader(json);
-        } catch (JSONException e) {
-            throw new XMLStreamException(e);
-        }
-
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java b/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
deleted file mode 100644
index 5b0312056e..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
+++ /dev/null
@@ -1,176 +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.databinding.json.axiom;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axiom.om.OMDataSource;
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMOutputFormat;
-import org.codehaus.jettison.json.JSONObject;
-import org.codehaus.jettison.json.JSONTokener;
-import org.codehaus.jettison.mapped.MappedXMLInputFactory;
-
-/**
- * JSONDataSource keeps the JSON String inside and consumes it when needed. This is to be kept in the
- * OMSourcedElementImpl and can be used either to expand the tree or get the JSON String directly without expanding.
- * This uses the "Mapped" JSON convention.
- *
- * @version $Rev$ $Date$
- */
-
-public class JSONDataSource implements OMDataSource {
-    protected JSONObject json;
-
-    public JSONDataSource(JSONObject json) {
-        this.json = json;
-    }
-
-    /**
-     * Writes JSON into the output stream. As this should write JSON, it directly gets the JSON string and writes it
-     * without expanding the tree.
-     * 
-     * @param outputStream the stream to be written into
-     * @param omOutputFormat format of the message, this is ignored.
-     * @throws javax.xml.stream.XMLStreamException if there is an error while writing the message in to the output
-     *             stream.
-     */
-    public void serialize(OutputStream outputStream, OMOutputFormat omOutputFormat)
-        throws javax.xml.stream.XMLStreamException {
-        try {
-            String encoding = omOutputFormat == null ? "UTF-8" : omOutputFormat.getCharSetEncoding();
-            outputStream.write(getJSONString().getBytes(encoding));
-        } catch (IOException e) {
-            throw new OMException();
-        }
-    }
-
-    /**
-     * Writes JSON through the writer. As this should write JSON, it directly gets the JSON string and writes it without
-     * expanding the tree.
-     * 
-     * @param writer Writer to be written into
-     * @param omOutputFormat format of the message, this is ignored.
-     * @throws javax.xml.stream.XMLStreamException if there is an error while writing the message through the writer.
-     */
-    public void serialize(Writer writer, OMOutputFormat omOutputFormat) throws javax.xml.stream.XMLStreamException {
-        try {
-            writer.write(getJSONString());
-        } catch (IOException e) {
-            throw new OMException();
-        }
-    }
-
-    /**
-     * Writes XML through the XMLStreamWriter. As the input data source is JSON, this method needs to get a StAX reader
-     * from that JSON String. Therefore this uses the getReader() method to get the StAX reader writes the events into
-     * the XMLStreamWriter.
-     * 
-     * @param xmlStreamWriter StAX writer to be written into
-     * @throws javax.xml.stream.XMLStreamException if there is an error while writing the message through the StAX
-     *             writer.
-     */
-    public void serialize(javax.xml.stream.XMLStreamWriter xmlStreamWriter) throws javax.xml.stream.XMLStreamException {
-        XMLStreamReader reader = getReader();
-        xmlStreamWriter.writeStartDocument();
-        while (reader.hasNext()) {
-            int x = reader.next();
-            switch (x) {
-                case XMLStreamConstants.START_ELEMENT:
-                    xmlStreamWriter.writeStartElement(reader.getPrefix(), reader.getLocalName(), reader
-                        .getNamespaceURI());
-                    int namespaceCount = reader.getNamespaceCount();
-                    for (int i = namespaceCount - 1; i >= 0; i--) {
-                        xmlStreamWriter.writeNamespace(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
-                    }
-                    int attributeCount = reader.getAttributeCount();
-                    for (int i = 0; i < attributeCount; i++) {
-                        xmlStreamWriter.writeAttribute(reader.getAttributePrefix(i),
-                                                       reader.getAttributeNamespace(i),
-                                                       reader.getAttributeLocalName(i),
-                                                       reader.getAttributeValue(i));
-                    }
-                    break;
-                case XMLStreamConstants.START_DOCUMENT:
-                    break;
-                case XMLStreamConstants.CHARACTERS:
-                    xmlStreamWriter.writeCharacters(reader.getText());
-                    break;
-                case XMLStreamConstants.CDATA:
-                    xmlStreamWriter.writeCData(reader.getText());
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    xmlStreamWriter.writeEndElement();
-                    break;
-                case XMLStreamConstants.END_DOCUMENT:
-                    xmlStreamWriter.writeEndDocument();
-                    break;
-                case XMLStreamConstants.SPACE:
-                    break;
-                case XMLStreamConstants.COMMENT:
-                    xmlStreamWriter.writeComment(reader.getText());
-                    break;
-                case XMLStreamConstants.DTD:
-                    xmlStreamWriter.writeDTD(reader.getText());
-                    break;
-                case XMLStreamConstants.PROCESSING_INSTRUCTION:
-                    xmlStreamWriter.writeProcessingInstruction(reader.getPITarget(), reader.getPIData());
-                    break;
-                case XMLStreamConstants.ENTITY_REFERENCE:
-                    xmlStreamWriter.writeEntityRef(reader.getLocalName());
-                    break;
-                default:
-                    throw new OMException();
-            }
-        }
-        xmlStreamWriter.writeEndDocument();
-    }
-
-    /**
-     * Gives the StAX reader using the "Mapped" formatted input JSON String.
-     * 
-     * @return The XMLStreamReader according to the JSON String.
-     * @throws javax.xml.stream.XMLStreamException if there is an error while making the StAX reader.
-     */
-
-    public javax.xml.stream.XMLStreamReader getReader() throws javax.xml.stream.XMLStreamException {
-
-        Map<String, String> nsMap = new HashMap<String, String>();
-        nsMap.put("", "");
-
-        // input factory for "Mapped" convention
-        MappedXMLInputFactory inputFactory = new MappedXMLInputFactory(nsMap);
-        String jsonString = this.getJSONString();
-        return inputFactory.createXMLStreamReader(new JSONTokener(jsonString));
-    }
-
-    // returns the json string by consuming the JSON input stream.
-    protected String getJSONString() {
-        return json.toString();
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/java/sca-contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
deleted file mode 100644
index 400507296f..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ /dev/null
@@ -1,19 +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.
-
-# implementation classes for the databindings
-org.apache.tuscany.sca.databinding.json.JSONDataBinding;name=JSON
diff --git a/java/sca-contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/java/sca-contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index b122533f6e..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /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.
-
-# Implementation classes for the transformers
-org.apache.tuscany.sca.databinding.json.JSON2XMLStreamReader;source=JSON,target=javax.xml.stream.XMLStreamReader,weight=5000
-org.apache.tuscany.sca.databinding.json.XMLStreamReader2JSON;source=javax.xml.stream.XMLStreamReader,target=JSON,weight=5000,public=false
-org.apache.tuscany.sca.databinding.json.JavaBean2JSON;source=java:complexType,target=JSON,weight=80000,public=false
-org.apache.tuscany.sca.databinding.json.JavaBean2JSON;source=java:simpleType,target=JSON,weight=80000,public=false
-org.apache.tuscany.sca.databinding.json.axiom.JSON2OMElement;source=JSON,target=org.apache.axiom.om.OMElement,weight=500
-org.apache.tuscany.sca.databinding.json.JavaBean2JSON;source=java:array,target=JSON,weight=80000,public=false
-org.apache.tuscany.sca.databinding.json.JavaBean2JSON;source=commonj.sdo.DataObject,target=JSON,weight=80000,public=false
-org.apache.tuscany.sca.databinding.json.JavaBean2JSON;source=javax.xml.bind.JAXBElement,target=JSON,weight=80000,public=false
-org.apache.tuscany.sca.databinding.json.JSON2JavaBean;source=JSON,target=java:complexType,weight=80000,public=false
-org.apache.tuscany.sca.databinding.json.JSON2JavaBean;source=JSON,target=java:simpleType,weight=80000,public=false
-org.apache.tuscany.sca.databinding.json.JSON2JavaBean;source=JSON,target=commonj.sdo.DataObject,weight=80000,public=false
-org.apache.tuscany.sca.databinding.json.JSON2JavaBean;source=JSON,target=javax.xml.bind.JAXBElement,weight=80000,public=false
-org.apache.tuscany.sca.databinding.json.JSON2JavaBean;source=JSON,target=java:array,weight=80000,public=false
diff --git a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
deleted file mode 100644
index 3c7f151ed7..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
+++ /dev/null
@@ -1,128 +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.databinding.json;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl;
-import org.apache.tuscany.sca.databinding.json.axiom.JSON2OMElement;
-import org.apache.tuscany.sca.databinding.xml.XMLStreamSerializer;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.json.JSONObject;
-
-public class JSONTransformerTestCase extends TestCase {
-    private static final String IPO_XML = "<?xml version=\"1.0\"?>" + "<ipo:purchaseOrder"
-                                          + "  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-                                          + "  xmlns:ipo=\"http://www.example.com/IPO\""
-                                          + "  xsi:schemaLocation=\"http://www.example.com/IPO ipo.xsd\""
-                                          + "  orderDate=\"1999-12-01\">"
-                                          + "  <shipTo exportCode=\"1\" xsi:type=\"ipo:UKAddress\">"
-                                          + "    <name>Helen Zoe</name>"
-                                          + "    <street>47 Eden Street</street>"
-                                          + "    <city>Cambridge</city>"
-                                          + "    <postcode>CB1 1JR</postcode>"
-                                          + "  </shipTo>"
-                                          + "  <billTo xsi:type=\"ipo:USAddress\">"
-                                          + "    <name>Robert Smith</name>"
-                                          + "    <street>8 Oak Avenue</street>"
-                                          + "    <city>Old Town</city>"
-                                          + "    <state>PA</state>"
-                                          + "    <zip>95819</zip>"
-                                          + "  </billTo>"
-                                          + "  <items>"
-                                          + "    <item partNum=\"833-AA\">"
-                                          + "      <productName>Lapis necklace</productName>"
-                                          + "      <quantity>1</quantity>"
-                                          + "      <USPrice>99.95</USPrice>"
-                                          + "      <ipo:comment>Want this for the holidays</ipo:comment>"
-                                          + "      <shipDate>1999-12-05</shipDate>"
-                                          + "    </item>"
-                                          + "  </items>"
-                                          + "</ipo:purchaseOrder>";
-
-    private static final String JSON_STR = "{\"xsl:root\":{\"@xmlns\":{\"xsl\":\"http://foo.com\"},\"data\":{\"$\":\"my json string\"}}}";
-
-    public void testXML2JSON() throws Exception {
-        XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(IPO_XML));
-        XMLStreamReader2JSON t1 = new XMLStreamReader2JSON();
-        JSONObject json = (JSONObject) t1.transform(reader, null);
-        Assert.assertNotNull(json);
-
-        // Cannot round-trip as we hit a bug in Jettison: http://jira.codehaus.org/browse/JETTISON-37
-        /*
-         JSON2XMLStreamReader t2 = new JSON2XMLStreamReader();
-         XMLStreamReader reader2 = t2.transform(json, null);
-         StringWriter sw = new StringWriter();
-         XMLStreamWriter streamWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(sw);
-         new XMLStreamSerializer().serialize(reader2, streamWriter);
-         streamWriter.flush();
-         System.out.println(sw.toString());
-         */
-
-    }
-
-    public void testJSON2XML() throws Exception {
-        JSON2XMLStreamReader t2 = new JSON2XMLStreamReader();
-        XMLStreamReader reader2 = t2.transform(new JSONObject(JSON_STR), null);
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter streamWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(sw);
-        new XMLStreamSerializer().serialize(reader2, streamWriter);
-        streamWriter.flush();
-        Assert.assertTrue(sw.toString()
-            .contains("<xsl:root xmlns:xsl=\"http://foo.com\"><data>my json string</data></xsl:root>"));
-    }
-
-    public void testJSON2OMElement() throws Exception {
-        JSON2OMElement t1 = new JSON2OMElement();
-        TransformationContext context = new TransformationContextImpl();
-        DataType dt = new DataTypeImpl(Object.class, new XMLType(new QName("http://foo.com", "root"), null));
-        context.setTargetDataType(dt);
-        OMElement element = t1.transform(new JSONObject(JSON_STR), context);
-        StringWriter writer = new StringWriter();
-        element.serialize(writer);
-        // System.out.println(writer.toString());
-    }
-
-    public void testString2JSON() throws Exception {
-        String json = "{\"name\":\"John\",\"age\":25}";
-        String2JSON t1 = new String2JSON();
-        JSONObject jsonObject = (JSONObject) t1.transform(json, null);
-        assertEquals(jsonObject.getString("name"), "John");
-        assertEquals(jsonObject.getInt("age"), 25);
-        JSON2String t2 = new JSON2String();
-        String str = t2.transform(jsonObject, null);
-        assertTrue(str.contains("\"name\":\"John\""));
-        assertTrue(str.contains("\"age\":25"));
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java b/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
deleted file mode 100644
index 3b36f5be74..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
+++ /dev/null
@@ -1,170 +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.databinding.json;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.json.JSONObject;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaBean2JSONTestCase {
-
-    public static class MyBean {
-        private String name;
-        private int age;
-        private boolean vip;
-        private String friends[];
-        private List<String> books;
-        private YourBean you;
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public int getAge() {
-            return age;
-        }
-
-        public void setAge(int age) {
-            this.age = age;
-        }
-
-        public boolean isVip() {
-            return vip;
-        }
-
-        public void setVip(boolean vip) {
-            this.vip = vip;
-        }
-
-        public String[] getFriends() {
-            return friends;
-        }
-
-        public void setFriends(String[] friends) {
-            this.friends = friends;
-        }
-
-        public List<String> getBooks() {
-            return books;
-        }
-
-        public void setBooks(List<String> books) {
-            this.books = books;
-        }
-
-        public YourBean getYou() {
-            return you;
-        }
-
-        public void setYou(YourBean you) {
-            this.you = you;
-        }
-
-    }
-
-    public static class YourBean {
-        private int id;
-        private String name;
-
-        public int getId() {
-            return id;
-        }
-
-        public void setId(int id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-    }
-
-    @Test
-    public void testBean2JSON() throws Exception {
-        MyBean me = new MyBean();
-        me.setAge(30);
-        me.setBooks(new ArrayList<String>());
-        me.setFriends(new String[] {"John", "Mike"});
-        me.setVip(true);
-        me.setName("Me");
-        YourBean you = new YourBean();
-        you.setId(123);
-        you.setName(null);
-        me.setYou(you);
-        JavaBean2JSON t1 = new JavaBean2JSON();
-        Object result = t1.transform(me, null);
-        System.out.println(result);
-        JSON2JavaBean t2 = new JSON2JavaBean();
-        TransformationContext context = new TransformationContextImpl();
-        context.setTargetDataType(new DataTypeImpl(MyBean.class, null));
-        Object v = t2.transform(new JSONObject(result.toString()), context);
-        Assert.assertTrue(v instanceof MyBean);
-        //        String json =
-        //            "{\"age\":30,\"books\":[],\"friends\":[\"John\",\"Mike\"],\"name\":\"Me\",\"vip\":true,\"you\":{\"id\":123,\"name\":null}}";
-        //        Assert.assertEquals(json, result.toString());
-    }
-
-    @Test
-    public void testString2JSON() throws Exception {
-        JavaBean2JSONObject t1 = new JavaBean2JSONObject();
-        Object result = t1.transform("ABC", null);
-        System.out.println(result);
-        JSON2JavaBean t2 = new JSON2JavaBean();
-        TransformationContext context = new TransformationContextImpl();
-        context.setTargetDataType(new DataTypeImpl(String.class, null));
-        Object v = t2.transform(result, context);
-        Assert.assertTrue(v instanceof String);
-        Assert.assertEquals("ABC", v);
-    }
-
-    @Test
-    public void testStringArray2JSON() throws Exception {
-        JavaBean2JSON t1 = new JavaBean2JSON();
-        Object result = t1.transform(new String[] {"ABC", "DF"}, null);
-        System.out.println(result);
-        JSON2JavaBean t2 = new JSON2JavaBean();
-        TransformationContext context = new TransformationContextImpl();
-        context.setTargetDataType(new DataTypeImpl(String[].class, null));
-        Object v = t2.transform(result, context);
-        Assert.assertTrue(v instanceof String[]);
-        String[] strs = (String[])v;
-        Assert.assertEquals("ABC", strs[0]);
-        Assert.assertEquals("DF", strs[1]);
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java b/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
deleted file mode 100644
index 60b293c1d4..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
+++ /dev/null
@@ -1,158 +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.databinding.json;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class MyBean {
-    private int age;
-    private String name;
-    private float[] rates = new float[] {1.0f, 2.0f};
-    private List<String> notes = new ArrayList<String>();
-    private Map<String, Integer> map = new HashMap<String, Integer>();
-    private Object service; 
-    private Object otherService;  
-    private boolean good;
-    
-    public int getAge() {
-        return age;
-    }
-
-    public void setAge(int age) {
-        this.age = age;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<String> getNotes() {
-        return notes;
-    }
-
-    public void setNotes(List<String> notes) {
-        this.notes = notes;
-    }
-
-    public float[] getRates() {
-        return rates;
-    }
-
-    public void setRates(float[] rates) {
-        this.rates = rates;
-    }
-
-    public Map<String, Integer> getMap() {
-        return map;
-    }
-
-    public void setMap(Map<String, Integer> map) {
-        this.map = map;
-    }
-
-    public Object getService() {
-        return service;
-    }
-
-    public void setService(Object service) {
-        this.service = service;
-    }
-
-    public Object getOtherService() {
-        return otherService;
-    }
-
-    public void setOtherService(Object otherService) {
-        this.otherService = otherService;
-    }
-
-    public boolean isGood() {
-        return good;
-    }
-
-    public void setGood(boolean good) {
-        this.good = good;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + age;
-        result = prime * result + (good ? 1231 : 1237);
-        result = prime * result + ((map == null) ? 0 : map.hashCode());
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
-        result = prime * result + ((notes == null) ? 0 : notes.hashCode());
-        result = prime * result + ((otherService == null) ? 0 : otherService.hashCode());
-        result = prime * result + Arrays.hashCode(rates);
-        result = prime * result + ((service == null) ? 0 : service.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        final MyBean other = (MyBean)obj;
-        if (age != other.age)
-            return false;
-        if (good != other.good)
-            return false;
-        if (map == null) {
-            if (other.map != null)
-                return false;
-        } else if (!map.equals(other.map))
-            return false;
-        if (name == null) {
-            if (other.name != null)
-                return false;
-        } else if (!name.equals(other.name))
-            return false;
-        if (notes == null) {
-            if (other.notes != null)
-                return false;
-        } else if (!notes.equals(other.notes))
-            return false;
-        if (otherService == null) {
-            if (other.otherService != null)
-                return false;
-        } else if (!otherService.equals(other.otherService))
-            return false;
-        if (!Arrays.equals(rates, other.rates))
-            return false;
-        if (service == null) {
-            if (other.service != null)
-                return false;
-        } else if (!service.equals(other.service))
-            return false;
-        return true;
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java b/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
deleted file mode 100644
index d32e0763c7..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
+++ /dev/null
@@ -1,29 +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.databinding.json;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface MyInterface {
-    void setId(String id);
-
-    String getId();
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java b/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
deleted file mode 100644
index 3a2b95a4e2..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
+++ /dev/null
@@ -1,67 +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.databinding.json;
-
-/**
- * @version $Rev$ $Date$
- */
-public class MyInterfaceImpl implements MyInterface {
-    private String id;
-
-    /**
-     * @see org.apache.tuscany.databinding.jaxb.MyInterface#getId()
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @see org.apache.tuscany.databinding.jaxb.MyInterface#setId(java.lang.String)
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((id == null) ? 0 : id.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        final MyInterfaceImpl other = (MyInterfaceImpl)obj;
-        if (id == null) {
-            if (other.id != null)
-                return false;
-        } else if (!id.equals(other.id))
-            return false;
-        return true;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java b/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
deleted file mode 100644
index 84995baadf..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
+++ /dev/null
@@ -1,87 +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.databinding.json;
-
-import java.lang.reflect.Array;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-
-public class POJOTestCase extends TestCase {
-    public void testPOJO() throws Exception {
-        MyBean bean = new MyBean();
-        bean.setName("Test");
-        bean.setAge(20);
-        bean.getNotes().add("1");
-        bean.getNotes().add("2");
-        bean.getMap().put("1", 1);
-        MyInterface service = new MyInterfaceImpl();
-        service.setId("ID001");
-        bean.setService(service);
-        bean.setOtherService(service);
-
-        roundTrip(bean);
-    }
-
-    private <T> void roundTrip(T bean) {
-        JavaBean2JSON t1 = new JavaBean2JSON();
-
-        Object json = t1.transform(bean, null);
-        System.out.println(json);
-        JSON2JavaBean t2 = new JSON2JavaBean();
-
-        TransformationContext context = new TransformationContextImpl();
-        context.setTargetDataType(new DataTypeImpl(bean == null ? Object.class : bean.getClass(), null));
-        Object newBean = t2.transform(json, context);
-
-        if (newBean != null && newBean.getClass().isArray()) {
-            int len = Array.getLength(newBean);
-            assertEquals(Array.getLength(bean), len);
-            for (int i = 0; i < len; i++) {
-                assertEquals(Array.get(bean, i), Array.get(newBean, i));
-            }
-            return;
-        }
-        assertEquals(bean, newBean);
-    }
-
-    public void testString() throws Exception {
-        roundTrip("ABC");
-    }
-
-    public void testNull() throws Exception {
-        roundTrip(null);
-    }
-
-    public void testArray() throws Exception {
-        roundTrip(new String[] {"123", "ABC"});
-    }
-
-    public void testByteArray() throws Exception {
-        roundTrip("ABC".getBytes());
-    }
-
-    public void testPrimitive() throws Exception {
-        roundTrip(123);
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-json/src/test/resources/ipo.xsd b/java/sca-contrib/modules/databinding-json/src/test/resources/ipo.xsd
deleted file mode 100644
index 5a493e1746..0000000000
--- a/java/sca-contrib/modules/databinding-json/src/test/resources/ipo.xsd
+++ /dev/null
@@ -1,136 +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.    
--->
-<schema targetNamespace="http://www.example.com/IPO"
-	xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:ipo="http://www.example.com/IPO">
-
-	<annotation>
-		<documentation xml:lang="en">
-			International Purchase order schema for Example.com
-			Copyright 2000 Example.com. All rights reserved.
-		</documentation>
-	</annotation>
-
-
-	<element name="purchaseOrder" type="ipo:PurchaseOrderType" />
-
-	<element name="comment" type="string" />
-
-	<complexType name="PurchaseOrderType">
-		<sequence>
-			<element name="shipTo" type="ipo:Address" />
-			<element name="billTo" type="ipo:Address" />
-			<element ref="ipo:comment" minOccurs="0" />
-			<element name="items" type="ipo:Items" />
-		</sequence>
-		<attribute name="orderDate" type="date" />
-	</complexType>
-
-	<complexType name="Items">
-		<sequence>
-			<element name="item" minOccurs="0" maxOccurs="unbounded">
-				<complexType>
-					<sequence>
-						<element name="productName" type="string" />
-						<element name="quantity">
-							<simpleType>
-								<restriction base="positiveInteger">
-									<maxExclusive value="100" />
-								</restriction>
-							</simpleType>
-						</element>
-						<element name="USPrice" type="decimal" />
-						<element ref="ipo:comment" minOccurs="0" />
-						<element name="shipDate" type="date"
-							minOccurs="0" />
-					</sequence>
-					<attribute name="partNum" type="ipo:SKU"
-						use="required" />
-				</complexType>
-			</element>
-		</sequence>
-	</complexType>
-
-	<simpleType name="SKU">
-		<restriction base="string">
-			<pattern value="\d{3}-[A-Z]{2}" />
-		</restriction>
-	</simpleType>
-
-	<complexType name="Address">
-		<sequence>
-			<element name="name" type="string" />
-			<element name="street" type="string" />
-			<element name="city" type="string" />
-		</sequence>
-	</complexType>
-
-	<complexType name="USAddress">
-		<complexContent>
-			<extension base="ipo:Address">
-				<sequence>
-					<element name="state" type="ipo:USState" />
-					<element name="zip" type="positiveInteger" />
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<complexType name="UKAddress">
-		<complexContent>
-			<extension base="ipo:Address">
-				<sequence>
-					<element name="postcode" type="ipo:UKPostcode" />
-				</sequence>
-				<attribute name="exportCode" type="positiveInteger"
-					fixed="1" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<!-- other Address derivations for more countries -->
-
-	<simpleType name="USState">
-		<restriction base="string">
-			<enumeration value="AK" />
-			<enumeration value="AL" />
-			<enumeration value="AR" />
-			<enumeration value="CA" />
-			<enumeration value="PA" />
-			<!-- and so on ... -->
-		</restriction>
-	</simpleType>
-
-	<simpleType name="Postcode">
-		<restriction base="string">
-			<length value="7" fixed="true" />
-		</restriction>
-	</simpleType>
-
-
-	<simpleType name="UKPostcode">
-		<restriction base="ipo:Postcode">
-			<pattern value="[A-Z]{2}\d\s\d[A-Z]{2}" />
-		</restriction>
-	</simpleType>
-
-
-
-</schema>
-
diff --git a/java/sca-contrib/modules/databinding-saxon/LICENSE b/java/sca-contrib/modules/databinding-saxon/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/java/sca-contrib/modules/databinding-saxon/META-INF/MANIFEST.MF b/java/sca-contrib/modules/databinding-saxon/META-INF/MANIFEST.MF
deleted file mode 100644
index 3c9e95f67d..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,38 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.databinding.saxon;uses:="org.ap

- ache.tuscany.sca.databinding,net.sf.saxon.value,org.apache.tuscany.sc

- a.databinding.impl,net.sf.saxon.trans,javax.xml.transform.dom,commonj

- .sdo.helper,net.sf.saxon,org.apache.tuscany.sca.interfacedef,org.apac

- he.tuscany.sca.databinding.saxon.collection,org.w3c.dom,net.sf.saxon.

- query,commonj.sdo,net.sf.saxon.event,javax.xml.transform,net.sf.saxon

- .om";version="2.0.0",org.apache.tuscany.sca.databinding.saxon.collectio

- n;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Data Binding for Saxon

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397384281

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Data Binding for Saxon

-Import-Package: commonj.sdo;version="2.1",

- commonj.sdo.helper;version="2.1",

- javax.xml.transform,

- javax.xml.transform.dom,

- net.sf.saxon,

- net.sf.saxon.event,

- net.sf.saxon.om,

- net.sf.saxon.query,

- net.sf.saxon.trans,

- net.sf.saxon.value,

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",

- org.apache.tuscany.sca.databinding.saxon;version="2.0.0",

- org.apache.tuscany.sca.databinding.saxon.collection;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.w3c.dom

-Bundle-SymbolicName: org.apache.tuscany.sca.databinding.saxon

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/databinding-saxon/NOTICE b/java/sca-contrib/modules/databinding-saxon/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/databinding-saxon/pom.xml b/java/sca-contrib/modules/databinding-saxon/pom.xml
deleted file mode 100644
index 33a379c107..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/pom.xml
+++ /dev/null
@@ -1,106 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-databinding-saxon</artifactId>
-    <name>Apache Tuscany SCA Data Binding for Saxon</name>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>rfeng</id>
-            <name>Tuscany Maven 2.0 Repository</name>
-            <url>http://svn.apache.org/repos/asf/incubator/tuscany/maven</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!--dependency>
-            <groupId>net.sf.saxon</groupId>
-            <artifactId>saxon</artifactId>
-            <version>9.0.0.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.sf.saxon</groupId>
-            <artifactId>saxon-api</artifactId>
-            <version>9.0.0.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.sf.saxon</groupId>
-            <artifactId>saxon-dom</artifactId>
-            <version>9.0.0.2</version>
-        </dependency-->
-
-        <dependency>
-            <groupId>net.sf.saxon</groupId>
-            <artifactId>saxon</artifactId>
-            <version>8.7</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.sf.saxon</groupId>
-            <artifactId>saxon-dom</artifactId>
-            <version>8.7</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-lib</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
deleted file mode 100644
index 25f8ee886f..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
+++ /dev/null
@@ -1,99 +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.databinding.saxon;
-
-import javax.xml.transform.dom.DOMResult;
-
-import net.sf.saxon.om.NodeInfo;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-
-/**
- * Transforms SDO DataObject-s to NodeInfo objects needed by Saxon parser.
- *
- * For root element when Serializing the DataObject the name of its 
- * implemented interface is used with its first letter made lowercase.
- * Also any namespaces that are defined are deleted, because otherwise
- * the SaxonB parser does not work
- *
- * @version $Rev$ $Date$
- */
-public class DataObject2NodeInfoTransformer extends BaseTransformer<DataObject, NodeInfo> implements
-    PullTransformer<DataObject, NodeInfo> {
-
-    private Node2NodeInfoTransformer node2NodeInfoTransformer;
-
-    public DataObject2NodeInfoTransformer(Node2NodeInfoTransformer node2NodeInfoTransformer) {
-        this.node2NodeInfoTransformer = node2NodeInfoTransformer;
-    }
-
-    public DataObject2NodeInfoTransformer() {
-        this.node2NodeInfoTransformer = new Node2NodeInfoTransformer();
-    }
-
-    public NodeInfo transform(DataObject source, TransformationContext context) {
-        // FIXME: Need to create the HelperContext from the transformation context
-        // FIXME: This is a big hack to create a document using the class name
-        XMLHelper helper = XMLHelper.INSTANCE;
-        String name = null;
-        if (source.getClass().getInterfaces().length > 0) {
-            name = source.getClass().getInterfaces()[0].getSimpleName();
-        } else {
-            name = source.getClass().getName();
-        }
-
-        if (name.length() > 0) {
-            name = Character.toLowerCase(name.charAt(0)) + name.substring(1, name.length());
-        }
-
-        try {
-            DOMResult domResult = new DOMResult(DOMHelper.newDocument());
-            XMLDocument xmlDoc = helper.createDocument(source, null, name);
-            helper.save(xmlDoc, domResult, null);
-            return node2NodeInfoTransformer.transform(domResult.getNode(), context);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-
-    }
-
-    @Override
-    protected Class<DataObject> getSourceType() {
-        return DataObject.class;
-    }
-
-    @Override
-    protected Class<NodeInfo> getTargetType() {
-        return NodeInfo.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 30 + node2NodeInfoTransformer.getWeight();
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
deleted file mode 100644
index 7122217b8b..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
+++ /dev/null
@@ -1,153 +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.databinding.saxon;

-

-import java.lang.reflect.Array;

-

-import net.sf.saxon.om.Item;

-import net.sf.saxon.om.NodeInfo;

-import net.sf.saxon.trans.XPathException;

-import net.sf.saxon.value.Value;

-

-import org.apache.tuscany.sca.databinding.PullTransformer;

-import org.apache.tuscany.sca.databinding.TransformationContext;

-import org.apache.tuscany.sca.databinding.TransformationException;

-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;

-import org.apache.tuscany.sca.databinding.saxon.collection.ItemList;

-

-/**

- * Transforms each object contained in the ItemList object.

- * 

- * 	If the object type is the same as the target type, it is not transformed.

- * 

- * 	If the object is a NodeInfo, it's transformed to a DataObject.

- * 

- * 	If the object is a Value, it's transformed to a Java object.

- * 

- * If the target type is not an array, the first transformed object is returned.

- * 

- * 	If the first transformed object type is not a target type, then a

- * 	TransformException is thrown

- * 

- * If the target type is an array, a array of this type is created containing

- * all transformed objects and it is returned

- * 

- * 	If any transformed object is not a target type, then a TransformException is

- * 	thrown

- * 

- * @version $Rev: 659284 $ $Date: 2008-05-22 14:26:18 -0800 (Thu, 22 May 2008) $

- */

-public class ItemList2ObjectTransformer extends BaseTransformer<ItemList, Object> implements

-    PullTransformer<ItemList, Object> {

-

-    private NodeInfo2DataObjectTransformer nodeInfo2DataObjectTransformer = new NodeInfo2DataObjectTransformer();

-

-    public ItemList2ObjectTransformer() {

-    }

-

-    @Override

-    protected Class<ItemList> getSourceType() {

-        return ItemList.class;

-    }

-

-    @Override

-    protected Class<Object> getTargetType() {

-        return Object.class;

-    }

-

-    @Override

-    public int getWeight() {

-        return 30 + nodeInfo2DataObjectTransformer.getWeight();

-    }

-

-    public Object transform(ItemList source, TransformationContext context) {

-

-        if (source.size() == 0) {

-            return null;

-        }

-

-        Class<?> targetType = context.getTargetDataType().getPhysical();

-

-        if (targetType.isArray()) {

-            int i = 0;

-            Class<?> componentClass = targetType.getComponentType();

-            Object[] result = (Object[])Array.newInstance(componentClass, source.size());

-

-            try {

-

-                if (componentClass.isAssignableFrom(NodeInfo.class) || componentClass.isAssignableFrom(Value.class)) {

-

-                    for (Item item : source) {

-                        result[i++] = item;

-                    }

-

-                } else {

-

-                    for (Item item : source) {

-

-                        if (item instanceof NodeInfo) {

-                            result[i] = nodeInfo2DataObjectTransformer.transform((NodeInfo)item, context);

-

-                        } else if (item instanceof Value) {

-                            result[i] = Value.convert(item);

-

-                        } else {

-                            result[i] = item;

-                        }

-

-                        i++;

-

-                    }

-

-                }

-

-            } catch (ArrayStoreException ex) {

-                throw new TransformationException(ex);

-

-            } catch (XPathException ex) {

-                throw new TransformationException(ex);

-            }

-

-            return result;

-

-        } else {

-            Item item = source.iterator().next();

-

-            if (item.getClass().isAssignableFrom(targetType)) {

-                return item;

-

-            } else if (item instanceof NodeInfo) {

-                return nodeInfo2DataObjectTransformer.transform((NodeInfo)item, context);

-

-            } else {

-

-                try {

-                    return Value.convert(item);

-

-                } catch (XPathException e) {

-                    throw new TransformationException(e);

-                }

-

-            }

-

-        }

-

-    }

-

-}

diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
deleted file mode 100644
index fabadd34ea..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
+++ /dev/null
@@ -1,77 +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.databinding.saxon;
-
-import javax.xml.transform.dom.DOMSource;
-
-import net.sf.saxon.Configuration;
-import net.sf.saxon.event.Builder;
-import net.sf.saxon.om.NodeInfo;
-import net.sf.saxon.trans.XPathException;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-import org.w3c.dom.Node;
-
-/**
- * Transforms DOM Node-s to NodeInfo objects needed by Saxon parser.
- *
- * Any namespaces that are defined are deleted, because otherwise
- * the SaxonB parser does not work
- *
- * @version $Rev$ $Date$
- */
-public class Node2NodeInfoTransformer extends BaseTransformer<Node, NodeInfo> implements
-    PullTransformer<Node, NodeInfo> {
-
-    public NodeInfo transform(Node source, TransformationContext context) {      
-        Configuration configuration = SaxonDataBindingHelper.CURR_EXECUTING_CONFIG;
-        if (configuration == null) {
-            configuration = new Configuration();
-        }        
-        
-        NodeInfo docInfo = null;
-        try {
-            source = DOMHelper.promote(source);
-            docInfo = Builder.build(new DOMSource(source), null, configuration);
-        } catch (XPathException e) {
-            throw new TransformationException(e);
-        }
-        return docInfo;
-    }
-
-    @Override
-    protected Class<Node> getSourceType() {
-        return Node.class;
-    }
-
-    @Override
-    protected Class<NodeInfo> getTargetType() {
-        return NodeInfo.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
deleted file mode 100644
index a5093f8cdf..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
+++ /dev/null
@@ -1,91 +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.databinding.saxon;
-
-import java.io.IOException;
-
-import javax.xml.transform.dom.DOMSource;
-
-import net.sf.saxon.om.NodeInfo;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.w3c.dom.Document;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.XMLHelper;
-
-/**
- * Transforms NodeInfo objects to SDO DataObjects.
- *
- * Before constructing the data object, resulting XML is populated
- * with correct namespaces (which are taken from the logical target data type)
- * These namespaces are crucial for constructing the right instance of
- * the DataObject (i.e. if there is a SDO factory, an instance from this factory will
- * be used, not the generic any data object)
- *
- * @version $Rev$ $Date$
- */
-public class NodeInfo2DataObjectTransformer extends BaseTransformer<NodeInfo, DataObject> implements
-    PullTransformer<NodeInfo, DataObject> {
-
-    private NodeInfo2NodeTransformer nodeInfo2NodeTransformer;
-
-    public NodeInfo2DataObjectTransformer(NodeInfo2NodeTransformer nodeInfo2NodeTransformer) {
-        this.nodeInfo2NodeTransformer = nodeInfo2NodeTransformer;
-    }
-
-    public NodeInfo2DataObjectTransformer() {
-        this.nodeInfo2NodeTransformer = new NodeInfo2NodeTransformer();
-    }
-
-    @Override
-    protected Class<NodeInfo> getSourceType() {
-        return NodeInfo.class;
-    }
-
-    @Override
-    protected Class<DataObject> getTargetType() {
-        return DataObject.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 30 + nodeInfo2NodeTransformer.getWeight();
-    }
-
-    public DataObject transform(NodeInfo source, TransformationContext context) {
-        Document doc = (Document)nodeInfo2NodeTransformer.transform(source, context);
-
-        return produceResult(doc);
-    }
-
-    private DataObject produceResult(Document doc) {
-        try {
-            // FIXME: [rfeng] We should use the HelperContext from the context
-            DataObject resultingObject =
-                XMLHelper.INSTANCE.load(new DOMSource(doc), doc.getDocumentURI(), null).getRootObject();
-            return resultingObject;
-        } catch (IOException e) {
-            throw new TransformationException(e);
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
deleted file mode 100644
index 36ebac3aea..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.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.databinding.saxon;

-

-import java.lang.reflect.Array;

-

-import net.sf.saxon.om.Item;

-import net.sf.saxon.om.NodeInfo;

-import net.sf.saxon.trans.XPathException;

-import net.sf.saxon.value.Value;

-

-import org.apache.tuscany.sca.databinding.PullTransformer;

-import org.apache.tuscany.sca.databinding.TransformationContext;

-import org.apache.tuscany.sca.databinding.TransformationException;

-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;

-import org.apache.tuscany.sca.databinding.saxon.collection.ItemList;

-

-import commonj.sdo.DataObject;

-

-/**

- * Transforms a NodeInfo object to a DataObject and return it in an array.

- * 

- * @version $Rev: 659284 $ $Date: 2008-05-22 14:26:18 -0800 (Thu, 22 May 2008) $

- */

-public class NodeInfo2JavaArrayTransformer extends

-		BaseTransformer<NodeInfo, Object[]> implements

-		PullTransformer<NodeInfo, Object[]> {

-

-	private NodeInfo2DataObjectTransformer nodeInfo2DataObjectTransformer = new NodeInfo2DataObjectTransformer();

-

-	public NodeInfo2JavaArrayTransformer() {}

-

-	@Override

-	protected Class<NodeInfo> getSourceType() {

-		return NodeInfo.class;

-	}

-

-	@Override

-	protected Class<Object[]> getTargetType() {

-		return Object[].class;

-	}

-

-	@Override

-	public int getWeight() {

-		return 30 + nodeInfo2DataObjectTransformer.getWeight();

-	}

-

-	public Object[] transform(NodeInfo source, TransformationContext context) {

-		Object object = nodeInfo2DataObjectTransformer.transform(source, context);

-		

-		Class<?> componentClass = context.getTargetDataType().getPhysical().getComponentType();

-		Object[] result = (Object[]) Array.newInstance(componentClass, 1);

-		

-		result[0] = object;

-		

-		return result;

-

-	}

-

-}

diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
deleted file mode 100644
index 1e5b816662..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
+++ /dev/null
@@ -1,71 +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.databinding.saxon;
-
-import java.util.Properties;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.dom.DOMResult;
-
-import net.sf.saxon.om.NodeInfo;
-import net.sf.saxon.query.QueryResult;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.w3c.dom.Node;
-
-/**
- * Transforms NodeInfo objects to SDO DataObjects.
- *
- * @version $Rev$ $Date$
- */
-public class NodeInfo2NodeTransformer extends BaseTransformer<NodeInfo, Node> implements
-    PullTransformer<NodeInfo, Node> {
-
-    public Node transform(NodeInfo source, TransformationContext context) {
-        DOMResult destination = new DOMResult();
-        try {
-            Properties props = new Properties();
-            props.setProperty(OutputKeys.METHOD, "xml");
-            props.setProperty(OutputKeys.INDENT, "yes");
-            QueryResult.serialize(source, destination, props, source.getConfiguration());
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-        return destination.getNode();
-    }
-
-    @Override
-    protected Class<NodeInfo> getSourceType() {
-        return NodeInfo.class;
-    }
-
-    @Override
-    protected Class<Node> getTargetType() {
-        return Node.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
deleted file mode 100644
index 616bcca6c5..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
+++ /dev/null
@@ -1,65 +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.databinding.saxon;
-
-import net.sf.saxon.value.FloatValue;
-import net.sf.saxon.value.ObjectValue;
-import net.sf.saxon.value.Value;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;
-
-/**
- * Transforms generic java objects to Value objects needed by Saxon parser.
- *
- * @version $Rev$ $Date$
- */
-public class Object2ValueTransformer extends BaseTransformer<Object, Value> implements PullTransformer<Object, Value> {
-
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    @Override
-    protected Class<Value> getTargetType() {
-        return Value.class;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return JavaBeansDataBinding.NAME;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10000;
-    }
-
-    public Value transform(Object source, TransformationContext context) {
-        // WORKAROUND for ClassCastException in ObjectValue.toJavaObject(float)
-        if (source instanceof Float) {
-            return new FloatValue(((Float)source).floatValue());
-        }
-        return new ObjectValue(source);
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
deleted file mode 100644
index ecb20b24b5..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
+++ /dev/null
@@ -1,41 +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.databinding.saxon;
-
-import net.sf.saxon.Configuration;
-
-/**
- * Provides helper functionality for Saxon data bindings
- * @version $Rev$ $Date$
- */
-public class SaxonDataBindingHelper {
-    /**
-     * This variable is meaningful only in the context of XQoery expression
-     * execution. It is used by the DataObject2NodeInfoTransformer and
-     * Node2NodeInfoTransformer to create the correct NodeInfo objects
-     * in the Output2Output transformations. 
-     * For Input2Input transformations it is meaningless:
-     *    - if it is null - it is ignored by the transformers as they create new
-     *      configuration objects
-     *    - if it is not null - it is reused
-     * However the XQueryInvoker transforms all NodeInfo-s to NodeInfo-s with
-     * its current configuration, so there is no effect for Input2Input transformations
-     */
-    public static Configuration CURR_EXECUTING_CONFIG = null;
-}
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
deleted file mode 100644
index ccf842710d..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
+++ /dev/null
@@ -1,54 +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.databinding.saxon;
-
-
-import net.sf.saxon.om.NodeInfo;
-
-import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-/**
- * Represents data binding for parameters of type NodeInfo.
- *
- * The NodeInfo type is the type accepted by the Saxon XQuery processor for
- * all XML - based content (i.e. not strings and simple types)
- *
- * @version $Rev$ $Date$
- */
-public class SaxonNodeDataBinding extends BaseDataBinding {
-
-    public static final String NAME = NodeInfo.class.getName();
-    public static final String[] ALIASES = new String[] {"saxon_node"};
-
-    public SaxonNodeDataBinding() {
-        super(NAME, NodeInfo.class);
-    }
-
-    @Override
-    public boolean introspect(DataType type, Operation operation) {
-        if (super.introspect(type, operation)) {
-            // type.setLogical(XMLType.UNKNOWN);
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
deleted file mode 100644
index 2f51cf86ec..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
+++ /dev/null
@@ -1,53 +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.databinding.saxon;
-
-
-import net.sf.saxon.value.Value;
-
-import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-/**
- * Represents data binding for parameters of type Value.
- *
- * The Value type is the type accepted by the Saxon XQuery processor for
- * all simple types and strings
- *
- * @version $Rev$ $Date$
- */
-public class SaxonValueDataBinding extends BaseDataBinding {
-    public static final String NAME = Value.class.getName();
-    public static final String[] ALIASES = new String[] {"saxon_value"};
-
-    public SaxonValueDataBinding() {
-        super(NAME, Value.class);
-    }
-
-    @Override
-    public boolean introspect(DataType type, Operation operation) {
-        if (super.introspect(type, operation)) {
-            // type.setLogical(XMLType.UNKNOWN);
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
deleted file mode 100644
index 67d89a6e0b..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
+++ /dev/null
@@ -1,87 +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.databinding.saxon;
-
-import java.math.BigDecimal;
-
-import net.sf.saxon.value.DecimalValue;
-import net.sf.saxon.value.DoubleValue;
-import net.sf.saxon.value.FloatValue;
-import net.sf.saxon.value.IntegerValue;
-import net.sf.saxon.value.ObjectValue;
-import net.sf.saxon.value.StringValue;
-import net.sf.saxon.value.Value;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;
-
-/**
- * Transforms simple types and strings to Value objects needed by Saxon parser
- * @version $Rev$ $Date$
- */
-public class SimpleType2ValueTransformer extends BaseTransformer<Object, Value> implements
-    PullTransformer<Object, Value> {
-
-    @Override
-    public String getSourceDataBinding() {
-        return SimpleJavaDataBinding.NAME;
-    }
-
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    @Override
-    protected Class<Value> getTargetType() {
-        return Value.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10000;
-    }
-
-    public Value transform(Object source, TransformationContext context) {
-        Value result = null;
-        if (source instanceof Integer) {
-            result = new IntegerValue((Integer)source);
-        } else if (source instanceof Long) {
-            result = new IntegerValue((Long)source);
-        } else if (source instanceof Short) {
-            result = new IntegerValue((Short)source);
-        } else if (source instanceof Byte) {
-            result = new IntegerValue((Byte)source);
-        } else if (source instanceof Double) {
-            result = new DoubleValue((Double)source);
-        } else if (source instanceof Float) {
-            result = new FloatValue((Float)source);
-        } else if (source instanceof BigDecimal) {
-            result = new DecimalValue((BigDecimal)source);
-        } else if (source instanceof String) {
-            result = new StringValue(((String)source));
-        } else {
-            result = new ObjectValue(source);
-        }
-
-        return result;
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
deleted file mode 100644
index 16d5f524bb..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
+++ /dev/null
@@ -1,74 +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.databinding.saxon;

-

-import java.lang.reflect.Array;

-

-import net.sf.saxon.trans.XPathException;

-import net.sf.saxon.value.Value;

-

-import org.apache.tuscany.sca.databinding.PullTransformer;

-import org.apache.tuscany.sca.databinding.TransformationContext;

-import org.apache.tuscany.sca.databinding.TransformationException;

-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;

-

-/**

- * Transforms a Value object to a Java Object and return it in an array.

- * 

- * @version $Rev: 659284 $ $Date: 2008-05-22 14:26:18 -0800 (Thu, 22 May 2008) $

- */

-public class Value2JavaArray extends BaseTransformer<Value, Object[]> implements PullTransformer<Value, Object[]> {

-

-    public Value2JavaArray() {

-    }

-

-    @Override

-    protected Class<Value> getSourceType() {

-        return Value.class;

-    }

-

-    @Override

-    protected Class<Object[]> getTargetType() {

-        return Object[].class;

-    }

-

-    @Override

-    public int getWeight() {

-        return super.getWeight() + 100;

-    }

-

-    public Object[] transform(Value source, TransformationContext context) {

-

-        try {

-            Object object = Value.convert(Value.asItem(source));

-

-            Class<?> componentClass = context.getTargetDataType().getPhysical().getComponentType();

-            Object[] result = (Object[])Array.newInstance(componentClass, 1);

-

-            result[0] = object;

-

-            return result;

-

-        } catch (XPathException e) {

-            throw new TransformationException(e.getMessage());

-        }

-

-    }

-

-}

diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
deleted file mode 100644
index 7589f6789b..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
+++ /dev/null
@@ -1,66 +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.databinding.saxon;
-
-import net.sf.saxon.trans.XPathException;
-import net.sf.saxon.value.Value;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;
-
-/**
- * Transforms Value objects to generic java objects
- * @version $Rev$ $Date$
- */
-public class Value2ObjectTransformer extends BaseTransformer<Value, Object> implements PullTransformer<Value, Object> {
-
-    public Object transform(Value source, TransformationContext context) {
-        Object object;
-        try {
-            object = Value.convert(Value.asItem(source));
-        } catch (XPathException e) {
-            throw new TransformationException(e);
-        }
-        return object;
-    }
-
-    @Override
-    protected Class<Value> getSourceType() {
-        return Value.class;
-    }
-
-    @Override
-    protected Class<Object> getTargetType() {
-        return Object.class;
-    }
-    
-    @Override
-    public String getTargetDataBinding() {
-        return JavaBeansDataBinding.NAME;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10000;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
deleted file mode 100644
index 5da4effcfd..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
+++ /dev/null
@@ -1,65 +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.databinding.saxon;
-
-import net.sf.saxon.trans.XPathException;
-import net.sf.saxon.value.Value;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;
-
-/**
- * Transforms Value objects to simple types
- * @version $Rev$ $Date$
- */
-public class Value2SimpleTypeTransformer extends BaseTransformer<Value, Object> implements
-    PullTransformer<Value, Object> {
-    public Object transform(Value source, TransformationContext context) {
-        Object object;
-        try {
-            object = Value.convert(Value.asItem(source));
-        } catch (XPathException e) {
-            throw new TransformationException(e);
-        }
-        return object;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return SimpleJavaDataBinding.NAME;
-    }
-
-    @Override
-    protected Class<Value> getSourceType() {
-        return Value.class;
-    }
-
-    @Override
-    protected Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10000;
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java b/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
deleted file mode 100644
index 065121520b..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
+++ /dev/null
@@ -1,34 +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.databinding.saxon.collection;

-

-import java.util.ArrayList;

-

-import net.sf.saxon.om.Item;

-

-/**

- * Stores a list of Item objects.

- * 

- * Used by the implementation.xquery to store a collection of results

- * generated by the xquery execution.

- *

- * @version $Rev: 659284 $ $Date: 2008-05-22 14:26:18 -0800 (Thu, 22 May 2008) $

- */

-public class ItemList extends ArrayList<Item> {}

diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/java/sca-contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
deleted file mode 100644
index e15021b972..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ /dev/null
@@ -1,20 +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.
-
-# implementation classes for the databindings
-org.apache.tuscany.sca.databinding.saxon.SaxonNodeDataBinding;name=net.sf.saxon.om.NodeInfo
-org.apache.tuscany.sca.databinding.saxon.SaxonValueDataBinding;name=net.sf.saxon.value.Value
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/java/sca-contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index 4d927ce53d..0000000000
--- a/java/sca-contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /dev/null
@@ -1,34 +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.
-
-# Implementation classes for the transformers
-org.apache.tuscany.sca.databinding.saxon.Node2NodeInfoTransformer;source=org.w3c.dom.Node,target=net.sf.saxon.om.NodeInfo,weight=2000
-org.apache.tuscany.sca.databinding.saxon.NodeInfo2NodeTransformer;source=net.sf.saxon.om.NodeInfo,target=org.w3c.dom.Node,weight=2000
-org.apache.tuscany.sca.databinding.saxon.Object2ValueTransformer;source=java:complexType,target=net.sf.saxon.value.Value,weight=80000
-org.apache.tuscany.sca.databinding.saxon.Value2ObjectTransformer;source=net.sf.saxon.value.Value,target=java:complexType,weight=80000
-org.apache.tuscany.sca.databinding.saxon.SimpleType2ValueTransformer;source=java:simpleType,target=net.sf.saxon.value.Value,weight=80000
-org.apache.tuscany.sca.databinding.saxon.Value2SimpleTypeTransformer;source=net.sf.saxon.value.Value,target=java:simpleType,weight=80000
-org.apache.tuscany.sca.databinding.saxon.NodeInfo2DataObjectTransformer;source=net.sf.saxon.om.NodeInfo,target=commonj.sdo.DataObject,weight=1000
-org.apache.tuscany.sca.databinding.saxon.DataObject2NodeInfoTransformer;source=commonj.sdo.DataObject,target=net.sf.saxon.om.NodeInfo,weight=1000
-org.apache.tuscany.sca.databinding.saxon.ItemList2ObjectTransformer;source=org.apache.tuscany.sca.databinding.saxon.collection.ItemList,target=net.sf.saxon.om.NodeInfo,weight=1000
-org.apache.tuscany.sca.databinding.saxon.ItemList2ObjectTransformer;source=org.apache.tuscany.sca.databinding.saxon.collection.ItemList,target=net.sf.saxon.value.Value,weight=1000
-org.apache.tuscany.sca.databinding.saxon.ItemList2ObjectTransformer;source=org.apache.tuscany.sca.databinding.saxon.collection.ItemList,target=commonj.sdo.DataObject,weight=1000
-org.apache.tuscany.sca.databinding.saxon.ItemList2ObjectTransformer;source=org.apache.tuscany.sca.databinding.saxon.collection.ItemList,target=java:complex,weight=1000
-org.apache.tuscany.sca.databinding.saxon.ItemList2ObjectTransformer;source=org.apache.tuscany.sca.databinding.saxon.collection.ItemList,target=java:simple,weight=1000
-org.apache.tuscany.sca.databinding.saxon.ItemList2ObjectTransformer;source=org.apache.tuscany.sca.databinding.saxon.collection.ItemList,target=java:array,weight=1000
-org.apache.tuscany.sca.databinding.saxon.NodeInfo2JavaArrayTransformer;source=net.sf.saxon.om.NodeInfo,target=java:array,weight=1000
-org.apache.tuscany.sca.databinding.saxon.Value2JavaArrayTransformer;source=net.sf.saxon.value.Value,target=java:array,weight=1000
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/LICENSE b/java/sca-contrib/modules/databinding-sdo-axiom/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF b/java/sca-contrib/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
deleted file mode 100644
index 76259a7555..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: com.example.ipo.sdo;version="2.0.0",com.example.ipo.sdo

- .impl;version="2.0.0",com.example.stock.sdo;version="2.0.0",com.example.s

- tock.sdo.impl;version="2.0.0",org.apache.tuscany.sca.databinding.sdo2om

- ;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Data Binding for SDO/AXIOM

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397381546

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Data Binding for SDO/AXIOM

-Import-Package: commonj.sdo;version="2.1",

- commonj.sdo.helper;version="2.1",

- commonj.sdo.impl;resolution:=optional,

- javax.xml.namespace,

- javax.xml.stream,

- 

- org.apache.axiom.om,

- org.apache.axiom.om.impl.builder,

- org.apache.axiom.om.impl.serialize,

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.databinding.sdo;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.tuscany.sdo.api,

- org.apache.tuscany.sdo.helper,

- org.apache.tuscany.sdo.impl,

- org.apache.tuscany.sdo.model,

- org.apache.tuscany.sdo.model.impl,

- org.eclipse.emf.common.notify,

- org.eclipse.emf.ecore,

- org.eclipse.emf.ecore.util

-Bundle-SymbolicName: org.apache.tuscany.sca.databinding.sdo.axiom

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/NOTICE b/java/sca-contrib/modules/databinding-sdo-axiom/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/pom.xml b/java/sca-contrib/modules/databinding-sdo-axiom/pom.xml
deleted file mode 100644
index 4737cfd963..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/pom.xml
+++ /dev/null
@@ -1,153 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-    <name>Apache Tuscany SCA Data Binding for SDO/AXIOM</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <version>1.2.7</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>xerces</groupId>
-                  <artifactId>xercesImpl</artifactId>
-               </exclusion>
-                <exclusion>
-                    <groupId>javax.mail</groupId>
-                    <artifactId>mail</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>                
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-		<dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.7</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-           <groupId>commons-logging</groupId>
-           <artifactId>commons-logging</artifactId>
-           <version>1.1.1</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>commons-logging</groupId>
-                   <artifactId>commons-logging</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>          
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>        
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-po-sdo</id>
-                        <phase>generate-test-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/test/resources/ipo.xsd</schemaFile>
-                            <javaPackage>com.example.ipo.sdo</javaPackage>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>generate-stock-sdo</id>
-                        <phase>generate-test-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/test/resources/stock.xsd</schemaFile>
-                            <javaPackage>com.example.stock.sdo</javaPackage>
-                            <prefix>Stock</prefix>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>                    
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java b/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
deleted file mode 100644
index 02f43000b4..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
+++ /dev/null
@@ -1,142 +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.databinding.sdo2om;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMDataSource;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.builder.StAXBuilder;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- * Helper for AXIOM
- * 
- * @version $Rev$ $Date$
- */
-public class AxiomHelper {
-    private static final String DEFAULT_PREFIX = "_ns_";
-
-    private AxiomHelper() {
-    }
-
-    /**
-     * See http://issues.apache.org/jira/browse/WSCOMMONS-240
-     * @param om
-     */
-    public static void completeAndClose(OMElement om) {
-        // Get the builder associated with the om element
-        OMXMLParserWrapper builder = om.getBuilder();
-        if (builder != null) {
-            if (builder instanceof StAXBuilder) {
-                ((StAXBuilder)builder).releaseParserOnClose(true);
-            }
-            OMElement document = builder.getDocumentElement();
-            if (document != null) {
-                document.build();
-            }
-        }
-        if (builder instanceof StAXBuilder) {
-            ((StAXBuilder)builder).close();
-        }
-    }
-
-    /**
-     * This method will close the builder immediately.  Any subsequent Axiom objects won't 
-     * be built or accessible.
-     */
-    public static void closeImmediately(OMElement om) {
-        // Get the builder associated with the om element
-        OMXMLParserWrapper builder = om.getBuilder();
-        if (builder != null) {
-            if (builder instanceof StAXBuilder) {
-                ((StAXBuilder)builder).releaseParserOnClose(true);
-                ((StAXBuilder)builder).close();
-            }
-            // builder.close();
-        }
-    }
-
-    /**
-     * @param context
-     * @param element
-     */
-    public static void adjustElementName(TransformationContext context, OMElement element) {
-        if (context != null) {
-            DataType dataType = context.getTargetDataType();
-            Object logical = dataType == null ? null : dataType.getLogical();
-            if (!(logical instanceof XMLType)) {
-                return;
-            }
-            XMLType xmlType = (XMLType)logical;
-            if (xmlType.isElement() && !xmlType.getElementName().equals(element.getQName())) {
-                // FIXME:: Throw exception or switch to the new Element?
-                OMFactory factory = OMAbstractFactory.getOMFactory();
-                QName name = xmlType.getElementName();
-                OMNamespace namespace = factory.createOMNamespace(name.getNamespaceURI(), name.getPrefix());
-                element.setNamespace(namespace);
-                element.setLocalName(name.getLocalPart());
-            }
-        }
-    }
-
-    public static OMElement createOMElement(OMFactory factory, QName element) {
-        String localName = element.getLocalPart();
-        OMNamespace ns = createOMNamespace(factory, element);
-
-        return factory.createOMElement(localName, ns);
-
-    }
-
-    public static OMElement createOMElement(OMFactory factory, QName element, OMDataSource dataSource) {
-        String localName = element.getLocalPart();
-        OMNamespace ns = createOMNamespace(factory, element);
-
-        return factory.createOMElement(dataSource, localName, ns);
-
-    }
-
-    /**
-     * @param factory
-     * @param name
-     * @return
-     */
-    public static OMNamespace createOMNamespace(OMFactory factory, QName name) {
-        String namespaceURI = name.getNamespaceURI();
-        String prefix = name.getPrefix();
-
-        OMNamespace ns = null;
-        if (namespaceURI.length() != 0) {
-            // Qualified Element: we need an OMNamespace         
-            if (prefix.length() == 0) {
-                // The prefix does not appear to be specified, let's create one
-                prefix = DEFAULT_PREFIX;
-            }
-            ns = factory.createOMNamespace(namespaceURI, prefix);
-        }
-        return ns;
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
deleted file mode 100644
index aa7f99724d..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
+++ /dev/null
@@ -1,86 +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.databinding.sdo2om;
-
-import static org.apache.tuscany.sca.databinding.sdo.SDODataBinding.ROOT_ELEMENT;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.sdo.SDOContextHelper;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- * SDO DataObject --> AXIOM OMElement transformer
- * 
- * @version $Rev$ $Date$
- */
-public class DataObject2OMElement extends BaseTransformer<DataObject, OMElement> implements
-    PullTransformer<DataObject, OMElement> {
-
-    public OMElement transform(DataObject source, TransformationContext context) {
-        HelperContext helperContext = SDOContextHelper.getHelperContext(context, true);
-        OMFactory factory = OMAbstractFactory.getOMFactory();
-
-        QName name  = ROOT_ELEMENT;
-        if (context != null) {
-            DataType dataType = context.getTargetDataType();
-            Object logical = dataType == null ? null : dataType.getLogical();
-            if (logical instanceof XMLType) {
-                XMLType xmlType = (XMLType)logical;
-                if (xmlType.isElement()) {
-                    name = xmlType.getElementName();
-                }
-            }
-        }
-
-        XMLDocument document = helperContext.getXMLHelper().createDocument(source,
-                                                                           name.getNamespaceURI(),
-                                                                           name.getLocalPart());
-        SDODataSource dataSource = new SDODataSource(document, helperContext);
-        OMElement element = AxiomHelper.createOMElement(factory, name, dataSource);
-        return element;
-    }
-
-    @Override
-    protected Class<DataObject> getSourceType() {
-        return DataObject.class;
-    }
-
-    @Override
-    protected Class<OMElement> getTargetType() {
-        return OMElement.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
deleted file mode 100644
index dc3c2610a4..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
+++ /dev/null
@@ -1,89 +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.databinding.sdo2om;
-
-import static org.apache.tuscany.sca.databinding.sdo.SDODataBinding.ROOT_ELEMENT;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.axiom.om.OMDataSource;
-import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.api.XMLStreamHelper;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class SDODataSource implements OMDataSource {
-    private HelperContext helperContext;
-    private XMLDocument sourceDocument;
-
-    public SDODataSource(XMLDocument source, HelperContext helperContext) {
-        this.sourceDocument = source;
-        this.helperContext = helperContext;
-    }
-
-    public SDODataSource(DataObject obj, HelperContext helperContext) {
-        this.helperContext = helperContext;
-        this.sourceDocument =
-            helperContext.getXMLHelper().createDocument(obj,
-                                                        ROOT_ELEMENT.getNamespaceURI(),
-                                                        ROOT_ELEMENT.getLocalPart());
-    }
-
-    public XMLStreamReader getReader() throws XMLStreamException {
-        XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext);
-        return streamHelper.createXMLStreamReader(sourceDocument);
-    }
-
-    public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException {
-        StreamingOMSerializer serializer = new StreamingOMSerializer();
-        serializer.serialize(getReader(), xmlWriter);
-    }
-
-    public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
-        try {
-            helperContext.getXMLHelper().save(sourceDocument, output, null);
-        } catch (Exception e) {
-            throw new XMLStreamException(e);
-        }
-    }
-
-    public void serialize(Writer writer, OMOutputFormat format) throws XMLStreamException {
-        try {
-            helperContext.getXMLHelper().save(sourceDocument, writer, null);
-        } catch (IOException e) {
-            throw new XMLStreamException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
deleted file mode 100644
index a55a9f37cb..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
+++ /dev/null
@@ -1,65 +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.databinding.sdo2om;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.sdo.SDOContextHelper;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- * SDO XMLDocument --> AXIOM OMElement transformer
- * @version $Rev$ $Date$
- */
-public class XMLDocument2OMElement extends BaseTransformer<XMLDocument, OMElement> implements
-    PullTransformer<XMLDocument, OMElement> {
-
-    public OMElement transform(XMLDocument source, TransformationContext context) {
-        HelperContext helperContext = SDOContextHelper.getHelperContext(context, true);
-        SDODataSource dataSource = new SDODataSource(source, helperContext);
-        OMFactory factory = OMAbstractFactory.getOMFactory();
-        QName name = new QName(source.getRootElementURI(), source.getRootElementName());
-        OMElement element = AxiomHelper.createOMElement(factory, name, dataSource);
-        return element;
-    }
-
-    @Override
-    protected Class<XMLDocument> getSourceType() {
-        return XMLDocument.class;
-    }
-
-    @Override
-    protected Class<OMElement> getTargetType() {
-        return OMElement.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/java/sca-contrib/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index c870ec2406..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /dev/null
@@ -1,20 +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.
-
-# Implementation classes for the transformers
-org.apache.tuscany.sca.databinding.sdo2om.DataObject2OMElement;source=commonj.sdo.DataObject,target=org.apache.axiom.om.OMElement,weight=3000
-org.apache.tuscany.sca.databinding.sdo2om.XMLDocument2OMElement;source=commonj.sdo.helper.XMLDocument,target=org.apache.axiom.om.OMElement,weight=3000
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
deleted file mode 100644
index 57dd056526..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
+++ /dev/null
@@ -1,78 +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.databinding.sdo2om;
-
-import java.io.StringWriter;
-
-import javax.xml.stream.XMLStreamException;
-
-import junit.framework.Assert;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-import commonj.sdo.DataObject;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DataObject2OMElementTestCase extends SDOTransformerTestCaseBase {
-
-    @Override
-    protected DataType<?> getSourceDataType() {
-        return new DataTypeImpl<XMLType>(DataObject.class.getName(), DataObject.class, new XMLType(ORDER_QNAME, null));
-    }
-
-    @Override
-    protected DataType<?> getTargetDataType() {
-        return new DataTypeImpl<XMLType>(OMElement.class.getName(), OMElement.class, new XMLType(ORDER_QNAME, null));
-    }
-
-    public final void testTransform() throws XMLStreamException {
-        OMElement element = new DataObject2OMElement().transform(dataObject, context);
-        Assert.assertEquals(ORDER_QNAME.getNamespaceURI(), element.getNamespace().getNamespaceURI());
-        Assert.assertEquals(ORDER_QNAME.getLocalPart(), element.getLocalName());
-        // TODO: See https://issues.apache.org/jira/browse/WSCOMMONS-226
-        // element.getBuilder().setCache(false);
-        StringWriter writer = new StringWriter();
-        element.serialize(writer);
-    }
-
-    public final void testTransformWrapper() throws XMLStreamException {
-        OMElement element = new DataObject2OMElement().transform(dataObject, context);
-        Assert.assertEquals(ORDER_QNAME.getNamespaceURI(), element.getNamespace().getNamespaceURI());
-        Assert.assertEquals(ORDER_QNAME.getLocalPart(), element.getLocalName());
-
-        OMNamespace ns = OMAbstractFactory.getOMFactory().createOMNamespace("http://ns1", "ns1");
-        element.setNamespace(ns);
-        element.setLocalName("dummy");
-        // TODO: See https://issues.apache.org/jira/browse/WSCOMMONS-226
-        // element.getBuilder().setCache(true);
-        StringWriter writer = new StringWriter();
-        element.serializeAndConsume(writer);
-        // System.out.println(writer);
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
deleted file mode 100644
index f69ef598b8..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
+++ /dev/null
@@ -1,82 +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.databinding.sdo2om;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl;
-import org.apache.tuscany.sca.interfacedef.DataType;
-
-import com.example.ipo.sdo.PurchaseOrderType;
-import com.example.ipo.sdo.SdoFactory;
-import com.example.ipo.sdo.USAddress;
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * The base class for SDO-related test cases
- *
- * @version $Rev$ $Date$
- */
-public abstract class SDOTransformerTestCaseBase extends TestCase {
-    protected static final QName ORDER_QNAME = new QName("http://www.example.com/IPO", "purchaseOrder");
-
-    protected HelperContext helperContext;
-    protected String binding = DataObject.class.getName();
-    protected TransformationContext context;
-    protected TransformationContext reversedContext; 
-    protected DataObject dataObject;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        helperContext = HelperProvider.getDefaultContext();
-        SdoFactory.INSTANCE.register(helperContext);
-        
-        context = new TransformationContextImpl();
-        context.setSourceDataType(getSourceDataType());
-        context.setTargetDataType(getTargetDataType());
-
-        reversedContext = new TransformationContextImpl();
-        reversedContext.setSourceDataType(getTargetDataType());
-        reversedContext.setTargetDataType(getSourceDataType());
-        
-        PurchaseOrderType po = SdoFactory.INSTANCE.createPurchaseOrderType();
-        USAddress address = SdoFactory.INSTANCE.createUSAddress();
-        address.setCity("San Jose");
-        address.setStreet("123 ABC St");
-        address.setState("CA");
-        address.setStreet("95131");
-        po.setBillTo(address);
-        dataObject = (DataObject) po;
-    }
-
-    protected abstract DataType<?> getSourceDataType();
-
-    protected abstract DataType<?> getTargetDataType();
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
deleted file mode 100644
index 5015a1b697..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
+++ /dev/null
@@ -1,63 +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.databinding.sdo2om;
-
-import java.io.StringWriter;
-
-import javax.xml.stream.XMLStreamException;
-
-import junit.framework.Assert;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-import commonj.sdo.helper.XMLDocument;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class XMLDocument2OMElementTestCase extends SDOTransformerTestCaseBase {
-
-    @Override
-    protected DataType<?> getSourceDataType() {
-        return new DataTypeImpl<XMLType>(XMLDocument.class.getName(), XMLDocument.class, new XMLType(ORDER_QNAME, null));
-    }
-
-    @Override
-    protected DataType<?> getTargetDataType() {
-        return new DataTypeImpl<XMLType>(OMElement.class.getName(), OMElement.class, new XMLType(ORDER_QNAME, null));
-    }
-
-    public final void testTransform() throws XMLStreamException {
-        XMLDocument document =
-            helperContext.getXMLHelper().createDocument(dataObject,
-                                                        ORDER_QNAME.getNamespaceURI(),
-                                                        ORDER_QNAME.getLocalPart());
-        OMElement element = new XMLDocument2OMElement().transform(document, context);
-        Assert.assertEquals(ORDER_QNAME.getNamespaceURI(), element.getNamespace().getNamespaceURI());
-        Assert.assertEquals(ORDER_QNAME.getLocalPart(), element.getLocalName());
-        StringWriter writer = new StringWriter();
-        element.serialize(writer);
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd b/java/sca-contrib/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
deleted file mode 100644
index 241ec15d36..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
+++ /dev/null
@@ -1,136 +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.    
--->
-<schema targetNamespace="http://www.example.com/IPO"
-	xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:ipo="http://www.example.com/IPO">
-
-	<annotation>
-		<documentation xml:lang="en">
-			International Purchase order schema for Example.com
-			Copyright 2000 Example.com. All rights reserved.
-		</documentation>
-	</annotation>
-
-
-	<element name="purchaseOrder" type="ipo:PurchaseOrderType" />
-
-	<element name="comment" type="string" />
-
-	<complexType name="PurchaseOrderType">
-		<sequence>
-			<element name="shipTo" type="ipo:Address" />
-			<element name="billTo" type="ipo:Address" />
-			<element ref="ipo:comment" minOccurs="0" />
-			<element name="items" type="ipo:Items" />
-		</sequence>
-		<attribute name="orderDate" type="date" />
-	</complexType>
-
-	<complexType name="Items">
-		<sequence>
-			<element name="item" minOccurs="0" maxOccurs="unbounded">
-				<complexType>
-					<sequence>
-						<element name="productName" type="string" />
-						<element name="quantity">
-							<simpleType>
-								<restriction base="positiveInteger">
-									<maxExclusive value="100" />
-								</restriction>
-							</simpleType>
-						</element>
-						<element name="USPrice" type="decimal" />
-						<element ref="ipo:comment" minOccurs="0" />
-						<element name="shipDate" type="date"
-							minOccurs="0" />
-					</sequence>
-					<attribute name="partNum" type="ipo:SKU"
-						use="required" />
-				</complexType>
-			</element>
-		</sequence>
-	</complexType>
-
-	<simpleType name="SKU">
-		<restriction base="string">
-			<pattern value="\d{3}-[A-Z]{2}" />
-		</restriction>
-	</simpleType>
-
-	<complexType name="Address">
-		<sequence>
-			<element name="name" type="string" />
-			<element name="street" type="string" />
-			<element name="city" type="string" />
-		</sequence>
-	</complexType>
-
-	<complexType name="USAddress">
-		<complexContent>
-			<extension base="ipo:Address">
-				<sequence>
-					<element name="state" type="ipo:USState" />
-					<element name="zip" type="positiveInteger" />
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<complexType name="UKAddress">
-		<complexContent>
-			<extension base="ipo:Address">
-				<sequence>
-					<element name="postcode" type="ipo:UKPostcode" />
-				</sequence>
-				<attribute name="exportCode" type="positiveInteger"
-					fixed="1" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<!-- other Address derivations for more countries -->
-
-	<simpleType name="USState">
-		<restriction base="string">
-			<enumeration value="AK" />
-			<enumeration value="AL" />
-			<enumeration value="AR" />
-			<enumeration value="CA" />
-			<enumeration value="PA" />
-			<!-- and so on ... -->
-		</restriction>
-	</simpleType>
-
-	<simpleType name="Postcode">
-		<restriction base="string">
-			<length value="7" fixed="true" />
-		</restriction>
-	</simpleType>
-
-
-	<simpleType name="UKPostcode">
-		<restriction base="ipo:Postcode">
-			<pattern value="[A-Z]{2}\d\s\d[A-Z]{2}" />
-		</restriction>
-	</simpleType>
-
-
-
-</schema>
-
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/resources/stock.xsd b/java/sca-contrib/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
deleted file mode 100644
index a0a6717371..0000000000
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
+++ /dev/null
@@ -1,33 +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://www.example.com/stock" xmlns="http://www.w3.org/2001/XMLSchema">
-    <!-- Faults -->
-    <element name="InvalidSymbolFault">
-        <complexType>
-            <sequence>
-                <element name="message" minOccurs="1" type="string" />
-                <element name="symbol" minOccurs="1" type="string" />
-            </sequence>
-        </complexType>
-    </element>
-
-    <element name="MarketClosedFault" type="string" />
-
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/databinding-sdo/LICENSE b/java/sca-contrib/modules/databinding-sdo/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/databinding-sdo/META-INF/MANIFEST.MF b/java/sca-contrib/modules/databinding-sdo/META-INF/MANIFEST.MF
deleted file mode 100644
index 798df260ff..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,66 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.databinding.sdo;uses:="org.apac

- he.tuscany.sca.databinding,commonj.sdo.impl,org.apache.tuscany.sca.in

- terfacedef.util,org.apache.tuscany.sca.assembly.impl,javax.xml.transf

- orm.dom,org.apache.tuscany.sca.core,commonj.sdo.helper,javax.xml.name

- space,javax.xml.stream,org.w3c.dom.ls,org.apache.tuscany.sca.contribu

- tion.resolver,org.apache.tuscany.sca.databinding.util,org.oasisopen.sca,or

- g.apache.ws.commons.schema,org.apache.tuscany.sca.databinding.impl,or

- g.apache.tuscany.sca.contribution,org.apache.tuscany.sca.monitor,org.

- apache.tuscany.sdo.api,org.w3c.dom,org.apache.tuscany.sca.interfacede

- f,org.w3c.dom.bootstrap,commonj.sdo,javax.xml.transform,org.apache.tu

- scany.sca.interfacedef.impl,org.apache.tuscany.sca.contribution.proce

- ssor,org.apache.tuscany.sca.xsd";version="2.0.0"

-Private-Package: com.example.ipo.sdo;version="2.0.0",com.example.ipo.sdo

- .impl;version="2.0.0",com.example.stock.sdo;version="2.0.0",com.example.s

- tock.sdo.impl;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Data Binding for SDO

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397376421

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Data Binding for SDO

-Import-Package: commonj.sdo;version="2.1",

- commonj.sdo.helper;version="2.1",

- commonj.sdo.impl,

- javax.xml.namespace,

- javax.xml.stream,

- javax.xml.transform,

- javax.xml.transform.dom,

- 

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.contribution;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.databinding.sdo;version="2.0.0",

- org.apache.tuscany.sca.databinding.util;version="2.0.0",

- org.apache.tuscany.sca.databinding.xml;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.xsd;version="2.0.0",

- org.apache.tuscany.sdo.api,

- org.apache.tuscany.sdo.helper,

- org.apache.tuscany.sdo.impl,

- org.apache.tuscany.sdo.model,

- org.apache.tuscany.sdo.model.impl,

- org.apache.ws.commons.schema,

- org.eclipse.emf.common.notify,

- org.eclipse.emf.ecore,

- org.eclipse.emf.ecore.util,

- 

- org.oasisopen.sca;version="2.0.0",

- org.w3c.dom,

- org.w3c.dom.bootstrap,

- org.w3c.dom.ls

-Bundle-SymbolicName: org.apache.tuscany.sca.databinding.sdo

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/databinding-sdo/NOTICE b/java/sca-contrib/modules/databinding-sdo/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/databinding-sdo/pom.xml b/java/sca-contrib/modules/databinding-sdo/pom.xml
deleted file mode 100644
index 6d2de7c2db..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/pom.xml
+++ /dev/null
@@ -1,119 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-databinding-sdo</artifactId>
-    <name>Apache Tuscany SCA Data Binding for SDO</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <!-- FIXME: We might want to create a separate module to host the processor -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-lib</artifactId>
-            <version>1.1.1</version>
-        </dependency>                    
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>        
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-po-sdo</id>
-                        <phase>generate-test-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/test/resources/ipo.xsd</schemaFile>
-                            <javaPackage>com.example.ipo.sdo</javaPackage>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>generate-stock-sdo</id>
-                        <phase>generate-test-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/test/resources/stock.xsd</schemaFile>
-                            <javaPackage>com.example.stock.sdo</javaPackage>
-                            <prefix>Stock</prefix>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>                    
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
deleted file mode 100644
index 503e54e530..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
+++ /dev/null
@@ -1,73 +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.databinding.sdo;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.dom.DOMResult;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-
-public class DataObject2Node extends BaseTransformer<DataObject, Node> implements
-    PullTransformer<DataObject, Node> {
-
-    public Node transform(DataObject source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, true);
-            XMLHelper xmlHelper = helperContext.getXMLHelper();
-            QName elementName = SDOContextHelper.getElement(context);
-            Document doc = DOMHelper.newDocument();
-            DOMResult result = new DOMResult(doc);
-            XMLDocument xmlDoc = xmlHelper.createDocument(source, elementName.getNamespaceURI(), elementName.getLocalPart());
-            xmlHelper.save(xmlDoc, result, null);
-            return doc.getDocumentElement();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<DataObject> getSourceType() {
-        return DataObject.class;
-    }
-
-    @Override
-    protected Class<Node> getTargetType() {
-        return Node.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
deleted file mode 100644
index 8ce8eae587..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
+++ /dev/null
@@ -1,64 +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.databinding.sdo;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLHelper;
-
-public class DataObject2String extends BaseTransformer<DataObject, String> implements
-    PullTransformer<DataObject, String> {
-
-    public String transform(DataObject source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }            
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, true);
-            XMLHelper xmlHelper = helperContext.getXMLHelper();
-            QName elementName = SDOContextHelper.getElement(context);
-            return xmlHelper.save(source, elementName.getNamespaceURI(), elementName.getLocalPart());
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<DataObject> getSourceType() {
-        return DataObject.class;
-    }
-
-    @Override
-    protected Class<String> getTargetType() {
-        return String.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
deleted file mode 100644
index 116ac4c553..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
+++ /dev/null
@@ -1,82 +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.databinding.sdo;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.api.XMLStreamHelper;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-
-public class DataObject2XMLStreamReader extends BaseTransformer<DataObject, XMLStreamReader> implements
-        PullTransformer<DataObject, XMLStreamReader> {
-
-    public XMLStreamReader transform(final DataObject source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }            
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, true);
-            XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext);
-            final QName elementName = SDOContextHelper.getElement(context);
-            final XMLHelper xmlHelper = helperContext.getXMLHelper();
-            // Allow privileged access to read properties. REquires java.util.PropertyPermission
-            // XML.load.form.lax read in security policy.
-            XMLDocument document = AccessController.doPrivileged(new PrivilegedAction<XMLDocument>() {
-                public XMLDocument run() {
-                    return xmlHelper.createDocument(source, elementName.getNamespaceURI(), elementName.getLocalPart());
-                }
-            });
-                    
-            return streamHelper.createXMLStreamReader(document);
-        } catch (XMLStreamException e) {
-            // TODO: Add context to the exception
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<DataObject> getSourceType() {
-        return DataObject.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getTargetType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
deleted file mode 100644
index 7afb7d9463..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
+++ /dev/null
@@ -1,87 +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.databinding.sdo;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Base;
-
-import commonj.sdo.helper.HelperContext;
-
-/**
- * The model object for import.sdo
- * 
- * @version $Rev$ $Date$
- */
-public class ImportSDO implements Base {
-    public static final QName IMPORT_SDO =
-        new QName("http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0", "import.sdo");
-
-    private HelperContext helperContext;
-    private String factoryClassName;
-    private String schemaLocation;
-    private boolean unresolved;
-    
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean undefined) {
-        this.unresolved = undefined;
-    }
-
-    public ImportSDO(HelperContext helperContext) {
-        super();
-        this.helperContext = helperContext;
-        setUnresolved(true);
-    }
-
-    public HelperContext getHelperContext() {
-        return helperContext;
-    }
-
-    /**
-     * @return the factoryClassName
-     */
-    public String getFactoryClassName() {
-        return factoryClassName;
-    }
-
-    /**
-     * @param factoryClassName the factoryClassName to set
-     */
-    public void setFactoryClassName(String factoryClassName) {
-        this.factoryClassName = factoryClassName;
-    }
-
-    /**
-     * @return the schemaLocation
-     */
-    public String getSchemaLocation() {
-        return schemaLocation;
-    }
-
-    /**
-     * @param schemaLocation the schemaLocation to set
-     */
-    public void setSchemaLocation(String schemaLocation) {
-        this.schemaLocation = schemaLocation;
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
deleted file mode 100644
index 1e2f3a795c..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
+++ /dev/null
@@ -1,211 +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.databinding.sdo;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static org.apache.tuscany.sca.databinding.sdo.ImportSDO.IMPORT_SDO;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLConnection;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XSDHelper;
-
-/**
- * Loader that handles &lt;import.sdo&gt; elements.
- * 
- * @version $Rev$ $Date$
- * @deprecated
- */
-@Deprecated
-public class ImportSDOProcessor implements StAXArtifactProcessor<ImportSDO> {
-    
-    private ContributionFactory contributionFactory;
-    private Monitor monitor;
-
-    public ImportSDOProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-		 if (monitor != null) {
-		    Problem problem = monitor.createProblem(this.getClass().getName(), "databinding-sdo-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-		    monitor.problem(problem);
-		 }
-    }
-     
-     /**
-      * Report a exception.
-      * 
-      * @param problems
-      * @param message
-      * @param model
-      */
-    private void error(String message, Object model, Exception ex) {
-     	 if (monitor != null) {
-     		 Problem problem = monitor.createProblem(this.getClass().getName(), "databinding-sdo-validation-messages", Severity.ERROR, model, message, ex);
-     	     monitor.problem(problem);
-     	 }        
-    }
-
-    public QName getXMLType() {
-        return IMPORT_SDO;
-    }
-
-    public ImportSDO read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        assert IMPORT_SDO.equals(reader.getName());
-
-        // FIXME: How do we associate the application HelperContext with the one
-        // imported by the composite
-        ImportSDO importSDO = new ImportSDO(SDOContextHelper.getDefaultHelperContext());
-        String factoryName = reader.getAttributeValue(null, "factory");
-        if (factoryName != null) {
-            importSDO.setFactoryClassName(factoryName);
-        }
-        String location = reader.getAttributeValue(null, "location");
-        if (location != null) {
-            importSDO.setSchemaLocation(location);
-        }
-
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && ImportSDO.IMPORT_SDO.equals(reader.getName())) {
-                break;
-            }
-        }
-        return importSDO;
-    }
-
-    private void importFactory(ImportSDO importSDO, ModelResolver resolver) throws ContributionResolveException {
-        String factoryName = importSDO.getFactoryClassName();
-        if (factoryName != null) {
-            ClassReference reference = new ClassReference(factoryName);
-            ClassReference resolved = resolver.resolveModel(ClassReference.class, reference);
-            if (resolved != null && !resolved.isUnresolved()) {
-            	try {
-                    Class<?> factoryClass = resolved.getJavaClass();
-                    register(factoryClass, importSDO.getHelperContext());
-                    importSDO.setUnresolved(false);
-                } catch (Exception e) {
-                	ContributionResolveException ce = new ContributionResolveException(e);
-                	error("ContributionResolveException", resolver, ce);
-                    //throw ce;
-                }                
-            } else {
-            	error("FailToResolveClass", resolver, factoryName);
-                //ContributionResolveException loaderException =
-                    //new ContributionResolveException("Fail to resolve class: " + factoryName);
-                //throw loaderException;
-            }            
-        }
-    }
-
-    private static void register(Class factoryClass, HelperContext helperContext) throws Exception {
-        Field field = factoryClass.getField("INSTANCE");
-        Object factory = field.get(null);
-        Method method = factory.getClass().getMethod("register", new Class[] {HelperContext.class});
-        method.invoke(factory, new Object[] {helperContext});
-
-        //        HelperContext defaultContext = HelperProvider.getDefaultContext();
-        //        method.invoke(factory, new Object[] {defaultContext});
-    }
-
-    private void importWSDL(ImportSDO importSDO, ModelResolver resolver) throws ContributionResolveException {
-        String location = importSDO.getSchemaLocation();
-        if (location != null) {
-            try {
-                Artifact artifact = contributionFactory.createArtifact();
-                artifact.setURI(location);
-                artifact = resolver.resolveModel(Artifact.class, artifact);
-                if (artifact.getLocation() != null) {
-                	String wsdlURL = artifact.getLocation();
-                    URLConnection connection = new URL(wsdlURL).openConnection();
-                    connection.setUseCaches(false);
-                    InputStream xsdInputStream = connection.getInputStream();
-                    try {
-                        XSDHelper xsdHelper = importSDO.getHelperContext().getXSDHelper();
-                        xsdHelper.define(xsdInputStream, wsdlURL);
-                    } finally {
-                        xsdInputStream.close();
-                    }
-                    importSDO.setUnresolved(false);
-                } else {
-                   	error("FailToResolveLocation", resolver, location);
-                    //ContributionResolveException loaderException = new ContributionResolveException("Fail to resolve location: " + location);
-                    //throw loaderException;
-                }                
-            } catch (IOException e) {
-            	ContributionResolveException ce = new ContributionResolveException(e);
-            	error("ContributionResolveException", resolver, ce);
-                //throw ce;
-            }            
-        }
-    }
-
-    public QName getArtifactType() {
-        return ImportSDO.IMPORT_SDO;
-    }
-
-    public void write(ImportSDO model, XMLStreamWriter outputSource) throws ContributionWriteException {
-        // Not implemented as <import.sdo> is deprecated
-    }
-
-    public Class<ImportSDO> getModelType() {
-        return ImportSDO.class;
-    }
-
-    public void resolve(ImportSDO importSDO, ModelResolver resolver) throws ContributionResolveException {
-        importFactory(importSDO, resolver);
-        importWSDL(importSDO, resolver);
-        if (!importSDO.isUnresolved()) {
-            resolver.addModel(importSDO);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
deleted file mode 100644
index 4a05492dd8..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
+++ /dev/null
@@ -1,69 +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.databinding.sdo;
-
-import javax.xml.transform.dom.DOMSource;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-
-public class Node2DataObject extends BaseTransformer<Node, DataObject> implements PullTransformer<Node, DataObject> {
-
-    public DataObject transform(Node source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, false);
-            XMLHelper xmlHelper = helperContext.getXMLHelper();
-            Document doc = DOMHelper.promote(source);
-            DOMSource domSource = new DOMSource(doc);
-            XMLDocument xmlDoc = xmlHelper.load(domSource, doc.getDocumentURI(), null);
-            return xmlDoc.getRootObject();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Node> getSourceType() {
-        return Node.class;
-    }
-
-    @Override
-    protected Class<DataObject> getTargetType() {
-        return DataObject.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
deleted file mode 100644
index 695722be18..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
+++ /dev/null
@@ -1,208 +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.databinding.sdo;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.util.DataTypeHelper;
-import org.apache.tuscany.sca.databinding.util.LRUCache;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sdo.api.SDOUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * Helper class to get TypeHelper from the context
- *
- * @version $Rev$ $Date$
- */
-public final class SDOContextHelper {
-    private static final LRUCache<Object, HelperContext> cache = new LRUCache<Object, HelperContext>(1024);
-
-    private SDOContextHelper() {
-    }
-
-    public static HelperContext getHelperContext(TransformationContext context, boolean source) {
-        if (context == null) {
-            return getDefaultHelperContext();
-        }
-
-        HelperContext helperContext = null;
-        Operation op = source ? context.getSourceOperation() : context.getTargetOperation();
-        if (op == null) {
-            DataType<?> dt = source ? context.getSourceDataType() : context.getTargetDataType();
-
-            helperContext = dt.getMetaData(HelperContext.class);
-            if (helperContext != null) {
-                return helperContext;
-            }
-            helperContext = SDOUtil.createHelperContext();
-            boolean found = register(helperContext, dt);
-            if (!found) {
-                helperContext = getDefaultHelperContext();
-            }
-            dt.setMetaData(HelperContext.class, helperContext);
-            return helperContext;
-        } else {
-            return getHelperContext(op);
-        }
-
-    }
-
-    public static HelperContext getHelperContext(Operation op) {
-        if (op == null) {
-            return getDefaultHelperContext();
-        }
-
-        HelperContext helperContext = op.getInputType().getMetaData(HelperContext.class);
-
-        if (helperContext != null) {
-            return helperContext;
-        }
-
-        // Use the default HelperContext until a type is registered later on
-        helperContext = getDefaultHelperContext();
-
-        /*
-        List<DataType> dataTypes = DataTypeHelper.getDataTypes(op, false);
-        boolean found = false;
-        for (DataType d : dataTypes) {
-            if (register(helperContext, d)) {
-                found = true;
-            }
-        }
-        if (!found) {
-            helperContext = getDefaultHelperContext();
-        }
-        */
-        op.getInputType().setMetaData(HelperContext.class, helperContext);
-        return helperContext;
-    }
-
-    /**
-     * @param helperContext
-     * @param dataType
-     * @return
-     */
-    private static boolean register(HelperContext helperContext, DataType dataType) {
-        if (dataType == null) {
-            return false;
-        }
-        Set<Class<?>> classes = DataTypeHelper.findClasses(dataType);
-        boolean found = false;
-        for (Class<?> cls : classes) {
-            found = register(helperContext, dataType.getPhysical()) || found;
-        }
-        return found;
-    }
-
-    /**
-     * FIXME: [rfeng] This is a hack to get the factory out a SDO class
-     * @param helperContext
-     * @param javaType
-     */
-
-    public static boolean register(HelperContext helperContext, Class javaType) {
-        if (javaType == null || DataObject.class == javaType) {
-            return false;
-        }
-        try {
-            Type type = helperContext.getTypeHelper().getType(javaType);
-            if (type != null && (!type.isDataType())) {
-                Method method = type.getClass().getMethod("getEPackage");
-                Object factory = method.invoke(type, new Object[] {});
-                method = factory.getClass().getMethod("register", HelperContext.class);
-                method.invoke(factory, new Object[] {helperContext});
-                return true;
-            }
-            return false;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    public static HelperContext getDefaultHelperContext() {
-        // SDOUtil.createHelperContext();
-        return HelperProvider.getDefaultContext();
-    }
-
-    public static QName getElement(TransformationContext context) {
-        if (context == null) {
-            return SDODataBinding.ROOT_ELEMENT;
-        }
-        DataType<?> dataType = context.getTargetDataType();
-        Object logical = dataType.getLogical();
-        QName elementName = null;
-        if (logical instanceof XMLType) {
-            XMLType xmlType = (XMLType)logical;
-            QName element = xmlType.getElementName();
-            if (element != null) {
-                elementName = element;
-            }
-        }
-        if (elementName == null) {
-            // Try source type
-            dataType = context.getSourceDataType();
-            logical = dataType.getLogical();
-            if (logical instanceof XMLType) {
-                XMLType xmlType = (XMLType)logical;
-                QName element = xmlType.getElementName();
-                if (element != null) {
-                    elementName = element;
-                }
-            }
-        }
-        if (elementName != null) {
-            return elementName;
-        } else {
-            return SDODataBinding.ROOT_ELEMENT;
-        }
-    }
-
-    public static String generateSchema(HelperContext context, Class<?>[] classes) {
-        TypeHelper typeHelper = context.getTypeHelper();
-        List<Type> types = new ArrayList<Type>();
-        for (Class<?> cls : classes) {
-            Type type = typeHelper.getType(cls);
-            if (type != null) {
-                types.add(type);
-            }
-        }
-        return generateSchema(context, types);
-    }
-
-    public static String generateSchema(HelperContext context, List<Type> types) {
-        // FIXME: SDO throws IllegalArgumentException for types generated from existing XSDs
-        return context.getXSDHelper().generate(types);
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
deleted file mode 100644
index 0b58be9e41..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
+++ /dev/null
@@ -1,146 +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.databinding.sdo;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.WrapperHandler;
-import org.apache.tuscany.sca.databinding.XMLTypeHelper;
-import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sdo.api.SDOUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.CopyHelper;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- * SDO Databinding
- * 
- * @version $Rev$ $Date$
- */
-public class SDODataBinding extends BaseDataBinding {
-    public static final String NAME = DataObject.class.getName();
-
-    public static final String ROOT_NAMESPACE = "commonj.sdo";
-    public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "dataObject");
-
-    private WrapperHandler<Object> wrapperHandler;
-    private XMLTypeHelper xmlTypeHelper;
-
-    public SDODataBinding() {
-        super(NAME, DataObject.class);
-        wrapperHandler = new SDOWrapperHandler();
-        xmlTypeHelper = new SDOTypeHelper();
-    }
-
-    @Override
-    public boolean introspect(DataType dataType, final Operation operation) {
-        final Class javaType = dataType.getPhysical();
-        // Allow privileged access to read system properties. Requires PropertyPermission
-        // java.specification.version read in security policy.
-        final HelperContext context = AccessController.doPrivileged(new PrivilegedAction<HelperContext>() {
-            public HelperContext run() {
-                return SDOContextHelper.getHelperContext(operation);
-            }
-        });
-
-        Type type = context.getTypeHelper().getType(javaType);
-        if (type == null) {
-            // FIXME: Need a better to test dynamic SDO
-            if (DataObject.class.isAssignableFrom(javaType)) {
-                // Dynamic SDO
-                dataType.setDataBinding(getName());
-                if (dataType.getLogical() == null) {
-                    dataType.setLogical(XMLType.UNKNOWN);
-                }
-                return true;
-            }
-            return false;
-        } 
-        if (type.isDataType()) {
-            // FIXME: Ignore simple types?
-            return false;
-        }
-
-        // Found a SDO type, replace the default context with a private one
-        AccessController.doPrivileged(new PrivilegedAction<Object>() {
-            public Object run() {
-                if (context == SDOContextHelper.getDefaultHelperContext()) {
-                    HelperContext newContext = SDOUtil.createHelperContext();
-                    SDOContextHelper.register(newContext, javaType);
-                    if (operation != null) {
-                        operation.getInputType().setMetaData(HelperContext.class, newContext);
-                    }
-                }
-                return null;
-            }
-        });
-
-        String namespace = type.getURI();
-        String name = context.getXSDHelper().getLocalName(type);
-        QName xmlType = new QName(namespace, name);
-        dataType.setDataBinding(getName());
-        QName elementName = null;
-        Object logical = dataType.getLogical();
-        if (logical instanceof XMLType) {
-            elementName = ((XMLType)logical).getElementName();
-        }
-        dataType.setLogical(new XMLType(elementName, xmlType));
-
-        return true;
-    }
-
-    @Override
-    public WrapperHandler getWrapperHandler() {
-        return wrapperHandler;
-    }
-
-    @Override
-    public XMLTypeHelper getXMLTypeHelper() {
-        // return new SDOTypeHelper();
-        return xmlTypeHelper;
-    }
-
-    @Override
-    public Object copy(Object arg, DataType dataType, Operation operation) {
-        HelperContext context = SDOContextHelper.getHelperContext(operation);
-        CopyHelper copyHelper = context.getCopyHelper();
-        if (arg instanceof XMLDocument) {
-            XMLDocument document = (XMLDocument)arg;
-            DataObject dataObject = copyHelper.copy(document.getRootObject());
-            return context.getXMLHelper().createDocument(dataObject,
-                                                         document.getRootElementURI(),
-                                                         document.getRootElementName());
-        } else if (arg instanceof DataObject) {
-            return context.getCopyHelper().copy((DataObject)arg);
-        } else {
-            return super.copy(arg, dataType, operation);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
deleted file mode 100644
index c83ec53b01..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.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 org.apache.tuscany.sca.databinding.sdo;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sdo.api.SDOUtil;
-
-import commonj.sdo.Type;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
-
-/**
- * SDO Java/XML mapping for simple XSD types
- *
- * @version $Rev$ $Date$
- */
-public class SDOSimpleTypeMapper implements SimpleTypeMapper {
-    public static final String URI_2001_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
-
-    public SDOSimpleTypeMapper() {
-        super();
-    }
-
-    public Object toJavaObject(QName typeName, String value, TransformationContext context) {
-        Type type = null;
-        if (URI_2001_SCHEMA_XSD.equals(typeName.getNamespaceURI())) {
-            type = SDOUtil.getXSDSDOType(typeName.getLocalPart());
-        } else {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, false);
-            TypeHelper typeHelper = helperContext.getTypeHelper();
-            type = typeHelper.getType(typeName.getNamespaceURI(), typeName.getLocalPart());
-        }
-        return SDOUtil.createFromString(type, value);
-    }
-
-    public String toXMLLiteral(QName typeName, Object obj, TransformationContext context) {
-        Type type = null;
-        if (URI_2001_SCHEMA_XSD.equals(typeName.getNamespaceURI())) {
-            type = SDOUtil.getXSDSDOType(typeName.getLocalPart());
-        } else {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, true);
-            TypeHelper typeHelper = helperContext.getTypeHelper();
-            type = typeHelper.getType(typeName.getNamespaceURI(), typeName.getLocalPart());
-        }
-        return SDOUtil.convertToString(type, obj);
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
deleted file mode 100644
index 0927f87f3b..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
+++ /dev/null
@@ -1,235 +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.databinding.sdo;
-
-import java.beans.Introspector;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.databinding.XMLTypeHelper;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.bootstrap.DOMImplementationRegistry;
-import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSInput;
-import org.w3c.dom.ls.LSParser;
-
-import commonj.sdo.Type;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XSDHelper;
-
-public class SDOTypeHelper implements XMLTypeHelper {
-    private static final String SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
-
-    private TypeHelper typeHelper;
-    private XSDHelper xsdHelper;
-    // private Map<String, List<Type>> xsdTypesMap = new HashMap<String, List<Type>>();
-    // private Map<String, List<Type>> typesMap = new HashMap<String, List<Type>>();
-
-    public SDOTypeHelper() {
-        super();
-        typeHelper = SDOContextHelper.getDefaultHelperContext().getTypeHelper();
-        xsdHelper = SDOContextHelper.getDefaultHelperContext().getXSDHelper();
-    }
-
-    public TypeInfo getTypeInfo(Class javaType, Object logical) {
-        QName xmlType = JavaXMLMapper.getXMLType(javaType);
-        if (xmlType != null) {
-            return new TypeInfo(xmlType, true, null);
-        } else {
-            // introspect(javaType, xsdTypesMap, typesMap);
-            if (logical instanceof XMLType) {
-                xmlType = ((XMLType)logical).getTypeName();
-            }
-            if (xmlType == null) {
-                xmlType =
-                    new QName(JavaXMLMapper.getNamespace(javaType), Introspector.decapitalize(javaType.getSimpleName()));
-            }
-            return new TypeInfo(xmlType, false, null);
-        }
-    }
-
-    private void introspect(Class javaType, Map<String, List<Type>> xsdTypesMap, Map<String, List<Type>> typesMap) {
-        Type type = typeHelper.getType(javaType);
-        if (type == null) {
-            return;
-        }
-        if (xsdHelper.isXSD(type)) {
-            addToMap(xsdTypesMap, type);
-        } else {
-            addToMap(typesMap, type);
-        }
-    }
-
-    private void addToMap(Map<String, List<Type>> map, Type type) {
-        List<Type> types = map.get(type.getURI());
-        if (types == null) {
-            types = new ArrayList<Type>();
-            map.put(type.getURI(), types);
-        }
-        if (!types.contains(type)) {
-            types.add(type);
-        }
-    }
-
-    /*
-    public List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver) {
-        List<XSDefinition> definitions = new ArrayList<XSDefinition>();
-        generateSDOSchemas(definitions, factory, typesMap);
-        addResolvedXSDs(definitions, factory, resolver, xsdTypesMap);
-        return definitions;
-    }
-    */
-
-    private void generateSDOSchemas(List<XSDefinition> definitions, XSDFactory factory, Map<String, List<Type>> map) {
-        for (Map.Entry<String, List<Type>> entry : map.entrySet()) {
-            List<Type> types = entry.getValue();
-            String ns = entry.getKey();
-            generateSchema(definitions, factory, types, ns);
-        }
-    }
-
-    private void generateSchema(List<XSDefinition> definitions, XSDFactory factory, List<Type> types, String ns) {
-        String schema = xsdHelper.generate(types);
-        DOMImplementationRegistry registry = null;
-        try {
-            registry = DOMImplementationRegistry.newInstance();
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-        DOMImplementation impl = registry.getDOMImplementation("XML 3.0");
-        DOMImplementationLS ls = (DOMImplementationLS)impl.getFeature("LS", "3.0");
-        LSParser parser = ls.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, SCHEMA_NS);
-        LSInput input = ls.createLSInput();
-        input.setCharacterStream(new StringReader(schema));
-        Document document = parser.parse(input);
-        XSDefinition definition = factory.createXSDefinition();
-        definition.setUnresolved(true);
-        definition.setDocument(document);
-        definition.setNamespace(ns);
-        definitions.add(definition);
-    }
-
-    private void addResolvedXSDs(List<XSDefinition> definitions,
-                                 XSDFactory factory,
-                                 ModelResolver resolver,
-                                 Map<String, List<Type>> map) {
-        for (Map.Entry<String, List<Type>> entry : map.entrySet()) {
-            XSDefinition definition = factory.createXSDefinition();
-            definition.setUnresolved(true);
-            definition.setNamespace(entry.getKey());
-            //FIXME: set location URI
-            XSDefinition resolved = resolver.resolveModel(XSDefinition.class, definition);
-            if (resolved.getSchema() == null) {
-                //FIXME: create a checked exception and propagate it back up to the activator
-                throw new RuntimeException("No XSD found for namespace " + entry.getKey());
-            }
-            // make sure all the required types are defined in the resolved schema
-            for (Type type : entry.getValue()) {
-                String name = xsdHelper.getLocalName(type);
-                QName typeName = null;
-                if (name.endsWith("_._type")) {
-                    // FIXME: Anonymous tyype
-                    name = name.substring(0, name.length() - "_._type".length());
-                    typeName = new QName(type.getURI(), name);
-                    if (resolved.getXmlSchemaElement(typeName) == null) {
-                        //FIXME: create a checked exception and propagate it back up to the activator
-                        throw new RuntimeException("No XSD found for " + typeName.toString());
-                    }
-                } else {
-                    typeName = new QName(type.getURI(), name);
-                    if (resolved.getXmlSchemaType(typeName) == null) {
-                        //FIXME: create a checked exception and propagate it back up to the activator
-                        throw new RuntimeException("No XSD found for " + typeName.toString());
-                    }
-                }
-
-            }
-            definitions.add(resolved);
-        }
-    }
-
-    private static List<DataType> getDataTypes(Interface intf) {
-        List<DataType> dataTypes = new ArrayList<DataType>();
-        for (Operation op : intf.getOperations()) {
-            WrapperInfo wrapper = op.getWrapper();
-            if (wrapper != null) {
-                DataType dt1 = wrapper.getInputWrapperType();
-                if (dt1 != null) {
-                    dataTypes.add(dt1);
-                }
-                DataType dt2 = wrapper.getOutputWrapperType();
-                if (dt2 != null) {
-                    dataTypes.add(dt2);
-                }
-            } else {
-                for (DataType dt1 : op.getInputType().getLogical()) {
-                    dataTypes.add(dt1);
-                }
-                DataType dt2 = op.getOutputType();
-                if (dt2 != null) {
-                    dataTypes.add(dt2);
-                }
-                for (DataType<DataType> dt3 : op.getFaultTypes()) {
-                    DataType dt4 = dt3.getLogical();
-                    if (dt4 != null) {
-                        dataTypes.add(dt4);
-                    }
-                }
-            }
-        }
-        return dataTypes;
-    }
-
-    public List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver, Interface intf) {
-        return getSchemaDefinitions(factory, resolver, getDataTypes(intf));
-    }
-
-    public List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver, List<DataType> dataTypes) {
-        Map<String, List<Type>> xsdTypesMap = new HashMap<String, List<Type>>();
-        Map<String, List<Type>> typesMap = new HashMap<String, List<Type>>();
-        for (DataType d : dataTypes) {
-            if (SDODataBinding.NAME.equals(d.getDataBinding())) {
-                introspect(d.getPhysical(), xsdTypesMap, typesMap);
-            }
-        }
-        List<XSDefinition> definitions = new ArrayList<XSDefinition>();
-        generateSDOSchemas(definitions, factory, typesMap);
-        addResolvedXSDs(definitions, factory, resolver, xsdTypesMap);
-        return definitions;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
deleted file mode 100644
index 8a1cd666d8..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
+++ /dev/null
@@ -1,177 +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.databinding.sdo;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.WrapperHandler;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.ElementInfo;
-import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-import commonj.sdo.helper.DataFactory;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XSDHelper;
-
-/**
- * SDO Wrapper Handler
- *
- * @version $Rev$ $Date$
- */
-public class SDOWrapperHandler implements WrapperHandler<Object> {
-
-    public Object create(Operation operation, boolean input) {
-        WrapperInfo wrapperInfo = operation.getWrapper();
-        ElementInfo element = input ? wrapperInfo.getInputWrapperElement() : wrapperInfo.getOutputWrapperElement();
-        // Class<?> wrapperClass = input ? wrapperInfo.getInputWrapperClass() : wrapperInfo.getOutputWrapperClass();
-        HelperContext helperContext = SDOContextHelper.getHelperContext(operation);
-        Type sdoType = getSDOType(helperContext, element);
-        if (sdoType != null) {
-            DataFactory dataFactory = helperContext.getDataFactory();
-            return dataFactory.create(sdoType);
-        }
-        return null;
-    }
-
-    public void setChildren(Object wrapper, Object[] childObjects, Operation operation, boolean input) {
-        List<ElementInfo> childElements =
-            input ? operation.getWrapper().getInputChildElements() : operation.getWrapper().getOutputChildElements();
-        for (int i = 0; i < childElements.size(); i++) {
-            setChild(wrapper, i, childElements.get(i), childObjects[i]);
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.WrapperHandler#setChild(java.lang.Object, int, ElementInfo,
-     *      java.lang.Object)
-     */
-    public void setChild(Object wrapper, int i, ElementInfo childElement, Object value) {
-        DataObject wrapperDO =
-            (wrapper instanceof XMLDocument) ? ((XMLDocument)wrapper).getRootObject() : (DataObject)wrapper;
-        String name = childElement.getQName().getLocalPart();
-        if (childElement.isMany()) {
-            // FIXME: If we look up by name, we need to make sure the WrapperInfo has the correct element names
-            wrapperDO.getList(i).addAll((Collection)value);
-        } else {
-            wrapperDO.set(i, value);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public List getChildren(Object wrapper, Operation operation, boolean input) {
-        DataObject wrapperDO =
-            (wrapper instanceof XMLDocument) ? ((XMLDocument)wrapper).getRootObject() : (DataObject)wrapper;
-        List<Property> properties = wrapperDO.getInstanceProperties();
-        List<Object> elements = new ArrayList<Object>();
-        Type type = wrapperDO.getType();
-        if (type.isSequenced()) {
-            // Add values in the sequence
-            Sequence sequence = wrapperDO.getSequence();
-            for (int i = 0; i < sequence.size(); i++) {
-                // Skip mixed text
-                if (sequence.getProperty(i) != null) {
-                    elements.add(sequence.getValue(i));
-                }
-            }
-        } else {
-            for (Property p : properties) {
-                Object child = wrapperDO.get(p);
-                if (p.isMany()) {
-                    for (Object c : (Collection<?>)child) {
-                        elements.add(c);
-                    }
-                } else {
-                    elements.add(child);
-                }
-            }
-        }
-        return elements;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.WrapperHandler#getWrapperType(Operation, boolean)
-     */
-    public DataType getWrapperType(Operation operation, boolean input) {
-        WrapperInfo wrapper = operation.getWrapper();
-        ElementInfo element = input ? wrapper.getInputWrapperElement() : wrapper.getOutputWrapperElement();
-        HelperContext helperContext = SDOContextHelper.getHelperContext(operation);
-        Type sdoType = getSDOType(helperContext, element);
-        if (sdoType != null) {
-            // Check if child elements matches
-            Class physical = sdoType.getInstanceClass();
-            DataType<XMLType> wrapperType =
-                new DataTypeImpl<XMLType>(SDODataBinding.NAME, physical, new XMLType(element));
-            return wrapperType;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @param helperContext
-     * @param element
-     * @return
-     */
-    private Type getSDOType(HelperContext helperContext, ElementInfo element) {
-        XSDHelper xsdHelper = helperContext.getXSDHelper();
-        Type sdoType = null;
-        Property prop =
-            xsdHelper.getGlobalProperty(element.getQName().getNamespaceURI(), element.getQName().getLocalPart(), true);
-        if (prop != null) {
-            sdoType = prop.getType();
-        } else {
-            TypeInfo type = element.getType();
-            QName typeName = type != null ? type.getQName() : null;
-            if (typeName != null) {
-                sdoType = helperContext.getTypeHelper().getType(typeName.getNamespaceURI(), typeName.getLocalPart());
-            }
-        }
-        return sdoType;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.WrapperHandler#isInstance(java.lang.Object, Operation, boolean)
-     */
-    public boolean isInstance(Object wrapper, Operation operation, boolean input) {
-        WrapperInfo wrapperInfo = operation.getWrapper();
-        ElementInfo element = input ? wrapperInfo.getInputWrapperElement() : wrapperInfo.getOutputWrapperElement();
-        //        List<ElementInfo> childElements =
-        //            input ? wrapperInfo.getInputChildElements() : wrapperInfo.getOutputChildElements();
-        HelperContext helperContext = SDOContextHelper.getHelperContext(operation);
-        Type sdoType = getSDOType(helperContext, element);
-        if (sdoType != null) {
-            return sdoType.isInstance(wrapper);
-        }
-        return false;
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
deleted file mode 100644
index 7ac423f8d8..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
+++ /dev/null
@@ -1,61 +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.databinding.sdo;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLHelper;
-
-public class String2DataObject extends BaseTransformer<String, DataObject> implements
-    PullTransformer<String, DataObject> {
-
-    public DataObject transform(String source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, false);
-            XMLHelper xmlHelper = helperContext.getXMLHelper();
-            return xmlHelper.load(source).getRootObject();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<String> getSourceType() {
-        return String.class;
-    }
-
-    @Override
-    protected Class<DataObject> getTargetType() {
-        return DataObject.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 50;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
deleted file mode 100644
index 4e5aa1d5fd..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
+++ /dev/null
@@ -1,65 +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.databinding.sdo;
-
-import java.io.StringWriter;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-
-public class XMLDocument2String extends BaseTransformer<XMLDocument, String> implements
-    PullTransformer<XMLDocument, String> {
-
-    public String transform(XMLDocument source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, true);
-            XMLHelper xmlHelper = helperContext.getXMLHelper();
-            StringWriter writer = new StringWriter();
-            xmlHelper.save(source, writer, null);
-            return writer.toString();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<XMLDocument> getSourceType() {
-        return XMLDocument.class;
-    }
-
-    @Override
-    protected Class<String> getTargetType() {
-        return String.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
deleted file mode 100644
index e70fa08477..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
+++ /dev/null
@@ -1,69 +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.databinding.sdo;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.api.XMLStreamHelper;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-public class XMLDocument2XMLStreamReader extends BaseTransformer<XMLDocument, XMLStreamReader> implements
-    PullTransformer<XMLDocument, XMLStreamReader> {
-    /**
-     * @param source
-     * @param context
-     * @return
-     */
-    public XMLStreamReader transform(XMLDocument source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, true);
-            XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext);
-            return streamHelper.createXMLStreamReader(source);
-        } catch (XMLStreamException e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<XMLDocument> getSourceType() {
-        return XMLDocument.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getTargetType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
deleted file mode 100644
index baf3e2e90a..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
+++ /dev/null
@@ -1,72 +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.databinding.sdo;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.api.XMLStreamHelper;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-
-public class XMLStreamReader2DataObject extends BaseTransformer<XMLStreamReader, DataObject> implements
-    PullTransformer<XMLStreamReader, DataObject> {
-
-    public DataObject transform(XMLStreamReader source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, false);
-            XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext);
-            // The XMLStreamHelper requires that the reader is positioned at
-            // START_ELEMENT
-            while (source.getEventType() != XMLStreamConstants.START_ELEMENT && source.hasNext()) {
-                source.next();
-            }
-            DataObject target = streamHelper.loadObject(source);
-            source.close();
-            return target;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<DataObject> getTargetType() {
-        return DataObject.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getSourceType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 15;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
deleted file mode 100644
index ac452910f6..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
+++ /dev/null
@@ -1,66 +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.databinding.sdo;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.api.XMLStreamHelper;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-public class XMLStreamReader2XMLDocument extends BaseTransformer<XMLStreamReader, XMLDocument> implements
-    PullTransformer<XMLStreamReader, XMLDocument> {
-
-    public XMLDocument transform(XMLStreamReader source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, false);
-            XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext);
-            XMLDocument target = streamHelper.load(source);
-            source.close();
-            return target;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<XMLDocument> getTargetType() {
-        return XMLDocument.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getSourceType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 15;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index ffe8b895b8..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,18 +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. 
-
-org.apache.tuscany.sca.databinding.sdo.ImportSDOProcessor;qname=http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0#import.sdo,model=org.apache.tuscany.sca.databinding.sdo.ImportSDO
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
deleted file mode 100644
index 5ae557cc74..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ /dev/null
@@ -1,19 +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.
-
-# implementation classes for the databindings
-org.apache.tuscany.sca.databinding.sdo.SDODataBinding;name=commonj.sdo.DataObject
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index b1916fd32a..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /dev/null
@@ -1,27 +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.
-
-# Implementation classes for the transformers
-org.apache.tuscany.sca.databinding.sdo.DataObject2String;source=commonj.sdo.DataObject,target=java.lang.String,weight=510
-org.apache.tuscany.sca.databinding.sdo.DataObject2XMLStreamReader;source=commonj.sdo.DataObject,target=javax.xml.stream.XMLStreamReader,weight=490
-org.apache.tuscany.sca.databinding.sdo.XMLDocument2String;source=commonj.sdo.helper.XMLDocument,target=java.lang.String,weight=510
-org.apache.tuscany.sca.databinding.sdo.String2DataObject;source=java.lang.String,target=commonj.sdo.DataObject,weight=500
-org.apache.tuscany.sca.databinding.sdo.XMLDocument2XMLStreamReader;source=commonj.sdo.helper.XMLDocument,target=javax.xml.stream.XMLStreamReader,weight=490
-org.apache.tuscany.sca.databinding.sdo.XMLStreamReader2DataObject;source=javax.xml.stream.XMLStreamReader,target=commonj.sdo.DataObject,weight=490
-org.apache.tuscany.sca.databinding.sdo.XMLStreamReader2XMLDocument;source=javax.xml.stream.XMLStreamReader,target=commonj.sdo.helper.XMLDocument,weight=490
-org.apache.tuscany.sca.databinding.sdo.DataObject2Node;source=commonj.sdo.DataObject,target=org.w3c.dom.Node,weight=500
-org.apache.tuscany.sca.databinding.sdo.Node2DataObject;source=org.w3c.dom.Node,target=commonj.sdo.DataObject,weight=500
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties b/java/sca-contrib/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
deleted file mode 100644
index f53f08f377..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
+++ /dev/null
@@ -1,23 +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.
-#
-#
-FailToResolveClass = Fail to resolve class: {0}
-FailToResolveLocation = Fail to resolve location: {0}
-ContributionResolveException = ContributionResolveException occured due to:
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/java/sca-contrib/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
deleted file mode 100644
index 5a0208b290..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
+++ /dev/null
@@ -1,70 +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 com.example.stock.sdo.fault;
-
-import javax.xml.namespace.QName;
-
-import com.example.stock.sdo.InvalidSymbolFault;
-
-/**
- * Hand-crafted java exception for SDO fault
- *
- * @version $Rev$ $Date$
- */
-public class InvalidSymbolFault_Exception extends Exception {
-    private static final long serialVersionUID = 8602157311925253920L;
-    
-    /**
-     * Generated QName for the fault element
-     */
-    public static final QName FAULT_ELEMENT = new QName("http://www.example.com/stock", "InvalidSymbolFault");
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     */
-    private InvalidSymbolFault faultInfo;
-
-    /**
-     * @param faultInfo
-     * @param message
-     */
-    public InvalidSymbolFault_Exception(String message, InvalidSymbolFault faultInfo) {
-        super(message);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * @param faultInfo
-     * @param message
-     * @param cause
-     */
-    public InvalidSymbolFault_Exception(String message, InvalidSymbolFault faultInfo, Throwable cause) {
-        super(message, cause);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * @return returns fault bean:
-     *         org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault
-     */
-    public InvalidSymbolFault getFaultInfo() {
-        return faultInfo;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java b/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
deleted file mode 100644
index 4bc41a5541..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
+++ /dev/null
@@ -1,60 +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.databinding.sdo;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import com.example.ipo.sdo.PurchaseOrderType;
-import commonj.sdo.DataObject;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DataObject2NodeTestCase extends SDOTransformerTestCaseBase {
-    @Override
-    protected DataType<?> getSourceDataType() {
-        return new DataTypeImpl<XMLType>(binding, PurchaseOrderType.class, new XMLType(ORDER_QNAME, null));
-    }
-
-    @Override
-    protected DataType<?> getTargetDataType() {
-        return new DataTypeImpl<Class<String>>(String.class, String.class);
-    }
-
-    public final void testTransform() {
-        Node node = new DataObject2Node().transform(dataObject, context);
-        Assert.assertNotNull(node);
-        Element element = (Element) node;
-        Assert.assertEquals(ORDER_QNAME.getNamespaceURI(), element.getNamespaceURI());
-        Assert.assertEquals(ORDER_QNAME.getLocalPart(), element.getLocalName());
-        DataObject po = new Node2DataObject().transform(node, reversedContext);
-        Assert.assertTrue(po instanceof PurchaseOrderType);
-        PurchaseOrderType orderType = (PurchaseOrderType)po;
-        Assert.assertEquals("San Jose", orderType.getBillTo().getCity());
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
deleted file mode 100644
index 44d11cd586..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
+++ /dev/null
@@ -1,65 +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.databinding.sdo;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-import com.example.ipo.sdo.PurchaseOrderType;
-import commonj.sdo.DataObject;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DataObject2StringTestCase extends SDOTransformerTestCaseBase {
-    @Override
-    protected DataType<?> getSourceDataType() {
-        return new DataTypeImpl<XMLType>(binding, PurchaseOrderType.class, new XMLType(ORDER_QNAME, null));
-    }
-
-    @Override
-    protected DataType<?> getTargetDataType() {
-        return new DataTypeImpl<Class<String>>(String.class, String.class);
-    }
-
-    public final void testTransform() {
-        String xml = new DataObject2String().transform(dataObject, context);
-        Assert.assertTrue(xml.indexOf("<city>San Jose</city>") != -1);
-        DataObject po = new String2DataObject().transform(xml, reversedContext);
-        Assert.assertTrue(po instanceof PurchaseOrderType);
-        PurchaseOrderType orderType = (PurchaseOrderType)po;
-        Assert.assertEquals("San Jose", orderType.getBillTo().getCity());
-    }
-
-    public final void testXML() {
-        String xml =
-            "<foo xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " 
-            + "xmlns:ipo=\"http://www.example.com/IPO\" xsi:type=\"ipo:USAddress\"/>";
-        DataObject dataObject = new String2DataObject().transform(xml, reversedContext);
-        context.setSourceDataType(new DataTypeImpl<XMLType>(DataObject.class.getName(), DataObject.class, null));
-        xml = new DataObject2String().transform(dataObject, context);
-        Assert.assertTrue(xml.contains("xsi:type=\"ipo:USAddress\""));
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
deleted file mode 100644
index 6a82a7fb18..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.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.databinding.sdo;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.xml.Node2String;
-import org.apache.tuscany.sca.databinding.xml.XMLStreamReader2Node;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-import com.example.ipo.sdo.PurchaseOrderType;
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.EqualityHelper;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DataObject2XMLStreamReaderTestCase extends SDOTransformerTestCaseBase {
-
-    @Override
-    protected DataType<?> getSourceDataType() {
-        return new DataTypeImpl<XMLType>(binding, PurchaseOrderType.class, new XMLType(ORDER_QNAME, null));
-    }
-
-    @Override
-    protected DataType<?> getTargetDataType() {
-        return new DataTypeImpl<Class<XMLStreamReader>>(XMLStreamReader.class, XMLStreamReader.class);
-    }
-
-    public final void testTransform() throws XMLStreamException {
-        XMLStreamReader reader = new DataObject2XMLStreamReader().transform(dataObject, context);
-        while (reader.hasNext()) {
-            int event = reader.next();
-            if (event == XMLStreamConstants.START_ELEMENT) {
-                break;
-            }
-        }
-        DataObject d = new XMLStreamReader2DataObject().transform(reader, reversedContext);
-        assertNotNull(d);
-        assertTrue(EqualityHelper.INSTANCE.equal(dataObject, d));
-    }
-    
-    public final void testTransform1() throws XMLStreamException {
-        XMLStreamReader reader = new DataObject2XMLStreamReader().transform(dataObject, context);
-        XMLStreamReader2Node t2 = new XMLStreamReader2Node();
-        org.w3c.dom.Node node = t2.transform(reader, context);
-        assertNotNull(node);
-        Node2String t3 = new Node2String();
-        String xml = t3.transform(node, context);
-        assertTrue(xml.contains("xmlns:xsi"));
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
deleted file mode 100644
index 26c0f3ecb6..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
+++ /dev/null
@@ -1,90 +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.databinding.sdo;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.DefaultFactoryExtensionPoint;
-
-import com.example.ipo.sdo.SdoFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ImportSDOProcessorTestCase extends TestCase {
-    private static boolean inited;
-
-    private ImportSDOProcessor loader;
-    private XMLInputFactory xmlFactory;
-
-    public void testMinimal() throws Exception {
-        String xml = "<import.sdo xmlns='http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0'/>";
-        XMLStreamReader reader = getReader(xml);
-        assertTrue(loader.read(reader) instanceof ImportSDO);
-    }
-
-    public void testLocation() throws Exception {
-        String xml = "<import.sdo xmlns='http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0' location='ipo.xsd'/>";
-        XMLStreamReader reader = getReader(xml);
-        assertTrue(loader.read(reader) instanceof ImportSDO);
-    }
-
-    public void testFactory() throws Exception {
-        String xml = "<import.sdo xmlns='http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0' " + "factory='"
-                     + MockFactory.class.getName()
-                     + "'/>";
-        XMLStreamReader reader = getReader(xml);
-        assertFalse(inited);
-        ImportSDO importSDO = loader.read(reader);
-        assertNotNull(importSDO);
-        ModelResolver resolver = new TestModelResolver();
-        resolver.addModel(new ClassReference(MockFactory.class));
-        loader.resolve(importSDO, resolver);
-        assertTrue(inited);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        loader = new ImportSDOProcessor(new DefaultFactoryExtensionPoint(new DefaultExtensionPointRegistry()), null);
-        xmlFactory = XMLInputFactory.newInstance();
-    }
-
-    protected XMLStreamReader getReader(String xml) throws XMLStreamException {
-        XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(xml));
-        reader.next();
-        return reader;
-    }
-
-    public static class MockFactory {
-        public static final Object INSTANCE = SdoFactory.INSTANCE;
-
-        static {
-            ImportSDOProcessorTestCase.inited = true;
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java b/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
deleted file mode 100644
index e0d1c9bf12..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.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 org.apache.tuscany.sca.databinding.sdo;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.junit.Test;
-
-import commonj.sdo.Type;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XSDHelper;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SDOContextHelperTestCase {
-    @Test
-    public void testGenerateSchema() throws IOException {
-        HelperContext context = SDOUtil.createHelperContext();
-        URL url = getClass().getResource("/ipo.xsd");
-        Assert.assertNotNull(url);
-        InputStream is = url.openStream();
-        XSDHelper xsdHelper = context.getXSDHelper();
-        xsdHelper.define(is, url.toExternalForm());
-        TypeHelper typeHelper = context.getTypeHelper();
-        Type type = typeHelper.getType("http://www.example.com/IPO", "PurchaseOrderType");
-        Assert.assertNotNull(type);
-        /*
-        SDOContextHelper.generateSchema(context, Arrays.asList(type));
-        */
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
deleted file mode 100644
index 3c21b56c9f..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
+++ /dev/null
@@ -1,114 +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.databinding.sdo;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-import com.example.ipo.sdo.PurchaseOrderType;
-import com.example.ipo.sdo.SdoFactory;
-import com.example.ipo.sdo.USAddress;
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class SDODataBindingTestCase extends TestCase {
-    protected static final QName ORDER_QNAME = new QName("http://www.example.com/IPO", "purchaseOrder");
-    private SDODataBinding binding;
-    private HelperContext context;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        binding = new SDODataBinding();
-        context = HelperProvider.getDefaultContext();
-        SdoFactory.INSTANCE.register(context);
-    }
-
-    public final void testIntrospect() {
-        Operation op = null;
-        DataType dataType = new DataTypeImpl<Class>(DataObject.class, null);
-        boolean yes = binding.introspect(dataType, op);
-        assertTrue(yes);
-        assertTrue(dataType.getDataBinding().equals(binding.getName()));
-        assertTrue(dataType.getPhysical() == DataObject.class && dataType.getLogical() == XMLType.UNKNOWN);
-        dataType = new DataTypeImpl<Class>(PurchaseOrderType.class, null);
-        yes = binding.introspect(dataType, op);
-        assertTrue(yes);
-        assertEquals(PurchaseOrderType.class, dataType.getPhysical());
-        assertEquals(new QName("http://www.example.com/IPO", "PurchaseOrderType"), ((XMLType)dataType.getLogical())
-            .getTypeName());
-        dataType = new DataTypeImpl<Class>(USAddress.class, null);
-        yes = binding.introspect(dataType, op);
-        assertTrue(yes);
-        assertEquals(USAddress.class, dataType.getPhysical());
-        assertEquals(new QName("http://www.example.com/IPO", "USAddress"), ((XMLType)dataType.getLogical())
-            .getTypeName());
-    }
-
-    public final void testCopyRoot() {
-        PurchaseOrderType po = SdoFactory.INSTANCE.createPurchaseOrderType();
-        po.setComment("Comment");
-        Object copy = binding.copy(po, null, null);
-        assertTrue(copy instanceof PurchaseOrderType);
-        assertTrue(po != copy);
-        assertTrue(context.getEqualityHelper().equal((DataObject)po, (DataObject)copy));
-        assertEquals("Comment", ((PurchaseOrderType)copy).getComment());
-    }
-
-    public final void testCopyNonRoot() {
-        USAddress address = SdoFactory.INSTANCE.createUSAddress();
-        address.setCity("San Jose");
-        Object copy = binding.copy(address, null, null);
-        assertTrue(copy instanceof USAddress);
-        assertTrue(address != copy);
-        assertTrue(context.getEqualityHelper().equal((DataObject)address, (DataObject)copy));
-        assertEquals("San Jose", ((USAddress)copy).getCity());
-    }
-
-    public final void testCopyXMLDocument() {
-        PurchaseOrderType po = SdoFactory.INSTANCE.createPurchaseOrderType();
-        po.setComment("Comment");
-        XMLDocument doc =
-            context.getXMLHelper().createDocument((DataObject)po,
-                                                  ORDER_QNAME.getNamespaceURI(),
-                                                  ORDER_QNAME.getLocalPart());
-        Object copy = binding.copy(doc, null, null);
-        assertTrue(copy instanceof XMLDocument);
-        XMLDocument docCopy = (XMLDocument)copy;
-        assertTrue(doc != copy);
-        assertTrue(context.getEqualityHelper().equal((DataObject)po, docCopy.getRootObject()));
-        assertEquals("Comment", ((PurchaseOrderType)docCopy.getRootObject()).getComment());
-    }
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
deleted file mode 100644
index 2aaae3c6d8..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
+++ /dev/null
@@ -1,82 +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.databinding.sdo;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl;
-import org.apache.tuscany.sca.interfacedef.DataType;
-
-import com.example.ipo.sdo.PurchaseOrderType;
-import com.example.ipo.sdo.SdoFactory;
-import com.example.ipo.sdo.USAddress;
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * The base class for SDO-related test cases
- *
- * @version $Rev$ $Date$
- */
-public abstract class SDOTransformerTestCaseBase extends TestCase {
-    protected static final QName ORDER_QNAME = new QName("http://www.example.com/IPO", "purchaseOrder");
-
-    protected HelperContext helperContext;
-    protected String binding = DataObject.class.getName();
-    protected TransformationContext context;
-    protected TransformationContext reversedContext; 
-    protected DataObject dataObject;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        helperContext = HelperProvider.getDefaultContext();
-        SdoFactory.INSTANCE.register(helperContext);
-        
-        context = new TransformationContextImpl();
-        context.setSourceDataType(getSourceDataType());
-        context.setTargetDataType(getTargetDataType());
-
-        reversedContext = new TransformationContextImpl();
-        reversedContext.setSourceDataType(getTargetDataType());
-        reversedContext.setTargetDataType(getSourceDataType());
-        
-        PurchaseOrderType po = SdoFactory.INSTANCE.createPurchaseOrderType();
-        USAddress address = SdoFactory.INSTANCE.createUSAddress();
-        address.setCity("San Jose");
-        address.setStreet("123 ABC St");
-        address.setState("CA");
-        address.setStreet("95131");
-        po.setBillTo(address);
-        dataObject = (DataObject) po;
-    }
-
-    protected abstract DataType<?> getSourceDataType();
-
-    protected abstract DataType<?> getTargetDataType();
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
deleted file mode 100644
index 11d8495de8..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
+++ /dev/null
@@ -1,83 +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.databinding.sdo;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.sca.interfacedef.util.ElementInfo;
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-import org.apache.tuscany.sdo.api.SDOUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SDOWrapperHandlerTestCase extends TestCase {
-    private HelperContext context;
-    private SDOWrapperHandler handler;
-
-    @Override
-    public void setUp() throws Exception {
-        context = SDOUtil.createHelperContext();
-        handler = new SDOWrapperHandler();
-    }
-
-    public void testWrapperAnyType() throws Exception {
-        XMLHelper xmlHelper = context.getXMLHelper();
-        XMLDocument document = xmlHelper.load(getClass().getResourceAsStream("/wrapper.xml"));
-        Operation op = new OperationImpl();
-        List children = handler.getChildren(document, op, true);
-        assertEquals(5, children.size());
-    }
-
-    public void testWrapper() throws Exception {
-        XSDHelper xsdHelper = context.getXSDHelper();
-        xsdHelper.define(getClass().getResourceAsStream("/wrapper.xsd"), null);
-        XMLHelper xmlHelper = context.getXMLHelper();
-        XMLDocument document = xmlHelper.load(getClass().getResourceAsStream("/wrapper.xml"));
-        Operation op = new OperationImpl();
-        List children = handler.getChildren(document, op, true);
-        assertEquals(5, children.size());
-    }
-    
-    public void testCreate() {
-        HelperContext context = HelperProvider.getDefaultContext();
-        XSDHelper xsdHelper = context.getXSDHelper();
-        xsdHelper.define(getClass().getResourceAsStream("/wrapper.xsd"), null);
-        ElementInfo element = new ElementInfo(new QName("http://www.example.com/wrapper", "op"), null);
-        Operation op = new OperationImpl();
-        WrapperInfo wrapperInfo = new WrapperInfo(SDODataBinding.NAME, element, null, null, null);
-        op.setWrapper(wrapperInfo);
-        DataObject wrapper = (DataObject) handler.create(op, true);
-        assertNotNull(wrapper);
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
deleted file mode 100644
index ce04f5be3f..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
+++ /dev/null
@@ -1,63 +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.databinding.sdo;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-
-/**
- * A default implementation of an artifact resolver, based on a map.
- *
- * @version $Rev$ $Date$
- */
-public class TestModelResolver implements ModelResolver {
-    private static final long serialVersionUID = -7826976465762296634L;
-    
-    private Map<Object, Object> map = new HashMap<Object, Object>();
-    
-    public TestModelResolver() {
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        Object resolved = map.get(unresolved);
-        if (resolved != null) {
-            
-            // Return the resolved object
-            return modelClass.cast(resolved);
-            
-        } else {
-            
-            // Return the unresolved object
-            return unresolved;
-        }
-    }
-    
-    public void addModel(Object resolved) {
-        map.put(resolved, resolved);
-    }
-    
-    public Object removeModel(Object resolved) {
-        return map.remove(resolved);
-    }
-    
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
deleted file mode 100644
index 114c568c38..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
+++ /dev/null
@@ -1,62 +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.databinding.sdo;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-import com.example.ipo.sdo.PurchaseOrderType;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class XMLDocument2XMLStreamReaderTestCase extends SDOTransformerTestCaseBase {
-
-    @Override
-    protected DataType<?> getSourceDataType() {
-        return new DataTypeImpl<XMLType>(XMLDocument.class.getName(), XMLDocument.class, new XMLType(ORDER_QNAME, null));
-    }
-
-    @Override
-    protected DataType<?> getTargetDataType() {
-        return new DataTypeImpl<Class<XMLStreamReader>>(XMLStreamReader.class, XMLStreamReader.class);
-    }
-
-    public final void testTransform() throws XMLStreamException {
-        XMLDocument document =
-            helperContext.getXMLHelper().createDocument(dataObject,
-                                                        ORDER_QNAME.getNamespaceURI(),
-                                                        ORDER_QNAME.getLocalPart());
-        XMLStreamReader reader = new XMLDocument2XMLStreamReader().transform(document, context);
-        XMLDocument document2 = new XMLStreamReader2XMLDocument().transform(reader, reversedContext);
-        Assert.assertEquals(ORDER_QNAME.getNamespaceURI(), document2.getRootElementURI());
-        Assert.assertEquals(ORDER_QNAME.getLocalPart(), document2.getRootElementName());
-        Assert.assertTrue(document2.getRootObject() instanceof PurchaseOrderType);
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/resources/ipo.xsd b/java/sca-contrib/modules/databinding-sdo/src/test/resources/ipo.xsd
deleted file mode 100755
index 241ec15d36..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/resources/ipo.xsd
+++ /dev/null
@@ -1,136 +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.    
--->
-<schema targetNamespace="http://www.example.com/IPO"
-	xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:ipo="http://www.example.com/IPO">
-
-	<annotation>
-		<documentation xml:lang="en">
-			International Purchase order schema for Example.com
-			Copyright 2000 Example.com. All rights reserved.
-		</documentation>
-	</annotation>
-
-
-	<element name="purchaseOrder" type="ipo:PurchaseOrderType" />
-
-	<element name="comment" type="string" />
-
-	<complexType name="PurchaseOrderType">
-		<sequence>
-			<element name="shipTo" type="ipo:Address" />
-			<element name="billTo" type="ipo:Address" />
-			<element ref="ipo:comment" minOccurs="0" />
-			<element name="items" type="ipo:Items" />
-		</sequence>
-		<attribute name="orderDate" type="date" />
-	</complexType>
-
-	<complexType name="Items">
-		<sequence>
-			<element name="item" minOccurs="0" maxOccurs="unbounded">
-				<complexType>
-					<sequence>
-						<element name="productName" type="string" />
-						<element name="quantity">
-							<simpleType>
-								<restriction base="positiveInteger">
-									<maxExclusive value="100" />
-								</restriction>
-							</simpleType>
-						</element>
-						<element name="USPrice" type="decimal" />
-						<element ref="ipo:comment" minOccurs="0" />
-						<element name="shipDate" type="date"
-							minOccurs="0" />
-					</sequence>
-					<attribute name="partNum" type="ipo:SKU"
-						use="required" />
-				</complexType>
-			</element>
-		</sequence>
-	</complexType>
-
-	<simpleType name="SKU">
-		<restriction base="string">
-			<pattern value="\d{3}-[A-Z]{2}" />
-		</restriction>
-	</simpleType>
-
-	<complexType name="Address">
-		<sequence>
-			<element name="name" type="string" />
-			<element name="street" type="string" />
-			<element name="city" type="string" />
-		</sequence>
-	</complexType>
-
-	<complexType name="USAddress">
-		<complexContent>
-			<extension base="ipo:Address">
-				<sequence>
-					<element name="state" type="ipo:USState" />
-					<element name="zip" type="positiveInteger" />
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<complexType name="UKAddress">
-		<complexContent>
-			<extension base="ipo:Address">
-				<sequence>
-					<element name="postcode" type="ipo:UKPostcode" />
-				</sequence>
-				<attribute name="exportCode" type="positiveInteger"
-					fixed="1" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<!-- other Address derivations for more countries -->
-
-	<simpleType name="USState">
-		<restriction base="string">
-			<enumeration value="AK" />
-			<enumeration value="AL" />
-			<enumeration value="AR" />
-			<enumeration value="CA" />
-			<enumeration value="PA" />
-			<!-- and so on ... -->
-		</restriction>
-	</simpleType>
-
-	<simpleType name="Postcode">
-		<restriction base="string">
-			<length value="7" fixed="true" />
-		</restriction>
-	</simpleType>
-
-
-	<simpleType name="UKPostcode">
-		<restriction base="ipo:Postcode">
-			<pattern value="[A-Z]{2}\d\s\d[A-Z]{2}" />
-		</restriction>
-	</simpleType>
-
-
-
-</schema>
-
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/resources/model/sca-core.xsd b/java/sca-contrib/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
deleted file mode 100755
index 56c6977254..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
+++ /dev/null
@@ -1,233 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-		targetNamespace="http://www.osoa.org/xmlns/sca/0.9" 
-		xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
-		elementFormDefault="qualified">
-
-	<element name="componentType" type="sca:ComponentType"/>
-	<complexType name="ComponentType">
-		<sequence>
-			<element minOccurs="0" maxOccurs="unbounded" name="service" type="sca:Service"/>
-			<element minOccurs="0" maxOccurs="unbounded" name="reference" type="sca:Reference"/>
-			<element minOccurs="0" maxOccurs="unbounded" name="property" type="sca:Property"/>
-		    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<complexType name="Service">
-		<sequence>
-			<element minOccurs="1" maxOccurs="1" ref="sca:interface"/>
-		    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="name" type="NCName" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<element name="interface" type="sca:Interface"/>
-	<complexType name="Interface"/>
-
-	<complexType name="Reference">
-		<sequence>
-			<element minOccurs="1" maxOccurs="1" ref="sca:interface"/>
-		    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="name" type="NCName" use="required"/>
-		<attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<complexType name="Property">
-		<sequence>
-		    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-  		<attribute name="name" type="NCName" use="required"/>
-   		<attribute name="type" type="QName" use="required"/>		
-  		<attribute name="many" type="boolean" default="false" use="optional"/>
-  		<attribute name="required" type="boolean" default="false" use="optional"/>  		
-		<attribute name="default" type="string" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-
-	<element name="moduleFragment" type="sca:ModuleFragment"/>
-	<complexType name="ModuleFragment">
-		<sequence>
-			<element minOccurs="0" maxOccurs="unbounded" name="entryPoint" type="sca:EntryPoint"/>
-			<element minOccurs="0" maxOccurs="unbounded" name="component" type="sca:Component"/>
-			<element minOccurs="0" maxOccurs="unbounded" name="externalService" type="sca:ExternalService"/>
-			<element minOccurs="0" maxOccurs="unbounded" name="wire" type="sca:ModuleWire"/>
-			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="name" type="NCName" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<element name="module" type="sca:Module"/>
-	<complexType name="Module">
-		<complexContent>
-			<extension base="sca:ModuleFragment"/>
-		</complexContent>
-	</complexType>
-
-	<complexType name="EntryPoint">
-		<sequence>
-			<element minOccurs="0" maxOccurs="1" ref="sca:interface"/>
-			<element minOccurs="1" maxOccurs="unbounded" ref="sca:binding"/>
-			<element minOccurs="1" maxOccurs="unbounded" name="reference" type="anyURI"/>
-			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="name" type="NCName" use="required"/>
-		<attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-	<!-- a multiplicity 1..1 or 0..n sample
-			<reference>StockQuoteComponent</reference>		- type must be URI
-		 a multiplicity 1..n or 0..n sample
-			<reference>StockQuoteComponent1</reference>		- type must be URI
-			<reference>StockQuoteComponent2</reference>
-	 -->
-
-	<element name="binding" type="sca:Binding"/>
-	<complexType name="Binding">
-		<attribute name="uri" type="anyURI" use="optional"/>
-	</complexType>
-	
-	<complexType name="Component">
-		<sequence>
-			<element minOccurs="1" maxOccurs="1" ref="sca:implementation"/>
-			<element minOccurs="0" maxOccurs="1" name="properties" type="sca:PropertyValues"/>
-			<element minOccurs="0" maxOccurs="1" name="references" type="sca:ReferenceValues"/>
-			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="name" type="NCName" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-	<!-- a multiplicity 1..1 or 0..1 sample
-			<references>
-				<v:stockQuote>StockQuoteComponent</v:stockquote>	- type must be URI
-			</references>
-		 a multiplicity 1..n or 0..n sample
-			<references>
-				<v:stockQuote>StockQuoteComponent1</v:stockQuote>	- type must be URI
-				<v:stockQuote>StockQuoteComponent2</v:stockQuote>
-			</references>
-	 -->
-
-	<element name="implementation" type="sca:Implementation"/>
-	<complexType name="Implementation"/>
-
-	<complexType name="PropertyValues">
-		<sequence>
-			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<anyAttribute namespace="##any" processContents="lax"/>			
-	</complexType>
-
-	<complexType name="ReferenceValues">
-		<sequence>
-			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<anyAttribute namespace="##any" processContents="lax"/>			
-	</complexType>
-
-
-	<complexType name="ExternalService">
-		<sequence>
-			<element minOccurs="1" maxOccurs="1" ref="sca:interface"/>
-			<element minOccurs="0" maxOccurs="unbounded" ref="sca:binding"/>
-		</sequence>
-		<attribute name="name" type="NCName" use="required"/>
-		<attribute name="overridable" type="sca:OverrideOptions" default="may" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	
-	<complexType name="ModuleWire">
-		<sequence>
-			<element minOccurs="1" maxOccurs="1" ref="sca:source.uri"/>
-			<element minOccurs="1" maxOccurs="1" ref="sca:target.uri"/>
-			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<element name="source" type="anyType"/>
-	<element name="target" type="anyType"/>
-	
-	<element name="source.uri" type="anyURI" substitutionGroup="sca:source"/>
-	<element name="target.uri" type="anyURI" substitutionGroup="sca:target"/>
-
-	<element name="subsystem" type="sca:Subsystem"/>
-	<complexType name="Subsystem">
-		<sequence>
-			<element minOccurs="0" maxOccurs="unbounded" name="entryPoint" type="sca:EntryPoint"/>
-			<element minOccurs="0" maxOccurs="unbounded" name="moduleComponent" type="sca:ModuleComponent"/>
-			<element minOccurs="0" maxOccurs="unbounded" name="externalService" type="sca:ExternalService"/>
-			<element minOccurs="0" maxOccurs="unbounded" name="wire" type="sca:SystemWire"/>
-			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="name" type="NCName" use="required"/>
-		<attribute name="uri" type="anyURI" use="optional"/>		
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-	
-	<complexType name="ModuleComponent">
-		<sequence>
-			<element minOccurs="0" maxOccurs="1" name="properties" type="sca:PropertyValues"/>
-			<element minOccurs="0" maxOccurs="1" name="references" type="sca:ReferenceValues"/>
-			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="name" type="NCName" use="required"/>
-		<attribute name="module" type="NCName" use="required"/>
-		<attribute name="uri" type="anyURI" use="optional"/>		
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<complexType name="SystemWire">
-		<sequence>
-			<element minOccurs="1" maxOccurs="1" ref="sca:source"/>
-			<element minOccurs="1" maxOccurs="1" ref="sca:target"/>
-			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-
-	<element name="source.epr" type="anyType" substitutionGroup="sca:source"/>
-	<element name="target.epr" type="anyType" substitutionGroup="sca:target"/>
-
-	<simpleType name="Multiplicity">
-		<restriction base="string">
-			<enumeration value="0..1"/>
-			<enumeration value="1..1"/>
-			<enumeration value="0..n"/>
-			<enumeration value="1..n"/>
-		</restriction>
-	</simpleType>
-
-	<simpleType name="OverrideOptions">
-		<restriction base="string">
-			<enumeration value="no"/>
-			<enumeration value="may"/>
-			<enumeration value="must"/>
-		</restriction>
-	</simpleType>
-
-</schema>
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd b/java/sca-contrib/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
deleted file mode 100755
index bbaf58f00c..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
+++ /dev/null
@@ -1,43 +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 xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://www.osoa.org/xmlns/mock/0.9"
-	elementFormDefault="qualified"
-	xmlns:mock="http://www.osoa.org/xmlns/mock/0.9"
-	xmlns:sca="http://www.osoa.org/xmlns/sca/0.9">
-
-	<import namespace="http://www.osoa.org/xmlns/sca/0.9"
-		schemaLocation="sca-core.xsd" />
-
-	<element name="implementation.mock" type="mock:MockImplementation"
-		substitutionGroup="sca:implementation" />
-	<complexType name="MockImplementation">
-		<complexContent>
-			<extension base="sca:Implementation">
-				<sequence>
-					<any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</sequence>
-				<attribute name="myAttr" type="NCName" use="required" />
-				<anyAttribute namespace="##any" processContents="lax" />
-			</extension>
-		</complexContent>
-	</complexType>
-</schema>
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/resources/stock.xsd b/java/sca-contrib/modules/databinding-sdo/src/test/resources/stock.xsd
deleted file mode 100644
index a0a6717371..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/resources/stock.xsd
+++ /dev/null
@@ -1,33 +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://www.example.com/stock" xmlns="http://www.w3.org/2001/XMLSchema">
-    <!-- Faults -->
-    <element name="InvalidSymbolFault">
-        <complexType>
-            <sequence>
-                <element name="message" minOccurs="1" type="string" />
-                <element name="symbol" minOccurs="1" type="string" />
-            </sequence>
-        </complexType>
-    </element>
-
-    <element name="MarketClosedFault" type="string" />
-
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/resources/wrapper.xml b/java/sca-contrib/modules/databinding-sdo/src/test/resources/wrapper.xml
deleted file mode 100644
index 2526629409..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/resources/wrapper.xml
+++ /dev/null
@@ -1,27 +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.    
--->
-<p:op xmlns:p="http://www.example.com/wrapper" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.example.com/wrapper wrapper.xsd ">
-    <message>message</message>
-    <symbol>symbol</symbol>
-    <message>message1</message>
-    <symbol>symbol1</symbol>
-    <symbol>symbol2</symbol>
-</p:op>
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/resources/wrapper.xsd b/java/sca-contrib/modules/databinding-sdo/src/test/resources/wrapper.xsd
deleted file mode 100644
index ea4dc5f7f3..0000000000
--- a/java/sca-contrib/modules/databinding-sdo/src/test/resources/wrapper.xsd
+++ /dev/null
@@ -1,38 +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://www.example.com/wrapper" xmlns="http://www.w3.org/2001/XMLSchema">
-    <!-- Faults -->
-    <element name="op">
-        <complexType>
-            <sequence maxOccurs="unbounded">
-                <element name="message" minOccurs="1" type="string" />
-                <element name="symbol" minOccurs="1" maxOccurs="3" type="string" />
-            </sequence>
-        </complexType>
-    </element>
-
-    <element name="opResponse">
-        <complexType>
-            <sequence maxOccurs="1">
-                <element name="price" minOccurs="1" maxOccurs="unbounded" type="string" />
-            </sequence>
-        </complexType>
-    </element>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/LICENSE b/java/sca-contrib/modules/databinding-xmlbeans/LICENSE
deleted file mode 100755
index d645695673..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/META-INF/MANIFEST.MF b/java/sca-contrib/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
deleted file mode 100644
index dfddbeb6c8..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.databinding.xmlbeans;version="

- 1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Data Binding for XmlBeans

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397402000

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Data Binding for XmlBeans

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.xmlbeans,

- org.apache.xmlbeans.impl.values;resolution:=optional,

- org.apache.xmlbeans.xml.stream;resolution:=optional,

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0",

- org.w3c.dom

-Bundle-SymbolicName: org.apache.tuscany.sca.databinding.xmlbeans

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/databinding-xmlbeans/NOTICE b/java/sca-contrib/modules/databinding-xmlbeans/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/pom.xml b/java/sca-contrib/modules/databinding-xmlbeans/pom.xml
deleted file mode 100644
index bee5c8f44e..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/pom.xml
+++ /dev/null
@@ -1,119 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-databinding-xmlbeans</artifactId>
-    <name>Apache Tuscany SCA Data Binding for XmlBeans</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
-            <version>2.3.0</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/xmlbeans-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-                
-                <executions>
-                    <execution>
-                        <id>generate-xmlbeans</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <tasks>
-                                <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean"
-                                    classpathref="maven.compile.classpath" />
-                                <xmlbean schema="${basedir}/src/test/resources" classpathref="maven.compile.classpath"
-                                    destfile="${project.build.directory}/ipo-xmlbeans.jar"
-                                    srcgendir="${project.build.directory}/xmlbeans-source" javasource="1.5"
-                                    classgendir="${project.build.directory}/test-classes" />
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java b/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
deleted file mode 100644
index e7b240b781..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
+++ /dev/null
@@ -1,61 +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.databinding.xmlbeans;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.w3c.dom.Node;
-
-/**
- * Transforms a DOM Node to an XML Object.
- *
- * @version $Rev$ $Date$
- */
-public class Node2XmlObject extends BaseTransformer<Node, XmlObject> implements
-    PullTransformer<Node, XmlObject> {
-    // private XmlOptions options;
-
-    public XmlObject transform(Node source, TransformationContext context) {
-        try {
-            return XmlObject.Factory.parse(source);
-        } catch (XmlException e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<XmlObject> getTargetType() {
-        return XmlObject.class;
-    }
-
-    @Override
-    protected Class<Node> getSourceType() {
-        return Node.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 30;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java b/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
deleted file mode 100644
index 4e557522fe..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
+++ /dev/null
@@ -1,82 +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.databinding.xmlbeans;
-
-import java.lang.reflect.Field;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.WrapperHandler;
-import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.xmlbeans.SchemaType;
-import org.apache.xmlbeans.XmlObject;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * XMLBeans DataBinding
- *
- * @version $Rev$ $Date$
- */
-public class XMLBeansDataBinding extends BaseDataBinding {
-    public static final String NAME = XmlObject.class.getName();
-    public static final String[] ALIASES = {"xmlbeans"};
-
-    public XMLBeansDataBinding() {
-        super(NAME, XmlObject.class);
-    }
-
-    @Override
-    public WrapperHandler getWrapperHandler() {
-        return new XMLBeansWrapperHandler();
-    }
-
-    @Override
-    public boolean introspect(DataType type, Operation operation) {
-        if (XmlObject.class.isAssignableFrom(type.getPhysical())) {
-            Class<?> cls = type.getPhysical();
-            SchemaType schemaType = null;
-            try {
-                Field f = cls.getField("type");
-                schemaType = (SchemaType)f.get(null);
-            } catch (Throwable e) {
-                throw new ServiceRuntimeException(e);
-            }
-            QName typeName = schemaType.getName();
-            Object logical = type.getLogical();
-            QName elementName = null;
-            if (logical instanceof XMLType) {
-                elementName = ((XMLType)logical).getElementName();
-            }
-            type.setLogical(new XMLType(elementName, typeName));
-            type.setMetaData(SchemaType.class, schemaType);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public Object copy(Object object, DataType dataType, Operation operation) {
-        return ((XmlObject)object).copy();
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java b/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
deleted file mode 100644
index 506c42e40f..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
+++ /dev/null
@@ -1,110 +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.databinding.xmlbeans;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.databinding.WrapperHandler;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.ElementInfo;
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-import org.apache.xmlbeans.SchemaProperty;
-import org.apache.xmlbeans.SimpleValue;
-import org.apache.xmlbeans.XmlObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XMLBeansWrapperHandler implements WrapperHandler<XmlObject> {
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.WrapperHandler#create(org.apache.tuscany.sca.interfacedef.Operation, boolean)
-     */
-    public XmlObject create(Operation operation, boolean input) {
-        WrapperInfo wrapperInfo = operation.getWrapper();
-        ElementInfo element = input ? wrapperInfo.getInputWrapperElement() : wrapperInfo.getOutputWrapperElement();
-        return null;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.WrapperHandler#getChildren(java.lang.Object, org.apache.tuscany.sca.interfacedef.Operation, boolean)
-     */
-    public List getChildren(XmlObject wrapper, Operation operation, boolean input) {
-        List<Object> children = new ArrayList<Object>();
-
-        List<ElementInfo> childElements =
-            input ? operation.getWrapper().getInputChildElements() : operation.getWrapper().getOutputChildElements();
-        for (ElementInfo e : childElements) {
-            XmlObject[] objects = wrapper.selectChildren(e.getQName());
-            if (objects != null && objects.length == 1) {
-                if (objects[0] instanceof SimpleValue) {
-                    children.add(((SimpleValue)objects[0]).getObjectValue());
-                } else {
-                    children.add(objects[0]);
-                }
-            }
-            // FIXME: What should we do for many-value?
-        }
-        return children;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.WrapperHandler#getWrapperType(org.apache.tuscany.sca.interfacedef.Operation, boolean)
-     */
-    public DataType getWrapperType(Operation operation, boolean input) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.WrapperHandler#isInstance(java.lang.Object, org.apache.tuscany.sca.interfacedef.Operation, boolean)
-     */
-    public boolean isInstance(Object wrapper, Operation operation, boolean input) {
-        WrapperInfo wrapperInfo = operation.getWrapper();
-        ElementInfo element = input ? wrapperInfo.getInputWrapperElement() : wrapperInfo.getOutputWrapperElement();
-        return true;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.WrapperHandler#setChildren(java.lang.Object, java.lang.Object[], org.apache.tuscany.sca.interfacedef.Operation, boolean)
-     */
-    public void setChildren(XmlObject wrapper, Object[] childObjects, Operation operation, boolean input) {
-        List<ElementInfo> childElements =
-            input ? operation.getWrapper().getInputChildElements() : operation.getWrapper().getOutputChildElements();
-        int i = 0;
-        for (ElementInfo c : childElements) {
-            SchemaProperty property = wrapper.schemaType().getElementProperty(c.getQName());
-
-            String prop = property.getJavaPropertyName();
-
-            Method setter;
-            try {
-                setter = wrapper.schemaType().getJavaClass().getMethod("set" + prop, property.getType().getJavaClass());
-                setter.invoke(wrapper, childObjects[i++]);
-            } catch (Throwable e) {
-                throw new IllegalArgumentException(e);
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java b/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
deleted file mode 100644
index ca84f961b1..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
+++ /dev/null
@@ -1,62 +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.databinding.xmlbeans;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.xmlbeans.XmlObject;
-
-/**
- * Transforms an XMLStreamReader to an XML Object. 
- *
- * @version $Rev$ $Date$
- */
-public class XMLStreamReader2XmlObject extends BaseTransformer<XMLStreamReader, XmlObject> implements PullTransformer<XMLStreamReader, XmlObject> {
-    // private XmlOptions options;
-
-    public XmlObject transform(XMLStreamReader source, TransformationContext context) {
-        try {
-            XmlObject target = XmlObject.Factory.parse(source);
-            source.close();
-            return target;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<XmlObject> getTargetType() {
-        return XmlObject.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getSourceType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java b/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
deleted file mode 100644
index 9620d38eaf..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
+++ /dev/null
@@ -1,60 +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.databinding.xmlbeans;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.Transformer;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.xmlbeans.XmlObject;
-import org.oasisopen.sca.annotation.Service;
-import org.w3c.dom.Node;
-
-/**
- * Transforms an XML Object to a DOM Node.
- *
- * @version $Rev$ $Date$
- */
-@Service(Transformer.class)
-public class XmlObject2Node extends BaseTransformer<XmlObject, Node> implements
-    PullTransformer<XmlObject, Node> {
-    // private XmlOptions options;
-
-    public Node transform(XmlObject source, TransformationContext context) {
-        if (source == null)
-            return null;
-        return source.newDomNode();
-    }
-
-    @Override
-    protected Class<XmlObject> getSourceType() {
-        return XmlObject.class;
-    }
-
-    @Override
-    protected Class<Node> getTargetType() {
-        return Node.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 30;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java b/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
deleted file mode 100644
index bbffb7d748..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.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 org.apache.tuscany.sca.databinding.xmlbeans;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.xmlbeans.XmlObject;
-
-/**
- * Transforms an XML Object to an XMLStreamReader.
- *
- * @version $Rev$ $Date$
- */
-public class XmlObject2XMLStreamReader extends BaseTransformer<XmlObject, XMLStreamReader> implements PullTransformer<XmlObject, XMLStreamReader> {
-    // private XmlOptions options;
-    
-    public XMLStreamReader transform(XmlObject source, TransformationContext context) {
-        return source.newXMLStreamReader();
-    }
-
-    @Override
-    protected Class<XmlObject> getSourceType() {
-        return XmlObject.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getTargetType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/java/sca-contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
deleted file mode 100644
index ac76c6ca9b..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ /dev/null
@@ -1,19 +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.
-
-# implementation classes for the databindings
-org.apache.tuscany.sca.databinding.xmlbeans.XMLBeansDataBinding;name=org.apache.xmlbeans.XmlObject
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/java/sca-contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index 4e419de051..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /dev/null
@@ -1,22 +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.
-
-# Implementation classes for the transformers
-org.apache.tuscany.sca.databinding.xmlbeans.Node2XmlObject;source=org.w3c.dom.Node,target=org.apache.xmlbeans.XmlObject,weight=500
-org.apache.tuscany.sca.databinding.xmlbeans.XmlObject2Node;source=org.apache.xmlbeans.XmlObject,target=org.w3c.dom.Node,weight=500
-org.apache.tuscany.sca.databinding.xmlbeans.XmlObject2XMLStreamReader;source=org.apache.xmlbeans.XmlObject,target=javax.xml.stream.XMLStreamReader,weight=490
-org.apache.tuscany.sca.databinding.xmlbeans.XMLStreamReader2XmlObject;source=javax.xml.stream.XMLStreamReader,target=org.apache.xmlbeans.XmlObject,weight=490
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java b/java/sca-contrib/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
deleted file mode 100644
index 7b98ddb021..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
+++ /dev/null
@@ -1,105 +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.databinding.xmlbeans;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.xmlbeans.XmlObject;
-import org.w3c.dom.Node;
-
-import com.example.ipo.xmlbeans.PurchaseOrderDocument;
-
-/**
- * Test cases for testing XML Object transformations.
- *
- * @version $Rev$ $Date$
- */
-public class XmlObjectTestCase extends TestCase {
-    private static final String IPO_XML = "<?xml version=\"1.0\"?>" + "<ipo:purchaseOrder"
-    + "  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" + "  xmlns:ipo=\"http://www.example.com/IPO\""
-    + "  xsi:schemaLocation=\"http://www.example.com/IPO ipo.xsd\"" + "  orderDate=\"1999-12-01\">"
-    + "  <shipTo exportCode=\"1\" xsi:type=\"ipo:UKAddress\">" + "    <name>Helen Zoe</name>" + "    <street>47 Eden Street</street>"
-    + "    <city>Cambridge</city>" + "    <postcode>CB1 1JR</postcode>" + "  </shipTo>" + "  <billTo xsi:type=\"ipo:USAddress\">"
-    + "    <name>Robert Smith</name>" + "    <street>8 Oak Avenue</street>" + "    <city>Old Town</city>" + "    <state>PA</state>"
-    + "    <zip>95819</zip>" + "  </billTo>" + "  <items>" + "    <item partNum=\"833-AA\">"
-    + "      <productName>Lapis necklace</productName>" + "      <quantity>1</quantity>" + "      <USPrice>99.95</USPrice>"
-    + "      <ipo:comment>Want this for the holidays</ipo:comment>" + "      <shipDate>1999-12-05</shipDate>" + "    </item>" + "  </items>"
-    + "</ipo:purchaseOrder>";
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testXmlObject() throws Exception {
-        // URL/Stream/Reader to XmlObject
-        XmlObject object = XmlObject.Factory.parse(new StringReader(IPO_XML));
-
-        // XmlObject to XMLStreamReader
-        XmlObject2XMLStreamReader t1 = new XmlObject2XMLStreamReader();
-        XMLStreamReader reader = t1.transform(object, null);
-
-        // XMLStreamReader to XmlObject
-        XMLStreamReader2XmlObject t2 = new XMLStreamReader2XmlObject();
-        XmlObject object2 = t2.transform(reader, null);
-
-        // XmlObject to Node
-        XmlObject2Node t3 = new XmlObject2Node();
-        Node node = t3.transform(object2, null);
-
-        // Node to XmlObject
-        Node2XmlObject t4 = new Node2XmlObject();
-        XmlObject object3 = t4.transform(node, null);
-        Assert.assertNotNull(object3);
-    }
-    
-    public void testGeneratedXmlObject() throws Exception {
-        // URL xmlFile = getClass().getClassLoader().getResource("ipo.xml");
-        // URL/Stream/Reader to XmlObject
-        PurchaseOrderDocument object = PurchaseOrderDocument.Factory.parse(new StringReader(IPO_XML));
-
-        // XmlObject to XMLStreamReader
-        XmlObject2XMLStreamReader t1 = new XmlObject2XMLStreamReader();
-        XMLStreamReader reader = t1.transform(object, null);
-
-        // XMLStreamReader to XmlObject
-        XMLStreamReader2XmlObject t2 = new XMLStreamReader2XmlObject();
-        PurchaseOrderDocument object2 = (PurchaseOrderDocument) t2.transform(reader, null);
-
-        // XmlObject to Node
-        XmlObject2Node t3 = new XmlObject2Node();
-        Node node = t3.transform(object2, null);
-
-        // Node to XmlObject
-        Node2XmlObject t4 = new Node2XmlObject();
-        PurchaseOrderDocument object3 = (PurchaseOrderDocument) t4.transform(node, null);
-        Assert.assertNotNull(object3);
-    }   
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-}
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsd b/java/sca-contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
deleted file mode 100755
index 5a493e1746..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
+++ /dev/null
@@ -1,136 +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.    
--->
-<schema targetNamespace="http://www.example.com/IPO"
-	xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:ipo="http://www.example.com/IPO">
-
-	<annotation>
-		<documentation xml:lang="en">
-			International Purchase order schema for Example.com
-			Copyright 2000 Example.com. All rights reserved.
-		</documentation>
-	</annotation>
-
-
-	<element name="purchaseOrder" type="ipo:PurchaseOrderType" />
-
-	<element name="comment" type="string" />
-
-	<complexType name="PurchaseOrderType">
-		<sequence>
-			<element name="shipTo" type="ipo:Address" />
-			<element name="billTo" type="ipo:Address" />
-			<element ref="ipo:comment" minOccurs="0" />
-			<element name="items" type="ipo:Items" />
-		</sequence>
-		<attribute name="orderDate" type="date" />
-	</complexType>
-
-	<complexType name="Items">
-		<sequence>
-			<element name="item" minOccurs="0" maxOccurs="unbounded">
-				<complexType>
-					<sequence>
-						<element name="productName" type="string" />
-						<element name="quantity">
-							<simpleType>
-								<restriction base="positiveInteger">
-									<maxExclusive value="100" />
-								</restriction>
-							</simpleType>
-						</element>
-						<element name="USPrice" type="decimal" />
-						<element ref="ipo:comment" minOccurs="0" />
-						<element name="shipDate" type="date"
-							minOccurs="0" />
-					</sequence>
-					<attribute name="partNum" type="ipo:SKU"
-						use="required" />
-				</complexType>
-			</element>
-		</sequence>
-	</complexType>
-
-	<simpleType name="SKU">
-		<restriction base="string">
-			<pattern value="\d{3}-[A-Z]{2}" />
-		</restriction>
-	</simpleType>
-
-	<complexType name="Address">
-		<sequence>
-			<element name="name" type="string" />
-			<element name="street" type="string" />
-			<element name="city" type="string" />
-		</sequence>
-	</complexType>
-
-	<complexType name="USAddress">
-		<complexContent>
-			<extension base="ipo:Address">
-				<sequence>
-					<element name="state" type="ipo:USState" />
-					<element name="zip" type="positiveInteger" />
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<complexType name="UKAddress">
-		<complexContent>
-			<extension base="ipo:Address">
-				<sequence>
-					<element name="postcode" type="ipo:UKPostcode" />
-				</sequence>
-				<attribute name="exportCode" type="positiveInteger"
-					fixed="1" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<!-- other Address derivations for more countries -->
-
-	<simpleType name="USState">
-		<restriction base="string">
-			<enumeration value="AK" />
-			<enumeration value="AL" />
-			<enumeration value="AR" />
-			<enumeration value="CA" />
-			<enumeration value="PA" />
-			<!-- and so on ... -->
-		</restriction>
-	</simpleType>
-
-	<simpleType name="Postcode">
-		<restriction base="string">
-			<length value="7" fixed="true" />
-		</restriction>
-	</simpleType>
-
-
-	<simpleType name="UKPostcode">
-		<restriction base="ipo:Postcode">
-			<pattern value="[A-Z]{2}\d\s\d[A-Z]{2}" />
-		</restriction>
-	</simpleType>
-
-
-
-</schema>
-
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig b/java/sca-contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
deleted file mode 100755
index a397182672..0000000000
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed 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. -->
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config"
-           xmlns:ipo="http://www.example.com/IPO">
-
-  <xb:namespace uri="http://www.example.com/IPO">
-    <xb:package>com.example.ipo.xmlbeans</xb:package>
-  </xb:namespace>
-
-</xb:config>
diff --git a/java/sca-contrib/modules/domain-manager/LICENSE b/java/sca-contrib/modules/domain-manager/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/domain-manager/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/domain-manager/META-INF/MANIFEST.MF b/java/sca-contrib/modules/domain-manager/META-INF/MANIFEST.MF
deleted file mode 100644
index 482c048938..0000000000
--- a/java/sca-contrib/modules/domain-manager/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,69 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.domain.manager.impl;uses:="org.

- apache.commons.fileupload.disk,org.apache.tuscany.sca.runtime,org.apa

- che.tuscany.sca.data.collection,org.apache.tuscany.sca.core.context,o

- rg.apache.tuscany.sca.definitions,org.apache.tuscany.sca.binding.atom

- ,org.apache.tuscany.sca.core,javax.xml.namespace,javax.servlet,javax.

- xml.stream,org.apache.tuscany.sca.core.assembly,org.apache.tuscany.sc

- a.contribution.resolver,org.apache.tuscany.sca.workspace,org.apache.t

- uscany.sca.core.invocation,org.oasisopen.sca,org.apache.tuscany.sca.assemb

- ly.builder,org.apache.tuscany.sca.implementation.node,org.oasisopen.sca.an

- notations,org.apache.tuscany.sca.assembly,org.apache.commons.fileuplo

- ad,org.apache.commons.fileupload.servlet,org.apache.tuscany.sca.works

- pace.builder,javax.xml.parsers,org.apache.tuscany.sca.contribution,or

- g.apache.tuscany.sca.interfacedef.java,org.apache.tuscany.sca.monitor

- ,org.apache.tuscany.sca.interfacedef,org.w3c.dom,org.apache.xml.seria

- lize,org.apache.tuscany.sca.contribution.processor,javax.servlet.http

- ";version="2.0.0",org.apache.tuscany.sca.domain.manager.launcher;uses:=

- "org.apache.tuscany.sca.domain.manager.impl,org.apache.tuscany.sca.no

- de,org.oasisopen.sca";version="2.0.0"

-Private-Package: icons;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Domain Manager Application

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397422109

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Domain Manager Application

-Import-Package: javax.servlet,

- javax.servlet.http,

- javax.xml.namespace,

- javax.xml.parsers,

- javax.xml.stream,

- 

- org.apache.commons.fileupload,

- org.apache.commons.fileupload.disk,

- org.apache.commons.fileupload.servlet,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.builder;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0",

- org.apache.tuscany.sca.binding.atom;version="2.0.0",

- org.apache.tuscany.sca.contribution;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.core.assembly;version="2.0.0",

- org.apache.tuscany.sca.core.context;version="2.0.0",

- org.apache.tuscany.sca.core.invocation;version="2.0.0",

- org.apache.tuscany.sca.data.collection;version="2.0.0",

- org.apache.tuscany.sca.definitions;version="2.0.0",

- org.apache.tuscany.sca.domain.manager.impl;version="2.0.0",

- org.apache.tuscany.sca.domain.manager.launcher;version="2.0.0",

- org.apache.tuscany.sca.implementation.node;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.node;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.apache.tuscany.sca.workspace;version="2.0.0",

- org.apache.tuscany.sca.workspace.builder;version="2.0.0",

- org.apache.xml.serialize,

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0",

- org.w3c.dom

-Bundle-SymbolicName: org.apache.tuscany.sca.domain.manager

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/domain-manager/NOTICE b/java/sca-contrib/modules/domain-manager/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/domain-manager/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/domain-manager/pom.xml b/java/sca-contrib/modules/domain-manager/pom.xml
deleted file mode 100644
index 2eec0d53be..0000000000
--- a/java/sca-contrib/modules/domain-manager/pom.xml
+++ /dev/null
@@ -1,181 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-domain-manager</artifactId>
-    <name>Apache Tuscany SCA Domain Manager Application</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.8.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-manager</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
deleted file mode 100644
index 65959645ae..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
+++ /dev/null
@@ -1,127 +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.domain.manager.impl;
-
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeQName;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeTitle;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.contributionURI;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.ItemCollection;
-import org.apache.tuscany.sca.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a component that returns composite configuration collections. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(interfaces={ItemCollection.class, LocalItemCollection.class})
-public class CompositeConfigurationCollectionImpl implements ItemCollection, LocalItemCollection {
-
-    private static final Logger logger = Logger.getLogger(CompositeConfigurationCollectionImpl.class.getName());
-
-    @Reference
-    public LocalItemCollection contributionCollection;
-    
-    @Reference
-    public LocalItemCollection cloudCollection;
-    
-    /**
-     * Initialize the component.
-     */
-    @Init
-    public void initialize() {
-    }
-    
-    public Entry<String, Item>[] getAll() {
-        throw new UnsupportedOperationException();
-    }
-
-    public Item get(String key) throws NotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    public String post(String key, Item item) {
-        throw new UnsupportedOperationException();
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    public void delete(String key) throws NotFoundException {
-        throw new UnsupportedOperationException();
-    }
-    
-    public Entry<String, Item>[] query(String queryString) {
-        logger.fine("query " + queryString);
-        
-        if (queryString.startsWith("composite=")) {
-
-            // Expecting a key in the form:
-            // composite:contributionURI;namespace;localName
-            int e = queryString.indexOf('=');
-            String key = queryString.substring(e + 1);
-            String contributionURI = contributionURI(key);
-            QName qname = compositeQName(key);
-            
-            // Return a collection containing the following entries:
-            // the resolved version of the specified composite
-            // the required contributions
-            List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
-            
-            // Add the resolved composite entry
-            Entry<String, Item> compositeEntry = new Entry<String, Item>();
-            Item compositeItem = new Item();
-            compositeItem.setTitle(compositeTitle(contributionURI, qname));
-            compositeItem.setLink("/composite-resolved/" + key);
-            compositeEntry.setKey(key);
-            compositeEntry.setData(compositeItem);
-            entries.add(compositeEntry);
-            
-            // Get the collection of required contributions
-            Entry<String, Item>[] contributionEntries = contributionCollection.query("alldependencies=" + contributionURI);
-            for (Entry<String, Item> entry: contributionEntries) {
-                Item item = entry.getData();
-                item.setContents(null);
-                entries.add(entry);
-            }
-
-            return entries.toArray(new Entry[entries.size()]);
-            
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
deleted file mode 100644
index b4b9f5dc0f..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
+++ /dev/null
@@ -1,515 +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.domain.manager.impl;
-
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeQName;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.contributionURI;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.locationURL;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.apache.tuscany.sca.implementation.node.NodeImplementation;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionBuilder;
-import org.apache.tuscany.sca.workspace.builder.ContributionBuilderException;
-import org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a service that returns a fully configured composite. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(Servlet.class)
-public class CompositeConfigurationServiceImpl extends HttpServlet implements Servlet {
-    private static final long serialVersionUID = -8809641932774129152L;
-    
-    private static final Logger logger = Logger.getLogger(CompositeConfigurationServiceImpl.class.getName());
-
-    @Reference
-    public LocalItemCollection contributionCollection;
-    
-    @Reference 
-    public LocalItemCollection domainCompositeCollection;
-    
-    @Reference
-    public DomainManagerConfiguration domainManagerConfiguration;
-    
-    @Reference 
-    public LocalItemCollection cloudCollection;    
-
-    private FactoryExtensionPoint modelFactories;
-    private ModelResolverExtensionPoint modelResolvers;
-    private AssemblyFactory assemblyFactory;
-    private WorkspaceFactory workspaceFactory;
-    private URLArtifactProcessor<Contribution> contributionProcessor;
-    private StAXArtifactProcessorExtensionPoint staxProcessors;
-    private StAXArtifactProcessor<Composite> compositeProcessor;
-    private XMLOutputFactory outputFactory;
-    private ContributionBuilder contributionDependencyBuilder;
-    private CompositeBuilder compositeBuilder;
-    private CompositeBuilder compositeIncludeBuilder;
-    private CompositeBuilder nodeConfigurationBuilder;
-    private Monitor monitor;
-    
-    /**
-     * Initialize the component.
-     */
-    @Init
-    public void initialize() throws ParserConfigurationException {
-        
-        ExtensionPointRegistry extensionPoints = domainManagerConfiguration.getExtensionPoints();
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        monitor = monitorFactory.createMonitor();
-        
-        // Get model factories
-        modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true);
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class);
-        
-        // Get and initialize artifact processors
-        staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        compositeProcessor = (StAXArtifactProcessor<Composite>)staxProcessors.getProcessor(Composite.class);
-        StAXArtifactProcessor<Object> staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, monitor);
-
-        URLArtifactProcessorExtensionPoint urlProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        URLArtifactProcessor<Object> urlProcessor = new ExtensibleURLArtifactProcessor(urlProcessors, monitor);
-        
-        // Create contribution processor
-        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        // contributionProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlProcessor, staxProcessor, monitor);
-        contributionProcessor = urlProcessors.getProcessor(Contribution.class);
-        
-        // Get a contribution dependency builder
-        ContributionBuilderExtensionPoint contributionBuilders = extensionPoints.getExtensionPoint(ContributionBuilderExtensionPoint.class);
-        contributionDependencyBuilder = contributionBuilders.getContributionBuilder("org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder");
-        
-        // Get composite builders
-        CompositeBuilderExtensionPoint compositeBuilders = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class);
-        compositeBuilder = compositeBuilders.getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
-        nodeConfigurationBuilder = compositeBuilders.getCompositeBuilder("org.apache.tuscany.sca.implementation.node.builder.NodeCompositeBuilder");
-        compositeIncludeBuilder = compositeBuilders.getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeIncludeBuilder");
-        nodeConfigurationBuilder = compositeBuilders.getCompositeBuilder("org.apache.tuscany.sca.implementation.node.builder.NodeCompositeBuilder");
-    }
-    
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        
-        // Get the request path
-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-        String key;
-        if (path.startsWith("/")) {
-            if (path.length() > 1) {
-                key = path.substring(1);
-            } else {
-                key ="";
-            }
-        } else {
-            key =path;
-        }
-        logger.fine("get " + key);
-        
-        // Expect a key in the form composite:contributionURI;namespace;localName or
-        // a path in the form componentName/componentName/...
-        // and return the corresponding resolved composite
-        String requestedContributionURI = null;
-        QName requestedCompositeName = null;
-        String[] requestedComponentPath = null;
-        if (key.startsWith("composite:")) {
-            
-            // Extract the composite qname from the key
-            requestedContributionURI = contributionURI(key);
-            requestedCompositeName = compositeQName(key);
-            
-        } else if (key.length() != 0) {
-            
-            // Extract the path to the requested component from the key
-            requestedComponentPath = key.split("/");
-        }
-        
-        // Somewhere to store the composite we expect to write out at the end
-        Composite requestedComposite = null;
-
-        // Create a domain composite model
-        Composite domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName(Constants.SCA10_TUSCANY_NS, "domain"));
-            
-        // Get the domain composite items
-        Entry<String, Item>[] domainEntries = domainCompositeCollection.getAll();
-        
-        // Populate the domain composite
-        Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-        
-        Map<String, Contribution> contributionMap = new HashMap<String, Contribution>(); 
-        for (Entry<String, Item> domainEntry: domainEntries) {
-            
-            // Load the required contributions
-            String contributionURI = contributionURI(domainEntry.getKey());
-            Contribution contribution = contributionMap.get(contributionURI);
-            if (contribution == null) {
-                
-                // The contribution has not been loaded yet, load it with all its dependencies
-                Entry<String, Item>[] entries = contributionCollection.query("alldependencies=" + contributionURI);
-                for (Entry<String, Item> entry: entries) {
-                    Item dependencyItem = entry.getData();
-                    String dependencyURI = entry.getKey();
-                    
-                    if (!contributionMap.containsKey(dependencyURI)) {
-                        
-                        // Read the contribution
-                        Contribution dependency;
-                        try {
-                            String dependencyLocation = dependencyItem.getAlternate();
-                            dependency = contribution(workspace, dependencyURI, dependencyLocation);
-                        } catch (ContributionReadException e) {
-                            continue;
-                        }
-                        workspace.getContributions().add(dependency);
-                        contributionMap.put(dependencyURI, dependency);
-                        
-                        if (contributionURI.equals(entry.getKey())) {
-                            contribution = dependency;
-                        }
-                    }
-                }
-            }
-            
-            if (contribution == null) {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND, contributionURI);
-                return;
-            }
-            
-            // Find the specified deployable composite in the contribution
-            Composite deployable = null;
-            QName qn = compositeQName(domainEntry.getKey());
-            for (Composite d: contribution.getDeployables()) {
-                if (qn.equals(d.getName())) {
-                    deployable = d;
-                    break;
-                }
-            }
-            if (deployable == null) {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND, qn.toString());
-                return;
-            }
-            
-            // add the deployable composite to the domain composite
-            domainComposite.getIncludes().add(deployable);
-
-            // Fuse includes into the deployable composite
-            try {
-                compositeIncludeBuilder.build(deployable, null, monitor);
-            } catch (CompositeBuilderException e) {
-                response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
-            }
-            
-            // Store away the requested composite  
-            if (requestedCompositeName != null) {
-                if (requestedContributionURI.equals(contributionURI) && requestedCompositeName.equals(deployable.getName())){
-                    requestedComposite = deployable;
-                }
-            }
-        }
-        
-        // The requested composite was not found
-        if (requestedCompositeName != null && requestedComposite == null) {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND, key);
-            return;
-        }
-
-        // Get the clouds composite
-        Composite cloudsComposite;
-        try {
-            cloudsComposite = cloud();
-        } catch (NotFoundException e) {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND, e.getMessage());
-            return;
-        }
-        
-        // configure the endpoints for each composite in the domain
-        List<Composite> domainIncludes = domainComposite.getIncludes(); 
-        for (int i = 0, n =domainIncludes.size(); i < n; i++) {
-            Composite composite = domainIncludes.get(i);
-            QName compositeName = composite.getName();
-            String contributionURI = contributionURI(domainEntries[i].getKey());
-            
-            // find the node that will run this composite and the default
-            // bindings that it configures
-            Component nodeComponent = null;
-            QName nodeCompositeName = null;
-            for (Composite cloudComposite : cloudsComposite.getIncludes()) {
-                for (Component nc : cloudComposite.getComponents()) {
-                    NodeImplementation nodeImplementation = (NodeImplementation)nc.getImplementation();
-                    if (nodeImplementation.getComposite().getName().equals(compositeName) &&
-                        nodeImplementation.getComposite().getURI().equals(contributionURI)) {
-                        nodeImplementation.setComposite(composite);
-                        nodeComponent = nc;
-                        nodeCompositeName = cloudComposite.getName();
-                        break;
-                    }
-                }
-            }
-
-            if (nodeComponent != null) {
-                try {
-                    Composite nodeComposite = assemblyFactory.createComposite();
-                    nodeComposite.setName(nodeCompositeName);
-                    nodeComposite.getComponents().add(nodeComponent);
-                    nodeConfigurationBuilder.build(nodeComposite, null, monitor);
-                } catch (CompositeBuilderException e) {
-                    throw new ServletException(e);
-                }
-            }
-        }
-        
-        // Build the domain composite
-        try {
-            compositeBuilder.build(domainComposite, null, monitor);
-        } catch (CompositeBuilderException e) {
-            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
-            return;
-        }        
-
-        // Return the requested composite
-        if (requestedComposite != null) {
-            
-            // Rebuild the requested composite from the domain composite
-            // we have to reverse the flattening that went on when the domain
-            // composite was built
-            List<Component> tempComponentList = new ArrayList<Component>();
-            tempComponentList.addAll(requestedComposite.getComponents());
-            requestedComposite.getComponents().clear();
-            for (Component inputComponent : tempComponentList){
-                for (Component deployComponent : domainComposite.getComponents()){
-                    if (deployComponent.getName().equals(inputComponent.getName())){
-                        requestedComposite.getComponents().add(deployComponent);
-                    }
-                }
-            }
-            
-        } else if (requestedComponentPath != null) {
-            
-            // If a component path was specified, walk the path to get to the requested
-            // component and the composite that implements it
-            Composite nestedComposite = domainComposite;
-            for (String componentName: requestedComponentPath) {
-                Component component = null;
-                for (Component c: nestedComposite.getComponents()) {
-                    if (componentName.equals(c.getName())) {
-                        component = c;
-                        break;
-                    }
-                }
-                if (component == null) {
-                    response.sendError(HttpServletResponse.SC_NOT_FOUND, key);
-                    return;
-                } else {
-                    if (component.getImplementation() instanceof Composite) {
-                        nestedComposite = (Composite)component.getImplementation();
-                    } else {
-                        response.sendError(HttpServletResponse.SC_NOT_FOUND, key);
-                        return;
-                    }
-                }
-            }
-            
-            // Return the nested composite
-            requestedComposite = nestedComposite;
-            
-        } else {
-            
-            
-            // Return the whole domain composite
-            requestedComposite = domainComposite;
-        }
-        
-        // Write the composite in the requested format
-        StAXArtifactProcessor<Composite> processor;
-        String queryString = request.getQueryString();
-        if (queryString != null && queryString.startsWith("format=")) {
-            String format = queryString.substring(7);
-            int s = format.indexOf(';');
-            QName formatName = new QName(format.substring(0, s), format.substring(s +1));
-            processor = (StAXArtifactProcessor<Composite>)staxProcessors.getProcessor(formatName);
-            if (processor == null) {
-                response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, new IllegalArgumentException(queryString).toString());
-                return;
-            }
-        } else {
-            processor = compositeProcessor;
-        }
-        try {
-            response.setContentType("text/xml");
-            XMLStreamWriter writer = outputFactory.createXMLStreamWriter(response.getOutputStream());
-            processor.write(requestedComposite, writer);
-        } catch (Exception e) {
-            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
-            return;
-        }
-        
-        
-    }
-
-    /**
-     * Returns the cloud composite.
-     * 
-     * @return the cloud composite
-     */
-    private Composite cloud() throws NotFoundException {
-
-        // Create a new composite for the clouds
-        Composite cloudComposite = assemblyFactory.createComposite();
-        cloudComposite.setName(new QName(Constants.SCA10_TUSCANY_NS, "cloud"));
-        
-        // Get the collection of cloud composites
-        Entry<String, Item>[] cloudEntries = cloudCollection.getAll();
-        
-        // Load the cloud contributions
-        Workspace workspace = workspaceFactory.createWorkspace();
-        Map<String, Contribution> contributionMap = new HashMap<String, Contribution>(); 
-        for (Entry<String, Item> cloudEntry: cloudEntries) {
-            String key = cloudEntry.getKey();
-            String contributionURI = contributionURI(key);
-
-            // Load the contribution
-            Contribution contribution = contributionMap.get(contributionURI);
-            if (contribution == null) {
-                Item contributionItem = contributionCollection.get(contributionURI);
-                
-                // Read the contribution
-                try {
-                    contribution = contribution(workspace, contributionURI, contributionItem.getAlternate());
-                } catch (ContributionReadException e) {
-                    continue;
-                }
-                workspace.getContributions().add(contribution);
-                contributionMap.put(contributionURI, contribution);
-                
-            }
-
-            // Include the cloud composite in the clouds composite
-            QName qname = compositeQName(key);
-            for (Artifact artifact : contribution.getArtifacts()) {
-                if (artifact.getModel() instanceof Composite) {
-                    Composite composite = (Composite)artifact.getModel();
-                    if (composite.getName().equals(qname)) {
-                        cloudComposite.getIncludes().add(composite);
-                    }
-                }
-            } 
-        }
-        
-        return cloudComposite;
-    }
-
-    /**
-     * Returns the contribution with the given URI.
-     * 
-     * @param workspace
-     * @param contributionURI
-     * @param contributionLocation
-     * @return
-     * @throws NotFoundException
-     */
-    private Contribution contribution(Workspace workspace, String contributionURI, String contributionLocation) throws ContributionReadException {
-        try {
-            URI uri = URI.create(contributionURI);
-            URL location = locationURL(contributionLocation);
-            Contribution contribution = (Contribution)contributionProcessor.read(null, uri, location);
-            
-            // Resolve the contribution dependencies
-            try {
-                contributionDependencyBuilder.build(contribution, workspace, monitor);
-            } catch (ContributionBuilderException e) {
-            }
-            
-            contributionProcessor.resolve(contribution, workspace.getModelResolver());
-            return contribution;
-
-        } catch (ContributionReadException e) {
-            throw e;
-        } catch (ContributionResolveException e) {
-            throw new ContributionReadException(e);
-        } catch (MalformedURLException e) {
-            throw new ContributionReadException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
deleted file mode 100644
index a4f8f1722b..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
+++ /dev/null
@@ -1,256 +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.domain.manager.impl;
-
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeQName;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.contributionURI;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.lastModified;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.locationURL;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.apache.tuscany.sca.domain.manager.impl.CompositeGeneratorServiceImpl.Cache.ContributionCache;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a service that generates a composite from a composite model. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(interfaces={Servlet.class})
-public class CompositeGeneratorServiceImpl extends HttpServlet implements Servlet {
-    private static final long serialVersionUID = -6531448326726908269L;
-
-    private static final Logger logger = Logger.getLogger(CompositeGeneratorServiceImpl.class.getName());
-
-    @Reference
-    public LocalItemCollection contributionCollection;
-    
-    @Reference
-    public DomainManagerConfiguration domainManagerConfiguration;
-    
-    private FactoryExtensionPoint modelFactories;
-    private ModelResolverExtensionPoint modelResolvers;
-    private URLArtifactProcessor<Contribution> contributionProcessor;
-    private StAXArtifactProcessor<Composite> compositeProcessor;
-    private XMLOutputFactory outputFactory;
-    
-    /**
-     * Cache contribution models. 
-     */
-    static class Cache {
-        static class ContributionCache {
-            private Contribution contribution;
-            private long contributionLastModified;
-        }
-        private Map<URL, ContributionCache> contributions = new HashMap<URL, ContributionCache>();
-    }
-    
-    private Cache cache = new Cache();
-    
-    /**
-     * Initialize the component.
-     */
-    @Init
-    public void initialize() throws ParserConfigurationException {
-        
-        ExtensionPointRegistry extensionPoints = domainManagerConfiguration.getExtensionPoints();
-        
-        // Create a monitor
-        UtilityExtensionPoint services = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = services.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        
-        // Get model factories
-        modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true);
-        
-        // Get and initialize artifact processors
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        compositeProcessor = (StAXArtifactProcessor<Composite>)staxProcessors.getProcessor(Composite.class);
-        StAXArtifactProcessor<Object> staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, monitor);
-
-        URLArtifactProcessorExtensionPoint urlProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        URLArtifactProcessor<Object> urlProcessor = new ExtensibleURLArtifactProcessor(urlProcessors, monitor);
-        
-        // Create contribution processor
-        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        // contributionProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlProcessor, staxProcessor, monitor);
-        contributionProcessor = urlProcessors.getProcessor(Contribution.class);
-
-    }
-    
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-        // Expect a key in the form
-        // composite:contributionURI;namespace;localName
-        // and return the corresponding source file
-        
-        // Get the request path
-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-        String key = path.startsWith("/")? path.substring(1) : path;
-        logger.fine("get " + key);
-        
-        // Get the specified contribution info 
-        String contributionURI = contributionURI(key);
-        Item contributionItem;
-        try {
-            contributionItem = contributionCollection.get(contributionURI);
-        } catch (NotFoundException e) {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND, key);
-            return;
-        }
-        
-        // Read the contribution
-        Contribution contribution;
-        try {
-            contribution = contribution(contributionURI, contributionItem.getAlternate());
-        } catch (ContributionReadException e) {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND, key);
-            return;
-        }
-
-        // Find the specified deployable composite
-        QName qname = compositeQName(key);
-        Composite composite = null;
-        for (Composite deployable: contribution.getDeployables()) {
-            if (qname.equals(deployable.getName())) {
-                if (!deployable.isUnresolved()) {
-                    composite = deployable;
-                }
-                break;
-            }
-        }
-        if (composite == null) {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND, key);
-            return;
-        }
-        
-        // Write the composite
-        response.setContentType("text/xml");
-        ServletOutputStream os = response.getOutputStream();
-        try {
-            compositeProcessor.write(composite, outputFactory.createXMLStreamWriter(os));
-        } catch (ContributionWriteException e) {
-            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
-            return;
-        } catch (XMLStreamException e) {
-            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
-            return;
-        }
-        os.flush();
-    }
-
-    /**
-     * Returns the contribution with the given URI.
-     * 
-     * @param contributionURI
-     * @param contributionLocation
-     * @return
-     * @throws NotFoundException
-     */
-    private Contribution contribution(String contributionURI, String contributionLocation) throws ContributionReadException {
-        try {
-            URI uri = URI.create(contributionURI);
-            URL location = locationURL(contributionLocation);
-
-            // Get contribution from cache
-            ContributionCache contributionCache = cache.contributions.get(location);
-            long lastModified = lastModified(location);
-            if (contributionCache != null) {
-                if (contributionCache.contributionLastModified == lastModified) {
-                    return contributionCache.contribution;
-                }
-                
-                // Reset contribution cache
-                cache.contributions.remove(location);
-            }
-            
-            Contribution contribution = (Contribution)contributionProcessor.read(null, uri, location);
-            
-            contributionProcessor.resolve(contribution, new DefaultModelResolver());
-
-            // Cache contribution
-            contributionCache = new ContributionCache();
-            contributionCache.contribution = contribution;
-            contributionCache.contributionLastModified = lastModified;
-            cache.contributions.put(location, contributionCache);
-            
-            return contribution;
-
-        } catch (ContributionReadException e) {
-            throw e;
-        } catch (MalformedURLException e) {
-            throw new ContributionReadException(e);
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        } catch (ContributionResolveException e) {
-            throw new ContributionReadException(e);
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
deleted file mode 100644
index 3cf10fc587..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
+++ /dev/null
@@ -1,687 +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.domain.manager.impl;
-
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.DEPLOYMENT_CONTRIBUTION_URI;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeSimpleTitle;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeSourceLink;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.lastModified;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.locationURL;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.DefaultExport;
-import org.apache.tuscany.sca.contribution.DefaultImport;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.ItemCollection;
-import org.apache.tuscany.sca.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.apache.tuscany.sca.domain.manager.impl.ContributionCollectionImpl.Cache.ContributionCache;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionBuilder;
-import org.apache.tuscany.sca.workspace.builder.ContributionBuilderException;
-import org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-import org.w3c.dom.Document;
-
-/**
- * Implementation of a contribution collection service component. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(interfaces={ItemCollection.class, LocalItemCollection.class})
-public class ContributionCollectionImpl implements ItemCollection, LocalItemCollection {
-
-    private static final Logger logger = Logger.getLogger(ContributionCollectionImpl.class.getName());
-
-    @Property
-    public String workspaceFile;
-    
-    @Property
-    public String deploymentContributionDirectory;
-    
-    @Reference
-    public DomainManagerConfiguration domainManagerConfiguration;
-    
-    private Monitor monitor;
-    private ContributionFactory contributionFactory;
-    private WorkspaceFactory workspaceFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private URLArtifactProcessor<Contribution> contributionProcessor;
-    private XMLInputFactory inputFactory;
-    private XMLOutputFactory outputFactory;
-    private DocumentBuilder documentBuilder;
-    private ContributionBuilder contributionDependencyBuilder;
-    
-    /**
-     * Cache workspace and contribution models. 
-     */
-    static class Cache {
-        private Workspace workspace;
-        private long workspaceLastModified;
-        
-        static class ContributionCache {
-            private Contribution contribution;
-            private long contributionLastModified;
-        }
-        private Map<URL, ContributionCache> contributions = new HashMap<URL, ContributionCache>();
-    }
-    
-    private Cache cache = new Cache();
-    
-    /**
-     * Initialize the component.
-     */
-    @Init
-    public void initialize() throws ParserConfigurationException {
-        
-        ExtensionPointRegistry extensionPoints = domainManagerConfiguration.getExtensionPoints();
-        
-        // Create a validation monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        monitor = monitorFactory.createMonitor();
-        
-        // Create model factories
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true);
-        contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class);
-        
-        // Create artifact processors
-        inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, monitor);
-
-        URLArtifactProcessorExtensionPoint urlProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        
-        // Create contribution info processor
-        contributionProcessor = urlProcessors.getProcessor(".contribution/info");
-
-        // Create a document builder (used to pretty print XML)
-        documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        
-        // Get contribution dependency builder
-        ContributionBuilderExtensionPoint contributionBuilders = extensionPoints.getExtensionPoint(ContributionBuilderExtensionPoint.class);
-        contributionDependencyBuilder = contributionBuilders.getContributionBuilder("org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder"); 
-        
-    }
-    
-    public Entry<String, Item>[] getAll() {
-        logger.fine("getAll");
-
-        // Return all the contributions
-        List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
-        Workspace workspace = readContributions(readWorkspace());
-        
-        for (Contribution contribution: workspace.getContributions()) {
-            if (contribution.getURI().equals(DEPLOYMENT_CONTRIBUTION_URI)) {
-                continue;
-            }
-            entries.add(entry(workspace, contribution, contributionDependencyBuilder, monitor));
-        }
-        return entries.toArray(new Entry[entries.size()]);
-    }
-
-    public Item get(String key) throws NotFoundException {
-        logger.fine("get " + key);
-
-        // Returns the contribution with the given URI key
-        Workspace workspace = readContributions(readWorkspace());
-        for (Contribution contribution: workspace.getContributions()) {
-            if (key.equals(contribution.getURI())) {
-                return item(workspace, contribution, contributionDependencyBuilder, monitor);
-            }
-        }
-        throw new NotFoundException(key);
-    }
-    
-    public String post(String key, Item item) {
-        logger.fine("post " + key);
-        
-        // Adds a new contribution to the workspace
-        Workspace workspace = readWorkspace();
-        Contribution contribution = contributionFactory.createContribution();
-        contribution.setURI(key);
-        try {
-            contribution.setLocation(locationURL(item.getLink()).toString());
-        } catch (MalformedURLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-        workspace.getContributions().add(contribution);
-        
-        // Write the workspace
-        writeWorkspace(workspace);
-        
-        return key;
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        
-        // Update a contribution already in the workspace
-        Workspace workspace = readWorkspace();
-        Contribution newContribution = contributionFactory.createContribution();
-        newContribution.setURI(key);
-        try {
-            newContribution.setLocation(locationURL(item.getLink()).toString());
-        } catch (MalformedURLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-        List<Contribution> contributions = workspace.getContributions();
-        for (int i = 0, n = contributions.size(); i < n; i++) {
-            if (contributions.get(i).getURI().equals(key)) {
-                contributions.set(i, newContribution);
-                
-                // Write the workspace
-                writeWorkspace(workspace);
-                return;
-            }
-        }
-        throw new NotFoundException(key);
-    }
-
-    public void delete(String key) throws NotFoundException {
-        logger.fine("delete " + key);
-        
-        // Delete a contribution from the workspace
-        Workspace workspace = readWorkspace();
-        List<Contribution> contributions = workspace.getContributions();
-        for (int i = 0, n = contributions.size(); i < n; i++) {
-            if (contributions.get(i).getURI().equals(key)) {
-                contributions.remove(i);
-
-                // Write the workspace
-                writeWorkspace(workspace);
-                return;
-            }
-        }
-        throw new NotFoundException(key);
-    }
-
-    public Entry<String, Item>[] query(String queryString) {
-        logger.fine("query " + queryString);
-        
-        if (queryString.startsWith("dependencies=") || queryString.startsWith("alldependencies=")) {
-
-            // Return the collection of dependencies of the specified contribution
-            List<Entry<String, Item>> entries = new ArrayList<Entry<String,Item>>();
-            
-            // Extract the contribution URI
-            int eq = queryString.indexOf('=');
-            String key = queryString.substring(eq+1);
-            
-            // Read the metadata for all the contributions
-            Workspace workspace = readContributions(readWorkspace());
-            
-            // Look for the specified contribution
-            for (Contribution contribution: workspace.getContributions()) {
-                if (key.equals(contribution.getURI())) {                
-
-                    // Compute the contribution dependencies
-                    try {
-                        contributionDependencyBuilder.build(contribution, workspace, monitor);
-                    } catch (ContributionBuilderException e) {
-                    }
-                    List<Contribution> dependencies = contribution.getDependencies();
-                    
-                    // Returns entries for the dependencies
-                    // optionally skip the specified contribution
-                    boolean allDependencies = queryString.startsWith("alldependencies=");
-                    for (Contribution dependency: dependencies) {
-                        if (!allDependencies && dependency == contribution) {
-                            // Skip the specified contribution
-                            continue;
-                        }
-                        entries.add(entry(workspace, dependency, contributionDependencyBuilder, monitor));
-                    }
-                    break;
-                }
-            }
-
-            return entries.toArray(new Entry[entries.size()]);
-            
-        } if (queryString.startsWith("suggestions=true")) {
-            
-            // Returns a list of contribution suggestions, scan the parent of the workspace
-            // directory for potential contribution directories
-            
-            // For now, recognize project directories that contain .project files
-            // Directories containing .classpath files are likely to be Java projects, we parse
-            // the .classpath file to determine the Java project output location 
-            Workspace suggestionWorkspace = workspaceFactory.createWorkspace();
-            List<Entry> entries = new ArrayList<Entry>();
-            String rootDirectory = domainManagerConfiguration.getRootDirectory();
-            File rootLocation = new File(new File(rootDirectory).toURI().normalize());
-            for (File project: rootLocation.getParentFile().listFiles()) {
-                File dotProject = new File(project, ".project");
-                if (!dotProject.exists()) {
-                    continue;
-                }
-                
-                // We have a potential contribution
-                String uri = project.getName();
-                File location = project;
-                
-                // If this is a Java project, parse its .classpath file to determine it's output location
-                File dotClasspath = new File(project, ".classpath");
-                if (dotClasspath.exists()) {
-                    try {
-                        XMLStreamReader reader = inputFactory.createXMLStreamReader(new FileInputStream(dotClasspath));
-                        reader.nextTag();
-                        while (reader.hasNext()) {
-                            int event = reader.getEventType();
-                            if (event == START_ELEMENT) {
-                                if ("classpathentry".equals(reader.getName().getLocalPart())) {
-                                    if ("output".equals(reader.getAttributeValue("", "kind"))) {
-                                        location = new File(project, reader.getAttributeValue("", "path"));
-                                        break;
-                                    }
-                                }
-                            }
-                            if (reader.hasNext()) {
-                                reader.next();
-                            }
-                        }
-                    } catch (FileNotFoundException e) {
-                    } catch (XMLStreamException e) {
-                    }
-                    
-                }
-                
-                // Create a contribution entry, skip the domain root directory and childrens of the
-                // domain root directory
-                String rootLocationPath = rootLocation.getPath();
-                if (rootLocationPath.indexOf('\\') != -1 || rootLocationPath.indexOf(' ') != -1) {
-                    rootLocationPath = new File(rootLocationPath.replace('\\', '/')).toURI().toString();
-                }
-                String locationPath = location.getPath();
-                if (locationPath.indexOf('\\') != -1 || locationPath.indexOf(' ') != -1) {
-                    locationPath = new File(locationPath.replace('\\', '/')).toURI().toString();
-                }
-                if (!locationPath.startsWith(rootLocationPath + "/") && !locationPath.equals(rootLocationPath)) {
-                    Contribution contribution = contributionFactory.createContribution();
-                    contribution.setURI(uri);
-                    contribution.setLocation(locationPath);
-                    entries.add(entry(suggestionWorkspace, contribution, contributionDependencyBuilder, monitor));
-                }
-            }
-            
-            return entries.toArray(new Entry[entries.size()]);
-            
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-    
-    /**
-     * Returns an entry representing a contribution
-     * @param contribution
-     * @return
-     */
-    private static Entry<String, Item> entry(Workspace workspace, Contribution contribution,
-                                             ContributionBuilder contributionDependencyBuilder, Monitor monitor) {
-        Entry<String, Item> entry = new Entry<String, Item>();
-        entry.setKey(contribution.getURI());
-        entry.setData(item(workspace, contribution, contributionDependencyBuilder, monitor));
-        return entry;
-    }
-    
-    /**
-     * Returns an item representing a contribution.
-     * 
-     * @param workspace
-     * @param contribution
-     * @param monitor
-     * @return
-     */
-    private static Item item(Workspace workspace, Contribution contribution,
-                             ContributionBuilder contributionDependencyBuilder, final Monitor monitor) {
-        String contributionURI = contribution.getURI();
-        Item item = new Item();
-        item.setTitle(title(contributionURI));
-        item.setLink(link(contributionURI));
-        item.setAlternate(contribution.getLocation());
-        
-        // List the contribution dependencies in the item contents
-        final List<String> problems = new ArrayList<String>();
-        Monitor recordingMonitor = new Monitor() {
-            public void problem(Problem problem) {
-                problems.add(problem.getMessageId() + " " + problem.getProblemObject().toString());
-            }
-            
-            public List<Problem> getProblems() {
-                return null;
-            }
-            
-            public Problem getLastProblem() {
-                // TODO Auto-generated method stub
-                return null;
-            }
-            
-            public Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Exception cause) {
-                return monitor.createProblem(sourceClassName, bundleName, severity, problemObject, messageId, cause);
-            }
-            
-            public Problem createProblem(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Object... messageParams) {
-                return monitor.createProblem(sourceClassName, bundleName, severity, problemObject, messageId, messageParams);
-            }
-        };
-        
-        StringBuffer sb = new StringBuffer();
-        try {
-            contributionDependencyBuilder.build(contribution, workspace, recordingMonitor);
-        } catch (ContributionBuilderException e) {
-        }
-        List<Contribution> dependencies = contribution.getDependencies();
-        if (dependencies.size() > 1) {
-            sb.append("Dependencies: <span id=\"dependencies\">");
-            for (int i = 0, n = dependencies.size(); i < n ; i++) {
-                if (i > 0) {
-                    sb.append("  ");
-                }
-                Contribution dependency = dependencies.get(i);
-                if (dependency != contribution) {
-                    String dependencyURI = dependency.getURI();
-                    sb.append("<a href=\""+ link(dependencyURI) +"\">" + title(dependencyURI) + "</a>");
-                }
-            }
-            sb.append("</span><br>");
-        }
-        
-        // List the deployables
-        List<Composite> deployables = contribution.getDeployables();
-        if (!deployables.isEmpty()) {
-            sb.append("Deployables: <span id=\"deployables\">");
-            for (int i = 0, n = deployables.size(); i < n ; i++) {
-                if (i > 0) {
-                    sb.append("  ");
-                }
-                Composite deployable = deployables.get(i);
-                QName qname = deployable.getName();
-                sb.append("<a href=\""+ compositeSourceLink(contributionURI, qname) +"\">" + compositeSimpleTitle(contributionURI, qname) + "</a>");
-            }
-            sb.append("</span><br>");
-        }
-        
-        // List the dependency problems
-        if (contribution.isUnresolved()) {
-            problems.add("Contribution not found");
-        }
-        if (problems.size() > 0) {
-            sb.append("<span id=\"problems\" style=\"color: red\">");
-            for (int i = 0, n = problems.size(); i < n ; i++) {
-                sb.append("Problem: "+ problems.get(i) + "<br>");
-            }
-            sb.append("</span>");
-        }
-        
-        // Store in the item contents
-        item.setContents(sb.toString());
-        
-        return item;
-    }
-
-    /**
-     * Returns a link to a contribution.
-     * @param contributionURI
-     * @return
-     */
-    private static String link(String contributionURI) {
-        return "/contribution/" + contributionURI;
-    }
-    
-    /**
-     * Returns a title for the given contribution
-     * 
-     * @param contributionURI
-     * @return
-     */
-    private static String title(String contributionURI) {
-        return contributionURI;
-    }
-
-    
-    /**
-     * Read the workspace.
-     * 
-     * @return
-     */
-    private Workspace readWorkspace() {
-        String rootDirectory = domainManagerConfiguration.getRootDirectory();
-        
-        Workspace workspace;
-        File file = new File(rootDirectory + "/" + workspaceFile);
-        if (file.exists()) {
-            
-            // Get workspace from cache
-            if (cache.workspace != null && file.lastModified() == cache.workspaceLastModified) {
-                workspace = cache.workspace;
-                
-            } else {
-                
-                try {
-                    FileInputStream is = new FileInputStream(file);
-                    XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-                    reader.nextTag();
-                    workspace = (Workspace)staxProcessor.read(reader);
-                } catch (Exception e) {
-                    throw new ServiceRuntimeException(e);
-                }
-
-                // Cache workspace
-                cache.workspaceLastModified = file.lastModified();
-                cache.workspace = workspace;
-            }
-            
-        } else {
-            
-            // Create new workspace
-            workspace = workspaceFactory.createWorkspace();
-
-            // Cache workspace
-            cache.workspaceLastModified = 0;
-            cache.workspace = workspace;
-        }
-        
-        // Make sure that the workspace contains the cloud contribution
-        // The cloud contribution contains the composites describing the
-        // SCA nodes declared in the cloud
-        Contribution cloudContribution = null;
-        for (Contribution contribution: workspace.getContributions()) {
-            if (contribution.getURI().equals(DEPLOYMENT_CONTRIBUTION_URI)) {
-                cloudContribution = contribution;
-            }
-        }
-        if (cloudContribution == null) {
-            Contribution contribution = contributionFactory.createContribution();
-            contribution.setURI(DEPLOYMENT_CONTRIBUTION_URI);
-            File cloudDirectory = new File(rootDirectory + "/" + deploymentContributionDirectory);
-            contribution.setLocation(cloudDirectory.toURI().toString());
-            workspace.getContributions().add(contribution);
-        }
-        
-        return workspace;
-    }
-    
-    /**
-     * Write the workspace back to disk
-     * 
-     * @param workspace
-     */
-    private void writeWorkspace(Workspace workspace) {
-        try {
-            String rootDirectory = domainManagerConfiguration.getRootDirectory();
-            
-            // First write to a byte stream
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            XMLStreamWriter writer = outputFactory.createXMLStreamWriter(bos);
-            staxProcessor.write(workspace, writer);
-            
-            // Parse again to pretty format the document
-            Document document = documentBuilder.parse(new ByteArrayInputStream(bos.toByteArray()));
-            OutputFormat format = new OutputFormat();
-            format.setIndenting(true);
-            format.setIndent(2);
-            
-            // Write to workspace.xml
-            File file = new File(rootDirectory + "/" + workspaceFile);
-            FileOutputStream os = new FileOutputStream(file);
-            XMLSerializer serializer = new XMLSerializer(os, format);
-            serializer.serialize(document);
-            os.close();
-            
-            // Cache workspace
-            cache.workspace = workspace;
-            cache.workspaceLastModified = file.lastModified();
-            
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    /**
-     * Returns a workspace populated with the contribution info read from
-     * the contributions.
-     * 
-     * @param workspace
-     * @return
-     */
-    private Workspace readContributions(Workspace workspace) {
-        
-        Workspace contributions = workspaceFactory.createWorkspace();
-        try {
-            for (Contribution c: workspace.getContributions()) {
-                URI uri = URI.create(c.getURI());
-                URL location = locationURL(c.getLocation());
-                
-                // Get contribution from cache
-                ContributionCache contributionCache = cache.contributions.get(location);
-                long lastModified = lastModified(location);
-                if (contributionCache != null) {
-                    if (contributionCache.contributionLastModified == lastModified) {
-                        Contribution contribution = contributionCache.contribution;
-                        contribution.setUnresolved(false);
-                        contributions.getContributions().add(contribution);
-                        continue;
-                    }
-                    
-                    // Reset contribution cache
-                    cache.contributions.remove(location);
-                }
-                
-                try {
-                    Contribution contribution = (Contribution)contributionProcessor.read(null, uri, location);
-                    contribution.setUnresolved(false);
-                    contributions.getContributions().add(contribution);
-                    
-                    // Cache contribution
-                    contributionCache = new ContributionCache();
-                    contributionCache.contribution = contribution;
-                    contributionCache.contributionLastModified = lastModified;
-                    cache.contributions.put(location, contributionCache);
-                    
-                    
-                    // Make sure that the cloud contribution does not contain
-                    // default imports/exports as we want to isolate it from application
-                    // provided contributions
-                    if (contribution.getURI().equals(DEPLOYMENT_CONTRIBUTION_URI)) {
-                        for (Iterator<Import> i = contribution.getImports().iterator(); i.hasNext(); ) {
-                            Import import_ = i.next();
-                            if (import_ instanceof DefaultImport) {
-                                i.remove();
-                            }
-                        }
-                        for (Iterator<Export> i = contribution.getExports().iterator(); i.hasNext(); ) {
-                            Export export = i.next();
-                            if (export instanceof DefaultExport) {
-                                i.remove();
-                            }
-                        }
-                    }
-                    
-                } catch (ContributionReadException e) {
-                    Contribution contribution = contributionFactory.createContribution();
-                    contribution.setURI(c.getURI());
-                    contribution.setLocation(c.getLocation());
-                    contribution.setUnresolved(true);
-                    contributions.getContributions().add(contribution);
-                }
-            }
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-        return contributions;
-    }
-    
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
deleted file mode 100644
index 46652984b9..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
+++ /dev/null
@@ -1,77 +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.domain.manager.impl;
-
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.logging.Logger;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a contribution collection service component. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(interfaces={Servlet.class})
-public class ContributionServiceImpl extends HttpServlet implements Servlet {
-    private static final long serialVersionUID = -4759297945439322773L;
-
-    private static final Logger logger = Logger.getLogger(ContributionServiceImpl.class.getName());
-
-    @Reference
-    public LocalItemCollection contributionCollection;
-    
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-        // Get the request path
-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-
-        // The key is the contribution URI
-        String key = path.startsWith("/")? path.substring(1) : path;
-        logger.fine("get " + key);
-        
-        // Get the item describing the composite
-        Item item;
-        try {
-            item = contributionCollection.get(key);
-        } catch (NotFoundException e) {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND, key);
-            return;
-        }
-
-        // Redirect to the actual contribution location
-        response.sendRedirect("/files/" + item.getAlternate());
-    }
-
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
deleted file mode 100644
index 58aab75855..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
+++ /dev/null
@@ -1,404 +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.domain.manager.impl;
-
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeAlternateLink;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeKey;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeQName;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeSourceLink;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeTitle;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.contributionURI;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.lastModified;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.locationURL;
-
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.ItemCollection;
-import org.apache.tuscany.sca.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.apache.tuscany.sca.domain.manager.impl.DeployableCompositeCollectionImpl.Cache.ContributionCache;
-import org.apache.tuscany.sca.implementation.node.NodeImplementation;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionBuilder;
-import org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a deployable composite collection service. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(interfaces={ItemCollection.class, LocalItemCollection.class})
-public class DeployableCompositeCollectionImpl implements ItemCollection, LocalItemCollection {
-
-    private static final Logger logger = Logger.getLogger(DeployableCompositeCollectionImpl.class.getName());
-
-    @Reference
-    public LocalItemCollection contributionCollection;
-    
-    @Reference
-    public DomainManagerConfiguration domainManagerConfiguration;
-    
-    private FactoryExtensionPoint modelFactories;
-    private ModelResolverExtensionPoint modelResolvers;
-    private URLArtifactProcessor<Contribution> contributionProcessor;
-    private XMLOutputFactory outputFactory;
-    private ContributionBuilder contributionDependencyBuilder;
-    private Monitor monitor;
-    
-    /**
-     * Cache contribution models. 
-     */
-    static class Cache {
-        static class ContributionCache {
-            private Contribution contribution;
-            private long contributionLastModified;
-        }
-        private Map<URL, ContributionCache> contributions = new HashMap<URL, ContributionCache>();
-    }
-    
-    private Cache cache = new Cache();
-    
-    /**
-     * Initialize the component.
-     */
-    @Init
-    public void initialize() throws ParserConfigurationException {
-        
-        ExtensionPointRegistry extensionPoints = domainManagerConfiguration.getExtensionPoints();
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        monitor = monitorFactory.createMonitor();        
-        
-        // Get model factories
-        modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true);
-        
-        // Get and initialize artifact processors
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        StAXArtifactProcessor<Object> staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, monitor);
-
-        URLArtifactProcessorExtensionPoint urlProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        URLArtifactProcessor<Object> urlProcessor = new ExtensibleURLArtifactProcessor(urlProcessors, monitor);
-        
-        // Create contribution processor
-        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        // contributionProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlProcessor, staxProcessor, monitor);
-        contributionProcessor = urlProcessors.getProcessor(Contribution.class);
-        
-        // Get a contribution dependency builder
-        ContributionBuilderExtensionPoint contributionBuilders = extensionPoints.getExtensionPoint(ContributionBuilderExtensionPoint.class);
-        contributionDependencyBuilder = contributionBuilders.getContributionBuilder("org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder");
-    }
-    
-    public Entry<String, Item>[] getAll() {
-        logger.fine("getAll");
-        
-        // Return all the deployable composites in the contributions
-        List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
-        
-        // Get the list of contributions in the workspace
-        Entry<String, Item>[] contributionEntries = contributionCollection.getAll();
-
-        // Read contribution metadata
-        for (Entry<String, Item> contributionEntry: contributionEntries) {
-            Item contributionItem = contributionEntry.getData();
-            Contribution contribution;
-            try {
-                contribution = contribution(contributionEntry.getKey(), contributionItem.getAlternate());
-            } catch (ContributionReadException e) {
-                continue;
-            }
-
-            // Create entries for the deployable composites
-            for (Composite deployable: contribution.getDeployables()) {
-                entries.add(entry(contribution, deployable));
-            }
-            
-        }
-        return entries.toArray(new Entry[entries.size()]);
-    }
-
-    public Item get(String key) throws NotFoundException {
-        logger.fine("get " + key);
-
-        // Get the specified contribution info 
-        String contributionURI = contributionURI(key);
-        Item contributionItem = contributionCollection.get(contributionURI);
-        
-        // Read the contribution
-        Contribution contribution;
-        try {
-            contribution = contribution(contributionURI, contributionItem.getAlternate());
-        } catch (ContributionReadException e) {
-            throw new NotFoundException(key);
-        }
-
-        // Find the specified deployable composite
-        QName qname = compositeQName(key);
-        for (Composite deployable: contribution.getDeployables()) {
-            if (qname.equals(deployable.getName())) {
-                if (deployable.isUnresolved()) {
-                    throw new NotFoundException(key);
-                }
-                
-                // Return an item describing the deployable composite
-                return item(contribution, deployable);
-            }
-        }
-
-        throw new NotFoundException(key);
-    }
-    
-    public String post(String key, Item item) {
-        throw new UnsupportedOperationException();
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    public void delete(String key) throws NotFoundException {
-        throw new UnsupportedOperationException();
-    }
-    
-    public Entry<String, Item>[] query(String queryString) {
-        logger.fine("query " + queryString);
-        
-        if (queryString.startsWith("contribution=")) {
-
-            // Return all the deployable composites in the specified
-            // contribution
-            List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
-
-            // Get the specified contribution info 
-            String contributionURI = queryString.substring(queryString.indexOf('=') + 1);
-            Item contributionItem;
-            try {
-                contributionItem = contributionCollection.get(contributionURI);
-            } catch (NotFoundException e) {
-                return entries.toArray(new Entry[entries.size()]);
-            }
-            
-            // Read the contribution
-            Contribution contribution;
-            try {
-                contribution = contribution(contributionURI, contributionItem.getAlternate());
-            } catch (ContributionReadException e) {
-                return entries.toArray(new Entry[entries.size()]);
-            }
-
-            // Create entries for the deployable composites
-            for (Composite deployable: contribution.getDeployables()) {
-                entries.add(entry(contribution, deployable));
-            }
-
-            return entries.toArray(new Entry[entries.size()]);
-            
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-    
-    /**
-     * Returns the contribution with the given URI.
-     * 
-     * @param contributionURI
-     * @param contributionLocation
-     * @return
-     * @throws NotFoundException
-     */
-    private Contribution contribution(String contributionURI, String contributionLocation) throws ContributionReadException {
-        try {
-            URI uri = URI.create(contributionURI);
-            URL location = locationURL(contributionLocation);
-            
-            // Get contribution from cache
-            ContributionCache contributionCache = cache.contributions.get(location);
-            long lastModified = lastModified(location);
-            if (contributionCache != null) {
-                if (contributionCache.contributionLastModified == lastModified) {
-                    return contributionCache.contribution;
-                }
-                
-                // Reset contribution cache
-                cache.contributions.remove(location);
-            }
-            
-            Contribution contribution = (Contribution)contributionProcessor.read(null, uri, location);
-            
-            contributionProcessor.resolve(contribution, new DefaultModelResolver());
-            
-            // Cache contribution
-            contributionCache = new ContributionCache();
-            contributionCache.contribution = contribution;
-            contributionCache.contributionLastModified = lastModified;
-            cache.contributions.put(location, contributionCache);
-            
-            return contribution;
-
-        } catch (ContributionReadException e) {
-            throw e;
-        } catch (MalformedURLException e) {
-            throw new ContributionReadException(e);
-        } catch (ContributionResolveException e) {
-            throw new ContributionReadException(e);
-        } catch (Throwable e) {
-            throw new ContributionReadException(e);
-        }
-    }
-    
-    /**
-     * Returns the entry contents describing a composite.
-     * 
-     * @param composite
-     * @return
-     */
-    private static String content(Composite composite) {
-        StringBuffer sb = new StringBuffer();
-        List<Component> components = composite.getComponents();
-        for (int i = 0, n = components.size(); i < n; i++) {
-            Component component = components.get(i);
-            if (component.getImplementation() instanceof NodeImplementation) {
-                List<ComponentService> services = component.getServices();
-                if (!services.isEmpty()) {
-                    List<Binding> bindings = services.get(0).getBindings();
-                    if (!bindings.isEmpty()) {
-                        
-                        // List node URIs
-                        sb.append("Node URI: <span id=\"nodeURI\">");
-                        sb.append(component.getServices().get(0).getBindings().get(0).getURI());
-                        break;
-                    }
-                }
-            } else {
-                
-                // List component names
-                if (sb.length() == 0) {
-                    sb.append("Components: <span id=\"components\">");
-                } else {
-                    sb.append(" ");
-                }
-                sb.append(component.getName());
-            }
-        }
-        if (sb.length() != 0) {
-            sb.append("</span>");
-        }
-        return sb.toString();
-    }
-    
-    /**
-     * Returns the link to the resource related to a composite.
-     * 
-     * @param composite
-     * @return
-     */
-    private static String relatedLink(Composite composite) {
-        for (Component component: composite.getComponents()) {
-            if (component.getImplementation() instanceof NodeImplementation) {
-                NodeImplementation nodeImplementation = (NodeImplementation)component.getImplementation();
-                Composite deployable = nodeImplementation.getComposite();
-                String contributionURI = deployable.getURI();
-                QName qname = deployable.getName();
-                String key = compositeKey(contributionURI, qname);
-                return "/composite-source/" + key;
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Returns an entry describing the given deployable.
-     * 
-     * @param contribution
-     * @param deployable
-     * @return
-     */
-    private static Entry<String, Item> entry(Contribution contribution, Composite deployable) {
-        Entry<String, Item> entry = new Entry<String, Item>();
-        entry.setKey(DomainManagerUtil.compositeKey(contribution.getURI(), deployable.getName()));
-        entry.setData(item(contribution, deployable));
-        return entry;
-    }
-
-    /**
-     * Returns an item describing the given deployable.
-     * 
-     * @param contribution
-     * @param deployable
-     * @return
-     */
-    private static Item item(Contribution contribution, Composite deployable) {
-        String contributionURI = contribution.getURI();
-        String contributionLocation = contribution.getLocation();
-        QName qname = deployable.getName();
-        String deployableURI = deployable.getURI();
-        Item item = new Item();
-        item.setTitle(compositeTitle(contributionURI, qname));
-        item.setContents(content(deployable));
-        item.setLink(compositeSourceLink(contributionURI, qname));
-        item.setAlternate(compositeAlternateLink(contributionLocation, deployableURI));
-        item.setRelated(relatedLink(deployable));
-        return item;
-    }
-
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
deleted file mode 100644
index d36bf77c96..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
+++ /dev/null
@@ -1,128 +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.domain.manager.impl;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLDecoder;
-import java.util.logging.Logger;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a service that returns the source of a deployable composite. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(Servlet.class)
-public class DeployableCompositeServiceImpl extends HttpServlet implements Servlet {
-    private static final long serialVersionUID = -3477992129462720902L;
-
-    private static final Logger logger = Logger.getLogger(DeployableCompositeServiceImpl.class.getName());
-
-    @Reference
-    public DomainManagerConfiguration domainManagerConfiguration;
-    
-    @Reference
-    public LocalItemCollection deployableCollection;
-    
-    /**
-     * Initialize the component.
-     */
-    @Init
-    public void initialize() throws ParserConfigurationException {
-        
-        ExtensionPointRegistry extensionPoints = domainManagerConfiguration.getExtensionPoints();
-    }
-    
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-        // Expect a key in the form
-        // composite:contributionURI;namespace;localName
-        // and return the corresponding source file
-        
-        // Get the request path
-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-        String key = path.startsWith("/")? path.substring(1) : path;
-        logger.fine("get " + key);
-        
-        // Get the item describing the composite
-        Item item;
-        try {
-            item = deployableCollection.get(key);
-        } catch (NotFoundException e) {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND, key);
-            return;
-        }
-
-        // Redirect if there is no composite file
-        String uri = item.getAlternate();
-        if (uri == null) {
-            response.sendRedirect("/composite-generated/" + key);
-            return;
-        }
-        
-        // Read the composite file and write to response
-        InputStream is;
-        try {
-            URLConnection connection = new URL(uri).openConnection();
-            connection.setUseCaches(false);
-            connection.connect();
-            is = connection.getInputStream();
-        } catch (FileNotFoundException ex) {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND, key);
-            return;
-        }
-
-        response.setContentType("text/xml");
-        ServletOutputStream os = response.getOutputStream();
-        byte[] buffer = new byte[4096];
-        for (;;) {
-            int n = is.read(buffer);
-            if (n < 0) {
-                break;
-            }
-            os.write(buffer, 0, n);
-        }
-        is.close();
-        os.flush();
-    }
-
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
deleted file mode 100644
index d4f882185c..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
+++ /dev/null
@@ -1,378 +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.domain.manager.impl;
-
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.DEPLOYMENT_CONTRIBUTION_URI;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeKey;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeQName;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeSourceLink;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeTitle;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.contributionURI;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.ItemCollection;
-import org.apache.tuscany.sca.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-import org.w3c.dom.Document;
-
-/**
- * Implementation of a composite collection service. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(interfaces={ItemCollection.class,LocalItemCollection.class})
-public class DeployedCompositeCollectionImpl implements ItemCollection, LocalItemCollection {
-    private static final Logger logger = Logger.getLogger(DeployedCompositeCollectionImpl.class.getName());
-
-    @Property
-    public String compositeFile;
-    
-    @Property
-    public String deploymentContributionDirectory;
-    
-    @Reference
-    public LocalItemCollection deployableCollection;
-    
-    @Reference(required=false)
-    public LocalItemCollection processCollection;
-
-    @Reference
-    public DomainManagerConfiguration domainManagerConfiguration;
-    
-    private FactoryExtensionPoint modelFactories;
-    private AssemblyFactory assemblyFactory;
-    private StAXArtifactProcessor<Composite> compositeProcessor;
-    private XMLOutputFactory outputFactory;
-    private DocumentBuilder documentBuilder;
-    
-    /**
-     * Cache domain composite model. 
-     */
-    static class Cache {
-        private Composite compositeCollection;
-        private long compositeCollectionLastModified;
-    }
-    
-    private Cache cache = new Cache();
-    
-    /**
-     * Initialize the component.
-     */
-    @Init
-    public void initialize() throws ParserConfigurationException {
-        
-        // Create factories
-        ExtensionPointRegistry extensionPoints = domainManagerConfiguration.getExtensionPoints();
-        modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true);
-        
-        // Create composite processor
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        compositeProcessor = staxProcessors.getProcessor(Composite.class);
-
-        // Create a document builder (used to pretty print XML)
-        documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-    }
-    
-    public Entry<String, Item>[] getAll() {
-        logger.fine("getAll");
-
-        // Return all the composites in the domain composite
-        List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
-        Composite compositeCollection = readCompositeCollection();
-        for (Composite composite: compositeCollection.getIncludes()) {
-            String contributionURI = composite.getURI();
-            QName qname = composite.getName();
-            String key = compositeKey(contributionURI, qname);
-            Item item;
-            try {
-                item = deployableCollection.get(key);
-            } catch (NotFoundException e) {
-                item = new Item();
-                item.setTitle(compositeTitle(contributionURI, qname));
-                item.setLink(compositeSourceLink(contributionURI, qname));
-                item.setContents("<span id=\"problem\" style=\"color: red\">Problem: Composite not found</span>");
-            }
-            Entry<String, Item> entry = new Entry<String, Item>();
-            entry.setKey(key);
-            entry.setData(item);
-            entries.add(entry);
-        }
-        return entries.toArray(new Entry[entries.size()]);
-    }
-
-    public Item get(String key) throws NotFoundException {
-        logger.fine("get " + key);
-        
-        String contributionURI = contributionURI(key);
-        QName qname = compositeQName(key);
-
-        // Look for the specified composite in the domain composite
-        List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
-        Composite compositeCollection = readCompositeCollection();
-        for (Composite composite: compositeCollection.getIncludes()) {
-            if (contributionURI.equals(composite.getURI()) && qname.equals(composite.getName())) {
-                return deployableCollection.get(key);
-            }
-        }
-        throw new NotFoundException(key);
-    }
-    
-    public String post(String key, Item item) {
-        logger.fine("post " + key);
-        
-        String contributionURI = contributionURI(key);
-        QName qname = compositeQName(key);
-
-        // Adds a new composite to the domain composite
-        Composite compositeCollection = readCompositeCollection();
-        Composite composite = assemblyFactory.createComposite();
-        composite.setName(qname);
-        composite.setURI(contributionURI);
-        composite.setUnresolved(true);
-        compositeCollection.getIncludes().add(composite);
-        
-        // Optionally, write the composite contents in a new composite file
-        // under the deployment composites directory, if that directory is
-        // configured on this component
-        if (deploymentContributionDirectory != null && item.getContents() != null) {
-            String rootDirectory = domainManagerConfiguration.getRootDirectory();
-            
-            File directory = new File(rootDirectory + "/" + deploymentContributionDirectory);
-            if (!directory.exists()) {
-                directory.mkdirs();
-            }
-            File file = new File(directory, qname.getLocalPart() + ".composite");
-            try {
-                Writer w = new OutputStreamWriter(new FileOutputStream(file));
-                w.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-                w.write(item.getContents());
-                w.close();
-            } catch (IOException e) {
-                throw new ServiceRuntimeException(e);
-            }
-        }
-        
-        // Write the composite collection
-        writeCompositeCollection(compositeCollection);
-        
-        return key;
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        logger.fine("put " + key);
-
-        String contributionURI = contributionURI(key);
-        QName qname = compositeQName(key);
-        
-        // Update a composite already in the domain composite
-        Composite compositeCollection = readCompositeCollection();
-        Composite newComposite = assemblyFactory.createComposite();
-        newComposite.setName(qname);
-        newComposite.setURI(contributionURI);
-        newComposite.setUnresolved(true);
-        List<Composite> composites = compositeCollection.getIncludes();
-        for (int i = 0, n = composites.size(); i < n; i++) {
-            Composite composite = composites.get(i);
-            if (contributionURI.equals(composite.getURI()) && qname.equals(composite.getName())) {
-                composites.set(i, newComposite);
-                
-                // Write the domain composite
-                writeCompositeCollection(compositeCollection);
-                
-                return;
-            }
-        }
-        throw new NotFoundException(key);
-    }
-
-    public void delete(String key) throws NotFoundException {
-        logger.fine("delete " + key);
-        
-        String contributionURI = contributionURI(key);
-        QName qname = compositeQName(key);
-        
-        // Delete/stop the corresponding process, if any
-        try {
-            processCollection.delete(qname.getLocalPart());
-        } catch (Exception e) {}
-        
-        // Delete a composite from the composite collection
-        Composite compositeCollection = readCompositeCollection();
-        List<Composite> composites = compositeCollection.getIncludes();
-        Composite deleted = null;
-        for (int i = 0, n = composites.size(); i < n; i++) {
-            Composite composite = composites.get(i);
-            if (contributionURI.equals(composite.getURI()) && qname.equals(composite.getName())) {
-                composites.remove(i);
-                deleted = composite;
-                
-                // Write the domain composite
-                writeCompositeCollection(compositeCollection);
-                break;
-            }
-        }
-
-        // Delete the file too if it is in the deployment contribution directory
-        if (deploymentContributionDirectory != null && contributionURI.equals(DEPLOYMENT_CONTRIBUTION_URI)) {
-            String rootDirectory = domainManagerConfiguration.getRootDirectory();
-            
-            File file = new File(rootDirectory + "/" + deploymentContributionDirectory, qname.getLocalPart() + ".composite");
-            if (file.exists()) {
-                file.delete();
-            }
-        }
-        
-        if (deleted == null) {
-            throw new NotFoundException(key);
-        }
-    }
-
-    public Entry<String, Item>[] query(String queryString) {
-        throw new UnsupportedOperationException();
-    }
-    
-    /**
-     * Reads the domain composite.
-     * 
-     * @return the domain composite
-     * @throws ServiceRuntimeException
-     */
-    private Composite readCompositeCollection() throws ServiceRuntimeException {
-        String rootDirectory = domainManagerConfiguration.getRootDirectory();
-        
-        Composite compositeCollection;
-        File file = new File(rootDirectory + "/" + compositeFile);
-        if (file.exists()) {
-
-            // Get composite collection from cache
-            if (cache.compositeCollection != null && file.lastModified() == cache.compositeCollectionLastModified) {
-                compositeCollection = cache.compositeCollection;
-                
-            } else {
-                    
-                XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-                try {
-                    FileInputStream is = new FileInputStream(file);
-                    XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-                    compositeCollection = compositeProcessor.read(reader);
-                } catch (Exception e) {
-                    throw new ServiceRuntimeException(e);
-                }
-                
-                // Cache composite collection
-                cache.compositeCollectionLastModified = file.lastModified();
-                cache.compositeCollection = compositeCollection;
-            }
-            
-        } else {
-            compositeCollection = assemblyFactory.createComposite();
-            String name;
-            int d = compositeFile.lastIndexOf('.');
-            if (d != -1) {
-                name = compositeFile.substring(0, d);
-            } else {
-                name = compositeFile;
-            }
-            compositeCollection.setName(new QName(Constants.SCA10_TUSCANY_NS, name));
-
-            // Cache composite collection
-            cache.compositeCollectionLastModified = 0;
-            cache.compositeCollection = compositeCollection;
-        }
-        return compositeCollection;
-    }
-    
-    /**
-     * Write the domain composite back to disk.
-     * 
-     * @param compositeCollection
-     */
-    private void writeCompositeCollection(Composite compositeCollection) {
-        try {
-            String rootDirectory = domainManagerConfiguration.getRootDirectory();
-            
-            // First write to a byte stream
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            XMLStreamWriter writer = outputFactory.createXMLStreamWriter(bos);
-            compositeProcessor.write(compositeCollection, writer);
-            
-            // Parse again to pretty format the document
-            Document document = documentBuilder.parse(new ByteArrayInputStream(bos.toByteArray()));
-            OutputFormat format = new OutputFormat();
-            format.setIndenting(true);
-            format.setIndent(2);
-            
-            // Write to domain.composite
-            File file = new File(rootDirectory + "/" + compositeFile);
-            FileOutputStream os = new FileOutputStream(file);
-            XMLSerializer serializer = new XMLSerializer(os, format);
-            serializer.serialize(document);
-
-            // Cache composite collection
-            cache.compositeCollection = compositeCollection;
-            cache.compositeCollectionLastModified = file.lastModified();
-            
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
deleted file mode 100644
index 1831728f07..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
+++ /dev/null
@@ -1,53 +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.domain.manager.impl;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-
-/**
- * Domain manager configuration service interface.
- *
- * @version $Rev$ $Date$
- */
-public interface DomainManagerConfiguration {
-    
-    /**
-     * Sets the domain manager root directory.
-     * 
-     * @param rootDirectory
-     */
-    void setRootDirectory(String rootDirectory);
-    
-    /**
-     * Returns the domain manager root directory.
-     * 
-     * @return the domain manager root directory
-     */
-    String getRootDirectory();
-    
-    /**
-     * Returns the extension point registry used in the
-     * domain manager.
-     * 
-     * @return
-     */
-    ExtensionPointRegistry getExtensionPoints();
-
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
deleted file mode 100644
index 21c7cd4383..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
+++ /dev/null
@@ -1,85 +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.domain.manager.impl;
-
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a domain manager configuration component.
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(DomainManagerConfiguration.class)
-public class DomainManagerConfigurationImpl implements DomainManagerConfiguration {
-
-    private String rootDirectory = ".";
-    private ExtensionPointRegistry extensionPoints;
-    
-    @Init
-    public void initialize() {
-        
-        // Create extension point registry
-        extensionPoints = new DefaultExtensionPointRegistry();
-
-        // Initialize module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            try {
-                activator.start(extensionPoints);
-            } catch (Exception e) {
-                //FIXME fix the module activators that have cross module dependencies
-                // and currently fail when the whole runtime is not present 
-            }
-        }
-    }
-    
-    @Destroy
-    public void destroy() {
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            try {
-                activator.stop(extensionPoints);
-            } catch (Exception e) {
-                //FIXME fix the module activators that have cross module dependencies
-                // and currently fail when the whole runtime is not present 
-            }
-        }
-    }
-    
-    public String getRootDirectory() {
-        return rootDirectory;
-    }
-    
-    public void setRootDirectory(String rootDirectory) {
-        this.rootDirectory = rootDirectory;
-    }
-    
-    public ExtensionPointRegistry getExtensionPoints() {
-        return extensionPoints;
-    }
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
deleted file mode 100644
index 644ebd86d0..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
+++ /dev/null
@@ -1,296 +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.domain.manager.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * Common functions and constants used by the admin components.
- *
- * @version $Rev$ $Date$
- */
-public final class DomainManagerUtil {
-
-    static final String DEPLOYMENT_CONTRIBUTION_URI = "http://tuscany.apache.org/cloud";
-
-    /**
-     * Extracts a qname from a key expressed as contributionURI;namespace;localpart.
-     * @param key
-     * @return
-     */
-    static QName compositeQName(String key) {
-        int i = key.indexOf(';');
-        key = key.substring(i + 1);
-        i = key.indexOf(';');
-        return new QName(key.substring(0, i), key.substring(i + 1));
-    }
-
-    /**
-     * Returns a composite title expressed as contributionURI - namespace;localpart.
-     * @param qname
-     * @return
-     */
-    static String compositeTitle(String uri, QName qname) {
-        if (uri.equals(DEPLOYMENT_CONTRIBUTION_URI)) {
-            return qname.getLocalPart();
-        } else {
-            return uri + " - " + qname.getNamespaceURI() + ";" + qname.getLocalPart();
-        }
-    }
-
-    /**
-     * Extracts a contribution uri from a key expressed as contributionURI;namespace;localpart.
-     * @param key
-     * @return
-     */
-    static String contributionURI(String key) {
-        int i = key.indexOf(';');
-        return key.substring("composite:".length(), i);
-    }
-
-    /**
-     * Returns a composite key expressed as contributionURI;namespace;localpart.
-     * @param qname
-     * @return
-     */
-    static String compositeKey(String uri, QName qname) {
-        return "composite:" + uri + ';' + qname.getNamespaceURI() + ';' + qname.getLocalPart();
-    }
-
-    /**
-     * Returns a link to the source of a composite
-     * @param contributionURI
-     * @param qname
-     * @return
-     */
-    static String compositeSourceLink(String contributionURI, QName qname) {
-        return "/composite-source/" + compositeKey(contributionURI, qname);
-    }
-
-    /**
-     * Returns a composite title expressed as contributionURI - namespace;localpart.
-     * @param qname
-     * @return
-     */
-    static String compositeSimpleTitle(String uri, QName qname) {
-        if (uri.equals(DomainManagerUtil.DEPLOYMENT_CONTRIBUTION_URI)) {
-            return qname.getLocalPart();
-        } else {
-            return qname.getNamespaceURI() + ";" + qname.getLocalPart();
-        }
-    }
-
-    /**
-     * Returns a URL from a location string.
-     * @param location
-     * @return
-     * @throws MalformedURLException
-     */
-    static URL locationURL(String location) throws MalformedURLException {
-        String scheme = null; 
-        URI uri = null;
-        
-        IllegalArgumentException uriException = null;
-        try {
-            uri = URI.create(location);
-            scheme = uri.getScheme();
-        }catch (java.lang.IllegalArgumentException e) {
-            uriException = e;
-        }
-        
-        if (scheme == null) {
-            File file = new File(location);
-            return file.toURI().toURL();
-        } else if (scheme.equals("file")) {
-            File file = new File(location.substring(5));
-            return file.toURI().toURL();
-        } else if(uri == null){
-            throw uriException;
-        } else {
-            return uri.toURL();
-        }
-    }
-
-    /**
-     * Returns a link to a deployable composite.
-     * 
-     * If the containing contribution is a local directory, return the URI of  the local composite file
-     * inside the contribution.
-     * 
-     * If the containing contribution is a local or remote file, return a URI of the form:
-     * jar: contribution URI !/ composite URI.
-     *  
-     * @param contributionLocation
-     * @param deployableURI
-     * @return
-     */
-    static String compositeAlternateLink(String contributionLocation, String deployableURI) {
-        if (deployableURI == null) {
-            return null;
-        }
-        URI u = URI.create(contributionLocation);
-        String uri;
-        if ("file".equals(u.getScheme())) {
-            String path = u.toString().substring(5);
-            File file = new File(path);
-            if (file.isDirectory()) {
-                if (contributionLocation.endsWith("/")) {
-                    uri = contributionLocation + deployableURI;
-                } else {
-                    uri = contributionLocation + "/" + deployableURI;
-                }
-            } else {
-                uri = contributionLocation + "!/" + deployableURI; 
-            }
-        } else {
-            uri = contributionLocation + "!/" + deployableURI;
-        }
-        int e = uri.indexOf("!/"); 
-        if (e != -1) {
-            int s = uri.lastIndexOf('/', e - 2) +1;
-            if (uri.substring(s, e).contains(".")) {
-                uri = "jar:" + uri;
-            } else {
-                uri = uri.substring(0, e) + uri.substring(e + 1);
-            }
-        }
-        return uri;
-    }
-
-    /**
-     * Extract a node URI from an ATOM entry content.
-     * 
-     * @param content
-     * @return
-     */
-    static String nodeURI(String content) {
-        if (content != null) {
-            int bs = content.indexOf("<span id=\"nodeURI\">");
-            if (bs != -1) {
-                content = content.substring(bs + 19);
-                int es = content.indexOf("</span>");
-                if (es != -1) {
-                    return content.substring(0, es);
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Create a new service reference dynamically.
-     * 
-     * @param <B>
-     * @param businessInterface
-     * @param binding
-     * @param assemblyFactory
-     * @param compositeActivator
-     * @return
-     */
-    static <B> ServiceReference<B> dynamicReference(Class<B> businessInterface, Binding binding, AssemblyFactory assemblyFactory, CompositeActivator compositeActivator) {
-        try {
-    
-            Composite composite = assemblyFactory.createComposite();
-            composite.setName(new QName("http://tempuri.org", "default"));
-            RuntimeComponent component = (RuntimeComponent)assemblyFactory.createComponent();
-            component.setName("default");
-            component.setURI("default");
-            compositeActivator.configureComponentContext(component);
-            composite.getComponents().add(component);
-            RuntimeComponentReference reference = (RuntimeComponentReference)assemblyFactory.createComponentReference();
-            reference.setName("default");
-            JavaInterfaceFactory javaInterfaceFactory = compositeActivator.getJavaInterfaceFactory();
-            InterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract();
-            interfaceContract.setInterface(javaInterfaceFactory.createJavaInterface(businessInterface));
-            reference.setInterfaceContract(interfaceContract);
-            component.getReferences().add(reference);
-            reference.setComponent(component);
-            reference.getBindings().add(binding);
-    
-            ProxyFactory proxyFactory = compositeActivator.getProxyFactory();
-            return new ServiceReferenceImpl<B>(businessInterface, component, reference, binding, proxyFactory, compositeActivator);
-            
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    /**
-     * Returns the last modified time of the content at the given URL.
-     * 
-     * @param url
-     * @return
-     * @throws IOException
-     */
-    static long lastModified(URL url) throws IOException {
-        
-        if (url.getProtocol() == null || "file".equals(url.getProtocol())) {
-            return lastModified(new File(url.getPath()));
-        } else {
-            URLConnection connection = url.openConnection();
-            long lastModified = connection.getLastModified();
-            return lastModified;
-        }
-    }
-
-    /**
-     * Returns the last modified time of the given file or directory.
-     *  
-     * @param file
-     * @return
-     */
-    static long lastModified(File file) {
-        if (file.isDirectory()) {
-            long lastModified = file.lastModified();
-            
-            for (File child: file.listFiles()) {
-                long m = lastModified(child);
-                if (m > lastModified) {
-                    lastModified = m;
-                }
-            }
-            return lastModified;
-            
-        } else {
-            return file.lastModified();
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
deleted file mode 100644
index 22eff61840..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
+++ /dev/null
@@ -1,136 +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.domain.manager.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.ItemCollection;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a file collection service component. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(ItemCollection.class)
-public class FileCollectionImpl implements ItemCollection {
-    
-    private static final Logger logger = Logger.getLogger(FileCollectionImpl.class.getName());
-
-    @Property
-    public String directoryName;
-
-    @Reference
-    public DomainManagerConfiguration domainManagerConfiguration;
-    
-    /**
-     * Initialize the component.
-     */
-    @Init
-    public void initialize() throws IOException {
-    }
-    
-    public Entry<String, Item>[] getAll() {
-        logger.fine("getAll");
-        
-        String rootDirectory = domainManagerConfiguration.getRootDirectory();
-        
-        // Return all the files
-        List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
-        File directory = new File(rootDirectory + "/" + directoryName);
-        if (directory.exists()) {
-            for (File file: directory.listFiles()) {
-                if (file.getName().startsWith(".")) {
-                    continue;
-                }
-                entries.add(entry(file.getName()));
-            }
-        }
-        return entries.toArray(new Entry[entries.size()]);
-    }
-
-    public Item get(String key) throws NotFoundException {
-        logger.fine("get " + key);
-        return item(key);
-    }
-
-    public String post(String key, Item item) {
-        throw new UnsupportedOperationException();
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    public void delete(String key) throws NotFoundException {
-        logger.fine("delete " + key);
-
-        String rootDirectory = domainManagerConfiguration.getRootDirectory();
-        File directory = new File(rootDirectory + "/" + directoryName);
-        File file = new File(directory, key);
-        if (file.exists()) {
-            file.delete();
-        } else {
-            throw new NotFoundException(key);
-        }
-    }
-
-    public Entry<String, Item>[] query(String queryString) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns an entry representing a file.
-     * 
-     * @param fileName
-     * @return
-     */
-    private static Entry<String, Item> entry(String fileName) {
-        Entry<String, Item> entry = new Entry<String, Item>();
-        entry.setKey(fileName);
-        entry.setData(item(fileName));
-        return entry;
-    }
-
-    /**
-     * Returns an item representing a file.
-     * 
-     * @param fileName
-     * @return
-     */
-    private static Item item(String fileName) {
-        Item item = new Item();
-        item.setTitle(fileName);
-        item.setLink("/files/" + fileName);
-        return item;
-    }
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
deleted file mode 100644
index 7881217436..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
+++ /dev/null
@@ -1,153 +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.domain.manager.impl;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URLConnection;
-import java.net.URLDecoder;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a servlet component supporting file upload/download.
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(Servlet.class)
-public class FileServiceImpl extends HttpServlet {
-    private static final long serialVersionUID = -4560385595481971616L;
-    
-    private static final Logger logger = Logger.getLogger(FileServiceImpl.class.getName());
-
-    @Property
-    public String directoryName;
-    
-    @Reference
-    public DomainManagerConfiguration domainManagerConfiguration;
-    
-    private ServletFileUpload upload;
-    
-    /**
-     * Initialize the component.
-     */
-    @Init
-    public void initialize() throws IOException {
-        upload = new ServletFileUpload(new DiskFileItemFactory());
-    }
-    
-    @Override
-    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
-
-        // Upload files
-        String rootDirectory = domainManagerConfiguration.getRootDirectory();
-        try {
-            for (FileItem item: (List<FileItem>)upload.parseRequest(request)) {
-                if (!item.isFormField()) {
-                    File directory = new File(rootDirectory + "/" + directoryName);
-                    if (!directory.exists()) {
-                        directory.mkdirs();
-                    }
-                    logger.fine("post " + item.getName());
-                    item.write(new File(directory, item.getName()));
-                }
-            }
-            
-            // Redirect to the admin page
-            response.sendRedirect("/ui/files");
-        }
-        catch (Exception e) {
-            throw new IOException(e.toString());
-        }
-    }
-    
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        
-        // Download a file
-        String requestURI = URLDecoder.decode(request.getRequestURI(), "UTF-8");
-        String path = requestURI.substring(request.getServletPath().length());
-        if (path.startsWith("/")) {
-            path = path.substring(1);
-        }
-        logger.fine("get " + path);
-        
-        try {
-            
-            // Analyze the given path
-            URI uri = URI.create(path);
-            String scheme = uri.getScheme();
-            if (scheme == null) {
-
-                // If no scheme is specified then the path identifies file
-                // inside our directory
-                String rootDirectory = domainManagerConfiguration.getRootDirectory();
-                uri = new File(rootDirectory + "/" + directoryName, path).toURI();
-                
-            } else if (!scheme.equals("file")) {
-                
-                // If the scheme does not identify a local file, just redirect to the server
-                // hosting the file
-                response.sendRedirect(path);
-            }
-            
-            // Read the file and write to response 
-            URLConnection connection = uri.toURL().openConnection();
-            connection.setUseCaches(false);
-            connection.connect();
-            InputStream is = connection.getInputStream();
-            ServletOutputStream os = response.getOutputStream();
-            byte[] buffer = new byte[4096];
-            for (;;) {
-                int n = is.read(buffer);
-                if (n < 0) {
-                    break;
-                }
-                os.write(buffer, 0, n);
-            }
-            is.close();
-            os.flush();
-            
-      } catch (FileNotFoundException e) {
-          response.sendError(HttpServletResponse.SC_NOT_FOUND);
-      }
-    }
-    
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
deleted file mode 100644
index 695f25f480..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
+++ /dev/null
@@ -1,96 +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.domain.manager.impl;
-
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeQName;
-
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.logging.Logger;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.LocalItemCollection;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a service that returns a node configuration. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(Servlet.class)
-public class NodeConfigurationServiceImpl extends HttpServlet implements Servlet {
-    private static final long serialVersionUID = 6913769467386954463L;
-
-    private static final Logger logger = Logger.getLogger(NodeConfigurationServiceImpl.class.getName());
-
-    @Reference
-    public LocalItemCollection contributionCollection;
-    
-    @Reference
-    public LocalItemCollection cloudCollection;
-    
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        
-        // Get the request path
-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-        String key = path.startsWith("/")? path.substring(1) : path;
-        logger.fine("get " + key);
-        
-        // The key contains a node name, redirect 
-        // to the corresponding composite config
-            
-        // Get the collection of cloud composites
-        Entry<String, Item>[] cloudEntries = cloudCollection.getAll();
-
-        // Find the specified node
-        for (Entry<String, Item> cloudEntry: cloudEntries) {
-            QName qname = compositeQName(cloudEntry.getKey());
-            if (qname.getLocalPart().equals(key)) {
-                
-                // Found the specified node
-                String related = cloudEntry.getData().getRelated();
-                int i = related.indexOf("composite:");
-                if (i != -1) {
-                    
-                    // Redirect to its composite config
-                    String compositeConfiguration = "/composite-config/?composite=" + related.substring(i);
-                    response.sendRedirect(compositeConfiguration);
-                    return;
-                }
-            }
-        }
-        
-        // Node not found
-        response.sendError(HttpServletResponse.SC_NOT_FOUND, key);
-        return;
-    }
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
deleted file mode 100644
index 9ab86ec2fc..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
+++ /dev/null
@@ -1,251 +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.domain.manager.impl;
-
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeQName;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.nodeURI;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.binding.atom.AtomBindingFactory;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.ItemCollection;
-import org.apache.tuscany.sca.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a node process collection service. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(interfaces={ItemCollection.class, LocalItemCollection.class})
-public class NodeProcessCollectionFacadeImpl implements ItemCollection, LocalItemCollection {
-
-    private static final Logger logger = Logger.getLogger(NodeProcessCollectionFacadeImpl.class.getName());
-
-    @Reference
-    public LocalItemCollection cloudCollection;
-    
-    @Reference
-    public ItemCollection processCollection;
-    
-    @Reference
-    public DomainManagerConfiguration domainManagerConfiguration;
-    
-    private AssemblyFactory assemblyFactory;
-    private AtomBindingFactory atomBindingFactory;
-    private CompositeActivator compositeActivator;
-
-    /**
-     * Initialize the component.
-     */
-    @Init
-    public void initialize() {
-
-        // Get its composite activator
-        //FIXME
-        //compositeActivator = runtime.getCompositeActivator();
-
-        // Get the model factories
-        ExtensionPointRegistry extensionPoints = domainManagerConfiguration.getExtensionPoints();
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        atomBindingFactory = modelFactories.getFactory(AtomBindingFactory.class);
-    }
-    
-    public Entry<String, Item>[] getAll() {
-        logger.fine("getAll");
-        
-        // Get the collection of nodes
-        Entry<String, Item>[] nodeEntries = cloudCollection.getAll();
-
-        // Dispatch to the hosts hosting these nodes
-        List<Entry<String, Item>> entries = new ArrayList<Entry<String,Item>>();
-        for (String host: hosts(nodeEntries)) {
-            ItemCollection processCollection = processCollection(host);
-            for (Entry<String, Item> remoteEntry: processCollection.getAll()) {
-                entries.add(remoteEntry);
-            }
-            break;
-        }
-        
-        return entries.toArray(new Entry[entries.size()]);
-    }
-
-    public Item get(String key) throws NotFoundException {
-        logger.fine("get " + key);
-        
-        // Get the host hosting the given node
-        String host = host(key);
-        
-        // Dispatch the request to that host
-        ItemCollection processCollection = processCollection(host);
-        return processCollection.get(key);
-    }
-
-    public String post(String key, Item item) {
-        logger.fine("post " + key);
-
-        // Get the host hosting the given node
-        String host;
-        try {
-            host = host(key);
-        } catch (NotFoundException e) {
-            throw new ServiceRuntimeException(e);
-        }
-        
-        // Dispatch the request to that host
-        ItemCollection processCollection = processCollection(host);
-        return processCollection.post(key, item);
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    public void delete(String key) throws NotFoundException {
-        logger.fine("delete " + key);
-        
-        // Get the host hosting the given node
-        String host = host(key);
-        
-        // Dispatch the request to that host
-        ItemCollection processCollection = processCollection(host);
-        processCollection.delete(key);
-    }
-    
-    public Entry<String, Item>[] query(String queryString) {
-        logger.fine("query " + queryString);
-        
-        if (queryString.startsWith("node=")) {
-            String key = queryString.substring(queryString.indexOf('=') + 1);
-            
-            // Get the host hosting the given node
-            String host;
-            try {
-                host = host(key);
-            } catch (NotFoundException e) {
-                return new Entry[0];
-            }
-            
-            // Dispatch the request to that host
-            ItemCollection processCollection = processCollection(host);
-            return processCollection.query(queryString);
-            
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-    
-    private String host(String nodeName) throws NotFoundException {
-
-        // Get the entry representing the given node
-        Entry<String, Item> nodeEntry = nodeEntry(cloudCollection.getAll(), nodeName);
-        if (nodeEntry == null) {
-            throw new NotFoundException(nodeName);
-        }
-        
-        // Get the host hosting it
-        return host(nodeEntry.getData());
-    }
-
-    /**
-     * Returns the entry representing the given node.
-     *  
-     * @param entries
-     * @param name
-     * @return
-     */
-    private static Entry<String, Item> nodeEntry(Entry<String, Item>[] entries, String name) {
-        for (Entry<String, Item> entry: entries) {
-            QName qname = compositeQName(entry.getKey());
-            if (qname.getLocalPart().equals(name)) {
-                return entry;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the lists of hosts hosting the nodes in the given entries.
-     *  
-     * @param entries
-     * @return
-     */
-    private static List<String> hosts(Entry<String, Item>[] entries) {
-        List<String> hosts = new ArrayList<String>();
-        for (Entry<String, Item> entry: entries) {
-            String host = host(entry.getData());
-            if (!hosts.contains(host)) {
-                hosts.add(host);
-            }
-        }
-        return hosts;
-    }
-
-    /**
-     * Returns the host of the node represented by the given item.
-     * 
-     * @param item
-     * @return
-     */
-    private static String host(Item item) {
-        String uri = nodeURI(item.getContents());
-        if (uri != null) {
-            return URI.create(uri).getHost();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns a proxy to the process collection service on the specified
-     * host.
-     * 
-     * @param host
-     * @return
-     */
-    private ItemCollection processCollection(String host) {
-        return processCollection;
-        
-//FIXME        
-//        AtomBinding binding = atomBindingFactory.createAtomBinding();
-//        binding.setURI("http://" + host + ":9990/node/processes");
-//        ServiceReference<ItemCollection> reference = dynamicReference(ItemCollection.class, binding, assemblyFactory, compositeActivator);
-//        return reference.getService();
-    }
-        
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
deleted file mode 100644
index f7ae597c52..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
+++ /dev/null
@@ -1,236 +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.domain.manager.impl;
-
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeKey;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.compositeQName;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.contributionURI;
-import static org.apache.tuscany.sca.domain.manager.impl.DomainManagerUtil.nodeURI;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URLDecoder;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a component that provides a quick start path for a
- * composite in a contribution. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(interfaces={Servlet.class})
-public class QuickStartServiceImpl extends HttpServlet {
-    private static final long serialVersionUID = -3477992129462720901L;
-
-    private static final Logger logger = Logger.getLogger(QuickStartServiceImpl.class.getName());
-
-    @Reference
-    public LocalItemCollection contributionCollection;
-    
-    @Reference
-    public LocalItemCollection deployableCollection;
-
-    @Reference 
-    public LocalItemCollection domainCompositeCollection;
-    
-    @Reference
-    public LocalItemCollection cloudCollection;
-    
-    @Reference
-    public LocalItemCollection processCollection;
-    
-    /**
-     * Initialize the component.
-     */
-    @Init
-    public void initialize() throws ParserConfigurationException {
-    }
-
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        try {
-            
-            // Get the request path
-            String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-            if (path.startsWith("/")) {
-                path = path.substring(1);
-            }
-            
-            // Get the request parameters
-            String contributionURI = request.getParameter("contribution");
-            String contributionLocation = request.getParameter("location");
-            String compositeURI = request.getParameter("composite");
-            String start = request.getParameter("start");
-    
-            logger.fine("Composite Quick Start.");
-            logger.fine("Contribution URI: " + contributionURI);
-            logger.fine("Contribution location: " + contributionLocation);
-            logger.fine("Composite URI: " + compositeURI);
-            
-            // Look for the contribution in the workspace
-            Entry<String, Item>[] contributionEntries = contributionCollection.getAll();
-            Entry<String, Item> contributionEntry = null;
-            for (Entry<String, Item> entry: contributionEntries) {
-                if (contributionURI.equals(entry.getKey())) {
-                    contributionEntry = entry;
-                    break;
-                }
-            }
-            
-            // Add the contribution if necessary
-            if (contributionEntry == null) {
-                Item item = new Item();
-                item.setLink(contributionLocation);
-                contributionCollection.post(contributionURI, item);
-            }
-            
-            // Look for the specified deployable composite in the contribution
-            String compositeKey = null;
-            Entry<String, Item>[] deployableEntries = deployableCollection.query("contribution=" + contributionURI);
-            for (Entry<String, Item> entry: deployableEntries) {
-                Item item = entry.getData();
-                if (contributionURI.equals(contributionURI(entry.getKey())) && item.getAlternate().endsWith(compositeURI)) {
-                    compositeKey = entry.getKey();
-                    break;
-                }
-            }
-            
-            if (compositeKey == null) {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND, compositeURI);
-                return;
-            }
-            
-            // Look for the deployable composite in the domain composite
-            try {
-                domainCompositeCollection.get(compositeKey);
-            } catch (NotFoundException e) {
-    
-                // Add the deployable composite to the domain composite
-                Item item = new Item();
-                domainCompositeCollection.post(compositeKey, item);
-            }
-    
-            // Check if the deployable composite is already assigned a node
-            Entry<String, Item>[] nodeEntries = cloudCollection.getAll();
-            String nodeName = null;
-            for (Entry<String, Item> entry: nodeEntries) {
-                Item item = entry.getData();
-                String related = item.getRelated();
-                if (related != null) {
-                    int c = related.indexOf("composite:");
-                    related = related.substring(c);
-                    if (compositeKey.equals(related)) {
-                        nodeName = compositeQName(entry.getKey()).getLocalPart();
-                    }
-                }
-            }
-            
-            // Create a new node for the composite if necessary
-            if (nodeName == null) {
-                
-                // Construct node name and key
-                QName compositeName = compositeQName(compositeKey); 
-                nodeName = compositeName.getLocalPart() + "Node"; 
-                String nodeKey = compositeKey("http://tuscany.apache.org/cloud", new QName("http://tuscany.apache.org/cloud", nodeName));
-                
-                // Find a free node port
-                Set<Integer> nodePorts = new HashSet<Integer>(); 
-                for (Entry<String, Item> entry: nodeEntries) {
-                    Item item = entry.getData();
-                    String uri = nodeURI(item.getContents());
-                    if (uri != null) {
-                        URI u = URI.create(uri);
-                        int port = u.getPort();
-                        if (port != -1) {
-                            nodePorts.add(port);
-                        }
-                    }
-                }
-                String nodeURI = null;
-                for (int port = 8100; port<8200; port++) {
-                    if (!nodePorts.contains(port)) {
-                        nodeURI = "http://localhost:" + port;
-                        break;
-                    }
-                }
-                if (nodeURI == null) {
-                    throw new RuntimeException("Couldn't find a free port for new node: " + nodeName);
-                }
-                
-                // Build the entry describing the node
-                Item item = new Item();
-                String content = 
-                                "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"\n" +
-                                "       xmlns:t=\"http://tuscany.apache.org/xmlns/sca/1.0\"\n" +
-                                "       targetNamespace=\"http://tuscany.apache.org/cloud\"\n" +
-                                "       xmlns:c=\"" + compositeName.getNamespaceURI() + "\"\n" +
-                                "       name=\"" + nodeName + "\">\n" +
-                                "\n" +
-                                "       <component name=\"" + nodeName + "\">\n" +
-                                "               <t:implementation.node uri=\"" + contributionURI + "\" composite=\"c:" + compositeName.getLocalPart() + "\"/>\n" +
-                                "               <service name=\"Node\">\n" +
-                                "                       <binding.ws uri=\"" + nodeURI + "\"/>\n" +
-                                "                       <t:binding.http uri=\"" + nodeURI + "\"/>\n" +
-                                "                       <t:binding.jsonrpc uri=\"" + nodeURI + "\"/>\n" +
-                                "                       <t:binding.atom uri=\"" + nodeURI + "\"/>\n" +
-                                "               </service>\n" +
-                                "       </component>\n" + 
-                                "</composite>";
-                item.setContents(content);
-    
-                // Create the new node
-                cloudCollection.post(nodeKey, item);
-            }
-            
-            // Finally, start the node
-            if ("true".equals(start)) {
-                processCollection.post(nodeName, new Item());
-            }
-            
-            response.getWriter().print("<html><body>Node <span id=\"node\">" + nodeName + "</span> OK.</body></html>");
-
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "Could not start composite", e);
-            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java b/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
deleted file mode 100644
index c0afcc6efd..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
+++ /dev/null
@@ -1,121 +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.domain.manager.launcher;
-
-import org.apache.tuscany.sca.domain.manager.impl.DomainManagerConfiguration;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ServiceReference;
-
-/**
- * Bootstrap class for the SCA domain manager.
- *  
- * @version $Rev$ $Date$
- */
-public class DomainManagerLauncherBootstrap {
-    private Node node;
-
-    /**
-     * A node wrappering an instance of a domain manager.
-     */
-    public static class NodeFacade implements Node {
-        private ClassLoader threadContextClassLoader;
-        private ClassLoader runtimeClassLoader;
-        private Node node;
-        private String rootDirectory;
-        
-        private NodeFacade(String rootDirectory) {
-            this.rootDirectory = rootDirectory;
-            runtimeClassLoader = Thread.currentThread().getContextClassLoader();
-        }
-        
-        public void start() {
-            threadContextClassLoader = Thread.currentThread().getContextClassLoader();
-            boolean started = false;
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                NodeFactory factory = NodeFactory.newInstance();
-                String contribution = ContributionLocationHelper.getContributionLocation(getClass());
-                node = factory.createNode("DomainManager.composite", new Contribution("domain-manager", contribution));
-                node.start();
-
-                // Set the domain manager's root directory
-                DomainManagerConfiguration domainManagerConfiguration = node.getService(DomainManagerConfiguration.class, "DomainManagerConfigurationComponent");
-                domainManagerConfiguration.setRootDirectory(rootDirectory);
-                
-                started = true;
-            } finally {
-                if (!started) {
-                    Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-                }
-            }
-        }
-        
-        public void stop() {
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                node.stop();
-            } finally {
-                Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-            }
-        }
-        
-        public void destroy() {
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                node.destroy();
-            } finally {
-                Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-            }
-        }
-
-        public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-            throw new UnsupportedOperationException();
-        }
-
-        public <B> B getService(Class<B> businessInterface, String serviceName) {
-            throw new UnsupportedOperationException();
-        }
-
-        public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String serviceName) {
-            throw new UnsupportedOperationException();
-        }
-
-    }
-    
-    /**
-     * Constructs a new domain manager bootstrap.
-     */
-    public DomainManagerLauncherBootstrap(String rootDirectory) throws Exception {
-        node = new NodeFacade(rootDirectory);
-    }
-
-    /**
-     * Returns the node representing the domain manager.
-     * @return
-     */
-    public Node getNode() {
-        return node;
-    }
-
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/DomainManager.composite b/java/sca-contrib/modules/domain-manager/src/main/resources/DomainManager.composite
deleted file mode 100644
index ba57ea45d1..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/DomainManager.composite
+++ /dev/null
@@ -1,281 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    name="DomainManager">
-
-    <component name="HomePage">
-        <t:implementation.widget location="home.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/home"/>
-        </service>
-    </component>
-    
-    <component name="HomeGadget">
-        <t:implementation.widget location="home-gadget.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/home-gadget"/>
-        </service>
-    </component>
-    
-    <component name="WorkspacePage">
-        <t:implementation.widget location="workspace.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/workspace"/>
-        </service>
-    </component>
-    
-    <component name="WorkspaceGadget">
-        <t:implementation.widget location="workspace-gadget.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/workspace-gadget"/>
-        </service>
-		 <reference name="workspace" target="ContributionCollectionComponent/ItemCollection">
-		 	<t:binding.atom/>
-		 </reference>
-    </component>
-    
-    <component name="FilesPage">
-        <t:implementation.widget location="files.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/files"/>
-        </service>
-    </component>
-    
-    <component name="FilesGadget">
-        <t:implementation.widget location="files-gadget.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/files-gadget"/>
-        </service>
-		 <reference name="files" target="FileCollectionComponent">
-		 	<t:binding.atom/>
-		 </reference>
-    </component>
-    
-    <component name="DomainCompositePage">
-        <t:implementation.widget location="composite.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/composite"/>
-        </service>
-    </component>
-    
-    <component name="DomainCompositeGadget">
-        <t:implementation.widget location="composite-gadget.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/composite-gadget"/>
-        </service>
-		 <reference name="domainComposite" target="DomainCompositeCollectionComponent/ItemCollection">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="workspace" target="ContributionCollectionComponent/ItemCollection">
-		 	<t:binding.atom/>
-		 </reference>
-    </component>
-
-    <component name="CloudPage">
-        <t:implementation.widget location="cloud.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/cloud"/>
-        </service>
-    </component>
-    
-    <component name="CloudGadget">
-        <t:implementation.widget location="cloud-gadget.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/cloud-gadget"/>
-        </service>
-		 <reference name="cloudComposite" target="CloudCollectionComponent/ItemCollection">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="domainComposite" target="DomainCompositeCollectionComponent/ItemCollection">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="processCollection" target="NodeProcessCollectionFacadeComponent/ItemCollection">
-		 	<t:binding.atom/>
-		 </reference>
-    </component>
-    
-    <component name="ContributionCollectionComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.ContributionCollectionImpl"/>             
-        <property name="workspaceFile">workspace.xml</property>             
-        <property name="deploymentContributionDirectory">cloud</property>             
-   		<service name="ItemCollection">
-   	 		<t:binding.atom uri="http://localhost:9990/workspace" title="Contributions"/>
-   		</service>
-   		<reference name="domainManagerConfiguration" target="DomainManagerConfigurationComponent"/>
-    </component>
-
-    <component name="ContributionServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.ContributionServiceImpl"/>             
-   		<service name="Servlet">
-   	 		<t:binding.http uri="http://localhost:9990/contribution"/>
-   		</service>
-   		<reference name="contributionCollection" target="ContributionCollectionComponent/LocalItemCollection"/>
-    </component>
-
-    <component name="FileCollectionComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.FileCollectionImpl"/>             
-        <property name="directoryName">files</property>             
-   		<service name="ItemCollection">
-   	 		<t:binding.atom uri="http://localhost:9990/feed/files" title="Files"/>
-   		</service>
-   		<reference name="domainManagerConfiguration" target="DomainManagerConfigurationComponent"/>
-    </component>
-
-    <component name="FileServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.FileServiceImpl"/>
-        <property name="directoryName">files</property>             
-   		<service name="Servlet">
-   	 		<t:binding.http uri="http://localhost:9990/files"/>
-   		</service>
-   		<reference name="domainManagerConfiguration" target="DomainManagerConfigurationComponent"/>
-    </component>
-
-    <component name="DomainCompositeCollectionComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.DeployedCompositeCollectionImpl"/>
-        <property name="compositeFile">domain.composite</property>
-   		<service name="ItemCollection">
-   	 		<t:binding.atom uri="http://localhost:9990/composite" title="Domain Composite"/>
-   		</service>
-        <reference name="deployableCollection" target="DeployableCompositeCollectionComponent/LocalItemCollection"/>
-   		<reference name="domainManagerConfiguration" target="DomainManagerConfigurationComponent"/>
-    </component>
-
-    <component name="DeployableCompositeServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.DeployableCompositeServiceImpl"/>
-   		<service name="Servlet">
-   	 		<t:binding.http uri="http://localhost:9990/composite-source"/>
-   		</service>
-        <reference name="deployableCollection" target="DeployableCompositeCollectionComponent/LocalItemCollection"/>
-   		<reference name="domainManagerConfiguration" target="DomainManagerConfigurationComponent"/>
-    </component>
-
-    <component name="DeployableCompositeCollectionComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.DeployableCompositeCollectionImpl"/>
-   		<service name="ItemCollection">
-   	 		<t:binding.atom uri="http://localhost:9990/deployable" title="Deployable Composites"/>
-   		</service>
-   		<reference name="domainManagerConfiguration" target="DomainManagerConfigurationComponent"/>
-   		<reference name="contributionCollection" target="ContributionCollectionComponent/LocalItemCollection"/>
-    </component>
-
-    <component name="CompositeGeneratorServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.CompositeGeneratorServiceImpl"/>
-   		<service name="Servlet">
-   	 		<t:binding.http uri="http://localhost:9990/composite-generated"/>
-   		</service>
-   		<reference name="domainManagerConfiguration" target="DomainManagerConfigurationComponent"/>
-   		<reference name="contributionCollection" target="ContributionCollectionComponent/LocalItemCollection"/>
-    </component>
-
-    <component name="CompositeConfigurationServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.CompositeConfigurationServiceImpl"/>
-   		<service name="Servlet">
-   	 		<t:binding.http uri="http://localhost:9990/composite-resolved"/>
-   		</service>
-   		<reference name="domainManagerConfiguration" target="DomainManagerConfigurationComponent"/>
-   		<reference name="contributionCollection" target="ContributionCollectionComponent/LocalItemCollection"/>
-   		<reference name="domainCompositeCollection" target="DomainCompositeCollectionComponent/LocalItemCollection"/>
-   		<reference name="cloudCollection" target="CloudCollectionComponent/LocalItemCollection"/>
-    </component>
-
-    <component name="CloudCollectionComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.DeployedCompositeCollectionImpl"/>
-        <property name="compositeFile">cloud.composite</property>
-        <property name="deploymentContributionDirectory">cloud</property>             
-   		<service name="ItemCollection">
-   	 		<t:binding.atom uri="http://localhost:9990/cloud" title="Cloud"/>
-   		</service>
-        <reference name="deployableCollection" target="DeployableCompositeCollectionComponent/LocalItemCollection"/>
-        <reference name="processCollection" target="NodeProcessCollectionFacadeComponent/LocalItemCollection"/>
-   		<reference name="domainManagerConfiguration" target="DomainManagerConfigurationComponent"/>
-    </component>
-
-    <component name="CloudCompositeServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.DeployableCompositeServiceImpl"/>
-   		<service name="Servlet">
-   	 		<t:binding.http uri="http://localhost:9990/cloud-source"/>
-   		</service>
-        <reference name="deployableCollection" target="DeployableCompositeCollectionComponent/LocalItemCollection"/>
-   		<reference name="domainManagerConfiguration" target="DomainManagerConfigurationComponent"/>
-    </component>
-
-    <component name="CompositeConfigurationCollectionComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.CompositeConfigurationCollectionImpl"/>
-   		<service name="ItemCollection">
-   	 		<t:binding.atom uri="http://localhost:9990/composite-config" title="Node Configuration"/>
-   		</service>
-   		<reference name="contributionCollection" target="ContributionCollectionComponent/LocalItemCollection"/>
-   		<reference name="cloudCollection" target="CloudCollectionComponent/LocalItemCollection"/>
-    </component>
-
-    <component name="NodeConfigurationServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.NodeConfigurationServiceImpl"/>
-   		<service name="Servlet">
-   	 		<t:binding.http uri="http://localhost:9990/node-config"/>
-   		</service>
-   		<reference name="contributionCollection" target="ContributionCollectionComponent/LocalItemCollection"/>
-   		<reference name="cloudCollection" target="CloudCollectionComponent/LocalItemCollection"/>
-    </component>
-
-    <component name="QuickStartServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.QuickStartServiceImpl"/>
-   		<service name="Servlet">
-   	 		<t:binding.http uri="http://localhost:9990/quickstart"/>
-   		</service>
-   		<reference name="contributionCollection" target="ContributionCollectionComponent/LocalItemCollection"/>
-        <reference name="deployableCollection" target="DeployableCompositeCollectionComponent/LocalItemCollection"/>
-   		<reference name="domainCompositeCollection" target="DomainCompositeCollectionComponent/LocalItemCollection"/>
-   		<reference name="cloudCollection" target="CloudCollectionComponent/LocalItemCollection"/>
-   		<reference name="processCollection" target="NodeProcessCollectionComponent/LocalItemCollection"/>
-    </component>
-
-    <component name="NodeProcessCollectionFacadeComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.NodeProcessCollectionFacadeImpl"/>
-   		<service name="ItemCollection">
-   	 		<t:binding.atom uri="http://localhost:9990/processes" title="Log"/>
-   		</service>
-   		<reference name="domainManagerConfiguration" target="DomainManagerConfigurationComponent"/>
-   		<reference name="cloudCollection" target="CloudCollectionComponent/LocalItemCollection"/>
-   		<reference name="processCollection" target="NodeProcessCollectionComponent/ItemCollection">
-   	 		<t:binding.atom/>
-   		</reference>
-    </component>
-
-    <component name="NodeProcessCollectionComponent">
-        <implementation.java class="org.apache.tuscany.sca.implementation.node.manager.NodeProcessCollectionImpl"/>
-   		<service name="ItemCollection">
-   	 		<t:binding.atom uri="http://localhost:9990/node/processes" title="Log"/>
-   		</service>
-    </component>
-
-    <component name="PingServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.implementation.node.manager.PingServiceImpl"/>
-   		<service name="Servlet">
-   	 		<t:binding.http uri="http://localhost:9990/ping"/>
-   		</service>
-    </component>
-    
-    <component name="DomainManagerConfigurationComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.manager.impl.DomainManagerConfigurationImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/cloud-gadget.html b/java/sca-contrib/modules/domain-manager/src/main/resources/cloud-gadget.html
deleted file mode 100644
index 619df54ede..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/cloud-gadget.html
+++ /dev/null
@@ -1,408 +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.    
--->
-<html>
-<head>
-<title>SCA Domain - Cloud</title>
-
-<script type="text/javascript" src="../cloud-gadget/cloud-gadget.js"></script>
-<script type="text/javascript" src="utils.js"></script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body>
-  <div id="cloudComposite">
-  
-  <form id="cloudCompositeForm">
-    <div id="composites" ></div>
-    <br>
-    &gt;<a href="" id="addNodeLink">Add</a>
-    &nbsp;<a href="" id="deleteNodeLink">Delete</a>
-    &nbsp;&nbsp;
-    <a href="" id="startNodeLink">Start</a>
-    &nbsp;<a href="" id="stopNodeLink">Stop</a>
-  </form>
-
-  <div id="newNode" style="visibility: hidden;">
-  <form id="newNodeForm">
-    <table width="100%">
-    <tr><th>Add a Node</th></tr>
-    <tr><td>Add a node to the cloud. The node will run the SCA components declared in the specified composite.</td></tr>
-    </table>
-    <br>
-    <table>
-    <tr><td>Node name:</td><td><input type="text" name="nodeName" size="50"/></td><td>e.g. YourNode</td></tr>
-    <tr><td>Node URI:</td><td><input type="text" name="nodeURI" size="50"/></td></td><td>e.g. http://yourhost:8080</td></tr>
-    <tr><td>Composite namespace:</td><td><input type="text" name="compositeNamespace" size="50"/></td></td><td>e.g. http://your/namespace</td></tr>
-    <tr><td>Composite name:</td><td><input type="text" name="compositeName" size="50"/></td></td><td>e.g. yourcomposite</td></tr>
-    <tr><td>Contribution URI:</td><td><input type="text" name="contributionURI" size="50"/></td></td><td>e.g. yourcontrib, http://yourcontrib</td></tr>
-    </table>
-    <input id="addNodeButton" type="button" value="Add" />
-  </form>
-  </div>
-  
-  </div>
-</body>
-
-<script type="text/javascript">
-
-	//@Reference
-	var cloudComposite = new Reference("cloudComposite");
-	
-	//@Reference
-	var domainComposite = new Reference("domainComposite");
-	
-	//@Reference
-	var processCollection = new Reference("processCollection");
-	
-	var gadget = gadget(window, document);
-	if (gadget.showStatus == null) {
-		gadget.showStatus = true;
-	}
-	if (gadget.showConfigurations == null) {
-		gadget.showConfigurations = true;
-	}
-
-	var cloudCompositeForm = elementByID(gadget, 'cloudCompositeForm');
-	var compositesElement = elementByID(gadget, 'composites');
-	var newNodeElement = elementByID(gadget, 'newNode');
-	var newNodeForm = elementByID(gadget, 'newNodeForm');
-	
-	var nodeNames;
-	var deployedComposites = new Array();
-	
-	function getNodes() {
-		cloudComposite.get("", getNodesResponse);
-	}
-	
-	function contributionURI(id) {
-       var i = id.indexOf(';');
-       return id.substring(10, i);
-	}
-	
-	function compositeName(id) {
-       var i = id.indexOf(';');
-       return id.substring(i + 1);
-	}
-	
-	function compositeLocalName(id) {
-		name = compositeName(id); 
-    	var i = name.indexOf(';');
-    	return name.substring(i + 1);
-	}
-	
-	function getNodesResponse(feed) {
-		nodeNames = new Array();      
-		if (feed != null) {
-			var entries = feed.getElementsByTagName("entry");
-			var composites = "";
-			composites += '<table width="100%">';
-			composites += '<tr><th>Node</th>';
-			if (gadget.showStatus) {
-				composites += '<th>Status</th>';
-			}
-			if (gadget.showComposites) {
-				composites += '<th>Composite</th>';
-			}
-			if (gadget.showContributions) {
-				composites += '<th>Contribution</th>';
-			}
-			if (gadget.showConfigurations) {
-				composites += '<th>Node Config</th>';
-			}
-			composites += '</tr>';
-			
-			for (var i=0; i<entries.length; i++) {
-				var nodeId = entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
-				var links = entries[i].getElementsByTagName("link");
-				var nodeLink = undefined;
-				var compositeLink = undefined;
-				var compositeId = "composite:undefined;undefined;undefined";
-				var uri = '<span style="color: red">unknown</span>';
-				var qname = undefined;
-				for (var l = 0; l < links.length; l++) {
-					var a = links[l].getAttribute('rel');
-					if (a == undefined) {
-					  nodeLink = links[l].getAttribute('href');
-					} else if (a == 'related') {
-					  compositeLink = links[l].getAttribute('href');
-					  var c = compositeLink.indexOf('composite:');
-					  compositeId = compositeLink.substring(c);
-					  uri = contributionURI(compositeId);
-					  qname = compositeName(compositeId);
-					}
-				}
-
-				var nodeName = compositeLocalName(nodeId);
-				nodeNames[i] = nodeName;
-				
-				var content = "";
-				if (entries[i].getElementsByTagName("content")[0].firstChild != null) {
-					content = entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
-				}
-
-				composites += '<tr>'
-				if (content.indexOf('<span id="problem"') != -1) {
-					composites += '<td><input name="composites" type="checkbox" value="' + nodeId + '">' +
-											'<a href=\"' + nodeLink + '\">' + nodeName + '</a></td>';
-					if (gadget.showStatus) {
-						composites += '<td><span id="status_' + nodeName + '">unknown</span></td>';
-					}
-					if (gadget.showComposites) {
-						composites += '<td>' + content + '</td>';
-					}
-					if (gadget.showContributions) {
-						composites += '<td>' + uri + '</td>';
-					}
-				} else {
-					composites += '<td><input name="composites" type="checkbox" value="' + nodeId + '">' +
-											'<a href=\"' + nodeLink + '\">' + nodeName + '</a></td>';
-					if (gadget.showStatus) {
-						composites += '<td><span id="status_' + nodeName + '">unknown</span></td>';
-					}
-					if (gadget.showComposites) {
-						composites += '<td><a href=\"' + compositeLink + '\">' + qname + '</a></td>';
-					}
-					if (gadget.showContributions) {
-						composites += '<td><a href="/contribution/' + uri + '">' + uri + '</a></td>';
-					}
-				}
-				if (gadget.showConfigurations) {
-					composites += '<td><a href="/node-config/' + nodeName + '"><img src="icons/feed-icon.png" border="0"></a></td>';
-				}
-				composites += '</tr>';
-			}
-			composites += '</table>';
-			compositesElement.innerHTML = composites;
-
-			processCollection.get("", getProcessesResponse);
-		}
-	}
-	
-	function getProcessesResponse(feed) {
-		if (feed != null) {
-			var nodeStatus = new Array();
-			
-			var entries = feed.getElementsByTagName("entry");
-			for (var i=0; i<entries.length; i++) {
-				var nodeName = entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
-				nodeStatus[nodeName] = 'started';
-			}
-
-			if (gadget.showStatus) {
-				for (var i = 0; i < nodeNames.length; i++) {
-					var element = elementByID(gadget, 'status_' + nodeNames[i]);
-					var nodeName = nodeNames[i];
-					if (nodeStatus[nodeName] == null) {
-						element.innerHTML = '<span>stopped</span>';
-					} else {
-						element.innerHTML = '<span><a style="color: green" href="/processes/?node=' + nodeName + '">started</a></span>';
-					}
-				}
-			}
-		}
-	}
-
-	function deleteNode() {
-		var composites  = array(cloudCompositeForm.composites);
-		for (var i = 0; i < composites.length; i++) {
-			if (composites[i].checked) {
-			    var id = composites[i].value;
-				cloudComposite.del(id, deleteNodeResponse);
-			}
-		}
-		return false;
-	}
-
-	function deleteNodeResponse() {
-	    getNodes();
-	}	
-
-	function addNode() {
-		var nodeName = newNodeForm.nodeName.value;
-		var nodeURI = newNodeForm.nodeURI.value;			
-		var compositeNamespace = newNodeForm.compositeNamespace.value;
-		var compositeName = newNodeForm.compositeName.value;
-		var contributionURI = newNodeForm.contributionURI.value;
-		var id  = 'composite:' +
-			'http://tuscany.apache.org/cloud' + ';' +
-			'http://tuscany.apache.org/cloud' + ';' +
-			nodeName;
-			
-		var entry = '<entry xmlns="http://www.w3.org/2005/Atom">\n' +
-              	'<id>' + id + '</id>\n' +
-              	'<content type="text/xml">\n' + 
-  				'<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"\n' +
-				'	xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"\n' +
-				'	targetNamespace="http://tuscany.apache.org/cloud"\n' +
-				'	xmlns:c="' + compositeNamespace + '"\n' +
-				'	name="' + nodeName + '">\n' +
-				'\n' +
-				'	<component name="' + nodeName + '">\n' +
-				'		<t:implementation.node uri="' + contributionURI + '" composite="c:' + compositeName + '"/>\n' +
-				'		<service name="Node">\n' +
-				'			<binding.ws uri="' + nodeURI + '"/>\n' +
-				'			<t:binding.http uri="' + nodeURI + '"/>\n' +
-				'			<t:binding.jsonrpc uri="' + nodeURI + '"/>\n' +
-				'			<t:binding.atom uri="' + nodeURI + '"/>\n' +
-				'		</service>\n' +
-				'	</component>\n' + 
-				'</composite>' +
-              	'</content>' +
-               	'</entry>';
-		cloudComposite.post(entry, addNodeResponse);
-	}
-
-	function addNodeResponse() {
-		newNodeForm.nodeName.value = "";
-		newNodeForm.nodeURI.value = "";
-		newNodeForm.compositeNamespace.value = "";
-		newNodeForm.compositeName.value = "";
-		newNodeForm.contributionURI.value = "";
-	    getNodes();
-	}	
-
-	function startNode() {
-		var composites  = array(cloudCompositeForm.composites);
-		for (var i = 0; i < composites.length; i++) {
-			if (composites[i].checked) {
-			    var id = nodeNames[i];
-			    
-				var entry = '<entry xmlns="http://www.w3.org/2005/Atom">' +
-              	'<id>' + id + '</id>' +
-               	'</entry>';
-				processCollection.post(entry, startNodeResponse);
-			}
-		}
-		return false;
-	}
-
-	function startNodeResponse() {
-		processCollection.get("", getProcessesResponse);
-		
-		var composites  = array(cloudCompositeForm.composites);
-		for (var i = 0; i < composites.length; i++) {
-			if (composites[i].checked) {
-			  composites[i].checked = false;
-			}
-		}
-	}	
-
-	function stopNode() {
-		var composites  = array(cloudCompositeForm.composites);
-		for (var i = 0; i < composites.length; i++) {
-			if (composites[i].checked) {
-			    var id = nodeNames[i];
-				processCollection.del(id, stopNodeResponse);
-			}
-		}
-		return false;
-	}
-
-	function stopNodeResponse() {
-		processCollection.get("", getProcessesResponse);
-		
-		var composites  = array(cloudCompositeForm.composites);
-		for (var i = 0; i < composites.length; i++) {
-			if (composites[i].checked) {
-			  composites[i].checked = false;
-			}
-		}
-	}	
-
-	function getComposites() {
-		domainComposite.get("", getCompositesResponse);
-	}
-	
-	function getCompositesResponse(feed) {
-		if (feed != null) {
-			var entries = feed.getElementsByTagName("entry");              
-			for (var i=0; i<entries.length; i++) {
-				var id = entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
-				deployedComposites[id] = id;
-			}
-		}
-	}
-
-	function suggestCompositeNamespaces() {
-		var namespaces = new Array();
-		for (var uri in deployedComposites) {
-			var qname = compositeName(uri);
-			var ns = qname.substring(0, qname.indexOf(';'));
-			namespaces[ns] = ns;
-		}
-		return array(namespaces);
-	}	
-
-	function suggestCompositeNames() {
-		var inputns = newNodeForm.compositeNamespace.value;
-		var names = new Array();
-		for (var uri in deployedComposites) {
-			var qname = compositeName(uri);
-			var sc = qname.indexOf(';');
-			var ns = qname.substring(0, sc);
-			var name = qname.substring(sc + 1);
-			if (ns == inputns || inputns == "") {
-				names[name] = name;
-			}
-		}
-		return array(names);
-	}	
-
-	function suggestContributionURIs() {
-		var inputns = newNodeForm.compositeNamespace.value;
-		var inputname = newNodeForm.compositeName.value;
-		var uris = new Array();
-		for (var uri in deployedComposites) {
-			var qname = compositeName(uri);
-			var sc = qname.indexOf(';');
-			var ns = qname.substring(0, sc);
-			var name = qname.substring(sc + 1);
-			if ((ns == inputns || inputns == "") && (name == inputname || inputname == "")) {
-				var curi = contributionURI(uri);
-				uris[curi] = curi;
-			}
-		}
-		return array(uris);
-	}
-
-	function toggleNewNode() {
-		var visibility = newNodeElement.style.visibility;
-		if (visibility == 'hidden') {
-			newNodeElement.style.visibility = 'visible';
-		} else {
-			newNodeElement.style.visibility = 'hidden';
-		}
-		return false;
-	}
-
-	elementByID(gadget, 'deleteNodeLink').onclick = deleteNode; 
-	elementByID(gadget, 'addNodeLink').onclick = toggleNewNode; 
-	elementByID(gadget, 'startNodeLink').onclick = startNode; 
-	elementByID(gadget, 'stopNodeLink').onclick = stopNode; 
-	elementByID(gadget, 'addNodeButton').onclick = addNode; 
-
-	getNodes();
-	getComposites();
-	suggest(newNodeForm.compositeNamespace, suggestCompositeNamespaces);
-	suggest(newNodeForm.compositeName, suggestCompositeNames);
-	suggest(newNodeForm.contributionURI, suggestContributionURIs);
-	
-</script>
-</html>
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/cloud.html b/java/sca-contrib/modules/domain-manager/src/main/resources/cloud.html
deleted file mode 100644
index d661d5d38b..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/cloud.html
+++ /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.    
--->
-<html>
-<head>
-<title>SCA Domain - Cloud</title>
-
-<script type="text/javascript" src="utils.js"></script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body>
-  <div id="toolbarGadgetDiv"></div>
-  <br>
-  
-  <span class=hd1>
-  SCA Domain<br><br>
-  Cloud</b>&nbsp;<a href="/cloud/"><img src="icons/feed-icon.png" border="0"></a>
-  </span>
-  <br>
-  Here is the list of SCA nodes configured in your SCA domain cloud.
-  <br><br>
-  
-  <div id="cloudGadgetDiv"></div>
-  
-  <iframe id="toolbarGadget" src="toolbar-gadget.html"></iframe>
-  <iframe id="cloudGadget" src="cloud-gadget.html"></iframe>
-</body>
-
-<script type="text/javascript">
-	var toolbarGadgetDiv = elementByID(document, 'toolbarGadgetDiv');
-	var cloudGadgetDiv = elementByID(document, 'cloudGadgetDiv');
-	
-	var toolbarGadget = elementByID(document, 'toolbarGadget');
-	var cloudGadget = elementByID(document, 'cloudGadget');
-	
-	function ongadget(win, doc) {
-		if (doc == content(toolbarGadget)) {
-			toolbarGadgetDiv.innerHTML = doc.body.innerHTML;
-			return toolbarGadgetDiv;
-		} else if (doc == content(cloudGadget)) {
-			cloudGadgetDiv.innerHTML = doc.body.innerHTML;
-			cloudGadgetDiv.showStatus = true;
-			cloudGadgetDiv.showComposites = true;
-			cloudGadgetDiv.showContributions = true;
-			cloudGadgetDiv.showConfigurations = true;
-			return cloudGadgetDiv;
-		}
-		return document;
-	}
-</script>
-</html>
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/composite-gadget.html b/java/sca-contrib/modules/domain-manager/src/main/resources/composite-gadget.html
deleted file mode 100644
index 82855a410a..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/composite-gadget.html
+++ /dev/null
@@ -1,277 +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.    
--->
-<html>
-<head>
-<title>SCA Domain - Domain Composite</title>
-
-<script type="text/javascript" src="../composite-gadget/composite-gadget.js"></script>
-<script type="text/javascript" src="utils.js"></script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body>
-  <div id="domainComposite">
-  
-  <form id="domainCompositeForm">
-    <div id="composites" ></div>
-    <br>
-     &gt;<a href="" id="addCompositeLink">Add</a>
-     &nbsp;<a href="" id="deleteCompositeLink">Delete</a>
-  </form>
-  
-  <div id="newComposite" style="visibility: hidden;">
-  <form id="newCompositeForm">
-    <table width="100%">
-    <tr><th>Add Composite</th></tr>
-    <tr><td>Add an SCA composite describing your SCA service components.</td></tr>
-    </table>
-    <br>
-	<table>    
-    <tr><td>Composite namespace:</td><td><input type="text" name="compositeNamespace" size="50"/></td><td>e.g. http://your/namespace</td></tr> 
-    <tr><td>Composite name:</td><td><input type="text" name="compositeName" size="50"/></td><td>e.g. yourcomposite</td></tr>
-    <tr><td>Contribution URI:</td><td><input type="text" name="contributionURI" size="50"/></td><td>e.g. yourcontrib, http://yourcontrib</td></tr>
-    </table>
-    <input id="addCompositeButton" type="button" value="Add" />
-  </form>
-  </div>
-  
-  </div>
-</body>
-
-<script type="text/javascript">
-	//@Reference
-	var domainComposite = new Reference("domainComposite");
-	
-	//@Reference
-	var workspace = new Reference("workspace");
-	
-	var gadget = gadget(window, document);
-	if (gadget.showContributions == null) {
-		gadget.showContributions = true;
-	}
-
-	var domainCompositeForm = elementByID(gadget, 'domainCompositeForm');
-	var compositesElement = elementByID(gadget, 'composites');
-	var newCompositeElement = elementByID(gadget, 'newComposite');
-	var newCompositeForm = elementByID(gadget, 'newCompositeForm');
-
-	var contributedComposites = new Array();
-	
-	function getComposites() {
-		domainComposite.get("", getCompositesResponse);
-	}
-	
-	function contributionURI(id) {
-	       var i = id.indexOf(';');
-	       return id.substring(10, i);
-	}
-	
-	function compositeName(id) {
-	       var i = id.indexOf(';');
-	       return id.substring(i + 1);
-	}
-		
-	function getCompositesResponse(feed) {
-		if (feed != null) {
-			var entries = feed.getElementsByTagName("entry");              
-			var composites = "";
-			composites += '<table width="100%">';
-			composites += '<tr><th>Composite</th>';
-			if (gadget.showContributions) {
-				composites += '<th>Contribution</th>';
-			}
-			if (gadget.showComponents) {
-				composites += '<th>Components</th>';
-			}
-			composites += '</tr>';
-			//'<th>Composite Configuration</th>' +
-			
-			for (var i=0; i<entries.length; i++) {
-				var id = entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
-				var link = entries[i].getElementsByTagName("link")[0].getAttribute("href");
-				var uri = contributionURI(id);
-				var qname = compositeName(id);
-
-				var content = "";
-				if (entries[i].getElementsByTagName("content")[0].firstChild != null) {
-					content = entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
-				}
-				var components = '';
-				var bs = content.indexOf('<span id="components">');
-				if (bs != -1) {
-					var es = content.indexOf('</span>', bs); 
-					components = content.substring(bs, es + 7);
-				} else {
-					bs = content.indexOf('<span id="problem"');
-					if (bs != -1) {
-						var es = content.indexOf('</span>', bs); 
-						components = content.substring(bs, es + 7);
-					}
-				}
-				
-				composites += '<tr>'
-				composites += '<td><input name="composites" type="checkbox" value="' + id + '">';
-				composites += '<a href=\"' + link + '\">' + qname + '</a></td>';
-				if (gadget.showContributions) {
-					composites += '<td><a href="/contribution/' + uri + '">' + uri + '</a></td>';
-				}
-				if (gadget.showComponents) {
-					composites += '<td class=tdw>' + components + '</td>';
-				}
-				//composites += '<td><a href="/composite-config/?composite=' + id + '"><img src="icons/feed-icon.png" border="0"></a></td>';
-				composites += '</tr>';
-			}
-			composites += '</table>';
-			compositesElement.innerHTML = composites;
-		}
-	}
-
-	function deleteComposite() {
-		var composites  = array(domainCompositeForm.composites);
-		for (var i = 0; i < composites.length; i++) {
-			if (composites[i].checked) {
-			    var id = composites[i].value;
-				domainComposite.del(id, deleteCompositeResponse);
-			}
-		}
-		return false;
-	}
-
-	function deleteCompositeResponse() {
-	    getComposites();
-	}	
-
-	function addComposite() {
-		var id  = 'composite:' +
-			newCompositeForm.contributionURI.value + ';' +
-			newCompositeForm.compositeNamespace.value + ';' +
-			newCompositeForm.compositeName.value;
-		var entry = '<entry xmlns="http://www.w3.org/2005/Atom">' +
-				'<title>' + id +'</title>' +
-              	'<id>' + id + '</id>' +
-               	'</entry>';
-		domainComposite.post(entry, addCompositeResponse);
-	}
-
-	function addCompositeResponse() {
-		newCompositeForm.compositeNamespace.value = "";
-		newCompositeForm.compositeName.value = "";
-		newCompositeForm.contributionURI.value = "";
-	    getComposites();
-	}
-	
-	function getContributions() {
-		workspace.get("", getContributionsResponse);
-	}
-	
-	function getContributionsResponse(feed) {
-		if (feed != null) {
-			contributedComposites = new Array();
-			var entries = feed.getElementsByTagName("entry");              
-			for (var i=0; i<entries.length; i++) {
-				if (entries[i].getElementsByTagName("content")[0].firstChild != null) {
-					var content = entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
-					var bs = content.indexOf('<span id="deployables">');
-					if (bs != -1) {
-						var es = content.indexOf('</span>', bs); 
-						content = content.substring(bs, es + 7);
-						for (;;) {
-							var bc = content.indexOf('composite:');
-							if (bc == -1) {
-								break;
-							}
-							var ec = content.indexOf('">', bc);
-							if (ec == -1) {
-								break;
-							}
-							var uri = content.substring(bc, ec);
-							contributedComposites[uri] = uri;
-							content = content.substring(ec +1);
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	function suggestCompositeNamespaces() {
-		var namespaces = new Array();
-		for (var uri in contributedComposites) {
-			var qname = compositeName(uri);
-			var ns = qname.substring(0, qname.indexOf(';'));
-			namespaces[ns] = ns;
-		}
-		return array(namespaces);
-	}	
-
-	function suggestCompositeNames() {
-		var inputns = newCompositeForm.compositeNamespace.value;
-		var names = new Array();
-		for (var uri in contributedComposites) {
-			var qname = compositeName(uri);
-			var sc = qname.indexOf(';');
-			var ns = qname.substring(0, sc);
-			var name = qname.substring(sc + 1);
-			if (ns == inputns || inputns == "") {
-				names[name] = name;
-			}
-		}
-		return array(names);
-	}	
-
-	function suggestContributionURIs() {
-		var inputns = newCompositeForm.compositeNamespace.value;
-		var inputname = newCompositeForm.compositeName.value;
-		var uris = new Array();
-		for (var uri in contributedComposites) {
-			var qname = compositeName(uri);
-			var sc = qname.indexOf(';');
-			var ns = qname.substring(0, sc);
-			var name = qname.substring(sc + 1);
-			if ((ns == inputns || inputns == "") && (name == inputname || inputname == "")) {
-				var curi = contributionURI(uri);
-				uris[curi] = curi;
-			}
-		}
-		return array(uris);
-	}
-
-	function toggleNewComposite() {
-		var visibility = newCompositeElement.style.visibility;
-		if (visibility == 'hidden') {
-			newCompositeElement.style.visibility = 'visible';
-		} else {
-			newCompositeElement.style.visibility = 'hidden';
-		}
-		return false;
-	}
-
-	elementByID(gadget, 'deleteCompositeLink').onclick = deleteComposite; 
-	elementByID(gadget, 'addCompositeLink').onclick = toggleNewComposite; 
-	elementByID(gadget, 'addCompositeButton').onclick = addComposite; 
-
-	getComposites();
-	getContributions();
-	suggest(newCompositeForm.compositeNamespace, suggestCompositeNamespaces);
-	suggest(newCompositeForm.compositeName, suggestCompositeNames);
-	suggest(newCompositeForm.contributionURI, suggestContributionURIs);
-		
-</script>
-</html>
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/composite.html b/java/sca-contrib/modules/domain-manager/src/main/resources/composite.html
deleted file mode 100644
index b0631e1d66..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/composite.html
+++ /dev/null
@@ -1,66 +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.    
--->
-<html>
-<head>
-<title>SCA Domain - Domain Composite</title>
-
-<script type="text/javascript" src="utils.js"></script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body>
-  <div id="toolbarGadgetDiv"></div>
-  <br>
-  
-  <span class=hd1>
-  SCA Domain<br><br>
-  Domain Composite&nbsp;<a href="/composite/"><img src="icons/feed-icon.png" border="0"></a>
-  </span>
-  <br>
-  Here is the list of SCA composites currently included as top-level composites in your SCA domain.
-  <br><br>
-  
-  <div id="compositeGadgetDiv"></div>
-  
-  <iframe id="toolbarGadget" src="toolbar-gadget.html"></iframe>
-  <iframe id="compositeGadget" src="composite-gadget.html"></iframe>
-</body>
-
-<script type="text/javascript">
-	var toolbarGadgetDiv = elementByID(document, 'toolbarGadgetDiv');
-	var compositeGadgetDiv = elementByID(document, 'compositeGadgetDiv');
-	
-	var toolbarGadget = elementByID(document, 'toolbarGadget');
-	var compositeGadget = elementByID(document, 'compositeGadget');
-	
-	function ongadget(win, doc) {
-		if (doc == content(toolbarGadget)) {
-			toolbarGadgetDiv.innerHTML = doc.body.innerHTML;
-			return toolbarGadgetDiv;
-		} else if (doc == content(compositeGadget)) {
-			compositeGadgetDiv.innerHTML = doc.body.innerHTML;
-			compositeGadgetDiv.showContributions = true;
-			compositeGadgetDiv.showComponents = true; 
-			return compositeGadgetDiv;
-		}
-		return document;
-	}
-</script>
-</html>
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/files-gadget.html b/java/sca-contrib/modules/domain-manager/src/main/resources/files-gadget.html
deleted file mode 100644
index 83315a1957..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/files-gadget.html
+++ /dev/null
@@ -1,124 +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.    
--->
-<html>
-<head>
-<title>SCA Domain - Contribution File Server</title>
-
-<script type="text/javascript" src="../files-gadget/files-gadget.js"></script>
-<script type="text/javascript" src="utils.js"></script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body>
-  <div id="fileServer">
-  
-  <form id="filesForm">
-    <div id="files" ></div>
-    <br>
-     &gt;<a href="" id="uploadFileLink">Upload</a>
-     &nbsp;<a href="" id="deleteFileLink">Delete</a>
-  </form>
-
-  <div id="uploadFile" style="visibility: hidden;">
-  <form method="post" id="uploadFileForm" enctype='multipart/form-data' action='/files'>
-    <table width="100%">
-    <tr><th>Upload File</th></tr>
-    <tr><td>Upload a file to the server.</td></tr>
-    </table>
-    <br>
-    <table border="0">
-    <tr><td>File:</td><td><input type="file" name="file" size="50"/></td></tr>
-    </table>
-    <br/>
-    <input id="uploadFileButton" type="button" value="Upload" />
-  </form>
-  </div>    
-      
-  </div>
-</body>
-
-<script type="text/javascript">
-	//@Reference
-	var files = new Reference("files");
-
-	var gadget = gadget(window, document);
-
-	var filesForm = elementByID(gadget, "filesForm");
-	var filesElement = elementByID(gadget, 'files');
-	var uploadFileElement = elementByID(gadget, 'uploadFile');
-	var uploadFileForm = elementByID(gadget, 'uploadFileForm');
-	
-	function getFiles() {
-		files.get("", getFilesResponse);
-	}
-	
-	function getFilesResponse(feed) {
-		if (feed != null) {
-			var entries = feed.getElementsByTagName("entry");              
-			var list = '<table width="100%"><tr><th>Files</th></tr>';
-			for (var i=0; i<entries.length; i++) {
-				var id = entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
-				var location = entries[i].getElementsByTagName("link")[0].getAttribute("href");
-				list += '<tr><td><input name="files" type="checkbox" value="' + id + '">' +
-											'<a href=\"' + location + '\">' + id + '</a></td></tr>';
-			}
-			list += "</table>";
-			filesElement.innerHTML = list;
-		}
-	}				
-
-	function deleteFile() {
-		var list = array(filesForm.files);
-		for (var i=0; i < list.length; i++) {
-			if (list[i].checked) {
-			    var id = list[i].value;
-				files.del(id, deleteFileResponse);
-			}
-		}
-		return false;
-	}
-
-	function deleteFileResponse() {
-	    getFiles();
-	}
-
-	function uploadFile() {
-		uploadFileForm.submit();
-		return false;
-	}
-
-	function toggleUploadFile() {
-		var visibility = uploadFileElement.style.visibility;
-		if (visibility == 'hidden') {
-			uploadFileElement.style.visibility = 'visible';
-		} else {
-			uploadFileElement.style.visibility = 'hidden';
-		}
-		return false;
-	}
-
-	elementByID(gadget, 'deleteFileLink').onclick = deleteFile; 
-	elementByID(gadget, 'uploadFileLink').onclick = toggleUploadFile; 
-	elementByID(gadget, 'uploadFileButton').onclick = uploadFile; 
-
-	getFiles();
-
-</script>
-</html>
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/files.html b/java/sca-contrib/modules/domain-manager/src/main/resources/files.html
deleted file mode 100644
index 37d89e7665..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/files.html
+++ /dev/null
@@ -1,64 +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.    
--->
-<html>
-<head>
-<title>SCA Domain - Contribution File Server</title>
-
-<script type="text/javascript" src="utils.js"></script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body>
-  <div id="toolbarGadgetDiv"></div>
-  <br>
-
-  <span class=hd1>
-  SCA Domain<br><br>
-  File Server&nbsp;<a href="/feed/files/"><img src="icons/feed-icon.png" border="0"></a>
-  </span>
-  <br>
-  This is a simple ATOM-based file server useful to share files if you don't have an FTP, SVN or Maven repository.
-  <br><br>
-  
-  <div id="filesGadgetDiv"></div>
-  
-  <iframe id="toolbarGadget" src="toolbar-gadget.html"></iframe>
-  <iframe id="filesGadget" src="files-gadget.html"></iframe>
-</body>
-
-<script type="text/javascript">
-	var toolbarGadgetDiv = elementByID(document, 'toolbarGadgetDiv');
-	var filesGadgetDiv = elementByID(document, 'filesGadgetDiv');
-	
-	var toolbarGadget = elementByID(document, 'toolbarGadget');
-	var filesGadget = elementByID(document, 'filesGadget');
-	
-	function ongadget(win, doc) {
-		if (doc == content(toolbarGadget)) {
-			toolbarGadgetDiv.innerHTML = doc.body.innerHTML;
-			return toolbarGadgetDiv;
-		} else if (doc == content(filesGadget)) {
-			filesGadgetDiv.innerHTML = doc.body.innerHTML;
-			return filesGadgetDiv;
-		}
-		return document;
-	}
-</script>
-</html>
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/home-gadget.html b/java/sca-contrib/modules/domain-manager/src/main/resources/home-gadget.html
deleted file mode 100644
index 05e262e4df..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/home-gadget.html
+++ /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.    
--->
-<html>
-<head>
-<title>SCA Domain - Home</title>
-
-<script type="text/javascript" src="../home-gadget/home-gadget.js"></script>
-<script type="text/javascript" src="utils.js"></script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body>
-  <div id="home">
-  
-  <form>
-  <table border="0" align="center">
-  <tr><td valign="top"><span style="font-size:150%; color: blue">Search:</span></td><td><input type="text" name="search" size="50"/></td></tr>
-  <tr><td></td><td align="center"><input type="button" name="search" value="Search" /></td></tr>
-  </table>
-  </form>
-  
-  </div>
-</body>
-
-<script type="text/javascript">
-	var gadget = gadget(window, document);
-</script>
-</html>
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/home.html b/java/sca-contrib/modules/domain-manager/src/main/resources/home.html
deleted file mode 100644
index aad1856621..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/home.html
+++ /dev/null
@@ -1,65 +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.    
--->
-<html>
-<head>
-<title>SCA Domain - Home</title>
-
-<script type="text/javascript" src="utils.js"></script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body>
-  <div id="toolbarGadgetDiv"></div>
-  <br>
-  
-  <span class=hd1>
-  SCA Domain
-  </span>
-  <br><br><br><br><br><br>
-  
-  <div id="homeGadgetDiv"></div>
-  
-  <br><br><br><br><br><br><br>
-  <center>This page is under construction, searching the domain is not implemented yet.</center>
-  
-  <iframe id="toolbarGadget" src="toolbar-gadget.html" style="visibility: hidden;"></iframe>
-  <iframe id="homeGadget" src="home-gadget.html" style="visibility: hidden;"></iframe>
-</body>
-
-<script type="text/javascript">
-	var toolbarGadgetDiv = elementByID(document, 'toolbarGadgetDiv');
-	var homeGadgetDiv = elementByID(document, 'homeGadgetDiv');
-	
-	var toolbarGadget = elementByID(document, 'toolbarGadget');
-	var homeGadget = elementByID(document, 'homeGadget');
-	
-	function ongadget(win, doc) {
-		if (doc == content(toolbarGadget)) {
-			toolbarGadgetDiv.innerHTML = doc.body.innerHTML;
-			return toolbarGadgetDiv;
-		} else if (doc == content(homeGadget)) {
-			homeGadgetDiv.innerHTML = doc.body.innerHTML;
-			return homeGadgetDiv;
-		}
-		return document;
-	}
-</script>
-
-</html>
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/icons/feed-icon.png b/java/sca-contrib/modules/domain-manager/src/main/resources/icons/feed-icon.png
deleted file mode 100644
index a59728b2ad..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/icons/feed-icon.png
+++ /dev/null
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/manager.css b/java/sca-contrib/modules/domain-manager/src/main/resources/manager.css
deleted file mode 100644
index e080ff1d87..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/manager.css
+++ /dev/null
@@ -1,104 +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.
- */
-
-body {
-	white-space: nowrap; margin: 2px;
-}
-
-table {
-	border: 1px; border-collapse: separate
-}
-
-th {
-	font-weight: bold; white-space: nowrap; background-color: #e5ecf9; color: #598edd;
-	text-align: left; padding-left: 2px; padding-right: 20px; padding-top: 2px; padding-bottom: 2px; vertical-align: text-top;
-	border-top: 1px; border-bottom: 1px; border-left: 0px; border-right: 0px;
-	border-style: solid; border-top-color: #a2bae7; border-bottom-color: #d1d3d4
-}
-
-td {
-	padding-left: 2px; padding-top: 2px; padding-right: 20px; white-space: nowrap; vertical-align: text-top
-}
-
-iframe {
-	visibility: hidden;
-}
-
-input {
-	vertical-align: middle
-}
-
-a:link {
-  color: blue
-}
-
-a:visited {
-  color: blue
-}
-
-.tdw {
-	padding-left: 2px; padding-top: 2px; padding-right: 20px; white-space: normal; vertical-align: text-top
-}
-
-.hd1 {
-	font-size:150%; font-weight: bold
-}
-
-.tbar {
-	margin: 0px;
-	padding-top: 0px; padding-left: 0px; padding-right: 0px; padding-bottom: 3px;
-	border-bottom: 1px solid #a2bae7
-}
-
-.ltbar {
-	padding-left: 0px; padding-top: 0px; padding-right: 20px; white-space: nowrap; vertical-align: top
-}
-
-.rtbar {
-	padding-left: 0px; padding-right: 0px; padding-top: 0px; white-space: nowrap; vertical-align: top;
-	text-align: right
-}
-
-.suggest {
-	background-color: #e5ecf9; color: #598edd;
-	border-top: 1px; border-bottom: 1px; border-left: 1px; border-right: 1px;
-	border-style: solid; border-top-color: #a2bae7; border-bottom-color: #d1d3d4;
-	border-left-color: #d1d3d4; border-right-color: #d1d3d4;
-    position: absolute;
-    overflow: auto; overflow-x: hidden;
-    cursor: default;
-    padding: 0px; margin: 0px;
-}
-
-suggestTable {
-	border: 0px; border-collapse: separate;
-    padding-left: 5px; padding-right: 5px; padding-top: 2px; padding-bottom: 2px; 
-	margin: 0px;
-}
-
-.suggestItem {
-	padding-left: 2px; padding-top: 0px; padding-bottom: 0px; padding-right: 2px; white-space: nowrap; vertical-align: text-top;
-	background-color: #e5ecf9; color: #598edd;
-}
-
-.suggestHilighted {
-	padding-left: 2px; padding-top: 0px; padding-bottom: 0px; padding-right: 2px; white-space: nowrap; vertical-align: text-top;
-	background-color: #598edd; color: #e5ecf9;
-}
-
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/toolbar-gadget.html b/java/sca-contrib/modules/domain-manager/src/main/resources/toolbar-gadget.html
deleted file mode 100644
index c9389affc3..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/toolbar-gadget.html
+++ /dev/null
@@ -1,47 +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.    
--->
-<html>
-<head>
-<title>SCA Domain - Toolbar</title>
-
-<script type="text/javascript" src="utils.js"></script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body>
-  <div id="toolbar"></div>
-</body>
-
-<script type="text/javascript">
-	var gadget = gadget(window, document);
-
-	var tools = new Array();
-	tools[0] = new Tool("Contributions", "../workspace");
-	tools[1] = new Tool("Composites", "../composite");
-	tools[2] = new Tool("Cloud", "../cloud");
-	tools[3] = new Tool("Files", "../files");
-	
-	var home = new Tool("Home", "../home");
-
-	var toolbarDiv = elementByID(gadget, 'toolbar'); 
-	toolbarDiv.innerHTML = toolbar(home, tools);
-
-</script>
-</html>
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/utils.js b/java/sca-contrib/modules/domain-manager/src/main/resources/utils.js
deleted file mode 100644
index 77ed807e85..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/utils.js
+++ /dev/null
@@ -1,246 +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.    
- */
- 
-/**
- * Autocomplete / suggest support for input fields
- *
- * To use it declare a 'suggest' function as follows:
- * function suggestItems() {
- *   	return new Array('abc', 'def', 'ghi');
- * }
- *
- * then hook it to an input field as follows:
- * suggest(document.yourForm.yourInputField, suggestItems);
- */ 
-function selectSuggestion(node, value) {
-	for (;;) {
-		node = node.parentNode;
-		if (node.tagName.toLowerCase() == 'div') {
-      		break;
-      	}
-	}
-	node.selectSuggestion(value);
-}
-
-function hilightSuggestion(node, over) {
-	if (over) {
-  		node.className = 'suggestHilighted';
-	} else {
-		node.className = 'suggestItem';
-	}
-}
-
-function suggest(input, suggestFunction) {
-  	
-  	input.suggest = suggestFunction;
-  	
-	input.selectSuggestion = function(value) {
-		this.hideSuggestDiv();
-		this.value = value;
-	}
-	
-	input.hideSuggestDiv = function() {
-		if (this.suggestDiv != null) {
-			this.suggestDiv.style.visibility = 'hidden';
-		}
-	}
-	
-  	input.showSuggestDiv = function() {
-  		if (this.suggestDiv == null) {
-	  		this.suggestDiv = document.createElement('div');
-	  		this.suggestDiv.input = this;
-	  		this.suggestDiv.className = 'suggest';
-			input.parentNode.insertBefore(this.suggestDiv, input);
-			this.suggestDiv.style.visibility = 'hidden';
-		  	this.suggestDiv.style.zIndex = '99';
-		  	
-		  	this.suggestDiv.selectSuggestion = function(value) {
-		  		this.input.selectSuggestion(value);
-		  	}
-		}
-	  	
-  		var values = this.suggest();
-    	var items = "";
-    	for (var i = 0; i < values.length; i++) {
-    		if (values[i].indexOf(this.value) == -1) {
-    			continue;
-    		}
-    		if (items.length == 0) {
-    			items += '<table class=suggestTable>';
-    		}
-    		items += '<tr><td class="suggestItem" ' +
-    		'onmouseover="hilightSuggestion(this, true)" onmouseout="hilightSuggestion(this, false)" ' +
-    		'onmousedown="selectSuggestion(this, \'' + values[i] + '\')">' + values[i] + '</td></tr>';
-    	}
-    	if (items.length != 0) {
-    		items += '</table>';
-    	}
-	  	this.suggestDiv.innerHTML = items;
-	  	
-		if (items.length != 0) {
-			var node = input;		  	
-	        var left = 0;
-	        var top = 0;
-	        for (;;) {
-	            left += node.offsetLeft;
-	            top += node.offsetTop;
-	            node = node.offsetParent;
-	            if (node.tagName.toLowerCase() == 'body') {
-	            	break;
-	            }
-	        }
-		  	this.suggestDiv.style.left = left;
-		  	this.suggestDiv.style.top = top + input.offsetHeight;
-		  	this.suggestDiv.style.visibility = 'visible';
-		} else {
-			this.suggestDiv.style.visibility = 'hidden';
-		}
-  	}
-  	
-	input.onkeydown = function(event) {
-    	this.showSuggestDiv();
-	};
-
-	input.onkeyup = function(event) {
-    	this.showSuggestDiv();
-	};
-
-	input.onmousedown = function(event) {
-    	this.showSuggestDiv();
-	};
-
-	input.onblur = function(event) {
-		setTimeout(function() { input.hideSuggestDiv(); }, 50);
-	};
-}
-
-/**
- * A Toolbar class
- */ 
-function Tool(name, href) {
-	this.name = name;
-	this.href = href;
-}
-
-Tool.prototype.print = function() {
-    var loc = '' + location;
-	if (loc.match(this.href) == null) {
-		return '<a href="' + this.href + '" target="_parent">' + this.name + '</a>';
-	} else {
-		return '<span>' + this.name + '</span>';
-	}
-}
-
-/**
- * Initialize the toolbar
- */
-function toolbar(home, tools) {
-	var toolbar = '<table width="100%" cellpadding="0" cellspacing="0" class=tbar><tr>' +
-	'<td class=ltbar><table border="0" cellspacing="0" cellpadding="0"><tr>';
-   
-	for (var i = 0; i < tools.length; i++) {
-	   toolbar = toolbar + '<td class=ltbar>' +tools[i].print() + '</td>'
-   	}
-   
-   	toolbar = toolbar + '</tr></table></td>' + 
-   	'<td class=rtbar><table border="0" cellpadding="0" cellspacing="0" align="right"><tr>' +
-   	'<td class=rtbar>' + home.print() + '</td></tr></table></td>' +
-   	'</tr></table>';
-
-   	return toolbar;
-}
-
-/**
- * Return an non-sparse array from an array or an object. 
- */ 
-function array(obj) {
-    if (obj.length == undefined) {
-		var a = new Array();
-  		a[0] = obj;
-  		return a;
-  	}
-  	else {
-  		var a = new Array();
-  		var n = 0;
-  		for (var i in obj) {
-  			a[n++] = obj[i];
-  		}
-  		return a;
-  	}
-}
-
-/**
- * Dump a Javascript object to the console
- */
-function dump(o) {
-	for (f in o) {
-		try {
-			console.log(f + '=' + o[f]);
-		} catch (e) {}
-	}
-}
-
-/**
- * Return the content document of the given window.
- */
-function content(win) {
-	if (win.document != 'undefined' && win.document != null) {
-		return win.document;
-	} else if (win.contentDocument != 'undefined' && win.contentDocument != null) {
-		return win.contentDocument;
-	} else {
-		return null;
-	}
-}
-
-/**
- * Returns a child element with the given id.
- */
-function elementByID(node, id) {
-	for (var i in node.childNodes) {
-		var child = node.childNodes[i];
-		if (child.id == id) {
-			return child;
-		} else {
-			child = elementByID(child, id);
-			if (child != null) {
-				return child;
-			}
-		}
-	}
-	return null;
-}
-
-/**
- * Install a gadget.
- */
-function gadget(win, doc) {
-	var ongadget = null;
-	try {
-		if (win.parent.ongadget != null && win.parent.ongadget != 'undefined') {
-			ongadget = win.parent.ongadget;
-		}
-	} catch (e) {
-	}
-	if (ongadget != null) {
-		return ongadget(win, doc);
-	} else {
-		return doc;
-	}
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/workspace-gadget.html b/java/sca-contrib/modules/domain-manager/src/main/resources/workspace-gadget.html
deleted file mode 100644
index a4589b42e6..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/workspace-gadget.html
+++ /dev/null
@@ -1,232 +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.    
--->
-<html>
-<head>
-<title>SCA Domain - Contributions</title>
-
-<script type="text/javascript" src="../workspace-gadget/workspace-gadget.js"></script>
-<script type="text/javascript" src="utils.js"></script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body>
-  <div id="workspace">
-  
-  <form id="workspaceForm">
-	<div id="contributions" ></div>
-  	<br>
-     &gt;<a href="" id="addContributionLink">Add</a>
-     &nbsp;<a href="" id="deleteContributionLink">Delete</a>
-  </form>
-	
-  <div id="newContribution" style="visibility: hidden;">
-  <form id="newContributionForm">
-    <table width="100%">
-    <tr><th>Add Contribution</th></tr>
-    <tr><td>Add an SCA contribution containing your application artifacts to the SCA domain.</td></tr>
-    </table>
-    <br>
-    <table>
-    <tr><td>Contribution URI:</td><td><input type="text" name="contributionID" size="50"/></td></td><td>e.g. yourcontrib, http://yourcontrib</td></tr> 
-    <tr><td>Location:</td><td><input type="text" name="contributionLocation" size="50"/></td></td><td>e.g. http://host/yourjar.jar, file:/yourdir, file:/yourjar.jar</td></tr>
-    </table>
-    <input id="addContributionButton" type="button" value="Add" />
-  </form>
-  </div>
-  
-  </div>
-</body>
-
-<script type="text/javascript">
-
-	//@Reference
-	var workspace = new Reference("workspace");
-
-	var gadget = gadget(window, document);
-	if (gadget.showDependencies == null) {
-		gadget.showDependencies = true;
-	}
-
-	var workspaceForm = elementByID(gadget, 'workspaceForm');
-	var contributionsElement = elementByID(gadget, 'contributions');
-	var newContributionElement = elementByID(gadget, 'newContribution');
-	var newContributionForm = elementByID(gadget, 'newContributionForm');
-
-	var suggestedContributions = new Array();
-	
-	function getContributions() {
-		workspace.get("", getContributionsResponse);
-	}
-	
-	function getContributionsResponse(feed) {
-		if (feed != null) {
-			var entries = feed.getElementsByTagName("entry");              
-			var contributions = "";
-			contributions += '<table width="100%">';
-			contributions += '<tr><th>Contribution</th>';
-			if (gadget.showDependencies) {
-				contributions += '<th>Dependencies</td>';
-			}
-			if (gadget.showDeployables) {
-				contributions += '<th>Deployable Composites</th>';
-			}
-			contributions += '</tr>';
-			for (var i=0; i<entries.length; i++) {
-				var id = entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
-				var location = entries[i].getElementsByTagName("link")[0].getAttribute("href");
-				var content = '';
-				if (entries[i].getElementsByTagName("content")[0].firstChild != null) {
-					content = entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
-				}
-				
-				contributions += '<tr>';
-				contributions += '<td><input name="contributions" type="checkbox" value="' + id + '">' +
-											'<a href=\"' + location + '\">' + id + '</a></td>';
-	
-				var dependencies = '';
-				var bs = content.indexOf('<span id="dependencies">');
-				if (bs != -1) {
-					var es = content.indexOf('</span>', bs); 
-					dependencies = content.substring(bs, es + 7);
-				}
-											
-				var deployables = '';
-				var bs = content.indexOf('<span id="deployables">');
-				if (bs != -1) {
-					var es = content.indexOf('</span>', bs); 
-					deployables = content.substring(bs, es + 7);
-				}
-				
-				var problems = "";
-				var bs = content.indexOf('<span id="problems" ');
-				if (bs != -1) {
-					var es = content.indexOf('</span>', bs);
-					if (dependencies.length != 0) {
-					  problems = '<br>';
-					} 
-					problems += content.substring(bs, es + 7);
-				}
-
-				if (gadget.showDependencies) {
-					contributions += '<td class=tdw>' + dependencies + problems + ' </td>';
-				}
-				if (gadget.showDeployables) {
-					contributions += '<td class=tdw>' + deployables + '</td>';
-				}
-				contributions += '</tr>';
-			}
-			contributions += '</table>';
-			contributionsElement.innerHTML = contributions;
-		}
-	}				
-	
-	function getSuggestedContributions() {
-		workspace.get("?suggestions=true", getSuggestedContributionsResponse);
-	}
-	
-	function getSuggestedContributionsResponse(feed) {
-		suggestedContributions = new Array();
-		if (feed != null) {
-			var entries = feed.getElementsByTagName("entry");              
-			for (var i=0; i<entries.length; i++) {
-				var id = entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
-				var location = entries[i].getElementsByTagName("link")[1].getAttribute("href");
-				suggestedContributions[i] = id + ':' + location;	
-			}
-		}
-	}				
-	
-	function deleteContribution() {
-		var contributions  = array(workspaceForm.contributions);
-		for (var i=0; i < contributions.length; i++) {
-			if (contributions[i].checked) {
-			    var id = contributions[i].value;
-				alert("hey " + id);
-				workspace.del(id, deleteContributionResponse);
-			}
-		}
-		return false;
-	}
-	
-	function deleteContributionResponse() {
-	    getContributions();
-	}	
-	
-	function addContribution() {
-		var id  = newContributionForm.contributionID.value;
-		var location  = newContributionForm.contributionLocation.value;
-		var entry = '<entry xmlns="http://www.w3.org/2005/Atom">' +
-				'<title>Contribution - ' + id +'</title>' +
-	          	'<id>' + id + '</id>' +
-	          	'<link href="' + location + '" />' +
-	           	'</entry>';
-		workspace.post(entry, addContributionResponse);
-	}
-	
-	function addContributionResponse() {
-		newContributionForm.contributionID.value = "";
-		newContributionForm.contributionLocation.value = "";
-	    getContributions();
-	}
-	
-	function suggestContributionIDs() {
-		var ids = new Array();
-		for (var i=0; i<suggestedContributions.length; i++) {
-			var uri = suggestedContributions[i];
-			var id = uri.substring(0, uri.indexOf(':'));
-			ids[id] = id;
-		}
-		return array(ids);
-	}
-	
-	function suggestContributionLocations() {
-		var locations = new Array();
-		for (var i=0; i<suggestedContributions.length; i++) {
-			var uri = suggestedContributions[i];
-			var id = uri.substring(0, uri.indexOf(':'));
-			if (id == newContributionForm.contributionID.value) {
-				var location = uri.substring(uri.indexOf(':') +1);
-				locations[location] = location;
-			}
-		}
-		return array(locations);
-	}
-
-	function toggleNewContribution() {
-		var visibility = newContributionElement.style.visibility;
-		if (visibility == 'hidden') {
-			newContributionElement.style.visibility = 'visible';
-		} else {
-			newContributionElement.style.visibility = 'hidden';
-		}
-		return false;
-	}
-
-	elementByID(gadget, 'deleteContributionLink').onclick = deleteContribution; 
-	elementByID(gadget, 'addContributionLink').onclick = toggleNewContribution; 
-	elementByID(gadget, 'addContributionButton').onclick = addContribution; 
-
-	getContributions();
-	getSuggestedContributions();
-	suggest(newContributionForm.contributionID, suggestContributionIDs);
-	suggest(newContributionForm.contributionLocation, suggestContributionLocations);
-	
-</script>
-</html>
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/workspace.html b/java/sca-contrib/modules/domain-manager/src/main/resources/workspace.html
deleted file mode 100644
index 36c02ab1e6..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/workspace.html
+++ /dev/null
@@ -1,65 +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.    
--->
-<html>
-<head>
-<title>SCA Domain - Contributions</title>
-
-<script type="text/javascript" src="utils.js"></script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body>
-  <div id="toolbarGadgetDiv"></div>
-  <br>
-  
-  <span class=hd1>
-  SCA Domain<br><br>
-  Contributions</b>&nbsp;<a href="/workspace/"><img src="icons/feed-icon.png" border="0"></a>  </span>
-  <br>
-  Here is the list of SCA contributions currently available in your SCA domain.
-  <br><br>
-  
-  <div id="workspaceGadgetDiv"></div>
-  
-  <iframe id="toolbarGadget" src="toolbar-gadget.html"></iframe>
-  <iframe id="workspaceGadget" src="workspace-gadget.html"></iframe>
-</body>
-
-<script type="text/javascript">
-	var toolbarGadgetDiv = elementByID(document, 'toolbarGadgetDiv');
-	var workspaceGadgetDiv = elementByID(document, 'workspaceGadgetDiv');
-
-	var toolbarGadget = elementByID(document, 'toolbarGadget');
-	var workspaceGadget = elementByID(document, 'workspaceGadget');
-
-	function ongadget(win, doc) {
-		if (doc == content(toolbarGadget)) {
-			toolbarGadgetDiv.innerHTML = doc.body.innerHTML;
-			return toolbarGadgetDiv;
-		} else if (doc == content(workspaceGadget)) {
-			workspaceGadgetDiv.innerHTML = doc.body.innerHTML;
-			workspaceGadgetDiv.showDependencies = true;
-			workspaceGadgetDiv.showDeployables = true;
-			return workspaceGadgetDiv;
-		}
-		return document;
-	}
-</script>
-</html>
diff --git a/java/sca-contrib/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java b/java/sca-contrib/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
deleted file mode 100644
index 5e76556a14..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
+++ /dev/null
@@ -1,117 +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.domain.manager.impl;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-
-/**
- * Test case for the workspace admin services.
- *
- * @version $Rev$ $Date$
- */
-public class DomainManagerTestCase extends TestCase {
-
-    private ContributionCollectionImpl contributionCollection;
-    private DeployableCompositeCollectionImpl deployableCollection;
-    private DomainManagerConfigurationImpl domainManagerConfiguration;
-    
-    private static final String WORKSPACE_XML =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-        "<workspace xmlns=\"http://tuscany.apache.org/xmlns/sca/1.0\" " +
-        "xmlns:ns1=\"http://tuscany.apache.org/xmlns/sca/1.0\">\n" +
-        "</workspace>";
-    
-    @Override
-    protected void setUp() throws Exception {
-        ClassLoader cl = getClass().getClassLoader();
-
-        // Make sure we start with a clean workspace.xml file
-        URL url = cl.getResource("workspace.xml");
-        FileOutputStream os = new FileOutputStream(new File(url.toURI()));
-        Writer writer = new OutputStreamWriter(os);
-        writer.write(WORKSPACE_XML);
-        writer.flush();
-        writer.close();
-        
-        // Create a workspace collection component
-        domainManagerConfiguration = new DomainManagerConfigurationImpl();
-        domainManagerConfiguration.initialize();
-        String root = url.getFile();
-        root = root.substring(0, root.lastIndexOf('/'));
-        domainManagerConfiguration.setRootDirectory(root);
-        
-        contributionCollection = new ContributionCollectionImpl();
-        contributionCollection.domainManagerConfiguration = domainManagerConfiguration;
-        contributionCollection.workspaceFile = "workspace.xml";
-        contributionCollection.deploymentContributionDirectory = "cloud";
-        contributionCollection.domainManagerConfiguration = domainManagerConfiguration;
-        deployableCollection = new DeployableCompositeCollectionImpl();
-        deployableCollection.domainManagerConfiguration = domainManagerConfiguration;
-        deployableCollection.contributionCollection = contributionCollection;
-        contributionCollection.initialize();
-        deployableCollection.initialize();
-        
-        // Populate the workspace with test data
-        Item item = new Item();
-        item.setLink(cl.getResource("contributions/store").toString());
-        contributionCollection.post("store", item);
-        item.setLink(cl.getResource("contributions/assets").toString());
-        contributionCollection.post("assets", item);
-    }
-    
-    public void testGetAll() {
-        Entry<String, Item>[] entries = contributionCollection.getAll();
-        assertEquals(2, entries.length);
-        assertEquals(entries[0].getKey(), "store");
-    }
-
-    public void testGet() throws NotFoundException {
-        Item item = contributionCollection.get("assets");
-        assertTrue(item.getAlternate().endsWith("contributions/assets/"));
-    }
-    
-    public void testDependencies1() {
-        Entry<String, Item>[] entries = contributionCollection.query("alldependencies=store");
-        assertEquals(2, entries.length);
-    }
-    
-    public void testDependencies2() {
-        Entry<String, Item>[] entries = contributionCollection.query("alldependencies=assets");
-        assertEquals(1, entries.length);
-        assertEquals("assets", entries[0].getKey());
-    }
-    
-    public void testDeployables() throws NotFoundException {
-        Entry<String, Item>[] entries = deployableCollection.getAll();
-        assertEquals(1, entries.length);
-        assertEquals("composite:store;http://store;store", entries[0].getKey());
-    }
-    
-}
diff --git a/java/sca-contrib/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml b/java/sca-contrib/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
deleted file mode 100644
index 4eab6dd5e7..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,27 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://assets">
-   <export.java package="services"/>
-   <export.java package="services.merger"/>
-   <export.java package="services.db"/>
-   <import.java package="org.apache.tuscany.sca.data.collection"/>
-   <import.java package="org.apache.derby.*"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml b/java/sca-contrib/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
deleted file mode 100644
index 48d4be2d6e..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	          targetNamespace="http://store"
-              xmlns:s="http://store">
-   <deployable composite="s:store"/>
-   <import.java package="services"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/domain-manager/src/test/resources/workspace.xml b/java/sca-contrib/modules/domain-manager/src/test/resources/workspace.xml
deleted file mode 100644
index e6ac7d7701..0000000000
--- a/java/sca-contrib/modules/domain-manager/src/test/resources/workspace.xml
+++ /dev/null
@@ -1,21 +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.    
--->
-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
-</workspace>
diff --git a/java/sca-contrib/modules/host-corba-jee/LICENSE b/java/sca-contrib/modules/host-corba-jee/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/host-corba-jee/META-INF/MANIFEST.MF b/java/sca-contrib/modules/host-corba-jee/META-INF/MANIFEST.MF
deleted file mode 100644
index 71fbb7e6a9..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.host.corba.jee;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA JEE environment CORBA Host

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397427890

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA JEE environment CORBA Host

-Import-Package: javax.naming,

- javax.naming.spi;resolution:=optional,

- javax.rmi,

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.host.corba;version="2.0.0",

- org.omg.CORBA,

- org.omg.CORBA.portable;resolution:=optional,

- org.omg.CosNaming,

- org.omg.CosNaming.NamingContextPackage

-Bundle-SymbolicName: org.apache.tuscany.sca.host.corba.jee

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/host-corba-jee/NOTICE b/java/sca-contrib/modules/host-corba-jee/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/host-corba-jee/pom.xml b/java/sca-contrib/modules/host-corba-jee/pom.xml
deleted file mode 100644
index 29cd6209ae..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/pom.xml
+++ /dev/null
@@ -1,44 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>tuscany-host-corba-jee</artifactId>
-    <name>Apache Tuscany SCA JEE environment CORBA Host</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-corba</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>2.0-SNAPSHOT</version>
-	    <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java b/java/sca-contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
deleted file mode 100644
index b5fe9f5d0f..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.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 org.apache.tuscany.sca.host.corba.jee;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CorbaRuntimeModuleActivator implements ModuleActivator {
-
-    private JEECorbaHost server;
-
-    public void start(ExtensionPointRegistry extensionPointRegistry) {
-
-        // Register our Corba host
-        CorbaHostExtensionPoint corbaHosts = extensionPointRegistry.getExtensionPoint(CorbaHostExtensionPoint.class);
-
-        server = new JEECorbaHost();
-        try {
-            server.start();
-            corbaHosts.addCorbaHost(server);
-        } catch (Exception e) {
-
-        }
-    }
-
-    public void stop(ExtensionPointRegistry registry) {
-        if (server != null) {
-            server.stop();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java b/java/sca-contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
deleted file mode 100644
index 7e714c1ca5..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
+++ /dev/null
@@ -1,162 +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.host.corba.jee;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.rmi.PortableRemoteObject;
-
-import org.apache.tuscany.sca.host.corba.CorbaHost;
-import org.apache.tuscany.sca.host.corba.CorbaHostException;
-import org.apache.tuscany.sca.host.corba.CorbaHostUtils;
-import org.apache.tuscany.sca.host.corba.CorbanameURL;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.Object;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextExt;
-import org.omg.CosNaming.NamingContextExtHelper;
-import org.omg.CosNaming.NamingContextHelper;
-import org.omg.CosNaming.NamingContextPackage.InvalidName;
-import org.omg.CosNaming.NamingContextPackage.NotFound;
-
-/**
- * @version $Rev$ $Date$
- * Implementation of JEE CORBA host
- */
-public class JEECorbaHost implements CorbaHost {
-
-    public static final String ORB_NAME = "java:comp/ORB";
-
-    private List<String> registeredServants = Collections.synchronizedList(new ArrayList<String>());
-    private ORB orb;
-
-    private void registerURI(String uri) {
-        registeredServants.add(uri);
-    }
-
-    private void removeURI(String uri) {
-        registeredServants.remove(uri);
-    }
-
-    private NamingContextExt getNamingContext(String nameService) throws Exception {
-        org.omg.CORBA.Object objRef = orb.resolve_initial_references(nameService);
-        return NamingContextExtHelper.narrow(objRef);
-    }
-
-    private void handleException(Exception e) throws CorbaHostException {
-        // The cause of the Exception is JDK specific
-        if (e instanceof NotFound) {
-            throw new CorbaHostException(CorbaHostException.NO_SUCH_OBJECT, e);
-        } else if (e instanceof InvalidName) {
-            throw new CorbaHostException(e);
-        } else {
-            throw new CorbaHostException(e);
-        }
-    }
-
-    public void registerServant(String uri, Object servantObject) throws CorbaHostException {
-        CorbanameURL details = CorbaHostUtils.getServiceDetails(uri);
-        try {
-            NamingContext namingCtx = getNamingContext(details.getNameService());
-            for (int i = 0; i < details.getNamePath().size() - 1; i++) {
-                NameComponent nc = new NameComponent(details.getNamePath().get(i), "");
-                NameComponent[] path = new NameComponent[] {nc};
-                try {
-                    namingCtx = NamingContextHelper.narrow(namingCtx.resolve(path));
-                } catch (Exception e) {
-                    namingCtx = namingCtx.bind_new_context(path);
-                }
-            }
-            NameComponent finalName =
-                new NameComponent(details.getNamePath().get(details.getNamePath().size() - 1), "");
-            try {
-                namingCtx.resolve(new NameComponent[] {finalName});
-                // no exception means that some object is already registered
-                // under this name, we need to crash here
-                throw new CorbaHostException(CorbaHostException.BINDING_IN_USE);
-            } catch (NotFound e) {
-                namingCtx.bind(new NameComponent[] {finalName}, servantObject);
-                registerURI(uri);
-            }
-        } catch (CorbaHostException e) {
-            throw e;
-        } catch (Exception e) {
-            handleException(e);
-        }
-    }
-
-    public void unregisterServant(String uri) throws CorbaHostException {
-        CorbanameURL details = CorbaHostUtils.getServiceDetails(uri);
-        try {
-            NamingContextExt namingCtx = getNamingContext(details.getNameService());
-            namingCtx.unbind(namingCtx.to_name(details.getName()));
-            removeURI(uri);
-        } catch (Exception e) {
-            handleException(e);
-        }
-    }
-
-    public Object lookup(String uri) throws CorbaHostException {
-        Object result = null;
-        try {
-            CorbanameURL url = new CorbanameURL(uri);
-            NamingContextExt context = getNamingContext(url.getNameService());
-            result = context.resolve_str(url.getName());
-        } catch (Exception e) {
-            // e.printStackTrace();
-            handleException(e);
-        }
-        if (result == null) {
-            throw new CorbaHostException(CorbaHostException.NO_SUCH_OBJECT);
-        }
-        return result;
-    }
-
-    // obtain ORB from environment
-    public void start() throws CorbaHostException {
-        Context ctx;
-        try {
-            ctx = new InitialContext();
-            orb = (ORB)PortableRemoteObject.narrow(ctx.lookup(ORB_NAME), org.omg.CORBA.ORB.class);
-        } catch (Exception e) {
-            throw new CorbaHostException(e);
-        }
-    }
-
-    // unregister registered servants
-    public void stop() {
-        // use copy because unregisterServant(...) method removes from
-        // registeredServants collection
-        List<String> rsCopy = new ArrayList<String>(registeredServants);
-        for (String servantURI : rsCopy) {
-            try {
-                unregisterServant(servantURI);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/java/sca-contrib/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 3762550c01..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.host.corba.jee.CorbaRuntimeModuleActivator

diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java b/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
deleted file mode 100644
index fd952a02c7..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
+++ /dev/null
@@ -1,208 +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.host.corba.jee.testing;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
-
-import javax.naming.Context;
-
-import org.apache.tuscany.sca.host.corba.CorbaHostException;
-import org.apache.tuscany.sca.host.corba.jee.JEECorbaHost;
-import org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface;
-import org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterfaceHelper;
-import org.apache.tuscany.sca.host.corba.jee.testing.servants.TestInterfaceServant;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * General tests for JEECorbaHost. Uses host-corba-jdk as mock for JEE
- * environment ORB.
- */
-public class JEECorbaHostTestCase {
-
-    public static final String LOCALHOST = "localhost";
-    public static final int DEFAULT_PORT = 11100;
-    private static JEECorbaHost host;
-    private static TransientNameServer server;
-    private static String factoryClassName;
-
-    private String createCorbanameURI(String name) {
-        return "corbaname:#" + name;
-    }
-
-    @BeforeClass
-    public static void start() {
-        try {
-            server = new TransientNameServer(LOCALHOST, DEFAULT_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
-            Thread t = server.start();
-            if (t == null) {
-                fail("The naming server cannot be started");
-            }
-            factoryClassName = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
-            System.setProperty(Context.INITIAL_CONTEXT_FACTORY, TestInitialContextFactory.class.getName());
-            host = new JEECorbaHost();
-            host.start();
-        } catch (Throwable e) {
-            e.printStackTrace();
-            fail(e.getMessage());
-        }
-    }
-
-    @AfterClass
-    public static void stop() {
-        server.stop();
-        if (factoryClassName != null) {
-            System.setProperty(Context.INITIAL_CONTEXT_FACTORY, factoryClassName);
-        } else {
-            System.clearProperty(Context.INITIAL_CONTEXT_FACTORY);
-        }
-    }
-
-    /**
-     * Tests registering and lookup CORBA services
-     */
-    @Test
-    public void test_registerServant() {
-        try {
-            String uri = createCorbanameURI("Nested/Test");
-            TestInterface servant = new TestInterfaceServant();
-            host.registerServant(uri, servant);
-            TestInterface ref = TestInterfaceHelper.narrow(host.lookup(uri));
-            assertEquals(2, ref.getInt(2));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests unregistering servants
-     */
-    @Test
-    public void test_unregisterServant() {
-        try {
-            String uri = createCorbanameURI("Unregistering/Test");
-            TestInterface servant = new TestInterfaceServant();
-
-            // creating and releasing using corbaname URI
-            host.registerServant(uri, servant);
-            host.unregisterServant(uri);
-            host.registerServant(uri, servant);
-            host.unregisterServant(uri);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests situation when name is already registered
-     */
-    @Test
-    public void test_nameAlreadyRegistered() {
-        // test using URI
-        try {
-            TestInterface servant = new TestInterfaceServant();
-            String uri = createCorbanameURI("AlreadyRegisteredTest2");
-            host.registerServant(uri, servant);
-            host.registerServant(uri, servant);
-            fail();
-        } catch (CorbaHostException e) {
-            assertTrue(e.getMessage().equals(CorbaHostException.BINDING_IN_USE));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests getting non existing reference
-     */
-    @Test
-    public void test_getNonExistingObject() {
-        // try to fetch object with corbaname URI
-        try {
-            host.lookup(createCorbanameURI("NonExistingOne"));
-            fail();
-        } catch (CorbaHostException e) {
-            // The message is JDK-specific
-            // assertTrue(e.getMessage().equals(CorbaHostException.NO_SUCH_OBJECT));
-        } catch (Exception e) {
-            // e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests unregistering non existing reference
-     */
-    @Test
-    public void test_unregisterNonExistentObject() {
-        // test using URI
-        try {
-            String uri = createCorbanameURI("NonExistingReference1");
-            host.unregisterServant(uri);
-            fail();
-        } catch (CorbaHostException e) {
-            assertTrue(e.getMessage().equals(CorbaHostException.NO_SUCH_OBJECT));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests unregistering servants on host stop
-     */
-    @Test
-    public void test_unregisterOnStop() {
-        try {
-            String uri1 = createCorbanameURI("TempService1");
-            String uri2 = createCorbanameURI("TempService2");
-            JEECorbaHost innerHost = new JEECorbaHost();
-            innerHost.start();
-            TestInterfaceServant servant = new TestInterfaceServant();
-            innerHost.registerServant(uri1, servant);
-            innerHost.registerServant(uri2, servant);
-            innerHost.stop();
-            try {
-                innerHost.lookup(uri1);
-                fail();
-            } catch (CorbaHostException e) {
-                assertEquals(CorbaHostException.NO_SUCH_OBJECT, e.getMessage());
-            }
-            try {
-                innerHost.lookup(uri2);
-                fail();
-            } catch (CorbaHostException e) {
-                assertEquals(CorbaHostException.NO_SUCH_OBJECT, e.getMessage());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java b/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
deleted file mode 100644
index a0b9b7c514..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
+++ /dev/null
@@ -1,174 +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.host.corba.jee.testing;
-
-import java.util.Hashtable;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
-import org.apache.tuscany.sca.host.corba.jee.JEECorbaHost;
-import org.omg.CORBA.ORB;
-
-/**
- * Mock implementation of javax.naming.Context interface.
- */
-public class TestContext implements Context {
-
-    private ORB orb;
-
-    public Object addToEnvironment(String propName, Object propVal) throws NamingException {
-        return null;
-    }
-
-    public void bind(Name name, Object obj) throws NamingException {
-
-    }
-
-    public void bind(String name, Object obj) throws NamingException {
-
-    }
-
-    public void close() throws NamingException {
-
-    }
-
-    public Name composeName(Name name, Name prefix) throws NamingException {
-        return null;
-    }
-
-    public String composeName(String name, String prefix) throws NamingException {
-        return null;
-    }
-
-    public Context createSubcontext(Name name) throws NamingException {
-        return null;
-    }
-
-    public Context createSubcontext(String name) throws NamingException {
-        return null;
-    }
-
-    public void destroySubcontext(Name name) throws NamingException {
-
-    }
-
-    public void destroySubcontext(String name) throws NamingException {
-
-    }
-
-    public Hashtable<?, ?> getEnvironment() throws NamingException {
-        return null;
-    }
-
-    public String getNameInNamespace() throws NamingException {
-        return null;
-    }
-
-    public NameParser getNameParser(Name name) throws NamingException {
-        return null;
-    }
-
-    public NameParser getNameParser(String name) throws NamingException {
-        return null;
-    }
-
-    public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
-        return null;
-    }
-
-    public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
-        return null;
-    }
-
-    public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
-        return null;
-    }
-
-    public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
-        return null;
-    }
-
-    public Object lookup(Name name) throws NamingException {
-        return null;
-    }
-
-    public Object lookup(String name) throws NamingException {
-        try {
-            if (name.equals(JEECorbaHost.ORB_NAME)) {
-                if (orb == null) {
-                    // get ORB which was spawned under host and port declared in
-                    // test class
-                    String[] args =
-                        {"-ORBInitialHost", JEECorbaHostTestCase.LOCALHOST, "-ORBInitialPort",
-                         "" + JEECorbaHostTestCase.DEFAULT_PORT};
-                    orb = ORB.init(args, null);
-                }
-            } else {
-                throw new NamingException("Unknown name: " + name);
-            }
-        } catch (Exception e) {
-            throw new NamingException(e.getMessage());
-        }
-        return orb;
-    }
-
-    public Object lookupLink(Name name) throws NamingException {
-        return null;
-    }
-
-    public Object lookupLink(String name) throws NamingException {
-        return null;
-    }
-
-    public void rebind(Name name, Object obj) throws NamingException {
-
-    }
-
-    public void rebind(String name, Object obj) throws NamingException {
-
-    }
-
-    public Object removeFromEnvironment(String propName) throws NamingException {
-        return null;
-    }
-
-    public void rename(Name oldName, Name newName) throws NamingException {
-
-    }
-
-    public void rename(String oldName, String newName) throws NamingException {
-
-    }
-
-    public void unbind(Name name) throws NamingException {
-
-    }
-
-    public void unbind(String name) throws NamingException {
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java b/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
deleted file mode 100644
index f480235fa8..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.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.host.corba.jee.testing;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-
-/**
- * Factory for mock implementation of javax.naming.Context interface.
- */
-public class TestInitialContextFactory implements InitialContextFactory {
-
-    public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
-        return new TestContext();
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java b/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
deleted file mode 100644
index f9f3d4789e..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
+++ /dev/null
@@ -1,30 +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.host.corba.jee.testing.general;
-
-/**
-* org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* ¶roda, 25 czerwiec 2008 16:19:44 CEST
-*/
-
-public interface TestInterface extends TestInterfaceOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity {
-} // interface TestInterface
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java b/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
deleted file mode 100644
index 9ed4c81248..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
+++ /dev/null
@@ -1,100 +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.host.corba.jee.testing.general;
-
-/**
-* org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* ¶roda, 25 czerwiec 2008 16:19:44 CEST
-*/
-
-abstract public class TestInterfaceHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/host/corba/testing/general/TestInterface:1.0";
-
-    public static void insert(org.omg.CORBA.Any a,
-                              org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode =
-                org.omg.CORBA.ORB
-                    .init()
-                    .create_interface_tc(org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterfaceHelper.id(),
-                                         "TestInterface");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_TestInterfaceStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface)
-            return (org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface)obj;
-        else if (!obj._is_a(id()))
-            throw new org.omg.CORBA.BAD_PARAM();
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.host.corba.jee.testing.general._TestInterfaceStub stub =
-                new org.apache.tuscany.sca.host.corba.jee.testing.general._TestInterfaceStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface)
-            return (org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.host.corba.jee.testing.general._TestInterfaceStub stub =
-                new org.apache.tuscany.sca.host.corba.jee.testing.general._TestInterfaceStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java b/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
deleted file mode 100644
index 357c1eddb0..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
+++ /dev/null
@@ -1,51 +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.host.corba.jee.testing.general;
-
-/**
-* org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* ¶roda, 25 czerwiec 2008 16:19:44 CEST
-*/
-
-public final class TestInterfaceHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface value = null;
-
-    public TestInterfaceHolder() {
-    }
-
-    public TestInterfaceHolder(org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterfaceHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterfaceHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterfaceHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java b/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
deleted file mode 100644
index c2d4877791..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.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.host.corba.jee.testing.general;
-
-/**
-* org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* ¶roda, 25 czerwiec 2008 16:19:44 CEST
-*/
-
-public interface TestInterfaceOperations {
-    int getInt(int arg);
-} // interface TestInterfaceOperations
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java b/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
deleted file mode 100644
index 9846748775..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
+++ /dev/null
@@ -1,74 +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.host.corba.jee.testing.general;
-
-/**
-* org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* ¶roda, 25 czerwiec 2008 16:19:44 CEST
-*/
-
-public abstract class _TestInterfaceImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _TestInterfaceImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-        _methods.put("getInt", new java.lang.Integer(0));
-    }
-
-    public org.omg.CORBA.portable.OutputStream _invoke(String $method,
-                                                       org.omg.CORBA.portable.InputStream in,
-                                                       org.omg.CORBA.portable.ResponseHandler $rh) {
-        org.omg.CORBA.portable.OutputStream out = null;
-        java.lang.Integer __method = (java.lang.Integer)_methods.get($method);
-        if (__method == null)
-            throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-        switch (__method.intValue()) {
-            case 0: // org/apache/tuscany/sca/host/corba/testing/general/TestInterface/getInt
-            {
-                int arg = in.read_long();
-                int $result = (int)0;
-                $result = this.getInt(arg);
-                out = $rh.createReply();
-                out.write_long($result);
-                break;
-            }
-
-            default:
-                throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-        }
-
-        return out;
-    } // _invoke
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/host/corba/testing/general/TestInterface:1.0"};
-
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _TestInterfaceImplBase
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java b/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
deleted file mode 100644
index cd722214ed..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
+++ /dev/null
@@ -1,73 +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.host.corba.jee.testing.general;
-
-/**
-* org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* ¶roda, 25 czerwiec 2008 16:19:44 CEST
-*/
-
-public class _TestInterfaceStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface {
-
-    public int getInt(int arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("getInt", true);
-            $out.write_long(arg);
-            $in = _invoke($out);
-            int $result = $in.read_long();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return getInt(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // getInt
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/host/corba/testing/general/TestInterface:1.0"};
-
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-    private void readObject(java.io.ObjectInputStream s) throws java.io.IOException {
-        String str = s.readUTF();
-        String[] args = null;
-        java.util.Properties props = null;
-        org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init(args, props).string_to_object(str);
-        org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-        _set_delegate(delegate);
-    }
-
-    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
-        String[] args = null;
-        java.util.Properties props = null;
-        String str = org.omg.CORBA.ORB.init(args, props).object_to_string(this);
-        s.writeUTF(str);
-    }
-} // class _TestInterfaceStub
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java b/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
deleted file mode 100644
index 6195f3af9c..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
+++ /dev/null
@@ -1,35 +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.host.corba.jee.testing.servants;
-
-import org.apache.tuscany.sca.host.corba.jee.testing.general._TestInterfaceImplBase;
-
-/**
- * Testing servant 
- */
-public class TestInterfaceServant extends _TestInterfaceImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public int getInt(int arg) {
-        return arg;
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/resources/general.idl b/java/sca-contrib/modules/host-corba-jee/src/test/resources/general.idl
deleted file mode 100644
index 9194a37334..0000000000
--- a/java/sca-contrib/modules/host-corba-jee/src/test/resources/general.idl
+++ /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.    

- */

-

-/*

- * compile by

- * idlj -fall -oldImplBase general.idl

- */

- 

-module org {

-	module apache {

-		module tuscany {

-			module sca {

-				module host {

-					module corba {

-						module jee {

-							module testing {

-								module general {

-									interface TestInterface {

-										long getInt(in long arg);

-									};

-								};

-							};

-						};

-					};

-				};

-			};

-		};

-	};

-};

diff --git a/java/sca-contrib/modules/host-corba-jse-tns/LICENSE b/java/sca-contrib/modules/host-corba-jse-tns/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/host-corba-jse-tns/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/host-corba-jse-tns/META-INF/MANIFEST.MF b/java/sca-contrib/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
deleted file mode 100644
index 8edf701bf7..0000000000
--- a/java/sca-contrib/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.host.corba.jse.tns;version="1.

- 4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Transient Name Server CORBA Host

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397430015

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Transient Name Server CORBA Hos

- t

-Import-Package: org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.host.corba;version="2.0.0",

- org.apache.tuscany.sca.host.corba.jse;version="2.0.0",

- org.apache.tuscany.sca.host.corba.naming;version="2.0.0",

- org.omg.CORBA

-Bundle-SymbolicName: org.apache.tuscany.sca.host.corba.jse.tns

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/host-corba-jse-tns/NOTICE b/java/sca-contrib/modules/host-corba-jse-tns/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/host-corba-jse-tns/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/host-corba-jse-tns/pom.xml b/java/sca-contrib/modules/host-corba-jse-tns/pom.xml
deleted file mode 100644
index 5014507384..0000000000
--- a/java/sca-contrib/modules/host-corba-jse-tns/pom.xml
+++ /dev/null
@@ -1,53 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>tuscany-host-corba-jse-tns</artifactId>
-    <name>Apache Tuscany SCA Transient Name Server CORBA Host</name>
-
-    <dependencies>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-corba</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-corba-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java b/java/sca-contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
deleted file mode 100644
index 312d739c53..0000000000
--- a/java/sca-contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
+++ /dev/null
@@ -1,53 +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.host.corba.jse.tns;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint;
-import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
-
-/**
- * @version $Rev: 683329 $ $Date: 2008-08-06 19:06:39 +0200 (śro, 06 sie 2008) $
- */
-public class CorbaRuntimeModuleActivator implements ModuleActivator {
-    // private static final Logger logger =
-    // Logger.getLogger(CorbaRuntimeModuleActivator.class.getName());
-
-    private TnsDefaultCorbaHost server;
-
-    public void start(ExtensionPointRegistry extensionPointRegistry) {       
-        // Register our Corba host
-        CorbaHostExtensionPoint corbaHosts = extensionPointRegistry.getExtensionPoint(CorbaHostExtensionPoint.class);
-        server = new TnsDefaultCorbaHost();
-        if (corbaHosts.getCorbaHosts().size() > 0 && corbaHosts.getCorbaHosts().get(0) instanceof DefaultCorbaHost) {
-            // Set TnsDefaultCorbaHost as default when DefaultCorbaHost was registered before
-            corbaHosts.getCorbaHosts().add(0, server);     
-        } else {
-            corbaHosts.getCorbaHosts().add(server);
-        }
-    }
-
-    public void stop(ExtensionPointRegistry registry) {
-        if (server != null) {
-            server.stop();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java b/java/sca-contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
deleted file mode 100644
index 2dc2c7ddd4..0000000000
--- a/java/sca-contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
+++ /dev/null
@@ -1,116 +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.host.corba.jse.tns;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.host.corba.CorbaHost;
-import org.apache.tuscany.sca.host.corba.CorbaHostException;
-import org.apache.tuscany.sca.host.corba.CorbanameURL;
-import org.apache.tuscany.sca.host.corba.SocketUtil;
-import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.omg.CORBA.Object;
-
-/**
- * @version $Rev$ $Date$
- * Default implementation of CORBA host
- */
-public class TnsDefaultCorbaHost implements CorbaHost {
-    
-    private static final Logger logger = Logger.getLogger(TnsDefaultCorbaHost.class.getName());
-    private Map<Integer, TransientNameServer> localServers = new ConcurrentHashMap<Integer, TransientNameServer>();
-    private Map<Integer, Integer> clientsCount = new ConcurrentHashMap<Integer, Integer>();
-    private CorbaHost targetHost = new DefaultCorbaHost();
-
-    public void registerServant(String uri, Object servantObject) throws CorbaHostException {
-        CorbanameURL details = new CorbanameURL(uri);
-        if (SocketUtil.isLocalhost(details.getHost())) {
-            createLocalNameServer(details.getPort());
-        }
-        targetHost.registerServant(uri, servantObject);
-    }
-
-    public void unregisterServant(String uri) throws CorbaHostException {
-        targetHost.unregisterServant(uri);
-        CorbanameURL details = new CorbanameURL(uri);
-        if (SocketUtil.isLocalhost(details.getHost())) {
-            releaseLocalNameServer(details.getPort());
-        }
-    }
-
-    public Object lookup(String uri) throws CorbaHostException {
-        return targetHost.lookup(uri);
-    }
-
-    /**
-     * Starts transient name server under given port. If TNS was previously
-     * spawned it increments clients counter.
-     */
-    synchronized private void createLocalNameServer(int port) throws CorbaHostException {
-        int useCount = clientsCount.containsKey(port) ? clientsCount.get(port) : 0;
-        // no server previously spawned
-        if (useCount == 0) {
-            TransientNameServer server =
-                new TransientNameServer("localhost", port, TransientNameService.DEFAULT_SERVICE_NAME);
-            Thread thread = server.start();
-            if (thread == null) {
-                throw new CorbaHostException("TransientNameServer couldn't be started");
-            } else {
-                localServers.put(port, server);
-            }
-        }
-        clientsCount.put(port, ++useCount);
-    }
-
-    /**
-     * Stops transient name server if there is only one client left using such
-     * TNS. Decrements clients counter if TNS is used by 2 or more clients.
-     */
-    synchronized private void releaseLocalNameServer(int port) throws CorbaHostException {
-        int useCount = clientsCount.containsKey(port) ? clientsCount.get(port) : 0;
-        if (useCount == 1) {
-            // last client executed stop, cleaning up
-            TransientNameServer server = localServers.get(port);
-            if (server != null) {
-                server.stop();
-                clientsCount.remove(port);
-                localServers.remove(port);
-            } else {
-                logger.warning("Local name server on port " + port + " was null!");
-            }
-        } else if (useCount > 1) {
-            clientsCount.put(port, --useCount);
-        } else {
-            logger.warning("Tried to release non existing local name server on port " + port);
-        }
-
-    }
-
-    public void stop() {
-        for (TransientNameServer tns : localServers.values()) {
-            tns.stop();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/java/sca-contrib/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 906ec4efce..0000000000
--- a/java/sca-contrib/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.host.corba.jse.tns.CorbaRuntimeModuleActivator

diff --git a/java/sca-contrib/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java b/java/sca-contrib/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
deleted file mode 100644
index 39d9191f80..0000000000
--- a/java/sca-contrib/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
+++ /dev/null
@@ -1,97 +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.host.corba.testing;
-
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
-
-import java.net.Socket;
-import java.net.SocketException;
-
-import org.apache.tuscany.sca.binding.corba.provider.service.DynaCorbaServant;
-import org.apache.tuscany.sca.host.corba.jse.tns.TnsDefaultCorbaHost;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- * General tests
- */
-public class TnsDefaultCorbaHostTestCase {
-
-    private static TnsDefaultCorbaHost host;
-
-    @BeforeClass
-    public static void start() {
-        try {
-            host = new TnsDefaultCorbaHost();
-        } catch (Throwable e) {
-            e.printStackTrace();
-            fail(e.getMessage());
-        }
-    }
-
-    @AfterClass
-    public static void stop() {
-        host.stop();
-    }
-
-    /**
-     * Test for creating and releasing local name server
-     */
-    @Test
-    public void test_localNameServer() {
-        int testPort = 5070;
-        try {
-            String testUri1 = "corbaname::localhost:" + testPort + "#Test1";
-            String testUri2 = "corbaname::localhost:" + testPort + "#Test2";
-            String testUri3 = "corbaname::localhost:" + testPort + "#Test3";
-            DynaCorbaServant servant = new DynaCorbaServant(null, "IDL:org/apache/tuscany:1.0");
-            host.registerServant(testUri1, servant);
-            host.registerServant(testUri2, servant);
-            host.registerServant(testUri3, servant);
-            Thread.sleep(1000);
-            // make test connection to name server
-            Socket socket = new Socket("localhost", testPort);
-            socket.close();
-            // and stop server
-            host.unregisterServant(testUri1);
-            host.unregisterServant(testUri2);
-            // after releasing 2 clients 3rd should still hold the server
-            socket = new Socket("localhost", testPort);
-            socket.close();
-            host.unregisterServant(testUri3);
-            Thread.sleep(1000);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-        try {
-            // previously made 3rd stop so there should be no name server under
-            // this port
-            new Socket("localhost", testPort);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof SocketException);
-        }
-    }
-}
-
diff --git a/java/sca-contrib/modules/host-corba-jse/LICENSE b/java/sca-contrib/modules/host-corba-jse/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/host-corba-jse/META-INF/MANIFEST.MF b/java/sca-contrib/modules/host-corba-jse/META-INF/MANIFEST.MF
deleted file mode 100644
index 060baa69b9..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.host.corba.naming;uses:="org.om

- g.CosNaming.NamingContextPackage,org.omg.CosNaming,org.omg.CosNaming.

- NamingContextExtPackage,org.omg.CORBA,org.omg.PortableServer";version

- ="1.4",org.apache.tuscany.sca.host.corba.jse;uses:="org.omg.CosNaming

- .NamingContextPackage,org.omg.CosNaming,org.apache.tuscany.sca.host.c

- orba,org.omg.CORBA,org.apache.tuscany.sca.core";version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA JSE built-in CORBA Host

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397133187

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA JSE built-in CORBA Host

-Import-Package: org.apache.tuscany.sca.core;version="2.0.0",org.apache.t

- uscany.sca.host.corba;version="2.0.0",org.apache.tuscany.sca.host.corba

- .jse;version="2.0.0",org.apache.tuscany.sca.host.corba.naming;version="

- 1.4",org.omg.CORBA,org.omg.CosNaming,org.omg.CosNaming.NamingContextE

- xtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.PortableServ

- er,org.omg.CORBA.portable;resolu

- tion:=optional

-Bundle-SymbolicName: org.apache.tuscany.sca.host.corba.jse

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/host-corba-jse/NOTICE b/java/sca-contrib/modules/host-corba-jse/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/host-corba-jse/pom.xml b/java/sca-contrib/modules/host-corba-jse/pom.xml
deleted file mode 100644
index 72cb65f5b4..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/pom.xml
+++ /dev/null
@@ -1,38 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>tuscany-host-corba-jse</artifactId>
-    <name>Apache Tuscany SCA JSE built-in CORBA Host</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-corba</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java b/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
deleted file mode 100644
index 252a1512e4..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
+++ /dev/null
@@ -1,48 +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.host.corba.jse;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CorbaRuntimeModuleActivator implements ModuleActivator {
-    // private static final Logger logger =
-    // Logger.getLogger(CorbaRuntimeModuleActivator.class.getName());
-
-    private DefaultCorbaHost server;
-
-    public void start(ExtensionPointRegistry extensionPointRegistry) {
-
-        // Register our Corba host
-        CorbaHostExtensionPoint corbaHosts = extensionPointRegistry.getExtensionPoint(CorbaHostExtensionPoint.class);
-        server = new DefaultCorbaHost();
-        corbaHosts.addCorbaHost(server);
-    }
-
-    public void stop(ExtensionPointRegistry registry) {
-        if (server != null) {
-            server.stop();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java b/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
deleted file mode 100644
index 015644e19d..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
+++ /dev/null
@@ -1,181 +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.host.corba.jse;
-
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.host.corba.CorbaHost;
-import org.apache.tuscany.sca.host.corba.CorbaHostException;
-import org.apache.tuscany.sca.host.corba.CorbaHostUtils;
-import org.apache.tuscany.sca.host.corba.CorbanameURL;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.Object;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextExt;
-import org.omg.CosNaming.NamingContextExtHelper;
-import org.omg.CosNaming.NamingContextHelper;
-import org.omg.CosNaming.NamingContextPackage.InvalidName;
-import org.omg.CosNaming.NamingContextPackage.NotFound;
-
-/**
- * @version $Rev$ $Date$
- * Default implementation of JSE CORBA host
- */
-public class DefaultCorbaHost implements CorbaHost {
-    private static final Logger logger = Logger.getLogger(DefaultCorbaHost.class.getName());
-
-    private Map<String, ORB> orbs = new ConcurrentHashMap<String, ORB>();
-
-    private void validatePort(int port) throws IllegalArgumentException {
-        if (port < 1) {
-            throw new IllegalArgumentException("Port value should be > 0");
-        }
-    }
-
-    private NamingContextExt getNamingContext(ORB orb, String nameService) throws Exception {
-        org.omg.CORBA.Object objRef = orb.resolve_initial_references(nameService);
-        return NamingContextExtHelper.narrow(objRef);
-    }
-
-    private void handleException(Exception e) throws CorbaHostException {
-        // The cause of the Exception is JDK specific
-        if (e instanceof NotFound) {
-            throw new CorbaHostException(CorbaHostException.NO_SUCH_OBJECT, e);
-        } else if (e instanceof InvalidName) {
-            throw new CorbaHostException(e);
-        } else {
-            throw new CorbaHostException(e);
-        }
-    }
-
-    public void registerServant(String uri, Object servantObject) throws CorbaHostException {
-        CorbanameURL details = CorbaHostUtils.getServiceDetails(uri);
-        ORB orb = createORB(details.getHost(), details.getPort(), false);
-        try {
-            NamingContext namingCtx = getNamingContext(orb, details.getNameService());
-            for (int i = 0; i < details.getNamePath().size() - 1; i++) {
-                NameComponent nc = new NameComponent(details.getNamePath().get(i), "");
-                NameComponent[] path = new NameComponent[] {nc};
-                try {
-                    namingCtx = NamingContextHelper.narrow(namingCtx.resolve(path));
-                } catch (Exception e) {
-                    namingCtx = namingCtx.bind_new_context(path);
-                }
-            }
-            NameComponent finalName =
-                new NameComponent(details.getNamePath().get(details.getNamePath().size() - 1), "");
-            try {
-                namingCtx.resolve(new NameComponent[] {finalName});
-                // no exception means that some object is already registered
-                // under this name, we need to crash here
-                throw new CorbaHostException(CorbaHostException.BINDING_IN_USE);
-            } catch (NotFound e) {
-                namingCtx.bind(new NameComponent[] {finalName}, servantObject);
-            }
-        } catch (CorbaHostException e) {
-            throw e;
-        } catch (Exception e) {
-            handleException(e);
-        }
-    }
-
-    public void unregisterServant(String uri) throws CorbaHostException {
-        CorbanameURL details = CorbaHostUtils.getServiceDetails(uri);
-        ORB orb = createORB(details.getHost(), details.getPort(), false);
-        try {
-            NamingContextExt namingCtx = getNamingContext(orb, details.getNameService());
-            namingCtx.unbind(namingCtx.to_name(details.getName()));
-        } catch (Exception e) {
-            handleException(e);
-        }
-    }
-
-    public Object lookup(String uri) throws CorbaHostException {
-        Object result = null;
-        try {
-            CorbanameURL url = new CorbanameURL(uri);
-            ORB orb = createORB(url.getHost(), url.getPort(), false);
-            NamingContextExt context = getNamingContext(orb, url.getNameService());
-            result = context.resolve_str(url.getName());
-        } catch (Exception e) {
-            handleException(e);
-        }
-        if (result == null) {
-            throw new CorbaHostException(CorbaHostException.NO_SUCH_OBJECT);
-        }
-        return result;
-    }
-
-    public ORB createORB(String host, int port, boolean server) throws CorbaHostException {
-        validatePort(port);
-
-        String key = host + ":" + port;
-        ORB orb = orbs.get(key);
-        if (orb != null) {
-            return orb;
-        }
-        // Create an ORB object
-        Properties props = new Properties();
-        props.putAll(System.getProperties());
-
-        String portStr = String.valueOf(port);
-        props.put("org.omg.CORBA.ORBServerId", "1000000");
-        props.put("org.omg.CORBA.ORBInitialHost", host);
-        props.put("org.omg.CORBA.ORBInitialPort", portStr);
-
-        // STEP 1: Set ORBPeristentServerPort property
-        // Set the proprietary property to open up a port to listen to
-        // INS requests.
-
-        if (server) {
-            props.put("com.sun.CORBA.POA.ORBPersistentServerPort", portStr);
-            props.put("com.ibm.CORBA.ListenerPort", portStr);
-            props.put("gnu.CORBA.ListenerPort", portStr);
-            // props.put("org.omg.CORBA.ORBClass",
-            // "org.apache.yoko.orb.CORBA.ORB");
-            // props.put("org.omg.CORBA.ORBSingletonClass",
-            // "org.apache.yoko.orb.CORBA.ORBSingleton");
-            props.put("yoko.orb.oa.endpoint", "iiop --host " + host + " --port " + port);
-            props.put("yoko.orb.poamanager.TNameService.endpoint", "iiop --host " + host);
-        }
-
-        String[] args = {"-ORBInitialHost", host, "-ORBInitialPort", "" + port};
-        orb = ORB.init(args, props);
-        orbs.put(key, orb);
-        return orb;
-    }
-
-    public void stop() {
-        for (ORB orb : orbs.values()) {
-            try {
-                orb.shutdown(true);
-                orb.destroy();
-            } catch (Throwable e) {
-                logger.log(Level.SEVERE, e.getMessage(), e);
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java b/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
deleted file mode 100644
index 59f0ce9a53..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
+++ /dev/null
@@ -1,863 +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.    
- */
-/**
- * @version $Rev$ $Date$
- */
-
-package org.apache.tuscany.sca.host.corba.naming;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.CompletionStatus;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.SystemException;
-import org.omg.CosNaming.BindingType;
-import org.omg.CosNaming.BindingTypeHolder;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextExtPOA;
-import org.omg.CosNaming.NamingContextHelper;
-import org.omg.CosNaming.NamingContextExtPackage.InvalidAddress;
-import org.omg.CosNaming.NamingContextPackage.AlreadyBound;
-import org.omg.CosNaming.NamingContextPackage.InvalidName;
-import org.omg.CosNaming.NamingContextPackage.NotFound;
-import org.omg.CosNaming.NamingContextPackage.NotFoundReason;
-import org.omg.PortableServer.POA;
-
-public abstract class NamingContextBase extends NamingContextExtPOA {
-    // the real logger backing instance.  We use the interface class as the locator
-    protected static final Logger logger = Logger.getLogger(NamingContext.class.getName());
-
-    // set of URL characters that don't require escaping when encoded.
-    protected final String nonEscaped = ";/?:@&=+$;-_.!~* ()";
-    // the orb we're attached to
-    protected ORB orb;
-    // the poa we're associated with
-    protected POA poa;
-
-    /**
-     * Create a new base NamingContext (super class constructor
-     * for the derived classes).
-     *
-     * @param orb    The ORB this is hosted on.
-     *
-     * @exception java.lang.Exception
-     */
-    public NamingContextBase(ORB orb, POA poa) throws java.lang.Exception {
-        super();
-        this.orb = orb;
-        this.poa = poa;
-    }
-
-    /**
-     * Bind an object to a given name.
-     *
-     * @param n      An array of NameComponents that are the target name.
-     *               The last element in the array is binding name for the
-     *               object.  The remainder of the array is the path
-     *               for resolving the naming context, relative to the
-     *               current context.  All path contexts must already be
-     *               bound in the context tree.
-     * @param obj    The object to be bound.
-     *
-     * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
-     * @exception org.omg.CosNaming.NamingContextPackage.InvalidName
-     * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound
-     */
-    public void bind(org.omg.CosNaming.NameComponent[] n, org.omg.CORBA.Object obj)
-        throws org.omg.CosNaming.NamingContextPackage.NotFound, org.omg.CosNaming.NamingContextPackage.CannotProceed,
-        org.omg.CosNaming.NamingContextPackage.InvalidName, org.omg.CosNaming.NamingContextPackage.AlreadyBound {
-        // perform various name validations
-        validateName(n);
-
-        logNameComponent("bind() name", n);
-
-        // do we need to push through to a deeper naming context first?
-        if (n.length > 1) {
-            // resolve the top level name to a context, and have that context
-            // resolve the rest.
-            NamingContext context = resolveContext(n[0]);
-            NameComponent[] subName = extractSubName(n);
-
-            // now pass this along to the next context for the real bind operation.
-            context.bind(subName, obj);
-        } else {
-            NameComponent name = n[0];
-            // we need the resolveObject() and bindObject() calls to be consistent, so
-            // synchronize on this
-            synchronized (this) {
-                // see if we have this bound already...can't replace these.
-                BindingTypeHolder type = new BindingTypeHolder();
-                if (resolveObject(name, type) != null) {
-                    throw new AlreadyBound();
-                }
-                type.value = BindingType.nobject;
-                // ok, this is a new binding, go do it.
-                bindObject(name, obj, type);
-            }
-        }
-    }
-
-    /**
-     * Rebind an object to a given name.  If an object is
-     * already bound with this name, the new object replaces
-     * the bound object's value.  If no object has been
-     * bound already, this is the same as a bind operation.
-     *
-     * @param n      An array of NameComponents that are the target name.
-     *               The last element in the array is binding name for the
-     *               object.  The remainder of the array is the path
-     *               for resolving the naming context, relative to the
-     *               current context.  All path contexts must already be
-     *               bound in the context tree.
-     * @param obj    The new value for this binding.
-     *
-     * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
-     * @exception org.omg.CosNaming.NamingContextPackage.InvalidName
-     * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound
-     */
-    public void rebind(org.omg.CosNaming.NameComponent[] n, org.omg.CORBA.Object obj)
-        throws org.omg.CosNaming.NamingContextPackage.NotFound, org.omg.CosNaming.NamingContextPackage.CannotProceed,
-        org.omg.CosNaming.NamingContextPackage.InvalidName {
-        // perform various name validations
-        validateName(n);
-
-        logNameComponent("rebind() name", n);
-
-        // do we need to push through to a deeper naming context first?
-        if (n.length > 1) {
-            // resolve the top level name to a context, and have that context
-            // resolve the rest.
-            NamingContext context = resolveContext(n[0]);
-            NameComponent[] subName = extractSubName(n);
-
-            // now pass this along to the next context for the real bind operation.
-            context.rebind(subName, obj);
-        } else {
-            NameComponent name = n[0];
-            // we need the resolveObject() and bindObject() calls to be consistent, so
-            // synchronize on this
-            synchronized (this) {
-                // see if we have this bound already...can't replace these.
-                BindingTypeHolder type = new BindingTypeHolder();
-                // for a rebind, we must have an object, and it must be a real object
-                if (resolveObject(name, type) != null) {
-                    // it has to resolve to a real object.  If it is a naming context,
-                    // then this is the wrong binding operation.
-                    if (type.value.value() == BindingType._ncontext) {
-                        throw new NotFound(NotFoundReason.not_object, n);
-                    }
-                    // safe to unbind
-                    unbindObject(name);
-                }
-                type.value = BindingType.nobject;
-                // now bind this object
-                bindObject(name, obj, type);
-            }
-        }
-    }
-
-    /**
-     * Bind a new context to a given name.
-     *
-     * @param n      An array of NameComponents that are the target name.
-     *               The last element in the array is binding name for the
-     *               object.  The remainder of the array is the path
-     *               for resolving the naming context, relative to the
-     *               current context.  All path contexts must already be
-     *               bound in the context tree.
-     * @param nc     The new naming context added to the tree.
-     *
-     * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
-     * @exception org.omg.CosNaming.NamingContextPackage.InvalidName
-     * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound
-     */
-    public void bind_context(org.omg.CosNaming.NameComponent[] n, org.omg.CosNaming.NamingContext nc)
-        throws org.omg.CosNaming.NamingContextPackage.NotFound, org.omg.CosNaming.NamingContextPackage.CannotProceed,
-        org.omg.CosNaming.NamingContextPackage.InvalidName, org.omg.CosNaming.NamingContextPackage.AlreadyBound {
-        // perform various name validations
-        validateName(n);
-
-        logNameComponent("bind_context() name", n);
-
-        // do we need to push through to a deeper naming context first?
-        if (n.length > 1) {
-            // resolve the top level name to a context, and have that context
-            // resolve the rest.
-            NamingContext context = resolveContext(n[0]);
-            NameComponent[] subName = extractSubName(n);
-
-            // now pass this along to the next context for the real bind operation.
-            context.bind_context(subName, nc);
-        } else {
-            NameComponent name = n[0];
-            // we need the resolveObject() and bindObject() calls to be consistent, so
-            // synchronize on this
-            synchronized (this) {
-                // see if we have this bound already...can't replace these.
-                BindingTypeHolder type = new BindingTypeHolder();
-                if (resolveObject(name, type) != null) {
-                    throw new AlreadyBound();
-                }
-                type.value = BindingType.ncontext;
-                // ok, this is a new binding, go do it.
-                bindObject(name, nc, type);
-            }
-        }
-    }
-
-    /**
-     * Rebind a context to a given name.  If a context is
-     * already bound with this name, the new context replaces
-     * the existing context.  If no context has been
-     * bound already, this is the same as a bind operation.
-     *
-     * @param n      An array of NameComponents that are the target name.
-     *               The last element in the array is binding name for the
-     *               object.  The remainder of the array is the path
-     *               for resolving the naming context, relative to the
-     *               current context.  All path contexts must already be
-     *               bound in the context tree.
-     * @param nc     The new context to be bound with the name.
-     *
-     * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
-     * @exception org.omg.CosNaming.NamingContextPackage.InvalidName
-     * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound
-     */
-    public void rebind_context(org.omg.CosNaming.NameComponent[] n, org.omg.CosNaming.NamingContext nc)
-        throws org.omg.CosNaming.NamingContextPackage.NotFound, org.omg.CosNaming.NamingContextPackage.CannotProceed,
-        org.omg.CosNaming.NamingContextPackage.InvalidName {
-        // perform various name validations
-        validateName(n);
-
-        logNameComponent("rebind_context() name", n);
-
-        // do we need to push through to a deeper naming context first?
-        if (n.length > 1) {
-            // resolve the top level name to a context, and have that context
-            // resolve the rest.
-            NamingContext context = resolveContext(n[0]);
-            NameComponent[] subName = extractSubName(n);
-
-            // now pass this along to the next context for the real bind operation.
-            context.rebind_context(subName, nc);
-        } else {
-            NameComponent name = n[0];
-            // we need the resolveObject() and bindObject() calls to be consistent, so
-            // synchronize on this
-            synchronized (this) {
-                // see if we have this bound already...can't replace these.
-                BindingTypeHolder type = new BindingTypeHolder();
-                // for a rebind, we must have an object, and it must be a real object
-                if (resolveObject(name, type) != null) {
-                    // it has to resolve to a real object.  If it is a naming context,
-                    // then this is the wrong binding operation.
-                    if (type.value.value() != BindingType._ncontext) {
-                        throw new NotFound(NotFoundReason.not_context, n);
-                    }
-                    // safe to unbind
-                    unbindObject(name);
-                }
-                type.value = BindingType.ncontext;
-                // now bind this object
-                bindObject(name, nc, type);
-            }
-        }
-    }
-
-    /**
-     * Resolve an an entry in the context tree.  The
-     * resolved object may be a bound object or another
-     * NamingContext.  If the named entry is not found,
-     * a NotFound exception is thrown.
-     *
-     * @param n      An array of NameComponents that are the target name.
-     *               The last element in the array is binding name for the
-     *               object.  The remainder of the array is the path
-     *               for resolving the naming context, relative to the
-     *               current context.  All path contexts must already be
-     *               bound in the context tree.
-     *
-     * @return The object bound at the indicated location.
-     * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
-     * @exception org.omg.CosNaming.NamingContextPackage.InvalidName
-     * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound
-     */
-    public org.omg.CORBA.Object resolve(org.omg.CosNaming.NameComponent[] n)
-        throws org.omg.CosNaming.NamingContextPackage.NotFound, org.omg.CosNaming.NamingContextPackage.CannotProceed,
-        org.omg.CosNaming.NamingContextPackage.InvalidName {
-        // perform various name validations
-        validateName(n);
-
-        logNameComponent("resolve() name", n);
-
-        // do we need to push through to a deeper naming context first?
-        if (n.length > 1) {
-            // resolve the top level name to a context, and have that context
-            // resolve the rest.
-            NamingContext context = resolveContext(n[0]);
-            NameComponent[] subName = extractSubName(n);
-
-            // now pass this along to the next context for the real bind operation.
-            return context.resolve(subName);
-        } else {
-            NameComponent name = n[0];
-            // see if we have this bound already...can't replace these.
-            BindingTypeHolder type = new BindingTypeHolder();
-            org.omg.CORBA.Object obj = resolveObject(name, type);
-            if (obj == null) {
-                // Object was not found
-                throw new NotFound(NotFoundReason.missing_node, n);
-            }
-            return obj;
-        }
-    }
-
-    /**
-     * Remove an entry from the context tree.  The
-     * target object may be a bound object or another
-     * NamingContext.  If the named entry is not found,
-     * a NotFound exception is thrown.
-     *
-     * @param n      An array of NameComponents that are the target name.
-     *               The last element in the array is binding name for the
-     *               object.  The remainder of the array is the path
-     *               for resolving the naming context, relative to the
-     *               current context.  All path contexts must already be
-     *               bound in the context tree.
-     *
-     * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
-     * @exception org.omg.CosNaming.NamingContextPackage.InvalidName
-     * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound
-     */
-    public void unbind(org.omg.CosNaming.NameComponent[] n) throws org.omg.CosNaming.NamingContextPackage.NotFound,
-        org.omg.CosNaming.NamingContextPackage.CannotProceed, org.omg.CosNaming.NamingContextPackage.InvalidName {
-        // perform various name validations
-        validateName(n);
-
-        logNameComponent("unbind() name", n);
-
-        // do we need to push through to a deeper naming context first?
-        if (n.length > 1) {
-            // resolve the top level name to a context, and have that context
-            // resolve the rest.
-            NamingContext context = resolveContext(n[0]);
-            NameComponent[] subName = extractSubName(n);
-
-            // now pass this along to the next context for the real bind operation.
-            context.unbind(subName);
-        } else {
-            NameComponent name = n[0];
-            synchronized (this) {
-                // see if we have this bound already...can't replace these.
-                BindingTypeHolder type = new BindingTypeHolder();
-                org.omg.CORBA.Object obj = unbindObject(name);
-                if (obj == null) {
-                    // Object was not found
-                    throw new NotFound(NotFoundReason.missing_node, n);
-                }
-            }
-        }
-    }
-
-    /**
-     * Create a new context and bind it in at the target
-     * location.
-     *
-     * @param n      An array of NameComponents that are the target name.
-     *               The last element in the array is binding name for the
-     *               object.  The remainder of the array is the path
-     *               for resolving the naming context, relative to the
-     *               current context.  All path contexts must already be
-     *               bound in the context tree.
-     *
-     * @return The newly created context.
-     * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
-     * @exception org.omg.CosNaming.NamingContextPackage.InvalidName
-     * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound
-     */
-    public synchronized org.omg.CosNaming.NamingContext bind_new_context(org.omg.CosNaming.NameComponent[] n)
-        throws org.omg.CosNaming.NamingContextPackage.NotFound, org.omg.CosNaming.NamingContextPackage.AlreadyBound,
-        org.omg.CosNaming.NamingContextPackage.CannotProceed, org.omg.CosNaming.NamingContextPackage.InvalidName {
-        logNameComponent("bind_new_context() name", n);
-
-        NamingContext context = new_context();
-        try {
-            bind_context(n, context);
-            NamingContext returnContext = context;
-            // transfer this to another variable so the finally block doesn't try to destroy this.
-            context = null;
-            return returnContext;
-        } finally {
-            // if there is a bind failure on this, we need to ensure the context has
-            // an opportunity to clean up any of its resources.
-            if (context != null) {
-                try {
-                    context.destroy();
-                } catch (org.omg.CosNaming.NamingContextPackage.NotEmpty e) {
-                    // new contexts should be empty.
-                }
-            }
-        }
-    }
-
-    /**
-     * Convert an array of NameComponents into the string
-     * form of a context name.
-     *
-     * @param n      The array of NameComponents to convert.
-     *
-     * @return The context name, in string form.
-     * @exception org.omg.CosNaming.NamingContextPackage.InvalidName
-     */
-    public String to_string(org.omg.CosNaming.NameComponent[] n)
-        throws org.omg.CosNaming.NamingContextPackage.InvalidName {
-        validateName(n);
-
-        logNameComponent("to_string() name", n);
-
-        // convert the first part of the name
-        StringBuffer value = new StringBuffer();
-        ;
-        // convert the first component, then build up from there.
-        nameToString(n[0], value);
-
-        // the remainder need to get a separator
-        for (int i = 1; i < n.length; i++) {
-            value.append('/');
-            nameToString(n[i], value);
-        }
-        return value.toString();
-    }
-
-    /**
-     * Perform the reverse operation of the to_string() method,
-     * parsing a String context name into an array of
-     * NameComponents.
-     *
-     * @param sn     The string form of the name.
-     *
-     * @return An array of NameComponents parsed from the String name.
-     * @exception org.omg.CosNaming.NamingContextPackage.InvalidName
-     */
-    public org.omg.CosNaming.NameComponent[] to_name(String sn)
-        throws org.omg.CosNaming.NamingContextPackage.InvalidName {
-        // must have a argument to parse
-        if (sn == null || sn.length() == 0) {
-            throw new InvalidName();
-        }
-
-        List components = new ArrayList();
-
-        StringBuffer component = new StringBuffer();
-
-        int index = 0;
-        String id = null;
-        String kind = null;
-        while (index < sn.length()) {
-            char ch = sn.charAt(index++);
-
-            // found an escape character or a delimiter?
-            if (ch == '\\') {
-                // nothing after the escape?  Trouble
-                if (index >= sn.length()) {
-                    throw new InvalidName();
-                }
-                // get the next character
-                ch = sn.charAt(index++);
-                component.append(ch);
-            }
-            // we need to process the periods here, to avoid getting
-            // mixed up with unescaped periods.
-            else if (ch == '.') {
-                // already seen a period while scanning?  That's not allowed
-                if (id != null) {
-                    throw new InvalidName();
-                }
-                // pull off the id piece and reset the buffer
-                id = component.toString();
-                component.setLength(0);
-            }
-            // found a component delimiter?
-            else if (ch == '/') {
-                // not seen a id/kind separator yet?  This is an id with no kind
-                if (id == null) {
-                    id = component.toString();
-                    kind = "";
-                } else {
-                    // we have an id already, pull off the kind
-                    kind = component.toString();
-                }
-                // add the parsed name component
-                components.add(new NameComponent(id, kind));
-                // make sure these are all reset after pulling off a component
-                component.setLength(0);
-                id = null;
-                kind = null;
-            } else {
-                component.append(ch);
-            }
-        }
-
-        // parse the last section
-        // not seen a id/kind separator yet?  This is an id with no kind
-        if (id == null) {
-            id = component.toString();
-            kind = "";
-        } else {
-            // we have an id already, pull off the kind
-            kind = component.toString();
-        }
-        // add the parsed name component
-        components.add(new NameComponent(id, kind));
-
-        // and turn this into a component array
-        return (NameComponent[])components.toArray(new NameComponent[components.size()]);
-    }
-
-    /**
-     * Create a URL name for accessing a component by name.  The
-     * URL will have a corbaname: protocol.
-     *
-     * @param addr   The address location for the naming service used
-     *               to resolve the object.  This is in "host:port" form,
-     *               just line a corbaloc: URL.
-     * @param sn     The string mae of the target object.
-     *
-     * @return A URL for accessing this object, in String form.
-     * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidAddress
-     * @exception org.omg.CosNaming.NamingContextPackage.InvalidName
-     */
-    public String to_url(String addr, String sn) throws org.omg.CosNaming.NamingContextExtPackage.InvalidAddress,
-        org.omg.CosNaming.NamingContextPackage.InvalidName {
-        // basic validation
-        if (addr == null || addr.length() == 0) {
-            throw new InvalidAddress();
-        }
-
-        if (sn == null || sn.length() == 0) {
-            throw new InvalidName();
-        }
-
-        // TODO:  What validation, if any, needs to be done here?
-        return "corbaname:" + addr + "#" + encodeRFC2396Name(sn);
-    }
-
-    /**
-     * Resolve a bound object or context using a name
-     * in String form.
-     *
-     * @param n      The string name of the object context.  This must
-     *               be a form parseable by to_name().
-     *
-     * @return The bound object or context.
-     * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
-     * @exception org.omg.CosNaming.NamingContextPackage.InvalidName
-     */
-    public org.omg.CORBA.Object resolve_str(String n) throws org.omg.CosNaming.NamingContextPackage.NotFound,
-        org.omg.CosNaming.NamingContextPackage.CannotProceed, org.omg.CosNaming.NamingContextPackage.InvalidName {
-        // this is just a simple convenience method
-        return resolve(to_name(n));
-    }
-
-    // abstract methods that are part of the NamingContext interface that need to be
-    // implemented by the subclasses.
-
-    /**
-     * Create a new context of the same type as the
-     * calling context.
-     *
-     * @return A new NamingContext item.
-     * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     * @exception SystemException
-     */
-    public abstract org.omg.CosNaming.NamingContext new_context() throws SystemException;
-
-    /**
-     * Destroy a context.  This method should clean up
-     * any backing resources associated with the context.
-     *
-     * @exception org.omg.CosNaming.NamingContextPackage.NotEmpty
-     */
-    public abstract void destroy() throws org.omg.CosNaming.NamingContextPackage.NotEmpty;
-
-    /**
-     * Create a list of bound objects an contexts contained
-     * within this context.
-     *
-     * @param how_many The count of elements to return as a BindingList.
-     * @param bl       A holder element for returning the source binding list.
-     * @param bi       A holder for returning a BindingIterator.  Any extra
-     *                 elements not returned in the BindingList are returned
-     *                 in the BindingIterator.
-     *
-     * @exception SystemException
-     */
-    public abstract void list(int how_many,
-                              org.omg.CosNaming.BindingListHolder bl,
-                              org.omg.CosNaming.BindingIteratorHolder bi) throws SystemException;
-
-    // abstract methods for the sub class to implement
-
-    /**
-     * Resolve an object in this context (single level
-     * resolution).
-     *
-     * @param n      The name of the target object.
-     * @param type   A type holder for returning the bound object type
-     *               information.
-     *
-     * @return The bound object.  Returns null if the object does not
-     *         exist in the context.
-     * @exception SystemException
-     */
-    protected abstract org.omg.CORBA.Object resolveObject(NameComponent n, BindingTypeHolder type)
-        throws SystemException;
-
-    /**
-     * Bind an object into the current context.  This can
-     * be either an object or a naming context.
-     *
-     * @param n      The single-level name of the target object.
-     * @param obj    The object or context to be bound.
-     * @param type
-     *
-     * @exception SystemException
-     */
-    protected abstract void bindObject(NameComponent n, org.omg.CORBA.Object obj, BindingTypeHolder type)
-        throws SystemException;
-
-    /**
-     * Unbind an object from the current context.
-     *
-     * @param n      The name of the target object (single level).
-     *
-     * @return The object associated with the binding.  Returns null
-     *         if there was no binding currently associated with this
-     *         name.
-     * @exception SystemException
-     */
-    protected abstract org.omg.CORBA.Object unbindObject(NameComponent n) throws SystemException;
-
-    // implementation specific routines
-
-    /**
-     * Resolve a name to a context object stored that has
-     * already been stored in this context.  Throws an exception
-     * if the name cannot be resolved or if the resolved
-     * object is not a naming context.
-     *
-     * @param name   The target name.
-     *
-     * @return The resolved NamingContext object.
-     * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     */
-    protected synchronized NamingContext resolveContext(NameComponent name)
-        throws org.omg.CosNaming.NamingContextPackage.NotFound {
-        BindingTypeHolder type = new BindingTypeHolder();
-        // Resolve this to an object.  We must be able to resolve this.
-        org.omg.CORBA.Object resolvedReference = resolveObject(name, type);
-        if (resolvedReference == null) {
-            throw new NotFound(NotFoundReason.missing_node, new NameComponent[] {name});
-        }
-
-        // it has to resolve to a naming context
-        if (type.value.value() != BindingType._ncontext) {
-            throw new NotFound(NotFoundReason.not_context, new NameComponent[] {name});
-        }
-
-        // in theory, this is a naming context.  Narrow it an return.  Any
-        // errors just become a NotFound exception
-        try {
-            return NamingContextHelper.narrow(resolvedReference);
-        } catch (org.omg.CORBA.BAD_PARAM ex) {
-            throw new NotFound(NotFoundReason.not_context, new NameComponent[] {name});
-        }
-    }
-
-    /**
-     * Extract the tail portion of a name.  This is used
-     * to strip off the first name element so we can recurse
-     * on the name resolutions with a resolved context.
-     *
-     * @param name   The current name array (this MUST have 2 or more
-     *               elements).
-     *
-     * @return An array of NameComponent items that is one element
-     *         smaller than the argument array, with the elements
-     *         shifted over.
-     */
-    protected NameComponent[] extractSubName(NameComponent[] name) {
-        NameComponent[] subName = new NameComponent[name.length - 1];
-        System.arraycopy(name, 1, subName, 0, name.length - 1);
-        return subName;
-    }
-
-    /**
-     * Perform common name validity checking.
-     *
-     * @param n      The NameComponent array to check.
-     *
-     * @exception InvalidName
-     */
-    protected void validateName(NameComponent[] n) throws InvalidName {
-        // perform various name validations
-        if (n == null) {
-            throw new BAD_PARAM(27 | org.omg.CORBA.OMGVMCID.value, CompletionStatus.COMPLETED_NO);
-        }
-
-        // Valid name?
-        if (n.length < 1) {
-            throw new InvalidName();
-        }
-
-        // we have at least one name, so validate the toplevel item
-        NameComponent name = n[0];
-
-        // more name validation
-        if (name.id.length() == 0 && name.kind.length() == 0) {
-            throw new InvalidName();
-        }
-    }
-
-    /**
-     * Convert a NameComponent item into a string form,
-     * appending it to a StringBuffer.
-     *
-     * @param name   The source NameComponent.
-     * @param out    The StringBuffer location used to store the name
-     *               value (appended to the end).
-     */
-    protected void nameToString(NameComponent name, StringBuffer out) {
-        // if the id is null, then we base off of the kind.
-        if (name.id == null || name.id.length() == 0) {
-            out.append(".");
-            // true null name element?  That displays as a "."
-            if (name.kind != null && name.kind.length() != 0) {
-                escapeName(name.kind, out);
-            }
-        } else {
-            // escape the name
-            escapeName(name.id, out);
-            // have a kind qualifier to add on?
-            if (name.kind != null && name.kind.length() != 0) {
-                out.append(".");
-                escapeName(name.kind, out);
-            }
-        }
-    }
-
-    /**
-     * Process a name or kind element of a NameComponent,
-     * adding escape characters for '.' or '/' characters
-     * that might appear in the name.
-     *
-     * @param name   The name element to process.
-     * @param out    The StringBuffer to copy the escaped name into.
-     */
-    protected void escapeName(String name, StringBuffer out) {
-        // no characters requiring escapes (common)?
-        // use this directly
-        if (name.indexOf('.') == -1 && name.indexOf('/') == -1) {
-            out.append(name);
-        } else {
-            // scan the string adding the escapes
-            for (int i = 0; i < name.length(); i++) {
-                char ch = name.charAt(i);
-                if (ch == '.' || ch == '/') {
-                    out.append('/');
-                }
-                out.append(ch);
-            }
-        }
-    }
-
-    /**
-     * Perform RFC 2396 escape encoding of a name value.
-     *
-     * @param name   The input name value.
-     *
-     * @return An encoded name, with special characters converted
-     *         into a hex encoded value.
-     */
-    protected String encodeRFC2396Name(String name) {
-        StringBuffer value = new StringBuffer();
-
-        for (int i = 0; i < name.length(); i++) {
-            char ch = name.charAt(i);
-
-            // Alphanumerics and the "acceptable" set of special characters just get copied
-            // without encoding.
-            if (Character.isLetterOrDigit(ch) || nonEscaped.indexOf(ch) != -1) {
-                value.append(ch);
-            } else {
-                // this gets converted into a hex value, marked by "%".
-                value.append('%');
-                value.append(Integer.toHexString((int)ch));
-            }
-        }
-        return value.toString();
-    }
-
-    /**
-     * Test if debug logging is currently available.
-     *
-     * @return True if debug level (FINE) logging is currently turned on.
-     */
-    protected boolean isDebugEnabled() {
-        return logger.isLoggable(Level.FINE);
-    }
-
-    /**
-     * Log a line of debug output
-     *
-     * @param message The message to log
-     */
-    protected void debug(String message) {
-        logger.fine(message);
-    }
-
-    /**
-     * Log the name components passed in for a request.
-     *
-     * @param message A message describing the request context.
-     * @param n       The array of name components.
-     */
-    protected void logNameComponent(String message, NameComponent[] n) {
-        if (isDebugEnabled()) {
-            debug(message);
-            for (int i = 0; i < n.length; i++) {
-                debug("   NameComponent " + i + " id=" + n[i].id + " kind=" + n[i].kind);
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java b/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
deleted file mode 100644
index 599f5bca54..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
+++ /dev/null
@@ -1,133 +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.    
- */
-
-/**
- * @version $Rev$ $Date$
- */
-package org.apache.tuscany.sca.host.corba.naming;
-
-import org.omg.CORBA.ORB;
-
-/**
- * A stand-alone naming service launchable from a command line.
- */
-public class TransientNameServer {
-    private final TransientNameService service;
-    private final Object flag = new Object();
-    private Boolean started;
-
-    public TransientNameServer(String host, int port, String serviceName) {
-        this.service = new TransientNameService(host, port, serviceName);
-    }
-
-    public ORB getORB() {
-        return service.getORB();
-    }
-
-    public Thread start() {
-        Thread t = new Thread() {
-            public void run() {
-                ORB orb = null;
-                synchronized (flag) {
-                    try {
-                        service.run();
-                        orb = service.getORB();
-                        started = Boolean.TRUE;
-                    } catch (Throwable e) {
-                        started = Boolean.FALSE;
-                        throw new IllegalStateException(e);
-                    } finally {
-                        flag.notifyAll();
-                    }
-                }
-                // Wait for requests
-                orb.run();
-            }
-        };
-        t.setDaemon(true);
-        t.start();
-        checkState();
-        return t.isAlive() ? t : null;
-    }
-
-    private Boolean checkState() {
-        synchronized (flag) {
-            while (started == null) {
-                try {
-                    flag.wait();
-                } catch (InterruptedException e) {
-                    return null;
-                }
-            }
-            return started;
-        }
-    }
-
-    public void stop() {
-        if (started == Boolean.TRUE) {
-            service.destroy();
-        }
-    }
-
-    /**
-     * Launch a name service as a stand alone process.  The
-     * Host, port, and service name are controlled using
-     * program arguments.
-     *
-     * @param args   The array of arguments for tailoring the service.
-     *
-     * @exception Exception
-     */
-    public static void main(String args[]) throws Exception {
-        int port = TransientNameService.DEFAULT_SERVICE_PORT;
-        String host = TransientNameService.DEFAULT_SERVICE_HOST;
-        String serviceName = TransientNameService.DEFAULT_SERVICE_NAME;
-
-        // see if we have
-        for (int i = 0; i < args.length; i++) {
-            if (args[i].equals("-ORBInitialPort")) {
-                i++;
-                if (i < args.length) {
-                    port = java.lang.Integer.parseInt(args[i]);
-                } else {
-                    throw new IllegalArgumentException("Invalid -ORBInitialPort option");
-                }
-            } else if (args[i].equals("-ORBInitialHost")) {
-                i++;
-                if (i < args.length) {
-                    host = args[i];
-                } else {
-                    throw new IllegalArgumentException("Invalid -ORBInitialHost option");
-                }
-            } else if (args[i].equals("-ORBServiceName")) {
-                i++;
-                if (i < args.length) {
-                    serviceName = args[i];
-                } else {
-                    throw new IllegalArgumentException("Invalid -ORBServiceName option");
-                }
-            }
-
-        }
-        // create a services, and just spin it off.  We wait forever after that.
-        TransientNameServer server = new TransientNameServer(host, port, serviceName);
-        server.start().join();
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java b/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
deleted file mode 100644
index 77617a6c5c..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
+++ /dev/null
@@ -1,200 +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.    
- */
-
-/**
- * @version $Rev$ $Date$
- */
-package org.apache.tuscany.sca.host.corba.naming;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Properties;
-
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.Policy;
-import org.omg.PortableServer.IdAssignmentPolicyValue;
-import org.omg.PortableServer.LifespanPolicyValue;
-import org.omg.PortableServer.POA;
-import org.omg.PortableServer.ServantRetentionPolicyValue;
-
-/**
- * A transient name service attached to an ORB.  This
- * class manages all of the housekeeping for creating a
- * TransientNamingContext and a exposing it using an
- * ORB.
- */
-public class TransientNameService {
-    // the default registered name service
-    static public final String DEFAULT_SERVICE_NAME = "TNameService";
-    // the default listening port
-    static public final int DEFAULT_SERVICE_PORT = 900;
-    // the default host name
-    static public final String DEFAULT_SERVICE_HOST = "localhost";
-
-    // the service root context
-    protected TransientNamingContext initialContext;
-    // initial listening port
-    protected int port;
-    // initial listening host
-    protected String host;
-    // the service name (used for registing for the corbaloc:: URL name
-    protected String serviceName;
-    // the orb instance we're running on
-    protected ORB createdOrb;
-
-    /**
-     * Create a new TransientNameService, using all default
-     * attributes.
-     */
-    public TransientNameService() {
-        this(DEFAULT_SERVICE_HOST, DEFAULT_SERVICE_PORT, DEFAULT_SERVICE_NAME);
-    }
-
-    /**
-     * Create a default-named name service using the specified
-     * host and port parameters.
-     *
-     * @param host   The host to expose this under.
-     * @param port   The initial listening port.
-     */
-    public TransientNameService(String host, int port) {
-        this(host, port, DEFAULT_SERVICE_NAME);
-    }
-
-    /**
-     * Create a specifically-named name service using the specified
-     * host and port parameters.
-     *
-     * @param host   The host to expose this under.
-     * @param port   The initial listening port.
-     * @param name   The name to register this service under using the
-     *               BootManager.
-     */
-    public TransientNameService(String host, int port, String name) {
-        this.port = port;
-        this.host = host;
-        this.serviceName = name;
-    }
-
-    /**
-     * Start up the name service, including creating an
-     * ORB instance to expose it under.
-     *
-     * @exception TransientServiceException
-     */
-    public void run() throws TransientServiceException {
-        // Create an ORB object
-        Properties props = new Properties();
-        props.putAll(System.getProperties());
-
-        String portStr = String.valueOf(port);
-        props.put("org.omg.CORBA.ORBServerId", "1000000");
-        props.put("org.omg.CORBA.ORBInitialHost", host);
-        props.put("org.omg.CORBA.ORBInitialPort", portStr);
-
-        // STEP 1: Set ORBPeristentServerPort property
-        // Set the proprietary property to open up a port to listen to
-        // INS requests. 
-
-        props.put("com.sun.CORBA.POA.ORBPersistentServerPort", portStr);
-        props.put("com.ibm.CORBA.ListenerPort", portStr);
-        props.put("gnu.CORBA.ListenerPort", portStr);
-        //        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        //        props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
-        props.put("yoko.orb.oa.endpoint", "iiop --host " + host + " --port " + port);
-        props.put("yoko.orb.poamanager.TNameService.endpoint", "iiop --host " + host);
-
-        String[] args = {"-ORBInitialHost", host, "-ORBInitialPort", "" + port};
-        createdOrb = ORB.init(args, props);
-
-        // now initialize the service
-        initialize(createdOrb);
-
-    }
-
-    /**
-     * Initialize a transient name service on a specific
-     * ORB.
-     *
-     * @param orb    The ORB hosting the service.
-     *
-     * @exception TransientServiceException
-     */
-    public void initialize(ORB orb) throws TransientServiceException {
-        try {
-            // get the root POA.  We're going to re
-            POA rootPOA = (POA)orb.resolve_initial_references("RootPOA");
-            rootPOA.the_POAManager().activate();
-
-            // we need to create a POA to manage this named instance, and then activate
-            // a context on it.
-            Policy[] policy = new Policy[3];
-            policy[0] = rootPOA.create_lifespan_policy(LifespanPolicyValue.TRANSIENT);
-            policy[1] = rootPOA.create_id_assignment_policy(IdAssignmentPolicyValue.SYSTEM_ID);
-            policy[2] = rootPOA.create_servant_retention_policy(ServantRetentionPolicyValue.RETAIN);
-
-            POA nameServicePOA = rootPOA.create_POA("TNameService", null, policy);
-            nameServicePOA.the_POAManager().activate();
-
-            // create our initial context, and register that with the ORB as the name service
-            initialContext = new TransientNamingContext(orb, nameServicePOA);
-            org.omg.CORBA.Object context = initialContext.getRootContext();
-            Method method =
-                orb.getClass().getMethod("register_initial_reference", String.class, org.omg.CORBA.Object.class);
-            method.invoke(orb, serviceName, context);
-            method.invoke(orb, "NamingService", context);
-            method.invoke(orb, "NameService", context);
-        } catch (Exception e) {
-            throw new TransientServiceException("Unable to initialize name service", e);
-        }
-    }
-
-    /**
-     * Destroy the created service.
-     */
-    public void destroy() {
-        // only destroy this if we created the orb instance.
-        if (createdOrb != null) {
-            createdOrb.shutdown(false);
-            createdOrb.destroy();
-            
-            try {
-                // This is a workaround to close the sockets for SUN ORB
-                Method m = createdOrb.getClass().getMethod("getTransportManager");
-                Object tm = m.invoke(createdOrb);
-                m = tm.getClass().getMethod("close");
-                m.invoke(tm);
-                m = tm.getClass().getMethod("getAcceptors");
-                Collection acceptors = (Collection) m.invoke(tm);
-                for(Object a: acceptors) {
-                    m = a.getClass().getMethod("close");
-                    m.invoke(a);
-                }
-            } catch (Throwable e) {
-                // Ignore
-            }
-            createdOrb = null;
-        }
-    }
-
-    public ORB getORB() {
-        return createdOrb;
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java b/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
deleted file mode 100644
index a7164e9ef3..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
+++ /dev/null
@@ -1,440 +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.    
- */
-/**
- * @version $Rev$ $Date$
- */
-
-package org.apache.tuscany.sca.host.corba.naming;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.omg.CORBA.INTERNAL;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.SystemException;
-import org.omg.CosNaming.Binding;
-import org.omg.CosNaming.BindingHolder;
-import org.omg.CosNaming.BindingIteratorHelper;
-import org.omg.CosNaming.BindingIteratorPOA;
-import org.omg.CosNaming.BindingType;
-import org.omg.CosNaming.BindingTypeHolder;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextHelper;
-import org.omg.CosNaming.NamingContextPackage.NotEmpty;
-import org.omg.PortableServer.POA;
-
-public class TransientNamingContext extends NamingContextBase {
-    // the bindings maintained by this context
-    protected HashMap bindings = new HashMap();
-    // the root context object
-    protected org.omg.CORBA.Object rootContext = null;
-
-    /**
-     * Create a top-level naming context.
-     *
-     * @param orb    The orb hosting this context.
-     * @param poa    The POA used to activate the object.
-     *
-     * @exception Exception
-     */
-    public TransientNamingContext(ORB orb, POA poa) throws Exception {
-        this(orb, poa, null);
-        // now get the initial root context as a corba object.
-
-        byte[] objectId = poa.activate_object(this);
-        rootContext = poa.id_to_reference(objectId);
-
-    }
-
-    /**
-     * Construct a TransientNamingContext subcontext.
-     *
-     * @param orb    The orb this context is associated with.
-     * @param poa    The POA the root context is activated under.
-     * @param root   The root context.
-     *
-     * @exception Exception
-     */
-    public TransientNamingContext(ORB orb, POA poa, org.omg.CORBA.Object root) throws Exception {
-        super(orb, poa);
-        // save the root context link.
-        rootContext = root;
-    }
-
-    // abstract methods part of the interface contract that the implementation is required
-    // to supply.
-
-    /**
-     * Create a new context of the same type as the
-     * calling context.
-     *
-     * @return A new NamingContext item.
-     * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     * @exception SystemException
-     */
-    public NamingContext new_context() throws SystemException {
-        try {
-            // create a new context.  Then we need to register this with the POA and activate it.
-            TransientNamingContext newContext = new TransientNamingContext(orb, poa, rootContext);
-
-            byte[] objectId = poa.activate_object(newContext);
-            org.omg.CORBA.Object obj = poa.id_to_reference(objectId);
-            return NamingContextHelper.narrow(obj);
-        } catch (SystemException e) {
-            // just propagate system exceptions
-            throw e;
-        } catch (Exception e) {
-            throw (INTERNAL)(new INTERNAL("Unable to create new naming context").initCause(e));
-        }
-    }
-
-    /**
-     * Destroy a context.  This method should clean up
-     * any backing resources associated with the context.
-     *
-     * @exception org.omg.CosNaming.NamingContextPackage.NotEmpty
-     */
-    public synchronized void destroy() throws org.omg.CosNaming.NamingContextPackage.NotEmpty {
-        // still holding bound objects?  Not allowed to destroy
-        if (!bindings.isEmpty()) {
-            throw new NotEmpty();
-        }
-
-        try {
-            // now detach ourselves from the POA
-            byte[] objectId = poa.servant_to_id(this);
-            if (objectId != null) {
-                poa.deactivate_object(objectId);
-            }
-        } catch (Exception e) {
-            // ignore
-        }
-    }
-
-    /**
-     * Create a list of bound objects an contexts contained
-     * within this context.
-     *
-     * @param how_many The count of elements to return as a BindingList.
-     * @param bl       A holder element for returning the source binding list.
-     * @param bi       A holder for returning a BindingIterator.  Any extra
-     *                 elements not returned in the BindingList are returned
-     *                 in the BindingIterator.
-     *
-     * @exception SystemException
-     */
-    public synchronized void list(int how_many,
-                                  org.omg.CosNaming.BindingListHolder bl,
-                                  org.omg.CosNaming.BindingIteratorHolder bi) throws SystemException {
-        TransientBindingIterator iterator = new TransientBindingIterator(poa, (HashMap)bindings.clone());
-        // have the iterator fill in the entries here
-        iterator.next_n(how_many, bl);
-
-        // now it's necessary to activate this iterator with the poa.  The value we pass
-        // back is the narrowed activated object
-        try {
-            byte[] objectId = poa.activate_object(iterator);
-            org.omg.CORBA.Object obj = poa.id_to_reference(objectId);
-
-            bi.value = BindingIteratorHelper.narrow(obj);
-        } catch (SystemException e) {
-            // just propagate system exceptions
-            throw e;
-        } catch (Exception e) {
-            throw (INTERNAL)(new INTERNAL("Unable to activate BindingIterator").initCause(e));
-        }
-    }
-
-    // lower level functions that are used by the base class
-
-    /**
-     * Resolve an object in this context (single level
-     * resolution).
-     *
-     * @param n      The name of the target object.
-     * @param type   A type holder for returning the bound object type
-     *               information.
-     *
-     * @return The bound object.  Returns null if the object does not
-     *         exist in the context.
-     * @exception SystemException
-     */
-    protected org.omg.CORBA.Object resolveObject(NameComponent n, BindingTypeHolder type) throws SystemException {
-        // special call to resolve the root context.  This is the only one that goes backwards.
-        if (n.id.length() == 0 && n.kind.length() == 0) {
-            // this is a name context item, so set it properly.
-            type.value = BindingType.ncontext;
-            return rootContext;
-        }
-
-        BindingKey key = new BindingKey(n);
-        BoundObject obj = (BoundObject)bindings.get(key);
-        // if not in the table, just return null
-        if (obj == null) {
-            return null;
-        }
-        // update the type information and return the bound object reference.
-        type.value = obj.type;
-        return obj.boundObject;
-    }
-
-    /**
-     * Bind an object into the current context.  This can
-     * be either an object or a naming context.
-     *
-     * @param n      The single-level name of the target object.
-     * @param obj    The object or context to be bound.
-     * @param type
-     *
-     * @exception SystemException
-     */
-    protected void bindObject(NameComponent n, org.omg.CORBA.Object obj, BindingTypeHolder type) throws SystemException {
-        // fairly simple table put...
-        bindings.put(new BindingKey(n), new BoundObject(n, obj, type.value));
-    }
-
-    /**
-     * Unbind an object from the current context.
-     *
-     * @param n      The name of the target object (single level).
-     *
-     * @return The object associated with the binding.  Returns null
-     *         if there was no binding currently associated with this
-     *         name.
-     * @exception SystemException
-     */
-    protected org.omg.CORBA.Object unbindObject(NameComponent n) throws SystemException {
-        //remove the object from the hash table, returning the bound object if it exists.
-        BindingKey key = new BindingKey(n);
-        BoundObject obj = (BoundObject)bindings.remove(key);
-
-        if (obj != null) {
-            return obj.boundObject;
-        }
-        return null;
-    }
-
-    /**
-     * Retrieve the rootContext for this NamingContext.
-     *
-     * @return The rootContext CORBA object associated with this context.
-     */
-    public org.omg.CORBA.Object getRootContext() {
-        return rootContext;
-    }
-
-    /**
-     * Internal class used for HashMap lookup keys.
-     */
-    class BindingKey {
-        // the name component this is a HashMap key for.
-        public NameComponent name;
-        private int hashval = 0;
-
-        /**
-         * Create a new BindingKey for a NameComponent.
-         *
-         * @param n      The lookup name.
-         */
-        public BindingKey(NameComponent n) {
-            name = n;
-            // create a hash value used for lookups
-            if (name.id != null) {
-                hashval += name.id.hashCode();
-            }
-            if (name.kind != null) {
-                hashval += name.kind.hashCode();
-            }
-        }
-
-        /**
-         * Return the hashcode associated with this binding key.  The
-         * hashcode is created using the NameComponent id and
-         * kind fields.
-         *
-         * @return The lookup hashvalue associated with this key.
-         */
-        public int hashCode() {
-            return hashval;
-        }
-
-        /**
-         * Compare two BindingKeys for equality (used for HashMap
-         * lookups).
-         *
-         * @param other  The comparison partner.
-         *
-         * @return True if the keys are equivalent, false otherwise.
-         */
-        public boolean equals(Object other) {
-            // if not given or the wrong type, this is false.
-            if (other == null || !(other instanceof BindingKey)) {
-                return false;
-            }
-
-            BindingKey otherKey = (BindingKey)other;
-
-            // verify first on the id name.
-            if (name.id != null) {
-                if (otherKey.name.id == null) {
-                    return false;
-                }
-                if (!name.id.equals(otherKey.name.id)) {
-                    return false;
-                }
-            } else {
-                if (otherKey.name.id != null) {
-                    return false;
-                }
-            }
-            // this is a match so far...now compare the kinds
-            if (name.kind != null) {
-                if (otherKey.name.kind == null) {
-                    return false;
-                }
-                if (!name.kind.equals(otherKey.name.kind)) {
-                    return false;
-                }
-            } else {
-                if (otherKey.name.kind != null) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    }
-
-    /**
-     * Internal class used to store bound objects in the HashMap.
-     */
-    public class BoundObject {
-        // the name this object is bound under.
-        public NameComponent name;
-        // the type of binding (either nobject or ncontext).
-        public BindingType type;
-        // the actual bound object.
-        public org.omg.CORBA.Object boundObject;
-
-        /**
-         * Create a new object binding for our HashMap.
-         *
-         * @param name   The bound object's name.
-         * @param boundObject
-         *               The bound object (real object or NamingContext).
-         * @param type   The type information associated with this binding.
-         */
-        public BoundObject(NameComponent name, org.omg.CORBA.Object boundObject, BindingType type) {
-            this.name = name;
-            this.boundObject = boundObject;
-            this.type = type;
-        }
-    }
-
-    /**
-     * Context implementation version of the BindingIterator
-     * object used to return list items.
-     */
-    public class TransientBindingIterator extends BindingIteratorPOA {
-        // the POA used to activate this object (required for destroy();
-        private POA poa;
-        // the binding set we're iterating over (this must be a snapshot copy)
-        private HashMap bindings;
-        // the iterator use to access the bindings
-        private Iterator iterator;
-
-        /**
-         * Create a new BindingIterator hosted by the given POA and
-         * iterating over the map of items.
-         *
-         * @param poa      The hosting POA.
-         * @param bindings The HashMap of bound objects.
-         */
-        public TransientBindingIterator(POA poa, HashMap bindings) {
-            this.poa = poa;
-            this.bindings = bindings;
-            this.iterator = bindings.values().iterator();
-        }
-
-        /**
-         * Return the next object in the iteration sequence.
-         *
-         * @param b      The BindingHolder used to return the next item.  If
-         *               we've reached the end of the sequence, an item
-         *               with an empty name is returned.
-         *
-         * @return true if there is another item, false otherwise.
-         */
-        public boolean next_one(org.omg.CosNaming.BindingHolder b) {
-            if (iterator.hasNext()) {
-                // return this as a Binding value.
-                BoundObject obj = (BoundObject)iterator.next();
-                b.value = new Binding(new NameComponent[] {obj.name}, obj.type);
-                return true;
-            } else {
-                // return an empty element
-                b.value = new Binding(new NameComponent[0], BindingType.nobject);
-                return false;
-            }
-        }
-
-        /**
-         * Retrieve the next "n" items from the list, returned
-         * as a BindingList.
-         *
-         * @param how_many The count of items to retrieve.
-         * @param bl       A holder for returning an array of Bindings for
-         *                 the returned items.
-         *
-         * @return true if any items were returned, false if there's
-         *         nothing left to return.
-         */
-        public boolean next_n(int how_many, org.omg.CosNaming.BindingListHolder bl) {
-            List accum = new ArrayList();
-            BindingHolder holder = new BindingHolder();
-            int i = 0;
-            // Keep iterating as long as there are entries
-            while (i < how_many && next_one(holder)) {
-                accum.add(holder.value);
-                i++;
-            }
-
-            // convert to an array and return whether we found anything.
-            bl.value = (Binding[])accum.toArray(new Binding[accum.size()]);
-            return accum.isEmpty();
-        }
-
-        /**
-         * Destory this BindingIterator instance, which deativates
-         * it from the hosting POA.
-         */
-        public void destroy() {
-            try {
-                // we need to deactivate this from the POA.
-                byte[] objectId = poa.servant_to_id(this);
-                if (objectId != null) {
-                    poa.deactivate_object(objectId);
-                }
-            } catch (Exception e) {
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java b/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
deleted file mode 100644
index 444143f173..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.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.    
- */
-
-/**
- * @version $Rev$ $Date$
- */
-package org.apache.tuscany.sca.host.corba.naming;
-
-public class TransientServiceException extends Exception {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -2611596914331994827L;
-
-    public TransientServiceException() {
-        super();
-    }
-
-    public TransientServiceException(String reason) {
-        super(reason);
-    }
-
-    public TransientServiceException(String reason, Exception cause) {
-        super(reason, cause);
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/java/sca-contrib/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index a96baed33e..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.host.corba.jse.CorbaRuntimeModuleActivator
\ No newline at end of file
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java b/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
deleted file mode 100644
index 8084e39956..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
+++ /dev/null
@@ -1,250 +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.host.corba.testing;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
-
-import java.net.ConnectException;
-import java.net.Socket;
-import java.net.SocketException;
-
-import org.apache.tuscany.sca.host.corba.CorbaHost;
-import org.apache.tuscany.sca.host.corba.CorbaHostException;
-import org.apache.tuscany.sca.host.corba.CorbaHostUtils;
-import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
-import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
-import org.apache.tuscany.sca.host.corba.testing.general.TestInterface;
-import org.apache.tuscany.sca.host.corba.testing.general.TestInterfaceHelper;
-import org.apache.tuscany.sca.host.corba.testing.servants.TestInterfaceServant;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * General tests
- */
-public class DefaultCorbaHostTestCase {
-
-    private static final String LOCALHOST = "localhost";
-    private static final int DEFAULT_PORT = 11100; // 1050;
-
-    private static CorbaHost host;
-
-    private static TransientNameServer server;
-
-    @BeforeClass
-    public static void start() {
-        try {
-            server = new TransientNameServer(LOCALHOST, DEFAULT_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
-            Thread t = server.start();
-            if (t == null) {
-                fail("The naming server cannot be started");
-            }
-            host = new DefaultCorbaHost();
-        } catch (Throwable e) {
-            e.printStackTrace();
-            fail(e.getMessage());
-        }
-    }
-
-    @AfterClass
-    public static void stop() {
-        server.stop();
-    }
-
-    /**
-     * Tests registering and lookup CORBA services
-     */
-    @Test
-    public void test_registerServant() {
-        try {
-            String uri = CorbaHostUtils.createCorbanameURI(LOCALHOST, DEFAULT_PORT, "Nested/Test");
-            TestInterface servant = new TestInterfaceServant();
-            host.registerServant(uri, servant);
-            TestInterface ref = TestInterfaceHelper.narrow(host.lookup(uri));
-            assertEquals(2, ref.getInt(2));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests unregistering servants
-     */
-    @Test
-    public void test_unregisterServant() {
-        try {
-            String objName = "Unregistering/Test";
-            String uri = CorbaHostUtils.createCorbanameURI(LOCALHOST, DEFAULT_PORT, objName);
-            TestInterface servant = new TestInterfaceServant();
-
-            // creating and releasing using corbaname URI
-            host.registerServant(uri, servant);
-            host.unregisterServant(uri);
-            host.registerServant(uri, servant);
-            host.unregisterServant(uri);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests situation when name is already registered
-     */
-    @Test
-    public void test_nameAlreadyRegistered() {
-        // test using URI
-        try {
-            TestInterface servant = new TestInterfaceServant();
-            String uri = CorbaHostUtils.createCorbanameURI(LOCALHOST, DEFAULT_PORT, "AlreadyRegisteredTest2");
-            host.registerServant(uri, servant);
-            host.registerServant(uri, servant);
-            fail();
-        } catch (CorbaHostException e) {
-            assertTrue(e.getMessage().equals(CorbaHostException.BINDING_IN_USE));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests getting non existing reference
-     */
-    @Test
-    public void test_getNonExistingObject() {
-        // try to fetch object with corbaname URI
-        try {
-            host.lookup(CorbaHostUtils.createCorbanameURI("NonExistingOne", DEFAULT_PORT, LOCALHOST));
-            fail();
-        } catch (CorbaHostException e) {
-            // The message is JDK-specific
-            // assertTrue(e.getMessage().equals(CorbaHostException.NO_SUCH_OBJECT));
-        } catch (Exception e) {
-            // e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests unregistering non existing reference
-     */
-    @Test
-    public void test_unregisterNonExistentObject() {
-        // test using URI
-        try {
-            String uri = CorbaHostUtils.createCorbanameURI(LOCALHOST, DEFAULT_PORT, "NonExistingReference1");
-            host.unregisterServant(uri);
-            fail();
-        } catch (CorbaHostException e) {
-            assertTrue(e.getMessage().equals(CorbaHostException.NO_SUCH_OBJECT));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * Tests registering under invalid host
-     */
-    @Test
-    public void test_invalidHost() {
-        try {
-            String url = CorbaHostUtils.createCorbanameURI("not_" + LOCALHOST, DEFAULT_PORT, "Name");
-            TestInterface servant = new TestInterfaceServant();
-            host.registerServant(url, servant);
-            fail();
-        } catch (CorbaHostException e) {
-            // Expected
-        } catch (Exception e) {
-            // e.printStackTrace();
-            fail(e.getMessage());
-        }
-    }
-
-    /**
-     * Tests registering under invalid port
-     */
-    @Test
-    public void test_invalidPort() {
-        try {
-            String url = CorbaHostUtils.createCorbanameURI(LOCALHOST, DEFAULT_PORT + 1, "Name");
-            TestInterface servant = new TestInterfaceServant();
-            host.registerServant(url, servant);
-            fail();
-        } catch (CorbaHostException e) {
-            // Expected
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail(e.getMessage());
-        }
-    }
-
-    /**
-     * Tests registering under invalid name
-     */
-    @Test
-    @Ignore("SUN JDK 6 is happy with all kind of names")
-    public void test_invalidBindingName() {
-        try {
-            TestInterface servant = new TestInterfaceServant();
-            host.registerServant("---", servant);
-            fail();
-        } catch (CorbaHostException e) {
-            assertTrue(e.getMessage().equals(CorbaHostException.WRONG_NAME));
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    /**
-     * 
-     */
-    @Test
-    public void test_ensureORBStopped() {
-        try {
-            int innerORBPort = 11102;
-            TransientNameServer innerServer =
-                new TransientNameServer(LOCALHOST, innerORBPort, TransientNameService.DEFAULT_SERVICE_NAME);
-            innerServer.start();
-            innerServer.stop();
-            try {
-                Thread.sleep(500);
-            } catch (Exception e) {
-            }
-            new Socket(LOCALHOST, innerORBPort);
-            fail();
-        } catch (Exception e) {
-            if (e instanceof ConnectException) {
-                assertTrue(true);
-            } else {
-                e.printStackTrace();
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java b/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
deleted file mode 100644
index 8d1a9db9e9..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
+++ /dev/null
@@ -1,30 +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.host.corba.testing.general;
-
-/**
-* org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* ¶roda, 25 czerwiec 2008 16:19:44 CEST
-*/
-
-public interface TestInterface extends TestInterfaceOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity {
-} // interface TestInterface
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java b/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
deleted file mode 100644
index fe85dc7743..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
+++ /dev/null
@@ -1,98 +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.host.corba.testing.general;
-
-/**
-* org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* ¶roda, 25 czerwiec 2008 16:19:44 CEST
-*/
-
-abstract public class TestInterfaceHelper {
-    private static String _id = "IDL:org/apache/tuscany/sca/host/corba/testing/general/TestInterface:1.0";
-
-    public static void insert(org.omg.CORBA.Any a, org.apache.tuscany.sca.host.corba.testing.general.TestInterface that) {
-        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
-        a.type(type());
-        write(out, that);
-        a.read_value(out.create_input_stream(), type());
-    }
-
-    public static org.apache.tuscany.sca.host.corba.testing.general.TestInterface extract(org.omg.CORBA.Any a) {
-        return read(a.create_input_stream());
-    }
-
-    private static org.omg.CORBA.TypeCode __typeCode = null;
-
-    synchronized public static org.omg.CORBA.TypeCode type() {
-        if (__typeCode == null) {
-            __typeCode =
-                org.omg.CORBA.ORB.init()
-                    .create_interface_tc(org.apache.tuscany.sca.host.corba.testing.general.TestInterfaceHelper.id(),
-                                         "TestInterface");
-        }
-        return __typeCode;
-    }
-
-    public static String id() {
-        return _id;
-    }
-
-    public static org.apache.tuscany.sca.host.corba.testing.general.TestInterface read(org.omg.CORBA.portable.InputStream istream) {
-        return narrow(istream.read_Object(_TestInterfaceStub.class));
-    }
-
-    public static void write(org.omg.CORBA.portable.OutputStream ostream,
-                             org.apache.tuscany.sca.host.corba.testing.general.TestInterface value) {
-        ostream.write_Object((org.omg.CORBA.Object)value);
-    }
-
-    public static org.apache.tuscany.sca.host.corba.testing.general.TestInterface narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.host.corba.testing.general.TestInterface)
-            return (org.apache.tuscany.sca.host.corba.testing.general.TestInterface)obj;
-        else if (!obj._is_a(id()))
-            throw new org.omg.CORBA.BAD_PARAM();
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.host.corba.testing.general._TestInterfaceStub stub =
-                new org.apache.tuscany.sca.host.corba.testing.general._TestInterfaceStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-    public static org.apache.tuscany.sca.host.corba.testing.general.TestInterface unchecked_narrow(org.omg.CORBA.Object obj) {
-        if (obj == null)
-            return null;
-        else if (obj instanceof org.apache.tuscany.sca.host.corba.testing.general.TestInterface)
-            return (org.apache.tuscany.sca.host.corba.testing.general.TestInterface)obj;
-        else {
-            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-            org.apache.tuscany.sca.host.corba.testing.general._TestInterfaceStub stub =
-                new org.apache.tuscany.sca.host.corba.testing.general._TestInterfaceStub();
-            stub._set_delegate(delegate);
-            return stub;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java b/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
deleted file mode 100644
index 305a4d7b97..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
+++ /dev/null
@@ -1,51 +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.host.corba.testing.general;
-
-/**
-* org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* ¶roda, 25 czerwiec 2008 16:19:44 CEST
-*/
-
-public final class TestInterfaceHolder implements org.omg.CORBA.portable.Streamable {
-    public org.apache.tuscany.sca.host.corba.testing.general.TestInterface value = null;
-
-    public TestInterfaceHolder() {
-    }
-
-    public TestInterfaceHolder(org.apache.tuscany.sca.host.corba.testing.general.TestInterface initialValue) {
-        value = initialValue;
-    }
-
-    public void _read(org.omg.CORBA.portable.InputStream i) {
-        value = org.apache.tuscany.sca.host.corba.testing.general.TestInterfaceHelper.read(i);
-    }
-
-    public void _write(org.omg.CORBA.portable.OutputStream o) {
-        org.apache.tuscany.sca.host.corba.testing.general.TestInterfaceHelper.write(o, value);
-    }
-
-    public org.omg.CORBA.TypeCode _type() {
-        return org.apache.tuscany.sca.host.corba.testing.general.TestInterfaceHelper.type();
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java b/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
deleted file mode 100644
index f557d3e020..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.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.host.corba.testing.general;
-
-/**
-* org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* ¶roda, 25 czerwiec 2008 16:19:44 CEST
-*/
-
-public interface TestInterfaceOperations {
-    int getInt(int arg);
-} // interface TestInterfaceOperations
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java b/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
deleted file mode 100644
index f993066dab..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
+++ /dev/null
@@ -1,74 +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.host.corba.testing.general;
-
-/**
-* org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* ¶roda, 25 czerwiec 2008 16:19:44 CEST
-*/
-
-public abstract class _TestInterfaceImplBase extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.host.corba.testing.general.TestInterface, org.omg.CORBA.portable.InvokeHandler {
-
-    // Constructors
-    public _TestInterfaceImplBase() {
-    }
-
-    private static java.util.Hashtable _methods = new java.util.Hashtable();
-    static {
-        _methods.put("getInt", new java.lang.Integer(0));
-    }
-
-    public org.omg.CORBA.portable.OutputStream _invoke(String $method,
-                                                       org.omg.CORBA.portable.InputStream in,
-                                                       org.omg.CORBA.portable.ResponseHandler $rh) {
-        org.omg.CORBA.portable.OutputStream out = null;
-        java.lang.Integer __method = (java.lang.Integer)_methods.get($method);
-        if (__method == null)
-            throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-        switch (__method.intValue()) {
-            case 0: // org/apache/tuscany/sca/host/corba/testing/general/TestInterface/getInt
-            {
-                int arg = in.read_long();
-                int $result = (int)0;
-                $result = this.getInt(arg);
-                out = $rh.createReply();
-                out.write_long($result);
-                break;
-            }
-
-            default:
-                throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-        }
-
-        return out;
-    } // _invoke
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/host/corba/testing/general/TestInterface:1.0"};
-
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-} // class _TestInterfaceImplBase
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java b/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
deleted file mode 100644
index 30a77deaf5..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
+++ /dev/null
@@ -1,73 +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.host.corba.testing.general;
-
-/**
-* org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from general_tests.idl
-* ¶roda, 25 czerwiec 2008 16:19:44 CEST
-*/
-
-public class _TestInterfaceStub extends org.omg.CORBA.portable.ObjectImpl implements
-    org.apache.tuscany.sca.host.corba.testing.general.TestInterface {
-
-    public int getInt(int arg) {
-        org.omg.CORBA.portable.InputStream $in = null;
-        try {
-            org.omg.CORBA.portable.OutputStream $out = _request("getInt", true);
-            $out.write_long(arg);
-            $in = _invoke($out);
-            int $result = $in.read_long();
-            return $result;
-        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-            $in = $ex.getInputStream();
-            String _id = $ex.getId();
-            throw new org.omg.CORBA.MARSHAL(_id);
-        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-            return getInt(arg);
-        } finally {
-            _releaseReply($in);
-        }
-    } // getInt
-
-    // Type-specific CORBA::Object operations
-    private static String[] __ids = {"IDL:org/apache/tuscany/sca/host/corba/testing/general/TestInterface:1.0"};
-
-    public String[] _ids() {
-        return (String[])__ids.clone();
-    }
-
-    private void readObject(java.io.ObjectInputStream s) throws java.io.IOException {
-        String str = s.readUTF();
-        String[] args = null;
-        java.util.Properties props = null;
-        org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init(args, props).string_to_object(str);
-        org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
-        _set_delegate(delegate);
-    }
-
-    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
-        String[] args = null;
-        java.util.Properties props = null;
-        String str = org.omg.CORBA.ORB.init(args, props).object_to_string(this);
-        s.writeUTF(str);
-    }
-} // class _TestInterfaceStub
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java b/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
deleted file mode 100644
index 0ebde8ef0d..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
+++ /dev/null
@@ -1,35 +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.host.corba.testing.servants;
-
-import org.apache.tuscany.sca.host.corba.testing.general._TestInterfaceImplBase;
-
-/**
- * Testing servant 
- */
-public class TestInterfaceServant extends _TestInterfaceImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public int getInt(int arg) {
-        return arg;
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/resources/general.idl b/java/sca-contrib/modules/host-corba-jse/src/test/resources/general.idl
deleted file mode 100644
index f67566deb8..0000000000
--- a/java/sca-contrib/modules/host-corba-jse/src/test/resources/general.idl
+++ /dev/null
@@ -1,43 +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.    

- */

-

-/*

- * compile by

- * idlj -fall -oldImplBase genera.idl

- */

- 

-module org {

-	module apache {

-		module tuscany {

-			module sca {

-				module host {

-					module corba {

-						module testing {

-							module general {

-								interface TestInterface {

-									long getInt(in long arg);

-								};

-							};

-						};

-					};

-				};

-			};

-		};

-	};

-};

diff --git a/java/sca-contrib/modules/host-corba/LICENSE b/java/sca-contrib/modules/host-corba/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/host-corba/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/host-corba/META-INF/MANIFEST.MF b/java/sca-contrib/modules/host-corba/META-INF/MANIFEST.MF
deleted file mode 100644
index 2b38d299c0..0000000000
--- a/java/sca-contrib/modules/host-corba/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.host.corba;uses:="org.omg.CORBA

- ";version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA CORBA Host Extension Point

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397126578

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA CORBA Host Extension Point

-Import-Package: org.apache.tuscany.sca.host.corba;version="2.0.0",org.om

- g.CORBA

-Bundle-SymbolicName: org.apache.tuscany.sca.host.corba

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/host-corba/NOTICE b/java/sca-contrib/modules/host-corba/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/host-corba/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/host-corba/pom.xml b/java/sca-contrib/modules/host-corba/pom.xml
deleted file mode 100644
index b1e1281e17..0000000000
--- a/java/sca-contrib/modules/host-corba/pom.xml
+++ /dev/null
@@ -1,38 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>tuscany-host-corba</artifactId>
-    <name>Apache Tuscany SCA CORBA Host Extension Point</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java b/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
deleted file mode 100644
index eb49f3f841..0000000000
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
+++ /dev/null
@@ -1,56 +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.host.corba;
-
-import org.omg.CORBA.Object;
-
-/**
- * @version $Rev$ $Date$
- * CORBA Service hosting interface
- */
-public interface CorbaHost {
-
-    /**
-     * Registers servant in name server.
-     * 
-     * @param uri corbaname URI
-     * @param serviceObject
-     * @throws CorbaHostException
-     */
-    void registerServant(String uri, Object serviceObject) throws CorbaHostException;
-
-    /**
-     * Removes servant from name server
-     * 
-     * @param orb The ORB instance
-     * @param name binding name
-     * @throws CorbaHostException
-     */
-    void unregisterServant(String uri) throws CorbaHostException;
-
-    /**
-     * Gets reference to object
-     * 
-     * @param name binding name
-     * @return objects reference
-     * @throws CorbaHostException
-     */
-    Object lookup(String uri) throws CorbaHostException;
-}
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java b/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
deleted file mode 100644
index 049bfdb6cd..0000000000
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
+++ /dev/null
@@ -1,47 +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.host.corba;
-
-/**
- * @version $Rev$ $Date$
- * General exception for corba hosts operations
- */
-public class CorbaHostException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-
-    public static final String BINDING_IN_USE = "Binding name is already in use";
-    public static final String NO_SUCH_OBJECT = "There is no object under given location";
-    public static final String NO_SUCH_HOST = "Couldn't find specified host";
-    public static final String NO_SUCH_PORT = "Couldn't connect to specified port";
-    public static final String WRONG_NAME = "Characters used in binding name are illegal";
-
-    public CorbaHostException(String message) {
-        super(message);
-    }
-
-    public CorbaHostException(Exception cause) {
-        super(cause);
-    }
-
-    public CorbaHostException(String message, Exception cause) {
-        super(message, cause);
-    }
-}
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java b/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
deleted file mode 100644
index 067b9193c5..0000000000
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
+++ /dev/null
@@ -1,51 +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.host.corba;
-
-import java.util.List;
-
-/**
- * @version $Rev$ $Date$
- * An extension point for CORBA hostst
- */
-public interface CorbaHostExtensionPoint {
-
-    /**
-     * Removes CORBA host extension
-     * 
-     * @param corbaHost
-     */
-    void addCorbaHost(CorbaHost corbaHost);
-
-    /**
-     * Removes CORBA host extension
-     * 
-     * @param corbaHost
-     */
-    void removeCorbaHost(CorbaHost corbaHost);
-
-    /**
-     * Gets all CORBA host extensions
-     * 
-     * @return
-     */
-    List<CorbaHost> getCorbaHosts();
-
-}
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java b/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
deleted file mode 100644
index b90fe9c78b..0000000000
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
+++ /dev/null
@@ -1,61 +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.host.corba;
-
-
-/**
- * @version $Rev$ $Date$
- * Various utilities for host-corba
- */
-public class CorbaHostUtils {
-
-    /**
-     * Tests if given URI is valid corbaname string
-     * @param uri
-     * @return
-     */
-    public static boolean isValidCorbanameURI(String uri) {
-        return uri != null && uri.startsWith("corbaname:") && uri.contains("#") && uri.indexOf('#') < uri.length() - 1;
-    }
-
-    /**
-     * Creates corbaname URI basing on given parameters
-     * @param host
-     * @param port
-     * @param name
-     * 
-     * @return
-     */
-    public static String createCorbanameURI(String host, int port, String name) {
-        return new CorbanameURL(host, port, name).toString();
-    }
-
-    /**
-     * Translates corbaname URI to CorbanameDetails instances
-     * 
-     * @param uri
-     * @return
-     */
-    public static CorbanameURL getServiceDetails(String uri) {
-        CorbanameURL details = new CorbanameURL(uri);
-        return details;
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java b/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
deleted file mode 100644
index a380fd6d79..0000000000
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
+++ /dev/null
@@ -1,202 +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.host.corba;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @version $Rev$ $Date$
- * Holds corbaname URI details
- */
-public class CorbanameURL {
-    public static String DEFAULT_PROTOCOL = "iiop";
-    public static String DEFAULT_VERSION = "";
-    public static String DEFAULT_NAME_SERVICE = "NameService";
-    public static String DEFAULT_HOST = "localhost";
-    public static int DEFAULT_PORT = 2809;
-
-    private String protocol = "";
-    private String version = "";
-    private String host;
-    private int port;
-    private String nameService;
-    private List<String> namePath;
-
-    public CorbanameURL(String host, int port, String namePath, String nameService) {
-        super();
-        this.host = host == null ? DEFAULT_HOST : host;
-        this.port = port <= 0 ? DEFAULT_PORT : port;
-        this.namePath = parseName(namePath);
-        this.nameService = nameService == null ? DEFAULT_NAME_SERVICE : nameService;
-    }
-
-    public CorbanameURL(String host, int port, String namePath) {
-        this(host, port, namePath, DEFAULT_NAME_SERVICE);
-    }
-
-    public CorbanameURL(String url) {
-        if (url == null || (!url.startsWith("corbaname"))) {
-            throw new IllegalArgumentException("Malformed corbaname URL: " + url);
-        }
-        try {
-            url = URLDecoder.decode(url, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new IllegalArgumentException(e);
-        }
-        String[] parts = url.split("#");
-        if (parts.length == 2) {
-            String serviceLocation = parts[0];
-            String servicePath = parts[1];
-            namePath = parseName(servicePath);
-
-            parts = serviceLocation.split("/");
-            if (parts.length == 2) {
-                nameService = parts[1];
-            } else {
-                nameService = DEFAULT_NAME_SERVICE;
-            }
-
-            parts = parts[0].split(":");
-
-            if (parts.length >= 2) {
-                protocol = parts[1];
-            }
-            if (parts.length >= 3) {
-                version = parts[2];
-                String[] strs = version.split("@");
-                if (strs.length == 2) {
-                    version = strs[0];
-                    host = strs[1];
-                } else {
-                    version = "";
-                    host = strs[0];
-                }
-            }
-            if (host == null || "".equals(host)) {
-                host = DEFAULT_HOST;
-            }
-            if (parts.length >= 4 && !"".equals(parts[3])) {
-                port = Integer.parseInt(parts[3]);
-            } else {
-                port = DEFAULT_PORT;
-            }
-        } else {
-            throw new IllegalArgumentException("Malformed corbaname URL: " + url);
-        }
-    }
-
-    private static List<String> parseName(String name) {
-        try {
-            name = URLDecoder.decode(name, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new IllegalArgumentException(e);
-        }
-        String[] names = name.split("/");
-        return Arrays.asList(names);
-    }
-
-    public String getProtocol() {
-        return protocol;
-    }
-
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public String getNameService() {
-        return nameService;
-    }
-
-    public void setNameService(String nameService) {
-        this.nameService = nameService;
-    }
-
-    public List<String> getNamePath() {
-        return namePath;
-    }
-    
-    public String getName() {
-        if (namePath != null) {
-            StringBuffer buf = new StringBuffer();
-            for (int i = 0; i < namePath.size(); i++) {
-                buf.append(namePath.get(i));
-                if (i < namePath.size() - 1) {
-                    buf.append("/");
-                }
-            }
-            return buf.toString();
-        }
-        return null;
-    }
-
-    public void setNamePath(List<String> namePath) {
-        this.namePath = namePath;
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer buf = new StringBuffer();
-        buf.append("corbaname:");
-        buf.append(protocol).append(":");
-        if (version != null && !"".equals(version)) {
-            buf.append(version).append("@");
-        }
-        buf.append(host).append(":").append(port);
-        buf.append("/").append(nameService);
-        buf.append("#");
-        if (namePath != null) {
-            for (int i = 0; i < namePath.size(); i++) {
-                buf.append(namePath.get(i));
-                if (i < namePath.size() - 1) {
-                    buf.append("/");
-                }
-            }
-        }
-        return buf.toString();
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java b/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
deleted file mode 100644
index 438734086d..0000000000
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
+++ /dev/null
@@ -1,48 +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.host.corba;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @version $Rev$ $Date$
- * Default implementation of CorbaHostExtensionPoint
- */
-public class DefaultCorbaHostExtensionPoint implements CorbaHostExtensionPoint {
-
-    private List<CorbaHost> corbaHosts = new ArrayList<CorbaHost>();
-
-    public DefaultCorbaHostExtensionPoint() {
-    }
-
-    public void addCorbaHost(CorbaHost host) {
-        corbaHosts.add(host);
-    }
-
-    public void removeCorbaHost(CorbaHost host) {
-        corbaHosts.remove(host);
-    }
-
-    public List<CorbaHost> getCorbaHosts() {
-        return corbaHosts;
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java b/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
deleted file mode 100644
index 7e043667a9..0000000000
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.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 org.apache.tuscany.sca.host.corba;
-
-import org.omg.CORBA.Object;
-
-/**
- * @version $Rev$ $Date$
- * Default implementation of extensible CORBA host
- */
-public class ExtensibleCorbaHost implements CorbaHost {
-
-    private CorbaHostExtensionPoint hosts;
-
-    public ExtensibleCorbaHost(CorbaHostExtensionPoint chep) {
-        this.hosts = chep;
-    }
-
-    public Object lookup(String uri) throws CorbaHostException {
-        return getCorbaHost().lookup(uri);
-    }
-
-    public void registerServant(String uri, Object serviceObject) throws CorbaHostException {
-        getCorbaHost().registerServant(uri, serviceObject);
-    }
-
-    public void unregisterServant(String uri) throws CorbaHostException {
-        getCorbaHost().unregisterServant(uri);
-    }
-    
-    protected CorbaHost getCorbaHost() throws CorbaHostException {
-        if (hosts.getCorbaHosts().isEmpty()) {
-            throw new CorbaHostException("No registered CORBA hosts");
-        }
-        return hosts.getCorbaHosts().get(0);
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java b/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
deleted file mode 100755
index 6989b3ad06..0000000000
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
+++ /dev/null
@@ -1,226 +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.host.corba;
-
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.UnknownHostException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @version $Rev$ $Date$
- * Class partially copied from eclipse wst project
- * (http://repo1.maven.org/maven2/org/eclipse/wst/server/core/1.0.205-v20070829b/).
- * Finally we should use jar from maven dependency. Problem described in
- * http://www.fornax-platform.org/cp/display/fornax/2.+Hello+World+Tutorial+(CSC)?replyToComment=2098#comment-2098
- * needs to be fixed.
- */
-public class SocketUtil {
-
-    protected static final Object lock = new Object();
-
-    private static Set<String> localHostCache;
-    private static Set<String> notLocalHostCache = new HashSet<String>();
-    private static Map<String, CacheThread> threadMap = new HashMap<String, CacheThread>();
-
-    private static Set<InetAddress> addressCache;
-
-    static class CacheThread extends Thread {
-        private Set<InetAddress> currentAddresses;
-        private Set<String> addressList;
-        private String host;
-        private Set<String> nonAddressList;
-        private Map<String, CacheThread> threadMap2;
-
-        public CacheThread(String host,
-                           Set<InetAddress> currentAddresses,
-                           Set<String> addressList,
-                           Set<String> nonAddressList,
-                           Map<String, CacheThread> threadMap2) {
-            super("Caching localhost information");
-            this.host = host;
-            this.currentAddresses = currentAddresses;
-            this.addressList = addressList;
-            this.nonAddressList = nonAddressList;
-            this.threadMap2 = threadMap2;
-        }
-
-        public void run() {
-            if (currentAddresses != null) {
-                Iterator<InetAddress> iter2 = currentAddresses.iterator();
-                while (iter2.hasNext()) {
-                    InetAddress addr = iter2.next();
-                    String hostname = addr.getHostName();
-                    String hostname2 = addr.getCanonicalHostName();
-                    synchronized (lock) {
-                        if (hostname != null && !addressList.contains(hostname))
-                            addressList.add(hostname);
-                        if (hostname2 != null && !addressList.contains(hostname2))
-                            addressList.add(hostname2);
-                    }
-                }
-            }
-
-            try {
-                InetAddress[] addrs = InetAddress.getAllByName(host);
-                int length = addrs.length;
-                for (int j = 0; j < length; j++) {
-                    InetAddress addr = addrs[0];
-                    String hostname = addr.getHostName();
-                    String hostname2 = addr.getCanonicalHostName();
-                    synchronized (lock) {
-                        if (addr.isLoopbackAddress()) {
-                            if (hostname != null && !addressList.contains(hostname))
-                                addressList.add(hostname);
-                            if (hostname2 != null && !addressList.contains(hostname2))
-                                addressList.add(hostname2);
-                        } else {
-                            if (hostname != null && !nonAddressList.contains(hostname))
-                                nonAddressList.add(hostname);
-                            if (hostname2 != null && !nonAddressList.contains(hostname2))
-                                nonAddressList.add(hostname2);
-                        }
-                    }
-                }
-            } catch (UnknownHostException e) {
-                synchronized (lock) {
-                    if (host != null && !nonAddressList.contains(host))
-                        nonAddressList.add(host);
-                }
-            }
-            synchronized (lock) {
-                threadMap2.remove(host);
-            }
-        }
-    }
-
-    public static boolean isLocalhost(final String host) {
-        if (host == null || host.equals(""))
-            return false;
-
-        if ("localhost".equals(host) || "127.0.0.1".equals(host))
-            return true;
-
-        // check simple cases
-        try {
-            InetAddress localHostaddr = InetAddress.getLocalHost();
-            if (localHostaddr.getHostName().equals(host) || host.equals(localHostaddr.getCanonicalHostName())
-                || localHostaddr.getHostAddress().equals(host))
-                return true;
-        } catch (Exception e) {
-
-        }
-
-        // check for current thread and wait if necessary
-        boolean currentThread = false;
-        try {
-            Thread t = null;
-            synchronized (lock) {
-                t = threadMap.get(host);
-            }
-            if (t != null && t.isAlive()) {
-                currentThread = true;
-                t.join(30);
-            }
-        } catch (Exception e) {
-
-        }
-
-        // check if cache is still ok
-        boolean refreshedCache = false;
-        try {
-            // get network interfaces
-            final Set<InetAddress> currentAddresses = new HashSet<InetAddress>();
-            currentAddresses.add(InetAddress.getLocalHost());
-            Enumeration<?> nis = NetworkInterface.getNetworkInterfaces();
-            while (nis.hasMoreElements()) {
-                NetworkInterface inter = (NetworkInterface)nis.nextElement();
-                Enumeration<InetAddress> ias = inter.getInetAddresses();
-                while (ias.hasMoreElements())
-                    currentAddresses.add(ias.nextElement());
-            }
-
-            // check if cache is empty or old and refill it if necessary
-            if (addressCache == null || !addressCache.containsAll(currentAddresses)
-                || !currentAddresses.containsAll(addressCache)) {
-                CacheThread cacheThread = null;
-                refreshedCache = true;
-
-                synchronized (lock) {
-                    addressCache = currentAddresses;
-                    notLocalHostCache = new HashSet<String>();
-                    localHostCache = new HashSet<String>(currentAddresses.size() * 3);
-
-                    Iterator<InetAddress> iter = currentAddresses.iterator();
-                    while (iter.hasNext()) {
-                        InetAddress addr = iter.next();
-                        String a = addr.getHostAddress();
-                        if (a != null && !localHostCache.contains(a))
-                            localHostCache.add(a);
-                    }
-
-                    cacheThread = new CacheThread(host, currentAddresses, localHostCache, notLocalHostCache, threadMap);
-                    threadMap.put(host, cacheThread);
-                    cacheThread.setDaemon(true);
-                    cacheThread.setPriority(Thread.NORM_PRIORITY - 1);
-                    cacheThread.start();
-                }
-                cacheThread.join(200);
-            }
-        } catch (Exception e) {
-        }
-
-        synchronized (lock) {
-            if (localHostCache.contains(host))
-                return true;
-            if (notLocalHostCache.contains(host))
-                return false;
-        }
-
-        // if the cache hasn't been cleared, maybe we still need to lookup the
-        // host
-        if (!refreshedCache && !currentThread) {
-            try {
-                CacheThread cacheThread = null;
-                synchronized (lock) {
-                    cacheThread = new CacheThread(host, null, localHostCache, notLocalHostCache, threadMap);
-                    threadMap.put(host, cacheThread);
-                    cacheThread.setDaemon(true);
-                    cacheThread.setPriority(Thread.NORM_PRIORITY - 1);
-                    cacheThread.start();
-                }
-                cacheThread.join(75);
-
-                synchronized (lock) {
-                    if (localHostCache.contains(host))
-                        return true;
-                }
-            } catch (Exception e) {
-            }
-        }
-        return false;
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint b/java/sca-contrib/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
deleted file mode 100644
index a72bed4ea8..0000000000
--- a/java/sca-contrib/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
+++ /dev/null
@@ -1,18 +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.

-

-org.apache.tuscany.sca.host.corba.DefaultCorbaHostExtensionPoint

diff --git a/java/sca-contrib/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java b/java/sca-contrib/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
deleted file mode 100644
index 4e076f9342..0000000000
--- a/java/sca-contrib/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
+++ /dev/null
@@ -1,145 +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.host.corba;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- * Tests for host utils
- */
-public class UtilsTestCase {
-
-    private void assertDetailsAreOk(CorbanameURL details, String host, int port, String nameService, List<String> namePath) {
-        assertTrue(details.getHost().equals(host));
-        assertTrue(details.getNameService().equals(nameService));
-        assertTrue(details.getPort() == port);
-        assertTrue(details.getNamePath().size() == namePath.size());
-        for (int i = 0; i < namePath.size(); i++) {
-            assertTrue(details.getNamePath().get(i).equals(namePath.get(i)));
-        }
-    }
-
-    /**
-     * Tests if corbaname url is beeing processes properly
-     */
-    @Test
-    public void test_validCorbaname() {
-        String testUri = null;
-        CorbanameURL details = null;
-        List<String> namePath = null;
-        
-        testUri = "corbaname:ignore:host:1234/Service#Reference";
-        details = CorbaHostUtils.getServiceDetails(testUri);
-        namePath = new ArrayList<String>();
-        namePath.add("Reference");
-        assertDetailsAreOk(details, "host", 1234, "Service", namePath);
-
-        testUri = "corbaname:ignore:host:/Service#Reference";
-        details = CorbaHostUtils.getServiceDetails(testUri);
-        namePath = new ArrayList<String>();
-        namePath.add("Reference");
-        assertDetailsAreOk(details, "host", CorbanameURL.DEFAULT_PORT, "Service", namePath);
-        
-        testUri = "corbaname:ignore:host/Service#Reference";
-        details = CorbaHostUtils.getServiceDetails(testUri);
-        namePath = new ArrayList<String>();
-        namePath.add("Reference");
-        assertDetailsAreOk(details, "host", CorbanameURL.DEFAULT_PORT, "Service", namePath);
-        
-        testUri = "corbaname:ignore:/Service#Reference";
-        details = CorbaHostUtils.getServiceDetails(testUri);
-        namePath = new ArrayList<String>();
-        namePath.add("Reference");
-        assertDetailsAreOk(details, CorbanameURL.DEFAULT_HOST, CorbanameURL.DEFAULT_PORT, "Service", namePath);
-        
-        testUri = "corbaname:ignore/Service#Reference";
-        details = CorbaHostUtils.getServiceDetails(testUri);
-        namePath = new ArrayList<String>();
-        namePath.add("Reference");
-        assertDetailsAreOk(details, CorbanameURL.DEFAULT_HOST, CorbanameURL.DEFAULT_PORT, "Service", namePath);
-
-        testUri = "corbaname:/Service#Reference";
-        details = CorbaHostUtils.getServiceDetails(testUri);
-        namePath = new ArrayList<String>();
-        namePath.add("Reference");
-        assertDetailsAreOk(details, CorbanameURL.DEFAULT_HOST, CorbanameURL.DEFAULT_PORT, "Service", namePath);
-        
-        testUri = "corbaname/Service#Reference";
-        details = CorbaHostUtils.getServiceDetails(testUri);
-        namePath = new ArrayList<String>();
-        namePath.add("Reference");
-        assertDetailsAreOk(details, CorbanameURL.DEFAULT_HOST, CorbanameURL.DEFAULT_PORT, "Service", namePath);
-        
-        testUri = "corbaname#Reference";
-        details = CorbaHostUtils.getServiceDetails(testUri);
-        namePath = new ArrayList<String>();
-        namePath.add("Reference");
-        assertDetailsAreOk(details, CorbanameURL.DEFAULT_HOST, CorbanameURL.DEFAULT_PORT, CorbanameURL.DEFAULT_NAME_SERVICE, namePath);
-
-        testUri = "corbaname#Parent/Mid/Reference";
-        details = CorbaHostUtils.getServiceDetails(testUri);
-        namePath = new ArrayList<String>();
-        namePath.add("Parent");
-        namePath.add("Mid");
-        namePath.add("Reference");
-        assertDetailsAreOk(details, CorbanameURL.DEFAULT_HOST, CorbanameURL.DEFAULT_PORT, CorbanameURL.DEFAULT_NAME_SERVICE, namePath);
-    }
-    
-    /**
-     * Test for invalid corbaname url 
-     */
-    @Test
-    public void test_invalidCorbaname() {
-        String testUri = null;
-     
-        try {
-            testUri = "this.string.should.not.appear.in.the.beggining:ignore:host:1234/Service#Reference";
-            CorbaHostUtils.getServiceDetails(testUri);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof IllegalArgumentException);
-        }
-        
-        try {
-            testUri = "corbaname:ignore:host:1234/Service#";
-            CorbaHostUtils.getServiceDetails(testUri);
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof IllegalArgumentException);
-        }
-    }
-    
-    /**
-     * Test for creating corbaname url from host, port, name parameters
-     */
-    @Test
-    public void test_creatingCorbanameURI() {
-        String uri = CorbaHostUtils.createCorbanameURI("SomeHost", 1000, "SomeName");
-        assertEquals("corbaname::SomeHost:1000/NameService#SomeName", uri);
-    }
-}
diff --git a/java/sca-contrib/modules/host-tomcat/LICENSE b/java/sca-contrib/modules/host-tomcat/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/host-tomcat/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/host-tomcat/META-INF/MANIFEST.MF b/java/sca-contrib/modules/host-tomcat/META-INF/MANIFEST.MF
deleted file mode 100644
index d6a87c4ae8..0000000000
--- a/java/sca-contrib/modules/host-tomcat/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.http.tomcat;version="2.0.0",org.

- apache.tuscany.sca.http.tomcat.module;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Tomcat Servlet Host Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1222833663765

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Tomcat Servlet Host Extension

-Import-Package: javax.naming,javax.naming.directory,javax.servlet,java

- x.servlet.http,org.apache.catalina,org.apache.catalina.connector,org.

- apache.catalina.core,org.apache.catalina.servlets,org.apache.catalina

- .startup,org.apache.coyote,org.apache.coyote.http11,org.apache.naming

- .resources,org.apache.tomcat.util.buf,org.apache.tomcat.util.http.map

- per,org.apache.tomcat.util.net,org.apache.tuscany.sca.core;version="1

- .4",org.apache.tuscany.sca.host.http;version="2.0.0",org.apache.tuscany

- .sca.work;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.host.tomcat

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/host-tomcat/NOTICE b/java/sca-contrib/modules/host-tomcat/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/host-tomcat/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/host-tomcat/pom.xml b/java/sca-contrib/modules/host-tomcat/pom.xml
deleted file mode 100644
index 826a58deee..0000000000
--- a/java/sca-contrib/modules/host-tomcat/pom.xml
+++ /dev/null
@@ -1,69 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-host-tomcat</artifactId>
-    <name>Apache Tuscany SCA Tomcat Servlet Host Extension</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-	        <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>catalina</artifactId>
-            <version>6.0.14</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.tomcat</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>coyote</artifactId>
-            <version>6.0.14</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.tomcat</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java b/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
deleted file mode 100644
index a0b384d554..0000000000
--- a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.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 org.apache.tuscany.sca.http.tomcat;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-
-import org.apache.catalina.core.StandardWrapper;
-
-/**
- * A Servlet wrapper.
- * 
- * @version $Rev$ $Date$
- */
-public class ServletWrapper extends StandardWrapper {
-    private static final long serialVersionUID = 1L;
-
-    private final Servlet servlet;
-
-    public ServletWrapper(Servlet servlet) {
-        this.servlet = servlet;
-    }
-
-    @Override
-    public synchronized Servlet loadServlet() {
-        return servlet;
-    }
-
-    @Override
-    public Servlet getServlet() {
-        return servlet;
-    }
-    
-    public void initServlet() throws ServletException {
-        servlet.init(facade);
-    }
-    
-    public void destroyServlet() {
-        servlet.destroy();
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java b/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
deleted file mode 100644
index 5d9b65503a..0000000000
--- a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
+++ /dev/null
@@ -1,114 +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.http.tomcat;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Hashtable;
-
-import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
-import javax.naming.directory.DirContext;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.catalina.servlets.DefaultServlet;
-import org.apache.naming.resources.FileDirContext;
-import org.apache.naming.resources.ProxyDirContext;
-import org.apache.naming.resources.Resource;
-
-/**
- * DefaultServlet implementation for Tomcat.
- *
- * @version $Rev$ $Date$
- */
-public class TomcatDefaultServlet extends DefaultServlet {
-    private static final long serialVersionUID = -7503581551326796573L;
-    
-    private String documentRoot;
-    private ProxyDirContext proxyDirContext;
-    
-    public TomcatDefaultServlet(String servletPath, String documentRoot) {
-        this.documentRoot = documentRoot;
-        
-        DirContext dirContext;
-        URI uri = URI.create(documentRoot);
-        if (!"file".equals(uri.getScheme())) {
-            
-            dirContext = new FileDirContext() {
-                @Override
-                public Attributes getAttributes(String name) throws NamingException {
-                    return new BasicAttributes();
-                }
-                
-                @Override
-                public Object lookup(String name) throws NamingException {
-                    
-                    try {
-                        final URL url = new URL(TomcatDefaultServlet.this.documentRoot + name);
-                        return new Resource() {
-                            @Override
-                            public InputStream streamContent() throws IOException {
-                                URLConnection connection = url.openConnection();
-                                connection.setUseCaches(false);
-                                return connection.getInputStream();
-                            }
-                        };
-                    } catch (MalformedURLException e) {
-                        throw new NamingException(e.toString());
-                    }
-                }
-            };
-            
-        } else {
-            dirContext = new FileDirContext();
-            ((FileDirContext)dirContext).setDocBase(uri.getPath());
-        }
-        proxyDirContext = new ProxyDirContext(new Hashtable(), dirContext);
-        resources = proxyDirContext;            
-    }
-    
-    @Override
-    public void init() throws ServletException {
-        super.init();
-        resources = proxyDirContext;
-    }
-    
-    @Override
-    public void init(ServletConfig servletConfig) throws ServletException {
-        super.init(servletConfig);
-        resources = proxyDirContext;
-    }
-
-    @Override
-    protected String getRelativePath(HttpServletRequest request) {
-        String path = request.getPathInfo();
-        if (path == null || path.length() == 0) {
-            path = "/";
-        }
-        return path;
-    }
-}
diff --git a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java b/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
deleted file mode 100644
index 5ea1701c05..0000000000
--- a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
+++ /dev/null
@@ -1,653 +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.http.tomcat;
-
-import java.beans.PropertyChangeListener;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.security.AccessController;
-import java.security.KeyStore;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-
-import org.apache.catalina.Container;
-import org.apache.catalina.Context;
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleException;
-import org.apache.catalina.Loader;
-import org.apache.catalina.connector.Connector;
-import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.core.StandardEngine;
-import org.apache.catalina.core.StandardHost;
-import org.apache.catalina.startup.ContextConfig;
-import org.apache.coyote.http11.Http11Protocol;
-import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.http.mapper.MappingData;
-import org.apache.tomcat.util.net.JIoEndpoint;
-import org.apache.tuscany.sca.host.http.DefaultResourceServlet;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletMappingException;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- * A Tomcat based implementation of ServletHost.
- *
- * @version $Rev$ $Date$
- */
-@SuppressWarnings("deprecation")
-public class TomcatServer implements ServletHost {
-    private static final Logger logger = Logger.getLogger(TomcatServer.class.getName());
-
-    private int defaultPortNumber = 8080;
-
-    private final class TuscanyLoader implements Loader {
-        private final ClassLoader tccl;
-        private boolean delegate;
-        private boolean reloadable;
-        private Container container;
-        private List<String> repos = new ArrayList<String>();
-        private List<PropertyChangeListener> listeners = new ArrayList<PropertyChangeListener>();
-
-        private TuscanyLoader(ClassLoader tccl) {
-            this.tccl = tccl;
-        }
-
-        public void addPropertyChangeListener(PropertyChangeListener listener) {
-            listeners.add(listener);
-        }
-
-        public void addRepository(String repository) {
-            repos.add(repository);
-        }
-
-        public void backgroundProcess() {
-        }
-
-        public String[] findRepositories() {
-            return repos.toArray(new String[repos.size()]);
-        }
-
-        public Container getContainer() {
-            return container;
-        }
-
-        public boolean getDelegate() {
-            return delegate;
-        }
-
-        public String getInfo() {
-            return "Tuscany Loader for Embedded Tomcat";
-        }
-
-        public boolean getReloadable() {
-            return reloadable;
-        }
-
-        public boolean modified() {
-            return false;
-        }
-
-        public void removePropertyChangeListener(PropertyChangeListener listener) {
-            listeners.remove(listener);
-        }
-
-        public void setContainer(Container container) {
-            this.container = container;
-        }
-
-        public void setDelegate(boolean delegate) {
-            this.delegate = delegate;
-        }
-
-        public void setReloadable(boolean reloadable) {
-            this.reloadable = reloadable;
-        }
-
-        public ClassLoader getClassLoader() {
-            return tccl;
-        }
-    }
-
-    /**
-     * Represents a port and the server that serves it.
-     */
-    private class Port {
-        private StandardEngine engine;
-        private StandardHost host;
-        private Connector connector;
-
-        private Port(StandardEngine engine, StandardHost host, Connector connector) {
-            this.engine = engine;
-            this.host = host;
-            this.connector = connector;
-        }
-
-        public StandardEngine getEngine() {
-            return engine;
-        }
-
-        public StandardHost getHost() {
-            return host;
-        }
-
-        public Connector getConnector() {
-            return connector;
-        }
-    }
-
-    private Map<Integer, Port> ports = new HashMap<Integer, Port>();
-
-    private WorkScheduler workScheduler;
-
-    private String contextPath = "/";
-
-    /**
-     * Constructs a new embedded Tomcat server.
-     *
-     * @param workScheduler the WorkScheduler to use to process requests.
-     */
-    public TomcatServer(WorkScheduler workScheduler) {
-        this.workScheduler = workScheduler;
-    }
-
-    public void setDefaultPort(int port) {
-        defaultPortNumber = port;
-    }
-
-    public int getDefaultPort() {
-        return defaultPortNumber;
-    }
-
-    /**
-     * Stop all the started servers.
-     */
-    public void stop() throws ServletMappingException {
-        if (!ports.isEmpty()) {
-            try {
-                Set<Entry<Integer, Port>> entries = new HashSet<Entry<Integer, Port>>(ports.entrySet());
-                for (Entry<Integer, Port> entry : entries) {
-                    Port port = entry.getValue();
-                    port.getConnector().stop();
-                    port.getEngine().stop();
-                    ports.remove(entry.getKey());
-                }
-            } catch (Exception e) {
-                throw new ServletMappingException(e);
-            }
-        }
-    }
-
-    public void addServletMapping(String suri, Servlet servlet) {
-        URI uri = URI.create(suri);
-
-        // Get the URI scheme and port
-        String scheme = uri.getScheme();
-        if (scheme == null) {
-            scheme = "http";
-        }
-        final int portNumber = (uri.getPort() == -1 ? defaultPortNumber : uri.getPort());
-
-        // Get the port object associated with the given port number
-        Port port = ports.get(portNumber);
-        if (port == null) {
-
-            // Create an engine
-            // Allow privileged access to read properties. Requires PropertiesPermission read in
-            // security policy.
-            final StandardEngine engine = AccessController.doPrivileged(new PrivilegedAction<StandardEngine>() {
-                public StandardEngine run() {
-                    return new StandardEngine();
-                }
-            });
-
-            engine.setBaseDir("");
-            engine.setDefaultHost("localhost");
-            engine.setName("engine/" + portNumber);
-
-            // Create a host
-            final StandardHost host = new StandardHost();
-            host.setAppBase("");
-            host.setName("localhost");
-            // Allow privileged access to read properties. Requires PropertiesPermission read in
-            // security policy.
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    engine.addChild(host);
-                    return null;
-                }
-            });
-
-            // Create the root context
-            StandardContext context = new StandardContext();
-            final ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-            context.setLoader(new TuscanyLoader(tccl));
-            // context.setParentClassLoader(tccl.getParent());
-            context.setDocBase("");
-            context.setPath("");
-            ContextConfig config = new ContextConfig();
-            ((Lifecycle)context).addLifecycleListener(config);
-            host.addChild(context);
-
-            // Install an HTTP connector
-            // Allow privileged access to read properties. Requires PropertiesPermission read in
-            // security policy.
-            try {
-                AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                    public Object run() throws LifecycleException {
-                        engine.start();
-                        return null;
-                    }
-                });
-            } catch (PrivilegedActionException e) {
-                // throw (LifecycleException)e.getException();
-                throw new ServletMappingException(e);
-            }
-            Connector connector;
-            // Allow privileged access to read properties. Requires PropertiesPermission read in
-            // security policy.
-            try {
-                final String protocol = scheme;
-                connector = AccessController.doPrivileged(new PrivilegedExceptionAction<CustomConnector>() {
-                    public CustomConnector run() throws Exception {
-                        CustomConnector customConnector = new CustomConnector();
-                        customConnector.setPort(portNumber);
-                        customConnector.setContainer(engine);
-
-                        if ("https".equalsIgnoreCase(protocol)) {
-                            configureSSL(customConnector);
-                            ((Http11Protocol) customConnector.getProtocolHandler()).setSSLEnabled(true);
-                        }
-                        customConnector.initialize();
-                        customConnector.start();
-                        return customConnector;
-                    }
-
-                    private void configureSSL(CustomConnector customConnector) {
-                        String trustStore = System.getProperty("javax.net.ssl.trustStore");
-                        String trustStorePass = System.getProperty("javax.net.ssl.trustStorePassword");
-                        String keyStore = System.getProperty("javax.net.ssl.keyStore");
-                        String keyStorePass = System.getProperty("javax.net.ssl.keyStorePassword");
-
-                        customConnector.setProperty("protocol", "TLS");
-
-                        customConnector.setProperty("keystore", keyStore);
-                        customConnector.setProperty("keypass", keyStorePass);
-                        String keyStoreType =
-                            System.getProperty("javax.net.ssl.keyStoreType", KeyStore.getDefaultType());
-                        String trustStoreType =
-                            System.getProperty("javax.net.ssl.trustStoreType", KeyStore.getDefaultType());
-                        customConnector.setProperty("keytype", keyStoreType);
-                        customConnector.setProperty("trusttype", trustStoreType);
-                        customConnector.setProperty("truststore", trustStore);
-                        customConnector.setProperty("trustpass", trustStorePass);
-
-                        customConnector.setProperty("clientauth", "false");
-                        customConnector.setProtocol("HTTP/1.1");
-                        customConnector.setScheme(protocol);
-                        customConnector.setProperty("backlog", "10");
-                        customConnector.setSecure(true);
-                    }
-                });
-            } catch (Exception e) {
-                throw new ServletMappingException(e);
-            }
-            // Keep track of the running server
-            port = new Port(engine, host, connector);
-            ports.put(portNumber, port);
-        }
-
-        // Register the Servlet mapping
-        String path = uri.getPath();
-
-        if (!path.startsWith("/")) {
-            path = '/' + path;
-        }
-
-        if (!path.startsWith(contextPath)) {
-            path = contextPath + path;
-        }
-
-        ServletWrapper wrapper;
-        if (servlet instanceof DefaultResourceServlet) {
-            String defaultServletPath = path;
-
-            // Optimize the handling of resource requests, use the Tomcat default Servlet
-            // instead of our default resource Servlet
-            if (defaultServletPath.endsWith("*")) {
-                defaultServletPath = defaultServletPath.substring(0, defaultServletPath.length() - 1);
-            }
-            if (defaultServletPath.endsWith("/")) {
-                defaultServletPath = defaultServletPath.substring(0, defaultServletPath.length() - 1);
-            }
-            DefaultResourceServlet resourceServlet = (DefaultResourceServlet)servlet;
-            TomcatDefaultServlet defaultServlet =
-                new TomcatDefaultServlet(defaultServletPath, resourceServlet.getDocumentRoot());
-            wrapper = new ServletWrapper(defaultServlet);
-
-        } else {
-            wrapper = new ServletWrapper(servlet);
-        }
-        Context context = port.getHost().map(path);
-        wrapper.setName(path);
-        wrapper.addMapping(path);
-        context.addChild(wrapper);
-        context.addServletMapping(path, path);
-        port.getConnector().getMapper().addWrapper("localhost", "", path, wrapper);
-
-        // Initialize the Servlet
-        try {
-            wrapper.initServlet();
-        } catch (ServletException e) {
-            throw new ServletMappingException(e);
-        }
-
-        // Compute the complete URL
-        String host;
-        try {
-            host = InetAddress.getLocalHost().getHostName();
-        } catch (UnknownHostException e) {
-            host = "localhost";
-        }
-        URL addedURL;
-        try {
-            addedURL = new URL(scheme, host, portNumber, path);
-        } catch (MalformedURLException e) {
-            throw new ServletMappingException(e);
-        }
-        logger.info("Added Servlet mapping: " + addedURL);
-    }
-
-    public URL getURLMapping(String suri) throws ServletMappingException {
-        URI uri = URI.create(suri);
-
-        // Get the URI scheme and port
-        String scheme = uri.getScheme();
-        if (scheme == null) {
-            scheme = "http";
-        }
-        int portNumber = uri.getPort();
-        if (portNumber == -1) {
-            portNumber = defaultPortNumber;
-        }
-
-        // Get the host
-        String host;
-        try {
-            host = InetAddress.getLocalHost().getHostName();
-        } catch (UnknownHostException e) {
-            host = "localhost";
-        }
-
-        // Construct the URL
-        String path = uri.getPath();
-
-        if (!path.startsWith("/")) {
-            path = '/' + path;
-        }
-
-        if (!path.startsWith(contextPath)) {
-            path = contextPath + path;
-        }
-        URL url;
-        try {
-            url = new URL(scheme, host, portNumber, path);
-        } catch (MalformedURLException e) {
-            throw new ServletMappingException(e);
-        }
-        return url;
-    }
-
-    public Servlet getServletMapping(String suri) throws ServletMappingException {
-
-        if (suri == null) {
-            return null;
-        }
-
-        URI uri = URI.create(suri);
-
-        // Get the URI port
-        int portNumber = uri.getPort();
-        if (portNumber == -1) {
-            portNumber = defaultPortNumber;
-        }
-
-        // Get the port object associated with the given port number
-        Port port = ports.get(portNumber);
-        if (port == null) {
-            return null;
-        }
-
-        String mapping = uri.getPath();
-
-        if (!mapping.startsWith("/")) {
-            mapping = '/' + mapping;
-        }
-
-        if (!mapping.startsWith(contextPath)) {
-            mapping = contextPath + mapping;
-        }
-
-        final Context context = port.getHost().map(mapping);
-        final MappingData md = new MappingData();
-        final MessageBytes mb = MessageBytes.newInstance();
-        mb.setString(mapping);
-        try {
-            // Allow privileged access to read properties. Requires PropertiesPermission read in
-            // security policy.
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                public Object run() throws Exception {
-                    context.getMapper().map(mb, md);
-                    return null;
-                }
-            });
-        } catch (Exception e) {
-            return null;
-        }
-        if (md.wrapper instanceof ServletWrapper) {
-            ServletWrapper servletWrapper = (ServletWrapper)md.wrapper;
-            return servletWrapper.getServlet();
-        } else {
-            return null;
-        }
-    }
-
-    public Servlet removeServletMapping(String suri) {
-        URI uri = URI.create(suri);
-
-        // Get the URI port
-        int portNumber = uri.getPort();
-        if (portNumber == -1) {
-            portNumber = defaultPortNumber;
-        }
-
-        // Get the port object associated with the given port number
-        Port port = ports.get(portNumber);
-        if (port == null) {
-            throw new IllegalStateException("No servlet registered at this URI: " + suri);
-        }
-
-        String mapping = uri.getPath();
-
-        if (!mapping.startsWith("/")) {
-            mapping = '/' + mapping;
-        }
-
-        if (!mapping.startsWith(contextPath)) {
-            mapping = contextPath + mapping;
-        }
-
-        final Context context = port.getHost().map(mapping);
-        final MappingData md = new MappingData();
-        final MessageBytes mb = MessageBytes.newInstance();
-        mb.setString(mapping);
-        try {
-            // Allow privileged access to read properties. Requires PropertiesPermission read in
-            // security policy.
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                public Object run() throws Exception {
-                    context.getMapper().map(mb, md);
-                    return null;
-                }
-            });
-        } catch (Exception e) {
-            return null;
-        }
-        if (md.wrapper instanceof ServletWrapper) {
-            ServletWrapper servletWrapper = (ServletWrapper)md.wrapper;
-
-            port.getConnector().getMapper().removeWrapper("localhost", "", mapping);
-
-            try {
-                context.removeServletMapping(mapping);
-            } catch (NegativeArraySizeException e) {
-                // JIRA TUSCANY-1599
-                // FIXME Looks like a bug in Tomcat when removing the last
-                // Servlet in the list, catch the exception for now as it doesn't
-                // seem harmful, will find a better solution for the next release
-            }
-            context.removeChild(servletWrapper);
-            try {
-                servletWrapper.destroyServlet();
-            } catch (Exception ex) {
-                // Hack to handle destruction of Servlets without Servlet context 
-            }
-
-            logger.info("Removed Servlet mapping: " + suri);
-
-            // Stop the port if there's no servlets on it anymore
-            String[] contextNames = port.getConnector().getMapper().getContextNames();
-            if (contextNames == null || contextNames.length == 0) {
-                try {
-                    port.getConnector().stop();
-                    port.getEngine().stop();
-                    ports.remove(portNumber);
-                } catch (LifecycleException e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-
-            return servletWrapper.getServlet();
-        } else {
-            logger.warning("Trying to Remove servlet mapping: " + mapping + " where mapping is not registered");
-            return null;
-        }
-    }
-
-    public RequestDispatcher getRequestDispatcher(String suri) throws ServletMappingException {
-        //FIXME implement this later
-        return null;
-    }
-
-    public String getContextPath() {
-        return contextPath;
-    }
-
-    /**
-     * A custom connector that uses our WorkScheduler to schedule
-     * worker threads.
-     */
-    private class CustomConnector extends Connector {
-
-        private class CustomHttpProtocolHandler extends Http11Protocol {
-
-            /**
-             * An Executor wrapping our WorkScheduler
-             */
-            private class WorkSchedulerExecutor implements Executor {
-                public void execute(Runnable command) {
-                    workScheduler.scheduleWork(command);
-                }
-            }
-
-            /**
-             * A custom Endpoint that waits for its acceptor thread to
-             * terminate before stopping.
-             */
-            private class CustomEndpoint extends JIoEndpoint {
-                private Thread acceptorThread;
-
-                private class CustomAcceptor extends Acceptor {
-                    CustomAcceptor() {
-                        super();
-                    }
-                }
-
-                @Override
-                public void start() throws Exception {
-                    if (!initialized)
-                        init();
-                    if (!running) {
-                        running = true;
-                        paused = false;
-                        acceptorThread = new Thread(new CustomAcceptor(), getName() + "-Acceptor-" + 0);
-                        acceptorThread.setPriority(threadPriority);
-                        acceptorThread.setDaemon(daemon);
-                        acceptorThread.start();
-                    }
-                }
-
-                @Override
-                public void stop() {
-                    super.stop();
-                    try {
-                        acceptorThread.join();
-                    } catch (InterruptedException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-
-                @Override
-                public int getCurrentThreadsBusy() {
-                    return 0;
-                }
-            }
-
-            CustomHttpProtocolHandler() {
-                endpoint = new CustomEndpoint();
-                endpoint.setExecutor(new WorkSchedulerExecutor());
-            }
-        }
-
-        CustomConnector() throws Exception {
-            protocolHandler = new CustomHttpProtocolHandler();
-        }
-    }
-
-    public void setContextPath(String path) {
-        this.contextPath = path;
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java b/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
deleted file mode 100644
index 070dffdce6..0000000000
--- a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
+++ /dev/null
@@ -1,69 +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.http.tomcat.module;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.http.tomcat.TomcatServer;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TomcatRuntimeModuleActivator implements ModuleActivator {
-
-    private TomcatServer server;
-
-    public void start(ExtensionPointRegistry extensionPointRegistry) {
-
-        // Register a Tomcat Servlet host
-        ServletHostExtensionPoint servletHosts =
-            extensionPointRegistry.getExtensionPoint(ServletHostExtensionPoint.class);
-        
-        if (servletHosts.getServletHosts().size() < 1) {
-            UtilityExtensionPoint utilities = extensionPointRegistry.getExtensionPoint(UtilityExtensionPoint.class);
-            final WorkScheduler workScheduler = utilities.getUtility(WorkScheduler.class);
-            // Allow privileged access to start MBeans. Requires MBeanPermission in security policy.
-            server = AccessController.doPrivileged(new PrivilegedAction<TomcatServer>() {
-                public TomcatServer run() {
-                    return new TomcatServer(workScheduler);
-                 }
-            });        
-            servletHosts.addServletHost(server);
-        }
-    }
-
-    public void stop(ExtensionPointRegistry registry) {
-        // Allow privileged access to stop MBeans. Requires MBeanPermission in security policy.
-        AccessController.doPrivileged(new PrivilegedAction<Object>() {
-            public Object run() {
-                if (server != null) {
-                    server.stop();
-                }
-                return null;
-            }
-        });            
-    }
-}
diff --git a/java/sca-contrib/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/java/sca-contrib/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index f0f4e17507..0000000000
--- a/java/sca-contrib/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /dev/null
@@ -1,18 +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.

-# Implementation class for the ModuleActivator

-org.apache.tuscany.sca.http.tomcat.module.TomcatRuntimeModuleActivator

diff --git a/java/sca-contrib/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java b/java/sca-contrib/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
deleted file mode 100644
index afbec52cd9..0000000000
--- a/java/sca-contrib/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
+++ /dev/null
@@ -1,353 +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.http.tomcat;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.URL;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLSession;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.http.DefaultResourceServlet;
-import org.apache.tuscany.sca.work.NotificationListener;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TomcatServerTestCase extends TestCase {
-
-    private static final String REQUEST1_HEADER =
-        "GET /foo HTTP/1.0\n" + "Host: localhost\n"
-            + "Content-Type: text/xml\n"
-            + "Connection: close\n"
-            + "Content-Length: ";
-    private static final String REQUEST1_CONTENT = "";
-    private static final String REQUEST1 =
-        REQUEST1_HEADER + REQUEST1_CONTENT.getBytes().length + "\n\n" + REQUEST1_CONTENT;
-
-    private static final String REQUEST2_HEADER =
-        "GET /webcontent/test.html HTTP/1.0\n" + "Host: localhost\n"
-            + "Content-Type: text/xml\n"
-            + "Connection: close\n"
-            + "Content-Length: ";
-    private static final String REQUEST2_CONTENT = "";
-    private static final String REQUEST2 =
-        REQUEST2_HEADER + REQUEST2_CONTENT.getBytes().length + "\n\n" + REQUEST2_CONTENT;
-
-    private static final int HTTP_PORT = 8085;
-
-    private WorkScheduler workScheduler = new WorkScheduler() {
-
-        public <T extends Runnable> void scheduleWork(T work) {
-            Thread thread = new Thread(work);
-            thread.start();
-        }
-
-        public <T extends Runnable> void scheduleWork(T work, NotificationListener<T> listener) {
-            scheduleWork(work);
-        }
-
-        public void destroy() {
-        }
-    };      
-
-    /**
-     * Verifies requests are properly routed according to the Servlet mapping
-     */
-    public void testRegisterServletMapping() throws Exception {
-        TomcatServer service = new TomcatServer(workScheduler);
-        TestServlet servlet = new TestServlet();
-        service.addServletMapping("http://127.0.0.1:" + HTTP_PORT + "/foo", servlet);
-        Socket client = new Socket("127.0.0.1", HTTP_PORT);
-        OutputStream os = client.getOutputStream();
-        os.write(REQUEST1.getBytes());
-        os.flush();
-        read(client);
-        service.stop();
-        assertTrue(servlet.invoked);
-    }
-    
-    /**
-     * Verifies requests are properly routed according to the Servlet mapping
-     */
-    public void testRegisterServletMappingSSL() throws Exception {
-        System.setProperty("javax.net.ssl.keyStore", "target/test-classes/tuscany.keyStore");
-        System.setProperty("javax.net.ssl.keyStorePassword", "apache");
-        TomcatServer service = new TomcatServer(workScheduler);
-        TestServlet servlet = new TestServlet();
-        try {
-            service.addServletMapping("https://127.0.0.1:" + HTTP_PORT + "/foo", servlet);
-        } finally {
-            System.clearProperty("javax.net.ssl.keyStore");
-            System.clearProperty("javax.net.ssl.keyStorePassword");
-        }
-        System.setProperty("javax.net.ssl.trustStore", "target/test-classes/tuscany.keyStore");
-        System.setProperty("javax.net.ssl.trustStorePassword", "apache");
-        URL url = new URL("https://127.0.0.1:8085/foo");
-        HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
-        conn.setHostnameVerifier(new HostnameVerifier() {
-            public boolean verify(String hostname, SSLSession session) {
-                return true;
-            }}
-        );
-
-        conn.connect();
-        read(conn.getInputStream());
-        
-        service.stop();
-        assertTrue(servlet.invoked);
-
-    }
-    /**
-     * Verifies that Servlets can be registered with multiple ports
-     */
-    public void testRegisterMultiplePorts() throws Exception {
-        TomcatServer service = new TomcatServer(workScheduler);
-        TestServlet servlet = new TestServlet();
-        service.addServletMapping("http://127.0.0.1:" + HTTP_PORT + "/", servlet);
-        TestServlet servlet2 = new TestServlet();
-        service.addServletMapping("http://127.0.0.1:" + (HTTP_PORT + 1) + "/", servlet2);
-        {
-            Socket client = new Socket("127.0.0.1", HTTP_PORT);
-            OutputStream os = client.getOutputStream();
-            os.write(REQUEST1.getBytes());
-            os.flush();
-            read(client);
-        }
-        {
-            Socket client = new Socket("127.0.0.1", HTTP_PORT + 1);
-            OutputStream os = client.getOutputStream();
-            os.write(REQUEST1.getBytes());
-            os.flush();
-            read(client);
-        }
-        
-        service.stop();
-        assertTrue(servlet.invoked);
-        assertTrue(servlet2.invoked);
-    }
-
-    public void testUnregisterMapping() throws Exception {
-        TomcatServer service = new TomcatServer(workScheduler);
-        TestServlet servlet = new TestServlet();
-        service.addServletMapping("http://127.0.0.1:" + HTTP_PORT + "/foo", servlet);
-        service.removeServletMapping("http://127.0.0.1:" + HTTP_PORT + "/foo");
-        Socket client = new Socket("127.0.0.1", HTTP_PORT);
-        OutputStream os = client.getOutputStream();
-        os.write(REQUEST1.getBytes());
-        os.flush();
-        read(client);
-        service.stop();
-        assertFalse(servlet.invoked);
-        
-    }
-    
-    public void testRegisterUnregisterMapping() throws Exception {
-        TomcatServer service = new TomcatServer(workScheduler);
-        TestServlet servlet = new TestServlet();
-        service.addServletMapping("http://127.0.0.1:" + HTTP_PORT + "/foo", servlet);
-        {
-            Socket client = new Socket("127.0.0.1", HTTP_PORT);
-            OutputStream os = client.getOutputStream();
-            os.write(REQUEST1.getBytes());
-            os.flush();
-            read(client);            
-        }
-        assertTrue(servlet.invoked);
-        service.removeServletMapping("http://127.0.0.1:" + HTTP_PORT + "/foo");
-        {
-            Socket client = new Socket("127.0.0.1", HTTP_PORT);
-            OutputStream os = client.getOutputStream();
-            os.write(REQUEST1.getBytes());
-            os.flush();
-            read(client);            
-        }
-        servlet = new TestServlet();
-        service.addServletMapping("http://127.0.0.1:" + HTTP_PORT + "/foo", servlet);
-        {
-            Socket client = new Socket("127.0.0.1", HTTP_PORT);
-            OutputStream os = client.getOutputStream();
-            os.write(REQUEST1.getBytes());
-            os.flush();
-            read(client);            
-        }
-        assertTrue(servlet.invoked);
-        service.stop();
-    } 
-
-    public void testRequestSession() throws Exception {
-        TomcatServer service = new TomcatServer(workScheduler);
-        TestServlet servlet = new TestServlet();
-        service.addServletMapping("http://127.0.0.1:" + HTTP_PORT + "/foo", servlet);
-        Socket client = new Socket("127.0.0.1", HTTP_PORT);
-        OutputStream os = client.getOutputStream();
-        os.write(REQUEST1.getBytes());
-        os.flush();
-        read(client);
-        service.stop();
-        assertTrue(servlet.invoked);
-        assertNotNull(servlet.sessionId);
-    }
-
-    public void testRestart() throws Exception {
-        TomcatServer service = new TomcatServer(workScheduler);
-        service.stop();
-        service.stop();
-    }
-
-    public void testNoMappings() throws Exception {
-        TomcatServer service = new TomcatServer(workScheduler);
-        Exception ex = null;
-        try {
-            Socket client = new Socket("127.0.0.1", HTTP_PORT);
-            OutputStream os = client.getOutputStream();
-            os.write(REQUEST1.getBytes());
-            os.flush();
-        } catch (Exception e) {
-            ex = e;
-        }
-        assertNotNull(ex);
-        service.stop();
-    }
-
-    public void testResourceServlet() throws Exception {
-        TomcatServer service = new TomcatServer(workScheduler);
-        
-        String documentRoot = getClass().getClassLoader().getResource("content/test.html").toString();
-        documentRoot = documentRoot.substring(0, documentRoot.lastIndexOf('/'));
-        DefaultResourceServlet resourceServlet = new DefaultResourceServlet(documentRoot);
-        TestResourceServlet servlet = new TestResourceServlet(resourceServlet);
-        service.addServletMapping("http://127.0.0.1:" + HTTP_PORT + "/webcontent/*", servlet);
-        
-        Socket client = new Socket("127.0.0.1", HTTP_PORT);
-        OutputStream os = client.getOutputStream();
-        os.write(REQUEST2.getBytes());
-        os.flush();
-        
-        String document = read(client);
-        assertTrue(document.indexOf("<body><p>hello</body>") != -1);
-        
-        service.stop();
-    }
-
-    public void testDefaultServlet() throws Exception {
-        TomcatServer service = new TomcatServer(workScheduler);
-        
-        String documentRoot = getClass().getClassLoader().getResource("content/test.html").toString();
-        documentRoot = documentRoot.substring(0, documentRoot.lastIndexOf('/'));
-        DefaultResourceServlet resourceServlet = new DefaultResourceServlet(documentRoot);
-        service.addServletMapping("http://127.0.0.1:" + HTTP_PORT + "/webcontent/*", resourceServlet);
-        
-        Socket client = new Socket("127.0.0.1", HTTP_PORT);
-        OutputStream os = client.getOutputStream();
-        os.write(REQUEST2.getBytes());
-        os.flush();
-        
-        String document = read(client);
-        assertTrue(document.indexOf("<body><p>hello</body>") != -1);
-        
-        service.stop();
-    }
-
-    private static String read(Socket socket) throws IOException {
-        InputStream is = socket.getInputStream();
-        return read(is);
-    }
-
-    private static String read(InputStream is) throws IOException {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(is));
-            StringBuffer sb = new StringBuffer();
-            String str;
-            while ((str = reader.readLine()) != null) {
-                sb.append(str);
-            }
-            return sb.toString();
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
-    }
-    private class TestServlet extends HttpServlet {
-        private static final long serialVersionUID = 1L;
-        boolean invoked;
-        String sessionId;
-
-        @Override
-        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-            invoked = true;
-            sessionId = req.getSession().getId();
-            OutputStream writer = resp.getOutputStream();
-            try {
-                writer.write("result".getBytes());
-            } finally {
-                writer.close();
-            }
-        }
-
-    }
-
-    private class TestResourceServlet extends HttpServlet {
-        private static final long serialVersionUID = 1L;
-        private HttpServlet delegate;
-        
-        public TestResourceServlet(HttpServlet delegate) {
-            this.delegate = delegate;
-        }
-        
-        @Override
-        public void init() throws ServletException {
-            super.init();
-            delegate.init();
-        }
-
-        @Override
-        public void init(ServletConfig config) throws ServletException {
-            super.init();
-            delegate.init(config);
-        }
-        
-        @Override
-        protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-            delegate.service(req, resp);
-        }
-        
-        @Override
-        public void destroy() {
-            super.destroy();
-            delegate.destroy();
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/host-tomcat/src/test/resources/content/test.html b/java/sca-contrib/modules/host-tomcat/src/test/resources/content/test.html
deleted file mode 100644
index f4b79d7f01..0000000000
--- a/java/sca-contrib/modules/host-tomcat/src/test/resources/content/test.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<!--
-    * 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.    
--->
-<body><p>hello</body>
-</html>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/host-tomcat/src/test/resources/tuscany.keyStore b/java/sca-contrib/modules/host-tomcat/src/test/resources/tuscany.keyStore
deleted file mode 100644
index 7ea23f7ff4..0000000000
--- a/java/sca-contrib/modules/host-tomcat/src/test/resources/tuscany.keyStore
+++ /dev/null
diff --git a/java/sca-contrib/modules/host-webapp-junit/LICENSE b/java/sca-contrib/modules/host-webapp-junit/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/host-webapp-junit/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/host-webapp-junit/META-INF/MANIFEST.MF b/java/sca-contrib/modules/host-webapp-junit/META-INF/MANIFEST.MF
deleted file mode 100644
index 56b597c164..0000000000
--- a/java/sca-contrib/modules/host-webapp-junit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.host.webapp.junit;uses:="org.ju

- nit.runner.notification,javax.servlet,junit.framework,org.junit.runne

- r,javax.servlet.http";version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Webapp JUnit Host

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397431421

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Webapp JUnit Host

-Import-Package: javax.servlet,javax.servlet.http,junit.framework,org.a

- pache.tuscany.sca.host.webapp.junit;version="2.0.0",org.junit.runner,or

- g.junit.runner.notification

-Bundle-SymbolicName: org.apache.tuscany.sca.host.webapp.junit

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/host-webapp-junit/NOTICE b/java/sca-contrib/modules/host-webapp-junit/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/host-webapp-junit/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/host-webapp-junit/pom.xml b/java/sca-contrib/modules/host-webapp-junit/pom.xml
deleted file mode 100644
index 443b55b8a9..0000000000
--- a/java/sca-contrib/modules/host-webapp-junit/pom.xml
+++ /dev/null
@@ -1,48 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-host-webapp-junit</artifactId>
-    <name>Apache Tuscany SCA Webapp JUnit Host</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java b/java/sca-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
deleted file mode 100644
index b2d3d0abf1..0000000000
--- a/java/sca-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
+++ /dev/null
@@ -1,355 +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.host.webapp.junit;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-import java.util.logging.Logger;
-import java.util.regex.Pattern;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import junit.framework.AssertionFailedError;
-
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Request;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JUnitServletFilter implements Filter {
-    private static final Logger logger = Logger.getLogger(JUnitServletFilter.class.getName());
-
-    private static final String JUNIT_TESTS_PATTERN = "junit.tests.pattern";
-    private static final String JUNIT_TESTS_PATH = "junit.tests.path";
-    private static final String JUNIT_ENABLED = "junit.enabled";
-    private static final String TESTCASE_PATTERN = ".*TestCase";
-    private static final String TESTS_JAR = "/WEB-INF/test-lib/junit-tests.jar";
-
-    private FilterConfig config;
-    private boolean junitEnabled = true;
-    private Set<String> allTestCases;
-    private ClassLoader testClassLoader;
-
-    private Set<String> findTestCases(String testJarPath) throws IOException {
-        Pattern pattern = getTestCasePattern();
-        if (testJarPath.endsWith(".jar")) {
-            return findTestCasesInJar(testJarPath, pattern);
-        } else {
-            return findTestCasesInDir(testJarPath, pattern);
-        }
-    }
-
-    /**
-     * Search test cases in a JAR
-     * @param testJarPath
-     * @param pattern
-     * @return
-     * @throws IOException
-     */
-    private Set<String> findTestCasesInJar(String testJarPath, Pattern pattern) throws IOException {
-        InputStream in = config.getServletContext().getResourceAsStream(testJarPath);
-        Set<String> tests = new HashSet<String>();
-        if (in != null) {
-            JarInputStream jar = new JarInputStream(in);
-            try {
-                JarEntry entry = null;
-
-                while ((entry = jar.getNextJarEntry()) != null) {
-                    String name = entry.getName();
-
-                    if (name.endsWith(".class")) {
-                        String className = name.substring(0, name.length() - 6).replace('/', '.');
-                        if (pattern.matcher(className).matches()) {
-                            tests.add(className);
-                        }
-                    }
-                }
-            } catch (EOFException e) {
-            } finally {
-                if (jar != null) {
-                    try {
-                        jar.close();
-                    } catch (IOException e) {
-                    }
-                }
-            }
-
-        }
-        return tests;
-    }
-
-    private Pattern getTestCasePattern() {
-        String filter = config.getInitParameter(JUNIT_TESTS_PATTERN);
-        if (filter == null) {
-            filter = TESTCASE_PATTERN;
-        }
-        Pattern pattern = Pattern.compile(filter);
-        return pattern;
-    }
-
-    public void destroy() {
-    }
-
-    private void init() throws IOException {
-        testClassLoader = Thread.currentThread().getContextClassLoader();
-        allTestCases = new HashSet<String>();
-        String testsPath = config.getInitParameter(JUNIT_TESTS_PATH);
-        if (testsPath == null) {
-            testsPath = TESTS_JAR;
-        }
-        URL url = config.getServletContext().getResource(testsPath);
-        if (url != null) {
-            allTestCases = findTestCases(testsPath);
-            if (!(testsPath.startsWith("/WEB-INF/lib/") || testsPath.startsWith("/WEB-INF/classes/"))) {
-                // Create a new ClassLoader to load the test jar
-                testClassLoader = new URLClassLoader(new URL[] {url}, testClassLoader);
-            }
-        }
-    }
-
-    /**
-     * Search test cases in a directory
-     * @param classesPath
-     * @param pattern
-     * @return
-     */
-    private Set<String> findTestCasesInDir(String classesPath, Pattern pattern) {
-        ServletContext context = config.getServletContext();
-        Set<String> tests = new HashSet<String>();
-        String dir = classesPath;
-        findResources(context, pattern, tests, classesPath, dir);
-        return tests;
-    }
-
-    @SuppressWarnings("unchecked")
-    private void findResources(ServletContext context, Pattern pattern, Set<String> tests, String root, String dir) {
-        Set<String> paths = context.getResourcePaths(dir);
-        if (paths != null) {
-            for (String name : paths) {
-                if (name.endsWith("/")) {
-                    findResources(context, pattern, tests, root, name);
-                }
-                if (name.endsWith(".class")) {
-                    String className = name.substring(root.length(), name.length() - 6).replace('/', '.');
-                    if (pattern.matcher(className).matches()) {
-                        tests.add(className);
-                    }
-                }
-            }
-        }
-    }
-
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
-        ServletException {
-
-        if (!junitEnabled) {
-            chain.doFilter(request, response);
-            return;
-        }
-
-        HttpServletRequest req = (HttpServletRequest)request;
-        HttpServletResponse resp = (HttpServletResponse)response;
-
-        if (!req.getRequestURI().equals(req.getContextPath() + "/junit")) {
-            // Intercept the /junit call
-            chain.doFilter(request, response);
-            return;
-        }
-
-        String query = req.getQueryString();
-        PrintStream ps = new PrintStream(response.getOutputStream());
-
-        Set<String> testCases = null;
-        // ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        String op = req.getParameter("op");
-        if (query == null || op == null || "list".equalsIgnoreCase(op)) {
-            response.setContentType("text/html");
-            resp.setStatus(HttpServletResponse.SC_OK);
-            ps.println("<html><body>");
-            ps.println("<h2>Available Test Cases</h2><p>");
-            ps.println("<form method=\"get\" action=\"junit\">");
-            ps.println("<table border=\"1\">");
-            for (String s : this.allTestCases) {
-                ps.print("<tr><td>");
-                ps.print("<input type=\"checkbox\" name=\"test\" value=\"" + s
-                    + "\"/><a href=\"junit?op=runSelected&test="
-                    + s
-                    + "\">"
-                    + s
-                    + "</a>");
-                ps.println("</td></tr>");
-            }
-            ps.println("</table>");
-            ps.println("<p><input type=\"submit\" name=\"op\" value=\"RunSelected\"/>");
-            ps.println("<input type=\"submit\" name=\"op\" value=\"RunAll\"/>");
-            ps.println("</form></body></html>");
-            resp.flushBuffer();
-            return;
-        } else {
-            if ("runAll".equalsIgnoreCase(op)) {
-                testCases = this.allTestCases;
-            } else {
-                String[] tests = req.getParameterValues("test");
-                if (tests == null) {
-                    tests = new String[0];
-                }
-                testCases = new HashSet<String>(Arrays.asList(tests));
-            }
-        }
-
-        response.setContentType("application/xml");
-        ps.println("<?xml version=\"1.0\" encoding=\"" + "UTF-8" + "\"?>");
-
-        ServletContext context = config.getServletContext();
-        Object domain = context.getAttribute("org.apache.tuscany.sca.SCADomain");
-        URL contribution = context.getResource("/META-INF/sca-contribution.xml");
-
-        long duration = 0L;
-        int errors = 0;
-        int failures = 0;
-        int runs = 0;
-        List<Class<?>> testClasses = new ArrayList<Class<?>>();
-        List<Result> results = new ArrayList<Result>();
-        for (String testClass : testCases) {
-            Class<?> test = null;
-            try {
-                test = Class.forName(testClass, false, testClassLoader);
-                if (domain != null && contribution != null) {
-                    // Inject the SCADomain
-                    inject(test, domain);
-                }
-                testClasses.add(test);
-            } catch (ClassNotFoundException e) {
-                String st = XMLFormatter.exceptionToString(e);
-                st = XMLFormatter.escape(st);
-                ps.println(st);
-                // ps.close();
-                throw new ServletException(e);
-            }
-
-            JUnitCore core = new JUnitCore();
-            Result result = core.run(Request.aClass(test));
-            results.add(result);
-
-            duration += result.getRunTime();
-            runs += result.getRunCount();
-
-            for (Failure f : result.getFailures()) {
-                if (f.getException() instanceof AssertionFailedError) {
-                    failures++;
-                } else {
-                    errors++;
-                }
-            }
-        }
-
-        ps.println("<" + XMLFormatter.TESTSUITE
-            + " "
-            + XMLFormatter.ATTR_TESTS
-            + "=\""
-            + runs
-            + "\" "
-            + XMLFormatter.ATTR_FAILURES
-            + "=\""
-            + failures
-            + "\" "
-            + XMLFormatter.ATTR_ERRORS
-            + "=\""
-            + errors
-            + "\" "
-            + XMLFormatter.ATTR_TIME
-            + "=\""
-            + XMLFormatter.getDurationAsString(duration)
-            + "\">");
-        for (int i = 0; i < testClasses.size(); i++) {
-            ps.println(XMLFormatter.toXML(results.get(i), testClasses.get(i)));
-        }
-        ps.println("</" + XMLFormatter.TESTSUITE + ">");
-
-        resp.addIntHeader("junit.errors", errors);
-        resp.addIntHeader("junit.failures", failures);
-        resp.addIntHeader("junit.runs", runs);
-        resp.setStatus(HttpServletResponse.SC_OK);
-        resp.flushBuffer();
-        
-        ps.close();    
-    }
-
-    private boolean inject(Class<?> cls, Object target) {
-        for (Field f : cls.getDeclaredFields()) {
-            if (Modifier.isStatic(f.getModifiers()) && f.getType().isInstance(target)) {
-                f.setAccessible(true);
-                try {
-                    f.set(null, target);
-                    return true;
-                } catch (IllegalArgumentException e) {
-                    return false;
-                } catch (IllegalAccessException e) {
-                    return false;
-                }
-            }
-        }
-        return false;
-    }
-
-    public void init(FilterConfig config) throws ServletException {
-        this.config = config;
-        // Check if the /junit path should be allowed
-        String param = config.getInitParameter(JUNIT_ENABLED);
-        if (param != null && param.trim().equals("false")) {
-            junitEnabled = false;
-            return;
-        }
-        try {
-            init();
-        } catch (IOException e) {
-            throw new ServletException(e);
-        }
-    }
-
-    public boolean isJunitEnabled() {
-        return junitEnabled;
-    }
-
-}
diff --git a/java/sca-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java b/java/sca-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
deleted file mode 100644
index 72ec478cd6..0000000000
--- a/java/sca-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/* 
- * ========================================================================
- * 
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed 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.host.webapp.junit;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.text.NumberFormat;
-import java.util.Locale;
-
-import junit.framework.AssertionFailedError;
-
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-
-/**
- * Format the test results in XML.
- *
- * @version $Id: XMLFormatter.java 239169 2005-05-05 09:21:54Z vmassol $
- */
-public class XMLFormatter {
-    /**
-     * Errors attribute for TestSuite elements
-     */
-    public static final String ATTR_ERRORS = "errors";
-
-    /**
-     * Failures attribute for TestSuite elements
-     */
-    public static final String ATTR_FAILURES = "failures";
-
-    /**
-     * Message attribute for failure elements (message of the exception)
-     */
-    public static final String ATTR_MESSAGE = "message";
-
-    /**
-     * Name attribute for property, TestCase and TestSuite elements
-     */
-    public static final String ATTR_NAME = "name";
-
-    /**
-     * Tests attribute for TestSuite elements (number of tests executed)
-     */
-    public static final String ATTR_TESTS = "tests";
-
-    /**
-     * Time attribute for TestCase and TestSuite elements
-     */
-    public static final String ATTR_TIME = "time";
-
-    /**
-     * Type attribute for failure and error elements
-     */
-    public static final String ATTR_TYPE = "type";
-
-    /**
-     * Default stack filter patterns.
-     */
-    private static final String[] DEFAULT_STACK_FILTER_PATTERNS =
-        new String[] {"junit.framework.TestCase", "junit.framework.TestResult", "junit.framework.TestSuite",
-                      "junit.framework.Assert.", // don't filter AssertionFailure
-                      "java.lang.reflect.Method.invoke("};
-
-    /**
-     * The number format used to convert durations into strings. Don't use the
-     * default locale for that, because the resulting string needs to use 
-     * dotted decimal notation for an XSLT transformation to work correctly.
-     */
-    private static NumberFormat durationFormat = NumberFormat.getInstance(Locale.US);
-
-    /**
-     * The error element (for a test case)
-     */
-    public static final String ERROR = "error";
-
-    /**
-     * The failure element (for a test case)
-     */
-    public static final String FAILURE = "failure";
-
-    /**
-     * A single TestCase element
-     */
-    public static final String TESTCASE = "testcase";
-
-    /**
-     * A single test suite results.
-     */
-    public static final String TESTSUITE = "testsuite";
-
-    /**
-     * Escapes reserved XML characters.
-     *
-     * @param theString the string to escape
-     * @return the escaped string
-     */
-    public static String escape(String theString) {
-        String newString;
-
-        // It is important to replace the "&" first as the other replacements
-        // also introduces "&" chars ...
-        newString = theString.replace("&", "&amp;");
-
-        newString = newString.replace("<", "&lt;");
-        newString = newString.replace(">", "&gt;");
-        newString = newString.replace("\"", "&quot;");
-
-        return newString;
-    }
-
-    /**
-     * Returns the stack trace of an exception as String.
-     * 
-     * @param theThrowable the exception from which to extract the stack trace
-     *        as a String
-     * @return the exception stack trace as a String
-     */
-    public static String exceptionToString(Throwable theThrowable) {
-        return exceptionToString(theThrowable, null);
-    }
-
-    /**
-     * Returns the stack trace of an exception as String, optionally filtering
-     * out line from the stack trace
-     * 
-     * @param theThrowable the exception from which to extract the stack trace
-     *        as a String
-     * @param theFilterPatterns Array containing a list of patterns to filter 
-     *        out from the stack trace
-     * @return the exception stack trace as a String
-     */
-    public static String exceptionToString(Throwable theThrowable, String[] theFilterPatterns) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-
-        theThrowable.printStackTrace(pw);
-        String stackTrace = sw.toString();
-        return filterStackTrace(stackTrace, theFilterPatterns);
-    }
-
-    /**
-     * 
-     * 
-     * @param theLine The line to check
-     * @param theFilterPatterns The patterns to filter out
-     * @return boolean Whether the specified line should be filtered from the
-     *         stack trace
-     */
-    public static boolean filterLine(String theLine, String[] theFilterPatterns) {
-        for (int i = 0; i < theFilterPatterns.length; i++) {
-            if (theLine.indexOf(theFilterPatterns[i]) > 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 
-     * 
-     * @param theStackTrace The original, unfiltered stack trace
-     * @param theFilterPatterns The patterns to filter out
-     * @return The filtered stack trace
-     */
-    static String filterStackTrace(String theStackTrace, String[] theFilterPatterns) {
-        if ((theFilterPatterns == null) || (theFilterPatterns.length == 0) || (theStackTrace == null)) {
-            return theStackTrace;
-        }
-
-        StringWriter stringWriter = new StringWriter();
-        PrintWriter printWriter = new PrintWriter(stringWriter);
-        StringReader stringReader = new StringReader(theStackTrace);
-        BufferedReader bufferedReader = new BufferedReader(stringReader);
-
-        String line;
-        try {
-            while ((line = bufferedReader.readLine()) != null) {
-                if (!filterLine(line, theFilterPatterns)) {
-                    printWriter.println(line);
-                }
-            }
-        } catch (IOException e) {
-            return theStackTrace;
-        }
-        return stringWriter.toString();
-    }
-
-    /**
-     * Convert a duration expressed as a long into a string.
-     *
-     * @param theDuration the duration to convert to string
-     * @return the total duration as a string
-     */
-    public static String getDurationAsString(long theDuration) {
-        return durationFormat.format((double)theDuration / 1000);
-    }
-
-    public static String toXML(Failure failure) {
-        StringBuffer xml = new StringBuffer();
-        Throwable ex = failure.getException();
-        String tag = (ex instanceof AssertionFailedError) ? FAILURE : ERROR;
-        xml.append("<" + tag
-            + " "
-            + ATTR_MESSAGE
-            + "=\""
-            + escape(ex.getMessage())
-            + "\" "
-            + ATTR_TYPE
-            + "=\""
-            + ex.getClass().getName()
-            + "\">");
-        xml.append(escape(exceptionToString(ex, DEFAULT_STACK_FILTER_PATTERNS)));
-        xml.append("</" + tag + ">");
-
-        return xml.toString();
-    }
-
-    /**
-     * Formats the test result as an XML string.
-     *
-     * @param result the test result object
-     * @return the XML string representation of the test results
-     */
-    public static String toXML(Result result, Class<?> cls) {
-        int failures = 0, errors = 0;
-        for (Failure f : result.getFailures()) {
-            if (f.getException() instanceof AssertionFailedError) {
-                failures++;
-            } else {
-                errors++;
-            }
-        }
-        StringBuffer xml = new StringBuffer();
-
-        xml.append("<" + TESTCASE
-            + " "
-            + ATTR_NAME
-            + "=\""
-            + cls.getName()
-            + "\" "
-            + ATTR_TESTS
-            + "=\""
-            + result.getRunCount()
-            + "\" "
-            + ATTR_FAILURES
-            + "=\""
-            + failures
-            + "\" "
-            + ATTR_ERRORS
-            + "=\""
-            + errors
-            + "\" "
-            + ATTR_TIME
-            + "=\""
-            + getDurationAsString(result.getRunTime())
-            + "\">");
-
-        for (Failure f : result.getFailures()) {
-            xml.append(toXML(f));
-        }
-
-        xml.append("</" + TESTCASE + ">");
-
-        return xml.toString();
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/LICENSE b/java/sca-contrib/modules/implementation-bpel-ode/LICENSE
deleted file mode 100644
index baba9ca048..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/LICENSE
+++ /dev/null
@@ -1,251 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-===============================================================================================================

-

-Apache Tuscany SCA for Java Subcomponents

-=========================================: 

-

-The Tuscany SCA for Java release includes a number of subcomponents with

-separate copyright notices and license terms. Your use of the source

-code for the these subcomponents is subject to the terms and

-conditions of the following licenses.

-

-=================================================================================================================

-

-This module implementation-script temporarily includes one file under the following BSD license:

-

- Copyright (c) 2006, Sun Microsystems, Inc.

- All rights reserved.

- 

- Redistribution and use in source and binary forms, with or without 

- modification, are permitted provided that the following conditions are met:

- 

-  - Redistributions of source code must retain the above copyright notice, this 

-    list of conditions and the following disclaimer.

- 

-  - Redistributions in binary form must reproduce the above copyright notice, 

-    this list of conditions and the following disclaimer in the documentation 

-    and/or other materials provided with the distribution.

- 

-  - Neither the name of the Sun Microsystems, Inc. nor the names of 

-    contributors may be used to endorse or promote products derived from this 

-    software without specific prior written permission.

- 

- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 

- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 

- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 

- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 

- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 

- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 

- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 

- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 

- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 

- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 

- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 

- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 

- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 

- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 

- DAMAGE. 

-

-=================================================================================================================

diff --git a/java/sca-contrib/modules/implementation-bpel-ode/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
deleted file mode 100644
index 552581efb6..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.implementation.bpel.ode;versio

- n="1.4",org.apache.tuscany.sca.implementation.bpel.ode.provider;versi

- on="1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA BPEL ODE Implementation Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397447609

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA BPEL ODE Implementation Extensi

- on

-Import-Package: javax.resource.spi,

- javax.sql,

- javax.transaction;version="1.0.1",

- javax.wsdl,

- javax.xml.namespace,

- 

- org.apache.commons.logging,

- org.apache.geronimo.transaction.manager,

- org.apache.ode.bpel.compiler,

- org.apache.ode.bpel.dao,

- org.apache.ode.bpel.engine,

- org.apache.ode.bpel.evt,

- org.apache.ode.bpel.iapi,

- org.apache.ode.bpel.memdao,

- org.apache.ode.il.config,

- org.apache.ode.il.dbutil,

- org.apache.ode.scheduler.simple,

- org.apache.ode.utils,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.databinding.xml;version="2.0.0",

- org.apache.tuscany.sca.implementation.bpel;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0",

- org.w3c.dom

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.bpel.ode

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/implementation-bpel-ode/NOTICE b/java/sca-contrib/modules/implementation-bpel-ode/NOTICE
deleted file mode 100644
index 61ea4111aa..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/NOTICE
+++ /dev/null
@@ -1,17 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

-Unless otherwise indicated, all distribution made available by the Apache Software Foundation

-is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").

-A copy of the AL is provided with this distribution as the LICENSE file present in the

-root directory, and is also available at http://www.apache.org/licenses/.

-

-This product also includes software under the BSD license 

-(see the LICENSE file contained in this distribution), with

-the following copyright:

-

-Copyright (c) 2006, Sun Microsystems, Inc.

-All rights reserved.

diff --git a/java/sca-contrib/modules/implementation-bpel-ode/pom.xml b/java/sca-contrib/modules/implementation-bpel-ode/pom.xml
deleted file mode 100644
index 02eccc899a..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/pom.xml
+++ /dev/null
@@ -1,415 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-implementation-bpel-ode</artifactId>

-    <name>Apache Tuscany SCA BPEL ODE Implementation Extension</name>

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-assembly</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-bpel</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-core</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-contribution</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-databinding</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-databinding-sdo</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sdo</groupId>

-            <artifactId>tuscany-sdo-impl</artifactId>

-            <version>1.1.1</version>

-            <scope>compile</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <!-- ODE Jars -->

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-bpel-epr</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-bpel-store</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-bpel-dao</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-bpel-dao</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-dao-jpa</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-dao-jpa-ojpa-derby</artifactId>

-            <version>1.1.1</version>

-            <type>zip</type>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-bpel-runtime</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-bpel-api</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-scheduler-simple</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-utils</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-bpel-compiler</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-bpel-schemas</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-bpel-obj</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-jacob</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-jacob-ap</artifactId>

-            <version>1.1.1</version>

-        </dependency>

-

-        <!-- ODE Dependencies -->

-        <dependency>

-            <groupId>commons-lang</groupId>

-            <artifactId>commons-lang</artifactId>

-            <version>2.1</version>

-        </dependency>

-        <dependency>

-            <groupId>commons-collections</groupId>

-            <artifactId>commons-collections</artifactId>

-            <version>3.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.geronimo.specs</groupId>

-            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>

-            <version>1.0</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.geronimo.modules</groupId>

-            <artifactId>geronimo-kernel</artifactId>

-            <version>1.2-beta</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>mx4j</groupId>

-                    <artifactId>mx4j</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>xpp3</groupId>

-                    <artifactId>xpp3</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>xstream</groupId>

-                    <artifactId>xstream</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.geronimo.modules</groupId>

-            <artifactId>geronimo-transaction</artifactId>

-            <version>1.2-beta</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.geronimo.specs</groupId>

-                    <artifactId>geronimo-ejb_2.1_spec</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>ognl</groupId>

-                    <artifactId>ognl</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.geronimo.specs</groupId>

-            <artifactId>geronimo-ejb_3.0_spec</artifactId>

-            <version>1.0</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.geronimo.modules</groupId>

-            <artifactId>geronimo-connector</artifactId>

-            <version>1.2-beta</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>xmlbeans</groupId>

-                    <artifactId>xbean</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.derby</groupId>

-            <artifactId>derby</artifactId>

-            <version>10.3.1.4</version>

-        </dependency>

-        <dependency>

-            <groupId>tranql</groupId>

-            <artifactId>tranql-connector</artifactId>

-            <version>1.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.openjpa</groupId>

-            <artifactId>openjpa-all</artifactId>

-            <version>0.9.7-incubating</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.openjpa</groupId>

-                    <artifactId>openjpa-lib</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.apache.openjpa</groupId>

-                    <artifactId>openjpa-kernel</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.apache.openjpa</groupId>

-                    <artifactId>openjpa-kernel-5</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.apache.openjpa</groupId>

-                    <artifactId>openjpa-jdbc</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.apache.openjpa</groupId>

-                    <artifactId>openjpa-jdbc-5</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.apache.openjpa</groupId>

-                    <artifactId>openjpa-persistence-jdbc</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.apache.openjpa</groupId>

-                    <artifactId>openjpa-xmlstore</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-        <dependency>

-            <groupId>net.sourceforge.serp</groupId>

-            <artifactId>serp</artifactId>

-            <version>1.12.0</version>

-        </dependency>

-        <dependency>

-            <groupId>jaxen</groupId>

-            <artifactId>jaxen</artifactId>

-            <version>1.1.1</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>xom</groupId>

-                    <artifactId>xom</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-        <dependency>

-            <groupId>xalan</groupId>

-            <artifactId>xalan</artifactId>

-            <version>2.7.0</version>

-        </dependency>

-        <dependency>

-            <groupId>xerces</groupId>

-            <artifactId>xercesImpl</artifactId>

-            <version>2.8.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.xmlbeans</groupId>

-            <artifactId>xmlbeans</artifactId>

-            <version>2.3.0</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-        <dependency>

-            <groupId>net.sf.saxon</groupId>

-            <artifactId>saxon</artifactId>

-            <version>8.7</version>

-            <!--version>9.0.0.2</version-->

-        </dependency>

-        <dependency>

-            <groupId>net.sf.saxon</groupId>

-            <artifactId>saxon-dom</artifactId>

-            <version>8.7</version>

-            <!--version>9.0.0.2</version-->

-        </dependency>

-        <dependency>

-            <groupId>net.sf.saxon</groupId>

-            <artifactId>saxon-xpath</artifactId>

-            <version>8.7</version>

-            <!--version>9.0.0.2</version-->

-        </dependency>

-        <dependency>

-            <groupId>commons-codec</groupId>

-            <artifactId>commons-codec</artifactId>

-            <version>1.3</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>commons-codec</groupId>

-                    <artifactId>commons-codec</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-        <dependency>

-            <groupId>log4j</groupId>

-            <artifactId>log4j</artifactId>

-            <version>1.2.13</version>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-surefire-plugin</artifactId>

-                <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->

-                <version>2.3.1</version>

-                <configuration>

-                    <useFile>false</useFile>

-                    <trimStackTrace>false</trimStackTrace>

-                    <useSystemClassLoader>true</useSystemClassLoader>

-                </configuration>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-dependency-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>unpack</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>unpack</goal>

-                        </goals>

-                        <configuration>

-                            <artifactItems>

-                                <artifactItem>

-                                    <groupId>org.apache.ode</groupId>

-                                    <artifactId>ode-dao-jpa-ojpa-derby</artifactId>

-                                    <version>1.1.1</version>

-                                    <type>zip</type>

-                                    <overWrite>true</overWrite>

-                                    <outputDirectory>${project.build.directory}/test-classes/

-                                    </outputDirectory>

-                                </artifactItem>

-                            </artifactItems>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-

-        </plugins>

-    </build>

-</project>

diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
deleted file mode 100644
index 20373d0819..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
+++ /dev/null
@@ -1,225 +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.implementation.bpel.ode;

-

-import java.io.File;

-import java.io.FileOutputStream;

-import java.io.IOException;

-import java.io.PrintStream;

-import java.net.URI;

-import java.util.List;

-

-import javax.xml.namespace.QName;

-

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

-import org.apache.tuscany.sca.assembly.ComponentType;

-import org.apache.tuscany.sca.assembly.Reference;

-import org.apache.tuscany.sca.assembly.Service;

-import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;

-

-/**

- * A class that handles the deploy.xml file required for each BPEL process by the ODE runtime

- * @author Mike Edwards

- * 

- * An explanation of the structure of the ODE deploy file:

- * 

- * <deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"

- *  xmlns:tns="http://helloworld"

- *  xmlns:tus="http://tuscany.apache.org">

- *

- *  <process name="tns:HelloWorld">

- *      <active>true</active>

- *      <provide partnerLink="helloPartnerLink">

- *          <service name="tus:helloPartnerLink" port="HelloWorld"/>

- *      </provide>

- *      <invoke partnerLink="greetingsPartnerLink">

- *          <service name="tus:greetingsPartnerLink" port="Greetings"/>

- *      </invoke>

- *  </process>

- * </deploy> 

- * 

- * For SCA purposes:

- * 

- * a) Each partner link in the BPEL process is declared using either a <provide.../> 

- * (for a service) or using a <invoke.../> (for a reference).

- * 

- * b) Each <provide/> and <invoke/> must use the partnerLink name, as declared in the

- * BPEL process.

- * 

- * c) The <provide/> and <invoke/> elements each have a single child <service/> element.  

- * The <service/> elements have name and port attributes.  The NAME attribute MUST be set 

- * to the same name as the partnerLink and MUST be prefixed by a prefix which references 

- * the namespace "http://tuscany.apache.org" ("tus" in the example above).  

- * The port attribute can be set to any name (it must be present but it is not actually 

- * used for anything significant).

- * 

- * When SCA loads a BPEL process to the ODE server, this file is read by the ODE server to

- * characterize the process.  When SCA interacts with ODE at later points - either when a

- * service is being invoked or the process invokes a reference - it is the service @name

- * attribute that identifies the service or reference involved.

- *

- * @version 

- */

-public class BPELODEDeployFile {

-	private final Log __log = LogFactory.getLog(getClass());

-	

-	static final String DEPLOY_ELEMENT_START = "<deploy xmlns=\"http://www.apache.org/ode/schemas/dd/2007/03\"";

-	static final String DEPLOY_ENDELEMENT = "</deploy>";

-	static final String PROCESS_NAMESPACE_DECL = "xmlns:tns=";

-	static final String SERVICE_NAMESPACE = "xmlns:tus=\"http://tuscany.apache.org\"";

-	static final String PROCESS_ELEMENT_START = "<process name=\"tns:";

-	static final String PROCESS_ELEMENT_END = "\">";

-	static final String PROCESS_ENDELEMENT = "</process>";

-	static final String ACTIVE_ELEMENT = "<active>true</active>";

-	static final String PROVIDE_ELEMENT_START = "<provide partnerLink=\"";

-	static final String PROVIDE_ELEMENT_END = "\">";

-	static final String PROVIDE_ENDELEMENT = "</provide>";

-	static final String SERVICE_ELEMENT_START = "<service name=\"tus:";

-	static final String SERVICE_ELEMENT_PORT = "\" port=\"";

-	static final String SERVICE_ELEMENT_END = "Port\"/>";

-	static final String INVOKE_ELEMENT_START = "<invoke partnerLink=\"";

-	static final String INVOKE_ELEMENT_END = "\">";

-	static final String INVOKE_ENDELEMENT = "</invoke>";

-	

-	static final String DEPLOY_FILENAME = "deploy.xml";

-	

-	private BPELImplementation implementation;

-	

-	/**

-	 * Constructor - requires a BPELImplementation as a parameter

-	 * The ODE deploy.xml file is for this supplied BPELImplementation

-	 * @param theImplementation

-	 */

-	public BPELODEDeployFile( BPELImplementation theImplementation ) {

-		

-		implementation = theImplementation;

-		

-	} // end BPELODEDeployFile constructor

-	

-	/**

-	 * Writes the deploy file into the same directory as the BPEL process file, with the name

-	 * "deploy.xml"

-	 */

-	public void writeDeployfile() throws IOException {

-		

-		File theDirectory = getDirectory();

-		

-		File deployFile = new File( theDirectory, DEPLOY_FILENAME );

-		new FileOutputStream( deployFile );

-		//if( !deployFile.canWrite() ) throw new IOException( "Unable to write to deploy file" +

-		//		                                             deployFile.getPath() );

-		

-		// Create a stream for the data and write the data to the file

-		PrintStream theStream = new PrintStream( new FileOutputStream( deployFile ) );

-		try {

-		    constructDeployXML( theStream );

-		    if( theStream.checkError() ) throw new IOException();

-		} catch (Exception e) {

-			throw new IOException( "Unable to write data to deploy file" +

-					                deployFile.getPath() );

-		} finally {

-			theStream.close();

-		} // end try

-		

-	} // end writeDeployFile

-	

-	/**

-	 * Creates the deploy.xml data and writes it to a supplied PrintStream

-	 * @param stream

-	 */

-	public void constructDeployXML( PrintStream stream ) {

-		

-		// <deploy + namespace...

-		stream.println( DEPLOY_ELEMENT_START );

-		// namespace of the BPEL process

-		QName process = implementation.getProcess();

-		String processNamespace = process.getNamespaceURI();

-		stream.println( PROCESS_NAMESPACE_DECL + "\"" + processNamespace + "\"" );

-		// namespace for the service name elements

-		stream.println( SERVICE_NAMESPACE + ">" );

-		

-		// <process> element

-		stream.println( PROCESS_ELEMENT_START + process.getLocalPart() + 

-						PROCESS_ELEMENT_END );

-		

-		// <active/> element

-		stream.println( ACTIVE_ELEMENT );

-		

-		ComponentType componentType = implementation.getComponentType();

-		List<Service> theServices = componentType.getServices();

-		// Loop over the <provide/> elements - one per service

-		for ( Service service : theServices ) {

-			String serviceName = service.getName();

-			// Provide element...

-			stream.println( PROVIDE_ELEMENT_START + serviceName + PROVIDE_ELEMENT_END );

-			// Child service element...

-			stream.println( SERVICE_ELEMENT_START + serviceName + 

-					SERVICE_ELEMENT_PORT + serviceName + SERVICE_ELEMENT_END );

-			stream.println( PROVIDE_ENDELEMENT );

-		} // end for

-		

-		// Loop over the <invoke/> elements - one per reference

-		List<Reference> theReferences = componentType.getReferences();

-		for ( Reference reference : theReferences ) {

-			String referenceName = reference.getName();

-			stream.println( INVOKE_ELEMENT_START + referenceName + INVOKE_ELEMENT_END );

-			// Child service element...

-			stream.println( SERVICE_ELEMENT_START + referenceName + 

-					SERVICE_ELEMENT_PORT + referenceName + SERVICE_ELEMENT_END );

-			stream.println( INVOKE_ENDELEMENT );

-

-		} // end for

-		

-		// </process> element

-		stream.println( PROCESS_ENDELEMENT );

-		

-		// </deploy>

-		stream.println( DEPLOY_ENDELEMENT );

-		

-	} // end constructDeployXML

-	

-    /** 

-     * Gets the directory containing the BPEL process

-     * @return

-     */

-    private File getDirectory() {

-        File theDir = getBPELFile().getParentFile();

-        return theDir;

-    } // end getDirectory

-

-    /**

-     * Gets the File containing the BPEL process definition

-     * @return - the File object containing the BPEL process

-     */

-    private File getBPELFile() {

-        try {

-            File theProcess = new File(URI.create(implementation.getProcessDefinition().getLocation()));

-            return theProcess;

-        } catch( Exception e ) {

-            if(__log.isDebugEnabled()) {

-                __log.debug("Exception converting BPEL file URL to an URI: " + e );

-            }

-        } // end try

-        return null;

-    } // end getBPELFile

-

-

-

-} // end class BPELODEDeployFile

diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
deleted file mode 100644
index ed327331db..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
+++ /dev/null
@@ -1,261 +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.implementation.bpel.ode;
-
-import java.io.File;
-import java.net.URL;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import javax.transaction.TransactionManager;
-import javax.xml.namespace.QName;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC;
-import org.apache.ode.bpel.engine.BpelServerImpl;
-import org.apache.ode.bpel.engine.CountLRUDehydrationPolicy;
-import org.apache.ode.bpel.iapi.Scheduler;
-import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl;
-import org.apache.ode.il.config.OdeConfigProperties;
-import org.apache.ode.il.dbutil.Database;
-import org.apache.ode.scheduler.simple.JdbcDelegate;
-import org.apache.ode.scheduler.simple.SimpleScheduler;
-import org.apache.ode.utils.GUID;
-import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * Embedded ODE process server
- * 
- * @version $Rev$ $Date$
- */
-public class EmbeddedODEServer {
-    protected final Log __log = LogFactory.getLog(getClass());
-
-    private boolean _initialized;
-
-    private OdeConfigProperties _config;
-
-    private TransactionManager _txMgr;
-
-    private Database _db;
-
-    private File _workRoot;
-
-    private BpelDAOConnectionFactoryJDBC _daoCF;
-
-    private BpelServerImpl _bpelServer;
-
-    private Scheduler _scheduler;
-    
-    protected ExecutorService _executorService;
-
-    private Map<QName, RuntimeComponent> tuscanyRuntimeComponents = new ConcurrentHashMap<QName, RuntimeComponent>();
-    
-    public EmbeddedODEServer(TransactionManager txMgr) {
-        _txMgr = txMgr;
-    }
-    
-    public void init() throws ODEInitializationException {
-        Properties p = System.getProperties();
-        p.put("derby.system.home", "target");
-
-        Properties confProps = new Properties();
-        confProps.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=false)");
-        _config = new OdeConfigProperties(confProps, "ode-sca");
-
-        // Setting work root as the directory containing our database (wherever in the classpath)
-        URL dbLocation = getClass().getClassLoader().getResource("jpadb");
-        if (dbLocation == null)
-            throw new ODEInitializationException("Couldn't find database in the classpath");
-        _workRoot = new File(dbLocation.getFile()).getParentFile();
-
-        initTxMgr();
-        initPersistence();
-        initBpelServer();
-
-        try {
-            _bpelServer.start();
-        } catch (Exception ex) {
-            String errmsg = "An error occured during the ODE BPEL server startup.";
-            __log.error(errmsg, ex);
-            throw new ODEInitializationException(errmsg, ex);
-        }
-
-        __log.info("ODE BPEL server started.");
-        _initialized = true;
-    }
-
-    private void initTxMgr() {
-        if(_txMgr == null) {
-            try {
-                GeronimoTxFactory txFactory = new GeronimoTxFactory();
-                _txMgr = txFactory.getTransactionManager();
-            } catch (Exception e) {
-                __log.fatal("Couldn't initialize a transaction manager using Geronimo's transaction factory.", e);
-                throw new ODEInitializationException("Couldn't initialize a transaction manager using " + "Geronimo's transaction factory.", e);
-            }            
-        }
-    }
-
-    private void initPersistence() {
-        _db = new Database(_config);
-        _db.setTransactionManager(_txMgr);
-        _db.setWorkRoot(_workRoot);
-
-        try {
-            _db.start();
-            _daoCF = _db.createDaoCF();
-        } catch (Exception ex) {
-            String errmsg = "Error while configuring ODE persistence.";
-            __log.error(errmsg, ex);
-            throw new ODEInitializationException(errmsg, ex);
-        }
-    }
-
-    private void initBpelServer() {
-        if (__log.isDebugEnabled()) {
-            __log.debug("ODE initializing");
-        }
-        
-        //FIXME: externalize the configuration for ThreadPoolMaxSize
-        _executorService = Executors.newCachedThreadPool();
-       
-        _bpelServer = new BpelServerImpl();
-        _scheduler = createScheduler();
-        _scheduler.setJobProcessor(_bpelServer);
-
-        _bpelServer.setDaoConnectionFactory(_daoCF);
-        _bpelServer.setInMemDaoConnectionFactory(new BpelDAOConnectionFactoryImpl(_scheduler));
-        // _bpelServer.setEndpointReferenceContext(new EndpointReferenceContextImpl(this));
-        _bpelServer.setMessageExchangeContext(new ODEMessageExchangeContext(this));
-        _bpelServer.setBindingContext(new ODEBindingContext());
-        _bpelServer.setScheduler(_scheduler);
-        if (_config.isDehydrationEnabled()) {
-            CountLRUDehydrationPolicy dehy = new CountLRUDehydrationPolicy();
-            _bpelServer.setDehydrationPolicy(dehy);
-        }
-
-        _bpelServer.init();
-    } // end InitBpelServer
-
-    public void stop() throws ODEShutdownException {
-        if(_bpelServer != null) {
-            try {
-                __log.debug("Stopping BPEL Embedded server");
-                _bpelServer.shutdown();
-                _bpelServer = null;
-            } catch (Exception ex) {
-                __log.debug("Error stopping BPEL server");
-            }
-        }
-
-        if(_scheduler != null) {
-            try {
-                __log.debug("Stopping scheduler");
-                _scheduler.shutdown();
-                _scheduler = null;
-            } catch (Exception ex) {
-                __log.debug("Error stopping scheduler");
-            }
-        }
-        
-        if(_daoCF != null) {
-            try {
-                __log.debug("Stopping DAO");
-                _daoCF.shutdown();
-                _daoCF = null;
-            } catch (Exception ex) {
-                __log.debug("Error stopping DAO");
-            }
-        }
-        
-        if(_db != null) {
-            try {
-                __log.debug("Stopping DB");
-                _db.shutdown();
-                _db = null;
-            } catch (Exception ex) {
-                __log.debug("Error stopping DB");
-            }
-        }
-        
-        if(_txMgr != null) {
-            try {
-                __log.debug("Stopping Transaction Manager");
-                _txMgr = null;
-            } catch (Exception ex) {
-                __log.debug("Error stopping Transaction Manager");
-            }
-        }
-    }
-
-    protected Scheduler createScheduler() {
-        SimpleScheduler scheduler = new SimpleScheduler(new GUID().toString(),new JdbcDelegate(_db.getDataSource()));
-        scheduler.setTransactionManager(_txMgr);
-
-        return scheduler;
-    }
-
-    public boolean isInitialized() {
-        return _initialized;
-    }
-
-    public BpelServerImpl getBpelServer() {
-        return _bpelServer;
-    }
-    
-    public Scheduler getScheduler() {
-        return _scheduler;
-    }
-    
-    public ExecutorService getExecutor() {
-    	return _executorService;
-    }
-
-    // Updated by Mike Edwards, 23/05/2008
-    public void deploy(ODEDeployment d, BPELImplementation implementation) {
-        try {
-        	TuscanyProcessConfImpl processConf = new TuscanyProcessConfImpl( implementation );
-        	_bpelServer.register(processConf);
-        	System.out.println("Completed calling new Process deployment code...");
-        } catch (Exception ex) {
-            String errMsg = ">>> DEPLOY: Unexpected exception: " + ex.getMessage();
-            __log.debug(errMsg, ex);
-            throw new ODEDeploymentException(errMsg,ex);
-        }
-    }
-
-    public void undeploy(ODEDeployment d) {
-        //TODO
-    }
-    
-    public void registerTuscanyRuntimeComponent(QName processName,RuntimeComponent componentContext) {
-        tuscanyRuntimeComponents.put(processName, componentContext);
-    }
-        
-    public RuntimeComponent getTuscanyRuntimeComponent(QName processName) {
-        return tuscanyRuntimeComponents.get(processName);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
deleted file mode 100644
index 11af0f8b50..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
+++ /dev/null
@@ -1,48 +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.implementation.bpel.ode;
-
-import javax.transaction.TransactionManager;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Geronimo transaction factory
- * 
- * @version $Rev$ $Date$
- */
-public class GeronimoTxFactory {
-    private static final Log __log = LogFactory.getLog(GeronimoTxFactory.class);
-
-    /* Public no-arg constructor is required */
-    public GeronimoTxFactory() {
-    }
-
-    public TransactionManager getTransactionManager() {
-        __log.info("Using embedded Geronimo transaction manager");
-        try {
-            Object obj = new org.apache.geronimo.transaction.manager.GeronimoTransactionManager();
-            return (TransactionManager) obj;
-        } catch (Exception except) {
-            throw new IllegalStateException("Unable to instantiate Geronimo Transaction Manager", except);
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
deleted file mode 100644
index 3f2db7b244..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
+++ /dev/null
@@ -1,79 +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.implementation.bpel.ode;
-
-import javax.wsdl.PortType;
-import javax.xml.namespace.QName;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.iapi.BindingContext;
-import org.apache.ode.bpel.iapi.Endpoint;
-import org.apache.ode.bpel.iapi.EndpointReference;
-import org.apache.ode.bpel.iapi.PartnerRoleChannel;
-
-/**
- * Binding Context information
- * 
- * @version $Rev$ $Date$
- */
-public class ODEBindingContext implements BindingContext {
-    protected final Log __log = LogFactory.getLog(getClass());
-
-    public ODEBindingContext() {
-
-    }
-
-    public EndpointReference activateMyRoleEndpoint(QName pid, Endpoint endpoint) {
-        // This will be needed when we support callBacks
-        if (__log.isDebugEnabled()) {
-            __log.debug("Activating MyRole Endpoint : " + pid + " - " + endpoint.serviceName);
-        }
-        
-        QName processName = getProcessName(pid);
-        
-        return new TuscanyEPR(processName, endpoint);
-    }
-
-    public void deactivateMyRoleEndpoint(Endpoint endpoint) {
-        if (__log.isDebugEnabled()) {
-            __log.debug("Deactivate MyRole Endpoint : " + endpoint.serviceName);
-        }
-
-    }
-
-    public PartnerRoleChannel createPartnerRoleChannel(QName pid, PortType portType, Endpoint endpoint) {
-        if (__log.isDebugEnabled()) {
-            __log.debug("Create PartnerRole channel : " + pid + " - " + portType.getQName() + " - "+ endpoint.serviceName);
-        }
-
-        QName processName = getProcessName(pid);
-        return new TuscanyPRC(processName, pid, portType, endpoint);
-    }
-    
-    /**
-     * Helper method to retrieve the BPEL process name from a processID (where processID have version concatenated to it)
-     * @param pid
-     * @return QName the BPEL process name
-     */
-    private static QName getProcessName(QName pid) {
-        String processName = pid.getLocalPart().substring(0, pid.getLocalPart().lastIndexOf("-"));
-        return new QName(pid.getNamespaceURI(), processName);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
deleted file mode 100644
index a6428f6984..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.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 org.apache.tuscany.sca.implementation.bpel.ode;
-
-import java.io.File;
-
-/**
- * Deployment information
- * 
- * @version $Rev$ $Date$
- */
-public class ODEDeployment {
-    /** The directory containing the deploy.xml and artifacts. */
-    public File deployDir;
-
-    /** If non-null the type of exception we expect to get when we deploy. */
-    public Class expectedException = null;
-
-    public ODEDeployment(File deployDir) {
-        this.deployDir = deployDir;
-    }
-
-    @Override
-    public String toString() {
-        return "Deployment#" + deployDir;
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
deleted file mode 100644
index b03f69d9aa..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
+++ /dev/null
@@ -1,41 +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.implementation.bpel.ode;
-
-/**
- * Thrown when ODE failed to shutdown.
- * 
- * @version $Rev$ $Date$
- */
-public class ODEDeploymentException extends RuntimeException {
-    private static final long serialVersionUID = -2869674556330744215L;
-
-    public ODEDeploymentException(Throwable cause) {
-        super(cause);
-    }
-
-    public ODEDeploymentException(String message) {
-        super(message);
-    }
-
-    public ODEDeploymentException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
deleted file mode 100644
index 15e9229601..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
+++ /dev/null
@@ -1,285 +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.implementation.bpel.ode;
-
-import java.util.concurrent.Callable;
-
-import javax.wsdl.Part;
-import javax.xml.namespace.QName;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.iapi.Message;
-import org.apache.ode.bpel.iapi.MessageExchange;
-import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
-import org.apache.ode.bpel.iapi.Scheduler;
-import org.apache.ode.utils.DOMUtils;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Helper Class to handle invocation to Tuscany Component References
- * 
- * @version $Rev$ $Date$ 
- */
-public class ODEExternalService {
-    protected final Log __log = LogFactory.getLog(getClass());
-
-    private EmbeddedODEServer _server;
-    private Scheduler _sched;
-	
-    public ODEExternalService(EmbeddedODEServer server) {
-        this._server = server;
-        this._sched = _server.getScheduler();
-    }
-	
-
-    public void invoke(final PartnerRoleMessageExchange partnerRoleMessageExchange) {
-        boolean isTwoWay =
-            partnerRoleMessageExchange.getMessageExchangePattern() == org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern.REQUEST_RESPONSE;
-
-        if (isTwoWay) {
-            // Defer the invoke until the transaction commits.
-            _sched.registerSynchronizer(new Scheduler.Synchronizer() {
-                public void beforeCompletion() {
-
-                }
-
-                public void afterCompletion(boolean success) {
-                    // If the TX is rolled back, then we don't send the request.
-                    if (!success)
-                        return;
-
-                    // The invocation must happen in a separate thread, holding
-                    // on the afterCompletion
-                    // blocks other operations that could have been listed there
-                    // as well.
-                    _server.getExecutor().submit(new Callable<Object>() {
-                        public Object call() throws Exception {
-                            try {
-                                // do execution
-                                if(! (partnerRoleMessageExchange.getChannel() instanceof TuscanyPRC)) {
-                                    throw new IllegalArgumentException("Channel should be an instance of TuscanyPRC");
-                                }
-                                
-                                TuscanyPRC channel = (TuscanyPRC) partnerRoleMessageExchange.getChannel();
-                                RuntimeComponent tuscanyRuntimeComponent = _server.getTuscanyRuntimeComponent(channel.getProcessName());
-
-                                RuntimeComponentReference runtimeComponentReference =
-                                    (RuntimeComponentReference)tuscanyRuntimeComponent.getReferences().get(0);
-                                RuntimeWire runtimeWire =
-                                    runtimeComponentReference.getRuntimeWire(runtimeComponentReference.getBindings().get(0));
-
-                                // convert operations
-                                Operation operation =
-                                    findOperation(partnerRoleMessageExchange.getOperation().getName(), runtimeComponentReference);
-
-
-                                /*
-                                 This is how a request looks like (payload is wrapped with extra info) 
-                                   <?xml version="1.0" encoding="UTF-8"?>
-                                   <message>
-                                     <parameters>
-                                       <getGreetings xmlns="http://greetings">
-                                         <message xmlns="http://helloworld">Luciano</message>
-                                       </getGreetings>
-                                     </parameters>
-                                   </message>
-                                 */
-                                Element msg = partnerRoleMessageExchange.getRequest().getMessage();
-                                if (msg != null) {
-                                    String xml = DOMUtils.domToString(msg);
-                                    
-                                    String payload =
-                                        DOMUtils.domToString(getPayload(partnerRoleMessageExchange.getRequest()));
-                                    
-                                    if(__log.isDebugEnabled()) {
-                                        __log.debug("Starting invocation of SCA Reference");
-                                        __log.debug(">>> Original message: " + xml);
-                                        __log.debug(">>> Payload: " + payload);
-                                    }
-                                    
-                                    Object[] args = new Object[] {getPayload(partnerRoleMessageExchange.getRequest())};
-
-                                    Object result = null;
-                                    boolean success = false;
-
-                                    try {
-                                        result = runtimeWire.invoke(operation, args);
-                                        success = true;
-                                    } catch (Exception e) {
-                                        partnerRoleMessageExchange.replyWithFailure(MessageExchange.FailureType.OTHER,
-                                                                                    e.getMessage(),
-                                                                                    null);
-                                    }
-
-                                    
-                                    if(__log.isDebugEnabled()) {
-                                        __log.debug("SCA Reference invocation finished");
-                                        __log.debug(">>> Result : " + DOMUtils.domToString((Element)result));
-                                    }
-
-                                    if (!success) {
-                                        return null;
-                                    }
-
-                                    // two way invocation
-                                    // process results based on type of message
-                                    // invocation
-
-                                    // Message response =
-                                    // createResponseMessage(partnerRoleMessageExchange,
-                                    // (Element) result);
-                                    // partnerRoleMessageExchange.reply(response);
-                                    replyTwoWayInvocation(partnerRoleMessageExchange.getMessageExchangeId(), 
-                                                          operation, 
-                                                          (Element)result);
-                                }
-
-                            } catch (Throwable t) {
-                                // some error
-                                String errmsg =
-                                    "Error sending message (mex=" + partnerRoleMessageExchange + "): " + t.getMessage();
-                                __log.error(errmsg, t);
-                                /*replyWithFailure(partnerRoleMessageExchange.getMessageExchangeId(),
-                                                 MessageExchange.FailureType.COMMUNICATION_ERROR,
-                                                 errmsg,
-                                                 null);*/
-                            }
-                            return null;
-                        }
-                    });
-
-                }
-            });
-            partnerRoleMessageExchange.replyAsync();
-
-        } else {
-            /** one-way case * */
-            _server.getExecutor().submit(new Callable<Object>() {
-                public Object call() throws Exception {
-                    // do reply
-                    // operationClient.execute(false);
-                    return null;
-                }
-            });
-            partnerRoleMessageExchange.replyOneWayOk();
-        }
-    }
-	
-	
-    /**
-     * Find the SCA Reference operation
-     * 
-     * @param operationName
-     * @param runtimeComponentReference
-     * @return
-     */
-    private Operation findOperation(String operationName, RuntimeComponentReference runtimeComponentReference) {
-    	Operation reseultOperation = null;
-    	
-    	for(Operation operation : runtimeComponentReference.getInterfaceContract().getInterface().getOperations()) {
-    		if (operationName.equalsIgnoreCase(operation.getName())) {
-    			reseultOperation = operation;
-    			break;
-    		}
-    	}
-    	return reseultOperation;
-    }
-    
-    /**
-     * Get paylod from a given ODEMessage
-     * @param odeMessage
-     * @return
-     */
-    private Element getPayload(Message odeMessage) {
-        Element payload = null;
-        Element parameters = odeMessage.getPart("parameters");
-
-        if (parameters != null && parameters.hasChildNodes()) {
-            payload = (Element)parameters.getFirstChild();
-        }
-
-        return payload;
-    }
-    
-
-    private void replyTwoWayInvocation(final String odeMexId, final Operation operation, final Element result) {
-        // ODE MEX needs to be invoked in a TX.
-        try {
-            _server.getScheduler().execIsolatedTransaction(new Callable<Void>() {
-                public Void call() throws Exception {
-                    PartnerRoleMessageExchange odeMex = null;
-                    try {
-                        odeMex = (PartnerRoleMessageExchange)_server.getBpelServer().getEngine().getMessageExchange(odeMexId);
-                        if (odeMex != null) {
-                            Message response = createResponseMessage(odeMex, operation, (Element)result);
-                            odeMex.reply(response);
-                        }
-                    } catch (Exception ex) {
-                        String errmsg = "Unable to process response: " + ex.getMessage();
-                        if (odeMex != null) {
-                            odeMex.replyWithFailure(MessageExchange.FailureType.OTHER, errmsg, null);
-                        }
-                    }
-
-                    return null;
-                }
-            });
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    	
-    }
-
-    private Message createResponseMessage(PartnerRoleMessageExchange partnerRoleMessageExchange,
-                                          Operation operation,
-                                          Element invocationResult) {
-        Document dom = DOMUtils.newDocument();
-
-        String operationName = operation.getName();
-        Part bpelOperationOutputPart =
-            (Part)((WSDLInterface)operation.getInterface()).getPortType().getOperation(operationName, null, null)
-                .getOutput().getMessage().getParts().values().iterator().next();
-
-        Element contentMessage = dom.createElement("message");
-        Element contentPart = dom.createElement(bpelOperationOutputPart.getName());
-
-        contentPart.appendChild(dom.importNode(invocationResult, true));
-        contentMessage.appendChild(contentPart);
-        dom.appendChild(contentMessage);
-
-        if(__log.isDebugEnabled()) {
-            __log.debug("Creating result message:");
-            __log.debug(">>>" + DOMUtils.domToString(dom.getDocumentElement()));
-        }
-
-        QName id = partnerRoleMessageExchange.getOperation().getOutput().getMessage().getQName();
-        Message response = partnerRoleMessageExchange.createMessage(id);
-        response.setMessage(dom.getDocumentElement());
-
-        return response;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
deleted file mode 100644
index 2fa91e4e86..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
+++ /dev/null
@@ -1,41 +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.implementation.bpel.ode;
-
-/**
- * Thrown when ODE failed to initialize one if its needed resources.
- * 
- * @version $Rev$ $Date$
- */
-public class ODEInitializationException extends RuntimeException {
-    private static final long serialVersionUID = -2869674556330744215L;
-
-    public ODEInitializationException(Throwable cause) {
-        super(cause);
-    }
-
-    public ODEInitializationException(String message) {
-        super(message);
-    }
-
-    public ODEInitializationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
deleted file mode 100644
index 1ec82390cf..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
+++ /dev/null
@@ -1,57 +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.implementation.bpel.ode;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.iapi.BpelEngineException;
-import org.apache.ode.bpel.iapi.ContextException;
-import org.apache.ode.bpel.iapi.MessageExchangeContext;
-import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
-import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
-
-/**
- * Message Exchange Context information
- * 
- * @version $Rev$ $Date$
- */
-public class ODEMessageExchangeContext implements MessageExchangeContext {
-    private static final Log __log = LogFactory.getLog(ODEMessageExchangeContext.class);
-    
-    private EmbeddedODEServer _server;
-
-    public ODEMessageExchangeContext(EmbeddedODEServer _server) {
-        this._server = _server;
-    }
-
-    public void invokePartner(PartnerRoleMessageExchange partnerRoleMessageExchange) throws ContextException {
-        if (__log.isDebugEnabled()) {
-            __log.debug("Invoking a partner operation: " + partnerRoleMessageExchange.getOperationName());
-        }
-        
-        ODEExternalService scaService = new ODEExternalService(_server);
-        scaService.invoke(partnerRoleMessageExchange);
-    }
-
-    public void onAsyncReply(MyRoleMessageExchange myRoleMessageExchange) throws BpelEngineException {
-        if (__log.isDebugEnabled()) {
-            __log.debug("Processing an async reply from service " + myRoleMessageExchange.getServiceName());
-        }
-    }
- }
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
deleted file mode 100644
index a928379ba9..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
+++ /dev/null
@@ -1,41 +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.implementation.bpel.ode;
-
-/**
- * Thrown when ODE failed to shutdown.
- * 
- * @version $Rev$ $Date$
- */
-public class ODEShutdownException extends RuntimeException {
-    private static final long serialVersionUID = -2869674556330744215L;
-
-    public ODEShutdownException(Throwable cause) {
-        super(cause);
-    }
-
-    public ODEShutdownException(String message) {
-        super(message);
-    }
-
-    public ODEShutdownException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
deleted file mode 100644
index 328403e626..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
+++ /dev/null
@@ -1,54 +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.implementation.bpel.ode;
-
-import javax.xml.namespace.QName;
-
-import org.apache.ode.bpel.iapi.Endpoint;
-import org.apache.ode.bpel.iapi.EndpointReference;
-import org.apache.ode.utils.DOMUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * This should hold something that makes sense for Tuscany so that the
- * process has an address that makes sense from the outside world perspective
- * 
- * @version $Rev$ $Date$
- */
-public class TuscanyEPR implements EndpointReference {
-    private final QName prcessName;
-    private final Endpoint endpoint;
-    private final Document doc = DOMUtils.newDocument();
-    
-    public TuscanyEPR(QName processName, Endpoint endpoint) {
-        this.prcessName = processName;
-        this.endpoint = endpoint;
-        
-        Element serviceref = doc.createElementNS(EndpointReference.SERVICE_REF_QNAME.getNamespaceURI(),
-                                                 EndpointReference.SERVICE_REF_QNAME.getLocalPart());
-        serviceref.setNodeValue(endpoint.serviceName + ":" + endpoint.portName);
-        doc.appendChild(serviceref);
-    }
-    
-    public Document toXML() {
-        return doc;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
deleted file mode 100644
index 8f8f608217..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
+++ /dev/null
@@ -1,71 +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.implementation.bpel.ode;
-
-import javax.wsdl.PortType;
-import javax.xml.namespace.QName;
-
-import org.apache.ode.bpel.iapi.Endpoint;
-import org.apache.ode.bpel.iapi.EndpointReference;
-import org.apache.ode.bpel.iapi.PartnerRoleChannel;
-import org.apache.ode.utils.DOMUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Tuscany Partner Role Channel for ODE Integration
- * 
- * @version $Rev$ $Date$
- */
-public class TuscanyPRC implements PartnerRoleChannel {
-    private final QName processName;
-    private final QName pid;
-    private final PortType portType;
-    private final Endpoint endpoint;
-    
-    public TuscanyPRC(QName processName, QName pid, PortType portType, Endpoint endpoint){
-        this.processName = processName;
-        this.pid = pid;
-        this.portType = portType;
-        this.endpoint = endpoint;
-    }
-    
-    public QName getProcessName() {
-        return this.processName;
-    }
-
-    public void close() {
-
-    }
-    
-    public EndpointReference getInitialEndpointReference() {
-        final Document doc = DOMUtils.newDocument();
-        Element serviceref = doc.createElementNS(EndpointReference.SERVICE_REF_QNAME.getNamespaceURI(),
-                                                 EndpointReference.SERVICE_REF_QNAME.getLocalPart());
-        doc.appendChild(serviceref);
-        
-        return new EndpointReference() {
-            public Document toXML() {
-                return doc;
-            }
-        };
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
deleted file mode 100644
index c626e6a8e3..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
+++ /dev/null
@@ -1,433 +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.implementation.bpel.ode;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.xml.namespace.QName;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.compiler.BpelC;
-import org.apache.ode.bpel.evt.BpelEvent.TYPE;
-import org.apache.ode.bpel.iapi.Endpoint;
-import org.apache.ode.bpel.iapi.ProcessConf;
-import org.apache.ode.bpel.iapi.ProcessState;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * A Tuscany implementation of the ODE Process Conf
- * 
- * @version $Rev$ $Date$
- */
-public class TuscanyProcessConfImpl implements ProcessConf {
-    private final Log __log = LogFactory.getLog(getClass());
-
-    private BPELImplementation implementation;
-    private Map<String, Endpoint> invokeEndpoints = null;
-    private Map<String, Endpoint> provideEndpoints = null;
-    private Map<QName, Node> properties = null;
-    private ProcessState processState;
-    private Date deployDate;
-
-    private final String TUSCANY_NAMESPACE = "http://tuscany.apache.org";
-
-    /**
-     * Constructor for the ProcessConf implementation
-     * @param theImplementation the BPEL implementation for which this is the ProcessConf
-     */
-    public TuscanyProcessConfImpl( BPELImplementation theImplementation ) {
-        //System.out.println("New TuscanyProcessConfImpl...");
-        this.implementation = theImplementation;
-
-        processState = ProcessState.ACTIVE;
-        deployDate = new Date();
-
-        // Compile the process
-        compile( getBPELFile() );
-    } // end TuscanyProcessConfImpl constructor
-
-    /**
-     * Returns the URI for the directory containing the BPEL process
-     */
-    public URI getBaseURI() {
-        //System.out.println("getBaseURI called");
-        File theDir = getDirectory();
-        return theDir.toURI();
-    }
-
-    /**
-     * Returns a String containing the (local) name of the file containing the BPEL process
-     */
-    public String getBpelDocument() {
-        //System.out.println("getBPELDocument called");
-        try {
-            File processFile = new File(URI.create(implementation.getProcessDefinition().getLocation()));
-            return getRelativePath( getDirectory(), processFile);
-        } catch (Exception e) {
-            if(__log.isWarnEnabled()) {
-                __log.warn("Unable to resolve relative path of BPEL process" + implementation.getProcessDefinition().getLocation(), e );
-            }
-            return null;
-        } // end try
-    } // end getBpelDocument
-
-    /**
-     * Returns an InputStream containing the Compiled BPEL Process (CBP)
-     */
-    public InputStream getCBPInputStream() {
-        //System.out.println("getCBPInputStream called");
-        // Find the CBP file - it has the same name as the BPEL process and lives in the same
-        // directory as the process file
-        String cbpFileName = null;
-        try {
-            String fileName = getRelativePath( getDirectory(), getBPELFile() );
-            cbpFileName = fileName.substring(0, fileName.lastIndexOf(".")) + ".cbp";
-        } catch (Exception e ) {
-        	// IOException trying to fetch the BPEL file name
-            if(__log.isDebugEnabled()) {
-                __log.debug("Unable to calculate the file name for BPEL process: " +
-                                   implementation.getProcessDefinition().getName(), e);
-                return null;
-            } // end if
-        } // end try
-        File cbpFile = new File( getDirectory(), cbpFileName );
-        if( cbpFile.exists() ) {
-            // Create an InputStream from the cbp file...
-            try {
-                return new FileInputStream( cbpFile );
-            } catch ( Exception e ) {
-                if(__log.isDebugEnabled()) {
-                    __log.debug("Unable to open the cbp file for BPEL process: " +
-                                       implementation.getProcessDefinition().getName(), e);
-                }
-            } // end try
-        } else {
-            // Cannot find the cbp file
-            if(__log.isWarnEnabled()){
-                __log.warn("Cannot find the cbp file for process: " + 
-                                   implementation.getProcessDefinition().getName());
-            }
-        } // end if
-        // TODO - need better exception handling if we can't open the cbp file for any reason
-        return null;
-    } // end getCBPInputStream
-
-    /**
-     * Return the WSDL Definition for a given PortType
-     * @param portTypeName - the QName of the PortType
-     */
-    public Definition getDefinitionForPortType( QName portTypeName ) {
-        //System.out.println("getDefinitionForPortType called for portType: " + portTypeName );
-        // Find the named PortType in the list of WSDL interfaces associated with this BPEL Process
-        Collection<WSDLInterface> theInterfaces = implementation.getProcessDefinition().getInterfaces();
-        for( WSDLInterface wsdlInterface : theInterfaces ) {
-            if ( wsdlInterface.getPortType().getQName().equals( portTypeName ) ) {
-                // Extract and return the Definition associated with the WSDLDefinition...
-                return wsdlInterface.getWsdlDefinition().getDefinition();
-            } // end if
-        } // end for
-        return null;
-    } // end getDefinitionforPortType
-
-    /**
-     * Returns a WSDL Definition for a given Service QName
-     * 
-     * 22/05/2008 - it is very unclear what this service QName is really meant to be.
-     * From the handling of the deploy.xml file by the current ODE code, it seems that the key link
-     * is from the Service QName to the PartnerLink name (done in the deploy.xml file).
-     * 
-     * The curious part about this is that the QName for the service is ONLY defined in deploy.xml file
-     * and does not appear to relate to anything else, except for the QName of the PartnerLink
-     * 
-     * The PartnerLink name is the same as the name of the SCA service (or reference) which in turn points
-     * at the PartnerLinkType which in turn points at an (WSDL) interface definition.
-     */
-    public Definition getDefinitionForService(QName serviceQName ) {
-    	//System.out.println("getDefinitionForService called for Service: " + serviceQName );
-        if(__log.isDebugEnabled()){
-            __log.debug("getDefinitionforService called for service: " + serviceQName );
-        }
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * Returns the date of deployment of the process
-     * - for SCA returns the date at which this object was created
-     */
-    public Date getDeployDate() {
-        //System.out.println("getDeployDate called");
-        return deployDate;
-    }
-
-    /**
-     * Returns userid of deployer 
-     * - always "SCA Tuscany" for Tuscany...
-     */
-    public String getDeployer() {
-        //System.out.println("getDeployer called");
-        return "SCA Tuscany";
-    } // end getDeployer
-
-    /**
-     * Returns a list of the files in the directory containing the BPEL Process
-     */
-    public List<File> getFiles() {
-        //System.out.println("getFiles called");
-        File theDir = getDirectory();
-        List<File> theFiles = Arrays.asList( (File[]) theDir.listFiles() );
-        // TODO recurse into subdirectories
-        return theFiles;
-    } // end getFiles
-
-    /**
-     * Returns a Map containing all the "invoke endpoints" - for which read "SCA references"
-     * The map is keyed by partnerLink name and holds Endpoint objects 
-     * 
-     * TODO deal with service callbacks on bidirectional services
-     */
-    public Map<String, Endpoint> getInvokeEndpoints() {
-        //System.out.println("getInvokeEndpoints called");
-        if( invokeEndpoints == null ) {
-            invokeEndpoints = new HashMap<String, Endpoint>();
-            // Get a collection of the references
-            List<Reference> theReferences = implementation.getReferences();
-            // Create an endpoint for each reference, using the reference name as the "service"
-            // name, combined with http://tuscany.apache.org to make a QName
-            for( Reference reference : theReferences ) {
-                invokeEndpoints.put( reference.getName(), 
-                                     new Endpoint( new QName( TUSCANY_NAMESPACE, reference.getName() ), "ReferencePort"));
-            } // end for
-        } // end if
-        return invokeEndpoints;
-    } // end getInvokeEndpoints
-
-    /**
-     * Returns the name of the directory containing the BPEL files
-     */
-    public String getPackage() {
-        //System.out.println("getPackage called");
-        File theDir = getDirectory();
-        return theDir.getName();
-    } // end getPackage
-
-    /**
-     * Return the BPEL Process ID - which is the Process QName appended "-versionnumber"
-     */
-    public QName getProcessId() {
-        //System.out.println("getProcessId called");
-        QName processType = getType();
-        QName processID = new QName( processType.getNamespaceURI(), 
-                                     processType.getLocalPart() + "-" + getVersion() );
-        return processID;
-    } // end getProcessID
-
-    /**
-     * TODO - What are properties?
-     */
-    public Map<QName, Node> getProperties() {
-        //System.out.println("getProperties called");
-        if ( properties == null ) {
-            properties = new HashMap<QName, Node>();
-        } // end if
-        return properties;
-    } // end getProperties
-
-    /**
-     * Returns a Map containing all the "provide endpoints" - for which read "SCA services"
-     * The map is keyed by partnerLink name and holds Endpoint objects 
-     * 
-     * TODO deal with reference callbacks on bidirectional references
-     */
-    public Map<String, Endpoint> getProvideEndpoints() {
-        //System.out.println("getProvideEndpoints called");
-        if( provideEndpoints == null ) {
-            provideEndpoints = new HashMap<String, Endpoint>();
-            // Get a collection of the references
-            List<Service> theServices = implementation.getServices();
-            // Create an endpoint for each reference, using the reference name as the "service"
-            // name, combined with http://tuscany.apache.org to make a QName
-            for( Service service : theServices ) {
-                provideEndpoints.put( service.getName(), 
-                                      new Endpoint( new QName( TUSCANY_NAMESPACE, service.getName() ), "ServicePort"));
-            } // end for
-        } // end if
-        return provideEndpoints;
-    } // end getProvideEndpoints
-
-    /**
-     * Return the process state
-     */
-    public ProcessState getState() {
-        //System.out.println("getState called");
-        return processState;
-    }
-
-    /**
-     * Returns the QName of the BPEL process
-     */
-    public QName getType() {
-        //System.out.println("getType called");
-        return implementation.getProcess();
-    }
-
-    /**
-     * Gets the process Version number
-     * - current code does not have versions for BPEL processes and always returns "1"
-     */
-    public long getVersion() {
-        //System.out.println("getVersion called");
-        return 1;
-    }
-
-    /**
-     * Returns true if the supplied event type is enabled for any of the scopes in the provided
-     * List.  These events are "ODE Execution Events" and there is a definition of them on this
-     * page:  http://ode.apache.org/user-guide.html#UserGuide-ProcessDeployment
-     * 
-     * For the present Tuscany does not support manipulating the event enablement and always
-     * returns that the event is not enabled
-     * @param scopeNames - list of BPEL process Scope names
-     * @param type - the event type
-     */
-    public boolean isEventEnabled(List<String> scopeNames, TYPE type) {
-        //System.out.println("isEventEnabled called with scopeNames: " + 
-        //		            scopeNames + " and type: " + type );
-        return false;
-    } // end isEventEnabled
-
-    /**
-     * Returns whether the process is persisted in the store
-     * 
-     * Returns false for SCA configuration 
-     * - returning true causes problems in communicating with the BPEL process
-     */
-    public boolean isTransient() {
-        //System.out.println("isTransient called");
-        return false;
-    } // end isTransient
-
-    /**
-     * Compiles a BPEL process file into a compiled form CBP file in the main directory 
-     * (ie same directory as the BPEL process file)
-     * @param bpelFile - the BPEL process file
-     */
-    private void compile( File bpelFile ) {
-        // Set up the compiler
-        BpelC compiler = BpelC.newBpelCompiler();
-        // Provide a null set of initial properties for now
-        Map<QName, Node> processProps = new HashMap<QName, Node>(); 
-        Map<String, Object> compileProps = new HashMap<String, Object>();
-        compileProps.put( BpelC.PROCESS_CUSTOM_PROPERTIES, processProps );
-        compiler.setCompileProperties( compileProps );
-        compiler.setBaseDirectory( getDirectory() );
-
-        // Run the compiler and generate the CBP file into the given directory
-        try {
-            compiler.compile( bpelFile );
-        } catch (IOException e) {
-            if(__log.isDebugEnabled()) {
-                __log.debug("Compile error in " + bpelFile, e);
-            }
-            // TODO - need better exception handling here
-        } // end try
-    } // end compile
-
-    /** 
-     * Gets the directory containing the BPEL process
-     * @return
-     */
-    private File getDirectory() {
-        File theDir = getBPELFile().getParentFile();
-        return theDir;
-    } // end getDirectory
-
-    /**
-     * Gets the File containing the BPEL process definition
-     * @return - the File object containing the BPEL process
-     */
-    private File getBPELFile() {
-        try {
-            File theProcess = new File(URI.create(implementation.getProcessDefinition().getLocation()));
-            return theProcess;
-        } catch( Exception e ) {
-            if(__log.isDebugEnabled()) {
-                __log.debug("Exception converting BPEL file URL to an URI: " + e );
-            }
-        } // end try
-        return null;
-    } // end getBPELFile
-
-    /**
-     * Gets the relative path of a file against a directory in its hierarchy
-     * @param base - the base directory
-     * @param path - the file
-     * @return
-     * @throws IOException
-     */
-    private String getRelativePath(File base, File path) throws IOException {
-        String basePath = base.getCanonicalPath();
-        String filePath = path.getCanonicalPath();
-        if (!filePath.startsWith(basePath)) {
-            throw new IOException("Invalid relative path: base=" + base + " path=" + path);
-        }
-        String relative = filePath.substring(basePath.length());
-        if (relative.startsWith(File.separator)) {
-            relative = relative.substring(1);
-        }
-        return relative;
-    } // end getRelativePath
-
-    //-----------------------------------------------------------------------------
-    // other public APIs which ProcessConfImpl displays which are not in ProcessConf interface
-
-    public List<String> getMexInterceptors(QName processId) {
-        System.out.println("getMexInterceptors for processID: " + processId );
-        return null;
-    }
-
-    public void setTransient(boolean t) {
-        System.out.println("setTransient called with boolean: " + t );
-    }
-
-    public List<Element> getExtensionElement(QName arg0) {
-        return Collections.emptyList();
-    }
-    // end of other public APIs
-    //-----------------------------------------------------------------------------
-
-} // end class TuscanyProcessConfImpl
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
deleted file mode 100644
index c644b6a965..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
+++ /dev/null
@@ -1,145 +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.implementation.bpel.ode.provider;
-
-import java.io.File;
-import java.net.URI;
-
-import javax.transaction.TransactionManager;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.databinding.xml.DOMDataBinding;
-import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
-import org.apache.tuscany.sca.implementation.bpel.ode.EmbeddedODEServer;
-import org.apache.tuscany.sca.implementation.bpel.ode.ODEDeployment;
-import org.apache.tuscany.sca.implementation.bpel.ode.ODEInitializationException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * BPEL Implementation provider
- * 
- * @version $Rev$ $Date$
- */
-public class BPELImplementationProvider implements ImplementationProvider {
-    private final Log __log = LogFactory.getLog(getClass());
-    
-    private RuntimeComponent component;
-    private BPELImplementation implementation;
-    
-    private EmbeddedODEServer odeServer;
-    private TransactionManager txMgr;
-    
-    /**
-     * Constructs a new BPEL Implementation.
-     */
-    public BPELImplementationProvider(RuntimeComponent component,
-                                      BPELImplementation implementation,
-                                      EmbeddedODEServer odeServer,
-                                      TransactionManager txMgr) {
-        this.component = component;
-        this.implementation = implementation;
-        this.odeServer = odeServer;
-        this.txMgr = txMgr;
-        
-        // Configure the service and reference interfaces to use a DOM databinding
-        // as it's what ODE expects
-        for (Service service: implementation.getServices()) {
-            service.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
-        }
-        for (Reference reference: implementation.getReferences()) {
-            reference.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
-        }
-        
-    }
-
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        BPELInvoker invoker = new BPELInvoker(component, service, operation, odeServer, txMgr);
-        return invoker;
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-        if(__log.isInfoEnabled()) {
-            __log.info("Starting " + component.getName());
-        }
-        
-        try {
-            if (!odeServer.isInitialized()) {
-                // start ode server
-                odeServer.init();
-            }
-
-            URI deployURI = URI.create(this.implementation.getProcessDefinition().getLocation());
-            
-            File deploymentDir = new File(deployURI).getParentFile();
-            
-            if(__log.isInfoEnabled()) {
-                __log.info(">>> Deploying : " + deploymentDir.toString());
-            }
-
-            // deploy the process
-            if (odeServer.isInitialized()) {
-                try {
-                    //txMgr.begin();
-                    odeServer.registerTuscanyRuntimeComponent(implementation.getProcess(), component);
-                    // Replaced by Mike Edwards 23/05/2008
-                    //odeServer.deploy(new ODEDeployment(deploymentDir));
-                    odeServer.deploy(new ODEDeployment(deploymentDir), implementation );
-                    //txMgr.commit();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    //txMgr.rollback();
-                }
-            }
-            
-        } catch (ODEInitializationException inite) {
-            throw new RuntimeException("BPEL Component Type Implementation : Error initializing embedded ODE server " + inite.getMessage(), inite);
-        } catch(Exception e) {
-            throw new RuntimeException("BPEl Component Type Implementation initialization failure : " + e.getMessage(), e);
-        }
-    }
-
-    public void stop() {
-        if(__log.isInfoEnabled()) {
-            __log.info("Stopping " + component.getName());
-        }
-        
-        if (odeServer.isInitialized()) {
-            // start ode server
-            odeServer.stop();
-        }
-        
-        txMgr = null;
-
-        if(__log.isInfoEnabled()) {
-            __log.info("Stopped !!!");
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
deleted file mode 100644
index ed327e237b..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
+++ /dev/null
@@ -1,69 +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.implementation.bpel.ode.provider;
-
-import javax.transaction.TransactionManager;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
-import org.apache.tuscany.sca.implementation.bpel.ode.EmbeddedODEServer;
-import org.apache.tuscany.sca.implementation.bpel.ode.GeronimoTxFactory;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.oasisopen.sca.annotation.Destroy;
-
-/**
- * BPEL Implementation provider factory
- * 
- * We use the provider factory to instantiate a ODE server that is going to be injected in all BPEL components
- * 
- * @version $Rev$ $Date$
- */
-public class BPELImplementationProviderFactory implements ImplementationProviderFactory<BPELImplementation> {
-
-    private EmbeddedODEServer odeServer;
-    private TransactionManager txMgr;
-
-    /**
-     * Default constructor receiving an extension point
-     * @param extensionPoints
-     */
-    public BPELImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
-        GeronimoTxFactory txFactory = new GeronimoTxFactory();
-        txMgr = txFactory.getTransactionManager();
-        this.odeServer = new EmbeddedODEServer(txMgr);
-    }
-
-    /**
-     * Creates a new BPEL Implementation and inject the EmbeddedODEServer
-     */
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component, BPELImplementation implementation) {
-        return new BPELImplementationProvider(component, implementation, odeServer, txMgr);
-    }
-    
-    public Class<BPELImplementation> getModelType() {
-        return BPELImplementation.class;
-    }
-    
-    @Destroy
-    public void destroy() {
-        txMgr = null;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java b/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
deleted file mode 100644
index f301082d59..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
+++ /dev/null
@@ -1,251 +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.implementation.bpel.ode.provider;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.concurrent.Future;
-
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-import javax.wsdl.Part;
-import javax.xml.namespace.QName;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
-import org.apache.ode.bpel.iapi.MessageExchange.Status;
-import org.apache.ode.utils.DOMUtils;
-import org.apache.ode.utils.GUID;
-import org.apache.tuscany.sca.implementation.bpel.ode.EmbeddedODEServer;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Implements a target invoker for BPEL component implementations.
- * 
- * The target invoker is responsible for dispatching invocations to the particular
- * component implementation logic. In this example we are simply delegating the
- * CRUD operation invocations to the corresponding methods on our fake
- * resource manager.
- * 
- * @version $Rev$ $Date$
- */
-public class BPELInvoker implements Invoker {
-    protected final Log __log = LogFactory.getLog(getClass());
-    
-    private EmbeddedODEServer odeServer;
-    private TransactionManager txMgr;
-    
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private Operation operation;
-    private QName bpelServiceName;
-    private String bpelOperationName;
-    private Part bpelOperationInputPart;
-    private Part bpelOperationOutputPart;
-    
-    public BPELInvoker(RuntimeComponent component, RuntimeComponentService service, Operation operation, EmbeddedODEServer odeServer, TransactionManager txMgr) {
-        this.component = component;
-        this.service = service;
-        this.operation = operation;
-        this.bpelOperationName = operation.getName();
-        this.odeServer = odeServer;
-        this.txMgr = txMgr;
-
-        initializeInvocation();
-    }
-
-    
-    private void initializeInvocation() {
-      
-        if(true){
-            __log.debug("Initializing BPELInvoker");
-        }
-        Interface interfaze = operation.getInterface();
-        if(interfaze instanceof WSDLInterface){
-            WSDLInterface wsdlInterface = null;
-            wsdlInterface = (WSDLInterface) interfaze;
-            
-            // The following commented out code is bogus and is replaced by what follows - Mike Edwards
-            // Service serviceDefinition = (Service) wsdlInterface.getWsdlDefinition().getDefinition().getAllServices().values().iterator().next(); 
-            // bpelServiceName = serviceDefinition.getQName();
-            //
-            // Fetch the service name from the service object
-            bpelServiceName = new QName( "http://tuscany.apache.org", service.getName() );
-            //System.out.println("Actual service QName: " + bpelServiceName );
-                
-            bpelOperationInputPart = (Part) wsdlInterface.getPortType().getOperation(bpelOperationName,null,null).getInput().getMessage().getParts().values().iterator().next();
-            bpelOperationOutputPart = (Part) wsdlInterface.getPortType().getOperation(bpelOperationName,null,null).getOutput().getMessage().getParts().values().iterator().next();
-        }
-    }
-    
-    public Message invoke(Message msg) {
-        try {
-            Object[] args = msg.getBody();
-            Object resp = doTheWork(args);
-            msg.setBody(resp);
-        } catch (InvocationTargetException e) {
-            msg.setFaultBody(e.getCause());
-        }
-        return msg;
-    }
-
-    public Object doTheWork(Object[] args) throws InvocationTargetException {
-        Element response = null;
-        
-        if(! (operation.getInterface() instanceof WSDLInterface)) {
-            throw new InvocationTargetException(null,"Unsupported service contract");
-        }
-        
-        if(true) {
-            System.out.println("Invoking bpel component : " + bpelServiceName + "#" + bpelOperationName);
-        }
-        
-        org.apache.ode.bpel.iapi.MyRoleMessageExchange mex = null;
-        Future onhold = null;
-        
-        //Process the BPEL process invocation
-        try {
-            txMgr.begin();
-            mex = odeServer.getBpelServer().getEngine().createMessageExchange(new GUID().toString(),
-                                                                              bpelServiceName,
-                                                                              bpelOperationName);
-            
-            onhold = mex.invoke(createInvocationMessage(mex, args));
-            
-            txMgr.commit();
-        } catch (Exception e) {
-            try {
-                txMgr.rollback();
-            } catch (SystemException se) {
-
-            }
-            throw new InvocationTargetException(e, "Error invoking BPEL process : " + e.getMessage());
-        } 
-
-
-        // Waiting until the reply is ready in case the engine needs to continue in a different thread
-        if (onhold != null) {
-            try {
-                onhold.get();
-            } catch (Exception e) {
-                throw new InvocationTargetException(e,"Error invoking BPEL process : " + e.getMessage());
-            }
-        }
-
-        //Process the BPEL invocation response
-        try {
-            txMgr.begin();
-            // Reloading the mex in the current transaction, otherwise we can't
-            // be sure we have the "freshest" one.
-            mex = (MyRoleMessageExchange)odeServer.getBpelServer().getEngine().getMessageExchange(mex.getMessageExchangeId());
-
-            if(true) {
-                Status status = mex.getStatus();
-                Element invocationResponse = mex.getResponse().getMessage();
-
-                System.out.println(">>>Invocation status:" + status.name());
-                System.out.println(">>>Response:\n" + DOMUtils.domToString(invocationResponse));
-                System.out.println(">>>Response:\n" + DOMUtils.domToString(invocationResponse));
-            }
-            //process the method invocation result
-            response = processResponse(mex.getResponse().getMessage());
-            
-            txMgr.commit();
-            // end of transaction two
-        } catch (Exception e) {
-            try {
-                txMgr.rollback();
-            } catch (SystemException se) {
-
-            }
-            throw new InvocationTargetException(e, "Error retrieving BPEL process invocation status : " + e.getMessage());
-        }
-    
-    
-        return response;
-    }
-
-    /**
-     * Create BPEL Invocation message
-     * 
-     *  BPEL invocation message like :
-     *  <message>
-     *     <TestPart>
-     *        <hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">Hello</hello>
-     *     </TestPart>
-     *   </message>
-     * @param args
-     * @return
-     */
-    private org.apache.ode.bpel.iapi.Message createInvocationMessage(org.apache.ode.bpel.iapi.MyRoleMessageExchange mex, Object[] args) {
-        Document dom = DOMUtils.newDocument();
-        
-        Element contentMessage = dom.createElement("message");
-        Element contentPart = dom.createElement(bpelOperationInputPart.getName());
-        Element payload = null;
-        
-        //TUSCANY-2321 - Properly handling Document or Element types
-        if(args[0] instanceof Document) {
-            payload = (Element) ((Document) args[0]).getFirstChild();
-        } else {
-            payload = (Element) args[0];
-        }
-        
-        contentPart.appendChild(dom.importNode(payload, true));
-        contentMessage.appendChild(contentPart);
-        dom.appendChild(contentMessage);
-        
-        if(true) {
-            System.out.println("Creating invocation message:");
-            System.out.println(">> args.....: " + DOMUtils.domToString(payload));
-            System.out.println(">> message..:" + DOMUtils.domToString(dom.getDocumentElement()));
-        }
-
-        org.apache.ode.bpel.iapi.Message request = mex.createMessage(new QName("", ""));
-        request.setMessage(dom.getDocumentElement());
-                
-        return request;
-    }
-    
-    /**
-     * Process BPEL response
-     * 
-     *  <message>
-     *     <TestPart>
-     *        <hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">World</hello>
-     *     </TestPart>
-     *   </message> 
-     * 
-     * @param response
-     * @return
-     */
-    private Element processResponse(Element response) {
-        // return (Element) DOMUtils.findChildByName(response, new QName("",bpelOperationOutputPart.getName())).getFirstChild();
-        return (Element) DOMUtils.findChildByName(response, new QName("",bpelOperationOutputPart.getName()));
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca-contrib/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 3bce8aa9ab..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the implementation extension

-org.apache.tuscany.sca.implementation.bpel.ode.provider.BPELImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.bpel.BPELImplementation

diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java b/java/sca-contrib/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
deleted file mode 100644
index 0f59990377..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
+++ /dev/null
@@ -1,124 +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.implementation.bpel.ode;
-
-import javax.transaction.TransactionManager;
-
-import junit.framework.TestCase;
-
-/**
- * Test to Deploy and Invoke a HelloWorld BPEL process using EmbeddedODEServer
- * 
- * Major changes introduced to this testcase on 27/05/2008 associated with changes in the
- * implementation of EmbeddedODEServer which remove the need for the ODE deploy.xml file - 
- * instead a Tuscany BPELImplementation object is passed to the EmbeddedODEServer and this is
- * introspected to get all the necessary information about the BPEL process
- * 
- * @version $Rev$ $Date$
- */
-public class EmbeddedODEServerTestCase extends TestCase {
-	
-    private EmbeddedODEServer odeServer;
-
-    private TransactionManager txMgr;
-
-    @Override
-    protected void setUp() throws Exception {
-    	// Set up the ODE BPEL server...
-        GeronimoTxFactory txFactory = new GeronimoTxFactory();
-        txMgr = txFactory.getTransactionManager();
-
-        this.odeServer = new EmbeddedODEServer(txMgr);
-        odeServer.init();
-        
-    } // end setUp
-
-    @Override
-    protected void tearDown() throws Exception {
-        odeServer.stop();
-    }
-
-    public void testProcessInvocation() throws Exception {
-        if (!odeServer.isInitialized()) {
-            fail("Server did not start !");
-        }
-// TODO - write effective testcase - made problematic by the need to supply a resolved
-// BPELImplementation        
-/*
-        URL deployURL = getClass().getClassLoader().getResource("helloworld/deploy.xml");
-        File deploymentDir = new File(deployURL.toURI().getPath()).getParentFile();
-        System.out.println("Deploying : " + deploymentDir.toString());
-        System.out.println(deploymentDir);
-        
-        if (odeServer.isInitialized()) {
-            try {
-                txMgr.begin();
-                odeServer.deploy(new ODEDeployment(deploymentDir), implementation);
-                txMgr.commit();
-            } catch (Exception e) {
-                e.printStackTrace();
-                txMgr.rollback();
-            }
-            
-            // transaction one
-            MyRoleMessageExchange mex = null;
-            Future onhold = null;
-            try {
-                // invoke the process
-                txMgr.begin();
-                mex = odeServer.getBpelServer().getEngine().createMessageExchange(new GUID().toString(),
-                        new QName("http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl", "HelloService"), "hello");
-
-                Message request = mex.createMessage(new QName("", ""));
-                request.setMessage(DOMUtils.stringToDOM("<message><TestPart><hello xmlns=\"http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl\">Hello</hello></TestPart></message>"));
-                onhold = mex.invoke(request);
-                txMgr.commit();
-            } catch (Exception e) {
-                e.printStackTrace();
-                txMgr.rollback();
-            } 
-            // - end of transaction one
-
-            // Waiting until the reply is ready in case the engine needs to continue in a different thread
-            if (onhold != null)
-                onhold.get();
-
-            // transaction two
-            try {
-                txMgr.begin();
-                // Reloading the mex in the current transaction, otherwise we can't be sure we have
-                // the "freshest" one.
-                mex = (MyRoleMessageExchange) odeServer.getBpelServer().getEngine().getMessageExchange(mex.getMessageExchangeId());
-
-                Status status = mex.getStatus();
-                System.out.println("Status: " + status.name());
-                Element response = mex.getResponse().getMessage();
-                System.out.println("Response: " + DOMUtils.domToString(response));
-                txMgr.commit();
-                // end of transaction two
-            } catch (Exception e) {
-                e.printStackTrace();
-                txMgr.rollback();
-            } // end try
-        } // end if
-*/                
-    } // end testProcessInvocation
-
-}
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml b/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml
+++ /dev/null
@@ -1,30 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="wns:HelloService" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl b/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
deleted file mode 100644
index bcd3ea6afa..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
+++ /dev/null
@@ -1,87 +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 name="greetings"

-    targetNamespace="http://greetings" 

-    xmlns:tns="http://greetings" 

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 

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

-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://greetings" xmlns="http://www.w3.org/2001/XMLSchema">

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-            

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="Greetings">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="GreetingsSoapBinding" type="tns:Greetings">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="GreetingsService">

-        <wsdl:port name="GreetingsSoapPort" binding="tns:GreetingsSoapBinding">

-            <wsdlsoap:address location="http://localhost:8085/GreetingsServiceComponent"/>

-        </wsdl:port>

-    </wsdl:service>

-

-    <plnk:partnerLinkType name="GreetingsPartnerLinkType">

-        <plnk:role name="Provider" portType="tns:Greetings"/>

-    </plnk:partnerLinkType>

-</wsdl:definitions>

diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel b/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
deleted file mode 100644
index 8cf91adc2c..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
+++ /dev/null
@@ -1,66 +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.
-  -->
-<process name="HelloWorld"
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"    
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
-     namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
-
-   <partnerLinks>
-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="helloMessage" messageType="test:HelloMessage"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="hello"
-          variable="helloMessage"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <from variable="helloMessage" part="TestPart"/>
-              <to variable="tmpVar"/>
-          </copy>
-          <copy>
-              <from>concat($tmpVar,' World')</from>
-              <to variable="helloMessage" part="TestPart"/>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="hello"
-              variable="helloMessage"/>
-   </sequence>
-</process>
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl b/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
deleted file mode 100644
index 1d71727b2d..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
+++ /dev/null
@@ -1,82 +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 name="helloworld"

-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"

-    xmlns="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

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

-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">

-    

-    <wsdl:types>

-        <schema elementFormDefault="qualified" 

-           targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" 

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

-

-            <element name="hello">

-                <complexType>

-                    <sequence>

-                        <element name="message" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>            

-        </schema>

-    </wsdl:types>

-    

-    <wsdl:message name="HelloMessage">

-        <wsdl:part element="tns:hello" name="TestPart"/>

-    </wsdl:message>

-    

-    <wsdl:portType name="HelloPortType">

-        <wsdl:operation name="hello">

-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>

-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>

-        </wsdl:operation>    

-    </wsdl:portType>

-    

-

-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">

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

-        <wsdl:operation name="hello">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="TestIn">

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

-            </wsdl:input>

-            <wsdl:output name="TestOut">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>    

-    

-    <wsdl:service name="HelloService">

-		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">

-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>

-		</wsdl:port>

-    </wsdl:service>

-    

-   <plnk:partnerLinkType name="HelloPartnerLinkType">

-       <plnk:role name="me" portType="tns:HelloPortType"/>

-       <plnk:role name="you" portType="tns:HelloPortType"/>

-   </plnk:partnerLinkType>

-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/log4j.properties b/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/log4j.properties
deleted file mode 100644
index 82b3c09723..0000000000
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/log4j.properties
+++ /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.
-#
-
-# Set root logger level to WARN and its only appender to CONSOLE

-log4j.rootLogger=OFF, CONSOLE

-

-# log4j properties to work with commandline tools.

-log4j.category.org.mortbay=OFF

-log4j.category.org.hibernate.type=OFF

-log4j.category.org.objectweb=OFF

-log4j.category.org.apache.ode.axis2=OFF

-log4j.category.org.apache.ode.bpel.engine=OFF

-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF

-log4j.category.org.apache.ode.bpel.epr=OFF
-log4j.category.org.apache.tuscany.sca.implementation.bpel=OFF
-log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=OFF
-log4j.category.org.apache.tuscany.sca.implementation.bpel.ode.provider=OFF
-

-# Console appender

-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender

-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout

-log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n

diff --git a/java/sca-contrib/modules/implementation-bpel/LICENSE b/java/sca-contrib/modules/implementation-bpel/LICENSE
deleted file mode 100644
index baba9ca048..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/LICENSE
+++ /dev/null
@@ -1,251 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-===============================================================================================================

-

-Apache Tuscany SCA for Java Subcomponents

-=========================================: 

-

-The Tuscany SCA for Java release includes a number of subcomponents with

-separate copyright notices and license terms. Your use of the source

-code for the these subcomponents is subject to the terms and

-conditions of the following licenses.

-

-=================================================================================================================

-

-This module implementation-script temporarily includes one file under the following BSD license:

-

- Copyright (c) 2006, Sun Microsystems, Inc.

- All rights reserved.

- 

- Redistribution and use in source and binary forms, with or without 

- modification, are permitted provided that the following conditions are met:

- 

-  - Redistributions of source code must retain the above copyright notice, this 

-    list of conditions and the following disclaimer.

- 

-  - Redistributions in binary form must reproduce the above copyright notice, 

-    this list of conditions and the following disclaimer in the documentation 

-    and/or other materials provided with the distribution.

- 

-  - Neither the name of the Sun Microsystems, Inc. nor the names of 

-    contributors may be used to endorse or promote products derived from this 

-    software without specific prior written permission.

- 

- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 

- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 

- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 

- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 

- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 

- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 

- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 

- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 

- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 

- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 

- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 

- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 

- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 

- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 

- DAMAGE. 

-

-=================================================================================================================

diff --git a/java/sca-contrib/modules/implementation-bpel/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-bpel/META-INF/MANIFEST.MF
deleted file mode 100644
index ba65f8632d..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.implementation.bpel;uses:="org.

- apache.tuscany.sca.assembly,org.apache.tuscany.sca.contribution.resol

- ver,javax.xml.namespace";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.implementation.bpel.impl;versi

- on="1.4",org.apache.tuscany.sca.implementation.bpel.xml;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA BPEL Implementation Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397433843

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA BPEL Implementation Extension

-Import-Package: javax.wsdl,

- javax.wsdl.extensions,

- javax.xml.namespace,

- javax.xml.stream,

- 

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.impl;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.implementation.bpel;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.bpel

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/implementation-bpel/NOTICE b/java/sca-contrib/modules/implementation-bpel/NOTICE
deleted file mode 100644
index 61ea4111aa..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/NOTICE
+++ /dev/null
@@ -1,17 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

-Unless otherwise indicated, all distribution made available by the Apache Software Foundation

-is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").

-A copy of the AL is provided with this distribution as the LICENSE file present in the

-root directory, and is also available at http://www.apache.org/licenses/.

-

-This product also includes software under the BSD license 

-(see the LICENSE file contained in this distribution), with

-the following copyright:

-

-Copyright (c) 2006, Sun Microsystems, Inc.

-All rights reserved.

diff --git a/java/sca-contrib/modules/implementation-bpel/pom.xml b/java/sca-contrib/modules/implementation-bpel/pom.xml
deleted file mode 100644
index c0f92f1c1d..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/pom.xml
+++ /dev/null
@@ -1,82 +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>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<groupId>org.apache.tuscany.sca</groupId>

-		<artifactId>tuscany-modules</artifactId>

-		<version>2.0-SNAPSHOT</version>

-		<relativePath>../pom.xml</relativePath>

-	</parent>

-	<artifactId>tuscany-implementation-bpel</artifactId>

-	<name>Apache Tuscany SCA BPEL Implementation Extension</name>

-

-	<dependencies>

-		<dependency>

-			<groupId>org.apache.tuscany.sca</groupId>

-			<artifactId>tuscany-assembly</artifactId>

-			<version>2.0-SNAPSHOT</version>

-		</dependency>

-

-		<dependency>

-			<groupId>org.apache.tuscany.sca</groupId>

-			<artifactId>tuscany-assembly-xml</artifactId>

-			<version>2.0-SNAPSHOT</version>

-		</dependency>

-

-		<dependency>

-			<groupId>org.apache.tuscany.sca</groupId>

-			<artifactId>tuscany-interface</artifactId>

-			<version>2.0-SNAPSHOT</version>

-		</dependency>

-

-		<dependency>

-			<groupId>org.apache.tuscany.sca</groupId>

-			<artifactId>tuscany-interface-wsdl</artifactId>

-			<version>2.0-SNAPSHOT</version>

-		</dependency>

-

-		<dependency>

-			<groupId>org.apache.tuscany.sca</groupId>

-			<artifactId>tuscany-interface-java</artifactId>

-			<version>2.0-SNAPSHOT</version>

-		</dependency>

-

-		<dependency>

-			<groupId>org.apache.tuscany.sca</groupId>

-			<artifactId>tuscany-interface-wsdl-xml</artifactId>

-			<version>2.0-SNAPSHOT</version>

-		</dependency>

-

-		<dependency>

-			<groupId>org.apache.tuscany.sca</groupId>

-			<artifactId>tuscany-databinding</artifactId>

-			<version>2.0-SNAPSHOT</version>

-		</dependency>

-

-		<dependency>

-			<groupId>junit</groupId>

-			<artifactId>junit</artifactId>

-			<version>3.8.1</version>

-			<scope>test</scope>

-		</dependency>

-	</dependencies>

-	

-</project>

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

-

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

-

-/**

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

- * - this has attributes:

- *      location

- *      importType

- *      namespace

- *

- * @version $Rev$ $Date$

- */

-public class BPELImportElement {

-	

-    private String location;

-    private String importType;

-    private String namespace;

-    private WSDLDefinition theWSDL = null;

-

-    public BPELImportElement(String location, String importType, String namespace) {

-        this.location = location;

-        this.importType = importType;

-        this.namespace = namespace;

-    }

-

-    public String getImportType() {

-        return importType;

-    }

-

-    public String getLocation() {

-        return location;

-    }

-

-    public String getNamespace() {

-        return namespace;

-    }

-

-    public void setWSDLDefinition(WSDLDefinition theDefinition) {

-        theWSDL = theDefinition;

-    }

-

-    public WSDLDefinition getWSDLDefinition() {

-        return theWSDL;

-    }

-

-} // end class BPELImportElement

diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java b/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
deleted file mode 100644
index b7f5d1d3f2..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
+++ /dev/null
@@ -1,130 +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.implementation.bpel.xml;

-

-import javax.xml.namespace.QName;

-

-import javax.wsdl.PortType;

-

-/**

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

- * - this has attributes:

- *      name

- *      partnerLinkType

- *      myRole

- *      partnerRole

- * - plus zero or more property elements as children

- * 

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

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

- *

- * @version $Rev$ $Date$

- */

-public class BPELPartnerLinkElement {

-

-    private String 	REFERENCE_TYPE = "reference";

-    private String 	SERVICE_TYPE = "service";

-    private String 	name;

-    private QName	partnerLinkType;

-    private BPELPartnerLinkTypeElement 	pLinkType = null;

-    private String 	myRole;

-    private String 	partnerRole;

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

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

-    

-    public BPELPartnerLinkElement(String name, 

-    							  QName partnerLinkType,

-    							  String myRole, 

-    							  String partnerRole ) {

-        this.name = name;

-        this.partnerLinkType = partnerLinkType;

-        this.myRole = myRole;

-        this.partnerRole = partnerRole;

-        

-        scaName = null;

-    }

-

-    public QName getPartnerLinkType() {

-        return partnerLinkType;

-    }

-    

-    public void setPartnerLinkType( BPELPartnerLinkTypeElement pLinkType ) {

-    	this.pLinkType = pLinkType;

-    }

-    

-    

-    public PortType getMyRolePortType() {

-    	return getRolePortType( myRole );

-    }

-    

-    public PortType getPartnerRolePortType() {

-    	return getRolePortType( partnerRole );

-    }

-    

-    private PortType getRolePortType( String theRole ) {

-    	if (theRole == null || theRole.length() == 0) {

-            return null;

-        } // end if

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

-            return pLinkType.getRole1pType();

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

-            return pLinkType.getRole2pType();

-        } // end if

-        return null;

-    } // end getRolePortType

-

-    public String getName() {

-        return name;

-    }

-    

-    public String getMyRole() {

-    	return myRole;

-    }

-    

-    public String getPartnerRole() {

-    	return partnerRole;

-    }

-    

-    public void setSCAName( String name ) {

-    	scaName = name;

-    }

-    

-    public String getSCAName() {

-    	return scaName;

-    }

-    

-    public boolean isSCATyped() {

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

-    }

-    

-    public void setAsReference( String name ) {

-    	scaType = REFERENCE_TYPE;

-    	scaName = name;

-    }

-    

-    public void setAsService( String name ) {

-    	scaType = SERVICE_TYPE;

-    	scaName = name;

-    }

-    

-    public String querySCAType() {

-    	return scaType;

-    }

-

-} // end class BPELPartnerLinkElement

diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java b/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
deleted file mode 100644
index fdaf98a97f..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
+++ /dev/null
@@ -1,112 +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.implementation.bpel.xml;

-

- import javax.xml.namespace.QName; 

- 

- import javax.wsdl.extensions.ExtensibilityElement;

- import javax.wsdl.PortType;

- 

-/**

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

- * - this has attributes:

- *      name

- *      Role1 name

- *      Role1 portType

- *      Role2 name

- *         Role2 portType

- *

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

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

- * both roles within the representation of the partnerLinkType itself

- *

- * @version $Rev$ $Date$

- */

-public class BPELPartnerLinkTypeElement implements ExtensibilityElement {

-	

-    private QName name;

-    private String Role1name = null;

-    private QName Role1porttype = null;

-    private PortType Role1pType = null;

-    private String Role2name = null;

-    private QName Role2porttype = null;

-    private PortType Role2pType = null;

-    private QName elementType = null;

-    private Boolean required = false;

-

-    public BPELPartnerLinkTypeElement(QName name) {

-        this.name = name;

-    }

-

-    public QName getName() {

-        return name;

-    }

-

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

-        Role1name = name;

-        Role1porttype = portType;

-        Role1pType = pType;

-    }

-

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

-        Role2name = name;

-        Role2porttype = portType;

-        Role2pType = pType;

-    }

-

-    public String getRole1Name() {

-        return Role1name;

-    }

-

-    public String getRole2Name() {

-        return Role2name;

-    }

-

-    public QName getRole1PortType() {

-        return Role1porttype;

-    }

-

-    public QName getRole2PortType() {

-        return Role2porttype;

-    }

-

-    public PortType getRole1pType() {

-        return Role1pType;

-    }

-

-    public PortType getRole2pType() {

-        return Role2pType;

-    }

-

-    public QName getElementType() {

-        return elementType;

-    }

-

-    public Boolean getRequired() {

-        return required;

-    }

-

-    public void setElementType(QName elementType) {

-        this.elementType = elementType;

-    }

-

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

-        this.required = required;

-    }

-

-} // end BPELPartnerLinkType

diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 03ef3e3a7f..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.bpel.xml.BPELImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.bpel,model=org.apache.tuscany.sca.implementation.bpel.BPELImplementation
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
deleted file mode 100644
index f6fd442f56..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the artifact processor extension

-org.apache.tuscany.sca.implementation.bpel.xml.BPELDocumentProcessor;type=.bpel,model=org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory b/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
deleted file mode 100644
index 4276e938f1..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.implementation.bpel.impl.BPELFactoryImpl

diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties b/java/sca-contrib/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
deleted file mode 100644
index b6d8bdc0f1..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
+++ /dev/null
@@ -1,34 +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.
-#
-#
-CannotResolveWSDLReference = BPELDocumentProcessor:resolve - unable to resolve WSDL referenced by BPEL import WSDL location: {0} WSDLNamespace: {1}
-ContributionReadException = ContributionReadException occured due to :
-PartnerLinkNoMatchingType = PartnerLink {0} has no matching partner link type
-PartnerLinkTypeNoRoles = PartnerLinkType {0} has no Roles defined
-ContributionResolveException = ContributionResolveException occured due to :
-PartnerLinkHasBothAttr = BPEL PartnerLink {0} has both sca:reference and sca:service attributes set
-ReferencePartnerLinkNotInList = BPEL TypeLoader - element references partnerLink {0} not in the list
-MyRolePartnerRoleNull = Error: myRole and partnerRole port types are both null
-NoInterfaceForPortType = Interface not found for port type {0}
-AttributeProcessMissing = Attribute 'process' is missing.
-AttributeWithoutNamespace = Attribute {0} with value {1} in your composite should be of the form {namespaceURI}localname
-AttributeWithoutPrefix = Attribute {0} with value {1} in your composite should be prefixed (process=\"prefix:name\").
-AttributeUnrecognizedNamespace = Attribute {0} with value {1} in your composite has un unrecognized namespace prefix.
-BPELProcessNotFound = Can't find BPEL Process : {0}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java b/java/sca-contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
deleted file mode 100644
index e355b7adf9..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.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 org.apache.tuscany.sca.implementation.bpel;
-
-import java.net.URI;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BPELDocumentProcessorTestCase extends TestCase {
-
-    protected static final String BPEL_PROCESS_FILE = "helloworld/helloworld.bpel";
-
-    private URLArtifactProcessor<Object> documentProcessor;
-
-    @Override
-    protected void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
-    }
-
-    public void testLoadBPELProcessDefinition() throws Exception {
-        URI processURI = getClass().getClassLoader().getResource(BPEL_PROCESS_FILE).toURI();
-        URL processLocation = getClass().getClassLoader().getResource(BPEL_PROCESS_FILE);
-        BPELProcessDefinition bpelProcessDefinition = (BPELProcessDefinition)documentProcessor.read(null, processURI, processLocation);
-
-        assertNotNull(bpelProcessDefinition);
-        assertEquals(new QName("http://tuscany.apache.org/implementation/bpel/example/helloworld", "HelloWorld"), bpelProcessDefinition.getName());
-        assertEquals(processLocation.toString(), bpelProcessDefinition.getLocation());
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/java/sca-contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
deleted file mode 100644
index 28cc562a3b..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
+++ /dev/null
@@ -1,107 +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.implementation.bpel;
-
-import java.io.StringReader;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BPELImplementationProcessorTestCase extends TestCase {
-
-    private static final String COMPOSITE =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-        + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:hns=\"http://tuscany.apache.org/implementation/bpel/example/helloworld\" targetNamespace=\"http://bpel\" name=\"bpel\">"
-            + " <component name=\"BPELHelloWorldComponent\">"
-            + "   <implementation.bpel process=\"hns:HelloWorld\" />"
-            + " </component>"
-            + "</composite>";
-
-    private static final String COMPOSITE_INVALID =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:hns=\"http://tuscany.apache.org/implementation/bpel/example/helloworld\" targetNamespace=\"http://bpel\" name=\"bpel\">"
-            + " <component name=\"BPELHelloWorldComponent\">"
-            + "   <implementation.bpel/>"
-            + " </component>"
-            + "</composite>";
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private Monitor monitor;
-
-    @Override
-    protected void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactory();  
-        if (monitorFactory != null) {
-        	monitor = monitorFactory.createMonitor();
-        	utilities.addUtility(monitorFactory);
-        }
-        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-    }
-
-    /**
-     * Test parsing valid composite definition. Valid composite populated with correct values expected.
-     * @throws Exception
-     */
-    public void testLoadValidComposite() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(COMPOSITE));
-        
-        Composite composite = (Composite)staxProcessor.read(reader);
-        BPELImplementation implementation = (BPELImplementation)composite.getComponents().get(0).getImplementation();
-        
-        assertNotNull(implementation);
-        assertEquals(new QName("http://tuscany.apache.org/implementation/bpel/example/helloworld", "HelloWorld"), implementation.getProcess());
-    }
-
-    /**
-     * Test parsing invalid composite definition. Exception should be thrown
-     * @throws Exception
-     */
-    public void testLoadInvalidComposite() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(COMPOSITE_INVALID));
-        staxProcessor.read(reader);
-        Problem problem = monitor.getLastProblem();           
-        assertNotNull(problem);
-        assertEquals("AttributeProcessMissing", problem.getMessageId());
-    }    
-}
diff --git a/java/sca-contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel b/java/sca-contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
deleted file mode 100644
index 8cf91adc2c..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
+++ /dev/null
@@ -1,66 +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.
-  -->
-<process name="HelloWorld"
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"    
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
-     namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
-
-   <partnerLinks>
-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="helloMessage" messageType="test:HelloMessage"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="hello"
-          variable="helloMessage"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <from variable="helloMessage" part="TestPart"/>
-              <to variable="tmpVar"/>
-          </copy>
-          <copy>
-              <from>concat($tmpVar,' World')</from>
-              <to variable="helloMessage" part="TestPart"/>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="hello"
-              variable="helloMessage"/>
-   </sequence>
-</process>
diff --git a/java/sca-contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl b/java/sca-contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
deleted file mode 100644
index 1d71727b2d..0000000000
--- a/java/sca-contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
+++ /dev/null
@@ -1,82 +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 name="helloworld"

-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"

-    xmlns="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

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

-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">

-    

-    <wsdl:types>

-        <schema elementFormDefault="qualified" 

-           targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" 

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

-

-            <element name="hello">

-                <complexType>

-                    <sequence>

-                        <element name="message" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>            

-        </schema>

-    </wsdl:types>

-    

-    <wsdl:message name="HelloMessage">

-        <wsdl:part element="tns:hello" name="TestPart"/>

-    </wsdl:message>

-    

-    <wsdl:portType name="HelloPortType">

-        <wsdl:operation name="hello">

-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>

-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>

-        </wsdl:operation>    

-    </wsdl:portType>

-    

-

-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">

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

-        <wsdl:operation name="hello">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="TestIn">

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

-            </wsdl:input>

-            <wsdl:output name="TestOut">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>    

-    

-    <wsdl:service name="HelloService">

-		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">

-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>

-		</wsdl:port>

-    </wsdl:service>

-    

-   <plnk:partnerLinkType name="HelloPartnerLinkType">

-       <plnk:role name="me" portType="tns:HelloPortType"/>

-       <plnk:role name="you" portType="tns:HelloPortType"/>

-   </plnk:partnerLinkType>

-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-ejb/LICENSE b/java/sca-contrib/modules/implementation-ejb/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/implementation-ejb/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-ejb/META-INF/MANIFEST.MF
deleted file mode 100644
index 17dc48478c..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.implementation.ejb;uses:="org.a

- pache.tuscany.sca.assembly";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.implementation.ejb.impl;versio

- n="1.4",org.apache.tuscany.sca.implementation.ejb.xml;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA EJB Session Bean Implementation Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397451671

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA EJB Session Bean Implementation

-  Model

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.assembly;version="2.0.0",org.apache.tuscany.sca.contribution.proc

- essor;version="2.0.0",org.apache.tuscany.sca.contribution.resolver;vers

- ion="1.4",org.apache.tuscany.sca.core;version="2.0.0",org.apache.tuscan

- y.sca.implementation.ejb;version="2.0.0",org.apache.tuscany.sca.monitor

- ;version="2.0.0",org.apache.tuscany.sca.assembly.builder.impl;resolutio

- n:=optional,org.apache.tuscany.sca.definitions;version="2.0.0";resoluti

- on:=optional,org.apache.tuscany.sca.policy;version="2.0.0";resolution:=

- optional,org.apache.tuscany.sca.interfacedef;version="2.0.0";resolution

- :=optional,org.apache.tuscany.sc

- a.assembly.builder;version="2.0.0";resolution:=optional

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.ejb

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/implementation-ejb/NOTICE b/java/sca-contrib/modules/implementation-ejb/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/implementation-ejb/pom.xml b/java/sca-contrib/modules/implementation-ejb/pom.xml
deleted file mode 100644
index 472f8f81ed..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/pom.xml
+++ /dev/null
@@ -1,62 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-implementation-ejb</artifactId>
-    <name>Apache Tuscany SCA EJB Session Bean Implementation Model</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
- 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
- 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java b/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
deleted file mode 100644
index 0d3b05f0c9..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.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 org.apache.tuscany.sca.implementation.ejb;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-
-
-
-/**
- * The model representing an EJB implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-public interface EJBImplementation extends Implementation {
-    
-    /**
-     * Returns the EJB link URI.
-     * @return the EJB link URI
-     */
-    String getEJBLink();
-    
-    /**
-     * Sets the EJB link URI.
-     * @param ejbLink the EJB link URI
-     */
-    void setEJBLink(String ejbLink);
-
-}
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java b/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
deleted file mode 100644
index bf9e13069b..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.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 org.apache.tuscany.sca.implementation.ejb;
-
-
-/**
- * Factory for the EJB implementation model.
- *
- * @version $Rev$ $Date$
- */
-public interface EJBImplementationFactory {
-    
-    /**
-     * Creates a new EJB implementation.
-     * @return a new EJB implementation
-     */
-    EJBImplementation createEJBImplementation();
-
-}
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java b/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
deleted file mode 100644
index 050d0cf17a..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
+++ /dev/null
@@ -1,39 +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.implementation.ejb.impl;
-
-import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
-import org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory;
-
-/**
- * Factory for the EJB implementation model.
- *
- * @version $Rev$ $Date$
- */
-public class EJBImplementationFactoryImpl implements EJBImplementationFactory {
-    
-    public EJBImplementationFactoryImpl() {
-    }
-
-    public EJBImplementation createEJBImplementation() {
-        return new EJBImplementationImpl();
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java b/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
deleted file mode 100644
index bf2e6354d5..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
+++ /dev/null
@@ -1,95 +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.implementation.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
-
-
-/**
- * The model representing an EJB implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-class EJBImplementationImpl implements EJBImplementation {
-
-    private List<Property> properties = new ArrayList<Property>(); 
-    private List<Service> services = new ArrayList<Service>(); 
-    private List<Reference> references = new ArrayList<Reference>(); 
-    private String ejbLink;
-    private String uri;
-    private boolean unresolved;
-
-    /**
-     * Constructs a new EJB implementation.
-     */
-    EJBImplementationImpl() {
-    }
-
-    public ConstrainingType getConstrainingType() {
-        // The EJB implementation does not support constrainingTypes
-        return null;
-    }
-
-    public List<Property> getProperties() {
-        return properties;
-    }
-
-    public List<Service> getServices() {
-        return services;
-    }
-    
-    public List<Reference> getReferences() {
-        return references;
-    }
-
-    public String getEJBLink() {
-        return ejbLink;
-    }
-    
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        // The EJB implementation does not support constrainingTypes
-    }
-
-    public void setEJBLink(String ejbLink) {
-        this.ejbLink = ejbLink;
-    }
-    
-    public String getURI() {
-        return uri;
-    }
-    
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-    
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java b/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
deleted file mode 100644
index 573bd7ef17..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
+++ /dev/null
@@ -1,147 +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.implementation.ejb.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
-import org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-
-/**
- * Implements a StAX artifact processor for EJB implementations.
- *
- * @version $Rev$ $Date$
- */
-public class EJBImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<EJBImplementation> {
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    private static final QName IMPLEMENTATION_EJB = new QName(SCA10_NS, "implementation.ejb");
-    
-    private AssemblyFactory assemblyFactory;
-    private EJBImplementationFactory implementationFactory;
-    private Monitor monitor;
-    
-    public EJBImplementationProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.implementationFactory = modelFactories.getFactory(EJBImplementationFactory.class);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     *
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = monitor.createProblem(this.getClass().getName(), "impl-ejb-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    public QName getArtifactType() {
-        // Returns the QName of the XML element processed by this processor
-        return IMPLEMENTATION_EJB;
-    }
-
-    public Class<EJBImplementation> getModelType() {
-        // Returns the type of model processed by this processor
-        return EJBImplementation.class;
-    }
-
-    public EJBImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        
-        // Read an <implementation.ejb> element
-        EJBImplementation implementation = implementationFactory.createEJBImplementation();
-        implementation.setUnresolved(true);
-
-        // Read the ejb-link attribute
-        String ejbLink = getString(reader, "ejb-link");
-        if (ejbLink != null) {
-            implementation.setEJBLink(ejbLink);
-            
-            // Set the URI of the component type 
-            //implementation.setURI(ejbLink.replace('#', '/'));
-            int hashPosition = ejbLink.indexOf('#');
-            if (hashPosition >= 0) {
-                implementation.setURI(ejbLink.substring(hashPosition + 1));
-            } else {
-                implementation.setURI(ejbLink);
-            }
-        } else {
-            error("EJBLinkAttributeMissing", reader);
-        }
-
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && IMPLEMENTATION_EJB.equals(reader.getName())) {
-                break;
-            }
-        }
-        
-        return implementation;
-    }
-
-    public void resolve(EJBImplementation implementation, ModelResolver resolver) throws ContributionResolveException {
-        
-        // Resolve the component type
-        String uri = implementation.getURI();
-        if (uri != null) {
-            ComponentType componentType = assemblyFactory.createComponentType();
-            componentType.setURI(uri + ".componentType");
-            componentType = resolver.resolveModel(ComponentType.class, componentType);
-            if (!componentType.isUnresolved()) {
-                
-                // Initialize the implementation's services, references and properties
-                implementation.getServices().addAll(componentType.getServices());
-                implementation.getReferences().addAll(componentType.getReferences());
-                implementation.getProperties().addAll(componentType.getProperties());
-            }
-        }
-        implementation.setUnresolved(false);
-    }
-
-    public void write(EJBImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <implementation.ejb>
-        writeStart(writer, IMPLEMENTATION_EJB.getNamespaceURI(), IMPLEMENTATION_EJB.getLocalPart(),
-                                 new XAttr("ejb-link", implementation.getEJBLink()));
-        
-        writeEnd(writer);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index ae6db609a2..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.ejb.xml.EJBImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.ejb,model=org.apache.tuscany.sca.implementation.ejb.EJBImplementation,factory=org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory b/java/sca-contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
deleted file mode 100644
index fb828707a6..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for model factory
-org.apache.tuscany.sca.implementation.ejb.impl.EJBImplementationFactoryImpl
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties b/java/sca-contrib/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
deleted file mode 100644
index 4eaf2b9007..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
+++ /dev/null
@@ -1,21 +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.
-#
-#
-EJBLinkAttributeMissing = Reading implementation.ejb - ejb-link attribute missing
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java b/java/sca-contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
deleted file mode 100644
index ffbdf1d54c..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
+++ /dev/null
@@ -1,71 +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.implementation.ejb.xml;
-
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
-
-/**
- * Test reading Node implementations.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadTestCase extends TestCase {
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private CompositeBuilder compositeBuilder;
-
-    @Override
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-        
-        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
-    }
-
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("TestEJB.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite) staxProcessor.read(reader);
-        assertNotNull(composite);
-
-        compositeBuilder.build(composite, null, null);
-        
-        assertTrue(((EJBImplementation) composite.getComponents().get(0).getImplementation()).getEJBLink().equals("module.jar#TestEJB"));
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java b/java/sca-contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
deleted file mode 100644
index 8ba43dd635..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.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 org.apache.tuscany.sca.implementation.ejb.xml;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-
-/**
- * Test reading/write WSDL interfaces.
- * 
- * @version $Rev$ $Date$
- */
-public class WriteTestCase extends TestCase {
-
-    private XMLInputFactory inputFactory;
-    private XMLOutputFactory outputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-
-    @Override
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        outputFactory = XMLOutputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null);
-    }
-
-    public void testReadWriteComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("TestEJB.composite");
-        Composite composite = (Composite) staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(composite);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
-        
-        assertTrue(bos.toString().contains("module.jar#TestEJB"));
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite b/java/sca-contrib/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
deleted file mode 100644
index 0c1368c4dd..0000000000
--- a/java/sca-contrib/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
+++ /dev/null
@@ -1,29 +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://sample/ejb"
-	xmlns:sc="http://sample/composite"
-	name="TestEJB">
-
-    <component name="TestEJB">
-        <implementation.ejb ejb-link="module.jar#TestEJB"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/LICENSE b/java/sca-contrib/modules/implementation-java-xml-osoa/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-java-xml-osoa/META-INF/MANIFEST.MF
deleted file mode 100644
index 0b3527e3cb..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Java Implementation XML Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397170750

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Java Implementation XML Model

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.builder;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.assembly.xml.osoa;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.definitions;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.implementation.java;version="2.0.0",

- org.apache.tuscany.sca.implementation.java.introspect;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java.xml.osoa

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
-Export-Package: org.apache.tuscany.sca.implementation.java.xml.osoa;version="2.0.0"

diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/NOTICE b/java/sca-contrib/modules/implementation-java-xml-osoa/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/pom.xml b/java/sca-contrib/modules/implementation-java-xml-osoa/pom.xml
deleted file mode 100644
index 23a09e47bb..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/pom.xml
+++ /dev/null
@@ -1,92 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-implementation-java-xml-osoa</artifactId>
-    <name>Apache Tuscany SCA Java Implementation XML Model based on OSOA Spec</name>
-
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml-osoa</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <!-- dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency-->
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api-osoa</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-    
-        <!-- dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency-->
-
-        <!-- dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency-->
-
-        <!-- dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency-->        
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationConstants.java b/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationConstants.java
deleted file mode 100644
index 895c6d2edb..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationConstants.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 org.apache.tuscany.sca.implementation.java.xml.osoa;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.osoa.Constants;
-
-/**
- * Constants for the Java Implementation.
- *
- * @version $Rev$ $Date$
- */
-public interface JavaImplementationConstants {
-
-    String IMPLEMENTATION_JAVA = "implementation.java";
-    QName IMPLEMENTATION_JAVA_QNAME = new QName(Constants.SCA10_NS, "implementation.java");
-    String CLASS = "class";
-
-}
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationProcessor.java b/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationProcessor.java
deleted file mode 100644
index 59e0cf2e6c..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationProcessor.java
+++ /dev/null
@@ -1,347 +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.implementation.java.xml.osoa;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Extension;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.xml.osoa.Constants;
-import org.apache.tuscany.sca.assembly.xml.osoa.PolicySubjectProcessor;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaElementImpl;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JavaImplementationProcessor implements StAXArtifactProcessor<JavaImplementation>,
-    JavaImplementationConstants {
-
-    private AssemblyFactory assemblyFactory;
-    private PolicyFactory policyFactory;
-    private JavaImplementationFactory javaFactory;
-    private PolicySubjectProcessor policyProcessor;
-
-    private Monitor monitor;
-
-    public JavaImplementationProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.javaFactory = modelFactories.getFactory(JavaImplementationFactory.class);
-        this.policyProcessor = new PolicySubjectProcessor(policyFactory);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem =
-                monitor.createProblem(this.getClass().getName(),
-                                      "impl-javaxml-validation-messages",
-                                      Severity.ERROR,
-                                      model,
-                                      message,
-                                      (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    /**
-     * Report a exception.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Exception ex) {
-        if (monitor != null) {
-            Problem problem =
-                monitor.createProblem(this.getClass().getName(),
-                                      "impl-javaxml-validation-messages",
-                                      Severity.ERROR,
-                                      model,
-                                      message,
-                                      ex);
-            monitor.problem(problem);
-        }
-    }
-
-    public JavaImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-
-        // Read an <implementation.java>
-        JavaImplementation javaImplementation = javaFactory.createJavaImplementation();
-        
-        
-        javaImplementation.setUnresolved(true);
-        javaImplementation.setName(reader.getAttributeValue(null, CLASS));
-
-        // Read policies
-        policyProcessor.readPolicies(javaImplementation, reader);
-        
-        // Handle extended attributes
-/* TODO        
-        for (int a = 0; a < reader.getAttributeCount(); a++) {
-            QName attributeName = reader.getAttributeName(a);
-            if( attributeName.getNamespaceURI() != null && attributeName.getNamespaceURI().length() > 0) {
-                if( (! Constants.SCA10_NS.equals(attributeName.getNamespaceURI()) && 
-                    (! Constants.SCA10_TUSCANY_NS.equals(attributeName.getNamespaceURI()) ))) {
-            Object attributeValue = extensionAttributeProcessor.read(attributeName, reader);
-                    Extension attributeExtension;
-                    if (attributeValue instanceof Extension) {
-                        attributeExtension = (Extension) attributeValue;
-                    } else {
-                        attributeExtension = extensionFactory.createExtension(attributeName, attributeValue, true);
-                    }
-                    javaImplementation.getAttributeExtensions().add(attributeExtension);
-                }
-            }
-        }
-*/        
-
-        
-
-        // read operation elements if exists or skip unto end element
-/* TODO - 2.x model doesn't support operations yet     
-        int event;
-        ConfiguredOperation confOp = null;
-        while (reader.hasNext()) {
-            event = reader.next();
-            switch ( event ) {
-                case START_ELEMENT  : {
-                    if ( Constants.OPERATION_QNAME.equals(reader.getName()) ) {
-                        confOp = configuredOperationProcessor.read(reader);
-                        if ( confOp != null ) {
-                            ((OperationsConfigurator)javaImplementation).getConfiguredOperations().add(confOp);
-                        }
-                    }
-                }
-                break;
-            }
-
-            if (event == END_ELEMENT && IMPLEMENTATION_JAVA_QNAME.equals(reader.getName())) {
-                break;
-            }
-        }
-*/        
-        return javaImplementation;
-    }
-
-    public void write(JavaImplementation javaImplementation, XMLStreamWriter writer) throws ContributionWriteException,
-        XMLStreamException {
-
-        // Write an <implementation.java>
-        policyProcessor.writePolicyPrefixes(javaImplementation, writer);
-        writer.writeStartElement(Constants.SCA10_NS, IMPLEMENTATION_JAVA);
-        policyProcessor.writePolicyAttributes(javaImplementation, writer);
-
-        if (javaImplementation.getName() != null) {
-            writer.writeAttribute(CLASS, javaImplementation.getName());
-        }
-
-        // Write extended attributes
-/* TODO        
-        for(Extension extension : javaImplementation.getAttributeExtensions()) {
-            if(extension.isAttribute()) {
-                extensionAttributeProcessor.write(extension, writer);
-            }
-        }
-*/        
-        writer.writeEndElement();
-    }
-
-    public void resolve(JavaImplementation javaImplementation, ModelResolver resolver)
-        throws ContributionResolveException {
-
-        ClassReference classReference = new ClassReference(javaImplementation.getName());
-        classReference = resolver.resolveModel(ClassReference.class, classReference);
-        Class javaClass = classReference.getJavaClass();
-        if (javaClass == null) {
-        	error("ClassNotFoundException", resolver, javaImplementation.getName());
-            //throw new ContributionResolveException(new ClassNotFoundException(javaImplementation.getName()));
-        	return;
-        }
-        
-        javaImplementation.setJavaClass(javaClass);        
-
-        try {
-            javaFactory.createJavaImplementation(javaImplementation, javaImplementation.getJavaClass());
-        } catch (IntrospectionException e) {
-        	ContributionResolveException ce = new ContributionResolveException(e);
-        	error("ContributionResolveException", javaFactory, ce);
-            //throw ce;
-        	return;
-        }
-        
-        javaImplementation.setUnresolved(false);
-        mergeComponentType(resolver, javaImplementation);
-
-        // FIXME the introspector should always create at least one service
-        if (javaImplementation.getServices().isEmpty()) {
-            javaImplementation.getServices().add(assemblyFactory.createService());
-        }
-    }
-
-    private JavaElementImpl getMemeber(JavaImplementation impl, String name, Class<?> type) {
-        String setter = JavaIntrospectionHelper.toSetter(name);
-        try {
-            Method method = impl.getJavaClass().getDeclaredMethod(setter, type);
-            int mod = method.getModifiers();
-            if ((Modifier.isPublic(mod) || Modifier.isProtected(mod)) && (!Modifier.isStatic(mod))) {
-                return new JavaElementImpl(method, 0);
-            }
-        } catch (NoSuchMethodException e) {
-            Field field;
-            try {
-                field = impl.getJavaClass().getDeclaredField(name);
-                int mod = field.getModifiers();
-                if ((Modifier.isPublic(mod) || Modifier.isProtected(mod)) && (!Modifier.isStatic(mod))) {
-                	return new JavaElementImpl(field);
-                }
-            } catch (NoSuchFieldException e1) {
-                // Ignore
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Merge the componentType from introspection and external file
-     * @param resolver
-     * @param impl
-     */
-    private void mergeComponentType(ModelResolver resolver, JavaImplementation impl) {
-        // FIXME: Need to clarify how to merge
-        ComponentType componentType = getComponentType(resolver, impl);
-        if (componentType != null && !componentType.isUnresolved()) {
-            Map<String, Reference> refMap = new HashMap<String, Reference>();
-            for (Reference ref : impl.getReferences()) {
-                refMap.put(ref.getName(), ref);
-            }
-            for (Reference reference : componentType.getReferences()) {
-                refMap.put(reference.getName(), reference);
-            }
-            impl.getReferences().clear();
-            impl.getReferences().addAll(refMap.values());
-
-            // Try to match references by type
-            Map<String, JavaElementImpl> refMembers = impl.getReferenceMembers();
-            for (Reference ref : impl.getReferences()) {
-                if (ref.getInterfaceContract() != null) {
-                    Interface i = ref.getInterfaceContract().getInterface();
-                    if (i instanceof JavaInterface) {
-                        Class<?> type = ((JavaInterface)i).getJavaClass();
-                        if (!refMembers.containsKey(ref.getName())) {
-                            JavaElementImpl e = getMemeber(impl, ref.getName(), type);
-                            if (e != null) {
-                                refMembers.put(ref.getName(), e);
-                            }
-                        }
-                    }
-                }
-            }
-
-            Map<String, Service> serviceMap = new HashMap<String, Service>();
-            for (Service svc : impl.getServices()) {
-                serviceMap.put(svc.getName(), svc);
-            }
-            for (Service service : componentType.getServices()) {
-                serviceMap.put(service.getName(), service);
-            }
-            impl.getServices().clear();
-            impl.getServices().addAll(serviceMap.values());
-
-            Map<String, Property> propMap = new HashMap<String, Property>();
-            for (Property prop : impl.getProperties()) {
-                propMap.put(prop.getName(), prop);
-            }
-            for (Property property : componentType.getProperties()) {
-                propMap.put(property.getName(), property);
-            }
-            impl.getProperties().clear();
-            impl.getProperties().addAll(propMap.values());
-
-            if (componentType.getConstrainingType() != null) {
-                impl.setConstrainingType(componentType.getConstrainingType());
-            }
-        }
-    }
-
-    private ComponentType getComponentType(ModelResolver resolver, JavaImplementation impl) {
-        String className = impl.getJavaClass().getName();
-        String componentTypeURI = className.replace('.', '/') + ".componentType";
-        ComponentType componentType = assemblyFactory.createComponentType();
-        componentType.setUnresolved(true);
-        componentType.setURI(componentTypeURI);
-        componentType = resolver.resolveModel(ComponentType.class, componentType);
-        if (!componentType.isUnresolved()) {
-            return componentType;
-        }
-        return null;
-    }
-
-    public QName getArtifactType() {
-        return IMPLEMENTATION_JAVA_QNAME;
-    }
-
-    public Class<JavaImplementation> getModelType() {
-        return JavaImplementation.class;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index d49774908d..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.java.xml.osoa.JavaImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.java,model=org.apache.tuscany.sca.implementation.java.JavaImplementation
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/resources/impl-javaxml-validation-messages.properties b/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/resources/impl-javaxml-validation-messages.properties
deleted file mode 100644
index 210b715da8..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/resources/impl-javaxml-validation-messages.properties
+++ /dev/null
@@ -1,23 +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.
-#
-#
-ClassNotFoundException = Class Not Found Exception: {0}
-ContributionResolveException = Contribution Resolve Exception occured due to: 
-
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddService.java b/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddService.java
deleted file mode 100644
index 9c22177684..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddService.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * Interface for the Add Service.
- *
- * @version $Rev$ $Date$
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddServiceImpl.java b/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 3f28d740a7..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddServiceImpl.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 calculator;
-
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * An implementation of the Add service.
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@EagerInit
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        return n1 + n2;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorService.java b/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index e0cf23dc17..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorService.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 calculator;
-
-/**
- * The Calculator service interface.
- *
- * @version $Rev$ $Date$
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index c1fceb575d..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,73 +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 calculator;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * An implementation of the Calculator service.
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideService.java b/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideService.java
deleted file mode 100644
index 9599c86292..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideService.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * Interface for the Divide Service.
- *
- * @version $Rev$ $Date$
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideServiceImpl.java b/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index e1f35f99b5..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import org.osoa.sca.annotations.Scope;
-
-/**
- * An implementation of the Divide service.
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyService.java b/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyService.java
deleted file mode 100644
index 7a3d06c15e..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * Interface for the Multiply Service.
- *
- * @version $Rev$ $Date$
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index d621407908..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import org.osoa.sca.annotations.Scope;
-
-/**
- * An implementation of the Multiply service.
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractService.java b/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractService.java
deleted file mode 100644
index 21af91f392..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * Interface for the Subtract Service.
- *
- * @version $Rev$ $Date$
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 4fed0a8c6a..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import org.osoa.sca.annotations.Scope;
-
-/**
- * An implementation of the subtract service.
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
deleted file mode 100644
index a58fa0c072..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ /dev/null
@@ -1,66 +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:calc="http://sample.calculator"
-	requires="cns:tuscanyIntent_1"
-	targetNamespace="http://sample.calculator"
-	xmlns:cns="http://test" 
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent" requires="cns:tuscanyIntent_2">
-		<implementation.java class="calculator.CalculatorServiceImpl" requires="cns:tuscanyIntent_3" />
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-    
-    <component name="AnotherCalculatorServiceComponent" requires="cns:tuscanyIntent_4">
-		<implementation.java class="calculator.CalculatorServiceImpl" requires="cns:tuscanyIntent_5">
-			<operation name="add"  requires="cns:tuscanyIntent_6"/>
-		</implementation.java>	
-    </component>
-    
-    <component name="YetAnotherCalculatorServiceComponent" requires="cns:tuscanyIntent_4">
-		<implementation.java class="calculator.CalculatorServiceImpl" requires="cns:tuscanyIntent_6.qualified1">
-			<operation name="add"  requires="cns:tuscanyIntent_6.qualified2" policySets="cns:tuscanyPolicySet_4"/>
-		</implementation.java>	
-    </component>
-</composite>
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
deleted file mode 100644
index 5142737b32..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<sca:definitions xmlns="http://test"
- 			targetNamespace="http://test"
- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- simple intent -->
- <sca:intent name="tuscanyIntent_1" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_2" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_3" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_4" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
-<sca:intent name="tuscanyIntent_5" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_6" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_7" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_8" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <!-- qualified intents -->
- <sca:intent name="tuscanyIntent_1.qualified" />
- <sca:intent name="tuscanyIntent_2.qualified" />
- <sca:intent name="tuscanyIntent_6.qualified1" />
- <sca:intent name="tuscanyIntent_6.qualified2" />
- 
- <sca:policySet name="tuscanyPolicySet_4"
- 	provides="tuscanyIntent_6"
- 	appliesTo="/sca:composite/sca:component"
- 	xmlns="http://test"
- 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- 	<sca:intentMap provides="tuscanyIntent_6" default="qualified2">
-        <sca:qualifier name="qualified2">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "qualified2" alternative" -->
-            </wsp:Policy>
-        </sca:qualifier>
-    </sca:intentMap>
- </sca:policySet>
-</sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
deleted file mode 100644
index e49359f3ee..0000000000
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<sca:definitions xmlns="http://test"
- 			targetNamespace="http://test"
- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- simple intent -->
- <sca:intent name="tuscanyIntent_1" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_2" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_3" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_4" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
-<sca:intent name="tuscanyIntent_5" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_6" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_7" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_8" 
- 			 constrains="sca:binding sca:implementation.java">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:policySet name="tuscanyPolicySet_1"
- 	provides="tuscanyIntent_1 tuscanyIntent_2 tuscanyIntent_3"
- 	appliesTo="/sca:composite/sca:component"
- 	xmlns="http://test"
- 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- </sca:policySet>
- 
- <sca:policySet name="tuscanyPolicySet_2"
- 	provides="tuscanyIntent_4 tuscanyIntent_5"
- 	appliesTo="/sca:composite/sca:component"
- 	xmlns="http://test"
- 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- </sca:policySet>
- 
- <sca:policySet name="tuscanyPolicySet_3"
- 	provides="tuscanyIntent_6"
- 	appliesTo="/sca:composite/sca:component"
- 	xmlns="http://test"
- 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- 	<sca:intentMap provides="tuscanyIntent_6" default="qualified1">
-        <sca:qualifier name="qualified1">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "qualified1" alternative -->
-            </wsp:Policy>
-        </sca:qualifier>
-        <sca:qualifier name="qualifed2">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "qualified2" alternative" -->
-            </wsp:Policy>
-        </sca:qualifier>
-    </sca:intentMap>
- </sca:policySet>
- 
- <sca:policySet name="tuscanyPolicySet_4"
- 	provides="tuscanyIntent_6"
- 	appliesTo="/sca:composite/sca:component"
- 	xmlns="http://test"
- 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- 	<sca:intentMap provides="tuscanyIntent_6" default="qualified2">
-        <sca:qualifier name="qualified2">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "qualified2" alternative" -->
-            </wsp:Policy>
-        </sca:qualifier>
-    </sca:intentMap>
- </sca:policySet>
- 
-  <!-- qualified intents -->
- <sca:intent name="tuscanyIntent_1.qualified" />
- <sca:intent name="tuscanyIntent_2.qualified" />
- <sca:intent name="tuscanyIntent_6.qualified1" />
- <sca:intent name="tuscanyIntent_6.qualified2" />
-</sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-node-runtime/LICENSE b/java/sca-contrib/modules/implementation-node-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/implementation-node-runtime/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-node-runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 114dd2af2f..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,36 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.implementation.node.launcher;us

- es:="org.apache.tuscany.sca.node,org.oasisopen.sca";version="2.0.0",org.apac

- he.tuscany.sca.implementation.node.webapp;uses:="org.apache.tuscany.s

- ca.implementation.node.launcher,org.apache.tuscany.sca.node,org.apach

- e.tuscany.sca.core,javax.servlet,org.apache.tuscany.sca.host.http,jav

- ax.servlet.http";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.implementation.node.provider;v

- ersion="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Node Implementation Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397409312

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Node Implementation Extension

-Import-Package: javax.servlet,

- javax.servlet.http,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.host.http;version="2.0.0",

- org.apache.tuscany.sca.implementation.node;version="2.0.0",

- org.apache.tuscany.sca.implementation.node.launcher;version="2.0.0",

- org.apache.tuscany.sca.implementation.node.webapp;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.node;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.oasisopen.sca;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.node.runtim

- e

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca-contrib/modules/implementation-node-runtime/NOTICE b/java/sca-contrib/modules/implementation-node-runtime/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/implementation-node-runtime/pom.xml b/java/sca-contrib/modules/implementation-node-runtime/pom.xml
deleted file mode 100644
index 1db4bcfd24..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/pom.xml
+++ /dev/null
@@ -1,84 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-implementation-node-runtime</artifactId>
-    <name>Apache Tuscany SCA Node Implementation Model Runtime</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java b/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
deleted file mode 100644
index e4e88003c7..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
+++ /dev/null
@@ -1,112 +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.implementation.node.launcher;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ServiceReference;
-
-/**
- * Bootstrap class for the SCA node daemon.
- *
- * @version $Rev$ $Date$
- */
-public class NodeImplementationDaemonBootstrap {
-    private Node node;
-
-    /**
-     * A node wrappering an instance of a node daemon.
-     */
-    public static class NodeFacade implements Node {
-        private ClassLoader threadContextClassLoader;
-        private ClassLoader runtimeClassLoader;
-        private Node daemon;
-
-        private NodeFacade() {
-            runtimeClassLoader = Thread.currentThread().getContextClassLoader();
-        }
-
-        public Node start() {
-            threadContextClassLoader = Thread.currentThread().getContextClassLoader();
-            boolean started = false;
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                NodeFactory factory = NodeFactory.newInstance();
-                String contribution = ContributionLocationHelper.getContributionLocation(getClass());
-                daemon = factory.createNode("NodeDaemon.composite", new Contribution("node-runtime", contribution));
-                started = true;
-                return this;
-            } finally {
-                if (!started) {
-                    Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-                }
-            }
-        }
-
-        public void stop() {
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                daemon.stop();
-            } finally {
-                Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-            }
-        }
-
-        public void destroy() {
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                daemon.destroy();
-            } finally {
-                Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-            }
-        }
-
-        public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-            throw new UnsupportedOperationException();
-        }
-
-        public <B> B getService(Class<B> businessInterface, String serviceName) {
-            throw new UnsupportedOperationException();
-        }
-
-        public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String serviceName) {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Constructs a new daemon bootstrap.
-     */
-    public NodeImplementationDaemonBootstrap() throws Exception {
-        node = new NodeFacade();
-    }
-
-    /**
-     * Returns the node representing the daemon.
-     * @return
-     */
-    public Node getNode() {
-        return node;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
deleted file mode 100644
index 9a9a4d8ddf..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
+++ /dev/null
@@ -1,150 +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.implementation.node.launcher;
-
-import java.net.URL;
-
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ServiceReference;
-
-/**
- * Bootstrap class for standalone SCA nodes.
- *
- * @version $Rev$ $Date$
- */
-public class NodeImplementationLauncherBootstrap {
-
-    private Node node;
-
-    /**
-     * A node facade.
-     */
-    public static class NodeFacade implements Node, Client {
-        private ClassLoader threadContextClassLoader;
-        private ClassLoader runtimeClassLoader;
-        private Node delegate;
-
-        private NodeFacade(Node delegate) {
-            runtimeClassLoader = Thread.currentThread().getContextClassLoader();
-            this.delegate = delegate;
-        }
-
-        public Node start() {
-            threadContextClassLoader = Thread.currentThread().getContextClassLoader();
-            boolean started = false;
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                delegate.start();
-                started = true;
-                return this;
-            } finally {
-                if (!started) {
-                    Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-                }
-            }
-        }
-
-        public void stop() {
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                delegate.stop();
-            } finally {
-                Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-            }
-        }
-
-        public void destroy() {
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                delegate.destroy();
-            } finally {
-                Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-            }
-        }
-
-        public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-            return (R)((Client)delegate).cast(target);
-        }
-
-        public <B> B getService(Class<B> businessInterface, String serviceName) {
-            return (B)((Client)delegate).getService(businessInterface, serviceName);
-        }
-
-        public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String referenceName) {
-            return (ServiceReference<B>)((Client)delegate).getServiceReference(businessInterface, referenceName);
-        }
-    }
-
-    /**
-     * Bootstrap a new SCA node.
-     *
-     * @param configurationURI
-     */
-    public NodeImplementationLauncherBootstrap(String configurationURI) throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        node = new NodeFacade(nodeFactory.createNode(new URL(configurationURI)));
-    }
-
-    /**
-     * Bootstrap a new SCA node.
-     *
-     * @param compositeURI
-     * @param uris
-     * @param locations
-     */
-    public NodeImplementationLauncherBootstrap(String compositeURI, String[] uris, String[] locations) throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        Contribution[] contributions = new Contribution[uris.length];
-        for (int i = 0; i < uris.length; i++) {
-            contributions[i] = new Contribution(uris[i], locations[i]);
-        }
-        node = new NodeFacade(nodeFactory.createNode(compositeURI, contributions));
-    }
-
-    /**
-     * Bootstrap a new SCA node.
-     *
-     * @param compositeURI
-     * @param uris
-     * @param locations
-     */
-    public NodeImplementationLauncherBootstrap(String compositeURI, String compositeContent, String[] uris, String[] locations) throws Exception {
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        Contribution[] contributions = new Contribution[uris.length];
-        for (int i = 0; i < uris.length; i++) {
-            contributions[i] = new Contribution(uris[i], locations[i]);
-        }
-        node = new NodeFacade(nodeFactory.createNode(compositeURI, compositeContent, contributions));
-    }
-
-    /**
-     * Returns the SCA node.
-     *
-     * @return
-     */
-    public Node getNode() {
-        return node;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java b/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
deleted file mode 100644
index 62a822a85e..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
+++ /dev/null
@@ -1,51 +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.implementation.node.launcher;
-
-/**
- * Utility methods for node implementation launchers.
- *
- * @version $Rev$ $Date$
- */
-public class NodeImplementationLauncherUtil {
-
-    private static final String TUSCANY_DOMAIN = "TUSCANY_DOMAIN";
-    private static final String DEFAULT_DOMAIN = "http://localhost:9990";
-
-    /**
-     * Determine the URI of a node configuration. The domain URI can be configured
-     * using a TUSCANY_DOMAIN system property or environment variable.
-     * 
-     * @param nodeName
-     * @return
-     */
-    public static String nodeConfigurationURI(String nodeName) {
-        String domain = System.getProperty(TUSCANY_DOMAIN);
-        if (domain == null || domain.length() == 0) {
-            domain = System.getenv(TUSCANY_DOMAIN);
-        }
-        if (domain == null || domain.length() ==0) {
-            domain = DEFAULT_DOMAIN;
-        }
-        String nodeConfiguration = domain + "/node-config/" + nodeName;
-        return nodeConfiguration;
-    }
-    
-}
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java b/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
deleted file mode 100644
index 5895a8614d..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.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 org.apache.tuscany.sca.implementation.node.provider;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-/**
- * Implements an invoker for node component implementations.
- * 
- * @version $Rev$ $Date$
- */
-class NodeImplementationInvoker implements Invoker {
-    private Composite composite;
-    
-    NodeImplementationInvoker(Composite composite) {
-        this.composite = composite;
-    }
-    
-    public Message invoke(Message msg) {
-        //FIXME Implement later
-        msg.setBody(composite);
-        return msg;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java b/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
deleted file mode 100644
index 6cdb18938e..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
+++ /dev/null
@@ -1,62 +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.implementation.node.provider;
-
-import org.apache.tuscany.sca.implementation.node.NodeImplementation;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * An implementation provider for node component implementations.
- * 
- * @version $Rev$ $Date$
- */
-class NodeImplementationProvider implements ImplementationProvider {
-    
-    private NodeImplementation implementation;
-
-    /**
-     * Constructs a new node implementation provider.
-     * 
-     * @param component
-     * @param implementation
-     */
-    NodeImplementationProvider(RuntimeComponent component, NodeImplementation implementation) {
-        this.implementation = implementation;
-    }
-
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        NodeImplementationInvoker invoker = new NodeImplementationInvoker(implementation.getComposite());
-        return invoker;
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-    }
-
-    public void stop() {
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java b/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
deleted file mode 100644
index e2a3e4df92..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.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 org.apache.tuscany.sca.implementation.node.provider;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.node.NodeImplementation;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * Factory for node component implementation providers.
- * 
- * @version $Rev$ $Date$
- */
-public class NodeImplementationProviderFactory implements ImplementationProviderFactory<NodeImplementation> {
-
-    /**
-     * Constructs a new factory.
-     * 
-     * @param extensionPoints
-     */
-    public NodeImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
-    }
-
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component, NodeImplementation implementation) {
-        return new NodeImplementationProvider(component, implementation);
-    }
-    
-    public Class<NodeImplementation> getModelType() {
-        return NodeImplementation.class;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java b/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
deleted file mode 100644
index f6a601a3cd..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.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.implementation.node.webapp;
-
-import java.io.IOException;
-import java.util.StringTokenizer;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-
-/**
- * A Servlet request dispatcher that can be used to delegate requests to a
- * Serlvet registered with the Webapp Servlet host.
- * 
- * @version $Rev$ $Date$
- */
-class NodeWebAppRequestDispatcher implements RequestDispatcher {
-    private String servletPath;
-    private Servlet servlet;
-    
-    /**
-     * Constructs a new request dispatcher.
-     * 
-     * @param mapping
-     * @param servlet
-     */
-    public NodeWebAppRequestDispatcher(String mapping, Servlet servlet) {
-        if (mapping.endsWith("*")) {
-            mapping = mapping.substring(0, mapping.length()-1);
-        }
-        if (mapping.endsWith("/")) {
-            mapping = mapping.substring(0, mapping.length()-1);
-        }
-        this.servletPath = mapping;
-        this.servlet = servlet;
-    }
-
-    /**
-     * Returns a request wrapper which will return the correct Servlet path
-     * and path info.
-     * 
-     * @param request
-     * @return
-     */
-    private HttpServletRequest createRequestWrapper(ServletRequest request) {
-        HttpServletRequest requestWrapper = new HttpServletRequestWrapper((HttpServletRequest)request) {
-            
-            @Override
-            public String getServletPath() {
-                return servletPath;
-            }
-            
-            @Override
-            public String getPathInfo() {
-                String path = super.getServletPath();
-                if (path.length() == 0) {
-                    path = super.getPathInfo();
-                }
-
-                // TODO: another context path hack, revisit when context path is sorted out
-                path = fiddlePath(path, servletPath);
-
-                return path;
-            }
-        };
-        return requestWrapper;
-    }
-
-    /**
-     * Remove any path suffix thats part of the Servlet context path.
-     * 
-     * @param path
-     * @param servletPath
-     */
-    private static String fiddlePath(String path, String servletPath) {
-        StringTokenizer st = new StringTokenizer(path, "/");
-        String root = "";
-        while (st.hasMoreTokens()){
-                String s = st.nextToken();
-                if (servletPath.endsWith((root + "/" + s))) {
-                        root += "/" + s;
-                } else {
-                        break;
-                }
-        }
-        String fiddlePath = path.substring(root.length());
-        return fiddlePath;
-    }
-
-    public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-        servlet.service(createRequestWrapper(request), response);
-    }
-    
-    public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-        servlet.service(createRequestWrapper(request), response);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java b/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
deleted file mode 100644
index b6d2f3d643..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
+++ /dev/null
@@ -1,400 +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.implementation.node.webapp;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterConfig;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.host.http.ServletMappingException;
-import org.apache.tuscany.sca.implementation.node.launcher.NodeImplementationLauncherUtil;
-import org.apache.tuscany.sca.node.Client;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-/**
- * ServletHost implementation for use in a Webapp Node environment.
- *
- * @version $Rev$ $Date$
- */
-public class NodeWebAppServletHost implements ServletHost, Filter {
-    private static final Logger logger = Logger.getLogger(NodeWebAppServletHost.class.getName());
-
-    private static final NodeWebAppServletHost servletHost = new NodeWebAppServletHost();
-
-    private Map<String, Servlet> servlets = new HashMap<String, Servlet>();
-    private Node node;
-
-    private String contextPath = "/";
-    private int defaultPort = 8080;
-
-    /**
-     * Constructs a new NodeWebAppServletHost.
-     */
-    private NodeWebAppServletHost() {
-    }
-
-    /**
-     * Returns the Servlet host for the current Web app.
-     *
-     * @return
-     */
-    public static NodeWebAppServletHost servletHost() {
-        return servletHost;
-    }
-
-    /**
-     * Initialize the Servlet host.
-     *
-     * @param filterConfig
-     * @throws ServletException
-     */
-    public void init(final FilterConfig filterConfig) throws ServletException {
-
-        // Create a Servlet config wrapping the given filter config
-        ServletConfig servletConfig = servletConfig(filterConfig);
-
-        // Get the Servlet context
-        ServletContext servletContext = servletConfig.getServletContext();
-
-        // Initialize the context path
-        contextPath = contextPath(servletContext);
-
-        // Derive the node name from the Webapp context path
-        String nodeName = contextPath;
-        if (nodeName.startsWith("/")) {
-            nodeName = nodeName.substring(1);
-        }
-        if (nodeName.endsWith("/")) {
-            nodeName = nodeName.substring(0, nodeName.length() - 1);
-        }
-
-        // Determine the node configuration URI
-        String nodeConfiguration = NodeImplementationLauncherUtil.nodeConfigurationURI(nodeName);
-
-        // Create the SCA node
-        NodeFactory nodeFactory = NodeFactory.newInstance();
-        try {
-            node = nodeFactory.createNode(new URL(nodeConfiguration));
-        } catch (MalformedURLException e) {
-            throw new ServletException(e);
-        }
-
-        // Register the Servlet host
-        ServletHostExtensionPoint servletHosts = servletHosts(node);
-        servletHosts.getServletHosts().clear();
-        servletHosts.addServletHost(servletHost);
-
-        // Save the node in the Servlet context
-        servletContext.setAttribute(Client.class.getName(), node);
-
-        // Start the node
-        node.start();
-
-        // Initialize the registered Servlets
-        for (Servlet servlet : servlets.values()) {
-            servlet.init(servletConfig);
-        }
-    }
-
-    public void addServletMapping(String suri, Servlet servlet) throws ServletMappingException {
-        URI pathURI = URI.create(suri);
-
-        // Make sure that the path starts with a /
-        suri = pathURI.getPath();
-        if (!suri.startsWith("/")) {
-            suri = '/' + suri;
-        }
-
-        if (!suri.startsWith(contextPath)) {
-            suri = contextPath + suri;
-        }
-
-        // In a webapp just use the given path and ignore the host and port
-        // as they are fixed by the Web container
-        servlets.put(suri, servlet);
-
-        logger.info("Added Servlet mapping: " + suri);
-    }
-
-    public Servlet removeServletMapping(String suri) throws ServletMappingException {
-        URI pathURI = URI.create(suri);
-
-        // Make sure that the path starts with a /
-        suri = pathURI.getPath();
-        if (!suri.startsWith("/")) {
-            suri = '/' + suri;
-        }
-
-        if (!suri.startsWith(contextPath)) {
-            suri = contextPath + suri;
-        }
-
-        // In a webapp just use the given path and ignore the host and port
-        // as they are fixed by the Web container
-        return servlets.remove(suri);
-    }
-
-    public Servlet getServletMapping(String suri) throws ServletMappingException {
-        if (!suri.startsWith("/")) {
-            suri = '/' + suri;
-        }
-
-        if (!suri.startsWith(contextPath)) {
-            suri = contextPath + suri;
-        }
-
-        // Get the Servlet mapped to the given path
-        Servlet servlet = servlets.get(suri);
-        return servlet;
-    }
-
-    public URL getURLMapping(String suri) throws ServletMappingException {
-        URI uri = URI.create(suri);
-
-        // Get the URI scheme and port
-        String scheme = uri.getScheme();
-        if (scheme == null) {
-            scheme = "http";
-        }
-        int portNumber = uri.getPort();
-        if (portNumber == -1) {
-            portNumber = defaultPort;
-        }
-
-        // Get the host
-        String host;
-        try {
-            host = InetAddress.getLocalHost().getHostName();
-        } catch (UnknownHostException e) {
-            host = "localhost";
-        }
-
-        // Construct the URL
-        String path = uri.getPath();
-        if (!path.startsWith("/")) {
-            path = '/' + path;
-        }
-
-        if (contextPath != null && !path.startsWith(contextPath)) {
-            path = contextPath + path;
-        }
-
-        URL url;
-        try {
-            url = new URL(scheme, host, portNumber, path);
-        } catch (MalformedURLException e) {
-            throw new ServletMappingException(e);
-        }
-        return url;
-    }
-
-    public RequestDispatcher getRequestDispatcher(String suri) throws ServletMappingException {
-
-        // Make sure that the path starts with a /
-        if (!suri.startsWith("/")) {
-            suri = '/' + suri;
-        }
-
-        suri = contextPath + suri;
-
-        // Get the Servlet mapped to the given path
-        Servlet servlet = servlets.get(suri);
-        if (servlet != null) {
-            return new NodeWebAppRequestDispatcher(suri, servlet);
-        }
-
-        for (Map.Entry<String, Servlet> entry : servlets.entrySet()) {
-            String servletPath = entry.getKey();
-            if (servletPath.endsWith("*")) {
-                servletPath = servletPath.substring(0, servletPath.length() - 1);
-                if (suri.startsWith(servletPath)) {
-                    return new NodeWebAppRequestDispatcher(entry.getKey(), entry.getValue());
-                } else {
-                    if ((suri + "/").startsWith(servletPath)) {
-                        return new NodeWebAppRequestDispatcher(entry.getKey(), entry.getValue());
-                    }
-                }
-            }
-        }
-
-        // No Servlet found
-        return null;
-    }
-
-    /**
-     * Destroy the Servlet host.
-     *
-     * @throws ServletException
-     */
-    public void destroy() {
-
-        // Destroy the registered Servlets
-        for (Servlet servlet : servlets.values()) {
-            servlet.destroy();
-        }
-
-        // Stop the node
-        if (node != null) {
-            node.stop();
-        }
-    }
-
-    public void doFilter(ServletRequest request, ServletResponse response, javax.servlet.FilterChain chain)
-        throws IOException, ServletException {
-
-        // Get the Servlet path
-        HttpServletRequest httpRequest = (HttpServletRequest)request;
-        String path = httpRequest.getPathInfo();
-        if (path == null) {
-            path = httpRequest.getServletPath();
-        }
-        if (path == null) {
-            path = "/";
-        }
-
-        // Get a request dispatcher for the Servlet mapped to that path
-        RequestDispatcher dispatcher = getRequestDispatcher(path);
-        if (dispatcher != null) {
-
-            // Let the dispatcher forward the request to the Servlet
-            dispatcher.forward(request, response);
-
-        } else {
-
-            // Proceed down the filter chain
-            chain.doFilter(request, response);
-        }
-    }
-
-    public void setDefaultPort(int port) {
-        defaultPort = port;
-    }
-
-    public int getDefaultPort() {
-        return defaultPort;
-    }
-
-    public String getContextPath() {
-        return contextPath;
-    }
-
-    public void setContextPath(String path) {
-        //this.contextPath = path;
-    }
-
-    /**
-     * Initializes the contextPath
-     * The 2.5 Servlet API has a getter for this, for pre 2.5 Servlet
-     * containers use an init parameter.
-     */
-    private static String contextPath(ServletContext context) {
-        String contextPath = "/";
-
-        // The getContextPath() is introduced since Servlet 2.5
-        Method m;
-        try {
-            // Try to get the method anyway since some ServletContext impl has this method even before 2.5
-            m = context.getClass().getMethod("getContextPath", new Class[] {});
-            contextPath = (String)m.invoke(context, new Object[] {});
-        } catch (Exception e) {
-            contextPath = context.getInitParameter("contextPath");
-            if (contextPath == null) {
-                logger.warning("Servlet level is: " + context.getMajorVersion() + "." + context.getMinorVersion());
-                throw new IllegalStateException(
-                                                "'contextPath' init parameter must be set for pre-2.5 servlet container");
-            }
-        }
-
-        logger.info("ContextPath: " + contextPath);
-        return contextPath;
-    }
-
-    /**
-     * Returns the Servlet host extension point used by the given node.
-     *
-     * @return
-     */
-    private static ServletHostExtensionPoint servletHosts(Node node) {
-        //FIXME Need a clean way to get the extension point registry
-        // from the node
-        ExtensionPointRegistry registry;
-        try {
-            registry = (ExtensionPointRegistry)node.getClass().getMethod("getExtensionPointRegistry").invoke(node);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        ServletHostExtensionPoint servletHosts = registry.getExtensionPoint(ServletHostExtensionPoint.class);
-        return servletHosts;
-    }
-
-    /**
-     * Returns a Servlet config wrapping a filter config.
-     *
-     * @param filterConfig
-     * @return
-     */
-    private static ServletConfig servletConfig(final FilterConfig filterConfig) {
-        ServletConfig servletConfig = new ServletConfig() {
-            public String getInitParameter(String name) {
-                return filterConfig.getInitParameter(name);
-            }
-
-            public Enumeration getInitParameterNames() {
-                return filterConfig.getInitParameterNames();
-            }
-
-            public ServletContext getServletContext() {
-                return filterConfig.getServletContext();
-            }
-
-            public String getServletName() {
-                return filterConfig.getFilterName();
-            }
-        };
-        return servletConfig;
-    }
-
-    public void setAttribute(String name, Object value) {
-        // TODO Auto-generated method stub
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca-contrib/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 306b53be5b..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the implementation extension

-org.apache.tuscany.sca.implementation.node.provider.NodeImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.node.NodeImplementation

diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java b/java/sca-contrib/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
deleted file mode 100644
index 579dd5e390..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
+++ /dev/null
@@ -1,60 +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.implementation.node;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Test case for node component implementations.
- * 
- * @version $Rev$ $Date$
- */
-public class NodeImplementationTestCase {
-
-    private Node node;
-    
-    @Before
-    public void setUp() throws Exception {
-        String contribution = ContributionLocationHelper.getContributionLocation(getClass());
-        node = NodeFactory.newInstance().createNode("TestNode.composite", new Contribution("test", contribution));
-        node.start();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (node != null){
-            node.stop();
-        }
-    }
-    
-    @Test
-    public void testNode() {
-        Assert.assertNotNull(node);
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/test/resources/TestComposite.composite b/java/sca-contrib/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
deleted file mode 100644
index b8f6dcceb9..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
+++ /dev/null
@@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-	targetNamespace="http://sample/composite"
-	xmlns:sc="http://sample/composite"
-	name="TestComposite">
-
-    <component name="TestComponent">
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/test/resources/TestNode.composite b/java/sca-contrib/modules/implementation-node-runtime/src/test/resources/TestNode.composite
deleted file mode 100644
index 3e719ef6ab..0000000000
--- a/java/sca-contrib/modules/implementation-node-runtime/src/test/resources/TestNode.composite
+++ /dev/null
@@ -1,30 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-	targetNamespace="http://sample/node"
-	xmlns:sc="http://sample/composite"
-	name="TestNode">
-
-    <component name="TestNode">
-        <tuscany:implementation.node uri="TestNode" composite="sc:TestComposite"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/implementation-node/LICENSE b/java/sca-contrib/modules/implementation-node/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/implementation-node/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/implementation-node/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-node/META-INF/MANIFEST.MF
deleted file mode 100644
index 18dcfedd29..0000000000
--- a/java/sca-contrib/modules/implementation-node/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.implementation.node;uses:="org.

- apache.tuscany.sca.assembly";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.implementation.node.builder.im

- pl;version="2.0.0",org.apache.tuscany.sca.implementation.node.impl;vers

- ion="2.0.0",org.apache.tuscany.sca.implementation.node.xml;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Node Implementation Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397193593

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Node Implementation Model

-Import-Package: javax.xml.namespace,

- javax.xml.parsers,

- javax.xml.stream,

- javax.xml.transform,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.builder;version="2.0.0",

- org.apache.tuscany.sca.assembly.impl;version="2.0.0",

- org.apache.tuscany.sca.contribution;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.definitions;version="2.0.0",

- org.apache.tuscany.sca.implementation.node;version="2.0.0",

- org.apache.tuscany.sca.implementation.node.impl;resolution:=optional,

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0";resolution:=optional

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.node

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca-contrib/modules/implementation-node/NOTICE b/java/sca-contrib/modules/implementation-node/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/implementation-node/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/implementation-node/pom.xml b/java/sca-contrib/modules/implementation-node/pom.xml
deleted file mode 100644
index d26d870994..0000000000
--- a/java/sca-contrib/modules/implementation-node/pom.xml
+++ /dev/null
@@ -1,67 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-implementation-node</artifactId>
-    <name>Apache Tuscany SCA Node Implementation Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java b/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
deleted file mode 100644
index d4755f4071..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
+++ /dev/null
@@ -1,54 +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.implementation.node;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.contribution.Contribution;
-
-
-
-/**
- * The model representing a resource implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-public interface ConfiguredNodeImplementation extends Implementation {
-    
-    /**
-     * Returns the composite deployed to this node.
-     * @return the composite deployed to this node
-     */
-    Composite getComposite();
-    
-    /**
-     * Sets the composite deployed to this node.
-     * @param composite the composite deployed to this node
-     */
-    void setComposite(Composite composite);
-
-    /**
-     * Returns the list of contributions deployed to this node.
-     * @return the list of contributions deployed to this node
-     */
-    List<Contribution> getContributions();
-
-}
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java b/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
deleted file mode 100644
index 527698ea91..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.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.    
- */
-package org.apache.tuscany.sca.implementation.node;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Implementation;
-
-
-
-/**
- * The model representing a resource implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-public interface NodeImplementation extends Implementation {
-    
-    /**
-     * Returns the composite deployed to this node.
-     * @return the composite deployed to this node
-     */
-    Composite getComposite();
-    
-    /**
-     * Sets the composite deployed to this node.
-     * @param composite the composite deployed to this node
-     */
-    void setComposite(Composite composite);
-
-}
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java b/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
deleted file mode 100644
index 9c4fed689b..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
+++ /dev/null
@@ -1,42 +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.implementation.node;
-
-
-/**
- * Factory for the resource implementation model.
- *
- * @version $Rev$ $Date$
- */
-public interface NodeImplementationFactory {
-    
-    /**
-     * Creates a new node implementation.
-     * @return a new node implementation
-     */
-    NodeImplementation createNodeImplementation();
-
-    /**
-     * Creates a new configured node implementation.
-     * @return a new configured node implementation
-     */
-    ConfiguredNodeImplementation createConfiguredNodeImplementation();
-
-}
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java b/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
deleted file mode 100644
index 14046065b5..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
+++ /dev/null
@@ -1,106 +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.implementation.node.builder.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.TransformerFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.definitions.Definitions;
-import org.apache.tuscany.sca.implementation.node.NodeImplementation;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A composite builder that handles the configuration of composites assigned to
- * node components, from the default configuration from the node components.
- *
- * @version $Rev$ $Date$
- */
-public class NodeCompositeBuilderImpl implements CompositeBuilder {
-    
-    private CompositeBuilder bindingConfigurationBuilder;
-    
-    public NodeCompositeBuilderImpl(CompositeBuilderExtensionPoint compositeBuilders, FactoryExtensionPoint factories, InterfaceContractMapper mapper) {
-        bindingConfigurationBuilder = compositeBuilders.getCompositeBuilder("org.apache.tuscany.assembly.builder.CompositeBindingConfigurationBuilder");
-    }
-    
-    @Deprecated
-    public NodeCompositeBuilderImpl(AssemblyFactory assemblyFactory,
-                                    SCABindingFactory scaBindingFactory,
-                                    InterfaceContractMapper interfaceContractMapper,
-                                    CompositeBuilder bindingConfigurationBuilder) {
-        this.bindingConfigurationBuilder = bindingConfigurationBuilder;
-    }
-
-    public NodeCompositeBuilderImpl(AssemblyFactory assemblyFactory,
-                                                  SCABindingFactory scaBindingFactory,
-                                                  DocumentBuilderFactory documentBuilderFactory,
-                                                  TransformerFactory transformerFactory,
-                                                  InterfaceContractMapper interfaceContractMapper,
-                                                  CompositeBuilder bindingConfigurationBuilder) {
-        this.bindingConfigurationBuilder = bindingConfigurationBuilder;
-    }
-
-    public String getID() {
-        return "org.apache.tuscany.sca.implementation.node.builder.NodeCompositeBuilder";
-    }
-
-    public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
-        
-        // Process each node component in the given composite
-        for (Component component: composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof NodeImplementation) {
-                
-                // Get the application composite assigned to the node
-                NodeImplementation nodeImplementation = (NodeImplementation)implementation;
-                Composite applicationComposite = nodeImplementation.getComposite();
-                
-                // Get the default bindings configured on the node
-                List<Binding> defaultBindings = new ArrayList<Binding>();
-                for (ComponentService componentService: component.getServices()) {
-                    defaultBindings.addAll(componentService.getBindings());
-                }
-
-                // Configure services in the application composite assigned to
-                // the node using the default bindings.
-                applicationComposite.getExtensions().add(defaultBindings);
-                bindingConfigurationBuilder.build(applicationComposite, definitions, monitor);
-                applicationComposite.getExtensions().remove(defaultBindings);
-            }
-        }
-        
-    }
-    
-}
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java b/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
deleted file mode 100644
index 706a657654..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
+++ /dev/null
@@ -1,105 +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.implementation.node.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.implementation.node.ConfiguredNodeImplementation;
-
-
-/**
- * The model representing a configured node implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-class ConfiguredNodeImplementationImpl extends ImplementationImpl implements ConfiguredNodeImplementation {
-
-    private String uri;
-    private boolean unresolved;
-    private Composite composite;
-    private List<Contribution> contributions = new ArrayList<Contribution>();
-
-    /**
-     * Constructs a new node implementation.
-     */
-    ConfiguredNodeImplementationImpl() {
-    }
-
-    public ConstrainingType getConstrainingType() {
-        // The node implementation does not support constrainingTypes
-        return null;
-    }
-
-    public List<Property> getProperties() {
-        // The node implementation does not support properties
-        return Collections.emptyList();
-    }
-
-    public List<Service> getServices() {
-        // The node implementation does not support services
-        return Collections.emptyList();
-    }
-    
-    public List<Reference> getReferences() {
-        // The node implementation does not support properties
-        return Collections.emptyList();
-    }
-
-    public String getURI() {
-        return uri;
-    }
-    
-    public Composite getComposite() {
-        return composite;
-    }
-    
-    public List<Contribution> getContributions() {
-        return contributions;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        // The node implementation does not support constrainingTypes
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-    
-    public void setComposite(Composite composite) {
-        this.composite = composite;
-    }
-
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java b/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
deleted file mode 100644
index 94ea610314..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.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 org.apache.tuscany.sca.implementation.node.impl;
-
-import org.apache.tuscany.sca.implementation.node.ConfiguredNodeImplementation;
-import org.apache.tuscany.sca.implementation.node.NodeImplementation;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-
-/**
- * Factory for the resource implementation model.
- *
- * @version $Rev$ $Date$
- */
-public class NodeImplementationFactoryImpl implements NodeImplementationFactory {
-    
-    public NodeImplementationFactoryImpl() {
-    }
-
-    public NodeImplementation createNodeImplementation() {
-        return new NodeImplementationImpl();
-    }
-    
-    public ConfiguredNodeImplementation createConfiguredNodeImplementation() {
-        return new ConfiguredNodeImplementationImpl();
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java b/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
deleted file mode 100644
index daa1e54333..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
+++ /dev/null
@@ -1,98 +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.implementation.node.impl;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
-import org.apache.tuscany.sca.implementation.node.NodeImplementation;
-
-
-/**
- * The model representing a node implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-class NodeImplementationImpl extends ImplementationImpl implements NodeImplementation {
-
-    private String uri;
-    private boolean unresolved;
-    private Composite composite;
-
-    /**
-     * Constructs a new node implementation.
-     */
-    NodeImplementationImpl() {
-    }
-
-    public ConstrainingType getConstrainingType() {
-        // The node implementation does not support constrainingTypes
-        return null;
-    }
-
-    public List<Property> getProperties() {
-        // The node implementation does not support properties
-        return Collections.emptyList();
-    }
-
-    public List<Service> getServices() {
-        // The node implementation does not support services
-        return Collections.emptyList();
-    }
-    
-    public List<Reference> getReferences() {
-        // The node implementation does not support properties
-        return Collections.emptyList();
-    }
-
-    public String getURI() {
-        return uri;
-    }
-    
-    public Composite getComposite() {
-        return composite;
-    }
-    
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        // The node implementation does not support constrainingTypes
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-    
-    public void setComposite(Composite composite) {
-        this.composite = composite;
-    }
-
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java b/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
deleted file mode 100644
index 8ed57a8a0e..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
+++ /dev/null
@@ -1,196 +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.implementation.node.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.implementation.node.ConfiguredNodeImplementation;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-
-/**
- * Implements a StAX artifact processor for configured node implementations.
- *
- * @version $Rev$ $Date$
- */
-public class ConfiguredNodeImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<ConfiguredNodeImplementation> {
-    
-    private static final String ATOM_NS = "http://www.w3.org/2005/Atom";
-    private static final QName FEED_QNAME = new QName(ATOM_NS, "feed");
-    private static final QName ENTRY_QNAME = new QName(ATOM_NS, "entry");
-    private static final QName ID_QNAME = new QName(ATOM_NS, "id");
-    private static final QName LINK_QNAME = new QName(ATOM_NS, "link");
-    private static final String HREF = "href";
-    
-    private ContributionFactory contributionFactory;
-    private AssemblyFactory assemblyFactory;
-    private NodeImplementationFactory implementationFactory;
-    
-    public ConfiguredNodeImplementationProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.implementationFactory = modelFactories.getFactory(NodeImplementationFactory.class);
-    }
-
-    public QName getArtifactType() {
-        return null;
-    }
-
-    public Class<ConfiguredNodeImplementation> getModelType() {
-        // Returns the type of model processed by this processor
-        return ConfiguredNodeImplementation.class;
-    }
-
-    public ConfiguredNodeImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        
-        ConfiguredNodeImplementation implementation = implementationFactory.createConfiguredNodeImplementation();
-        implementation.setUnresolved(true);
-
-        // Read a feed containing links to the composite and the contributions assigned to
-        // the node
-        Composite composite = null;
-        Contribution contribution = null;
-        boolean id = false;
-        QName name = null;
-        
-        while (reader.hasNext()) {
-            int event = reader.getEventType();
-            switch (event) {
-
-                case START_ELEMENT:
-                    name = reader.getName();
-
-                    if (ENTRY_QNAME.equals(name)) {
-
-                        // Read an <entry>
-                        if (implementation.getComposite() == null) {
-                            composite = assemblyFactory.createComposite();
-                        } else {
-                            contribution = contributionFactory.createContribution();
-                        }
-                    } else if (ID_QNAME.equals(name)) {
-                        
-                        // Read an <id>
-                        id = true;
-                        
-                    } else if (LINK_QNAME.equals(name)) {
-
-                        // Read a <link>
-                        String href = getString(reader, HREF);
-                        
-                        if (composite != null) {
-                            composite.setURI(href);
-                        } else if (contribution != null) {
-                            contribution.setLocation(href);
-                        }
-                    }
-                    break;
-
-                case XMLStreamConstants.CHARACTERS:
-                    
-                    // Read characters inside an <id> element
-                    if (id) {
-                        if (contribution != null) {
-                            contribution.setURI(reader.getText());
-                        }
-                    }
-                    break;
-
-                case END_ELEMENT:
-                    name = reader.getName();
-
-                    // Clear current state when reading reaching end element
-                    if (ENTRY_QNAME.equals(name)) {
-                        if (composite != null) {
-                            implementation.setComposite(composite);
-                        } else if (contribution != null) {
-                            implementation.getContributions().add(contribution);
-                        }
-
-                        composite = null;
-                        contribution = null;
-                        
-                    } else if (ID_QNAME.equals(name)) {
-                        id = false;
-                        
-                    } else if (FEED_QNAME.equals(name)) {
-                        
-                        // We've reached the end of the feed
-                        return implementation;
-                    }
-                    break;
-            }
-
-            // Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-        return implementation;
-    }
-
-    public void resolve(ConfiguredNodeImplementation implementation, ModelResolver resolver) throws ContributionResolveException {
-        
-        // Resolve the referenced composite
-        Composite composite = implementation.getComposite();
-        if (composite != null) {
-            composite = resolver.resolveModel(Composite.class, composite);
-            if (!composite.isUnresolved()) {
-                implementation.setComposite(composite);
-            }
-        }
-        
-        // Resolve the referenced contributions
-        List<Contribution> contributions = implementation.getContributions();
-        for (int i = 0, n = contributions.size(); i < n; i++) {
-            Contribution contribution = contributions.get(i);
-            contribution = resolver.resolveModel(Contribution.class, contribution);
-            if (!contribution.isUnresolved()) {
-                contributions.set(i, contribution);
-            }
-        }
-        
-        implementation.setUnresolved(false);
-    }
-
-    public void write(ConfiguredNodeImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        //TODO Write the feed describing the node configuration
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java b/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
deleted file mode 100644
index fc5a85c956..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.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.implementation.node.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.implementation.node.NodeImplementation;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-
-/**
- * Implements a StAX artifact processor for node implementations.
- *
- * @version $Rev$ $Date$
- */
-public class NodeImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<NodeImplementation> {
-    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
-    private static final QName IMPLEMENTATION_NODE = new QName(SCA10_TUSCANY_NS, "implementation.node");
-    
-    private AssemblyFactory assemblyFactory;
-    private NodeImplementationFactory implementationFactory;
-    
-    public NodeImplementationProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.implementationFactory = modelFactories.getFactory(NodeImplementationFactory.class);
-    }
-
-    public QName getArtifactType() {
-        // Returns the QName of the XML element processed by this processor
-        return IMPLEMENTATION_NODE;
-    }
-
-    public Class<NodeImplementation> getModelType() {
-        // Returns the type of model processed by this processor
-        return NodeImplementation.class;
-    }
-
-    public NodeImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        
-        // Read an <implementation.node> element
-        NodeImplementation implementation = implementationFactory.createNodeImplementation();
-        implementation.setUnresolved(false);
-
-        // Read the composite attribute
-        QName qname = getQName(reader, "composite");
-        if (qname != null) {
-            Composite composite = assemblyFactory.createComposite();
-            composite.setName(qname);
-            String uri = getString(reader, "uri");
-            composite.setURI(uri);
-            composite.setUnresolved(true);
-            implementation.setComposite(composite);
-        }
-
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && IMPLEMENTATION_NODE.equals(reader.getName())) {
-                break;
-            }
-        }
-        
-        return implementation;
-    }
-
-    public void resolve(NodeImplementation implementation, ModelResolver resolver) throws ContributionResolveException {
-        // We do not need to resolve the referenced composites here
-        // Nodes and application composites are not in the same composition tree
-    }
-
-    public void write(NodeImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <implementation.node>
-        Composite composite = implementation.getComposite();
-        QName qname;
-        String uri;
-        if (composite != null) {
-            qname = composite.getName();
-            uri = composite.getURI();
-        } else {
-            qname = null;
-            uri = null;
-        }
-        writeStart(writer, IMPLEMENTATION_NODE.getNamespaceURI(), IMPLEMENTATION_NODE.getLocalPart(),
-                                 new XAttr("composite", qname), new XAttr("uri", uri));
-        
-        writeEnd(writer);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder b/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
deleted file mode 100644
index c928916667..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuilderImpl;id=org.apache.tuscany.sca.implementation.node.builder.NodeCompositeBuilder

diff --git a/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 1d93ff3408..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,20 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.node.xml.NodeImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#implementation.node,model=org.apache.tuscany.sca.implementation.node.NodeImplementation,factory=org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
-org.apache.tuscany.sca.implementation.node.xml.ConfiguredNodeImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#implementation.node.configured,model=org.apache.tuscany.sca.implementation.node.ConfiguredNodeImplementation,factory=org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory b/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
deleted file mode 100644
index b8a63a3b16..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for model factory
-org.apache.tuscany.sca.implementation.node.impl.NodeImplementationFactoryImpl
diff --git a/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java b/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
deleted file mode 100644
index c8f1ee81c8..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
+++ /dev/null
@@ -1,608 +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.implementation.node.builder.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.DistributedSCABinding;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.node.NodeImplementation;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-import org.apache.tuscany.sca.implementation.node.impl.NodeImplementationFactoryImpl;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class CalculateBindingURITestCase {
-    private static final Logger logger = Logger.getLogger(CalculateBindingURITestCase.class.getName());
-    private AssemblyFactory assemblyFactory;
-    private SCABindingFactory scaBindingFactory;
-    private NodeImplementationFactory nodeImplementationFactory;
-    private Monitor monitor;
-    private CompositeBuilder bindingConfigurationBuilder;
-    private CompositeBuilder nodeConfigurationBuilder;
-    private List<Binding> defaultBindings = new ArrayList<Binding>();
-
-    @Before
-    public void setUp() throws Exception {
-        assemblyFactory = new DefaultAssemblyFactory();
-        scaBindingFactory = new TestBindingFactory();
-        nodeImplementationFactory = new NodeImplementationFactoryImpl();
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        bindingConfigurationBuilder =
-            extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class)
-                .getCompositeBuilder("org.apache.tuscany.assembly.builder.CompositeBindingConfigurationBuilder");
-        nodeConfigurationBuilder =
-            extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class)
-                .getCompositeBuilder("org.apache.tuscany.sca.implementation.node.builder.NodeCompositeBuilder");
-        Binding defaultBinding = new TestBindingImpl();
-        defaultBinding.setURI("http://myhost:8080/root");
-        defaultBindings.add(defaultBinding);
-    }
-
-    /**
-     * Create a composite containing a node component pointing to the
-     * given application composite.
-     *
-     * @param composite
-     * @return
-     */
-    private Composite nodeComposite(Composite composite) {
-        Composite nodeComposite = assemblyFactory.createComposite();
-        Component nodeComponent = assemblyFactory.createComponent();
-        NodeImplementation nodeImplementation = nodeImplementationFactory.createNodeImplementation();
-        nodeImplementation.setComposite(composite);
-        nodeComponent.setImplementation(nodeImplementation);
-        ComponentService nodeService = assemblyFactory.createComponentService();
-        nodeService.getBindings().addAll(defaultBindings);
-        nodeComponent.getServices().add(nodeService);
-        nodeComposite.getComponents().add(nodeComponent);
-        return nodeComposite;
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        assemblyFactory = null;
-    }
-
-    /**
-     * Test that URI are generated in accordance with the Assembly Specification section 1.7.2.1 as
-     * follows. For the 3 parts that make up the URI;
-     *
-     *   BaseURI / Component URI / Service Binding URI
-     *
-     * Test the following combinations for:
-     *
-     * NB. The short hand here, e.g. <service name="s1"> <binding.sca> <service name="s2"> means
-     * two services appear where the first has the sca binding specified.
-     *
-     * component service bindings
-     *
-     * http://myhost:8080/root  /  <component name="c1">  / <service name="s1"> <binding.sca>
-     * --> http://myhost:8080/root/c1
-     * http://myhost:8080/root  /  <component name="c1">  / <service name="s1"> <binding.sca> <service name="s2">
-     * --> http://myhost:8080/root/c1/s1
-     * http://myhost:8080/root  /  <component name="c1">  / <service name="s1"> <binding.sca name="n"> <service name="s2">
-     * --> http://myhost:8080/root/c1/n
-     * http://myhost:8080/root  /  <component name="c1">  / <service name="s1"> <binding.sca uri="b"> <service name="s2">
-     * --> http://myhost:8080/root/c1/b
-     * http://myhost:8080/root  /  <component name="c1">  / <service name="s1"> <binding.sca uri="http://myhost:8080/b"> <service name="s2">
-     * --> http://myhost:8080/b
-     * http://myhost:8080/root  /  <component name="c1">  / <service name="s1"> <binding.sca uri="../../b"> <service name="s2">
-     * --> http://myhost:8080/b
-     *
-     * top level composite service bindings
-     *
-     * http://myhost:8080/root  /  null  / <service name="s1"> <binding.sca> <service name="s2">
-     * --> http://myhost:8080/root
-     * http://myhost:8080/root  /  null  / <service name="s1"> <binding.sca> <service name="s2">
-     * --> http://myhost:8080/root/s1
-     * http://myhost:8080/root  /  null  / <service name="s1"> <binding.sca name="n"> <service name="s2">
-     * --> http://myhost:8080/root/n
-     * http://myhost:8080/root  /  null  / <service name="s1"> <binding.sca uri="b"> <service name="s2">
-     * --> http://myhost:8080/root/b
-     * http://myhost:8080/root  /  null  / <service name="s1"> <binding.sca uri="http://myhost:8080/b"> <service name="s2">
-     * --> http://myhost:8080/b
-     *
-     * nested composite service bindings
-     *
-     * http://myhost:8080/root  /  <component name="c1"> implemented by composite with <component name="c2"> / <service name="s1"> <binding.sca>
-     * --> http://myhost:8080/root/c1/c2
-     * http://myhost:8080/root  /  <component name="c1"> implemented by composite with <component name="c2"> / <service name="s1"> <binding.sca> <service name="s2">
-     * --> http://myhost:8080/root/c1/c2/s1
-     * http://myhost:8080/root  /  <component name="c1"> implemented by composite with <component name="c2"> / <service name="s1"> <binding.sca name="n"> <service name="s2">
-     * --> http://myhost:8080/root/c1/c2/n
-     * http://myhost:8080/root  /  <component name="c1"> implemented by composite with <component name="c2"> / <service name="s1"> <binding.sca uri="b"> <service name="s2">
-     * --> http://myhost:8080/root/c1/c2/b
-     * http://myhost:8080/root  /  <component name="c1"> implemented by composite with <component name="c2"> / <service name="s1"> <binding.sca uri="http://myhost:8080/b"> <service name="s2">
-     * --> http://myhost:8080/b
-     *
-     * binding name duplication errors
-     *
-     * http://myhost:8080/root  /  <component name="c1"> implemented by composite with <component name="c2"> / <service name="s1"> <binding.sca> <binding.xyz>
-     * --> Error
-     * http://myhost:8080/root  /  <component name="c1"> implemented by composite with <component name="c2"> / <service name="s1"> <binding.sca name="b1"> <binding.xyz name="b1">
-     * --> Error
-     */
-
-    private Composite createComponentServiceBinding() {
-        Composite composite1 = assemblyFactory.createComposite();
-        composite1.setName(new QName("http://foo", "C1"));
-
-        Component c1 = assemblyFactory.createComponent();
-        c1.setName("c1");
-        composite1.getComponents().add(c1);
-
-        ComponentService s1 = assemblyFactory.createComponentService();
-        c1.getServices().add(s1);
-        s1.setName("s1");
-
-        ComponentService s2 = assemblyFactory.createComponentService();
-        c1.getServices().add(s2);
-        s2.setName("s2");
-
-        Binding b1 = new TestBindingImpl();
-        s1.getBindings().add(b1);
-
-        Binding b2 = new TestBindingImpl();
-        s2.getBindings().add(b2);
-
-        return composite1;
-    }
-
-    private Composite createTopLevelCompositeServiceBinding() {
-        Composite composite1 = assemblyFactory.createComposite();
-        composite1.setName(new QName("http://foo", "C1"));
-
-        CompositeService s1 = assemblyFactory.createCompositeService();
-        s1.setName("s1");
-        composite1.getServices().add(s1);
-
-        Binding b1 = new TestBindingImpl();
-        s1.getBindings().add(b1);
-
-        CompositeService s2 = assemblyFactory.createCompositeService();
-        s2.setName("s2");
-        composite1.getServices().add(s2);
-
-        Binding b2 = new TestBindingImpl();
-        s2.getBindings().add(b2);
-
-        return composite1;
-    }
-
-    private Composite createNestCompositeServiceBinding() {
-        Composite composite1 = assemblyFactory.createComposite();
-        composite1.setName(new QName("http://foo", "C1"));
-
-        Component c1 = assemblyFactory.createComponent();
-        c1.setName("c1");
-        composite1.getComponents().add(c1);
-
-        Composite composite2 = assemblyFactory.createComposite();
-        c1.setImplementation(composite2);
-        composite2.setName(new QName("http://foo", "C2"));
-
-        Component c2 = assemblyFactory.createComponent();
-        composite2.getComponents().add(c2);
-        c2.setName("c2");
-
-        ComponentService s1 = assemblyFactory.createComponentService();
-        c2.getServices().add(s1);
-        s1.setName("s1");
-
-        ComponentService s2 = assemblyFactory.createComponentService();
-        c2.getServices().add(s2);
-        s2.setName("s2");
-
-        Binding b1 = new TestBindingImpl();
-        s1.getBindings().add(b1);
-
-        Binding b2 = new TestBindingImpl();
-        s2.getBindings().add(b2);
-
-        return composite1;
-    }
-
-    // component service binding tests
-
-    @Test
-    public void testComponentServiceSingleService() {
-        Composite composite = createComponentServiceBinding();
-        composite.getComponents().get(0).getServices().remove(1);
-        Binding b = composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/root/c1", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    @Test
-    public void testComponentServiceBindingDefault() {
-        Composite composite = createComponentServiceBinding();
-        Binding b = composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/root/c1/s1", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    @Test
-    public void testComponentServiceBindingName() {
-        Composite composite = createComponentServiceBinding();
-        Binding b = composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
-        b.setName("n");
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/root/c1/n", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    @Test
-    public void testComponentServiceBindingURIRelative() {
-        Composite composite = createComponentServiceBinding();
-        Binding b = composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
-        b.setName("n");
-        b.setURI("b");
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/root/c1/b", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    @Test
-    public void testComponentServiceBindingURIAbsolute() {
-        Composite composite = createComponentServiceBinding();
-        Binding b = composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
-        b.setName("n");
-        b.setURI("http://myhost:8080/b");
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/b", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    @Test
-    public void testComponentServiceBindingURIRelative2() {
-        Composite composite = createComponentServiceBinding();
-        Binding b = composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
-        b.setName("n");
-        b.setURI("../../b");
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/b", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    // top level composite service binding tests
-
-    @Test
-    public void testCompositeServiceSingleService() {
-        Composite composite = createTopLevelCompositeServiceBinding();
-        composite.getServices().remove(1);
-        Binding b = composite.getServices().get(0).getBindings().get(0);
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/root", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    @Test
-    public void testCompositeServiceBindingDefault() {
-        Composite composite = createTopLevelCompositeServiceBinding();
-        Binding b = composite.getServices().get(0).getBindings().get(0);
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/root/s1", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    @Test
-    public void testCompositeServiceBindingName() {
-        Composite composite = createTopLevelCompositeServiceBinding();
-        Binding b = composite.getServices().get(0).getBindings().get(0);
-        b.setName("n");
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/root/n", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    @Test
-    public void testCompositeServiceBindingURIRelative() {
-        Composite composite = createTopLevelCompositeServiceBinding();
-        Binding b = composite.getServices().get(0).getBindings().get(0);
-        b.setName("n");
-        b.setURI("b");
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/root/b", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    @Test
-    public void testCompositeServiceBindingURIAbsolute() {
-        Composite composite = createTopLevelCompositeServiceBinding();
-        Binding b = composite.getServices().get(0).getBindings().get(0);
-        b.setName("n");
-        b.setURI("http://myhost:8080/b");
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/b", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    // nested composite service binding tests
-
-    @Test
-    public void testNestedCompositeServiceSingleService() {
-        Composite composite = createNestCompositeServiceBinding();
-        ((Composite)composite.getComponents().get(0).getImplementation()).getComponents().get(0).getServices()
-            .remove(1);
-        Binding b =
-            ((Composite)composite.getComponents().get(0).getImplementation()).getComponents().get(0).getServices()
-                .get(0).getBindings().get(0);
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/root/c1/c2", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    @Test
-    public void testNestedCompositeServiceBindingDefault() {
-        Composite composite = createNestCompositeServiceBinding();
-        Binding b =
-            ((Composite)composite.getComponents().get(0).getImplementation()).getComponents().get(0).getServices()
-                .get(0).getBindings().get(0);
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/root/c1/c2/s1", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    @Test
-    public void testNestedCompositeServiceBindingName() {
-        Composite composite = createNestCompositeServiceBinding();
-        Binding b =
-            ((Composite)composite.getComponents().get(0).getImplementation()).getComponents().get(0).getServices()
-                .get(0).getBindings().get(0);
-        b.setName("n");
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/root/c1/c2/n", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    @Test
-    public void testNestedCompositeServiceBindingURIRelative() {
-        Composite composite = createNestCompositeServiceBinding();
-        Binding b =
-            ((Composite)composite.getComponents().get(0).getImplementation()).getComponents().get(0).getServices()
-                .get(0).getBindings().get(0);
-        b.setName("n");
-        b.setURI("b");
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/root/c1/c2/b", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    @Test
-    public void testNestedCompositeServiceBindingURIAbsolute() {
-        Composite composite = createNestCompositeServiceBinding();
-        Binding b =
-            ((Composite)composite.getComponents().get(0).getImplementation()).getComponents().get(0).getServices()
-                .get(0).getBindings().get(0);
-        b.setName("n");
-        b.setURI("http://myhost:8080/b");
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-
-            assertEquals("http://myhost:8080/b", b.getURI());
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-            fail();
-        }
-    }
-
-    // component service binding name error tests
-
-    //FIXME Need to find a better way to test these error cases as
-    // the composite builder now (intentionally) logs warnings instead of
-    // throwing exceptions
-    public void FIXMEtestComponentServiceBindingNameError1() {
-        Composite composite = createComponentServiceBinding();
-        Binding b1 = composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
-        Binding b2 = new TestBindingImpl();
-        composite.getComponents().get(0).getServices().get(0).getBindings().add(b2);
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-            fail();
-        } catch (Exception ex) {
-            //System.out.println(ex.toString());
-        }
-    }
-
-    //FIXME Need to find a better way to test these error cases as
-    // the composite builder now (intentionally) logs warnings instead of
-    // throwing exceptions
-    public void FIXMEtestComponentServiceBindingNameError2() {
-        Composite composite = createComponentServiceBinding();
-        Binding b1 = composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
-        Binding b2 = new TestBindingImpl();
-        composite.getComponents().get(0).getServices().get(0).getBindings().add(b2);
-
-        b1.setName("b");
-        b2.setName("b");
-
-        try {
-            nodeConfigurationBuilder.build(nodeComposite(composite), null, null);
-            fail();
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-        }
-    }
-
-    public class TestBindingFactory implements SCABindingFactory {
-        public SCABinding createSCABinding() {
-            return new TestBindingImpl();
-        }
-
-        public DistributedSCABinding createDistributedSCABinding() {
-            return null;
-        }
-    }
-
-    public class TestBindingImpl implements SCABinding {
-        private String name;
-        private String uri;
-        private boolean unresolved;
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getURI() {
-            return uri;
-        }
-
-        public void setURI(String uri) {
-            this.uri = uri;
-        }
-
-        public void setUnresolved(boolean unresolved) {
-            this.unresolved = unresolved;
-        }
-
-        public boolean isUnresolved() {
-            return unresolved;
-        }
-
-        @Override
-        public Object clone() throws CloneNotSupportedException {
-            return super.clone();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java b/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
deleted file mode 100644
index 8720d5c607..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
+++ /dev/null
@@ -1,72 +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.implementation.node.xml;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test reading Node implementations.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadTestCase {
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private CompositeBuilder compositeBuilder;
-
-    @Before
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-        
-        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
-
-    }
-
-    @Test
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("TestNode.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-
-        compositeBuilder.build(composite, null, null);
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java b/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
deleted file mode 100644
index de1506ae59..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.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 org.apache.tuscany.sca.implementation.node.xml;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test reading/writing Node implementations.
- * 
- * @version $Rev$ $Date$
- */
-public class WriteTestCase {
-
-    private XMLInputFactory inputFactory;
-    private XMLOutputFactory outputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-
-    @Before
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        outputFactory = XMLOutputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null);
-    }
-
-    @Test
-    public void testReadWriteComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("TestNode.composite");
-        Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(composite);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite b/java/sca-contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
deleted file mode 100644
index b8f6dcceb9..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
+++ /dev/null
@@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-	targetNamespace="http://sample/composite"
-	xmlns:sc="http://sample/composite"
-	name="TestComposite">
-
-    <component name="TestComponent">
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite b/java/sca-contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
deleted file mode 100644
index ef096fe5ae..0000000000
--- a/java/sca-contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
+++ /dev/null
@@ -1,64 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-	targetNamespace="http://sample/node"
-	xmlns:sc="http://sample/composite"
-	name="TestNode">
-
-    <component name="TestNode">
-        <tuscany:implementation.node composite="sc:TestComposite"/>
-       	<service name="Default">
-        	<binding.sca uri="http://localhost:8080"/>
-        </service>
-    </component>
-
-    <component name="TestNode2">
-        <tuscany:implementation.node.configured>
-
-		<feed xmlns="http://www.w3.org/2005/Atom">
-			<title type="text">Feed</title>
-			<entry>
-				<id>composite:store;http://store;store</id>
-				<title type="text">store - http://store;store</title>
-				<content type="text" />
-				<link
-					href="/resolved/composite/composite:store;http://store;store" />
-			</entry>
-			<entry>
-				<id>assets</id>
-				<title type="text">assets</title>
-				<content type="text" />
-				<link
-					href="http://localhost:9990/files/tutorial-assets.jar" />
-			</entry>
-			<entry>
-				<id>store</id>
-				<title type="text">store</title>
-				<content type="text" />
-				<link
-					href="http://localhost:9990/files/tutorial-store.jar" />
-			</entry>
-		</feed>
-
-        </tuscany:implementation.node.configured>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/implementation-osgi/LICENSE b/java/sca-contrib/modules/implementation-osgi/LICENSE
deleted file mode 100644
index 6b0b1270ff..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
diff --git a/java/sca-contrib/modules/implementation-osgi/NOTICE b/java/sca-contrib/modules/implementation-osgi/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/implementation-osgi/pom.xml b/java/sca-contrib/modules/implementation-osgi/pom.xml
deleted file mode 100644
index fbe98efefc..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/pom.xml
+++ /dev/null
@@ -1,145 +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>
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-implementation-osgi</artifactId>
-    <name>Apache Tuscany SCA OSGi Implementation Extension</name>
-
-    <packaging>jar</packaging>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.main</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java b/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
deleted file mode 100644
index 7bcb0a1da5..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.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.    
- */
-package org.apache.tuscany.sca.implementation.osgi;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.Extensible;
-import org.apache.tuscany.sca.assembly.Implementation;
-
-/**
- *
- * The model representing an OSGi implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-public interface OSGiImplementation extends Implementation, Extensible {
-
-    String getBundleSymbolicName();
-
-    String getBundleVersion();
-
-    String[] getImports();
-
-    List<ComponentProperty> getReferenceProperties(String referenceName);
-
-    List<ComponentProperty> getServiceProperties(String serviceName);
-
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java b/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
deleted file mode 100644
index e5a726c8c0..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
+++ /dev/null
@@ -1,325 +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.implementation.osgi.context;
-
-
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.context.RequestContextFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.scope.Scope;
-import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.java.impl.JavaScopeImpl;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.AllowsPassByReferenceProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.BaseJavaClassVisitor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ComponentNameProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ConstructorProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ContextProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ConversationProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.DestroyProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.EagerInitProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.HeuristicPojoProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.InitProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.PolicyProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.PropertyProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ReferenceProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ResourceProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ServiceProcessor;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.osgi.framework.Bundle;
-
-
-/**
- * OSGi annotation processing
- * OSGi bundles are not introspected by OSGiImplementation when a component is created.
- * Instead if the list of implementation classes is specified in <implementation.osgi/>,
- * the classes are introspected when the bundle is resolved. The classes are loaded using
- * the bundle ClassLoader, and hence the delay in annotation processing is inevitable.
- * There is one other difference compared to implementation.java. While instances (and
- * the instance class) are associated with a component in Java, all Java annotations from
- * the component implementation class apply to all the component instances. In OSGi, 
- * instances are associated with services, and a bundle can register multiple services.
- * Hence annotations from classes need to be stored separately so that the right ones
- * can be associated with the service instance.
- *
- * @version $Rev$ $Date$
- */
-public class OSGiAnnotations  {
-    
-    private Scope scope = Scope.COMPOSITE;
-    private boolean isEagerInit;
-    
-    private String[] classList;
-    
-    private Bundle[] bundles;    
-    
-    private RuntimeComponent runtimeComponent;
-    private JavaPropertyValueObjectFactory propertyValueFactory;
-    private ProxyFactory proxyFactory;
-    
-    private JavaImplementationFactory javaImplementationFactory;
-    private JavaInterfaceFactory javaInterfaceFactory; 
-    private PolicyFactory policyFactory;
-    private RequestContextFactory requestContextFactory;
-    
-    private Hashtable<Class<?>, JavaImplementation> javaAnnotationInfo = 
-        new Hashtable<Class<?>, JavaImplementation>();
-    private Hashtable<JavaImplementation, OSGiPropertyInjector> propertyInjectors = 
-        new Hashtable<JavaImplementation, OSGiPropertyInjector>();
-    
-    private long maxAge = -1;
-    private long maxIdleTime = -1;
-    
-    private boolean annotationsProcessed;
-    
-    
-    
-    public OSGiAnnotations(ModelFactoryExtensionPoint modelFactories, 
-            String[] classList,
-            RuntimeComponent runtimeComponent,
-            JavaPropertyValueObjectFactory propertyValueFactory,
-            ProxyFactory proxyFactory,
-            RequestContextFactory requestContextFactory,
-            Bundle mainBundle, 
-            ArrayList<Bundle> dependentBundles) {
-        
-       
-        this.classList = classList;
-        this.runtimeComponent = runtimeComponent;
-        this.propertyValueFactory = propertyValueFactory;
-        this.proxyFactory = proxyFactory;
-        
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.javaInterfaceFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-        this.javaImplementationFactory = createJavaImplementationFactory(assemblyFactory);
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        
-        bundles = new Bundle[dependentBundles.size() + 1];
-        bundles[0] = mainBundle;
-        for (int i = 0; i < dependentBundles.size(); i++)
-            bundles[i + 1] = dependentBundles.get(i);
-        
-    }
-    
-
-    public void processAnnotations() throws IntrospectionException {
-        
-        if (annotationsProcessed)
-            return;
-        annotationsProcessed = true;
-        for (String className : classList) {
-            for (Bundle bundle : bundles) {
-                try {
-                    Class<?> clazz = bundle.loadClass(className);
- 
-                    processAnnotations(clazz);
-                    
-                    break;
-                    
-                } catch (ClassNotFoundException e) {                    
-                }
-            }
-        }
-    }
-    
-    
-    public void injectProperties(Object instance) {
-        JavaImplementation javaImpl = getAnnotationInfo(instance);
-        if (javaImpl != null) {
-            OSGiPropertyInjector injector = propertyInjectors.get(javaImpl);
-            if (injector != null)
-                injector.injectProperties(instance);
-        }
-    }
-
-
-    public Scope getScope() {
-        return scope;
-    }
-    
-   
-
-    public boolean isAllowsPassByReference(Object instance, Method method) {
-        
-        JavaImplementation javaImpl = getAnnotationInfo(instance);
-        if (javaImpl == null) {
-            return false;
-        }
-        if (javaImpl.isAllowsPassByReference()) {
-            return true;
-        }
-        return javaImpl.isAllowsPassByReference(method);
-    }
-    
-    
-    public boolean isEagerInit() {
-        return isEagerInit;
-    }
-
-    public long getMaxAge() {
-        return maxAge;
-    }
-
-    public long getMaxIdleTime() {
-        return maxIdleTime;
-    }
-    
-    public Method getInitMethod(Object instance) {
-        JavaImplementation javaImpl = getAnnotationInfo(instance);
-        return javaImpl == null? null : javaImpl.getInitMethod();
-    }
-    
-
-    public Method getDestroyMethod(Object instance) {
-        JavaImplementation javaImpl = getAnnotationInfo(instance);
-        return javaImpl == null? null : javaImpl.getDestroyMethod();       
-    }
-    
-
-    /*
-     * Get the annotation corresponding to an instance
-     * 
-     */
-    private JavaImplementation getAnnotationInfo(final Object instance) {
-    	
-    	// The simplest case where the implementation class was listed under the
-    	// classes attribute of <implementation.osgi/>, or this is the second call
-    	// to this method for the implementation class.
-        // Allow privileged access to get classloader. Requires getClassLoader in security policy.
-        JavaImplementation javaImpl = AccessController.doPrivileged(new PrivilegedAction<JavaImplementation>() {
-            public JavaImplementation run() {
-                return javaAnnotationInfo.get(instance.getClass());
-            }
-        });
-        if (javaImpl != null)
-            return javaImpl;
-    	
-        // Process annotations from the instance class.
-        try {
-            return processAnnotations(instance.getClass());
-        } catch (IntrospectionException e) {
-            // e.printStackTrace();
-        }
-        
-        return null;
-    }
-    
-
-    private JavaImplementation processAnnotations(Class<?> clazz)
-            throws IntrospectionException {
-
-        JavaImplementation javaImpl = javaImplementationFactory.createJavaImplementation(clazz);
-
-        javaAnnotationInfo.put(clazz, javaImpl);
-
-        OSGiPropertyInjector propertyInjector = new OSGiPropertyInjector(
-                javaImpl, runtimeComponent, propertyValueFactory, proxyFactory, requestContextFactory);
-
-        propertyInjectors.put(javaImpl, propertyInjector);
-
-        if (javaImpl.isEagerInit())
-            isEagerInit = true;
-        if (javaImpl.getMaxAge() != -1)
-            maxAge = javaImpl.getMaxAge();
-        if (javaImpl.getMaxIdleTime() != -1)
-            maxIdleTime = javaImpl.getMaxIdleTime();
-        if (javaImpl.getJavaScope() != JavaScopeImpl.COMPOSITE)
-            scope = new Scope(javaImpl.getJavaScope().getScope());
-        
-        return javaImpl;
-    }
-        
-    
-    
-    
-    private JavaImplementationFactory  createJavaImplementationFactory(AssemblyFactory assemblyFactory) {
-        JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-        
-        // Create the list of class visitors
-        BaseJavaClassVisitor[] extensions =
-            new BaseJavaClassVisitor[] {
-                                        new ConstructorProcessor(assemblyFactory),
-                                        new AllowsPassByReferenceProcessor(assemblyFactory),
-                                        new ComponentNameProcessor(assemblyFactory),
-                                        new ContextProcessor(assemblyFactory),
-                                        new ConversationProcessor(assemblyFactory),
-                                        new DestroyProcessor(assemblyFactory),
-                                        new EagerInitProcessor(assemblyFactory),
-                                        new InitProcessor(assemblyFactory),
-                                        new PropertyProcessor(assemblyFactory),
-                                        new ReferenceProcessor(assemblyFactory, javaInterfaceFactory),
-                                        new ResourceProcessor(assemblyFactory),
-                                        new OSGiScopeProcessor(assemblyFactory),
-                                        new ServiceProcessor(assemblyFactory, javaInterfaceFactory),
-                                        new HeuristicPojoProcessor(assemblyFactory, javaInterfaceFactory),
-                                        new PolicyProcessor(assemblyFactory, policyFactory)};
-        for (JavaClassVisitor extension : extensions) {
-            javaImplementationFactory.addClassVisitor(extension);
-        }
-        
-        return javaImplementationFactory;
-    }
-    
-    private class OSGiScopeProcessor extends BaseJavaClassVisitor {
-        
-        public OSGiScopeProcessor(AssemblyFactory factory) {
-            super(factory);
-        }
-
-        @Override
-        public <T> void visitClass(Class<T> clazz,
-                                   JavaImplementation type)
-            throws IntrospectionException {
-            org.oasisopen.sca.annotation.Scope annotation = clazz.getAnnotation(org.oasisopen.sca.annotation.Scope.class);
-            if (annotation == null) {
-                type.setJavaScope(JavaScopeImpl.COMPOSITE);
-                return;
-            }
-            String name = annotation.value();
-            JavaScopeImpl scope;
-            if ("COMPOSITE".equals(name)) {
-                scope = JavaScopeImpl.COMPOSITE;
-            } else if ("SESSION".equals(name)) {
-                scope = JavaScopeImpl.SESSION;
-            } else if ("CONVERSATION".equals(name)) {
-                scope = JavaScopeImpl.CONVERSATION;
-            } else if ("REQUEST".equals(name)) {
-                scope = JavaScopeImpl.REQUEST;
-            } else {
-                scope = new JavaScopeImpl(name);
-            }
-            type.setJavaScope(scope);
-        }
-    }
-
-    
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java b/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
deleted file mode 100644
index 8eee337638..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
+++ /dev/null
@@ -1,293 +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.implementation.osgi.context;
-
-
-import java.lang.annotation.ElementType;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.context.RequestContextFactory;
-import org.apache.tuscany.sca.core.context.RequestContextImpl;
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.core.invocation.CallbackWireObjectFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl;
-import org.apache.tuscany.sca.implementation.java.injection.ArrayMultiplicityObjectFactory;
-import org.apache.tuscany.sca.implementation.java.injection.ConversationIDObjectFactory;
-import org.apache.tuscany.sca.implementation.java.injection.FieldInjector;
-import org.apache.tuscany.sca.implementation.java.injection.Injector;
-import org.apache.tuscany.sca.implementation.java.injection.InvalidAccessorException;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.implementation.java.injection.ListMultiplicityObjectFactory;
-import org.apache.tuscany.sca.implementation.java.injection.MethodInjector;
-import org.apache.tuscany.sca.implementation.java.injection.ResourceObjectFactory;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.annotation.ConversationID;
-
-
-/**
- * OSGi property injection support
- *
- * @version $Rev$ $Date$
- */
-public class OSGiPropertyInjector {
-    
-    
-    private ArrayList<JavaElementImpl> injectionSites = new ArrayList<JavaElementImpl>();
-    private Hashtable<JavaElementImpl, ObjectFactory> factories = 
-        new Hashtable<JavaElementImpl, ObjectFactory>();
-    
-    private Injector[] injectors;
-    
-    public OSGiPropertyInjector(
-            JavaImplementation javaImpl,
-            RuntimeComponent component,
-            JavaPropertyValueObjectFactory propertyValueFactory,
-            ProxyFactory proxyFactory,
-            RequestContextFactory requestContextFactory) throws IntrospectionException {
-          
-        createInjectionSites(javaImpl, component, propertyValueFactory, proxyFactory, requestContextFactory);
-           
-        injectors = createInjectors();
-      
-    }
-
-    
-    @SuppressWarnings("unchecked")
-    public void injectProperties(Object instance) {
-        
-        for (Injector injector : injectors) {
-            injector.inject(instance);
-        }            
-
-    }
-    
-  
-    @SuppressWarnings("unchecked")
-    private void createInjectionSites(
-            JavaImplementation javaImpl,
-            RuntimeComponent component,
-            JavaPropertyValueObjectFactory propertyValueFactory,
-            ProxyFactory proxyFactory,
-            RequestContextFactory requestContextFactory) 
-    {
-
-        List<ComponentProperty> componentProperties = component.getProperties();
-        Map<String, JavaElementImpl> propertyMembers = javaImpl.getPropertyMembers();
-        
-        for (ComponentProperty prop : componentProperties) {
-            JavaElementImpl element = propertyMembers.get(prop.getName());
-            
-            if (element != null && !(element.getAnchor() instanceof Constructor) && prop.getValue() != null) {
-                Class propertyJavaType = JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType());
-                ObjectFactory objFactory = propertyValueFactory.createValueFactory(prop, prop.getValue(), propertyJavaType);
-                    
-                factories.put(element, objFactory);
-                injectionSites.add(element);
-            }  
-        }
-        
-        for (Member member : javaImpl.getConversationIDMembers()) {
-            ObjectFactory<String> factory = new ConversationIDObjectFactory();
-            if (member instanceof Field) {
-                JavaElementImpl element = new JavaElementImpl((Field) member);
-                element.setClassifer(ConversationID.class);
-                injectionSites.add(element);
-                factories.put(element, factory);
-            } else if (member instanceof Method) {
-                JavaElementImpl element = new JavaElementImpl((Method) member, 0);
-                element.setName(JavaIntrospectionHelper.toPropertyName(member.getName()));
-                element.setClassifer(ConversationID.class);
-                injectionSites.add(element);
-                factories.put(element, factory);
-            } else {
-                throw new InvalidAccessorException(
-                        "Member must be a field or method: " + member.getName());
-            }
-
-        }
-        
-        if (!javaImpl.getCallbackMembers().isEmpty()) {
-            Map<String, List<RuntimeWire>> callbackWires = new HashMap<String, List<RuntimeWire>>();
-            for (ComponentService service : component.getServices()) {
-
-                RuntimeComponentReference callbackReference = (RuntimeComponentReference)service.getCallbackReference();
-                if (callbackReference != null) {
-                    List<RuntimeWire> wires = callbackReference.getRuntimeWires();
-                    if (!wires.isEmpty()) {
-                        callbackWires.put(wires.get(0).getSource().getInterfaceContract().getInterface().toString(), wires);
-                    }
-                }
-            }
-
-            for (Map.Entry<String, Collection<JavaElementImpl>> entry : javaImpl.getCallbackMembers()
-                .entrySet()) {
-                List<RuntimeWire> wires = callbackWires.get(entry.getKey());
-                if (wires == null) {
-                    // this can happen when there are no client wires to a
-                    // component that has a callback
-                    continue;
-                }
-                for(JavaElementImpl element : entry.getValue()) {
-                    ObjectFactory<?> factory = new CallbackWireObjectFactory(element.getType(), proxyFactory, wires);
-                    if (!(element.getAnchor() instanceof Constructor)) {
-                        injectionSites.add(element);
-                    }
-                    factories.put(element, factory);
-                }
-            }
-        }
-        
-        for (JavaResourceImpl resource : javaImpl.getResources().values()) {
-            
-            ObjectFactory<?> objectFactory;
-            Class<?> type = resource.getElement().getType();
-            if (ComponentContext.class.equals(type)) {
-                objectFactory = new ComponentContextFactory(component);
-                
-            } else if (RequestContext.class.equals(type)) {
-                objectFactory = new RequestContextObjectFactory(requestContextFactory, proxyFactory);
-               
-            } else {
-                boolean optional = resource.isOptional();
-                String mappedName = resource.getMappedName();
-                objectFactory = new ResourceObjectFactory(type, mappedName, optional, null);
-            }
-            factories.put(resource.getElement(), objectFactory);
-            if (!(resource.getElement().getAnchor() instanceof Constructor)) {
-                injectionSites.add(resource.getElement());
-            }
-        }
-        
-        
-    }
-    
-
-    @SuppressWarnings("unchecked")
-    private Injector[] createInjectors() {
-        
-        Injector[] injectors = (Injector[])new Injector[injectionSites.size()];
-
-        int i = 0;
-        for (JavaElementImpl element : injectionSites) {
-            Object obj = factories.get(element);
-            if (obj != null) {
-                if (obj instanceof ObjectFactory) {
-                    ObjectFactory<?> factory = (ObjectFactory<?>)obj;
-                    Member member = (Member)element.getAnchor();
-                    if (element.getElementType() == ElementType.FIELD) {
-                        injectors[i++] = new FieldInjector((Field)member, factory);
-                    } else if (element.getElementType() == ElementType.PARAMETER && member instanceof Method) {
-                        injectors[i++] = new MethodInjector((Method)member, factory);
-                    } else if (member instanceof Constructor) {
-                        // Ignore
-                    } else {
-                        throw new AssertionError(String.valueOf(element));
-                    }
-                } else {
-                    injectors[i++] = createMultiplicityInjector(element, (List<ObjectFactory<?>>)obj);
-                }
-            }
-        }
-        return injectors;
-    }
-    
-    @SuppressWarnings("unchecked")
-    protected Injector createMultiplicityInjector(JavaElementImpl element, List<ObjectFactory<?>> factories) {
-        Class<?> interfaceType = JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType());
-
-        if (element.getAnchor() instanceof Field) {
-            Field field = (Field)element.getAnchor();
-            if (field.getType().isArray()) {
-                return new FieldInjector(field, new ArrayMultiplicityObjectFactory(interfaceType, factories));
-            } else {
-                return new FieldInjector(field, new ListMultiplicityObjectFactory(factories));
-            }
-        } else if (element.getAnchor() instanceof Method) {
-            Method method = (Method)element.getAnchor();
-            if (method.getParameterTypes()[0].isArray()) {
-                return new MethodInjector(method, new ArrayMultiplicityObjectFactory(interfaceType, factories));
-            } else {
-                return new MethodInjector(method, new ListMultiplicityObjectFactory(factories));
-            }
-        } else {
-            throw new InvalidAccessorException("Member must be a field or method: " + element.getName());
-        }
-    }
-
-    private static class ComponentContextFactory implements ObjectFactory {
-        
-        RuntimeComponent component;
-        
-        private ComponentContextFactory(RuntimeComponent component) {
-            this.component = component;
-        }
-
-        public Object getInstance() throws ObjectCreationException {
-            return component.getComponentContext();
-        }
-        
-    }
-    
-
-    private static class RequestContextObjectFactory implements ObjectFactory {
-        
-        private RequestContextFactory factory;
-        private ProxyFactory proxyFactory;
-
-        public RequestContextObjectFactory(RequestContextFactory factory) {
-            this(factory, null);
-        }
-
-        public RequestContextObjectFactory(RequestContextFactory factory, ProxyFactory proxyFactory) {
-            this.factory = factory;
-            this.proxyFactory = proxyFactory;
-        }
-
-        public RequestContext getInstance() throws ObjectCreationException {
-            if (factory != null) {
-                return factory.createRequestContext();
-            } else {
-                return new RequestContextImpl(proxyFactory);
-            }
-        }
-        
-    }
-    
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java b/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
deleted file mode 100644
index 38befa611b..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
+++ /dev/null
@@ -1,226 +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.implementation.osgi.context;
-
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
-import org.apache.tuscany.sca.databinding.xml.DOMDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * 
- * Process properties and create property values.
- * 
- * This code has been copied from the Java implementation to avoid dependencies on the Java implementation.
- *
- * @version $Rev$ $Date$
- */
-public class OSGiPropertyValueObjectFactory {
-    protected SimpleTypeMapper simpleTypeMapper = new SimpleTypeMapperImpl();
-    boolean isSimpleType;
-    
-    
-    public OSGiPropertyValueObjectFactory() {
-    }
-    
-    public OSGiPropertyValueObjectFactory(Mediator mediator) {
-    }
-    
-    public ObjectFactory createValueFactory(Property property, Object propertyValue) {
-        
-        Class javaType = SimpleTypeMapperImpl.getJavaType(property.getXSDType());
-        isSimpleType = isSimpleType(property);
-        Document doc = (Document)propertyValue;
-        Element rootElement = doc.getDocumentElement();
-        if (property.isMany()) {
-            if (isSimpleType) {
-                String value = "";
-                if (rootElement.getChildNodes().getLength() > 0) {
-                    value = rootElement.getChildNodes().item(0).getTextContent();
-                }
-                List<String> values = 
-                    getSimplePropertyValues(value, javaType);
-                return new ListObjectFactoryImpl(property, 
-                                                 values,
-                                                 isSimpleType,
-                                                 javaType);
-            } else {
-                return new ListObjectFactoryImpl(property,
-                                                 getComplexPropertyValues(doc),
-                                                 isSimpleType,
-                                                 javaType);
-            }
-        } else {
-            if (isSimpleType) {
-                String value = "";
-                if (rootElement.getChildNodes().getLength() > 0) {
-                    value = rootElement.getChildNodes().item(0).getTextContent();
-                }
-                return new ObjectFactoryImpl(property,
-                                             value,
-                                             isSimpleType,
-                                             javaType);
-            } else {
-                Object value = getComplexPropertyValues(doc).get(0);
-                return new ObjectFactoryImpl(property,
-                                             value,
-                                             isSimpleType,
-                                             javaType);
-            }
-            
-        }
-    }
-    
-    private boolean isSimpleType(Property property) {
-        if (property.getXSDType() != null) {
-            return SimpleTypeMapperImpl.isSimpleXSDType(property.getXSDType());
-        } else {
-            if (property instanceof Document) {
-                Document doc = (Document)property;
-                Element element = doc.getDocumentElement(); 
-                if (element.getChildNodes().getLength() == 1 && 
-                    element.getChildNodes().item(0).getNodeType() == Node.TEXT_NODE) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    
-    private List<String> getSimplePropertyValues(String concatenatedValue, Class javaType) {
-        List<String> propValues = new ArrayList<String>();
-        StringTokenizer st = null;
-        if ( javaType.getName().equals("java.lang.String")) {
-            st = new StringTokenizer(concatenatedValue, "\"");
-        } else {
-            st = new StringTokenizer(concatenatedValue);
-        }
-        String aToken = null;
-        while (st.hasMoreTokens()) {
-            aToken = st.nextToken();
-            if (aToken.trim().length() > 0) {
-                propValues.add(aToken);
-            }
-        }
-        return propValues;
-    }
-    
-    private List<Node> getComplexPropertyValues(Document document) {
-        Element rootElement = document.getDocumentElement();
-        List<Node> propValues = new ArrayList<Node>();
-        for (int count = 0 ; count < rootElement.getChildNodes().getLength() ; ++count) {
-            if (rootElement.getChildNodes().item(count).getNodeType() == Node.ELEMENT_NODE) {
-                propValues.add(rootElement.getChildNodes().item(count));
-            }
-        }
-        return propValues;
-    }
-    
-    public abstract class ObjectFactoryImplBase  implements ObjectFactory {
-        protected SimpleTypeMapper simpleTypeMapper = new SimpleTypeMapperImpl();
-        protected Property property;
-        protected Object propertyValue;
-        protected Class javaType;
-        protected DataType<XMLType> sourceDataType;
-        protected DataType<?> targetDataType;
-        boolean isSimpleType;
-
-        public ObjectFactoryImplBase(Property property, Object propertyValue, boolean isSimpleType, Class javaType)  {
-            this.isSimpleType = isSimpleType;
-            this.property = property;
-            this.propertyValue = propertyValue;
-            this.javaType = javaType;
-            sourceDataType =
-                new DataTypeImpl<XMLType>(DOMDataBinding.NAME, Node.class, 
-                    new XMLType(null, this.property.getXSDType()));
-            TypeInfo typeInfo = null;
-            if (this.property.getXSDType() != null) {
-                if (SimpleTypeMapperImpl.isSimpleXSDType(this.property.getXSDType())) {
-                    typeInfo = new TypeInfo(property.getXSDType(), true, null);
-                } else {
-                    typeInfo = new TypeInfo(property.getXSDType(), false, null);
-                }
-            } else {
-                typeInfo = new TypeInfo(property.getXSDType(), false, null);
-            }
-
-            XMLType xmlType = new XMLType(typeInfo);
-            String dataBinding = null; //(String)property.getExtensions().get(DataBinding.class.getName());
-            if (dataBinding != null) {
-                targetDataType = new DataTypeImpl<XMLType>(dataBinding, javaType, xmlType);
-            } else {
-                targetDataType = new DataTypeImpl<XMLType>(dataBinding, javaType, xmlType);
-            }
-        }
-    }
-    
-    public class ObjectFactoryImpl extends ObjectFactoryImplBase {
-        public ObjectFactoryImpl(Property property, Object propertyValue, boolean isSimpleType, Class javaType) {
-            super(property, propertyValue, isSimpleType, javaType);
-        }
-
-        @SuppressWarnings("unchecked")
-        public Object getInstance() throws ObjectCreationException {
-            if (isSimpleType) {
-                return simpleTypeMapper.toJavaObject(property.getXSDType(), (String)propertyValue, null);
-            } else {
-                return null;
-            }
-        }
-    }
-
-    public class ListObjectFactoryImpl extends ObjectFactoryImplBase  {
-        public ListObjectFactoryImpl(Property property, List<?>propertyValues, boolean isSimpleType, Class javaType) {
-            super(property, propertyValues, isSimpleType, javaType);
-        }
-
-        @SuppressWarnings("unchecked")
-        public List<?> getInstance() throws ObjectCreationException {
-            if (isSimpleType) {
-                List<Object> values = new ArrayList<Object>();
-                for (String aValue : (List<String>)propertyValue) {
-                    values.add(simpleTypeMapper.toJavaObject(property.getXSDType(), aValue, null));
-                }
-                return values;
-            } else {
-                List instances = new ArrayList();
-                for (Node aValue : (List<Node>)propertyValue) {
-                    instances.add(aValue);
-                }
-                return instances;
-            }
-        }
-    }
-}
-      
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java b/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
deleted file mode 100644
index fe3efd22cd..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
+++ /dev/null
@@ -1,168 +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.implementation.osgi.impl;
-
-
-import java.util.Hashtable;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation;
-
-
-/**
- * OSGi implementation 
- *    All attributes from <implementation.osgi> have getters in this class
- * This class implements OSGiImplementationInterface which is associated with OSGiImplementationProvider.
- *
- * @version $Rev$ $Date$
- */
-public class OSGiImplementationImpl extends ImplementationImpl implements OSGiImplementation {
-    
-    private String bundleSymbolicName;
-    private String bundleVersion;
-    
-    private String[] imports;
-    private Hashtable<String, List<ComponentProperty>> referenceProperties;
-    private Hashtable<String, List<ComponentProperty>> serviceProperties;
-
-    private Hashtable<String, List<ComponentProperty>> referenceCallbackProperties;
-    private Hashtable<String, List<ComponentProperty>> serviceCallbackProperties;
-    
-    private String[] classList;
-    
-    private ModelFactoryExtensionPoint modelFactories;
-    
-    private Object osgiBundle;
-    
-    public OSGiImplementationImpl(
-            ModelFactoryExtensionPoint modelFactories,
-            String bundleSymbolicName,
-            String bundleVersion,
-            String[] imports,
-            String[] classList,
-            Hashtable<String, List<ComponentProperty>> refProperties,
-            Hashtable<String, List<ComponentProperty>> serviceProperties) {
-        
-        super();
-        this.bundleSymbolicName = bundleSymbolicName;
-        this.bundleVersion = bundleVersion;
-        this.imports = imports;
-        this.referenceProperties = refProperties;
-        this.serviceProperties = serviceProperties;
-        this.classList = classList;
-        this.modelFactories = modelFactories;
-    }
-
-    public void setCallbackProperties(Hashtable<String, List<ComponentProperty>> refCallbackProperties, 
-            Hashtable<String, List<ComponentProperty>> serviceCallbackProperties) {
-        
-        this.referenceCallbackProperties = refCallbackProperties;
-        this.serviceCallbackProperties = serviceCallbackProperties;
-        
-    }
-    
-   
-    public String getBundleSymbolicName() {
-        return bundleSymbolicName;
-    }
-
-    public String getBundleVersion() {
-        return bundleVersion;
-    }
-
-    public String[] getImports() {
-        return imports;
-    }
-    
-    public String[] getClassList() {
-        return classList;
-    }
-    
-    public ModelFactoryExtensionPoint getModelFactories() {
-        return modelFactories;
-    }
-    
-    public List<ComponentProperty> getReferenceProperties(String referenceName) {
-        return referenceProperties.get(referenceName);
-    }
-    
-    public List<ComponentProperty> getServiceProperties(String serviceName) {
-        return serviceProperties.get(serviceName);
-    }
-    
-    public List<ComponentProperty> getReferenceCallbackProperties(String referenceName) {
-        return referenceCallbackProperties.get(referenceName);
-    }
-    
-    public List<ComponentProperty> getServiceCallbackProperties(String serviceName) {
-        return serviceCallbackProperties.get(serviceName);
-    }
-
-    /**
-     * Since OSGi implementation annotations may not be processed until much later, leave it to
-     * the OSGi invoker to decide whether pass-by-reference is allowed.
-     * @return
-     */
-    public boolean isAllowsPassByReference() {
-        return true;
-    }
-    
-    public Object getOSGiBundle() {
-        return osgiBundle;
-    }
-
-    public void setOSGiBundle(Object osgiBundle) {
-        this.osgiBundle = osgiBundle;
-    }
-
-    private boolean areEqual(Object obj1, Object obj2) {
-        if (obj1 == obj2)
-            return true;
-        if (obj1 == null || obj2 == null)
-            return false;
-        return obj1.equals(obj2);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        
-        if (!(obj instanceof OSGiImplementationImpl))
-            return super.equals(obj);
-        OSGiImplementationImpl impl = (OSGiImplementationImpl)obj;
-        if (!areEqual(bundleSymbolicName, impl.bundleSymbolicName))
-            return false;
-        if (!areEqual(bundleVersion, impl.bundleVersion))
-            return false;
-        if (!areEqual(serviceProperties, impl.serviceProperties))
-            return false;
-        if (!areEqual(serviceCallbackProperties, impl.serviceCallbackProperties))
-            return false;
-        if (!areEqual(referenceProperties, impl.referenceProperties))            
-            return false;
-        if (!areEqual(referenceCallbackProperties, impl.referenceCallbackProperties))            
-                return false;
-        return super.equals(obj);
-    }
-    
-
-    
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java b/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
deleted file mode 100644
index 5664c77618..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
+++ /dev/null
@@ -1,1254 +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.implementation.osgi.runtime;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.context.RequestContextFactory;
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.core.invocation.JDKProxyFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.scope.Scope;
-import org.apache.tuscany.sca.core.scope.ScopeContainer;
-import org.apache.tuscany.sca.core.scope.ScopeRegistry;
-import org.apache.tuscany.sca.core.scope.ScopedImplementationProvider;
-import org.apache.tuscany.sca.core.scope.ScopedRuntimeComponent;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation;
-import org.apache.tuscany.sca.implementation.osgi.context.OSGiAnnotations;
-import org.apache.tuscany.sca.implementation.osgi.impl.OSGiImplementationImpl;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleEvent;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.BundleListener;
-import org.osgi.framework.Constants;
-import org.osgi.framework.FrameworkEvent;
-import org.osgi.framework.FrameworkListener;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.service.packageadmin.ExportedPackage;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-/**
- * The runtime instantiation of OSGi component implementations
- *
- * @version $Rev$ $Date$
- */
-public class OSGiImplementationProvider  implements ScopedImplementationProvider, 
-                                                    FrameworkListener,
-                                                    BundleListener {
-    
-    private static final String COMPONENT_SERVICE_NAME = "component.service.name";
-    
-    // Maximum milliseconds to wait for a method to complete
-    private static final long METHOD_TIMEOUT_MILLIS = 60000; 
-    // Maximum milliseconds to wait for services to be registered into OSGi service registry
-    private static final long SERVICE_TIMEOUT_MILLIS = 300000; 
-  
-    private OSGiImplementationImpl implementation;
-    private OSGiAnnotations osgiAnnotations;
-    private BundleContext bundleContext;
-    
-    private Hashtable<RuntimeWire, Reference> referenceWires = new Hashtable<RuntimeWire,Reference>();
-    private Hashtable<RuntimeWire, ComponentReference> componentReferenceWires 
-                       = new Hashtable<RuntimeWire,ComponentReference>();
-    private HashSet<RuntimeWire> resolvedWires = new HashSet<RuntimeWire>();   
-    private boolean wiresResolved;
-        
-    private AtomicInteger startBundleEntryCount = new AtomicInteger();     
-    private AtomicInteger processAnnotationsEntryCount = new AtomicInteger();
-    
-    private JavaPropertyValueObjectFactory propertyValueFactory;
-    
-
-    private Hashtable<String, Object> componentProperties = new Hashtable<String, Object>();
-    private RuntimeComponent runtimeComponent;
-    
-    private Bundle osgiBundle;
-    private ArrayList<Bundle> dependentBundles = new ArrayList<Bundle>();
-    private OSGiServiceListener osgiServiceListener;
-    private PackageAdmin packageAdmin;
-    
-    private OSGiRuntime osgiRuntime;
-    
-    private ScopeRegistry scopeRegistry;
-    private DataBindingExtensionPoint dataBindingRegistry;
-    
-    private boolean packagesRefreshed;
-    
-    private MessageFactory messageFactory;
-    private InterfaceContractMapper mapper;
-    
-
-    public OSGiImplementationProvider(RuntimeComponent definition,
-            OSGiImplementation impl,
-            DataBindingExtensionPoint dataBindingRegistry,
-            JavaPropertyValueObjectFactory propertyValueFactory,
-            ProxyFactory proxyFactory,
-            ScopeRegistry scopeRegistry,
-            RequestContextFactory requestContextFactory,
-            MessageFactory messageFactory,
-            InterfaceContractMapper mapper) throws BundleException {
-        
-        
-        this.implementation = (OSGiImplementationImpl)impl;
-        this.runtimeComponent = definition;
-        this.dataBindingRegistry = dataBindingRegistry;
-        this.propertyValueFactory = propertyValueFactory;
-        this.scopeRegistry = scopeRegistry;
-        this.messageFactory = messageFactory;
-        this.mapper = mapper;
-        
-        bundleContext = getBundleContext();
-        osgiBundle = (Bundle)implementation.getOSGiBundle();
-        bundleContext.addBundleListener(this);
-        osgiServiceListener = new OSGiServiceListener(osgiBundle);        
-        bundleContext.addServiceListener(osgiServiceListener);    
-        
-        // Install and start all dependent  bundles
-        String[] imports = implementation.getImports();
-        for (int i = 0; i < imports.length; i++) {
-            String location = imports[i].trim();
-            if (location.length() > 0) {
-                Bundle bundle = bundleContext.installBundle(location);
-                dependentBundles.add(bundle);
-            }                
-        }
-        
-
-        this.osgiAnnotations = new OSGiAnnotations(
-                implementation.getModelFactories(),
-                implementation.getClassList(),
-                runtimeComponent,
-                propertyValueFactory,
-                proxyFactory,
-                requestContextFactory,
-                osgiBundle,
-                dependentBundles);
-
-        
-        // PackageAdmin is used to resolve bundles 
-        org.osgi.framework.ServiceReference packageAdminReference = 
-            bundleContext.getServiceReference("org.osgi.service.packageadmin.PackageAdmin");
-        if (packageAdminReference != null) {
-            packageAdmin = (PackageAdmin) bundleContext.getService(packageAdminReference);
-            bundleContext.addFrameworkListener(this);
-        }
-        
-        
-    }
-    
-    protected RuntimeComponent getRuntimeComponent() {
-        return runtimeComponent;
-    }
-    
-    protected OSGiImplementationImpl getImplementation() {
-        return implementation;
-    }
-    
-    // Create a property table from the list of properties 
-    // The source properties are properties read from <property/> elements
-    // Create property values in the table of the appropriate class based 
-    // on the property type specified.
-    private void processProperties(List<?> props, Hashtable<String, Object> propsTable) {
-        
-        if (props != null) {
-            for (Object p : props) {
-             
-                Property prop = (Property)p;
-                Class javaType = SimpleTypeMapperImpl.getJavaType(prop.getXSDType());
-                ObjectFactory<?> objFactory = propertyValueFactory.createValueFactory(prop, prop.getValue(), javaType);
-                Object value = objFactory.getInstance();          
-
-                propsTable.put(prop.getName(), value);
-            }
-        }
-    }
-
-   
-    private BundleContext getBundleContext() throws BundleException {
-
-        try {
-            if (bundleContext == null) {
-                osgiRuntime = OSGiRuntime.getRuntime();
-                bundleContext = osgiRuntime .getBundleContext();       
-            }
-        } catch (BundleException e) {
-           throw e;
-        } catch (Exception e) {
-            throw new BundleException("Could not start OSGi runtime", e);
-        }
-        
-        
-        return bundleContext;
-    }
-    
-    
-    private String getOSGiFilter(Hashtable<String, Object> props) {
-        
-        String filter = "";
-        
-        if (props != null && props.size() > 0) {
-            int propCount = 0;
-            for (String propName : props.keySet()) {
-                if (propName.equals("service.pid"))
-                    continue;
-                filter = filter + "(" + propName + "=" + props.get(propName)  + ")";
-                propCount++;
-            }
-    
-            if (propCount > 1) filter = "(&" + filter + ")";
-        }
-        else
-            filter = null;
-        return filter;
-    }
-    
-    /*
-     * Return a matching service registered by the specified bundle.
-     * If <implementation.osgi /> has the attribute filter defined, return a service
-     * reference that matches the filter. Otherwise, return a service which has a component
-     * name equal to this component's name. If not found, return a service which no
-     * component name set.
-     * 
-     * Even though services registered by this bundle can be filtered using the
-     * service listener, we use this method to filter all service references so that 
-     * the service matching functionality of OSGi can be directly used.
-     */
-    private org.osgi.framework.ServiceReference getOSGiServiceReference( 
-            String scaServiceName,
-            String osgiServiceName, String filter) 
-        throws InvalidSyntaxException {
-        
-        String compServiceName = runtimeComponent.getName() + "/" + scaServiceName;
-        if (filter != null && filter.length() > 0) {
-           org.osgi.framework.ServiceReference[] references = 
-                   bundleContext.getServiceReferences(osgiServiceName, filter);
-           
-
-           org.osgi.framework.ServiceReference reference = null;
-           if (references != null) {
-                for (org.osgi.framework.ServiceReference ref : references) {
-                    if (ref.getBundle() != osgiBundle)
-                        continue;
-                    Object compName = ref.getProperty(COMPONENT_SERVICE_NAME);
-                    if (compName == null && reference == null)
-                        reference = ref;
-                    if (scaServiceName == null || compServiceName.equals(compName)) {
-                        reference = ref;
-                        break;
-                    }
-                }
-           }
-        
-           return reference;
-           
-        }
-        
-        filter = scaServiceName == null? null : 
-                                         "(" + COMPONENT_SERVICE_NAME + "="+ compServiceName + ")";
-        
-        org.osgi.framework.ServiceReference[] references = 
-            bundleContext.getServiceReferences(osgiServiceName, filter);
-        
-        if (references != null) {            
-            for (org.osgi.framework.ServiceReference ref : references) {
-                if (ref.getBundle() == osgiBundle) {
-                    return ref;
-               }
-             }
-        }
-        
-        references = bundleContext.getServiceReferences(osgiServiceName, null);
-        
-        org.osgi.framework.ServiceReference reference = null;
-        
-        if (references != null) {
-            for (org.osgi.framework.ServiceReference ref : references) {
-                
-                if (ref.getBundle() != osgiBundle)
-                    continue;
-                Object compName = ref.getProperty(COMPONENT_SERVICE_NAME);
-                if (compName == null && reference == null)
-                    reference = ref;
-                if (compServiceName.equals(compName)) {
-                    reference = ref;
-                    break;
-                }
-            }
-        }
-        
-        return reference;
-    }
-    
-    /**
-     * This method is used to avoid full synchronization of methods which should
-     * be executed only once. 
-     * 
-     * entryCount=0: The count is incremented, and this thread executes the method. Returns true.
-     * 
-     * entryCount=1: Another thread is already executing this method. 
-     *               Wait for the thread to complete if doWait is true. Returns false. 
-     * 
-     * entryCount=2: The method has already been executed. Returns false.
-     * 
-     * @param doWait     If true, and another method is executing this method
-     *                   wait for method execution to complete
-     * @param entryCount Atomic integer used to ensure that the method is
-     *                   executed only once
-     * @return true if this thread has exclusive access to execute this method
-     */
-    private boolean enterMethod(boolean doWait, AtomicInteger entryCount) {
-        
-        if (entryCount.compareAndSet(0, 1)) {
-            return true;
-        }
-        else {
-            if (doWait) {
-                synchronized (entryCount) {
-                    if (entryCount.get() != 2) {
-                        try {
-                            entryCount.wait(METHOD_TIMEOUT_MILLIS);
-                        } catch (InterruptedException e) {
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-    }
-    
-    /**
-     * Called on method exit of methods which were entered after 
-     * enterMethod returned true. Increments entryCount, and wakes
-     * up threads waiting for the method to complete.
-     * 
-     * @param entryCount Atomic integer used for synchronization
-     */
-    private void exitMethod(AtomicInteger entryCount) {
-        entryCount.compareAndSet(1, 2);
-        synchronized (entryCount) {
-          entryCount.notifyAll();
-        }
-    }
-    
-    protected Bundle startBundle(boolean doWait) throws ObjectCreationException {
-
-        try {
-            
-            if (enterMethod(doWait, startBundleEntryCount)) {               
-                
-                configurePropertiesUsingConfigAdmin();
-                
-                resolveBundle();
-                
-                processAnnotations(true);
-                
-                
-                for (Bundle bundle : dependentBundles) {
-                    try {
-                        if (bundle.getState() != Bundle.ACTIVE && bundle.getState() != Bundle.STARTING) {
-                            bundle.start();
-                        }
-                    } catch (BundleException e) {
-                        if (bundle.getHeaders().get("Fragment-Host") == null)
-                            throw e;
-                    }
-                }
-                
-            }
-    
-            if (osgiBundle.getState() != Bundle.ACTIVE && osgiBundle.getState() != Bundle.STARTING) {
-        
-
-                    int retry = 0;
-                
-                    while (retry++ < 10) {
-                        try {
-                            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                                public Object run() throws BundleException {
-                                    osgiBundle.start();
-                                   return null;
-                               }
-                            });
-                            break;
-                        // } catch ( BundleException e) {
-                        } catch ( PrivilegedActionException e) {
-                            // It is possible that the thread "Refresh Packages" is in the process of
-                            // changing the state of this bundle. 
-                            Thread.yield();
-                        
-                            if (retry == 10)
-                            throw e;
-                        }
-                    }
-                }     
-   
-        } catch (Exception e) {
-            throw new ObjectCreationException(e);
-        } finally {
-            exitMethod(startBundleEntryCount);
-        }
-        return osgiBundle;
-    }
-    
-    
-    // This method is called by OSGiInstanceWrapper.getInstance to obtain the OSGi service reference
-    // corresponding to the specified service. The properties used to filter the service should
-    // be chosen based on whether this is a normal service or a callback.
-    protected org.osgi.framework.ServiceReference getOSGiServiceReference(ComponentService service) 
-            throws ObjectCreationException {
-         
-        Hashtable<String, Object> props = new Hashtable<String, Object>();
-        if (!service.isCallback())
-            processProperties(implementation.getServiceProperties(service.getName()), props);
-        else
-            processProperties(implementation.getServiceCallbackProperties(service.getName()), props);
-        
-        String filter = getOSGiFilter(props);
-        Interface serviceInterface = service.getInterfaceContract().getInterface();
-        String scaServiceName = service.getName();
-            
-        return getOSGiServiceReference(serviceInterface, filter, scaServiceName);
-           
-    }
-    
-    protected org.osgi.framework.ServiceReference getOSGiServiceReference(
-            EndpointReference from, Interface callbackInterface) 
-            throws ObjectCreationException {
-        
-        RuntimeWire refWire = null;
-        String filter = null;
-        for (RuntimeWire wire : referenceWires.keySet()) {
-            if (wire.getSource() == from) {
-                refWire = wire;
-                break;
-            }
-        }
-        if (refWire != null) {
-            Hashtable<String, Object> props = new Hashtable<String, Object>();
-            ComponentReference scaRef = componentReferenceWires.get(refWire);
-            processProperties(implementation.getReferenceCallbackProperties(scaRef.getName()), props);
-            filter = getOSGiFilter(props);
-        }
-        
-        return getOSGiServiceReference(callbackInterface, filter, null);
-    }
-    
-    private org.osgi.framework.ServiceReference getOSGiServiceReference(Interface serviceInterface,
-            String filter, String scaServiceName)
-            throws ObjectCreationException {
-        
-        try {
-            
-            String serviceInterfaceName = null;
-
-            org.osgi.framework.ServiceReference osgiServiceReference = null;
-            
-            if (serviceInterface instanceof JavaInterface) {
-                serviceInterfaceName = ((JavaInterface)serviceInterface).getJavaClass().getName();
-                                  
-                if ((osgiServiceReference = getOSGiServiceReference( 
-                        scaServiceName,
-                        serviceInterfaceName, filter)) == null) {
-                    
-                    // The service listener for our bundle will notify us when the service is registered.
-                    synchronized (implementation) {                            
-                                                
-                        // When declarative services are used, the component is started asynchronously
-                        // So this thread has to wait for the service to be registered by the component
-                        // activate method
-                        // For regular bundle activators, bundle.start activates the bundle synchronously
-                        // and hence the service would probably have been started by the bundle activator
-                        long startTime = System.currentTimeMillis();
-                        while ((osgiServiceReference = getOSGiServiceReference( 
-                                scaServiceName,
-                                serviceInterfaceName, filter)) == null) {
-                                            
-                            // Wait for the bundle to register the service
-                            implementation.wait(100);
-                            if (System.currentTimeMillis() - startTime > SERVICE_TIMEOUT_MILLIS)
-                                break;
-                        }
-                    }   
-                    
-                }
-            }
-                
-            return osgiServiceReference;
-            
-        } catch (Exception e) {
-            throw new ObjectCreationException(e);
-        }
-    }
-    
-    
-    // Felix does not support bundle fragments. This is a temporary workaround.
-    protected Bundle installDummyBundleWithoutFragments(Class<?> interfaceClass)
-            throws Exception {
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-        String EOL = System.getProperty("line.separator");
-
-        String interfaceName = interfaceClass.getName();
-        String packageName = getPackageName(interfaceClass);
-        String bundleName = "dummy.sca." + packageName;
-
-        String manifestStr = "Manifest-Version: 1.0" + EOL
-                + "Bundle-ManifestVersion: 2" + EOL + "Bundle-Name: "
-                + bundleName + EOL + "Bundle-SymbolicName: " + bundleName + EOL
-                + "Bundle-Version: " + "1.0.0" + EOL
-                + "Bundle-Localization: plugin" + EOL;
-        
-        ArrayList<String> dummyClasses = new ArrayList<String>();
-
-        StringBuilder manifestBuf = new StringBuilder();
-        manifestBuf.append(manifestStr);
-        manifestBuf.append("Export-Package: " + packageName + EOL);
-        String exportedInterfaces = interfaceName;
-        Bundle existingBundle = getDummyHostBundle(packageName);
-        String existingClasses;
-        dummyClasses.add(interfaceClass.getName());
-        for (Class<?> clazz :  interfaceClass.getClasses()) {
-            dummyClasses.add(clazz.getName());
-        }
-        if (existingBundle != null && 
-                (existingClasses = (String)existingBundle.getHeaders().get("SCA-Dummy-Classes")) != null) {
-            exportedInterfaces = exportedInterfaces + " " +  existingClasses;
-            
-            StringTokenizer tokenizer = new StringTokenizer(existingClasses);
-            while (tokenizer.hasMoreTokens()) {
-                String className = tokenizer.nextToken();
-                if (!dummyClasses.contains(className))
-                    dummyClasses.add(className);
-            }
-        }
-
-        manifestBuf.append("SCA-Dummy-Classes: " + exportedInterfaces + EOL);
-
-        ByteArrayInputStream manifestStream = new ByteArrayInputStream(
-                manifestBuf.toString().getBytes());
-        Manifest manifest = new Manifest();
-        manifest.read(manifestStream);
-
-        JarOutputStream jarOut = new JarOutputStream(out, manifest);
-
-        for (int i = 0; i < dummyClasses.size(); i++) {
-
-            String className = dummyClasses.get(i);
-            
-            Class clazz = interfaceClass.getClassLoader().loadClass(className);
-            className = clazz.getName().replaceAll("\\.", "/") + ".class";
-            ZipEntry ze = new ZipEntry(className);
-            jarOut.putNextEntry(ze);
-            InputStream stream = clazz.getResourceAsStream(clazz.getSimpleName() + ".class");
-            
-            byte[] bytes = new byte[stream.available()];
-            stream.read(bytes);
-            jarOut.write(bytes);
-            stream.close();
-        }
-        
-        
-        jarOut.close();
-        out.close();
-        
-        if (existingBundle != null) {
-            existingBundle.stop();
-            existingBundle.uninstall();
-        }
-
-        ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-
-        Bundle bundle = bundleContext.installBundle("file://" + bundleName
-                + ".jar", in);
-
-        bundle.start();
-        
-        if (existingBundle != null && packageAdmin != null) {
-            refreshPackages();
-            
-        }
-
-        return bundle;
-
-    }
-    
-    private Bundle getDummyHostBundle(String packageName) {
-        
-        if (packageAdmin == null)
-            return null;
-        
-        ExportedPackage exp = packageAdmin.getExportedPackage(packageName);
-        if (exp == null)
-            return null;
-        else
-            return exp.getExportingBundle();
-    }
-    
-    private static String getPackageName(Class<?> cls) {
-        String name = cls.getName();
-        int index = name.lastIndexOf('.');
-        return index == -1 ? "" : name.substring(0, index);
-    }
-    
-    private Bundle installDummyBundle(Class<?> interfaceClass)
-            throws Exception {
-        
-
-        if (!osgiRuntime.supportsBundleFragments()) {
-            return installDummyBundleWithoutFragments(interfaceClass);
-        }
-        
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-                
-        String EOL = System.getProperty("line.separator");
-        ArrayList<Class<?>> dummyClasses = new ArrayList<Class<?>>();
-        
-        String interfaceName = interfaceClass.getName();
-        String packageName = getPackageName(interfaceClass);
-        String bundleName = "dummy.sca." + interfaceName;
-        
-        
-        String manifestStr = "Manifest-Version: 1.0" + EOL +
-                        "Bundle-ManifestVersion: 2" + EOL +
-                        "Bundle-Name: " + bundleName + EOL +
-                        "Bundle-SymbolicName: " + bundleName + EOL +
-                        "Bundle-Version: " + "1.0.0" + EOL +
-                        "Bundle-Localization: plugin" + EOL;
-        
-                        
-        StringBuilder manifestBuf = new StringBuilder();
-        manifestBuf.append(manifestStr);
-        manifestBuf.append("Export-Package: " + packageName + EOL);
-        Bundle dummyHost = getDummyHostBundle(packageName);
-        if (dummyHost != null)
-            manifestBuf.append("Fragment-Host: " + dummyHost.getSymbolicName() + EOL);
-       
-        ByteArrayInputStream manifestStream = new ByteArrayInputStream(manifestBuf.toString().getBytes());
-        Manifest manifest = new Manifest();
-        manifest.read(manifestStream);
-        
-        dummyClasses.add(interfaceClass);
-        for (Class<?> clazz :  interfaceClass.getClasses()) {
-            dummyClasses.add(clazz);
-        }
-        
-        JarOutputStream jarOut = new JarOutputStream(out, manifest);
-
-        for (int i = 0; i < dummyClasses.size(); i++) {
-            
-            Class<?> clazz = dummyClasses.get(i);
-            String className = clazz.getName();
-            className = clazz.getName().replaceAll("\\.", "/") + ".class";
-            ZipEntry ze = new ZipEntry(className);
-            jarOut.putNextEntry(ze);
-            InputStream stream = clazz.getResourceAsStream(clazz.getSimpleName() + ".class");
-            
-            byte[] bytes = new byte[stream.available()];
-            stream.read(bytes);
-            jarOut.write(bytes);
-            stream.close();
-        }
-        
-        jarOut.close();
-        out.close();
-        
-        
-        ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-        
-        
-        Bundle bundle = bundleContext.installBundle(
-                "file://" + bundleName + ".jar",
-                in);
-        
-        if (dummyHost == null)
-            bundle.start();
-        
-        return bundle;
-        
-    }
-    
-    
-    
-    public InstanceWrapper<?> createInstanceWrapper() throws ObjectCreationException {
-        
-        return new OSGiInstanceWrapper<Object>(this, osgiAnnotations, bundleContext);
-    }
-    
-   
-    
-    private  void resolveWireCreateDummyBundles(final Class interfaceClass) throws Exception {
-        
-        
-        try {
-                 
-            osgiBundle.loadClass(interfaceClass.getName());
-                            
-        } catch (ClassNotFoundException e) {
-                        
-            // The interface used by the proxy is not in the source bundle
-            // A dummy bundle needs to be installed to create the proxy
-            // Allow privileged access to file system. Requires FileSystem permission in security
-            // policy.
-            Bundle dummyBundle = AccessController.doPrivileged(new PrivilegedExceptionAction<Bundle>() {
-                public Bundle run() throws Exception {
-                    return installDummyBundle(interfaceClass);
-                }
-            });
-                                
-            if (packageAdmin != null) {
-                                    
-                packageAdmin.resolveBundles(new Bundle[]{dummyBundle, osgiBundle});
-                              
-            } 
-
-        }
-    }
-    
-    /**
-     * For OSGi->Java wires, create a proxy corresponding to the Java interfaces
-     * and register the proxy with the OSGi registry, so that the source OSGi bundle can 
-     * locate the target Java instance from the registry like a regular OSGi service.
-     * 
-     * For OSGi->OSGi wires, start the target OSGi bundle, so that references of the
-     * target are resolved before the source OSGi bundle is started. If the reference
-     * has properties specified, create a Proxy and register a service with highest
-     * possible ranking. The Proxy should wire to the correct OSGi instance specified
-     * in the SCA composite.
-     * 
-     * The first phase determines whether a proxy should be installed. It also registers
-     * a dummy bundle if necessary to resolve the bundle. When phase1 is completed on all
-     * wires of the component, the bundle should be resolved. Phase2 registers the proxy service.
-     */
-    private boolean resolveWireResolveReferences(Bundle bundle, Class interfaceClass, RuntimeWire wire,
-            boolean isOSGiToOSGiWire) throws Exception {
-        
-
-        // FIXME: At the moment injection of values into instances require an instance to be obtained
-        // through the instance wrapper, and hence requires a proxy. When we do this processing here,
-        // we don't yet know whether the target requires any property or callback injection. So it is
-        // safer to create a proxy all the time. 
-        boolean createProxy = true; 
-       
-        ComponentReference scaRef = componentReferenceWires.get(wire);
-        Hashtable<String, Object> targetProperties = new Hashtable<String, Object>();
-        processProperties(implementation.getReferenceProperties(scaRef.getName()), targetProperties);
-            
-
-        if (isOSGiToOSGiWire) {
-                    
-                OSGiImplementationProvider implProvider = (OSGiImplementationProvider)wire.getTarget().getComponent().getImplementationProvider();
-                    
-                // This is an OSGi->OSGi wire
-                isOSGiToOSGiWire = true;
-                    
-                // If the target component is stateless, use a proxy to create a new service each time 
-                if (!implProvider.getScope().equals(Scope.COMPOSITE)) createProxy = true;
-                
-                Interface interfaze = wire.getTarget().getInterfaceContract().getInterface();
-                
-                // If the target interface is remotable, create a proxy to support pass-by-value semantics
-                // AllowsPassByReference is not detected until the target instance is obtained.
-                if (interfaze.isRemotable())
-                    createProxy = true;
-                    
-                // If any of the operations in the target interface is non-blocking, create a proxy
-                List<Operation> ops = interfaze.getOperations();
-                for (Operation op : ops) {
-                    if (op.isNonBlocking())
-                        createProxy = true;
-                }
-                    
-                // If properties are specified for the reference, create a proxy since rewiring may be required
-                if (targetProperties.size() > 0) {
-                    createProxy = true;
-                }
-                
-                // If properties are specified for the component, create a proxy for configuring
-                // the component services.
-                if (componentProperties.size() > 0) {
-                    createProxy = true;
-                }
-                    
-                // Since this is an OSGi->OSGi wire, start the target bundle before starting the
-                // source bundle if there is no proxy. For direct wiring without a proxy, this ordering 
-                // is irrelevant in terms of class resolution, but the target needs to be started at some 
-                // point. But there is no opportunity later on to start the target OSGi bundle without a proxy.    
-                // When a Proxy is used, the target bundle needs to be resolved for the source bundle
-                // to be resolved so that the interface is visible to the source. In this case the bundle
-                // will be started when an instance is needed.                    
-                if (!createProxy) {    
-                    implProvider.startBundle(false);
-                }
-                else {
-                    implProvider.resolveBundle();
-                }
-        }
-        else {
-                createProxy = true;
-        }
-            
-        return createProxy;
-    }
-    
-    
-    // Register proxy service 
-    private void resolveWireRegisterProxyService(final Bundle bundle, final Class interfaceClass, RuntimeWire wire) throws Exception {
-          
-        ComponentReference scaRef = componentReferenceWires.get(wire);
-        Hashtable<String, Object> targetProperties = new Hashtable<String, Object>();
-        processProperties(implementation.getReferenceProperties(scaRef.getName()), targetProperties);
-        targetProperties.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
-        
-        if (targetProperties.get(COMPONENT_SERVICE_NAME) == null && wire.getTarget().getComponent() != null) {
-            String compServiceName = wire.getTarget().getComponent().getName() + "/" + 
-                                     wire.getTarget().getContract().getName();
-            targetProperties.put(COMPONENT_SERVICE_NAME, compServiceName);
-        }
-        
-           
-        JDKProxyFactory proxyService = new JDKProxyFactory(messageFactory, mapper);
-
-        // Allow privileged access to load classes. Requires getClassLoader permission in security
-        // policy.
-        final Class<?> proxyInterface = AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>() {
-            public Class<?> run() throws Exception {
-                return bundle.loadClass(interfaceClass.getName());
-            }
-        });
-
-        final Object proxy = proxyService.createProxy(proxyInterface, wire);
-        final Hashtable<String, Object> finalTargetProperties = targetProperties;
-        AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-            public Object run() throws Exception {
-                bundleContext.registerService(proxyInterface.getName(), proxy, finalTargetProperties);
-                return null;
-            }
-        });
-            
-        
-    }
-    
-    
-    private void refreshPackages() {
-    
-        if (packageAdmin != null) {
-            synchronized (this) {
-                packagesRefreshed = false;
-                packageAdmin.refreshPackages(null);
-                        
-                if (!packagesRefreshed) {
-                	try {
-                        this.wait(2000);
-                	} catch (InterruptedException e) {
-                		// ignore
-                	}
-                }
-                packagesRefreshed = false;
-            }                       
-        }
-    }
-    
-    
-    private void resolveBundle() throws ObjectCreationException {
-        
-        
-        try {
-            
-            if (!wiresResolved) {
-                wiresResolved = true;
-                
-                if (!setReferencesAndProperties()) {
-                    wiresResolved = false;
-                    return;
-                }
-                    
-                int refPlusServices = referenceWires.size() + runtimeComponent.getServices().size();
-                boolean[] createProxyService = new boolean[refPlusServices];
-                Class<?>[] interfaceClasses = new Class<?>[refPlusServices] ;
-                boolean[] isOSGiToOSGiWire = new boolean[refPlusServices];
-                boolean[] wireResolved = new boolean[refPlusServices];
-                int index = 0;
-                for (RuntimeWire wire : referenceWires.keySet()) {
-                
-                    Reference reference = referenceWires.get(wire);
-                    
-                    isOSGiToOSGiWire[index] = wire.getTarget().getComponent() != null &&
-                            wire.getTarget().getComponent().getImplementationProvider() 
-                            instanceof OSGiImplementationProvider;
-                            
-                    Interface refInterface = reference.getInterfaceContract().getInterface();
-                    if (refInterface instanceof JavaInterface) {
-                        interfaceClasses[index] = ((JavaInterface)refInterface).getJavaClass();
-                    
-                        if (!isOSGiToOSGiWire[index])
-                            resolveWireCreateDummyBundles(interfaceClasses[index]);
-
-                    }
-                    
-                    if (!resolvedWires.contains(wire)) {
-                        resolvedWires.add(wire);                       
-                    }
-                    else
-                        wireResolved[index] = true;
-                    
-                    index++;
-                }
-                for (ComponentService service : runtimeComponent.getServices()) {
-                    Interface callbackInterface = service.getInterfaceContract().getCallbackInterface();
-                    if (callbackInterface instanceof JavaInterface) {
-                        interfaceClasses[index] = ((JavaInterface)callbackInterface).getJavaClass();
-                        
-                        resolveWireCreateDummyBundles(interfaceClasses[index]);
-                    }
-                    
-                    index++;
-                }
-                
-                index = 0;
-                for (RuntimeWire wire : referenceWires.keySet()) {
-                    
-                    if (!wireResolved[index]) {
-                        createProxyService[index] = resolveWireResolveReferences(osgiBundle, 
-                            interfaceClasses[index], 
-                            wire,
-                            isOSGiToOSGiWire[index]);
-                    }
-                    index++;
-                }
-
-                refreshPackages();
-                
-                
-                index = 0;
-                for (RuntimeWire wire : referenceWires.keySet()) {
-                    
-                    if (createProxyService[index] && !wireResolved[index])
-                        resolveWireRegisterProxyService(osgiBundle, interfaceClasses[index], wire);
-                    index++;
-                }
-            }
-            else if (osgiBundle.getState() == Bundle.INSTALLED && packageAdmin != null) {
-                packageAdmin.resolveBundles(new Bundle[] {osgiBundle});
-            }
-            
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new ObjectCreationException(e);
-        }         
-    }
-    
-   
-    @SuppressWarnings("unchecked")
-    private void configurePropertiesUsingConfigAdmin() {
-               
-        try {
-
-            if (componentProperties.size() == 0)
-                return;
-            
-            org.osgi.framework.ServiceReference configAdminReference = 
-                bundleContext.getServiceReference("org.osgi.service.cm.ConfigurationAdmin");
-            if (configAdminReference != null) {
-                
-                Object cm = bundleContext.getService(configAdminReference);
-                Class cmClass = cm.getClass().getClassLoader().loadClass("org.osgi.service.cm.ConfigurationAdmin");
-                Method getConfigMethod = cmClass.getMethod("getConfiguration", String.class, String.class);
-                
-
-                Class configClass = cm.getClass().getClassLoader().loadClass("org.osgi.service.cm.Configuration");
-                
-                Method getMethod = configClass.getMethod("getProperties");
-                Method updateMethod = configClass.getMethod("update", Dictionary.class);
-                
-                List<Service> services = implementation.getServices();
-                HashSet<String> pidsProcessed = new HashSet<String>();
-                
-                for (Service service : services) {
-                    
-                    List<ComponentProperty> serviceProps = implementation.getServiceProperties(service.getName());
-                    String pid = null;
-                    
-                    if (serviceProps != null) {
-                        for (ComponentProperty prop : serviceProps) {
-                            if (prop.getName().equals("service.pid")) {
-                                ObjectFactory objFactory = propertyValueFactory.createValueFactory(prop, 
-                                        prop.getValue(), String.class);
-                                pid = (String)objFactory.getInstance();
-                            }
-                        }
-                    }
-                    if (pid == null || pidsProcessed.contains(pid))
-                        continue;
-                    
-
-                   
-                    
-                    Object config = getConfigMethod.invoke(cm, pid, null);
-                    Dictionary props = (Dictionary) getMethod.invoke(config);
-                    if (props == null)
-                        props = new Hashtable<String, Object>();
-                    for (String propertyName : componentProperties.keySet()) {
-
-                        props.put(propertyName, componentProperties.get(propertyName));
-                    }
-                    
-                    updateMethod.invoke(config, props);
-                    
-                    
-                }                
-                
-            }
-            
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-    
-    
-    
-    public boolean isOptimizable() {
-        return false;
-    }
-    
-    public Scope getScope() {
-        return osgiAnnotations.getScope();
-    }
-
-    public boolean isEagerInit() {
-        return osgiAnnotations.isEagerInit();
-    }
-
-    public long getMaxAge() {
-        return osgiAnnotations.getMaxAge();
-    }
-
-    public long getMaxIdleTime() {
-        return osgiAnnotations.getMaxIdleTime();
-    }
-    
-    protected ScopeContainer<?> getScopeContainer() {
-        startBundle(true);
-        return ((ScopedRuntimeComponent)runtimeComponent).getScopeContainer();
-    }
-    
-    public Invoker createTargetInvoker(RuntimeComponentService service, Operation operation)  {
-       
-        
-        Interface serviceInterface = operation.getInterface();
-        boolean isRemotable = serviceInterface.isRemotable();
-
-
-        Invoker invoker = new OSGiTargetInvoker(operation, this, service);
-        if (isRemotable) {
-            return new OSGiRemotableInvoker(osgiAnnotations, dataBindingRegistry, operation, this, service);
-        } else {
-            return invoker;
-        }
-        
-    }
-    
-    
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        return createTargetInvoker(service, operation);
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    private boolean setReferencesAndProperties() {
-       
-        for (Reference ref: implementation.getReferences()) {
-            List<RuntimeWire> wireList = null;
-            ComponentReference compRef = null;
-            for (ComponentReference cRef : runtimeComponent.getReferences()) {
-                if (cRef.getName().equals(ref.getName())) {
-                    
-                    wireList = ((RuntimeComponentReference)cRef).getRuntimeWires();
-                    
-                    compRef = cRef;
-                    break;
-                }
-            }
-                
-            if (ref.getMultiplicity() == Multiplicity.ONE_N || ref.getMultiplicity() == Multiplicity.ZERO_N) {
-                 for (RuntimeWire wire : wireList) {
-                    referenceWires.put(wire, ref);
-                    componentReferenceWires.put(wire, compRef);
-                }
-                
-            } else {
-                if (wireList == null && ref.getMultiplicity() == Multiplicity.ONE_ONE) {
-                    throw new IllegalStateException("Required reference is missing: " + ref.getName());
-                }
-                if (wireList != null && !wireList.isEmpty()) {
-                    RuntimeWire wire = wireList.get(0);
-                    referenceWires.put(wire, ref);
-                    componentReferenceWires.put(wire, compRef);
-                }
-                
-            }
-            
-        }
-        
-        processProperties(runtimeComponent.getProperties(), componentProperties);
-        
-        return true;
-        
-    }
-    
-    public void start() {
-        setReferencesAndProperties();
-    }
-        
-    public void processAnnotations(boolean doWait) throws IntrospectionException {
-        
-        if (!enterMethod(doWait, processAnnotationsEntryCount))
-            return;
-        
-        try {
-            osgiAnnotations.processAnnotations();
-        
-            Scope scope = osgiAnnotations.getScope();
-            if (scope.equals(Scope.SYSTEM) || scope.equals(Scope.COMPOSITE)) {
-                // Nothing
-            } else {
-
-                if (runtimeComponent instanceof ScopedRuntimeComponent) {
-
-                    ScopedRuntimeComponent component = (ScopedRuntimeComponent) runtimeComponent;
-
-                    ScopeContainer oldScopeContainer = component.getScopeContainer();
-                    component.setScopeContainer(null);
-                    ScopeContainer scopeContainer = scopeRegistry.getScopeContainer(runtimeComponent);
-
-                    if (oldScopeContainer != null && oldScopeContainer.getLifecycleState() == ScopeContainer.RUNNING) {
-                        scopeContainer.start();
-                    }
-                
-                    component.setScopeContainer(scopeContainer);
-                }
-
-            }
-        } finally {
-            exitMethod(processAnnotationsEntryCount);
-        }  
-    }
-    
-    public void stop() {
-
-        if (osgiServiceListener != null)
-            bundleContext.removeServiceListener(osgiServiceListener);
-    }
-
-    
-    
-    public void frameworkEvent(FrameworkEvent event) {
-        if (event.getType() == FrameworkEvent.PACKAGES_REFRESHED) {
-            synchronized (this) {
-                packagesRefreshed = true;
-                this.notifyAll();
-            }            
-        }
-        
-    }
-    
-    public void bundleChanged(BundleEvent event) {
-        if (event.getType() == BundleEvent.RESOLVED && event.getBundle() == osgiBundle) {
-            try {
-                processAnnotations(false);
-            } catch (Throwable e) {
-                e.printStackTrace();
-            }             
-        }
-    }
-
-    private class OSGiServiceListener implements ServiceListener {
-        
-        private Bundle bundle;
-        
-        OSGiServiceListener(Bundle bundle) {
-            this.bundle = bundle;
-        }
-        
-        public void serviceChanged(org.osgi.framework.ServiceEvent event) {
-            
-
-            org.osgi.framework.ServiceReference reference = event.getServiceReference();
-            
-            if (event.getType() == ServiceEvent.REGISTERED && reference.getBundle() == bundle) {
-                
-                synchronized (implementation) {
-                    
-                    implementation.notifyAll();
-                }
-            }
-            
-            if (event.getType() == ServiceEvent.UNREGISTERING && reference.getBundle() == bundle) {
-                // TODO: Process deregistering of OSGi services.
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java b/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
deleted file mode 100644
index 814d37f203..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
+++ /dev/null
@@ -1,111 +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.implementation.osgi.runtime;
-
-
-import org.apache.tuscany.sca.context.ContextFactoryExtensionPoint;
-import org.apache.tuscany.sca.context.RequestContextFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.scope.ScopeRegistry;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.osgi.framework.BundleException;
-
-
-/**
- * Builds a OSGi-based implementation provider from a component definition
- *
- * @version $Rev$ $Date$
- */
-public class OSGiImplementationProviderFactory implements ImplementationProviderFactory<OSGiImplementation> {
-    
-    private DataBindingExtensionPoint dataBindings;
-    private JavaPropertyValueObjectFactory propertyFactory;
-    private ProxyFactory proxyFactory;
-    private ScopeRegistry scopeRegistry;
-    private MessageFactory messageFactory;
-    private InterfaceContractMapper mapper;
-    
-    private RequestContextFactory requestContextFactory;
-    
-    public OSGiImplementationProviderFactory(ExtensionPointRegistry extensionPoints ) {
-        
-        dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class);
-        ProxyFactoryExtensionPoint proxyFactories = extensionPoints.getExtensionPoint(ProxyFactoryExtensionPoint.class);
-        proxyFactory = new ExtensibleProxyFactory(proxyFactories);
-        ContextFactoryExtensionPoint contextFactories = extensionPoints.getExtensionPoint(ContextFactoryExtensionPoint.class);
-        requestContextFactory = contextFactories.getFactory(RequestContextFactory.class);
-        
-
-        // FIXME: Scope registry is not an extension point, and this usage is specific
-        // to implementation.osgi since it needs to change scope after the component is
-        // created. Do we need to find a better way?
-        scopeRegistry = extensionPoints.getExtensionPoint(ScopeRegistry.class);
-        
-        TransformerExtensionPoint transformers = extensionPoints.getExtensionPoint(TransformerExtensionPoint.class);
-        MediatorImpl mediator = new MediatorImpl(dataBindings, transformers);
-        propertyFactory = new JavaPropertyValueObjectFactory(mediator);
-
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        messageFactory = modelFactories.getFactory(MessageFactory.class);
-        
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        mapper = utilities.getUtility(InterfaceContractMapper.class);
-    }
-
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component,
-        OSGiImplementation implementation) {
-                
-        try {
-                
-            return new OSGiImplementationProvider(component, 
-                    implementation, 
-                    dataBindings,
-                    propertyFactory,
-                    proxyFactory,
-                    scopeRegistry,
-                    requestContextFactory,
-                    messageFactory,
-                    mapper
-                    );
-                
-        } catch (BundleException e) {
-            throw new RuntimeException(e);
-        }
-        
-    }
-
-    public Class<OSGiImplementation> getModelType() {
-        return OSGiImplementation.class;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java b/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
deleted file mode 100644
index a4fb1ec2ca..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
+++ /dev/null
@@ -1,299 +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.implementation.osgi.runtime;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.core.scope.Scope;
-import org.apache.tuscany.sca.core.scope.TargetDestructionException;
-import org.apache.tuscany.sca.core.scope.TargetInitializationException;
-import org.apache.tuscany.sca.implementation.osgi.context.OSGiAnnotations;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.ServiceReference;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-
-
-/**
- * InstanceWrapper for creating instances for OSGi components. 
- * This class needs to implement InstanceWrapper since the wrapper is stored in
- * the scope container. But getInstance() is called on this wrapper only through the
- * OSGi target invoker. OSGiTargetInvoker always invokes getInstance for a specific
- * service since one OSGi SCA component can associate different objects with 
- * different services (this is different from Java SCA components which always associate 
- * a single component instance with multiple services).
- *
- * @version $Rev$ $Date$
- */
-public class OSGiInstanceWrapper<T> implements InstanceWrapper<T> {
-    private static final Random RANDOM_NUMBER_GENERATOR = new Random();
-    
-    private OSGiAnnotations annotationProcessor;
-    private OSGiImplementationProvider provider;
-    private BundleContext bundleContext;
-    private Hashtable<Object,InstanceInfo<T>> instanceInfoList = 
-        new Hashtable<Object,InstanceInfo<T>>();
-    
-    // Dummy bundles are used to create a new service object for scopes other than COMPOSITE
-    private Bundle dummyReferenceBundle;
-
-
-    public OSGiInstanceWrapper(OSGiImplementationProvider provider, 
-            OSGiAnnotations annotationProcessor,
-            BundleContext bundleContext) {
-        
-        this.provider = provider;
-        this.annotationProcessor = annotationProcessor;
-        this.bundleContext = bundleContext;
-    }
-    
-    public synchronized T getInstance(ComponentService service) throws TargetInitializationException {
-        
-    	// If an instance corresponding to this service has already been created, return the instance.
-        if (instanceInfoList.get(service) != null)
-            return instanceInfoList.get(service).osgiInstance;
-        
-        // There is no strict relation between service and callback instances. The instance semantics
-        // actually applies to the component instance in SCA. But for OSGi services, the callback
-        // is just another OSGi service, and could correspond to any of the service instances in 
-        // the component. To implement the SCA scope semantics for callbacks, OSGi callbacks
-        // should also be made on the service object which implements the callback. The following code
-        // finds the first possible callback instance based on the interfaces implemented by the service 
-        // objects in this component. Note that the interfaces are checked by name rather than using
-        // instanceof since the class seen by Tuscany could be from a different classloader from that
-        // used by the bundle.
-        if (service.isCallback()) {
-        	Iterator<InstanceInfo<T>> instances = instanceInfoList.values().iterator();
-        	while (instances.hasNext()) {
-        		InstanceInfo<T> instanceInfo = instances.next();
-        		Interface interfaze = service.getInterfaceContract().getInterface();
-        		if (interfaze instanceof JavaInterface && ((JavaInterface)interfaze).getJavaClass() != null) {
-        			String interfaceName = ((JavaInterface)interfaze).getJavaClass().getName();
-        			Class[] interfaces = instanceInfo.osgiInstance.getClass().getInterfaces();
-        			for (Class clazz : interfaces) {
-        				if (clazz.getName().equals(interfaceName)) {
-                			return instanceInfo.osgiInstance;
-        				}
-        			}
-        			
-        		}
-        		    
-        	}
-        }
-
-        Bundle refBundle = provider.startBundle(true);
-        
-        // For scopes other than composite, the service object is obtained using a dummy reference
-        // bundle to guarantee that a new instance is created each time. This combined with the Tuscany
-        // scope container code guarantee SCA scope semantics for OSGi components as long as service
-        // factories are used.
-        if (!annotationProcessor.getScope().equals(Scope.COMPOSITE)) {
-            refBundle = getDummyReferenceBundle();
-        }
-        
-        InstanceInfo<T> instanceInfo = new InstanceInfo<T>();
-               
-        instanceInfo.refBundleContext = refBundle.getBundleContext();
-
-        instanceInfo.osgiInstance = getInstanceObject(instanceInfo, service);
-        
-        try {
-
-            if (!isInitialized(instanceInfo.osgiInstance)) {
-                
-                annotationProcessor.injectProperties(instanceInfo.osgiInstance);
-                callLifecycleMethod(instanceInfo.osgiInstance, Init.class);
-                
-                instanceInfo.isFirstInstance = true;
-            }
-
-            instanceInfoList.put(service, instanceInfo);
-
-        } catch (Exception e) {
-            throw new TargetInitializationException(e);
-        }
-        
-        return instanceInfo.osgiInstance;
-    }
-    
-    
-    
-    // This method is provided purely to implement InstanceWrapper interface, and is never called.
-    public T getInstance() {
-
-        return null;
-    }
-    
-    public void start() throws TargetInitializationException {
-
-        if (provider.isEagerInit()) {
-            List<ComponentService> services = provider.getRuntimeComponent().getServices();
-            for (ComponentService service : services) {
-                getInstance(service);
-            }
-        }
-    }
-
-    public synchronized void stop() throws TargetDestructionException {
-        
-        for (InstanceInfo<T> instanceInfo : instanceInfoList.values()) {
-            if (instanceInfo.osgiInstance != null && instanceInfo.osgiServiceReference != null) {            
-                
-                try {
-                    
-                    if (instanceInfo.isFirstInstance)
-                        callLifecycleMethod(instanceInfo.osgiInstance, Destroy.class);
-            
-                    instanceInfo.refBundleContext.ungetService(instanceInfo.osgiServiceReference);
-            
-                    instanceInfo.osgiInstance = null;
-                    instanceInfo.osgiServiceReference = null;
-            
-                } catch (Exception e) {
-                    throw new TargetDestructionException(e);
-                }            
-            }
-        }
-        instanceInfoList.clear();
-        if (dummyReferenceBundle != null) {
-            try {
-                dummyReferenceBundle.uninstall();
-            } catch (BundleException e) {
-                throw new TargetDestructionException(e);
-            }
-            dummyReferenceBundle = null;
-        }
-    }
-    
-    @SuppressWarnings("unchecked")
-    private T getInstanceObject(InstanceInfo<T> instanceInfo, ComponentService service) {
-
-    	/** 
-    	 * Since implementation.osgi is not well integrated with the OSGi lifecycle
-    	 * it is possible that the service is deactivated before the service instance
-    	 * is obtained when using declarative services. Retry in this case.  
-    	 */
-    	int maxRetries = 10;
-    	for (int i = 0; i < maxRetries; i++) {
-          instanceInfo.osgiServiceReference = provider.getOSGiServiceReference(service); 
-          if (instanceInfo.osgiServiceReference == null)
-        	  return null;
-          T obj = (T)instanceInfo.refBundleContext.getService(instanceInfo.osgiServiceReference);
-          if (obj != null)
-        	  return obj;
-    	}
-    	return null;
-    }
-    
-    private Bundle getDummyReferenceBundle() throws TargetInitializationException {
-        
-        if (dummyReferenceBundle != null)
-            return dummyReferenceBundle;
-        
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        
-        String EOL = System.getProperty("line.separator");
-        String bundleName = "dummy.sca." + RANDOM_NUMBER_GENERATOR.nextInt();
-        
-        
-        String manifestStr = "Manifest-Version: 1.0" + EOL +
-                        "Bundle-ManifestVersion: 2" + EOL +
-                        "Bundle-Name: " + bundleName + EOL +
-                        "Bundle-SymbolicName: " + bundleName + EOL +
-                        "Bundle-Version: " + "1.0.0" + EOL +
-                        "Bundle-Localization: plugin" + EOL;
-        
-                        
-        StringBuilder manifestBuf = new StringBuilder();
-        manifestBuf.append(manifestStr);
-       
-        try {
-            ByteArrayInputStream manifestStream = new ByteArrayInputStream(manifestBuf.toString().getBytes());
-            Manifest manifest = new Manifest();
-            manifest.read(manifestStream);
-            
-      
-            JarOutputStream jarOut = new JarOutputStream(out, manifest);
-
-            jarOut.close();
-            out.close();
-            
-            
-            ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-                   
-            dummyReferenceBundle = bundleContext.installBundle("file://" + bundleName + ".jar", in);
-            
-            dummyReferenceBundle.start();
-            
-        } catch (Exception e) {
-            throw new TargetInitializationException(e);
-        }
-        
-        return dummyReferenceBundle;
-        
-    }
-    
-    private void callLifecycleMethod(Object instance,
-            Class<? extends Annotation> annotationClass) throws Exception {
-
-        Method method = null;
-        if (annotationClass == Init.class) {
-            method = annotationProcessor.getInitMethod(instance);
-        } else if (annotationClass == Destroy.class) {
-            method = annotationProcessor.getDestroyMethod(instance);
-        }
-
-        if (method != null) {
-            method.setAccessible(true);
-            method.invoke(instance);
-        }
-    }
-    
-    private boolean isInitialized(Object instance) {
-        for (InstanceInfo<?> info : instanceInfoList.values()) {
-            if (info.osgiInstance == instance)
-                return true;
-        }
-        return false;
-    }
-    
-    private static class InstanceInfo<T> {
-        private T osgiInstance;
-        private ServiceReference osgiServiceReference;
-        private BundleContext refBundleContext;
-        private boolean isFirstInstance;
-
-    }
-    
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java b/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
deleted file mode 100644
index deb44d26fb..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
+++ /dev/null
@@ -1,139 +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.implementation.osgi.runtime;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.IdentityHashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.databinding.DataBinding;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.implementation.osgi.context.OSGiAnnotations;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * An interceptor to enforce pass-by-value semantics for remotable interfaces
- *
- * @version $Rev$ $Date$
- */
-public class OSGiRemotableInvoker extends OSGiTargetInvoker implements DataExchangeSemantics {
-
-    private DataBindingExtensionPoint registry;
-    private Operation operation;
-    private OSGiAnnotations osgiAnnotations;
-
-    /**
-     * @param registry
-     * @param operation
-     * @param method
-     * @param component
-     */
-    public OSGiRemotableInvoker(OSGiAnnotations osgiAnnotations,
-                                DataBindingExtensionPoint registry,
-                                Operation operation,
-                                OSGiImplementationProvider provider,
-                                RuntimeComponentService service) {
-        super(operation, provider, service);
-        this.osgiAnnotations = osgiAnnotations;
-        this.registry = registry;
-        this.operation = operation;
-    }
-
-    @Override
-    public Object invokeMethod(Object targetObject, Method m, Message msg) throws InvocationTargetException {
-
-        Object result;
-        if (osgiAnnotations.isAllowsPassByReference(targetObject, m)) {
-            result = super.invokeMethod(targetObject, m, msg);
-        } else {
-            Object obj = msg.getBody();
-            msg.setBody(copy((Object[])obj));
-
-            result = super.invokeMethod(targetObject, m, msg);
-
-            if (operation.getOutputType() != null) {
-                String dataBindingId = operation.getOutputType().getDataBinding();
-                DataBinding dataBinding = registry.getDataBinding(dataBindingId);
-                result = copy(result, operation.getOutputType(), dataBinding);
-            }
-        }
-        return result;
-    }
-
-    public Object[] copy(Object[] args) {
-        if (args == null) {
-            return null;
-        }
-        Object[] copiedArgs = new Object[args.length];
-        Map<Object, Object> map = new IdentityHashMap<Object, Object>();
-        for (int i = 0; i < args.length; i++) {
-            if (args[i] == null) {
-                copiedArgs[i] = null;
-            } else {
-                Object copiedArg = map.get(args[i]);
-                if (copiedArg != null) {
-                    copiedArgs[i] = copiedArg;
-                } else {
-                    DataType dt = operation.getInputType().getLogical().get(i);
-                    String dataBindingId = dt.getDataBinding();
-                    DataBinding dataBinding = registry.getDataBinding(dataBindingId);
-                    copiedArg = copy(args[i], dt, dataBinding);
-                    map.put(args[i], copiedArg);
-                    copiedArgs[i] = copiedArg;
-                }
-            }
-        }
-        return copiedArgs;
-    }
-
-    public Object copy(Object arg, DataType dataType, DataBinding argDataBinding) {
-        if (arg == null) {
-            return null;
-        }
-        Object copiedArg;
-        if (argDataBinding != null) {
-            copiedArg = argDataBinding.copy(arg, dataType, operation);
-        } else {
-            copiedArg = arg;
-            dataType = registry.introspectType(arg, operation);
-            if (dataType != null) {
-                DataBinding binding = registry.getDataBinding(dataType.getDataBinding());
-                if (binding != null) {
-                    copiedArg = binding.copy(arg, dataType, operation);
-                }
-            }
-            // FIXME: What to do if it's not recognized?
-        }
-        return copiedArg;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.PassByValueAware#allowsPassByReference()
-     */
-    public boolean allowsPassByReference() {
-        return true;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java b/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
deleted file mode 100644
index deb39a47cd..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
+++ /dev/null
@@ -1,199 +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.implementation.osgi.runtime;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.core.invocation.TargetInvocationException;
-import org.apache.tuscany.sca.core.scope.Scope;
-import org.apache.tuscany.sca.core.scope.ScopeContainer;
-import org.apache.tuscany.sca.core.scope.TargetResolutionException;
-import org.apache.tuscany.sca.interfacedef.ConversationSequence;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Java->OSGi references use OSGiTargetInvoker to call methods from OSGi bundles
- * OSGi->Java references use JDKProxyService and invocation handler and do not use this class
- * OSGi->OSGi references go through OSGi reference mechanisms when a proxy is not used
- *    When a proxy is used, this invoker is used to call methods from OSGi bundles
- *    A proxy is used for OSGi->OSGi if
- *       1) target reference properties are specified  OR
- *       2) there are one or more non-blocking methods in the target interface OR
- *       3) scope is not COMPOSITE
- *
- * @version $Rev$ $Date$
- */
-public class OSGiTargetInvoker<T> implements Invoker {
-
-    private Operation operation;
-    protected InstanceWrapper<T> target;
-
-    private final OSGiImplementationProvider provider;
-    private final RuntimeComponentService service;
-    
-    // Scope container is reset by the OSGi implementation provider if @Scope
-    // annotation is used to modify the scope (default is composite)
-    // Hence this field is initialized on the first invoke.
-    private ScopeContainer scopeContainer;
-
-    public OSGiTargetInvoker(
-            Operation operation, 
-            OSGiImplementationProvider provider, 
-            RuntimeComponentService service) {
-        
-
-        this.operation = operation;
-        this.service = service;
-        this.provider = provider;
-
-    }
-
-    /**
-     * Resolves the target service instance or returns a cached one
-     */
-    @SuppressWarnings("unchecked")
-    protected InstanceWrapper getInstance(Object contextId)
-        throws TargetResolutionException, TargetInvocationException {
-        
-        if (scopeContainer == null)
-            scopeContainer = provider.getScopeContainer();
-        
-        
-        return scopeContainer.getWrapper(contextId);
-
-    }
-
-    @SuppressWarnings("unchecked")
-    private Object invokeTarget(Message msg) throws InvocationTargetException {
-
-        if (scopeContainer == null)
-            scopeContainer = provider.getScopeContainer();
-        
-        
-        Operation op = msg.getOperation();
-        if (op == null) {
-            op = this.operation;
-        }
-        ConversationSequence sequence = op.getConversationSequence();
-
-        Object contextId = null;
-
-        EndpointReference from = msg.getFrom();
-        ReferenceParameters parameters = null;
-
-        if (from != null) {
-            parameters = from.getReferenceParameters();
-        }
-        // check what sort of context is required
-        if (scopeContainer != null) {
-            Scope scope = scopeContainer.getScope();
-            if (scope == Scope.REQUEST) {
-                contextId = Thread.currentThread();
-            } else if (scope == Scope.CONVERSATION && parameters != null) {
-                contextId = parameters.getConversationID();
-            }
-        }
-
-        try {
-        	
-            OSGiInstanceWrapper wrapper = (OSGiInstanceWrapper)getInstance(contextId);
-            Object instance;
-
-
-            // detects whether the scope container has created a conversation Id. This will
-            // happen in the case that the component has conversational scope but only the
-            // callback interface is conversational. Or in the callback case if the service interface
-            // is conversational and the callback interface isn't. If we are in this situation we need
-            // to get the contextId of this component and remove it after we have invoked the method on 
-            // it. It is possible that the component instance will not go away when it is removed below 
-            // because a callback conversation will still be holding a reference to it
-            boolean removeTemporaryConversationalComponentAfterCall = false;
-            if (parameters != null && (contextId == null) && (parameters.getConversationID() != null)) {
-                contextId = parameters.getConversationID();
-                removeTemporaryConversationalComponentAfterCall = true;
-            }
-            
-            instance = wrapper.getInstance(service);
-            
-            Method m = JavaInterfaceUtil.findMethod(instance.getClass(), operation);
-
-            Object ret = invokeMethod(instance, m, msg);
-
-            scopeContainer.returnWrapper(wrapper, contextId);
-
-            if ((sequence == ConversationSequence.CONVERSATION_END) || (removeTemporaryConversationalComponentAfterCall)) {
-                // if end conversation, or we have the special case where a conversational
-                // object was created to service the stateless half of a stateful component
-                scopeContainer.remove(contextId);
-                parameters.setConversationID(null);
-            }
-            
-            return ret;
-        } catch (InvocationTargetException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new InvocationTargetException(e);
-        }
-    }
-
-    protected Object invokeMethod(Object instance, Method m, Message msg) throws InvocationTargetException {
-
-        try {
-
-            Object payload = msg.getBody();
-
-            if (payload != null && !payload.getClass().isArray()) {
-                return m.invoke(instance, payload);
-            } else {
-                return m.invoke(instance, (Object[])payload);
-            }
-
-        } catch (InvocationTargetException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new InvocationTargetException(e);
-        }
-    }
-
-    public Message invoke(Message msg) {
-        try {
-            //            Object messageId = msg.getMessageID();
-            //            Message workContext = ThreadMessageContext.getMessageContext();
-            //            if (messageId != null) {
-            //                workContext.setCorrelationID(messageId);
-            //            }
-            Object resp = invokeTarget(msg);
-            msg.setBody(resp);
-        } catch (InvocationTargetException e) {
-            msg.setFaultBody(e.getCause());
-        }
-        return msg;
-    }
-
-
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
deleted file mode 100644
index 7f246cb76c..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
+++ /dev/null
@@ -1,550 +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.implementation.osgi.xml;
-
-import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
-import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.osgi.BundleReference;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
-import org.apache.tuscany.sca.implementation.osgi.impl.OSGiImplementationImpl;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.osgi.framework.Bundle;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * 
- * Process an <implementation.osgi/> element in a component definition. An instance of
- * OSGiImplementation is created.
- * Also associates the component type file with the implementation.
- *
- * @version $Rev$ $Date$
- */
-public class OSGiImplementationProcessor implements StAXArtifactProcessor<OSGiImplementationImpl> {
-    
-    public static final QName IMPLEMENTATION_OSGI  = new QName(Constants.SCA10_TUSCANY_NS, "implementation.osgi");
-    
-    private static final String BUNDLE_SYMBOLICNAME= "bundleSymbolicName";
-    private static final String BUNDLE_VERSION     = "bundleVersion";
-    private static final String CLASSES            = "classes";
-    private static final String IMPORTS            = "imports";
-
-    private static final QName PROPERTIES_QNAME    = new QName(Constants.SCA10_TUSCANY_NS, "properties");
-    private static final QName PROPERTY_QNAME      = new QName(Constants.SCA10_TUSCANY_NS, "property");
-    
-    private JavaInterfaceFactory javaInterfaceFactory;
-    private AssemblyFactory assemblyFactory;
-    private ModelFactoryExtensionPoint modelFactories;
-    private Monitor monitor;
-    
-    private static final DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
-    static {
-        domFactory.setNamespaceAware(true);
-    }
-
-    public OSGiImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-    	this.monitor = monitor;
-        this.modelFactories = modelFactories;
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.javaInterfaceFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-    }
-    
-    /**
-     * Report a exception.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Exception ex) {
-    	 if (monitor != null) {
-	        Problem problem = new ProblemImpl(this.getClass().getName(), "impl-osgi-validation-messages", Severity.ERROR, model, message, ex);
-	        monitor.problem(problem);
-    	 }
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-	        Problem problem = new ProblemImpl(this.getClass().getName(), "impl-osgi-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-    }
-    
-    public QName getArtifactType() {
-        return IMPLEMENTATION_OSGI;
-    }
-
-    public Class<OSGiImplementationImpl> getModelType() {
-        return OSGiImplementationImpl.class;
-    }
-
-    private String[] tokenize(String str) {
-        StringTokenizer tokenizer = new StringTokenizer(str);
-        String[] tokens = new String[tokenizer.countTokens()];
-        for (int i= 0; i < tokens.length; i++) {
-            tokens[i] = tokenizer.nextToken();
-        }
-        
-        return tokens;
-    }
-    
-    public OSGiImplementationImpl read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        assert IMPLEMENTATION_OSGI.equals(reader.getName());
-
-        String bundleSymbolicName = reader.getAttributeValue(null, BUNDLE_SYMBOLICNAME);
-        String bundleVersion = reader.getAttributeValue(null, BUNDLE_VERSION);
-        String imports = reader.getAttributeValue(null, IMPORTS);
-        String[] importList;
-        if (imports != null)
-            importList = tokenize(imports);
-        else
-            importList = new String[0];
-        String classes = reader.getAttributeValue(null, CLASSES);
-        String[] classList;
-        if (classes != null)
-            classList = tokenize(classes);
-        else
-            classList = new String[0];
-
-        Hashtable<String, List<ComponentProperty>> refProperties = 
-                new Hashtable<String, List<ComponentProperty>>();
-        Hashtable<String, List<ComponentProperty>> serviceProperties = 
-                new Hashtable<String, List<ComponentProperty>>();
-        Hashtable<String, List<ComponentProperty>> refCallbackProperties = 
-                new Hashtable<String, List<ComponentProperty>>();
-        Hashtable<String, List<ComponentProperty>> serviceCallbackProperties = 
-                new Hashtable<String, List<ComponentProperty>>();
-            
-        while (reader.hasNext()) {
-                
-            int next = reader.next();
-            if (next == END_ELEMENT && IMPLEMENTATION_OSGI.equals(reader.getName())) {
-                break;
-            }
-            else if (next == START_ELEMENT && PROPERTIES_QNAME.equals(reader.getName())) {
-                    
-                // FIXME: This is temporary code which allows reference and service properties used
-                //        for filtering OSGi services to be specified in <implementation.osgi/>
-                //        This should really be provided in the component type file since these
-                //        properties are associated with an implementation rather than a configured
-                //        instance of an implementation.
-                String refName = reader.getAttributeValue(null, "reference");
-                String serviceName = reader.getAttributeValue(null, "service");
-                String refCallbackName = reader.getAttributeValue(null, "referenceCallback");
-                String serviceCallbackName = reader.getAttributeValue(null, "serviceCallback");
-                List<ComponentProperty> props = readProperties(reader);
-                if (refName != null)
-                    refProperties.put(refName, props);
-                else if (serviceName != null)
-                    serviceProperties.put(serviceName, props);
-                else if (refCallbackName != null)
-                    refCallbackProperties.put(refCallbackName, props);
-                else if (serviceCallbackName != null)
-                    serviceCallbackProperties.put(serviceCallbackName, props);
-                else {
-                	error("PropertyShouldSpecifySR", reader);
-                    //throw new ContributionReadException("Properties in implementation.osgi should specify service or reference");
-                }
-            }
-
-        }
-            
-        OSGiImplementationImpl implementation = new OSGiImplementationImpl(
-                    modelFactories,
-                    bundleSymbolicName,
-                    bundleVersion,
-                    importList, 
-                    classList,
-                    refProperties,
-                    serviceProperties);
-        implementation.setCallbackProperties(refCallbackProperties, serviceCallbackProperties);
-           
-        implementation.setUnresolved(true);
-            
-        return implementation;
-        
-    }
-    
-
-    public void resolve(OSGiImplementationImpl impl, ModelResolver resolver) throws ContributionResolveException {
-        
-        try {
-        	
-        	if (impl == null || !impl.isUnresolved())
-        		return;
-        	
-        	impl.setUnresolved(false);
-            
-            BundleReference bundleReference = new BundleReference(impl.getBundleSymbolicName(), impl.getBundleVersion());
-            BundleReference resolvedBundle = resolver.resolveModel(BundleReference.class, bundleReference);
-            Bundle bundle = (Bundle)resolvedBundle.getBundle();
-            if (bundle != null) {
-                impl.setOSGiBundle(bundle);                
-            } else {
-            	error("CouldNotLocateOSGiBundle", impl, impl.getBundleSymbolicName());
-                //throw new ContributionResolveException("Could not locate OSGi bundle " + 
-                        //impl.getBundleSymbolicName());
-            	return;
-            }
-            
-            String bundleName = resolvedBundle.getBundleRelativePath();
-            String ctURI = bundleName.endsWith(".jar") || bundleName.endsWith(".JAR")? 
-                    bundleName.substring(0, bundleName.lastIndexOf(".")) : bundleName;
-            ctURI = ctURI.replaceAll("\\.", "/");
-            ctURI = ctURI + ".componentType";
-
-            ComponentType componentType = assemblyFactory.createComponentType();
-            componentType.setURI(ctURI);
-            componentType.setUnresolved(true);
-            componentType = resolver.resolveModel(ComponentType.class, componentType);
-            if (componentType.isUnresolved()) {
-            	error("MissingComponentTypeFile", impl, ctURI);
-                //throw new ContributionResolveException("missing .componentType side file " + ctURI);
-            	return;
-            }
-            
-            List<Service> services = componentType.getServices();
-            for (Service service : services) {
-                Interface interfaze = service.getInterfaceContract().getInterface();
-                if (interfaze instanceof JavaInterface) {
-                    JavaInterface javaInterface = (JavaInterface)interfaze;
-                    if (javaInterface.getJavaClass() == null) {
-                        
-                        javaInterface.setJavaClass(getJavaClass(resolver, javaInterface.getName()));
-                    }
-                    Class<?> callback = null;
-                    if (service.getInterfaceContract().getCallbackInterface() instanceof JavaInterface) {
-                        JavaInterface callbackInterface = (JavaInterface)service.getInterfaceContract().getCallbackInterface();
-                        if (callbackInterface.getJavaClass() == null) {
-                            callbackInterface.setJavaClass(getJavaClass(resolver, callbackInterface.getName()));
-                        }
-                        callback = callbackInterface.getJavaClass();
-                    }
-                    
-                    Service serv = createService(service, javaInterface.getJavaClass(), callback);
-                    impl.getServices().add(serv);
-                }
-            }
-            
-            List<Reference> references = componentType.getReferences();
-            for (Reference reference : references) {
-                Interface interfaze = reference.getInterfaceContract().getInterface();
-                if (interfaze instanceof JavaInterface) {
-                    JavaInterface javaInterface = (JavaInterface)interfaze;
-                    if (javaInterface.getJavaClass() == null) {
-                        javaInterface.setJavaClass(getJavaClass(resolver, javaInterface.getName()));
-                    }
-                    Reference ref = createReference(reference, javaInterface.getJavaClass());
-                    impl.getReferences().add(ref);
-                }
-                else
-                    impl.getReferences().add(reference);
-            }
-            
-            List<Property> properties = componentType.getProperties();
-            for (Property property : properties) {
-                impl.getProperties().add(property);
-            }
-            impl.setConstrainingType(componentType.getConstrainingType());
-            
-        } catch (InvalidInterfaceException e) {
-        	ContributionResolveException ce = new ContributionResolveException(e);
-        	error("ContributionResolveException", resolver, ce);
-            //throw ce;
-        }
-        
-    }
-    
-
-    private Class getJavaClass(ModelResolver resolver, String className) {
-        ClassReference ref = new ClassReference(className);
-        ref = resolver.resolveModel(ClassReference.class, ref);
-        return ref.getJavaClass();
-    }
-    
-    private Service createService(Service serv, Class<?> interfaze, Class<?> callbackInterfaze) throws InvalidInterfaceException {
-        Service service = assemblyFactory.createService();
-        JavaInterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract();
-        service.setInterfaceContract(interfaceContract);
-        
-        
-        // create a relative URI
-        service.setName(serv.getName());
-
-        JavaInterface callInterface = javaInterfaceFactory.createJavaInterface(interfaze);
-        service.getInterfaceContract().setInterface(callInterface);
-        
-        if (callbackInterfaze != null) {
-            JavaInterface callbackInterface = javaInterfaceFactory.createJavaInterface(callbackInterfaze);
-            service.getInterfaceContract().setCallbackInterface(callbackInterface);
-        }
-        else if (callInterface.getCallbackClass() != null) {
-            JavaInterface callbackInterface = javaInterfaceFactory.createJavaInterface(callInterface.getCallbackClass());
-            service.getInterfaceContract().setCallbackInterface(callbackInterface);
-        }
-        return service;
-    }
-    
-    private Reference createReference(Reference ref, Class<?> clazz) throws InvalidInterfaceException {
-        org.apache.tuscany.sca.assembly.Reference reference = assemblyFactory.createReference();
-        JavaInterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract();
-        reference.setInterfaceContract(interfaceContract);
-        
-        reference.setName(ref.getName());
-        reference.setMultiplicity(ref.getMultiplicity());
-
-        JavaInterface callInterface = javaInterfaceFactory.createJavaInterface(clazz);
-        reference.getInterfaceContract().setInterface(callInterface);
-        if (callInterface.getCallbackClass() != null) {
-            JavaInterface callbackInterface = javaInterfaceFactory.createJavaInterface(callInterface.getCallbackClass());
-            reference.getInterfaceContract().setCallbackInterface(callbackInterface);
-        }
-       
-        return reference;
-    }
-
-    public void write(OSGiImplementationImpl model, XMLStreamWriter outputSource) throws ContributionWriteException, XMLStreamException {
-        
-        //FIXME Implement this method
-    }
-    
-  
-    private QName getQNameValue(XMLStreamReader reader, String value) {
-        if (value != null) {
-            int index = value.indexOf(':');
-            String prefix = index == -1 ? "" : value.substring(0, index);
-            String localName = index == -1 ? value : value.substring(index + 1);
-            String ns = reader.getNamespaceContext().getNamespaceURI(prefix);
-            if (ns == null) {
-                ns = "";
-            }
-            return new QName(ns, localName, prefix);
-        } else {
-            return null;
-        }
-    }
-    
-    private void declareNamespace(Element element, String prefix, String ns) {
-        String qname = null;
-        if ("".equals(prefix)) {
-            qname = "xmlns";
-        } else {
-            qname = "xmlns:" + prefix;
-        }
-        Node node = element;
-        boolean declared = false;
-        while (node != null && node.getNodeType() == Node.ELEMENT_NODE) {
-            NamedNodeMap attrs = node.getAttributes();
-            if (attrs == null) {
-                break;
-            }
-            Node attr = attrs.getNamedItem(qname);
-            if (attr != null) {
-                declared = ns.equals(attr.getNodeValue());
-                break;
-            }
-            node = node.getParentNode();
-        }
-        if (!declared) {
-            org.w3c.dom.Attr attr = element.getOwnerDocument().createAttributeNS(XMLNS_ATTRIBUTE_NS_URI, qname);
-            attr.setValue(ns);
-            element.setAttributeNodeNS(attr);
-        }
-    }
-    
-    private Element createElement(Document document, QName name) {
-        String prefix = name.getPrefix();
-        String qname = (prefix != null && prefix.length() > 0) ? prefix + ":" + name.getLocalPart() : name
-            .getLocalPart();
-        return document.createElementNS(name.getNamespaceURI(), qname);
-    }
-
-    private void loadElement(XMLStreamReader reader, Element root) throws XMLStreamException {
-        Document document = root.getOwnerDocument();
-        Node current = root;
-        while (true) {
-            switch (reader.next()) {
-                case XMLStreamConstants.START_ELEMENT:
-                    QName name = reader.getName();
-                    Element child = createElement(document, name);
-
-                    // push the new element and make it the current one
-                    current.appendChild(child);
-                    current = child;
-
-                    declareNamespace(child, name.getPrefix(), name.getNamespaceURI());
-
-                    int count = reader.getNamespaceCount();
-                    for (int i = 0; i < count; i++) {
-                        String prefix = reader.getNamespacePrefix(i);
-                        String ns = reader.getNamespaceURI(i);
-                        declareNamespace(child, prefix, ns);
-                    }
-
-                    // add the attributes for this element
-                    count = reader.getAttributeCount();
-                    for (int i = 0; i < count; i++) {
-                        String ns = reader.getAttributeNamespace(i);
-                        String prefix = reader.getAttributePrefix(i);
-                        String localPart = reader.getAttributeLocalName(i);
-                        String value = reader.getAttributeValue(i);
-                        child.setAttributeNS(ns, localPart, value);
-                        declareNamespace(child, prefix, ns);
-                    }
-
-                    break;
-                case XMLStreamConstants.CDATA:
-                    current.appendChild(document.createCDATASection(reader.getText()));
-                    break;
-                case XMLStreamConstants.CHARACTERS:
-                    current.appendChild(document.createTextNode(reader.getText()));
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    // if we are back at the root then we are done
-                    if (current == root) {
-                        return;
-                    }
-
-                    // pop the element off the stack
-                    current = current.getParentNode();
-            }
-        }
-    }
-    
-    private Document readPropertyValue(XMLStreamReader reader, QName type)
-            throws XMLStreamException, ParserConfigurationException {
-    
-        Document doc = domFactory.newDocumentBuilder().newDocument();
-
-        // root element has no namespace and local name "value"
-        Element root = doc.createElementNS(null, "value");
-        if (type != null) {
-            org.w3c.dom.Attr xsi = doc.createAttributeNS(XMLNS_ATTRIBUTE_NS_URI, "xmlns:xsi");
-             xsi.setValue(W3C_XML_SCHEMA_INSTANCE_NS_URI);
-            root.setAttributeNodeNS(xsi);
-
-            String prefix = type.getPrefix();
-            if (prefix == null || prefix.length() == 0) {
-                prefix = "ns";
-            }
-
-            declareNamespace(root, prefix, type.getNamespaceURI());
-
-            org.w3c.dom.Attr xsiType = doc.createAttributeNS(W3C_XML_SCHEMA_INSTANCE_NS_URI, "xsi:type");
-            xsiType.setValue(prefix + ":" + type.getLocalPart());
-            root.setAttributeNodeNS(xsiType);
-        }
-        doc.appendChild(root);
-
-        loadElement(reader, root);
-        return doc;
-    }
-    
-    private  void readProperty(ComponentProperty prop, XMLStreamReader reader)
-            throws XMLStreamException, ContributionReadException {
-        
-    
-        prop.setName(reader.getAttributeValue(null, "name"));
-        String xsdType = reader.getAttributeValue(null, "type");
-        if (xsdType != null)       
-            prop.setXSDType(getQNameValue(reader, xsdType));
-        else
-            prop.setXSDType(SimpleTypeMapperImpl.XSD_STRING);
-        
-        try {
-            Document value = readPropertyValue(reader, prop.getXSDType());
-            prop.setValue(value);
-        } catch (ParserConfigurationException e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", reader, ce);
-            throw ce;
-        }
-    }
-    
-    private  List<ComponentProperty> readProperties(XMLStreamReader reader)
-            throws XMLStreamException, ContributionReadException {
-        
-        List<ComponentProperty> properties = new ArrayList<ComponentProperty>();
-        
-        while (reader.hasNext()) {
-            
-            int next = reader.next();
-            if (next == END_ELEMENT && PROPERTIES_QNAME.equals(reader.getName())) {
-                break;
-            }
-            else if (next == START_ELEMENT && PROPERTY_QNAME.equals(reader.getName())) {
-                
-                ComponentProperty componentProperty = assemblyFactory.createComponentProperty();
-                readProperty(componentProperty, reader);
-                properties.add(componentProperty);
-            }
-        }
-        
-        return properties;
-
-    }
-   
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 9ecff71874..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.osgi.xml.OSGiImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#implementation.osgi,model=org.apache.tuscany.sca.implementation.osgi.OSGiImplementation
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca-contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index c2cd957351..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the implementation extension

-org.apache.tuscany.sca.implementation.osgi.runtime.OSGiImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.osgi.OSGiImplementation

diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties b/java/sca-contrib/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
deleted file mode 100644
index 2503be0b13..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
+++ /dev/null
@@ -1,25 +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.
-#
-#
-ContributionReadException = ContributionReadException occured due to:
-ContributionResolveException = ContributionResolveException occured due to:
-PropertyShouldSpecifySR = Properties in implementation.osgi should specify service or reference
-CouldNotLocateOSGiBundle = Could not locate OSGi bundle: {0}
-MissingComponentTypeFile = Missing .componentType side file: {0}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java b/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
deleted file mode 100644
index fb4cb4207a..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.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 org.apache.tuscany.sca.implementation.osgi.runtime;
-
-import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestBundles;
-import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface;
-import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestWithPropertyImpl;
-
-
-/**
- * 
- * Test the execution of an OSGi implementation type
- *
- * @version $Rev$ $Date$
- */
-public class OSGiPropertyTestCase extends OSGiTestCase {
-    
-    @Override
-    protected void setUp() throws Exception {
-        
-        className = OSGiTestWithPropertyImpl.class.getName();
-        compositeName = "osgiproptest.composite";
-        
-        OSGiTestBundles.createBundle("target/test-classes/OSGiTestService.jar", 
-                OSGiTestInterface.class, 
-                OSGiTestWithPropertyImpl.class);        
-        
-    }
-    
-    
-
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java b/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
deleted file mode 100644
index 6a6d80f15e..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
+++ /dev/null
@@ -1,74 +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.implementation.osgi.runtime;
-
-import java.lang.reflect.Proxy;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestBundles;
-import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestImpl;
-import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-
-/**
- * 
- * Test the execution of an OSGi implementation type
- *
- * @version $Rev$ $Date$
- */
-public class OSGiTestCase extends TestCase {
-    
-    protected String className;
-    protected String compositeName;
-    
-    protected void setUp() throws Exception {
-
-        className = OSGiTestImpl.class.getName();
-        compositeName = "osgitest.composite";
-        OSGiTestBundles.createBundle("target/test-classes/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class);
-        
-    }
-   
-    
-    @Override
-    protected void tearDown() throws Exception {
-        OSGiRuntime.stop();
-    }
-    
-    public void testOSGiComponent() throws Exception {
-        
-        SCADomain scaDomain = SCADomain.newInstance(compositeName);
-        OSGiTestInterface testService = scaDomain.getService(OSGiTestInterface.class, "OSGiTestServiceComponent");
-        assert(testService != null);
-        
-        assert(testService instanceof Proxy);
-        
-        String str = testService.testService();
-        
-        assertEquals(className, str);
-
-        scaDomain.close();
-              
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
deleted file mode 100644
index 93b4dee033..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
+++ /dev/null
@@ -1,116 +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.implementation.osgi.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.net.URL;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-
-
-/**
- * 
- * Utility class to create OSGi bundles
- *
- * @version $Rev$ $Date$
- */
-public class OSGiTestBundles {
-    private static String getPackageName(Class<?> cls) {
-        String name = cls.getName();
-        int index = name.lastIndexOf('.');
-        return index == -1 ? "" : name.substring(0, index);
-    }
-    
-    public static void createBundle(String jarName,
-            Class<?> interfaceClass, Class<?> implClass) throws Exception {
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-        String EOL = System.getProperty("line.separator");
-        
-        String packageName = getPackageName(interfaceClass);
-        String bundleName = interfaceClass.getName();
-
-        String manifestStr = "Manifest-Version: 1.0" + EOL
-                + "Bundle-ManifestVersion: 2" + EOL + "Bundle-Name: "
-                + bundleName + EOL + "Bundle-SymbolicName: " + bundleName + EOL
-                + "Bundle-Version: " + "1.0.0" + EOL
-                + "Bundle-Localization: plugin" + EOL;
-
-        StringBuilder manifestBuf = new StringBuilder();
-        manifestBuf.append(manifestStr);
-        manifestBuf.append("Export-Package: " + packageName + EOL);
-        manifestBuf.append("Import-Package: org.osgi.framework" + EOL);
-        manifestBuf.append("Bundle-Activator: " + implClass.getName() + EOL);
-
-        ByteArrayInputStream manifestStream = new ByteArrayInputStream(manifestBuf.toString().getBytes());
-        Manifest manifest = new Manifest();
-        manifest.read(manifestStream);
-        
-
-        JarOutputStream jarOut = new JarOutputStream(out, manifest);
-
-        String interfaceClassName = interfaceClass.getName().replaceAll("\\.",
-                "/")
-                + ".class";
-
-        URL url = interfaceClass.getClassLoader().getResource(
-                interfaceClassName);
-        String path = url.getPath();
-
-        ZipEntry ze = new ZipEntry(interfaceClassName);
-
-        jarOut.putNextEntry(ze);
-        FileInputStream file = new FileInputStream(path);
-        byte[] fileContents = new byte[file.available()];
-        file.read(fileContents);
-        jarOut.write(fileContents);
-        
-        String implClassName = implClass.getName().replaceAll("\\.",
-                "/")
-                + ".class";
-
-        url = implClass.getClassLoader().getResource(implClassName);
-        path = url.getPath();
-
-        ze = new ZipEntry(implClassName);
-
-        jarOut.putNextEntry(ze);
-        file = new FileInputStream(path);
-        fileContents = new byte[file.available()];
-        file.read(fileContents);
-        jarOut.write(fileContents);
-
-        file.close();
-
-        jarOut.close();
-        out.close();
-
-        FileOutputStream fileOut = new FileOutputStream(jarName);
-        fileOut.write(out.toByteArray());
-        fileOut.close();
-
-
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java b/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
deleted file mode 100644
index d412f6bd6a..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
+++ /dev/null
@@ -1,51 +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.implementation.osgi.test;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * 
- * Test class - Implementation of an OSGi service
- *
- * @version $Rev$ $Date$
- */
-public class OSGiTestImpl implements OSGiTestInterface, BundleActivator {
-    
-    public String testService() {
-        
-        return OSGiTestImpl.class.getName();
-        
-    }
-
-    public void start(BundleContext bc) throws Exception {
-        
-        bc.registerService(OSGiTestInterface.class.getName(), this, new Hashtable<String, Object>());
-        
-    }
-
-    public void stop(BundleContext bc) throws Exception {
-    }
-
-    
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java b/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
deleted file mode 100644
index feb9ce177e..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.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 org.apache.tuscany.sca.implementation.osgi.test;
-
-/**
- *
- * Test class - Interface for an OSGi service
- *
- * @version $Rev$ $Date$
- */
-public interface OSGiTestInterface {
-
-    String testService() throws Exception ;
-
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java b/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
deleted file mode 100644
index e59032e3ea..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
+++ /dev/null
@@ -1,66 +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.implementation.osgi.test;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.oasisopen.sca.annotation.Property;
-
-/**
- * 
- * Test class - Implementation of an OSGi service
- *
- * @version $Rev$ $Date$
- */
-public class OSGiTestWithPropertyImpl implements OSGiTestInterface, BundleActivator {
-    
-    @Property
-    public double exchangeRate;
-    
-    private String currency;
-    
-    @Property
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-    
-    public String testService() throws Exception {
-        
-        if (exchangeRate != 2.0)
-            throw new Exception("Property exchangeRate not set correctly, expected 2.0, got " + exchangeRate);
-        if (!"USD".equals(currency))
-            throw new Exception("Property currency not set correctly, expected USD, got " + currency);
-        return OSGiTestWithPropertyImpl.class.getName();
-        
-    }
-
-    public void start(BundleContext bc) throws Exception {
-        
-        bc.registerService(OSGiTestInterface.class.getName(), this, new Hashtable<String, Object>());
-        
-    }
-
-    public void stop(BundleContext bc) throws Exception {
-    }
-
-    
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
deleted file mode 100644
index 1831587896..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
+++ /dev/null
@@ -1,132 +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.implementation.osgi.xml;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.implementation.osgi.impl.OSGiImplementationImpl;
-import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestBundles;
-import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestImpl;
-import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-
-/**
- * Test reading OSGi implementations.
- *
- * @version $Rev$ $Date$
- */
-public class OSGiReadImplTestCase extends TestCase {
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private CompositeBuilder compositeBuilder;
-
-    @Override
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-        
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper, null);
-
-        OSGiTestBundles.createBundle("target/test-classes/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class);
-
-    }
-
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getClassLoader().getResourceAsStream("osgitest.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-
-        compositeBuilder.build(composite);
-    }
-
-    public void testReadAndResolveComposite() throws Exception {
-        InputStream is = getClass().getClassLoader().getResourceAsStream("osgitest.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-        
-        is = getClass().getClassLoader().getResourceAsStream("OSGiTestService.componentType");
-        reader = inputFactory.createXMLStreamReader(is);
-        ComponentType componentType = (ComponentType)staxProcessor.read(reader);
-
-        ModelResolver resolver = new TestModelResolver(getClass().getClassLoader());
-        staxProcessor.resolve(componentType, resolver);
-        resolver.addModel(componentType);
-        
-        staxProcessor.resolve(composite, resolver);
-
-        compositeBuilder.build(composite);
-    }
-
-    public void testReadOSGiImplementation() throws Exception {
-
-        String str = "<?xml version=\"1.0\" encoding=\"ASCII\"?>" +
-                     "<implementation.osgi xmlns=\"http://tuscany.apache.org/xmlns/sca/1.0\" targetNamespace=\"http://osgi\" " +
-                     "bundleSymbolicName=\"OSGiTestService\" " +
-                     "bundleVersion=\"2.0.0\" " +
-                     "imports=\"import1.jar import2.jar\"" +
-                     "/>";
-        ByteArrayInputStream is = new ByteArrayInputStream(str.getBytes());
-
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        reader.next();
-
-        OSGiImplementationImpl osgiImpl = (OSGiImplementationImpl)staxProcessor.read(reader);
-
-        assertEquals(osgiImpl.getBundleSymbolicName(), "OSGiTestService");
-        assertEquals(osgiImpl.getBundleVersion(), "2.0.0");
-        assertTrue(osgiImpl.getImports().length == 2);
-        assertEquals(osgiImpl.getImports()[0], "import1.jar");
-        assertEquals(osgiImpl.getImports()[1], "import2.jar");
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
deleted file mode 100644
index e1bbd97655..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
+++ /dev/null
@@ -1,106 +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.implementation.osgi.xml;
-
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.implementation.osgi.impl.OSGiImplementationImpl;
-
-
-/**
- * A default implementation of an artifact resolver, based on a map.
- *
- * @version $Rev$ $Date$
- */
-public class TestModelResolver implements ModelResolver {
-    private static final long serialVersionUID = -7826976465762296634L;
-    
-    private Map<Object, Object> map = new HashMap<Object, Object>();
-    
-    private WeakReference<ClassLoader> classLoader;
-    
-    public TestModelResolver(ClassLoader classLoader) {
-        this.classLoader = new WeakReference<ClassLoader>(classLoader);
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        Object resolved = map.get(unresolved);
-        if (resolved != null) {
-            
-            if (unresolved instanceof OSGiImplementationImpl && !(resolved instanceof OSGiImplementationImpl)) {
-                
-                OSGiImplementationImpl impl = ((OSGiImplementationImpl)unresolved);
-                ComponentType componentType = (ComponentType)resolved;
-                
-                List<Property> properties = componentType.getProperties();
-                for (Property property : properties) {
-                    impl.getProperties().add(property);
-                }
-                impl.setUnresolved(false);
-                return unresolved;
-            }
-                
-            
-            // Return the resolved object
-            return modelClass.cast(resolved);
-            
-        } else if (unresolved instanceof ClassReference) {
-            
-            // Load a class on demand
-            ClassReference classReference = (ClassReference)unresolved;
-            Class clazz;
-            try {
-                clazz = Class.forName(classReference.getClassName(), true, classLoader.get());
-            } catch (ClassNotFoundException e) {
-                
-                // Return the unresolved object
-                return unresolved;
-            }
-            
-            // Store a new ClassReference wrapping the loaded class
-            resolved = new ClassReference(clazz);
-            map.put(resolved, resolved);
-            
-            // Return the resolved ClassReference
-            return modelClass.cast(resolved);
-           
-        } else {
-            
-            // Return the unresolved object
-            return unresolved;
-        }
-    }
-    
-    public void addModel(Object resolved) {
-        map.put(resolved, resolved);
-    }
-    
-    public Object removeModel(Object resolved) {
-        return map.remove(resolved);
-    }
-    
-}
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType b/java/sca-contrib/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
deleted file mode 100644
index 254ce99d59..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="OSGiTestService">
-        <interface.java interface="org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface"/>
-    </service>
-    
-    <property name="currency" type="xsd:string" >GBP</property> 
-    <property name="exchangeRate" type="xsd:double" >1.0</property> 
-    
-</componentType>
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/resources/osgiproptest.composite b/java/sca-contrib/modules/implementation-osgi/src/test/resources/osgiproptest.composite
deleted file mode 100644
index 0b31145407..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/test/resources/osgiproptest.composite
+++ /dev/null
@@ -1,37 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

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

-           name="OSGiTestComposite">

-

-    <component name="OSGiTestServiceComponent">

-        <tuscany:implementation.osgi 

-            bundle="OSGiTestService" 

-            bundleSymbolicName="org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface"

-            classes="org.apache.tuscany.sca.implementation.osgi.test.OSGiTestWithPropertyImpl"

-        />

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/resources/osgitest.composite b/java/sca-contrib/modules/implementation-osgi/src/test/resources/osgitest.composite
deleted file mode 100644
index 5465eec8d9..0000000000
--- a/java/sca-contrib/modules/implementation-osgi/src/test/resources/osgitest.composite
+++ /dev/null
@@ -1,36 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

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

-           name="OSGiTestComposite">

-

-    <component name="OSGiTestServiceComponent">

-        <tuscany:implementation.osgi 

-            bundle="OSGiTestService" 

-            bundleSymbolicName="org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface"

-        />

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-pojo/LICENSE b/java/sca-contrib/modules/implementation-pojo/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/implementation-pojo/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-pojo/META-INF/MANIFEST.MF
deleted file mode 100644
index 298921a55f..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.pojo

-Private-Package: org.apache.tuscany.sca.implementation.java.impl;versi

- on="1.4",org.apache.tuscany.sca.implementation.java.introspect.impl;v

- ersion="1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Java Implementation Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397153500

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Java Implementation Model

-Import-Package: javax.jws,

- javax.xml.namespace,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.impl;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java.impl;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.policy.util;version="2.0.0",

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/implementation-pojo/NOTICE b/java/sca-contrib/modules/implementation-pojo/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/implementation-pojo/pom.xml b/java/sca-contrib/modules/implementation-pojo/pom.xml
deleted file mode 100644
index 2a93a36593..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/pom.xml
+++ /dev/null
@@ -1,68 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-implementation-pojo</artifactId>
-    <name>Apache Tuscany SCA Implementation Pojo Model</name>
-
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.jws</groupId>
-            <artifactId>jsr181-api</artifactId>
-            <version>1.0-MR1</version>
-        </dependency>
-    </dependencies>
-
-
-
-</project>
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java b/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java
deleted file mode 100644
index 5f81353606..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java
+++ /dev/null
@@ -1,42 +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.pojo;
-
-import java.lang.reflect.Constructor;
-
-
-/**
- * Hold injection information for the constructor used to instantiate a
- * component implementation instance
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaConstructor<T> {
-
-	/**
-	 * @return the constructor
-	 */
-	Constructor<T> getConstructor();
-
-	/**
-	 * @return the parameters
-	 */
-	JavaParameter[] getParameters();
-
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java b/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java
deleted file mode 100644
index 19d452d07f..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java
+++ /dev/null
@@ -1,92 +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.pojo;
-
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Type;
-
-
-/**
- * This class represents a java element such as a Package, Class, Constructor,
- * Field, Method or Parameter.
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaElement {
-
-	/**
-	 * @return the anchor
-	 */
-	AnnotatedElement getAnchor();
-
-	/**
-	 * @return the elementType
-	 */
-	ElementType getElementType();
-
-	/**
-	 * @return the genericType
-	 */
-	Type getGenericType();
-
-	/**
-	 * @return the index
-	 */
-	int getIndex();
-
-	/**
-	 * @return the type
-	 */
-	Class<?> getType();
-
-	/**
-	 * @return the annotations
-	 */
-	Annotation[] getAnnotations();
-
-	/**
-	 * Return a given annotation
-	 * @param annotationType the annotation type
-	 * @return the annotation
-	 */
-	<T extends Annotation> T getAnnotation(Class<T> annotationType);
-
-	/**
-	 * @return the name
-	 */
-	String getName();
-
-	/**
-	 * @param name the name to set
-	 */
-	void setName(String name);
-
-	/**
-	 * @return the classifier
-	 */
-	Class<? extends Annotation> getClassifer();
-
-	/**
-	 * @param classifer the classifier to set
-	 */
-	void setClassifer(Class<? extends Annotation> classifer);
-
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaFactory.java b/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaFactory.java
deleted file mode 100644
index 28375c86f8..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaFactory.java
+++ /dev/null
@@ -1,82 +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.pojo;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-/**
- * Factory for the Java model used during introspection of java class/interfaces
- * 
- * @version $Rev$ $Date$
- */
-
-public interface JavaFactory {
-
-	/**
-	 * Create a model representing a java constructor
-	 * @param clazz
-	 * @return the java constructor
-	 */
-    JavaConstructor<?> createJavaConstructor(Constructor<?> constructor);
-    
-    /**
-     * Create model representing a java class
-     * @param clazz the class 
-     * @return the java element representing the class
-     */
-    JavaElement createJavaElement(Class<?> clazz);
-    
-    /**
-     * Create a model representing a java property 
-     * @param field the property
-     * @return the java element representing the property
-     */
-    JavaElement createJavaElement(Field field);
-    
-    /**
-     * Create a model representing a java constructor
-     * @param constructor the constructor
-     * @param index the constructor position
-     * @return the java element representing the constructor
-     */
-    JavaElement createJavaElement(Constructor<?> constructor, int index);
-    
-    /**
-     * Create a model representing a java method
-     * @param method the method
-     * @param index the method position
-     * @return the java element representing the constructor
-     */
-    JavaElement createJavaElement(Method method, int index);
-    
-    /**
-     * Create a model representing a java parameter
-     * @return the parameter
-     */
-    JavaParameter createJavaParameter(Constructor<?> constructor, int index);
-    
-    /**
-     * Create a model representing a java resource
-     * @return
-     */
-    JavaResource createJavaResource(JavaElement element);
-    
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java b/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java
deleted file mode 100644
index d5ded915db..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java
+++ /dev/null
@@ -1,29 +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.pojo;
-
-/**
- * This class represents a java element such as a Package, Class, Constructor,
- * Field, Method or Parameter.
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaParameter extends JavaElement {
-
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java b/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java
deleted file mode 100644
index 38fbf75a71..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java
+++ /dev/null
@@ -1,65 +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.pojo;
-
-
-/**
- * A resource dependency declared by a Java component implementation
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaResource {
-
-	/**
-	 * The name of the resource
-	 * 
-	 * @return the name of the resource
-	 */
-	String getName();
-
-	/**
-	 * Returns the URI of the resource
-	 * 
-	 * @return the URI of the resource
-	 */
-	String getMappedName();
-
-	/**
-	 * Sets the resource URI
-	 */
-	void setMappedName(String mappedName);
-
-	/**
-	 * If true, the resource is optional
-	 * 
-	 * @return true if the resource is optional
-	 */
-	boolean isOptional();
-
-	/**
-	 * Sets whether the resource is optional
-	 */
-	void setOptional(boolean optional);
-
-	/**
-	 * @return the element
-	 */
-	JavaElement getElement();
-
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java b/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java
deleted file mode 100644
index 36a87420ab..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java
+++ /dev/null
@@ -1,54 +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.pojo.impl;
-
-import java.lang.reflect.Constructor;
-
-import org.apache.tuscany.sca.pojo.JavaConstructor;
-
-
-/**
- * Hold injection information for the constructor used to instantiate a
- * component implementation instance
- * 
- * @version $Rev$ $Date$
- */
-public class JavaConstructorImpl<T> implements JavaConstructor<T> {
-    private Constructor<T> constructor;
-    private JavaParameterImpl[] parameters;
-
-    public JavaConstructorImpl(Constructor<T> constructor) {
-        this.constructor = constructor;
-        int size = constructor.getParameterTypes().length;
-        parameters = new JavaParameterImpl[size];
-        for (int i = 0; i < size; i++) {
-            parameters[i] = new JavaParameterImpl(constructor, i);
-        }
-    }
-
-
-    public Constructor<T> getConstructor() {
-        return constructor;
-    }
-
-
-    public JavaParameterImpl[] getParameters() {
-        return parameters;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java b/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java
deleted file mode 100644
index fc3ca3238f..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java
+++ /dev/null
@@ -1,194 +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.pojo.impl;
-
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-
-import org.apache.tuscany.sca.pojo.JavaElement;
-
-/**
- * This class represents a java element such as a Package, Class, Constructor,
- * Field, Method or Parameter.
- * 
- * @version $Rev$ $Date$
- */
-public class JavaElementImpl implements JavaElement {
-    private AnnotatedElement anchor;
-    private ElementType elementType;
-    private Class<?> type;
-    private Type genericType;
-    private int index = -1;
-    private String name;
-    private Class<? extends Annotation> classifer;
-
-    public JavaElementImpl(Class<?> clazz) {
-        this.anchor = clazz;
-        this.elementType = ElementType.TYPE;
-        this.type = clazz;
-        this.genericType = clazz;
-        this.name = clazz.getName();
-    }
-
-    public JavaElementImpl(Field field) {
-        this.anchor = field;
-        this.elementType = ElementType.FIELD;
-        this.type = field.getType();
-        this.genericType = field.getGenericType();
-        this.name = field.getName();
-    }
-
-    public JavaElementImpl(Constructor<?> constructor, int index) {
-        this.anchor = constructor;
-        this.elementType = ElementType.PARAMETER;
-        this.type = constructor.getParameterTypes()[index];
-        this.genericType = constructor.getGenericParameterTypes()[index];
-        this.index = index;
-        this.name = "";
-    }
-
-    public JavaElementImpl(Method method, int index) {
-        this.anchor = method;
-        this.elementType = ElementType.PARAMETER;
-        this.type = method.getParameterTypes()[index];
-        this.genericType = method.getGenericParameterTypes()[index];
-        this.index = index;
-        this.name = "";
-    }
-
-    /**
-     * For testing purpose
-     * 
-     * @param name
-     * @param type
-     * @param classifer TODO
-     * @param elementType
-     */
-    public JavaElementImpl(String name, Class<?> type, Class<? extends Annotation> classifer) {
-        super();
-        this.type = type;
-        this.name = name;
-        this.classifer = classifer;
-    }
-
-    public AnnotatedElement getAnchor() {
-        return anchor;
-    }
-
-    public ElementType getElementType() {
-        return elementType;
-    }
-
-    public Type getGenericType() {
-        return genericType;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-
-    public Class<?> getType() {
-        return type;
-    }
-
-    public Annotation[] getAnnotations() {
-        if (elementType == ElementType.PARAMETER) {
-            if (anchor instanceof Method) {
-                // We only care about the method-level annotations
-                return ((Method)anchor).getAnnotations();
-            }
-            if (anchor instanceof Constructor) {
-                return ((Constructor<?>)anchor).getParameterAnnotations()[index];
-            }
-        }
-        return anchor.getAnnotations();
-    }
-
-    public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
-        for (Annotation a : getAnnotations()) {
-            if (a.annotationType() == annotationType) {
-                return annotationType.cast(a);
-            }
-        }
-        return null;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Class<? extends Annotation> getClassifer() {
-        return classifer;
-    }
-
-    public void setClassifer(Class<? extends Annotation> classifer) {
-        this.classifer = classifer;
-    }
-    
-
-    @Override
-    public String toString() {
-        return anchor.toString() + (elementType == ElementType.PARAMETER ? "[" + index + "]" : "");
-    }
-
-    @Override
-    public int hashCode() {
-        final int PRIME = 31;
-        int result = 1;
-        result = PRIME * result + ((anchor == null) ? 0 : anchor.hashCode());
-        result = PRIME * result + index;
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final JavaElementImpl other = (JavaElementImpl)obj;
-        if (anchor == null) {
-            if (other.anchor != null) {
-                return false;
-            }
-        } else if (!anchor.equals(other.anchor)) {
-            return false;
-        }
-        if (index != other.index) {
-            return false;
-        }
-        return true;
-    }    
-
-}
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaFactoryImpl.java b/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaFactoryImpl.java
deleted file mode 100644
index d1b7d4c5ad..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaFactoryImpl.java
+++ /dev/null
@@ -1,74 +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.pojo.impl;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.pojo.JavaConstructor;
-import org.apache.tuscany.sca.pojo.JavaElement;
-import org.apache.tuscany.sca.pojo.JavaFactory;
-import org.apache.tuscany.sca.pojo.JavaParameter;
-import org.apache.tuscany.sca.pojo.JavaResource;
-
-/**
- * Factory for the Java model used during introspection of java class/interfaces
- * 
- * @version $Rev$ $Date$
- */
-
-public class JavaFactoryImpl implements JavaFactory {
-
-	public void JavaFactory() {
-		
-	}
-	
-	public JavaConstructor<?> createJavaConstructor(Constructor<?> constructor){
-    	return new JavaConstructorImpl(constructor);
-    }
-
-	public JavaElement createJavaElement(Class<?> clazz) {
-		return new JavaElementImpl(clazz);
-	}
-	
-	public JavaElement createJavaElement(Field field){
-		return new JavaElementImpl(field);
-
-	}
-
-	public JavaElement createJavaElement(Constructor<?> constructor, int index) {
-		return new JavaElementImpl(constructor, index);
-
-	}
-
-	public JavaElement createJavaElement(Method method, int index) {
-		return new JavaElementImpl(method, index);
-	}
-
-    public JavaParameter createJavaParameter(Constructor<?> constructor, int index) {
-    	return new JavaParameterImpl(constructor, index);
-    }
-    
-    public JavaResource createJavaResource(JavaElement element) {
-    	return new JavaResourceImpl(element);
-    }
-    
-}
-
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java b/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java
deleted file mode 100644
index 417644be14..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.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.pojo.impl;
-
-import java.lang.reflect.Constructor;
-
-import org.apache.tuscany.sca.pojo.JavaParameter;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaParameterImpl extends JavaElementImpl implements JavaParameter {
-    /**
-     * @param constructor
-     * @param index
-     */
-    public JavaParameterImpl(Constructor<?> constructor, int index) {
-        super(constructor, index);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java b/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java
deleted file mode 100644
index 5a36a21db8..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java
+++ /dev/null
@@ -1,63 +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.pojo.impl;
-
-import org.apache.tuscany.sca.pojo.JavaElement;
-import org.apache.tuscany.sca.pojo.JavaResource;
-
-/**
- * A resource dependency declared by a Java component implementation
- * 
- * @version $Rev$ $Date$
- */
-public class JavaResourceImpl implements JavaResource {
-    private JavaElement element;
-    private String mappedName;
-    private boolean optional;
-
-    public JavaResourceImpl(JavaElement element) {
-        this.element = element;
-    }
-
-    public String getName() {
-        return element.getName();
-    }
-
-    public String getMappedName() {
-        return mappedName;
-    }
-
-    public void setMappedName(String mappedName) {
-        this.mappedName = mappedName;
-    }
-
-    public boolean isOptional() {
-        return optional;
-    }
-
-    public void setOptional(boolean optional) {
-        this.optional = optional;
-    }
-
-    public JavaElement getElement() {
-        return element;
-    }
-
-
-}
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.pojo.JavaFactory b/java/sca-contrib/modules/implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.pojo.JavaFactory
deleted file mode 100644
index 5ed06a8dcd..0000000000
--- a/java/sca-contrib/modules/implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.pojo.JavaFactory
+++ /dev/null
@@ -1,20 +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. 

-

-

-# Implementation class for the java model factory

-org.apache.tuscany.sca.pojo.impl.JavaFactoryImpl
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/LICENSE b/java/sca-contrib/modules/implementation-resource-runtime/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/implementation-resource-runtime/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/implementation-resource-runtime/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 586b890ecc..0000000000
--- a/java/sca-contrib/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.implementation.resource.provid

- er;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Resource Implementation Runtime

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397274609

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Resource Implementation Runtime

-Import-Package: 

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.data.collection;version="2.0.0",

- org.apache.tuscany.sca.implementation.resource;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.resource.ru

- ntime

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/implementation-resource-runtime/NOTICE b/java/sca-contrib/modules/implementation-resource-runtime/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/implementation-resource-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/implementation-resource-runtime/pom.xml b/java/sca-contrib/modules/implementation-resource-runtime/pom.xml
deleted file mode 100644
index 3f28bd9480..0000000000
--- a/java/sca-contrib/modules/implementation-resource-runtime/pom.xml
+++ /dev/null
@@ -1,67 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-implementation-resource-runtime</artifactId>
-    <name>Apache Tuscany SCA Resource Implementation Runtime</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java b/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
deleted file mode 100644
index 582795625d..0000000000
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
+++ /dev/null
@@ -1,67 +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.implementation.resource.provider;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-/**
- * An invoker for a get resource operation.
- *
- * @version $Rev$ $Date$
- */
-class GetResourceInvoker implements Invoker {
-    private String locationURL;
-    
-    GetResourceInvoker(String locationURL) {
-        this.locationURL = locationURL;
-    }
-    
-    public Message invoke(Message msg) {
-        
-        // Get the resource id from the request message
-        String id = (String)((Object[])msg.getBody())[0];
-        try {
-            
-            // Return an input stream for the resource
-            URL url = new URL(locationURL +'/' + id);
-            URLConnection connection = url.openConnection();
-            connection.setUseCaches(false);
-            InputStream is = connection.getInputStream();
-            msg.setBody(is);
-        } catch (MalformedURLException e) {
-
-            // Report exception as a fault
-            msg.setFaultBody(e);
-        } catch (IOException e) {
-
-            // Report exception as a fault
-            msg.setFaultBody(e);
-        }
-        return msg;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java b/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
deleted file mode 100644
index a974f68a7e..0000000000
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.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.implementation.resource.provider;
-
-import org.apache.tuscany.sca.implementation.resource.ResourceImplementation;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * The model representing a resource implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-class ResourceImplementationProvider implements ImplementationProvider {
-    
-    private ResourceImplementation implementation;
-
-    /**
-     * Constructs a new resource implementation provider.
-     */
-    ResourceImplementationProvider(RuntimeComponent component, ResourceImplementation implementation) {
-        this.implementation = implementation;
-    }
-
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        if ("get".equals(operation.getName())) {
-            
-            // Return an instance of our get resource invoker
-            Invoker invoker = new GetResourceInvoker(implementation.getLocationURL().toString());
-            return invoker;
-            
-        } else {
-            
-            // Return a dummy invoker that returns an "unsupported operation"
-            // exception for now
-            return new Invoker() {
-                public Message invoke(Message msg) {
-                    msg.setFaultBody(new UnsupportedOperationException());
-                    return msg;
-                }
-            };
-        }
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-    }
-
-    public void stop() {
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java b/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
deleted file mode 100644
index 47e70b5581..0000000000
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
+++ /dev/null
@@ -1,47 +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.implementation.resource.provider;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.resource.ResourceImplementation;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * A factory for resource implementation providers.
- *
- * @version $Rev$ $Date$
- */
-public class ResourceImplementationProviderFactory implements ImplementationProviderFactory<ResourceImplementation> {
-
-    /**
-     * Constructs a resource implementation.
-     */
-    public ResourceImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
-    }
-
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component, ResourceImplementation implementation) {
-        return new ResourceImplementationProvider(component, implementation);
-    }
-    
-    public Class<ResourceImplementation> getModelType() {
-        return ResourceImplementation.class;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca-contrib/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 656d8c2751..0000000000
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the implementation extension

-org.apache.tuscany.sca.implementation.resource.provider.ResourceImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.resource.ResourceImplementation

diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java b/java/sca-contrib/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
deleted file mode 100644
index 9b3c959753..0000000000
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
+++ /dev/null
@@ -1,83 +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.implementation.resource;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ResourceImplementationTestCase extends TestCase {
-
-    private Node node;
-    
-    @Override
-    protected void setUp() throws Exception {
-        String contribution = ContributionLocationHelper.getContributionLocation(getClass());
-        node = NodeFactory.newInstance().createNode("resource.composite", new Contribution("test", contribution));
-        node.start();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-        node.destroy();
-    }
-    
-    public void testResource() throws Exception {
-        Resource resource = node.getService(Resource.class, "ResourceServiceComponent");
-        InputStream is = resource.get("test.html");
-        String document = read(is);
-        assertTrue(document.indexOf("<body><p>hello</body>") != -1);
-    }
-
-    /**
-     * Read response stream from the given input stream.
-     * @param is
-     * @return
-     * @throws IOException
-     */
-    private static String read(InputStream is) throws IOException {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(is));
-            StringBuffer sb = new StringBuffer();
-            String str;
-            while ((str = reader.readLine()) != null) {
-                sb.append(str);
-            }
-            return sb.toString();
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/test/resources/content/test.html b/java/sca-contrib/modules/implementation-resource-runtime/src/test/resources/content/test.html
deleted file mode 100644
index f4b79d7f01..0000000000
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/test/resources/content/test.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<!--
-    * 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.    
--->
-<body><p>hello</body>
-</html>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/test/resources/resource.composite b/java/sca-contrib/modules/implementation-resource-runtime/src/test/resources/resource.composite
deleted file mode 100644
index 4654056cd7..0000000000
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/test/resources/resource.composite
+++ /dev/null
@@ -1,30 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/resource"
-	xmlns:sr="http://sample/resource"
-	name="resource">
-
-    <component name="ResourceServiceComponent">
-        <tuscany:implementation.resource location="content"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/implementation-resource/LICENSE b/java/sca-contrib/modules/implementation-resource/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/implementation-resource/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/implementation-resource/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-resource/META-INF/MANIFEST.MF
deleted file mode 100644
index 89e37fe4e3..0000000000
--- a/java/sca-contrib/modules/implementation-resource/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.implementation.resource;uses:="

- org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.data.collectio

- n";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.implementation.resource.impl;v

- ersion="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Resource Implementation Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397272734

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Resource Implementation Model

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.contribution;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.data.collection;version="2.0.0",

- org.apache.tuscany.sca.implementation.resource;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.resource

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/implementation-resource/NOTICE b/java/sca-contrib/modules/implementation-resource/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/implementation-resource/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/implementation-resource/pom.xml b/java/sca-contrib/modules/implementation-resource/pom.xml
deleted file mode 100644
index 2562e253bf..0000000000
--- a/java/sca-contrib/modules/implementation-resource/pom.xml
+++ /dev/null
@@ -1,60 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-implementation-resource</artifactId>
-    <name>Apache Tuscany SCA Resource Implementation Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java b/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
deleted file mode 100644
index 68219de701..0000000000
--- a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
+++ /dev/null
@@ -1,34 +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.implementation.resource;
-
-import java.io.InputStream;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-
-/**
- * The service interface of resource implementations. This is not an API for application
- * developers. Application developers should use the data collection API to invoke
- * resource components.
- * 
- * @version $Rev: 548609 $ $Date: 2007-06-18 23:31:03 -0700 (Mon, 18 Jun 2007) $
- */
-public interface Resource extends Collection<String, InputStream> {
-}
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java b/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
deleted file mode 100644
index be136ee792..0000000000
--- a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
+++ /dev/null
@@ -1,57 +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.implementation.resource;
-
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-
-
-/**
- * The model representing a resource implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-public interface ResourceImplementation extends Implementation {
-
-    /**
-     * The URI of the resource inside its contribution.
-     * @return the URI of the resource
-     */
-    String getLocation();
-
-    /**
-     * Sets the URI of the resource inside its contribution.
-     * @param location the URI of the resource
-     */
-    void setLocation(String location);
-
-    /**
-     * Returns the URL of the resource.
-     * @return the URL of the resource
-     */
-    URL getLocationURL();
-
-    /**
-     * Sets the URL of the resource.
-     * @param url the URL of the resource
-     */
-    void setLocationURL(URL url);
-
-}
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java b/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
deleted file mode 100644
index 95ac452c66..0000000000
--- a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
+++ /dev/null
@@ -1,35 +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.implementation.resource;
-
-/**
- * Factory for the resource implementation model.
- *
- * @version $Rev$ $Date$
- */
-public interface ResourceImplementationFactory {
-    
-    /**
-     * Creates a new resource implementation.
-     * @return a new resource implementation
-     */
-    ResourceImplementation createResourceImplementation();
-
-}
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java b/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
deleted file mode 100644
index 2eb7b681b6..0000000000
--- a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
+++ /dev/null
@@ -1,47 +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.implementation.resource.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.implementation.resource.ResourceImplementation;
-import org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-/**
- * Factory for the resource implementation model.
- *
- * @version $Rev$ $Date$
- */
-public class ResourceImplementationFactoryImpl implements ResourceImplementationFactory {
-    
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-    
-    public ResourceImplementationFactoryImpl(FactoryExtensionPoint modelFactories) {
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-    }
-
-    public ResourceImplementation createResourceImplementation() {
-        return new ResourceImplementationImpl(assemblyFactory, javaFactory);
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java b/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
deleted file mode 100644
index 9cad0890a3..0000000000
--- a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
+++ /dev/null
@@ -1,130 +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.implementation.resource.impl;
-
-import java.net.URL;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.implementation.resource.Resource;
-import org.apache.tuscany.sca.implementation.resource.ResourceImplementation;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-
-/**
- * The model representing a resource implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-class ResourceImplementationImpl implements ResourceImplementation {
-
-    private Service resourceService;
-    
-    private String location;
-    private URL url;
-    private boolean unresolved;
-
-    /**
-     * Constructs a new resource implementation.
-     */
-    ResourceImplementationImpl(AssemblyFactory assemblyFactory,
-                                  JavaInterfaceFactory javaFactory) {
-
-        // Resource implementation always provide a single service exposing
-        // the Resource interface, and have no references and properties
-        resourceService = assemblyFactory.createService();
-        resourceService.setName("Resource");
-        
-        // Create the Java interface contract for the Resource service
-        JavaInterface javaInterface;
-        try {
-            javaInterface = javaFactory.createJavaInterface(Resource.class);
-        } catch (InvalidInterfaceException e) {
-            throw new IllegalArgumentException(e);
-        }
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        interfaceContract.setInterface(javaInterface);
-        resourceService.setInterfaceContract(interfaceContract);
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public URL getLocationURL() {
-        return url;
-    }
-    
-    public void setLocationURL(URL url) {
-        this.url = url;
-    }
-    
-    public ConstrainingType getConstrainingType() {
-        // The resource implementation does not support constrainingTypes
-        return null;
-    }
-
-    public List<Property> getProperties() {
-        // The resource implementation does not support properties
-        return Collections.emptyList();
-    }
-
-    public List<Service> getServices() {
-        // The resource implementation does not support services
-        return Collections.singletonList(resourceService);
-    }
-    
-    public List<Reference> getReferences() {
-        // The resource implementation does not support properties
-        return Collections.emptyList();
-    }
-
-    public String getURI() {
-        return location;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        // The resource implementation does not support constrainingTypes
-    }
-
-    public void setURI(String uri) {
-        this.location = uri;
-    }
-
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }    
-}
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java b/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
deleted file mode 100644
index 9c1453fba3..0000000000
--- a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
+++ /dev/null
@@ -1,166 +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.implementation.resource.impl;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import java.io.IOException;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.implementation.resource.ResourceImplementation;
-import org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-
-/**
- * Implements a StAX artifact processor for resource implementations.
- *
- * @version $Rev$ $Date$
- */
-public class ResourceImplementationProcessor implements StAXArtifactProcessor<ResourceImplementation> {
-    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
-    private static final QName IMPLEMENTATION_RESOURCE = new QName(SCA10_TUSCANY_NS, "implementation.resource");
-    
-    private ContributionFactory contributionFactory;
-    private ResourceImplementationFactory implementationFactory;
-    private Monitor monitor;
-
-    public ResourceImplementationProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        implementationFactory = modelFactories.getFactory(ResourceImplementationFactory.class);
-        this.monitor = monitor;
-    }
-
-    /**
-     * Report a exception.
-     *
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Exception ex) {
-    	 if (monitor != null) {
-	        Problem problem = monitor.createProblem(this.getClass().getName(), "impl-resource-validation-messages", Severity.ERROR, model, message, ex);
-	        monitor.problem(problem);
-    	 }
-    }
-
-    /**
-     * Report a error.
-     *
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = monitor.createProblem(this.getClass().getName(), "impl-resource-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    public QName getArtifactType() {
-        // Returns the QName of the XML element processed by this processor
-        return IMPLEMENTATION_RESOURCE;
-    }
-
-    public Class<ResourceImplementation> getModelType() {
-        // Returns the type of model processed by this processor
-        return ResourceImplementation.class;
-    }
-
-    public ResourceImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-
-        // Read an <implementation.resource> element
-
-        // Create and initialize the resource implementation model
-        ResourceImplementation implementation = null;
-
-        // Read the location attribute specifying the location of the resources
-        String location = reader.getAttributeValue(null, "location");
-        if (location != null) {
-            implementation = implementationFactory.createResourceImplementation();
-            implementation.setLocation(location);
-            implementation.setUnresolved(true);
-        } else {
-            error("LocationAttributeMissing", reader);
-            //throw new ContributionReadException(MSG_LOCATION_MISSING);
-        }
-
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && IMPLEMENTATION_RESOURCE.equals(reader.getName())) {
-                break;
-            }
-        }
-
-        return implementation;
-    }
-
-    public void resolve(ResourceImplementation implementation, ModelResolver resolver) throws ContributionResolveException {
-    	
-    	if (implementation == null)
-    		return;
-    	
-        // Resolve the resource directory location
-        Artifact artifact = contributionFactory.createArtifact();
-        artifact.setURI(implementation.getLocation());
-        Artifact resolved = resolver.resolveModel(Artifact.class, artifact);
-        if (resolved.getLocation() != null) {
-            try {
-                implementation.setLocationURL(new URL(resolved.getLocation()));
-                implementation.setUnresolved(false);
-            } catch (IOException e) {
-            	ContributionResolveException ce = new ContributionResolveException(e);
-            	error("ContributionResolveException", resolver, ce);
-                //throw ce;
-            }
-        } else {
-            error("CouldNotResolveLocation", resolver, implementation.getLocation());
-            //throw new ContributionResolveException("Could not resolve implementation.resource location: " + implementation.getLocation());
-        }
-    }
-
-    public void write(ResourceImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
-        // Write <implementation.resource>
-        writer.writeStartElement(IMPLEMENTATION_RESOURCE.getNamespaceURI(), IMPLEMENTATION_RESOURCE.getLocalPart());
-
-        if (implementation.getLocation() != null) {
-            writer.writeAttribute("location", implementation.getLocation());
-        }
-
-        writer.writeEndElement();
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index b5774c5c5b..0000000000
--- a/java/sca-contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.resource.impl.ResourceImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#implementation.resource,model=org.apache.tuscany.sca.implementation.resource.ResourceImplementation,factory=org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory b/java/sca-contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
deleted file mode 100644
index f77f723c3e..0000000000
--- a/java/sca-contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for model factory
-org.apache.tuscany.sca.implementation.resource.impl.ResourceImplementationFactoryImpl
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties b/java/sca-contrib/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
deleted file mode 100644
index 7f619ef036..0000000000
--- a/java/sca-contrib/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
+++ /dev/null
@@ -1,23 +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.
-#
-#
-ContributionResolveException = ContributionResolveException occured due to:
-LocationAttributeMissing = Reading implementation.resource - location attribute missing
-CouldNotResolveLocation = Could not resolve implementation.resource location: {0}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/LICENSE b/java/sca-contrib/modules/implementation-script-runtime/LICENSE
deleted file mode 100644
index 4b5ab74408..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/LICENSE
+++ /dev/null
@@ -1,251 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-===============================================================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-=================================================================================================================
-
-This module implementation-script temporarily includes one file under the following BSD license:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-=================================================================================================================
diff --git a/java/sca-contrib/modules/implementation-script-runtime/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-script-runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index aed41dbb4f..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,58 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.implementation.script.provider;

- uses:="org.apache.tuscany.sca.databinding,org.apache.tuscany.sca.runt

- ime,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.databindin

- g.impl,org.apache.tuscany.sca.provider,org.apache.bsf.xml,org.apache.

- tuscany.sca.core,org.apache.tuscany.sca.interfacedef.java,org.w3c.dom

- ,javax.script,org.apache.tuscany.sca.interfacedef,javax.xml.namespace

- ,org.apache.axiom.om,org.apache.tuscany.sca.implementation.script,org

- .apache.tuscany.sca.invocation,org.apache.tuscany.sca.core.factory,or

- g.apache.tuscany.sca.interfacedef.wsdl";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.implementation.script.engines;

- version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Script Implementation Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397459984

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Script Implementation Extension

-Import-Package: com.sun.script.jruby,

- javax.script,

- javax.xml.namespace,

- org.apache.axiom.om,

- org.apache.bsf.xml,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.core.factory;version="2.0.0",

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.implementation.script;version="2.0.0",

- org.apache.tuscany.sca.implementation.script.provider;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.jruby,

- org.jruby.ast,

- org.jruby.exceptions,

- org.jruby.internal.runtime,

- org.jruby.javasupport,

- org.jruby.runtime,

- org.jruby.runtime.builtin,

- org.jruby.runtime.load,

- org.jruby.util,

- org.jruby.util.io,

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,

- org.w3c.dom

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.script.runt

- ime

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/implementation-script-runtime/NOTICE b/java/sca-contrib/modules/implementation-script-runtime/NOTICE
deleted file mode 100644
index ecbcc6a660..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the BSD license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-
-Copyright (c) 2006, Sun Microsystems, Inc.
-All rights reserved.
diff --git a/java/sca-contrib/modules/implementation-script-runtime/pom.xml b/java/sca-contrib/modules/implementation-script-runtime/pom.xml
deleted file mode 100644
index e2e0f59ce5..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/pom.xml
+++ /dev/null
@@ -1,183 +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>

-

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-implementation-script-runtime</artifactId>

-    <name>Apache Tuscany SCA Script Implementation Extension</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-script</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-core</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-databinding</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.bsf</groupId>

-            <artifactId>bsf-all</artifactId>

-            <version>3.0-beta2</version>    

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-       <dependency>

-            <groupId>org.apache.ws.commons.axiom</groupId>

-            <artifactId>axiom-api</artifactId>

-            <exclusions>

-                <exclusion>

-                    <groupId>xerces</groupId>

-                    <artifactId>xercesImpl</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>javax.mail</groupId>

-                    <artifactId>mail</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>commons-logging</groupId>

-                    <artifactId>commons-logging</artifactId>

-                </exclusion>                 

-                <exclusion>

-                    <groupId>xml-apis</groupId>

-                    <artifactId>xml-apis</artifactId>

-                </exclusion>

-            </exclusions>

-            <version>1.2.7</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.ws.commons.axiom</groupId>

-            <artifactId>axiom-impl</artifactId>

-            <version>1.2.7</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>                                      

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-           <groupId>commons-logging</groupId>

-           <artifactId>commons-logging</artifactId>

-           <version>1.1.1</version>

-           <exclusions>

-               <exclusion>

-                   <groupId>commons-logging</groupId>

-                   <artifactId>commons-logging</artifactId>

-               </exclusion>

-               <exclusion>

-                   <groupId>javax.servlet</groupId>

-                   <artifactId>servlet-api</artifactId>

-               </exclusion>

-           </exclusions>

-        </dependency>          

-

-<!-- TODO: big hack to add script engine dependencies till extension dependencies fixed -->

-

-        <dependency>

-            <groupId>rhino</groupId>

-            <artifactId>js</artifactId>

-            <version>1.6R7</version>

-            <scope>compile</scope> 

-        </dependency>

-

-        <dependency>

-            <groupId>org.jruby</groupId>

-            <artifactId>jruby-complete</artifactId>

-            <version>1.1.3</version>

-            <scope>compile</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>asm</groupId>

-                    <artifactId>asm</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>asm</groupId>

-                    <artifactId>asm-commons</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>jline</groupId>

-                    <artifactId>jline</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.python</groupId>

-            <artifactId>jython</artifactId>

-            <version>2.2</version>

-            <scope>compile</scope>

-         </dependency>

-

-         <dependency>

-            <groupId>org.codehaus.groovy</groupId>

-            <artifactId>groovy-all-minimal</artifactId>

-            <version>1.5.4</version>

-            <scope>compile</scope>

-         </dependency>

-    </dependencies>

-

-</project>

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java b/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
deleted file mode 100644
index 324246c32b..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
+++ /dev/null
@@ -1,697 +0,0 @@
-/*

-* Copyright (c) 2006, Sun Microsystems, Inc.

-* All rights reserved.

-* 

-* Redistribution and use in source and binary forms, with or without 

-* modification, are permitted provided that the following conditions are met:

-* 

-*  - Redistributions of source code must retain the above copyright notice, this 

-*    list of conditions and the following disclaimer.

-* 

-*  - Redistributions in binary form must reproduce the above copyright notice, 

-*    this list of conditions and the following disclaimer in the documentation 

-*    and/or other materials provided with the distribution.

-* 

-*  - Neither the name of the Sun Microsystems, Inc. nor the names of 

-*    contributors may be used to endorse or promote products derived from this 

-*    software without specific prior written permission.

-* 

-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 

-* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 

-* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 

-* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 

-* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 

-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 

-* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 

-* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 

-* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 

-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 

-* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 

-* DAMAGE. 

-*/

-package org.apache.tuscany.sca.implementation.script.engines;

-

-import java.io.File;

-import java.io.FileInputStream;

-import java.io.FileNotFoundException;

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.OutputStream;

-import java.io.PrintStream;

-import java.io.Reader;

-import java.io.StringWriter;

-import java.io.UnsupportedEncodingException;

-import java.io.Writer;

-import java.lang.reflect.InvocationHandler;

-import java.lang.reflect.Method;

-import java.lang.reflect.Proxy;

-import java.nio.ByteBuffer;

-import java.nio.CharBuffer;

-import java.nio.charset.Charset;

-import java.nio.charset.CharsetDecoder;

-import java.nio.charset.CoderResult;

-import java.nio.charset.CodingErrorAction;

-import java.security.AccessController;

-import java.security.PrivilegedAction;

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Set;

-

-import javax.script.AbstractScriptEngine;

-import javax.script.Bindings;

-import javax.script.Compilable;

-import javax.script.CompiledScript;

-import javax.script.Invocable;

-import javax.script.ScriptContext;

-import javax.script.ScriptEngine;

-import javax.script.ScriptEngineFactory;

-import javax.script.ScriptException;

-import javax.script.SimpleBindings;

-

-import org.jruby.Ruby;

-import org.jruby.RubyException;

-import org.jruby.RubyIO;

-import org.jruby.RubyObject;

-import org.jruby.ast.Node;

-import org.jruby.exceptions.RaiseException;

-import org.jruby.internal.runtime.GlobalVariable;

-import org.jruby.internal.runtime.GlobalVariables;

-import org.jruby.internal.runtime.ReadonlyAccessor;

-import org.jruby.internal.runtime.ValueAccessor;

-import org.jruby.javasupport.Java;

-import org.jruby.javasupport.JavaEmbedUtils;

-import org.jruby.javasupport.JavaObject;

-import org.jruby.javasupport.JavaUtil;

-import org.jruby.runtime.Block;

-import org.jruby.runtime.IAccessor;

-import org.jruby.runtime.builtin.IRubyObject;

-import org.jruby.util.KCode;

-

-import com.sun.script.jruby.JRubyScriptEngineFactory;

-

-/**

- * This class is a copy of the class com.sun.script.ruby.JRubyScriptEngine with some minor modifications

- * to work around problems with Tuscany setting SCA properties and references as global variable in JRuby

- * Should only need it temporarily till a new BSF release fixes it.

- *

- * @version $Rev$ $Date$

- */

-@SuppressWarnings("unchecked")

-public class TuscanyJRubyScriptEngine extends AbstractScriptEngine 

-        implements Compilable, Invocable { 

-

-    // my factory, may be null

-    private ScriptEngineFactory factory;

-    private Ruby runtime;

-   

-    public TuscanyJRubyScriptEngine() {

-        // Allow privileged access to ready properties. Requires PropertyPermission in security

-        // policy.

-        String rubyPath = AccessController.doPrivileged(new PrivilegedAction<String>() {

-            public String run() {

-                return System.getProperty("com.sun.script.jruby.loadpath");

-            }

-        });

-        init(rubyPath);

-    }

-

-    public TuscanyJRubyScriptEngine(String loadPath) {

-        init(loadPath);

-    }

-

-    // my implementation for CompiledScript

-    private class JRubyCompiledScript extends CompiledScript {

-        // my compiled code

-        private Node node;     

-

-        JRubyCompiledScript (Node node) {

-            this.node = node;

-        }

-

-        public ScriptEngine getEngine() {

-            return TuscanyJRubyScriptEngine.this;

-        }

-

-        public Object eval(ScriptContext ctx) throws ScriptException {

-            return evalNode(node, ctx);

-        }

-    }

-

-    // Compilable methods

-    public CompiledScript compile(String script) 

-                                  throws ScriptException {  

-        Node node = compileScript(script, context);

-        return new JRubyCompiledScript(node);

-    }

-

-    public CompiledScript compile (Reader reader) 

-                                  throws ScriptException {  

-        Node node = compileScript(reader, context);

-        return new JRubyCompiledScript(node);

-    }

-

-    // Invocable methods

-    public Object invokeFunction(String name, Object... args) 

-                         throws ScriptException, NoSuchMethodException {       

-        return invokeImpl(null, name, args, Object.class);

-    }

-

-    public Object invokeMethod(Object obj, String name, Object... args) 

-                         throws ScriptException, NoSuchMethodException {       

-        if (obj == null) {

-            throw new IllegalArgumentException("script object is null");

-        }

-        return invokeImpl(obj, name, args, Object.class);

-    }

-

-    public Object getInterface(Object obj, Class clazz) {

-        if (obj == null) {

-            throw new IllegalArgumentException("script object is null");

-        }

-        return makeInterface(obj, clazz);

-    }

-

-    public Object getInterface(Class clazz) {

-        return makeInterface(null, clazz);

-    }

-

-    private <T> T makeInterface(Object obj, Class<T> clazz) {

-        if (clazz == null || !clazz.isInterface()) {

-            throw new IllegalArgumentException("interface Class expected");

-        }

-        final Object thiz = obj;

-        return (T) Proxy.newProxyInstance(

-              clazz.getClassLoader(),

-              new Class[] { clazz },

-              new InvocationHandler() {

-                  public Object invoke(Object proxy, Method m, Object[] args)

-                                       throws Throwable {

-                      return invokeImpl(thiz, m.getName(),

-                                        args, m.getReturnType());

-                  }

-              });

-    }

-

-    // ScriptEngine methods

-    public synchronized Object eval(String str, ScriptContext ctx) 

-                       throws ScriptException { 

-        Node node = compileScript(str, ctx);

-        return evalNode(node, ctx);

-    }

-

-    public synchronized Object eval(Reader reader, ScriptContext ctx)

-                       throws ScriptException { 

-        Node node = compileScript(reader, ctx);

-        return evalNode(node, ctx);

-    }

-

-    public ScriptEngineFactory getFactory() {

-        synchronized (this) {

-            if (factory == null) {

-                factory = new JRubyScriptEngineFactory();

-            }

-        }

-        return factory;

-    }

-

-    public Bindings createBindings() {

-        return new SimpleBindings();

-    }

-

-    // package-private methods

-    void setFactory(ScriptEngineFactory factory) {

-        this.factory = factory;

-    } 

-

-    // internals only below this point    

-

-    private Object rubyToJava(IRubyObject value) {

-        return rubyToJava(value, Object.class);

-    }

-

-    private Object rubyToJava(IRubyObject value, Class type) {

-        return JavaUtil.convertArgument(

-                runtime,

-                Java.ruby_to_java(value, value, Block.NULL_BLOCK), 

-                type);

-    }

-

-    private IRubyObject javaToRuby(Object value) {

-        if (value instanceof IRubyObject) {

-            return (IRubyObject) value;

-        }

-        IRubyObject result = JavaUtil.convertJavaToRuby(runtime, value);

-        if (result instanceof JavaObject) {

-            return runtime.getModule("JavaUtilities").callMethod(runtime.getCurrentContext(), "wrap", result);

-        }

-        return result;

-    }   

-

-    private synchronized Node compileScript(String script, ScriptContext ctx) 

-                                 throws ScriptException {

-        GlobalVariables oldGlobals = runtime.getGlobalVariables();  

-        try {

-            setErrorWriter(ctx.getErrorWriter());

-            setGlobalVariables(ctx);

-            String filename = (String) ctx.getAttribute(ScriptEngine.FILENAME);

-            if (filename == null) {

-                filename = "<unknown>";

-            }            

-            return runtime.parseEval(script, filename, null, 0);

-        } catch (RaiseException e) {

-            RubyException re =  e.getException();

-            runtime.printError(re);

-            throw new ScriptException(e);

-        } catch (Exception e) {

-            throw new ScriptException(e);

-        } finally {

-            if (oldGlobals != null) {

-                setGlobalVariables(oldGlobals);

-            }

-        }

-    }

-

-    private synchronized Node compileScript(Reader reader, ScriptContext ctx) 

-                                 throws ScriptException {

-        GlobalVariables oldGlobals = runtime.getGlobalVariables();  

-        try {

-            setErrorWriter(ctx.getErrorWriter());

-            setGlobalVariables(ctx);

-            String filename = (String) ctx.getAttribute(ScriptEngine.FILENAME);

-            if (filename == null) {

-                filename = "<unknown>";

-                String script = getRubyScript(reader);

-                return runtime.parseEval(script, filename, null, 0);

-            }

-            InputStream inputStream = getRubyReader(filename);

-            return runtime.parseFile(inputStream, filename, null);

-        } catch (RaiseException e) {

-            RubyException re =  e.getException();

-            runtime.printError(re);

-            throw new ScriptException(e);

-        } catch (Exception exp) {

-            throw new ScriptException(exp);

-        } finally {

-            if (oldGlobals != null) {

-                setGlobalVariables(oldGlobals);

-            }

-        }

-    }

-

-    private String getRubyScript(Reader reader) throws IOException {

-        StringBuffer sb = new StringBuffer();

-        char[] cbuf;

-        while (true) {

-            cbuf = new char[8*1024];

-            int chars = reader.read(cbuf, 0, cbuf.length);

-            if (chars < 0) {

-                break;

-            }

-            sb.append(cbuf, 0, chars);

-        }

-        cbuf = null;

-        return (new String(sb)).trim();

-    }

-    

-    private InputStream getRubyReader(String filename) throws FileNotFoundException {

-        File file = new File(filename);

-        return new FileInputStream(file);

-    }

-

-    private void setGlobalVariables(final ScriptContext ctx) {

-        ctx.setAttribute("context", ctx, ScriptContext.ENGINE_SCOPE);

-        setGlobalVariables(new GlobalVariables(runtime) {

-                GlobalVariables parent = runtime.getGlobalVariables();

-

-            @Override

-                public void define(String name, IAccessor accessor) {

-                    assert name != null;

-                    assert accessor != null;

-                    assert name.startsWith("$");

-                    synchronized (ctx) {

-                        Bindings engineScope = ctx.getBindings(ScriptContext.ENGINE_SCOPE);                  

-                        engineScope.put(name, new GlobalVariable(accessor)); 

-                    }

-                }

-

-            @Override

-                public void defineReadonly(String name, IAccessor accessor) {

-                    assert name != null;

-                    assert accessor != null;

-                    assert name.startsWith("$");

-                    synchronized (ctx) {

-                        Bindings engineScope = ctx.getBindings(ScriptContext.ENGINE_SCOPE);

-                        engineScope.put(name, new GlobalVariable(new 

-                                             ReadonlyAccessor(name, accessor)));

-                    }

-                } 

-

-            @Override

-                public boolean isDefined(String name) {

-                    assert name != null;

-                    assert name.startsWith("$");

-                    synchronized (ctx) {

-                        String modifiedName = name.substring(1);

-                        boolean defined = ctx.getAttributesScope(modifiedName) != -1;

-                        return defined ? true : parent.isDefined(name);

-                    }

-                }

-

-            @Override

-                public void alias(String name, String oldName) {

-                    assert name != null;

-                    assert oldName != null;

-                    assert name.startsWith("$");

-                    assert oldName.startsWith("$");

-

-                    if (runtime.getSafeLevel() >= 4) {

-                        throw runtime.newSecurityError("Insecure: can't alias global variable");

-                    }

-

-                    synchronized (ctx) {

-                        int scope = ctx.getAttributesScope(name);

-                        if (scope == -1) {

-                            scope = ScriptContext.ENGINE_SCOPE;

-                        }

-

-                        IRubyObject value = get(oldName);

-                        ctx.setAttribute(name, rubyToJava(value), scope);

-                    }

-                }

-

-            @Override

-                public IRubyObject get(String name) {

-                    assert name != null;

-                    assert name.startsWith("$");

-

-                    synchronized (ctx) {

-                        // skip '$' and try

-                        String modifiedName = name.substring(1);

-                        int scope = ctx.getAttributesScope(modifiedName);

-                        if (scope == -1) {

-                            return parent.get(name);

-                        }

-

-                        Object obj = ctx.getAttribute(modifiedName, scope);

-                        if (obj instanceof IAccessor) {

-                            return ((IAccessor)obj).getValue();

-                        } else {

-                            return javaToRuby(obj);

-                        }

-                    }                    

-                }

-

-            @Override

-                public IRubyObject set(String name, IRubyObject value) {

-                    assert name != null;

-                    assert name.startsWith("$");

-

-                    if (runtime.getSafeLevel() >= 4) {

-                        throw runtime.newSecurityError("Insecure: can't change global variable value");

-                    }

-

-                    synchronized (ctx) {

-                        // skip '$' and try

-                        String modifiedName = name.substring(1);

-                        int scope = ctx.getAttributesScope(modifiedName);

-                        if (scope == -1) {

-                            scope = ScriptContext.ENGINE_SCOPE;

-                        }

-                        IRubyObject oldValue = get(name);

-                        Object obj = ctx.getAttribute(modifiedName, scope);

-                        if (obj instanceof IAccessor) {

-                            ((IAccessor)obj).setValue(value);

-                        } else {                        

-                            ctx.setAttribute(modifiedName, rubyToJava(value), scope);

-                            if ("KCODE".equals(modifiedName)) {

-                                setKCode((String)rubyToJava(value));

-                            } else if ("stdout".equals(modifiedName)) {

-                                equalOutputs((RubyObject)value);

-                            }

-                        }

-                        return oldValue;

-                    }

-                }

-

-            @Override

-                public Set<String> getNames() {                    

-                    HashSet set = new HashSet();

-                    synchronized (ctx) {

-                        for (Object scope : ctx.getScopes()) {

-                            Bindings b = ctx.getBindings((Integer)scope);

-                            if (b != null) {

-                                for (Object key: b.keySet()) {

-                                    set.add(key);

-                                }

-                            }

-                        }

-                    }

-                    for (Iterator<String> names = parent.getNames().iterator(); names.hasNext();) {

-                        set.add(names.next());

-                    }

-                    return Collections.unmodifiableSet(set);

-                }

-

-            @Override

-                public IRubyObject getDefaultSeparator() {

-                    return parent.getDefaultSeparator();

-                }

-            });

-    }

-

-    private void setGlobalVariables(GlobalVariables globals) {

-        runtime.setGlobalVariables(globals);

-    }

-

-    private synchronized Object evalNode(Node node, ScriptContext ctx) 

-                            throws ScriptException {

-        GlobalVariables oldGlobals = runtime.getGlobalVariables();

-        try {

-            setWriterOutputStream(ctx.getWriter());

-            setErrorWriter(ctx.getErrorWriter());

-            setGlobalVariables(ctx);

-            return rubyToJava(runtime.runNormally(node, false));

-        } catch (Exception exp) {

-            throw new ScriptException(exp);

-        } finally {

-            try {

-                JavaEmbedUtils.terminate(runtime);

-            } catch (RaiseException e) {

-                RubyException re =  e.getException();

-                runtime.printError(re);

-                if (!runtime.fastGetClass("SystemExit").isInstance(re)) {

-                    throw new ScriptException(e);

-                }

-            } finally {

-                if (oldGlobals != null) {

-                    setGlobalVariables(oldGlobals);

-                }

-            }

-        }

-    }

-

-    private void init(final String loadPath) {

-        AccessController.doPrivileged(new PrivilegedAction<Object>() {

-            public Object run() {

-                runtime = Ruby.newInstance();

-                IAccessor d = new ValueAccessor(runtime.newString("<script>"));

-                runtime.getGlobalVariables().define("$PROGRAM_NAME", d);

-                runtime.getGlobalVariables().define("$0", d);

-                String path = loadPath;

-                if (path == null) {

-                    path = System.getProperty("java.class.path");

-                }

-                List list = Arrays.asList(path.split(File.pathSeparator));

-                runtime.getLoadService().init(list);

-                runtime.getLoadService().require("java");

-                return null;

-            }

-        });

-    }

-

-    private synchronized Object invokeImpl(final Object obj, String method, 

-                        Object[] args, Class returnType)

-                        throws ScriptException {

-        if (method == null) {

-            throw new NullPointerException("method name is null");

-        }

-        GlobalVariables oldGlobals = runtime.getGlobalVariables();

-        try {

-            setWriterOutputStream(context.getWriter());

-            setErrorWriter(context.getErrorWriter());

-            setGlobalVariables(context);           

-            IRubyObject rubyRecv = obj != null ? 

-                  JavaUtil.convertJavaToRuby(runtime, obj) : runtime.getTopSelf();

-            

-            IRubyObject result;

-            if (args != null && args.length > 0) {

-                IRubyObject[] rubyArgs = JavaUtil.convertJavaArrayToRuby(runtime, args);

-                // Create Ruby proxies for any input arguments that are not primitives.

-                IRubyObject javaUtilities = runtime.getObject().getConstant("JavaUtilities");

-                for (int i = 0; i < rubyArgs.length; i++) {

-                    IRubyObject tmp = rubyArgs[i];

-                    if (tmp instanceof JavaObject) {

-                        rubyArgs[i] = javaUtilities.callMethod(runtime.getCurrentContext(), "wrap", tmp);

-                    }

-                }

-                result = rubyRecv.callMethod(runtime.getCurrentContext(), method, rubyArgs);

-            } else {

-                result = rubyRecv.callMethod(runtime.getCurrentContext(), method);

-            }   

-            return rubyToJava(result, returnType);

-        } catch (Exception exp) {

-            throw new ScriptException(exp);

-        } finally {

-            try {

-                JavaEmbedUtils.terminate(runtime);

-            } catch (RaiseException e) {

-                RubyException re =  e.getException();

-                runtime.printError(re);

-                if (!runtime.fastGetClass("SystemExit").isInstance(re)) {

-                    throw new ScriptException(e);

-                }

-            } finally {

-                if (oldGlobals != null) {

-                    setGlobalVariables(oldGlobals);

-                }

-            }

-        }

-    }

-    

-    private void setKCode(String encoding) {

-        KCode kcode = KCode.create(runtime, encoding);

-        runtime.setKCode(kcode);

-    }

-    

-    private void equalOutputs(RubyObject value) {

-        runtime.getGlobalVariables().set("$>", value);

-        runtime.getGlobalVariables().set("$defout", value);

-    }

-    

-    private void setWriterOutputStream(Writer writer) {

-        try {

-            RubyIO dummy_io = 

-                new RubyIO(runtime, new PrintStream(new WriterOutputStream(new StringWriter())));

-            runtime.getGlobalVariables().set("$stderr", dummy_io); //discard unwanted warnings

-            RubyIO io = 

-                new RubyIO(runtime, new PrintStream(new WriterOutputStream(writer)));

-            io.getOpenFile().getMainStream().setSync(true);

-            runtime.defineGlobalConstant("STDOUT", io);

-            runtime.getGlobalVariables().set("$>", io);

-            runtime.getGlobalVariables().set("$stdout", io);

-            runtime.getGlobalVariables().set("$defout", io);

-        } catch (UnsupportedEncodingException exp) {

-            throw new IllegalArgumentException(exp);

-        }

-    }

-    

-    private void setErrorWriter(Writer writer) {

-        try {

-            RubyIO dummy_io = 

-                new RubyIO(runtime, new PrintStream(new WriterOutputStream(new StringWriter())));

-            runtime.getGlobalVariables().set("$stderr", dummy_io); //discard unwanted warnings

-            RubyIO io = 

-                new RubyIO(runtime, new PrintStream(new WriterOutputStream(writer)));

-            io.getOpenFile().getMainStream().setSync(true);

-            runtime.defineGlobalConstant("STDERR", io);

-            runtime.getGlobalVariables().set("$stderr", io);

-            runtime.getGlobalVariables().set("$deferr", io);

-        } catch (UnsupportedEncodingException exp) {

-            throw new IllegalArgumentException(exp);

-        }

-    }

-

-    private String getEncoding() {

-        String enc = System.getProperty("sun.jnu.encoding");

-        if (enc != null) {

-            return enc;

-        }

-        return ((enc = System.getProperty("file.encoding")) == null) ? "UTF-8" : enc;

-    }

-    

-    private class WriterOutputStream extends OutputStream {

-

-        private Writer writer;

-        private CharsetDecoder decoder;

-        

-        private WriterOutputStream(Writer writer) throws UnsupportedEncodingException {

-            this(writer, getEncoding());

-        }

-        

-        private WriterOutputStream(Writer writer, String enc) throws UnsupportedEncodingException {

-            this.writer = writer;

-            if (enc == null) {

-                throw new UnsupportedEncodingException("encoding is " + enc);

-            }

-            try {

-                decoder = Charset.forName(enc).newDecoder();

-            } catch (Exception e) {

-                throw new UnsupportedEncodingException("Unsupported: " + enc);

-            }

-            decoder.onMalformedInput(CodingErrorAction.REPLACE);

-            decoder.onUnmappableCharacter(CodingErrorAction.REPLACE);

-        }

-        

-        @Override

-        public void close() throws IOException {

-            synchronized(writer) {

-                decoder = null;

-                writer.close();

-            }

-        }

-

-        @Override

-        public void flush() throws IOException {

-            synchronized(writer) {

-                writer.flush();

-            }

-        }

-        

-        @Override

-        public void write(int b) throws IOException {

-            byte[] buffer = new byte[1];

-            write(buffer, 0, 1);

-        }

-        

-        @Override

-        public void write(byte[] buffer) throws IOException {

-            write(buffer, 0, buffer.length);

-        }

-

-        @Override

-        public void write(byte[] buffer, int offset, int length) throws IOException {

-            synchronized(writer) {

-                if (offset < 0 || offset > buffer.length - length || length < 0) {

-                    throw new IndexOutOfBoundsException();

-                }

-                if (length == 0) {

-                    return;

-                }

-                ByteBuffer bytes = ByteBuffer.wrap(buffer, offset, length);

-                CharBuffer chars = CharBuffer.allocate(length);

-                convert(bytes, chars);

-                char[] cbuf = new char[chars.length()];

-                chars.get(cbuf, 0, chars.length());

-                writer.write(cbuf);

-                writer.flush();

-            }

-        }

-

-        private void convert(ByteBuffer bytes, CharBuffer chars) throws IOException {

-            decoder.reset();

-            chars.clear();

-            CoderResult result = decoder.decode(bytes, chars, true);

-            if (result.isError() || result.isOverflow()) {

-                throw new IOException(result.toString());

-            } else if (result.isUnderflow()) {

-                chars.flip();

-            }

-        }

-    }

-}

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java b/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java
deleted file mode 100644
index 473b990a79..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java
+++ /dev/null
@@ -1,176 +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.implementation.script.provider;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import javax.script.Invocable;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.bsf.xml.XMLHelper;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.implementation.script.ScriptImplementation;
-import org.apache.tuscany.sca.implementation.script.engines.TuscanyJRubyScriptEngine;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * An ImplementationProvider for Script implementations.
- *
- * @version $Rev: $ $Date: $
- */
-public class ScriptImplementationProvider implements ImplementationProvider {
-    
-    private RuntimeComponent component;
-    private ScriptImplementation implementation;
-    private ScriptPropertyFactory propertyFactory;
-    private ScriptEngine scriptEngine;
-    private XMLHelper xmlHelper;
-    
-    public ScriptImplementationProvider(RuntimeComponent component, ScriptImplementation implementation, ScriptPropertyFactory propertyFactory) {
-        this.component = component;
-        this.implementation = implementation;
-        this.propertyFactory = propertyFactory;
-
-        // Set the databinding and XMLHelper for WSDL interfaces
-        for (Service service : component.getServices()) {
-            InterfaceContract ic = service.getInterfaceContract();
-            if (ic instanceof WSDLInterfaceContract) {
-                ic.getInterface().resetDataBinding(OMElement.class.getName());
-                xmlHelper = XMLHelper.getArgHelper(scriptEngine);
-            }
-        }
-    }
-
-    public void start() {
-        try {
-            String language = implementation.getLanguage();
-            if (language == null) {
-                language = implementation.getScript();
-                language = language.substring(language.lastIndexOf('.') +1);
-            }
-            scriptEngine = scriptEngine(language);
-            if (scriptEngine == null) {
-                throw new ObjectCreationException("no script engine found for language: " + implementation.getLanguage());
-            }
-            if (!(scriptEngine instanceof Invocable)) {
-                throw new ObjectCreationException("script engine does not support Invocable: " + scriptEngine);
-            }
-            
-            for (Reference reference : implementation.getReferences()) {
-                scriptEngine.put(reference.getName(), getProxy(reference.getName()));
-            }
-
-            for (Property property : implementation.getProperties()) {
-                ObjectFactory<?> valueFactory = propertyFactory.createValueFactory(property);
-                if (valueFactory != null) {
-                    scriptEngine.put(property.getName(), valueFactory.getInstance());
-                }
-            }
-
-            URL url = new URL(implementation.getLocation());
-            InputStreamReader reader = new InputStreamReader(url.openStream());
-            scriptEngine.eval(reader);
-            reader.close();
-
-        } catch (IOException e) {
-            throw new IllegalArgumentException(e);
-        } catch (ScriptException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    public void stop() {
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        return new ScriptInvoker(scriptEngine, xmlHelper, operation);
-    }
-
-    private Object getProxy(String name) {
-        for (ComponentReference reference : component.getReferences()) {
-            if (reference.getName().equals(name)) {
-                Class<?> iface = ((JavaInterface)reference.getInterfaceContract().getInterface()).getJavaClass();
-                return component.getComponentContext().getService(iface, name);
-            }
-        }
-        throw new IllegalArgumentException("reference " + name + " not found on component: " + component);
-    }
-
-    /**
-     * Returns the script engine for the given language.
-     * 
-     * @param language
-     * @return
-     */
-    private ScriptEngine scriptEngine(String language) {
-        if ("rb".equals(language)) {
-
-            // Hack for now to work around a problem with the JRuby script engine
-            return new TuscanyJRubyScriptEngine();
-        } else {
-            if ("py".equals(language)) {
-                pythonCachedir();
-            }
-            
-            // Allow privileged access to run access classes. Requires RuntimePermission
-            // for accessClassInPackage.sun.misc.
-            ScriptEngineManager scriptEngineManager =
-                AccessController.doPrivileged(new PrivilegedAction<ScriptEngineManager>() {
-                    public ScriptEngineManager run() {
-                        return new ScriptEngineManager();
-                    }
-                });
-            return scriptEngineManager.getEngineByExtension(language);
-        }
-    }
-
-    /**
-     * If the Python home isn't set then let Tuscany suppress messages other than errors
-     * See TUSCANY-1950
-     */
-    private static void pythonCachedir() {
-        if (System.getProperty("python.home") == null) {
-          System.setProperty("python.verbose", "error");
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java b/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
deleted file mode 100644
index f65403c9ed..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.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 org.apache.tuscany.sca.implementation.script.provider;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
-import org.apache.tuscany.sca.implementation.script.ScriptImplementation;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * An ImplementationProviderFactory for Script implementations.
- *
- * @version $Rev: $ $Date: $
- */
-public class ScriptImplementationProviderFactory implements ImplementationProviderFactory<ScriptImplementation> {
-    
-    private ScriptPropertyFactory propertyFactory;
-    
-    public ScriptImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
-        Mediator mediator = new MediatorImpl(extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class),
-                                         extensionPoints.getExtensionPoint(TransformerExtensionPoint.class));
-        propertyFactory = new ScriptPropertyFactory(mediator);
-    }
-
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component, ScriptImplementation Implementation) {
-        return new ScriptImplementationProvider(component, Implementation, propertyFactory);
-    }
-    
-    public Class<ScriptImplementation> getModelType() {
-        return ScriptImplementation.class;
-    }
-    
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java b/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java
deleted file mode 100644
index 976eb2c0dd..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.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.implementation.script.provider;
-
-import javax.script.Invocable;
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.bsf.xml.XMLHelper;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-/**
- * Perform the actual script invocation
- *
- * @version $Rev$ $Date$
- */
-public class ScriptInvoker implements Invoker {
-
-    private ScriptEngine scriptEngine;
-    private XMLHelper xmlHelper;
-    private Operation operation;
-
-    public ScriptInvoker(ScriptEngine scriptEngine, XMLHelper xmlHelper, Operation operation) {
-        this.scriptEngine = scriptEngine;
-        this.xmlHelper = xmlHelper;
-        this.operation = operation;
-    }
-
-    private Object doInvoke(Object[] objects, Operation op) throws ScriptException {
-        if (xmlHelper != null) {
-            objects[0] = xmlHelper.toScriptXML((OMElement)objects[0]);
-        }
-
-        Operation oper = operation;  // static setting
-        if (oper.getName() == null) {  // if no static setting
-            oper = op;  // use dynamic setting
-        }
-        Object response;
-        try {
-            response = ((Invocable)scriptEngine).invokeFunction(oper.getName(), objects);
-        } catch (ScriptException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new ScriptException(e);
-        }
-
-        if (xmlHelper != null) {
-            response = xmlHelper.toOMElement(response);
-        }
-
-        return response;
-    }
-
-    public Message invoke(Message msg) {
-        try {
-            Object resp = doInvoke((Object[])msg.getBody(), msg.getOperation());
-            msg.setBody(resp);
-        } catch (ScriptException e) {
-            msg.setFaultBody(e.getCause());
-        }
-        return msg;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java b/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
deleted file mode 100644
index 5833c9f4d5..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
+++ /dev/null
@@ -1,225 +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.implementation.script.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * A property factory for script properties.
- *
- * @version $Rev$ $Date$
- */
-public class ScriptPropertyFactory {
-    private Mediator mediator = null;
-    boolean isSimpleType;
-    
-    public ScriptPropertyFactory(Mediator mediator) {
-        this.mediator = mediator;
-    }
-    
-    public ObjectFactory createValueFactory(Property property) {
-        isSimpleType = isSimpleType(property);
-        Document doc = (Document)property.getValue();
-        Element rootElement = doc.getDocumentElement();
-        
-        //FIXME : since scripts use dynamic types we need to generate a dynamic java type using the 
-        //XML structure of the property value.  Should this be done in the JavaBeansDataBinding... 
-        Class javaType = null;
-        
-        if (property.isMany()) {
-            if (isSimpleType) {
-                String value = "";
-                if (rootElement.getChildNodes().getLength() > 0) {
-                    value = rootElement.getChildNodes().item(0).getTextContent();
-                }
-                List<String> values = 
-                    getSimplePropertyValues(value, javaType);
-                return new ListObjectFactoryImpl(property, 
-                                                 values,
-                                                 isSimpleType,
-                                                 javaType);
-            } else {
-                return new ListObjectFactoryImpl(property,
-                                                 getComplexPropertyValues(doc),
-                                                 isSimpleType,
-                                                 javaType);
-            }
-        } else {
-            if (isSimpleType) {
-                String value = "";
-                if (rootElement.getChildNodes().getLength() > 0) {
-                    value = rootElement.getChildNodes().item(0).getTextContent();
-                }
-                return new ObjectFactoryImpl(property,
-                                             value,
-                                             isSimpleType,
-                                             javaType);
-            } else {
-                Object value = getComplexPropertyValues(doc).get(0);
-                return new ObjectFactoryImpl(property,
-                                             value,
-                                             isSimpleType,
-                                             javaType);
-            }
-            
-        }
-    }
-    
-    private boolean isSimpleType(Property property) {
-        if (property.getXSDType() != null) {
-            return SimpleTypeMapperImpl.isSimpleXSDType(property.getXSDType());
-        } else {
-            if (property instanceof Document) {
-                Document doc = (Document)property;
-                Element element = doc.getDocumentElement(); 
-                if (element.getChildNodes().getLength() == 1 && 
-                    element.getChildNodes().item(0).getNodeType() == Node.TEXT_NODE) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    
-    private List<String> getSimplePropertyValues(String concatenatedValue, Class<?> javaType) {
-        List<String> propValues = new ArrayList<String>();
-        StringTokenizer st = null;
-        if ( javaType.getName().equals("java.lang.String")) {
-            st = new StringTokenizer(concatenatedValue, "\"");
-        } else {
-            st = new StringTokenizer(concatenatedValue);
-        }
-        String aToken = null;
-        while (st.hasMoreTokens()) {
-            aToken = st.nextToken();
-            if (aToken.trim().length() > 0) {
-                propValues.add(aToken);
-            }
-        }
-        return propValues;
-    }
-    
-    private List<Node> getComplexPropertyValues(Document document) {
-        Element rootElement = document.getDocumentElement();
-        List<Node> propValues = new ArrayList<Node>();
-        for (int count = 0 ; count < rootElement.getChildNodes().getLength() ; ++count) {
-            if (rootElement.getChildNodes().item(count).getNodeType() == Node.ELEMENT_NODE) {
-                propValues.add(rootElement.getChildNodes().item(count));
-            }
-        }
-        return propValues;
-    }
-    
-    public abstract class ObjectFactoryImplBase  implements ObjectFactory {
-        protected SimpleTypeMapper simpleTypeMapper = new SimpleTypeMapperImpl();
-        protected Property property;
-        protected Object propertyValue;
-        protected Class<?> javaType;
-        protected DataType<XMLType> sourceDataType;
-        protected DataType<?> targetDataType;
-        boolean isSimpleType;
-
-        public ObjectFactoryImplBase(Property property, Object propertyValue, boolean isSimpleType, Class<?> javaType)  {
-            
-            this.isSimpleType = isSimpleType;
-            this.property = property;
-            this.propertyValue = propertyValue;
-            this.javaType = javaType;
-
-            //FIXME : fix this when we have managed to generate dynamic java types
-            
-            /*sourceDataType =
-                new DataTypeImpl<XMLType>(DOMDataBinding.NAME, Node.class, 
-                    new XMLType(null, this.property.getXSDType()));
-            TypeInfo typeInfo = null;
-            if (this.property.getXSDType() != null) {
-                if (SimpleTypeMapperExtension.isSimpleXSDType(this.property.getXSDType())) {
-                    typeInfo = new TypeInfo(property.getXSDType(), true, null);
-                } else {
-                    typeInfo = new TypeInfo(property.getXSDType(), false, null);
-                }
-            } else {
-                typeInfo = new TypeInfo(property.getXSDType(), false, null);
-            }
-
-            XMLType xmlType = new XMLType(typeInfo);
-            String dataBinding = null; //(String)property.getExtensions().get(DataBinding.class.getName());
-            if (dataBinding != null) {
-                targetDataType = new DataTypeImpl<XMLType>(dataBinding, javaType, xmlType);
-            } else {
-                targetDataType = new DataTypeImpl<XMLType>(dataBinding, javaType, xmlType);
-                mediator.getDataBindingRegistry().introspectType(targetDataType, null);  
-            }*/
-        }
-    }
-    
-    public class ObjectFactoryImpl extends ObjectFactoryImplBase {
-        public ObjectFactoryImpl(Property property, Object propertyValue, boolean isSimpleType, Class<?> javaType) {
-            super(property, propertyValue, isSimpleType, javaType);
-        }
-
-        public Object getInstance() throws ObjectCreationException {
-            if (isSimpleType) {
-                return simpleTypeMapper.toJavaObject(property.getXSDType(), (String)propertyValue, null);
-            } else {
-                return mediator.mediate(propertyValue, sourceDataType, targetDataType, null);
-            }
-        }
-    }
-
-    public class ListObjectFactoryImpl extends ObjectFactoryImplBase  {
-        public ListObjectFactoryImpl(Property property, List<?>propertyValues, boolean isSimpleType, Class<?> javaType) {
-            super(property, propertyValues, isSimpleType, javaType);
-        }
-
-        public List<?> getInstance() throws ObjectCreationException {
-            if (isSimpleType) {
-                List<Object> values = new ArrayList<Object>();
-                for (String aValue : (List<String>)propertyValue) {
-                    values.add(simpleTypeMapper.toJavaObject(property.getXSDType(), aValue, null));
-                }
-                return values;
-            } else {
-                List<Object> instances = new ArrayList<Object>();
-                for (Node aValue : (List<Node>)propertyValue) {
-                    instances.add(mediator.mediate(aValue,
-                                                      sourceDataType,
-                                                      targetDataType,
-                                                      null));
-                }
-                return instances;
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca-contrib/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 941cfd7fd5..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the implementation extension

-org.apache.tuscany.sca.implementation.script.provider.ScriptImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.script.ScriptImplementation

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
deleted file mode 100644
index f098885741..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
+++ /dev/null
@@ -1,60 +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.implementation.script.itests;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public abstract class AbstractSCATestCase<T> extends TestCase {
-
-    protected Node node;
-    protected T service;
-
-    @Override
-    @SuppressWarnings("unchecked")
-    protected void setUp() throws Exception {
-        String contribution = ContributionLocationHelper.getContributionLocation(getClass());
-        node = NodeFactory.newInstance().createNode(getCompositeName(), new Contribution("test", contribution));
-        node.start();
-        service = (T) node.getService(getServiceClass(), "ClientComponent");
-    }
-    
-    protected abstract Class getServiceClass();
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-        node.destroy();
-    }
-
-    protected String getCompositeName() {
-        String className = this.getClass().getName();
-        return className.substring(0, className.length() - 8).replace('.', '/') + ".composite";
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
deleted file mode 100644
index 1af3a295a4..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
+++ /dev/null
@@ -1,38 +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.implementation.script.itests.helloworld;
-
-import org.apache.tuscany.sca.implementation.script.itests.AbstractSCATestCase;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public abstract class AbstractHelloWorldTestCase extends AbstractSCATestCase<HelloWorld> {
-
-    public void testCalculator() throws Exception {
-        assertEquals("Hello petra", service.sayHello("petra"));
-    }
-    
-    @Override
-    protected Class<HelloWorld> getServiceClass() {
-        return HelloWorld.class;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
deleted file mode 100644
index 6a4f10dbbb..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
+++ /dev/null
@@ -1,29 +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.implementation.script.itests.helloworld;
-
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class GroovyHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
deleted file mode 100644
index f87cf104f3..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
+++ /dev/null
@@ -1,30 +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.implementation.script.itests.helloworld;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public interface HelloWorld {
-
-    String sayHello(String s);
-
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
deleted file mode 100644
index cffe65c27a..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.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.implementation.script.itests.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class HelloWorldProxy implements HelloWorld {
-
-    @Reference
-    public HelloWorld delegate;
-    
-    public String sayHello(String s) {
-        return delegate.sayHello(s);
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
deleted file mode 100644
index ca4bd5ae6a..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
+++ /dev/null
@@ -1,29 +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.implementation.script.itests.helloworld;
-
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JRubyHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
deleted file mode 100644
index 46ed9abce6..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
+++ /dev/null
@@ -1,29 +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.implementation.script.itests.helloworld;
-
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JavaScriptHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
deleted file mode 100644
index d694515829..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
+++ /dev/null
@@ -1,29 +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.implementation.script.itests.helloworld;
-
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JythonHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
deleted file mode 100644
index e7375253a3..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
+++ /dev/null
@@ -1,38 +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.implementation.script.itests.properties;
-
-import org.apache.tuscany.sca.implementation.script.itests.AbstractSCATestCase;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public abstract class AbstractHelloWorldTestCase extends AbstractSCATestCase<HelloWorld> {
-
-    public void testCalculator() throws Exception {
- //       assertEquals("Hello petra from Tuscany", service.sayHello("petra"));
-    }
-    
-    @Override
-    protected Class<HelloWorld> getServiceClass() {
-        return HelloWorld.class;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
deleted file mode 100644
index f93edc76d1..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
+++ /dev/null
@@ -1,29 +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.implementation.script.itests.properties;
-
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class GroovyHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
deleted file mode 100644
index 910d22ec83..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
+++ /dev/null
@@ -1,30 +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.implementation.script.itests.properties;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public interface HelloWorld {
-
-    String sayHello(String s);
-
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
deleted file mode 100644
index 719212e831..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.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.implementation.script.itests.properties;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class HelloWorldProxy implements HelloWorld {
-
-    @Reference
-    public HelloWorld delegate;
-    
-    public String sayHello(String s) {
-        return delegate.sayHello(s);
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
deleted file mode 100644
index 60c73359c0..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
+++ /dev/null
@@ -1,28 +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.implementation.script.itests.properties;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JRubyHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
deleted file mode 100644
index cde96b4b9b..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
+++ /dev/null
@@ -1,29 +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.implementation.script.itests.properties;
-
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JavaScriptHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
deleted file mode 100644
index 0e6be74e09..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
+++ /dev/null
@@ -1,29 +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.implementation.script.itests.properties;
-
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JythonHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
deleted file mode 100644
index 6116581356..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
+++ /dev/null
@@ -1,29 +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.implementation.script.itests.references;
-
-import org.apache.tuscany.sca.implementation.script.itests.helloworld.AbstractHelloWorldTestCase;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class GroovyReferenceTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
deleted file mode 100644
index dfcd37c46c..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
+++ /dev/null
@@ -1,34 +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.implementation.script.itests.references;
-
-import org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorld;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class HelloWorldTarget implements HelloWorld {
-
-    public String sayHello(String s) {
-        return "Hello " + s;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
deleted file mode 100644
index 83c2e99469..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
+++ /dev/null
@@ -1,29 +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.implementation.script.itests.references;
-
-import org.apache.tuscany.sca.implementation.script.itests.helloworld.AbstractHelloWorldTestCase;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JRubyReferenceTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
deleted file mode 100644
index 392e16411c..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
+++ /dev/null
@@ -1,29 +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.implementation.script.itests.references;
-
-import org.apache.tuscany.sca.implementation.script.itests.helloworld.AbstractHelloWorldTestCase;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JavaScriptReferenceTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java b/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
deleted file mode 100644
index 8866ae6b70..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
+++ /dev/null
@@ -1,29 +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.implementation.script.itests.references;
-
-import org.apache.tuscany.sca.implementation.script.itests.helloworld.AbstractHelloWorldTestCase;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JythonReferenceTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
deleted file mode 100644
index ce377e4ed3..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           name="GroovyHelloWorld">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>

-        <reference name="delegate" target="HelloWorldComponent"></reference>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
deleted file mode 100644
index 4d32ed9f6b..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           name="JRubyHelloWorld">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>

-        <reference name="delegate" target="HelloWorldComponent"></reference>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
deleted file mode 100644
index 13cb94d511..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           name="JavaScriptHelloWorld">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>

-        <reference name="delegate" target="HelloWorldComponent"></reference>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
deleted file mode 100644
index c641b82cd6..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           name="JythonHelloWorld">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>

-        <reference name="delegate" target="HelloWorldComponent"></reference>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
deleted file mode 100644
index bb0ddd002f..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="HelloWorldService">
-        <interface.java interface="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorld" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
deleted file mode 100644
index 9f89bd373e..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
+++ /dev/null
@@ -1,22 +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.    

- */

- 

-def sayHello(s) {

-   return "Hello " + s

-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
deleted file mode 100644
index eac2ab283f..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
+++ /dev/null
@@ -1,23 +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.    
- */
-
-function sayHello(s) {
-   
-   return "Hello " + s;
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
deleted file mode 100644
index f5dd0f8fcf..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
+++ /dev/null
@@ -1,20 +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.
-#
- 
-def sayHello(s):
-   return 'Hello ' + s
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
deleted file mode 100644
index cd2d3bcaea..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
+++ /dev/null
@@ -1,21 +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.

-#

- 

-def sayHello(s)

-    return "Hello " + s

-end
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
deleted file mode 100644
index 26574c6266..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           name="GroovyProperties">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.properties.HelloWorldProxy"/>

-        <reference name="delegate" target="HelloWorldComponent"></reference>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
deleted file mode 100644
index a3551cefc3..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           name="JRubyProperties">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.properties.HelloWorldProxy"/>

-        <reference name="delegate" target="HelloWorldComponent" />

-    </component>

-

-    <component name="HelloWorldComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
deleted file mode 100644
index f72c6e922f..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           name="JavaScriptProperties">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.properties.HelloWorldProxy"/>

-        <reference name="delegate" target="HelloWorldComponent"></reference>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
deleted file mode 100644
index bd754c8d2e..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           name="JythonProperties">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.properties.HelloWorldProxy"/>

-        <reference name="delegate" target="HelloWorldComponent"></reference>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
deleted file mode 100644
index 06f261015e..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="HelloWorldService">
-        <interface.java interface="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorld" />
-  </service>
-
-  <property name="greeter" type="xsd:string">Tuscany</property>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
deleted file mode 100644
index a7eb446d37..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
+++ /dev/null
@@ -1,22 +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.    

- */

- 

-def sayHello(s) {

-   return "Hello " + s + " from " + greeter

-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
deleted file mode 100644
index 64df3ebbef..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
+++ /dev/null
@@ -1,23 +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.    
- */
-
-function sayHello(s) {
-   
-   return "Hello " + s + " from " + greeter;
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
deleted file mode 100644
index 868cfa9eeb..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
+++ /dev/null
@@ -1,20 +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.
-#
- 
-def sayHello(s):
-   return 'Hello ' + s + ' from ' + greeter
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
deleted file mode 100644
index 2844f8b8d9..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
+++ /dev/null
@@ -1,21 +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.

-#

- 

-def sayHello(s)

-    return "Hello " + s + " from " + $greeter 

-end
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
deleted file mode 100644
index 175bb79104..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
+++ /dev/null
@@ -1,38 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           name="GroovyReference">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>

-        <reference name="delegate" target="ReferenceComponent"></reference>

-    </component>

-

-    <component name="ReferenceComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy"/>

-        <reference name="ref" target="TargetComponent" />

-    </component>

-

-    <component name="TargetComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.references.HelloWorldTarget"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
deleted file mode 100644
index 7581b633cc..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
+++ /dev/null
@@ -1,38 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           name="JRubyReference">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>

-        <reference name="delegate" target="ReferenceComponent"></reference>

-    </component>

-

-    <component name="ReferenceComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/references/reference.rb"/>

-        <reference name="ref" target="TargetComponent" />

-    </component>

-

-    <component name="TargetComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.references.HelloWorldTarget"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
deleted file mode 100644
index 91085b9eb2..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
+++ /dev/null
@@ -1,38 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           name="JavaScriptReference">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>

-        <reference name="delegate" target="ReferenceComponent"></reference>

-    </component>

-

-    <component name="ReferenceComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/references/reference.js"/>

-        <reference name="ref" target="TargetComponent" />

-    </component>

-

-    <component name="TargetComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.references.HelloWorldTarget"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
deleted file mode 100644
index 535164aae7..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
+++ /dev/null
@@ -1,38 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           name="JavaScriptReference">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>

-        <reference name="delegate" target="ReferenceComponent"></reference>

-    </component>

-

-    <component name="ReferenceComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/references/reference.py"/>

-        <reference name="ref" target="TargetComponent" />

-    </component>

-

-    <component name="TargetComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.references.HelloWorldTarget"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
deleted file mode 100644
index 3edd075126..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">
-
-  <service name="HelloWorldService">
-      <interface.java interface="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorld" />
-  </service>
-
-  <reference name="ref">
-      <interface.java interface="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorld" />
-  </reference>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
deleted file mode 100644
index 5d2216d583..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
+++ /dev/null
@@ -1,22 +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.    

- */

- 

-def sayHello(s) {

-   return ref.sayHello(s)

-}

diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
deleted file mode 100644
index ad0a932d26..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
+++ /dev/null
@@ -1,22 +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.    
- */
- 
-function sayHello(s) {
-   return ref.sayHello(s);
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
deleted file mode 100644
index aee8bf991d..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
+++ /dev/null
@@ -1,20 +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.
-#
- 
-def sayHello(s):
-   return ref.sayHello(s)
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb b/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
deleted file mode 100644
index 87f0f56082..0000000000
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
+++ /dev/null
@@ -1,21 +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.

-#

- 

-def sayHello(s)

-    return $ref.sayHello(s)

-end
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-script/LICENSE b/java/sca-contrib/modules/implementation-script/LICENSE
deleted file mode 100644
index 4b5ab74408..0000000000
--- a/java/sca-contrib/modules/implementation-script/LICENSE
+++ /dev/null
@@ -1,251 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-===============================================================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-=================================================================================================================
-
-This module implementation-script temporarily includes one file under the following BSD license:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - Redistributions in binary form must reproduce the above copyright notice, 
-    this list of conditions and the following disclaimer in the documentation 
-    and/or other materials provided with the distribution.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    contributors may be used to endorse or promote products derived from this 
-    software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
- DAMAGE. 
-
-=================================================================================================================
diff --git a/java/sca-contrib/modules/implementation-script/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-script/META-INF/MANIFEST.MF
deleted file mode 100644
index dd96f10c3a..0000000000
--- a/java/sca-contrib/modules/implementation-script/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.implementation.script;uses:="ja

- vax.xml.stream,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca

- .contribution.resolver,org.apache.tuscany.sca.contribution.processor,

- org.apache.tuscany.sca.core,org.apache.tuscany.sca.contribution,org.a

- pache.tuscany.sca.monitor,javax.xml.namespace";version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Script Implementation Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397453750

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Script Implementation Model

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0",

- org.apache.tuscany.sca.contribution;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.implementation.script;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.script

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/implementation-script/NOTICE b/java/sca-contrib/modules/implementation-script/NOTICE
deleted file mode 100644
index ecbcc6a660..0000000000
--- a/java/sca-contrib/modules/implementation-script/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the BSD license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-
-Copyright (c) 2006, Sun Microsystems, Inc.
-All rights reserved.
diff --git a/java/sca-contrib/modules/implementation-script/pom.xml b/java/sca-contrib/modules/implementation-script/pom.xml
deleted file mode 100644
index 84b81a57d7..0000000000
--- a/java/sca-contrib/modules/implementation-script/pom.xml
+++ /dev/null
@@ -1,48 +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>

-

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-implementation-script</artifactId>

-    <name>Apache Tuscany SCA Script Implementation Model</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-</project>

diff --git a/java/sca-contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java b/java/sca-contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
deleted file mode 100644
index 9dc8f2aeca..0000000000
--- a/java/sca-contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
+++ /dev/null
@@ -1,113 +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.implementation.script;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-
-/**
- * Represents a Script implementation.
- *
- * @version $Rev$ $Date$
- */
-public class ScriptImplementation implements Implementation {
-
-    private String uri;
-    private String language;
-    private List<Property> properties = new ArrayList<Property>();
-    private List<Reference> references = new ArrayList<Reference>();
-    private List<Service> services = new ArrayList<Service>();
-    private String location;
-    private boolean unresolved;
-    
-    public ScriptImplementation() {
-    }
-
-    public String getScript() {
-        return uri;
-    }
-
-    public void setScript(String uri) {
-        this.uri = uri;
-    }
-    
-    public String getLocation() {
-        return location;
-    }
-    
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public ConstrainingType getConstrainingType() {
-        // The script implementation does not support constrainingTypes
-        return null;
-    }
-
-    public List<Property> getProperties() {
-        return properties;
-    }
-
-    public List<Service> getServices() {
-        return services;
-    }
-    
-    public List<Reference> getReferences() {
-        return references;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        // The script implementation does not support constrainingTypes
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }    
-
-    @Override
-    public String toString() {
-        return "Script : " + getURI(); 
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProcessor.java b/java/sca-contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProcessor.java
deleted file mode 100644
index 1aec9d0df3..0000000000
--- a/java/sca-contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProcessor.java
+++ /dev/null
@@ -1,163 +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.implementation.script;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * ScriptImplementationProcessor
- *
- * @version $Rev: $ $Date: $
- */
-public class ScriptImplementationProcessor implements StAXArtifactProcessor<ScriptImplementation> {
-    private static final QName IMPLEMENTATION_SCRIPT = new QName(Constants.SCA10_TUSCANY_NS, "implementation.script");
-
-    private AssemblyFactory assemblyFactory;
-    private ContributionFactory contributionFactory;
-    private Monitor monitor;
-    
-    public ScriptImplementationProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        this.monitor = monitor;
-    }
-    
-    public QName getArtifactType() {
-        return IMPLEMENTATION_SCRIPT;
-    }
-    
-    public Class<ScriptImplementation> getModelType() {
-        return ScriptImplementation.class;
-    }
-    
-    public ScriptImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        
-        // Read an <implementation.script> element
-
-        // Create and initialize the script implementation model
-        ScriptImplementation implementation = new ScriptImplementation();
-        implementation.setUnresolved(true);
-
-        // Read the script attribute
-        String script = reader.getAttributeValue(null, "script");
-        if (script != null) {                
-            implementation.setScript(script);
-        }
-
-        // Read the language attribute
-        String language = reader.getAttributeValue(null, "language");
-        if (language != null) {                
-            implementation.setLanguage(language);
-        }
-
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && IMPLEMENTATION_SCRIPT.equals(reader.getName())) {
-                break;
-            }
-        }
-
-        return implementation;
-    }
-    
-    public void resolve(ScriptImplementation implementation, ModelResolver resolver) throws ContributionResolveException {
-        
-        // Resolve the script location
-        if (implementation.getScript() != null) {
-            Artifact artifact = contributionFactory.createArtifact();
-            artifact.setURI(implementation.getScript());
-            Artifact resolved = resolver.resolveModel(Artifact.class, artifact);
-            if (resolved.getLocation() != null) {
-                implementation.setLocation(resolved.getLocation());
-            } else {
-                error("CouldNotResolveScript", resolver, implementation.getScript());
-            }
-            
-            // Resolve the componentType and add the declared properties, references
-            // and services to the implementation
-            String componentTypeURI = implementation.getScript();
-            componentTypeURI = componentTypeURI.substring(0, componentTypeURI.lastIndexOf('.'));
-            componentTypeURI += ".componentType";
-            ComponentType componentType = assemblyFactory.createComponentType();
-            componentType.setUnresolved(true);
-            componentType.setURI(componentTypeURI);
-            componentType = resolver.resolveModel(ComponentType.class, componentType);
-            if (!componentType.isUnresolved()) {
-                implementation.getProperties().addAll(componentType.getProperties());
-                implementation.getReferences().addAll(componentType.getReferences());
-                implementation.getServices().addAll(componentType.getServices());
-            }
-        }
-        
-        implementation.setUnresolved(false);
-    }
-    
-    public void write(ScriptImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <implementation.script>
-        writer.setPrefix("script", IMPLEMENTATION_SCRIPT.getNamespaceURI());
-        writer.writeStartElement(IMPLEMENTATION_SCRIPT.getNamespaceURI(), IMPLEMENTATION_SCRIPT.getLocalPart());
-        writer.writeNamespace("script", IMPLEMENTATION_SCRIPT.getNamespaceURI());
-        
-        if (implementation.getScript() != null) {
-            writer.writeAttribute("script", implementation.getScript());
-        }
-        if (implementation.getLanguage() != null) {
-            writer.writeAttribute("language", implementation.getLanguage());
-        }
-        
-        writer.writeEndElement();
-    }
-
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = monitor.createProblem(this.getClass().getName(), "impl-widget-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }    
-
-}
diff --git a/java/sca-contrib/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 794fe423b0..0000000000
--- a/java/sca-contrib/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.script.ScriptImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#implementation.script,model=org.apache.tuscany.sca.implementation.script.ScriptImplementation
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/LICENSE b/java/sca-contrib/modules/implementation-spring-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index ea29fcdb24..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,54 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.implementation.spring.xml;vers

- ion="1.4",org.springframework.sca.xml;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Spring Framework Implementation Extens

- ion

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397466437

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Spring Framework Implementation

-  Extension

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- junit.framework;resolution:=optional,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.impl;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.core.factory;version="2.0.0",

- org.apache.tuscany.sca.core.invocation;version="2.0.0",

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.implementation.java;version="2.0.0",

- org.apache.tuscany.sca.implementation.java.injection;version="2.0.0",

- org.apache.tuscany.sca.implementation.spring,

- org.apache.tuscany.sca.implementation.spring.xml,

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java.impl;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.node;resolution:=optional,

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,

- org.springframework.beans,

- org.springframework.beans.factory,

- org.springframework.beans.factory.config,

- org.springframework.beans.factory.xml,

- org.springframework.context,

- org.springframework.context.support,

- org.springframework.core.io,

- org.w3c.dom

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.spring

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/implementation-spring-runtime/NOTICE b/java/sca-contrib/modules/implementation-spring-runtime/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/pom.xml b/java/sca-contrib/modules/implementation-spring-runtime/pom.xml
deleted file mode 100644
index fc8b406acb..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/pom.xml
+++ /dev/null
@@ -1,113 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-implementation-spring-runtime</artifactId>
-    <name>Apache Tuscany SCA Spring Framework Implementation Extension</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>  
-
-        <!-- Spring dependencies... -->    
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>2.0.8</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>2.0.8</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>2.0.8</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java b/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
deleted file mode 100644
index 6ed1840b6b..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
+++ /dev/null
@@ -1,53 +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.implementation.spring.impl;
-
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.core.io.Resource;
-
-/**
- * An <code>ApplicationContext</code> specialization that registers namespace
- * handlers for SCA elements - in particular the <service/>, <reference/> and
- * <property/> elements which are provided as SCA extensions to the Spring
- * application context schema
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-public class SCAApplicationContext extends AbstractXmlApplicationContext {
-    public static final String APP_CONTEXT_PROP = "org.springframework.sca.application.context";
-    private Resource appXml;
-
-    public SCAApplicationContext(ApplicationContext parent, Resource appXml) {
-        super(parent);
-        this.appXml = appXml;
-        //refresh();
-    }
-
-    @Override
-    protected void initBeanDefinitionReader(XmlBeanDefinitionReader beanDefinitionReader) {
-        ClassLoader cl = getClassLoader();
-        beanDefinitionReader.setNamespaceHandlerResolver(new SCANamespaceHandlerResolver(cl));
-    }
-
-    @Override
-    protected Resource[] getConfigResources() {
-        return new Resource[] {appXml};
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java b/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
deleted file mode 100644
index 4e1c861910..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
+++ /dev/null
@@ -1,53 +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.implementation.spring.impl;
-
-import org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver;
-import org.springframework.beans.factory.xml.NamespaceHandler;
-
-/**
- * Overrides the default Spring namespace resolver to automatically register
- * {@link ScaNamespaceHandler} instead of requiring a value to be supplied in a
- * Spring configuration
- * 
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-public class SCANamespaceHandlerResolver extends DefaultNamespaceHandlerResolver {
-    private static final String SCA_NAMESPACE = "http://www.springframework.org/schema/sca";
-
-    private ScaNamespaceHandler handler;
-
-    public SCANamespaceHandlerResolver(ClassLoader classLoader) {
-        super(classLoader);
-        handler = new ScaNamespaceHandler(/*componentType*/);
-    }
-
-    public SCANamespaceHandlerResolver(String handlerMappingsLocation, ClassLoader classLoader) {
-        super(classLoader, handlerMappingsLocation);
-        handler = new ScaNamespaceHandler(/*componentType*/);
-    }
-
-    @Override
-    public NamespaceHandler resolve(String namespaceUri) {
-        if (SCA_NAMESPACE.equals(namespaceUri)) {
-            return handler;
-        }
-        return super.resolve(namespaceUri);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java b/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
deleted file mode 100644
index d654d1172a..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
+++ /dev/null
@@ -1,272 +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.implementation.spring.impl;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.MessageSourceResolvable;
-import org.springframework.context.NoSuchMessageException;
-import org.springframework.core.io.Resource;
-
-/**
- * A Spring ParentApplicationContext for a given Spring Implementation
- *
- * The Parent application context is responsible for handling those entities within a Spring
- * application context that actually belong to SCA rather than to Spring.  The principal things
- * are Properties and References.  These may be present either through explicit <sca:property/>
- * and <sca:reference/> elements in the application context or they may be implicit through
- * unresolved Spring bean <property.../> elements.  In either case, it is the Parent application
- * context that must provide Spring beans that correspond to the property or reference, as derived
- * from the SCA composite in which the Spring application context is an implementation.
- *
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-public class SCAParentApplicationContext implements ApplicationContext {
-
-    // The Spring implementation for which this is the parent application context
-    private SpringImplementation implementation;
-    private RuntimeComponent component;
-    private JavaPropertyValueObjectFactory propertyFactory;
-
-    private static final String[] EMPTY_ARRAY = new String[0];
-
-    public SCAParentApplicationContext(RuntimeComponent component,
-                                       SpringImplementation implementation,
-                                       ProxyFactory proxyService,
-                                       JavaPropertyValueObjectFactory propertyValueObjectFactory) {
-        this.implementation = implementation;
-        this.component = component;
-        this.propertyFactory = propertyValueObjectFactory;
-    } // end constructor
-
-    public Object getBean(String name) throws BeansException {
-        return getBean(name, (Class) null);
-    }
-
-    /**
-     * Get a Bean for a reference or for a property.
-     *
-     * @param name - the name of the Bean required
-     * @param requiredType - the required type of the Bean (either a Java class or a Java interface)
-     * @return Object - a Bean which matches the requested bean
-     */
-    public Object getBean(String name, Class requiredType) throws BeansException {
-        System.out.println("Spring parent context - getBean called for name: " + name);
-        // The expectation is that the requested Bean is either a reference or a property
-        // from the Spring context
-        for (Reference reference : implementation.getReferences()) {
-            if (reference.getName().equals(name)) {
-                // Extract the Java interface for the reference (it can't be any other interface type
-                // for a Spring application context)
-                if (requiredType == null) {
-                    JavaInterface javaInterface = (JavaInterface)reference.getInterfaceContract().getInterface();
-                    requiredType = javaInterface.getJavaClass();
-                }
-                // Create and return the proxy for the reference
-                return getService(requiredType, reference.getName());
-            } // end if
-        } // end for
-
-        // For a property, get the name and the required Java type and create a Bean
-        // of that type with the value inserted.
-        for (Property property : implementation.getProperties()) {
-            if (property.getName().equals(name)) {
-                if (requiredType == null) {
-                    // The following code only deals with a subset of types and was superceded
-                    // by the information from the implementation (which uses Classes as found
-                    // in the Spring implementation itself.
-                    //requiredType = JavaXMLMapper.getJavaType( property.getXSDType() );
-                    requiredType = implementation.getPropertyClass(name);
-                }
-                return getPropertyBean(requiredType, property.getName());
-            } // end if
-        } // end for
-        throw new NoSuchBeanDefinitionException("Unable to find Bean with name " + name);
-
-    } // end method getBean( String, Class )
-
-    public Object getBean(String name, Object[] args) throws BeansException {
-         return getBean(name, ((Class)null));
-    }
-
-    /**
-     * Creates a proxy Bean for a reference
-     * @param <B> the Business interface type for the reference
-     * @param businessInterface - the business interface as a Class
-     * @param referenceName - the name of the Reference
-     * @return an Bean of the type defined by <B>
-     */
-    private <B> B getService(Class<B> businessInterface, String referenceName) {
-        return component.getComponentContext().getService(businessInterface, referenceName);
-    }
-
-    /**
-     * Method to create a Java Bean for a Property value
-     * @param <B> the class type of the Bean
-     * @param requiredType - a Class object for the required type
-     * @param name - the Property name
-     * @return - a Bean of the specified property, with value set
-     */
-    private <B> B getPropertyBean(Class requiredType, String name) {
-        B propertyObject = null;
-        // Get the component's list of properties
-        List<ComponentProperty> props = component.getProperties();
-        for (ComponentProperty prop : props) {
-            if (prop.getName().equals(name)) {
-                // On finding the property, create a factory for it and create a Bean using
-                // the factory
-                ObjectFactory factory = propertyFactory.createValueFactory(prop, prop.getValue(), requiredType);
-                propertyObject = (B)factory.getInstance();
-            } // end if
-        } // end for
-
-        return propertyObject;
-    }
-
-    public boolean containsBean(String name) {
-        // TODO
-        System.out.println("Spring parent context - containsBean called for name: " + name);
-        return false;
-    }
-
-    public boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
-        // TODO
-        return false;
-    }
-
-    public boolean isTypeMatch(String name, Class targetType) throws NoSuchBeanDefinitionException {
-        throw new UnsupportedOperationException();
-    }
-
-    public Class getType(String name) throws NoSuchBeanDefinitionException {
-        return null;
-    }
-
-    public String[] getAliases(String name) throws NoSuchBeanDefinitionException {
-        return EMPTY_ARRAY;
-    }
-
-    public ApplicationContext getParent() {
-        return null;
-    }
-
-    public AutowireCapableBeanFactory getAutowireCapableBeanFactory() throws IllegalStateException {
-        return null;
-    }
-
-    public String getId() {
-          return this.toString();
-    }
-
-    public String getDisplayName() {
-        return implementation.getURI();
-    }
-
-    public long getStartupDate() {
-        return 0;
-    }
-
-    public boolean containsBeanDefinition(String beanName) {
-        return false;
-    }
-
-    public int getBeanDefinitionCount() {
-        return 0;
-    }
-
-    public String[] getBeanDefinitionNames() {
-        return new String[0];
-    }
-
-    public String[] getBeanNamesForType(Class type) {
-        return new String[0];
-    }
-
-    public String[] getBeanNamesForType(Class type, boolean includePrototypes, boolean includeFactoryBeans) {
-        return new String[0];
-    }
-
-    public Map getBeansOfType(Class type) throws BeansException {
-        return null;
-    }
-
-    public Map getBeansOfType(Class type, boolean includePrototypes, boolean includeFactoryBeans) throws BeansException {
-        return null;
-    }
-
-    public boolean isPrototype(String theString) {
-        return false;
-    }
-
-    public BeanFactory getParentBeanFactory() {
-        return null;
-    }
-
-    public boolean containsLocalBean(String name) {
-        return false;
-    }
-
-    public String getMessage(String code, Object[] args, String defaultMessage, Locale locale) {
-        return null;
-    }
-
-    public String getMessage(String code, Object[] args, Locale locale) throws NoSuchMessageException {
-        return null;
-    }
-
-    public String getMessage(MessageSourceResolvable resolvable, Locale locale) throws NoSuchMessageException {
-        return null;
-    }
-
-    public void publishEvent(ApplicationEvent event) {
-
-    }
-
-    public Resource[] getResources(String locationPattern) throws IOException {
-        return new Resource[0];
-    }
-
-    public Resource getResource(String location) {
-        return null;
-    }
-
-    public ClassLoader getClassLoader() {
-        // REVIEW: this is almost certainly flawed, but it's not clear how the SCA runtime's
-        // resource loading mechanism is exposed right now.
-        return this.getClass().getClassLoader();
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java b/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
deleted file mode 100644
index 5f7614a68e..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
+++ /dev/null
@@ -1,40 +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.implementation.spring.impl;
-
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-
-/**
- * Handler for the &lt;sca:&gt; namespace in an application context
- * 
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-public class ScaNamespaceHandler extends NamespaceHandlerSupport {
-
-    public ScaNamespaceHandler() {
-        init();
-    }
-
-    public final void init() {
-        registerBeanDefinitionParser("reference", new ScaReferenceBeanDefinitionParser());
-        registerBeanDefinitionParser("service", new ScaServiceBeanDefinitionParser());
-        registerBeanDefinitionParser("property", new ScaPropertyBeanDefinitionParser());
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java b/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java
deleted file mode 100644
index a025d23b9f..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.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.implementation.spring.impl;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Parser for the &lt;sca:reference&gt; element
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-public class ScaPropertyBeanDefinitionParser implements BeanDefinitionParser {
-
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        // do nothing, this is handled by Tuscany
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java b/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
deleted file mode 100644
index 178f538339..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
+++ /dev/null
@@ -1,38 +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.implementation.spring.impl;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Parser for the &lt;sca:reference&gt; element
- *
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-public class ScaReferenceBeanDefinitionParser implements BeanDefinitionParser {
-
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        // do nothing, this is handled by Tuscany
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java b/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
deleted file mode 100644
index ae5093dbea..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
+++ /dev/null
@@ -1,38 +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.implementation.spring.impl;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Parser for the &lt;sca:service/&gt; element
- *
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-public class ScaServiceBeanDefinitionParser implements BeanDefinitionParser {
-
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        // do nothing, handled by Tuscany
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java b/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
deleted file mode 100644
index f780c71549..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
+++ /dev/null
@@ -1,90 +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.implementation.spring.provider;
-
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
-import org.apache.tuscany.sca.implementation.spring.impl.SCAApplicationContext;
-import org.apache.tuscany.sca.implementation.spring.impl.SCAParentApplicationContext;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.springframework.context.support.AbstractApplicationContext;
-
-// TODO - create a working version of this class...
-/**
- * A provider class for runtime Spring implementation instances
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- */
-public class SpringImplementationProvider implements ImplementationProvider {
-    private RuntimeComponent component;
-    
-    // A Spring application context object
-    private AbstractApplicationContext springContext;
-
-    /**
-     * Constructor for the provider - takes a component definition and a Spring implementation
-     * description
-     * @param component - the component in the assembly
-     * @param implementation - the implementation
-     */
-    public SpringImplementationProvider(RuntimeComponent component,
-                                        SpringImplementation implementation,
-                                        ProxyFactory proxyService,
-                                        JavaPropertyValueObjectFactory propertyValueObjectFactory) {
-        super();
-        this.component = component;
-        SCAParentApplicationContext scaParentContext =
-            new SCAParentApplicationContext(component, implementation, proxyService, propertyValueObjectFactory);
-        springContext = new SCAApplicationContext(scaParentContext, implementation.getResource());
-    } // end constructor
-
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        return new SpringInvoker(component, springContext, service, operation);
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    /**
-     * Start this Spring implementation instance
-     */
-    public void start() {
-        // Do refresh here to ensure that Spring Beans are not touched before the SCA config process 
-        // is complete...
-        springContext.refresh();
-        springContext.start();
-        // System.out.println("SpringImplementationProvider: Spring context started");
-    } // end method start()
-
-    /**
-     * Stop this implementation instance
-     */
-    public void stop() {
-        // TODO - complete 
-        springContext.stop();
-        //System.out.println("SpringImplementationProvider: Spring context stopped");
-    } // end method stop
-
-} // end class SpringImplementationProvider
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java b/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
deleted file mode 100644
index eb83a92f6a..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
+++ /dev/null
@@ -1,79 +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.implementation.spring.provider;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * ImplementationProviderFactory for Spring implementation type
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- *
- */
-public class SpringImplementationProviderFactory implements ImplementationProviderFactory<SpringImplementation> {
-
-    private ProxyFactory proxyFactory;
-    private JavaPropertyValueObjectFactory propertyFactory;
-
-    /**
-     * Simple constructor
-     *
-     */
-    public SpringImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
-        super();
-        
-        ProxyFactoryExtensionPoint proxyFactories = extensionPoints.getExtensionPoint(ProxyFactoryExtensionPoint.class); 
-        proxyFactory = new ExtensibleProxyFactory(proxyFactories); 
-
-        // TODO: could the runtime have a default PropertyValueObjectFactory?
-        DataBindingExtensionPoint dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class);
-        TransformerExtensionPoint transformers = extensionPoints.getExtensionPoint(TransformerExtensionPoint.class);
-        MediatorImpl mediator = new MediatorImpl(dataBindings, transformers);
-        propertyFactory = new JavaPropertyValueObjectFactory(mediator);
-    }
-
-    /**
-     * Returns a SpringImplementationProvider for a given component and Spring implementation
-     * @param component the component for which implementation instances are required
-     * @param implementation the Spring implementation with details of the component
-     * implementation
-     * @return the SpringImplementationProvider for the specified component
-     */
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component,
-                                                               SpringImplementation implementation) {
-        return new SpringImplementationProvider(component, implementation, proxyFactory, propertyFactory);
-    }
-
-    /**
-     * Returns the class of the Spring implementation
-     */
-    public Class<SpringImplementation> getModelType() {
-        return SpringImplementation.class;
-    }
-} // end class SpringImplementationProviderFactory
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java b/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
deleted file mode 100644
index a195549851..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
+++ /dev/null
@@ -1,40 +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.implementation.spring.provider;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SpringInvocationException extends Exception {
-
-    private static final long serialVersionUID = -1157790036638157513L;
-
-    public SpringInvocationException(String msg) {
-        super(msg);
-    }
-    
-    public SpringInvocationException(Throwable e) {
-        super(e);
-    }
-    
-    public SpringInvocationException(String msg,Throwable e) {
-        super(msg,e);
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java b/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
deleted file mode 100644
index b63518d1c7..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
+++ /dev/null
@@ -1,128 +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.implementation.spring.provider;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
-import org.apache.tuscany.sca.implementation.spring.xml.SpringBeanElement;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.springframework.beans.BeansException;
-import org.springframework.context.support.AbstractApplicationContext;
-
-/**
- * Initial implementation of a Spring bean invoker
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- */
-public class SpringInvoker implements Invoker {
-
-    private Method theMethod = null;
-    private Object bean;
-    private SpringBeanElement beanElement;
-    private boolean badInvoker = false;
-
-    private AbstractApplicationContext springContext;
-    private Operation operation;
-
-    /**
-     * SpringInvoker constructor
-     * @param component - the Spring component to invoke
-     * @param service - the service to invoke
-     * @param operation - the operation to invoke
-     */
-    public SpringInvoker(RuntimeComponent component,
-                         AbstractApplicationContext springContext,
-                         RuntimeComponentService service,
-                         Operation operation) {
-
-        this.springContext = springContext;
-        this.operation = operation;
-
-        // From the component and the service, identify the Spring Bean which is the target
-        SpringImplementation theImplementation = (SpringImplementation)component.getImplementation();
-        beanElement = theImplementation.getBeanFromService(service.getService());
-
-        if (beanElement == null) {
-            badInvoker = true;
-            return;
-        }
-
-    } // end constructor SpringInvoker
-
-    // Lazy-load the method to avoid timing problems with the Spring Context
-    private void setupMethod() throws SpringInvocationException{
-        try {
-            bean = springContext.getBean(beanElement.getId());
-            Class<?> beanClass = bean.getClass();
-            theMethod = JavaInterfaceUtil.findMethod(beanClass, operation);
-            //System.out.println("SpringInvoker - found method " + theMethod.getName() );
-        } catch (BeansException e) {
-            throw new SpringInvocationException(e);
-        } catch (NoSuchMethodException e) {
-        	throw new SpringInvocationException(e);
-        }
-    }
-
-    private Object doInvoke(Object payload) throws SpringInvocationException {
-        if (theMethod == null)
-            setupMethod();
-
-        if (badInvoker)
-            throw new SpringInvocationException("Spring invoker incorrectly configured");
-        // Invoke the method on the Spring bean using the payload, returning the results
-        try {
-            Object ret;
-
-            if (payload != null && !payload.getClass().isArray()) {
-                ret = theMethod.invoke(bean, payload);
-            } else {
-                ret = theMethod.invoke(bean, (Object[])payload);
-            }
-            return ret;
-        } catch (InvocationTargetException e) {
-            throw new SpringInvocationException("Spring invoker invoke method '"+ theMethod.getName()+"' error.",e);
-        } catch (Exception e) {
-            throw new SpringInvocationException("Spring invoker invoke method '"+ theMethod.getName()+"' error.",e);
-        }
-
-    } // end method doInvoke
-
-    /**
-     * @param msg the message to invoke on the target bean
-     */
-    public Message invoke(Message msg) {
-        try {
-            Object resp = doInvoke(msg.getBody());
-            msg.setBody(resp);
-        } catch (SpringInvocationException e) {
-            msg.setFaultBody(e.getCause());
-        }catch (Throwable e) {
-            msg.setFaultBody(e);
-        }
-        //System.out.println("Spring Invoker - invoke called");
-        return msg;
-    } // end method invoke
-
-} // end class SpringInvoker
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca-contrib/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 6edfc3b6ca..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the implementation extension

-org.apache.tuscany.sca.implementation.spring.provider.SpringImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.spring.SpringImplementation

diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
deleted file mode 100644
index d782384ce6..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
+++ /dev/null
@@ -1,61 +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.implementation.spring.itests;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public abstract class AbstractSCATestCase<T> extends TestCase {
-
-    protected Node node;
-    protected T service;
-
-    @Override
-    protected void setUp() throws Exception {
-        String contribution = ContributionLocationHelper.getContributionLocation(getClass());
-        node = NodeFactory.newInstance().createNode(getCompositeName(), new Contribution("test", contribution));
-        node.start();
-        service = (T)node.getService(getServiceClass(), "ClientComponent");
-    }
-
-    protected abstract Class getServiceClass();
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-        node.destroy();
-    }
-
-    protected String getCompositeName() {
-        String className = this.getClass().getName();
-        String compositeName = className.substring(0, className.length() - 8).replace('.', '/') + ".composite";
-        System.out.println("Using composite: " + compositeName);
-        return compositeName;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
deleted file mode 100644
index c9b30b1688..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
+++ /dev/null
@@ -1,43 +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.implementation.spring.itests.helloworld;
-
-import org.apache.tuscany.sca.implementation.spring.itests.AbstractSCATestCase;
-
-/**
- * Basic "hello world" style test case for testing Spring component implementation
- *
- * @version $Rev$ $Date$
- */
-public abstract class AbstractHelloWorldTestCase extends AbstractSCATestCase<HelloWorld> {
-
-    /**
-     * Calls the hello world service and checks that it gives the right response...
-     */
-    public void testCalculator() throws Exception {
-        assertEquals("Hello petra", service.sayHello("petra"));
-        System.out.println("Test " + this.getClass().getSimpleName() + " completed successfully");
-    }
-
-    @Override
-    protected Class<HelloWorld> getServiceClass() {
-        return HelloWorld.class;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
deleted file mode 100644
index 935ff19992..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
+++ /dev/null
@@ -1,35 +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.implementation.spring.itests.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Interface for the "hello world" service - predictably simple with a single operation
- * "sayHello"
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface HelloWorld {
-
-    String sayHello(String s);
-
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 65ab096855..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,38 +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.implementation.spring.itests.helloworld;
-
-/**
- * A simple proxy Java class which implements the HelloWorld interface but which uses
- * a reference "delegate" to actually provide the HelloWorld service
- *
- * @version $Rev$ $Date$
- */
-public class HelloWorldImpl implements HelloWorld {
-
-    static String hello = "Hello ";
-
-    public String sayHello(String s) {
-        // Simply call the reference to satisfy the service request...
-        System.out.println("HelloWorldImpl - sayHello called");
-        return (hello + s);
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
deleted file mode 100644
index 0c912fddfa..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
+++ /dev/null
@@ -1,42 +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.implementation.spring.itests.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * A simple proxy Java class which implements the HelloWorld interface but which uses
- * a reference "delegate" to actually provide the HelloWorld service
- *
- * @version $Rev$ $Date$
- */
-public class HelloWorldProxy implements HelloWorld {
-
-    // Here is the reference "delegate" - it implements the HelloWorld interface...
-    @Reference
-    public HelloWorld delegate;
-
-    public String sayHello(String s) {
-        // Simply call the reference to satisfy the service request...
-        System.out.println("HelloWorldProxy - calling sayHello");
-        return delegate.sayHello(s);
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
deleted file mode 100644
index d77f183a66..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
+++ /dev/null
@@ -1,35 +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.implementation.spring.itests.helloworld;

-

-/**

- * A test case to check the ability of Spring Beans used as an SCA implementation

- * to access the Spring application context without problems:

- * 1) A composite containing a component with a Spring implementation

- * 2) The composite has a component with a Java POJO implementation which uses the

- * Spring implementation to satisfy a reference

- * 3) The Spring Bean accesses the Spring application context and only returns data

- * if it is successful

- *

- * @version $Rev$ $Date$

- */

-public class SpringContextAccessTestCase extends AbstractHelloWorldTestCase {

-    // super class does it all getting composite based on this class name

-}

diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
deleted file mode 100644
index 86f979fe15..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
+++ /dev/null
@@ -1,34 +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.implementation.spring.itests.helloworld;
-
-/**
- * A basic test case of:
- * 1) A composite containing a component with a Spring implementation
- * 2) The composite has a component with a Java POJO implementation which uses the
- * Spring implementation to satisfy a reference
- * 3) The <implementation.spring.../> element references an application context that
- * uses an explicit sca: element to identify the service offered by the Spring application
- *
- * @version $Rev$ $Date$
- */
-public class SpringExplicitHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
deleted file mode 100644
index 44016ad249..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
+++ /dev/null
@@ -1,39 +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.implementation.spring.itests.helloworld;
-
-/**
- * A test case designed to test the implementation of References from a Spring application
- * context, where the references are explicit, through the presence of an sca:reference
- * element within the Spring application context
- *
- * The artifacts involved in this test are:
- *
- * 1) A composite containing a component with a Spring implementation which makes
- * a reference to a second component
- * 2) The composite has a component with a Java POJO implementation which satisfies the reference
- * 3) The <implementation.spring.../> element references an application context that
- * uses an explicit sca:reference element to identify the reference made by the Spring application
- *
- * @version $Rev$ $Date$
- */
-public class SpringExplicitReferenceTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
deleted file mode 100644
index 74dcf32723..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.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 org.apache.tuscany.sca.implementation.spring.itests.helloworld;
-
-/**
- * A basic test case of:
- * 1) A composite containing a component with a Spring implementation
- * 2) The composite has a component with a Java POJO implementation which uses the
- * Spring implementation to satisfy a reference
- *
- * @version $Rev$ $Date$
- */
-public class SpringHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
deleted file mode 100644
index 97f91ff91e..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
+++ /dev/null
@@ -1,42 +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.implementation.spring.itests.helloworld;
-
-/**
- * A test case designed to test the implementation of References from a Spring application
- * context, where the references are implicit, through the presence of Bean properties with a
- * ref attribute which is not satisfied by a Bean within the application context.
- *
- * The artifacts involved in this test are:
- *
- * 1) A composite containing a component with a Spring implementation which makes
- * a reference to a second component
- * 2) The composite has a component with a Java POJO implementation which satisfies the reference
- * 3) The <implementation.spring.../> element references an application context that
- * does not use an explicit sca:reference element to identify the reference made by the
- * Spring application, but relies on an unsatisfied Bean property with a ref attribute.
- *
- * @version $Rev$ $Date$
- */
-public class SpringImplicitReferenceTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
-
-
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
deleted file mode 100644
index bfe3d64cf3..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.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 org.apache.tuscany.sca.implementation.spring.itests.helloworld;
-
-/**
- * A basic test case of:
- * 1) A composite containing a component with a Spring implementation
- * 2) The composite has a component with a Java POJO implementation which uses the
- * Spring implementation to satisfy a reference
- *
- * @version $Rev$ $Date$
- */
-public class SpringImportHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
deleted file mode 100644
index 2c46f8c066..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
+++ /dev/null
@@ -1,39 +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.implementation.spring.itests.helloworld;
-
-/**
- * A test case designed to test the implementation of Properties from a Spring application
- * context, where the properties are explicit, through the presence of an sca:property
- * element within the Spring application context
- *
- * The artifacts involved in this test are:
- *
- * 1) A composite containing a component with a Spring implementation
- * 2) The <implementation.spring.../> element references an application context that
- * uses an explicit sca:property element which is used to compute the response to an invocation
- * of the service of the implementation
- *
- * @version $Rev$ $Date$
- */
-public class SpringSCAPropertyTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
-
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
deleted file mode 100644
index 4d60bffef8..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.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.implementation.spring.itests.mock;
-
-/**
- * @version $Rev: 430937 $ $Date: 2006-08-12 02:17:56 +0100 (Sat, 12 Aug 2006) $
- */
-public interface TestBean {
-    String echo(String msg);
-
-    TestBean getBean();
-
-    void setBean(TestBean bean);
-
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
deleted file mode 100644
index acad9f2fea..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
+++ /dev/null
@@ -1,42 +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.implementation.spring.itests.mock;
-
-/**
- * @version $Rev: 441406 $ $Date: 2006-09-08 08:20:10 +0100 (Fri, 08 Sep 2006) $
- */
-public class TestBeanImpl implements TestBean {
-
-    private TestBean bean;
-
-    public TestBeanImpl() {
-    }
-
-    public String echo(String msg) {
-        return msg;
-    }
-
-    public TestBean getBean() {
-        return bean;
-    }
-
-    public void setBean(TestBean bean) {
-        this.bean = bean;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
deleted file mode 100644
index 79de2b32a0..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
+++ /dev/null
@@ -1,77 +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.implementation.spring.itests.mock;

-

-/**

- * Spring bean test class for testing the access to the Spring Context from within

- * a Spring Bean running as part of an SCA Component.

- * 

- * This class accesses the Spring Context and only returns non-null data if the 

- * Context is successfully accessed.

- * 

- * The design to receive the application context is as follows:

- * - the Bean implements the ApplicationContextAware interface

- * - this interface provides getter and setter methods for the Spring application

- *   context

- * - when the Bean is created at runtime, the setter method is called, injecting

- *   the context  

- */

-

-import org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorld;

-

-import org.springframework.beans.BeansException;   

-import org.springframework.context.ApplicationContext;   

-import org.springframework.context.ApplicationContextAware;

-

-

-public class TestContextAccessBean implements HelloWorld, ApplicationContextAware {

-

-    private static ApplicationContext ctx;

-    static String hello = "Hello ";

-    

-    // Return the hello string only if the application context is successfully accessed

-	public String sayHello(String message) {

-		System.out.println("TestContextAccessBean - sayHello called");

-		ApplicationContext theContext = getApplicationContext();

-		

-		if( theContext == null ) return null;

-		

-		// A simple check to see if the context contains this bean, which it should...

-		if ( !theContext.containsBean( "testBean" ) ) return null;

-		

-		return (hello + message);

-	} // end sayHello()

-	

-	/**

-	 * Application context setter

-	 */

-    public void setApplicationContext(ApplicationContext appContext) throws BeansException {

-        // Wiring the ApplicationContext into a static method           

-        ctx = appContext;      

-    }

-    

-    /**

-     * Application context getter

-     * @return

-     */

-    public static ApplicationContext getApplicationContext() {           

-        return ctx;       

-    }

-

-}

diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
deleted file mode 100644
index f165bb8b75..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
+++ /dev/null
@@ -1,39 +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.implementation.spring.itests.mock;
-
-/**
- * A simple test Spring bean which provides the HelloWorld service
- *
- * @version $Rev$ $Date$
- */
-
-import org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorld;
-
-public class TestHelloWorldBean implements HelloWorld {
-
-    static String hello = "Hello ";
-
-    // Classic "Hello xxx" response to any input message
-    public String sayHello(String message) {
-        System.out.println("TestHelloWorldBean - sayHello called");
-        return (hello + message);
-    }
-
-} // end class TestHelloWorldBean
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
deleted file mode 100644
index a1d9b5a2f4..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
+++ /dev/null
@@ -1,27 +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.implementation.spring.itests.mock;
-
-/**
- * @version $Rev: 536115 $ $Date: 2007-05-08 09:04:20 +0100 (Tue, 08 May 2007) $
- */
-public interface TestReference {
-    String echo(String msg);
-}
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
deleted file mode 100644
index ab4c07d059..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
+++ /dev/null
@@ -1,57 +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.implementation.spring.itests.mock;
-
-/**
- * A test Spring bean which provides the HelloWorld service by calling a reference
- * to provide the content of the response
- *
- * @version $Rev$ $Date$
- */
-
-import org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorld;
-
-public class TestReferenceBean implements HelloWorld {
-
-    // The reference
-    private HelloWorld bean;
-
-    // Classic "Hello xxx" response to any input message
-    public String sayHello(String message) {
-        System.out.println("TestReferenceBean - sayHello called");
-        return (bean.sayHello(message));
-    }
-
-    /**
-     * Setter for the bean reference
-     * @param theBean
-     */
-    public void setBean(HelloWorld theBean) {
-        this.bean = theBean;
-    }
-
-    /**
-     * Getter for the reference
-     * @return
-     */
-    public HelloWorld getBean() {
-        return this.bean;
-    }
-
-} // end class TestReferenceBean
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java b/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
deleted file mode 100644
index 0f00c7e480..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.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 org.apache.tuscany.sca.implementation.spring.itests.mock;
-
-/**
- * A test Spring bean which provides the HelloWorld service.
- * This bean has a single String property called "hello" which must be set through
- * external configuration to give the correct response message, otherwise an (incorrect)
- * default message is generated
- *
- * @version $Rev$ $Date$
- */
-
-import org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorld;
-
-public class TestSCAPropertyBean implements HelloWorld {
-
-    private String hello = "Go away";
-
-    /**
-     * Provides the operation of the "HelloWorld" interface - a simple string response
-     * to a string input message, where the response is a greeting followed by the original
-     * input message.
-     */
-    public String sayHello(String message) {
-        System.out.println("TestHelloWorldBean - sayHello called");
-        return (hello + " " + message);
-    }
-
-    /**
-     * Public setter for the (unannotated) field "hello" which constitutes an SCA
-     * property
-     * @param message - the message to use for the response to "sayHello"
-     */
-    public void setHello(String message) {
-        hello = message;
-    }
-
-} // end class TestSCAPropertyBean
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
deleted file mode 100644
index a7d30bf201..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
+++ /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.    

--->

-<!-- Application context for the SpringHelloWorld testcase -->

-<beans xmlns="http://www.springframework.org/schema/beans"

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

-       xmlns:sca="http://www.springframework.org/schema/sca"

-       xsi:schemaLocation="

-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

-

-    <bean id="testBean" class="org.apache.tuscany.sca.implementation.spring.itests.mock.TestContextAccessBean" lazy-init="true">

-    </bean>

-

-</beans>

diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
deleted file mode 100644
index 7c358ac01c..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
+++ /dev/null
@@ -1,39 +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.    
--->
-<!-- Application context for the SpringExplicitHelloWorld testcase 
-In this case, the service offered by the Spring application is specified
-explicitly using an sca:service element                                  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <sca:service name="fooService" 
-                 type="org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorld" 
-                 target="testBean"/>
-
-    <bean id="testBean" 
-          class="org.apache.tuscany.sca.implementation.spring.itests.mock.TestHelloWorldBean" 
-          lazy-init="true">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
deleted file mode 100644
index 38e90b41fa..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.sca.implementation.spring.itests.mock.TestReferenceBean">
-        <property name="bean" ref="testReference"/>
-    </bean>
-
-    <sca:reference name="testReference" type="org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorld"/>
-
-</beans>
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
deleted file mode 100644
index 18ce21805c..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
+++ /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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.sca.implementation.spring.itests.mock.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
deleted file mode 100644
index 18ce21805c..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ /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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.sca.implementation.spring.itests.mock.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
deleted file mode 100644
index e6b69e8cad..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.sca.implementation.spring.itests.mock.TestReferenceBean">
-        <!-- Here is the implicit reference - a property with a ref not satisifed within the
-         * Spring application context.
-         -->
-        <property name="bean" ref="testReference"/>
-    </bean>
-
-</beans>
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
deleted file mode 100644
index 8e18a56cca..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
+++ /dev/null
@@ -1,29 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <import resource="SpringHelloWorld-Imported-context.xml"/>
-
-</beans>
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml
deleted file mode 100644
index fdbbeeced2..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.container.spring.mock.TestBeanImpl">
-        <property name="bean" ref="testReference"/>
-    </bean>
-
-    <sca:reference name="testReference" type="org.apache.tuscany.container.spring.mock.TestBean"/>
-
-</beans>
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml
deleted file mode 100644
index 6b3f1f9890..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml
+++ /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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <sca:service name="fooService" type="org.apache.tuscany.container.spring.mock.TestBeanImpl" target="testBean"/>
-
-    <bean id="testBean" class="org.apache.tuscany.container.spring.mock.TestBeanImpl"/>
-
-</beans>
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
deleted file mode 100644
index 18ce21805c..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
+++ /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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.sca.implementation.spring.itests.mock.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
deleted file mode 100644
index 0b260b5dcf..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.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"

-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"

-    xmlns:c="http://SpringContextAccess"

-    targetNamespace="http://SpringContextAccess"

-    name="SpringContextAccess">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorldProxy"/>

-        <reference name="delegate" target="HelloWorldComponent"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <implementation.spring location="META-INF/sca/SpringContextAccess-context.xml"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
deleted file mode 100644
index 79f4041fe6..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           name="SpringExplicitHelloWorld">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorldProxy"/>

-        <reference name="delegate" target="HelloWorldComponent"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <implementation.spring location="META-INF/sca/SpringExplicitHelloWorld-context.xml"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
deleted file mode 100644
index 87353b69ea..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
+++ /dev/null
@@ -1,32 +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"

-           name="SpringExplicitReference">

-

-    <component name="ClientComponent">

-        <implementation.spring location="META-INF/sca/SpringExplicitReference-context.xml"/>

-        <reference name="testReference" target="ReferenceComponent"/>

-    </component>

-

-    <component name="ReferenceComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorldImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
deleted file mode 100644
index ebb693d243..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
+++ /dev/null
@@ -1,32 +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"

-           name="SpringHelloWorld">

-

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorldProxy"/>

-        <reference name="delegate" target="HelloWorldComponent"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <implementation.spring location="META-INF/sca/SpringHelloWorld-context.xml"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
deleted file mode 100644
index 9f51277d22..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
+++ /dev/null
@@ -1,39 +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 for the SpringImplicitReferenceTestCase         

- * This composite has a ClientComponent implemented with a Spring implementation where

- * Spring application context uses an implicit reference definition through a Bean with

- * a property with an unsatisfied ref attribute, which forms the reference.

- * The reference is satisified by a wire to a ReferenceComponent which is implemented

- * by a plain Java POJO.

--->

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-           name="SpringImplicitReference">

-

-    <component name="ClientComponent">

-        <implementation.spring location="META-INF/sca/SpringImplicitReference-context.xml"/>

-        <reference name="testReference" target="ReferenceComponent"/>

-    </component>

-

-    <component name="ReferenceComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorldImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
deleted file mode 100644
index 95dd9131eb..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
+++ /dev/null
@@ -1,32 +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"
-           name="SpringHelloWorld">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
-    </component>
-
-    <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/SpringImportHelloWorld-context.xml"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
deleted file mode 100644
index af1b3be0a5..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
+++ /dev/null
@@ -1,39 +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 for the SpringSCAPropertyTestCase         

- * This composite has the HelloWorldComponent implemented with a Spring implementation where

- * the Spring application context uses an explicit SCA property.  The value of the property

- * is set in this composite and is used to compute the response to a service invocation from

- * the ClientComponent.

- -->

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-           name="SpringSCAProperty">

-    

-    <component name="ClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorldProxy"/>

-        <reference name="delegate" target="HelloWorldComponent"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <implementation.spring location="spring"/>

-        <property name="TestProperty">Hello</property>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF
deleted file mode 100644
index 950dbeba4c..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0

-Spring-Context: META-INF/spring/SpringSCAProperty-context.xml

-

diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
deleted file mode 100644
index f1ee21686d..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.sca.implementation.spring.itests.mock.TestSCAPropertyBean" lazy-init="true">
-    	<property name="hello" ref="TestProperty"/>
-    </bean>
-    
-    <sca:property id="foo" name="TestProperty" type="java.lang.String"/>
-
-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/test.xml b/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/test.xml
deleted file mode 100644
index f2d684f766..0000000000
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/test.xml
+++ /dev/null
@@ -1,27 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:sca="http://www.springframework.org/schema/sca"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.sca.implementation.spring.itests.mock.TestBeanImpl" />
-
-</beans>
diff --git a/java/sca-contrib/modules/implementation-spring/LICENSE b/java/sca-contrib/modules/implementation-spring/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/implementation-spring/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/implementation-spring/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-spring/META-INF/MANIFEST.MF
deleted file mode 100644
index 8c8d152708..0000000000
--- a/java/sca-contrib/modules/implementation-spring/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,83 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.implementation.spring;version="2.0.0";

-  uses:="org.apache.tuscany.sca.databinding,

-   org.apache.tuscany.sca.runtime,

-   org.apache.tuscany.sca.provider,

-   org.springframework.context.support,

-   org.springframework.beans,

-   org.apache.tuscany.sca.assembly.impl,

-   org.springframework.beans.factory.config,

-   org.apache.tuscany.sca.core,

-   org.apache.tuscany.sca.policy,

-   javax.xml.namespace,

-   javax.xml.stream,

-   org.apache.tuscany.sca.interfacedef.java.impl,

-   org.apache.tuscany.sca.assembly.xml,

-   org.apache.tuscany.sca.contribution.resolver,

-   org.apache.tuscany.sca.core.factory,

-   org.apache.tuscany.sca.core.invocation,

-   org.springframework.beans.factory,

-   org.apache.tuscany.sca.assembly,

-   org.apache.tuscany.sca.databinding.impl,

-   org.springframework.core.io,

-   org.springframework.beans.factory.xml,

-   org.springframework.context,

-   org.apache.tuscany.sca.implementation.java,

-   org.apache.tuscany.sca.interfacedef.java,

-   org.apache.tuscany.sca.monitor,

-   org.apache.tuscany.sca.interfacedef,

-   org.w3c.dom,

-   org.apache.tuscany.sca.implementation.java.injection,

-   org.apache.tuscany.sca.invocation,

-   org.apache.tuscany.sca.contribution.processor",

- org.apache.tuscany.sca.implementation.spring.xml

-Private-Package: org.apache.tuscany.sca.implementation.spring.xml;vers

- ion="1.4",org.springframework.sca.xml;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Spring Framework Implementation Extens

- ion

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397466437

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Spring Framework Implementation

-  Extension

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.impl;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.core.factory;version="2.0.0",

- org.apache.tuscany.sca.core.invocation;version="2.0.0",

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.implementation.java;version="2.0.0",

- org.apache.tuscany.sca.implementation.java.injection;version="2.0.0",

- org.apache.tuscany.sca.implementation.spring;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java.impl;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,

- org.springframework.beans,

- org.springframework.beans.factory,

- org.springframework.beans.factory.config,

- org.springframework.beans.factory.xml,

- org.springframework.context,

- org.springframework.context.support,

- org.springframework.core.io,

- org.w3c.dom

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.spring

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/implementation-spring/NOTICE b/java/sca-contrib/modules/implementation-spring/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/implementation-spring/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/implementation-spring/pom.xml b/java/sca-contrib/modules/implementation-spring/pom.xml
deleted file mode 100644
index 16b50a0aea..0000000000
--- a/java/sca-contrib/modules/implementation-spring/pom.xml
+++ /dev/null
@@ -1,107 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-implementation-spring</artifactId>
-    <name>Apache Tuscany SCA Spring Framework Implementation Extension</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Spring dependencies... -->    
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>2.5.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>2.5.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>2.5.5</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
deleted file mode 100644
index 35df76fabc..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
+++ /dev/null
@@ -1,39 +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.implementation.spring;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SpringBeanNotFoundException extends Exception {
-
-    private static final long serialVersionUID = -1157790036638157553L;
-
-    public SpringBeanNotFoundException(String msg) {
-        super(msg);
-    }
-    
-    public SpringBeanNotFoundException(Throwable e) {
-        super(e);
-    }
-    
-    public SpringBeanNotFoundException(String msg, Throwable e) {
-        super(msg,e);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
deleted file mode 100644
index 8bf3e5ed3c..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ /dev/null
@@ -1,187 +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.implementation.spring;
-
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Extensible;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
-import org.apache.tuscany.sca.implementation.spring.xml.SpringBeanElement;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.springframework.core.io.Resource;
-
-/**
- * Represents a Spring implementation.
- * 
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- */
-public class SpringImplementation extends ImplementationImpl implements Implementation, Extensible {
-
-    /** The location attribute which points to the Spring application-context XML file **/
-    private String location;
-    /** The application-context file as a Spring Resource **/
-    private Resource resource;
-    /** **/
-    private ComponentType componentType;
-    /** Mapping of Services to Beans **/
-    private Hashtable<String, SpringBeanElement> serviceMap;
-    /** Mapping of property names to Java class **/
-    private Hashtable<String, Class> propertyMap;
-    private List<PolicyHandlerTuple> policyHandlerClassNames = null;
-    
-    // Method marked with @Init annotation
-    private Method initMethod = null;
-    // Method marked with @Destroy annotation
-    private Method destroyMethod = null;
-    // Method marked with @Constructor annotation
-    private JavaConstructorImpl<?> constructorDefinition = null;
-
-    public SpringImplementation() {
-        this.location = null;
-        this.resource = null;
-        setUnresolved(true);
-        serviceMap = new Hashtable<String, SpringBeanElement>();
-        propertyMap = new Hashtable<String, Class>();
-    }
-
-
-    /**
-     * Returns the location attribute for this Spring implementation
-     * @return URI for the location of the Spring implementation
-     */
-    public String getLocation() {
-        return location;
-    }
-
-    /**
-     * Sets the location attribute for this Spring implementation
-     * @param location a URI to the Spring application-context file
-     */
-    public void setLocation(String location) {
-        this.location = location;
-        return;
-    }
-
-    /**
-     * 
-     * @param resource
-     */
-    public void setResource(Resource resource) {
-        this.resource = resource;
-    }
-
-    /**
-     * 
-     * @return
-     */
-    public Resource getResource() {
-        return resource;
-    }
-    
-    public JavaConstructorImpl<?> getConstructor() {
-        return constructorDefinition;
-    }
-
-    /**
-     * Returns the componentType for this Spring implementation
-     * @return
-     */
-    public ComponentType getComponentType() {
-        return componentType;
-    }
-
-    /**
-     * Sets the componentType for this Spring implementation
-     * @param componentType
-     */
-    public void setComponentType(ComponentType componentType) {
-        this.componentType = componentType;
-    }
-
-    /**
-     * Returns the Spring Bean which implements a particular service
-     * @param service the service
-     * @return the bean which implements the service, as a SpringBeanElement
-     */
-    public SpringBeanElement getBeanFromService(Service service) {
-        SpringBeanElement theBean = serviceMap.get(service.getName());
-        return theBean;
-    }
-
-    /**
-     * Sets the mapping from a service to the Spring Bean that implements the service
-     * @param service the service
-     * @param theBean a SpringBeanElement for the Bean implementing the service
-     */
-    public void setBeanForService(Service service, SpringBeanElement theBean) {
-        serviceMap.put(service.getName(), theBean);
-    }
-
-    /**
-     * Add a mapping from a SCA property name to a Java class for the property
-     * @param propertyName
-     * @param propertyClass
-     */
-    public void setPropertyClass(String propertyName, Class propertyClass) {
-        if (propertyName == null || propertyClass == null)
-            return;
-        propertyMap.put(propertyName, propertyClass);
-        return;
-    }
-
-    /**
-     * Gets the Java Class for an SCA property 
-     * @param propertyName - the property name
-     * @return - a Class object for the type of the property
-     */
-    public Class getPropertyClass(String propertyName) {
-        return propertyMap.get(propertyName);
-    }
-
-    @Override
-    public List<Service> getServices() {
-        return componentType.getServices();
-    }
-
-    @Override
-    public List<Reference> getReferences() {
-        return componentType.getReferences();
-    }
-
-    @Override
-    public List<Property> getProperties() {
-        return componentType.getProperties();
-    }
-    
-    public List<PolicyHandlerTuple> getPolicyHandlerClassNames() {
-        return policyHandlerClassNames;
-    }
-
-    public void setPolicyHandlerClassNames(List<PolicyHandlerTuple> policyHandlerClassNames) {
-        this.policyHandlerClassNames = policyHandlerClassNames;
-    } // end method setPolicyHandlerClassNames
-}
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
deleted file mode 100644
index 1b6ba953c7..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
+++ /dev/null
@@ -1,232 +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.implementation.spring;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.spring.xml.SpringXMLComponentTypeLoader;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- * SpringArtifactProcessor is responsible for processing the XML of an <implementation.spring.../>
- * element in an SCA SCDL file.
- * 
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- */
-public class SpringImplementationProcessor implements StAXArtifactProcessor<SpringImplementation> {
-
-    private static final String LOCATION = "location";
-    private static final String IMPLEMENTATION_SPRING = "implementation.spring";
-    private static final QName IMPLEMENTATION_SPRING_QNAME = new QName(Constants.SCA10_NS, IMPLEMENTATION_SPRING);
-    private static final String MSG_LOCATION_MISSING = "Reading implementation.spring - location attribute missing";
-
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-    private JavaImplementationFactory javaImplementationFactory;
-    private PolicyFactory policyFactory;
-    private PolicyAttachPointProcessor policyProcessor;
-    private Monitor monitor;
-    
-    public SpringImplementationProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-        this.javaImplementationFactory = modelFactories.getFactory(JavaImplementationFactory.class);
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a exception.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Exception ex) {
-    	 if (monitor != null) {
-	        Problem problem = monitor.createProblem(this.getClass().getName(), "impl-spring-validation-messages", Severity.ERROR, model, message, ex);
-	        monitor.problem(problem);
-    	 }
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-	        Problem problem = monitor.createProblem(this.getClass().getName(), "impl-spring-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-    }
-
-    /*
-     * Read the XML and parse out the attributes.
-     * 
-     * <implementation.spring.../> has a single required attribute:
-     * "location" - which is the target URI of of an archive file or a directory that contains the Spring
-     * application context files.
-     * If the resource identified by the location attribute is an archive file, then the file 
-     * META-INF/MANIFEST.MF is read from the archive. 
-     * If the location URI identifies a directory, then META-INF/MANIFEST.MF must exist
-     * underneath that directory. 
-     * If the manifest file contains a header "Spring-Context" of the format:
-     *    Spring-Context ::= path ( ';' path )*
-     *    
-     * Where path is a relative path with respect to the location URI, then the set of paths 
-     * specified in the header identify the context configuration files. 
-     * If there is no MANIFEST.MF file or no Spring-Context header within that file, 
-     * then the default behaviour is to build an application context using all the *.xml files 
-     * in the METAINF/spring directory.
-     */
-    public SpringImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-
-        // Create the Spring implementation
-        SpringImplementation springImplementation = null;
-
-        // Read the location attribute for the spring implementation
-        String springLocation = reader.getAttributeValue(null, LOCATION);
-        if (springLocation != null) {
-        	springImplementation = new SpringImplementation();
-        	springImplementation.setLocation(springLocation);
-        	springImplementation.setUnresolved(true);
-            processComponentType(springImplementation);
-        } else {
-        	error("LocationAttributeMissing", reader);
-            //throw new ContributionReadException(MSG_LOCATION_MISSING);
-        }
-        
-        // Read policies
-        policyProcessor.readPolicies(springImplementation, reader);
-
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && IMPLEMENTATION_SPRING_QNAME.equals(reader.getName())) {
-                break;
-            }
-        } // end while
-
-        return springImplementation;
-    } // end read
-
-    /*
-     * Handles the component type for the Spring implementation
-     * @param springImplementation - a Spring implementation.  The component type information
-     * is created for this implementation
-     *  
-     */
-    private void processComponentType(SpringImplementation springImplementation) {
-
-        // Create a ComponentType and mark it unresolved
-        ComponentType componentType = assemblyFactory.createComponentType();
-        componentType.setUnresolved(true);
-        springImplementation.setComponentType(componentType);
-    } // end processComponentType
-
-    /*
-     * Write out the XML representation of the Spring implementation
-     * <implementation.spring location="..." />
-     */
-    public void write(SpringImplementation springImplementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
-        // Write <implementation.spring>
-        policyProcessor.writePolicyPrefixes(springImplementation, writer);
-        writer.writeStartElement(Constants.SCA10_NS, IMPLEMENTATION_SPRING);
-        policyProcessor.writePolicyAttributes(springImplementation, writer);
-        
-        if (springImplementation.getLocation() != null) {
-            writer.writeAttribute(LOCATION, springImplementation.getLocation());
-        }
-
-        writer.writeEndElement();
-
-    } // end write
-
-    /**
-     * Resolves the Spring implementation - loads the Spring application-context XML and
-     * derives the spring implementation componentType from it
-     */
-    public void resolve(SpringImplementation springImplementation, ModelResolver resolver)
-        throws ContributionResolveException {
-    	
-    	if (springImplementation == null)
-    		return;
-
-        /* Load the Spring component type by reading the Spring application context */
-        SpringXMLComponentTypeLoader springLoader =
-            new SpringXMLComponentTypeLoader(assemblyFactory, javaFactory, javaImplementationFactory, policyFactory);
-        try {
-            // Load the Spring Implementation information from its application context file...
-            springLoader.load(springImplementation);
-        } catch (ContributionReadException e) {
-        	ContributionResolveException ce = new ContributionResolveException(e);
-        	error("ContributionResolveException", resolver, ce);
-            throw ce;
-        }
-
-        ComponentType ct = springImplementation.getComponentType();
-        if (ct.isUnresolved()) {
-            // If the introspection fails to resolve, try to find a side file...
-            ComponentType componentType = resolver.resolveModel(ComponentType.class, ct);
-            if (componentType.isUnresolved()) {
-            	error("UnableToResolveComponentType", resolver);
-                //throw new ContributionResolveException("SpringArtifactProcessor: unable to resolve componentType for Spring component");             
-            } else {
-                springImplementation.setComponentType(componentType);
-                springImplementation.setUnresolved(false);
-           }            
-   
-        } // end if
-
-    } // end method resolve
-
-    public QName getArtifactType() {
-        return IMPLEMENTATION_SPRING_QNAME;
-    }
-
-    public Class<SpringImplementation> getModelType() {
-        return SpringImplementation.class;
-    }
-
-} // end class SpringArtifactProcessor
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
deleted file mode 100644
index 6e0987791b..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
+++ /dev/null
@@ -1,151 +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.implementation.spring.processor;

-

-import java.lang.reflect.Field;

-import java.lang.reflect.Method;

-import java.lang.reflect.Modifier;

-import java.beans.PropertyDescriptor;

-import java.lang.annotation.Annotation;

-

-import org.springframework.util.Assert;

-import org.springframework.beans.BeanUtils;

-import org.springframework.util.ReflectionUtils;

-import org.springframework.beans.BeansException;

-import org.springframework.beans.FatalBeanException;

-import org.springframework.beans.factory.config.BeanPostProcessor;

-

-import org.oasisopen.sca.annotation.ComponentName;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-

-public class ComponentNameAnnotationProcessor implements BeanPostProcessor {

-

-    private Class<? extends Annotation> componentNameAnnotationType = ComponentName.class;

-    

-    private RuntimeComponent component;

-    

-    public ComponentNameAnnotationProcessor (RuntimeComponent component) {

-        this.component = component;

-    }

-    

-    /**

-     * Gets componentName annotation type.

-     */

-    protected Class<? extends Annotation> getComponentNameAnnotationType() {

-        return this.componentNameAnnotationType;

-    }

-

-    /**

-     * Sets componentName annotation type.

-     */

-    public void setComponentNameAnnotationType(Class<? extends Annotation> componentNameAnnotationType) {

-        Assert.notNull(componentNameAnnotationType, "'componentNameAnnotationType' type must not be null.");

-        this.componentNameAnnotationType = componentNameAnnotationType;

-    }

-

-    /**

-     * This method is used to execute before a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessBeforeInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessBeforeInitialization(Object bean, String beanName) 

-    throws BeansException {

-        processAnnotation(bean);

-        return bean;

-    }

-

-    /**

-     * This method is used to execute after a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessAfterInitialization(Object bean, String beanName)

-    throws BeansException {

-        return bean;

-    }

-

-    /**

-     * <p>Processes a beans fields for injection if it has a {@link Reference} annotation.</p>

-     */

-    protected void processAnnotation(final Object bean) {

-        

-        final Class<?> clazz = bean.getClass();

-

-        ReflectionUtils.doWithFields(clazz, new ReflectionUtils.FieldCallback() {

-            public void doWith(Field field) {

-                Annotation annotation = field.getAnnotation(getComponentNameAnnotationType());

-

-                if (annotation != null) {

-                    if (Modifier.isStatic(field.getModifiers())) {

-                        throw new IllegalStateException("ComponentName annotation is not supported on static fields");

-                    }

-                    

-                    if (Modifier.isPrivate(field.getModifiers())) {

-                        throw new IllegalStateException("ComponentName annotation is not supported on private fields");

-                    }

-

-                    ReflectionUtils.makeAccessible(field);

-                    

-                    if (field.getType().getName().equals("java.lang.String")) {

-                        Object nameObj = component.getName();   

-                        if (nameObj != null)

-                            ReflectionUtils.setField(field, bean, nameObj);

-                    } else {

-                        throw new IllegalStateException("ComponentName annotation is supported only on java.lang.String field type.");

-                    }

-                }

-            }

-        });

-

-        ReflectionUtils.doWithMethods(clazz, new ReflectionUtils.MethodCallback() {

-            public void doWith(Method method) {

-                Annotation annotation = method.getAnnotation(getComponentNameAnnotationType());

-                

-                if (annotation != null) {

-                    if (Modifier.isStatic(method.getModifiers())) {

-                        throw new IllegalStateException("ComponentName annotation is not supported on static methods");

-                    }

-                    

-                    if (Modifier.isPrivate(method.getModifiers())) {

-                        throw new IllegalStateException("ComponentName annotation is not supported on private methods");

-                    }

-

-                    if (method.getParameterTypes().length == 0) {

-                        throw new IllegalStateException("ComponentName annotation requires at least one argument: " + method);

-                    }

-                    

-                    PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);                    

-                    

-                    if (pd.getPropertyType().getName().equals("java.lang.String")) {

-                        Object nameObj = component.getName();                    

-                        if (nameObj != null) {

-                            try {                                                       

-                                pd.getWriteMethod().invoke(bean, new Object[] { nameObj });

-                            } catch (Throwable e) {

-                                throw new FatalBeanException("Problem injecting reference:  " + e.getMessage(), e);

-                            }

-                        }

-                    } else {

-                        throw new IllegalStateException("ComponentName annotation is supported only on java.lang.String field type.");

-                    }

-                }

-            }

-        });

-    }

-}

diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
deleted file mode 100644
index 689ac27f0f..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.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.implementation.spring.processor;

-

-import java.lang.reflect.Method;

-import java.lang.reflect.Modifier;

-import java.lang.reflect.Constructor;

-import java.lang.annotation.Annotation;

-import java.util.ArrayList;

-import java.util.List;

-

-import org.springframework.util.Assert;

-import org.springframework.beans.BeansException;

-import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;

-import org.springframework.beans.factory.annotation.Autowired;

-

-public class ConstructorAnnotationProcessor extends InstantiationAwareBeanPostProcessorAdapter {

-

-    private Class<? extends Annotation> constructorAnnotationType 

-                                            = org.oasisopen.sca.annotation.Constructor.class;

-    

-    private Class<? extends Annotation> autowiredAnnotationType = Autowired.class;

-    

-    public ConstructorAnnotationProcessor () {

-        // Default constructor.

-    }

-    

-    /**

-     * Set the 'autowired' annotation type, to be used on constructors, fields,

-     * setter methods and arbitrary config methods.

-     */

-    public void setAutowiredAnnotationType(Class<? extends Annotation> autowiredAnnotationType) {

-        Assert.notNull(autowiredAnnotationType, "'autowiredAnnotationType' must not be null");

-        this.autowiredAnnotationType = autowiredAnnotationType;

-    }

-

-    /**

-     * Return the 'autowired' annotation type.

-     */

-    protected Class<? extends Annotation> getAutowiredAnnotationType() {

-        return this.autowiredAnnotationType;

-    }

-    

-    /**

-     * Return the 'constructor' annotation type.

-     */

-    protected Class<? extends Annotation> getConstructorAnnotationType() {

-        return this.constructorAnnotationType;

-    }

-

-    /**

-     * Sets the 'constructor' annotation type.

-     */

-    public void setConstructorAnnotationType(Class<? extends Annotation> constructorAnnotationType) {

-        Assert.notNull(constructorAnnotationType, "'constructorAnnotationType' type must not be null.");

-        this.constructorAnnotationType = constructorAnnotationType;

-    }

-

-    /**

-     * This method is used to execute before a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessBeforeInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessBeforeInitialization(Object bean, String beanName) 

-    throws BeansException {

-        return bean;

-    }

-

-    /**

-     * This method is used to execute after a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessAfterInitialization(Object bean, String beanName)

-    throws BeansException {

-        return bean;

-    }

-    

-    public Constructor[] determineCandidateConstructors(Class beanClass, String beanName) throws BeansException {

-        /*Constructor[] declaredConstructors = beanClass.getDeclaredConstructors();                

-        Method[] declaredMethods = beanClass.getDeclaredMethods();

-        List candidates = new ArrayList(declaredConstructors.length);

-

-        for (int i = 0; i < declaredMethods.length; i++) {

-            Method method = declaredMethods[i];

-            Annotation annotation = method.getAnnotation(getConstructorAnnotationType());

-            if (annotation != null) {

-                if (Modifier.isStatic(method.getModifiers())) {

-                    throw new IllegalStateException("Constructor annotation is not supported on static methods");

-                }

-                

-                if (candidates.size() == 1) {

-                    throw new IllegalStateException("Only one method is allowed to have constructor annotation in a bean: " + method);

-                }

-                

-                candidates.add(method);

-            }

-        }

-

-        return (Constructor[]) candidates.toArray(new Constructor[candidates.size()]);*/

-        return null;

-    }

-}

diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
deleted file mode 100644
index 129a15e72e..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
+++ /dev/null
@@ -1,72 +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.implementation.spring.processor;

-

-import java.lang.annotation.Annotation;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Destroy;

-import org.springframework.beans.factory.annotation.InitDestroyAnnotationBeanPostProcessor;

-import org.springframework.util.Assert;

-

-public class InitDestroyAnnotationProcessor extends InitDestroyAnnotationBeanPostProcessor {    

-    

-    private static final long serialVersionUID = 0;

-    

-    private Class<? extends Annotation> initAnnotationType = Init.class;

-

-    private Class<? extends Annotation> destroyAnnotationType = Destroy.class;

-    

-    /**

-     * Gets init annotation type.

-     */

-    protected Class<? extends Annotation> getInitAnnotationType() {

-        return this.initAnnotationType;

-    }

-

-    /**

-     * Sets init annotation type.

-     */

-    /*public void setInitAnnotationType(Class<? extends Annotation> initAnnotationType) {

-        Assert.notNull(initAnnotationType, "Init annotation type must not be null.");

-        this.initAnnotationType = initAnnotationType;

-    }*/

-    

-    /**

-     * Gets destroy annotation type.

-     */

-    protected Class<? extends Annotation> getDestroyAnnotationType() {

-        return this.destroyAnnotationType;

-    }

-

-    /**

-     * Sets destroy annotation type.

-     */

-    /*public void setDestroyAnnotationType(Class<? extends Annotation> destroyAnnotationType) {

-        Assert.notNull(destroyAnnotationType, "Destroy annotation type must not be null.");

-        this.destroyAnnotationType = destroyAnnotationType;

-    }*/

-

-    public InitDestroyAnnotationProcessor () {

-        // Set the @Init annotation type

-        setInitAnnotationType(initAnnotationType);

-        

-        // Set the @Destroy annotation type

-        setDestroyAnnotationType(destroyAnnotationType);

-    }

-}

diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
deleted file mode 100644
index fbc0e2b36f..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
+++ /dev/null
@@ -1,220 +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.implementation.spring.processor;

-

-import java.lang.reflect.Field;

-import java.lang.reflect.Method;

-import java.lang.reflect.Modifier;

-import java.beans.PropertyDescriptor;

-import java.lang.annotation.Annotation;

-import java.util.List;

-

-import org.springframework.util.Assert;

-import org.springframework.beans.BeanUtils;

-import org.springframework.util.ReflectionUtils;

-import org.springframework.beans.BeansException;

-import org.springframework.beans.FatalBeanException;

-import org.springframework.beans.factory.config.BeanPostProcessor;

-

-import org.oasisopen.sca.annotation.Property;

-import org.apache.tuscany.sca.assembly.ComponentProperty;

-import org.apache.tuscany.sca.core.factory.ObjectFactory;

-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-

-public class PropertyAnnotationProcessor implements BeanPostProcessor {

-

-    private Class<? extends Annotation> propertyAnnotationType = Property.class;

-    

-    private RuntimeComponent component;

-    

-    private JavaPropertyValueObjectFactory propertyFactory;

-    

-    public PropertyAnnotationProcessor (JavaPropertyValueObjectFactory propertyFactory, 

-                                        RuntimeComponent component) {

-        this.propertyFactory = propertyFactory;

-        this.component = component;

-    }

-

-    /**

-     * Gets property annotation type.

-     */

-    protected Class<? extends Annotation> getPropertyAnnotationType() {

-        return this.propertyAnnotationType;

-    }

-

-    /**

-     * Sets property annotation type.

-     */

-    public void setPropertyAnnotationType(Class<? extends Annotation> propertyAnnotationType) {

-        Assert.notNull(propertyAnnotationType, "'propertyAnnotationType' type must not be null.");

-        this.propertyAnnotationType = propertyAnnotationType;

-    }

-

-    /**

-     * This method is used to execute before a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessBeforeInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessBeforeInitialization(Object bean, String beanName) 

-    throws BeansException {

-        processAnnotation(bean);

-        return bean;

-    }

-

-    /**

-     * This method is used to execute after a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessAfterInitialization(Object bean, String beanName)

-    throws BeansException {

-        return bean;

-    }

-

-    /**

-     * <p>Processes a beans fields for injection if it has a {@link Property} annotation.</p>

-     */

-    protected void processAnnotation(final Object bean) {

-        

-        final Class<?> clazz = bean.getClass();       

-

-        ReflectionUtils.doWithMethods(clazz, new ReflectionUtils.MethodCallback() {

-            public void doWith(Method method) {

-                //Annotation annotation = method.getAnnotation(getPropertyAnnotationType());                

-                Property annotation = (Property) method.getAnnotation(getPropertyAnnotationType());

-                

-                if (annotation != null) {

-                    if (Modifier.isStatic(method.getModifiers())) {

-                        throw new IllegalStateException("Property annotation is not supported on static methods");

-                    }

-                    

-                    if (Modifier.isPrivate(method.getModifiers())) {

-                        throw new IllegalStateException("Property annotation is not supported on private methods");

-                    }

-

-                    if (method.getParameterTypes().length == 0) {

-                        throw new IllegalStateException("Property annotation requires at least one argument: " + method);

-                    }

-                    

-                    PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);

-                    if (pd != null) {

-                        String propName = annotation.name();

-                        if ("".equals(propName)) {

-                            injectProperty(bean, pd, getPropertyObj(pd.getPropertyType(), pd.getName()));

-                        } else {

-                            injectProperty(bean, pd, getPropertyObj(pd.getPropertyType(), propName));

-                        }

-                    }

-                }

-            }

-        });

-        

-        ReflectionUtils.doWithFields(clazz, new ReflectionUtils.FieldCallback() {

-            public void doWith(Field field) {

-                //Annotation annotation = field.getAnnotation(getPropertyAnnotationType());

-                Property annotation = (Property) field.getAnnotation(getPropertyAnnotationType());

-                

-                if (annotation != null) {

-                    if (Modifier.isStatic(field.getModifiers())) {

-                        throw new IllegalStateException("Property annotation is not supported on static fields");

-                    }

-                    

-                    if (Modifier.isPrivate(field.getModifiers())) {

-                        throw new IllegalStateException("Property annotation is not supported on private fields");

-                    }

-

-                    ReflectionUtils.makeAccessible(field);

-                    

-                    Object propertyObj = null;

-                    String propName = annotation.name();

-                    if ("".equals(propName)) {

-                        propertyObj = getPropertyObj(field.getType(), field.getName());                        

-                    } else {

-                        propertyObj = getPropertyObj(field.getType(), propName);

-                    }

-                    

-                    if (propertyObj != null)

-                        ReflectionUtils.setField(field, bean, propertyObj);

-                }

-            }

-        });

-    }

-    

-    /**

-     * Processes a property descriptor to inject a service.

-     */

-    public Object getPropertyObj(Class requiredType, String name) {

-        

-        Object propertyObj = null;

-        

-        List<ComponentProperty> props = component.getProperties();

-        for (ComponentProperty prop : props) {

-            if (prop.getName().equals(name)) {

-                // On finding the property, create a factory for it and create a Bean using

-                // the factory

-                ObjectFactory factory = propertyFactory.createValueFactory(prop, prop.getValue(), requiredType);

-                propertyObj = factory.getInstance();

-            } // end if

-        } // end for        

-        

-        return propertyObj;

-    }

-    

-    

-    public void injectProperty(Object bean, PropertyDescriptor pd, Object propertyObj) {

-        

-        if (propertyObj != null) {

-            try {                                                       

-                pd.getWriteMethod().invoke(bean, new Object[] { propertyObj });

-            } catch (Throwable e) {

-                throw new FatalBeanException("Problem injecting property:  " + e.getMessage(), e);

-            }

-        }

-    }

-    

-    /**

-     * Processes a property descriptor to inject a service.

-     */

-    /*public void injectMethod(Object bean, Method method) {

-        PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);        

-

-        if (pd != null) {

-            Object propertyObj = null;

-            

-            List<ComponentProperty> props = component.getProperties();

-            for (ComponentProperty prop : props) {

-                if (prop.getName().equals(pd.getName())) {

-                    // On finding the property, create a factory for it and create a Bean using

-                    // the factory

-                    ObjectFactory factory = propertyFactory.createValueFactory(prop, prop.getValue(), pd.getPropertyType());

-                    propertyObj = factory.getInstance();

-                } // end if

-            } // end for

-

-            if (propertyObj != null) {

-                try {                                                       

-                    pd.getWriteMethod().invoke(bean, new Object[] { propertyObj });

-                } catch (Throwable e) {

-                    throw new FatalBeanException("Problem injecting property:  " + e.getMessage(), e);

-                }

-            }

-        }

-    }*/

-}

diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
deleted file mode 100644
index 48c727baab..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
+++ /dev/null
@@ -1,186 +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.implementation.spring.processor;

-

-import java.lang.reflect.Field;

-import java.lang.reflect.Method;

-import java.lang.reflect.Modifier;

-import java.beans.PropertyDescriptor;

-import java.lang.annotation.Annotation;

-

-import org.springframework.util.Assert;

-import org.springframework.beans.BeanUtils;

-import org.springframework.util.ReflectionUtils;

-import org.springframework.beans.BeansException;

-import org.springframework.beans.FatalBeanException;

-import org.springframework.beans.factory.config.BeanPostProcessor;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-

-public class ReferenceAnnotationProcessor implements BeanPostProcessor {

-

-    private Class<? extends Annotation> referenceAnnotationType = Reference.class;

-    

-    private RuntimeComponent component;

-    

-    public ReferenceAnnotationProcessor (RuntimeComponent component) {

-        this.component = component;

-    }

-    

-    /**

-     * Gets referece annotation type.

-     */

-    protected Class<? extends Annotation> getReferenceAnnotationType() {

-        return this.referenceAnnotationType;

-    }

-

-    /**

-     * Sets referece annotation type.

-     */

-    public void setReferenceAnnotationType(Class<? extends Annotation> referenceAnnotationType) {

-        Assert.notNull(referenceAnnotationType, "'referenceAnnotationType' type must not be null.");

-        this.referenceAnnotationType = referenceAnnotationType;

-    }

-

-    /**

-     * This method is used to execute before a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessBeforeInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessBeforeInitialization(Object bean, String beanName) 

-    throws BeansException {

-        processAnnotation(bean);

-        return bean;

-    }

-

-    /**

-     * This method is used to execute after a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessAfterInitialization(Object bean, String beanName)

-    throws BeansException {

-        return bean;

-    }

-

-    /**

-     * <p>Processes a beans fields for injection if it has a {@link Reference} annotation.</p>

-     */

-    protected void processAnnotation(final Object bean) {

-        

-        final Class<?> clazz = bean.getClass();        

-

-        ReflectionUtils.doWithMethods(clazz, new ReflectionUtils.MethodCallback() {

-            public void doWith(Method method) {

-                //Annotation annotation = method.getAnnotation(getReferenceAnnotationType());                

-                Reference annotation = (Reference) method.getAnnotation(getReferenceAnnotationType());

-                

-                if (annotation != null) {

-                    if (Modifier.isStatic(method.getModifiers())) {

-                        throw new IllegalStateException("Reference annotation is not supported on static methods");

-                    }

-                    

-                    if (Modifier.isPrivate(method.getModifiers())) {

-                        throw new IllegalStateException("Reference annotation is not supported on private methods");

-                    }

-

-                    if (method.getParameterTypes().length == 0) {

-                        throw new IllegalStateException("Reference annotation requires at least one argument: " + method);

-                    }

-                    

-                    PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);

-                    if (pd != null) {

-                        String refName = annotation.name();

-                        if ("".equals(refName)) {

-                            injectReference(bean, pd, pd.getName());

-                        } else {

-                            injectReference(bean, pd, refName);

-                        }

-                    }

-                }

-            }

-        });

-        

-        ReflectionUtils.doWithFields(clazz, new ReflectionUtils.FieldCallback() {

-            public void doWith(Field field) {

-                //Annotation annotation = field.getAnnotation(getReferenceAnnotationType());                

-                Reference annotation = (Reference) field.getAnnotation(getReferenceAnnotationType());

-                

-                if (annotation != null) {

-                    if (Modifier.isStatic(field.getModifiers())) {

-                        throw new IllegalStateException("Reference annotation is not supported on static fields");

-                    }

-                    

-                    if (Modifier.isPrivate(field.getModifiers())) {

-                        throw new IllegalStateException("Reference annotation is not supported on private fields");

-                    }

-

-                    ReflectionUtils.makeAccessible(field);

-                    

-                    Object referenceObj = null;

-                    String refName = annotation.name();

-                    if ("".equals(refName)) {

-                        referenceObj = component.getComponentContext().getService(field.getType(), field.getName());

-                    } else {

-                        referenceObj = component.getComponentContext().getService(field.getType(), refName);

-                    }                        

-                    

-                    if (referenceObj != null)

-                        ReflectionUtils.setField(field, bean, referenceObj);

-                }

-            }

-        });

-    }

-    

-    /**

-     * Processes a property descriptor to inject a service.

-     */

-    public void injectReference(Object bean, PropertyDescriptor pd, String name) {

-               

-        Object referenceObj = component.getComponentContext().getService(pd.getPropertyType(), name);

-        

-        if (referenceObj != null) {

-            try {                                                       

-                pd.getWriteMethod().invoke(bean, new Object[] { referenceObj });

-            } catch (Throwable e) {

-                throw new FatalBeanException("Problem injecting reference:  " + e.getMessage(), e);

-            }

-        }

-    }

-    

-    /**

-     * Processes a property descriptor to inject a service.

-     */

-    /*public void injectMethod(Object bean, Method method) {

-        PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);        

-

-        if (pd != null) {            

-            Object referenceObj = component.getComponentContext().getService(pd.getPropertyType(), pd.getName());

-

-            if (referenceObj != null) {

-                try {                                                       

-                    pd.getWriteMethod().invoke(bean, new Object[] { referenceObj });

-                } catch (Throwable e) {

-                    throw new FatalBeanException("Problem injecting reference:  " + e.getMessage(), e);

-                }

-            }

-        }

-    }*/

-}

diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
deleted file mode 100644
index 92f980fdfe..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
+++ /dev/null
@@ -1,64 +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.implementation.spring.xml;

-

-import javax.xml.namespace.QName;

-

-/**

- * Constants used in Spring Application Context XML files.

- */

-public interface Constants {

-    

-    String SCA_NS = "http://www.springframework.org/schema/sca";

-    String SPRING_NS = "http://www.springframework.org/schema/beans";

-    

-    String PROPERTY = "property";

-    QName SCAPROPERTY_ELEMENT = new QName(SCA_NS, PROPERTY);

-    QName PROPERTY_ELEMENT = new QName(SPRING_NS, PROPERTY);

-    

-    String SERVICE = "service";

-    QName SERVICE_ELEMENT = new QName(SCA_NS, SERVICE);

-    

-    String REFERENCE = "reference";

-    QName REFERENCE_ELEMENT = new QName(SCA_NS, REFERENCE);

-    

-    String BEANS = "beans";

-    QName BEANS_ELEMENT = new QName(SPRING_NS, BEANS);

-    

-    String IMPORT = "import";

-    QName IMPORT_ELEMENT = new QName(SPRING_NS, IMPORT);

-    

-    String BEAN = "bean";

-    QName BEAN_ELEMENT = new QName(SPRING_NS, BEAN);

-    

-    String CONSTRUCTORARG = "constructor-arg";

-    QName CONSTRUCTORARG_ELEMENT = new QName(SPRING_NS, CONSTRUCTORARG);

-    

-    String LIST = "list";

-    QName LIST_ELEMENT = new QName(SPRING_NS, LIST); 

-    

-    String VALUE = "value";

-    QName VALUE_ELEMENT = new QName(SPRING_NS, VALUE);

-    

-    String REF = "ref";

-    QName REF_ELEMENT = new QName(SPRING_NS, REF);

-

-    String APPLICATION_CONTEXT = "application-context.xml";

-}

diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
deleted file mode 100644
index f9a9fee58f..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
+++ /dev/null
@@ -1,67 +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.implementation.spring.xml;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents a <bean> element in a Spring application-context
- * - this has id and className attributes
- * - plus zero or more property elements as children
- *
- * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $
- */
-public class SpringBeanElement {
-
-    private String id;
-    private String className;
-    private List<SpringPropertyElement> properties = new ArrayList<SpringPropertyElement>();
-    private List<SpringConstructorArgElement> constructorargs = new ArrayList<SpringConstructorArgElement>();
-
-    public SpringBeanElement(String id, String className) {
-        this.id = id;
-        this.className = className;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public List<SpringPropertyElement> getProperties() {
-        return properties;
-    }
-
-    public void addProperty(SpringPropertyElement property) {
-        properties.add(property);
-    }
-    
-    public List<SpringConstructorArgElement> getCustructorArgs() {
-        return constructorargs;
-    }
-
-    public void addCustructorArgs(SpringConstructorArgElement args) {
-        constructorargs.add(args);
-    }
-
-} // end class SpringBeanElement
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
deleted file mode 100644
index e5f8030b90..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
+++ /dev/null
@@ -1,108 +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.implementation.spring.xml;
-
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaElementImpl;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
-
-/**
- * Provides introspection functions for Spring beans
- * This version leans heavily on the implementation-java classes
- *
- * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $
- */
-public class SpringBeanIntrospector {
-
-    private JavaImplementationFactory javaImplementationFactory;
-
-    /**
-     * The constructor sets up the various visitor elements that will be used to introspect
-     * the Spring bean and extract SCA information.
-     *
-     * @param assemblyFactory The Assembly Factory to use
-     * @param javaFactory The Java Interface Factory to use
-     * @param policyFactory The Policy Factory to use.
-     */
-    public SpringBeanIntrospector(AssemblyFactory assemblyFactory,
-                                  JavaInterfaceFactory javaFactory,
-                                  JavaImplementationFactory javaImplementationFactory,
-                                  PolicyFactory policyFactory) {
-
-        this.javaImplementationFactory = javaImplementationFactory;
-
-    } // end constructor 
-
-    /**
-     * Introspect a Spring Bean and extract the features important to SCA
-     * @param beanClass the Spring Bean class to introspect
-     * @param componentType the componentType that is filled in through the introspection
-     * process (assumed empty on invocation, filled on return
-     * @return a Map of property names to JavaElementImpl
-     * @throws ContributionResolveException - if there was a problem resolving the
-     * Spring Bean or its componentType
-     *
-     */
-    public Map<String, JavaElementImpl> introspectBean(Class<?> beanClass, ComponentType componentType,
-                                                       SpringImplementation springImplementation) throws ContributionResolveException 
-    {
-        if (componentType == null)
-            throw new ContributionResolveException("Introspect Spring bean: supplied componentType is null");
-
-        // Create a Java implementation ready for the introspection
-        JavaImplementation javaImplementation = javaImplementationFactory.createJavaImplementation();
-
-        try {
-            // Introspect the bean...the results of the introspection are placed into the Java implementation
-            javaImplementationFactory.createJavaImplementation(javaImplementation, beanClass);
-
-            // Extract the services, references & properties found through introspection
-            // put the services, references and properties into the component type
-            componentType.getServices().addAll(javaImplementation.getServices());
-            componentType.getReferences().addAll(javaImplementation.getReferences());
-            componentType.getProperties().addAll(javaImplementation.getProperties());
-            
-            springImplementation.setInitMethod(javaImplementation.getInitMethod());
-            springImplementation.setDestroyMethod(javaImplementation.getDestroyMethod());
-            springImplementation.setConstructor(javaImplementation.getConstructor());
-            
-        } catch (IntrospectionException e) {
-            throw new ContributionResolveException(e);
-        } // end try
-
-        //List<Service> services = javaImplementation.getServices();
-        //for (Service service : services) {
-            //String name = service.getName();
-            //System.out.println("Spring Bean: found service with name: " + name);
-        //} // end for
-
-        return javaImplementation.getPropertyMembers();
-
-    } // end method introspectBean
-
-} // end class SpringBeanIntrospector
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
deleted file mode 100644
index 57f4a26ba3..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
+++ /dev/null
@@ -1,60 +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.implementation.spring.xml;

-

-import java.util.ArrayList;

-import java.util.List;

-

-/**

- * Represents a <constructor-arg> element in a Spring application-context

- * - this has ref attribute

- * 

- * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $

- */

-public class SpringConstructorArgElement {

-    

-    private String ref;

-    private String type;

-    private List<String> values = new ArrayList<String>();

-

-    public SpringConstructorArgElement(String ref, String type) {

-        this.ref = ref;

-        this.type = type;

-    }

-    

-    public String getType() {

-        return this.type;

-    }

-    

-    public String getRef() {

-        return this.ref;

-    }

-    

-    public void setRef(String ref) {

-        this.ref = ref;

-    }

-    

-    public List<String> getValues() {

-        return this.values;

-    }

-

-    public void addValue(String value) {

-        this.values.add(value);

-    }

-}

diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
deleted file mode 100644
index 39e1286f32..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
+++ /dev/null
@@ -1,61 +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.implementation.spring.xml;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents a <property> element in a Spring application-context
- * - this has name and ref attributes
- * 
- * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $
- */
-public class SpringPropertyElement {
-
-    private String name;
-    private String ref;
-    private List<String> values = new ArrayList<String>();
-
-    public SpringPropertyElement(String name, String ref) {
-        this.name = name;
-        this.ref = ref;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getRef() {
-        return ref;
-    }
-    
-    public void setRef(String ref) {
-        this.ref = ref;
-    }
-    
-    public List<String> getProperties() {
-        return values;
-    }
-
-    public void addProperty(String value) {
-        values.add(value);
-    }
-
-} // end class SpringPropertyElement
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
deleted file mode 100644
index 2f37ab6504..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.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 org.apache.tuscany.sca.implementation.spring.xml;
-
-/**
- * Represents an <sca:property> element in a Spring application-context
- * - this has name and type attributes
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- */
-public class SpringSCAPropertyElement {
-
-    private String name;
-    private String type;
-
-    public SpringSCAPropertyElement(String name, String type) {
-        this.name = name;
-        this.type = type;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-    
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-} // end class SpringPropertyElement
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
deleted file mode 100644
index b3f45415fd..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
+++ /dev/null
@@ -1,54 +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.implementation.spring.xml;
-
-/**
- * Represents a <sca:reference> element in a Spring application-context
- * - this has id and className attributes
- * - plus zero or more property elements as children
- *
- * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $
- */
-public class SpringSCAReferenceElement {
-
-    private String name;
-    private String type;
-
-    public SpringSCAReferenceElement(String name, String type) {
-        this.name = name;
-        this.type = type;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-    
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-} // end class SpringSCAReferenceElement
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
deleted file mode 100644
index 2eb5686270..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
+++ /dev/null
@@ -1,64 +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.implementation.spring.xml;
-
-/**
- * Represents a <sca:service> element in a Spring application-context
- * - this has id and className attributes
- * - plus zero or more property elements as children
- *
- * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $
- */
-public class SpringSCAServiceElement {
-
-    private String name;
-    private String type;
-    private String target;
-
-    public SpringSCAServiceElement(String name, String type, String target) {
-        this.name = name;
-        this.type = type;
-        this.target = target;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-    
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getType() {
-        return type;
-    }
-    
-    public void setTarget(String target) {
-        this.target = target;
-    }
-
-    public String getTarget() {
-        return target;
-    }
-
-} // end class SpringSCAServiceElement
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java b/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
deleted file mode 100644
index d7d1d55cbf..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
+++ /dev/null
@@ -1,637 +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.implementation.spring.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.jar.Attributes;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.implementation.java.JavaElementImpl;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
-
-/**
- * Introspects a Spring XML application-context configuration file to create <implementation-spring../>
- * component type information. 
- * 
- *
- * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $
- */
-public class SpringXMLComponentTypeLoader {
-
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-    private ClassLoader cl;
-
-    private SpringBeanIntrospector beanIntrospector;
-
-    public SpringXMLComponentTypeLoader(AssemblyFactory assemblyFactory,
-                                        JavaInterfaceFactory javaFactory,
-                                        JavaImplementationFactory javaImplementationFactory,
-                                        PolicyFactory policyFactory) {
-        super();
-        this.assemblyFactory = assemblyFactory;
-        this.javaFactory = javaFactory;
-        beanIntrospector =
-            new SpringBeanIntrospector(assemblyFactory, javaFactory, javaImplementationFactory, policyFactory);
-    }
-
-    protected Class<SpringImplementation> getImplementationClass() {
-        return SpringImplementation.class;
-    }
-
-    /**
-     * Base method which loads the component type from the application-context attached to the 
-     * Spring implementation
-     * 
-     */
-    public void load(SpringImplementation implementation) throws ContributionReadException {
-        //System.out.println("Spring TypeLoader - load method start");
-        ComponentType componentType = implementation.getComponentType();
-        /* Check that there is a component type object already set	*/
-        if (componentType == null) {
-            throw new ContributionReadException("SpringXMLLoader load: implementation has no ComponentType object");
-        }
-        if (componentType.isUnresolved()) {
-            /* Fetch the location of the application-context file from the implementation */
-            loadFromXML(implementation);
-            if (!componentType.isUnresolved())
-                implementation.setUnresolved(false);
-        } // end if
-        //System.out.println("Spring TypeLoader - load method complete");
-    } // end method load
-
-    /**
-     * Method which fills out the component type for a Spring implementation by reading the 
-     * Spring application-context.xml file.
-     * 
-     * @param implementation SpringImplementation into which to load the component type information
-     * @throws ContributionReadException Failed to read the contribution
-     */
-    private void loadFromXML(SpringImplementation implementation) throws ContributionReadException {
-        XMLStreamReader reader;
-        List<SpringBeanElement> beans = new ArrayList<SpringBeanElement>();
-        List<SpringSCAServiceElement> services = new ArrayList<SpringSCAServiceElement>();
-        List<SpringSCAReferenceElement> references = new ArrayList<SpringSCAReferenceElement>();
-        List<SpringSCAPropertyElement> scaproperties = new ArrayList<SpringSCAPropertyElement>();        
-
-        Resource resource;
-
-        String location = implementation.getLocation();
-
-        try {
-            // FIXME - is the ContextClassLoader the right place to start the search?
-            cl = Thread.currentThread().getContextClassLoader();
-
-            resource = getApplicationContextResource(location, cl);
-            implementation.setResource(resource);
-            // The URI is used to uniquely identify the Implementation
-            implementation.setURI(resource.getURL().toString());
-            // FIXME - need a better way to handle the XMLInputFactory than allocating a new one every time
-            XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
-            reader = xmlFactory.createXMLStreamReader(resource.getInputStream());
-
-            // System.out.println("Spring TypeLoader - starting to read context file");            
-            readBeanDefinition(reader, beans, services, references, scaproperties);            
-
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        } catch (XMLStreamException e) {
-            throw new ContributionReadException(e);
-        }
-
-        /* At this point, the complete application-context.xml file has been read and its contents  */
-        /* stored in the lists of beans, services, references.  These are now used to generate      */
-        /* the implied componentType for the application context								    */
-        generateComponentType(implementation, beans, services, references, scaproperties);
-
-        return;
-    } // end method loadFromXML    
-    
-    /**
-     * Method which returns the XMLStreamReader for the Spring application-context.xml file
-     * specified in the location attribute
-     */
-    private XMLStreamReader getApplicationContextReader (String location) throws ContributionReadException {
-        
-        try {
-            // FIXME - is the ContextClassLoader the right place to start the search?
-            cl = Thread.currentThread().getContextClassLoader();    
-            Resource resource = getApplicationContextResource(location, cl);
-            // FIXME - need a better way to handle the XMLInputFactory than allocating a new one every time
-            XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
-            XMLStreamReader reader = xmlFactory.createXMLStreamReader(resource.getInputStream());
-            return reader;
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        } catch (XMLStreamException e) {
-            throw new ContributionReadException(e);
-        }
-    }    
-    
-    /**
-     * Method which reads the bean definitions from Spring application-context.xml file and identifies
-     * the defined beans, properties, services and references     
-     */
-    private void readBeanDefinition(XMLStreamReader reader, 
-            List<SpringBeanElement> beans,
-            List<SpringSCAServiceElement> services,
-            List<SpringSCAReferenceElement> references,
-            List<SpringSCAPropertyElement> scaproperties) throws ContributionReadException {
-        
-        SpringBeanElement bean = null;
-        SpringPropertyElement property = null;
-        SpringConstructorArgElement constructorArg = null;
-        
-        try {
-            boolean completed = false;
-            while (!completed) {
-                switch (reader.next()) {
-                    case START_ELEMENT:
-                        QName qname = reader.getName();
-                        //System.out.println("Spring TypeLoader - found element with name: " + qname.toString());
-                        if (Constants.IMPORT_ELEMENT.equals(qname)) {
-                        	//FIXME - put the sequence of code below which gets the ireader into a subsidiary method
-                            String location = reader.getAttributeValue(null, "resource");
-                            if (location != null) {
-                                XMLStreamReader ireader = getApplicationContextReader(location);
-                                // Read the bean definition for the identified imported resource
-                                readBeanDefinition(ireader, beans, services, references, scaproperties);
-                            }
-                        } else if (Constants.SERVICE_ELEMENT.equals(qname)) {
-                            SpringSCAServiceElement service =
-                                new SpringSCAServiceElement(reader.getAttributeValue(null, "name"), reader
-                                    .getAttributeValue(null, "type"), reader.getAttributeValue(null, "target"));
-                            services.add(service);
-                        } else if (Constants.REFERENCE_ELEMENT.equals(qname)) {
-                            SpringSCAReferenceElement reference =
-                                new SpringSCAReferenceElement(reader.getAttributeValue(null, "name"), reader
-                                    .getAttributeValue(null, "type"));
-                            references.add(reference);
-                        } else if (Constants.SCAPROPERTY_ELEMENT.equals(qname)) {
-                            SpringSCAPropertyElement scaproperty =
-                                new SpringSCAPropertyElement(reader.getAttributeValue(null, "name"), reader
-                                    .getAttributeValue(null, "type"));
-                            scaproperties.add(scaproperty);
-                        } else if (Constants.BEAN_ELEMENT.equals(qname)) {
-                            bean = new SpringBeanElement(reader.getAttributeValue(null, "id"), reader
-                                    .getAttributeValue(null, "class"));
-                            //beans.add(bean);
-                        } else if (Constants.PROPERTY_ELEMENT.equals(qname)) {
-                            property = new SpringPropertyElement(reader.getAttributeValue(null, "name"), reader
-                                    .getAttributeValue(null, "ref"));
-                            //bean.addProperty(property);
-                        } else if (Constants.CONSTRUCTORARG_ELEMENT.equals(qname)) {
-                            constructorArg = new SpringConstructorArgElement(reader.getAttributeValue(null, "ref"), 
-                                    reader.getAttributeValue(null, "type"));                            
-                        } else if (Constants.REF_ELEMENT.equals(qname)) {
-                            String ref = reader.getAttributeValue(null, "bean");
-                            // Check if the parent element is a property 
-                            if (property != null) property.setRef(ref);
-                            // Check if the parent element is a constructor-arg
-                            if (constructorArg != null) constructorArg.setRef(ref);
-                        } else if (Constants.VALUE_ELEMENT.equals(qname)) {
-                            String value = reader.getElementText();
-                            // Check if the parent element is a constructor-arg
-                            if (constructorArg != null) {
-                                constructorArg.addValue(value);                            
-                                // Identify the XML resource specified for the constructor-arg element
-                                if ((value.indexOf(".xml") != -1)) {
-                                    if ((bean.getClassName().indexOf(".ClassPathXmlApplicationContext") != -1) ||
-                                        (bean.getClassName().indexOf(".FileSystemXmlApplicationContext") != -1)) {                                    
-                                        XMLStreamReader creader = getApplicationContextReader(value);
-                                        // Read the bean definition for the constructor-arg resources
-                                        readBeanDefinition(creader, beans, services, references, scaproperties);
-                                    }
-                                }
-                            }
-                        } // end if
-                        break;
-                    case END_ELEMENT:
-                        if (Constants.BEANS_ELEMENT.equals(reader.getName())) {
-                            //System.out.println("Spring TypeLoader - finished read of context file");
-                            completed = true;
-                            break;
-                        } else if (Constants.BEAN_ELEMENT.equals(reader.getName())) {
-                            beans.add(bean);
-                            bean = null;
-                        } else if (Constants.PROPERTY_ELEMENT.equals(reader.getName())) {
-                            bean.addProperty(property);
-                            property = null;
-                        } else if (Constants.CONSTRUCTORARG_ELEMENT.equals(reader.getName())) {
-                            bean.addCustructorArgs(constructorArg);
-                            constructorArg = null;
-                        } // end if
-                } // end switch
-            } // end while
-        } catch (XMLStreamException e) {
-            throw new ContributionReadException(e);
-        }
-    }
-
-    /**
-     * Generates the Spring implementation component type from the configuration contained in the
-     * lists of beans, services, references and scaproperties derived from the application context
-     */
-    private void generateComponentType(SpringImplementation implementation,
-                                       List<SpringBeanElement> beans,
-                                       List<SpringSCAServiceElement> services,
-                                       List<SpringSCAReferenceElement> references,
-                                       List<SpringSCAPropertyElement> scaproperties) throws ContributionReadException {
-        /*
-         * 1. Each service becomes a service in the component type
-         * 2. Each reference becomes a reference in the component type
-         * 3. IF there are no explicit service elements, each bean becomes a service
-         * 4. Each bean property which is a reference not pointing at another bean in the 
-         *    application context becomes a reference unless it is pointing at one of the references
-         * 5. Each scaproperty becomes a property in the component type
-         * 6. Each bean property which is not a reference and which is not pointing 
-         *    at another bean in the application context becomes a property in the component type
-         */
-
-        ComponentType componentType = implementation.getComponentType();
-
-        try {
-            // Deal with the services first....												
-            Iterator<SpringSCAServiceElement> its = services.iterator();
-            while (its.hasNext()) {
-                SpringSCAServiceElement serviceElement = its.next();
-                Class<?> interfaze = cl.loadClass(serviceElement.getType());
-                Service theService = createService(interfaze, serviceElement.getName());
-                componentType.getServices().add(theService);
-                // Add this service to the Service / Bean map
-                String beanName = serviceElement.getTarget();
-                for (SpringBeanElement beanElement : beans) {
-                    if (beanName.equals(beanElement.getId())) {
-                        implementation.setBeanForService(theService, beanElement);
-                    }
-                } // end for
-            } // end while
-
-            // Next handle the references
-            Iterator<SpringSCAReferenceElement> itr = references.iterator();
-            while (itr.hasNext()) {
-                SpringSCAReferenceElement referenceElement = itr.next();
-                Class<?> interfaze = cl.loadClass(referenceElement.getType());
-                Reference theReference = createReference(interfaze, referenceElement.getName());
-                componentType.getReferences().add(theReference);
-            } // end while
-
-            // Finally deal with the beans
-            Iterator<SpringBeanElement> itb;
-            // If there are no explicit service elements, then expose all the beans
-            if (services.isEmpty()) {
-                itb = beans.iterator();
-                // Loop through all the beans found
-                while (itb.hasNext()) {
-                    SpringBeanElement beanElement = itb.next();
-                    // Load the Spring bean class
-                    Class<?> beanClass = cl.loadClass(beanElement.getClassName());
-                    // Introspect the bean 
-                    ComponentType beanComponentType = assemblyFactory.createComponentType();
-                    beanIntrospector.introspectBean(beanClass, beanComponentType, implementation);
-                    // Get the service interface defined by this Spring Bean and add to
-                    // the component type of the Spring Assembly
-                    List<Service> beanServices = beanComponentType.getServices();
-                    componentType.getServices().addAll(beanServices);
-                    // Add these services to the Service / Bean map
-                    for (Service beanService : beanServices) {
-                        implementation.setBeanForService(beanService, beanElement);
-                    }
-                } // end while
-            } // end if
-            // Now check to see if there are any more references from beans that are not satisfied
-            itb = beans.iterator();
-            while (itb.hasNext()) {
-                SpringBeanElement beanElement = itb.next();
-                boolean unresolvedProperties = false;
-                if (!beanElement.getProperties().isEmpty()) {
-                    // Scan through the properties
-                    Iterator<SpringPropertyElement> itp = beanElement.getProperties().iterator();
-                    while (itp.hasNext()) {
-                        SpringPropertyElement propertyElement = itp.next();
-                        if (propertyRefUnresolved(propertyElement.getRef(), beans, references, scaproperties)) {
-                            // This means an unresolved reference from the spring bean...
-                            unresolvedProperties = true;
-                        } // end if
-                    } // end while 
-                    // If there are unresolved properties, then find which ones are references
-                    if (unresolvedProperties) {
-                        Class<?> beanClass = cl.loadClass(beanElement.getClassName());
-                        // Introspect the bean 
-                        ComponentType beanComponentType = assemblyFactory.createComponentType();
-                        Map<String, JavaElementImpl> propertyMap =
-                            beanIntrospector.introspectBean(beanClass, beanComponentType, implementation);
-                        // Get the references by this Spring Bean and add the unresolved ones to
-                        // the component type of the Spring Assembly
-                        List<Reference> beanReferences = beanComponentType.getReferences();
-                        List<Property> beanProperties = beanComponentType.getProperties();
-                        itp = beanElement.getProperties().iterator();
-                        while (itp.hasNext()) {
-                            SpringPropertyElement propertyElement = itp.next();
-                            if (propertyRefUnresolved(propertyElement.getRef(), beans, references, scaproperties)) {
-                                boolean resolved = false;
-                                // This means an unresolved reference from the spring bean...add it to
-                                // the references for the Spring application context
-                                for (Reference reference : beanReferences) {
-                                    if (propertyElement.getName().equals(reference.getName())) {
-                                        // The name of the reference in this case is the string in
-                                        // the @ref attribute of the Spring property element, NOT the
-                                        // name of the field in the Spring bean....
-                                        reference.setName(propertyElement.getRef());
-                                        componentType.getReferences().add(reference);
-                                        resolved = true;
-                                    } // end if
-                                } // end for
-                                if (!resolved) {
-                                    // If the bean property is not already resolved as a reference
-                                    // then it must be an SCA property...
-                                    for (Property scaproperty : beanProperties) {
-                                        if (propertyElement.getName().equals(scaproperty.getName())) {
-                                            // The name of the reference in this case is the string in
-                                            // the @ref attribute of the Spring property element, NOT the
-                                            // name of the field in the Spring bean....
-                                            scaproperty.setName(propertyElement.getRef());
-                                            componentType.getProperties().add(scaproperty);
-                                            // Fetch and store the type of the property
-                                            implementation.setPropertyClass(scaproperty.getName(), propertyMap
-                                                .get(scaproperty.getName()).getType());
-                                            resolved = true;
-                                        } // end if
-                                    } // end for
-                                } // end if
-                            } // end if
-                        } // end while 
-                    } // end if
-                } // end if
-
-            } // end while
-
-            Iterator<SpringSCAPropertyElement> itsp = scaproperties.iterator();
-            while (itsp.hasNext()) {
-                SpringSCAPropertyElement scaproperty = itsp.next();
-                // Create a component type property if the SCA property element has a name
-                // and a type declared...
-                if (scaproperty.getType() != null && scaproperty.getName() != null) {
-                    Property theProperty = assemblyFactory.createProperty();
-                    theProperty.setName(scaproperty.getName());
-                    // Get the Java class and then an XSD element type for the property
-                    Class<?> propType = Class.forName(scaproperty.getType());
-                    theProperty.setXSDType(JavaXMLMapper.getXMLType(propType));
-                    componentType.getProperties().add(theProperty);
-                    // Remember the Java Class (ie the type) for this property
-                    implementation.setPropertyClass(theProperty.getName(), propType);
-                } // end if 
-            } // end while
-
-        } catch (ClassNotFoundException e) {
-            // Means that either an interface class, property class or a bean was not found
-            throw new ContributionReadException(e);
-        } catch (InvalidInterfaceException e) {
-            throw new ContributionReadException(e);
-        } catch (ContributionResolveException e) {
-
-        } // end try
-
-        // If we get here, the Spring assembly component type is resolved
-        componentType.setUnresolved(false);
-        implementation.setComponentType(componentType);
-        return;
-    } // end method generateComponentType
-
-    /*
-     * Determines whether a reference attribute of a Spring property element is resolved either
-     * by a bean in the application context or by an SCA reference element or by an SCA property
-     * element
-     * @param ref - a String containing the name of the reference - may be null
-     * @param beans - a List of SpringBean elements
-     * @param references - a List of SCA reference elements
-     * @return true if the property is not resolved, false if it is resolved
-     */
-    private boolean propertyRefUnresolved(String ref,
-                                          List<SpringBeanElement> beans,
-                                          List<SpringSCAReferenceElement> references,
-                                          List<SpringSCAPropertyElement> scaproperties) {
-        boolean unresolved = true;
-
-        if (ref != null) {
-            // Scan over the beans looking for a match
-            Iterator<SpringBeanElement> itb = beans.iterator();
-            while (itb.hasNext()) {
-                SpringBeanElement beanElement = itb.next();
-                // Does the bean name match the ref?
-                if (ref.equals(beanElement.getId())) {
-                    unresolved = false;
-                    break;
-                } // end if
-            } // end while
-            // Scan over the SCA reference elements looking for a match
-            if (unresolved) {
-                Iterator<SpringSCAReferenceElement> itr = references.iterator();
-                while (itr.hasNext()) {
-                    SpringSCAReferenceElement referenceElement = itr.next();
-                    if (ref.equals(referenceElement.getName())) {
-                        unresolved = false;
-                        break;
-                    } // end if
-                } // end while
-            } // end if
-            // Scan over the SCA property elements looking for a match
-            if (unresolved) {
-                Iterator<SpringSCAPropertyElement> itsp = scaproperties.iterator();
-                while (itsp.hasNext()) {
-                    SpringSCAPropertyElement propertyElement = itsp.next();
-                    if (ref.equals(propertyElement.getName())) {
-                        unresolved = false;
-                        break;
-                    } // end if
-                } // end while
-            } // end if
-        } else {
-            // In the case where ref = null, the property is not going to be a reference of any
-            // kind and can be ignored
-            unresolved = false;
-        } // end if
-
-        return unresolved;
-
-    } // end method propertyRefUnresolved
-
-    /**
-     * Gets hold of the application-context.xml file as a Spring resource
-     * @param locationAttr - the location attribute from the <implementation.spring../> element
-     * @param cl - the ClassLoader for the Spring implementation
-     */
-    protected Resource getApplicationContextResource(String locationAttr, ClassLoader cl)
-        throws ContributionReadException {
-        File manifestFile = null;
-        File appXmlFile;
-        File locationFile = null;
-        
-        URL url = cl.getResource(locationAttr);
-        if (url != null) {
-            String path = url.getPath();
-            locationFile = new File(path);            
-        } else {
-            throw new ContributionReadException(
-                    "SpringXMLLoader getApplicationContextResource: " + "unable to find resource file " 
-                        + locationAttr);
-        }
-
-        if (locationFile.isDirectory()) {
-            try {
-                manifestFile = new File(locationFile, "META-INF"+ File.separator +"MANIFEST.MF");
-                if (manifestFile.exists()) {
-                    Manifest mf = new Manifest(new FileInputStream(manifestFile));
-                    Attributes mainAttrs = mf.getMainAttributes();
-                    String appCtxPath = mainAttrs.getValue("Spring-Context");
-                    if (appCtxPath != null) {
-                        appXmlFile = new File(locationFile, appCtxPath);
-                        if (appXmlFile.exists()) {
-                            return new UrlResource(appXmlFile.toURL());
-                        }
-                    }
-                }
-                // no manifest-specified Spring context, use default
-                appXmlFile = new File(locationFile, "META-INF" + File.separator + "spring" 
-                                                        + File.separator + Constants.APPLICATION_CONTEXT);
-                if (appXmlFile.exists()) {
-                    return new UrlResource(appXmlFile.toURL());
-                }
-            } catch (IOException e) {
-                throw new ContributionReadException("Error reading manifest " + manifestFile);
-            }
-        } else {            
-            if (locationFile.isFile() && locationFile.getName().indexOf(".jar") < 0) {
-                return new UrlResource(url);
-            }
-            else {
-                try {
-                    JarFile jf = new JarFile(locationFile);
-                    JarEntry je;
-                    Manifest mf = jf.getManifest();
-                    if (mf != null) {
-                        Attributes mainAttrs = mf.getMainAttributes();
-                        String appCtxPath = mainAttrs.getValue("Spring-Context");
-                        if (appCtxPath != null) {
-                            je = jf.getJarEntry(appCtxPath);
-                            if (je != null) {
-                                // TODO return a Spring specific Resource type for jars
-                                return new UrlResource(new URL("jar:" + locationFile.toURI().toURL() + "!/" + appCtxPath));
-                            }
-                        }
-                    }
-                    je = jf.getJarEntry("META-INF" + File.separator + "spring" 
-                                                + File.separator + Constants.APPLICATION_CONTEXT);
-                    if (je != null) {
-                        return new UrlResource(new URL("jar:" + locationFile.toURI().toURL() + "!/" + Constants.APPLICATION_CONTEXT));
-                    }
-                } catch (IOException e) {
-                    // bad archive
-                    // TODO: create a more appropriate exception type
-                    throw new ContributionReadException(
-                                                        "SpringXMLLoader getApplicationContextResource: " + " IO exception reading context file.",
-                                                        e);
-                }
-            }
-        }
-
-        throw new ContributionReadException("SpringXMLLoader getApplicationContextResource: " 
-                                        + "META-INF/spring/" + Constants.APPLICATION_CONTEXT + "not found");
-    } // end method getApplicationContextResource
-
-    /**
-     * Creates a Service for the component type based on its name and Java interface
-     */
-    public Service createService(Class<?> interfaze, String name) throws InvalidInterfaceException {
-        Service service = assemblyFactory.createService();
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        service.setInterfaceContract(interfaceContract);
-
-        // Set the name for the service
-        service.setName(name);
-
-        // Set the call interface and, if present, the callback interface
-        JavaInterface callInterface = javaFactory.createJavaInterface(interfaze);
-        service.getInterfaceContract().setInterface(callInterface);
-        if (callInterface.getCallbackClass() != null) {
-            JavaInterface callbackInterface = javaFactory.createJavaInterface(callInterface.getCallbackClass());
-            service.getInterfaceContract().setCallbackInterface(callbackInterface);
-        }
-        return service;
-    } // end method createService
-
-    /**
-     * Creates a Reference for the component type based on its name and Java interface
-     */
-    private org.apache.tuscany.sca.assembly.Reference createReference(Class<?> interfaze, String name)
-        throws InvalidInterfaceException {
-        org.apache.tuscany.sca.assembly.Reference reference = assemblyFactory.createReference();
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        reference.setInterfaceContract(interfaceContract);
-
-        // Set the name of the reference to the supplied name and the multiplicity of the reference
-        // to 1..1 - for Spring implementations, this is the only multiplicity supported
-        reference.setName(name);
-        reference.setMultiplicity(Multiplicity.ONE_ONE);
-
-        // Set the call interface and, if present, the callback interface
-        JavaInterface callInterface = javaFactory.createJavaInterface(interfaze);
-        reference.getInterfaceContract().setInterface(callInterface);
-        if (callInterface.getCallbackClass() != null) {
-            JavaInterface callbackInterface = javaFactory.createJavaInterface(callInterface.getCallbackClass());
-            reference.getInterfaceContract().setCallbackInterface(callbackInterface);
-        }
-
-        return reference;
-    }
-} // end class SpringXMLComponentTypeLoader
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 4b71cef6c4..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.spring.SpringImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.spring,model=org.apache.tuscany.sca.implementation.spring.SpringImplementation
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/spring.handlers b/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
deleted file mode 100644
index 7f9a7b17b0..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
+++ /dev/null
@@ -1 +0,0 @@
-http\://www.springframework.org/schema/sca=org.apache.tuscany.sca.implementation.spring.ScaNamespaceHandler
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/spring.schemas b/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
deleted file mode 100644
index 249cc21c13..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
+++ /dev/null
@@ -1 +0,0 @@
-http\://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd=org/springframework/sca/xml/spring-sca.xsd
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties b/java/sca-contrib/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
deleted file mode 100644
index 6fce02664a..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
+++ /dev/null
@@ -1,23 +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.
-#
-#
-LocationAttributeMissing = Reading implementation.spring - location attribute missing
-ContributionResolveException = ContributionResolveException occured due to:
-UnableToResolveComponentType = SpringArtifactProcessor: unable to resolve componentType for Spring component
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/java/sca-contrib/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
deleted file mode 100644
index e20f4e8158..0000000000
--- a/java/sca-contrib/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
+++ /dev/null
@@ -1,99 +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.    
--->
-<xsd:schema xmlns="http://www.springframework.org/schema/sca" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    attributeFormDefault="unqualified" elementFormDefault="qualified"
-    targetNamespace="http://www.springframework.org/schema/sca">
-
-    <xsd:element name="composite">
-        <xsd:complexType>
-            <xsd:attribute name="component" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="sca-adapter-class" use="optional">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
-
-    <xsd:element name="reference">
-        <xsd:complexType>
-            <xsd:attribute name="name" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="type" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="default" use="optional">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
-
-    <xsd:element name="property">
-        <xsd:complexType>
-            <xsd:attribute name="id" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="name" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="type" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
-
-    <xsd:element name="service">
-        <xsd:complexType>
-            <xsd:attribute name="name" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="type" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="target" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
-
-</xsd:schema>
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/LICENSE b/java/sca-contrib/modules/implementation-widget-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index bd616d5740..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.implementation.widget.provider

- ;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Widget Implementation Runtime

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397415984

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Widget Implementation Runtime

-Import-Package: 

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.implementation.widget;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,

- org.w3c.dom

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.widget.runt

- ime

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/implementation-widget-runtime/NOTICE b/java/sca-contrib/modules/implementation-widget-runtime/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/pom.xml b/java/sca-contrib/modules/implementation-widget-runtime/pom.xml
deleted file mode 100644
index 8efb922c17..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/pom.xml
+++ /dev/null
@@ -1,102 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-implementation-widget-runtime</artifactId>
-    <name>Apache Tuscany SCA Widget Implementation Runtime</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-        
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>   
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java b/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
deleted file mode 100644
index d9616de359..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
+++ /dev/null
@@ -1,253 +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.implementation.widget.provider;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * Implements an invoker for resource component implementations.
- *
- * @version $Rev$ $Date$
- */
-class WidgetImplementationInvoker implements Invoker {
-    private RuntimeComponent component;
-    private String widgetName;
-    private String widgetFolderURL;
-    private String widgetLocationURL;
-    
-    WidgetImplementationInvoker(RuntimeComponent component, String widgetName, String widgetFolderURL, String widgetLocationURL) {
-        this.component = component;
-        this.widgetName = widgetName + ".js";
-        this.widgetFolderURL = widgetFolderURL;
-        this.widgetLocationURL = widgetLocationURL;
-    }
-    
-    public Message invoke(Message msg) {
-        
-        // Get the resource id from the request message
-        String id = (String)((Object[])msg.getBody())[0];
-        try {
-            
-            if (id.length() == 0) {
-
-                // Return an input stream for the widget resource
-                URL url = new URL(widgetLocationURL);
-                InputStream is = url.openStream();
-                msg.setBody(is);
-                
-            } else if (id.equals(widgetName)) {
-                
-                // Generate JavaScript header for use in the Widget
-                InputStream is = generateWidgetCode();
-                msg.setBody(is);
-                
-            } else {
-
-                // Return an input stream for a resource inside the
-                // widget folder
-                URL url = new URL(widgetFolderURL +'/' + id);
-                InputStream is = url.openStream();
-                msg.setBody(is);
-            }
-        } catch (MalformedURLException e) {
-
-            // Report exception as a fault
-            msg.setFaultBody(e);
-            
-        } catch (URISyntaxException e) {
-
-            // Report exception as a fault
-            msg.setFaultBody(e);
-            
-        } catch (IOException e) {
-
-            // Report exception as a fault
-            msg.setFaultBody(e);
-        }
-        return msg;
-    }
-
-    /**
-     * This helper class concatenates the necessary JavaScript client code into a
-     * single JavaScript per component
-     */
-    private InputStream generateWidgetCode() throws IOException, URISyntaxException {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        PrintWriter pw = new PrintWriter(bos);
-
-        pw.println();
-        pw.println("/* Apache Tuscany SCA Widget header */");
-        pw.println();
-        
-        Map<String, Boolean> bindingClientProcessed = new HashMap<String, Boolean>();
-        
-        for(ComponentReference reference : component.getReferences()) {
-            for(Binding binding : reference.getBindings()) {
-                String [] bindingProxyNames = WidgetProxyHelper.getJavaScriptProxyFile(binding.getClass().getName());
-                //check if binding client code was already processed and inject to the generated script
-                if ( bindingProxyNames != null ) {
-                	for ( int i = 0; i < bindingProxyNames.length; i++ ) {
-                		String bindingProxyName = bindingProxyNames[ i ];
-                		if(bindingProxyName != null) {
-                			Boolean processedFlag = bindingClientProcessed.get(bindingProxyName);
-                			if( processedFlag == null || processedFlag.booleanValue() == false) {
-                				generateJavaScriptBindingProxy(pw,bindingProxyName);
-                				bindingClientProcessed.put(bindingProxyName, Boolean.TRUE);
-                			}
-                		}
-                }
-                }
-            }
-        }
-        
-        //process properties
-        generateJavaScriptPropertyFunction(pw);
-        
-        //process references
-        generateJavaScriptReferenceFunction(pw);
-        
-       
-        pw.println();
-        pw.println("/** End of Apache Tuscany SCA Widget */");
-        pw.println();
-        pw.flush();
-        pw.close();
-
-        return new ByteArrayInputStream(bos.toByteArray());
-    }
-
-    /**
-     * Retrieve the binding proxy based on the bind name
-     * and embedded the JavaScript into this js
-     */
-    private void generateJavaScriptBindingProxy(PrintWriter pw, String bindingProxyName) throws IOException {
-        //FIXME: Handle the case where the JavaScript binding client is not found
-        InputStream is = getClass().getClassLoader().getResourceAsStream(bindingProxyName);
-        if (is != null) {
-            int i;
-            while ((i = is.read()) != -1) {
-                pw.write(i);
-            }        	
-        }
-        
-        pw.println();
-        pw.println();
-    }
-    
-    /**
-     * Generate JavaScript code to inject SCA Properties
-     * @param pw
-     * @throws IOException
-     */
-    private void generateJavaScriptPropertyFunction(PrintWriter pw) throws IOException {
-
-        pw.println("var propertyMap = new String();");
-        for(ComponentProperty property : component.getProperties()) {
-            String propertyName = property.getName();
-
-            pw.println("propertyMap." + propertyName + " = \"" + getPropertyValue(property) + "\"");
-        }
-        
-        pw.println("function Property(name) {");
-        pw.println("    return propertyMap[name];");
-        pw.println("}");
-    }
-    
-    /**
-     * Convert property value to String
-     * @param property
-     * @return
-     */
-    private String getPropertyValue(ComponentProperty property) {
-    	Document doc = (Document)property.getValue();
-    	Element rootElement = doc.getDocumentElement();
-    	
-    	String value = null;
-    	
-    	//FIXME : Provide support for isMany and other property types
-    	
-    	if (rootElement.getChildNodes().getLength() > 0) {
-            value = rootElement.getChildNodes().item(0).getTextContent();
-        }
-    	
-    	return value;
-    }
-    
-    /**
-     * Generate JavaScript code to inject SCA References
-     * @param pw
-     * @throws IOException
-     */
-    private void generateJavaScriptReferenceFunction (PrintWriter pw) throws IOException, URISyntaxException {
-        
-        pw.println("var referenceMap = new Object();");
-        for(ComponentReference reference : component.getReferences()) {
-            String referenceName = reference.getName();
-            Binding binding = reference.getBindings().get(0);
-            if (binding != null) {
-                
-                String proxyClient = WidgetProxyHelper.getJavaScriptProxyClient(binding.getClass().getName());
-                if(proxyClient != null) {
-                    
-                    // Generate the JavaScript proxy configuration code
-                    // Proxies are configured with the target URI path, as at this point we shouldn't
-                    // be generating proxies that communicate with other hosts (if a proxy needs to
-                    // communicate with another host it should be generated on and served by
-                    // that particular host)
-                    URI targetURI = URI.create(binding.getURI());
-                    String targetPath = targetURI.getPath();
-                    
-                    if(proxyClient.equals("JSONRpcClient")) {
-                        //FIXME Proxies should follow the same pattern, saving us from having to test
-                        // for JSONRpc here
-                        pw.println("referenceMap." + referenceName + " = new " + proxyClient + "(\"" + targetPath + "\").Service;");
-                    } else {
-                        pw.println("referenceMap." + referenceName + " = new " + proxyClient + "(\"" + targetPath + "\");");
-                    }
-                }                
-            }
-        }
-        
-        pw.println("function Reference(name) {");
-        pw.println("    return referenceMap[name];");
-        pw.println("}");
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
deleted file mode 100644
index 61176d912c..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
+++ /dev/null
@@ -1,67 +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.implementation.widget.provider;
-
-import org.apache.tuscany.sca.implementation.widget.WidgetImplementation;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-
-/**
- * The model representing a resource implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-class WidgetImplementationProvider implements ImplementationProvider {
-    private RuntimeComponent component;
-    private String widgetLocationURL;
-    private String widgetFolderURL;
-    private String widgetName;
-
-    /**
-     * Constructs a new resource implementation provider.
-     */
-    WidgetImplementationProvider(RuntimeComponent component, WidgetImplementation implementation) {
-        this.component = component;
-        widgetLocationURL = implementation.getLocationURL().toString();
-        int s = widgetLocationURL.lastIndexOf('/');
-        widgetFolderURL = widgetLocationURL.substring(0, s);
-        widgetName = widgetLocationURL.substring(s +1);
-        widgetName = widgetName.substring(0, widgetName.lastIndexOf('.'));
-    }
-
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        WidgetImplementationInvoker invoker = new WidgetImplementationInvoker(component, widgetName, widgetFolderURL, widgetLocationURL);
-        return invoker;
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-    }
-
-    public void stop() {
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java b/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
deleted file mode 100644
index c57680fa1c..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
+++ /dev/null
@@ -1,47 +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.implementation.widget.provider;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.widget.WidgetImplementation;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * The model representing a resource implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-public class WidgetImplementationProviderFactory implements ImplementationProviderFactory<WidgetImplementation> {
-
-    /**
-     * Constructs a resource implementation.
-     */
-    public WidgetImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
-    }
-
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component, WidgetImplementation implementation) {
-        return new WidgetImplementationProvider(component, implementation);
-    }
-    
-    public Class<WidgetImplementation> getModelType() {
-        return WidgetImplementation.class;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java b/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
deleted file mode 100644
index 67520e2733..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
+++ /dev/null
@@ -1,51 +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.implementation.widget.provider;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-class WidgetProxyHelper {
-    private static Map<String, String[]> proxyFileRegistry = new HashMap<String, String[]>();
-    private static Map<String, String> proxyClient = new HashMap<String, String>();
-
-    static {
-        proxyFileRegistry.put("org.apache.tuscany.sca.binding.atom.impl.AtomBindingImpl", new String[]{ "binding-atom.js", "atomModel.js"});
-        proxyClient.put("org.apache.tuscany.sca.binding.atom.impl.AtomBindingImpl", "AtomClient");
-
-        proxyFileRegistry.put("org.apache.tuscany.sca.binding.jsonrpc.impl.JSONRPCBindingImpl", new String[]{"binding-jsonrpc.js"});
-        proxyClient.put("org.apache.tuscany.sca.binding.jsonrpc.impl.JSONRPCBindingImpl", "JSONRpcClient");
-
-        proxyFileRegistry.put("org.apache.tuscany.sca.binding.http.impl.HTTPBindingImpl", new String[]{"binding-http.js"});
-        proxyClient.put("org.apache.tuscany.sca.binding.http.impl.HTTPBindingImpl", "HTTPClient");
-    }
-
-    static String [] getJavaScriptProxyFile(String bindingClass) {
-        return proxyFileRegistry.get(bindingClass);
-    }
-
-    static String getJavaScriptProxyClient(String bindingClass) {
-        return proxyClient.get(bindingClass);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index d0f73cbdbb..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the implementation extension

-org.apache.tuscany.sca.implementation.widget.provider.WidgetImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.widget.WidgetImplementation

diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/atomModel.js b/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/atomModel.js
deleted file mode 100644
index c64c3fc97c..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/atomModel.js
+++ /dev/null
@@ -1,1590 +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.    
- */
- 
-/**
- * Class that defines a URI represented as a string,
- */
-function Uri( value ) {
-   this.value = value;
-   this.getValue = function() {
-      return this.value;
-   };
-
-   this.setValue = function(value) {
-      this.value = value;
-   };
-
-   this.toString = function() {
-       return "Uri value=" + this.value;
-   };
-
-   /**
-    * Serialize this element to XML.
-    * atomUri = text
-    */
-   this.toXML = function() {
-      xml = "<uri>";
-      xml += this.value;
-      xml += "</uri>\n";      
-      return xml;
-   };
-}
-
-/* Updated is Date */
-/* Published is Date */
-
-/**
- * Class that defines an Email represented as a string,
- */
-function Email( value ) {
-   this.value = value;
-   this.getValue = function() {
-      return this.value;
-   };
-
-   this.setValue = function(value) {
-      this.value = value;
-   };
-
-   this.toString = function() {
-       return "Email value=" + this.value;
-   };
-
-   /**
-    * Serialize this element to XML.
-    * atomEmailAddress = xsd:string { pattern = ".+@.+" }
-    */
-   this.toXML = function() {
-      xml = "<email>";
-      xml += this.value;
-      xml += "</email>\n";      
-      return xml;
-   };
-}
-
-/**
- * Class that defines an Id represented as a string,
- */
-function Id( value ) {
-   this.value = value;
-   this.getValue = function() {
-      return this.value;
-   };
-
-   this.setValue = function(value) {
-      this.value = value;
-   };
-
-   this.toString = function() {
-       return "Id value=" + this.value;
-   };
-
-   /**
-    * Serialize this element to XML.  
-    * atomId = element atom:id {
-    *    atomCommonAttributes,
-    *    (atomUri)
-    * }
-    */
-   this.toXML = function() {
-      xml = "<id";
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null ) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      xml += ">";
-      xml += this.value;
-      xml += "</id>\n";      
-      return xml;
-   };
-}
-
-
-/**
- * Class that defines an Id represented as a string,
- */
-function Logo( value ) {
-   this.value = value;
-   this.getValue = function() {
-      return this.value;
-   };
-
-   this.setValue = function(value) {
-      this.value = value;
-   };
-
-
-   this.toString = function() {
-       return "Logo value=" + this.value;
-   };
-
-   /**
-    * Serialize this element to XML.  
-    * atomLogo = element atom:logo {
-    *    atomCommonAttributes,
-    *    (atomUri)
-    * }
-    */
-   this.toXML = function() {
-      xml = "<logo";
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null ) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      xml += ">";
-      xml += this.value;
-      xml += "</logo>\n";      
-      return xml;
-   };
-}
-
-/**
- * Class that defines a Text object.
- */
-function Text( content, /* optional */ type ) {
-   this.content = content;
-   this.type = type;
-   if (type == null) this.type = "text"; // If undefined or null, use text
-   
-   this.setText = function(content) {
-      this.content = content;
-   };
-
-   this.getText = function() {
-      return this.content;
-   };
-
-   this.getValue = function() {
-      return this.content;
-   };
-
-   this.setType = function(type) {
-      if ((type != "text") && (type != "html") && (type != "xhtml")) {
-         error( "Text type must be one of text, html, or xhtml" );
-      }
-      this.type = type;
-   };
-
-   this.getType = function() {
-      return this.type;
-   };
-
-   this.setLang = function(lang) {
-      this.lang = lang;
-   };
-
-   this.getLang = function() {
-      return this.lang;
-   };
-
-   this.setUri = function(uri) {
-      this.uri = new Uri( uri );
-   };
-
-   this.getUri = function() {
-      return this.uri;
-   };
-
-   this.toString = function() {
-       return "Text type=" + this.type + ", content=" + this.content;
-   };
-   
-   /** Serialize this text element to XML. 
-    *  atomPlainTextConstruct =
-    *     atomCommonAttributes,
-    *     attribute type { "text" | "html" }?,
-    *     text
-    *
-    *  atomXHTMLTextConstruct =
-    *     atomCommonAttributes,
-    *     attribute type { "xhtml" },
-    *     xhtmlDiv
-    * 
-    *  atomTextConstruct = atomPlainTextConstruct | atomXHTMLTextConstruct
-    */
-   this.toXML = function( elementName ) {
-      if ( elementName == null ) {
-         elementName = "text";
-      }
-      xml = "<" + elementName;
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null ) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      xml += " type=\"" + this.type + "\"";
-      xml += ">";
-      if ( this.type === "xhtml" ) {
-         xml += "<div xmlns=\"http://www.w3.org/1999/xhtml\">";      
-      }
-      xml += this.content;
-      if ( this.type === "xhtml" ) {
-         xml += "</div>";      
-      }
-      xml += "</" + elementName + ">";      
-      return xml;
-   }
-}
-
-/**
- * Class that defines a Person object.
- */
-function Person( name, email ) {
-   this.name = name;
-   if ( email != null ) {
-      this.email = new Email( email );
-   }
-   
-   this.setName = function( name ) {
-      this.name = name;
-   };
-
-   this.getName = function() {
-      return this.name;
-   };
-
-   this.setLang = function(lang) {
-      this.lang = lang;
-   };
-
-   this.getLang = function() {
-      return this.lang;
-   };
-
-   this.setEmail = function( email ) {
-      this.email = new Email( email );
-   };
-
-   this.getEmail = function() {
-      return this.email;
-   };
-
-   this.setUri = function( uri ) {
-      this.uri = new Uri( uri );
-   };
-
-   this.getUri = function() {
-      return this.uri;
-   };
-
-   this.toString = function() {
-       return "Person name=" + this.name + ", email=" + this.email;
-   };
-
-  /** Serialize this text element to XML. 
-    * atomPersonConstruct =
-    *     atomCommonAttributes,
-    *     (element atom:name { text }
-    *      & element atom:uri { atomUri }?
-    *      & element atom:email { atomEmailAddress }?
-    *      & extensionElement*) 
-    */
-   this.toXML = function( elementName ) {
-      if ( elementName == null ) {
-         elementName = "person";
-      }
-      xml = "<" + elementName;
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null ) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      xml += ">\n";
-      if ( this.name != null ) {
-         xml += "<name>" + this.name + "</name>\n";
-      }
-      if ( this.uri != null ) {
-         xml += "<uri>" + this.uri + "</uri>\n";
-      }
-      if ( this.email != null) {
-         xml += this.email.toXML();
-      }      
-      xml += "</" + elementName + ">\n";      
-      return xml;
-   }
- }
-
-/**
- * Class that defines a Generator object.
- */
-function Generator( name, uri ) {
-   this.name = name;
-   this.uri = new Uri( uri );
-   
-   this.setName = function( name ) {
-      this.name = name;
-   };
-
-   this.getName = function() {
-      return this.name;
-   };
-
-   this.setVersion = function(version) {
-      this.version = version;
-   };
-
-   this.getVersion = function() {
-      return this.version;
-   };
-
-   this.setUri = function( uri ) {
-      this.uri = new Email( uri );
-   };
-
-   this.getUri = function() {
-      return this.uri;
-   };
-
-   this.toString = function() {
-       return "Generator name=" + this.name + ", email=" + this.email;
-   };
-
-  /** Serialize this text element to XML. 
-    * atomGenerator = element atom:generator {
-    *    atomCommonAttributes,
-    *    attribute uri { atomUri }?,
-    *    attribute version { text }?,
-    *    text
-    * }
-    */
-   this.toXML = function() {
-      xml = "<generator";
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri.getValue() + "\"";
-      }
-      if ( this.lang != null) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      if ( this.version != null ) {
-         xml += " version=\"" + this.version + "\"";
-      }
-      xml += ">";
-      if ( this.name != null ) {
-         xml += this.name;
-      }
-      xml += "</generator>\n";      
-      return xml;
-   }
-}
-
-/**
- * Class that defines a Category object.
- *atomCategory =
- *     element atom:category {
- *        atomCommonAttributes,
- *        attribute term { text },
- *        attribute scheme { atomUri }?,
- *        attribute label { text }?,
- *        undefinedContent
- *     }
- */
-function Category( label, content ) {
-   this.label = label;
-   this.content = content;
-   
-   this.setLabel = function( label ) {
-      this.label = label;
-   };
-
-   this.getLabel = function() {
-      return this.label;
-   };
-
-   this.setLang = function(lang) {
-      this.lang = lang;
-   };
-
-   this.getLang = function() {
-      return this.lang;
-   };
-
-   this.setTerm = function(term) {
-      this.term = term;
-   };
-
-   this.getTerm = function() {
-      return this.term;
-   };
-
-   this.setScheme = function( scheme ) {
-      this.scheme = scheme;
-   };
-
-   this.getScheme = function() {
-      return this.scheme;
-   };
-
-   this.setContent = function( content ) {
-      this.content = content;
-   };
-
-   this.getContent = function() {
-      return this.content;
-   };
-
-   this.toString = function() {
-       return "Category label=" + this.label;
-   };
-
-   /** Serialize this text element to XML. 
-    *  atomCategory =
-    *     element atom:category {
-    *        atomCommonAttributes,
-    *        attribute term { text },
-    *        attribute scheme { atomUri }?,
-    *        attribute label { text }?,
-    *        undefinedContent
-    *     }
-    */
-   this.toXML = function() {
-      xml = "<category>\n";
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      if ( this.term != null) {
-         xml += " term=\"" + this.term + "\"";
-      }
-      if ( this.scheme != null) {
-         xml += " scheme=\"" + this.scheme + "\"";
-      }
-      if ( this.label != null) {
-         xml += " label=\"" + this.label + "\"";
-      }
-      xml += ">\n";
-      if ( this.content != null ) {
-         xml += this.content + "\n";
-      }
-      xml += "</category>\n";      
-      return xml;
-   }
-}
-
-/**
- * Class that defines a Link object.
- */
-function Link( href, relation ) {
-   this.href = new Uri( href );
-   this.relation = relation;
-   
-   this.setHRef = function( uri ) {
-      this.href = new Uri( uri );
-   };
-
-   this.getHRef = function() {
-      return this.href;
-   };
-
-   this.setTitle = function( title ) {
-      this.title = title;
-   };
-
-   this.getTitle = function() {
-      return this.title;
-   };
-
-   this.setHRefLang = function(lang) {
-      this.hrefLang = lang;
-   };
-
-   this.getHRefLang = function() {
-      return this.hreflang;
-   };
-
-   this.setTitleLang = function(lang) {
-      this.titleLang = lang;
-   };
-
-   this.getTitleLang = function() {
-      return this.titleLang;
-   };
-   
-   this.setLength= function( length ) {
-      this.length= length;
-   };
-
-   this.getLength = function() {
-      return this.length;
-   };
-
-/*
-<static>  <final> String 	TYPE_ATOM
-          Link type used for Atom content.
-<static>  <final> String 	TYPE_HTML
-          Link type used for HTML content.
-*/          
-   this.setMimeType = function(mimeType) {
-      this.mimeType = mimeType;
-   };
-
-   this.getMimeType = function() {
-      return this.mimeType;
-   };
-
-   this.setContent= function( content ) {
-      this.content = content;
-   };
-
-   this.getContent = function() {
-      return this.content;
-   };
-
-/*
-<static>  <final> String 	REL_ALTERNATE
-          Link that provides the URI of an alternate format of the entry's or feed's contents.
-<static>  <final> String 	REL_ENTRY_EDIT
-          Link that provides the URI that can be used to edit the entry.
-<static>  <final> String 	REL_MEDIA_EDIT
-          Link that provides the URI that can be used to edit the media associated with an entry.
-<static>  <final> String 	REL_NEXT
-          Link that provides the URI of next page in a paged feed.
-<static>  <final> String 	REL_PREVIOUS
-          Link that provides the URI of previous page in a paged feed.
-<static>  <final> String 	REL_RELATED
-          Link that provides the URI of a related link to the entry.
-<static>  <final> String 	REL_SELF
-          Link that provides the URI of the feed or entry.
-<static>  <final> String 	REL_VIA
-          Link that provides the URI that of link that provides the data for the content in the feed.
-*/          
-   this.setRelation = function( relation ) {
-      this.relation = relation;
-   };
-
-   this.getRelation = function() {
-      return this.relation;
-   };
-
-   this.toString = function() {
-       return "Link href=" + this.href + ", title=" + this.title;
-   };
-   
-   /** Serialize this text element to XML. 
-     * atomLink =
-     *     element atom:link {
-     *     atomCommonAttributes,
-     *     attribute href { atomUri },
-     *     attribute rel { atomNCName | atomUri }?,
-     *     attribute type { atomMediaType }?,
-     *     attribute hreflang { atomLanguageTag }?,
-     *     attribute title { text }?,
-     *     attribute length { text }?,
-     *     undefinedContent
-     *  }
-     */
-   this.toXML = function() {
-      xml = "<link";
-      if ( this.relation != null ) {
-         xml += " rel=\"" + this.relation + "\"";
-      }
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri.getValue() + "\"";
-      }
-      if ( this.lang != null) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      if ( this.href != null ) {
-         xml += " href=\"" + this.href.getValue() + "\"";
-      }
-      if ( this.hreflang != null ) {
-         xml += " hreflang=\"" + this.hreflang + "\"";
-      }
-      if ( this.title != null ) {
-         xml += " title=\"" + this.title + "\"";
-      }
-      if ( this.length != null ) {
-         xml += " length=\"" + this.length + "\"";
-      }
-      if ( this.content != null ) {
-         xml += this.content + "\n";
-         xml += "</link>\n";
-      } else {
-         xml += "/>\n";
-      }      
-      return xml;
-   }
-   
-}          
-
-/**
- * Class that defines an Entry object.
- * atomEntry =
- *     element atom:entry {
- *        atomCommonAttributes,
- *        (atomAuthor*
- *         & atomCategory*
- *         & atomContent?
- *         & atomContributor*
- *         & atomId
- *         & atomLink*
- *         & atomPublished?
- *         & atomRights?
- *         & atomSource?
- *         & atomSummary?
- *         & atomTitle
- *         & atomUpdated
- *         & extensionElement*)
- *     } 
- */
-function Entry( init ) {
-   // Constructor code at bottom after function definition
-   
-   this.authors = new Array();
-   this.contributors = new Array();
-   this.categories = new Array();
-   this.links = new Array();
-
-   this.setNamespace = function( namespace ) {
-      this.namespace = namespace;
-   };
-
-   this.getNamespace = function() {
-      return this.namespace;
-   };
-
-   this.setId = function( id ) {
-      if (!((typeof id == "object") && (id instanceof Id)))
-         this.id = new Id( id );
-      else 
-         this.id = id;
-   }
-
-   this.getId = function() {
-      return this.id;
-   };
-
-   this.setPublished = function( published ) {
-      this.published = published;
-   };
-
-   this.getPublished = function() {
-      return this.published;
-   };
-
-   this.setUpdated = function( updated ) {
-      this.updated = updated;
-   };
-
-   this.getUpdated = function() {
-      return this.updated;
-   };
-
-   this.setRights = function( rights ) {
-      this.rights = rights;
-   }
-
-   this.getRights = function() {
-      return this.rights;
-   };
-
-   this.setSource = function( source ) {
-      this.source = source;
-   }
-
-   this.getSource = function() {
-      return this.source;
-   };
-
-   /* Type Text */
-   this.setTitle = function( title ) {
-      if (!((typeof title == "object") && (title instanceof Text)))
-         this.title = new Text( title, "text" );
-      else 
-         this.title = title;
-   }
-
-   this.getTitle = function() {
-      return this.title;
-   };
-
-   /* Type Text */
-   this.setSummary = function( summary ) {
-      if (!((typeof summary == "object") && (summary instanceof Text)))
-         this.summary = new Text( summary, "text" );
-      else
-         this.summary = summary;
-   }
-
-   this.getSummary = function() {
-      return this.summary;
-   };
-
-   /* Type Text */
-   this.setContent = function( content ) {
-      if (!((typeof content == "object") && (content instanceof Text)))
-         this.content = new Text( content, "text" );
-      else
-         this.content = content;
-   }
-
-   this.getContent = function() {
-      return this.content;
-   };
-
-   /**
-    * Add an author.
-    * @param name Author
-    */
-   this.addAuthor = function(person) {
-      if (!((typeof person == "object") && (person instanceof Person)))
-         error( "Entry author must be of type Person" );
-      var i = this.authors.length;
-      this.authors[ i ] = person; 
-   }
-   
-   /**
-    * Get an author.
-    * @param name Author
-    */
-   this.getAuthor = function(name) {
-      return this.authors[ name ];
-   }
-   
-   /**
-    * Set list of authors.
-    * @param name Author
-    */
-   this.setAuthors = function( authors ) {
-      return this.authors = authors;
-   }
-   
-   /**
-    * Get an author"pom.xml".
-    * @param name Author
-    */
-   this.getAuthors = function() {
-      return this.authors;
-   }
-   
-   /**
-    * Add an contributor.
-    * @param name Contributor
-    */
-   this.addContributor = function(person) {
-      if (!((typeof person == "object") && (person instanceof Person)))
-         error( "Entry contributor must be of type Person" );
-      var i = this.contributors.length;
-      this.contributors[ i ] = person;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Contributor
-    */
-   this.getContributor = function(name) {
-      return this.contributors[ name ];
-   }
-   
-   /**
-    * Set list of contributors
-    * @param name Author
-    */
-   this.setContributors = function( contributors ) {
-      return this.contributors = contributors;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Contributor
-    */
-   this.getContributors = function() {
-      return this.contributors;
-   }
-   
-   /**
-    * Add a category.
-    * @param name Category
-    */
-   this.addCategory = function(category) {
-      if (!((typeof category == "object") && (category instanceof Category)))
-         error( "Entry category must be of type Category" );
-      var i = this.categories.length
-      this.categories[ i ] = category;
-   }
-   
-   /**
-    * Get a names category.
-    * @param name Category
-    */
-   this.getCategory = function(name) {
-      return this.categories[ name ];
-   }
-   
-   /**
-    * Set list of categories
-    * @param name Author
-    */
-   this.setCategories = function( categories ) {
-      return this.categories = categories;
-   }
-   
-   /**
-    * Get all categories.
-    * @param name Category
-    */
-   this.getCategories = function() {
-      return this.categories;
-   }
-   
-   /**
-    * Add an link.
-    * @param name Link
-    */
-   this.addLink = function(link) {
-      if (!((typeof link == "object") && (link instanceof Link)))
-         error( "Entry link must be of type Link" );
-      var i = this.links.length;
-      this.links[ i ] = link;
-   }
-   
-   /**
-    * Get an link.
-    * @param name Link
-    */
-   this.getLink = function(name) {
-      return links[ name ];
-   }
-   
-   /**
-    * Set list of links.
-    * @param name Link
-    */
-   this.setLinks = function( links ) {
-      return this.links = links;
-   }
-   
-   /**
-    * Get an link.
-    * @param name Link
-    */
-   this.getLinks = function() {
-      return links;
-   }
-   
-   this.readFromXML = function( xml ) {
-      if (!((typeof xml == "object") && (xml instanceof string)))
-         error( "Entry xml must be of type string" );
-      // To Do - Read from arbutrary XML such as 
-      // <entry>
-      //   <title type="text">cart-item</title>
-      //   <content type="text">Apple - $ 2.99</content>
-      //   <id>cart-bd5323d6-1f59-4fae-a8f5-01f7654f1e77</id>
-      //   <link href="cart-bd5323d6-1f59-4fae-a8f5-01f7654f1e77" rel="edit"/>
-      //   <link href="cart-bd5323d6-1f59-4fae-a8f5-01f7654f1e77" rel="alternate"/>
-      //   <updated>2008-09-21T23:06:43.921Z</updated>
-      // </entry>
-      
-   }
-  this.readFromDoc = function( htmlDoc ) {
-      // Expect HTML collection.
-      var entryDoc = htmlDoc.getElementsByTagName("entry");
-      for (var i = 0; i < entryDoc.length; i++) {
-         this.readFromNode( entryDoc[ i ] );
-      }
-   }
-
-   this.readFromNode = function( entryNode ) {
-      // Expect entry node
-      var childNodes = entryNode.childNodes;
-      for ( var i = 0; i < childNodes.length; i++ ) {
-         var node = childNodes[ i ];
-         if (node.nodeType == 1 /*Node.ELEMENT_NODE*/) {
-            var tagName = node.tagName;
-            if (tagName == "title" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if ( type == undefined )
-                  type = "text";
-               var title = new Text( text, type );
-               this.setTitle( title );
-            } else if ( tagName == "subtitle" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if ( type == undefined )
-                  type = "text";
-               var title = new Text( text, type );
-               this.setSubtitle( title );
-            } else if ( tagName == "id" ) {
-               var id = new Id( getTextContent( node ) );
-               this.setId( id );
-            } else if ( tagName == "updated" ) {
-               var dateText = getTextContent( node );
-               var date = new Date( dateText ); // 2008-09-21T23:06:43.921Z
-               this.setUpdated( date );
-            } else if ( tagName == "link" ) {
-               // var href = node.attributes[ "href" ]; // Works on modern browsers.
-               var attrVal = node.getAttribute( "href" );
-               var link = new Link( attrVal );
-               attrVal = node.getAttribute( "rel" );
-               if ( attrVal )
-                  link.setRelation( attrVal );
-               this.addLink( link );
-            } else if ( tagName == "content" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if (type == undefined)
-                  type = "text";
-               var content = new Text( text, type );
-               this.setContent( content );
-            } else {
-               // To Do - implement rest of nodes
-			   error( "undefined element node" );
-            } 
-         } else if (node.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
-            var attrName = node.tagName;
-         } else if (node.nodeType == 3 /*Node.TEXT_NODE*/) {
-         }
-      }      
-   }
-
-   this.toString = function() {
-       return "Entry title=" + this.title + ", updated=" + this.updated;
-   };
-
-   /** Serialize this text element to XML. 
-	 * atomEntry =
-	 *     element atom:entry {
-	 *        atomCommonAttributes,
-	 *        (atomAuthor*
-	 *         & atomContributor*
-	 *         & atomCategory*
-	 *         & atomLink*
-	 *         & atomTitle
-	 *         & atomId
-	 *         & atomPublished?
-	 *         & atomUpdated
-	 *         & atomContent?
-	 *         & atomRights?
-	 *         & atomSource?
-	 *         & atomSummary?
-	 *         & extensionElement*)
-	 *     }    
-     */
-   this.toXML = function() {
-      xml = "<entry";
-      if ( this.namespace != null ) {
-         xml += " namespace=\"" + this.namespace + "\"";
-      }
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null ) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      xml += ">";
-      if ( this.title != null ) {
-         xml += this.title.toXML( "title" );
-      }
-      if ( this.id != null ) {
-         xml += this.id.toXML();
-      }
-      if ( this.published != null ) {
-         xml += "<published>" + this.published + "</published>\n";
-      }
-      if ( this.updated != null ) {
-         xml += "<updated>" + this.updated + "</updated>\n";
-      }
-      if ( this.authors != null ) {
-      for ( var i = 0; i < this.authors.length; i++ ) {
-         var author = this.authors[ i ];
-         xml += author.toXML( "author" );
-      }
-      }
-      if ( this.contributors != null ) {
-      for ( var i = 0; i < this.contributors.length; i++ ) {
-         var contributor = this.contributors[ i ];
-         xml += contributor.toXML( "contributor" );
-      }
-      }
-      if ( this.categories != null ) {
-      for ( var i = 0; i < this.categories.length; i++ ) {
-         var category = this.categories[ i ];
-         xml += category.toXML();
-      }
-      }
-      if ( this.links != null ) {
-      for ( var i = 0; i < this.links.length; i++ ) {
-         var link = this.links[ i ];
-         xml += link.toXML();
-      }
-      }
-      if ( this.rights != null ) {
-         xml += "<rights>" + this.rights + "</rights>\n";
-      }
-      if ( this.source != null ) {
-         xml += "<source>" + this.source + "</source>\n";
-      }
-      if ( this.summary != null ) {
-         xml += this.summary.toXML( "summary" );
-      }
-      if ( this.content != null ) {
-         xml += this.content.toXML( "content" );
-      }
-      xml += "</entry>";      
-      return xml;
-   }
-  
-   // Initialize from constructor   
-   if (typeof init == 'object') {
-      if ( init.nodeType == 1 ) { /* Document Node.ELEMENT_NODE 1 */
-         this.readFromDoc( init );
-      } else {      
-         error( "Feed init unknown type" );
-      }
-   }  else if ( typeof init === 'string' ) {
-      this.setTitle( init );
-   }
-   this.namespace = "http://www.w3.org/2005/Atom";
-}
-
-/**
- * Class that defines an Feed object.
- *  atomFeed =
- *     element atom:feed {
- *        atomCommonAttributes,
- *        (atomAuthor*
- *         & atomCategory*
- *         & atomContributor*
- *         & atomGenerator?
- *         & atomIcon?
- *         & atomId
- *         & atomLink*
- *         & atomLogo?
- *         & atomRights?
- *         & atomSubtitle?
- *         & atomTitle
- *         & atomUpdated
- *         & extensionElement*),
- *        atomEntry* 
- */
-function Feed( init ) {
-   // See init after functions have been defined.
-
-   this.authors = new Array();
-   this.contributors = new Array();
-   this.categories = new Array();
-   this.links = new Array();
-   this.entries = new Array();
-
-   this.setNamespace = function( namespace ) {
-      this.namespace = namespace;
-   };
-
-   this.getNamespace = function() {
-      return this.namespace;
-   };
-
-   this.setPublished = function( published ) {
-      this.published = published;
-   };
-
-   this.getPublished = function() {
-      return this.published;
-   };
-
-   this.setUpdated = function( updated ) {
-      this.updated = updated;
-   };
-
-   this.getUpdated = function() {
-      return this.updated;
-   };
-
-   this.setContent = function( content ) {
-      if (!((typeof content == "object") && (content instanceof Text)))
-         error( "Entry content must be of type Text" );
-
-      this.content = content;
-   }
-
-   this.getContent = function() {
-      return this.content;
-   };
-
-   this.setRights = function( rights ) {
-      if (!((typeof rights == "object") && (rights instanceof Text)))
-         this.rights = new Text( rights, "text" );
-      else 
-         this.rights = rights;
-   }
-
-   this.getRights = function() {
-      return this.rights;
-   };
-
-   this.setSummary = function( summary ) {
-      if (!((typeof summary == "object") && (summary instanceof Text)))
-         error( "Feed summary must be of type Text" );
-      this.summary = summary;
-   }
-
-   this.getSummary = function() {
-      return this.summary;
-   };
-
-   this.setTitle = function( title ) {
-      if (!((typeof title == "object") && (title instanceof Text)))
-         this.title = new Text( title, "text" );
-      else 
-         this.title = title;
-   }
-
-   this.getTitle = function() {
-      return this.title;
-   };
-
-   this.setSubtitle = function( subtitle ) {
-      if (!((typeof subtitle == "object") && (subtitle instanceof Text)))
-         this.subtitle = new Text( subtitle, "text" );
-      else 
-         this.subtitle = subtitle;
-   }
-
-   this.getSubtitle = function() {
-      return this.subtitle;
-   };
-
-   /* Type Id */
-   this.setId = function( id ) {
-      if (!((typeof id == "object") && (id instanceof Id)))
-         this.id = new Id( id );
-      else 
-         this.id = id;
-   }
-
-   this.getId = function() {
-      return this.id;
-   };
-
-   this.setGenerator = function( generator ) {
-      if (!((typeof generator == "object") && (generator instanceof Generator)))
-         error( "Feed generator must be of type Generator" );
-      this.generator = generator;
-   }
-
-   this.getGenerator = function() {
-      return this.generator;
-   };
-
-   this.setBase = function( base ) {
-      this.base = base;
-   }
-
-   this.getBase = function() {
-      return this.base;
-   };
-
-   this.setLogo = function( logo ) {
-      this.logo = logo;
-   }
-
-   this.getLogo = function() {
-      return this.logo;
-   };
-
-   /**
-    * Add an author.
-    * @param name Author
-    */
-   this.addAuthor = function(person) {
-      if (!((typeof person == "object") && (person instanceof Person)))
-         error( "Entry author must be of type Person" );
-      var i = this.authors.length;
-      this.authors[ i ] = person;
-   }
-   
-   /**
-    * Get an author.
-    * @param name Author
-    */
-   this.getAuthor = function(name) {
-      return this.authors[ name ];
-   }
-   
-   /**
-    * Set list of authors.
-    * @param name Author
-    */
-   this.setAuthors = function( authors ) {
-      return this.authors = authors;
-   }
-   
-   /**
-    * Get an author.
-    * @param name Author
-    */
-   this.getAuthors = function() {
-      return this.authors;
-   }
-   
-   /**
-    * Add an contributor.
-    * @param name Contributor
-    */
-   this.addContributor = function(person) {
-      if (!((typeof person == "object") && (person instanceof Person)))
-         error( "Entry contributor must be of type Person" );
-      var i = this.contributors.length;
-      this.contributors[ i ] = person;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Contributor
-    */
-   this.getContributor = function(name) {
-      return this.contributors[ name ];
-   }
-   
-   /**
-    * Set list of contributors
-    * @param name Author
-    */
-   this.setContributors = function( contributors ) {
-      return this.contributors = contributors;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Contributor
-    */
-   this.getContributors = function() {
-      return this.contributors;
-   }
-   
-   /**
-    * Add a category.
-    * @param name Category
-    */
-   this.addCategory = function(category) {
-      if (!((typeof category == "object") && (category instanceof Category)))
-         error( "Feed category must be of type Category" );
-      var i = this.categories.length;
-      this.categories[ i ] = category;
-   }
-   
-   /**
-    * Get a named contributor.
-    * @param name Category
-    */
-   this.getCategory = function(name) {
-      return this.categories[ name ];
-   }
-   
-   /**
-    * Set list of categories
-    * @param category
-    */
-   this.setCategories = function( categories ) {
-      return this.categories = categories;
-   }
-   
-   /**
-    * Get all categories.
-    * @param name Category
-    */
-   this.getCategories = function() {
-      return this.categories;
-   }
-   
-   /**
-    * Add an link.
-    * @param name Link
-    */
-   this.addLink = function(link) {
-      if (!((typeof link == "object") && (link instanceof Link)))
-         error( "Entry link must be of type Link" );
-      var i = this.links.length;
-      this.links[ i ] = link;
-   }
-   
-   /**
-    * Get an link.
-    * @param name Link
-    */
-   this.getLink = function(name) {
-      return this.links[ name ];
-   }
-   
-   /**
-    * Set list of links.
-    * @param name Link
-    */
-   this.setLinks = function( links ) {
-      return this.links = links;
-   }
-   
-   /**
-    * Get an link.
-    * @param name Link
-    */
-   this.getLinks = function() {
-      return this.links;
-   }
-   
-   /**
-    * Add an entry.
-    * @param name Entry
-    */
-   this.addEntry = function(entry) {
-      if (!((typeof entry == "object") && (entry instanceof Entry)))
-         error( "Entry entry must be of type Entry" );
-      var i = this.entries.length;
-      this.entries[ i ] = entry;
-   }
-   
-   /**
-    * Get an entry by name.
-    * @param name Entry
-    */
-   this.getEntry = function(name) {
-      return this.entries[ name ];
-   }
-   
-   /**
-    * Set list of entries
-    * @param name Author
-    */
-   this.setEntries = function( entries ) {
-      return this.entries = entries;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Entry
-    */
-   this.getEntries = function() {
-      return this.entries;
-   }
-   
-   this.readFromXML = function( xml ) {
-      // To Do Read from arbitraty XML such as 
-      // <feed xmlns="http://www.w3.org/2005/Atom">
-      // <title type="text">shopping cart</title>
-      // <subtitle type="text">Total : $4.54</subtitle>
-      // <entry>
-      //    ...
-      // </entry>
-      // </feed>    
-   }
-
-   this.readFromDoc = function( htmlDoc ) {
-      // Expect HTML collection.
-      var feedDoc = htmlDoc.getElementsByTagName("feed");
-      for (var i = 0; i < feedDoc.length; i++) {
-         this.readFromNode( feedDoc[ i ] );
-      }
-   }
-   this.readFromNode = function( feedNode ) {
-      // Expect feed node
-      var childNodes = feedNode.childNodes;
-      for ( var i = 0; i < childNodes.length; i++ ) {
-         var node = childNodes[ i ];
-         if (node.nodeType == 1 /*Node.ELEMENT_NODE*/) {
-            var tagName = node.tagName;
-            if (tagName == "title" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if ( type == undefined )
-                  type = "text";
-               var title = new Text( text, type );
-               this.setTitle( title );
-            } else if ( tagName == "subtitle" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if ( type == undefined )
-                  type = "text";
-               var title = new Text( text, type );
-               this.setSubtitle( title );
-            } else if ( tagName == "entry" ) {
-               var entry = new Entry();
-               entry.readFromNode( node );
-               this.addEntry( entry ); 
-            } else if ( tagName == "id" ) {
-               var id = new Id( getTextContent( node ) );
-               this.setId( id );
-            } else if ( tagName == "updated" ) {
-               var dateText = getTextContent( node );
-               var date = new Date( dateText ); //2008-09-21T23:06:53.750Z
-               this.setUpdated( date );
-            } else if ( tagName == "link" ) {
-               // var href = node.attributes[ "href" ]; // Works on modern browsers.
-               var attrVal = node.getAttribute( "href" );
-               var link = new Link( attrVal );
-               attrVal = node.getAttribute( "rel" );
-               if ( attrVal )
-                  link.setRelation( attrVal );
-               this.addLink( link );
-            } else {
-               // To Do - implement rest of nodes
-			   error( "undefined element node" );
-            } 
-         } else if (node.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
-            var attrName = node.tagName;
-         } else if (node.nodeType == 3 /*Node.TEXT_NODE*/) {
-         }
-      }      
-   }
-
-   this.toString = function() {
-       return "Feed title=" + this.title + ", updated=" + this.updated;
-   };
-
-   /** Serialize this text element to XML. 
-	 *  atomFeed =
-	 *     element atom:feed {
-	 *        atomCommonAttributes,
-	 *        (atomAuthor*
-	 *         & atomContributor*
-	 *         & atomCategory*
-	 *         & atomLink*
-	 *         & atomTitle
-	 *         & atomSubtitle?
-	 *         & atomId
-	 *         & atomUpdated
-	 *         & atomRights?	 
-	 *         & atomGenerator?
-	 *         & atomIcon?
-	 *         & atomLogo?
-	 *         & extensionElement*),
-	 *        atomEntry* 
-     */
-   this.toXML = function() {
-      xml = "<feed";
-      if ( this.namespace != null ) {
-         xml += " namespace=\"" + this.namespace + "\"";
-      }
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null ) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      xml += ">\n";
-      if ( this.title != null ) {
-         xml += this.title.toXML( "title" );
-      }
-      if ( this.subtitle != null ) {
-         xml += this.subtitle.toXML( "subtitle" );
-      }
-      if ( this.id != null ) {
-         xml += this.id.toXML();
-      }
-      if ( this.published != null ) {
-         xml += "<published>" + this.published + "</published>\n";
-      }
-      if ( this.updated != null ) {
-         xml += "<updated>" + this.updated + "</updated>\n";
-      }
-      if ( this.authors != null ) {      
-      for ( var i = 0; i < this.authors.length; i++ ) {
-         var author = this.authors[ i ];
-         xml += author.toXML( "author" );
-      }
-      }
-      if ( this.contributors != null ) {      
-      for ( var i = 0; i < this.contributors.length; i++ ) {
-         var contributor = this.contributors[ i ];
-         xml += contributor.toXML( "contributor" );
-      }
-      }
-      if ( this.categories != null ) {      
-      for ( var i = 0; i < this.categories.length; i++ ) {
-         var category = this.categories[ i ];
-         xml += category.toXML();
-      }
-      }
-      if ( this.links != null ) {      
-      for ( var i = 0; i < this.links.length; i++ ) {
-         var link = this.links[ i ];
-         xml += link.toXML();
-      }
-      }
-      if ( this.rights != null ) {
-         xml += this.rights.toXML( "rights" );
-      }
-      if ( this.source != null ) {
-         xml += "<source>" + this.source + "</source>\n";
-      }
-      if ( this.logo != null ) {
-         xml += "<logo>" + this.logo + "</logo>\n";
-      }
-      if ( this.icon != null ) {
-         xml += "<icon>" + this.icon + "</icon>\n";
-      }
-      if ( this.generator != null ) {
-         xml += this.generator.toXML( "generator" );
-      }
-      if ( this.summary != null ) {
-         xml += this.summary.toXML( "summary" );
-      }
-      if ( this.entries != null ) {
-      for ( var i = 0; i < this.entries.length; i++ ) {
-         var entry = this.entries[ i ];
-         xml += entry.toXML();
-      }      
-      }      
-      xml += "</feed>\n";      
-      return xml;
-   }
-  
-   // Initialize from constructor   
-   if (typeof init == 'object') {
-      if ( init.nodeType == 9 ) { /* Document Node.DOCUMENT_NODE 9 */
-         this.readFromDoc( init );
-      } else {      
-         error( "Feed init unknown type" );
-      }
-   }  else if ( typeof init === 'string' ) {
-      this.setTitle( init );
-   }   
-   this.namespace = "http://www.w3.org/2005/Atom";
-}
-
-function error( message ) {
-   alert( message );
-}
-
-/* Returns inner text on both IE and modern browsers. */
-function getTextContent(node) {
-   // innerText for IE, textContent for others, child text node, "" for others.
-   if ( node.innerText )
-      return node.innerText;
-   if ( node.textContent )
-      return node.textContent;
-   if ( node.hasChildNodes() ) {
-      var childNodes = node.childNodes
-      for ( var j = 0; j < childNodes.length; j++ ) {
-         var childNode = childNodes[ j ];
-         var childType = childNode.nodeType;
-         if (childNode.nodeType == 3 /*Node.TEXT_NODE*/) {
-            return childNode.nodeValue;
-         }
-      } 
-   }
-   return undefined;
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-atom.js b/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-atom.js
deleted file mode 100644
index 2719e9a9b9..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-atom.js
+++ /dev/null
@@ -1,137 +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.    
- */
-	
-function AtomClient(uri) {
-
-	this.msxmlNames = [ "MSXML2.XMLHTTP.5.0",
-                        "MSXML2.XMLHTTP.4.0",
-                        "MSXML2.XMLHTTP.3.0",
-                        "MSXML2.XMLHTTP",
-                        "Microsoft.XMLHTTP" ];
-			            
-	this.uri=uri;
-	
-	this.get = function(id, responseFunction) {
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 200) {
-				    var strDocument = xhr.responseText;
-				    var xmlDocument = xhr.responseXML;
-				    if(!xmlDocument || xmlDocument.childNodes.length==0){ 
-                        xmlDocument = (new DOMParser()).parseFromString(strDocument, "text/xml");
-                    } 
-                    if (responseFunction != null) responseFunction(xmlDocument);
-				} else {
-                    alert("get - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("GET", uri + '/' + id, true);
-		xhr.send(null);
-	}	
-
-	this.post = function (entry, responseFunction) {
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 201) {
-				    var strDocument = xhr.responseText;
-				    var xmlDocument = xhr.responseXML;
-				    if(!xmlDocument || xmlDocument.childNodes.length==0){ 
-                        xmlDocument = (new DOMParser()).parseFromString(strDocument, "text/xml");
-                    } 
-					if (responseFunction != null) responseFunction(xmlDocument);
-				} else {
-					alert("post - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("POST", uri, true);
-		xhr.setRequestHeader("Content-Type", "application/atom+xml");
-		xhr.send(entry);
-	}	
-
-	this.put = function (id, entry, responseFunction) {
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 200) {
-				    var strDocument = xhr.responseText;
-				    var xmlDocument = xhr.responseXML;
-				    if(!xmlDocument || xmlDocument.childNodes.length==0){ 
-                        xmlDocument = (new DOMParser()).parseFromString(strDocument, "text/xml");
-                    } 
-					if (responseFunction != null) responseFunction(xmlDocument);
-				} else {
-					alert("put - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("PUT", uri + '/' + id, true);
-		xhr.setRequestHeader("Content-Type", "application/atom+xml");
-		xhr.send(entry);
-	}	
-
-	this.del = function (id, responseFunction) {       
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 200) {
-					if (responseFunction != null) responseFunction();
-				} else {
-					alert("delete - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("DELETE", uri + '/' + id, true);		
-		xhr.send(null);
-	}
-	this.createXMLHttpRequest = function () {
-        /* Mozilla XMLHttpRequest */
-        try {return new XMLHttpRequest();} catch(e) {}      
-		
-        /* Microsoft MSXML ActiveX */
-        for (var i=0;i < this.msxmlNames.length; i++) {
-            try {return new ActiveXObject(this.msxmlNames[i]);} catch (e) {}
-        }
-        alert("XML http request not supported");
-        return null;
-	}
-	if (typeof DOMParser == "undefined") {
-	   DOMParser = function () {}
-	
-	   DOMParser.prototype.parseFromString = function (str, contentType) {
-	      if (typeof ActiveXObject != "undefined") {
-	         var d = new ActiveXObject("MSXML.DomDocument");
-	         d.loadXML(str);
-	         return d;
-	      } else if (typeof XMLHttpRequest != "undefined") {
-	         var req = new XMLHttpRequest;
-	         req.open("GET", "data:" + (contentType || "application/xml") +
-	                         ";charset=utf-8," + encodeURIComponent(str), false);
-	         if (req.overrideMimeType) {
-	            req.overrideMimeType(contentType);
-	         }
-	         req.send(null);
-	         return req.responseXML;
-	      }
-      }
-   }
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-http.js b/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-http.js
deleted file mode 100644
index 60bd841679..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-http.js
+++ /dev/null
@@ -1,105 +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.    
- */
-	
-function HTTPClient(uri) {
-
-	this.msxmlNames = [ "MSXML2.XMLHTTP.5.0",
-                        "MSXML2.XMLHTTP.4.0",
-                        "MSXML2.XMLHTTP.3.0",
-                        "MSXML2.XMLHTTP",
-                        "Microsoft.XMLHTTP" ];
-			            
-	this.uri=uri;
-	
-	this.get = function(id, responseFunction) {
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 200) {
-				    var strDocument = xhr.responseText;
-                    if (responseFunction != null) responseFunction(strDocument);
-				} else {
-                    alert("get - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("GET", uri + '/' + id, true);
-		xhr.send(null);
-	}	
-
-	this.post = function (entry, responseFunction) {
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 201) {
-				    var strDocument = xhr.responseText;
-					if (responseFunction != null) responseFunction(strDocument);
-				} else {
-					alert("post - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("POST", uri, true);
-		xhr.setRequestHeader("Content-Type", "text/xml");
-		xhr.send(entry);
-	}	
-
-	this.put = function (id, entry, responseFunction) {
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 200) {
-				    var strDocument = xhr.responseText;
-					if (responseFunction != null) responseFunction(strDocument);
-				} else {
-					alert("put - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("PUT", uri + '/' + id, true);
-		xhr.setRequestHeader("Content-Type", "text/xml");
-		xhr.send(entry);
-	}	
-
-	this.del = function (id, responseFunction) {       
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 200) {
-					if (responseFunction != null) responseFunction();
-				} else {
-					alert("delete - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("DELETE", uri + '/' + id, true);		
-		xhr.send(null);
-	}
-	this.createXMLHttpRequest = function () {
-        /* Mozilla XMLHttpRequest */
-        try {return new XMLHttpRequest();} catch(e) {}      
-		
-        /* Microsoft MSXML ActiveX */
-        for (var i=0;i < this.msxmlNames.length; i++) {
-            try {return new ActiveXObject(this.msxmlNames[i]);} catch (e) {}
-        }
-        alert("XML http request not supported");
-        return null;
-	}
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js b/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js
deleted file mode 100644
index ca3c2a8605..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js
+++ /dev/null
@@ -1,492 +0,0 @@
-/*
- * JSON-RPC JavaScript client
- *
- * $Id: jsonrpc.js,v 1.36.2.3 2006/03/08 15:09:37 mclark Exp $
- *
- * Copyright (c) 2003-2004 Jan-Klaas Kollhof
- * Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
- *
- * This code is based on Jan-Klaas' JavaScript o lait library (jsolait).
- *
- * Licensed 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.
- *
- */
-
-/*
- * Modifications for Apache Tuscany:
- * - JSONRpcClient_createMethod changed so callback is last arg
- */
-
-/* escape a character */
-
-escapeJSONChar =
-function escapeJSONChar(c)
-{
-    if(c == "\"" || c == "\\") return "\\" + c;
-    else if (c == "\b") return "\\b";
-    else if (c == "\f") return "\\f";
-    else if (c == "\n") return "\\n";
-    else if (c == "\r") return "\\r";
-    else if (c == "\t") return "\\t";
-    var hex = c.charCodeAt(0).toString(16);
-    if(hex.length == 1) return "\\u000" + hex;
-    else if(hex.length == 2) return "\\u00" + hex;
-    else if(hex.length == 3) return "\\u0" + hex;
-    else return "\\u" + hex;
-};
-
-
-/* encode a string into JSON format */
-
-escapeJSONString =
-function escapeJSONString(s)
-{
-    /* The following should suffice but Safari's regex is b0rken
-       (doesn't support callback substitutions)
-       return "\"" + s.replace(/([^\u0020-\u007f]|[\\\"])/g,
-       escapeJSONChar) + "\"";
-    */
-
-    /* Rather inefficient way to do it */
-    var parts = s.split("");
-    for(var i=0; i < parts.length; i++) {
-	var c =parts[i];
-	if(c == '"' ||
-	   c == '\\' ||
-	   c.charCodeAt(0) < 32 ||
-	   c.charCodeAt(0) >= 128)
-	    parts[i] = escapeJSONChar(parts[i]);
-    }
-    return "\"" + parts.join("") + "\"";
-};
-
-
-/* Marshall objects to JSON format */
-
-toJSON = function toJSON(o)
-{
-    if(o == null) {
-	return "null";
-    } else if(o.constructor == String) {
-	return escapeJSONString(o);
-    } else if(o.constructor == Number) {
-	return o.toString();
-    } else if(o.constructor == Boolean) {
-	return o.toString();
-    } else if(o.constructor == Date) {
-	return '{javaClass: "java.util.Date", time: ' + o.valueOf() +'}';
-    } else if(o.constructor == Array) {
-	var v = [];
-	for(var i = 0; i < o.length; i++) v.push(toJSON(o[i]));
-	return "[" + v.join(", ") + "]";
-    } else {
-	var v = [];
-	for(attr in o) {
-	    if(o[attr] == null) v.push("\"" + attr + "\": null");
-	    else if(typeof o[attr] == "function"); /* skip */
-	    else v.push(escapeJSONString(attr) + ": " + toJSON(o[attr]));
-	}
-	return "{" + v.join(", ") + "}";
-    }
-};
-
-
-/* JSONRpcClient constructor */
-
-JSONRpcClient =
-function JSONRpcClient_ctor(serverURL, user, pass, objectID)
-{
-    this.serverURL = serverURL;
-    this.user = user;
-    this.pass = pass;
-    this.objectID = objectID;
-
-    /* Add standard methods */
-    if(this.objectID) {
-	this._addMethods(["listMethods"]);
-	var req = this._makeRequest("listMethods", []);
-    } else {
-	this._addMethods(["system.listMethods"]);
-	var req = this._makeRequest("system.listMethods", []);
-    }
-    var m = this._sendRequest(req);
-    this._addMethods(m);
-};
-
-
-/* JSONRpcCLient.Exception */
-
-JSONRpcClient.Exception =
-function JSONRpcClient_Exception_ctor(code, message, javaStack)
-{
-    this.code = code;
-    var name;
-    if(javaStack) {
-	this.javaStack = javaStack;
-	var m = javaStack.match(/^([^:]*)/);
-	if(m) name = m[0];
-    }
-    if(name) this.name = name;
-    else this.name = "JSONRpcClientException";
-    this.message = message;
-};
-
-JSONRpcClient.Exception.CODE_REMOTE_EXCEPTION = 490;
-JSONRpcClient.Exception.CODE_ERR_CLIENT = 550;
-JSONRpcClient.Exception.CODE_ERR_PARSE = 590;
-JSONRpcClient.Exception.CODE_ERR_NOMETHOD = 591;
-JSONRpcClient.Exception.CODE_ERR_UNMARSHALL = 592;
-JSONRpcClient.Exception.CODE_ERR_MARSHALL = 593;
-
-JSONRpcClient.Exception.prototype = new Error();
-
-JSONRpcClient.Exception.prototype.toString =
-function JSONRpcClient_Exception_toString(code, msg)
-{
-    return this.name + ": " + this.message;
-};
-
-
-/* Default top level exception handler */
-
-JSONRpcClient.default_ex_handler =
-function JSONRpcClient_default_ex_handler(e) { alert(e); };
-
-
-/* Client settable variables */
-
-JSONRpcClient.toplevel_ex_handler = JSONRpcClient.default_ex_handler;
-JSONRpcClient.profile_async = false;
-JSONRpcClient.max_req_active = 1;
-JSONRpcClient.requestId = 1;
-
-
-/* JSONRpcClient implementation */
-
-JSONRpcClient.prototype._createMethod =
-function JSONRpcClient_createMethod(methodName)
-{
-    var fn=function()
-    {
-	var args = [];
-	var callback = null;
-	for(var i=0;i<arguments.length;i++) args.push(arguments[i]);
-
-/*	TUSCANY change callback to be last arg instead of first to match binding.ajax
-	if(typeof args[0] == "function") callback = args.shift();
-*/
-	if(typeof args[arguments.length-1] == "function") callback = args.pop();
-
-	var req = fn.client._makeRequest.call(fn.client, fn.methodName,
-					      args, callback);
-	if(callback == null) {
-	    return fn.client._sendRequest.call(fn.client, req);
-	} else {
-	    JSONRpcClient.async_requests.push(req);
-	    JSONRpcClient.kick_async();
-	    return req.requestId;
-	}
-    };
-    fn.client = this;
-    fn.methodName = methodName;
-    return fn;
-};
-
-JSONRpcClient.prototype._addMethods =
-function JSONRpcClient_addMethods(methodNames)
-{
-    for(var i=0; i<methodNames.length; i++) {
-	var obj = this;
-	var names = methodNames[i].split(".");
-	for(var n=0; n<names.length-1; n++) {
-	    var name = names[n];
-	    if(obj[name]) {
-		obj = obj[name];
-	    } else {
-		obj[name]  = new Object();
-		obj = obj[name];
-	    }
-	}
-	var name = names[names.length-1];
-	if(!obj[name]) {
-	    var method = this._createMethod(methodNames[i]);
-	    obj[name] = method;
-	}
-    }
-};
-
-JSONRpcClient._getCharsetFromHeaders =
-function JSONRpcClient_getCharsetFromHeaders(http)
-{
-    try {
-	var contentType = http.getResponseHeader("Content-type");
-	var parts = contentType.split(/\s*;\s*/);
-	for(var i =0; i < parts.length; i++) {
-	    if(parts[i].substring(0, 8) == "charset=")
-		return parts[i].substring(8, parts[i].length);
-	}
-    } catch (e) {}
-    return "UTF-8"; /* default */
-};
-
-/* Async queue globals */
-JSONRpcClient.async_requests = [];
-JSONRpcClient.async_inflight = {};
-JSONRpcClient.async_responses = [];
-JSONRpcClient.async_timeout = null;
-JSONRpcClient.num_req_active = 0;
-
-JSONRpcClient._async_handler =
-function JSONRpcClient_async_handler()
-{
-    JSONRpcClient.async_timeout = null;
-
-    while(JSONRpcClient.async_responses.length > 0) {
-	var res = JSONRpcClient.async_responses.shift();
-	if(res.canceled) continue;
-	if(res.profile) res.profile.dispatch = new Date();
-	try {
-	    res.cb(res.result, res.ex, res.profile);
-	} catch(e) {
-	    JSONRpcClient.toplevel_ex_handler(e);
-	}
-    }
-
-    while(JSONRpcClient.async_requests.length > 0 &&
-	  JSONRpcClient.num_req_active < JSONRpcClient.max_req_active) {
-	var req = JSONRpcClient.async_requests.shift();
-	if(req.canceled) continue;
-	req.client._sendRequest.call(req.client, req);
-    }
-};
-
-JSONRpcClient.kick_async =
-function JSONRpcClient_kick_async()
-{
-    if(JSONRpcClient.async_timeout == null)
-	JSONRpcClient.async_timeout =
-	    setTimeout(JSONRpcClient._async_handler, 0);
-};
-
-JSONRpcClient.cancelRequest =
-function JSONRpcClient_cancelRequest(requestId)
-{
-    /* If it is in flight then mark it as canceled in the inflight map
-       and the XMLHttpRequest callback will discard the reply. */
-    if(JSONRpcClient.async_inflight[requestId]) {
-	JSONRpcClient.async_inflight[requestId].canceled = true;
-	return true;
-    }
-
-    /* If its not in flight yet then we can just mark it as canceled in
-       the the request queue and it will get discarded before being sent. */
-    for(var i in JSONRpcClient.async_requests) {
-	if(JSONRpcClient.async_requests[i].requestId == requestId) {
-	    JSONRpcClient.async_requests[i].canceled = true;
-	    return true;
-	}
-    }
-
-    /* It may have returned from the network and be waiting for its callback
-       to be dispatched, so mark it as canceled in the response queue
-       and the response will get discarded before calling the callback. */
-    for(var i in JSONRpcClient.async_responses) {
-	if(JSONRpcClient.async_responses[i].requestId == requestId) {
-	    JSONRpcClient.async_responses[i].canceled = true;
-	    return true;
-	}
-    }
-
-    return false;
-};
-
-JSONRpcClient.prototype._makeRequest =
-function JSONRpcClient_makeRequest(methodName, args, cb)
-{
-    var req = {};
-    req.client = this;
-    req.requestId = JSONRpcClient.requestId++;
-
-    var obj = {};
-    obj.id = req.requestId;
-    if (this.objectID)
-	obj.method = ".obj#" + this.objectID + "." + methodName;
-    else
-	obj.method = methodName;
-    obj.params = args;
-
-    if (cb) req.cb = cb;
-    if (JSONRpcClient.profile_async)
-	req.profile = { "submit": new Date() };
-    req.data = toJSON(obj);
-
-    return req;
-};
-
-JSONRpcClient.prototype._sendRequest =
-function JSONRpcClient_sendRequest(req)
-{
-    if(req.profile) req.profile.start = new Date();
-
-    /* Get free http object from the pool */
-    var http = JSONRpcClient.poolGetHTTPRequest();
-    JSONRpcClient.num_req_active++;
-
-    /* Send the request */
-    if (typeof(this.user) == "undefined") {
-	http.open("POST", this.serverURL, (req.cb != null));
-    } else {
-	http.open("POST", this.serverURL, (req.cb != null), this.user, this.pass);
-    }
-
-    /* setRequestHeader is missing in Opera 8 Beta */
-    try { http.setRequestHeader("Content-type", "text/plain"); } catch(e) {}
-
-    /* Construct call back if we have one */
-    if(req.cb) {
-	var self = this;
-	http.onreadystatechange = function() {
-	    if(http.readyState == 4) {
-		http.onreadystatechange = function () {};
-		var res = { "cb": req.cb, "result": null, "ex": null};
-		if (req.profile) {
-		    res.profile = req.profile;
-		    res.profile.end = new Date();
-		}
-		try { res.result = self._handleResponse(http); }
-		catch(e) { res.ex = e; }
-		if(!JSONRpcClient.async_inflight[req.requestId].canceled)
-		    JSONRpcClient.async_responses.push(res);
-		delete JSONRpcClient.async_inflight[req.requestId];
-		JSONRpcClient.kick_async();
-	    }
-	};
-    } else {
-	http.onreadystatechange = function() {};
-    }
-
-    JSONRpcClient.async_inflight[req.requestId] = req;
-	
-    try {
-	http.send(req.data);
-    } catch(e) {
-	JSONRpcClient.poolReturnHTTPRequest(http);
-	JSONRpcClient.num_req_active--;
-	throw new JSONRpcClient.Exception
-	    (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
-    }
-
-    if(!req.cb) return this._handleResponse(http);
-};
-
-JSONRpcClient.prototype._handleResponse =
-function JSONRpcClient_handleResponse(http)
-{
-    /* Get the charset */
-    if(!this.charset) {
-	this.charset = JSONRpcClient._getCharsetFromHeaders(http);
-    }
-
-    /* Get request results */
-    var status, statusText, data;
-    try {
-	status = http.status;
-	statusText = http.statusText;
-	data = http.responseText;
-    } catch(e) {
-	JSONRpcClient.poolReturnHTTPRequest(http);
-	JSONRpcClient.num_req_active--;
-	JSONRpcClient.kick_async();
-	throw new JSONRpcClient.Exception
-	    (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
-    }
-
-    /* Return http object to the pool; */
-    JSONRpcClient.poolReturnHTTPRequest(http);
-    JSONRpcClient.num_req_active--;
-
-    /* Unmarshall the response */
-    if(status != 200) {
-	throw new JSONRpcClient.Exception(status, statusText);
-    }
-    var obj;
-    try {
-	eval("obj = " + data);
-    } catch(e) {
-	throw new JSONRpcClient.Exception(550, "error parsing result");
-    }
-    if(obj.error)
-	throw new JSONRpcClient.Exception(obj.error.code, obj.error.msg,
-					  obj.error.trace);
-    var res = obj.result;
-
-    /* Handle CallableProxy */
-    if(res && res.objectID && res.JSONRPCType == "CallableReference")
-	return new JSONRpcClient(this.serverURL, this.user,
-				 this.pass, res.objectID);
-
-    return res;
-};
-
-
-/* XMLHttpRequest wrapper code */
-
-/* XMLHttpRequest pool globals */
-JSONRpcClient.http_spare = [];
-JSONRpcClient.http_max_spare = 8;
-
-JSONRpcClient.poolGetHTTPRequest =
-function JSONRpcClient_pool_getHTTPRequest()
-{
-    if(JSONRpcClient.http_spare.length > 0) {
-	return JSONRpcClient.http_spare.pop();
-    }
-    return JSONRpcClient.getHTTPRequest();
-};
-
-JSONRpcClient.poolReturnHTTPRequest =
-function JSONRpcClient_poolReturnHTTPRequest(http)
-{
-    if(JSONRpcClient.http_spare.length >= JSONRpcClient.http_max_spare)
-	delete http;
-    else
-	JSONRpcClient.http_spare.push(http);
-};
-
-JSONRpcClient.msxmlNames = [ "MSXML2.XMLHTTP.5.0",
-			     "MSXML2.XMLHTTP.4.0",
-			     "MSXML2.XMLHTTP.3.0",
-			     "MSXML2.XMLHTTP",
-			     "Microsoft.XMLHTTP" ];
-
-JSONRpcClient.getHTTPRequest =
-function JSONRpcClient_getHTTPRequest()
-{
-    /* Mozilla XMLHttpRequest */
-    try {
-	JSONRpcClient.httpObjectName = "XMLHttpRequest";
-	return new XMLHttpRequest();
-    } catch(e) {}
-
-    /* Microsoft MSXML ActiveX */
-    for (var i=0;i < JSONRpcClient.msxmlNames.length; i++) {
-	try {
-	    JSONRpcClient.httpObjectName = JSONRpcClient.msxmlNames[i];
-	    return new ActiveXObject(JSONRpcClient.msxmlNames[i]);
-	} catch (e) {}
-    }
-
-    /* None found */
-    JSONRpcClient.httpObjectName = null;
-    throw new JSONRpcClient.Exception(0, "Can't create XMLHttpRequest object");
-};
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java b/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
deleted file mode 100644
index 3d559c20d5..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
+++ /dev/null
@@ -1,54 +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.implementation.widget;
-
-import java.net.Socket;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WidgetImplementationTestCase extends TestCase {
-
-    private Node node;
-    
-    @Override
-    protected void setUp() throws Exception {
-        String contribution = ContributionLocationHelper.getContributionLocation(getClass());
-        node = NodeFactory.newInstance().createNode("widget.composite", new Contribution("test", contribution));
-        node.start();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-        node.destroy();
-    }
-    
-    public void testPing() throws Exception {
-        new Socket("127.0.0.1", 8085);
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/Catalog.java b/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
deleted file mode 100644
index 5dd7d70e6c..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/Catalog.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 store;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Interface for the Catalog Service.
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface Catalog {
-    String[] get();
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java b/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
deleted file mode 100644
index 1a34094cc5..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
+++ /dev/null
@@ -1,47 +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 store;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Init;
-
-/**
- * Implementation of the Catalog Service.
- *
- * @version $Rev$ $Date$
- */
-public class CatalogImpl implements Catalog {
-    private List<String> catalog = new ArrayList<String>();
-
-    @Init
-    public void init() {
-        catalog.add("Apple - $ 2.99");
-        catalog.add("Orange - $ 3.55");
-        catalog.add("Pear - $ 1.55");
-    }
-
-    public String[] get() {
-        String[] catalogArray = new String[catalog.size()];
-        catalog.toArray(catalogArray);
-        return catalogArray;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java b/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
deleted file mode 100644
index 37e8d0161a..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
+++ /dev/null
@@ -1,124 +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 store;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.binding.atom.collection.NotFoundException;
-
-/**
- * Implementation of a Shopping Cart.
- *
- * @version $Rev$ $Date$
- */
-public class ShoppingCartImpl implements Collection {
-
-    private static Map<String, Entry> cart = new HashMap<String, Entry>();
-
-    public Feed getFeed() {
-        Feed feed = Abdera.getNewFactory().newFeed();
-        feed.setTitle("shopping cart");
-        feed.setSubtitle("Total : " + getTotal());
-        
-        for (Entry entry : cart.values()) {
-            feed.addEntry(entry);
-        }
-        return feed;
-    }
-    
-    public Feed query(String queryString) {
-        if (queryString.startsWith("name=")) {
-            String name = queryString.substring(5);
-
-            Feed feed = Abdera.getNewFactory().newFeed();
-            feed.setTitle("shopping cart");
-            feed.setSubtitle("Total : " + getTotal());
-            
-            for (Entry entry : cart.values()) {
-                if (entry.getTitle().contains(name)) {
-                    feed.addEntry(entry);
-                }
-            }
-            return feed;
-            
-        } else {
-            return getFeed();
-        }
-    }
-
-    public Entry get(String id) throws NotFoundException {
-        return cart.get(id);
-    }
-
-    public Entry post(Entry entry) {
-        System.out.println("post" + entry);
-        String id = "cart-" + UUID.randomUUID().toString();
-        entry.setId(id);
-
-        entry.addLink(id, "edit");
-        entry.addLink(id, "alternate");
-        
-        entry.setUpdated(new Date());
-
-        cart.put(id, entry);
-        return entry;
-    }
-
-    public void put(String id, Entry entry) throws NotFoundException {
-        entry.setUpdated(new Date());
-        cart.put(id, entry);
-    }
-
-    public void delete(String id) throws NotFoundException {
-        if (id.equals(""))
-            cart.clear();
-        else
-            cart.remove(id);
-    }
-
-    private String getTotal() {
-        float total = 0;
-        String currencySymbol = "";
-        if (!cart.isEmpty()) {
-            String item = ((Entry)cart.values().iterator().next()).getContent();
-            // Select first symbol after dash.
-            currencySymbol = item.substring(item.indexOf("-") + 2, item.indexOf("-") + 3);
-        }
-        for (Entry entry : cart.values()) {
-            String item = entry.getContent();
-            
-            int index = item.length()-1;
-            char digit;
-            while ((digit = item.charAt(index)) == '.' || Character.isDigit(digit)) {
-                index--;
-            }
-            
-            total += Float.valueOf(item.substring(index));
-        }
-        return currencySymbol + String.valueOf(total);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js b/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
deleted file mode 100644
index c64c3fc97c..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
+++ /dev/null
@@ -1,1590 +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.    
- */
- 
-/**
- * Class that defines a URI represented as a string,
- */
-function Uri( value ) {
-   this.value = value;
-   this.getValue = function() {
-      return this.value;
-   };
-
-   this.setValue = function(value) {
-      this.value = value;
-   };
-
-   this.toString = function() {
-       return "Uri value=" + this.value;
-   };
-
-   /**
-    * Serialize this element to XML.
-    * atomUri = text
-    */
-   this.toXML = function() {
-      xml = "<uri>";
-      xml += this.value;
-      xml += "</uri>\n";      
-      return xml;
-   };
-}
-
-/* Updated is Date */
-/* Published is Date */
-
-/**
- * Class that defines an Email represented as a string,
- */
-function Email( value ) {
-   this.value = value;
-   this.getValue = function() {
-      return this.value;
-   };
-
-   this.setValue = function(value) {
-      this.value = value;
-   };
-
-   this.toString = function() {
-       return "Email value=" + this.value;
-   };
-
-   /**
-    * Serialize this element to XML.
-    * atomEmailAddress = xsd:string { pattern = ".+@.+" }
-    */
-   this.toXML = function() {
-      xml = "<email>";
-      xml += this.value;
-      xml += "</email>\n";      
-      return xml;
-   };
-}
-
-/**
- * Class that defines an Id represented as a string,
- */
-function Id( value ) {
-   this.value = value;
-   this.getValue = function() {
-      return this.value;
-   };
-
-   this.setValue = function(value) {
-      this.value = value;
-   };
-
-   this.toString = function() {
-       return "Id value=" + this.value;
-   };
-
-   /**
-    * Serialize this element to XML.  
-    * atomId = element atom:id {
-    *    atomCommonAttributes,
-    *    (atomUri)
-    * }
-    */
-   this.toXML = function() {
-      xml = "<id";
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null ) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      xml += ">";
-      xml += this.value;
-      xml += "</id>\n";      
-      return xml;
-   };
-}
-
-
-/**
- * Class that defines an Id represented as a string,
- */
-function Logo( value ) {
-   this.value = value;
-   this.getValue = function() {
-      return this.value;
-   };
-
-   this.setValue = function(value) {
-      this.value = value;
-   };
-
-
-   this.toString = function() {
-       return "Logo value=" + this.value;
-   };
-
-   /**
-    * Serialize this element to XML.  
-    * atomLogo = element atom:logo {
-    *    atomCommonAttributes,
-    *    (atomUri)
-    * }
-    */
-   this.toXML = function() {
-      xml = "<logo";
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null ) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      xml += ">";
-      xml += this.value;
-      xml += "</logo>\n";      
-      return xml;
-   };
-}
-
-/**
- * Class that defines a Text object.
- */
-function Text( content, /* optional */ type ) {
-   this.content = content;
-   this.type = type;
-   if (type == null) this.type = "text"; // If undefined or null, use text
-   
-   this.setText = function(content) {
-      this.content = content;
-   };
-
-   this.getText = function() {
-      return this.content;
-   };
-
-   this.getValue = function() {
-      return this.content;
-   };
-
-   this.setType = function(type) {
-      if ((type != "text") && (type != "html") && (type != "xhtml")) {
-         error( "Text type must be one of text, html, or xhtml" );
-      }
-      this.type = type;
-   };
-
-   this.getType = function() {
-      return this.type;
-   };
-
-   this.setLang = function(lang) {
-      this.lang = lang;
-   };
-
-   this.getLang = function() {
-      return this.lang;
-   };
-
-   this.setUri = function(uri) {
-      this.uri = new Uri( uri );
-   };
-
-   this.getUri = function() {
-      return this.uri;
-   };
-
-   this.toString = function() {
-       return "Text type=" + this.type + ", content=" + this.content;
-   };
-   
-   /** Serialize this text element to XML. 
-    *  atomPlainTextConstruct =
-    *     atomCommonAttributes,
-    *     attribute type { "text" | "html" }?,
-    *     text
-    *
-    *  atomXHTMLTextConstruct =
-    *     atomCommonAttributes,
-    *     attribute type { "xhtml" },
-    *     xhtmlDiv
-    * 
-    *  atomTextConstruct = atomPlainTextConstruct | atomXHTMLTextConstruct
-    */
-   this.toXML = function( elementName ) {
-      if ( elementName == null ) {
-         elementName = "text";
-      }
-      xml = "<" + elementName;
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null ) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      xml += " type=\"" + this.type + "\"";
-      xml += ">";
-      if ( this.type === "xhtml" ) {
-         xml += "<div xmlns=\"http://www.w3.org/1999/xhtml\">";      
-      }
-      xml += this.content;
-      if ( this.type === "xhtml" ) {
-         xml += "</div>";      
-      }
-      xml += "</" + elementName + ">";      
-      return xml;
-   }
-}
-
-/**
- * Class that defines a Person object.
- */
-function Person( name, email ) {
-   this.name = name;
-   if ( email != null ) {
-      this.email = new Email( email );
-   }
-   
-   this.setName = function( name ) {
-      this.name = name;
-   };
-
-   this.getName = function() {
-      return this.name;
-   };
-
-   this.setLang = function(lang) {
-      this.lang = lang;
-   };
-
-   this.getLang = function() {
-      return this.lang;
-   };
-
-   this.setEmail = function( email ) {
-      this.email = new Email( email );
-   };
-
-   this.getEmail = function() {
-      return this.email;
-   };
-
-   this.setUri = function( uri ) {
-      this.uri = new Uri( uri );
-   };
-
-   this.getUri = function() {
-      return this.uri;
-   };
-
-   this.toString = function() {
-       return "Person name=" + this.name + ", email=" + this.email;
-   };
-
-  /** Serialize this text element to XML. 
-    * atomPersonConstruct =
-    *     atomCommonAttributes,
-    *     (element atom:name { text }
-    *      & element atom:uri { atomUri }?
-    *      & element atom:email { atomEmailAddress }?
-    *      & extensionElement*) 
-    */
-   this.toXML = function( elementName ) {
-      if ( elementName == null ) {
-         elementName = "person";
-      }
-      xml = "<" + elementName;
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null ) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      xml += ">\n";
-      if ( this.name != null ) {
-         xml += "<name>" + this.name + "</name>\n";
-      }
-      if ( this.uri != null ) {
-         xml += "<uri>" + this.uri + "</uri>\n";
-      }
-      if ( this.email != null) {
-         xml += this.email.toXML();
-      }      
-      xml += "</" + elementName + ">\n";      
-      return xml;
-   }
- }
-
-/**
- * Class that defines a Generator object.
- */
-function Generator( name, uri ) {
-   this.name = name;
-   this.uri = new Uri( uri );
-   
-   this.setName = function( name ) {
-      this.name = name;
-   };
-
-   this.getName = function() {
-      return this.name;
-   };
-
-   this.setVersion = function(version) {
-      this.version = version;
-   };
-
-   this.getVersion = function() {
-      return this.version;
-   };
-
-   this.setUri = function( uri ) {
-      this.uri = new Email( uri );
-   };
-
-   this.getUri = function() {
-      return this.uri;
-   };
-
-   this.toString = function() {
-       return "Generator name=" + this.name + ", email=" + this.email;
-   };
-
-  /** Serialize this text element to XML. 
-    * atomGenerator = element atom:generator {
-    *    atomCommonAttributes,
-    *    attribute uri { atomUri }?,
-    *    attribute version { text }?,
-    *    text
-    * }
-    */
-   this.toXML = function() {
-      xml = "<generator";
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri.getValue() + "\"";
-      }
-      if ( this.lang != null) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      if ( this.version != null ) {
-         xml += " version=\"" + this.version + "\"";
-      }
-      xml += ">";
-      if ( this.name != null ) {
-         xml += this.name;
-      }
-      xml += "</generator>\n";      
-      return xml;
-   }
-}
-
-/**
- * Class that defines a Category object.
- *atomCategory =
- *     element atom:category {
- *        atomCommonAttributes,
- *        attribute term { text },
- *        attribute scheme { atomUri }?,
- *        attribute label { text }?,
- *        undefinedContent
- *     }
- */
-function Category( label, content ) {
-   this.label = label;
-   this.content = content;
-   
-   this.setLabel = function( label ) {
-      this.label = label;
-   };
-
-   this.getLabel = function() {
-      return this.label;
-   };
-
-   this.setLang = function(lang) {
-      this.lang = lang;
-   };
-
-   this.getLang = function() {
-      return this.lang;
-   };
-
-   this.setTerm = function(term) {
-      this.term = term;
-   };
-
-   this.getTerm = function() {
-      return this.term;
-   };
-
-   this.setScheme = function( scheme ) {
-      this.scheme = scheme;
-   };
-
-   this.getScheme = function() {
-      return this.scheme;
-   };
-
-   this.setContent = function( content ) {
-      this.content = content;
-   };
-
-   this.getContent = function() {
-      return this.content;
-   };
-
-   this.toString = function() {
-       return "Category label=" + this.label;
-   };
-
-   /** Serialize this text element to XML. 
-    *  atomCategory =
-    *     element atom:category {
-    *        atomCommonAttributes,
-    *        attribute term { text },
-    *        attribute scheme { atomUri }?,
-    *        attribute label { text }?,
-    *        undefinedContent
-    *     }
-    */
-   this.toXML = function() {
-      xml = "<category>\n";
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      if ( this.term != null) {
-         xml += " term=\"" + this.term + "\"";
-      }
-      if ( this.scheme != null) {
-         xml += " scheme=\"" + this.scheme + "\"";
-      }
-      if ( this.label != null) {
-         xml += " label=\"" + this.label + "\"";
-      }
-      xml += ">\n";
-      if ( this.content != null ) {
-         xml += this.content + "\n";
-      }
-      xml += "</category>\n";      
-      return xml;
-   }
-}
-
-/**
- * Class that defines a Link object.
- */
-function Link( href, relation ) {
-   this.href = new Uri( href );
-   this.relation = relation;
-   
-   this.setHRef = function( uri ) {
-      this.href = new Uri( uri );
-   };
-
-   this.getHRef = function() {
-      return this.href;
-   };
-
-   this.setTitle = function( title ) {
-      this.title = title;
-   };
-
-   this.getTitle = function() {
-      return this.title;
-   };
-
-   this.setHRefLang = function(lang) {
-      this.hrefLang = lang;
-   };
-
-   this.getHRefLang = function() {
-      return this.hreflang;
-   };
-
-   this.setTitleLang = function(lang) {
-      this.titleLang = lang;
-   };
-
-   this.getTitleLang = function() {
-      return this.titleLang;
-   };
-   
-   this.setLength= function( length ) {
-      this.length= length;
-   };
-
-   this.getLength = function() {
-      return this.length;
-   };
-
-/*
-<static>  <final> String 	TYPE_ATOM
-          Link type used for Atom content.
-<static>  <final> String 	TYPE_HTML
-          Link type used for HTML content.
-*/          
-   this.setMimeType = function(mimeType) {
-      this.mimeType = mimeType;
-   };
-
-   this.getMimeType = function() {
-      return this.mimeType;
-   };
-
-   this.setContent= function( content ) {
-      this.content = content;
-   };
-
-   this.getContent = function() {
-      return this.content;
-   };
-
-/*
-<static>  <final> String 	REL_ALTERNATE
-          Link that provides the URI of an alternate format of the entry's or feed's contents.
-<static>  <final> String 	REL_ENTRY_EDIT
-          Link that provides the URI that can be used to edit the entry.
-<static>  <final> String 	REL_MEDIA_EDIT
-          Link that provides the URI that can be used to edit the media associated with an entry.
-<static>  <final> String 	REL_NEXT
-          Link that provides the URI of next page in a paged feed.
-<static>  <final> String 	REL_PREVIOUS
-          Link that provides the URI of previous page in a paged feed.
-<static>  <final> String 	REL_RELATED
-          Link that provides the URI of a related link to the entry.
-<static>  <final> String 	REL_SELF
-          Link that provides the URI of the feed or entry.
-<static>  <final> String 	REL_VIA
-          Link that provides the URI that of link that provides the data for the content in the feed.
-*/          
-   this.setRelation = function( relation ) {
-      this.relation = relation;
-   };
-
-   this.getRelation = function() {
-      return this.relation;
-   };
-
-   this.toString = function() {
-       return "Link href=" + this.href + ", title=" + this.title;
-   };
-   
-   /** Serialize this text element to XML. 
-     * atomLink =
-     *     element atom:link {
-     *     atomCommonAttributes,
-     *     attribute href { atomUri },
-     *     attribute rel { atomNCName | atomUri }?,
-     *     attribute type { atomMediaType }?,
-     *     attribute hreflang { atomLanguageTag }?,
-     *     attribute title { text }?,
-     *     attribute length { text }?,
-     *     undefinedContent
-     *  }
-     */
-   this.toXML = function() {
-      xml = "<link";
-      if ( this.relation != null ) {
-         xml += " rel=\"" + this.relation + "\"";
-      }
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri.getValue() + "\"";
-      }
-      if ( this.lang != null) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      if ( this.href != null ) {
-         xml += " href=\"" + this.href.getValue() + "\"";
-      }
-      if ( this.hreflang != null ) {
-         xml += " hreflang=\"" + this.hreflang + "\"";
-      }
-      if ( this.title != null ) {
-         xml += " title=\"" + this.title + "\"";
-      }
-      if ( this.length != null ) {
-         xml += " length=\"" + this.length + "\"";
-      }
-      if ( this.content != null ) {
-         xml += this.content + "\n";
-         xml += "</link>\n";
-      } else {
-         xml += "/>\n";
-      }      
-      return xml;
-   }
-   
-}          
-
-/**
- * Class that defines an Entry object.
- * atomEntry =
- *     element atom:entry {
- *        atomCommonAttributes,
- *        (atomAuthor*
- *         & atomCategory*
- *         & atomContent?
- *         & atomContributor*
- *         & atomId
- *         & atomLink*
- *         & atomPublished?
- *         & atomRights?
- *         & atomSource?
- *         & atomSummary?
- *         & atomTitle
- *         & atomUpdated
- *         & extensionElement*)
- *     } 
- */
-function Entry( init ) {
-   // Constructor code at bottom after function definition
-   
-   this.authors = new Array();
-   this.contributors = new Array();
-   this.categories = new Array();
-   this.links = new Array();
-
-   this.setNamespace = function( namespace ) {
-      this.namespace = namespace;
-   };
-
-   this.getNamespace = function() {
-      return this.namespace;
-   };
-
-   this.setId = function( id ) {
-      if (!((typeof id == "object") && (id instanceof Id)))
-         this.id = new Id( id );
-      else 
-         this.id = id;
-   }
-
-   this.getId = function() {
-      return this.id;
-   };
-
-   this.setPublished = function( published ) {
-      this.published = published;
-   };
-
-   this.getPublished = function() {
-      return this.published;
-   };
-
-   this.setUpdated = function( updated ) {
-      this.updated = updated;
-   };
-
-   this.getUpdated = function() {
-      return this.updated;
-   };
-
-   this.setRights = function( rights ) {
-      this.rights = rights;
-   }
-
-   this.getRights = function() {
-      return this.rights;
-   };
-
-   this.setSource = function( source ) {
-      this.source = source;
-   }
-
-   this.getSource = function() {
-      return this.source;
-   };
-
-   /* Type Text */
-   this.setTitle = function( title ) {
-      if (!((typeof title == "object") && (title instanceof Text)))
-         this.title = new Text( title, "text" );
-      else 
-         this.title = title;
-   }
-
-   this.getTitle = function() {
-      return this.title;
-   };
-
-   /* Type Text */
-   this.setSummary = function( summary ) {
-      if (!((typeof summary == "object") && (summary instanceof Text)))
-         this.summary = new Text( summary, "text" );
-      else
-         this.summary = summary;
-   }
-
-   this.getSummary = function() {
-      return this.summary;
-   };
-
-   /* Type Text */
-   this.setContent = function( content ) {
-      if (!((typeof content == "object") && (content instanceof Text)))
-         this.content = new Text( content, "text" );
-      else
-         this.content = content;
-   }
-
-   this.getContent = function() {
-      return this.content;
-   };
-
-   /**
-    * Add an author.
-    * @param name Author
-    */
-   this.addAuthor = function(person) {
-      if (!((typeof person == "object") && (person instanceof Person)))
-         error( "Entry author must be of type Person" );
-      var i = this.authors.length;
-      this.authors[ i ] = person; 
-   }
-   
-   /**
-    * Get an author.
-    * @param name Author
-    */
-   this.getAuthor = function(name) {
-      return this.authors[ name ];
-   }
-   
-   /**
-    * Set list of authors.
-    * @param name Author
-    */
-   this.setAuthors = function( authors ) {
-      return this.authors = authors;
-   }
-   
-   /**
-    * Get an author"pom.xml".
-    * @param name Author
-    */
-   this.getAuthors = function() {
-      return this.authors;
-   }
-   
-   /**
-    * Add an contributor.
-    * @param name Contributor
-    */
-   this.addContributor = function(person) {
-      if (!((typeof person == "object") && (person instanceof Person)))
-         error( "Entry contributor must be of type Person" );
-      var i = this.contributors.length;
-      this.contributors[ i ] = person;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Contributor
-    */
-   this.getContributor = function(name) {
-      return this.contributors[ name ];
-   }
-   
-   /**
-    * Set list of contributors
-    * @param name Author
-    */
-   this.setContributors = function( contributors ) {
-      return this.contributors = contributors;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Contributor
-    */
-   this.getContributors = function() {
-      return this.contributors;
-   }
-   
-   /**
-    * Add a category.
-    * @param name Category
-    */
-   this.addCategory = function(category) {
-      if (!((typeof category == "object") && (category instanceof Category)))
-         error( "Entry category must be of type Category" );
-      var i = this.categories.length
-      this.categories[ i ] = category;
-   }
-   
-   /**
-    * Get a names category.
-    * @param name Category
-    */
-   this.getCategory = function(name) {
-      return this.categories[ name ];
-   }
-   
-   /**
-    * Set list of categories
-    * @param name Author
-    */
-   this.setCategories = function( categories ) {
-      return this.categories = categories;
-   }
-   
-   /**
-    * Get all categories.
-    * @param name Category
-    */
-   this.getCategories = function() {
-      return this.categories;
-   }
-   
-   /**
-    * Add an link.
-    * @param name Link
-    */
-   this.addLink = function(link) {
-      if (!((typeof link == "object") && (link instanceof Link)))
-         error( "Entry link must be of type Link" );
-      var i = this.links.length;
-      this.links[ i ] = link;
-   }
-   
-   /**
-    * Get an link.
-    * @param name Link
-    */
-   this.getLink = function(name) {
-      return links[ name ];
-   }
-   
-   /**
-    * Set list of links.
-    * @param name Link
-    */
-   this.setLinks = function( links ) {
-      return this.links = links;
-   }
-   
-   /**
-    * Get an link.
-    * @param name Link
-    */
-   this.getLinks = function() {
-      return links;
-   }
-   
-   this.readFromXML = function( xml ) {
-      if (!((typeof xml == "object") && (xml instanceof string)))
-         error( "Entry xml must be of type string" );
-      // To Do - Read from arbutrary XML such as 
-      // <entry>
-      //   <title type="text">cart-item</title>
-      //   <content type="text">Apple - $ 2.99</content>
-      //   <id>cart-bd5323d6-1f59-4fae-a8f5-01f7654f1e77</id>
-      //   <link href="cart-bd5323d6-1f59-4fae-a8f5-01f7654f1e77" rel="edit"/>
-      //   <link href="cart-bd5323d6-1f59-4fae-a8f5-01f7654f1e77" rel="alternate"/>
-      //   <updated>2008-09-21T23:06:43.921Z</updated>
-      // </entry>
-      
-   }
-  this.readFromDoc = function( htmlDoc ) {
-      // Expect HTML collection.
-      var entryDoc = htmlDoc.getElementsByTagName("entry");
-      for (var i = 0; i < entryDoc.length; i++) {
-         this.readFromNode( entryDoc[ i ] );
-      }
-   }
-
-   this.readFromNode = function( entryNode ) {
-      // Expect entry node
-      var childNodes = entryNode.childNodes;
-      for ( var i = 0; i < childNodes.length; i++ ) {
-         var node = childNodes[ i ];
-         if (node.nodeType == 1 /*Node.ELEMENT_NODE*/) {
-            var tagName = node.tagName;
-            if (tagName == "title" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if ( type == undefined )
-                  type = "text";
-               var title = new Text( text, type );
-               this.setTitle( title );
-            } else if ( tagName == "subtitle" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if ( type == undefined )
-                  type = "text";
-               var title = new Text( text, type );
-               this.setSubtitle( title );
-            } else if ( tagName == "id" ) {
-               var id = new Id( getTextContent( node ) );
-               this.setId( id );
-            } else if ( tagName == "updated" ) {
-               var dateText = getTextContent( node );
-               var date = new Date( dateText ); // 2008-09-21T23:06:43.921Z
-               this.setUpdated( date );
-            } else if ( tagName == "link" ) {
-               // var href = node.attributes[ "href" ]; // Works on modern browsers.
-               var attrVal = node.getAttribute( "href" );
-               var link = new Link( attrVal );
-               attrVal = node.getAttribute( "rel" );
-               if ( attrVal )
-                  link.setRelation( attrVal );
-               this.addLink( link );
-            } else if ( tagName == "content" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if (type == undefined)
-                  type = "text";
-               var content = new Text( text, type );
-               this.setContent( content );
-            } else {
-               // To Do - implement rest of nodes
-			   error( "undefined element node" );
-            } 
-         } else if (node.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
-            var attrName = node.tagName;
-         } else if (node.nodeType == 3 /*Node.TEXT_NODE*/) {
-         }
-      }      
-   }
-
-   this.toString = function() {
-       return "Entry title=" + this.title + ", updated=" + this.updated;
-   };
-
-   /** Serialize this text element to XML. 
-	 * atomEntry =
-	 *     element atom:entry {
-	 *        atomCommonAttributes,
-	 *        (atomAuthor*
-	 *         & atomContributor*
-	 *         & atomCategory*
-	 *         & atomLink*
-	 *         & atomTitle
-	 *         & atomId
-	 *         & atomPublished?
-	 *         & atomUpdated
-	 *         & atomContent?
-	 *         & atomRights?
-	 *         & atomSource?
-	 *         & atomSummary?
-	 *         & extensionElement*)
-	 *     }    
-     */
-   this.toXML = function() {
-      xml = "<entry";
-      if ( this.namespace != null ) {
-         xml += " namespace=\"" + this.namespace + "\"";
-      }
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null ) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      xml += ">";
-      if ( this.title != null ) {
-         xml += this.title.toXML( "title" );
-      }
-      if ( this.id != null ) {
-         xml += this.id.toXML();
-      }
-      if ( this.published != null ) {
-         xml += "<published>" + this.published + "</published>\n";
-      }
-      if ( this.updated != null ) {
-         xml += "<updated>" + this.updated + "</updated>\n";
-      }
-      if ( this.authors != null ) {
-      for ( var i = 0; i < this.authors.length; i++ ) {
-         var author = this.authors[ i ];
-         xml += author.toXML( "author" );
-      }
-      }
-      if ( this.contributors != null ) {
-      for ( var i = 0; i < this.contributors.length; i++ ) {
-         var contributor = this.contributors[ i ];
-         xml += contributor.toXML( "contributor" );
-      }
-      }
-      if ( this.categories != null ) {
-      for ( var i = 0; i < this.categories.length; i++ ) {
-         var category = this.categories[ i ];
-         xml += category.toXML();
-      }
-      }
-      if ( this.links != null ) {
-      for ( var i = 0; i < this.links.length; i++ ) {
-         var link = this.links[ i ];
-         xml += link.toXML();
-      }
-      }
-      if ( this.rights != null ) {
-         xml += "<rights>" + this.rights + "</rights>\n";
-      }
-      if ( this.source != null ) {
-         xml += "<source>" + this.source + "</source>\n";
-      }
-      if ( this.summary != null ) {
-         xml += this.summary.toXML( "summary" );
-      }
-      if ( this.content != null ) {
-         xml += this.content.toXML( "content" );
-      }
-      xml += "</entry>";      
-      return xml;
-   }
-  
-   // Initialize from constructor   
-   if (typeof init == 'object') {
-      if ( init.nodeType == 1 ) { /* Document Node.ELEMENT_NODE 1 */
-         this.readFromDoc( init );
-      } else {      
-         error( "Feed init unknown type" );
-      }
-   }  else if ( typeof init === 'string' ) {
-      this.setTitle( init );
-   }
-   this.namespace = "http://www.w3.org/2005/Atom";
-}
-
-/**
- * Class that defines an Feed object.
- *  atomFeed =
- *     element atom:feed {
- *        atomCommonAttributes,
- *        (atomAuthor*
- *         & atomCategory*
- *         & atomContributor*
- *         & atomGenerator?
- *         & atomIcon?
- *         & atomId
- *         & atomLink*
- *         & atomLogo?
- *         & atomRights?
- *         & atomSubtitle?
- *         & atomTitle
- *         & atomUpdated
- *         & extensionElement*),
- *        atomEntry* 
- */
-function Feed( init ) {
-   // See init after functions have been defined.
-
-   this.authors = new Array();
-   this.contributors = new Array();
-   this.categories = new Array();
-   this.links = new Array();
-   this.entries = new Array();
-
-   this.setNamespace = function( namespace ) {
-      this.namespace = namespace;
-   };
-
-   this.getNamespace = function() {
-      return this.namespace;
-   };
-
-   this.setPublished = function( published ) {
-      this.published = published;
-   };
-
-   this.getPublished = function() {
-      return this.published;
-   };
-
-   this.setUpdated = function( updated ) {
-      this.updated = updated;
-   };
-
-   this.getUpdated = function() {
-      return this.updated;
-   };
-
-   this.setContent = function( content ) {
-      if (!((typeof content == "object") && (content instanceof Text)))
-         error( "Entry content must be of type Text" );
-
-      this.content = content;
-   }
-
-   this.getContent = function() {
-      return this.content;
-   };
-
-   this.setRights = function( rights ) {
-      if (!((typeof rights == "object") && (rights instanceof Text)))
-         this.rights = new Text( rights, "text" );
-      else 
-         this.rights = rights;
-   }
-
-   this.getRights = function() {
-      return this.rights;
-   };
-
-   this.setSummary = function( summary ) {
-      if (!((typeof summary == "object") && (summary instanceof Text)))
-         error( "Feed summary must be of type Text" );
-      this.summary = summary;
-   }
-
-   this.getSummary = function() {
-      return this.summary;
-   };
-
-   this.setTitle = function( title ) {
-      if (!((typeof title == "object") && (title instanceof Text)))
-         this.title = new Text( title, "text" );
-      else 
-         this.title = title;
-   }
-
-   this.getTitle = function() {
-      return this.title;
-   };
-
-   this.setSubtitle = function( subtitle ) {
-      if (!((typeof subtitle == "object") && (subtitle instanceof Text)))
-         this.subtitle = new Text( subtitle, "text" );
-      else 
-         this.subtitle = subtitle;
-   }
-
-   this.getSubtitle = function() {
-      return this.subtitle;
-   };
-
-   /* Type Id */
-   this.setId = function( id ) {
-      if (!((typeof id == "object") && (id instanceof Id)))
-         this.id = new Id( id );
-      else 
-         this.id = id;
-   }
-
-   this.getId = function() {
-      return this.id;
-   };
-
-   this.setGenerator = function( generator ) {
-      if (!((typeof generator == "object") && (generator instanceof Generator)))
-         error( "Feed generator must be of type Generator" );
-      this.generator = generator;
-   }
-
-   this.getGenerator = function() {
-      return this.generator;
-   };
-
-   this.setBase = function( base ) {
-      this.base = base;
-   }
-
-   this.getBase = function() {
-      return this.base;
-   };
-
-   this.setLogo = function( logo ) {
-      this.logo = logo;
-   }
-
-   this.getLogo = function() {
-      return this.logo;
-   };
-
-   /**
-    * Add an author.
-    * @param name Author
-    */
-   this.addAuthor = function(person) {
-      if (!((typeof person == "object") && (person instanceof Person)))
-         error( "Entry author must be of type Person" );
-      var i = this.authors.length;
-      this.authors[ i ] = person;
-   }
-   
-   /**
-    * Get an author.
-    * @param name Author
-    */
-   this.getAuthor = function(name) {
-      return this.authors[ name ];
-   }
-   
-   /**
-    * Set list of authors.
-    * @param name Author
-    */
-   this.setAuthors = function( authors ) {
-      return this.authors = authors;
-   }
-   
-   /**
-    * Get an author.
-    * @param name Author
-    */
-   this.getAuthors = function() {
-      return this.authors;
-   }
-   
-   /**
-    * Add an contributor.
-    * @param name Contributor
-    */
-   this.addContributor = function(person) {
-      if (!((typeof person == "object") && (person instanceof Person)))
-         error( "Entry contributor must be of type Person" );
-      var i = this.contributors.length;
-      this.contributors[ i ] = person;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Contributor
-    */
-   this.getContributor = function(name) {
-      return this.contributors[ name ];
-   }
-   
-   /**
-    * Set list of contributors
-    * @param name Author
-    */
-   this.setContributors = function( contributors ) {
-      return this.contributors = contributors;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Contributor
-    */
-   this.getContributors = function() {
-      return this.contributors;
-   }
-   
-   /**
-    * Add a category.
-    * @param name Category
-    */
-   this.addCategory = function(category) {
-      if (!((typeof category == "object") && (category instanceof Category)))
-         error( "Feed category must be of type Category" );
-      var i = this.categories.length;
-      this.categories[ i ] = category;
-   }
-   
-   /**
-    * Get a named contributor.
-    * @param name Category
-    */
-   this.getCategory = function(name) {
-      return this.categories[ name ];
-   }
-   
-   /**
-    * Set list of categories
-    * @param category
-    */
-   this.setCategories = function( categories ) {
-      return this.categories = categories;
-   }
-   
-   /**
-    * Get all categories.
-    * @param name Category
-    */
-   this.getCategories = function() {
-      return this.categories;
-   }
-   
-   /**
-    * Add an link.
-    * @param name Link
-    */
-   this.addLink = function(link) {
-      if (!((typeof link == "object") && (link instanceof Link)))
-         error( "Entry link must be of type Link" );
-      var i = this.links.length;
-      this.links[ i ] = link;
-   }
-   
-   /**
-    * Get an link.
-    * @param name Link
-    */
-   this.getLink = function(name) {
-      return this.links[ name ];
-   }
-   
-   /**
-    * Set list of links.
-    * @param name Link
-    */
-   this.setLinks = function( links ) {
-      return this.links = links;
-   }
-   
-   /**
-    * Get an link.
-    * @param name Link
-    */
-   this.getLinks = function() {
-      return this.links;
-   }
-   
-   /**
-    * Add an entry.
-    * @param name Entry
-    */
-   this.addEntry = function(entry) {
-      if (!((typeof entry == "object") && (entry instanceof Entry)))
-         error( "Entry entry must be of type Entry" );
-      var i = this.entries.length;
-      this.entries[ i ] = entry;
-   }
-   
-   /**
-    * Get an entry by name.
-    * @param name Entry
-    */
-   this.getEntry = function(name) {
-      return this.entries[ name ];
-   }
-   
-   /**
-    * Set list of entries
-    * @param name Author
-    */
-   this.setEntries = function( entries ) {
-      return this.entries = entries;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Entry
-    */
-   this.getEntries = function() {
-      return this.entries;
-   }
-   
-   this.readFromXML = function( xml ) {
-      // To Do Read from arbitraty XML such as 
-      // <feed xmlns="http://www.w3.org/2005/Atom">
-      // <title type="text">shopping cart</title>
-      // <subtitle type="text">Total : $4.54</subtitle>
-      // <entry>
-      //    ...
-      // </entry>
-      // </feed>    
-   }
-
-   this.readFromDoc = function( htmlDoc ) {
-      // Expect HTML collection.
-      var feedDoc = htmlDoc.getElementsByTagName("feed");
-      for (var i = 0; i < feedDoc.length; i++) {
-         this.readFromNode( feedDoc[ i ] );
-      }
-   }
-   this.readFromNode = function( feedNode ) {
-      // Expect feed node
-      var childNodes = feedNode.childNodes;
-      for ( var i = 0; i < childNodes.length; i++ ) {
-         var node = childNodes[ i ];
-         if (node.nodeType == 1 /*Node.ELEMENT_NODE*/) {
-            var tagName = node.tagName;
-            if (tagName == "title" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if ( type == undefined )
-                  type = "text";
-               var title = new Text( text, type );
-               this.setTitle( title );
-            } else if ( tagName == "subtitle" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if ( type == undefined )
-                  type = "text";
-               var title = new Text( text, type );
-               this.setSubtitle( title );
-            } else if ( tagName == "entry" ) {
-               var entry = new Entry();
-               entry.readFromNode( node );
-               this.addEntry( entry ); 
-            } else if ( tagName == "id" ) {
-               var id = new Id( getTextContent( node ) );
-               this.setId( id );
-            } else if ( tagName == "updated" ) {
-               var dateText = getTextContent( node );
-               var date = new Date( dateText ); //2008-09-21T23:06:53.750Z
-               this.setUpdated( date );
-            } else if ( tagName == "link" ) {
-               // var href = node.attributes[ "href" ]; // Works on modern browsers.
-               var attrVal = node.getAttribute( "href" );
-               var link = new Link( attrVal );
-               attrVal = node.getAttribute( "rel" );
-               if ( attrVal )
-                  link.setRelation( attrVal );
-               this.addLink( link );
-            } else {
-               // To Do - implement rest of nodes
-			   error( "undefined element node" );
-            } 
-         } else if (node.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
-            var attrName = node.tagName;
-         } else if (node.nodeType == 3 /*Node.TEXT_NODE*/) {
-         }
-      }      
-   }
-
-   this.toString = function() {
-       return "Feed title=" + this.title + ", updated=" + this.updated;
-   };
-
-   /** Serialize this text element to XML. 
-	 *  atomFeed =
-	 *     element atom:feed {
-	 *        atomCommonAttributes,
-	 *        (atomAuthor*
-	 *         & atomContributor*
-	 *         & atomCategory*
-	 *         & atomLink*
-	 *         & atomTitle
-	 *         & atomSubtitle?
-	 *         & atomId
-	 *         & atomUpdated
-	 *         & atomRights?	 
-	 *         & atomGenerator?
-	 *         & atomIcon?
-	 *         & atomLogo?
-	 *         & extensionElement*),
-	 *        atomEntry* 
-     */
-   this.toXML = function() {
-      xml = "<feed";
-      if ( this.namespace != null ) {
-         xml += " namespace=\"" + this.namespace + "\"";
-      }
-      if ( this.uri != null ) {
-         xml += " uri=\"" + this.uri + "\"";
-      }
-      if ( this.lang != null ) {
-         xml += " lang=\"" + this.lang + "\"";
-      }
-      xml += ">\n";
-      if ( this.title != null ) {
-         xml += this.title.toXML( "title" );
-      }
-      if ( this.subtitle != null ) {
-         xml += this.subtitle.toXML( "subtitle" );
-      }
-      if ( this.id != null ) {
-         xml += this.id.toXML();
-      }
-      if ( this.published != null ) {
-         xml += "<published>" + this.published + "</published>\n";
-      }
-      if ( this.updated != null ) {
-         xml += "<updated>" + this.updated + "</updated>\n";
-      }
-      if ( this.authors != null ) {      
-      for ( var i = 0; i < this.authors.length; i++ ) {
-         var author = this.authors[ i ];
-         xml += author.toXML( "author" );
-      }
-      }
-      if ( this.contributors != null ) {      
-      for ( var i = 0; i < this.contributors.length; i++ ) {
-         var contributor = this.contributors[ i ];
-         xml += contributor.toXML( "contributor" );
-      }
-      }
-      if ( this.categories != null ) {      
-      for ( var i = 0; i < this.categories.length; i++ ) {
-         var category = this.categories[ i ];
-         xml += category.toXML();
-      }
-      }
-      if ( this.links != null ) {      
-      for ( var i = 0; i < this.links.length; i++ ) {
-         var link = this.links[ i ];
-         xml += link.toXML();
-      }
-      }
-      if ( this.rights != null ) {
-         xml += this.rights.toXML( "rights" );
-      }
-      if ( this.source != null ) {
-         xml += "<source>" + this.source + "</source>\n";
-      }
-      if ( this.logo != null ) {
-         xml += "<logo>" + this.logo + "</logo>\n";
-      }
-      if ( this.icon != null ) {
-         xml += "<icon>" + this.icon + "</icon>\n";
-      }
-      if ( this.generator != null ) {
-         xml += this.generator.toXML( "generator" );
-      }
-      if ( this.summary != null ) {
-         xml += this.summary.toXML( "summary" );
-      }
-      if ( this.entries != null ) {
-      for ( var i = 0; i < this.entries.length; i++ ) {
-         var entry = this.entries[ i ];
-         xml += entry.toXML();
-      }      
-      }      
-      xml += "</feed>\n";      
-      return xml;
-   }
-  
-   // Initialize from constructor   
-   if (typeof init == 'object') {
-      if ( init.nodeType == 9 ) { /* Document Node.DOCUMENT_NODE 9 */
-         this.readFromDoc( init );
-      } else {      
-         error( "Feed init unknown type" );
-      }
-   }  else if ( typeof init === 'string' ) {
-      this.setTitle( init );
-   }   
-   this.namespace = "http://www.w3.org/2005/Atom";
-}
-
-function error( message ) {
-   alert( message );
-}
-
-/* Returns inner text on both IE and modern browsers. */
-function getTextContent(node) {
-   // innerText for IE, textContent for others, child text node, "" for others.
-   if ( node.innerText )
-      return node.innerText;
-   if ( node.textContent )
-      return node.textContent;
-   if ( node.hasChildNodes() ) {
-      var childNodes = node.childNodes
-      for ( var j = 0; j < childNodes.length; j++ ) {
-         var childNode = childNodes[ j ];
-         var childType = childNode.nodeType;
-         if (childNode.nodeType == 3 /*Node.TEXT_NODE*/) {
-            return childNode.nodeValue;
-         }
-      } 
-   }
-   return undefined;
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/store.html b/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/store.html
deleted file mode 100644
index 58f9f560a7..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/store.html
+++ /dev/null
@@ -1,127 +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.    

--->

-<html>

-<head>

-<title>Store</TITLE>

-

-<!-- one js include per sca component -->

-<script type="text/javascript" src="store.js"></script>

-

-<script language="JavaScript">

-

-	//@Reference

-	var catalog = new Reference("Catalog");

-	

-	//@Reference

-	var shoppingCart = new Reference("ShoppingCart"); 
-	
-	//@Property
-	var locale = Property("locale");

-

-	function catalog_getResponse(items,exception) {

-		if(exception){

-			alert(exception.message);

-			return;

-		}

-		var catalog = "";

-		for (var i=0; i<items.length; i++)

-			catalog += '<input name="items" type="checkbox" value="' + 

-						items[i] + '">' + items[i]+ ' <br>';

-		document.getElementById('catalog').innerHTML=catalog;

-	}

-	

-	function shoppingCart_getResponse(feed) {

-		if (feed != null) {

-			var entries = feed.getElementsByTagName("entry");              

-			var list = "";

-			for (var i=0; i<entries.length; i++) {

-				var item = entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;

-				list += item + ' <br>';

-			}

-			document.getElementById("shoppingCart").innerHTML = list;

-			document.getElementById('total').innerHTML = feed.getElementsByTagName("subtitle")[0].firstChild.nodeValue;

-		}

-	}

-	function shoppingCart_postResponse(entry) {

-		shoppingCart.get("", shoppingCart_getResponse);

-	}				

-

-

-	function addToCart() {

-		var items  = document.catalogForm.items;

-		var j = 0;

-		for (var i=0; i<items.length; i++)

-			if (items[i].checked) {

-				var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>cart-item</title><content type="text">'+items[i].value+'</content></entry>'

-				shoppingCart.post(entry, shoppingCart_postResponse);

-				items[i].checked = false;

-			}

-	}

-	function checkoutCart() {

-		document.getElementById('store').innerHTML='<h2>' +

-				'Thanks for Shopping With Us!</h2>'+

-				'<h2>Your Order</h2>'+

-				'<form name="orderForm" action="/ufs/store.html">'+

-					document.getElementById('shoppingCart').innerHTML+

-					'<br>'+

-					document.getElementById('total').innerHTML+

-					'<br>'+

-					'<br>'+

-					'<input type="submit" value="Continue Shopping">'+ 

-				'</form>';

-		shoppingCart.del("", null);

-	}

-	function deleteCart() {

-		shoppingCart.del("", null);

-		document.getElementById('shoppingCart').innerHTML = "";

-		document.getElementById('total').innerHTML = "";	

-	}	

-
-    //alert(locale);

-	catalog.get(catalog_getResponse);

-	shoppingCart.get("", shoppingCart_getResponse);

-</script>

-

-</head>

-

-<body>

-<h1>Store</h1>

-  <div id="store">

-   	<h2>Catalog</h2>

-   	<form name="catalogForm">

-		<div id="catalog" ></div>

-		<br>

-		<input type="button" onClick="addToCart()"  value="Add to Cart">

-   	</form>

- 

- 	<br>

-  

-   	<h2>Your Shopping Cart</h2>

-   	<form name="shoppingCartForm">

-		<div id="shoppingCart"></div>

-		<br>

-		<div id="total"></div>

-		<br>		

-		<input type="button" onClick="checkoutCart()" value="Checkout"> 

-		<input type="button" onClick="deleteCart()" value="Empty">     

-	   	<a href="../ShoppingCart/">(feed)</a>

-	</form>    

-  </div>

-</body>

-</html>
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html b/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
deleted file mode 100644
index 6bbc285377..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
+++ /dev/null
@@ -1,152 +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.    

--->

-<html>

-<head>

-<title>Store</TITLE>

-

-<!-- one js include per sca component -->

-<!-- For Atom, the Tuscany JavaScript client includes the model for Atom.  

-	 Using this JavaScript model, users can use syntax such as:

-	 item += "name=" + entry.getName() + ", price=" + entry.getContent() 

-	 rather than

-     item += entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;

-	-->

-<script type="text/javascript" src="storeJS.js"></script>

-

-<script language="JavaScript">

-

-	//@Reference

-	var catalog = new Reference("Catalog");

-	

-	//@Reference

-	var shoppingCart = new Reference("ShoppingCart"); 
-	
-	//@Property
-	var locale = Property("locale");

-

-	function catalog_getResponse(items,exception) {

-		if(exception){

-			alert(exception.message);

-			return;

-		}

-		var catalog = "";

-		for (var i=0; i<items.length; i++)

-			catalog += '<input name="items" type="checkbox" value="' + 

-						items[i] + '">' + items[i]+ ' <br>';

-		document.getElementById('catalog').innerHTML=catalog;

-	}

-	

-	function shoppingCart_getResponse(feedDoc) {

-	    // var xmlString = new XMLSerializer().serializeToString(feedDoc);

-	    // alert("shoppingCart_getResponse feed xml=" + xmlString);

-		var feed = new Feed( feedDoc );

-		

-		if (feed != null) {

-			// var entries = feed.getElementsByTagName("entry");

-			var entries = feed.getEntries();              

-			var list = "";

-			for (var i=0; i<entries.length; i++) {

-				// var item = entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;

-				var item = entries[ i ].getContent().getText();

-				list += item + ' <br>';

-			}

-			document.getElementById("shoppingCart").innerHTML = list;

-			// document.getElementById('total').innerHTML = feed.getElementsByTagName("subtitle")[0].firstChild.nodeValue;

-			var text =  feed.getSubtitle().getText();

-			document.getElementById('total').innerHTML = text;

-		}

-	}

-	

-	function shoppingCart_postResponse(entry) {

-		shoppingCart.get("", shoppingCart_getResponse);

-	}				

-

-	function addToCart() {

-		var items  = document.catalogForm.items;

-		var j = 0;

-		for (var i=0; i<items.length; i++)

-			if (items[i].checked) {

-				var entry = new Entry( "cart-item" );

-				entry.setContent( items[i].value );

-				var entryXML = entry.toXML();

-				var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>cart-item</title><content type="text">'+items[i].value+'</content></entry>'

-				shoppingCart.post(entry, shoppingCart_postResponse);

-				items[i].checked = false;

-			}

-	}

-	

-	function checkoutCart() {

-		document.getElementById('store').innerHTML='<h2>' +

-				'Thanks for Shopping With Us!</h2>'+

-				'<h2>Your Order</h2>'+

-				'<form name="orderForm" action="/ufs/store.html">'+

-					document.getElementById('shoppingCart').innerHTML+

-					'<br>'+

-					document.getElementById('total').innerHTML+

-					'<br>'+

-					'<br>'+

-					'<input type="submit" value="Continue Shopping">'+ 

-				'</form>';

-		shoppingCart.del("", null);

-	}

-	function deleteCart() {

-		shoppingCart.del("", null);

-		document.getElementById('shoppingCart').innerHTML = "";

-		document.getElementById('total').innerHTML = "";	

-	}	

-	function testFeedtoXML() {

-		if(exception){

-			alert(exception.message);

-			return;

-		}

-    	document.getElementById('results').innerHTML = text;

-	}

-	

-    //alert(locale);

-	catalog.get(catalog_getResponse);

-	shoppingCart.get("", shoppingCart_getResponse);

-</script>

-

-</head>

-

-<body>

-<h1>Store</h1>

-  <div id="store">

-   	<h2>Catalog</h2>

-   	<form name="catalogForm">

-		<div id="catalog" ></div>

-		<br>

-		<input type="button" onClick="addToCart()"  value="Add to Cart">

-   	</form>

- 

- 	<br>

-  

-   	<h2>Your Shopping Cart</h2>

-   	<form name="shoppingCartForm">

-		<div id="shoppingCart"></div>

-		<br>

-		<div id="total"></div>

-		<br>		

-		<input type="button" onClick="checkoutCart()" value="Checkout"> 

-		<input type="button" onClick="deleteCart()" value="Empty">     

-	   	<a href="../ShoppingCart/">(feed)</a>

-	</form>    

-  </div>

-</body>

-</html>
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html b/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html
deleted file mode 100644
index 352dd85508..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html
+++ /dev/null
@@ -1,250 +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.    

--->

-<html>

-<head>

-<title>Atom JavaScript Client Unit Tests</title>

-

-<!-- Include Tuscany JavaScript client model for Atom.  

-	 Using this JavaScript model, users can use syntax such as:

-	 item += "name=" + entry.getName() + ", price=" + entry.getContent() 

-	 rather than

-     item += entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;

-	-->

-<script type="text/javascript" src="atomModel.js"></script>

-

-<script language="JavaScript">

-	

-	function testUritoXML() {

-       var test = new Uri( "http://example.org/edit/first-post.atom" );

-       var text = text.toXML();

-       alert( "Uri=" + text );

-	}

-	

-	function testEmailtoXML() {

-       var test = new Email( "john.doe@ibm.com" );

-       var text = test.toXML();

-       alert( "Email=" + text );

-	}

-

-	function testIdtoXML() {

-       var test = new Id( "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" );

-       var text = test.toXML();

-       alert( "Id=" + text );

-	}

-

-	function testLogotoXML() {

-       var test = new Logo( "goofyGraphic.png" );

-       var text = test.toXML();

-       alert( "Logo=" + text );

-	 	document.getElementById('results').innerHTML = removeBrackets( text );

-	}

-

-	function testTexttoXML() {

-       var test = new Text( "This is ordinary text." );

-       var text = test.toXML();

-       alert( "Text=" + text );

-       var test = new Text( "This is <b>HTML</b> text.", "html" );

-       var text = test.toXML( "supertext" );

-       alert( "Text=" + text );

-	 document.getElementById('results').innerHTML = removeBrackets( text );

-	}

-

-	function testPersontoXML() {

-       var test = new Person( "John Doe", "john.doe@ibm.com" );

-       var text = test.toXML();

-       alert( "Person=" + text );

-	 document.getElementById('results').innerHTML = removeBrackets( text );

-	}

-	

-	function testGeneratortoXML() {

-       var test = new Generator( "Power Station", "http://www.powerstation.com" );

-       var text = test.toXML();

-       alert( "Generator=" + text );

-	 document.getElementById('results').innerHTML = removeBrackets( text );

-	}

-	

-	function testCategorytoXML() {

-       var test = new Category( "CategoryXYZ", "http://www.site.com/?category=CategoryXYZ" );

-       var text = test.toXML();

-       alert( "Category=" + text );

-	 document.getElementById('results').innerHTML = removeBrackets( text );

-	}

-	

-	function testLinktoXML() {

-       var test = new Link( "http://example.org/edit/first-post.atom", "edit" );

-       var text = test.toXML();

-       alert( "Link=" + text );

-	 document.getElementById('results').innerHTML = removeBrackets( text );

-	}

-	

-	function testEntrytoXML() {

-       // <?xml version="1.0"?>

-       // <entry xmlns="http://www.w3.org/2005/Atom">

-       //   <title>Atom-Powered Robots Run Amok</title>

-       //   <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>

-       //   <updated>2003-12-13T18:30:02Z</updated>

-       //   <author><name>John Doe</name></author>

-       //   <content>Some text.</content>

-       //   <link rel="edit" href="http://example.org/edit/first-post.atom"/>

-       // </entry>

-

-       var entry = new Entry();

-       entry.setNamespace( "http://www.w3.org/2005/Atom" );

-       entry.setTitle( "Atom-Powered Robots Run Amok" );

-       entry.setId( "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" );

-       entry.setUpdated( "2003-12-13T18:30:02Z" );

-       entry.setContent( "Some text." );

-       entry.addAuthor( new Person( "John Doe" ) );

-       entry.addAuthor( new Person( "Mark Pilgrim", "f8dy@example.com" ));

-       entry.addContributor( new Person( "Sam Ruby" ));

-       entry.addContributor( new Person( "Joe Gregorio" ));

-       entry.addLink( new Link( "http://example.org/edit/first-post.atom", "edit" ));

-       var text = entry.toXML();

-        		

-	 	document.getElementById('results').innerHTML = removeBrackets( text );

-	}

-	

-	function testFeedtoXML() {

-       // <feed xmlns="http://www.w3.org/2005/Atom">

-       // <title type="text">dive into mark</title>

-       // <subtitle type="html">A &lt;em&gt;lot&lt;/em&gt; of effort went into making this effortless </subtitle>

-       // <updated>2005-07-31T12:29:29Z</updated>

-       // <id>tag:example.org,2003:3</id>

-       // <link rel="alternate" type="text/html" hreflang="en" href="http://example.org/"/>

-       // <link rel="self" type="application/atom+xml" href="http://example.org/feed.atom"/>

-       // <rights>Copyright (c) 2003, Mark Pilgrim</rights>

-       // <generator uri="http://www.example.com/" version="1.0">Example Toolkit</generator>

-       // <entry>

-       //    <title>Atom draft-07 snapshot</title>

-       //    <link rel="alternate" type="text/html" href="http://example.org/2005/04/02/atom"/>

-       //    <link rel="enclosure" type="audio/mpeg" length="1337" href="http://example.org/audio/ph34r_my_podcast.mp3"/>

-       //    <id>tag:example.org,2003:3.2397</id>

-       //    <updated>2005-07-31T12:29:29Z</updated>

-       //    <published>2003-12-13T08:29:29-04:00</published>

-       //    <author><name>Mark Pilgrim</name><uri>http://example.org/</uri><email>f8dy@example.com</email></author>

-       //    <contributor><name>Sam Ruby</name></contributor>

-       //    <contributor><name>Joe Gregorio</name></contributor>

-       //    <content type="xhtml" xml:lang="en"  xml:base="http://diveintomark.org/">

-       //    <div xmlns="http://www.w3.org/1999/xhtml">

-       //       <p><i>[Update: The Atom draft is finished.]</i></p>

-       //    </div>

-       //    </content>

-       // </entry>

-       // <entry>

-       //    <title>Dan Becker's Triathlon Site - Best Hills In Austin</title>

-       //    <category term="triathlons"/>

-       //    <id>tag:www.io.com,2008-09-05:/~beckerdo/triathlons/besthills.html</id>

-       //    <link href="http://www.io.com/~beckerdo/triathlons/besthills.html"/>

-       //    <published>2008-09-05T14:09:32-05:00</published>

-       //    <updated>2008-09-06T08:49:12-05:00</updated>

-       //    <summary type='html'>

-       //    &lt;a href='http://www.io.com/~beckerdo/triathlons/besthills.html'&gt;&lt;img src='http://www.io.com/~beckerdo/pictures/LittleDan25.png' width='25' height='25' alt='Little Dan' align='left'&gt;&lt;/a&gt;

-       //    A description and Google maps of the best running and biking hills in Austin, Texas.

-       //    </summary>

-       //    </entry>

-       // </feed>

-

-       var feed = new Feed( "Dive into Mark" );

-       feed.setSubtitle( new Text( "A &lt;em&gt;lot&lt;/em&gt; of effort went into making this effortless", "html" ));

-       feed.setUpdated( "2005-07-31T12:29:29Z" );

-       feed.setId( "tag:example.org,2003:3" );

-       var link = new Link( "http://example.org", "alternate" );

-       link.setMimeType( "text/html" );

-       link.setHRefLang( "en" );

-       feed.addLink( link ); 

-       feed.addLink( new Link( "http://example.org/feed.atom", "self" ));

-       feed.setRights( "Copyright (c) 2003, Mark Pilgrim" );

-       feed.setGenerator( new Generator(  "Example Toolkit", "http://www.example.com/" ));

-       feed.addAuthor( new Person( "Mark Pilgrim", "f8dy@example.com" ));

-       feed.addContributor( new Person( "Sam Ruby" ));

-       feed.addContributor( new Person( "Joe Gregorio" ));

-       // <entry>

-       //    <title>Atom draft-07 snapshot</title>

-       //    <link rel="alternate" type="text/html" href="http://example.org/2005/04/02/atom"/>

-       //    <link rel="enclosure" type="audio/mpeg" length="1337" href="http://example.org/audio/ph34r_my_podcast.mp3"/>

-       //    <id>tag:example.org,2003:3.2397</id>

-       //    <updated>2005-07-31T12:29:29Z</updated>

-       //    <published>2003-12-13T08:29:29-04:00</published>

-       //    <author><name>Mark Pilgrim</name><uri>http://example.org/</uri><email>f8dy@example.com</email></author>

-       //    <contributor><name>Sam Ruby</name></contributor>

-       //    <contributor><name>Joe Gregorio</name></contributor>

-       //    <content type="xhtml" xml:lang="en"  xml:base="http://diveintomark.org/">

-       //    <div xmlns="http://www.w3.org/1999/xhtml">

-       //       <p><i>[Update: The Atom draft is finished.]</i></p>

-       //    </div>

-       //    </content>

-       // </entry>

-       // <entry>

-       //    <title>Dan Becker's Triathlon Site - Best Hills In Austin</title>

-       //    <category term="triathlons"/>

-       //    <id>tag:www.io.com,2008-09-05:/~beckerdo/triathlons/besthills.html</id>

-       //    <link href="http://www.io.com/~beckerdo/triathlons/besthills.html"/>

-       //    <published>2008-09-05T14:09:32-05:00</published>

-       //    <updated>2008-09-06T08:49:12-05:00</updated>

-       //    <summary type='html'>

-       //    &lt;a href='http://www.io.com/~beckerdo/triathlons/besthills.html'&gt;&lt;img src='http://www.io.com/~beckerdo/pictures/LittleDan25.png' width='25' height='25' alt='Little Dan' align='left'&gt;&lt;/a&gt;

-       //    A description and Google maps of the best running and biking hills in Austin, Texas.

-       //    </summary>

-       //    </entry>

-       // </feed>

-       var entry = new Entry( "Dan Becker's Triathlon Site - Best Hills In Austin" );

-       entry.addCategory( new Category( "running" ));

-       entry.addCategory( new Category( "triathlons" ));

-       entry.setId( "tag:www.io.com,2008-09-05:/~beckerdo/triathlons/besthills.html" );

-       entry.addLink( new Link ( "http://www.io.com/~beckerdo/triathlons/besthills.html" ));

-       entry.setPublished( "2008-09-05T14:09:32-05:00" );

-       entry.setUpdated( "2008-09-06T08:49:12-05:00" );

-       entry.setSummary( new Text (

-          "&lt;a href='http://www.io.com/~beckerdo/triathlons/besthills.html'&gt;&lt;img src='http://www.io.com/~beckerdo/pictures/LittleDan25.png' width='25' height='25' alt='Little Dan' align='left'&gt;&lt;/a&gt;\n" + 

-          "A description and Google maps of the best running and biking hills in Austin, Texas.", "html" ));

-       feed.addEntry( entry );

-       

-       var text = feed.toXML();

-       alert( "Feed xml=" + text );        		

-	 	document.getElementById('results').innerHTML = removeBrackets( text );

-	}

-	

-    function removeBrackets( input ) {

-       input = input.replace( /</g, "&lt;" ); // replaceAll

-       input = input.replace( />/g, "&gt;" ); // replaceAll

-       return input;

-    }

-</script>

-</head>

-

-<body>

-<h1>Atom JavaScript Client Unit Tests</h1>

-<p>This document tests the serialization and deserialization of the Atom JavaScript client.

-   	<h2>Model to XML Tests</h2>

-		<input type="button" onClick="testUritoXML()" value="Uri to XML"><br> 

-		<input type="button" onClick="testEmailtoXML()" value="Email to XML"><br> 

-		<input type="button" onClick="testIdtoXML()" value="Id to XML"><br> 

-		<input type="button" onClick="testLogotoXML()" value="Logo to XML"><br> 

-		<input type="button" onClick="testTexttoXML()" value="Text to XML"><br> 

-		<input type="button" onClick="testPersontoXML()" value="Person to XML"><br> 

-		<input type="button" onClick="testGeneratortoXML()" value="Generator to XML"><br> 

-		<input type="button" onClick="testCategorytoXML()" value="Category to XML"><br> 

-		<input type="button" onClick="testLinktoXML()" value="Link to XML"><br> 

-		<input type="button" onClick="testEntrytoXML()" value="Entry to XML"><br> 

-		<input type="button" onClick="testFeedtoXML()" value="Feed to XML"><br> 

-   	<h2>Results</h2>

-   	<code id="results">

-   	</code>

-</body>

-</html>
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widget.composite b/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widget.composite
deleted file mode 100644
index f23d6a20f5..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widget.composite
+++ /dev/null
@@ -1,54 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/resource"
-	xmlns:sr="http://sample/resource"
-	name="resource">
-
-    <component name="store">
-        <tuscany:implementation.widget location="content/store.html"/>
-        <property name="locale">en</property>
-        <service name="Widget">
-        	<tuscany:binding.http uri="http://localhost:8085/store"/> 
-        </service>
-		<reference name="Catalog" target="Catalog">
-		 	<tuscany:binding.jsonrpc uri="http://localhost:8085/Catalog"/>
-		 </reference>
-		 <reference name="ShoppingCart" target="ShoppingCart">
-		 	<tuscany:binding.atom uri="http://localhost:8085/ShoppingCart"/>
-		 </reference>
-    </component>
-    
-    <component name="Catalog">
-		<implementation.java class="store.CatalogImpl"/> 
-		<service name="Catalog">
-			<tuscany:binding.jsonrpc uri="http://localhost:8085/Catalog"/>
-   		</service>
-	</component> 
-	
-	<component name="ShoppingCart">
-		<implementation.java class="store.ShoppingCartImpl"/>
-		<service name="Collection">
-			<tuscany:binding.atom uri="http://localhost:8085/ShoppingCart"/>
-		</service>    	
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite b/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
deleted file mode 100644
index e44a56e520..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
+++ /dev/null
@@ -1,58 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://sample/resource"

-	xmlns:sr="http://sample/resource"

-	name="resource">

-

-    <component name="storeJS">

-    	<!-- Note: the store.html and storeJS.html clients are similar

-    		 except that store.html edits the client document using JavaScript

-    		 and many node queries, and storeJS.html uses the client Atom

-    		 JavaScript mode (fewer node queries and less XML knowledge needed.-->

-        <tuscany:implementation.widget location="content/storeJS.html"/>

-        <property name="locale">en</property>

-        <service name="Widget">

-        	<tuscany:binding.http uri="/storeJS"/> 

-        </service>

-		<reference name="Catalog" target="Catalog">

-		 	<tuscany:binding.jsonrpc uri="/Catalog"/>

-		 </reference>

-		 <reference name="ShoppingCart" target="ShoppingCart">

-		 	<tuscany:binding.atom uri="/ShoppingCart"/>

-		 </reference>

-    </component>

-    

-    <component name="Catalog">

-		<implementation.java class="store.CatalogImpl"/> 

-		<service name="Catalog">

-			<tuscany:binding.jsonrpc uri="/Catalog"/>

-   		</service>

-	</component> 

-	

-	<component name="ShoppingCart">

-		<implementation.java class="store.ShoppingCartImpl"/>

-		<service name="Collection">

-			<tuscany:binding.atom uri="/ShoppingCart"/>

-		</service>    	

-	</component>

-

-</composite>

diff --git a/java/sca-contrib/modules/implementation-widget/LICENSE b/java/sca-contrib/modules/implementation-widget/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/implementation-widget/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/implementation-widget/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-widget/META-INF/MANIFEST.MF
deleted file mode 100644
index f112dd57bf..0000000000
--- a/java/sca-contrib/modules/implementation-widget/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.implementation.widget;uses:="or

- g.apache.tuscany.sca.data.collection,org.apache.tuscany.sca.assembly,

- org.apache.tuscany.sca.contribution,org.apache.tuscany.sca.core,org.a

- pache.tuscany.sca.monitor,org.apache.tuscany.sca.interfacedef.java,or

- g.apache.tuscany.sca.interfacedef,javax.xml.namespace,javax.xml.strea

- m,org.apache.tuscany.sca.contribution.resolver,org.apache.tuscany.sca

- .contribution.processor";version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Widget Implementation Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397413234

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Widget Implementation Model

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.xml;version="2.0.0",

- org.apache.tuscany.sca.contribution;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.data.collection;version="2.0.0",

- org.apache.tuscany.sca.implementation.widget;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.widget

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/implementation-widget/NOTICE b/java/sca-contrib/modules/implementation-widget/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/implementation-widget/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/implementation-widget/pom.xml b/java/sca-contrib/modules/implementation-widget/pom.xml
deleted file mode 100644
index 85777f47ea..0000000000
--- a/java/sca-contrib/modules/implementation-widget/pom.xml
+++ /dev/null
@@ -1,60 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-implementation-widget</artifactId>
-    <name>Apache Tuscany SCA Widget Implementation Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java b/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
deleted file mode 100644
index f47850a05c..0000000000
--- a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
+++ /dev/null
@@ -1,34 +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.implementation.widget;
-
-import java.io.InputStream;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-
-/**
- * The service interface of widget implementations. This is not an API for application
- * developers. Application developers should use the data collection API to invoke
- * widget components.
- * 
- * @version $Rev$ $Date$
- */
-public interface Widget extends Collection<String, InputStream> {
-}
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java b/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
deleted file mode 100644
index b35cc41dd4..0000000000
--- a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
+++ /dev/null
@@ -1,134 +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.implementation.widget;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-
-/**
- * The model representing a widget implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-public class WidgetImplementation implements Implementation {
-    private Service widgetService;
-    private List<Reference> references = new ArrayList<Reference>();
-    private List<Property> properties = new ArrayList<Property>();
-    
-    private String location;
-    private URL url;
-    private boolean unresolved;
-
-    /**
-     * Constructs a new resource implementation.
-     */
-    WidgetImplementation(AssemblyFactory assemblyFactory,
-                         JavaInterfaceFactory javaFactory) {
-
-        // Resource implementation always provide a single service exposing
-        // the Resource interface, and have no references and properties
-        widgetService = assemblyFactory.createService();
-        widgetService.setName("Widget");
-        
-        // Create the Java interface contract for the Resource service
-        JavaInterface javaInterface;
-        try {
-            javaInterface = javaFactory.createJavaInterface(Widget.class);
-        } catch (InvalidInterfaceException e) {
-            throw new IllegalArgumentException(e);
-        }
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        interfaceContract.setInterface(javaInterface);
-        widgetService.setInterfaceContract(interfaceContract);
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public URL getLocationURL() {
-        return url;
-    }
-    
-    public void setLocationURL(URL url) {
-        this.url = url;
-    }
-    
-    public ConstrainingType getConstrainingType() {
-        // The resource implementation does not support constrainingTypes
-        return null;
-    }
-
-    public List<Property> getProperties() {
-        return properties;
-    }
-
-    public List<Service> getServices() {
-        // The resource implementation does not support services
-        return Collections.singletonList(widgetService);
-    }
-    
-    public List<Reference> getReferences() {
-        return references;
-    }
-
-    public String getURI() {
-        return location;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        // The resource implementation does not support constrainingTypes
-    }
-
-    public void setURI(String uri) {
-        this.location = uri;
-    }
-
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }    
-
-    @Override
-    public String toString() {
-        return "Widget : " + getLocation(); 
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java b/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
deleted file mode 100644
index dc5759a13d..0000000000
--- a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.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.    
- */
-
-package org.apache.tuscany.sca.implementation.widget;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-/**
- * Factory for the widget implementation model.
- *
- * @version $Rev$ $Date$
- */
-public class WidgetImplementationFactory {
-    
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-    
-    public WidgetImplementationFactory(FactoryExtensionPoint modelFactories) {
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-    }
-
-    public WidgetImplementation createWidgetImplementation() {
-        return new WidgetImplementation(assemblyFactory, javaFactory);
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java b/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
deleted file mode 100644
index abe00bac5b..0000000000
--- a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
+++ /dev/null
@@ -1,145 +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.implementation.widget;
-
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Scanner;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-class WidgetImplementationIntrospector {
-    private static final String WEB_REFERENCE_ANNOTATION = "//@Reference";
-    private static final String WEB_PROPERTY_ANNOTATION = "//@Property";
-    
-    private AssemblyFactory assemblyFactory;
-    private WidgetImplementation widgetImplementation;
-    
-    WidgetImplementationIntrospector(AssemblyFactory assemblyFactory, WidgetImplementation widgetImplementation) {
-        this.widgetImplementation = widgetImplementation;
-        this.assemblyFactory = assemblyFactory;
-    }
-    
-    
-    /**
-     * Introspect and populate a given widget implementation
-     */
-    public void introspectImplementation() {
-        URL htmlWidget = widgetImplementation.getLocationURL();
-        
-        try {
-            URLConnection connection = htmlWidget.openConnection();
-            connection.setUseCaches(false);
-            Scanner scanner = new Scanner(connection.getInputStream());
-            while(scanner.hasNextLine()) {
-                String line = scanner.nextLine();
-                if(line.contains(WEB_PROPERTY_ANNOTATION)) {
-                	//process the next line, as it has the property info
-                	if (scanner.hasNextLine()) {
-                		Property property = processPropertyScript(scanner.nextLine());
-                		if (property != null) {
-                			widgetImplementation.getProperties().add(property);
-                		}
-                	}
-                	
-                } else if(line.contains(WEB_REFERENCE_ANNOTATION)) {
-                    //process the next line, as it has the reference info
-                    if (scanner.hasNextLine()) {
-                        Reference reference = processReferenceScript(scanner.nextLine());
-                        if(reference != null){
-                        	widgetImplementation.getReferences().add(reference);
-                        }
-                        
-                    }
-                }
-            }
-            
-        } catch(Exception e) {
-            
-        }
-        
-    	
-    }
-    
-    
-    /**
-     * Process Property declaration in JavaScript code
-     * Supported ways:
-     *    //@Property
-     *    var locale = Property("locale");
-     *    
-     *    //@Property
-     *    locale = Property("locale");
-     *    
-     * @param scriptContent
-     * @return
-     */
-    private Property processPropertyScript(String scriptContent) {
-    	Property property = null;
-        String propertyName = null;
-        
-        String tokens[] = scriptContent.split("=");
-        tokens = tokens[0].split(" ");
-        propertyName = tokens[tokens.length -1];
-        
-        if(propertyName != null) {
-            property = assemblyFactory.createProperty();
-            property.setName(propertyName);     
-        }
-        
-        return property;
-    }
-    
-    /**
-     * Process Reference declaration in JavaScript code
-     * Supported ways :
-     *    //@Reference
-     *    var catalog = new Reference("catalog");
-     *    
-     *    //@Reference
-     *    catalog = new Reference("catalog");
-     *    
-     * @param scriptContent
-     * @return
-     */
-    private Reference processReferenceScript(String scriptContent) {
-        Reference reference = null;
-        String referenceName = null;
-        
-        String tokens[] = scriptContent.split("=");
-        
-        // find the string between the quotes
-        tokens = tokens[1].split("\"");
-        referenceName = tokens[1];
-        
-        if(referenceName != null) {
-            reference = assemblyFactory.createReference();
-            reference.setName(referenceName);            
-        }
-        
-        return reference;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java b/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
deleted file mode 100644
index 1d3e71dfcb..0000000000
--- a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
+++ /dev/null
@@ -1,175 +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.implementation.widget;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import java.io.IOException;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-
-/**
- * Implements a StAX artifact processor for Widget implementations.
- *
- * @version $Rev$ $Date$
- */
-public class WidgetImplementationProcessor implements StAXArtifactProcessor<WidgetImplementation> {
-    private static final QName IMPLEMENTATION_WIDGET = new QName(Constants.SCA10_TUSCANY_NS, "implementation.widget");
-        
-    private AssemblyFactory assemblyFactory;
-    private ContributionFactory contributionFactory;
-    private WidgetImplementationFactory implementationFactory;
-    private Monitor monitor;
-    
-    public WidgetImplementationProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-    	assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        implementationFactory = new WidgetImplementationFactory(modelFactories); 
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a exception.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Exception ex) {
-    	 if (monitor != null) {
-	        Problem problem = monitor.createProblem(this.getClass().getName(), "impl-widget-validation-messages", Severity.ERROR, model, message, ex);
-	        monitor.problem(problem);
-    	 }
-    }
-            
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = monitor.createProblem(this.getClass().getName(), "impl-widget-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }    
-
-    public QName getArtifactType() {
-        // Returns the QName of the XML element processed by this processor
-        return IMPLEMENTATION_WIDGET;
-    }
-
-    public Class<WidgetImplementation> getModelType() {
-        // Returns the type of model processed by this processor
-        return WidgetImplementation.class;
-    }
-
-    public WidgetImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-
-        // Read an <implementation.widget> element
-
-        // Create and initialize the resource implementation model
-        WidgetImplementation implementation = null;
-
-        // Read the location attribute specifying the location of the resources
-        String location = reader.getAttributeValue(null, "location");
-        if (location != null) {                
-            implementation = implementationFactory.createWidgetImplementation();
-            implementation.setLocation(location);
-            implementation.setUnresolved(true);
-        } else {
-            error("LocationAttributeMissing", reader);
-            //throw new ContributionReadException(MSG_LOCATION_MISSING);
-        }
-
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && IMPLEMENTATION_WIDGET.equals(reader.getName())) {
-                break;
-            }
-        }
-
-        return implementation;
-    }
-
-    public void resolve(WidgetImplementation implementation, ModelResolver resolver) throws ContributionResolveException {
-        
-    	if (implementation != null) {
-    		// Resolve the resource directory location
-            Artifact artifact = contributionFactory.createArtifact();
-            artifact.setURI(implementation.getLocation());
-            Artifact resolved = resolver.resolveModel(Artifact.class, artifact);
-            if (resolved.getLocation() != null) {
-                try {
-                    implementation.setLocationURL(new URL(resolved.getLocation()));                 
-                    
-                    //introspect implementation
-                    WidgetImplementationIntrospector widgetIntrospector = 
-                    	new WidgetImplementationIntrospector(assemblyFactory, implementation);
-                    widgetIntrospector.introspectImplementation();
-                    
-                    implementation.setUnresolved(false);
-                } catch (IOException e) {
-                	ContributionResolveException ce = new ContributionResolveException(e);
-                	error("ContributionResolveException", resolver, ce);
-                    //throw ce;
-                }
-            } else {
-                error("CouldNotResolveLocation", resolver, implementation.getLocation());
-                //throw new ContributionResolveException("Could not resolve implementation.widget location: " + implementation.getLocation());            
-            }
-    	}
-    }
-
-    public void write(WidgetImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <implementation.widget>
-        writer.setPrefix("widget",IMPLEMENTATION_WIDGET.getNamespaceURI());
-        writer.writeStartElement(IMPLEMENTATION_WIDGET.getNamespaceURI(), IMPLEMENTATION_WIDGET.getLocalPart());
-        writer.writeNamespace("widget",IMPLEMENTATION_WIDGET.getNamespaceURI());
-      
-        
-        if (implementation.getLocation() != null) {
-            writer.writeAttribute("location", implementation.getLocation());
-        }
-        
-        writer.writeEndElement();
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 6c167a6b31..0000000000
--- a/java/sca-contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.widget.WidgetImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#implementation.widget,model=org.apache.tuscany.sca.implementation.widget.WidgetImplementation
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory b/java/sca-contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
deleted file mode 100644
index fc45baa16d..0000000000
--- a/java/sca-contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for model factory
-org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties b/java/sca-contrib/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
deleted file mode 100644
index 3778bd4c50..0000000000
--- a/java/sca-contrib/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
+++ /dev/null
@@ -1,23 +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.
-#
-#
-ContributionResolveException = ContributionResolveException occured due to:
-LocationAttributeMissing = Reading implementation.widget - location attribute missing
-CouldNotResolveLocation = Could not resolve implementation.widget location: {0}
diff --git a/java/sca-contrib/modules/implementation-xquery/LICENSE b/java/sca-contrib/modules/implementation-xquery/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/java/sca-contrib/modules/implementation-xquery/META-INF/MANIFEST.MF b/java/sca-contrib/modules/implementation-xquery/META-INF/MANIFEST.MF
deleted file mode 100644
index 380c00293e..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,64 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.implementation.xquery;uses:="or

- g.apache.tuscany.sca.databinding,org.apache.tuscany.sca.runtime,net.s

- f.saxon.value,org.apache.tuscany.sca.interfacedef.util,org.apache.tus

- cany.sca.provider,org.apache.tuscany.sca.databinding.saxon,net.sf.sax

- on.trans,org.apache.tuscany.sca.core,javax.xml.transform.dom,net.sf.s

- axon,org.apache.tuscany.sca.databinding.saxon.collection,javax.xml.na

- mespace,net.sf.saxon.query,org.apache.tuscany.sca.core.factory,net.sf

- .saxon.om,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.data

- binding.impl,org.apache.tuscany.sca.interfacedef.java,org.apache.tusc

- any.sca.interfacedef,org.w3c.dom,org.apache.tuscany.sca.implementatio

- n.java.injection,org.apache.tuscany.sca.invocation,javax.xml.transfor

- m,net.sf.saxon.event,javax.xml.transform.stream";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.implementation.xquery.impl;ver

- sion="1.4",org.apache.tuscany.sca.implementation.xquery.xml;version="

- 1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA XQuery Implementation Extension

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397469781

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA XQuery Implementation Extension

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- javax.xml.transform,

- javax.xml.transform.dom,

- javax.xml.transform.stream,

- net.sf.saxon,

- net.sf.saxon.event,

- net.sf.saxon.om,

- net.sf.saxon.query,

- net.sf.saxon.trans,

- net.sf.saxon.value,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.impl;version="2.0.0",

- org.apache.tuscany.sca.contribution;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.core.factory;version="2.0.0",

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",

- org.apache.tuscany.sca.databinding.saxon;version="2.0.0",

- org.apache.tuscany.sca.databinding.saxon.collection;version="2.0.0",

- org.apache.tuscany.sca.implementation.java;version="2.0.0",

- org.apache.tuscany.sca.implementation.java.injection;version="2.0.0",

- org.apache.tuscany.sca.implementation.xquery;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.oasisopen.sca;version="2.0.0",

- org.w3c.dom

-Bundle-SymbolicName: org.apache.tuscany.sca.implementation.xquery

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/implementation-xquery/NOTICE b/java/sca-contrib/modules/implementation-xquery/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/implementation-xquery/pom.xml b/java/sca-contrib/modules/implementation-xquery/pom.xml
deleted file mode 100644
index 559c17e97d..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/pom.xml
+++ /dev/null
@@ -1,86 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-implementation-xquery</artifactId>
-    <name>Apache Tuscany SCA XQuery Implementation Extension</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-saxon</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java b/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
deleted file mode 100644
index f5bc5dd9b8..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.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.implementation.xquery;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import net.sf.saxon.query.XQueryExpression;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-
-/**
- * Class representing the XQuery implementation type
- * @version $Rev$ $Date$
- */
-public interface XQueryImplementation extends Implementation {
-
-    /**
-     * Location of the XQuery implementation file
-     * @return
-     */
-    String getLocation();
-
-    void setLocation(String location);
-
-    String getLocationURL();
-
-    void setLocationURL(String location);
-
-    /**
-     * The XQuery expression that is loaded from the XQuery implementation file
-     * @return
-     */
-    String getXqExpression();
-
-    void setXqExpression(String expression);
-
-    /**
-     * The XQuery expression should be extended for with additional
-     * script, which provides the external variables needed to invoke
-     * a function. In this way for each function that is defined in the
-     * original XQuery expression additional expression is defined, which
-     * can invoke this function, using external variables as input.
-     * These expression extensions are stored in this map. It provides for
-     * each method of a service interface that is implemented by this component
-     * type corresponding expression extension
-     * @return
-     */
-    Map<Method, String> getXqExpressionExtensionsMap();
-
-    /**
-     * This map is a kind of cache for function invocations. If a given
-     * XQuery function of this implementation has been invoked already
-     * its compiled expression can be reused. In this manner the performance
-     * can be increased
-     * @return
-     */
-    Map<String, XQueryExpression> getCompiledExpressionsCache();
-}
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java b/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
deleted file mode 100644
index bdfd390499..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.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 org.apache.tuscany.sca.implementation.xquery;
-
-import org.apache.tuscany.sca.implementation.xquery.impl.XQueryImplementationFactoryImpl;
-
-/**
- * Provides instances of XQueryImplementation classes
- * @version $Rev$ $Date$
- */
-public interface XQueryImplementationFactory {
-
-    XQueryImplementationFactory INSTANCE = new XQueryImplementationFactoryImpl();
-
-    XQueryImplementation createXQueryImplementation();
-}
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java b/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
deleted file mode 100644
index 63a3a49e13..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
+++ /dev/null
@@ -1,166 +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.implementation.xquery;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;
-import org.apache.tuscany.sca.databinding.saxon.SaxonNodeDataBinding;
-import org.apache.tuscany.sca.databinding.saxon.SaxonValueDataBinding;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Provides the runtime configuration of XQuery-typed component.
- * 
- * Generally the following is done:
- * 1. During construction all services and references are provided
- *    with the Saxon data binding, which is the one required by the 
- *    XQueryInvoker
- * 
- * 2. During startup:
- *    - a proxy is created for each reference and it is kept in the referenceProxies
- *      map, which is used later by the invoker to configure the Saxon parser;
- *    - each property value is read and put into the properties map. This is
- *      again used by the invoker to configure the Saxon parser
- *
- * @version $Rev$ $Date$
- */
-public class XQueryImplementationProvider implements ImplementationProvider {
-
-    private RuntimeComponent component;
-    private XQueryImplementation implementation;
-    private Map<String, Object> referenceProxies = new HashMap<String, Object>();
-    private Map<String, Object> properties = new HashMap<String, Object>();
-    private JavaPropertyValueObjectFactory javaFactory;
-
-    public XQueryImplementationProvider(RuntimeComponent component,
-                                        XQueryImplementation implementation,
-                                        JavaPropertyValueObjectFactory factory) {
-        this.component = component;
-        this.implementation = implementation;
-        this.javaFactory = factory;
-        init();
-    }
-
-    private void init() {
-        List<Service> services = implementation.getServices();
-        for (Service sevice : services) {
-            InterfaceContract interfaceContract = sevice.getInterfaceContract();
-            //interfaceContract.getInterface().setDefaultDataBinding(ValueRepresentation.class.getName());
-            setDataBinding(interfaceContract.getInterface(), false);
-        }
-
-        List<Reference> references = implementation.getReferences();
-        for (Reference reference : references) {
-            InterfaceContract interfaceContract = reference.getInterfaceContract();
-            //interfaceContract.getInterface().setDefaultDataBinding(ValueRepresentation.class.getName());
-            setDataBinding(interfaceContract.getInterface(), true);
-        }
-    }
-
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        return new XQueryInvoker(service, operation, implementation, referenceProxies, properties);
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-
-        for (Reference reference : component.getReferences()) {
-            String refName = reference.getName();
-            if (refName.startsWith("$self$.")) {
-                continue;
-            }
-            Class interfaze = ((JavaInterface)reference.getInterfaceContract().getInterface()).getJavaClass();
-            Object refProxy = component.getComponentContext().getService(interfaze, refName);
-            referenceProxies.put(refName, refProxy);
-        }
-
-        for (ComponentProperty property : component.getProperties()) {
-            String propName = property.getName();
-            QName xmlType = property.getXSDType();
-            Class clazz = JavaXMLMapper.getJavaType(xmlType);
-
-            Object propertyValue = null;
-            if (clazz == null || java.lang.Object.class.equals(clazz)) {
-                propertyValue = property.getValue();
-            } else {
-                ObjectFactory objfactory = javaFactory.createValueFactory(property, property.getValue(), clazz);
-                propertyValue = objfactory.getInstance();
-            }
-            properties.put(propName, propertyValue);
-        }
-    }
-
-    private void setDataBinding(Interface interfaze, boolean isReference) {
-        List<Operation> operations = interfaze.getOperations();
-        for (Operation operation : operations) {
-            operation.setDataBinding(SaxonNodeDataBinding.NAME);
-            DataType<List<DataType>> inputType = operation.getInputType();
-            if (inputType != null) {
-                List<DataType> logical = inputType.getLogical();
-                for (DataType inArg : logical) {
-                    if (SimpleJavaDataBinding.NAME.equals(inArg.getDataBinding())) {
-                        if (!isReference) {
-                            inArg.setDataBinding(SaxonValueDataBinding.NAME);
-                        }
-                    } else {
-                        inArg.setDataBinding(SaxonNodeDataBinding.NAME);
-                    }
-                }
-            }
-            DataType outputType = operation.getOutputType();
-            if (outputType != null) {
-                if (SimpleJavaDataBinding.NAME.equals(outputType.getDataBinding())) {
-                    if (!isReference) {
-                        outputType.setDataBinding(SaxonValueDataBinding.NAME);
-                    }
-                } else {
-                    outputType.setDataBinding(SaxonNodeDataBinding.NAME);
-                }
-            }
-        }
-    }
-
-    public void stop() {
-        // TODO Auto-generated method stub
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java b/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
deleted file mode 100644
index 57536e502b..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
+++ /dev/null
@@ -1,54 +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.implementation.xquery;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * A factory for XQuery implementation providers
- * @version $Rev$ $Date$
- */
-public class XQueryImplementationProviderFactory implements ImplementationProviderFactory<XQueryImplementation> {
-
-    private JavaPropertyValueObjectFactory javaFactory;
-
-    public XQueryImplementationProviderFactory(ExtensionPointRegistry registry) {
-        DataBindingExtensionPoint dataBindings = registry.getExtensionPoint(DataBindingExtensionPoint.class);
-        TransformerExtensionPoint transformers = registry.getExtensionPoint(TransformerExtensionPoint.class);
-        MediatorImpl mediator = new MediatorImpl(dataBindings, transformers);
-        this.javaFactory = new JavaPropertyValueObjectFactory(mediator);
-    }
-
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component,
-                                                               XQueryImplementation implementation) {
-        return new XQueryImplementationProvider(component, implementation, javaFactory);
-    }
-
-    public Class<XQueryImplementation> getModelType() {
-        return XQueryImplementation.class;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java b/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
deleted file mode 100644
index 0c628b3715..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
+++ /dev/null
@@ -1,33 +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.implementation.xquery;
-
-/**
- * Exception class used by the XQueryInvoker to report problems in
- * XQuery script invocation
- * @version $Rev$ $Date$
- */
-public class XQueryInvokationException extends Exception {
-
-    private static final long serialVersionUID = -2674411654705699541L;
-
-    public XQueryInvokationException(String msg) {
-        super(msg);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java b/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
deleted file mode 100644
index 2a9673068b..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
+++ /dev/null
@@ -1,318 +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.implementation.xquery;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import net.sf.saxon.Configuration;
-import net.sf.saxon.event.Builder;
-import net.sf.saxon.om.DocumentInfo;
-import net.sf.saxon.om.Item;
-import net.sf.saxon.om.NodeInfo;
-import net.sf.saxon.om.SequenceIterator;
-import net.sf.saxon.query.DynamicQueryContext;
-import net.sf.saxon.query.QueryResult;
-import net.sf.saxon.query.StaticQueryContext;
-import net.sf.saxon.query.XQueryExpression;
-import net.sf.saxon.trans.XPathException;
-import net.sf.saxon.value.Value;
-
-import org.apache.tuscany.sca.databinding.saxon.SaxonDataBindingHelper;
-import org.apache.tuscany.sca.databinding.saxon.collection.ItemList;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Performs the invocation of a requested XQuery function
- * @version $Rev$ $Date$
- */
-public class XQueryInvoker implements Invoker {
-
-    private RuntimeComponentService service;
-    private Operation operation;
-    private Method theMethod;
-    private XQueryImplementation implementation;
-    private Map<String, Object> referenceProxies;
-    private Map<String, Object> properties;
-
-    /**
-     * Constructs a new instance of the xquery invoker.
-     * Also performs a search of java.lang.Method instance
-     * that corresponds to the invoked operation
-     */
-    public XQueryInvoker(RuntimeComponentService service,
-                         Operation operation,
-                         XQueryImplementation implementation,
-                         Map<String, Object> referenceProxies,
-                         Map<String, Object> properties) {
-        this.service = service;
-        this.operation = operation;
-        this.implementation = implementation;
-        this.referenceProxies = referenceProxies;
-        this.properties = properties;
-
-        findMatchingMethod();
-    }
-
-    /**
-     * This method contains the XQuery invocation logic
-     * The following steps are performed:
-     * 1. XQuery expression is produced by combining the original expression
-     *    and the function invocation extension (See XQueryImplementation.getXqExpressionExtensionsMap()
-     *    for details)
-     * 2. A check is performed if this expression has been invoked already. If yes -
-     *    it is taken from the cache
-     * 3. Configuration for the execution is either created or retrieved from
-     *    the cached expression
-     * 4. The input parameters of the operation to be invoked are taken from the
-     *    payload and transformed to ones that are built with the current 
-     *    configuration. 
-     *    NOTE: This is unnecessary overhead - can the Configuration
-     *    object be attached in some way to the invocation request?
-     * 5. All parameters, reference proxies and property values are mapped
-     *    to external variables of the XQuery script
-     * 6. The query is executed and all the results are stored in a ItemList object
-     *    
-     *    NOTE: During execution of the XQuery a static variable is set with
-     *    the current configuration. This variable is used by the NodeInfo transformers
-     *    to produce the correct NodeInfo for all Output2Output transformations, which
-     *    happen as result of the XQuery component invoking some reference components
-     *    The old state of the static configuration is preserved and in this way allowing
-     *    to nest XQuery component invocations (i.e. one XQuery component invokes another
-     *    one)
-     */
-    private Object doInvoke(Object payload) throws XQueryInvokationException, XPathException {
-        if (theMethod == null) {
-            throw new XQueryInvokationException("No java method for operation: " + operation.getName());
-        }
-        String xqExpression =
-            implementation.getXqExpression() + implementation.getXqExpressionExtensionsMap().get(theMethod);
-
-        Configuration config = null;
-        Properties props = new Properties();
-        props.setProperty(OutputKeys.METHOD, "xml");
-        props.setProperty(OutputKeys.INDENT, "yes");
-
-        XQueryExpression exp = implementation.getCompiledExpressionsCache().get(xqExpression);
-        if (exp == null) {
-            config = new Configuration();
-            StaticQueryContext sqc = new StaticQueryContext(config);
-            exp = sqc.compileQuery(xqExpression);
-            implementation.getCompiledExpressionsCache().put(xqExpression, exp);
-        } else {
-            config = exp.getStaticContext().getConfiguration();
-        }
-
-        Object[] params = prepareParameters(payload, config, props);
-
-        DynamicQueryContext dynamicContext = new DynamicQueryContext(config);
-
-        // Setting the parameters for function invocation
-        String methodName = theMethod.getName();
-        for (int i = 0; i < params.length; i++) {
-            dynamicContext.setParameter(methodName + "_" + i, params[i]);
-        }
-
-        // Setting references
-        for (Map.Entry<String, Object> entry : referenceProxies.entrySet()) {
-            dynamicContext.setParameter(entry.getKey(), entry.getValue());
-        }
-
-        // Setting properties
-        for (Map.Entry<String, Object> entry : properties.entrySet()) {
-            dynamicContext.setParameter(entry.getKey(), transformProperty(entry.getValue(), config));
-        }
-
-        SequenceIterator iterator = null;
-        Configuration oldConfigValue = SaxonDataBindingHelper.CURR_EXECUTING_CONFIG;
-        SaxonDataBindingHelper.CURR_EXECUTING_CONFIG = config;
-        try {
-            iterator = exp.iterator(dynamicContext);
-        } finally {
-            SaxonDataBindingHelper.CURR_EXECUTING_CONFIG = oldConfigValue;
-        }
-        
-        ItemList list = new ItemList();
-        Item item = iterator.next();
-               
-        while (item != null) {
-        	list.add(item);
-        	item = iterator.next();
-        	
-        }
-        
-        if (list.size() == 0) {
-            return null;
-            
-        } else if (list.size() == 1) {
-        
-        	item = list.iterator().next();
-        	
-        	if (item instanceof NodeInfo) {
-                return item;
-            } else {
-                return Value.asValue(item);
-            }
-        	
-        }
-        
-        return list;
-        
-    }
-
-    public Message invoke(Message msg) {
-        try {
-            Object resp = doInvoke(msg.getBody());
-            msg.setBody(resp);
-        } catch (XQueryInvokationException e) {
-            msg.setFaultBody(e.getCause());
-        } catch (XPathException e) {
-            msg.setFaultBody(e.getCause());
-        }
-        return msg;
-    }
-
-    private void findMatchingMethod() {
-        Class<?> interfaze = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-
-        for (Method method : interfaze.getMethods()) {
-            if (match(operation, method)) {
-                theMethod = method;
-            }
-        }
-    }
-
-    private static boolean match(Operation operation, Method method) {
-        Class<?>[] params = method.getParameterTypes();
-        DataType<List<DataType>> inputType = operation.getInputType();
-        List<DataType> types = inputType.getLogical();
-        boolean matched = true;
-        if (types.size() == params.length && method.getName().equals(operation.getName())) {
-            for (int i = 0; i < params.length; i++) {
-                Class<?> clazz = params[i];
-                if (!clazz.equals(operation.getInputType().getLogical().get(i).getPhysical())) {
-                    matched = false;
-                }
-            }
-        } else {
-            matched = false;
-        }
-        return matched;
-
-    }
-
-    private Object[] prepareParameters(Object payload, Configuration configuration, Properties props) {
-        if (payload == null) {
-            return new Object[0];
-        }
-        Object[] inputArguments = null;
-        if (payload.getClass().isArray()) {
-            inputArguments = (Object[])payload;
-        } else {
-            inputArguments = new Object[1];
-            inputArguments[0] = payload;
-        }
-
-        Object[] parameters = new Object[inputArguments.length];
-
-        for (int i = 0; i < inputArguments.length; i++) {
-            if (inputArguments[i] instanceof NodeInfo) {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                StreamResult sw = new StreamResult(baos);
-                try {
-                    QueryResult.serialize((NodeInfo)inputArguments[i], sw, props, ((NodeInfo)inputArguments[i]).getConfiguration());
-                    baos.close();
-                    ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-                    StreamSource ss = new StreamSource(bais);
-                    parameters[i] = Builder.build(ss, null, configuration);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    parameters[i] = null;
-                }
-            } else {
-                parameters[i] = inputArguments[i];
-            }
-        }
-
-        return parameters;
-    }
-
-    private Object transformProperty(Object argument, Configuration configuration) {
-        Object parameter = argument;
-        if (argument instanceof Document) {
-            try {
-                Document doc = (Document)argument;
-                Node valueNode = doc.getFirstChild();
-                DocumentInfo docInfo = null;
-                if (valueNode instanceof Element && valueNode.getNodeName().equals("value")) {
-                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                    StreamResult sr = new StreamResult(baos);
-                    try {
-                        Node element = null;
-                        NodeList list = valueNode.getChildNodes();
-                        for (int i = 0; i < list.getLength(); i++) {
-                            if (list.item(i).getNodeType() == Node.ELEMENT_NODE) {
-                                element = list.item(i);
-                                break;
-                            }
-                        }
-                        if (element == null) {
-                            element = valueNode.getFirstChild();
-                        }
-                        Transformer transformer = TransformerFactory.newInstance().newTransformer();
-                        transformer.transform(new DOMSource(element), sr);
-                        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-                        docInfo = (DocumentInfo)Builder.build(new StreamSource(bais), null, configuration);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        return parameter;
-                    }
-                } else {
-                	docInfo = (DocumentInfo)Builder.build(new DOMSource(doc), null, configuration);
-                }
-                parameter = docInfo;
-            } catch (XPathException e) {
-                e.printStackTrace();
-                return parameter;
-            }
-        }
-
-        return parameter;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java b/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
deleted file mode 100644
index 5e77575c3c..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
+++ /dev/null
@@ -1,35 +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.implementation.xquery.impl;
-
-import org.apache.tuscany.sca.implementation.xquery.XQueryImplementation;
-import org.apache.tuscany.sca.implementation.xquery.XQueryImplementationFactory;
-
-/**
- * Actual implementation of the XQuery implementation factory
- * @version $Rev$ $Date$
- */
-public class XQueryImplementationFactoryImpl implements XQueryImplementationFactory {
-
-    public XQueryImplementation createXQueryImplementation() {
-        XQueryImplementation implementation = new XQueryImplementationImpl();
-        return implementation;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java b/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
deleted file mode 100644
index 77c8eea511..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
+++ /dev/null
@@ -1,102 +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.implementation.xquery.impl;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-import net.sf.saxon.query.XQueryExpression;
-
-import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
-import org.apache.tuscany.sca.implementation.xquery.XQueryImplementation;
-
-/**
- * Actual implementation of the XQuery implementation
- * @version $Rev$ $Date$
- */
-public class XQueryImplementationImpl extends ImplementationImpl implements XQueryImplementation {
-
-    private String location;
-    private String locationURL;
-    private String xqExpression;
-
-    private Map<String, XQueryExpression> compiledExpressionsCache = new HashMap<String, XQueryExpression>();
-    private Map<Method, String> xqExpressionExtensionsMap = new HashMap<Method, String>();
-
-    public XQueryImplementationImpl() {
-        setUnresolved(true);
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-    
-    public String getLocationURL() {
-        return locationURL;
-    }
-
-    public void setLocationURL(String locationURL) {
-        this.locationURL = locationURL;
-    }
-
-    public String getXqExpression() {
-        return xqExpression;
-    }
-
-    public void setXqExpression(String xqExpression) {
-        this.xqExpression = xqExpression;
-    }
-
-    public Map<String, XQueryExpression> getCompiledExpressionsCache() {
-        return compiledExpressionsCache;
-    }
-
-    public Map<Method, String> getXqExpressionExtensionsMap() {
-        return xqExpressionExtensionsMap;
-    }
-
-    @Override
-    public int hashCode() {
-        final int PRIME = 31;
-        int result = super.hashCode();
-        result = PRIME * result + ((location == null) ? 0 : location.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null || getClass() != obj.getClass())
-            return false;
-        final XQueryImplementationImpl other = (XQueryImplementationImpl)obj;
-        if (location == null) {
-            if (other.location != null)
-                return false;
-        } else if (!location.equals(other.location))
-            return false;
-        return true;
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java b/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
deleted file mode 100644
index c8d19bf149..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
+++ /dev/null
@@ -1,157 +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.implementation.xquery.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.implementation.xquery.XQueryImplementation;
-import org.apache.tuscany.sca.implementation.xquery.XQueryImplementationFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * Processor for the XQuery implementation type artifact
- * @version $Rev$ $Date$
- */
-public class XQueryImplementationProcessor implements StAXArtifactProcessor<XQueryImplementation> {
-    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
-    private static final String LOCATION = "location";
-    private static final String IMPLEMENTATION_XQUERY = "implementation.xquery";
-    private static final QName IMPLEMENTATION_XQUERY_QNAME =
-        new QName(SCA10_TUSCANY_NS, IMPLEMENTATION_XQUERY);
-    
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-    private ContributionFactory contributionFactory;
-    private Monitor monitor;
-
-    public XQueryImplementationProcessor(FactoryExtensionPoint modelFactoryExtensionPoint, Monitor monitor) {
-        assemblyFactory = modelFactoryExtensionPoint.getFactory(AssemblyFactory.class);
-        javaFactory = modelFactoryExtensionPoint.getFactory(JavaInterfaceFactory.class);
-        contributionFactory = modelFactoryExtensionPoint.getFactory(ContributionFactory.class);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-	        Problem problem = monitor.createProblem(this.getClass().getName(), "impl-xquery-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-    }
-
-    public QName getArtifactType() {
-        return IMPLEMENTATION_XQUERY_QNAME;
-    }
-
-    /**
-     * Reads  from the stream and sets the location attribute of the implementation correspondingly
-     */
-    public XQueryImplementation read(XMLStreamReader reader)
-        throws ContributionReadException, XMLStreamException {
-    	
-    	/* Create the XQuery implementation and set the location into it */
-        XQueryImplementation xqueryImplementation = null;
-
-        /* Read the location attribute for the XQuery implementation  */
-        String xqueryLocation = reader.getAttributeValue(null, LOCATION);
-        if (xqueryLocation != null) {
-        	xqueryImplementation = XQueryImplementationFactory.INSTANCE.createXQueryImplementation();
-            xqueryImplementation.setLocation(xqueryLocation);
-            xqueryImplementation.setUnresolved(true);
-        } else {        
-        	error("LocationAttributeMissing", reader);
-            //throw new ContributionReadException(MSG_LOCATION_MISSING);
-        }        
-
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && IMPLEMENTATION_XQUERY_QNAME.equals(reader.getName())) {
-                break;
-            }
-        } // end while
-
-        return xqueryImplementation;
-    }
-
-    public void write(XQueryImplementation xqueryImplementation, XMLStreamWriter writer)
-        throws ContributionWriteException, XMLStreamException {
-        
-        writer.writeStartElement(SCA10_TUSCANY_NS, IMPLEMENTATION_XQUERY);
-        if (xqueryImplementation.getLocation() != null) {
-            writer.writeAttribute(LOCATION, xqueryImplementation.getLocation());
-        }
-        writer.writeEndElement();
-
-    }
-
-    public Class<XQueryImplementation> getModelType() {
-        return XQueryImplementation.class;
-    }
-
-    /**
-     * Resolves the implementation: its services and references, by invoking the XQuery
-     * introspector
-     */
-    public void resolve(XQueryImplementation xqueryImplementation, ModelResolver resolver)
-        throws ContributionResolveException {
-    	
-    	if (xqueryImplementation != null) {
-            Artifact artifact = contributionFactory.createArtifact();
-            artifact.setURI(xqueryImplementation.getLocation());
-    	    artifact = resolver.resolveModel(Artifact.class, artifact);
-    	    if (artifact.getLocation() != null) {
-    	    	xqueryImplementation.setLocationURL(artifact.getLocation());
-    	        
-    	    	XQueryIntrospector introspector = new XQueryIntrospector(assemblyFactory, javaFactory);
-    	        
-    	        boolean success = introspector.introspect(xqueryImplementation, resolver);
-    	        if (success) {
-    	            xqueryImplementation.setUnresolved(false);
-    	        }
-    	    } else {
-    	    	error("CouldNotLocateFile", resolver, xqueryImplementation.getLocation());
-                //throw new ContributionResolveException("Could not locate file: " + xqueryImplementation.getLocation());
-    	    }
-    	}
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java b/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
deleted file mode 100644
index 59ac68aa7d..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
+++ /dev/null
@@ -1,328 +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.implementation.xquery.xml;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-import net.sf.saxon.Configuration;
-import net.sf.saxon.om.NamespaceResolver;
-import net.sf.saxon.query.StaticQueryContext;
-import net.sf.saxon.query.XQueryExpression;
-import net.sf.saxon.trans.XPathException;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.implementation.xquery.XQueryImplementation;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-
-/**
- * This class introspects an XQuery file and extracts out of it
- * all implemented service, references and properties
- * It also creates expression extensions for each operation
- * in the implemented services
- * @version $Rev$ $Date$
- */
-public class XQueryIntrospector {
-
-    private static final String SCA_SERVICE_PREFIX = "scaservice:java/";
-    private static final String SCA_REFERENCE_PREFIX = "scareference:java/";
-    private static final String SCA_PROPERTY_JAVA_PREFIX = "scaproperty:java/";
-    private static final String SCA_PROPERTY_XML_PREFIX = "scaproperty:xml/";
-
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-
-    public XQueryIntrospector(AssemblyFactory assemblyFactory, JavaInterfaceFactory javaFactory) {
-        super();
-        this.assemblyFactory = assemblyFactory;
-        this.javaFactory = javaFactory;
-    }
-
-    public boolean introspect(XQueryImplementation xqueryImplementation, ModelResolver resolver) throws ContributionResolveException {
-        
-        String xqExpression = null;
-        try {
-            URL url = new URL(xqueryImplementation.getLocationURL());
-            xqExpression = loadXQExpression(url);
-        } catch (FileNotFoundException e) {
-            throw new ContributionResolveException(e);
-        } catch (IOException e) {
-            throw new ContributionResolveException(e);
-        }
-
-        if (xqExpression == null) {
-            return false;
-        }
-
-        xqueryImplementation.setXqExpression(xqExpression);
-
-        xqExpression += "\r\n<dummy></dummy>";
-
-        Configuration config = new Configuration();
-        StaticQueryContext sqc = new StaticQueryContext(config);
-        XQueryExpression exp = null;
-        try {
-            exp = sqc.compileQuery(xqExpression);
-        } catch (XPathException e) {
-            throw new ContributionResolveException(e);
-        }
-
-        if (exp == null) {
-            return false;
-        }
-        xqueryImplementation.getCompiledExpressionsCache().put(xqExpression, exp);
-
-        try {
-            introspectServicesAndReferences(xqueryImplementation, exp, resolver);
-        } catch (ClassNotFoundException e) {
-            throw new ContributionResolveException(e);
-        } catch (InvalidInterfaceException e) {
-            throw new ContributionResolveException(e);
-        }
-
-        fillExpressionExtensions(xqueryImplementation);
-
-        return true;
-    }
-
-    /**
-     * Loads the XQuery expression from the location that is provided with the implementation
-     */
-    private String loadXQExpression(URL locationURL) throws FileNotFoundException, IOException {
-    	
-        InputStream xqResourceStream = locationURL.openStream();
-
-        if (xqResourceStream == null) {
-            return null;
-        }
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        int i = 0;
-        while ((i = xqResourceStream.read()) >= 0) {
-            baos.write(i);
-        }
-        xqResourceStream.close();
-        baos.flush();
-        baos.close();
-
-        String xqExpression = baos.toString();
-
-        return xqExpression;
-    }
-    
-    private Class<?> resolveClass(ModelResolver resolver, String className) throws ClassNotFoundException {
-        ClassReference classReference = new ClassReference(className);
-        classReference = resolver.resolveModel(ClassReference.class, classReference);
-        Class<?> javaClass = classReference.getJavaClass();
-        if (javaClass == null) {
-            throw new ClassNotFoundException(className);
-        } else {
-            return javaClass;
-        }
-    }
-
-    /**
-     * From the compiled XQuery expression get all namespaces and see if they
-     * are services, references or properties declarations
-     */
-    private void introspectServicesAndReferences(XQueryImplementation xqueryImplementation, XQueryExpression exp, ModelResolver resolver)
-        throws ClassNotFoundException, InvalidInterfaceException {
-        NamespaceResolver namespaceResolver = exp.getStaticContext().getNamespaceResolver();
-        Iterator declaredPrefixesIterator = namespaceResolver.iteratePrefixes();
-        while (declaredPrefixesIterator.hasNext()) {
-            String prefix = (String)declaredPrefixesIterator.next();
-            String uri = namespaceResolver.getURIForPrefix(prefix, false);
-            if (uri.startsWith(SCA_SERVICE_PREFIX)) {
-                String serviceName = prefix;
-                String className = uri.substring(SCA_SERVICE_PREFIX.length());
-                Class<?> interfaze = resolveClass(resolver, className);
-                Service theService = createService(interfaze, serviceName);
-                xqueryImplementation.getServices().add(theService);
-            } else if (uri.startsWith(SCA_REFERENCE_PREFIX)) {
-                String referenceName = prefix;
-                String className = uri.substring(SCA_REFERENCE_PREFIX.length());
-                Class<?> interfaze = resolveClass(resolver, className);
-                Reference theReference = createReference(interfaze, referenceName);
-                xqueryImplementation.getReferences().add(theReference);
-            } else if (uri.startsWith(SCA_PROPERTY_JAVA_PREFIX)) {
-                String propertyName = prefix;
-                String className = uri.substring(SCA_PROPERTY_JAVA_PREFIX.length());
-                Class<?> clazz = resolveClass(resolver, className);
-                QName xmlType = JavaXMLMapper.getXMLType(clazz);
-                Property theProperty = createProperty(xmlType, propertyName);
-                xqueryImplementation.getProperties().add(theProperty);
-            } else if (uri.startsWith(SCA_PROPERTY_XML_PREFIX)) {
-                String propertyName = prefix;
-                String namespaceAndLocalname = uri.substring(SCA_PROPERTY_XML_PREFIX.length());
-                int localNameDelimiterPostition = namespaceAndLocalname.lastIndexOf(':');
-                String localName = null;
-                String namespace = null;
-                if (localNameDelimiterPostition < 0) {
-                    localName = namespaceAndLocalname;
-                    namespace = "";
-                } else {
-                    namespace = namespaceAndLocalname.substring(0, localNameDelimiterPostition);
-                    localName = namespaceAndLocalname.substring(localNameDelimiterPostition + 1);
-                }
-                QName xmlType = new QName(namespace, localName);
-                Property theProperty = createProperty(xmlType, propertyName);
-                xqueryImplementation.getProperties().add(theProperty);
-            }
-        }
-    }
-
-    /**
-     * Creates a Service for the component type based on its name and Java interface
-     */
-    private Service createService(Class<?> interfaze, String name) throws InvalidInterfaceException {
-        Service service = assemblyFactory.createService();
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        service.setInterfaceContract(interfaceContract);
-
-        // Set the name for the service
-        service.setName(name);
-
-        // Set the call interface and, if present, the callback interface
-        JavaInterface callInterface = null;
-        try {
-            callInterface = (JavaInterface) javaFactory.createJavaInterface(interfaze).clone();
-        } catch (CloneNotSupportedException e) {
-            // Ignore
-        }
-        //setDataBindingForInterface(callInterface, DataObject.class.getName());
-        service.getInterfaceContract().setInterface(callInterface);
-        if (callInterface.getCallbackClass() != null) {
-            JavaInterface callbackInterface = null;
-            try {
-                callbackInterface = (JavaInterface) javaFactory.createJavaInterface(callInterface.getCallbackClass()).clone();
-            } catch (CloneNotSupportedException e) {
-                //Ignore
-            }
-            //setDataBindingForInterface(callbackInterface, DataObject.class.getName());
-            service.getInterfaceContract().setCallbackInterface(callbackInterface);
-        }
-        return service;
-    } // end method createService
-
-    protected Property createProperty(QName type, String name) {
-
-        Property property = assemblyFactory.createProperty();
-        property.setName(name);
-        property.setXSDType(type);
-
-        property.setMany(false);
-        return property;
-
-    }
-
-    /**
-     * Creates a Reference for the component type based on its name and Java interface
-     */
-    private Reference createReference(Class<?> interfaze, String name) throws InvalidInterfaceException {
-        Reference reference = assemblyFactory.createReference();
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        reference.setInterfaceContract(interfaceContract);
-
-        // Set the name of the reference to the supplied name and the multiplicity of the reference
-        // to 1..1 - for XQuery implementations, this is the only multiplicity supported
-        reference.setName(name);
-        reference.setMultiplicity(Multiplicity.ONE_ONE);
-
-        // Set the call interface and, if present, the callback interface
-        // Set the call interface and, if present, the callback interface
-        JavaInterface callInterface = null;
-        try {
-            callInterface = (JavaInterface) javaFactory.createJavaInterface(interfaze).clone();
-        } catch (CloneNotSupportedException e) {
-            // Ignore
-        }
-        reference.getInterfaceContract().setInterface(callInterface);
-        if (callInterface.getCallbackClass() != null) {
-            JavaInterface callbackInterface = null;
-            try {
-                callbackInterface = (JavaInterface) javaFactory.createJavaInterface(callInterface.getCallbackClass()).clone();
-            } catch (CloneNotSupportedException e) {
-                //Ignore
-            }
-            reference.getInterfaceContract().setCallbackInterface(callbackInterface);
-        }
-
-        return reference;
-    }
-
-    /**
-     * For the methods of each implemented service corresponding expression extension
-     * is generated
-     * @param xqueryImplementation
-     */
-    private void fillExpressionExtensions(XQueryImplementation xqueryImplementation) {
-        for (Service service : xqueryImplementation.getServices()) {
-            Class<?> interfaze = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
-
-            // For each of the methods
-            for (Method method : interfaze.getMethods()) {
-                String expressionExtension = createExpressionExtension(method, interfaze, service.getName());
-                xqueryImplementation.getXqExpressionExtensionsMap().put(method, expressionExtension);
-            }
-        }
-    }
-
-    private String createExpressionExtension(Method method, Class<?> interfaze, String serviceName) {
-        StringBuffer exprBuf = new StringBuffer();
-
-        exprBuf.append("\r\n");
-
-        String methodName = method.getName();
-
-        // For each of the declared parameters
-        for (int i = 0; i < method.getParameterTypes().length; i++) {
-            exprBuf.append("declare variable $" + methodName + "_" + i + " external;\r\n");
-        }
-
-        exprBuf.append(serviceName + ":" + methodName + "(");
-
-        for (int i = 0; i < method.getParameterTypes().length; i++) {
-            exprBuf.append("$" + methodName + "_" + i);
-            if (i != method.getParameterTypes().length - 1) {
-                exprBuf.append(", ");
-            }
-        }
-        exprBuf.append(")");
-
-        return exprBuf.toString();
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index a51995e56d..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.xquery.xml.XQueryImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#implementation.xquery,model=org.apache.tuscany.sca.implementation.xquery.XQueryImplementation
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca-contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 7ccc08d1ee..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the implementation extension

-org.apache.tuscany.sca.implementation.xquery.XQueryImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.xquery.XQueryImplementation

diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties b/java/sca-contrib/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
deleted file mode 100644
index 33c605de27..0000000000
--- a/java/sca-contrib/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
+++ /dev/null
@@ -1,22 +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.
-#
-#
-CouldNotLocateFile = Could not locate file: {0}
-LocationAttributeMissing = Reading implementation.xquery - location attribute missing
\ No newline at end of file
diff --git a/java/sca-contrib/modules/node-dynamic/LICENSE b/java/sca-contrib/modules/node-dynamic/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/node-dynamic/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/node-dynamic/NOTICE b/java/sca-contrib/modules/node-dynamic/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/node-dynamic/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/node-dynamic/pom.xml b/java/sca-contrib/modules/node-dynamic/pom.xml
deleted file mode 100644
index 91fbc9e025..0000000000
--- a/java/sca-contrib/modules/node-dynamic/pom.xml
+++ /dev/null
@@ -1,87 +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>

-

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>1.4-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tuscany-node-dynamic</artifactId>

-    <name>Apache Tuscany SCA Dynamic Node</name>

-

-    <dependencies>          

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>1.4-SNAPSHOT</version>

-        </dependency>          

-     

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca-jms</artifactId>

-            <version>1.4-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>          

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.4-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>          

-

-    </dependencies>

-

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <mainClass>org.apache.tuscany.sca.node.DynamicNodeMain</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-

-            <plugin>

-                <groupId>org.apache.felix</groupId>

-                <artifactId>maven-bundle-plugin</artifactId>

-

-                <configuration>

-                    <instructions>

-                        <Bundle-Version>${tuscany.version}</Bundle-Version>

-                        <Bundle-SymbolicName>org.apache.tuscany.sca.node.dynamic</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.node*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java b/java/sca-contrib/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java
deleted file mode 100644
index af6155e500..0000000000
--- a/java/sca-contrib/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java
+++ /dev/null
@@ -1,50 +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.node;

-

-import java.io.File;

-

-public class DynamicNodeMain {

-

-    /**

-     * Start an SCA node 

-     * @param args a list of contribution jars for the node to run

-     */

-    public static void main(String[] args) throws Exception {

-

-        SCAContribution[] contributions = new SCAContribution[args.length];

-        for (int i=0; i<args.length; i++) {

-            File f = new File(args[i]);

-            if (!f.exists()) {

-                System.err.println("contribution not found: " + f);

-                System.exit(1);

-            }

-            contributions[i] = new SCAContribution(args[i], f.toURL().toString());

-        }

-

-        SCANode node = SCANodeFactory.newInstance().createSCANode(null, contributions);

-        node.start();

-        

-        System.out.println("Hit enter to stop node...");

-        System.in.read();

-

-        node.stop();

-    }

-}

diff --git a/java/sca-contrib/modules/node-dynamic/src/main/resources/log4j.properties b/java/sca-contrib/modules/node-dynamic/src/main/resources/log4j.properties
deleted file mode 100644
index e5b3f8ebfb..0000000000
--- a/java/sca-contrib/modules/node-dynamic/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,51 +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.
-## ---------------------------------------------------------------------------
-
-#
-# 
-#
-log4j.rootLogger=INFO, stdout, out
-log4j.logger.org.apache.activemq.spring=WARN
-log4j.logger.org.springframework=WARN
-log4j.logger.org.apache.xbean.spring=WARN
-
-# When debugging or reporting problems to the ActiveMQ team,
-# comment out the above lines and uncomment the next.
-
-#log4j.rootLogger=DEBUG, out, stdout
-
-# Or for more fine grained debug logging uncomment one of these
-#log4j.logger.org.apache.activemq=DEBUG
-#log4j.logger.org.apache.camel=DEBUG
-
-
-
-#The logging properties used during tests..
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%-5p %-30.30c{1} - %m%n
-#log4j.appender.stdout.threshold=INFO
-
-# File appender
-log4j.appender.out=org.apache.log4j.RollingFileAppender
-log4j.appender.out.file=${activemq.base}/data/activemq.log
-log4j.appender.out.maxFileSize=1024KB
-log4j.appender.out.maxBackupIndex=5
-log4j.appender.out.append=true
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
diff --git a/java/sca-contrib/modules/node-launcher-webapp/LICENSE b/java/sca-contrib/modules/node-launcher-webapp/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/node-launcher-webapp/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/node-launcher-webapp/NOTICE b/java/sca-contrib/modules/node-launcher-webapp/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/node-launcher-webapp/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/node-launcher-webapp/pom.xml b/java/sca-contrib/modules/node-launcher-webapp/pom.xml
deleted file mode 100644
index cef83359a6..0000000000
--- a/java/sca-contrib/modules/node-launcher-webapp/pom.xml
+++ /dev/null
@@ -1,72 +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>
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-node-launcher-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Node WebApp</name>
-
-    <dependencies>   
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-
-    <build>
-        <plugins>
-            <plugin>
-               <artifactId>maven-eclipse-plugin</artifactId>
-               <version>2.5.1</version>
-               <configuration>
-                   <buildcommands>
-                       <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
-                   </buildcommands>
-                   <projectnatures>
-                       <projectnature>org.eclipse.jdt.core.javanature</projectnature>
-                   </projectnatures>
-                   <classpathContainers>
-                       <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
-                   </classpathContainers>
-               </configuration>
-           </plugin>
-           <plugin> 
-               <groupId>org.apache.tuscany.sca</groupId> 
-               <artifactId>tuscany-maven-bundle-plugin</artifactId> 
-               <version>2.0-SNAPSHOT</version>
-               <configuration>
-                <skip>true</skip>
-               </configuration> 
-           </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 78bbebbb83..0000000000
--- a/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,21 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-</contribution>
diff --git a/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 6c2c943c99..0000000000
--- a/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  * 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.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-  <display-name>Apache Tuscany SCA Node</display-name>
-
-  <filter>
-    <filter-name>tuscany</filter-name> 
-    <filter-class>org.apache.tuscany.sca.node.launcher.NodeServletFilter</filter-class> 
-  </filter>
-
-  <filter-mapping>
-    <filter-name>tuscany</filter-name> 
-    <url-pattern>/*</url-pattern> 
-  </filter-mapping>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-
-</web-app>
diff --git a/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/index.jsp b/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/index.jsp
deleted file mode 100644
index 3cc6c7b504..0000000000
--- a/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,27 +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.
---%>

-

-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<html>
-<head><title>Apache Tuscany SCA Node</title></head>
-
-<body>
-<h1>It works!</h1>
-</body>
-</html>

diff --git a/java/sca-contrib/modules/node-manager/LICENSE b/java/sca-contrib/modules/node-manager/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/node-manager/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/node-manager/META-INF/MANIFEST.MF b/java/sca-contrib/modules/node-manager/META-INF/MANIFEST.MF
deleted file mode 100644
index 55a65fb055..0000000000
--- a/java/sca-contrib/modules/node-manager/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.implementation.node.manager;use

- s:="javax.servlet,org.oasisopen.sca.annotation,org.apache.tuscany.sca.dat

- a.collection,org.apache.tuscany.sca.node.launcher,javax.xml.parsers,o

- rg.osoa.sca,javax.servlet.http";version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Node Manager Application

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397411859

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Node Manager Application

-Import-Package: javax.servlet,javax.servlet.http,javax.xml.parsers,org

- .apache.tuscany.sca.data.collection;version="2.0.0",org.apache.tuscany.

- sca.implementation.node.manager;version="2.0.0",org.apache.tuscany.sca.

- node.launcher;version="2.0.0",org.oasisopen.sca;version="2.0.0",org.oasisopen.sca.a

- nnotations;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.node.manager

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/node-manager/NOTICE b/java/sca-contrib/modules/node-manager/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/node-manager/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/node-manager/pom.xml b/java/sca-contrib/modules/node-manager/pom.xml
deleted file mode 100644
index fa01090467..0000000000
--- a/java/sca-contrib/modules/node-manager/pom.xml
+++ /dev/null
@@ -1,112 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-node-manager</artifactId>
-    <name>Apache Tuscany SCA Node Manager Application</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-	        <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java b/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
deleted file mode 100644
index 8dfae91314..0000000000
--- a/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
+++ /dev/null
@@ -1,51 +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.implementation.node.manager;
-
-/**
- * Utility methods for node implementation launchers.
- *
- * @version $Rev$ $Date$
- */
-public class NodeManagerUtil {
-
-    private static final String TUSCANY_DOMAIN = "TUSCANY_DOMAIN";
-    private static final String DEFAULT_DOMAIN = "http://localhost:9990";
-
-    /**
-     * Determine the URI of a node configuration. The domain URI can be configured
-     * using a TUSCANY_DOMAIN system property or environment variable.
-     * 
-     * @param nodeName
-     * @return
-     */
-    public static String nodeConfigurationURI(String nodeName) {
-        String domain = System.getProperty(TUSCANY_DOMAIN);
-        if (domain == null || domain.length() == 0) {
-            domain = System.getenv(TUSCANY_DOMAIN);
-        }
-        if (domain == null || domain.length() ==0) {
-            domain = DEFAULT_DOMAIN;
-        }
-        String nodeConfiguration = domain + "/node-config/" + nodeName;
-        return nodeConfiguration;
-    }
-    
-}
diff --git a/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java b/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
deleted file mode 100644
index 340c6236fa..0000000000
--- a/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
+++ /dev/null
@@ -1,338 +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.implementation.node.manager;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-import org.apache.tuscany.sca.data.collection.ItemCollection;
-import org.apache.tuscany.sca.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a node process collection service. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(interfaces={ItemCollection.class, LocalItemCollection.class})
-public class NodeProcessCollectionImpl implements ItemCollection, LocalItemCollection {
-
-    private static final Logger logger = Logger.getLogger(NodeProcessCollectionImpl.class.getName());    
-
-    private List<SCANodeVM> nodeVMs = new ArrayList<SCANodeVM>();
-
-    /**
-     * Initialize the component.
-     */
-    @Init
-    public void initialize() {
-    }
-    
-    public Entry<String, Item>[] getAll() {
-        logger.fine("getAll");
-        
-        // Return all the running VMs
-        List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
-        for (SCANodeVM vm: nodeVMs) {
-            entries.add(entry(vm));
-        }
-        return entries.toArray(new Entry[entries.size()]);
-    }
-
-    public Item get(String key) throws NotFoundException {
-        logger.fine("get " + key);
-
-        // Return the specified VM
-        SCANodeVM vm = vm(key);
-        if (vm == null) {
-            throw new NotFoundException();
-        }
-        
-        return item(vm);
-    }
-
-    public String post(String key, Item item) {
-        logger.fine("post " + key);
-
-        // If the VM is already running just return it
-        SCANodeVM vm = vm(key);
-        if (vm != null) {
-            if (vm.isAlive()) {
-                return key;
-            } else {
-                // Remove dead VM entry
-                try {
-                    vm.stop();
-                } catch (InterruptedException e) {
-                    throw new ServiceRuntimeException(e);
-                }
-                nodeVMs.remove(vm);
-            }
-        }
-
-        // Start a new VM and add it to the collection
-        vm = new SCANodeVM(key);
-        nodeVMs.add(0, vm);
-        try {
-            vm.start();
-        } catch (IOException e) {
-            throw new ServiceRuntimeException(e);
-        }
-        
-        return key;
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    public void delete(String key) throws NotFoundException {
-        logger.fine("delete " + key);
-        
-        // Stop a VM and remove it from the collection
-        SCANodeVM vm = vm(key);
-        if (vm != null) {
-            try {
-                vm.stop();
-            } catch (InterruptedException e) {
-                throw new ServiceRuntimeException(e);
-            }
-            nodeVMs.remove(vm);
-        } else {
-            //throw new NotFoundException();
-        }
-    }
-    
-    public Entry<String, Item>[] query(String queryString) {
-        logger.fine("query " + queryString);
-        
-        if (queryString.startsWith("node=")) {
-            
-            // Return the log for the specified VM
-            String key = queryString.substring(queryString.indexOf('=') + 1);
-            List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
-            for (SCANodeVM vm: nodeVMs) {
-                if (vm.getNodeName().equals(key)) {
-                    entries.add(entry(vm));
-                }
-            }
-            return entries.toArray(new Entry[entries.size()]);
-            
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-    
-    /**
-     * Returns the specified VM.
-     * 
-     * @param key
-     * @return
-     */
-    private SCANodeVM vm(String key) {
-        for (SCANodeVM vm: nodeVMs) {
-            if (key.equals(vm.getNodeName())) {
-                return vm;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns an entry representing a VM.
-     * 
-     * @param vm
-     * @return
-     */
-    private static Entry<String, Item> entry(SCANodeVM vm) {
-        Entry<String, Item> entry = new Entry<String, Item>();
-        entry.setKey(vm.getNodeName());
-        entry.setData(item(vm));
-        return entry;
-    }
-    
-    /**
-     * Returns an item representing a VM.
-     * 
-     * @param vm
-     * @return
-     */
-    private static Item item(SCANodeVM vm) {
-        Item item = new Item();
-        String key = vm.getNodeName();
-        item.setTitle(title(key));
-        item.setLink("/node-config/" + vm.getNodeName());
-        item.setContents("<span id=\"log\" style=\"white-space: nowrap; font-size: small\">" + vm.getLog().toString() + "</span>");
-        return item;
-    }
-    
-    /**
-     * Represent a child Java VM running an SCA node.
-     */
-    private static class SCANodeVM {
-        private String nodeName;
-        private StringBuffer log;
-        private Process process;
-        private Thread monitor;
-        private int status;
-        
-        SCANodeVM(String nodeName) {
-            log = new StringBuffer();
-            this.nodeName =nodeName;
-        }
-        
-        /**
-         * Starts a node in a new VM.
-         */
-        private void start() throws IOException {
-
-            // Determine the node configuration URI
-            String nodeConfigurationURI = NodeManagerUtil.nodeConfigurationURI(nodeName);
-            
-            // Build the Java VM command line
-            Properties props = System.getProperties();
-            String java = props.getProperty("java.home") + "/bin/java";
-            String cp = props.getProperty("java.class.path");
-            String main = NodeLauncher.class.getName();
-            final List<String> command = new ArrayList<String>();
-            command.add(java);
-            command.add("-cp");
-            command.add(cp);
-            
-            // Propagate TUSCANY properties
-            String tuscanyHome = props.getProperty("TUSCANY_HOME");
-            if (tuscanyHome != null) {
-                command.add("-DTUSCANY_HOME=" + tuscanyHome);
-            }
-            String tuscanyPath = props.getProperty("TUSCANY_PATH");
-            if (tuscanyPath != null) {
-                command.add("-DTUSCANY_PATH=" + tuscanyPath);
-            }
-
-            // Specify the main class and parameters
-            command.add(main);
-            command.add(nodeConfigurationURI);
-            
-            logger.info("Starting " + "java " + main + " " + nodeConfigurationURI);
-            
-            // Start the VM
-            ProcessBuilder builder = new ProcessBuilder(command);
-            builder.redirectErrorStream(true);
-            process = builder.start();
-            
-            logger.info("Started " + process);
-            
-            // Start a thread to monitor the process
-            final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-            monitor = new Thread(new Runnable() {
-                public void run() {
-                    try {
-                        for (;;) {
-                            String s = reader.readLine();
-                            if (s != null) {
-                                logger.info(s);
-                                log.append(s + "<br>");
-                            } else {
-                                break;
-                            }
-                        }
-                        status = process.waitFor();
-                    } catch (IOException e) {
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            });
-            monitor.start();
-        }
-
-        /**
-         * Returns the composite used to start this VM.
-         * @return
-         */
-        String getNodeName() {
-            return nodeName;
-        }
-        
-        /**
-         * Returns the log for this VM.
-         * 
-         * @return
-         */
-        StringBuffer getLog() {
-            return log;
-        }
-
-        /**
-         * Returns true if the VM is alive
-         * 
-         * @return
-         */
-        private boolean isAlive() {
-            return monitor.isAlive();
-        }
-        
-        /**
-         * Returns the VM status code.
-         * @return
-         */
-        int getStatus() {
-            return status;
-        }
-
-        /**
-         * Stops the VM.
-         * 
-         * @throws InterruptedException
-         */
-        private void stop() throws InterruptedException {
-            logger.info("Stopping " + process);
-            
-            process.destroy();
-            monitor.join();
-            
-            logger.info("Stopped " + process);
-        }
-    }
-    
-    /**
-     * Returns a node title.
-     * 
-     * @param key
-     * @return
-     */
-    private static String title(String key) {
-        return key;
-    }
-
-}
diff --git a/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java b/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
deleted file mode 100644
index d23674ed4a..0000000000
--- a/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
+++ /dev/null
@@ -1,61 +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.implementation.node.manager;
-
-import java.io.IOException;
-import java.util.logging.Logger;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Implementation of a ping service component.
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(interfaces={Servlet.class})
-public class PingServiceImpl extends HttpServlet {
-    private static final long serialVersionUID = -3477992129462720901L;
-
-    private static final Logger logger = Logger.getLogger(PingServiceImpl.class.getName());    
-
-    /**
-     * Initialize the component.
-     */
-    @Init
-    public void initialize() throws ParserConfigurationException {
-    }
-
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        logger.fine("ping");
-        response.getWriter().print("<html><body><span id=\"ping\">OK</span></body></html>");
-    }
-    
-}
diff --git a/java/sca-contrib/modules/node-manager/src/main/resources/NodeDaemon.composite b/java/sca-contrib/modules/node-manager/src/main/resources/NodeDaemon.composite
deleted file mode 100644
index cb587b02fd..0000000000
--- a/java/sca-contrib/modules/node-manager/src/main/resources/NodeDaemon.composite
+++ /dev/null
@@ -1,39 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    name="NodeDaemon">
-
-    <component name="NodeProcessCollectionComponent">
-        <implementation.java class="org.apache.tuscany.sca.implementation.node.manager.NodeProcessCollectionImpl"/>
-   		<service name="ItemCollection">
-   	 		<t:binding.atom uri="http://localhost:9990/node/processes" title="Log"/>
-   		</service>
-    </component>
-
-    <component name="PingServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.implementation.node.manager.PingServiceImpl"/>
-   		<service name="Servlet">
-   	 		<t:binding.http uri="http://localhost:9990/ping"/>
-   		</service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/modules/policy-logging/LICENSE b/java/sca-contrib/modules/policy-logging/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/policy-logging/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/policy-logging/META-INF/MANIFEST.MF b/java/sca-contrib/modules/policy-logging/META-INF/MANIFEST.MF
deleted file mode 100644
index df410e306f..0000000000
--- a/java/sca-contrib/modules/policy-logging/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.policy.logging;version="2.0.0",o

- rg.apache.tuscany.sca.policy.logging.jdk;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany Logging Policy Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397480671

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany Logging Policy Model

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.definitions;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.policy.logging

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/policy-logging/NOTICE b/java/sca-contrib/modules/policy-logging/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/policy-logging/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/policy-logging/pom.xml b/java/sca-contrib/modules/policy-logging/pom.xml
deleted file mode 100644
index 218458c9fb..0000000000
--- a/java/sca-contrib/modules/policy-logging/pom.xml
+++ /dev/null
@@ -1,52 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-policy-logging</artifactId>

-    <name>Apache Tuscany Logging Policy Model</name>

-    

-    <dependencies>

-    	        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-contribution</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-policy</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-

-</project>

diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java b/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
deleted file mode 100644
index 836631541d..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
+++ /dev/null
@@ -1,67 +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.policy.logging;
-
-import java.net.URI;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.Definitions;
-import org.apache.tuscany.sca.provider.DefinitionsProvider;
-import org.apache.tuscany.sca.provider.DefinitionsProviderException;
-
-/**
- * Provider for Policy Intents and PolicySet definitions related to security
- *
- * @version $Rev$ $Date$
- */
-public class LoggingPolicyDefinitionsProvider implements DefinitionsProvider {
-    private String definitionsFile = "org/apache/tuscany/sca/policy/logging/definitions.xml";
-    URLArtifactProcessor urlArtifactProcessor = null;
-    
-    public LoggingPolicyDefinitionsProvider(ExtensionPointRegistry registry) {
-        URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(Definitions.class);
-    }
-
-    public Definitions getDefinitions() throws DefinitionsProviderException {
-        // Allow privileged access to load resource. Requires RuntimePermssion in security policy.
-        URL definitionsFileUrl = AccessController.doPrivileged(new PrivilegedAction<URL>() {
-            public URL run() {
-                return getClass().getClassLoader().getResource(definitionsFile);
-            }
-        });           
-
-        Object scaDefn = null;
-        try {
-            URI uri = new URI(definitionsFile);
-            return (Definitions)urlArtifactProcessor.read(null, 
-                                                             uri, 
-                                                             definitionsFileUrl);
-        } catch ( Exception e ) {
-            throw new DefinitionsProviderException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java b/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
deleted file mode 100644
index c53c37ccf6..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
+++ /dev/null
@@ -1,90 +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.policy.logging.jdk;
-
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JDKLoggingImplementationPolicyProvider implements PolicyProvider {
-    private RuntimeComponent component;
-    private Implementation implementation;
-
-    public JDKLoggingImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) {
-        super();
-        this.component = component;
-        this.implementation = implementation;
-    }
-
-    private String getContext() {
-        return "component.implementation: " + component.getURI() + "(" + implementation.getClass().getName() + ")";
-    }
-
-    private PolicySet findPolicySet(Operation operation) {
-        for (PolicySet ps : component.getPolicySets()) {
-            for (Object p : ps.getPolicies()) {
-                if (JDKLoggingPolicy.class.isInstance(p)) {
-                    return ps;
-                }
-            }
-        }
-        
-        if ( component instanceof OperationsConfigurator ) {
-            for ( ConfiguredOperation confOp : ((OperationsConfigurator)component).getConfiguredOperations() ) {
-                if ( confOp.getName().equals(operation.getName())) {
-                    for (PolicySet ps : confOp.getPolicySets()) {
-                        for (Object p : ps.getPolicies()) {
-                            if (JDKLoggingPolicy.class.isInstance(p)) {
-                                return ps;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        
-        return null;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation)
-     */
-    public Interceptor createInterceptor(Operation operation) {
-        PolicySet ps = findPolicySet(operation);
-        return ps == null ? null : new JDKLoggingPolicyInterceptor(getContext(), operation, ps);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase()
-     */
-    public String getPhase() {
-        return Phase.IMPLEMENTATION_POLICY;
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java b/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
deleted file mode 100644
index b9ae619d11..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
+++ /dev/null
@@ -1,85 +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.policy.logging.jdk;

-

-import java.util.logging.Level;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.policy.Policy;

-

-/**

- * Implementation for policies that could be injected as parameter

- * into the axis2config.

- *

- * @version $Rev$ $Date$

- */

-public class JDKLoggingPolicy implements Policy {

-    static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";

-    static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";

-    private static final QName JDK_LOGGING_POLICY_QNAME = new QName(SCA10_TUSCANY_NS, "jdkLogger");

-

-    private String loggerName;

-    private String resourceBundleName;

-    private Level logLevel;

-    private boolean useParentHandlers = false;

-

-    public String getLoggerName() {

-        return loggerName;

-    }

-

-    public void setLoggerName(String loggerName) {

-        this.loggerName = loggerName;

-    }

-

-    public Level getLogLevel() {

-        return logLevel;

-    }

-

-    public void setLogLevel(Level logLevel) {

-        this.logLevel = logLevel;

-    }

-

-    public String getResourceBundleName() {

-        return resourceBundleName;

-    }

-

-    public void setResourceBundleName(String resourceBundleName) {

-        this.resourceBundleName = resourceBundleName;

-    }

-

-    public boolean isUseParentHandlers() {

-        return useParentHandlers;

-    }

-

-    public void setUseParentHandlers(boolean useParentHandlers) {

-        this.useParentHandlers = useParentHandlers;

-    }

-

-    public QName getSchemaName() {

-        return JDK_LOGGING_POLICY_QNAME;

-    }

-

-    public boolean isUnresolved() {

-        return false;

-    }

-

-    public void setUnresolved(boolean unresolved) {

-    }

-}

diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java b/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
deleted file mode 100644
index 9a21f1e559..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
+++ /dev/null
@@ -1,129 +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.policy.logging.jdk;
-
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
- *
- * @version $Rev$ $Date$
- */
-public class JDKLoggingPolicyInterceptor implements Interceptor {
-    public static final String loggingPolicy = "JDKLoggingPolicy";
-    public static final QName policySetQName = new QName(JDKLoggingPolicy.SCA10_TUSCANY_NS, loggingPolicy);
-    private Logger logger = null;
-
-    private Invoker next;
-    private Operation operation;
-    private PolicySet policySet = null;
-    private String context;
-
-    public JDKLoggingPolicyInterceptor(String context, Operation operation, PolicySet policySet) {
-        super();
-        this.operation = operation;
-        this.policySet = policySet;
-        this.context = context;
-        init();
-    }
-
-    private void init() {
-        if (policySet != null) {
-            JDKLoggingPolicy policy = (JDKLoggingPolicy)policySet.getPolicies().get(0);
-            logger = Logger.getLogger(policy.getLoggerName());
-            logger.setLevel(policy.getLogLevel());
-            logger.setUseParentHandlers(policy.isUseParentHandlers());
-
-            boolean found = false;
-            for (Handler handler : logger.getHandlers()) {
-                if (handler instanceof ConsoleHandler) {
-                    found = true;
-                    break;
-                }
-            }
-
-            if (!found) {
-                ConsoleHandler consoleHandler = new ConsoleHandler();
-                consoleHandler.setLevel(Level.ALL);
-                logger.addHandler(consoleHandler);
-            }
-        }
-    }
-
-    public Message invoke(Message msg) {
-        if (logger == null) {
-            return getNext().invoke(msg);
-        }
-        Object msgBody = msg.getBody();
-        if (msgBody instanceof Object[]) {
-            logger.logp(Level.INFO, context, "", "Invoking operation - " + operation.getName());
-
-            StringBuffer sb = new StringBuffer();
-            if (msgBody == null) {
-                sb.append("");
-            } else {
-                Object[] args = (Object[])msgBody;
-                for (int i = 0; i < args.length; i++) {
-                    sb.append(args[i]);
-                    if (i != args.length - 1) {
-                        sb.append(", ");
-                    }
-                }
-            }
-
-            Object[] logParams = new Object[] {operation.getName(), sb.toString()};
-            logger.logp(Level.FINER, context, "", "Invoking operation {0} with arguments {1}", logParams);
-        }
-
-        Message responseMsg = null;
-        try {
-            responseMsg = getNext().invoke(msg);
-            return responseMsg;
-        } catch (RuntimeException e) {
-            logger.logp(Level.SEVERE, context, "", "Exception thrown from operation - " + operation.getName(), e);
-            throw e;
-        } finally {
-            if (responseMsg != null) {
-                Object[] logParams = new Object[] {operation.getName(), responseMsg.getBody()};
-                logger.logp(Level.INFO, context, "", "Returned from operation - " + operation.getName());
-                logger.logp(Level.FINER, context, "", "Returning from operation {0} with return value {1}", logParams);
-            }
-        }
-    }
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-}
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java b/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
deleted file mode 100644
index 5fd7a37a26..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
+++ /dev/null
@@ -1,136 +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.policy.logging.jdk;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.util.logging.Level;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JDKLoggingPolicyProcessor implements StAXArtifactProcessor<JDKLoggingPolicy> {
-    private static final QName JDK_LOGGING_POLICY_QNAME = new QName(JDKLoggingPolicy.SCA10_TUSCANY_NS, "jdkLogger");
-    private static final String LOG_LEVEL = "logLevel";
-    private static final String RESOURCE_BUNDLE = "resourceBundle";
-    private static final String USE_PARENT_HANDLERS = "useParentHandlers";
-    private static final String TUSACNY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
-        
-    public QName getArtifactType() {
-        return JDK_LOGGING_POLICY_QNAME;
-    }
-    
-    public JDKLoggingPolicyProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-    }
-
-    
-    public JDKLoggingPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        JDKLoggingPolicy policy = new JDKLoggingPolicy();
-        int event = reader.getEventType();
-        QName name = null;
-        
-        
-        while (reader.hasNext()) {
-            event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT : {
-                    name = reader.getName();
-                    if ( name.equals(JDK_LOGGING_POLICY_QNAME) ) {
-                        String loggerName = reader.getAttributeValue(null, "name");
-                        policy.setLoggerName(loggerName);
-                    } else if ( LOG_LEVEL.equals(name.getLocalPart()) ) {
-                        policy.setLogLevel(Level.parse(reader.getElementText()));
-                    } else if ( RESOURCE_BUNDLE.equals(name.getLocalPart()) ) {
-                        policy.setResourceBundleName(reader.getElementText());
-                    } else if ( USE_PARENT_HANDLERS.equals(name.getLocalPart()) ) {
-                        policy.setUseParentHandlers(Boolean.getBoolean(reader.getElementText()));
-                    }
-                    break;
-                }
-            }
-            
-            if ( event == END_ELEMENT ) {
-                if ( JDK_LOGGING_POLICY_QNAME.equals(reader.getName()) ) {
-                    break;
-                } 
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-         
-        return policy;
-    }
-
-    public void write(JDKLoggingPolicy policy, XMLStreamWriter writer) throws ContributionWriteException,
-                                                        XMLStreamException {
-        String prefix = "tuscany";
-        writer.writeStartElement(prefix, 
-                                 JDK_LOGGING_POLICY_QNAME.getLocalPart(),
-                                 JDK_LOGGING_POLICY_QNAME.getNamespaceURI());
-        writer.writeNamespace("tuscany", JDKLoggingPolicy.SCA10_TUSCANY_NS);
-        
-        if (policy.getLoggerName() != null) {
-            writer.writeAttribute("name", policy.getLoggerName());
-        }
-        if ( policy.getLogLevel() != null ) {
-            writer.writeStartElement(prefix, 
-                                     LOG_LEVEL,
-                                     JDK_LOGGING_POLICY_QNAME.getNamespaceURI());
-            writer.writeCharacters(policy.getLogLevel().getLocalizedName());
-            writer.writeEndElement();
-        }
-        
-        if ( policy.getResourceBundleName() != null ) {
-            writer.writeStartElement(prefix,
-                                     RESOURCE_BUNDLE,
-                                     JDK_LOGGING_POLICY_QNAME.getNamespaceURI());
-            writer.writeCharacters(policy.getResourceBundleName());
-            writer.writeEndElement();
-        }
-        
-        writer.writeEndElement();
-    }
-
-    public Class<JDKLoggingPolicy> getModelType() {
-        return JDKLoggingPolicy.class;
-    }
-
-    public void resolve(JDKLoggingPolicy arg0, ModelResolver arg1) throws ContributionResolveException {
-
-    }
-    
-}
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java b/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
deleted file mode 100644
index 9bbae8956f..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.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.policy.logging.jdk;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JDKLoggingPolicyProviderFactory implements PolicyProviderFactory<JDKLoggingPolicy> {
-    private ExtensionPointRegistry registry;
-    
-    public JDKLoggingPolicyProviderFactory(ExtensionPointRegistry registry) {
-        super();
-        this.registry = registry;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createImplementationPolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.assembly.Implementation)
-     */
-    public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) {
-        return new JDKLoggingImplementationPolicyProvider(component, implementation);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createReferencePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentReference, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public PolicyProvider createReferencePolicyProvider(RuntimeComponent component,
-                                                        RuntimeComponentReference reference,
-                                                        Binding binding) {
-        return new JDKLoggingReferencePolicyProvider(component, reference, binding);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createServicePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentService, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public PolicyProvider createServicePolicyProvider(RuntimeComponent component,
-                                                      RuntimeComponentService service,
-                                                      Binding binding) {
-        return new JDKLoggingServicePolicyProvider(component, service, binding);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()
-     */
-    public Class getModelType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java b/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
deleted file mode 100644
index feddc8c056..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
+++ /dev/null
@@ -1,89 +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.policy.logging.jdk;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JDKLoggingReferencePolicyProvider implements PolicyProvider {
-    private RuntimeComponent component;
-    private RuntimeComponentReference reference;
-    private Binding binding;
-
-    public JDKLoggingReferencePolicyProvider(RuntimeComponent component,
-                                             RuntimeComponentReference reference,
-                                             Binding binding) {
-        super();
-        this.component = component;
-        this.reference = reference;
-        this.binding = binding;
-    }
-
-    private PolicySet findPolicySet() {
-        if (binding instanceof PolicySetAttachPoint) {
-            List<PolicySet> policySets = ((PolicySetAttachPoint)binding).getApplicablePolicySets();
-            for (PolicySet ps : policySets) {
-                for (Object p : ps.getPolicies()) {
-                    if (JDKLoggingPolicy.class.isInstance(p)) {
-                        return ps;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    private String getContext() {
-        return "component.reference: " + component.getURI()
-            + "#"
-            + reference.getName()
-            + "("
-            + binding.getClass().getName()
-            + ")";
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation)
-     */
-    public Interceptor createInterceptor(Operation operation) {
-        PolicySet ps = findPolicySet();
-        return ps == null ? null : new JDKLoggingPolicyInterceptor(getContext(), operation, ps);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase()
-     */
-    public String getPhase() {
-        return Phase.REFERENCE_POLICY;
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java b/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
deleted file mode 100644
index 472f76c680..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
+++ /dev/null
@@ -1,87 +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.policy.logging.jdk;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JDKLoggingServicePolicyProvider implements PolicyProvider {
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private Binding binding;
-
-    public JDKLoggingServicePolicyProvider(RuntimeComponent component, RuntimeComponentService service, Binding binding) {
-        super();
-        this.component = component;
-        this.service = service;
-        this.binding = binding;
-    }
-
-    private PolicySet findPolicySet() {
-        if (binding instanceof PolicySetAttachPoint) {
-            List<PolicySet> policySets = ((PolicySetAttachPoint)binding).getApplicablePolicySets();
-            for (PolicySet ps : policySets) {
-                for (Object p : ps.getPolicies()) {
-                    if (JDKLoggingPolicy.class.isInstance(p)) {
-                        return ps;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    private String getContext() {
-        return "component.service: " + component.getURI()
-            + "#"
-            + service.getName()
-            + "("
-            + binding.getClass().getName()
-            + ")";
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation)
-     */
-    public Interceptor createInterceptor(Operation operation) {
-        PolicySet ps = findPolicySet();
-        return ps == null ? null : new JDKLoggingPolicyInterceptor(getContext(), operation, ps);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase()
-     */
-    public String getPhase() {
-        return Phase.SERVICE_POLICY;
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index f56f96e4b9..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.policy.logging.jdk.JDKLoggingPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#jdkLogger,model=org.apache.tuscany.sca.policy.logging.jdk.JDKLoggingPolicy
diff --git a/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider b/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
deleted file mode 100644
index ec40cb7dc5..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for SCA Definitions Providers
-org.apache.tuscany.sca.policy.logging.LoggingPolicyDefinitionsProvider
\ No newline at end of file
diff --git a/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
deleted file mode 100644
index e14c657d80..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the policy extension

-org.apache.tuscany.sca.policy.logging.jdk.JDKLoggingPolicyProviderFactory;model=org.apache.tuscany.sca.policy.logging.jdk.JDKLoggingPolicy

diff --git a/java/sca-contrib/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml b/java/sca-contrib/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
deleted file mode 100644
index 956a8983a2..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"

- 			targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"

- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

-

-	<!-- Policy Intents Defined by the SCA Runtime -->

-	<intent name="logging" constrains="sca:implementation.java sca:implementation.spring">

-		<description>

-			All messages to and from this implementation must be logged

-		</description>

-	</intent>

-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java b/java/sca-contrib/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
deleted file mode 100644
index d5b1b9eedc..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
+++ /dev/null
@@ -1,91 +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.policy.logging.jdk;
-
-
-import java.io.InputStream;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.net.URL;
-import java.util.logging.Level;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import junit.framework.TestCase;
-
-/**
- * Test the reading of ws config params policy.
- *
- * @version $Rev$ $Date$
- */
-public class PolicyReadTestCase extends TestCase {
-
-    @Override
-    public void setUp() throws Exception {
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-    }
-
-    public void testPolicyReading() throws Exception { 
-        JDKLoggingPolicyProcessor processor = new JDKLoggingPolicyProcessor(null, null);
-        
-        URL url = getClass().getResource("mock_policies.xml");
-        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-        
-        InputStream urlStream = url.openStream();
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
-        
-        
-        JDKLoggingPolicy policy = processor.read(reader);
-        assertEquals(policy.getLoggerName(), "test.logger");
-        assertEquals(policy.getLogLevel(), Level.INFO );
-        assertEquals(policy.getResourceBundleName(), "Trace_Messages.properties");
-    }
-    
-    public void testPolicyWriting() throws Exception {
-        JDKLoggingPolicyProcessor processor = new JDKLoggingPolicyProcessor(null, null);
-        
-        JDKLoggingPolicy policy = new JDKLoggingPolicy();
-        policy.setLoggerName("test.logger");
-        policy.setLogLevel(Level.INFO);
-        policy.setResourceBundleName("Trace_Messages.properties");
-        
-        XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
-        StringWriter sw = new StringWriter();
-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(sw);
-        processor.write(policy, writer);
-        writer.close();
-        
-        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-        StringReader sr = new StringReader(sw.toString());
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(sr);
-        
-        policy = processor.read(reader);
-        assertEquals(policy.getLoggerName(), "test.logger");
-        assertEquals(policy.getLogLevel(), Level.INFO );
-        assertEquals(policy.getResourceBundleName(), "Trace_Messages.properties");
-        
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml b/java/sca-contrib/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
deleted file mode 100644
index fabb554236..0000000000
--- a/java/sca-contrib/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-<tuscany:jdkLogger xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" name="test.logger">

-	<logLevel>INFO</logLevel>

-	<resourceBundle>Trace_Messages.properties</resourceBundle>

-</tuscany:jdkLogger>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/policy-reliability/LICENSE b/java/sca-contrib/modules/policy-reliability/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/policy-reliability/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/policy-reliability/NOTICE b/java/sca-contrib/modules/policy-reliability/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/policy-reliability/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/policy-reliability/pom.xml b/java/sca-contrib/modules/policy-reliability/pom.xml
deleted file mode 100644
index b1cf5a48bb..0000000000
--- a/java/sca-contrib/modules/policy-reliability/pom.xml
+++ /dev/null
@@ -1,70 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-policy-reliability</artifactId>
-    <name>Apache Tuscany Reliability Policy Model</name>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-                
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.policy.reliability</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.policy.reliability*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java b/java/sca-contrib/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java
deleted file mode 100644
index 60e28f5231..0000000000
--- a/java/sca-contrib/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java
+++ /dev/null
@@ -1,72 +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.policy.reliability;
-
-import java.net.URI;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
-
-/**
- * Provider for Policy Intents and PolicySet definitions related to security
- *
- * @version $Rev$ $Date$
- */
-public class ReliabilityPolicyDefinitionsProvider implements SCADefinitionsProvider {
-    private String definitionsFile = "org/apache/tuscany/sca/policy/reliability/definitions.xml";
-    URLArtifactProcessor urlArtifactProcessor = null;
-
-    public ReliabilityPolicyDefinitionsProvider(ExtensionPointRegistry registry) {
-        URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
-    }
-
-    public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
-        SCADefinitions scaDefns = null;
-        SCADefinitions tuscanyDefns = null;
-        try {
-            // Allow privileged access to load resource. Requires RuntimePermssion in security policy.
-            URL definitionsFileUrl = AccessController.doPrivileged(new PrivilegedAction<URL>() {
-                public URL run() {
-                    return getClass().getClassLoader().getResource(definitionsFile);
-                }
-            });           
-
-            URI uri = new URI(definitionsFile);
-
-            scaDefns = (SCADefinitions)urlArtifactProcessor.read(null, 
-                                                                 uri, 
-                                                                 definitionsFileUrl);
-
-            return scaDefns;
-
-        } catch ( Exception e ) {
-            throw new SCADefinitionsProviderException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/java/sca-contrib/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
deleted file mode 100644
index 7f616cb3d4..0000000000
--- a/java/sca-contrib/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for SCA Definitions Providers

-org.apache.tuscany.sca.policy.reliability.ReliabilityPolicyDefinitionsProvider
\ No newline at end of file
diff --git a/java/sca-contrib/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml b/java/sca-contrib/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml
deleted file mode 100644
index df87906ab8..0000000000
--- a/java/sca-contrib/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 			 targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- 			 xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    
-	<!-- Policy Intents Defined by the SCA Runtime -->
-	<intent name="atLeastOnce" 
-	 		constrains="sca:binding">
-		<description>
-            This intent is used to indicate that a message sent
-            by a client is always delivered to the component.
-		</description>
-	</intent>
-	
-	<intent name="atMostOnce" 
-	 		constrains="sca:binding">
-		<description>
-            This intent is used to indicate that a message that was
-            successfully sent by a client is not delivered more than 
-            once to the component.
-		</description>
-	</intent>
-	
-	<intent name="ordered" 
-	 		constrains="sca:binding">
-		<description>
-            This intent is used to indicate that all the messages
-            are delivered to the component in the order they were
-            sent by the client.
-		</description>
-	</intent>
-    
-    <intent name="exactlyOnce" 
-            constrains="sca:binding"
-            requires="atLeastOnce atMostOnce">
-        <description>
-            This profile intent is used to indicate that a message
-            sent by a client is always delivered to the component.
-            It also indicates that duplicate messages are not
-            delivered to the component.
-        </description>
-    </intent>    
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/policy-security-jsr250/LICENSE b/java/sca-contrib/modules/policy-security-jsr250/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/policy-security-jsr250/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/policy-security-jsr250/META-INF/MANIFEST.MF b/java/sca-contrib/modules/policy-security-jsr250/META-INF/MANIFEST.MF
deleted file mode 100644
index a8d8f4fe9a..0000000000
--- a/java/sca-contrib/modules/policy-security-jsr250/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.policy.jsr250;version="2.0.0",or

- g.apache.tuscany.sca.policy.jsr250.introspect.impl;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Java JSR250 Implementation

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397483046

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Java JSR250 Implementation

-Import-Package: javax.annotation.security,javax.xml.namespace,org.apac

- he.tuscany.sca.assembly;version="2.0.0",org.apache.tuscany.sca.core;ver

- sion="1.4",org.apache.tuscany.sca.implementation.java;version="2.0.0",o

- rg.apache.tuscany.sca.implementation.java.introspect;version="2.0.0",or

- g.apache.tuscany.sca.policy;version="2.0.0",org.apache.tuscany.sca.poli

- cy.authorization;version="2.0.0",org.apache.tuscany.sca.policy.identity

- ;version="2.0.0",org.apache.tuscany.sca.implementation.java.introspect.

- impl;resolution:=optional,org.oasisopen.sca.annotation;version="2.0.0";reso

- lution:=optional,org.apache.tuscany.sca.interfacedef.java;version="1.

- 4";resolution:=optional,org.apache.tuscany.sca.interfacedef;version="

- 1.4";resolution:=optional,org.ap

- ache.tuscany.sca.interfacedef.java.impl;version="2.0.0";resolution:=opt

- ional

-Bundle-SymbolicName: org.apache.tuscany.sca.policy.security.jsr250

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/policy-security-jsr250/NOTICE b/java/sca-contrib/modules/policy-security-jsr250/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/policy-security-jsr250/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/policy-security-jsr250/pom.xml b/java/sca-contrib/modules/policy-security-jsr250/pom.xml
deleted file mode 100644
index ddd8e5e307..0000000000
--- a/java/sca-contrib/modules/policy-security-jsr250/pom.xml
+++ /dev/null
@@ -1,64 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-policy-security-jsr250</artifactId>
-    <name>Apache Tuscany SCA Java JSR250 Implementation</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
-            <version>1.0</version>
-        </dependency>    
-
-    </dependencies>
-    
-</project>
diff --git a/java/sca-contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java b/java/sca-contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java
deleted file mode 100644
index e6279f4811..0000000000
--- a/java/sca-contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java
+++ /dev/null
@@ -1,51 +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.policy.jsr250;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.jsr250.introspect.impl.JSR250PolicyProcessor;
-
-/**
- * A module activator for the Java implementation model.
- *
- * @version $Rev$ $Date$
- */
-public class JSR250Activator implements ModuleActivator {
-
-    public void start(ExtensionPointRegistry registry) {
-        FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        PolicyFactory policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        
-        JavaImplementationFactory javaImplementationFactory = modelFactories.getFactory(JavaImplementationFactory.class);
-        javaImplementationFactory.addClassVisitor(new JSR250PolicyProcessor(assemblyFactory, policyFactory));
-        
-    }
-
-    public void stop(ExtensionPointRegistry registry) {
-        
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java b/java/sca-contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java
deleted file mode 100644
index 2622886075..0000000000
--- a/java/sca-contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java
+++ /dev/null
@@ -1,179 +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.policy.jsr250.introspect.impl;
-
-import java.lang.reflect.Method;
-
-import javax.annotation.security.DenyAll;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-import javax.annotation.security.RunAs;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy;
-import org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy;
-
-/**
- * Processes an {@link javax.annotation.security.*} annotation
- * Below is a list of annotations
- * 
- *                Type    Method
- * RunAs             x
- * RolesAllowed      x       x
- * PermitAll         x       x
- * DenyAll                   x
- *
- * @version $Rev$ $Date$
- */
-public class JSR250PolicyProcessor extends BaseJavaClassVisitor {
-    private static final QName RUN_AS = new QName("http://www.osoa.org/xmlns/sca/1.0","runAs");
-    private static final QName ALLOW = new QName("http://www.osoa.org/xmlns/sca/1.0","allow");
-    private static final QName PERMIT_ALL = new QName("http://www.osoa.org/xmlns/sca/1.0","permitAll");
-    private static final QName DENY_ALL = new QName("http://www.osoa.org/xmlns/sca/1.0","denyAll");
-    
-    private PolicyFactory policyFactory;
-
-    public JSR250PolicyProcessor(AssemblyFactory assemblyFactory, PolicyFactory policyFactory) {
-        super(assemblyFactory);
-        this.policyFactory = policyFactory;
-    }
-    
-
-    @Override
-    public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-        
-        RunAs runAs = clazz.getAnnotation(javax.annotation.security.RunAs.class);
-        if (runAs != null) {
-            
-            String roleName = runAs.value();
-            if(roleName == null) {
-                //FIXME handle monitor or error
-            }
-
-            SecurityIdentityPolicy policy = new SecurityIdentityPolicy();
-            policy.setRunAsRole(roleName);
-
-            PolicySet policySet = policyFactory.createPolicySet();
-            policySet.setName(RUN_AS);
-            policySet.getPolicies().add(policy);
-            policySet.setUnresolved(false);
-            ((org.apache.tuscany.sca.policy.PolicySetAttachPoint)type).getPolicySets().add(policySet);
-        }
-        
-        RolesAllowed rolesAllowed = clazz.getAnnotation(javax.annotation.security.RolesAllowed.class);
-        if(rolesAllowed != null) {
-            if(rolesAllowed.value().length == 0) {
-                //FIXME handle monitor or error
-            }
-            
-            AuthorizationPolicy policy = new AuthorizationPolicy();
-            policy.setAccessControl(AuthorizationPolicy.AcessControl.allow);
-            
-            for(String role : rolesAllowed.value()) {
-                policy.getRoleNames().add(role);
-            }
-
-            PolicySet policySet = policyFactory.createPolicySet();
-            policySet.setName(ALLOW);
-            policySet.getPolicies().add(policy);
-            policySet.setUnresolved(false);
-            ((org.apache.tuscany.sca.policy.PolicySetAttachPoint)type).getPolicySets().add(policySet);
-        }
-        
-        PermitAll permitAll = clazz.getAnnotation(javax.annotation.security.PermitAll.class);
-        if(permitAll != null) {
-            AuthorizationPolicy policy = new AuthorizationPolicy();
-            policy.setAccessControl(AuthorizationPolicy.AcessControl.permitAll);
-            
-            PolicySet policySet = policyFactory.createPolicySet();
-            policySet.setName(PERMIT_ALL);
-            policySet.getPolicies().add(policy);
-            policySet.setUnresolved(false);
-            ((org.apache.tuscany.sca.policy.PolicySetAttachPoint)type).getPolicySets().add(policySet);
-        }
-        
-    }
-    
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-        RolesAllowed rolesAllowed = method.getAnnotation(javax.annotation.security.RolesAllowed.class);
-        if(rolesAllowed != null) {
-            if(rolesAllowed.value().length == 0) {
-                //FIXME handle monitor or error
-            }
-            
-            AuthorizationPolicy policy = new AuthorizationPolicy();
-            policy.setAccessControl(AuthorizationPolicy.AcessControl.allow);
-            
-            for(String role : rolesAllowed.value()) {
-                policy.getRoleNames().add(role);
-            }
-            
-            ConfiguredOperation confOp = assemblyFactory.createConfiguredOperation();
-            confOp.setName(method.getName());
-            ((OperationsConfigurator)type).getConfiguredOperations().add(confOp);
-            
-            PolicySet policySet = policyFactory.createPolicySet();
-            policySet.setName(ALLOW);
-            policySet.getPolicies().add(policy);
-            policySet.setUnresolved(false);
-            confOp.getPolicySets().add(policySet);
-        }
-        
-        PermitAll permitAll = method.getAnnotation(javax.annotation.security.PermitAll.class);
-        if(permitAll != null) {
-            AuthorizationPolicy policy = new AuthorizationPolicy();
-            policy.setAccessControl(AuthorizationPolicy.AcessControl.permitAll);
-            
-            ConfiguredOperation confOp = assemblyFactory.createConfiguredOperation();
-            confOp.setName(method.getName());
-            ((OperationsConfigurator)type).getConfiguredOperations().add(confOp);
-            
-            PolicySet policySet = policyFactory.createPolicySet();
-            policySet.setName(PERMIT_ALL);
-            policySet.getPolicies().add(policy);
-            policySet.setUnresolved(false);
-            confOp.getPolicySets().add(policySet);
-        }
-        
-        DenyAll denyAll = method.getAnnotation(javax.annotation.security.DenyAll.class);
-        if(denyAll != null) {
-            AuthorizationPolicy policy = new AuthorizationPolicy();
-            policy.setAccessControl(AuthorizationPolicy.AcessControl.denyAll);
-            
-            ConfiguredOperation confOp = assemblyFactory.createConfiguredOperation();
-            confOp.setName(method.getName());
-            ((OperationsConfigurator)type).getConfiguredOperations().add(confOp);
-            
-            PolicySet policySet = policyFactory.createPolicySet();
-            policySet.setName(DENY_ALL);
-            policySet.getPolicies().add(policy);
-            policySet.setUnresolved(false);
-            confOp.getPolicySets().add(policySet);
-        }
-    }    
-}
diff --git a/java/sca-contrib/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/java/sca-contrib/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 5feb961dc2..0000000000
--- a/java/sca-contrib/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /dev/null
@@ -1,18 +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.

-

-org.apache.tuscany.sca.policy.jsr250.JSR250Activator

diff --git a/java/sca-contrib/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java b/java/sca-contrib/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java
deleted file mode 100644
index 14454a1466..0000000000
--- a/java/sca-contrib/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java
+++ /dev/null
@@ -1,399 +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.policy.jsr250.introspect.impl;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.oasisopen.sca.annotation.Requires;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PolicyProcessorTestCaseFIXME extends TestCase {
-    private JSR250PolicyProcessor policyProcessor;
-    private JavaImplementation type;
-
-    // This actually is a test for PolicyJavaInterfaceProcessor. It will get
-    // invoked via the call to ImplementationProcessorServiceImpl.createService in
-    // ServiceProcessor. Of course ServiceProcessor class has to be working.
-    public void stestSingleInterfaceWithIntentsOnInterfaceAtInterfaceLevel() throws Exception {
-        policyProcessor.visitClass(Service1.class, type);
-        verifyIntents(Service1.class, type);
-    }
-
-    public void stestMultipleInterfacesWithIntentsOnInterfaceAtInterfaceLevel() throws Exception {
-        policyProcessor.visitClass(Service2.class, type);
-        verifyIntents(Service2.class, type);
-    }
-
-    public void stestSingleInterfaceWithIntentsOnImplAtClassLevel() throws Exception {
-        policyProcessor.visitClass(Service3.class, type);
-        verifyIntents(Service3.class, type);
-    }
-
-    public void stestMultipleInterfacesWithIntentsOnImplAtClassLevel() throws Exception {
-        policyProcessor.visitClass(Service4.class, type);
-        verifyIntents(Service4.class, type);
-    }
-
-    public void stestSingleInterfaceWithIntentsOnInterfaceAtMethodLevel() throws Exception {
-        policyProcessor.visitClass(Service5.class, type);
-        verifyIntents(Service5.class, type);
-    }
-
-    public void testSingleInterfaceWithIntentsOnServiceAndInterfaceAtImplAndInertfaceAndMethodLevel() throws Exception {
-        policyProcessor.visitClass(Service6.class, type);
-        for (Method method : Service6.class.getDeclaredMethods()) {
-            policyProcessor.visitMethod(method, type);
-        }
-        verifyIntents(Service6.class, type);
-    }
-
-    private void verifyIntents(Class serviceImplClass, JavaImplementation type) {
-        if ( !(type instanceof PolicySetAttachPoint) ) {
-            fail("No Intents on the service ");
-        }
-        Requires serviceImplIntentAnnotation = (Requires)serviceImplClass.getAnnotation(Requires.class);
-        if (serviceImplIntentAnnotation != null) {
-            String[] serviceImplIntents = serviceImplIntentAnnotation.value();
-            List<Intent> requiredIntents = ((PolicySetAttachPoint)type).getRequiredIntents();
-            if (serviceImplIntents.length > 0) {
-                if (requiredIntents == null || requiredIntents.size() == 0) {
-                    fail("No Intents on the service ");
-                }
-                Map<String, Intent> intentMap = new HashMap<String, Intent>();
-                for (Intent intent : requiredIntents) {
-                    intentMap.put(intent.getName().getLocalPart(), intent);
-                }
-                for (String intent : serviceImplIntents) {
-                    assertTrue("ComponentType for Service class " + serviceImplClass.getName()
-                        + " did not contain Service Implementation intent "
-                        + intent, intentMap.containsKey(intent));
-                }
-            }
-        }
-
-        // This should match what was specified on @Service for a Service Implementation
-        // If we use these to get the Service names and we get a null Service
-        // name then it would seem that wrong values were put on the @Service annotation
-        // or the wrong interfaces were specified on the implements list of the class
-        // statement?
-        Map<String, org.apache.tuscany.sca.assembly.Service> serviceMap = new HashMap<String, org.apache.tuscany.sca.assembly.Service>();
-        for (org.apache.tuscany.sca.assembly.Service service: type.getServices()) {
-            serviceMap.put(service.getName(), service);
-        }
-        for (Class interfaceClass : serviceImplClass.getInterfaces()) {
-            Requires interfaceIntentAnnotation = (Requires)interfaceClass.getAnnotation(Requires.class);
-            org.apache.tuscany.sca.assembly.Service service = serviceMap.get(interfaceClass.getSimpleName());
-            if (service == null) {
-                fail("No service defined for interface " + interfaceClass.getSimpleName()
-                    + " on Service Implementation "
-                    + serviceImplClass.getName());
-            }
-
-            if (interfaceIntentAnnotation != null) {
-                String[] interfaceIntents = interfaceIntentAnnotation.value();
-                List<Intent> requiredIntents = service.getInterfaceContract().getInterface().getRequiredIntents();
-                if (interfaceIntents.length > 0) {
-                    if (requiredIntents == null || requiredIntents.size() == 0) {
-                        fail("No Intents on the service " + service.getName());
-                    }
-                    Map<String, Intent> intentMap = new HashMap<String, Intent>();
-                    for (Intent intent : requiredIntents) {
-                        intentMap.put(intent.getName().getLocalPart(), intent);
-                    }
-                    for (String intent : interfaceIntents) {
-                        assertTrue("Interface " + service.getName()
-                            + " did not contain Service Interface intent "
-                            + intent, intentMap.containsKey(intent));
-                    }
-                }
-            }
-
-            for (Method method : interfaceClass.getDeclaredMethods()) {
-                Requires methodIntentAnnotation = method.getAnnotation(Requires.class);
-
-                // Verify that each of the Intents on each of the Service
-                // Interface Methods exist on their associated operation.
-                if (methodIntentAnnotation != null) {
-                    String[] methodIntents = methodIntentAnnotation.value();
-                    if (methodIntents.length > 0) {
-                        List<Intent> requiredIntents = null;
-                        for ( ConfiguredOperation confOp : service.getConfiguredOperations() ) {
-                            if ( confOp.getName().equals(method.getName()) &&
-                                    confOp.getContractName().equals(service.getName()) ) {
-                                requiredIntents = confOp.getRequiredIntents();
-                            }
-                        }
-                        
-                        if (requiredIntents == null || requiredIntents.size() == 0) {
-                            fail("No Intents on operation " + method.getName());
-                        }
-                        for (String intent : methodIntents) {
-                            boolean found = false;
-                            for (Intent requiredIntent: requiredIntents) {
-                                if (requiredIntent.getName().getLocalPart().equals(intent)) {
-                                    found = true;
-                                    break;
-                                }
-                            }
-                            assertTrue("Operation " + method.getName()
-                                + " did not contain Service Interface method intent "
-                                + intent, found);
-                        }
-                    }
-                }
-            }
-            
-            for (Method method : serviceImplClass.getDeclaredMethods()) {
-                Requires methodIntentAnnotation = method.getAnnotation(Requires.class);
-
-                // Verify that each of the Intents on each of the Service
-                // Implementation Methods exist on their associated
-                // operation.
-                if (methodIntentAnnotation != null) {
-                    String[] methodIntents = methodIntentAnnotation.value();
-                    if (methodIntents.length > 0) {
-                        List<Intent> requiredIntents = null;
-                        for ( ConfiguredOperation confOp : ((OperationsConfigurator)type).getConfiguredOperations() ) {
-                            if ( confOp.getName().equals(method.getName())  ) {
-                                requiredIntents = confOp.getRequiredIntents();
-                            }
-                        }
-                        
-                        if (requiredIntents == null || requiredIntents.size() == 0) {
-                            fail("No Intents on operation " + method.getName());
-                        }
-                        
-                        for (String intent : methodIntents) {
-                            boolean found = false;
-                            for (Intent requiredIntent: requiredIntents) {
-                                if (requiredIntent.getName().getLocalPart().equals(intent)) {
-                                    found = true;
-                                    break;
-                                }
-                            }
-                            assertTrue("Operation " + method.getName()
-                                + " did not contain Implementation method intent "
-                                + intent, found);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        policyProcessor = new JSR250PolicyProcessor(new DefaultAssemblyFactory(), new DefaultPolicyFactory());
-        JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-        type = javaImplementationFactory.createJavaImplementation();
-    }
-
-    // @Remotable
-    @Requires( {"transaction.global"})
-    private interface Interface1 {
-        int method1();
-
-        int method2();
-
-        int method3();
-
-        int method4();
-    }
-
-    @Service(Interface1.class)
-    private class Service1 implements Interface1 {
-        public int method1() {
-            return 0;
-        }
-
-        public int method2() {
-            return 0;
-        }
-
-        public int method3() {
-            return 0;
-        }
-
-        public int method4() {
-            return 0;
-        }
-    }
-
-    // @Remotable
-    @Requires( {"transaction.local"})
-    private interface Interface2 {
-        int method5();
-
-        int method6();
-    }
-
-    @Service(interfaces = {Interface1.class, Interface2.class})
-    private class Service2 implements Interface1, Interface2 {
-        public int method1() {
-            return 0;
-        }
-
-        public int method2() {
-            return 0;
-        }
-
-        public int method3() {
-            return 0;
-        }
-
-        public int method4() {
-            return 0;
-        }
-
-        public int method5() {
-            return 0;
-        }
-
-        public int method6() {
-            return 0;
-        }
-    }
-
-    // @Remotable
-    private interface Interface3 {
-        int method1();
-
-        int method2();
-
-        int method3();
-
-        int method4();
-    }
-
-    @Service(Interface3.class)
-    @Requires( {"transaction.global"})
-    private class Service3 implements Interface3 {
-        public int method1() {
-            return 0;
-        }
-
-        public int method2() {
-            return 0;
-        }
-
-        public int method3() {
-            return 0;
-        }
-
-        public int method4() {
-            return 0;
-        }
-    }
-
-    // @Remotable
-    private interface Interface4 {
-        int method5();
-
-        int method6();
-    }
-
-    @Service(interfaces = {Interface3.class, Interface4.class})
-    @Requires( {"transaction.local"})
-    private class Service4 implements Interface3, Interface4 {
-        public int method1() {
-            return 0;
-        }
-
-        public int method2() {
-            return 0;
-        }
-
-        public int method3() {
-            return 0;
-        }
-
-        public int method4() {
-            return 0;
-        }
-
-        public int method5() {
-            return 0;
-        }
-
-        public int method6() {
-            return 0;
-        }
-    }
-
-    private interface Interface5 {
-        @Requires( {"transaction.global"})
-        int method1();
-
-        @Requires( {"transaction.local"})
-        int method2();
-    }
-
-    @Service(Interface5.class)
-    private class Service5 implements Interface5 {
-        public int method1() {
-            return 0;
-        }
-
-        public int method2() {
-            return 0;
-        }
-    }
-
-    @Requires( {"transaction.global.Interface6"})
-    private interface Interface6 {
-        @Requires( {"transaction.global.Interface6.method1"})
-        int method1();
-
-        @Requires( {"transaction.local.Interface6.method2"})
-        int method2();
-    }
-
-    @Service(Interface6.class)
-    @Requires( {"transaction.global.Service6"})
-    private class Service6 implements Interface6 {
-        @Requires( {"transaction.global.Service6.method1"})
-        public int method1() {
-            return 0;
-        }
-
-        @Requires( {"transaction.global.Service6.method1"})
-        public int method2() {
-            return 0;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-transaction/LICENSE b/java/sca-contrib/modules/policy-transaction/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/policy-transaction/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/policy-transaction/META-INF/MANIFEST.MF b/java/sca-contrib/modules/policy-transaction/META-INF/MANIFEST.MF
deleted file mode 100644
index 7a81ed85eb..0000000000
--- a/java/sca-contrib/modules/policy-transaction/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.policy.transaction;uses:="org.a

- pache.tuscany.sca.runtime,org.apache.geronimo.transaction.log,org.apa

- che.tuscany.sca.assembly,org.apache.tuscany.sca.provider,org.apache.t

- uscany.sca.definitions,org.apache.tuscany.sca.core,org.apache.tuscany

- .sca.monitor,org.apache.tuscany.sca.policy,org.apache.tuscany.sca.int

- erfacedef,javax.xml.namespace,org.apache.tuscany.sca.definitions.util

- ,org.apache.tuscany.sca.invocation,javax.xml.stream,org.apache.tuscan

- y.sca.contribution.resolver,javax.transaction,org.apache.tuscany.sca.

- contribution.processor,org.apache.geronimo.transaction.manager";versi

- on="1.4"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Transaction Policy Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397486843

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Transaction Policy Model

-Import-Package: javax.resource.spi,

- javax.transaction;version="1.0.1",

- javax.transaction.xa;version="1.1";resolution:=optional,

- javax.xml.namespace,

- javax.xml.stream,

- 

- org.apache.geronimo.transaction.log,

- org.apache.geronimo.transaction.manager,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.definitions;version="2.0.0",

- org.apache.tuscany.sca.definitions.util;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.invocation;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.policy.transaction;version="2.0.0",

- org.apache.tuscany.sca.provider;version="2.0.0",

- org.apache.tuscany.sca.runtime;version="2.0.0",

- org.objectweb.howl.log;version="1.0.1"

-Bundle-SymbolicName: org.apache.tuscany.sca.policy.transaction

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/policy-transaction/NOTICE b/java/sca-contrib/modules/policy-transaction/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/policy-transaction/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/policy-transaction/pom.xml b/java/sca-contrib/modules/policy-transaction/pom.xml
deleted file mode 100644
index 281219136b..0000000000
--- a/java/sca-contrib/modules/policy-transaction/pom.xml
+++ /dev/null
@@ -1,58 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-policy-transaction</artifactId>
-    <name>Apache Tuscany SCA Transaction Policy Model</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.components</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.components</groupId>
-            <artifactId>geronimo-connector</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
deleted file mode 100644
index 8a242924ee..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.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 org.apache.tuscany.sca.policy.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public class IncompatibleIntentException extends Exception {
-    private static final long serialVersionUID = -2993825019200280397L;
-
-    public IncompatibleIntentException() {
-        super();
-    }
-
-    public IncompatibleIntentException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public IncompatibleIntentException(String message) {
-        super(message);
-    }
-
-    public IncompatibleIntentException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
deleted file mode 100644
index 3c11fef865..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
+++ /dev/null
@@ -1,61 +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.policy.transaction;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionImplementationPolicyProvider implements PolicyProvider {
-    private TransactionManagerHelper helper;
-    private List<PolicySet> policySets;
-
-    public TransactionImplementationPolicyProvider(TransactionManagerHelper helper, PolicySetAttachPoint attachPoint) {
-        super();
-        this.helper = helper;
-        this.policySets = attachPoint.getApplicablePolicySets();
-    }
-
-    public Interceptor createInterceptor(Operation operation) {
-        for (PolicySet policySet : policySets) {
-            for (Object p : policySet.getPolicies()) {
-                if (p instanceof TransactionPolicy) {
-                    TransactionInterceptor interceptor =
-                        new TransactionInterceptor(helper, false, (TransactionPolicy)p, null);
-                    return interceptor;
-                }
-            }
-        }
-        return null;
-    }
-
-    public String getPhase() {
-        return Phase.IMPLEMENTATION_POLICY;
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
deleted file mode 100644
index b3e90c23cd..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
+++ /dev/null
@@ -1,28 +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.policy.transaction;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public enum TransactionIntent {
-    managedTransactionLocal, managedTransactionGlobal, noManagedTransaction, propagatesTransacton, suspendsTransaction, transactedOneWay, immediateOneWay
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
deleted file mode 100644
index 0de98592cb..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
+++ /dev/null
@@ -1,122 +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.policy.transaction;
-
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionInterceptor implements Interceptor {
-    private Invoker next;
-    private TransactionManagerHelper helper;
-    private boolean outbound;
-    private TransactionPolicy interactionPolicy;
-    private TransactionPolicy implementationPolicy;
-
-    public TransactionInterceptor(TransactionManagerHelper helper,
-                                  boolean outbound,
-                                  TransactionPolicy interactionPolicy,
-                                  TransactionPolicy implementationPolicy) {
-        super();
-        this.helper = helper;
-        this.outbound = outbound;
-        this.interactionPolicy = interactionPolicy;
-        this.implementationPolicy = implementationPolicy;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Interceptor#getNext()
-     */
-    public Invoker getNext() {
-        return next;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Interceptor#setNext(org.apache.tuscany.sca.invocation.Invoker)
-     */
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Invoker#invoke(org.apache.tuscany.sca.invocation.Message)
-     */
-    public Message invoke(Message msg) {
-        TransactionalInvocation invocation = new TransactionalInvocation(next, msg);
-
-        Message result = null;
-        if (msg.getOperation().isNonBlocking()) {
-
-        }
-        TransactionIntent interactionIntent = TransactionIntent.propagatesTransacton;
-        if (interactionPolicy != null) {
-            if (interactionPolicy.getAction() == TransactionPolicy.Action.PROPAGATE) {
-                interactionIntent = TransactionIntent.propagatesTransacton;
-            } else {
-                interactionIntent = TransactionIntent.suspendsTransaction;
-            }
-        }
-        TransactionIntent implementationIntent = TransactionIntent.managedTransactionGlobal;
-        if (implementationPolicy != null) {
-            switch (implementationPolicy.getAction()) {
-                case REQUIRE_GLOBAL:
-                    implementationIntent = TransactionIntent.managedTransactionGlobal;
-                    break;
-                case REQUIRE_LOCAL:
-                    implementationIntent = TransactionIntent.managedTransactionLocal;
-                    break;
-                default:
-                    implementationIntent = TransactionIntent.noManagedTransaction;
-                    break;
-            }
-        }
-        try {
-            if (outbound) {
-                result = helper.handlesOutbound(interactionIntent, implementationIntent, invocation);
-            } else {
-                result = helper.handlesInbound(interactionIntent, implementationIntent, invocation);
-            }
-        } catch (Exception e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        return result;
-    }
-
-    private static class TransactionalInvocation implements TransactionalAction<Message> {
-        private final Invoker invoker;
-        private final Message message;
-
-        public TransactionalInvocation(Invoker invoker, Message message) {
-            super();
-            this.invoker = invoker;
-            this.message = message;
-        }
-
-        public Message run() throws Exception {
-            return invoker.invoke(message);
-        }
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
deleted file mode 100644
index defe12967e..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
+++ /dev/null
@@ -1,243 +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.policy.transaction;
-
-import java.lang.reflect.InvocationTargetException;
-
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.InvalidTransactionException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionManagerHelper {
-    // private static final Logger logger = Logger.getLogger(TransactionManagerHelper.class.getName());
-
-    private TransactionManager tm;
-
-    public TransactionManagerHelper(TransactionManager tm) {
-        super();
-        this.tm = tm;
-    }
-
-    public Transaction managedGlobalTransactionPreInvoke() throws SystemException, NotSupportedException {
-        int status = tm.getStatus();
-        if (status == Status.STATUS_COMMITTED || status == Status.STATUS_NO_TRANSACTION
-            || status == Status.STATUS_ROLLEDBACK) {
-            tm.begin();
-            return tm.getTransaction();
-        }
-        return null;
-    }
-
-    public void managedGlobalTransactionPostInvoke(Transaction created, boolean rollback)
-        throws InvalidTransactionException, IllegalStateException, SystemException, SecurityException,
-        HeuristicMixedException, HeuristicRollbackException, RollbackException {
-        if (created != null) {
-            int status = created.getStatus();
-            if (status == Status.STATUS_MARKED_ROLLBACK) {
-                created.rollback();
-            } else if (status == Status.STATUS_ACTIVE) {
-                if (rollback) {
-                    created.rollback();
-                } else {
-                    created.commit();
-                }
-            }
-        }
-    }
-
-    public Transaction suspendsTransactionPreInvoke() throws SystemException {
-        if (tm.getTransaction() != null) {
-            return tm.suspend();
-        } else {
-            return null;
-        }
-    }
-
-    public void suspendsTransactionPostInvoke(Transaction suspended) throws InvalidTransactionException,
-        IllegalStateException, SystemException {
-        if (suspended != null) {
-            tm.resume(suspended);
-        }
-    }
-
-    public TransactionManager getTransactionManager() {
-        return tm;
-    }
-
-    public void setTransactionManager(TransactionManager tm) {
-        this.tm = tm;
-    }
-
-    public void validateOneway(TransactionIntent onewayIntent, TransactionIntent implIntent)
-        throws IncompatibleIntentException {
-        if (onewayIntent == TransactionIntent.transactedOneWay) {
-            if (implIntent != TransactionIntent.managedTransactionGlobal) {
-                throw new IncompatibleIntentException(onewayIntent + "<-X->" + implIntent);
-            }
-        }
-    }
-
-    public void validateInbound(TransactionIntent serviceIntent, TransactionIntent implIntent)
-        throws IncompatibleIntentException {
-        if (serviceIntent == TransactionIntent.propagatesTransacton) {
-            if (implIntent != TransactionIntent.managedTransactionGlobal) {
-                throw new IncompatibleIntentException(serviceIntent + "<-X->" + implIntent);
-            }
-        }
-    }
-
-    public void validateOutbound(TransactionIntent referenceIntent, TransactionIntent implIntent)
-        throws IncompatibleIntentException {
-        if (referenceIntent == TransactionIntent.propagatesTransacton) {
-            if (implIntent != TransactionIntent.managedTransactionGlobal) {
-                throw new IncompatibleIntentException(referenceIntent + "<-X->" + implIntent);
-            }
-        }
-    }
-
-    public <T> T handlesOutbound(TransactionIntent referenceIntent,
-                                 TransactionIntent implIntent,
-                                 TransactionalAction<T> action) throws Exception {
-
-        if (implIntent == null) {
-            implIntent = TransactionIntent.noManagedTransaction;
-        }
-
-        if (referenceIntent == TransactionIntent.propagatesTransacton) {
-            if (implIntent != TransactionIntent.managedTransactionGlobal) {
-                throw new IncompatibleIntentException(referenceIntent + "<-X->" + implIntent);
-            } else {
-                // propagates the current TX
-                return run(action);
-            }
-        } else if (referenceIntent == TransactionIntent.suspendsTransaction) {
-            Transaction tx = suspendsTransactionPreInvoke();
-            try {
-                return run(action);
-            } finally {
-                suspendsTransactionPostInvoke(tx);
-            }
-        } else {
-            return run(action);
-        }
-    }
-
-    private <T> T run(TransactionalAction<T> action) throws Exception {
-        // Make sure a global TX is in place
-        Transaction tx = managedGlobalTransactionPreInvoke();
-        boolean rollback = false;
-        try {
-            return action.run();
-        } catch (InvocationTargetException e) {
-            throw e;
-        } catch (Throwable e) {
-            rollback = true;
-            if (e instanceof Error) {
-                throw (Error)e;
-            } else if (e instanceof RuntimeException) {
-                throw (RuntimeException)e;
-            } else {
-                throw (Exception)e;
-            }
-        } finally {
-            managedGlobalTransactionPostInvoke(tx, rollback);
-        }
-    }
-
-    public <T> T handlesInbound(TransactionIntent serviceIntent,
-                                TransactionIntent implIntent,
-                                TransactionalAction<T> action) throws Exception {
-        if (serviceIntent == null && implIntent == null) {
-            return run(action);
-        }
-
-        if (implIntent == null) {
-            implIntent = TransactionIntent.noManagedTransaction;
-        }
-
-        if (serviceIntent == TransactionIntent.propagatesTransacton) {
-            if (implIntent != TransactionIntent.managedTransactionGlobal) {
-                throw new IncompatibleIntentException(serviceIntent + "<-X->" + implIntent);
-            } else {
-                return run(action);
-            }
-        } else if (serviceIntent == TransactionIntent.suspendsTransaction) {
-            Transaction tx1 = suspendsTransactionPreInvoke();
-            try {
-                if (implIntent == TransactionIntent.managedTransactionGlobal) {
-                    return run(action);
-                } else {
-                    return action.run();
-                }
-            } finally {
-                suspendsTransactionPostInvoke(tx1);
-            }
-        } else {
-            if (implIntent == TransactionIntent.managedTransactionGlobal) {
-                // Start a new TX
-                return run(action);
-            } else {
-                return action.run();
-            }
-        }
-    }
-
-    public <T> void handlesOneWay(TransactionIntent onewayIntent,
-                                  TransactionIntent implIntent,
-                                  TransactionalAction<T> action) throws Exception {
-        if (implIntent == null) {
-            implIntent = TransactionIntent.noManagedTransaction;
-        }
-
-        if (onewayIntent == null) {
-            // Assume transactedOneWay
-            run(action);
-            return;
-        }
-
-        if (onewayIntent == TransactionIntent.transactedOneWay) {
-            if (implIntent != TransactionIntent.managedTransactionGlobal) {
-                throw new IncompatibleIntentException(onewayIntent + "<-X->" + implIntent);
-            } else {
-                run(action);
-                return;
-            }
-        } else {
-            // TransactionIntent.immediateOneWay
-            Transaction tx = suspendsTransactionPreInvoke();
-            try {
-                run(action);
-                return;
-            } finally {
-                suspendsTransactionPostInvoke(tx);
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
deleted file mode 100644
index 31beab4fca..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
+++ /dev/null
@@ -1,90 +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.policy.transaction;
-
-import java.io.File;
-
-import javax.transaction.TransactionManager;
-
-import org.apache.geronimo.transaction.log.HOWLLog;
-import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
-import org.apache.geronimo.transaction.manager.XidFactory;
-import org.apache.geronimo.transaction.manager.XidFactoryImpl;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionManagerWrapper {
-    private TransactionManager transactionManager;
-    private HOWLLog howlLog;
-
-    private String logFileDir = "target/logs";
-    private String bufferClassName = "org.objectweb.howl.log.BlockLogBuffer";
-    private int bufferSizeKBytes = 32;
-    private boolean checksumEnabled = true;
-    private boolean adler32Checksum = true;
-    private int flushSleepTimeMilliseconds = 50;
-    private String logFileExt = "log";
-    private String logFileName = "transaction";
-    private int maxBlocksPerFile = -1;
-    private int maxLogFiles = 2;
-    private int maxBuffers = 0;
-    private int minBuffers = 4;
-    private int threadsWaitingForceThreshold = -1;
-    private File serverBaseDir = new File(System.getProperty("basedir", System.getProperty("user.dir")));
-
-    public TransactionManagerWrapper() {
-        super();
-    }
-
-    public void start() {
-        try {
-            XidFactory xidFactory = new XidFactoryImpl();
-            howlLog =
-                new HOWLLog(bufferClassName, bufferSizeKBytes, checksumEnabled, adler32Checksum,
-                            flushSleepTimeMilliseconds, logFileDir, logFileExt, logFileName, maxBlocksPerFile,
-                            maxBuffers, maxLogFiles, minBuffers, threadsWaitingForceThreshold, xidFactory,
-                            serverBaseDir);
-
-            howlLog.doStart();
-            transactionManager = new GeronimoTransactionManager(1200, xidFactory, howlLog);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.ModuleActivator#stop(org.apache.tuscany.sca.core.ExtensionPointRegistry)
-     */
-    public void stop() {
-        try {
-            if (howlLog != null) {
-                howlLog.doStop();
-            }
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    public TransactionManager getTransactionManager() {
-        return transactionManager;
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
deleted file mode 100644
index 3339f2e338..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.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.policy.transaction;
-
-import javax.transaction.TransactionManager;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionModuleActivator implements ModuleActivator {
-    private TransactionManagerWrapper wrapper;
-
-    /**
-     * @see org.apache.tuscany.sca.core.ModuleActivator#start(org.apache.tuscany.sca.core.ExtensionPointRegistry)
-     */
-    public void start(ExtensionPointRegistry registry) {
-        if (registry != null) {
-            UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-            TransactionManager transactionManager = utilities.getUtility(TransactionManager.class);
-            if (transactionManager != null) {
-                // The transaction manage is provided by the hosting environment
-//                RuntimeWireProcessorExtensionPoint wireProcessorExtensionPoint =
-//                    registry.getExtensionPoint(RuntimeWireProcessorExtensionPoint.class);
-//                TransactionManagerHelper helper = new TransactionManagerHelper(transactionManager);
-//                wireProcessorExtensionPoint.addWireProcessor(new TransactionRuntimeWireProcessor(helper));
-                return;
-            }
-        }
-        try {
-            wrapper = new TransactionManagerWrapper();
-            wrapper.start();
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-        if (registry != null) {
-            UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-            utilities.addUtility(wrapper.getTransactionManager());
-//            RuntimeWireProcessorExtensionPoint wireProcessorExtensionPoint =
-//                registry.getExtensionPoint(RuntimeWireProcessorExtensionPoint.class);
-//            TransactionManagerHelper helper = new TransactionManagerHelper(wrapper.getTransactionManager());
-//            wireProcessorExtensionPoint.addWireProcessor(new TransactionRuntimeWireProcessor(helper));
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.ModuleActivator#stop(org.apache.tuscany.sca.core.ExtensionPointRegistry)
-     */
-    public void stop(ExtensionPointRegistry registry) {
-        try {
-            if (wrapper != null) {
-                wrapper.stop();
-                wrapper = null;
-            }
-            if (registry != null && wrapper != null) {
-                UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-                utilities.removeUtility(wrapper.getTransactionManager());
-            }
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
deleted file mode 100644
index 3a397e10d0..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
+++ /dev/null
@@ -1,46 +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.policy.transaction;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.policy.Policy;
-
-/**
- * The model for Tuscany transaction policy
- * 
- * @version $Rev$ $Date$
- */
-public interface TransactionPolicy extends Policy {
-    String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
-    QName NAME = new QName(SCA10_TUSCANY_NS, "transactionPolicy");
-
-    enum Action {
-        PROPAGATE, SUSPEND, REQUIRE_GLOBAL, REQUIRE_LOCAL, REQUIRE_NONE
-    };
-
-    int getTransactionTimeout();
-
-    void setTransactionTimeout(int seconds);
-
-    void setAction(Action action);
-
-    Action getAction();
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
deleted file mode 100644
index 0dfa986177..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
+++ /dev/null
@@ -1,71 +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.policy.transaction;
-
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.Definitions;
-import org.apache.tuscany.sca.definitions.util.DefinitionsUtil;
-import org.apache.tuscany.sca.provider.DefinitionsProvider;
-import org.apache.tuscany.sca.provider.DefinitionsProviderException;
-
-/**
- * Provider for Policy Intents and PolicySet definitions related to transaction
- *
- * @version $Rev$ $Date$
- */
-public class TransactionPolicyDefinitionsProvider implements DefinitionsProvider {
-    private static final String scaDefinitionsFile = "definitions.xml";
-    private static final String tuscanyDefinitionsFile = "tuscany_definitions.xml";
-    private URLArtifactProcessor urlArtifactProcessor;
-
-    public TransactionPolicyDefinitionsProvider(ExtensionPointRegistry registry) {
-        URLArtifactProcessorExtensionPoint documentProcessors =
-            registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(Definitions.class);
-    }
-
-    public Definitions getDefinitions() throws DefinitionsProviderException {
-
-        try {
-            Definitions scaTransactionPolicyDefns = null;
-            Definitions tuscanyTransactionPolicyDefns = null;
-
-            URI uri = new URI(scaDefinitionsFile);
-            URL defintionsFileUrl = getClass().getResource(scaDefinitionsFile);
-            scaTransactionPolicyDefns = (Definitions)urlArtifactProcessor.read(null, uri, defintionsFileUrl);
-
-            uri = new URI(tuscanyDefinitionsFile);
-            defintionsFileUrl = getClass().getResource(tuscanyDefinitionsFile);
-            tuscanyTransactionPolicyDefns = (Definitions)urlArtifactProcessor.read(null, uri, defintionsFileUrl);
-
-            DefinitionsUtil.aggregate(tuscanyTransactionPolicyDefns, scaTransactionPolicyDefns);
-
-            return scaTransactionPolicyDefns;
-        } catch (Exception e) {
-            throw new DefinitionsProviderException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
deleted file mode 100644
index f178876a72..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.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 org.apache.tuscany.sca.policy.transaction;
-
-import javax.xml.namespace.QName;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionPolicyImpl implements TransactionPolicy {
-    private boolean unresolved;
-    private int transactionTimeout = 1200;
-    private Action action = Action.PROPAGATE;
-
-    public int getTransactionTimeout() {
-        return transactionTimeout;
-    }
-
-    public void setTransactionTimeout(int transactionTimeout) {
-        this.transactionTimeout = transactionTimeout;
-    }
-
-    public Action getAction() {
-        return action;
-    }
-
-    public void setAction(Action policy) {
-        this.action = policy;
-    }
-
-    public QName getSchemaName() {
-        return NAME;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
deleted file mode 100644
index 831cd13914..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
+++ /dev/null
@@ -1,96 +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.policy.transaction;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionPolicyProcessor implements StAXArtifactProcessor<TransactionPolicy> {
-    public static final String TIMEOUT = "transactionTimeout";
-    public static final String ACTION = "action";
-    
-    public QName getArtifactType() {
-        return TransactionPolicy.NAME;
-    }
-
-    public TransactionPolicyProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-    }
-
-    public TransactionPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        TransactionPolicy txPolicy = new TransactionPolicyImpl();
-        int event = reader.getEventType();
-        while (reader.hasNext()) {
-            event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT: {
-                    String timeout = reader.getAttributeValue(null, TIMEOUT);
-                    if (timeout != null) {
-                        txPolicy.setTransactionTimeout(Integer.parseInt(timeout));
-                    }
-                    String action = reader.getAttributeValue(null, ACTION);
-                    if (action != null) {
-                        txPolicy.setAction(TransactionPolicy.Action.valueOf(action));
-                    }
-                    break;
-                }
-            }
-
-            if (event == END_ELEMENT) {
-                if (TransactionPolicy.NAME.equals(reader.getName())) {
-                    break;
-                }
-            }
-
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-
-        return txPolicy;
-    }
-
-    public void write(TransactionPolicy policy, XMLStreamWriter writer) throws ContributionWriteException,
-        XMLStreamException {
-    }
-
-    public Class<TransactionPolicy> getModelType() {
-        return TransactionPolicy.class;
-    }
-
-    public void resolve(TransactionPolicy policy, ModelResolver resolver) throws ContributionResolveException {
-
-    }
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
deleted file mode 100644
index be97090378..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
+++ /dev/null
@@ -1,92 +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.policy.transaction;
-
-import javax.transaction.TransactionManager;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionPolicyProviderFactory implements PolicyProviderFactory<TransactionPolicy> {
-    private TransactionManagerHelper helper;
-
-    public TransactionPolicyProviderFactory(ExtensionPointRegistry registry) {
-        super();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        TransactionManager tm = utilities.getUtility(TransactionManager.class);
-        this.helper = new TransactionManagerHelper(tm);
-    }
-    
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createImplementationPolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.assembly.Implementation)
-     */
-    public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) {
-        if (component instanceof PolicySetAttachPoint) {
-            return new TransactionImplementationPolicyProvider(helper, (PolicySetAttachPoint)component);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createReferencePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentReference, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public PolicyProvider createReferencePolicyProvider(RuntimeComponent component,
-                                                        RuntimeComponentReference reference,
-                                                        Binding binding) {
-        if (binding instanceof PolicySetAttachPoint) {
-            return new TransactionReferencePolicyProvider(helper, (PolicySetAttachPoint)binding);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createServicePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentService, org.apache.tuscany.sca.assembly.Binding)
-     */
-    public PolicyProvider createServicePolicyProvider(RuntimeComponent component,
-                                                      RuntimeComponentService service,
-                                                      Binding binding) {
-        if (binding instanceof PolicySetAttachPoint) {
-            return new TransactionServicePolicyProvider(helper, (PolicySetAttachPoint)binding);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()
-     */
-    public Class<TransactionPolicy> getModelType() {
-        return TransactionPolicy.class;
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
deleted file mode 100644
index 0795a4e5cf..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
+++ /dev/null
@@ -1,61 +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.policy.transaction;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionReferencePolicyProvider implements PolicyProvider {
-    private TransactionManagerHelper helper;
-    private List<PolicySet> policySets;
-
-    public TransactionReferencePolicyProvider(TransactionManagerHelper helper, PolicySetAttachPoint attachPoint) {
-        super();
-        this.helper = helper;
-        this.policySets = attachPoint.getApplicablePolicySets();
-    }
-
-    public Interceptor createInterceptor(Operation operation) {
-        for (PolicySet policySet : policySets) {
-            for (Object p : policySet.getPolicies()) {
-                if (p instanceof TransactionPolicy) {
-                    TransactionInterceptor interceptor =
-                        new TransactionInterceptor(helper, true, (TransactionPolicy)p, null);
-                    return interceptor;
-                }
-            }
-        }
-        return null;
-    }
-
-    public String getPhase() {
-        return Phase.REFERENCE_POLICY;
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
deleted file mode 100644
index 9f9088a380..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
+++ /dev/null
@@ -1,61 +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.policy.transaction;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionServicePolicyProvider implements PolicyProvider {
-    private TransactionManagerHelper helper;
-    private List<PolicySet> policySets;
-
-    public TransactionServicePolicyProvider(TransactionManagerHelper helper, PolicySetAttachPoint attachPoint) {
-        super();
-        this.helper = helper;
-        this.policySets = attachPoint.getApplicablePolicySets();
-    }
-
-    public Interceptor createInterceptor(Operation operation) {
-        for (PolicySet policySet : policySets) {
-            for (Object p : policySet.getPolicies()) {
-                if (p instanceof TransactionPolicy) {
-                    TransactionInterceptor interceptor =
-                        new TransactionInterceptor(helper, true, (TransactionPolicy)p, null);
-                    return interceptor;
-                }
-            }
-        }
-        return null;
-    }
-
-    public String getPhase() {
-        return Phase.SERVICE_POLICY;
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java b/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
deleted file mode 100644
index 5a7ae5c4cc..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.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.policy.transaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TransactionalAction<T> {
-    /**
-     * @return
-     * @throws Exception
-     */
-    T run() throws Exception;
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 1d034e23a2..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.policy.transaction.TransactionPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#transactionPolicy,model=org.apache.tuscany.sca.policy.transaction.TransactionPolicy
\ No newline at end of file
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 9a35d62cad..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /dev/null
@@ -1,18 +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.

-# Implementation class for the ModuleActivator

-org.apache.tuscany.sca.policy.transaction.TransactionModuleActivator

diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider b/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
deleted file mode 100644
index e9d9fab519..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for SCA Definitions Providers
-org.apache.tuscany.sca.policy.transaction.TransactionPolicyDefinitionsProvider
\ No newline at end of file
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
deleted file mode 100644
index eeec814f60..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the policy extension

-org.apache.tuscany.sca.policy.transaction.TransactionPolicyProviderFactory;model=org.apache.tuscany.sca.policy.transaction.TransactionPolicy

diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/log4j.properties b/java/sca-contrib/modules/policy-transaction/src/main/resources/log4j.properties
deleted file mode 100644
index 698ee41d7e..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,29 +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.
-#  
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, CONSOLE
-
-# CONSOLE is set to be a ConsoleAppender.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-
-
-# Print only messages of level WARN or above in the package com.foo.
-log4j.logger.org.apache.tuscany=INFO
\ No newline at end of file
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml b/java/sca-contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
deleted file mode 100644
index ff51b131b7..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <intent name="managedTransaction" constrains="implementation">
-        <description>Used to indicate the transaction environment desired by a component implementation.</description>
-    </intent>
-    <intent name="managedTransaction.global">
-        <description>
-            Used to indicate that a component implementation requires a managed global transaction.
-        </description>
-    </intent>
-    <intent name="managedTransaction.local">
-        <description>
-            Used to indicate that a component implementation requires a managed local transaction.
-        </description>
-    </intent>
-    <intent name="noManagedTransaction" constrains="implementation">
-        <description>
-            Used to indicate that a component implementation will manage its own transaction resources.
-        </description>
-    </intent>
-    <intent name="propagatesTransaction" constrains="binding">
-        <description>
-            Used to indicate that a reference will propagate any client transaction or that a service will be dispatched
-            under any received transaction.
-        </description>
-    </intent>
-    <intent name="suspendsTransaction" constrains="binding">
-        <description>
-            Used to indicate that a reference will not propagate any client transaction or that a service will not be
-            dispatched under any received transaction.
-        </description>
-    </intent>
-    <intent name="transactedOneWay" constrains="binding">
-        <description>
-            Used to indicate that the component requires the SCA runtime to transact OneWay send of messages as part of
-            any client global transaction or to transact oneWay message receipt as part of any service global
-            transaction.
-        </description>
-    </intent>
-    <intent name="immediateOneWay" constrains="binding">
-        <description>
-            Used to indicate that the component requires the SCA runtime to process the sending or receiving of OneWay
-            messages immediately, regardless of any transaction under which the sending/receiving component runs.
-        </description>
-    </intent>
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml b/java/sca-contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
deleted file mode 100644
index 324fa03da6..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <policySet name="ManagedTransactionPolicySet" provides="managedTransaction" appliesTo="implementation">
-        <intentMap provides="managedTransaction" default="global">
-            <qualifier name="global">
-                <tuscany:transactionPolicy transactionTimeout="1200" action="REQUIRE_GLOBAL" />
-            </qualifier>
-            <qualifier name="local">
-                <tuscany:transactionPolicy transactionTimeout="1200" action="REQUIRE_LOCAL" />
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="NoManagedTransactionPolicySet" provides="noManagedTransaction"
-        appliesTo="implementation">
-        <tuscany:transactionPolicy action="REQUIRE_NONE" />
-    </policySet>
-
-    <policySet name="PropagatesTransactionPolicySet" provides="propagatesTransaction" appliesTo="binding">
-        <tuscany:transactionPolicy action="PROPAGATE" />
-    </policySet>
-
-    <policySet name="SuspendsTransactionPolicySet" provides="suspendsTransaction" appliesTo="binding">
-        <tuscany:transactionPolicy action="SUSPEND" />
-    </policySet>
-
-    <policySet name="TransactedOneWayPolicySet" provides="transactedOneWay" appliesTo="binding">
-        <tuscany:transactionPolicy action="PROPAGATE" />
-    </policySet>
-
-    <policySet name="ImmediateOneWayPolicySet" provides="immediateOneWay" appliesTo="binding">
-        <tuscany:transactionPolicy action="SUSPEND" />
-    </policySet>
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java b/java/sca-contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
deleted file mode 100644
index e8560d775d..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
+++ /dev/null
@@ -1,54 +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.policy.transaction;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-/**
- * Test the reading of ws config params policy.
- *
- * @version $Rev$ $Date$
- */
-public class PolicyReadTestCase extends TestCase {
-
-    @Override
-    public void setUp() throws Exception {
-    }
-
-    public void testPolicyReading() throws Exception {
-
-        TransactionPolicyProcessor processor = new TransactionPolicyProcessor(null, null);
-
-        URL url = getClass().getResource("/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml");
-        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-
-        InputStream urlStream = url.openStream();
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
-
-        TransactionPolicy policy = processor.read(reader);
-        assertEquals(1200, policy.getTransactionTimeout());
-    }
-
-}
diff --git a/java/sca-contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java b/java/sca-contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
deleted file mode 100644
index 544e0f68c0..0000000000
--- a/java/sca-contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
+++ /dev/null
@@ -1,194 +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.policy.transaction;
-
-import java.util.logging.Logger;
-
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
-import junit.framework.TestCase;
-
-import org.apache.geronimo.transaction.manager.NamedXAResource;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionManagerHelperTestCase extends TestCase {
-    private static final Logger logger = Logger.getLogger(TransactionManagerHelper.class.getName());
-
-    public static class MockXAResource implements NamedXAResource {
-
-        private String rm;
-        private String id;
-        private int timeout = 1000;
-
-        public MockXAResource(String rm, String id) {
-            super();
-            this.rm = rm;
-            this.id = id;
-        }
-
-        public String getName() {
-            return rm + ":" + id;
-        }
-
-        public void commit(Xid xid, boolean onePhase) throws XAException {
-            logger.info(id + ": commit(" + xid + "," + onePhase + ")");
-        }
-
-        public void end(Xid xid, int flags) throws XAException {
-            logger.info(id + ": end(" + xid + "," + toString(flags) + ")");
-        }
-
-        public void forget(Xid xid) throws XAException {
-            logger.info(id + ": forget(" + xid + ")");
-        }
-
-        public int getTransactionTimeout() throws XAException {
-            return timeout;
-        }
-
-        public boolean isSameRM(XAResource xares) throws XAException {
-            if (xares instanceof MockXAResource) {
-                MockXAResource res = (MockXAResource)xares;
-                return res.rm.endsWith(rm);
-            } else {
-                return false;
-            }
-        }
-
-        public int prepare(Xid xid) throws XAException {
-            logger.info(id + ": prepare(" + xid + ")");
-            return XA_OK;
-        }
-
-        public Xid[] recover(int flag) throws XAException {
-            return null;
-        }
-
-        public void rollback(Xid xid) throws XAException {
-            logger.info(id + ": rollback(" + xid + ")");
-        }
-
-        public boolean setTransactionTimeout(int seconds) throws XAException {
-            this.timeout = seconds;
-            return true;
-        }
-
-        public void start(Xid xid, int flags) throws XAException {
-            logger.info(id + ": start(" + xid + "," + toString(flags) + ")");
-        }
-
-        private String toString(int flags) {
-            StringBuffer sb = new StringBuffer();
-            if ((flags & TMENDRSCAN) != 0) {
-                sb.append("TMENDRSCAN ");
-            }
-            if ((flags & TMFAIL) != 0) {
-                sb.append("TMFAIL ");
-            }
-            if ((flags & TMJOIN) != 0) {
-                sb.append("TMJOIN ");
-            }
-            if ((flags & TMONEPHASE) != 0) {
-                sb.append("TMONEPHASE ");
-            }
-            if ((flags & TMRESUME) != 0) {
-                sb.append("TMRESUME ");
-            }
-            if ((flags & TMSTARTRSCAN) != 0) {
-                sb.append("TMSTARTRSCAN ");
-            }
-            if ((flags & TMSUCCESS) != 0) {
-                sb.append("TMSUCCESS ");
-            }
-            if ((flags & TMSUSPEND) != 0) {
-                sb.append("TMSUSPEND ");
-            }
-            if (sb.length() == 0) {
-                sb.append("TMNOFLAGS");
-            } else {
-                sb.deleteCharAt(sb.length() - 1);
-            }
-            return sb.toString();
-        }
-
-    }
-
-    public void testHelper() throws Exception {
-        TransactionManagerWrapper activator = new TransactionManagerWrapper();
-        activator.start();
-        TransactionManager tm = activator.getTransactionManager();
-        // GeronimoUserTransaction tx = new GeronimoUserTransaction(tm);
-        TransactionManagerHelper helper = new TransactionManagerHelper(tm);
-
-        // No TX yet
-        assertNull(tm.getTransaction());
-        Transaction t1 = helper.managedGlobalTransactionPreInvoke();
-        // Should create T1
-        assertNotNull(t1);
-        // The current TX should be T1
-        assertSame(t1, tm.getTransaction());
-        
-        XAResource res1 = new MockXAResource("Derby", "001");
-        XAResource res2 = new MockXAResource("DB2", "002");
-        tm.getTransaction().enlistResource(res1);
-        tm.getTransaction().enlistResource(res2);
-
-        Transaction suspended = helper.suspendsTransactionPreInvoke();
-        suspended.delistResource(res1, XAResource.TMSUSPEND);
-        suspended.delistResource(res2, XAResource.TMSUSPEND);
-       
-        // T1 is suspended
-        assertSame(t1, suspended);
-        // No more active TX
-        assertNull(tm.getTransaction());
-
-        Transaction t2 = helper.managedGlobalTransactionPreInvoke();
-        assertNotNull(t2);
-        // The current TX should be T2
-        assertSame(t2, tm.getTransaction());
-        
-        XAResource res3 = new MockXAResource("Oracle", "003");
-        tm.getTransaction().enlistResource(res3);
-
-        tm.getTransaction().delistResource(res3, XAResource.TMSUCCESS);
-        tm.rollback();
-
-        // Skip post
-        // helper.managedGlobalTransactionPostInvoke(t2);
-
-        helper.suspendsTransactionPostInvoke(suspended);
-        suspended.enlistResource(res1);
-        suspended.enlistResource(res2);
-        // T1 is now resumed
-        assertSame(t1, tm.getTransaction());
-
-        helper.managedGlobalTransactionPostInvoke(t1, false);
-        assertNotNull(tm.getTransaction());
-        assertEquals(6, t1.getStatus());
-
-        activator.stop();
-    }
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/LICENSE b/java/sca-contrib/modules/sca-api-osoa/LICENSE
deleted file mode 100644
index 617c69079b..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/LICENSE
+++ /dev/null
@@ -1,243 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-===============================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================
-The module sca-api includes a number of files under the following license:
-
-Permission to copy, display and distribute the Service Component Architecture Specification and/or
-portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
-that you include the following on ALL copies of the Service Component Architecture Specification, or
-portions thereof, that you make:
-
-1. A link or URL to the Service Component Architecture Specification at this location:
-  http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
-
-2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
-
-BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
-SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
-royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
-necessary to implement the Service Component Architecture Specification.
-THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
-AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
-REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
-DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or
-publicity pertaining to the Service Component Architecture Specification or its contents without specific,
-
-
-
diff --git a/java/sca-contrib/modules/sca-api-osoa/META-INF/MANIFEST.MF b/java/sca-contrib/modules/sca-api-osoa/META-INF/MANIFEST.MF
deleted file mode 100644
index 33c6857cf9..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.api;version="2.0.0",

- org.osoa.sca;version="2.0.0",

- org.osoa.sca.annotations;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA API

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397105046

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: API classes for the Service Component Architecture

-Import-Package: javax.security.auth,

- org.apache.tuscany.sca.api;version="2.0.0",

- org.osoa.sca;version="2.0.0",

- org.osoa.sca.annotations;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.api.osoa

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca-contrib/modules/sca-api-osoa/NOTICE b/java/sca-contrib/modules/sca-api-osoa/NOTICE
deleted file mode 100644
index 4fe77f0e58..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/NOTICE
+++ /dev/null
@@ -1,13 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the Service Component Architecture specification license
-(see the LICENSE file contained in this distribution) with the following copyright
-
-(c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
-37 Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
-38 Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
-
diff --git a/java/sca-contrib/modules/sca-api-osoa/pom.xml b/java/sca-contrib/modules/sca-api-osoa/pom.xml
deleted file mode 100644
index 709c5e642d..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <groupId>org.apache.tuscany.sca</groupId>
-    <artifactId>tuscany-sca-api-osoa</artifactId>
-    <name>Apache Tuscany SCA API</name>
-
-    <description>API classes for the Service Component Architecture OSOA</description>
-    <packaging>jar</packaging>
-
-</project>
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java
deleted file mode 100644
index 578df9e017..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.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 org.apache.tuscany.sca.api;
-
-import java.util.Collection;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-
-/**
- * An extension of the OSOA ComponentContext that provides access to collections
- * of references. 
- * 
- * @version $Rev$ $Date$
- */
-public interface ComponentContextExtension extends ComponentContext {
-    
-   
-    /* ******************** Contribution for issue TUSCANY-2281 ******************** */
-
-    /**
-     * Returns a Collection of typed service proxies for a business interface type and a reference name.
-     * @param businessInterface the interface that will be used to invoke the service
-     * @param referenceName the name of the reference
-     * @param <B> the Java type of the business interface for the reference
-     * @return a Collection of objects that implements the business interface 
-     */
-    <B> Collection<B> getServices(Class<B> businessInterface, String referenceName); 
- 
-
-    /**
-     * Returns a Collection of typed service reference for a business interface type and a reference name. 
-     * @param businessInterface the interface that will be used to invoke the service
-     * @param referenceName the name of the reference
-     * @param <B> the Java type of the business interface for the reference
-     * @return a Collection of objects that implements the business interface
-     */
-    <B> Collection<ServiceReference<B>> getServiceReferences(Class<B> businessInterface, String referenceName); 
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/CallableReference.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/CallableReference.java
deleted file mode 100644
index 7f6756bcbd..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/CallableReference.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca;
-
-/**
- * Common superclass for references that can be passed between components.
- * 
- * @version $Rev$ $Date$
- * @param <B> the Java interface associated with this reference
- */
-public interface CallableReference<B> {
-    /**
-     * Returns a type-safe reference to the target of this reference.
-     * The instance returned is guaranteed to implement the business interface for this reference
-     * but may not be a proxy as defined by java.lang.reflect.Proxy.
-     *
-     * @return a proxy to the target that implements the business interface associated with this reference
-     */
-    B getService();
-
-    /**
-     * Returns the Java class for the business interface associated with this reference.
-     *
-     * @return the Class for the business interface associated with this reference
-     */
-    Class<B> getBusinessInterface();
-
-    /**
-     * Returns true if this reference is conversational.
-     *
-     * @return true if this reference is conversational
-     */
-    boolean isConversational();
-
-    /**
-     * Returns the conversation associated with this reference.
-     * Returns null if no conversation is currently active.
-     *
-     * @return the conversation associated with this reference; may be null
-     */
-    Conversation getConversation();
-
-    /**
-     * Returns the callback ID.
-     *
-     * @return the callback ID
-     */
-    Object getCallbackID();
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ComponentContext.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ComponentContext.java
deleted file mode 100644
index 52290a4bba..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ComponentContext.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca;
-
-import java.util.Collection;
-
-/**
- * Interface providing programmatic access to a component's SCA context as an alternative to injection.
- * It provides access to reference and property values for the component and provides a mechanism for
- * obtaining a reference to a service that can be passed to other components.
- * <p/>
- * SCA components obtain an instance of this interface through injection. Non-SCA client code may also
- * obtain an instance through runtime-specific mechanisms.
- * 
- * @version $Rev$ $Date$
- */
-public interface ComponentContext {
-    /**
-     * Returns the absolute URI of the component within the SCA Domain.
-     *
-     * @return the absolute URI of the component
-     */
-    String getURI();
-
-    /**
-     * Cast a type-safe reference to a CallableReference.
-     * Converts a type-safe reference to an equivalent CallableReference; if the target refers to a service
-     * then a ServiceReference will be returned, if the target refers to a callback then a CallableReference
-     * will be returned.
-     *
-     * @param target a reference proxy provided by the SCA runtime
-     * @param <B> the Java type of the business interface for the reference
-     * @param <R> the type of reference to be returned
-     * @return a CallableReference equivalent for the proxy
-     * @throws IllegalArgumentException if the supplied instance is not a reference supplied by the SCA runtime
-     */
-    <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException;
-
-    /**
-     * Returns a proxy for a reference defined by this component.
-     *
-     * @param businessInterface the interface that will be used to invoke the service
-     * @param referenceName the name of the reference
-     * @param <B> the Java type of the business interface for the reference
-     * @return an object that implements the business interface
-     */
-    <B> B getService(Class<B> businessInterface, String referenceName);
-
-    /**
-     * Returns a ServiceReference for a reference defined by this component.
-     *
-     * @param businessInterface the interface that will be used to invoke the service
-     * @param referenceName the name of the reference
-     * @param <B> the Java type of the business interface for the reference
-     * @return a ServiceReference for the designated reference
-     */
-    <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String referenceName);
-
-    /**
-     * Returns the value of an SCA property defined by this component.
-     *
-     * @param type the Java type to be returned for the property
-     * @param propertyName the name of the property whose value should be returned
-     * @param <B> the Java type of the property
-     * @return the property value
-     */
-    <B> B getProperty(Class<B> type, String propertyName);
-
-    /**
-     * Returns a ServiceReference that can be used to invoke this component over the default service.
-     *
-     * @param businessInterface the interface that will be used to invoke the service
-     * @param <B> the Java type of the business interface for the reference
-     * @return a ServiceReference that will invoke this component
-     */
-    <B> ServiceReference<B> createSelfReference(Class<B> businessInterface);
-
-    /**
-     * Returns a ServiceReference that can be used to invoke this component over the designated service.
-     *
-     * @param businessInterface the interface that will be used to invoke the service
-     * @param serviceName the name of the service to invoke
-     * @param <B> the Java type of the business interface for the reference
-     * @return a ServiceReference that will invoke this component
-     */
-    <B> ServiceReference<B> createSelfReference(Class<B> businessInterface, String serviceName);
-
-    /**
-     * Returns the context for the current SCA service request, or null if there is no current request
-     * or if the context is unavailable.
-     *
-     * @return the SCA request context; may be null
-     */
-    RequestContext getRequestContext();    
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Constants.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Constants.java
deleted file mode 100644
index b1b2af8048..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Constants.java
+++ /dev/null
@@ -1,34 +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.osoa.sca;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface Constants {
-    /**
-     * Namespace for intents.
-     */
-    String SCA_NS = "http://www.osoa.org/xmlns/sca/1.0";
-
-    /**
-     * Prefix form of the namespace that can be prepended to intent declarations.
-     */
-    String SCA_PREFIX = '{' + SCA_NS + '}';
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Conversation.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Conversation.java
deleted file mode 100644
index 12733a7bd2..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Conversation.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca;
-
-/**
- * Interface representing a Conversation providing access to the conversation id and and a mechanism
- * to terminate the conversation.
- * 
- * @version $Rev$ $Date$
- */
-public interface Conversation {
-    /**
-     * Returns the identifier for this conversation.
-     * If a user-defined identity had been supplied for this reference then its value will be returned;
-     * otherwise the identity generated by the system when the conversation was initiated will be returned.
-     *
-     * @return the identifier for this conversation
-     */
-    Object getConversationID();
-
-    /**
-     * End this conversation.
-     */
-    void end();
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ConversationEndedException.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ConversationEndedException.java
deleted file mode 100644
index 2e3b71fd1c..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ConversationEndedException.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca;
-
-/**
- * Exception thrown to indicate the conversation being used for a stateful interaction has been ended.
- *
- * @version $Rev$ $Date$
- */
-public class ConversationEndedException extends ServiceRuntimeException {
-    private static final long serialVersionUID = 3734864942222558406L;
-
-    /**
-     * Override constructor from ServiceRuntimeException.
-     *
-     * @see ServiceRuntimeException
-     */
-    public ConversationEndedException() {
-    }
-
-    /**
-     * Override constructor from ServiceRuntimeException.
-     *
-     * @param message passed to ServiceRuntimeException
-     * @see ServiceRuntimeException
-     */
-    public ConversationEndedException(String message) {
-        super(message);
-    }
-
-    /**
-     * Override constructor from ServiceRuntimeException.
-     *
-     * @param message passed to ServiceRuntimeException
-     * @param cause   passed to ServiceRuntimeException
-     * @see ServiceRuntimeException
-     */
-    public ConversationEndedException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Override constructor from ServiceRuntimeException.
-     *
-     * @param cause passed to ServiceRuntimeException
-     * @see ServiceRuntimeException
-     */
-    public ConversationEndedException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
deleted file mode 100644
index 0a0c2afff9..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca;
-
-/**
- * Exception thrown to indicate that no callback has been registered
- * when interacting with a service.
- *
- * @version $Rev$ $Date$
- */
-public class NoRegisteredCallbackException extends ServiceRuntimeException {
-    private static final long serialVersionUID = 3734864942222558406L;
-
-    /**
-     * Override constructor from ServiceRuntimeException.
-     *
-     * @see ServiceRuntimeException
-     */
-    public NoRegisteredCallbackException() {
-    }
-
-    /**
-     * Override constructor from ServiceRuntimeException.
-     *
-     * @param message passed to ServiceRuntimeException
-     * @see ServiceRuntimeException
-     */
-    public NoRegisteredCallbackException(String message) {
-        super(message);
-    }
-
-    /**
-     * Override constructor from ServiceRuntimeException.
-     *
-     * @param message passed to ServiceRuntimeException
-     * @param cause   passed to ServiceRuntimeException
-     * @see ServiceRuntimeException
-     */
-    public NoRegisteredCallbackException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Override constructor from ServiceRuntimeException.
-     *
-     * @param cause passed to ServiceRuntimeException
-     * @see ServiceRuntimeException
-     */
-    public NoRegisteredCallbackException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/RequestContext.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/RequestContext.java
deleted file mode 100644
index cdcfa9a791..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/RequestContext.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca;
-
-import javax.security.auth.Subject;
-
-/**
- * Interface that provides information on the current request.
- *
- * @version $Rev$ $Date$
- */
-public interface RequestContext {
-    /**
-     * Returns the JAAS Subject of the current request.
-     *
-     * @return the Subject of the current request
-     */
-    Subject getSecuritySubject();
-
-    /**
-     * Returns the name of the service that was invoked.
-     *
-     * @return the name of the service that was invoked
-     */
-    String getServiceName();
-
-    /**
-     * Returns a CallableReference for the service that was invoked by the caller.
-     *
-     * @param <B> the Java type of the business interface for the reference
-     * @return a CallableReference for the service that was invoked by the caller
-     */
-    <B> CallableReference<B> getServiceReference();
-
-    /**
-     * Returns a type-safe reference to the callback provided by the caller.
-     *
-     * @param <CB> the Java type of the business interface for the callback
-     * @return a type-safe reference to the callback provided by the caller
-     */
-    <CB> CB getCallback();
-
-    /**
-     * Returns a CallableReference to the callback provided by the caller.
-     *
-     * @param <CB> the Java type of the business interface for the callback
-     * @return a CallableReference to the callback provided by the caller
-     */
-    <CB> CallableReference<CB> getCallbackReference();
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceReference.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceReference.java
deleted file mode 100644
index 8da6bcd1f3..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceReference.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca;
-
-
-/**
- * A ServiceReference represents a client's perspective of a reference to another service.
- *
- * @version $Rev$ $Date$
- * @param <B> the Java interface associated with this reference
- */
-public interface ServiceReference<B> extends CallableReference<B> {
-    /**
-     * Returns the id supplied by the user that will be associated with conversations initiated through this reference.
-     *
-     * @return the id to associated with any conversation initiated through this reference
-     */
-    Object getConversationID();
-
-    /**
-     * Set the id to associate with any conversation started through this reference.
-     * If the value supplied is null then the id will be generated by the implementation.
-     *
-     * @param conversationId the user-defined id to associated with a conversation
-     * @throws IllegalStateException if a conversation is currently associated with this reference
-     */
-    void setConversationID(Object conversationId) throws IllegalStateException;
-
-    /**
-     * Sets the callback ID.
-     *
-     * @param callbackID the callback ID
-     */
-    void setCallbackID(Object callbackID);
-
-    /**
-     * Returns the callback object.
-     *
-     * @return the callback object
-     */
-    Object getCallback();
-
-    /**
-     * Sets the callback object.
-     *
-     * @param callback the callback object
-     */
-    void setCallback(Object callback);
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceRuntimeException.java
deleted file mode 100644
index 70f5f904a4..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceRuntimeException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca;
-
-
-/**
- * Base for Exceptions that may be raised by an SCA runtime and which typical
- * application code is not expected to be able to handle.
- *
- * @version $Rev$ $Date$
- */
-public class ServiceRuntimeException extends RuntimeException {
-    private static final long serialVersionUID = -3876058842262557092L;
-
-    /**
-     * Override constructor from RuntimeException.
-     *
-     * @see RuntimeException
-     */
-    public ServiceRuntimeException() {
-    }
-
-    /**
-     * Override constructor from RuntimeException.
-     *
-     * @param message passed to RuntimeException
-     * @see RuntimeException
-     */
-    public ServiceRuntimeException(String message) {
-        super(message);
-    }
-
-    /**
-     * Override constructor from RuntimeException.
-     *
-     * @param message passed to RuntimeException
-     * @param cause   passed to RuntimeException
-     * @see RuntimeException
-     */
-    public ServiceRuntimeException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Override constructor from RuntimeException.
-     *
-     * @param cause passed to RuntimeException
-     * @see RuntimeException
-     */
-    public ServiceRuntimeException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceUnavailableException.java
deleted file mode 100644
index dd6b1c3242..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceUnavailableException.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca;
-
-/**
- * Exception used to indicate that a runtime exception occurred during the invocation of and external service.
- *
- * @version $Rev$ $Date$
- */
-public class ServiceUnavailableException extends ServiceRuntimeException {
-
-    private static final long serialVersionUID = -5869397223249401047L;
-
-    /**
-     * Constructs a new ServiceUnavailableException.
-     */
-    public ServiceUnavailableException() {
-        super((Throwable) null);
-    }
-
-    /**
-     * Constructs a new ServiceUnavailableException with the specified detail message.
-     *
-     * @param message The detail message (which is saved to later retrieval by the getMessage() method).
-     */
-    public ServiceUnavailableException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructs a new ServiceUnavailableException with the specified cause.
-     *
-     * @param cause The cause (which is saved to later retrieval by the getCause() method).
-     */
-    public ServiceUnavailableException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Constructs a new ServiceUnavailableException with the specified detail message and cause.
-     *
-     * @param message The message (which is saved to later retrieval by the getMessage() method).
-     * @param cause   The cause (which is saved to later retrieval by the getCause() method).
-     */
-    public ServiceUnavailableException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
deleted file mode 100644
index 556dd4e68e..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation on a method that indicates that its parameters may safely
- * be passed by reference. The annotation may also be placed on an interface
- * or class to indicate that all declared methods support this optimization.
- *
- * @version $Rev$ $Date$
- */
-@Target({TYPE, METHOD})
-@Retention(RUNTIME)
-public @interface AllowsPassByReference {
-}
-
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Authentication.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Authentication.java
deleted file mode 100644
index f7fca41212..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Authentication.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.osoa.sca.Constants.SCA_PREFIX;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation denoting the intent that service operations require authentication.
- * <p/>
- * Applied to the injection site (field, method or constructor parameter) for a reference,
- * it indicates that all invocations through that reference require authentication.
- * <p/>
- * Applied to a interface method on a service contract, it indicates that all invocations
- * of that service operation require authentication; applied to the type of a service contract,
- * it indicates that all service operations on that interface require authentication.
- * <p/>
- * Applied to a method on an implementation class, it indicates that all invocations that
- * are dispatched to that implementation method (through any service) require authentication.
- * Applied to a interface implemented by an implementation class, it indicates that all
- * invocations that are dispatched to the implementation method for that interface operation
- * require authentication.
- * <p/>
- * Applied to an implementation class, it indicates that all invocations of that implementation
- * and that all invocations made by that implementation require authentication.
- *
- * @version $Rev$ $Date$
- */
-@Inherited
-@Target({TYPE, FIELD, METHOD, PARAMETER})
-@Retention(RUNTIME)
-@Intent(Authentication.AUTHENTICATION)
-public @interface Authentication {
-    String AUTHENTICATION = SCA_PREFIX + "authentication";
-    String AUTHENTICATION_MESSAGE = AUTHENTICATION + "message";
-    String AUTHENTICATION_TRANSPORT = AUTHENTICATION + "transport";
-
-    /**
-     * List of authentication qualifiers (such as "message" or "transport").
-     *
-     * @return authentication qualifiers
-     */
-    @Qualifier
-    String[] value() default "";
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Callback.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Callback.java
deleted file mode 100644
index 0ee613fdcb..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Callback.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * When placed on a service interface, this annotation specifies the interface
- * to be used for callbacks.
- * <p/>
- * When placed on a method or field, this annotation denotes the injection
- * site to be used for a callback reference.
- * <p/>
- * There is a error in the 1.00 draft spec in the declaration of this interface.
- * The form defined here is a proposed correction for that error.
- *
- * @version $Rev$ $Date$
- */
-@Target({TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Callback {
-    /**
-     * The Class of the associated callback interface.
-     *
-     * @return the associated callback interface
-     */
-    Class<?> value() default Void.class;
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ComponentName.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ComponentName.java
deleted file mode 100644
index bc73d22c9d..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ComponentName.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a field or method that is used to inject the component's name.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface ComponentName {
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Confidentiality.java
deleted file mode 100644
index 25ade6f091..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Confidentiality.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.osoa.sca.Constants.SCA_PREFIX;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation denoting the intent that service operations require confidentiality.
- * <p/>
- * Applied to the injection site (field, method or constructor parameter) for a reference,
- * it indicates that all invocations through that reference require confidentiality.
- * <p/>
- * Applied to a interface method on a service contract, it indicates that all invocations
- * of that service operation require confidentiality; applied to the type of a service contract,
- * it indicates that all service operations on that interface require confidentiality.
- * <p/>
- * Applied to a method on an implementation class, it indicates that all invocations that
- * are dispatched to that implementation method (through any service) require confidentiality.
- * Applied to a interface implemented by an implementation class, it indicates that all
- * invocations that are dispatched to the implementation method for that interface operation
- * require confidentiality.
- * <p/>
- * Applied to an implementation class, it indicates that all invocations of that implementation
- * and that all invocations made by that implementation require confidentiality.
- *
- * @version $Rev$ $Date$
- */
-@Inherited
-@Target({TYPE, FIELD, METHOD, PARAMETER})
-@Retention(RUNTIME)
-@Intent(Confidentiality.CONFIDENTIALITY)
-public @interface Confidentiality {
-    String CONFIDENTIALITY = SCA_PREFIX + "confidentiality";
-    String CONFIDENTIALITY_MESSAGE = CONFIDENTIALITY + ".message";
-    String CONFIDENTIALITY_TRANSPORT = CONFIDENTIALITY + ".transport";
-
-    /**
-     * List of confidentiality qualifiers (such as "message" or "transport").
-     *
-     * @return confidentiality qualifiers
-     */
-    @Qualifier
-    String[] value() default "";
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Constructor.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Constructor.java
deleted file mode 100644
index bc09c8ccdd..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Constructor.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Used to indicate the constructor the runtime is to use when instantiating a component implementation instance
- *
- * @version $Rev$ $Date$
- */
-@Target(CONSTRUCTOR)
-@Retention(RUNTIME)
-public @interface Constructor {
-    String[] value() default "";
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Context.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Context.java
deleted file mode 100644
index baacb2f520..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Context.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a field or setter method that is used to inject an SCA context.
- * The type of context injected is determined by the type of the field or the parameter
- * to the setter method and is typically a ComponentContext or RequestContext.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Context {
-}
-
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
deleted file mode 100644
index e9fcfee2d3..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate the characteristics of a conversation.
- *
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RUNTIME)
-public @interface ConversationAttributes {
-    /**
-     * The maximum time that can pass between operations in a single conversation. If this time is exceeded the
-     * container may end the conversation.
-     *
-     * @return the maximum time that can pass between operations in a single conversation
-     */
-    String maxIdleTime() default "";
-
-    /**
-     * The maximum time that a conversation may remain active. If this time is exceeded the container may end the
-     * conversation.
-     *
-     * @return the maximum time that a conversation may remain active
-     */
-    String maxAge() default "";
-
-    /**
-     * If true, indicates that only the user that initiated the conversation has the authority to continue it.
-     *
-     * @return true if only the user that initiated the conversation has the authority to continue it
-     */
-    boolean singlePrincipal() default false;
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationID.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationID.java
deleted file mode 100644
index b2f6f17129..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationID.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a field or method that is used to inject the conversation ID.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface ConversationID {
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Conversational.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Conversational.java
deleted file mode 100644
index f0350f8ff5..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Conversational.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Used on a Java interface to denote a conversational service contract.
- * <p/>
- * The draft spec erroneously defines the targets for this as {TYPE, METHOD, FIELD}
- * but this annotation is only applicable to interfaces.
- *
- * @version $Rev$ $Date$
- */
-@Target({TYPE})
-@Retention(RUNTIME)
-public @interface Conversational {
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Destroy.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Destroy.java
deleted file mode 100644
index d65558653b..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Destroy.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a method that will be called by the container when the
- * scope defined for the local service ends.
- *
- * @version $Rev$ $Date$
- */
-@Target(METHOD)
-@Retention(RUNTIME)
-public @interface Destroy {
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EagerInit.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EagerInit.java
deleted file mode 100644
index 21bf986705..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EagerInit.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate an instance should be eagerly initialized.
- *
- * @version $Rev$ $Date$
- */
-@Target({TYPE})
-@Retention(RUNTIME)
-public @interface EagerInit {
-
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EndsConversation.java
deleted file mode 100644
index c65ff5838f..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EndsConversation.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a method ends a conversation.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD})
-@Retention(RUNTIME)
-public @interface EndsConversation {
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Init.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Init.java
deleted file mode 100644
index d610e21d64..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Init.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a method that will be called by the container when the scope defined for the local
- * service begins.
- *
- * @version $Rev$ $Date$
- */
-@Target(METHOD)
-@Retention(RUNTIME)
-public @interface Init {
-
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Integrity.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Integrity.java
deleted file mode 100644
index a8cf28475b..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Integrity.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.osoa.sca.Constants.SCA_PREFIX;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation denoting the intent that service operations require integrity.
- * <p/>
- * Applied to the injection site (field, method or constructor parameter) for a reference,
- * it indicates that all invocations through that reference require integrity.
- * <p/>
- * Applied to a interface method on a service contract, it indicates that all invocations
- * of that service operation require integrity; applied to the type of a service contract,
- * it indicates that all service operations on that interface require integrity.
- * <p/>
- * Applied to a method on an implementation class, it indicates that all invocations that
- * are dispatched to that implementation method (through any service) require integrity.
- * Applied to a interface implemented by an implementation class, it indicates that all
- * invocations that are dispatched to the implementation method for that interface operation
- * require integrity.
- * <p/>
- * Applied to an implementation class, it indicates that all invocations of that implementation
- * and that all invocations made by that implementation require integrity.
- *
- * @version $Rev$ $Date$
- */
-@Inherited
-@Target({TYPE, FIELD, METHOD, PARAMETER})
-@Retention(RUNTIME)
-@Intent(Integrity.INTEGRITY)
-public @interface Integrity {
-    String INTEGRITY = SCA_PREFIX + "integrity";
-    String INTEGRITY_MESSAGE = INTEGRITY + "message";
-    String INTEGRITY_TRANSPORT = INTEGRITY + "transport";
-
-    /**
-     * List of integrity qualifiers (such as "message" or "transport").
-     *
-     * @return integrity qualifiers
-     */
-    @Qualifier
-    String[] value() default "";
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Intent.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Intent.java
deleted file mode 100644
index fc925aa402..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Intent.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation that can be applied to annotations that describe SCA intents.
- * Adding this annotation allows SCA runtimes to automatically detect user-defined intents.
- * <p/>
- * Applications must specify a value, a pairing of targetNamespace and localPort, or both.
- * If both value and pairing are supplied they must define the name qualified name.
- *
- * @version $Rev$ $Date$
- */
-@Target({ANNOTATION_TYPE})
-@Retention(RUNTIME)
-public @interface Intent {
-    /**
-     * The qualified name of the intent, in the form defined by {@link javax.xml.namespace.QName#toString}.
-     *
-     * @return the qualified name of the intent
-     */
-    String value() default "";
-
-    /**
-     * The XML namespace for the intent.
-     *
-     * @return the XML namespace for the intent
-     */
-    String targetNamespace() default "";
-
-    /**
-     * The name of the intent within its namespace.
-     *
-     * @return name of the intent within its namespace
-     */
-    String localPart() default "";
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/OneWay.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/OneWay.java
deleted file mode 100644
index eaf9e3207c..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/OneWay.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation on a method that indicates that the method is non-blocking and communication
- * with the service provider may use buffer the requests and send them at some later time.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD})
-@Retention(RUNTIME)
-public @interface OneWay {
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/PolicySets.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/PolicySets.java
deleted file mode 100644
index b22a6a840c..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/PolicySets.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation that allows application of SCA Policy Sets.
- * <p/>
- * Each policy set is specified using its XML QName in the form defined by {@link javax.xml.namespace.QName#toString()}.
- *
- * @version $Rev$ $Date$
- */
-@Target({TYPE, FIELD, METHOD, PARAMETER})
-@Retention(RUNTIME)
-public @interface PolicySets {
-    /**
-     * Returns the policy sets to be applied.
-     *
-     * @return the policy sets to be applied
-     */
-    String[] value() default "";
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Property.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Property.java
deleted file mode 100644
index 71af35634d..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Property.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a constructor parameter, field or method that is
- * used to inject a configuration property value.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD, FIELD, PARAMETER})
-@Retention(RUNTIME)
-public @interface Property {
-    /**
-     * The name of the property. If not specified then the name will be derived
-     * from the annotated field or method.
-     *
-     * @return the name of the property
-     */
-    String name() default "";
-
-    /**
-     * Indicates whether a value for the property must be provided.
-     *
-     * @return true if a value must be provided
-     */
-    boolean required() default false;
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Qualifier.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Qualifier.java
deleted file mode 100644
index 44388bea74..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Qualifier.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation that can be applied to an attribute of an @Intent annotation to indicate the
- * attribute provides qualifiers for the intent.
- * 
- * @version $Rev$ $Date$
- */
-@Target(METHOD)
-@Retention(RUNTIME)
-public @interface Qualifier {
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Reference.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Reference.java
deleted file mode 100644
index 4d71b3f357..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Reference.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a constructor parameter, field or method that is used to inject a reference.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD, FIELD, PARAMETER})
-@Retention(RUNTIME)
-public @interface Reference {
-    /**
-     * The name of the reference. If not specified then the name will be derived from the annotated field or method.
-     *
-     * @return the name of the reference
-     */
-    String name() default "";
-
-    /**
-     * Indicates if a reference must be specified.
-     *
-     * @return true if a reference must be specified
-     */
-    boolean required() default true;
-}
-
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Remotable.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Remotable.java
deleted file mode 100644
index 53d58b7dc1..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Remotable.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a Java interface as remotable.
- * Remotable interfaces use pass-by-value semantics, can be published as entry points
- * and used for external services.
- *
- * @version $Rev$ $Date$
- */
-@Target(TYPE)
-@Retention(RUNTIME)
-public @interface Remotable {
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Requires.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Requires.java
deleted file mode 100644
index 3af699de07..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Requires.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation that allows the attachment of any intent to a Java Class or interface or to members of that
- * class such as methods, fields or constructor parameters.
- * <p/>
- * Intents are specified as XML QNames in the representation defined by
- * {@link javax.xml.namespace.QName#toString()}. Intents may be qualified with one or more
- * suffixes separated by a "." such as:
- * <ul>
- * <li>{http://www.osoa.org/xmlns/sca/1.0}confidentiality</li>
- * <li>{http://www.osoa.org/xmlns/sca/1.0}confidentiality.message</li>
- * </ul>
- * This annotation supports general purpose intents specified as strings.  Users may also define
- * specific intents using the {@link @org.osoa.sca.annotations.Intent} annotation.
- *
- * @version $Rev$ $Date$
- */
-@Inherited
-@Retention(RUNTIME)
-@Target({TYPE, METHOD, FIELD, PARAMETER})
-public @interface Requires {
-    /**
-     * Returns the attached intents.
-     *
-     * @return the attached intents
-     */
-    String[] value() default "";
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Scope.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Scope.java
deleted file mode 100644
index cd88df1128..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Scope.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a scoped service.
- * <p/>
- * The spec refers to but does not describe an eager() attribute; this is an error in the draft.
- *
- * @version $Rev$ $Date$
- */
-@Target(TYPE)
-@Retention(RUNTIME)
-public @interface Scope {
-    /**
-     * The name of the scope. Values currently defined by the specification are:
-     * <ul>
-     * <li>STATELESS (default)</li>
-     * <li>REQUEST</li>
-     * <li>CONVERSATION</li>
-     * <li>COMPOSITE</li>
-     * </ul>
-     *
-     * @return the name of the scope
-     */
-    String value() default "STATELESS";
-}
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Service.java b/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Service.java
deleted file mode 100644
index 62f4abdbee..0000000000
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Service.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
- */
-package org.osoa.sca.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate the service interfaces exposed by a Java class.
- *
- * @version $Rev$ $Date$
- */
-@Target({TYPE})
-@Retention(RUNTIME)
-public @interface Service {
-    /**
-     * Array of interfaces that should be exposed as services.
-     *
-     * @return a list of interfaces that should be exposed as services
-     */
-    Class<?>[] interfaces() default {};
-
-    /**
-     * Shortcut allowing a single interface to be exposed.
-     *
-     * @return a single service interfaces to be exposed
-     */
-    Class<?> value() default Void.class;
-}
diff --git a/java/sca-contrib/modules/tracing-aspectj/LICENSE b/java/sca-contrib/modules/tracing-aspectj/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/modules/tracing-aspectj/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/modules/tracing-aspectj/META-INF/MANIFEST.MF b/java/sca-contrib/modules/tracing-aspectj/META-INF/MANIFEST.MF
deleted file mode 100644
index 5a415a3fe4..0000000000
--- a/java/sca-contrib/modules/tracing-aspectj/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.aspectj;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany AOP-based Logging and Tracing

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397489546

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: The Apache Software Foundation provides support fo

- r the Apache community of open-source software projects.    The Apach

- e projects are characterized by a collaborative, consensus based deve

- lopment process, an open and    pragmatic software license, and a des

- ire to create high quality software that leads the way in its field. 

-    We consider ourselves not simply a group of projects sharing a ser

- ver, but rather a community of developers    and users.

-Import-Package: org.aspectj.lang,org.aspectj.lang.annotation,org.aspec

- tj.lang.reflect

-Bundle-SymbolicName: org.apache.tuscany.sca.tracing.aspect

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/java/sca-contrib/modules/tracing-aspectj/NOTICE b/java/sca-contrib/modules/tracing-aspectj/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/modules/tracing-aspectj/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/modules/tracing-aspectj/launcher.bat b/java/sca-contrib/modules/tracing-aspectj/launcher.bat
deleted file mode 100644
index a5305f486d..0000000000
--- a/java/sca-contrib/modules/tracing-aspectj/launcher.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off

-set TUSCANY_HOME=C:\Apache\tuscany-sca-1.3

-set ASPECTJ_WEAVER=%HOMEPATH%\.m2\repository\org\aspectj\aspectjweaver\1.6.1\aspectjweaver-1.6.1.jar

-set CP=%ASPECTJ_WEAVER%;%TUSCANY_HOME%\lib\tuscany-sca-manifest.jar;%TUSCANY_HOME%\samples\calculator\target\sample-calculator.jar

-java -javaagent:"%ASPECTJ_WEAVER%" -cp "%CP%;target\classes" calculator.CalculatorClient
\ No newline at end of file
diff --git a/java/sca-contrib/modules/tracing-aspectj/pom.xml b/java/sca-contrib/modules/tracing-aspectj/pom.xml
deleted file mode 100644
index d96d1ef8d6..0000000000
--- a/java/sca-contrib/modules/tracing-aspectj/pom.xml
+++ /dev/null
@@ -1,98 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-tracing-aspectj</artifactId>

-    <name>Apache Tuscany AOP-based Logging and Tracing</name>

-    <dependencies>

-        <dependency>

-            <groupId>org.aspectj</groupId>

-            <artifactId>aspectjrt</artifactId>

-            <version>1.6.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.aspectj</groupId>

-            <artifactId>aspectjlib</artifactId>

-            <version>1.6.1</version>

-        </dependency>

-        <dependency>

-            <groupId>org.aspectj</groupId>

-            <artifactId>aspectjweaver</artifactId>

-            <version>1.6.1</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    <build>

-        <plugins>

-        <!-- Copy the aspectjweaver jar to avoid surefire problems for

-        directorites with space -->

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-dependency-plugin</artifactId>

-                <version>2.0</version>

-                <executions>

-                    <execution>

-                        <id>copy</id>

-                        <phase>process-sources</phase>

-                        <goals>

-                            <goal>copy</goal>

-                        </goals>

-                        <configuration>

-                            <artifactItems>

-                                <artifactItem>

-                                    <groupId>org.aspectj</groupId>

-                                    <artifactId>aspectjweaver</artifactId>

-                                    <version>1.6.1</version>

-                                    <type>jar</type>

-                                    <overWrite>true</overWrite>

-                                    <outputDirectory>${project.build.directory}/dependency

-                                    </outputDirectory>

-                                </artifactItem>

-                            </artifactItems>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>        

-            <!-- surefire plugin configuration -->

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-surefire-plugin</artifactId>

-                <version>LATEST</version>

-                <configuration>

-                    <includes>

-                        <include>**/*TestCase.java</include>

-                    </includes>

-                    <reportFormat>brief</reportFormat>

-                    <useFile>false</useFile>

-                    <forkMode>once</forkMode>

-                        <!--  I hit a bug in maven-surefire-plugin 

-                        http://jira.codehaus.org/browse/SUREFIRE-128 -->

-                    <argLine>-ea -Xmx128m -javaagent:target/dependency/aspectjweaver-1.6.1.jar</argLine>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-</project>

diff --git a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java b/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
deleted file mode 100644
index 630bcb285b..0000000000
--- a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
+++ /dev/null
@@ -1,105 +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.aspectj;
-
-import java.util.Arrays;
-
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-
-/**
- * LoggingAspect performs standard logging of method signatures, arguments, and
- * return values. All Tuscany methods, constructors, and statics are logged.
- * @version $Rev$ $Date$
- */
-@Aspect
-public class LoggingAspect {
-    @Pointcut("call(* org.apache.tuscany.sca..*(..)) && (!within(org.apache.tuscany.sca.aspectj.*Aspect))")
-    public void anyMethodCall() {
-    }
-    
-    @Pointcut("execution(* org.apache.tuscany.sca..*(..)) && (!within(org.apache.tuscany.sca.aspectj.*Aspect))")
-    public void anyMethodExecution() {
-    }
-    
-    @Pointcut("call(* java.util.logging.Logger.info(..))")
-    public void anyLogCall() {
-    }    
-    
-    @Pointcut("cflow(anyMethodExecution()) && anyLogCall()")
-    public void anyLog() {
-    }
-
-    @Pointcut("call(org.apache.tuscany.sca..*.new(..))")
-    public void anyConstructor() {
-    }
-
-    // e.g. org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper
-    @Pointcut("staticinitialization(org.apache.tuscany.sca.implementation..*)")
-    public void anyStatic() {
-    }
-
-    @Before("anyMethodCall()")
-    public void before(JoinPoint jp) {
-        // System.out.println("Logging anyMethodCall before jp=" + jp);
-        // System.out.println("Logging anyMethodCall before jp.getSourceLocation=" + jp.getSourceLocation());
-        // System.out.println("Logging anyMethodCall before jp.getThis=" + jp.getThis());
-        // System.out.println("Logging anyMethodCall before jp.getTarget=" + jp.getTarget());
-        System.out.println("Logging Before anyMethodCall jp.getSignature=" + jp.getSignature());
-        java.lang.Object[] args = jp.getArgs();
-        if (( args != null ) && ( args.length > 0 )) {
-           System.out.println("Logging Before anyMethodCall jp.getArgs=" + Arrays.asList(args));
-        }
-    }
-
-    @AfterReturning(pointcut = "anyMethodCall()", returning = "result")
-    public void afterReturning(JoinPoint jp, Object result) {
-        // Note that result is null for methods with void return.
-        System.out.println("Logging AfterReturning anyMethodCall jp=" + jp + ", result=" + result);
-    }
-
-    @AfterThrowing(pointcut = "anyMethodCall()", throwing = "t")
-    public void afterThrowing(JoinPoint jp, Throwable t) {
-        System.out.println("Logging AfterThrowing anyMethodCall jp=" + jp + ", t=" + t);
-    }
-
-    @Before("anyConstructor()")
-    public void beforeConstructor(JoinPoint jp) {
-        System.out.println("Logging Before anyConstructor jp.getSignature=" + jp.getSignature());
-        java.lang.Object[] args = jp.getArgs();
-        if (( args != null ) && ( args.length > 0 )) {
-           System.out.println("Logging Before anyConstructor jp.getArgs=" + Arrays.asList(args));
-        }
-    }
-
-    @Before("anyStatic()")
-    public void beforeStatic(JoinPoint jp) {
-        System.out.println("Logging Before anyStatic before jp=" + jp);
-        System.out.println("Logging anyMethodCall before jp.getSourceLocation=" + jp.getSourceLocation());
-    }
-
-}
diff --git a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java b/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
deleted file mode 100644
index 965cfa5b5d..0000000000
--- a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
+++ /dev/null
@@ -1,87 +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.aspectj;
-
-import java.util.Arrays;
-
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-
-/**
- * SimpleTraceAspect performs tracing of method signatures, arguments, and
- * return values. All Tuscany methods, constructors, and statics are traced.
- * 
- * @version $Rev$ $Date$
- */
-@Aspect
-public class SimpleTracingAspect extends TracingAspect {
-
-    @Pointcut("execution(public * org.apache.tuscany.sca..*.*(..))")
-    // @Pointcut("call(* org.apache.tuscany.sca..*(..))")
-    protected void entry() {
-    }
-
-    @Pointcut("within(org.apache.tuscany.sca..*) && !within(org.apache.tuscany.sca.aspectj..*Aspect)")
-    protected void withinScope() {
-    }
-
-    @Override
-    protected void startLog() {
-        System.out.println(">>> ----------------------------------------------------");
-    }
-
-    @Override
-    protected void completeLog() {
-        System.out.println("<<< ----------------------------------------------------");
-    }
-
-    @Override
-    protected void logEnter(JoinPoint jp) {
-        System.out.println("> logEnter jp.getSignature=" + jp.getSignature());
-        java.lang.Object[] args = jp.getArgs();
-        if (( args != null ) && ( args.length > 0 )) {
-       	// See http://www.eclipse.org/aspectj/doc/released/progguide/pitfalls-infiniteLoops.html
-           // System.out.println("Logging anyMethodCall before jp.getArgs=" + Arrays.asList(args));
-           System.out.print("  logEnter jp.getArgs(" + args.length + ")=[" );
-           for ( int i = 0; i < args.length; i++ ){
-        	  if ( i > 0 ) System.out.print( ",");
-        	  System.out.print( args[ i ]);
-           }
-           System.out.println("]" );
-        }
-    }
-
-    @Override
-    protected void logExit(JoinPoint jp, Object result) {
-        // Note that result is null for methods with void return.
-        System.out.println("< logExit jp.getSignature=" + jp.getSignature() +", result=" + result );        
-    }
-
-    @Override
-    protected void logThrowable(JoinPoint jp, Throwable throwable) {
-    	while ( throwable.getCause() != null )
-    		throwable = throwable.getCause();
-        System.out.println("! logThrowable jp.getSignature=" + jp.getSignature() + ", throwable=" + throwable);
-        // System.out.println("! logThowable stackTrace=" ); 
-        // throwable.printStackTrace( System.out );
-    }
-
-}
diff --git a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java b/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
deleted file mode 100644
index 262742e867..0000000000
--- a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
+++ /dev/null
@@ -1,60 +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.aspectj;
-
-import java.util.Arrays;
-
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-
-/**
- * The TimingAspect is used to perform timing metrics on various calls.
- * The Pointcut "timedCall" is not defined here, but rather in the aop.xml
- * configuration file. You may provide a point cut to state which type
- * of call you would like timed and reported in the output files.
- * 
- * @version $Rev$ $Date$
- */
-@Aspect
-public abstract class TimingAspect {
-	// Abstract pointcut. Pointcut is defined in aop.xml file.
-    @Pointcut
-    public void timedCall() {
-    }    
-    	    
-    @Around("timedCall()")
-    public Object timedSection(ProceedingJoinPoint jp) throws Throwable {
-        System.out.println("Timing Around timedSection jp=" + jp);
-        long start = System.currentTimeMillis();
-        try {
-            return jp.proceed();
-        } finally {
-            long end = System.currentTimeMillis();
-            System.out.println("Timing Around timedSection Roundtrip is " + (end - start) + "ms for jp.getSignature=" + jp.getSignature());
-        }
-    }
-}
diff --git a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java b/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
deleted file mode 100644
index 0178ebdb6e..0000000000
--- a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
+++ /dev/null
@@ -1,92 +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.aspectj;
-
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Aspect
-public abstract class TracingAspect {
-
-    @Pointcut("")
-    protected abstract void entry();
-
-    @Pointcut("")
-    protected abstract void withinScope();
-
-    @Pointcut("call(* java..*.*(..))")
-    protected void exit() {
-    }
-
-    @Pointcut("entry() && !cflowbelow(entry())")
-    void start() {
-    }
-
-    // @Pointcut("withinScope() && cflow(entry()) && !cflow(exit()) && !within(org.apache.tuscany.sca.aspectj.*Aspect) && !within(*.toString)")
-    @Pointcut("withinScope() && entry()")
-    // @Pointcut("withinScope() && entry()&& !cflow(execution(String toString())")
-    void trace() {
-    }
-
-    @Pointcut("!handler(*) && !preinitialization(new(..))")
-    protected void supportsAfterAdvice() {
-    }
-
-    @Before("start()")
-    public void beforeStart() {
-        startLog();
-    }
-
-    @Before("trace() && supportsAfterAdvice()")
-    public void beforeTrace(JoinPoint jp) {
-        logEnter(jp);
-    }
-   
-    @AfterReturning(pointcut = "trace() && supportsAfterAdvice()", returning = "result")
-    public void afterReturning(JoinPoint jp, Object result) {
-        logExit(jp, result);
-    }
-
-    @AfterThrowing(pointcut = "trace() && supportsAfterAdvice()", throwing = "e")
-    public void afterThrowing(JoinPoint jp, Throwable e) {
-        logThrowable(jp, e);
-    }
-
-    @After("start()")
-    public void afterStart() {
-        completeLog();
-    }
-
-    protected abstract void logEnter(JoinPoint jp);
-    protected abstract void logExit(JoinPoint jp, Object result);
-    protected abstract void logThrowable(JoinPoint jp, Throwable throwable);
-
-    protected abstract void startLog();
-    protected abstract void completeLog();
-}
diff --git a/java/sca-contrib/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml b/java/sca-contrib/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
deleted file mode 100644
index f699a140e3..0000000000
--- a/java/sca-contrib/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<aspectj>
-
-    <aspects>
-        <!-- Uncomment either of these two aspects to perform standard logging -->
-        <!-- or standard tracing on the Tuscany runtime.                       -->
-        <!-- <aspect name="org.apache.tuscany.sca.aspectj.SimpleTracingAspect" /> -->   
-        <!-- <aspect name="org.apache.tuscany.sca.aspectj.LoggingAspect" /> --> 
-        
-        <!-- Following is a concrete-aspect that defines the point cut for   -->
-        <!-- the TimingAspect. Which ever calls you define in this pointcut  -->
-        <!-- will be timed and displayed in the logs.                        -->
-        <concrete-aspect name="org.apache.tuscany.sca.aspectj.UserTimingAspect"
-           extends="org.apache.tuscany.sca.aspectj.TimingAspect"
-           precedence="org.apache.tuscany.sca.aspectj.UserTimingAspect, *">
-           <pointcut name="timedCall" 
-              expression="call(* java.util.logging.Logger.info(..))"/>
-        </concrete-aspect>
-    </aspects>
-  
-    <!--weaver options="-verbose -debug -showWeaveInfo"-->
-    <weaver options="-verbose">
-        <include within="org.apache.tuscany.sca..*" />
-    </weaver>
-
-</aspectj>
diff --git a/java/sca-contrib/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java b/java/sca-contrib/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
deleted file mode 100644
index 7b76faaf36..0000000000
--- a/java/sca-contrib/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
+++ /dev/null
@@ -1,41 +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.aspectj;
-
-import java.util.logging.Logger;
-
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TracingTestCase  {
-
-    @Test
-    public void testAOP() {
-        Logger log = Logger.getLogger(getClass().getName());
-        System.out.println("doSomething()");
-        log.info("Hello, Log");
-    }
-
-    public static void main(String[] args) {
-        new TracingTestCase().testAOP();
-    }
-}
diff --git a/java/sca-contrib/modules/workspace-impl/LICENSE b/java/sca-contrib/modules/workspace-impl/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/workspace-impl/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/workspace-impl/META-INF/MANIFEST.MF b/java/sca-contrib/modules/workspace-impl/META-INF/MANIFEST.MF
deleted file mode 100644
index dea3b120cf..0000000000
--- a/java/sca-contrib/modules/workspace-impl/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.workspace.builder.impl;version

- ="2.0.0",org.apache.tuscany.sca.workspace.processor.impl;version="2.0.0",

- org.apache.tuscany.sca.workspace.scanner.impl;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Domain Workspace Implementation

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397201562

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Domain Workspace Implementation

-Import-Package: 

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.contribution;version="2.0.0",

- org.apache.tuscany.sca.contribution.namespace;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.contribution.scanner;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.workspace;version="2.0.0",

- org.apache.tuscany.sca.workspace.builder;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.workspace.impl

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca-contrib/modules/workspace-impl/NOTICE b/java/sca-contrib/modules/workspace-impl/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/workspace-impl/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/workspace-impl/pom.xml b/java/sca-contrib/modules/workspace-impl/pom.xml
deleted file mode 100644
index 9dc538688b..0000000000
--- a/java/sca-contrib/modules/workspace-impl/pom.xml
+++ /dev/null
@@ -1,46 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-workspace-impl</artifactId>
-    <name>Apache Tuscany SCA Domain Workspace Implementation</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java b/java/sca-contrib/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
deleted file mode 100644
index bdfd244293..0000000000
--- a/java/sca-contrib/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
+++ /dev/null
@@ -1,144 +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.workspace.builder.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.DefaultImport;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.resolver.DefaultImportModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.builder.ContributionBuilder;
-import org.apache.tuscany.sca.workspace.builder.ContributionBuilderException;
-
-/**
- * A contribution dependency builder.
- *
- * @version $Rev$ $Date$
- */
-public class ContributionDependencyBuilderImpl implements ContributionBuilder {
-    private static final Logger logger = Logger.getLogger(ContributionDependencyBuilderImpl.class.getName());
-    
-    /**
-     * Constructs a new ContributionDependencyBuilder.
-     */
-    public ContributionDependencyBuilderImpl(FactoryExtensionPoint factories) {
-    }
-    
-    public String getID() {
-        return "org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder";
-    }
-    
-    public void build(Contribution contribution, Workspace workspace, Monitor monitor) throws ContributionBuilderException{
-        contribution.getDependencies().clear();
-        
-        List<Contribution> dependencies = new ArrayList<Contribution>();
-        Set<Contribution> set = new HashSet<Contribution>();
-
-        dependencies.add(contribution);
-        set.add(contribution);
-        addContributionDependencies(contribution, workspace, dependencies, set, monitor);
-        
-        Collections.reverse(dependencies);
-        
-        contribution.getDependencies().addAll(dependencies);
-    }
-    
-    /**
-     * Analyze a contribution and add its dependencies to the given dependency set.
-     * @param contribution
-     * @param workspace
-     * @param dependencies
-     * @param set
-     * @param monitor
-     */
-    private void addContributionDependencies(Contribution contribution, Workspace workspace, List<Contribution> dependencies, Set<Contribution> set, Monitor monitor) {
-        
-        // Go through the contribution imports
-        for (Import import_: contribution.getImports()) {
-            boolean resolved = false;
-            
-            // Go through all contribution candidates and their exports
-            List<Export> matchingExports = new ArrayList<Export>();
-            for (Contribution dependency: workspace.getContributions()) {
-                if (dependency == contribution) {
-                    // Do not self import
-                    continue;
-                }
-                for (Export export: dependency.getExports()) {
-                    
-                    // If an export from a contribution matches the import in hand
-                    // add that contribution to the dependency set
-                    if (import_.match(export)) {
-                        resolved = true;
-                        matchingExports.add(export);
-
-                        if (!set.contains(dependency)) {
-                            set.add(dependency);
-                            dependencies.add(dependency);
-                            
-                            // Now add the dependencies of that contribution 
-                            addContributionDependencies(dependency, workspace, dependencies, set, monitor);
-                        }
-                    }
-                }
-            }
-            
-            if (resolved) {
-                
-                // Initialize the import's model resolver with a delegating model
-                // resolver which will delegate to the matching exports 
-                import_.setModelResolver(new DefaultImportModelResolver(matchingExports));
-                
-            } else {
-                // Record import resolution issue
-                if (!(import_ instanceof DefaultImport)) {
-                    warning(monitor, "UnresolvedImport", import_, import_);
-                }
-            }
-        }
-    }
-
-    /**
-     * Report a warning.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private static void warning(Monitor monitor, String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = monitor.createProblem(ContributionDependencyBuilderImpl.class.getName(), "workspace-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilder b/java/sca-contrib/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilder
deleted file mode 100644
index 379d0a017e..0000000000
--- a/java/sca-contrib/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilder
+++ /dev/null
@@ -1,18 +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. 
-
-org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;id=org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder
diff --git a/java/sca-contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties b/java/sca-contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
deleted file mode 100644
index 0c07a3a30f..0000000000
--- a/java/sca-contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
+++ /dev/null
@@ -1,22 +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.
-#
-#
-
-UnresolvedImport = Unresolved import: Import = {0}
diff --git a/java/sca-contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties b/java/sca-contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
deleted file mode 100644
index 2e8326c062..0000000000
--- a/java/sca-contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
+++ /dev/null
@@ -1,21 +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.
-#
-#
-
diff --git a/java/sca-contrib/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java b/java/sca-contrib/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
deleted file mode 100644
index be64c65c45..0000000000
--- a/java/sca-contrib/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
+++ /dev/null
@@ -1,100 +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.workspace.builder.impl;
-
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.DefaultContributionFactory;
-import org.apache.tuscany.sca.contribution.namespace.DefaultNamespaceImportExportFactory;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory;
-import org.apache.tuscany.sca.workspace.DefaultWorkspaceFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test the contribution dependency analyzer.
- * 
- * @version $Rev$ $Date$
- */
-public class ContributionDependencyBuilderTestCase {
-
-    private ContributionFactory contributionFactory;
-    private WorkspaceFactory workspaceFactory;
-    private NamespaceImportExportFactory importExportFactory;
-
-    @Before
-    public void setUp() throws Exception {
-        contributionFactory = new DefaultContributionFactory();
-        workspaceFactory = new DefaultWorkspaceFactory();
-        importExportFactory = new DefaultNamespaceImportExportFactory();
-    }
-
-    @Test
-    public void testAnalyze() throws Exception {
-        Workspace workspace = workspaceFactory.createWorkspace();
-        Contribution importer = contributionFactory.createContribution();
-        importer.setURI("importer");
-        workspace.getContributions().add(importer);
-        NamespaceImport import_ = importExportFactory.createNamespaceImport();
-        import_.setNamespace("http://foo");
-        importer.getImports().add(import_);
-
-        Contribution imported = contributionFactory.createContribution();
-        imported.setURI("imported");
-        workspace.getContributions().add(imported);
-        NamespaceExport export = importExportFactory.createNamespaceExport();
-        export.setNamespace("http://foo");
-        imported.getExports().add(export);
-        import_ = importExportFactory.createNamespaceImport();
-        import_.setNamespace("http://bar");
-        imported.getImports().add(import_);
-        
-        Contribution imported2 = contributionFactory.createContribution();
-        imported2.setURI("imported2");
-        workspace.getContributions().add(imported2);
-        export = importExportFactory.createNamespaceExport();
-        export.setNamespace("http://bar");
-        imported2.getExports().add(export);
-        
-        Contribution another = contributionFactory.createContribution();
-        another.setURI("another");
-        workspace.getContributions().add(another);
-        export = importExportFactory.createNamespaceExport();
-        export.setNamespace("http://another");
-        another.getExports().add(export);
-        
-        ContributionDependencyBuilderImpl builder = new ContributionDependencyBuilderImpl(null);
-        builder.build(importer, workspace, null);
-        List<Contribution> dependencies = importer.getDependencies();
-        assertTrue(dependencies.size() == 3);
-        assertTrue(dependencies.contains(importer));
-        assertTrue(dependencies.contains(imported));
-        assertTrue(dependencies.contains(imported2));
-    }
-    
-}
diff --git a/java/sca-contrib/modules/workspace/LICENSE b/java/sca-contrib/modules/workspace/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/modules/workspace/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/modules/workspace/META-INF/MANIFEST.MF b/java/sca-contrib/modules/workspace/META-INF/MANIFEST.MF
deleted file mode 100644
index f37441dbdd..0000000000
--- a/java/sca-contrib/modules/workspace/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.workspace;uses:="org.apache.tus

- cany.sca.contribution";version="2.0.0",org.apache.tuscany.sca.workspace

- .builder;uses:="org.apache.tuscany.sca.workspace,org.apache.tuscany.s

- ca.core,org.apache.tuscany.sca.contribution,org.apache.tuscany.sca.mo

- nitor,org.apache.tuscany.sca.extensibility";version="2.0.0"

-Private-Package: org.apache.tuscany.sca.workspace.impl;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Domain Workspace Model

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397195718

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Domain Workspace Model

-Import-Package: javax.xml.namespace,

- javax.xml.stream,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.impl;version="2.0.0",

- org.apache.tuscany.sca.contribution;version="2.0.0",

- org.apache.tuscany.sca.contribution.processor;version="2.0.0",

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

- org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.extensibility;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.monitor;version="2.0.0",

- org.apache.tuscany.sca.workspace;version="2.0.0",

- org.apache.tuscany.sca.workspace.builder;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.workspace

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca-contrib/modules/workspace/NOTICE b/java/sca-contrib/modules/workspace/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/modules/workspace/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/modules/workspace/pom.xml b/java/sca-contrib/modules/workspace/pom.xml
deleted file mode 100644
index fc628481e8..0000000000
--- a/java/sca-contrib/modules/workspace/pom.xml
+++ /dev/null
@@ -1,53 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-workspace</artifactId>
-    <name>Apache Tuscany SCA Domain Workspace Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.4</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java b/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
deleted file mode 100644
index e895669d23..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.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 org.apache.tuscany.sca.workspace;
-
-import org.apache.tuscany.sca.workspace.impl.WorkspaceFactoryImpl;
-
-
-/**
- * Default implementation of a contribution workspace model factory.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultWorkspaceFactory extends WorkspaceFactoryImpl {
-    
-}
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java b/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
deleted file mode 100644
index 66f38afec7..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
+++ /dev/null
@@ -1,39 +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.workspace;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-
-/**
- * A workspace containing contributions.
- *
- * @version $Rev$ $Date$
- */
-public interface Workspace extends Contribution {
-
-    /**
-     * Returns the list of contributions in the workspace. 
-     * @return the list of contributions
-     */
-    List<Contribution> getContributions();
-    
-}
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java b/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
deleted file mode 100644
index 2656068bea..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.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 org.apache.tuscany.sca.workspace;
-
-
-
-/**
- * A factory for the contribution workspace model.
- * 
- * @version $Rev$ $Date$
- */
-public interface WorkspaceFactory {
-    
-  /**
-     * Create a new contribution workspace model object. 
-     * @return
-     */
-    Workspace createWorkspace();
-}
\ No newline at end of file
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java b/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java
deleted file mode 100644
index b7c11f769b..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.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 org.apache.tuscany.sca.workspace.builder;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.workspace.Workspace;
-
-/**
- * A contribution builder.
- *
- * @version $Rev$ $Date$
- */
-public interface ContributionBuilder {
-
-    /**
-     * Returns the ID of the builder.
-     * 
-     * @return
-     */
-    String getID();
-    
-    /**
-     * Build a contribution.
-     * 
-     * @param contribution
-     * @param workspace
-     * @param monitor
-     */
-    void build(Contribution contribution, Workspace workspace, Monitor monitor) throws ContributionBuilderException;
-
-}
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java b/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java
deleted file mode 100644
index 10c18def10..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.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.    
- */
-
-package org.apache.tuscany.sca.workspace.builder;
-
-/**
- * Reports a contribution builder exception.
- *
- * @version $Rev$ $Date$
- */
-public class ContributionBuilderException extends Exception {
-    private static final long serialVersionUID = -1198817287971778953L;
-
-    public ContributionBuilderException() {
-    }
-
-    public ContributionBuilderException(String message) {
-        super(message);
-    }
-
-    public ContributionBuilderException(Throwable cause) {
-        super(cause);
-    }
-
-    public ContributionBuilderException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java b/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java
deleted file mode 100644
index 8200321eec..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java
+++ /dev/null
@@ -1,51 +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.workspace.builder;
-
-/**
- * An extension point for Contribution builders.
- *
- * @version $Rev: $ $Date: $
- */
-public interface ContributionBuilderExtensionPoint {
-
-    /**
-     * Adds a contribution builder.
-     * 
-     * @param contributionBuilder
-     */
-    void addContributionBuilder(ContributionBuilder contributionBuilder);
-    
-    /**
-     * Removes a contribution builder.
-     *  
-     * @param contributionBuilder
-     */
-    void removeContributionBuilder(ContributionBuilder contributionBuilder);
-    
-    /**
-     * Returns the contribution builder with the given id.
-     * 
-     * @param id
-     * @return
-     */
-    ContributionBuilder getContributionBuilder(String id);
-    
-}
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java b/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java
deleted file mode 100644
index c94601be67..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java
+++ /dev/null
@@ -1,138 +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.workspace.builder;
-
-import java.lang.reflect.Constructor;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.workspace.Workspace;
-
-/**
- * Default implementation of a provider factory extension point.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultContributionBuilderExtensionPoint implements ContributionBuilderExtensionPoint {
-
-    private ExtensionPointRegistry registry;
-    private final Map<String, ContributionBuilder> builders = new HashMap<String, ContributionBuilder>();
-    private boolean loaded;
-
-    public DefaultContributionBuilderExtensionPoint(ExtensionPointRegistry registry) {
-        this.registry = registry;
-    }
-
-    public void addContributionBuilder(ContributionBuilder builder) {
-        builders.put(builder.getID(), builder);
-    }
-
-    public void removeContributionBuilder(ContributionBuilder builder) {
-        builders.remove(builder.getID());
-    }
-
-    public ContributionBuilder getContributionBuilder(String id) {
-        loadBuilders();
-        return builders.get(id);
-    }
-
-    /**
-     * Load builders declared under META-INF/services.
-     */
-    private synchronized void loadBuilders() {
-        if (loaded)
-            return;
-        
-        FactoryExtensionPoint factories = registry.getExtensionPoint(FactoryExtensionPoint.class);
-        
-        // Get the provider factory service declarations
-        Collection<ServiceDeclaration> builderDeclarations;
-        ServiceDiscovery serviceDiscovery = ServiceDiscovery.getInstance();
-        try {
-            builderDeclarations = serviceDiscovery.getServiceDeclarations(ContributionBuilder.class.getName());
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-
-        for (ServiceDeclaration builderDeclaration : builderDeclarations) {
-        Map<String, String> attributes = builderDeclaration.getAttributes();
-            String id = attributes.get("id");
-
-            ContributionBuilder builder = new LazyContributionBuilder(id, builderDeclaration, this, factories);
-            builders.put(id, builder);
-        }
-    }
-
-    /**
-     * A wrapper around a contribution builder allowing lazy
-     * loading and initialization of implementation providers.
-     */
-    private static class LazyContributionBuilder implements ContributionBuilder {
-
-        private FactoryExtensionPoint factories;
-        private String id;
-        private ServiceDeclaration builderDeclaration;
-        private ContributionBuilder builder;
-        private ContributionBuilderExtensionPoint builders;
-
-        private LazyContributionBuilder(String id, ServiceDeclaration factoryDeclaration,
-                                     ContributionBuilderExtensionPoint builders, FactoryExtensionPoint factories) {
-            this.id = id;
-            this.builderDeclaration = factoryDeclaration;
-            this.builders = builders;
-            this.factories = factories;
-        }
-        
-        public String getID() {
-            return id;
-        }
-        
-        public void build(Contribution contribution, Workspace workspace, Monitor monitor) throws ContributionBuilderException {
-            getBuilder().build(contribution, workspace, monitor);
-        }
-
-        private ContributionBuilder getBuilder() {
-            if (builder == null) {
-                try {
-                    Class<ContributionBuilder> builderClass = (Class<ContributionBuilder>)builderDeclaration.loadClass();
-                    try {
-                        Constructor<ContributionBuilder> constructor = builderClass.getConstructor(FactoryExtensionPoint.class);
-                        builder = constructor.newInstance(factories);
-                    } catch (NoSuchMethodException e) {
-                        Constructor<ContributionBuilder> constructor = builderClass.getConstructor(ContributionBuilderExtensionPoint.class, FactoryExtensionPoint.class);
-                        builder = constructor.newInstance(builders, factories);
-                    }
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return builder;
-        }
-
-    }
-
-}
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
deleted file mode 100644
index e41cc3ea83..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
+++ /dev/null
@@ -1,40 +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.workspace.impl;
-
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-
-
-/**
- * Default implementation of a contribution workspace model factory.
- * 
- * @version $Rev$ $Date$
- */
-public class WorkspaceFactoryImpl implements WorkspaceFactory {
-    
-    protected WorkspaceFactoryImpl() {
-    }
-    
-    public Workspace createWorkspace() {
-        return new WorkspaceImpl();
-    }
-
-}
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java b/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
deleted file mode 100644
index 7674c13627..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
+++ /dev/null
@@ -1,155 +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.workspace.impl;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.impl.ExtensibleImpl;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.workspace.Workspace;
-
-/**
- * WorkspaceImpl
- *
- * @version $Rev$ $Date$
- */
-class WorkspaceImpl extends ExtensibleImpl implements Workspace {
-
-    private List<Contribution> contributions = new ArrayList<Contribution>();
-    private String location;
-    private String uri;
-    private Object model;
-    private byte[] contents;
-    private boolean unresolved;
-    private ModelResolver modelResolver;
-    private List<Contribution> dependencies = new ArrayList<Contribution>();
-    private Set<String> types = new HashSet<String>();
-    /**
-     * Constructs a new workspace.
-     */
-    WorkspaceImpl() {
-        types.add("application/vnd.tuscany.workspace");
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public <T> T getModel() {
-        return (T) model;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public void setModel(Object model) {
-        this.model = model;
-    }
-
-    public byte[] getContents() {
-        return contents;
-    }
-
-    public void setContents(byte[] contents) {
-        this.contents = contents;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-
-    public List<Contribution> getContributions() {
-        return contributions;
-    }
-
-    public List<Artifact> getArtifacts() {
-        return (List<Artifact>)(Object)contributions;
-    }
-
-    public List<Contribution> getDependencies() {
-        return dependencies;
-    }
-
-    public ClassLoader getClassLoader() {
-        //FIXME Remove later
-        return null;
-    }
-
-    public void setClassLoader(ClassLoader classLoader) {
-        //FIXME Remove later
-    }
-
-    public List<Composite> getDeployables() {
-        List<Composite> deployables = new ArrayList<Composite>();
-        for (Contribution contribution: contributions) {
-            deployables.addAll(contribution.getDeployables());
-        }
-        return deployables;
-    }
-
-    public List<Export> getExports() {
-        List<Export> exports = new ArrayList<Export>();
-        for (Contribution contribution: contributions) {
-            exports.addAll(contribution.getExports());
-        }
-        return exports;
-    }
-
-    public List<Import> getImports() {
-        List<Import> imports = new ArrayList<Import>();
-        for (Contribution contribution: contributions) {
-            imports.addAll(contribution.getImports());
-        }
-        return imports;
-    }
-
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-
-    public Set<String> getTypes() {
-        return types;
-    }
-}
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java b/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
deleted file mode 100644
index 62e05d29fc..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
+++ /dev/null
@@ -1,130 +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.workspace.xml;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.URI;

-import java.net.URL;

-import java.net.URLConnection;

-

-import javax.xml.stream.XMLInputFactory;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-

-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;

-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.monitor.Monitor;

-import org.apache.tuscany.sca.monitor.Problem;

-import org.apache.tuscany.sca.monitor.Problem.Severity;

-import org.apache.tuscany.sca.workspace.Workspace;

-

-/**

- * A contribution workspace document processor.

- * 

- * @version $Rev: 709339 $ $Date: 2008-10-31 04:01:44 +0000 (Fri, 31 Oct 2008) $

- */

-public class WorkspaceDocumentProcessor implements URLArtifactProcessor<Workspace> {

-    private XMLInputFactory inputFactory;

-    private StAXArtifactProcessor<Object> staxProcessor;

-    private Monitor monitor;

-    

-    /**

-     * Constructs a new componentType processor.

-     * @param factory

-     * @param policyFactory

-     * @param registry

-     */

-    public WorkspaceDocumentProcessor(StAXArtifactProcessor<Object> staxProcessor, 

-    		                          XMLInputFactory inputFactory,

-    		                          Monitor monitor) {

-        this.staxProcessor = staxProcessor;

-        this.inputFactory = inputFactory;

-        this.monitor = monitor;

-    }

-    

-    /**

-     * Report a exception.

-     * 

-     * @param problems

-     * @param message

-     * @param model

-     */

-     private void error(String message, Object model, Exception ex) {

-    	 if (monitor != null) {

-    		 Problem problem = monitor.createProblem(this.getClass().getName(), "workspace-xml-validation-messages", Severity.ERROR, model, message, ex);

-    	     monitor.problem(problem);

-    	 }        

-     }

-    

-    public Workspace read(URL contributionURL, URI uri, URL url) throws ContributionReadException {

-        InputStream urlStream = null;

-        try {

-            

-            // Create a stream reader

-            URLConnection connection = url.openConnection();

-            connection.setUseCaches(false);

-            urlStream = connection.getInputStream();

-            XMLStreamReader reader = inputFactory.createXMLStreamReader(url.toString(), urlStream);

-            reader.nextTag();

-            

-            // Read the workspace model 

-            Workspace workspace = (Workspace)staxProcessor.read(reader);

-            if (workspace != null) {

-                workspace.setURI(uri.toString());

-            }

-

-            return workspace;

-            

-        } catch (XMLStreamException e) {

-        	ContributionReadException ce = new ContributionReadException(e);

-        	error("ContributionReadException", inputFactory, ce);

-            throw ce;

-        } catch (IOException e) {

-        	ContributionReadException ce = new ContributionReadException(e);

-        	error("ContributionReadException", staxProcessor, ce);

-            throw ce;

-        } finally {

-            try {

-                if (urlStream != null) {

-                    urlStream.close();

-                    urlStream = null;

-                }

-            } catch (IOException ioe) {

-                //ignore

-            }

-        }

-    }

-    

-    public void resolve(Workspace workspace, ModelResolver resolver) throws ContributionResolveException {

-        staxProcessor.resolve(workspace, resolver);

-    }

-    

-    public String getArtifactType() {

-        return ".workspace";

-    }

-    

-    public Class<Workspace> getModelType() {

-        return Workspace.class;

-    }

-}

diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java b/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
deleted file mode 100644
index 33ac7aa342..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
+++ /dev/null
@@ -1,167 +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.workspace.xml;

-

-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;

-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;

-

-import java.util.List;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.ContributionFactory;

-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;

-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;

-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.core.FactoryExtensionPoint;

-import org.apache.tuscany.sca.monitor.Monitor;

-import org.apache.tuscany.sca.workspace.Workspace;

-import org.apache.tuscany.sca.workspace.WorkspaceFactory;

-

-/**

- * A contribution workspace processor.

- * 

- * @version $Rev: 750323 $ $Date: 2009-03-05 05:52:01 +0000 (Thu, 05 Mar 2009) $

- */

-public class WorkspaceProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<Workspace> {

-    

-    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";

-    private static final QName WORKSPACE_QNAME = new QName(SCA10_TUSCANY_NS, "workspace");

-    private static final QName CONTRIBUTION_QNAME = new QName(SCA10_TUSCANY_NS, "contribution");

-    private static final String URI = "uri";

-    private static final String LOCATION = "location";

-    

-    private WorkspaceFactory workspaceFactory;

-    private ContributionFactory contributionFactory;

-    

-    /**

-     * Constructs a new contribution workspace processor.

-     * 

-     * @param contributionFactory

-     * @param extensionProcessor

-     */

-    public WorkspaceProcessor(WorkspaceFactory workspaceFactory, ContributionFactory contributionFactory, StAXArtifactProcessor<Object> extensionProcessor) {

-        this.workspaceFactory = workspaceFactory;

-        this.contributionFactory = contributionFactory;

-    }

-

-    /**

-     * Constructs a new contribution workspace processor.

-     * 

-     * @param modelFactories

-     * @param extensionProcessor

-     */

-    public WorkspaceProcessor(FactoryExtensionPoint modelFactories, StAXArtifactProcessor<Object> extensionProcessor, Monitor monitor) {

-        this.workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class);

-        this.contributionFactory = modelFactories.getFactory(ContributionFactory.class);

-    }

-    

-    public Workspace read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {

-        

-        Workspace workspace = null;

-        Contribution contribution = null;

-        

-        // Read the workspace document

-        while (reader.hasNext()) {

-            int event = reader.getEventType();

-            switch (event) {

-                case START_ELEMENT:

-                    QName name = reader.getName();

-

-                    if (WORKSPACE_QNAME.equals(name)) {

-

-                        // Read a <workspace>

-                        workspace = workspaceFactory.createWorkspace();

-                        workspace.setUnresolved(true);

-

-                    } else if (CONTRIBUTION_QNAME.equals(name)) {

-

-                        // Read a <contribution>

-                        contribution = contributionFactory.createContribution();

-                        contribution.setURI(getString(reader, URI));

-                        contribution.setLocation(getString(reader, LOCATION));

-                        contribution.setUnresolved(true);

-                        workspace.getContributions().add(contribution);

-                    }

-                    break;

-

-                case END_ELEMENT:

-                    name = reader.getName();

-

-                    // Clear current state when reading reaching end element

-                    if (CONTRIBUTION_QNAME.equals(name)) {

-                        contribution = null;

-                    }

-                    break;

-            }

-            

-            // Read the next element

-            if (reader.hasNext()) {

-                reader.next();

-            }

-        }

-        return workspace;

-    }

-    

-    public void write(Workspace workspace, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {

-        

-        // Write <workspace> element

-        writeStartDocument(writer, WORKSPACE_QNAME);

-

-        // Write <contribution> elements

-        for (Contribution contribution: workspace.getContributions()) {

-            writeStart(writer, CONTRIBUTION_QNAME,

-                           new XAttr(URI, contribution.getURI()), new XAttr(LOCATION, contribution.getLocation()));

-            writeEnd(writer);

-        }

-

-        writeEndDocument(writer);

-    }

-    

-    public void resolve(Workspace workspace, ModelResolver resolver) throws ContributionResolveException {

-        

-        // Resolve the contributions referenced by the workspace

-        List<Contribution> contributions = workspace.getContributions();

-        for (int i = 0, n = contributions.size(); i < n; i++) {

-            Contribution contribution = contributions.get(i);

-            Contribution resolved = resolver.resolveModel(Contribution.class, contribution);

-            if (resolved != contribution) {

-                contributions.set(i, resolved);

-            }

-        }

-        

-        workspace.setUnresolved(false);

-    }

-    

-    public QName getArtifactType() {

-        return WORKSPACE_QNAME;

-    }

-    

-    public Class<Workspace> getModelType() {

-        return Workspace.class;

-    }

-}

diff --git a/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 86a302a103..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.workspace.xml.WorkspaceProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#workspace,model=org.apache.tuscany.sca.workspace.Workspace
diff --git a/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory b/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
deleted file mode 100644
index d390d29d90..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.workspace.DefaultWorkspaceFactory
\ No newline at end of file
diff --git a/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint b/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint
deleted file mode 100644
index 98ad0b72b0..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.workspace.builder.DefaultContributionBuilderExtensionPoint
\ No newline at end of file
diff --git a/java/sca-contrib/modules/workspace/src/main/resources/workspace-xml-validation-messages.properties b/java/sca-contrib/modules/workspace/src/main/resources/workspace-xml-validation-messages.properties
deleted file mode 100644
index f83db411bf..0000000000
--- a/java/sca-contrib/modules/workspace/src/main/resources/workspace-xml-validation-messages.properties
+++ /dev/null
@@ -1,22 +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.

-#

-#

-ContributionReadException = ContributionReadException occured due to :

-ContributionResolveException = ContributionResolveException occured due to :
\ No newline at end of file
diff --git a/java/sca-contrib/modules/workspace/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java b/java/sca-contrib/modules/workspace/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
deleted file mode 100644
index 19924da859..0000000000
--- a/java/sca-contrib/modules/workspace/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
+++ /dev/null
@@ -1,95 +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.workspace.xml;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

-

-import java.io.StringReader;

-

-import javax.xml.stream.XMLInputFactory;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-

-import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;

-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;

-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

-import org.apache.tuscany.sca.workspace.Workspace;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-/**

- * Test the workspace processor.

- * 

- * @version $Rev: 750323 $ $Date: 2009-03-05 05:52:01 +0000 (Thu, 05 Mar 2009) $

- */

-

-public class ContributionWorkspaceProcessorTestCase {

-

-    private static final String VALID_XML =

-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<workspace xmlns=\"http://tuscany.apache.org/xmlns/sca/1.1\">"

-            + "<contribution uri=\"uri1\" location=\"location1\"/>"

-            + "<contribution uri=\"uri2\" location=\"location2\"/>"

-            + "</workspace>";

-

-    private static final String INVALID_XML =

-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<workspace xmlns=\"http://tuscany.apache.org/xmlns/sca/1.1\">"

-            + "<contribution uri=\"uri1\" location=\"location1\"/>"

-            + "<contribution uri=\"uri2\" location=\"location2\"/>"

-            + "</contribution>"

-            + "</workspace>";

-

-    private static XMLInputFactory inputFactory;

-    private static StAXArtifactProcessor<Object> staxProcessor;

-

-    @BeforeClass

-    public static void setUp() throws Exception {

-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

-        inputFactory = XMLInputFactory.newInstance();

-        StAXArtifactProcessorExtensionPoint staxProcessors =

-            new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);

-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);

-    }

-

-    @Test

-    public void testRead() throws Exception {

-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML));

-        Workspace workspace = (Workspace)staxProcessor.read(reader);

-        assertNotNull(workspace);

-        assertEquals(2, workspace.getContributions().size());

-        assertEquals("uri2", workspace.getContributions().get(1).getURI());

-        assertEquals("location2", workspace.getContributions().get(1).getLocation());

-    }

-

-    @Test

-    public void testReadInvalid() throws Exception {

-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(INVALID_XML));

-        try {

-            staxProcessor.read(reader);

-            fail("InvalidException should have been thrown");

-        } catch (XMLStreamException e) {

-            assertTrue(true);

-        }

-    }

-}

diff --git a/java/sca-contrib/samples/binding-echo-extension/README b/java/sca-contrib/samples/binding-echo-extension/README
deleted file mode 100644
index 94716b151f..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/README
+++ /dev/null
@@ -1,74 +0,0 @@
-Binding Echo Sample
-===================
-This sample demonstrates how new bindings are constructed for Apache Tuscany 
-SCA. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you want to try out the echo binding that this sample provides
-please see the binding-echo sample that provides the necessary client and
-application code to bring up an application that uses this binding
-
-Sample Overview
----------------
-This sample contains a implementation of an SCA binding that simply echoes back 
-any messages that are sent to it. 
-
-binding-echo-extension/
-  src/
-    main/
-      java/
-        echo/                    - The binding interfaces
-          impl/                  - The bindings model classes
-          provider/              - The bindings runtime classes
-          server/                - A dummy server that the binding is plugged into
-      resources/
-        META-INF/
-          services/              - The extension declaration
-    test/
-      java/
-        echo/                    - test code
-      resources/
-        EchoBinding.composite    - the SCA assembly used by the unit test
-  build.xml                      - the Ant build file
-  pom.xml                        - the Maven build file
-  
-Building The Sample Using Ant
------------------------------
-With the binary distribution the sample can be built using Ant as 
-follows
-
-cd binding-echo-extension
-ant compile
-
-See the binding-echo sample to run a sample that uses this binding. 
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd binding-echo-extension
-mvn
-
-Maven will also test that the sample extension built properly. You should see 
-the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running echo.EchoServiceTestCase
-Returned message: oof
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.011 sec
-Running echo.EchoReferenceTestCase
-Returned message: oof
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.06 sec
-
-Results :
-
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0 
-    
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/binding-echo-extension/build.xml b/java/sca-contrib/samples/binding-echo-extension/build.xml
deleted file mode 100644
index 5df5981bea..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/build.xml
+++ /dev/null
@@ -1,51 +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.    
--->
-<project name="binding-echo-extension" default="compile">
-	<property name="test.jar"   value="sample-binding-echo-extension.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>     	
-    </target>	
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/binding-echo-extension/pom.xml b/java/sca-contrib/samples/binding-echo-extension/pom.xml
deleted file mode 100644
index 5d5ba0865f..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/pom.xml
+++ /dev/null
@@ -1,78 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-binding-echo-extension</artifactId>
-    <name>Apache Tuscany SCA Echo Binding Extension Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
deleted file mode 100644
index 3fe1598e0d..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
+++ /dev/null
@@ -1,29 +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.sca.assembly.Binding;
-
-/**
- * A model for the sample Echo binding.
- */
-public interface EchoBinding extends Binding {
-    
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
deleted file mode 100644
index 0f6fee82be..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
+++ /dev/null
@@ -1,33 +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;
-
-/**
- * A factory for the sample Echo binding model.
- */
-public interface EchoBindingFactory {
-    
-    /**
-     * Creates a new Echo binding.
-     * 
-     * @return a new Echo binding
-     */
-    EchoBinding createEchoBinding();
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
deleted file mode 100644
index af759dbf93..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
+++ /dev/null
@@ -1,34 +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.impl;
-
-import echo.EchoBinding;
-import echo.EchoBindingFactory;
-
-/**
- * A factory for the sample Echo binding model.
- */
-public class EchoBindingFactoryImpl implements EchoBindingFactory {
-
-    public EchoBinding createEchoBinding() {
-        return new EchoBindingImpl();
-    }
-
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
deleted file mode 100644
index 19c9271bb8..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
+++ /dev/null
@@ -1,104 +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.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-import echo.EchoBinding;
-
-/**
- * Implementation of the Echo binding model.
- */
-public class EchoBindingImpl implements EchoBinding, PolicySetAttachPoint {
-    
-    private String name;
-    private String uri;
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    private IntentAttachPointType bindingType = null;
-
-    public IntentAttachPointType getType() {
-        return bindingType;
-    }
-
-    public void setType(IntentAttachPointType type) {
-        this.bindingType = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public boolean isUnresolved() {
-        // The sample binding is always resolved
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // The sample binding is always resolved
-    }
-    
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets;
-        
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-        
-    }
-    
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }    
-    
-    public List<PolicySet> getApplicablePolicySets() {
-        return this.applicablePolicySets;
-    }
-
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
deleted file mode 100644
index 45fdb73f67..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
+++ /dev/null
@@ -1,128 +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.impl;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.contribution.service.ContributionReadException;

-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;

-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.PolicyFactory;

-import org.apache.tuscany.sca.policy.PolicySet;

-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;

-import org.apache.tuscany.sca.policy.IntentAttachPointType;

-import org.apache.tuscany.sca.policy.impl.IntentAttachPointTypeFactoryImpl;

-

-import echo.EchoBinding;

-import echo.EchoBindingFactory;

-

-/**

- * A processor for <binding.echo> elements.

- */

-public class EchoBindingProcessor implements StAXArtifactProcessor<EchoBinding> {

-

-    private QName BINDING_ECHO = new QName("http://echo", "binding.echo");

-    

-    private final EchoBindingFactory factory;

-    private PolicyAttachPointProcessor policyProcessor;

-

-    public EchoBindingProcessor(EchoBindingFactory factory, PolicyFactory policyFactory) {

-        this.factory = factory;

-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);

-    }

-

-    public QName getArtifactType() {

-        return BINDING_ECHO;

-    }

-

-    public Class<EchoBinding> getModelType() {

-        return EchoBinding.class;

-    }

-

-    public EchoBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {

-        EchoBinding echoBinding = factory.createEchoBinding();

-                IntentAttachPointType bindingType = new IntentAttachPointTypeFactoryImpl().createBindingType();

-        bindingType.setName(getArtifactType());

-        bindingType.setUnresolved(true);

-        ((PolicySetAttachPoint)echoBinding).setType(bindingType);

-

-        String name = reader.getAttributeValue(null, "name");

-        if (name != null) {

-            echoBinding.setName(name);

-        }

-

-        String uri = reader.getAttributeValue(null, "uri");

-        if (uri != null) {

-            echoBinding.setURI(uri);

-        }

-        

-        policyProcessor.readPolicies(echoBinding, reader);

-

-        return echoBinding;

-    }

-    

-    public void write(EchoBinding echoBinding, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {

-

-        policyProcessor.writePolicyPrefixes(echoBinding, writer);

-        writer.writeStartElement(BINDING_ECHO.getNamespaceURI(), BINDING_ECHO.getLocalPart());

-        policyProcessor.writePolicyAttributes(echoBinding, writer);

-        

-        if (echoBinding.getName() != null) {

-            writer.writeAttribute("name", echoBinding.getName());

-        }

-        

-        if (echoBinding.getURI() != null) {

-            writer.writeAttribute("uri", echoBinding.getURI());

-        }

-        

-        writer.writeEndElement();

-    }

-

-    public void resolve(EchoBinding echoBinding, ModelResolver resolver) throws ContributionResolveException {

-        PolicySetAttachPoint policySetAttachPoint = (PolicySetAttachPoint)echoBinding;

-        List<Intent> requiredIntents = new ArrayList<Intent>();

-        Intent resolvedIntent = null;

-        for ( Intent intent : policySetAttachPoint.getRequiredIntents() ) {

-            resolvedIntent = resolver.resolveModel(Intent.class, intent);

-            requiredIntents.add(resolvedIntent);

-        }

-        policySetAttachPoint.getRequiredIntents().clear();

-        policySetAttachPoint.getRequiredIntents().addAll(requiredIntents);

-        

-        List<PolicySet> resolvedPolicySets = new ArrayList<PolicySet>();

-        PolicySet resolvedPolicySet = null;

-        for ( PolicySet policySet : policySetAttachPoint.getPolicySets() ) {

-            resolvedPolicySet = resolver.resolveModel(PolicySet.class, policySet);

-            resolvedPolicySets.add(resolvedPolicySet);

-        }

-        policySetAttachPoint.getPolicySets().clear();

-        policySetAttachPoint.getPolicySets().addAll(resolvedPolicySets);

-    }

-}

diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
deleted file mode 100644
index 91697fcd9a..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
+++ /dev/null
@@ -1,48 +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.provider;
-
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-/**
- * Invoker for the sample echo binding.
- */
-class EchoBindingInvoker implements Invoker {
-    
-    EchoBindingInvoker() {
-    }
-
-    public Message invoke(Message msg) {
-        try {
-            System.out.println("Passing thro invoker...");
-            Object[] args = msg.getBody();
-
-            // echo back the first parameter, a real binding would invoke some API for flowing the request
-            Object result = args[0];
-                                 
-            msg.setBody(result);
-            
-        } catch (Exception e) {
-            msg.setFaultBody(e);
-        }
-        return msg;
-    }  
-
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
deleted file mode 100644
index 4877bade7f..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
+++ /dev/null
@@ -1,71 +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.provider;

-

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.invocation.Invoker;

-import org.apache.tuscany.sca.invocation.Message;

-import org.apache.tuscany.sca.policy.PolicySet;

-

-import echo.provider.policy.PolicyHandler;

-import echo.provider.policy.EncryptionPolicyHandler;

-

-/**

- * Invoker that applies policies before invocation for the sample echo binding.

- */

-public class EchoBindingPoliciedInvoker implements Invoker {

-    List<PolicySet> policies = null;

-    Map<QName, PolicyHandler> policyHandlers = new HashMap<QName, PolicyHandler>();

-    

-    public EchoBindingPoliciedInvoker(List<PolicySet> policies) {

-        this.policies = policies;

-        policyHandlers.put(new QName("http://test","EncryptionPolicy"), 

-                           new EncryptionPolicyHandler());

-    }

-

-    public Message invoke(Message msg) {

-        try {

-            Object[] args = msg.getBody();

-            

-            applyPolicies(args);

-

-            // echo back the first parameter, a real binding would invoke some API for flowing the request

-            Object result = args[0];

-                                 

-            msg.setBody(result);

-            

-        } catch (Exception e) {

-            msg.setFaultBody(e);

-        }

-        return msg;

-    }  

-    

-    private void applyPolicies(Object[] args) throws Exception {

-        for ( PolicySet policySet : policies ) {

-            PolicyHandler policyHandler = policyHandlers.get(policySet.getName());

-            policyHandler.applyPolicy(args, policySet);

-        }

-    }

-

-}

diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
deleted file mode 100644
index ba74d8f99a..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.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.provider;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-import echo.EchoBinding;
-
-
-/**
- * Implementation of the Echo binding model.
- */
-public class EchoBindingProviderFactory implements BindingProviderFactory<EchoBinding> {
-    
-    private MessageFactory messageFactory;
-    
-    public EchoBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        ModelFactoryExtensionPoint factories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        this.messageFactory = factories.getFactory(MessageFactory.class);
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, EchoBinding binding) {
-        return new EchoReferenceBindingProvider(component, reference, binding);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, EchoBinding binding) {
-        return new EchoServiceBindingProvider(component, service, binding, messageFactory);
-    }
-    
-    public Class<EchoBinding> getModelType() {
-        return EchoBinding.class;
-    }
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
deleted file mode 100644
index 0efc319af9..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
+++ /dev/null
@@ -1,71 +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.provider;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-import echo.EchoBinding;
-
-/**
- * Implementation of the Echo binding provider.
- */
-class EchoReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private RuntimeComponentReference reference;
-    private EchoBinding binding;
-
-    EchoReferenceBindingProvider(RuntimeComponent component,
-                                        RuntimeComponentReference reference,
-                                        EchoBinding binding) {
-        this.reference = reference;
-        this.binding = binding;
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        if (binding instanceof PolicySetAttachPoint) {
-            PolicySetAttachPoint policySetAttachPoint = (PolicySetAttachPoint)binding;
-            if ( !policySetAttachPoint.getPolicySets().isEmpty() ){
-                return new EchoBindingPoliciedInvoker(policySetAttachPoint.getPolicySets());
-            }
-        }
-        return new EchoBindingInvoker();
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return reference.getInterfaceContract();
-    }
-
-    public void start() {
-    }
-
-    public void stop() {
-    }
-
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
deleted file mode 100644
index 1cd1e5af4e..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
+++ /dev/null
@@ -1,78 +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.provider;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-import echo.EchoBinding;
-import echo.server.EchoServer;
-import echo.server.EchoServiceListener;
-
-/**
- * Implementation of the Echo binding provider.
- */
-class EchoServiceBindingProvider implements ServiceBindingProvider {
-    
-    private RuntimeComponent component;
-    private RuntimeComponentService service;  
-    private EchoBinding binding;
-    private MessageFactory messageFactory;
-    
-    EchoServiceBindingProvider(RuntimeComponent component,
-                                      RuntimeComponentService service, EchoBinding binding, MessageFactory messageFactory) {
-        this.component = component;
-        this.service = service;
-        this.binding = binding;
-        this.messageFactory = messageFactory;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return service.getInterfaceContract();
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-
-        RuntimeComponentService componentService = (RuntimeComponentService) service;
-        RuntimeWire wire = componentService.getRuntimeWire(binding);
-        InvocationChain chain = wire.getInvocationChains().get(0);
-        
-        // Register with the hosting server
-        String uri = binding.getURI();
-        EchoServer.getServer().register(uri, new EchoServiceListener(chain.getHeadInvoker(), messageFactory));
-    }
-
-    public void stop() {
-        
-        // Unregister from the hosting server
-        String uri = component.getURI() + "/" + binding.getName();
-        EchoServer.getServer().unregister(uri);
-    }
-
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
deleted file mode 100644
index 33dc761aa4..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
+++ /dev/null
@@ -1,41 +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.provider.policy;

-

-/**

- */

-public class EchoBindingEncryptionPolicy extends EchoBindingPolicy {

-

-    private String encryptionStrategyClassName;

-    private Class<? extends EncryptionStrategy> strategyClass;

-    

-    public String getEncryptionStrategyClassName() {

-        return encryptionStrategyClassName;

-    }

-    public void setEncryptionStrategyClassName(String encryptionStrategyClassName) {

-        this.encryptionStrategyClassName = encryptionStrategyClassName;

-    }

-    public Class<? extends EncryptionStrategy> getStrategyClass() {

-        return strategyClass;

-    }

-    public void setStrategyClass(Class<? extends EncryptionStrategy> strategy) {

-        this.strategyClass = strategy;

-    }

-

-}

diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
deleted file mode 100644
index c847d088a6..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.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 echo.provider.policy;

-

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

-import org.apache.tuscany.sca.monitor.Monitor;

-

-

-/**

- *

- */

-public class EchoBindingEncryptionPolicyProcessor extends EchoBindingPolicyProcessor<EchoBindingEncryptionPolicy> {

-

-    public EchoBindingEncryptionPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {

-    }

-    

-    public Class<EchoBindingEncryptionPolicy> getModelType() {

-        return EchoBindingEncryptionPolicy.class;

-    }

-    

-}

diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
deleted file mode 100644
index 7d38e3b7a8..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
+++ /dev/null
@@ -1,43 +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.provider.policy;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.policy.Policy;

-

-/**

-

- */

-public class EchoBindingPolicy implements Policy {

-    private boolean unresolved = true;

-    

-    public QName getSchemaName() {

-        return new QName("http://sample/policy","echoBindingPolicy");

-    }

-

-    public boolean isUnresolved() {

-        return unresolved;

-    }

-

-    public void setUnresolved(boolean unresolved) {

-        this.unresolved = unresolved;

-    }

-

-}

diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
deleted file mode 100644
index 72b8002238..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
+++ /dev/null
@@ -1,78 +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.provider.policy;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.resolver.ClassReference;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.contribution.service.ContributionReadException;

-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;

-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;

-

-/**

- *

- */

-public abstract class EchoBindingPolicyProcessor<T extends EchoBindingPolicy> implements StAXArtifactProcessor<T> {

-    public static final String ENCRYPTION = "Encryption";

-

-    public QName getArtifactType() {

-        return new QName("http://sample/policy", "echoBindingPolicy");

-    }

-

-    public T read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {

-        String name = reader.getAttributeValue(null, "name");

-        if (name != null && name.equals(ENCRYPTION)) {

-            EchoBindingEncryptionPolicy policy = new EchoBindingEncryptionPolicy();

-            policy.setEncryptionStrategyClassName(reader.getAttributeValue(null, "strategy"));

-            return (T)policy;

-        }

-        return null;

-    }

-

-    public void write(T arg0, XMLStreamWriter arg1) throws ContributionWriteException, XMLStreamException {

-    }

-

-    public void resolve(T policy, ModelResolver resolver) throws ContributionResolveException {

-        if (policy instanceof EchoBindingEncryptionPolicy) {

-            EchoBindingEncryptionPolicy ePolicy = (EchoBindingEncryptionPolicy)policy;

-

-            ClassReference classReference = new ClassReference(ePolicy.getEncryptionStrategyClassName());

-            classReference = resolver.resolveModel(ClassReference.class, classReference);

-            Class javaClass = classReference != null ? classReference.getJavaClass() : null;

-            if (javaClass == null) {

-                //throw new ContributionResolveException(new ClassNotFoundException(ePolicy.getEncryptionStrategyClass()));

-            }

-            //ePolicy.setStrategyClass(javaClass);

-            //FIXME: need to resolve this thro resolver

-            try {

-                ePolicy.setStrategyClass((Class<? extends EncryptionStrategy>)Class.forName(ePolicy

-                    .getEncryptionStrategyClassName()));

-            } catch (Exception e) {

-                throw new ContributionResolveException(e);

-            }

-            ePolicy.setStrategyClass(ePolicy.getStrategyClass());

-            ePolicy.setUnresolved(false);

-        }

-    }

-}

diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
deleted file mode 100644
index deda8d9744..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
+++ /dev/null
@@ -1,48 +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.provider.policy;

-

-import org.apache.tuscany.sca.policy.Policy;

-import org.apache.tuscany.sca.policy.PolicySet;

-

-/**

- * Sample policy handler 

- */

-public class EncryptionPolicyHandler implements PolicyHandler {

-

-    public void applyPolicy(Object msg, PolicySet policySet) throws Exception {

-        for ( Object aPolicy : policySet.getPolicies() ) {

-            if ( aPolicy instanceof EchoBindingEncryptionPolicy ) {

-                encrypt(msg, (EchoBindingEncryptionPolicy)aPolicy); 

-            }

-        }

-    }

-    

-    private void encrypt(Object msg, EchoBindingEncryptionPolicy policy) throws Exception {

-        if ( !policy.isUnresolved() && msg instanceof Object[] ) {

-            EncryptionStrategy strategy = policy.getStrategyClass().newInstance();

-            Object[] msgArgs = (Object[])msg;

-            for ( int count = 0 ; count < msgArgs.length ; ++count ) {

-                msgArgs[count] = strategy.encryptMessage(msgArgs[count]);

-            }

-        }

-

-    }

-

-}

diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
deleted file mode 100644
index ffadfc7fff..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
+++ /dev/null
@@ -1,26 +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.provider.policy;

-

-/**

- 

- */

-public interface EncryptionStrategy {

-    Object encryptMessage(Object msg);

-}

diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
deleted file mode 100644
index 6fa5f26977..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
+++ /dev/null
@@ -1,29 +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.provider.policy;

-

-import org.apache.tuscany.sca.policy.PolicySet;

-

-/**

- * Sample Policy Handler Interface

- *

- */

-public interface PolicyHandler {

-    void applyPolicy(Object msg, PolicySet policySet) throws Exception;

-}

diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
deleted file mode 100644
index cf55b36fc2..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
+++ /dev/null
@@ -1,33 +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.provider.policy;

-

-/**

- */

-public class ReverseEncryptionStrategy implements EncryptionStrategy {

-

-    public Object encryptMessage(Object msg) {

-        if ( msg instanceof String ) {

-            StringBuffer sb = new StringBuffer((String)msg);

-            msg = sb.reverse().toString();

-        }

-        return msg;

-    }

-

-}

diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
deleted file mode 100644
index ac610cfb51..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
+++ /dev/null
@@ -1,43 +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.provider.policy;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.policy.Policy;

-

-/**

-

- */

-public class WSPolicy implements Policy {

-    private boolean unresolved = true;

-    

-    public QName getSchemaName() {

-        return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");

-    }

-

-    public boolean isUnresolved() {

-        return unresolved;

-    }

-

-    public void setUnresolved(boolean unresolved) {

-        this.unresolved = unresolved;

-    }

-

-}

diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
deleted file mode 100644
index fcb250b444..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
+++ /dev/null
@@ -1,54 +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.provider.policy;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.contribution.service.ContributionReadException;

-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;

-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;

-

-public class WSPolicyProcessor implements StAXArtifactProcessor<WSPolicy> {

-

-    public QName getArtifactType() {

-        return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");

-    }

-

-    public WSPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {

-        //FIXME Implement this method

-        return new WSPolicy();

-    }

-

-    public void write(WSPolicy wsPolicy, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {

-        //FIXME Implement this method

-    }

-

-    public Class<WSPolicy> getModelType() {

-        return WSPolicy.class;

-    }

-

-    public void resolve(WSPolicy wsPolicy, ModelResolver modelResolver) throws ContributionResolveException {

-

-    }

-}

diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
deleted file mode 100644
index 8ea2395d04..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
+++ /dev/null
@@ -1,78 +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.server;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A sample Echo server, showing how to integrate service bindings. 
- */
-public class EchoServer {
-
-    public static EchoServer server;
-
-    private Map<String, EchoServiceListener> services = new HashMap<String, EchoServiceListener>();
-
-    public static void start() {
-    }
-
-    public static void stop() {
-    }
-
-    public static EchoServer getServer() {
-        if (server == null)
-            server = new EchoServer();
-        return server;
-    }
-
-    /**
-     * Register a service under the given name.
-     * 
-     * @param service
-     * @param name
-     */
-    public void register(String uri, EchoServiceListener service) {
-        if (services.isEmpty()) {
-            start();
-        }
-        services.put(uri, service);
-    }
-
-    public void unregister(String uri) {
-        services.remove(uri);
-        if (services.isEmpty()) {
-            stop();
-        }
-    }
-
-    /**
-     * Dispatch an incoming interaction to the corresponding service.
-     * 
-     * @param uri
-     * @param input
-     * @return
-     */
-    public String sendReceive(String uri, String input) throws InvocationTargetException {
-        return services.get(uri).sendReceive(input);
-    }
-
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java b/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
deleted file mode 100644
index 32336dd94f..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.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.server;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-
-public class EchoServiceListener {
-    private Invoker invoker;
-    private MessageFactory messageFactory;
-
-    public EchoServiceListener(Invoker invoker, MessageFactory messageFactory) {
-        super();
-        this.invoker = invoker;
-        this.messageFactory = messageFactory;
-    }
-
-    public String sendReceive(String input) throws InvocationTargetException {
-
-        // Create a request message
-        Message request = messageFactory.createMessage();
-        request.setBody(new Object[] {input});
-        
-        // Dispatch and get the response
-        Message response = invoker.invoke(request);
-        Object body = response.getBody();
-        if (response.isFault()) {
-            throw new InvocationTargetException((Throwable)body);
-        }
-        return (String)body;
-    }
-
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory b/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
deleted file mode 100644
index 55be293862..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the binding model factory
-echo.impl.EchoBindingFactoryImpl
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 06d53250c1..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,21 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://echo#binding.echo,model=echo.EchoBinding,factory=echo.EchoBindingFactory
-echo.provider.policy.EchoBindingEncryptionPolicyProcessor;qname=http://sample/policy#echoBindingPolicy,model=echo.provider.policy.EchoBindingEncryptionPolicy
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://schemas.xmlsoap.org/ws/2004/09/policy#PolicyAttachment,model=echo.provider.policy.WSPolicy
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
deleted file mode 100644
index 4ad61f573d..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ /dev/null
@@ -1,19 +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. 
-
-# URI of the XML schema to be used for validation
-sample-binding-echo.xsd
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index efa475ef92..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding provider extension

-echo.provider.EchoBindingProviderFactory;model=echo.EchoBinding

diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd b/java/sca-contrib/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
deleted file mode 100644
index 9b64df4871..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
+++ /dev/null
@@ -1,36 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://echo" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:e="http://echo" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0"/>
-
-    <element name="binding.echo" type="e:EchoBinding"/>
-    
-    <complexType name="EchoBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/Echo.java b/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/Echo.java
deleted file mode 100644
index 1d5e973f33..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/Echo.java
+++ /dev/null
@@ -1,29 +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;
-
-/**
- * Interface of our sample Echo service.
- * 
- * @version $Rev$ $Date$
- */
-public interface Echo {
-    
-    String echo(String msg);
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
deleted file mode 100644
index 01b89101a8..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.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 org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.Reference;
-
-
-/**
- * A simple client component that uses a reference with an Echo binding.
- * 
- * @version $Rev$ $Date$
- */
-public class EchoComponentImpl implements Echo {
-
-    private Echo echoReference;
-
-    @Constructor
-    public EchoComponentImpl(@Reference(name = "echoReference", required = true) Echo echoReference) {
-        this.echoReference = echoReference;
-    }
-
-    public String echo(String msg) {
-        String result = echoReference.echo(msg);
-        System.out.println("Returned message: "+ result);
-        return result;
-    }
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
deleted file mode 100644
index 7383077f18..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
+++ /dev/null
@@ -1,50 +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.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoReferenceTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private Echo service;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("EchoBinding.composite");
-        service = scaDomain.getService(Echo.class, "EchoComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testEchoBinding() {
-        String result = service.echo("foo");
-        assertEquals(result, "oof");
-    }
-
-
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
deleted file mode 100644
index ab05516622..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
+++ /dev/null
@@ -1,50 +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.sca.host.embedded.SCADomain;
-
-import echo.server.EchoServer;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoServiceTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("EchoBinding.composite");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testEchoBinding() throws Exception {
-        String result = EchoServer.getServer().sendReceive("http://tempuri.org", "foo");
-        assertEquals(result, "oof");
-    }
-
-
-}
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/java/sca-contrib/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
deleted file mode 100644
index 176d67cc4b..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
+++ /dev/null
@@ -1,43 +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:sca="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/echo"
-	xmlns:se="http://sample/echo"
-	xmlns:e="http://echo"
-	xmlns:p="http://sample/policy"
-        xmlns:t="http://test"
-	name="EchoBinding">
-
-    <service name="EchoService" promote="EchoComponent">
-        <interface.java interface="echo.Echo"/>
-        <e:binding.echo uri="http://tempuri.org"  />
-    </service>
-
-    <component name="EchoComponent">
-        <implementation.java class="echo.EchoComponentImpl"/>
-    </component>
-    
-    <reference name="EchoReference" promote="EchoComponent/echoReference">
-        <interface.java interface="echo.Echo"/>
-        <e:binding.echo uri="http://tempuri.org" policySets="t:EncryptionPolicy" />
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/test/resources/definitions.xml b/java/sca-contrib/samples/binding-echo-extension/src/test/resources/definitions.xml
deleted file mode 100644
index 1cb1d1c9ba..0000000000
--- a/java/sca-contrib/samples/binding-echo-extension/src/test/resources/definitions.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-<sca:definitions xmlns="http://test"

-            targetNamespace="http://test"

-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-            xmlns:e="http://echo"

-            xmlns:p="http://sample/policy">

-    <!-- POLICY SETS -->

-    <sca:policySet name="EncryptionPolicy"

-       provides="confidentiality"

-       appliesTo="e:binding.echo">

-        <p:echoBindingPolicy name="Encryption" strategy="echo.provider.policy.ReverseEncryptionStrategy" />

-    </sca:policySet>
-	
-	<sca:intent name="confidentiality"
- 	   constrains="sca:binding">
- 	   <description>
- 	   Communitcation thro this binding must prevent
- 	   unauthorized users from reading the messages.
- 	   </description>
-    </sca:intent>

-</sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/binding-echo/README b/java/sca-contrib/samples/binding-echo/README
deleted file mode 100644
index 2772460cc6..0000000000
--- a/java/sca-contrib/samples/binding-echo/README
+++ /dev/null
@@ -1,104 +0,0 @@
-Binding Echo Sample Application
-===============================
-This sample demonstrates how to use the new binding extension 
-binding-echo-extension.
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens, open a command prompt,
-navigate to this sample directory, and do
-
-ant run 
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;..\binding-echo-extension\target\sample-binding-echo-extension.jar;target\sample-binding-echo.jar echo.EchoBindingClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:../binding-echo-extension/target/sample-binding-echo-extension.jar:target/sample-binding-echo.jar echo.EchoBindingClient
-
-This looks like a long command. The three things we add to the classpath are
-
-tuscany-sca-manifest.jar - all of the standard Tuscany SCA runtime and 
-                           extension classes
-sample-binding-echo-extension.jar  - the new echo binding extension implementation
-sample-binding-echo - the application that uses the echo binding                         
-
-Note: this sample currently is not working on Linux
-
-Sample Overview
----------------
-This sample contains an application (client and server code) that uses
-an SCA binding that simply echoes back any messages that are sent to it. 
-
-binding-echo/
-  src/
-    main/
-      java/
-        echo/
-          Echo.java                     - interface definition for the sample  
-                                          reference and service
-          EchoComponentImpl.java        - sample component implementation with 
-                                          echo binding reference
-          EchoBindingClient.java        - sample client
-      resources/
-        EchoBinding.composite           - the SCA assembly for this sample
-    test/
-      java/ 
-        echo
-          EchoBindingTestCase.java      - sample JUnit test case for the sample 
-                                          client
-  binding-echo.png                      - pictorial representation of the sample 
-                                          .composite file
-  build.xml                             - the Ant build file
-  pom.xml                               - the Maven build file
-  
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows.
-
-cd binding-echo
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] Passing thro invoker...
-     [java] Returned message: foo
-     [java] Echo reference = foo
-     [java] Passing thro invoker...
-     [java] Returned message: bar
-     [java] Echo service = bar
-
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and
-run using Maven as follows. 
-
-cd binding-echo
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running echo.EchoBindingTestCase
-Passing thro invoker...
-Returned message: foo
-Passing thro invoker...
-Returned message: bar
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.811 sec
-
-Results :
-
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0 
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/binding-echo/binding-echo.png b/java/sca-contrib/samples/binding-echo/binding-echo.png
deleted file mode 100644
index a38d985363..0000000000
--- a/java/sca-contrib/samples/binding-echo/binding-echo.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/binding-echo/binding-echo.svg b/java/sca-contrib/samples/binding-echo/binding-echo.svg
deleted file mode 100644
index 5b5051bef5..0000000000
--- a/java/sca-contrib/samples/binding-echo/binding-echo.svg
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\binding-echo"
-   sodipodi:docname="binding-echo.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\binding-echo\binding-echo.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="528.85714"
-     inkscape:cy="406.01174"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1142"
-     inkscape:window-height="722"
-     inkscape:window-x="58"
-     inkscape:window-y="135" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1.038749,0,0,1.009461,-29.25616,-1.807024)">
-      <rect
-         rx="8.7034655"
-         ry="12.692303"
-         y="192.00233"
-         x="375.89822"
-         height="299.99988"
-         width="281.85843"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.95312572;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="translate(104.5213,-10.61387)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">EchoBinding</flowPara></flowRoot>      <path
-         style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 397.85714,346.95163 L 440,346.95163"
-         id="path1896"
-         transform="matrix(0.962696,0,0,0.990628,28.1648,1.790088)" />
-    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="450.63062"
-       y="302.8819"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(183.0398,96.94336)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">EchoComponent</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 433.4801,334.72889 L 466.81514,334.72889 L 472.87605,347.86087 L 465.80499,359.98271 L 433.4801,359.98271 L 441.05625,347.86087 L 433.4801,334.72889 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 546.73254,332.89061 L 580.06758,332.89061 L 586.12849,346.02259 L 579.05743,358.14443 L 546.73254,358.14443 L 554.30869,346.02259 L 546.73254,332.89061 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 328.15933,319.32471 L 387.4834,319.32471 L 398.26959,346.57097 L 385.68571,371.72138 L 328.15933,371.72138 L 341.64208,346.57097 L 328.15933,319.32471 z "
-       id="path1883" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 610.30199,319.1819 L 674.46121,319.1819 L 686.12651,346.05674 L 672.517,370.8643 L 610.30199,370.8643 L 624.88364,346.05674 L 610.30199,319.1819 z "
-       id="path1885" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1887"
-       transform="translate(62.97619,122.4038)"><flowRegion
-         id="flowRegion1889"><rect
-           id="rect1891"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1893"
-         style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:12;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%">Echo</flowPara><flowPara
-         id="flowPara1895"
-         style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:12;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%">Serivce</flowPara></flowRoot>    <text
-       xml:space="preserve"
-       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-       x="625.14288"
-       y="343.23737"
-       id="text1897"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan1899"
-         x="625.14288"
-         y="343.23737"
-         style="font-family:Arial;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:12;text-anchor:start;text-align:start;writing-mode:lr;line-height:100%">Echo</tspan><tspan
-         sodipodi:role="line"
-         x="625.14288"
-         y="355.23737"
-         id="tspan1901"
-         style="font-family:Arial;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:12;text-anchor:start;text-align:start;writing-mode:lr;line-height:100%">Reference</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 585.71429,345.52305 C 624.28571,345.52305 624.28571,345.52305 624.28571,345.52305"
-       id="path1898" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/binding-echo/build.xml b/java/sca-contrib/samples/binding-echo/build.xml
deleted file mode 100644
index 7689ef3a54..0000000000
--- a/java/sca-contrib/samples/binding-echo/build.xml
+++ /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.    
--->
-<project name="binding-echo" default="compile">
-    <property name="test.class" value="echo.EchoBindingClient" />
-	<property name="test.jar"   value="sample-binding-echo.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-                <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar"/>
-                <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>      
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-                <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement location="target/${test.jar}"/>
-                <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar"/>
-                <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>	
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/binding-echo/pom.xml b/java/sca-contrib/samples/binding-echo/pom.xml
deleted file mode 100644
index f5e2464563..0000000000
--- a/java/sca-contrib/samples/binding-echo/pom.xml
+++ /dev/null
@@ -1,71 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-binding-echo</artifactId>
-    <name>Apache Tuscany SCA Echo Binding Sample Application</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-binding-echo-extension</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/binding-echo/src/main/java/echo/Echo.java b/java/sca-contrib/samples/binding-echo/src/main/java/echo/Echo.java
deleted file mode 100644
index 1d5e973f33..0000000000
--- a/java/sca-contrib/samples/binding-echo/src/main/java/echo/Echo.java
+++ /dev/null
@@ -1,29 +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;
-
-/**
- * Interface of our sample Echo service.
- * 
- * @version $Rev$ $Date$
- */
-public interface Echo {
-    
-    String echo(String msg);
-}
diff --git a/java/sca-contrib/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/java/sca-contrib/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
deleted file mode 100644
index 21bdff4011..0000000000
--- a/java/sca-contrib/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
+++ /dev/null
@@ -1,51 +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.sca.host.embedded.SCADomain;
-
-import echo.server.EchoServer;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- * @version $Rev$ $Date$
- */
-public class EchoBindingClient {
-    
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain  = SCADomain.newInstance("EchoBinding.composite");
-        
-        // Call the echo service component which will, in turn, call a reference
-        // with an echo binding. The echo binding will echo the given string.
-        Echo service = scaDomain.getService(Echo.class, "EchoComponent");
-        String echoString = service.echo("foo");
-        System.out.println("Echo reference = " + echoString );
-
-        // Call the echo server. This will dispatch the call to a service with an 
-        // echo binding. The echo binding will pass the call to the echo component.
-        echoString = EchoServer.getServer().sendReceive("http://tempuri.org", "bar");
-        System.out.println("Echo service = " + echoString );
-        
-        scaDomain.close();
-
-    }
-
-}
diff --git a/java/sca-contrib/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/java/sca-contrib/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
deleted file mode 100644
index 01b89101a8..0000000000
--- a/java/sca-contrib/samples/binding-echo/src/main/java/echo/EchoComponentImpl.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 org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.Reference;
-
-
-/**
- * A simple client component that uses a reference with an Echo binding.
- * 
- * @version $Rev$ $Date$
- */
-public class EchoComponentImpl implements Echo {
-
-    private Echo echoReference;
-
-    @Constructor
-    public EchoComponentImpl(@Reference(name = "echoReference", required = true) Echo echoReference) {
-        this.echoReference = echoReference;
-    }
-
-    public String echo(String msg) {
-        String result = echoReference.echo(msg);
-        System.out.println("Returned message: "+ result);
-        return result;
-    }
-}
diff --git a/java/sca-contrib/samples/binding-echo/src/main/resources/EchoBinding.composite b/java/sca-contrib/samples/binding-echo/src/main/resources/EchoBinding.composite
deleted file mode 100644
index 94612fb325..0000000000
--- a/java/sca-contrib/samples/binding-echo/src/main/resources/EchoBinding.composite
+++ /dev/null
@@ -1,40 +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://sample/echo"

-	xmlns:se="http://sample/echo"

-	xmlns:e="http://echo"
-	name="EchoBinding">

-

-    <service name="EchoService" promote="EchoComponent">

-        <interface.java interface="echo.Echo"/>

-        <e:binding.echo uri="http://tempuri.org" />

-    </service>

-

-    <component name="EchoComponent">

-        <implementation.java class="echo.EchoComponentImpl"/>

-    </component>

-    

-    <reference name="EchoReference" promote="EchoComponent/echoReference">

-        <interface.java interface="echo.Echo"/>

-        <e:binding.echo uri="http://tempuri.org" />

-    </reference>

-    

-</composite>

diff --git a/java/sca-contrib/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/java/sca-contrib/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
deleted file mode 100644
index 1a597fc80f..0000000000
--- a/java/sca-contrib/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
+++ /dev/null
@@ -1,57 +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.sca.host.embedded.SCADomain;
-
-import echo.Echo;
-import echo.server.EchoServer;
-
-public class EchoBindingTestCase extends TestCase {
-    
-    private SCADomain scaDomain;
-    
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain  = SCADomain.newInstance("EchoBinding.composite");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testReference() throws Exception {
-        // Call the echo service component which will, in turn, call a reference
-        // with an echo binding. The echo binding will echo the given string.
-        Echo service = scaDomain.getService(Echo.class, "EchoComponent");
-        String echoString = service.echo("foo");
-        assertEquals(echoString, "foo");
-    }
-    
-    public void testService() throws Exception {
-        // Call the echo server. This will dispatch the call to a service with an 
-        // echo binding. The echo binding will pass the call to the echo component.
-        String echoString = EchoServer.getServer().sendReceive("http://tempuri.org", "bar");
-        assertEquals(echoString, "bar");
-    }
-}
diff --git a/java/sca-contrib/samples/binding-notification-broker/README b/java/sca-contrib/samples/binding-notification-broker/README
deleted file mode 100644
index ebd8bbec30..0000000000
--- a/java/sca-contrib/samples/binding-notification-broker/README
+++ /dev/null
@@ -1,112 +0,0 @@
-Notification Broker Binding Sample

-==================================

-

-This sample illustrates the use of <binding.notification/> with a

-broker.

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-Sample Overview

----------------

-

-This sample illustrates the use of a notification broker that is located in a

-separate (and remote) composite with respect to any producers or consumers. As

-such, this sample is run in conjunction with the binding-notification-producer

-sample, the binding-notification-consumer sample, or both. Take a look at the

-composite file or the .svg file which shows the composite file in pictorial form.

-The composite service and composite reference each have a <binding.notification/>

-that handles the remote communication. This binding includes an 'ntm' attribute

-that refers to the notification type manager, which manages the connectivity of

-producers, consumers and brokers, and which (for this sample) is assumed to be

-running on http://localhost:8083. The ntm is a system component that is included in

-and runs as part of the binding-notification module.

-This sample also illustrates the use of a wsdl interface in the notification

-component's <implementation.notification/>. This allows messages sent and received

-via <binding.notification/> to be transported as literal xml over http.

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd binding-notification-broker

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/ntm/trafficAdvisory

-     [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/consumer/trafficAdvisory

-     [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/producer/trafficAdvisory

-     

-Building And Running The Sample Using Maven 

--------------------------------------------

-

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd binding-notification-broker

-mvn

-

-Sample Usage

-------------

-

-This sample is run using the tuscany binary distribution. To run it, navigate to this sample's directory and 

-

-on Wondows, use following command:

-

-java -Dnotification.httpPort=8080 -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-binding-notification-broker.jar  notification.broker.TrafficAdvisoryServer

-

-on *nix, use following command:

-

-java -Dnotification.httpPort=8080 -cp ../../lib/tuscany-sca-manifest.jar:target/sample-binding-notification-broker.jar notification.broker.TrafficAdvisoryServer

-

-this should bring up the following prompt:

-

-Send a report value, ^C or <end> to end

-

-at this point you should be able to type a message to send, for instance:

-

-Traffic congestion

-

-Notice that before you try to receive any message, you should bring up the

-consumer sample or another broker sample. When you have finished using this

-sample, type 'end' or ^C to end.

-

-Also notice that '-Dnotification.httpPort=8080' is used in the java command.

-This indicates the port the sample should use. This also says that this server

-is not going to play the role of ntm, given our previous assumption. It is important

-that the first one of the producer, consumer or broker sample that is run be the

-one that uses '-Dnotification.httpPort=8083', otherwise there is no ntm to talk

-to and an exception will be thrown.

-

-Sample directory structure:

----------------------------

-

-binding-notification-broker/

-  src/

-    main/

-      java/

-        notification.broker/

-          TestCaseProducer.java                    - interface for the producer component

-          TrafficAdvisory.java                     - remote interface referred to by the producer component

-                                                     and for the consumer component

-          TrafficAdvisoryConsumer.java             - implementation for the consumer components

-          TrafficAdvisoryProducer.java             - implementation for the producer component

-          TrafficAdvisoryServer.java               - server class including main entry point

-      resources/

-        wsdl/

-          TrafficAdvisory.wsdl                     - remote interface for the notification component

-        TrafficAdvisoryNotification.componentType  - the component type referred to by

-                                                     <implementation.notification/>

-        TrafficAdvisoryNotification.composite      - the main composite including producer, consumer and

-                                                     notification components, and composite service and reference

-  binding-notification-broker.png                  - a pictorial representation of the sample .composite file

-  build.xml                       		   - the Ant build file

-  pom.xml                                          - the Maven build file        

diff --git a/java/sca-contrib/samples/binding-notification-broker/binding-notification-broker.png b/java/sca-contrib/samples/binding-notification-broker/binding-notification-broker.png
deleted file mode 100644
index 49030650f2..0000000000
--- a/java/sca-contrib/samples/binding-notification-broker/binding-notification-broker.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/binding-notification-broker/build.xml b/java/sca-contrib/samples/binding-notification-broker/build.xml
deleted file mode 100644
index a042b9036a..0000000000
--- a/java/sca-contrib/samples/binding-notification-broker/build.xml
+++ /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.    

--->

-<project name="binding-notification-broker" default="compile">

-    <property name="test.class" value="notification.broker.TrafficAdvisoryServer" />

-	<property name="test.jar"   value="sample-binding-notification-broker.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        	<sysproperty key="notification.httpPort" value="8083"/>

-        	<arg value="end"/>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        	<sysproperty key="notification.httpPort" value="8083"/>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/binding-notification-broker/pom.xml b/java/sca-contrib/samples/binding-notification-broker/pom.xml
deleted file mode 100644
index 82e79c24f5..0000000000
--- a/java/sca-contrib/samples/binding-notification-broker/pom.xml
+++ /dev/null
@@ -1,98 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-binding-notification-broker</artifactId>

-    <name>Apache Tuscany SCA Notification Binding Broker Sample</name>

-    <version>2.0-SNAPSHOT</version>

-    <description>A sample illustrating use of binding.notification</description>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-notification</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-notification</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-databinding</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        <!-- test dependencies -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>  

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>     

-        <!-- test dependencies -->

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

-	<finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-compiler-plugin</artifactId>

-                <configuration>

-                    <source>1.5</source>

-                    <target>1.5</target>

-                </configuration>

-            </plugin>

-        </plugins>

-        <defaultGoal>install</defaultGoal>

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java b/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
deleted file mode 100644
index 35fa1a9ee9..0000000000
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
+++ /dev/null
@@ -1,24 +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 notification.broker;

-

-public interface TestCaseProducer {

-

-    public void produceTrafficNotification(String report);

-}

diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java b/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
deleted file mode 100644
index 3f069ede78..0000000000
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
+++ /dev/null
@@ -1,30 +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 notification.broker;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * @version $Rev$ $Date$

- */

-@Remotable

-public interface TrafficAdvisory {

-

-    void trafficNotification(String report);

-}

diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java b/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
deleted file mode 100644
index b9a5b98126..0000000000
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
+++ /dev/null
@@ -1,41 +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 notification.broker;

-

-import org.oasisopen.sca.annotation.AllowsPassByReference;

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * @version $Rev$ $Date$

- */

-@Service(TrafficAdvisory.class)

-@Scope("COMPOSITE")

-@AllowsPassByReference

-public class TrafficAdvisoryConsumer implements TrafficAdvisory {

-    

-    @Property

-    protected String name;

-

-    public void trafficNotification(String report) {

-        

-        System.out.println("Consumer [" + name + "] received report: " + report);

-    }

-}

diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java b/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
deleted file mode 100644
index 6406572d10..0000000000
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.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 notification.broker;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(TestCaseProducer.class)

-@Scope("COMPOSITE")

-public class TrafficAdvisoryProducer implements TestCaseProducer {

-    

-    @Reference

-    protected TrafficAdvisory destination;

-

-    public void produceTrafficNotification(String report) {

-        

-        destination.trafficNotification(report);

-    }

-}

diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java b/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
deleted file mode 100644
index b0f0d2a800..0000000000
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
+++ /dev/null
@@ -1,72 +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 notification.broker;

-

-import java.io.BufferedReader;

-import java.io.IOException;

-import java.io.InputStreamReader;

-import java.net.URI;

-

-import org.apache.tuscany.sca.binding.notification.NotificationBindingProviderFactory;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * @version $Rev$ $Date$

- */

-public class TrafficAdvisoryServer {

-    

-    private static URI notificationType;

-

-    public static void main(String[] args) {

-        try {

-            notificationType = new URI("trafficAdvisory");

-            String compositeName = "TrafficAdvisoryNotification.composite";

-            SCADomain domain = SCADomain.newInstance(compositeName);

-            TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");

-

-            BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));

-            String value = "";

-            if (args.length == 1) {

-                value = args[0];

-            }

-            do {

-                if(value == null || value.equals("end")) {

-                    break;

-                }

-                try {

-                    System.out.println("Send a report value, ^C or <end> to end");

-                    value = reader.readLine();

-                } catch (IOException e) {

-                    e.printStackTrace();

-                }

-                if (value.equals("rb")) {

-                    NotificationBindingProviderFactory.removeBroker(notificationType);

-                }

-                else {

-                    testCaseProducer.produceTrafficNotification("Report value [" + value + "]");

-                }

-            }

-            while(true);

-

-            domain.close();

-        } catch(Throwable e) {

-            e.printStackTrace();

-        }

-    }

-}

diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType b/java/sca-contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 2dc70f8ed1..0000000000
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">

-     <service name="TrafficAdvisoryNotificationService">

-           <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-               wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-           </interface.wsdl>

-     </service>

-

-     <reference name="TrafficAdvisoryNotificationReference"

-                multiplicity="0..n">

-           <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-               wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-           </interface.wsdl>

-     </reference>

-</componentType>

diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite b/java/sca-contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index f490c34ea6..0000000000
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

- * 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://tuscany.apache.org/xmlns/notification/1.0/samples"

-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-           name="TrafficAdvisoryNotificationBrokerComposite">

-

-    <service name="TrafficAdvisoryNotificationCompositeService"

-             promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationService">

-        <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-            wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-        </interface.wsdl>

-        <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="trafficAdvisory"/>

-    </service>

-             

-    <component name="TrafficAdvisoryProducer">

-		<implementation.java class="notification.broker.TrafficAdvisoryProducer"/>

-        <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>

-    </component>

-

-    <component name="TrafficAdvisoryNotificationComponent">

-        <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>

-        <!-- Never use > 1 reference elements here !! -->

-        <reference name="TrafficAdvisoryNotificationReference"

-                   multiplicity="0..n"

-                   target="TrafficAdvisoryConsumer1"/>

-    </component>

-    

-    <component name="TrafficAdvisoryConsumer1">

-        <implementation.java class="notification.broker.TrafficAdvisoryConsumer"/>

-        <property name="name">Consumer1</property>

-    </component>

-    

-    <reference name="TrafficAdvisoryNotificationCompositeReference"

-               promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationReference">

-        <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-            wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-        </interface.wsdl>

-        <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="trafficAdvisory"/>

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl b/java/sca-contrib/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.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.

--->

-<definitions name="TrafficAdvisory"

-             targetNamespace="http://example.com/TrafficAdvisory.wsdl"

-             xmlns:tns="http://example.com/TrafficAdvisory.wsdl"

-             xmlns:xsd1="http://example.com/TrafficAdvisory.xsd"

-             xmlns="http://schemas.xmlsoap.org/wsdl/">

-

-    <types>

-        <schema targetNamespace="http://example.com/TrafficAdvisory.xsd"

-                xmlns:tns="http://example.com/TrafficAdvisory.xsd"

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

-            <element name="trafficNotification">

-                <complexType>

-                    <sequence>

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

-                    </sequence>

-                </complexType>

-            </element>

-        </schema>

-    </types>

-

-    <message name="TrafficNotificationInput">

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

-    </message>

-

-    <portType name="TrafficAdvisoryPortType">

-        <operation name="trafficNotification">

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

-        </operation>

-    </portType>

-

-</definitions>

diff --git a/java/sca-contrib/samples/binding-notification-consumer/README b/java/sca-contrib/samples/binding-notification-consumer/README
deleted file mode 100644
index b54b445670..0000000000
--- a/java/sca-contrib/samples/binding-notification-consumer/README
+++ /dev/null
@@ -1,109 +0,0 @@
-Notification Consumer Binding Sample

-===============================

-

-This sample illustrates the use of <binding.notification/> with a

-remote consumer.

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-Sample Overview

----------------

-

-This sample illustrates the use of a notification consumer that is located in a

-separate (and remote) composite with respect to any producers. As such, this sample

-is run in conjunction with the binding-notification-producer sample, the

-binding-notification-broker sample, or both. Take a look at the composite file 

-or the .svg file which shows the composite file in pictorial form. The composite

-service, wired to the notification component, has a <binding.notification/>

-that handles the remote communication. This binding includes an 'ntm' attribute

-that refers to the notification type manager, which manages the connectivity of

-producers, consumers and brokers, and which (for this sample) is assumed to be

-running on http://localhost:8083. The ntm is a system component that is included in

-and runs as part of the binding-notification module.

-This sample also illustrates the use of a wsdl interface in the notification

-component's <implementation.notification/>. This allows messages sent and received

-via <binding.notification/> to be transported as literal xml over http.

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd binding-notification-consumer

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] Sep 14, 2007 10:56:29 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/ntm/trafficAdvisory

-     [java] Sep 14, 2007 10:56:29 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/consumer/trafficAdvisory

-     

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd binding-notification-consumer

-mvn

-

-Sample Usage

-------------

-

-This sample is run using the tuscany binary distribution. To run it, navigate to this sample's directory and 

-

-on Wondows, use following command:

-

-java -Dnotification.httpPort=8082 -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-binding-notification-consumer.jar notification.consumer.TrafficAdvisoryServer

-

-on *nix, use following command:

-

-java -Dnotification.httpPort=8082 -cp ../../lib/tuscany-sca-manifest.jar:target/sample-binding-notification-consumer.jar notification.consumer.TrafficAdvisoryServer

-

-this should bring up the following prompt:

-

-TrafficAdvisoryServer, hit return to end

-

-at this point you should be able to receive messages.

-

-Notice that before you try to receive any message, you should bring up the

-producer sample or the broker sample. When you have finished using this

-sample, hit return to end.

-

-Also notice that '-Dnotification.httpPort=8082' is used in the java command.

-This indicates the port the sample should use. This also says that this server

-is not going to play the role of ntm, given our previous assumption. It is important

-that the first one of the producer, consumer or broker sample that is run be the

-one that uses '-Dnotification.httpPort=8083', otherwise there is no ntm to talk

-to and an exception will be thrown.

-

-Sample directory structure:

----------------------------

-

-binding-notification-consumer/

-  src/

-    main/

-      java/

-        notification.consumer/

-          TrafficAdvisory.java                     - remote interface referred to by the producer component

-          TrafficAdvisoryConsumer.java             - implementation for the consumer components

-          TrafficAdvisoryServer.java               - server class including main entry point

-      resources/

-        wsdl/

-          TrafficAdvisory.wsdl                     - remote interface for the notification component

-        TrafficAdvisoryNotification.componentType  - the component type referred to by

-                                                     <implementation.notification/>

-        TrafficAdvisoryNotification.composite      - the main composite including producer and

-                                                     notification components, and composite reference

-  test/

-      java/

-        notification.producer/

-          TrafficAdvisoryTestCase.java             - JUnit test case

-  resources/

-  binding-notification-consumer.png                - a pictorial representation of the sample .composite file

-  build.xml                       		   - the Ant build file

-  pom.xml                                          - the Maven build file        

diff --git a/java/sca-contrib/samples/binding-notification-consumer/binding-notification-consumer.png b/java/sca-contrib/samples/binding-notification-consumer/binding-notification-consumer.png
deleted file mode 100644
index 33e1966c3e..0000000000
--- a/java/sca-contrib/samples/binding-notification-consumer/binding-notification-consumer.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/binding-notification-consumer/build.xml b/java/sca-contrib/samples/binding-notification-consumer/build.xml
deleted file mode 100644
index f57fe1bb26..0000000000
--- a/java/sca-contrib/samples/binding-notification-consumer/build.xml
+++ /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.    

--->

-<project name="binding-notification-consumer" default="compile">

-    <property name="test.class" value="notification.consumer.TrafficAdvisoryServer" />

-	<property name="test.jar"   value="sample-binding-notification-consumer.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        	<sysproperty key="notification.httpPort" value="8083"/>

-        	<arg value="end"/>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        	<sysproperty key="notification.httpPort" value="8081"/>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/binding-notification-consumer/pom.xml b/java/sca-contrib/samples/binding-notification-consumer/pom.xml
deleted file mode 100644
index c1452f7d02..0000000000
--- a/java/sca-contrib/samples/binding-notification-consumer/pom.xml
+++ /dev/null
@@ -1,116 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-binding-notification-consumer</artifactId>

-    <name>Apache Tuscany SCA Notification Binding Consumer Sample</name>

-    <version>2.0-SNAPSHOT</version>

-    <description>A sample illustrating use of binding.notification</description>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-notification</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-notification</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface-java-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>        

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-	<finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-compiler-plugin</artifactId>

-                <configuration>

-                    <source>1.5</source>

-                    <target>1.5</target>

-                </configuration>

-            </plugin>

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-surefire-plugin</artifactId>

-        <configuration>

-          <systemProperties>

-            <property>

-              <name>notification.httpPort</name>

-              <value>8083</value>

-            </property>

-          </systemProperties>

-        </configuration>

-      </plugin>

-        </plugins>

-        <defaultGoal>install</defaultGoal>

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java b/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
deleted file mode 100644
index 424728692f..0000000000
--- a/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
+++ /dev/null
@@ -1,30 +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 notification.consumer;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * @version $Rev$ $Date$

- */

-@Remotable

-public interface TrafficAdvisory {

-

-    void trafficNotification(String report);

-}

diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java b/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
deleted file mode 100644
index 852ddaa919..0000000000
--- a/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
+++ /dev/null
@@ -1,41 +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 notification.consumer;

-

-import org.oasisopen.sca.annotation.AllowsPassByReference;

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * @version $Rev$ $Date$

- */

-@Service(TrafficAdvisory.class)

-@Scope("COMPOSITE")

-@AllowsPassByReference

-public class TrafficAdvisoryConsumer implements TrafficAdvisory {

-    

-    @Property

-    protected String name;

-

-    public void trafficNotification(String report) {

-        

-        System.out.println("Consumer [" + name + "] received report: " + report);

-    }

-}

diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java b/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
deleted file mode 100644
index c53adb1944..0000000000
--- a/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
+++ /dev/null
@@ -1,48 +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 notification.consumer;

-

-import java.io.IOException;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * @version $Rev$ $Date$

- */

-public class TrafficAdvisoryServer {

-

-    public static void main(String[] args) {

-        try {

-            SCADomain domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");

-

-            try {

-                if (args.length != 1 || !args[0].equals("end")) {

-                    System.out.println("TrafficAdvisoryServer, hit return to end");

-                    System.in.read();

-                }

-            } catch (IOException e) {

-                e.printStackTrace();

-            }

-

-            domain.close();

-        } catch(Throwable e) {

-            e.printStackTrace();

-        }

-    }

-}

diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType b/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 2dc70f8ed1..0000000000
--- a/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">

-     <service name="TrafficAdvisoryNotificationService">

-           <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-               wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-           </interface.wsdl>

-     </service>

-

-     <reference name="TrafficAdvisoryNotificationReference"

-                multiplicity="0..n">

-           <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-               wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-           </interface.wsdl>

-     </reference>

-</componentType>

diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite b/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index 8f9bcc4438..0000000000
--- a/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

- * 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://tuscany.apache.org/xmlns/notification/1.0/samples"

-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-           name="TrafficAdvisoryNotificationRemoteConsumerComposite">

-

-    <service name="TrafficAdvisoryNotificationCompositeService"

-             promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationService">

-        <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-            wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-        </interface.wsdl>

-        <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="http://example.com/trafficAdvisory"/>

-    </service>

-             

-    <component name="TrafficAdvisoryNotificationComponent">

-        <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>

-        <!-- Never use > 1 reference elements here !! -->

-        <reference name="TrafficAdvisoryNotificationReference"

-                   multiplicity="0..n"

-                   target="TrafficAdvisoryConsumer1 TrafficAdvisoryConsumer2"/>

-    </component>

-    

-    <component name="TrafficAdvisoryConsumer1">

-        <implementation.java class="notification.consumer.TrafficAdvisoryConsumer"/>

-        <property name="name">Consumer1</property>

-    </component>

-

-    <component name="TrafficAdvisoryConsumer2">

-		<implementation.java class="notification.consumer.TrafficAdvisoryConsumer"/>

-        <property name="name">Consumer2</property>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.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.

--->

-<definitions name="TrafficAdvisory"

-             targetNamespace="http://example.com/TrafficAdvisory.wsdl"

-             xmlns:tns="http://example.com/TrafficAdvisory.wsdl"

-             xmlns:xsd1="http://example.com/TrafficAdvisory.xsd"

-             xmlns="http://schemas.xmlsoap.org/wsdl/">

-

-    <types>

-        <schema targetNamespace="http://example.com/TrafficAdvisory.xsd"

-                xmlns:tns="http://example.com/TrafficAdvisory.xsd"

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

-            <element name="trafficNotification">

-                <complexType>

-                    <sequence>

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

-                    </sequence>

-                </complexType>

-            </element>

-        </schema>

-    </types>

-

-    <message name="TrafficNotificationInput">

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

-    </message>

-

-    <portType name="TrafficAdvisoryPortType">

-        <operation name="trafficNotification">

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

-        </operation>

-    </portType>

-

-</definitions>

diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java b/java/sca-contrib/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
deleted file mode 100644
index c5318f405c..0000000000
--- a/java/sca-contrib/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
+++ /dev/null
@@ -1,61 +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 notification.consumer;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-import junit.framework.TestCase;

-

-public class TrafficAdvisoryTestCase extends TestCase {

-

-    private SCADomain domain;

-    

-    public void testTrafficAdvisoryNotification() throws Exception {

-        System.out.println("Only instantiating and closing domain ...");

-

-        /* Uncomment to test with producer

-        try {

-            System.out.println("TrafficAdvisoryServer, hit return to end");

-            System.in.read();

-        } catch (Exception e) {

-            e.printStackTrace();

-        }

-        */

-    }

-

-    @Override

-    protected void setUp() throws Exception {

-        try {

-            domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");

-        } catch(Throwable e) {

-            e.printStackTrace();

-            if (e instanceof Exception) {

-                throw (Exception)e;

-            }

-            else {

-                throw new Exception(e);

-            }

-        }

-    }

-    

-    @Override

-    protected void tearDown() throws Exception {

-        domain.close();

-    }

-}

diff --git a/java/sca-contrib/samples/binding-notification-producer/README b/java/sca-contrib/samples/binding-notification-producer/README
deleted file mode 100644
index c5f284d4c5..0000000000
--- a/java/sca-contrib/samples/binding-notification-producer/README
+++ /dev/null
@@ -1,133 +0,0 @@
-Notification Producer Binding Sample

-===============================

-

-This sample illustrates the use of <binding.notification/> with a

-remote producer.

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-Sample Overview

----------------

-

-This sample illustrates the use of a notification producer that is located in a

-separate (and remote) composite with respect to any consumers. As such, this sample

-is run in conjunction with the binding-notification-consumer sample, the

-binding-notification-broker sample, or both. Take a look at the composite file 

-or the .svg file which shows the composite file in pictorial form. The composite

-reference, referred to by the notification component, has a <binding.notification/>

-that handles the remote communication. This binding includes an 'ntm' attribute

-that refers to the notification type manager, which manages the connectivity of

-producers, consumers and brokers, and which (for this sample) is assumed to be

-running on http://localhost:8083. The ntm is a system component that is included in

-and runs as part of the binding-notification module.

-This sample also illustrates the use of a wsdl interface in the notification

-component's <implementation.notification/>. This allows messages sent and received

-via <binding.notification/> to be transported as literal xml over http.

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd binding-notification-producer

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] Sep 14, 2007 10:31:45 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/ntm/trafficAdvisory

-     [java] Sep 14, 2007 10:31:45 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/producer/trafficAdvisory

-     

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd binding-notification-producer

-mvn

-

-You should see the following output from the test phase.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running notification.producer.TrafficAdvisoryTestCase

-Only instantiating and closing domain ...

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.252 sec

-

-Results :

-

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

-

-This shows that the Junit test cases have run successfully. 

-

-Sample Usage

-------------

-

-This sample is run using the tuscany binary distribution. To run it, navigate to this sample's directory and 

-

-on Wondows, use following command:

-

-java -Dnotification.httpPort=8083 -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-binding-notification-producer.jar notification.producer.TrafficAdvisoryServer

-

-on *nix, use following command:

-

-java -Dnotification.httpPort=8083 -cp ../../lib/tuscany-sca-manifest.jar:target/sample-binding-notification-producer.jar notification.producer.TrafficAdvisoryServer

-

-this should bring up the following prompt:

-

-Send a report value, ^C or <end> to end

-

-at this point you should be able to type a message to send, for instance:

-

-Traffic congestion

-

-Notice that before you try to send any message, you should bring up the

-consumer sample or the broker sample. When you have finished using this

-sample, type 'end' or ^C to end.

-

-Also notice that '-Dnotification.httpPort=8083' is used in the java command.

-This indicates the port the sample should use. This also says that this server

-is going to play the role of ntm, given our previous assumption. It is important

-that the first one of the producer, consumer or broker sample that is run be the

-one that uses '-Dnotification.httpPort=8083', otherwise there is no ntm to talk

-to and an exception will be thrown.

-

-Sample directory structure:

----------------------------

-

-binding-notification-producer/

-  src/

-    main/

-      java/

-        notification.producer/

-          TestCaseProducer.java                    - interface for the producer component

-          TrafficAdvisory.java                     - remote interface referred to by the producer component

-          TrafficAdvisoryProducer.java             - implementation for the producer component

-          TrafficAdvisoryServer.java               - server class including main entry point

-      resources/

-        wsdl/

-          TrafficAdvisory.wsdl                     - remote interface for the notification component

-        TrafficAdvisoryNotification.componentType  - the component type referred to by

-                                                     <implementation.notification/>

-        TrafficAdvisoryNotification.composite      - the main composite including producer and

-                                                     notification components, and composite reference

-    test/

-      java/

-        notification.producer/

-          TrafficAdvisoryTestCase.java             - JUnit test case

-      resources/

-        wsdl/

-          TrafficAdvisory.wsdl                     - remote interface for the notification component

-        TrafficAdvisoryNotification.componentType  - the component type referred to by

-                                                     <implementation.notification/>

-        TrafficAdvisoryNotification.composite      - the main composite including producer and

-                                                     notification components, and composite reference

-  binding-notification-producer.png                - a pictorial representation of the sample .composite file

-  build.xml                       		   - the Ant build file

-  pom.xml                                          - the Maven build file        

diff --git a/java/sca-contrib/samples/binding-notification-producer/binding-notification-producer.png b/java/sca-contrib/samples/binding-notification-producer/binding-notification-producer.png
deleted file mode 100644
index 34c347c893..0000000000
--- a/java/sca-contrib/samples/binding-notification-producer/binding-notification-producer.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/binding-notification-producer/build.xml b/java/sca-contrib/samples/binding-notification-producer/build.xml
deleted file mode 100644
index d13e4c8a6c..0000000000
--- a/java/sca-contrib/samples/binding-notification-producer/build.xml
+++ /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.    

--->

-<project name="binding-notification-producer" default="compile">

-    <property name="test.class" value="notification.producer.TrafficAdvisoryServer" />

-	<property name="test.jar"   value="sample-binding-notification-producer.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        	<sysproperty key="notification.httpPort" value="8083"/>

-        	<arg value="end"/>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        	<sysproperty key="notification.httpPort" value="8082"/>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/binding-notification-producer/pom.xml b/java/sca-contrib/samples/binding-notification-producer/pom.xml
deleted file mode 100644
index ffe90c0cb3..0000000000
--- a/java/sca-contrib/samples/binding-notification-producer/pom.xml
+++ /dev/null
@@ -1,127 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-binding-notification-producer</artifactId>

-    <name>Apache Tuscany SCA Notification Binding Producer Sample</name>

-    <version>2.0-SNAPSHOT</version>

-    <description>A sample illustrating use of binding.notification</description>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-notification</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-notification</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.5</version>

-            <scope>provided</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>        

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-	<finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-compiler-plugin</artifactId>

-                <configuration>

-                    <source>1.5</source>

-                    <target>1.5</target>

-                </configuration>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <mainClass>org.apache.tuscany.notification.remoteProducer.TrafficAdvisoryServer</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-surefire-plugin</artifactId>

-        <configuration>

-          <systemProperties>

-            <property>

-              <name>notification.httpPort</name>

-              <value>8083</value>

-            </property>

-          </systemProperties>

-        </configuration>

-      </plugin>

-        </plugins>

-        <defaultGoal>install</defaultGoal>

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java b/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
deleted file mode 100644
index be80e71249..0000000000
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
+++ /dev/null
@@ -1,24 +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 notification.producer;

-

-public interface TestCaseProducer {

-

-    public void produceTrafficNotification(String report);

-}

diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java b/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
deleted file mode 100644
index 548d45b12d..0000000000
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
+++ /dev/null
@@ -1,30 +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 notification.producer;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * @version $Rev$ $Date$

- */

-@Remotable

-public interface TrafficAdvisory {

-

-    void trafficNotification(String report);

-}

diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java b/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
deleted file mode 100644
index e670ccb95c..0000000000
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.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 notification.producer;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(TestCaseProducer.class)

-@Scope("COMPOSITE")

-public class TrafficAdvisoryProducer implements TestCaseProducer {

-    

-    @Reference

-    protected TrafficAdvisory destination;

-

-    public void produceTrafficNotification(String report) {

-        

-        destination.trafficNotification(report);

-    }

-}

diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java b/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
deleted file mode 100644
index efd3657dc3..0000000000
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
+++ /dev/null
@@ -1,57 +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 notification.producer;

-

-import java.io.BufferedReader;

-import java.io.IOException;

-import java.io.InputStreamReader;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-public class TrafficAdvisoryServer {

-

-    public static void main(String[] args) {

-        try {

-            SCADomain domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");

-            TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");

-            BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));

-            String value = "";

-            if (args.length == 1) {

-                value = args[0];

-            }

-            do {

-                if(value == null || value.equals("end")) {

-                    break;

-                }

-                try {

-                    System.out.println("Send a report value, ^C or <end> to end");

-                    value = reader.readLine();

-                } catch (IOException e) {

-                    e.printStackTrace();

-                }

-                testCaseProducer.produceTrafficNotification("Report value [" + value + "]");

-            }

-            while(true);

-                                

-            domain.close();

-        } catch(Throwable e) {

-            e.printStackTrace();

-        }

-    }

-}

diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType b/java/sca-contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 2dc70f8ed1..0000000000
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">

-     <service name="TrafficAdvisoryNotificationService">

-           <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-               wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-           </interface.wsdl>

-     </service>

-

-     <reference name="TrafficAdvisoryNotificationReference"

-                multiplicity="0..n">

-           <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-               wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-           </interface.wsdl>

-     </reference>

-</componentType>

diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite b/java/sca-contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index 2db6ea655b..0000000000
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

- * 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://tuscany.apache.org/xmlns/notification/1.0/samples"

-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-           name="TrafficAdvisoryNotificationRemoteProducerComposite">

-

-    <component name="TrafficAdvisoryProducer">

-		<implementation.java class="notification.producer.TrafficAdvisoryProducer"/>

-        <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>

-    </component>

-

-    <component name="TrafficAdvisoryNotificationComponent">

-        <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>

-    </component>

-    

-    <reference name="TrafficAdvisoryNotificationCompositeReference"

-               promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationReference">

-        <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-            wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-        </interface.wsdl>

-        <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="trafficAdvisory"/>

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/java/sca-contrib/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.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.

--->

-<definitions name="TrafficAdvisory"

-             targetNamespace="http://example.com/TrafficAdvisory.wsdl"

-             xmlns:tns="http://example.com/TrafficAdvisory.wsdl"

-             xmlns:xsd1="http://example.com/TrafficAdvisory.xsd"

-             xmlns="http://schemas.xmlsoap.org/wsdl/">

-

-    <types>

-        <schema targetNamespace="http://example.com/TrafficAdvisory.xsd"

-                xmlns:tns="http://example.com/TrafficAdvisory.xsd"

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

-            <element name="trafficNotification">

-                <complexType>

-                    <sequence>

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

-                    </sequence>

-                </complexType>

-            </element>

-        </schema>

-    </types>

-

-    <message name="TrafficNotificationInput">

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

-    </message>

-

-    <portType name="TrafficAdvisoryPortType">

-        <operation name="trafficNotification">

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

-        </operation>

-    </portType>

-

-</definitions>

diff --git a/java/sca-contrib/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java b/java/sca-contrib/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
deleted file mode 100644
index d3901ee407..0000000000
--- a/java/sca-contrib/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
+++ /dev/null
@@ -1,78 +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 notification.producer;

-

-import java.io.BufferedReader;

-import java.io.InputStreamReader;

-

-import notification.producer.TestCaseProducer;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-//import org.apache.tuscany.sca.notification.remoteProducer.TestCaseProducer;

-

-import junit.framework.TestCase;

-

-public class TrafficAdvisoryTestCase extends TestCase {

-

-    private SCADomain domain;

-    

-    public void testTrafficAdvisoryNotification() throws Exception {

-        System.out.println("Only instantiating and closing domain ...");

-        TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");

-

-        /* Uncomment to test with consumer

-        BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));

-        String value = "foo";

-        do {

-            try {

-                System.out.println("Send a report value, ^C or <end> to end");

-                value = reader.readLine();

-            } catch (Exception e) {

-                e.printStackTrace();

-            }

-            if(value == null || value.equals("end")) {

-                break;

-            }

-            testCaseProducer.produceTrafficNotification("Report value [" + value + "]");

-            value = "end";

-        }

-        while(true);

-        */

-    }

-

-    @Override

-    protected void setUp() throws Exception {

-        try {

-            domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");

-        } catch(Throwable e) {

-            e.printStackTrace();

-            if (e instanceof Exception) {

-                throw (Exception)e;

-            }

-            else {

-                throw new Exception(e);

-            }

-        }

-    }

-    

-    @Override

-    protected void tearDown() throws Exception {

-        domain.close();

-    }

-}

diff --git a/java/sca-contrib/samples/calculator-corba-reference/README b/java/sca-contrib/samples/calculator-corba-reference/README
deleted file mode 100644
index 66c4cddb94..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/README
+++ /dev/null
@@ -1,83 +0,0 @@
-Calculator CORBA Reference Sample
-===============================
-
-This sample illustrates the use of Tuscany CORBA Binding to call reference 
-services that are hosted as CORBA services.  
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-
-Sample Overview
----------------
-This sample extends the calculator sample by replacing the local wired 
-connections with CORBA bindings. Instead of local add, subtract, multiply and 
-divide components, an CORBA service implementation now provides the
-add, subtract, multiply and divide interfaces and is hosted as an CORBA object. 
-References specified in the .composite file include a CORBA binding which targets
-this CORBA object. Name service which is used in CORBA communication is provided 
-in test case class - CalculatorCORBAReferenceTestCase.java.
-
-This sample adds a number of classes to the basic calculator sample:
-
-calculator-corba-reference/
-  src/
-    main/
-      java/
-        calculator/
-          CalculatorService.java  - as calculator sample
-          AddService.java         - as calculator sample
-          SubtractService.java    - as calculator sample
-          MultipleService.java    - as calculator sample
-          DivideService.java      - as calculator sample
-          CalculatorClient.java   - as calculator sample
-          CalculatorServiceImpl.java - calls the CORBA service
-                                    that provides the target for the 
-                                    CORBA bindings in the composite 
-      resources/
-        CalculatorCORBAReference.composite - the SCA assembly for this sample
-    test/
-      java/
-        calculator/
-          CalculatorCORBAReferenceTestCase.java - JUnit test case
-          CalculatorCORBAServant.java - CORBA service implementation
-          idl/                        - contains files generated 
-                                        from  IDL file. Files are 
-                                        used to create  CORBA object which
-                                        will be consumed by SCA reference.
-            _CalculatorCORBAServiceImplBase.java
-            CalculatorCORBAService.java
-            CalculatorCORBAServiceOperations.java
-      resources/
-        CalculatorCORBA.idl      - IDL description for CORBA object
-  pom.xml                         - the Maven build file   
-  
-Note. As this test creates and uses local network connections you may need to 
-configure your firewall, if you are running one, to allow the test to run
-successfully.         
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd calculator-corba-reference
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorCORBAReferenceTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.308 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
-
-
-
diff --git a/java/sca-contrib/samples/calculator-corba-reference/pom.xml b/java/sca-contrib/samples/calculator-corba-reference/pom.xml
deleted file mode 100644
index 96d4ce402c..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/pom.xml
+++ /dev/null
@@ -1,74 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-calculator-corba-reference</artifactId>

-    <name>Apache Tuscany SCA Calculator CORBA Reference Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-corba-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-	<dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-corba-jse</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/AddService.java b/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
deleted file mode 100644
index ec57a6a533..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the add service

- */

-public interface AddService {

-

-    double add(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java b/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index cd1076c3f1..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.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 calculator;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * and locate and invoke a SCA component

- */

-public class CalculatorClient {

-    public static void main(String[] args) throws Exception {

-        SCADomain scaDomain = SCADomain.newInstance("CalculatorRMIReference.composite");

-        CalculatorService calculatorService = 

-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");

-

-        // Calculate

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-        

-        scaDomain.close();

-

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 0bac3da45c..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,39 +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 calculator;

-

-import java.rmi.Remote;

-import java.rmi.RemoteException;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The Calculator service interface.

- */

-@Remotable

-public interface CalculatorService extends Remote {

-

-    double add(double n1, double n2) throws RemoteException;

-

-    double subtract(double n1, double n2) throws RemoteException;

-

-    double multiply(double n1, double n2) throws RemoteException;

-

-    double divide(double n1, double n2) throws RemoteException;

-}

diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 675350860e..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.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 calculator;

-

-import org.oasisopen.sca.annotation.Reference;

-

-/**

- * An implementation of the Calculator service.

- */

-public class CalculatorServiceImpl implements CalculatorService {

-

-    private AddService addService;

-    private SubtractService subtractService;

-    private MultiplyService multiplyService;

-    private DivideService divideService;

-

-    @Reference

-    public void setAddService(AddService addService) {

-        this.addService = addService;

-    }

-

-    @Reference

-    public void setSubtractService(SubtractService subtractService) {

-        this.subtractService = subtractService;

-    }

-

-    @Reference

-    public void setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-

-    @Reference

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-

-    public double add(double n1, double n2) {

-        return addService.add(n1, n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        return multiplyService.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        return divideService.divide(n1, n2);

-    }

-}

diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java b/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the divide service

- */

-public interface DivideService {

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the multiply service

- */

-public interface MultiplyService {

-

-    double multiply(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java b/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 30e4e6a56a..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the subtract service

- */

-public interface SubtractService {

-

-    double subtract(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite b/java/sca-contrib/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
deleted file mode 100644
index 717add91a8..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
+++ /dev/null
@@ -1,42 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="Calculator">

-

-    <component name="CalculatorServiceComponent">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-		<reference name="addService">
-	    	<tuscany:binding.corba uri="corbaname::localhost:5080#CalculatorCORBAService"/>
-		</reference>

-        <reference name="subtractService">
-    		<tuscany:binding.corba uri="corbaname::localhost:5080#CalculatorCORBAService"/>
-        </reference>

-        <reference name="multiplyService">
-    		<tuscany:binding.corba uri="corbaname::localhost:5080#CalculatorCORBAService"/>
-        </reference>

-        <reference name="divideService">
-    		<tuscany:binding.corba uri="corbaname::localhost:5080#CalculatorCORBAService"/>
-        </reference>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java b/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
deleted file mode 100644
index 041608273b..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
+++ /dev/null
@@ -1,82 +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 calculator;

-

-import junit.framework.Assert;

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;

-import org.apache.tuscany.sca.host.corba.naming.TransientNameService;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-import org.omg.CORBA.ORB;

-import org.omg.CosNaming.NameComponent;

-import org.omg.CosNaming.NamingContext;

-import org.omg.CosNaming.NamingContextHelper;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class CalculatorCORBAReferenceTestCase extends TestCase {

-

-    private SCADomain scaDomain;

-    private CalculatorService calculatorService;

-    private TransientNameServer server;

-

-    private void bindObject(String name, org.omg.CORBA.Object object) throws Exception {

-        ORB orb = server.getORB();

-        org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");

-        NamingContext ncRef = NamingContextHelper.narrow(objRef);

-        NameComponent nc = new NameComponent(name, "");

-        NameComponent path[] = {nc};

-        ncRef.rebind(path, object);

-    }

-    

-    @BeforeClass

-    protected void setUp() throws Exception {

-        // create name service

-        server = new TransientNameServer("localhost", 5080, TransientNameService.DEFAULT_SERVICE_NAME);

-        Thread t = server.start();

-        if (t == null) {

-            Assert.fail("The naming server cannot be started");

-        } else {

-            // create CORBA object which will be accessible by SCA CORBA binding

-            bindObject("CalculatorCORBAService", new CalculatorCORBAServant());

-            scaDomain = SCADomain.newInstance("CalculatorCORBAReference.composite");

-            calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");

-        }

-    }

-

-    @AfterClass

-    protected void tearDown() throws Exception {

-        scaDomain.close();

-        server.stop();

-    }

-

-    @Test

-    public void testCalculator() throws Exception {

-        assertEquals(5.0, calculatorService.add(3, 2));

-        assertEquals(1.0, calculatorService.subtract(3, 2));

-        assertEquals(6.0, calculatorService.multiply(3, 2));

-        assertEquals(1.5, calculatorService.divide(3, 2));

-    }

-}

diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java b/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java
deleted file mode 100644
index 65e9b89ce2..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.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 calculator;
-
-import calculator.idl._CalculatorCORBAServiceImplBase;
-
-public class CalculatorCORBAServant extends _CalculatorCORBAServiceImplBase {
-
-    private static final long serialVersionUID = 1L;
-
-    public double add(double arg1, double arg2) {
-        return arg1 + arg2;
-    }
-
-    public double subtract(double arg1, double arg2) {
-        return arg1 - arg2;
-    }
-
-    public double multiply(double arg1, double arg2) {
-        return arg1 * arg2;
-    }
-
-    public double divide(double arg1, double arg2) {
-        return arg1 / arg2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java b/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java
deleted file mode 100644
index 6206e0cf6f..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.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 calculator.idl;
-
-
-/**
-* calculator/idl/CalculatorCORBAService.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from CalculatorCORBA.idl
-* ¶roda, 15 pa¼dziernik 2008 16:02:31 CEST
-*/
-
-public interface CalculatorCORBAService extends CalculatorCORBAServiceOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 
-{
-} // interface CalculatorCORBAService
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java b/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
deleted file mode 100644
index 6facda6a34..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.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 calculator.idl;
-
-
-/**
-* calculator/idl/CalculatorCORBAServiceOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from CalculatorCORBA.idl
-* ¶roda, 15 pa¼dziernik 2008 16:02:31 CEST
-*/
-
-public interface CalculatorCORBAServiceOperations 
-{
-  double add (double arg1, double arg2);
-  double subtract (double arg1, double arg2);
-  double multiply (double arg1, double arg2);
-  double divide (double arg1, double arg2);
-} // interface CalculatorCORBAServiceOperations
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java b/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
deleted file mode 100644
index f6a4bd8994..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
+++ /dev/null
@@ -1,120 +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 calculator.idl;
-
-
-/**
-* calculator/idl/_CalculatorCORBAServiceImplBase.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from CalculatorCORBA.idl
-* ¶roda, 15 pa¼dziernik 2008 16:02:31 CEST
-*/
-
-public abstract class _CalculatorCORBAServiceImplBase extends org.omg.CORBA.portable.ObjectImpl
-                implements calculator.idl.CalculatorCORBAService, org.omg.CORBA.portable.InvokeHandler
-{
-
-  // Constructors
-  public _CalculatorCORBAServiceImplBase ()
-  {
-  }
-
-  private static java.util.Hashtable _methods = new java.util.Hashtable ();
-  static
-  {
-    _methods.put ("add", new java.lang.Integer (0));
-    _methods.put ("subtract", new java.lang.Integer (1));
-    _methods.put ("multiply", new java.lang.Integer (2));
-    _methods.put ("divide", new java.lang.Integer (3));
-  }
-
-  public org.omg.CORBA.portable.OutputStream _invoke (String $method,
-                                org.omg.CORBA.portable.InputStream in,
-                                org.omg.CORBA.portable.ResponseHandler $rh)
-  {
-    org.omg.CORBA.portable.OutputStream out = null;
-    java.lang.Integer __method = (java.lang.Integer)_methods.get ($method);
-    if (__method == null)
-      throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-
-    switch (__method.intValue ())
-    {
-       case 0:  // calculator/idl/CalculatorCORBAService/add
-       {
-         double arg1 = in.read_double ();
-         double arg2 = in.read_double ();
-         double $result = (double)0;
-         $result = this.add (arg1, arg2);
-         out = $rh.createReply();
-         out.write_double ($result);
-         break;
-       }
-
-       case 1:  // calculator/idl/CalculatorCORBAService/subtract
-       {
-         double arg1 = in.read_double ();
-         double arg2 = in.read_double ();
-         double $result = (double)0;
-         $result = this.subtract (arg1, arg2);
-         out = $rh.createReply();
-         out.write_double ($result);
-         break;
-       }
-
-       case 2:  // calculator/idl/CalculatorCORBAService/multiply
-       {
-         double arg1 = in.read_double ();
-         double arg2 = in.read_double ();
-         double $result = (double)0;
-         $result = this.multiply (arg1, arg2);
-         out = $rh.createReply();
-         out.write_double ($result);
-         break;
-       }
-
-       case 3:  // calculator/idl/CalculatorCORBAService/divide
-       {
-         double arg1 = in.read_double ();
-         double arg2 = in.read_double ();
-         double $result = (double)0;
-         $result = this.divide (arg1, arg2);
-         out = $rh.createReply();
-         out.write_double ($result);
-         break;
-       }
-
-       default:
-         throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
-    }
-
-    return out;
-  } // _invoke
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:calculator/idl/CalculatorCORBAService:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-
-} // class _CalculatorCORBAServiceImplBase
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl b/java/sca-contrib/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
deleted file mode 100644
index 55ffeac8a3..0000000000
--- a/java/sca-contrib/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
+++ /dev/null
@@ -1,33 +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.    
- */
-
-/*
- * Compile by: idlj -fserver -oldImplBase CalculatorCORBA.idl 
- */
- 
-module calculator {
-	module idl {
-		interface CalculatorCORBAService {
-			double add(in double arg1, in double arg2);
-			double subtract(in double arg1, in double arg2);
-			double multiply(in double arg1, in double arg2);
-			double divide(in double arg1, in double arg2);		
-		};
-	};
-};
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-corba-service/README b/java/sca-contrib/samples/calculator-corba-service/README
deleted file mode 100644
index 87863752cd..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/README
+++ /dev/null
@@ -1,82 +0,0 @@
-Calculator CORBA Service Sample
-=============================
-
-This sample illustrates the use of Tuscany CORBA Binding to expose component 
-services as CORBA objects. It also demonstrates how a simple Java CORBA 
-Client application invokes the SCA Application's services exposed as CORBA 
-Services.
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-
-Sample Overview
----------------
-This sample extends the calculator sample by replacing the local service 
-binding with an CORBA binding. So a java client can call the service exposed
-by the SCA application using an CORBA client. Name service which is used in 
-CORBA communication is provided by Tuscany CORBA hosting module 
-(maven dependency: tuscany-host-corba-jse-tns) - see CORBA binding reference
-on Apache Tuscany website for details.
-
-This sample adds a number of classes to the basic calculator sample:
-
-calculator-corba-service/
-  src/
-    main/
-      java/
-        calculator/
-          CalculatorService.java  - as calculator sample
-          CalculatorServiceImpl.java
-          AddService.java         - as calculator sample
-          AddServiceImpl.java
-          SubtractService.java    - as calculator sample
-          SubtractServiceImpl.java
-          MultiplyService.java    - as calculator sample
-          MultiplyServiceImpl.java
-          DivideService.java      - as calculator sample
-          DivideServiceImpl.java
-      resources/
-        CalculatorCORBAServer.composite - the SCA assembly for this sample
-    test/
-      java/
-        calculator/
-          CalculatorCORBAServerTestCase.java          - JUnit test case
-          idl/                                        - contains files generated 
-                                                        from  IDL file. Files are 
-                                                        used to access SCA component.
-            CalculatorCORBAServiceHelper.java
-            CalculatorCORBAService.java
-            _CalculatorCORBAServiceStub.java
-            CalculatorCORBAServiceHolder.java
-            CalculatorCORBAServiceOperations.java
-      resources/
-        CalculatorCORBA.idl      - IDL description for SCA component
-  pom.xml                         - the Maven build file   
-  
-Note. As this test creates and uses local network connections you may need to 
-configure your firewall, if you are running one, to allow the test to run
-successfully.
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd calculator-corba-service
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorCORBAServerTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.819 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/calculator-corba-service/pom.xml b/java/sca-contrib/samples/calculator-corba-service/pom.xml
deleted file mode 100644
index 63c5f5f9a6..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/pom.xml
+++ /dev/null
@@ -1,74 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-calculator-corba-service</artifactId>

-    <name>Apache Tuscany SCA Calculator CORBA Service Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-corba-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-	<dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-corba-jse-tns</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/AddService.java b/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/AddService.java
deleted file mode 100644
index ec57a6a533..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the add service

- */

-public interface AddService {

-

-    double add(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9c635e3c8..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Add service

- */

-public class AddServiceImpl implements AddService {

-

-    public double add(double n1, double n2) {

-        return n1 + n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index b0a46b6dd0..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.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 calculator;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The Calculator service interface.

- */

-@Remotable

-public interface CalculatorService {

-

-    double add(double n1, double n2);

-

-    double subtract(double n1, double n2);

-

-    double multiply(double n1, double n2);

-

-    double divide(double n1, double n2);

-}

diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 675350860e..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.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 calculator;

-

-import org.oasisopen.sca.annotation.Reference;

-

-/**

- * An implementation of the Calculator service.

- */

-public class CalculatorServiceImpl implements CalculatorService {

-

-    private AddService addService;

-    private SubtractService subtractService;

-    private MultiplyService multiplyService;

-    private DivideService divideService;

-

-    @Reference

-    public void setAddService(AddService addService) {

-        this.addService = addService;

-    }

-

-    @Reference

-    public void setSubtractService(SubtractService subtractService) {

-        this.subtractService = subtractService;

-    }

-

-    @Reference

-    public void setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-

-    @Reference

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-

-    public double add(double n1, double n2) {

-        return addService.add(n1, n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        return multiplyService.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        return divideService.divide(n1, n2);

-    }

-}

diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/DivideService.java b/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the divide service

- */

-public interface DivideService {

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Divide service.

- */

-public class DivideServiceImpl implements DivideService {

-

-    public double divide(double n1, double n2) {

-        return n1 / n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the multiply service

- */

-public interface MultiplyService {

-

-    double multiply(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Multiply service.

- */

-public class MultiplyServiceImpl implements MultiplyService {

-

-    public double multiply(double n1, double n2) {

-        return n1 * n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java b/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 30e4e6a56a..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the subtract service

- */

-public interface SubtractService {

-

-    double subtract(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the subtract service.

- */

-public class SubtractServiceImpl implements SubtractService {

-

-    public double subtract(double n1, double n2) {

-        return n1 - n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite b/java/sca-contrib/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
deleted file mode 100644
index 1ab6cecef7..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
+++ /dev/null
@@ -1,53 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="Calculator">

-

-    <component name="CalculatorServiceComponent">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-	    <service name="CalculatorService">
-	        <interface.java interface="calculator.CalculatorService"/>
-	        <tuscany:binding.corba uri="corbaname::localhost:5080#CalculatorCORBAService" id="IDL:calculator/idl/CalculatorCORBAService:1.0"/>
-	    </service>
-		<reference name="addService" target="AddServiceComponent"></reference>

-        <reference name="subtractService" target="SubtractServiceComponent"></reference>

-        <reference name="multiplyService" target="MultiplyServiceComponent"></reference>

-        <reference name="divideService" target="DivideServiceComponent"></reference>

-    </component>

-

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl"/>

-    </component>

-</composite>

diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java b/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
deleted file mode 100644
index 4248ca8573..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
+++ /dev/null
@@ -1,64 +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 calculator;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-import org.omg.CORBA.ORB;

-

-import calculator.idl.CalculatorCORBAService;

-import calculator.idl.CalculatorCORBAServiceHelper;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class CalculatorCORBAServerTestCase extends TestCase {

-

-    private SCADomain scaDomain;

-    private CalculatorCORBAService calculatorService;

-

-    @BeforeClass

-    protected void setUp() throws Exception {

-        scaDomain = SCADomain.newInstance("CalculatorCORBAServer.composite");

-        String[] args = {"-ORBInitialPort", "5080"};

-        // retrieve CORBA object which is SCA component

-        ORB orb = ORB.init(args, null);

-        calculatorService =

-            CalculatorCORBAServiceHelper.narrow(orb

-                .string_to_object("corbaname::localhost:5080#CalculatorCORBAService"));

-    }

-

-    @AfterClass

-    protected void tearDown() throws Exception {

-        scaDomain.close();

-    }

-

-    @Test

-    public void testCalculator() throws Exception {

-        assertEquals(5.0, calculatorService.add(3, 2));

-        assertEquals(1.0, calculatorService.subtract(3, 2));

-        assertEquals(6.0, calculatorService.multiply(3, 2));

-        assertEquals(1.5, calculatorService.divide(3, 2));

-    }

-}

diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java b/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java
deleted file mode 100644
index 6576358755..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.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 calculator.idl;
-
-
-/**
-* calculator/idl/CalculatorCORBAService.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from CalculatorCORBA.idl
-* ¶roda, 15 pa¼dziernik 2008 15:59:26 CEST
-*/
-
-public interface CalculatorCORBAService extends CalculatorCORBAServiceOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 
-{
-} // interface CalculatorCORBAService
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java b/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
deleted file mode 100644
index 0977982fb3..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
+++ /dev/null
@@ -1,104 +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 calculator.idl;
-
-
-/**
-* calculator/idl/CalculatorCORBAServiceHelper.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from CalculatorCORBA.idl
-* ¶roda, 15 pa¼dziernik 2008 15:59:26 CEST
-*/
-
-abstract public class CalculatorCORBAServiceHelper
-{
-  private static String  _id = "IDL:calculator/idl/CalculatorCORBAService:1.0";
-
-  public static void insert (org.omg.CORBA.Any a, calculator.idl.CalculatorCORBAService that)
-  {
-    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
-    a.type (type ());
-    write (out, that);
-    a.read_value (out.create_input_stream (), type ());
-  }
-
-  public static calculator.idl.CalculatorCORBAService extract (org.omg.CORBA.Any a)
-  {
-    return read (a.create_input_stream ());
-  }
-
-  private static org.omg.CORBA.TypeCode __typeCode = null;
-  synchronized public static org.omg.CORBA.TypeCode type ()
-  {
-    if (__typeCode == null)
-    {
-      __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (calculator.idl.CalculatorCORBAServiceHelper.id (), "CalculatorCORBAService");
-    }
-    return __typeCode;
-  }
-
-  public static String id ()
-  {
-    return _id;
-  }
-
-  public static calculator.idl.CalculatorCORBAService read (org.omg.CORBA.portable.InputStream istream)
-  {
-    return narrow (istream.read_Object (_CalculatorCORBAServiceStub.class));
-  }
-
-  public static void write (org.omg.CORBA.portable.OutputStream ostream, calculator.idl.CalculatorCORBAService value)
-  {
-    ostream.write_Object ((org.omg.CORBA.Object) value);
-  }
-
-  public static calculator.idl.CalculatorCORBAService narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof calculator.idl.CalculatorCORBAService)
-      return (calculator.idl.CalculatorCORBAService)obj;
-    else if (!obj._is_a (id ()))
-      throw new org.omg.CORBA.BAD_PARAM ();
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      calculator.idl._CalculatorCORBAServiceStub stub = new calculator.idl._CalculatorCORBAServiceStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-  public static calculator.idl.CalculatorCORBAService unchecked_narrow (org.omg.CORBA.Object obj)
-  {
-    if (obj == null)
-      return null;
-    else if (obj instanceof calculator.idl.CalculatorCORBAService)
-      return (calculator.idl.CalculatorCORBAService)obj;
-    else
-    {
-      org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate ();
-      calculator.idl._CalculatorCORBAServiceStub stub = new calculator.idl._CalculatorCORBAServiceStub ();
-      stub._set_delegate(delegate);
-      return stub;
-    }
-  }
-
-}
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java b/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
deleted file mode 100644
index 0cf6439d49..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
+++ /dev/null
@@ -1,57 +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 calculator.idl;
-
-/**
-* calculator/idl/CalculatorCORBAServiceHolder.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from CalculatorCORBA.idl
-* ¶roda, 15 pa¼dziernik 2008 15:59:26 CEST
-*/
-
-public final class CalculatorCORBAServiceHolder implements org.omg.CORBA.portable.Streamable
-{
-  public calculator.idl.CalculatorCORBAService value = null;
-
-  public CalculatorCORBAServiceHolder ()
-  {
-  }
-
-  public CalculatorCORBAServiceHolder (calculator.idl.CalculatorCORBAService initialValue)
-  {
-    value = initialValue;
-  }
-
-  public void _read (org.omg.CORBA.portable.InputStream i)
-  {
-    value = calculator.idl.CalculatorCORBAServiceHelper.read (i);
-  }
-
-  public void _write (org.omg.CORBA.portable.OutputStream o)
-  {
-    calculator.idl.CalculatorCORBAServiceHelper.write (o, value);
-  }
-
-  public org.omg.CORBA.TypeCode _type ()
-  {
-    return calculator.idl.CalculatorCORBAServiceHelper.type ();
-  }
-
-}
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java b/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
deleted file mode 100644
index 3e2956d469..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.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 calculator.idl;
-
-
-/**
-* calculator/idl/CalculatorCORBAServiceOperations.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from CalculatorCORBA.idl
-* ¶roda, 15 pa¼dziernik 2008 15:59:26 CEST
-*/
-
-public interface CalculatorCORBAServiceOperations 
-{
-  double add (double arg1, double arg2);
-  double subtract (double arg1, double arg2);
-  double multiply (double arg1, double arg2);
-  double divide (double arg1, double arg2);
-} // interface CalculatorCORBAServiceOperations
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java b/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
deleted file mode 100644
index ad193ee121..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
+++ /dev/null
@@ -1,143 +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 calculator.idl;
-
-
-/**
-* calculator/idl/_CalculatorCORBAServiceStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from CalculatorCORBA.idl
-* ¶roda, 15 pa¼dziernik 2008 15:59:26 CEST
-*/
-
-public class _CalculatorCORBAServiceStub extends org.omg.CORBA.portable.ObjectImpl implements calculator.idl.CalculatorCORBAService
-{
-
-  public double add (double arg1, double arg2)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("add", true);
-                $out.write_double (arg1);
-                $out.write_double (arg2);
-                $in = _invoke ($out);
-                double $result = $in.read_double ();
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return add (arg1, arg2        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // add
-
-  public double subtract (double arg1, double arg2)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("subtract", true);
-                $out.write_double (arg1);
-                $out.write_double (arg2);
-                $in = _invoke ($out);
-                double $result = $in.read_double ();
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return subtract (arg1, arg2        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // subtract
-
-  public double multiply (double arg1, double arg2)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("multiply", true);
-                $out.write_double (arg1);
-                $out.write_double (arg2);
-                $in = _invoke ($out);
-                double $result = $in.read_double ();
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return multiply (arg1, arg2        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // multiply
-
-  public double divide (double arg1, double arg2)
-  {
-            org.omg.CORBA.portable.InputStream $in = null;
-            try {
-                org.omg.CORBA.portable.OutputStream $out = _request ("divide", true);
-                $out.write_double (arg1);
-                $out.write_double (arg2);
-                $in = _invoke ($out);
-                double $result = $in.read_double ();
-                return $result;
-            } catch (org.omg.CORBA.portable.ApplicationException $ex) {
-                $in = $ex.getInputStream ();
-                String _id = $ex.getId ();
-                throw new org.omg.CORBA.MARSHAL (_id);
-            } catch (org.omg.CORBA.portable.RemarshalException $rm) {
-                return divide (arg1, arg2        );
-            } finally {
-                _releaseReply ($in);
-            }
-  } // divide
-
-  // Type-specific CORBA::Object operations
-  private static String[] __ids = {
-    "IDL:calculator/idl/CalculatorCORBAService:1.0"};
-
-  public String[] _ids ()
-  {
-    return (String[])__ids.clone ();
-  }
-
-  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
-  {
-     String str = s.readUTF ();
-     String[] args = null;
-     java.util.Properties props = null;
-     org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
-     org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
-     _set_delegate (delegate);
-  }
-
-  private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
-  {
-     String[] args = null;
-     java.util.Properties props = null;
-     String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
-     s.writeUTF (str);
-  }
-} // class _CalculatorCORBAServiceStub
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl b/java/sca-contrib/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
deleted file mode 100644
index 5848bbaa2c..0000000000
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
+++ /dev/null
@@ -1,33 +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.    
- */
-
-/*
- * Compile by: idlj -fclient -oldImplBase CalculatorCORBA.idl 
- */
- 
-module calculator {
-	module idl {
-		interface CalculatorCORBAService {
-			double add(in double arg1, in double arg2);
-			double subtract(in double arg1, in double arg2);
-			double multiply(in double arg1, in double arg2);
-			double divide(in double arg1, in double arg2);		
-		};
-	};
-};
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-distributed/README b/java/sca-contrib/samples/calculator-distributed/README
deleted file mode 100644
index 51f4b07e81..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/README
+++ /dev/null
@@ -1,438 +0,0 @@
-Calculator Distributed Sample

-=============================

-This sample implements a simple calculator using SCA components.  It uses 

-exactly the same calculator application classes as the calculator sample but 

-runs the application distributed across three nodes.

-

-A node in this sample means an instance of the Tuscany SCA java runtime running

-in a Java virtual machine. 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run it to see what happens open four command prompts and 

-navigate to this sample directory in each one. There is one command to be run 

-in each command prompt:

-

-ant runDomain

-ant runNodeB

-ant runNodeC

-ant runNodeA

-

-Please run the commands in this order. 

-

-OR if you don't have ant, on Windows use

-

-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.LaunchDomain

-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.LaunchCalculatorNodeB

-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.LaunchCalculatorNodeC

-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.LaunchCalculatorNodeA

-

-and on *nix do

-

-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.LaunchDomain

-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.LaunchCalculatorNodeB

-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.LaunchCalculatorNodeC

-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.LaunchCalculatorNodeA

-

-

-The processes started on each of these command prompts can be ended by pressing 

-the <Enter> key.

-

-

-Sample Overview

----------------

-The sample provides a single calculator service with a default SCA (java) 

-binding. NodeA exercises this interface by calling add, subtract, multiply and 

-divide operations. 

-

-In the case of add and subtract the runtime recognises that

-it can't find these services locally and, using the remote (web services) 

-version of the default SCA binding, contacts the add service running in NodeB 

-and the subtract service running in NodeC. 

-

-On the command prompt where you started NodeA, you see the output of invoking the 

-calculator functions distributed over NodeB and and NodeC.  On the command prompts 

-where you have started NodeB and NodeC, you see log messages that indicate that

-the add and subtract services where called on these nodes respectively.

-

-The sample demonstrates that the calculator application can be distributed

-across multiple nodes with no change to the application or to the SCA description

-files. 

-

-The domain node makes available a web application through which the contributions and 

-composites used in this sample can be navigated. One you have run "ant runDomain" you can 

-point you browser at:

-

-http://localhost:9990/ui/workspace/

-

-The contents of the sample are as follows:

-

-calculator/

-  src/

-    main/

-      java/

-        calculator/

-          CalculatorService.java  - the first component, calls +-/* as 

-                                    appropriate

-          AddService.java         - adds two numbers

-          AddServiceImpl.java

-          SubtractService.java    - subtracts one number from another

-          SubtractServiceImpl.java

-          MultiplyService.java    - multiplies two numbers

-          MultiplyServiceImpl.java

-          DivideService.java      - divides one number by another

-          DivideServiceImpl.java

-        node/

-          LaunchCalculatorNodeA.java - runs an sca node configured with the 

-                                    composite describing the main calculator

-                                    application. If you look inside this class

-                                    you will see that the node is configured

-                                    using a URL of the form:

-                                    

-                                    http://localhost:9990/node-config/NodeA

-                                    

-                                    This retrieves the information required

-                                    to configure NodeA from the domain.

-

-                                    Once the node has been started this launcher

-                                    then finds the calculator service and 

-                                    calls the various methods.

-                                    

-          LaunchCalculatorNodeB&C.java -  These launchers start nodes B and C

-                                    which runs the add and subtract services.

-                                    

-                                    Unlike NodeA though these launchers just

-                                    wait once the node has been started. They

-                                    will service incomming web service requests

-                                    as they arrive.  

-

-           LaunchDomain.java      - the node that provides the domain 

-                                    configuration to the distributed

-                                    nodes

-      resources/

-        cloud                     - The SCA composite files that describe

-                                    the configuration of each node				

-        nodeA                     - the SCA assembly for nodeA's part of the 

-                                    calculator application

-        nodeB                     - the SCA assembly for nodeB's part of the 

-                                    calculator application

-        nodeC                     - the SCA assembly for nodeC's part of the 

-                                    calculator application

-    test/

-      java/

-        calculator/

-          CalculatorDistributedTestCase.java - JUnit test case which runs all 

-                                    of the separate nodes along with the domain

-                                    in a single VM for test purposes

-  calculator-distributed.png      - a pictorial representation of the sample 

-                                    .composite files

-  build.xml                       - the Ant build file

-  pom.xml                         - the Maven build file        

-

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd calculator-distributed

-ant compile

-ant runDomain

-ant runNodeB

-ant runNodeC

-ant runNodeA

-

-You should see the following output from the four separate command prompt:

-

-runDomain:

-ted>ant runDomain

-Buildfile: build.xml

-

-runDomain:

-     [java] 26-Mar-2008 12:55:12 org.apache.tuscany.sca.node.launcher.DomainMana

-gerLauncher main

-     [java] INFO: Apache Tuscany SCA Domain Manager starting...

-     [java] 26-Mar-2008 12:55:13 org.apache.tuscany.sca.node.launcher.NodeLaunch

-erUtil collectJARFiles

-     [java] INFO: Runtime classpath: 147 JARs from C:\simon\tuscany\sca-java-1.2

-\distribution\target\apache-tuscany-sca-1.2-incubating-SNAPSHOT.dir\tuscany-sca-

-1.2-incubating-SNAPSHOT\lib

-     [java] 26-Mar-2008 12:55:13 org.apache.tuscany.sca.node.launcher.NodeLaunch

-erUtil collectJARFiles

-     [java] INFO: Runtime classpath: 89 JARs from C:\simon\tuscany\sca-java-1.2\

-distribution\target\apache-tuscany-sca-1.2-incubating-SNAPSHOT.dir\tuscany-sca-1

-.2-incubating-SNAPSHOT\modules

-     [java] 26-Mar-2008 12:55:19 org.apache.catalina.core.StandardEngine start

-     [java] INFO: Starting Servlet Engine: Apache Tomcat/6.0.14

-     [java] 26-Mar-2008 12:55:20 org.apache.catalina.startup.ContextConfig defau

-ltWebConfig

-     [java] INFO: No default web.xml

-     [java] 26-Mar-2008 12:55:20 org.apache.catalina.startup.DigesterFactory reg

-ister

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.

-xsd

-     [java] 26-Mar-2008 12:55:20 org.apache.catalina.startup.DigesterFactory reg

-ister

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_1.

-xsd

-     [java] 26-Mar-2008 12:55:20 org.apache.catalina.startup.DigesterFactory reg

-ister

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt

-aglibrary_1_1.dtd

-     [java] 26-Mar-2008 12:55:20 org.apache.catalina.startup.DigesterFactory reg

-ister

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt

-aglibrary_1_2.dtd

-     [java] 26-Mar-2008 12:55:20 org.apache.catalina.startup.DigesterFactory reg

-ister

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt

-aglibrary_2_0.xsd

-     [java] 26-Mar-2008 12:55:20 org.apache.catalina.startup.DigesterFactory reg

-ister

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt

-aglibrary_2_1.xsd

-     [java] 26-Mar-2008 12:55:20 org.apache.catalina.startup.DigesterFactory reg

-ister

-     [java] WARNING: Could not get url for /javax/servlet/resources/j2ee_web_ser

-vices_1_1.xsd

-     [java] 26-Mar-2008 12:55:20 org.apache.coyote.http11.Http11Protocol init

-     [java] INFO: Initializing Coyote HTTP/1.1 on http-9990

-     [java] 26-Mar-2008 12:55:20 org.apache.coyote.http11.Http11Protocol start

-     [java] INFO: Starting Coyote HTTP/1.1 on http-9990

-     [java] 26-Mar-2008 12:55:20 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/ui/home/*

-     [java] 26-Mar-2008 12:55:20 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/ui/workspace/*

-     [java] 26-Mar-2008 12:55:20 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/ui/files/*

-     [java] 26-Mar-2008 12:55:20 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/ui/composite/*

-     [java] 26-Mar-2008 12:55:20 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/ui/cloud/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/workspace/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/contribution/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/feed/files/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/files/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/composite/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/composite-source/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/deployable/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/composite-resolved/

-*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/cloud/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/cloud-source/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/composite-config/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/node-config/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/quickstart/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/processes/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/node/processes/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.http.tomcat.TomcatServer

- addServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:9990/ping/*

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.node.launcher.DomainMana

-gerLauncher main

-     [java] INFO: SCA Domain Manager started.

-     [java] 26-Mar-2008 12:55:21 org.apache.tuscany.sca.node.launcher.DomainMana

-gerLauncher main

-     [java] INFO: Press enter to shutdown.

-

-

-runNodeB:

-     [java] 26-Mar-2008 12:55:42 org.apache.tuscany.sca.node.launcher.NodeLaunch

-er main

-     [java] INFO: Apache Tuscany SCA Node starting...

-     [java] 26-Mar-2008 12:55:42 org.apache.tuscany.sca.node.launcher.NodeLaunch

-er main

-     [java] INFO: SCA Node configuration: http://localhost:9990/node-config/NodeB

-

-     [java] 26-Mar-2008 12:55:42 org.apache.tuscany.sca.node.launcher.NodeLaunch

-erUtil collectJARFiles

-     [java] INFO: Runtime classpath: 147 JARs from C:\simon\tuscany\sca-java-1.2

-\distribution\target\apache-tuscany-sca-1.2-incubating-SNAPSHOT.dir\tuscany-sca-

-1.2-incubating-SNAPSHOT\lib

-     [java] 26-Mar-2008 12:55:42 org.apache.tuscany.sca.node.launcher.NodeLaunch

-erUtil collectJARFiles

-     [java] INFO: Runtime classpath: 89 JARs from C:\simon\tuscany\sca-java-1.2\

-distribution\target\apache-tuscany-sca-1.2-incubating-SNAPSHOT.dir\tuscany-sca-1

-.2-incubating-SNAPSHOT\modules

-     [java] 26-Mar-2008 12:55:42 org.apache.tuscany.sca.node.impl.NodeImpl <init

->

-     [java] INFO: Creating node: http://localhost:9990/node-config/NodeB

-     [java] 26-Mar-2008 12:55:45 org.apache.tuscany.sca.node.impl.NodeImpl confi

-gureNode

-     [java] INFO: Loading contribution: file:/C:/simon/tuscany/sca-java-1.2/dist

-ribution/target/apache-tuscany-sca-1.2-incubating-SNAPSHOT.dir/tuscany-sca-1.2-i

-ncubating-SNAPSHOT/samples/calculator-distributed/./src/main/resources/nodeB/

-     [java] 26-Mar-2008 12:55:46 org.apache.tuscany.sca.node.impl.NodeImpl confi

-gureNode

-     [java] INFO: Loading composite: http://localhost:9990/composite-resolved/co

-mposite:nodeB;http://sample;CalculatorB

-     [java] 26-Mar-2008 12:55:47 org.apache.tuscany.sca.node.impl.NodeImpl start

-

-     [java] INFO: Starting node: http://localhost:9990/node-config/NodeB

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] 26-Mar-2008 12:55:53 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:8200/AddServiceComponent

-B

-     [java] 26-Mar-2008 12:55:53 org.apache.tuscany.sca.node.launcher.NodeLaunch

-er main

-     [java] INFO: SCA Node started.

-     [java] 26-Mar-2008 12:55:53 org.apache.tuscany.sca.node.launcher.NodeLaunch

-er main

-     [java] INFO: Press enter to shutdown.

-     [java] AddService - add 3.0 and 2.0

-     

-runNodeC:

-     [java] 26-Mar-2008 12:56:01 org.apache.tuscany.sca.node.launcher.NodeLaunch

-er main

-     [java] INFO: Apache Tuscany SCA Node starting...

-     [java] 26-Mar-2008 12:56:01 org.apache.tuscany.sca.node.launcher.NodeLaunch

-er main

-     [java] INFO: SCA Node configuration: http://localhost:9990/node-config/NodeC

-

-     [java] 26-Mar-2008 12:56:01 org.apache.tuscany.sca.node.launcher.NodeLaunch

-erUtil collectJARFiles

-     [java] INFO: Runtime classpath: 147 JARs from C:\simon\tuscany\sca-java-1.2

-\distribution\target\apache-tuscany-sca-1.2-incubating-SNAPSHOT.dir\tuscany-sca-

-1.2-incubating-SNAPSHOT\lib

-     [java] 26-Mar-2008 12:56:01 org.apache.tuscany.sca.node.launcher.NodeLaunch

-erUtil collectJARFiles

-     [java] INFO: Runtime classpath: 89 JARs from C:\simon\tuscany\sca-java-1.2\

-distribution\target\apache-tuscany-sca-1.2-incubating-SNAPSHOT.dir\tuscany-sca-1

-.2-incubating-SNAPSHOT\modules

-     [java] 26-Mar-2008 12:56:01 org.apache.tuscany.sca.node.impl.NodeImpl <init

->

-     [java] INFO: Creating node: http://localhost:9990/node-config/NodeC

-     [java] 26-Mar-2008 12:56:03 org.apache.tuscany.sca.node.impl.NodeImpl confi

-gureNode

-     [java] INFO: Loading contribution: file:/C:/simon/tuscany/sca-java-1.2/dist

-ribution/target/apache-tuscany-sca-1.2-incubating-SNAPSHOT.dir/tuscany-sca-1.2-i

-ncubating-SNAPSHOT/samples/calculator-distributed/./src/main/resources/nodeC/

-     [java] 26-Mar-2008 12:56:04 org.apache.tuscany.sca.node.impl.NodeImpl confi

-gureNode

-     [java] INFO: Loading composite: http://localhost:9990/composite-resolved/co

-mposite:nodeC;http://sample;CalculatorC

-     [java] 26-Mar-2008 12:56:04 org.apache.tuscany.sca.node.impl.NodeImpl start

-

-     [java] INFO: Starting node: http://localhost:9990/node-config/NodeC

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] 26-Mar-2008 12:56:10 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:8300/SubtractServiceComp

-onentC

-     [java] 26-Mar-2008 12:56:10 org.apache.tuscany.sca.node.launcher.NodeLaunch

-er main

-     [java] INFO: SCA Node started.

-     [java] 26-Mar-2008 12:56:10 org.apache.tuscany.sca.node.launcher.NodeLaunch

-er main

-     [java] INFO: Press enter to shutdown.

-     [java] SubtractService - subtract 3.0 and 2.0

-     

-runNodeA:

-     [java] 26-Mar-2008 12:56:10 org.apache.tuscany.sca.node.impl.NodeImpl <init

->

-     [java] INFO: Creating node: http://localhost:9990/node-config/NodeA

-     [java] 26-Mar-2008 12:56:12 org.apache.tuscany.sca.node.impl.NodeImpl confi

-gureNode

-     [java] INFO: Loading contribution: file:/C:/simon/tuscany/sca-java-1.2/dist

-ribution/target/apache-tuscany-sca-1.2-incubating-SNAPSHOT.dir/tuscany-sca-1.2-i

-ncubating-SNAPSHOT/samples/calculator-distributed/./src/main/resources/nodeA/

-     [java] 26-Mar-2008 12:56:13 org.apache.tuscany.sca.node.impl.NodeImpl confi

-gureNode

-     [java] INFO: Loading composite: http://localhost:9990/composite-resolved/co

-mposite:nodeA;http://sample;CalculatorA

-     [java] 26-Mar-2008 12:56:14 org.apache.tuscany.sca.assembly.builder.impl.Co

-mpositeBuilderImpl$1 problem

-     [java] WARNING: Component reference target not found, it might be a remote

-service: SubtractServiceComponentC

-     [java] 26-Mar-2008 12:56:14 org.apache.tuscany.sca.assembly.builder.impl.Co

-mpositeBuilderImpl$1 problem

-     [java] WARNING: Component reference target not found, it might be a remote

-service: AddServiceComponentB

-     [java] 26-Mar-2008 12:56:14 org.apache.tuscany.sca.node.impl.NodeImpl start

-

-     [java] INFO: Starting node: http://localhost:9990/node-config/NodeA

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] CalculatorService - add 3.0 and 2.0

-     [java] 3 + 2=5.0

-     [java] CalculatorService - subtract 3.0 and 2.0

-     [java] 3 - 2=1.0

-     [java] CalculatorService - multiply 3.0 and 2.0

-     [java] 3 * 2=6.0

-     [java] CalculatorService - divide 3.0 and 2.0

-     [java] 3 / 2=1.5

-     [java] 26-Mar-2008 12:56:20 org.apache.tuscany.sca.node.impl.NodeImpl stop

-     [java] INFO: Stopping node: http://localhost:9990/node-config/NodeA

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. When running from Maven the four nodes all run within 

-Java virtual machine. 

-

-cd calculator-distributed

-mvn

-

-You should see the following output at the end of the test phase.

-

-INFO: Starting node: http://localhost:9990/node-config/NodeA

-CalculatorService - add 3.0 and 2.0

-AddService - add 3.0 and 2.0

-CalculatorService - subtract 3.0 and 2.0

-SubtractService - subtract 3.0 and 2.0

-CalculatorService - multiply 3.0 and 2.0

-CalculatorService - divide 3.0 and 2.0

-26-Mar-2008 13:00:52 org.apache.tuscany.sca.node.impl.NodeImpl stop

-INFO: Stopping node: http://localhost:9990/node-config/NodeC

-26-Mar-2008 13:00:52 org.apache.tuscany.sca.node.impl.NodeImpl stop

-INFO: Stopping node: http://localhost:9990/node-config/NodeB

-26-Mar-2008 13:00:52 org.apache.tuscany.sca.node.impl.NodeImpl stop

-INFO: Stopping node: http://localhost:9990/node-config/NodeA

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.328 sec

-

-Results :

-

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

-

-This shows that the Junit test cases have run successfully. 

-

-

-

diff --git a/java/sca-contrib/samples/calculator-distributed/build.xml b/java/sca-contrib/samples/calculator-distributed/build.xml
deleted file mode 100644
index cccd22f3ae..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/build.xml
+++ /dev/null
@@ -1,111 +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.    
--->
-<project name="calculator" default="runDomain">
-	<property name="test.jar"   value="sample-calculator-distributed.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>
-	
-    <target name="runDomain">
-        <java classname="node.LaunchDomain"
-              fork="true">
-            <classpath>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
-            </classpath>    	        	
-        </java>
-    </target>
-	
-    <target name="runNodeA">
-        <java classname="node.LaunchCalculatorNodeA"
-              fork="true">
-            <classpath>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
-            </classpath>     	        	
-        </java>
-    </target>
-	
-    <target name="runNodeB">
-        <java classname="node.LaunchCalculatorNodeB"
-              fork="true">
-            <classpath>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
-            </classpath>      	
-        </java>
-    </target>	
-	
-    <target name="runNodeC">
-        <java classname="node.LaunchCalculatorNodeC"
-              fork="true">
-            <classpath>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
-            </classpath>      	
-        </java>
-    </target>	
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>	
-	
-	
-</project>
diff --git a/java/sca-contrib/samples/calculator-distributed/calculator-distributed.png b/java/sca-contrib/samples/calculator-distributed/calculator-distributed.png
deleted file mode 100644
index 7c0e175664..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/calculator-distributed.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/calculator-distributed/calculator-distributed.svg b/java/sca-contrib/samples/calculator-distributed/calculator-distributed.svg
deleted file mode 100644
index be5a4b8185..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/calculator-distributed.svg
+++ /dev/null
@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-distributed"
-   sodipodi:docname="calculator-distributed.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-distributed\calculator-distributed.png"
-   inkscape:export-xdpi="104.05"
-   inkscape:export-ydpi="104.05">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="555.3085"
-     inkscape:cy="454.41561"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1171"
-     inkscape:window-height="871"
-     inkscape:window-x="18"
-     inkscape:window-y="27" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1,0,0,1.144214,0,-27.53557)">
-      <rect
-         rx="15.307091"
-         ry="16.178549"
-         y="156.41957"
-         x="258.31146"
-         height="382.40201"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971927;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="translate(-3.571429,-41.82534)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">Calculator</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="191.57716"
-       x="339.91632"
-       y="262.1673"
-       rx="6.9961648"
-       ry="15.892869" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(79.61125,62.65764)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Calculator</flowPara><flowPara
-         id="flowPara1895">Service</flowPara><flowPara
-         id="flowPara1897">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
-       id="path1883" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1885"
-       transform="translate(-46.16225,128.7269)"
-       style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
-         id="flowRegion1887"><rect
-           id="rect1889"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
-         id="flowPara1891">Calculator</flowPara><flowPara
-         id="flowPara1893">Service</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1899"
-       width="115.66247"
-       height="70.148659"
-       x="594.75488"
-       y="167.73451"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1901"
-       transform="translate(334.4498,-31.77519)"><flowRegion
-         id="flowRegion1903"><rect
-           id="rect1905"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1907">Add</flowPara><flowPara
-         id="flowPara1909">Service</flowPara><flowPara
-         id="flowPara1911">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.31867,190.29606 L 606.65371,190.29606 L 612.71462,203.42804 L 605.64356,215.54988 L 573.31867,215.54988 L 580.89482,203.42804 L 573.31867,190.29606 z "
-       id="path1913" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1917"
-       width="115.66247"
-       height="70.148659"
-       x="594.06543"
-       y="280.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1919"
-       transform="translate(333.7604,81.08188)"><flowRegion
-         id="flowRegion1921"><rect
-           id="rect1923"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1925">Subtract</flowPara><flowPara
-         id="flowPara1927">Service</flowPara><flowPara
-         id="flowPara1929">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 572.62924,303.15313 L 605.96428,303.15313 L 612.02519,316.28511 L 604.95413,328.40695 L 572.62924,328.40695 L 580.20539,316.28511 L 572.62924,303.15313 z "
-       id="path1931" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1933"
-       width="115.66247"
-       height="70.148659"
-       x="594.77979"
-       y="391.87729"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1935"
-       transform="translate(334.4747,192.3676)"><flowRegion
-         id="flowRegion1937"><rect
-           id="rect1939"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1941">Multiply</flowPara><flowPara
-         id="flowPara1943">Service</flowPara><flowPara
-         id="flowPara1945">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.34352,414.43884 L 606.67856,414.43884 L 612.73947,427.57082 L 605.66841,439.69266 L 573.34352,439.69266 L 580.91967,427.57082 L 573.34352,414.43884 z "
-       id="path1947" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1949"
-       width="115.66247"
-       height="70.148659"
-       x="596.20831"
-       y="502.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1951"
-       transform="translate(335.9032,303.0819)"><flowRegion
-         id="flowRegion1953"><rect
-           id="rect1955"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1957">Divide</flowPara><flowPara
-         id="flowPara1959">Service</flowPara><flowPara
-         id="flowPara1961">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 574.77209,525.15313 L 608.10713,525.15313 L 614.16804,538.28511 L 607.09698,550.40695 L 574.77209,550.40695 L 582.34824,538.28511 L 574.77209,525.15313 z "
-       id="path1963" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1965"
-       transform="translate(161.0221,114.967)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1967"><rect
-           id="rect1969"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1973">add</flowPara><flowPara
-         id="flowPara1977">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
-       id="path1979" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1981"
-       transform="translate(160.6632,150.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1983"><rect
-           id="rect1985"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1987">subtract</flowPara><flowPara
-         id="flowPara1989">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
-       id="path1991" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1993"
-       transform="translate(161.3775,184.2583)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1995"><rect
-           id="rect1997"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1999">multiply</flowPara><flowPara
-         id="flowPara2001">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
-       id="path2003" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2005"
-       transform="translate(159.9489,215.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2007"><rect
-           id="rect2009"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara2011">divide</flowPara><flowPara
-         id="flowPara2013">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,335.52287 L 511.42857,335.52287 L 510.71429,202.66577 L 579.28571,202.66577"
-       id="path2015" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,369.80878 L 528.57143,369.80878 L 528.57143,315.52306 L 580,315.52306"
-       id="path2017" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 475.71429,435.52318 L 509.28571,435.52318 L 510,539.09463 L 582.14286,537.65613"
-       id="path2021" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 292.85714,355.52305 L 330,354.80877"
-       id="path2023" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.14286,404.09448 L 527.85714,404.09448 L 527.85714,427.66591 L 580,426.95163"
-       id="path1950" />
-    <rect
-       style="opacity:0.32777776;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1.99999964;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:5.99999869, 1.99999955;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2844"
-       width="328.57144"
-       height="117.85712"
-       x="532.85712"
-       y="140.8802"
-       rx="6.9961648"
-       ry="2.4683809" />
-    <rect
-       style="opacity:0.32777776;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1.99999976;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:5.99999958, 1.99999985;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2846"
-       width="328.57144"
-       height="98.571434"
-       x="533.57147"
-       y="268.73746"
-       rx="6.9961648"
-       ry="2.0644646" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2860"
-       transform="translate(614.3034,-75.00004)"><flowRegion
-         id="flowRegion2862"><rect
-           id="rect2864"
-           width="75"
-           height="32.857143"
-           x="173.57143"
-           y="231.95163" /></flowRegion><flowPara
-         id="flowPara2866">nodeB</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2868"
-       transform="translate(616.0952,47.8571)"><flowRegion
-         id="flowRegion2870"><rect
-           id="rect2872"
-           width="75"
-           height="32.857143"
-           x="173.57143"
-           y="231.95163" /></flowRegion><flowPara
-         id="flowPara2874">nodeC</flowPara></flowRoot>    <path
-       style="opacity:0.35555558;fill:#efacac;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,3;stroke-dashoffset:0"
-       d="M 172.73609,222.85576 L 495.9849,223.86592 L 498.00521,384.48017 L 863.68043,383.47002 L 862.67028,606.71373 L 173.74624,605.70358 L 172.73609,222.85576 z "
-       id="path1975"
-       sodipodi:nodetypes="ccccccc" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2852"
-       transform="translate(8,0)"><flowRegion
-         id="flowRegion2854"><rect
-           id="rect2856"
-           width="75"
-           height="32.857143"
-           x="173.57143"
-           y="231.95163" /></flowRegion><flowPara
-         id="flowPara2858">nodeA</flowPara></flowRoot>  </g>
-</svg>
diff --git a/java/sca-contrib/samples/calculator-distributed/cloud.composite b/java/sca-contrib/samples/calculator-distributed/cloud.composite
deleted file mode 100644
index 85e2f9c7f3..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/cloud.composite
+++ /dev/null
@@ -1,26 +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 name="cloud.composite"
-  targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-  xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
-  <include name="ns2:NodeA" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://sample/cloud"/>
-  <include name="ns2:NodeB" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://sample/cloud"/>
-  <include name="ns2:NodeC" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://sample/cloud"/>
-</composite>
diff --git a/java/sca-contrib/samples/calculator-distributed/domain.composite b/java/sca-contrib/samples/calculator-distributed/domain.composite
deleted file mode 100644
index 643e22d0cf..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/domain.composite
+++ /dev/null
@@ -1,26 +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 name="domain.composite"
-  targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-  xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
-  <include name="ns2:CalculatorA" uri="nodeA" xmlns:ns2="http://sample"/>
-  <include name="ns2:CalculatorB" uri="nodeB" xmlns:ns2="http://sample"/>
-  <include name="ns2:CalculatorC" uri="nodeC" xmlns:ns2="http://sample"/>  
-</composite>
diff --git a/java/sca-contrib/samples/calculator-distributed/pom.xml b/java/sca-contrib/samples/calculator-distributed/pom.xml
deleted file mode 100644
index e1e86d8896..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/pom.xml
+++ /dev/null
@@ -1,119 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-calculator-distributed</artifactId>
-    <name>Apache Tuscany SCA Distributed Calculator Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>                                        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>   
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-                
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/AddService.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/AddService.java
deleted file mode 100644
index dd7ecb827d..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/AddService.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 calculator;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The Add service interface
- */
-@Remotable
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9b7e254e5..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.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 calculator;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        System.out.println("AddService - add " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index c927500cc7..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,74 +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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService; 
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-       this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-    
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-    
-    public double add(double n1, double n2) {
-        System.out.println("CalculatorService - add " + n1 + " and " + n2);
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        System.out.println("CalculatorService - subtract " + n1 + " and " + n2);
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        System.out.println("CalculatorService - multiply " + n1 + " and " + n2);
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        System.out.println("CalculatorService - divide " + n1 + " and " + n2);
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index f03b9b94d4..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/SubtractService.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 calculator;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the multiply service
- */
-@Remotable
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1010207154..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.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 calculator;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        System.out.println("SubtractService - subtract " + n1 + " and " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
deleted file mode 100644
index 87021505b3..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
+++ /dev/null
@@ -1,67 +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 node;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-import calculator.CalculatorService;
-
-public class LaunchCalculatorNodeA {
-    public static void main(String[] args) throws Exception {
-        
-        SCANode node = null;
-        try {
-            
-            NodeLauncher nodeLauncher = NodeLauncher.newInstance();
-            node = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/NodeA");
-
-            node.start();
-            
-            // get a reference to the calculator component
-            SCAClient client = (SCAClient)node;
-            CalculatorService calculatorService = 
-                client.getService(CalculatorService.class, "CalculatorServiceComponentA");
-            
-            // Calculate
-            System.out.println("3 + 2=" + calculatorService.add(3, 2));
-            System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-            System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-            System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-            
-            if (args.length > 1){
-                for (int i=0; i < 1000; i++){
-                    // Calculate
-                    System.out.println("3 + 2=" + calculatorService.add(3, 2));
-                    System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-                    System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-                    System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-                }
-            } 
-            
-            node.stop();
-            
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }        
-    }
-}
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
deleted file mode 100644
index 50600eaedc..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
+++ /dev/null
@@ -1,28 +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 node;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchCalculatorNodeB {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/NodeB"});
-    }
-}
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
deleted file mode 100644
index 95d8934665..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
+++ /dev/null
@@ -1,28 +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 node;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchCalculatorNodeC {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/NodeC"});
-    }
-}
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchDomain.java b/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
deleted file mode 100644
index 8b4fe566a1..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
+++ /dev/null
@@ -1,33 +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 node;

-

-import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;

-

-/**

- * This server program that loads a composite to provide simple registry function.

- * This server can be replaced with any registry that is appropriate but the components

- * in each node that talk to the registry should be replaced also. 

- */

-public class LaunchDomain {

-    public static void main(String[] args) throws Exception {

-        DomainManagerLauncher.main(args);

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite b/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
deleted file mode 100644
index ed7fe55abc..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
+++ /dev/null
@@ -1,33 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://sample/cloud"
-		xmlns:s="http://sample"
-		name="NodeA">
-
-    <component name="NodeA">
-        <t:implementation.node uri="nodeA" composite="s:CalculatorA"/>
-        <service name="Node">
-            <binding.sca uri="http://localhost:8100"/>
-        </service>
-    </component>
-     
-</composite>
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite b/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
deleted file mode 100644
index 8f29cc17aa..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
+++ /dev/null
@@ -1,33 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://sample/cloud"
-		xmlns:s="http://sample"
-		name="NodeB">
-
-    <component name="NodeB">
-        <t:implementation.node uri="nodeB" composite="s:CalculatorB"/>
-        <service name="Node">
-            <binding.sca uri="http://localhost:8200"/>
-        </service>
-    </component>     
-
-</composite>
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite b/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
deleted file mode 100644
index 9ad132b0d4..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
+++ /dev/null
@@ -1,33 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://sample/cloud"
-		xmlns:s="http://sample"
-		name="NodeC">
-
-	<component name="NodeC">
-		<t:implementation.node uri="nodeC" composite="s:CalculatorC"/>
-		<service name="Node">
-			<binding.sca uri="http://localhost:8300"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
deleted file mode 100644
index 172676a3c7..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ /dev/null
@@ -1,41 +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://sample"

-           xmlns:sample="http://sample"

-           name="CalculatorA">

-

-    <component name="CalculatorServiceComponentA">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <reference name="addService" target="AddServiceComponentB" />     

-        <reference name="subtractService" target="SubtractServiceComponentC" />

-        <reference name="multiplyService" target="MultiplyServiceComponentA"/>     

-        <reference name="divideService" target="DivideServiceComponentA" />

-    </component>    

-

-    <component name="MultiplyServiceComponentA">

-        <implementation.java class="calculator.MultiplyServiceImpl" />

-    </component>   

-    

-    <component name="DivideServiceComponentA">

-        <implementation.java class="calculator.DivideServiceImpl" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index 1b1c0291e2..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:CalculatorA"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
deleted file mode 100644
index b770dbe8d4..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ /dev/null
@@ -1,29 +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://sample"

-           xmlns:sample="http://sample"

-           name="CalculatorB">

-

-    <component name="AddServiceComponentB">

-        <implementation.java class="calculator.AddServiceImpl" />

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index 6c0ffe4ac0..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:CalculatorB"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
deleted file mode 100644
index 66caf0d17b..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
+++ /dev/null
@@ -1,29 +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://sample"

-           xmlns:sample="http://sample"

-           name="CalculatorC">

-

-    <component name="SubtractServiceComponentC">

-        <implementation.java class="calculator.SubtractServiceImpl" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
deleted file mode 100644
index 8c311553c3..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:CalculatorC"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/java/sca-contrib/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
deleted file mode 100644
index 2a6f3af002..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
+++ /dev/null
@@ -1,92 +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 calculator;

-

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

-import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-/**

- * Runs a distributed domain in a single VM by using and in memory 

- * implementation of the distributed domain

- */

-public class CalculatorDistributedTestCase {

-

-    private static SCANode manager;

-    private static SCANode nodeA;

-    private static SCANode nodeB;

-    private static SCANode nodeC;

-

-    private static CalculatorService calculatorService;

-    

-

-    @BeforeClass

-    public static void init() throws Exception {

-             

-        try {

-            System.out.println("Setting up domain");

-

-            DomainManagerLauncher managerLauncher = DomainManagerLauncher.newInstance();

-            manager = managerLauncher.createDomainManager();

-            manager.start();

-            

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            nodeC  = nodeFactory.createSCANodeFromURL("http://localhost:9990/node-config/NodeC");

-            nodeB  = nodeFactory.createSCANodeFromURL("http://localhost:9990/node-config/NodeB");

-            nodeA  = nodeFactory.createSCANodeFromURL("http://localhost:9990/node-config/NodeA");

-

-            nodeC.start();

-            nodeB.start();

-            nodeA.start();

-            

-            SCAClient client = (SCAClient)nodeA;

-            calculatorService = 

-                client.getService(CalculatorService.class, "CalculatorServiceComponentA");

-

-        } catch(Exception ex){

-            System.err.println(ex.toString());

-        }  

-        

-   }

-

-    @AfterClass

-    public static void destroy() throws Exception {

-        nodeC.stop();

-        nodeB.stop();

-        nodeA.stop();

-        manager.stop();

-    }    

-

-    @Test

-    public void testCalculator() throws Exception {       

-        

-        // Calculate

-        Assert.assertEquals(calculatorService.add(3, 2), 5.0);

-        Assert.assertEquals(calculatorService.subtract(3, 2), 1.0);

-        Assert.assertEquals(calculatorService.multiply(3, 2), 6.0);

-        Assert.assertEquals(calculatorService.divide(3, 2), 1.5);

-    }

-}

diff --git a/java/sca-contrib/samples/calculator-distributed/workspace.xml b/java/sca-contrib/samples/calculator-distributed/workspace.xml
deleted file mode 100644
index 7d6d3dbdbd..0000000000
--- a/java/sca-contrib/samples/calculator-distributed/workspace.xml
+++ /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.    
--->
-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
-  <contribution location="file:./src/main/resources/nodeA"  uri="nodeA"/>
-  <contribution location="file:./src/main/resources/nodeB"  uri="nodeB"/>
-  <contribution location="file:./src/main/resources/nodeC"  uri="nodeC"/>  
-  <contribution location="file:./src/main/resources/cloud" uri="http://tuscany.apache.org/cloud"/>  
-</workspace>
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/README b/java/sca-contrib/samples/calculator-implementation-policies/README
deleted file mode 100644
index bd66eee1c9..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/README
+++ /dev/null
@@ -1,266 +0,0 @@
-Calculator Implementation Policies Sample

-=========================================

-This sample builds over simple calculator sample to demonstrate how Implementation Policies can 

-be use in Tuscany SCA Java.

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run the sample  to see what happens open a command prompt, navigate

-to this sample directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator.jar calculator.CalculatorClient

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient

-

-

-Sample Overview

----------------

-The sample provides the calculator service with a default SCA (java) binding.  The 'logging' policy

-which is handled by the Tuscany SCA java policy-logging module is used in this calculator 

-composite to specify the need for 'logging'.  The MultiplyService Component specifies for 'jassAuthentication'

-which is one way of implemention login authentication, using the Java Authentication and Authorization Service.

-

-The logging intent and policyset that is to be used by this calculator application must be 

-defined in the definitions.xml file.  Here we use the policyset structure already defined in

-Tuscany for logging under the policy-logging and hence there is no need to specify the policyset processors 

-and policy handler classes as part of this application.  

-

-Similarly the jaasAuthentication intent and policyset also is defined in the definitions.xml file 

-of this sample.  This sample uses the calculator.security.JaasLoginModule class for handling the 

-authentication functions.  Right now there is a simply matching of userid and passwords that happens in this

-class.  Applications could implement their own sophisticated authentication mechanisms.  For more information

-on how to do this please look up Java Authentication and Authorization Service documentation.  The sample

-also use the calculator.security.CalculatorCallbackHandler to fetch the userid and password to be use for the

-login authentication.  This handler presently uses hardcoded userids and passwords.  Applications could

-typically use this handler to prompt for userid and passwords.

-

-There are two components that provide the calculator service namely 'CalculatorServiceComponent'

-and 'AnotherCalculatorServiceComponent'.  The logging intent is specified for the 'subtract' and 'divide' 

-operations of the 'CalculatorServiceCompnent' implementation, and on the entire implementation 

-(i.e. all operations) for the AddServiceComponent and AnotherCalculatorServiceComponent.

-

-The CalculatorClient first exercises the CalculatorServiceComponent calling add, 

-subtract, multiply and divide operations.  This results in logging messages appearing on the 

-console for 'add', 'subtract' and 'divide' operations.  The CalculatorClient then exercises the 

-AnotherCalculatorServiceComponent calling all the service methods.  This will result in logging messages

-printed on the console for all the operations.  For the 'add' operation there will be two sets of messages

-printed - one that has resulted from specifying the 'logging' intent on the implementation element of the

-'AnotherCalculatorServiceComponent' and another from specifying the 'logging' intent on the 

-'AddServiceComponent'

-

-The jaasAuthentication intent is specified for the 'MultiplyServiceComponent'.  So everytime this component

-is invoke an authentication is attempted and only if it succeeds, is the multiply function is invoked.  The

-console prints messages that denote if the authentication has succeeded or failed.

-

-Thus this sample demonstrates how intents could be applied to either implementations as a whole or to some

-selective operations on an implementation.

-

-

-calculator/

-  src/

-    main/

-      java/

-        calculator/

-          CalculatorService.java                - the first component, calls +-/* as 

-                                                appropriate

-          CalculatorServiceImpl.java

-          AddService.java                       - adds two numbers

-          AddServiceImpl.java

-          SubtractService.java                  - subtracts one number from another

-          SubtractServiceImpl.java

-          MultiplyService.java                  - multiplies two numbers

-          MultiplyServiceImpl.java

-          DivideService.java                    - divides one number by another

-          DivideServiceImpl.java

-          CalculatorClient.java                 - starts the SCA Runtime and 

-                                                deploys the Calculator.composite. 

-                                                It then calls the deployed Calculator 

-                                                Components services

-       calculator/security		

-       	  JaasLoginModule.java					JaasLoginModule implementation for this sample

-       	  CalculatorCallbackHandler.java		JAAS callbackhandler for fetching userid and password

-			

-		                                                

-      resources/

-        Calculator.composite                    - the SCA assembly for this sample

-        definitions.xml                         - sca definitions file that defines the 'logging' intent 

-                                                and policyset

-                                                used by this application

-        CalculatorLogMessages.properties        - A resource bundle contain the log messages to be 

-                                                used.

-        CalculatorJaas.config					- JAAS Login Configuration file

-        

-    test/

-      java/

-        calculator/

-          CalculatorTestCase.java - JUnit test case 

-  calculator.png                  - a pictorial representation of the sample 

-                                    .composite file

-  build.xml                       - the Ant build file

-  pom.xml                         - the Maven build file        

-

-

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd calculator-implementation-policies

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-        [java] Calling CalculatorServiceComponent configured with 'logging' policy for subtract and divide operations...

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Invoking operation - add

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Returned from operation - add

-        [java] 3 + 2=5.0

-        [java] 3 - 2=1.0

-        [java] 3 * 2=6.0

-        [java] 3 / 2=1.5

-        [java] Calling CalculatorServiceComponent configured with 'logging' for all operations in the implementation...

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Invoking operation - subtract

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Returned from operation - subtract

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Invoking operation - divide

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Returned from operation - divide

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] 3 + 2=5.0

-        [java] 3 - 2=1.0

-        [java] 3 * 2=6.0

-        [java] INFO:  Invoking operation - add

-        [java] 3 / 2=1.5

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Invoking operation - add

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Returned from operation - add

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Returned from operation - add

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Invoking operation - subtract

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Returned from operation - subtract

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Invoking operation - multiply

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Returned from operation - multiply

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Invoking operation - divide

-        [java] Nov 23, 2007 1:06:10 PM

-        [java] INFO:  Returned from operation - divide

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd calculator

-mvn

-

-You should see the following output from the test phase. Notice the log messages.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running calculator.CalculatorTestCase

-Dec 18, 2007 12:05:06 PM org.apache.tuscany.sca.contribution.processor.ValidatingXMLStreamReader$1 error

-WARNING: XMLSchema validation problem in: file:/F:/LatestTrunk/sca/samples/calculator-implementation-policies/target/

-classes/Calculator.composite, line: 28, column: 4

-cvc-complex-type.2.4.a: Invalid content was found starting with element 'operation'. One of '{WC[##other:"http://www.

-osoa.org/xmlns/sca/1.0"]}' is expected.

-Dec 18, 2007 12:05:06 PM

-INFO:  Invoking operation - add

-Dec 18, 2007 12:05:06 PM

-FINER: Inovoking operation add with arguments 3.0, 2.0,

-Dec 18, 2007 12:05:06 PM

-INFO:  Returned from operation - add

-Dec 18, 2007 12:05:06 PM

-FINER: Returning from operation add with return value 5

-Dec 18, 2007 12:05:06 PM

-INFO:  Invoking operation - subtract

-Dec 18, 2007 12:05:06 PM

-FINER: Inovoking operation subtract with arguments 3.0, 2.0,

-Dec 18, 2007 12:05:06 PM

-INFO:  Returned from operation - subtract

-Dec 18, 2007 12:05:06 PM

-FINER: Returning from operation subtract with return value 1

-Successfully AUTHENTICATED!!

-Dec 18, 2007 12:05:06 PM

-INFO:  Invoking operation - divide

-Dec 18, 2007 12:05:06 PM

-FINER: Inovoking operation divide with arguments 3.0, 2.0,

-Dec 18, 2007 12:05:06 PM

-INFO:  Returned from operation - divide

-Dec 18, 2007 12:05:06 PM

-FINER: Returning from operation divide with return value 1.5

-Dec 18, 2007 12:05:06 PM org.apache.tuscany.sca.contribution.processor.ValidatingXMLStreamReader$1 error

-WARNING: XMLSchema validation problem in: file:/F:/LatestTrunk/sca/samples/calculator-implementation-policies/target/

-classes/Calculator.composite, line: 28, column: 4

-cvc-complex-type.2.4.a: Invalid content was found starting with element 'operation'. One of '{WC[##other:"http://www.

-osoa.org/xmlns/sca/1.0"]}' is expected.

-Dec 18, 2007 12:05:06 PM

-INFO:  Invoking operation - add

-Dec 18, 2007 12:05:06 PM

-FINER: Inovoking operation add with arguments 3.0, 2.0,

-Dec 18, 2007 12:05:06 PM

-INFO:  Invoking operation - add

-Dec 18, 2007 12:05:06 PM

-FINER: Inovoking operation add with arguments 3.0, 2.0,

-Dec 18, 2007 12:05:06 PM

-INFO:  Returned from operation - add

-Dec 18, 2007 12:05:06 PM

-FINER: Returning from operation add with return value 5

-Dec 18, 2007 12:05:06 PM

-INFO:  Returned from operation - add

-Dec 18, 2007 12:05:06 PM

-FINER: Returning from operation add with return value 5

-Dec 18, 2007 12:05:06 PM

-INFO:  Invoking operation - subtract

-Dec 18, 2007 12:05:06 PM

-FINER: Inovoking operation subtract with arguments 3.0, 2.0,

-Dec 18, 2007 12:05:06 PM

-INFO:  Returned from operation - subtract

-Dec 18, 2007 12:05:06 PM

-FINER: Returning from operation subtract with return value 1

-Dec 18, 2007 12:05:06 PM

-INFO:  Invoking operation - multiply

-Dec 18, 2007 12:05:06 PM

-FINER: Inovoking operation multiply with arguments 3.0, 2.0,

-Successfully AUTHENTICATED!!

-Dec 18, 2007 12:05:06 PM

-INFO:  Returned from operation - multiply

-Dec 18, 2007 12:05:06 PM

-FINER: Returning from operation multiply with return value 6

-Dec 18, 2007 12:05:06 PM

-INFO:  Invoking operation - divide

-Dec 18, 2007 12:05:06 PM

-FINER: Inovoking operation divide with arguments 3.0, 2.0,

-Dec 18, 2007 12:05:06 PM

-INFO:  Returned from operation - divide

-Dec 18, 2007 12:05:06 PM

-FINER: Returning from operation divide with return value 1.5

-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.823 sec

-

-Results :

-

-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0

-

-Results :

-

-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0

-This shows that the Junit test cases have run successfully. 

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/build.xml b/java/sca-contrib/samples/calculator-implementation-policies/build.xml
deleted file mode 100644
index 7afa23a07f..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/build.xml
+++ /dev/null
@@ -1,72 +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.    

--->

-<project name="calculator" default="compile">

-    <property name="test.class" value="calculator.CalculatorClient" />

-	<property name="test.jar"   value="sample-calculator-impl-policies.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>    	

-    </target>	

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/calculator.png b/java/sca-contrib/samples/calculator-implementation-policies/calculator.png
deleted file mode 100644
index 995a57b1fd..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/calculator.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/calculator.svg b/java/sca-contrib/samples/calculator-implementation-policies/calculator.svg
deleted file mode 100644
index af34f07e04..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/calculator.svg
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

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

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.44"

-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator"

-   sodipodi:docname="calculator.svg"

-   version="1.0"

-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator\calculator.png"

-   inkscape:export-xdpi="52.84"

-   inkscape:export-ydpi="52.84">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="1.4"

-     inkscape:cx="471.80491"

-     inkscape:cy="378.84265"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="721"

-     inkscape:window-x="59"

-     inkscape:window-y="79" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997"

-       transform="matrix(1,0,0,1.144214,0,-27.53557)">

-      <rect

-         rx="15.307091"

-         ry="12.692303"

-         y="192.00233"

-         x="258.31146"

-         height="299.99988"

-         width="495.71429"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">Calculator</flowPara></flowRoot>    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="191.57716"

-       x="339.91632"

-       y="262.1673"

-       rx="6.9961648"

-       ry="15.892869" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(79.61125,62.65764)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">Calculator</flowPara><flowPara

-         id="flowPara1895">Service</flowPara><flowPara

-         id="flowPara1897">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "

-       id="path3017" />

-    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "

-       id="path3019" />

-    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "

-       id="path1883" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1885"

-       transform="translate(-46.16225,128.7269)"

-       style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion

-         id="flowRegion1887"><rect

-           id="rect1889"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara

-         id="flowPara1891">Calculator</flowPara><flowPara

-         id="flowPara1893">Service</flowPara></flowRoot>    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1899"

-       width="115.66247"

-       height="70.148659"

-       x="594.75488"

-       y="209.73451"

-       rx="6.9961648"

-       ry="5.8193965" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1901"

-       transform="translate(334.4498,10.22481)"><flowRegion

-         id="flowRegion1903"><rect

-           id="rect1905"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1907">Add</flowPara><flowPara

-         id="flowPara1909">Service</flowPara><flowPara

-         id="flowPara1911">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "

-       id="path1913" />

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1917"

-       width="115.66247"

-       height="70.148659"

-       x="594.06543"

-       y="292.59158"

-       rx="6.9961648"

-       ry="5.8193965" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1919"

-       transform="translate(333.7604,93.08188)"><flowRegion

-         id="flowRegion1921"><rect

-           id="rect1923"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1925">Subtract</flowPara><flowPara

-         id="flowPara1927">Service</flowPara><flowPara

-         id="flowPara1929">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "

-       id="path1931" />

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1933"

-       width="115.66247"

-       height="70.148659"

-       x="594.77979"

-       y="371.87729"

-       rx="6.9961648"

-       ry="5.8193965" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1935"

-       transform="translate(334.4747,172.3676)"><flowRegion

-         id="flowRegion1937"><rect

-           id="rect1939"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1941">Multiply</flowPara><flowPara

-         id="flowPara1943">Service</flowPara><flowPara

-         id="flowPara1945">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "

-       id="path1947" />

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1949"

-       width="115.66247"

-       height="70.148659"

-       x="596.20831"

-       y="452.59158"

-       rx="6.9961648"

-       ry="5.8193965" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1951"

-       transform="translate(335.9032,253.0819)"><flowRegion

-         id="flowRegion1953"><rect

-           id="rect1955"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1957">Divide</flowPara><flowPara

-         id="flowPara1959">Service</flowPara><flowPara

-         id="flowPara1961">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "

-       id="path1963" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1965"

-       transform="translate(161.0221,114.967)"

-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion1967"><rect

-           id="rect1969"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara1973">add</flowPara><flowPara

-         id="flowPara1977">Service</flowPara></flowRoot>    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "

-       id="path1979" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1981"

-       transform="translate(160.6632,150.6868)"

-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion1983"><rect

-           id="rect1985"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara1987">subtract</flowPara><flowPara

-         id="flowPara1989">Service</flowPara></flowRoot>    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "

-       id="path1991" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1993"

-       transform="translate(161.3775,184.2583)"

-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion1995"><rect

-           id="rect1997"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara1999">multiply</flowPara><flowPara

-         id="flowPara2001">Service</flowPara></flowRoot>    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "

-       id="path2003" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2005"

-       transform="translate(159.9489,215.6868)"

-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion2007"><rect

-           id="rect2009"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara2011">divide</flowPara><flowPara

-         id="flowPara2013">Service</flowPara></flowRoot>    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"

-       id="path2015" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"

-       id="path2017" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"

-       id="path2019" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"

-       id="path2021" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 292.85714,355.52305 L 330,354.80877"

-       id="path2023" />

-  </g>

-</svg>

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/pom.xml b/java/sca-contrib/samples/calculator-implementation-policies/pom.xml
deleted file mode 100644
index 7bc0be2dca..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/pom.xml
+++ /dev/null
@@ -1,78 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-calculator-impl-policies</artifactId>

-    <name>Apache Tuscany SCA Calculator Sample using Implementation Policies</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-policy-logging</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-policy-security</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
deleted file mode 100644
index 5a1e7a638a..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The Add service interface

- */

-public interface AddService {

-

-    double add(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index caf4d358df..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-import java.util.logging.Level;

-import java.util.logging.Logger;

-

-/**

- * An implementation of the Add service

- */

-public class AddServiceImpl implements AddService {

-

-    public double add(double n1, double n2) {

-        Logger logger = Logger.getLogger("calculator");

-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);

-        return n1 + n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 2bce187049..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,66 +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 calculator;

-

-import javax.security.auth.login.Configuration;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * and locate and invoke a SCA component

- */

-public class CalculatorClient {

-    public static void main(String[] args) throws Exception {

-        try {

-            Configuration secConf = Configuration.getConfiguration();

-        } catch (java.lang.SecurityException e) {

-            System.setProperty("java.security.auth.login.config", CalculatorClient.class.getClassLoader()

-                .getResource("CalculatorJass.config").toString());

-        }

-

-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");

-        

-        CalculatorService calculatorService = 

-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");

-

-        // Calculate

-        System.out.println("Calling CalculatorServiceComponent configured with 'logging' " +

-                "policy for subtract and divide operations...");

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-        

-        calculatorService = 

-            scaDomain.getService(CalculatorService.class, "AnotherCalculatorServiceComponent");

-

-        // Calculate

-        System.out.println("Calling CalculatorServiceComponent configured with 'logging' " +

-                "for all operations in the implementation...");

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-

-        scaDomain.close();

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ad87375529..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-

-/**

- * The Calculator service interface.

- */

-public interface CalculatorService {

-

-    double add(double n1, double n2);

-

-    double subtract(double n1, double n2);

-

-    double multiply(double n1, double n2);

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index d3fa7a8f41..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +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 calculator;

-

-import org.oasisopen.sca.annotation.Reference;

-

-

-/**

- * An implementation of the Calculator service.

- */

-public class CalculatorServiceImpl implements CalculatorService {

-

-    private AddService addService;

-    private SubtractService subtractService;

-    private MultiplyService multiplyService;

-    private DivideService divideService;

-

-    @Reference

-    public void setAddService(AddService addService) {

-        this.addService = addService;

-    }

-

-    @Reference

-    public void setSubtractService(SubtractService subtractService) {

-        this.subtractService = subtractService;

-    }

-

-    @Reference

-    public void setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-

-    @Reference

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-

-    public double add(double n1, double n2) {

-        return addService.add(n1, n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        return multiplyService.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        return divideService.divide(n1, n2);

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
deleted file mode 100644
index ef6a8b375b..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The divide service interface

- */

-public interface DivideService {

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index cd91935f08..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-import java.util.logging.Level;

-import java.util.logging.Logger;

-

-/**

- * An implementation of the Divide service.

- */

-public class DivideServiceImpl implements DivideService {

-

-    public double divide(double n1, double n2) {

-        Logger logger = Logger.getLogger("calculator");

-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);

-        return n1 / n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the multiply service

- */

-public interface MultiplyService {

-

-    double multiply(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c85357fcd8..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-import java.util.logging.Level;

-import java.util.logging.Logger;

-

-/**

- * An implementation of the Multiply service.

- */

-public class MultiplyServiceImpl implements MultiplyService {

-

-    public double multiply(double n1, double n2) {

-        Logger logger = Logger.getLogger("calculator");

-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);

-        return n1 * n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 56ee372fc4..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the multiply service

- */

-public interface SubtractService {

-

-    double subtract(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1b669084d9..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-import java.util.logging.Level;

-import java.util.logging.Logger;

-

-/**

- * An implementation of the subtract service.

- */

-public class SubtractServiceImpl implements SubtractService {

-

-    public double subtract(double n1, double n2) {

-        Logger logger = Logger.getLogger("calculator");

-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);

-        return n1 - n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
deleted file mode 100644
index b48fb90148..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ /dev/null
@@ -1,50 +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 calculator.security;

-

-import java.io.IOException;

-

-import javax.security.auth.callback.Callback;

-import javax.security.auth.callback.CallbackHandler;

-import javax.security.auth.callback.NameCallback;

-import javax.security.auth.callback.PasswordCallback;

-import javax.security.auth.callback.UnsupportedCallbackException;

-

-/**

- * @version $Rev$ $Date$

- */

-public class CalculatorCallbackHandler implements CallbackHandler {

-

-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {

-        for (int i = 0; i < callbacks.length; i++) {

-            if (callbacks[i] instanceof NameCallback) {

-                NameCallback nc = (NameCallback)callbacks[i];

-                nc.setName("CalculatorUser");

-            } else if (callbacks[i] instanceof PasswordCallback) {

-                PasswordCallback pc = (PasswordCallback)callbacks[i];

-                pc.setPassword("CalculatorUserPasswd".toCharArray());

-            } else {

-                throw new UnsupportedCallbackException

-                 (callbacks[i], "Unsupported Callback!");

-            }

-          }

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
deleted file mode 100644
index fe4097640b..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
+++ /dev/null
@@ -1,178 +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 calculator.security;

-

-import java.security.Principal;

-import java.util.Map;

-

-import javax.security.auth.Subject;

-import javax.security.auth.callback.Callback;

-import javax.security.auth.callback.CallbackHandler;

-import javax.security.auth.callback.NameCallback;

-import javax.security.auth.callback.PasswordCallback;

-import javax.security.auth.login.LoginException;

-import javax.security.auth.spi.LoginModule;

-

-/**

- * @version $Rev$ $Date$

- */

-public class JaasLoginModule implements LoginModule {

-

-    private CallbackHandler callbackHandler;

-    private Subject subject;

-    private Principal userPrincipal;

-    private String userId;

-    private String password;

-    private boolean succeeded;

-    private boolean commitSucceeded;

-

-    public void initialize(Subject subject,

-                           CallbackHandler callbackHandler,

-                           Map<String, ?> sharedState,

-                           Map<String, ?> options) {

-        this.callbackHandler = callbackHandler;

-        this.subject = subject;

-    }

-

-    public boolean login() throws LoginException {

-        Callback[] callbacks = new Callback[2];

-        callbacks[0] = new NameCallback("UserId:");

-        callbacks[1] = new PasswordCallback("Password:", false);

-

-        try {

-            callbackHandler.handle(callbacks);

-            userId = ((NameCallback)callbacks[0]).getName();

-            password = new String(((PasswordCallback)callbacks[1]).getPassword());

-

-            if (userId.equals("CalculatorUser") && password.equals("CalculatorUserPasswd")) {

-                System.out.println("Successfully AUTHENTICATED!!");

-                succeeded = true;

-                return true;

-            } else {

-                System.out.println("Incorrect userId / password! AUTHENTICATION FAILED!!");

-                return false;

-            }

-        } catch (Exception e) {

-            e.printStackTrace();

-            return false;

-        }

-    }

-

-    /**

-     * <p> This method is called if the LoginContext's

-     * overall authentication succeeded

-     * (the relevant REQUIRED, REQUISITE, SUFFICIENT and OPTIONAL LoginModules

-     * succeeded).

-     *

-     * <p> If this LoginModule's own authentication attempt

-     * succeeded (checked by retrieving the private state saved by the

-     * <code>login</code> method), then this method associates a

-     * <code>UserPrincipal</code>

-     * with the <code>Subject</code> located in the

-     * <code>LoginModule</code>.  If this LoginModule's own

-     * authentication attempted failed, then this method removes

-     * any state that was originally saved.

-     *

-     * <p>

-     *

-     * @exception LoginException if the commit fails.

-     *

-     * @return true if this LoginModule's own login and commit

-     *          attempts succeeded, or false otherwise.

-     */

-    public boolean commit() throws LoginException {

-        if (succeeded == false) {

-            return false;

-        } else {

-            // add a Principal (authenticated identity) to the Subject

-

-            // assume the user we authenticated is the UserPrincipal

-            userPrincipal = new UserPrincipal(userId);

-            if (!subject.getPrincipals().contains(userPrincipal))

-                subject.getPrincipals().add(userPrincipal);

-

-            // in any case, clean out state

-            userId = null;

-            password = null;

-            commitSucceeded = true;

-            return true;

-        }

-    }

-

-    /**

-     * <p> This method is called if the LoginContext's

-     * overall authentication failed.

-     * (the relevant REQUIRED, REQUISITE, SUFFICIENT and OPTIONAL LoginModules

-     * did not succeed).

-     *

-     * <p> If this LoginModule's own authentication attempt

-     * succeeded (checked by retrieving the private state saved by the

-     * <code>login</code> and <code>commit</code> methods),

-     * then this method cleans up any state that was originally saved.

-     *

-     * <p>

-     *

-     * @exception LoginException if the abort fails.

-     *

-     * @return false if this LoginModule's own login and/or commit attempts

-     *          failed, and true otherwise.

-     */

-    public boolean abort() throws LoginException {

-        if (succeeded == false) {

-            return false;

-        } else if (succeeded == true && commitSucceeded == false) {

-            // login succeeded but overall authentication failed

-            succeeded = false;

-            userId = null;

-            password = null;

-            userPrincipal = null;

-        } else {

-            // overall authentication succeeded and commit succeeded,

-            // but someone else's commit failed

-            logout();

-        }

-        return true;

-    }

-

-    /**

-     * Logout the user.

-     *

-     * <p> This method removes the <code>SimplePrincipal</code>

-     * that was added by the <code>commit</code> method.

-     *

-     * <p>

-     *

-     * @exception LoginException if the logout fails.

-     *

-     * @return true in all cases since this <code>LoginModule</code>

-     *          should not be ignored.

-     */

-    public boolean logout() throws LoginException {

-        subject.getPrincipals().remove(userPrincipal);

-        succeeded = false;

-        succeeded = commitSucceeded;

-        userId = null;

-        if (password != null)

-            password = null;

-        userPrincipal = null;

-        return true;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java b/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
deleted file mode 100644
index 595626e672..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
+++ /dev/null
@@ -1,66 +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 calculator.security;
-
-import java.security.Principal;
-
-/**
- * @version $Rev$ $Date$
- */
-public class UserPrincipal implements Principal {
-
-    private final String name;
-
-    public UserPrincipal(String name) {
-        if (name == null)
-            throw new IllegalArgumentException("name cannot be null");
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String toString() {
-        return name;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        final UserPrincipal other = (UserPrincipal)obj;
-        if (name == null) {
-            if (other.name != null)
-                return false;
-        } else if (!name.equals(other.name))
-            return false;
-        return true;
-    }
-}
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/Calculator.composite b/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
deleted file mode 100644
index d91bf88d96..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/Calculator.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"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="Calculator"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

-

-    <component name="CalculatorServiceComponent">

-		<implementation.java class="calculator.CalculatorServiceImpl">

-			<operation name="divide" requires="tuscany:logging"/>

-			<operation name="subtract" requires="tuscany:logging"/>

-		</implementation.java>

-        <reference name="addService" target="AddServiceComponent" />

-        <reference name="subtractService" target="SubtractServiceComponent" />

-        <reference name="multiplyService" target="MultiplyServiceComponent" />

-        <reference name="divideService" target="DivideServiceComponent" />

-    </component>

-

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl" requires="tuscany:logging"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl" requires="tuscany:jaasAuthentication"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl"/>

-    </component>

-    

-    <component name="AnotherCalculatorServiceComponent">

-		<implementation.java class="calculator.CalculatorServiceImpl" requires="tuscany:logging"/>

-        <reference name="addService" target="AddServiceComponent" />

-        <reference name="subtractService" target="SubtractServiceComponent" />

-        <reference name="multiplyService" target="MultiplyServiceComponent" />

-        <reference name="divideService" target="DivideServiceComponent" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config b/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
deleted file mode 100644
index 0e7cb86633..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
+++ /dev/null
@@ -1,3 +0,0 @@
-Calculator {

-  calculator.security.JaasLoginModule required debug=true;

-};

diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties b/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
deleted file mode 100644
index f62125eaa9..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
+++ /dev/null
@@ -1,18 +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.    

-CALLING_OPERATION=Inovoking operation {0} with arguments {1}

-OPERATION_RETURNED=Returning from operation {0} with return value {1}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/definitions.xml b/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/definitions.xml
deleted file mode 100644
index 6cccde0d13..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"

-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-    xmlns:calc="http://calculator">

-

-    <!-- PolicySets -->

-    <policySet name="JaasPolicy" provides="tuscany:jaasAuthentication" appliesTo="sca:implementation.java"

-        xmlns="http://www.osoa.org/xmlns/sca/1.0">

-        <tuscany:jaasAuthentication>

-            <tuscany:configurationName>Calculator</tuscany:configurationName>

-            <tuscany:callbackHandler>calculator.security.CalculatorCallbackHandler</tuscany:callbackHandler>

-        </tuscany:jaasAuthentication>

-    </policySet>

-

-    <!-- PolicySets -->

-    <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.java"

-        xmlns="http://www.osoa.org/xmlns/sca/1.0">

-        <tuscany:jdkLogger name="calculator">

-            <logLevel>FINER</logLevel>

-        </tuscany:jdkLogger>

-    </policySet>

-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java b/java/sca-contrib/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index 157570c3df..0000000000
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
+++ /dev/null
@@ -1,74 +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 calculator;

-

-import javax.security.auth.login.Configuration;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class CalculatorTestCase extends TestCase {

-

-    private CalculatorService calculatorService;

-    private CalculatorService anotherCalculatorService;

-    private SCADomain scaDomain;

-

-    @Override

-    protected void setUp() throws Exception {

-        try {

-            Configuration secConf = Configuration.getConfiguration();

-        } catch ( java.lang.SecurityException e ) {

-        	//FIXME: We should not compare exception strings as they are localized in various languages

-            //if ( e.getMessage().equals("Unable to locate a login configuration") ) {

-                System.setProperty("java.security.auth.login.config", 

-                       this.getClass().getClassLoader().getResource("CalculatorJass.config").toString());

-            //} else {

-            //    throw e;

-            //}

-        }

-        scaDomain = SCADomain.newInstance("Calculator.composite");

-        calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");

-        anotherCalculatorService = scaDomain.getService(CalculatorService.class, "AnotherCalculatorServiceComponent");

-    }

-

-    @Override

-    protected void tearDown() throws Exception {

-        scaDomain.close();

-    }

-

-    public void testCalculator() throws Exception {

-        // Calculate

-        assertEquals(calculatorService.add(3, 2), 5.0);

-        assertEquals(calculatorService.subtract(3, 2), 1.0);

-        assertEquals(calculatorService.multiply(3, 2), 6.0);

-        assertEquals(calculatorService.divide(3, 2), 1.5);

-    }

-    

-    public void testAnotherCalculator() throws Exception {

-        // Calculate

-        assertEquals(anotherCalculatorService.add(3, 2), 5.0);

-        assertEquals(anotherCalculatorService.subtract(3, 2), 1.0);

-        assertEquals(anotherCalculatorService.multiply(3, 2), 6.0);

-        assertEquals(anotherCalculatorService.divide(3, 2), 1.5);

-    }

-}

diff --git a/java/sca-contrib/samples/calculator-lean/README b/java/sca-contrib/samples/calculator-lean/README
deleted file mode 100644
index a8aff232c6..0000000000
--- a/java/sca-contrib/samples/calculator-lean/README
+++ /dev/null
@@ -1,87 +0,0 @@
-Calculator Sample
-=================
-This sample implements a simple calculator using SCA components. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-java -jar <tuscany-install>/modules/tuscany-node-launcher.jar Calculator.composite target/sample-calculator-lean.jar
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java) 
-binding. The CalculatorClient exercises this interface by calling add, 
-subtract, multiply and divide operations. This results in messages passing to 
-the appropriate components in the composite across the local wires.
-
-calculator/
-  src/
-    main/
-      java/
-        calculator/
-          CalculatorService.java  - the first component, calls +-/* as 
-                                    appropriate
-          CalculatorServiceImpl.java
-          AddService.java         - adds two numbers
-          AddServiceImpl.java
-          SubtractService.java    - subtracts one number from another
-          SubtractServiceImpl.java
-          MultiplyService.java    - multiplies two numbers
-          MultiplyServiceImpl.java
-          DivideService.java      - divides one number by another
-          DivideServiceImpl.java
-          CalculatorClient.java   - a client component that calls the
-                                    Calculator services
-      resources/
-        Calculator.composite      - the SCA assembly for this sample
-    test/
-      java/
-        calculator/
-          CalculatorTestCase.java - JUnit test case 
-  calculator.png                  - a pictorial representation of the sample 
-                                    .composite file
-  build.xml                       - the Ant build file
-  pom.xml                         - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd calculator
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] 3 + 2=5.0
-     [java] 3 - 2=1.0
-     [java] 3 * 2=6.0
-     [java] 3 / 2=1.5
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd calculator
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.272 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/calculator-lean/calculator.png b/java/sca-contrib/samples/calculator-lean/calculator.png
deleted file mode 100644
index 995a57b1fd..0000000000
--- a/java/sca-contrib/samples/calculator-lean/calculator.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/calculator-lean/calculator.svg b/java/sca-contrib/samples/calculator-lean/calculator.svg
deleted file mode 100644
index 0615925c50..0000000000
--- a/java/sca-contrib/samples/calculator-lean/calculator.svg
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator"
-   sodipodi:docname="calculator.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator\calculator.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="471.80491"
-     inkscape:cy="378.84265"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="59"
-     inkscape:window-y="79" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1,0,0,1.144214,0,-27.53557)">
-      <rect
-         rx="15.307091"
-         ry="12.692303"
-         y="192.00233"
-         x="258.31146"
-         height="299.99988"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">Calculator</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="191.57716"
-       x="339.91632"
-       y="262.1673"
-       rx="6.9961648"
-       ry="15.892869" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(79.61125,62.65764)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Calculator</flowPara><flowPara
-         id="flowPara1895">Service</flowPara><flowPara
-         id="flowPara1897">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
-       id="path1883" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1885"
-       transform="translate(-46.16225,128.7269)"
-       style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
-         id="flowRegion1887"><rect
-           id="rect1889"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
-         id="flowPara1891">Calculator</flowPara><flowPara
-         id="flowPara1893">Service</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1899"
-       width="115.66247"
-       height="70.148659"
-       x="594.75488"
-       y="209.73451"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1901"
-       transform="translate(334.4498,10.22481)"><flowRegion
-         id="flowRegion1903"><rect
-           id="rect1905"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1907">Add</flowPara><flowPara
-         id="flowPara1909">Service</flowPara><flowPara
-         id="flowPara1911">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "
-       id="path1913" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1917"
-       width="115.66247"
-       height="70.148659"
-       x="594.06543"
-       y="292.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1919"
-       transform="translate(333.7604,93.08188)"><flowRegion
-         id="flowRegion1921"><rect
-           id="rect1923"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1925">Subtract</flowPara><flowPara
-         id="flowPara1927">Service</flowPara><flowPara
-         id="flowPara1929">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "
-       id="path1931" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1933"
-       width="115.66247"
-       height="70.148659"
-       x="594.77979"
-       y="371.87729"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1935"
-       transform="translate(334.4747,172.3676)"><flowRegion
-         id="flowRegion1937"><rect
-           id="rect1939"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1941">Multiply</flowPara><flowPara
-         id="flowPara1943">Service</flowPara><flowPara
-         id="flowPara1945">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "
-       id="path1947" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1949"
-       width="115.66247"
-       height="70.148659"
-       x="596.20831"
-       y="452.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1951"
-       transform="translate(335.9032,253.0819)"><flowRegion
-         id="flowRegion1953"><rect
-           id="rect1955"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1957">Divide</flowPara><flowPara
-         id="flowPara1959">Service</flowPara><flowPara
-         id="flowPara1961">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "
-       id="path1963" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1965"
-       transform="translate(161.0221,114.967)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1967"><rect
-           id="rect1969"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1973">add</flowPara><flowPara
-         id="flowPara1977">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
-       id="path1979" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1981"
-       transform="translate(160.6632,150.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1983"><rect
-           id="rect1985"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1987">subtract</flowPara><flowPara
-         id="flowPara1989">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
-       id="path1991" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1993"
-       transform="translate(161.3775,184.2583)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1995"><rect
-           id="rect1997"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1999">multiply</flowPara><flowPara
-         id="flowPara2001">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
-       id="path2003" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2005"
-       transform="translate(159.9489,215.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2007"><rect
-           id="rect2009"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara2011">divide</flowPara><flowPara
-         id="flowPara2013">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
-       id="path2015" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
-       id="path2017" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
-       id="path2019" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
-       id="path2021" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 292.85714,355.52305 L 330,354.80877"
-       id="path2023" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/calculator-lean/pom.xml b/java/sca-contrib/samples/calculator-lean/pom.xml
deleted file mode 100644
index a68887b9b5..0000000000
--- a/java/sca-contrib/samples/calculator-lean/pom.xml
+++ /dev/null
@@ -1,71 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-calculator-lean</artifactId>

-    <name>Apache Tuscany SCA Calculator Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/AddService.java b/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java b/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index d56aa86e09..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,51 +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 calculator;
-
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-@Scope("COMPOSITE") @EagerInit
-public class CalculatorClient {
-    
-    private CalculatorService calculatorService;
-
-    @Reference
-    public void setCalculatorService(CalculatorService calculatorService) {
-        this.calculatorService = calculatorService;
-    }
-    
-    @Init
-    public void calculate() {
-
-        // Calculate
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 17fad7de6b..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/DivideService.java b/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/SubtractService.java b/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/resources/Calculator.composite b/java/sca-contrib/samples/calculator-lean/src/main/resources/Calculator.composite
deleted file mode 100644
index 913081b9be..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,54 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-
-    <component name="CalculatorClient">
-		<implementation.java class="calculator.CalculatorClient"/>
-        <reference name="calculatorService" target="CalculatorServiceComponent" />
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/resources/CalculatorTest.composite b/java/sca-contrib/samples/calculator-lean/src/main/resources/CalculatorTest.composite
deleted file mode 100644
index 906e2a3918..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/main/resources/CalculatorTest.composite
+++ /dev/null
@@ -1,32 +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://sample"
-           xmlns:sample="http://sample"
-           name="CalculatorTest">
-           
-    <include name="sample:Calculator"/>
-
-    <component name="CalculatorTestCase">
-		<implementation.java class="calculator.CalculatorTestCase"/>
-        <reference name="calculatorService" target="CalculatorServiceComponent" />
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java b/java/sca-contrib/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index 94dc747734..0000000000
--- a/java/sca-contrib/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
+++ /dev/null
@@ -1,62 +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 calculator;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-/**
- * This shows how to test the Calculator composition.
- */
-@Scope("COMPOSITE") @EagerInit
-public class CalculatorTestCase extends TestCase {
-
-    private static CalculatorService calculatorService;
-    private SCANode node;
-    
-    @Reference
-    public void setCalculatorService(CalculatorService calculatorService) {
-        CalculatorTestCase.calculatorService = calculatorService;
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANodeFromClassLoader("CalculatorTest.composite", getClass().getClassLoader());
-        node.start();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-    public void testCalculator() throws Exception {
-        // Calculate
-        assertEquals(calculatorService.add(3, 2), 5.0);
-        assertEquals(calculatorService.subtract(3, 2), 1.0);
-        assertEquals(calculatorService.multiply(3, 2), 6.0);
-        assertEquals(calculatorService.divide(3, 2), 1.5);
-    }
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/build.properties b/java/sca-contrib/samples/calculator-rcp/build.properties
deleted file mode 100644
index 0530eb648b..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .
diff --git a/java/sca-contrib/samples/calculator-rcp/icons/alt_window_16.gif b/java/sca-contrib/samples/calculator-rcp/icons/alt_window_16.gif
deleted file mode 100644
index 05626b17d8..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/icons/alt_window_16.gif
+++ /dev/null
diff --git a/java/sca-contrib/samples/calculator-rcp/icons/alt_window_32.gif b/java/sca-contrib/samples/calculator-rcp/icons/alt_window_32.gif
deleted file mode 100644
index b432f88339..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/icons/alt_window_32.gif
+++ /dev/null
diff --git a/java/sca-contrib/samples/calculator-rcp/plugin.xml b/java/sca-contrib/samples/calculator-rcp/plugin.xml
deleted file mode 100644
index 1fb5acd9b5..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/plugin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-   <extension
-         id="application"
-         point="org.eclipse.core.runtime.applications">
-      <application>
-         <run
-               class="calculator.rcp.Application">
-         </run>
-      </application>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            name="Perspective"
-            class="calculator.rcp.Perspective"
-            id="org.apache.tuscany.sca.sample.calculator.rcp.perspective">
-      </perspective>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="View"
-            class="calculator.rcp.View"
-            id="org.apache.tuscany.sca.sample.calculator.rcp.view">
-      </view>
-   </extension>
-
-</plugin>
diff --git a/java/sca-contrib/samples/calculator-rcp/pom.xml b/java/sca-contrib/samples/calculator-rcp/pom.xml
deleted file mode 100644
index 0e5214cdd0..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/pom.xml
+++ /dev/null
@@ -1,126 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample.calculator.rcp</artifactId>
-    <name>Apache Tuscany SCA Calculator RCP Sample</name>
-    <repositories>
-        <repository>
-            <id>apache.incubator</id>
-            <url>http://people.apache.org/repo/m2-incubating-repository
-            </url>
-        </repository>
-    </repositories>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- 
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.3.0-I20070614-0800</version>
-        </dependency>
-         -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version> <!-- To be compatible with Jetty 6 -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <version>2.5.1</version>
-                <configuration>
-                    <buildcommands>
-                        <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
-                        <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
-                    </buildcommands>
-                    <projectnatures>
-                        <projectnature>org.eclipse.jdt.core.javanature</projectnature>
-                        <projectnature>org.eclipse.pde.PluginNature</projectnature>
-                    </projectnatures>
-                    <classpathContainers>
-                        <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER
-                        </classpathContainer>
-                        <classpathContainer>org.eclipse.pde.core.requiredPlugins
-                        </classpathContainer>
-                    </classpathContainers>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/Calculator.composite b/java/sca-contrib/samples/calculator-rcp/src/main/java/Calculator.composite
deleted file mode 100644
index 913081b9be..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/Calculator.composite
+++ /dev/null
@@ -1,54 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-
-    <component name="CalculatorClient">
-		<implementation.java class="calculator.CalculatorClient"/>
-        <reference name="calculatorService" target="CalculatorServiceComponent" />
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/AddService.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index afd5ea48fc..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.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 calculator;
-
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-@Scope("COMPOSITE")
-@EagerInit
-public class CalculatorClient {
-
-    private CalculatorService calculatorService;
-
-    @Reference
-    public void setCalculatorService(CalculatorService calculatorService) {
-        this.calculatorService = calculatorService;
-    }
-
-    @Init
-    public void calculate() {
-        // Calculate
-        System.out.println("SCA API ClassLoader: " + Reference.class.getClassLoader());
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index c89043276e..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,34 +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 calculator;
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 39f55ca31f..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,69 +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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/DivideService.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/SubtractService.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
deleted file mode 100644
index 50f68dcb01..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.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 calculator.rcp;
-
-import java.io.File;
-
-import org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoverer;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-    // The plug-in ID
-    public static final String PLUGIN_ID = "org.apache.tuscany.sca.sample.calculator.rcp";
-
-    // The shared instance
-    private static Activator plugin;
-
-    private SCANode node;
-
-    /**
-     * The constructor
-     */
-    public Activator() {
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-     */
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-        Class<?> cls = EquinoxServiceDiscoverer.class;
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANode("Calculator.composite", new SCAContribution("c1", new File("target/classes").toURI().toString()));
-        node.start();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-     */
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-        if (node != null) {
-            node.stop();
-        }
-    }
-
-    /**
-     * Returns the shared instance
-     *
-     * @return the shared instance
-     */
-    public static Activator getDefault() {
-        return plugin;
-    }
-
-    /**
-     * Returns an image descriptor for the image file at the given
-     * plug-in relative path
-     *
-     * @param path the path
-     * @return the image descriptor
-     */
-    public static ImageDescriptor getImageDescriptor(String path) {
-        return imageDescriptorFromPlugin(PLUGIN_ID, path);
-    }
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
deleted file mode 100644
index 5ce6522fed..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
+++ /dev/null
@@ -1,63 +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 calculator.rcp;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class Application implements IApplication {
-
-    /* (non-Javadoc)
-     * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
-     */
-    public Object start(IApplicationContext context) {
-        Display display = PlatformUI.createDisplay();
-        try {
-            int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-            if (returnCode == PlatformUI.RETURN_RESTART) {
-                return IApplication.EXIT_RESTART;
-            }
-            return IApplication.EXIT_OK;
-        } finally {
-            display.dispose();
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.equinox.app.IApplication#stop()
-     */
-    public void stop() {
-        final IWorkbench workbench = PlatformUI.getWorkbench();
-        if (workbench == null)
-            return;
-        final Display display = workbench.getDisplay();
-        display.syncExec(new Runnable() {
-            public void run() {
-                if (!display.isDisposed())
-                    workbench.close();
-            }
-        });
-    }
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 2fccfb2d77..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
+++ /dev/null
@@ -1,65 +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 calculator.rcp;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-
-/**
- * An action bar advisor is responsible for creating, adding, and disposing of
- * the actions added to a workbench window. Each window will be populated with
- * new actions.
- */
-public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
-
-    // Actions - important to allocate these only in makeActions, and then use
-    // them
-    // in the fill methods. This ensures that the actions aren't recreated
-    // when fillActionBars is called with FILL_PROXY.
-    private IWorkbenchAction exitAction;
-
-    public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
-        super(configurer);
-    }
-
-    protected void makeActions(final IWorkbenchWindow window) {
-        // Creates the actions and registers them.
-        // Registering is needed to ensure that key bindings work.
-        // The corresponding commands keybindings are defined in the plugin.xml
-        // file.
-        // Registering also provides automatic disposal of the actions when
-        // the window is closed.
-
-        exitAction = ActionFactory.QUIT.create(window);
-        register(exitAction);
-    }
-
-    protected void fillMenuBar(IMenuManager menuBar) {
-        MenuManager fileMenu = new MenuManager("&File", IWorkbenchActionConstants.M_FILE);
-        menuBar.add(fileMenu);
-        fileMenu.add(exitAction);
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index ac1893509c..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.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 calculator.rcp;
-
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-
-    private static final String PERSPECTIVE_ID = "org.apache.tuscany.sca.sample.calculator.rcp.perspective";
-
-    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        return new ApplicationWorkbenchWindowAdvisor(configurer);
-    }
-
-    public String getInitialWindowPerspectiveId() {
-        return PERSPECTIVE_ID;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 6378decf20..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.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 calculator.rcp;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
-
-    public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        super(configurer);
-    }
-
-    public ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer configurer) {
-        return new ApplicationActionBarAdvisor(configurer);
-    }
-
-    public void preWindowOpen() {
-        IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-        configurer.setInitialSize(new Point(400, 300));
-        configurer.setShowCoolBar(false);
-        configurer.setShowStatusLine(false);
-        configurer.setTitle("Tuscany SCA Calculator RCP Application");
-    }
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
deleted file mode 100644
index 445b4b65b2..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
+++ /dev/null
@@ -1,34 +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 calculator.rcp;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class Perspective implements IPerspectiveFactory {
-
-    public void createInitialLayout(IPageLayout layout) {
-        String editorArea = layout.getEditorArea();
-        layout.setEditorAreaVisible(false);
-        layout.setFixed(true);
-
-        layout.addStandaloneView(View.ID, false, IPageLayout.LEFT, 1.0f, editorArea);
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/View.java b/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
deleted file mode 100644
index f95c1e029c..0000000000
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
+++ /dev/null
@@ -1,88 +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 calculator.rcp;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-
-public class View extends ViewPart {
-    public static final String ID = "org.apache.tuscany.sca.sample.calculator.rcp.view";
-
-    private TableViewer viewer;
-
-    /**
-     * The content provider class is responsible for providing objects to the
-     * view. It can wrap existing objects in adapters or simply return objects
-     * as-is. These objects may be sensitive to the current input of the view,
-     * or ignore it and always show the same content (like Task List, for
-     * example).
-     */
-    class ViewContentProvider implements IStructuredContentProvider {
-        public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-        }
-
-        public void dispose() {
-        }
-
-        public Object[] getElements(Object parent) {
-            return new String[] {"One", "Two", "Three"};
-        }
-    }
-
-    class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {
-        public String getColumnText(Object obj, int index) {
-            return getText(obj);
-        }
-
-        public Image getColumnImage(Object obj, int index) {
-            return getImage(obj);
-        }
-
-        public Image getImage(Object obj) {
-            return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
-        }
-    }
-
-    /**
-     * This is a callback that will allow us to create the viewer and initialize
-     * it.
-     */
-    public void createPartControl(Composite parent) {
-        viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-        viewer.setContentProvider(new ViewContentProvider());
-        viewer.setLabelProvider(new ViewLabelProvider());
-        viewer.setInput(getViewSite());
-    }
-
-    /**
-     * Passing the focus request to the viewer's control.
-     */
-    public void setFocus() {
-        viewer.getControl().setFocus();
-    }
-}
diff --git a/java/sca-contrib/samples/calculator-script/README b/java/sca-contrib/samples/calculator-script/README
deleted file mode 100644
index ab1dda13df..0000000000
--- a/java/sca-contrib/samples/calculator-script/README
+++ /dev/null
@@ -1,105 +0,0 @@
-Calculator Script Sample
-========================
-This sample implements a simple calculator using SCA components implemented 
-using Java, JavaScript, Ruby, Python and Groovy. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-script.jar calculator.CalculatorClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-script.jar calculator.CalculatorClient
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java) 
-binding. The CalculatorClient exercises this interface by calling add, 
-subtract, multiply and divide operations. This results in messages passing 
-to the appropriate components in the composite across the local wires. Each
-component is implemented using a different language.
-
-calculator-script/
-  src/
-    main/
-      java/
-        calculator/
-          CalculatorService.java  - the first component calls +-/* as 
-                                    appropriate
-          CalculatorServiceImpl.java
-          AddService.java         - adds two numbers
-          SubtractService.java    - subtracts one number from another
-          MultiplyService.java    - multiplies two numbers
-          DivideService.java      - divides one number by another
-          CalculatorClient.java   - starts the SCA Runtime and 
-                                    deploys the Calculator.composite. 
-                                    It then calls the deployed Calculator 
-                                    Components services
-      resources/
-        calculator/
-          AddServiceImpl.js       - A JavaScript implementation of the
-                                    Add component
-          SubtractServiceImpl.rb  - A Ruby implementation of the Subtract
-                                    component
-          MultiplyServiceImpl.py  - A Python implementation of the 
-                                    Multiple component
-          DivideServiceImpl.groovy- A Groovy implementation of the 
-                                    Divide component
-        Calculator.composite      - the SCA assembly for this sample
-        
-    test/
-      java/
-        calculator/
-          CalculatorTestCase.java - JUnit test case 
-  calculator-script.png           - a pictorial representation of the 
-                                    sample .composite file
-  build.xml                       - the Ant build file
-  pom.xml                         - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd calculator-script
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] 3 + 2=5.0
-     [java] 3 - 2=1.0
-     [java] 3 * 2=6.0
-     [java] 3 / 2=1.5
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd calculator-script
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.918 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/calculator-script/build.xml b/java/sca-contrib/samples/calculator-script/build.xml
deleted file mode 100644
index 429d638ca5..0000000000
--- a/java/sca-contrib/samples/calculator-script/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="calculator-script" default="compile">
-    <property name="test.class" value="calculator.CalculatorClient" />
-	<property name="test.jar"   value="sample-calculator-script.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/calculator-script/calculator-script.png b/java/sca-contrib/samples/calculator-script/calculator-script.png
deleted file mode 100644
index d3f8c491c3..0000000000
--- a/java/sca-contrib/samples/calculator-script/calculator-script.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/calculator-script/calculator-script.svg b/java/sca-contrib/samples/calculator-script/calculator-script.svg
deleted file mode 100644
index 16939f9310..0000000000
--- a/java/sca-contrib/samples/calculator-script/calculator-script.svg
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-script"
-   sodipodi:docname="calculator-script.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-script\calculator-script.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="471.80491"
-     inkscape:cy="378.84265"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="59"
-     inkscape:window-y="79" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1,0,0,1.144214,0,-27.53557)">
-      <rect
-         rx="15.307091"
-         ry="12.692303"
-         y="192.00233"
-         x="258.31146"
-         height="299.99988"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">Calculator</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="191.57716"
-       x="339.91632"
-       y="262.1673"
-       rx="6.9961648"
-       ry="15.892869" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(79.61125,62.65764)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Calculator</flowPara><flowPara
-         id="flowPara1895">Service</flowPara><flowPara
-         id="flowPara1897">Component</flowPara><flowPara
-         id="flowPara1950">(Java)</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
-       id="path1883" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1885"
-       transform="translate(-46.16225,128.7269)"
-       style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
-         id="flowRegion1887"><rect
-           id="rect1889"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
-         id="flowPara1891">Calculator</flowPara><flowPara
-         id="flowPara1893">Service</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1899"
-       width="115.66247"
-       height="70.148659"
-       x="594.75488"
-       y="209.73451"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1901"
-       transform="translate(334.4498,10.22481)"><flowRegion
-         id="flowRegion1903"><rect
-           id="rect1905"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1907">Add</flowPara><flowPara
-         id="flowPara1909">Service</flowPara><flowPara
-         id="flowPara1911">Component</flowPara><flowPara
-         id="flowPara1952">(Javascript)</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "
-       id="path1913" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1917"
-       width="115.66247"
-       height="70.148659"
-       x="594.06543"
-       y="292.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1919"
-       transform="translate(333.7604,93.08188)"><flowRegion
-         id="flowRegion1921"><rect
-           id="rect1923"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1925">Subtract</flowPara><flowPara
-         id="flowPara1927">Service</flowPara><flowPara
-         id="flowPara1929">Component</flowPara><flowPara
-         id="flowPara1954">(Ruby)</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "
-       id="path1931" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1933"
-       width="115.66247"
-       height="70.148659"
-       x="594.77979"
-       y="371.87729"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1935"
-       transform="translate(334.4747,172.3676)"><flowRegion
-         id="flowRegion1937"><rect
-           id="rect1939"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1941">Multiply</flowPara><flowPara
-         id="flowPara1943">Service</flowPara><flowPara
-         id="flowPara1945">Component</flowPara><flowPara
-         id="flowPara1956">(Python)</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "
-       id="path1947" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1949"
-       width="115.66247"
-       height="70.148659"
-       x="596.20831"
-       y="452.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1951"
-       transform="translate(335.9032,253.0819)"><flowRegion
-         id="flowRegion1953"><rect
-           id="rect1955"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1957">Divide</flowPara><flowPara
-         id="flowPara1959">Service</flowPara><flowPara
-         id="flowPara1961">Component</flowPara><flowPara
-         id="flowPara1958">(Groovy)</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "
-       id="path1963" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1965"
-       transform="translate(161.0221,114.967)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1967"><rect
-           id="rect1969"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1973">add</flowPara><flowPara
-         id="flowPara1977">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
-       id="path1979" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1981"
-       transform="translate(160.6632,150.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1983"><rect
-           id="rect1985"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1987">subtract</flowPara><flowPara
-         id="flowPara1989">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
-       id="path1991" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1993"
-       transform="translate(161.3775,184.2583)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1995"><rect
-           id="rect1997"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1999">multiply</flowPara><flowPara
-         id="flowPara2001">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
-       id="path2003" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2005"
-       transform="translate(159.9489,215.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2007"><rect
-           id="rect2009"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara2011">divide</flowPara><flowPara
-         id="flowPara2013">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
-       id="path2015" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
-       id="path2017" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
-       id="path2019" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
-       id="path2021" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 292.85714,355.52305 L 330,354.80877"
-       id="path2023" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/calculator-script/pom.xml b/java/sca-contrib/samples/calculator-script/pom.xml
deleted file mode 100644
index 4ed19c0751..0000000000
--- a/java/sca-contrib/samples/calculator-script/pom.xml
+++ /dev/null
@@ -1,78 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-calculator-script</artifactId>
-    <name>Apache Tuscany SCA Calculator Sample using Scripting Languages</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/AddService.java b/java/sca-contrib/samples/calculator-script/src/main/java/calculator/AddService.java
deleted file mode 100644
index a235e648c7..0000000000
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the add service
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 243d1562dc..0000000000
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,43 +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 calculator;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
-        CalculatorService calculatorService = 
-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index c89043276e..0000000000
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,34 +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 calculator;
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 39f55ca31f..0000000000
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,69 +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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/DivideService.java b/java/sca-contrib/samples/calculator-script/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 497dafd4fd..0000000000
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the divide service
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/samples/calculator-script/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/SubtractService.java b/java/sca-contrib/samples/calculator-script/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 376b3e5bb9..0000000000
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the subtract service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator-script/src/main/resources/Calculator.composite b/java/sca-contrib/samples/calculator-script/src/main/resources/Calculator.composite
deleted file mode 100644
index 8a765e6153..0000000000
--- a/java/sca-contrib/samples/calculator-script/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,50 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="Calculator">

-

-    <component name="CalculatorServiceComponent">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <reference name="addService" target="AddServiceComponent" />

-        <reference name="subtractService" target="SubtractServiceComponent" />

-        <reference name="multiplyService" target="MultiplyServiceComponent" />

-        <reference name="divideService" target="DivideServiceComponent" />

-    </component>

-

-    <component name="AddServiceComponent">

-        <tuscany:implementation.script script="calculator/AddServiceImpl.js"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <tuscany:implementation.script script="calculator/SubtractServiceImpl.rb"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <tuscany:implementation.script script="calculator/MultiplyServiceImpl.py"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <tuscany:implementation.script script="calculator/DivideServiceImpl.groovy"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
deleted file mode 100644
index 1d4d221364..0000000000
--- a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ /dev/null
@@ -1,22 +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.    
- */
-
-function add(n1, n2) {
-   return n1 + n2;
-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
deleted file mode 100644
index c31c1e8fd6..0000000000
--- a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ /dev/null
@@ -1,22 +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.    

- */

- 

-def divide(n1, n2) {

-   return n1 / n2

-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
deleted file mode 100644
index d6f27ca7f5..0000000000
--- a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ /dev/null
@@ -1,20 +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.
-#
- 
-def multiply(n1, n2):
-   return n1 * n2
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
deleted file mode 100644
index 132a1d13b0..0000000000
--- a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ /dev/null
@@ -1,21 +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.

-#

- 

-def subtract(n1, n2)

-    return n1 - n2

-end
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/java/sca-contrib/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index fea8f62110..0000000000
--- a/java/sca-contrib/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.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 calculator;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CalculatorTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private CalculatorService calculatorService;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("Calculator.composite");
-        calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testCalculator() throws Exception {
-        // Calculate
-        assertEquals(calculatorService.add(3, 2), 5.0);
-        assertEquals(calculatorService.subtract(3, 2), 1.0);
-        assertEquals(calculatorService.multiply(3, 2), 6.0);
-        assertEquals(calculatorService.divide(3, 2), 1.5);
-
-    }
-}
diff --git a/java/sca-contrib/samples/calculator-webapp/README b/java/sca-contrib/samples/calculator-webapp/README
deleted file mode 100644
index c88b92b206..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/README
+++ /dev/null
@@ -1,118 +0,0 @@
-Calculator Sample
-=================
-This sample uses the same code as the calculator sample but deploys the
-sample wrapped in a web app. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want 
-to give this sample a go deploy the WAR file (target/sample-calculator-webapp.war)
-to you web application server. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-calculator-webapp/calc.jsp
-
-The port and hostname will of course vary depending on your local installation. 
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java) 
-binding. The CalculatorClient exercises this interface by calling add, 
-subtract, multiply and divide operations. This results in messages passing to 
-the appropriate components in the composite across the local wires.
-
-calculator-webapp/
-  src/
-    main/
-      java/
-        calculator/
-          CalculatorService.java  - As calculator sample
-          CalculatorServiceImpl.java
-          AddService.java         - As calculator sample
-          AddServiceImpl.java
-          SubtractService.java    - As calculator sample
-          SubtractServiceImpl.java
-          MultiplyService.java    - As calculator sample
-          MultiplyServiceImpl.java
-          DivideService.java      - As calculator sample
-          DivideServiceImpl.java
-          CalculatorClient.java   - As calculator sample
-      resources/
-        Calculator.composite      - As calculator sample
-      webapp
-        META-INF/
-          sca-contribution.xml    - specifies the composite to be deployed
-        WEB-INF/
-          web.xml                 - defines the listener that starts up the 
-                                    Tuscany SCA runtime
-        calc.jsp                  - the web application that makes use of the
-                                    SCA application 
-    test/
-      java/
-        calculator/
-          CalculatorTestCase.java - JUnit test case 
-           
-  calculator.png - a pictorial representation of the sample .composite file
-  build.xml      - the Ant build file
-  pom.xml        - the Maven build file  
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as 
-follows
-
-cd calculator-webapp
-ant package
-
-This should result in a war file (sample-calculator-webapp.war) in the target 
-directory. Copy this war file to your web app deployment directory in you
-web app container. 
-
-The process for getting the web app running will depend on which web app container
-you are using. For example, if you are using Tomcat then it is simply a matter
-of copying the WAR file to the webapps directory. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-calculator-webapp/calc.jsp
-
-The port and hostname will of course vary depending on your local installation. 
-
-You should see the following output.
-
-Expression	Result
-2 + 3	5.0
-3 - 2	1.0
-3 * 2	6.0
-3 / 2	1.5
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd calculator-webapp
-mvn
-
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.852 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0 
-
-Again this should result in a war file (sample-calculator-webapp.war) in the target 
-directory. Follow the steps described in the previous section for running the web 
-app and for the expected results.
-
-
diff --git a/java/sca-contrib/samples/calculator-webapp/calculator-web.png b/java/sca-contrib/samples/calculator-webapp/calculator-web.png
deleted file mode 100644
index 896ddc4093..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/calculator-web.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/calculator-webapp/calculator-web.svg b/java/sca-contrib/samples/calculator-webapp/calculator-web.svg
deleted file mode 100644
index 00ed27556f..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/calculator-web.svg
+++ /dev/null
@@ -1,358 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-web"
-   sodipodi:docname="calculator-web.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-web\calculator-web.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="471.80491"
-     inkscape:cy="378.84265"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="59"
-     inkscape:window-y="79" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1,0,0,1.144214,0,-27.53557)">
-      <rect
-         rx="15.307091"
-         ry="12.692303"
-         y="192.00233"
-         x="258.31146"
-         height="299.99988"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">Calculator</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="191.57716"
-       x="339.91632"
-       y="262.1673"
-       rx="6.9961648"
-       ry="15.892869" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(79.61125,62.65764)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Calculator</flowPara><flowPara
-         id="flowPara1895">Service</flowPara><flowPara
-         id="flowPara1897">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
-       id="path1883" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1885"
-       transform="translate(-46.16225,128.7269)"
-       style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
-         id="flowRegion1887"><rect
-           id="rect1889"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
-         id="flowPara1891">Calculator</flowPara><flowPara
-         id="flowPara1893">Service</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1899"
-       width="115.66247"
-       height="70.148659"
-       x="594.75488"
-       y="209.73451"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1901"
-       transform="translate(334.4498,10.22481)"><flowRegion
-         id="flowRegion1903"><rect
-           id="rect1905"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1907">Add</flowPara><flowPara
-         id="flowPara1909">Service</flowPara><flowPara
-         id="flowPara1911">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "
-       id="path1913" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1917"
-       width="115.66247"
-       height="70.148659"
-       x="594.06543"
-       y="292.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1919"
-       transform="translate(333.7604,93.08188)"><flowRegion
-         id="flowRegion1921"><rect
-           id="rect1923"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1925">Subtract</flowPara><flowPara
-         id="flowPara1927">Service</flowPara><flowPara
-         id="flowPara1929">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "
-       id="path1931" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1933"
-       width="115.66247"
-       height="70.148659"
-       x="594.77979"
-       y="371.87729"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1935"
-       transform="translate(334.4747,172.3676)"><flowRegion
-         id="flowRegion1937"><rect
-           id="rect1939"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1941">Multiply</flowPara><flowPara
-         id="flowPara1943">Service</flowPara><flowPara
-         id="flowPara1945">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "
-       id="path1947" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1949"
-       width="115.66247"
-       height="70.148659"
-       x="596.20831"
-       y="452.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1951"
-       transform="translate(335.9032,253.0819)"><flowRegion
-         id="flowRegion1953"><rect
-           id="rect1955"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1957">Divide</flowPara><flowPara
-         id="flowPara1959">Service</flowPara><flowPara
-         id="flowPara1961">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "
-       id="path1963" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1965"
-       transform="translate(161.0221,114.967)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1967"><rect
-           id="rect1969"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1973">add</flowPara><flowPara
-         id="flowPara1977">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
-       id="path1979" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1981"
-       transform="translate(160.6632,150.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1983"><rect
-           id="rect1985"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1987">subtract</flowPara><flowPara
-         id="flowPara1989">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
-       id="path1991" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1993"
-       transform="translate(161.3775,184.2583)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1995"><rect
-           id="rect1997"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1999">multiply</flowPara><flowPara
-         id="flowPara2001">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
-       id="path2003" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2005"
-       transform="translate(159.9489,215.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2007"><rect
-           id="rect2009"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara2011">divide</flowPara><flowPara
-         id="flowPara2013">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
-       id="path2015" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
-       id="path2017" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
-       id="path2019" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
-       id="path2021" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 292.85714,355.52305 L 330,354.80877"
-       id="path2023" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
-       id="path1950"
-       sodipodi:cx="179.28572"
-       sodipodi:cy="352.66592"
-       sodipodi:rx="32.857143"
-       sodipodi:ry="35"
-       d="M 197.59435,323.60313 A 32.857143,35 0 1 1 196.81963,323.06603"
-       sodipodi:start="5.3034219"
-       sodipodi:end="11.558474"
-       sodipodi:open="true"
-       transform="translate(-12.85714,0.714286)" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1952"
-       transform="translate(-142.5493,128.5383)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1954"><rect
-           id="rect1956"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1960">WebApp</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 235,356.23734 C 200.71429,356.23734 200.71429,356.23734 200.71429,356.23734"
-       id="path1972" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/calculator-webapp/pom.xml b/java/sca-contrib/samples/calculator-webapp/pom.xml
deleted file mode 100644
index d2152897dc..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/pom.xml
+++ /dev/null
@@ -1,72 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-calculator-webapp</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Calculator Sample in a WebApp</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>        

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-       <plugins>

-            <plugin>

-                <groupId>org.apache.tuscany.sca</groupId>

-                <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>2.0-SNAPSHOT</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-       </plugins>

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/AddService.java b/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/AddService.java
deleted file mode 100644
index ec57a6a533..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the add service

- */

-public interface AddService {

-

-    double add(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9c635e3c8..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Add service

- */

-public class AddServiceImpl implements AddService {

-

-    public double add(double n1, double n2) {

-        return n1 + n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ad87375529..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-

-/**

- * The Calculator service interface.

- */

-public interface CalculatorService {

-

-    double add(double n1, double n2);

-

-    double subtract(double n1, double n2);

-

-    double multiply(double n1, double n2);

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 0f03d6e7a1..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,69 +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 calculator;

-

-import org.oasisopen.sca.annotation.Reference;

-

-/**

- * An implementation of the Calculator service.

- */

-public class CalculatorServiceImpl implements CalculatorService {

-

-    private AddService addService;

-    private SubtractService subtractService;

-    private MultiplyService multiplyService;

-    private DivideService divideService;

-

-    @Reference

-    public void setAddService(AddService addService) {

-        this.addService = addService;

-    }

-

-    @Reference

-    public void setSubtractService(SubtractService subtractService) {

-        this.subtractService = subtractService;

-    }

-

-    @Reference

-    public void setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-

-    @Reference

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-

-    public double add(double n1, double n2) {

-        return addService.add(n1, n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        return multiplyService.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        return divideService.divide(n1, n2);

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the divide service

- */

-public interface DivideService {

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Divide service.

- */

-public class DivideServiceImpl implements DivideService {

-

-    public double divide(double n1, double n2) {

-        return n1 / n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the multiply service

- */

-public interface MultiplyService {

-

-    double multiply(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Multiply service.

- */

-public class MultiplyServiceImpl implements MultiplyService {

-

-    public double multiply(double n1, double n2) {

-        return n1 * n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 30e4e6a56a..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the subtract service

- */

-public interface SubtractService {

-

-    double subtract(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the subtract service.

- */

-public class SubtractServiceImpl implements SubtractService {

-

-    public double subtract(double n1, double n2) {

-        return n1 - n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 57d39cd8d8..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
-    xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2"
-	xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2">
-
-    <d:environment>
-        <d:moduleId>
-            <d:groupId>org.apache.tuscany.sca</d:groupId>
-            <d:artifactId>sample-calculator-webapp</d:artifactId>
-            <d:version>2.0-SNAPSHOT</d:version>
-            <d:type>war</d:type>
-        </d:moduleId>
-    </d:environment>
-</web-app>
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite b/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 50c23af0b2..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,49 +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://sample"

-           xmlns:sample="http://sample"

-           name="Calculator">

-

-    <component name="CalculatorServiceComponent">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <reference name="addService" target="AddServiceComponent"></reference>

-        <reference name="subtractService" target="SubtractServiceComponent"></reference>

-        <reference name="multiplyService" target="MultiplyServiceComponent"></reference>

-        <reference name="divideService" target="DivideServiceComponent"></reference>

-    </component>

-

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index b5a828d55b..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<!--

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

--->

-

-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web

-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">

-<web-app>

-

-  <display-name>Apache Tuscany Calculator Web Service Sample</display-name>

-

-  <filter>
-    <filter-name>tuscany</filter-name> 
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
-  </filter>
-
-  <filter-mapping>
-    <filter-name>tuscany</filter-name> 
-    <url-pattern>/*</url-pattern> 
-  </filter-mapping>
-
-  <welcome-file-list id="WelcomeFileList">

-    <welcome-file>calc.jsp</welcome-file>

-  </welcome-file-list>

-

-</web-app>

diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/calc.jsp b/java/sca-contrib/samples/calculator-webapp/src/main/webapp/calc.jsp
deleted file mode 100644
index 4bc5c984dd..0000000000
--- a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ /dev/null
@@ -1,47 +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.

---%>

-

-<%@ page contentType="text/html;charset=UTF-8" language="java" %>

-<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %>

-

-<sca:reference name="CalculatorServiceComponent" type="calculator.CalculatorService" />

-

-<html>

-<head><title>Calculator sample</title></head>

-

-<body>

-<table>

-    <tr>

-        <th>Expression</th><th>Result</th>

-    </tr>

-    <tr>

-        <td>2 + 3</td><td><%= CalculatorServiceComponent.add(2, 3) %></td>

-    </tr>

-    <tr>

-        <td>3 - 2</td><td><%= CalculatorServiceComponent.subtract(3, 2) %></td>

-    </tr>

-    <tr>

-        <td>3 * 2</td><td><%= CalculatorServiceComponent.multiply(3, 2) %></td>

-    </tr>

-    <tr>

-        <td>3 / 2</td><td><%= CalculatorServiceComponent.divide(3, 2) %></td>

-    </tr>    

-</table>

-</body>

-</html>

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/README b/java/sca-contrib/samples/calculator-ws-secure-webapp/README
deleted file mode 100644
index d0d3307b3a..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/README
+++ /dev/null
@@ -1,116 +0,0 @@
-Calculator Sample Exposing Secure Web Services In A WebApp

-==========================================================

-This sample uses the same code as the calculator sample, it deploys the

-sample wrapped in a web app and exposes the AddService as a web service. 

-The autentication intent is applied to communications with the add 

-component. The integrity intent is applied to communication with the 

-subtract component. 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-As this sample provides a web app there is a manual step where the WAR file

-that contains the sample is copied to your web app container. If you just want 

-to give this sample a go deploy the WAR file (target/sample-calculator-ws-secure-webapp.war)

-to you web application server. 

-  

-Once the web app is deployed use your browser to visit the following URL;

-

-http://localhost:8080/sample-calculator-ws-secure-webapp

-

-The sample is configured to use a service on port 8080. If your servlet container

-is using a port other than 8080 then you will need to edit the Calculator.composite

-and change the uri attribute of the <binding.ws> used by the CalculatorServiceComponent

-to use the correct port.

-

-Sample Overview

----------------

-The sample provides a single calculator service with a default SCA (java) 

-binding. The CalculatorClient exercises this interface by calling add, 

-subtract, multiply and divide operations. This results in messages passing to 

-the appropriate components in the composite.

-

-calculator-webapp/

-  src/

-    main/

-      java/

-        calculator/

-          AddService.java         - As calculator sample

-          AddServiceImpl.java

-          CalculatorClient.java   - As calculator sample

-          CalculatorService.java  - As calculator sample

-          CalculatorServiceImpl.java

-          DivideService.java      - As calculator sample

-          DivideServiceImpl.java

-          MultiplyService.java    - As calculator sample

-          MultiplyServiceImpl.java

-          SubtractService.java    - As calculator sample

-          SubtractServiceImpl.java

-      resources/

-        Calculator.composite      - As calculator sample except that the 

-                                    connection between the CalculatorService

-                                    and the AddService is web services

-        definitions.xml           - intent and polci set specification

-        security.properties       - security configuration for the 

-                                    rampart security engine that runs 

-                                    inside of Axis

-        calculatorKeys.jks        - keystore

-      webapp

-        META-INF/

-          sca-contribution.xml    - specifies the composite to be deployed

-        WEB-INF/

-          web.xml                 - defines the listener that starts up the 

-                                    Tuscany SCA runtime and maps service

-                                    calls to the TuscanyServlet

-        calc.jsp                  - the web application that makes use of the

-                                    SCA application 

-           

-  calculator.png - a pictorial representation of the sample .composite file

-  build.xml      - the Ant build file

-  pom.xml        - the Maven build file

-  README         - this file  

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built using Ant as 

-follows

-

-cd calculator-ws-secure-webapp

-ant package

-

-This should result in a war file (sample-calculator-ws-secure-webapp.war) in the target 

-directory. Copy this war file to your web app deployment directory in you

-web app container. 

-

-The process for getting the web app running will depend on which web app container

-you are using. For example, if you are using Tomcat then it is simply a matter

-of copying the WAR file to the webapps directory. 

-

-Once the web app is deployed use your browser to visit the following URL;

-

-http://localhost:8080/sample-calculator-ws-secure-webapp

-

-The port and hostname will of course vary depending on your local installation. 

-

-You should see the following output.

-

-Expression	Result

-2 + 3	5.0

-3 - 2	1.0

-3 * 2	6.0

-3 / 2	1.5

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd calculator-ws-secure-webapp 

-mvn

-

-Again this should result in a war file (sample-calculator-ws-webapp.war) in the target 

-directory. Follow the steps described in the previous section for running the web 

-app and for the expected results.

-

-

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/calculator-web.png b/java/sca-contrib/samples/calculator-ws-secure-webapp/calculator-web.png
deleted file mode 100644
index f482b8d1c8..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/calculator-web.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/calculator-web.svg b/java/sca-contrib/samples/calculator-ws-secure-webapp/calculator-web.svg
deleted file mode 100644
index 1b7015b156..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/calculator-web.svg
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\calculator-ws-webapp"
-   sodipodi:docname="calculator-web.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Tuscany\java-head\sca\samples\calculator-ws-webapp\calculator-web.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lend"
-       style="overflow:visible;">
-      <path
-         id="path4252"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="330.5192"
-     inkscape:cy="378.84265"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="59"
-     inkscape:window-y="79" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1,0,0,1.144214,0,-27.53557)">
-      <rect
-         rx="15.307091"
-         ry="12.692303"
-         y="192.00233"
-         x="258.31146"
-         height="299.99988"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">Calculator</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="191.57716"
-       x="339.91632"
-       y="262.1673"
-       rx="6.9961648"
-       ry="15.892869" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(79.61125,62.65764)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Calculator</flowPara><flowPara
-         id="flowPara1895">Service</flowPara><flowPara
-         id="flowPara1897">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
-       id="path1883" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1885"
-       transform="translate(-46.16225,128.7269)"
-       style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
-         id="flowRegion1887"><rect
-           id="rect1889"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
-         id="flowPara1891">Calculator</flowPara><flowPara
-         id="flowPara1893">Service</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1899"
-       width="115.66247"
-       height="70.148659"
-       x="594.75488"
-       y="209.73451"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1901"
-       transform="translate(334.4498,10.22481)"><flowRegion
-         id="flowRegion1903"><rect
-           id="rect1905"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1907">Add</flowPara><flowPara
-         id="flowPara1909">Service</flowPara><flowPara
-         id="flowPara1911">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "
-       id="path1913" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1917"
-       width="115.66247"
-       height="70.148659"
-       x="594.06543"
-       y="292.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1919"
-       transform="translate(333.7604,93.08188)"><flowRegion
-         id="flowRegion1921"><rect
-           id="rect1923"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1925">Subtract</flowPara><flowPara
-         id="flowPara1927">Service</flowPara><flowPara
-         id="flowPara1929">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "
-       id="path1931" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1933"
-       width="115.66247"
-       height="70.148659"
-       x="594.77979"
-       y="371.87729"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1935"
-       transform="translate(334.4747,172.3676)"><flowRegion
-         id="flowRegion1937"><rect
-           id="rect1939"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1941">Multiply</flowPara><flowPara
-         id="flowPara1943">Service</flowPara><flowPara
-         id="flowPara1945">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "
-       id="path1947" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1949"
-       width="115.66247"
-       height="70.148659"
-       x="596.20831"
-       y="452.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1951"
-       transform="translate(335.9032,253.0819)"><flowRegion
-         id="flowRegion1953"><rect
-           id="rect1955"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1957">Divide</flowPara><flowPara
-         id="flowPara1959">Service</flowPara><flowPara
-         id="flowPara1961">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "
-       id="path1963" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1965"
-       transform="translate(161.0221,114.967)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1967"><rect
-           id="rect1969"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1973">add</flowPara><flowPara
-         id="flowPara1977">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
-       id="path1979" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1981"
-       transform="translate(160.6632,150.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1983"><rect
-           id="rect1985"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1987">subtract</flowPara><flowPara
-         id="flowPara1989">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
-       id="path1991" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1993"
-       transform="translate(161.3775,184.2583)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1995"><rect
-           id="rect1997"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1999">multiply</flowPara><flowPara
-         id="flowPara2001">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
-       id="path2003" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2005"
-       transform="translate(159.9489,215.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2007"><rect
-           id="rect2009"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara2011">divide</flowPara><flowPara
-         id="flowPara2013">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:4,1;stroke-dashoffset:0"
-       d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
-       id="path2015" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
-       id="path2017" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
-       id="path2019" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
-       id="path2021" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 292.85714,355.52305 L 330,354.80877"
-       id="path2023" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
-       id="path1950"
-       sodipodi:cx="179.28572"
-       sodipodi:cy="352.66592"
-       sodipodi:rx="32.857143"
-       sodipodi:ry="35"
-       d="M 197.59435,323.60313 A 32.857143,35 0 1 1 196.81963,323.06603"
-       sodipodi:start="5.3034219"
-       sodipodi:end="11.558474"
-       sodipodi:open="true"
-       transform="translate(-11.428568,5.714286)" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1952"
-       transform="translate(-134.69216,137.10973)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1954"><rect
-           id="rect1956"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1960">calc.jsp</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 235,356.23734 C 200.71429,356.23734 200.71429,356.23734 200.71429,356.23734"
-       id="path1972" />
-    <rect
-       style="opacity:0.21666667;fill:#3d2020;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:4, 1;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2246"
-       width="56.428566"
-       height="317.85715"
-       x="57.14286"
-       y="206.95161"
-       rx="4.7646294"
-       ry="7.7766709" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3221"
-       transform="translate(-214.7771,5.7407504)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3223"><rect
-           id="rect3225"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3227">App</flowPara><flowPara
-         id="flowPara3229">Server</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3231"
-       transform="translate(232.36576,64.312179)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3233"><rect
-           id="rect3235"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3237">SOAP</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3239"
-       transform="translate(249.50862,136.45504)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3241"><rect
-           id="rect3243"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3245">local</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3247"
-       transform="translate(247.27783,197.54805)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3249"><rect
-           id="rect3251"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3253">local</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3255"
-       transform="translate(235.13497,276.11948)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3257"><rect
-           id="rect3259"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3261">local</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
-       d="M 113.57143,238.80877 L 575.71429,238.80877"
-       id="path3263" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 112.85714,359.09448 C 135.71429,359.09448 135.71429,359.09448 135.71429,359.09448"
-       id="path3265" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
-       d="M 478.57143,334.09448 C 499.28571,291.95163 505.71429,287.66591 498.57143,273.3802 C 491.42857,259.09448 477.85714,254.09448 470.71429,253.3802 C 463.57143,252.66591 14.285714,252.66591 14.285714,252.66591 L 13.571429,234.09448 L 57.857143,234.80877"
-       id="path4244" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/pom.xml b/java/sca-contrib/samples/calculator-ws-secure-webapp/pom.xml
deleted file mode 100644
index c6d24f4806..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/pom.xml
+++ /dev/null
@@ -1,102 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-calculator-ws-secure-webapp</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Calculator Sample Web Service enabled for 

-WS Security and in a WebApp</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>   

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->

-        <dependency>

-            <groupId>stax</groupId>

-            <artifactId>stax-api</artifactId>

-            <version>1.0.1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <!-- marking dependency as provided to exclude from war file -->

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.3</version>

-            <scope>provided</scope>

-        </dependency>

-
        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-       <plugins>

-            <plugin>

-                <groupId>org.apache.tuscany.sca</groupId>

-                <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>2.0-SNAPSHOT</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-       </plugins>       

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
deleted file mode 100644
index c7e6383559..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.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 calculator;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The interface for the add service

- */

-@Remotable

-public interface AddService {

-

-    double add(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index c79c7b0395..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * An implementation of the Add service

- */

-@Service(AddService.class)

-public class AddServiceImpl implements AddService {

-

-    public double add(double n1, double n2) {

-        System.err.println("********* Adding ***** " + n1 + " to " + n2);

-        System.err.println("Adding " + n1 + " to " + n2);

-        return n1 + n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 4787b728f4..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,47 +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 calculator;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * and locate and invoke a SCA component

- * 

- * (not really necessary as this sample runs in a webapp)

- */

-public class CalculatorClient {

-    public static void main(String[] args) throws Exception {

-

-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");

-        CalculatorService calculatorService = 

-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");

-

-        // Calculate

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-        

-        scaDomain.close();

-

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ad87375529..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-

-/**

- * The Calculator service interface.

- */

-public interface CalculatorService {

-

-    double add(double n1, double n2);

-

-    double subtract(double n1, double n2);

-

-    double multiply(double n1, double n2);

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 0f03d6e7a1..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,69 +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 calculator;

-

-import org.oasisopen.sca.annotation.Reference;

-

-/**

- * An implementation of the Calculator service.

- */

-public class CalculatorServiceImpl implements CalculatorService {

-

-    private AddService addService;

-    private SubtractService subtractService;

-    private MultiplyService multiplyService;

-    private DivideService divideService;

-

-    @Reference

-    public void setAddService(AddService addService) {

-        this.addService = addService;

-    }

-

-    @Reference

-    public void setSubtractService(SubtractService subtractService) {

-        this.subtractService = subtractService;

-    }

-

-    @Reference

-    public void setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-

-    @Reference

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-

-    public double add(double n1, double n2) {

-        return addService.add(n1, n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        return multiplyService.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        return divideService.divide(n1, n2);

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the divide service

- */

-public interface DivideService {

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Divide service.

- */

-public class DivideServiceImpl implements DivideService {

-

-    public double divide(double n1, double n2) {

-        return n1 / n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the multiply service

- */

-public interface MultiplyService {

-

-    double multiply(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Multiply service.

- */

-public class MultiplyServiceImpl implements MultiplyService {

-

-    public double multiply(double n1, double n2) {

-        return n1 * n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 8f6af2f224..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.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 calculator;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The interface for the subtract service

- */

-@Remotable

-public interface SubtractService {

-

-    double subtract(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the subtract service.

- */

-public class SubtractServiceImpl implements SubtractService {

-

-    public double subtract(double n1, double n2) {

-        return n1 - n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
deleted file mode 100644
index 9625c0d692..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.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 calculator.security;

-

-import java.io.IOException;

-

-import javax.security.auth.callback.Callback;

-import javax.security.auth.callback.CallbackHandler;

-import javax.security.auth.callback.UnsupportedCallbackException;

-

-import org.apache.ws.security.WSPasswordCallback;

-

-/**

- * Sample userid passwd generation class

- */

-public class ClientPWCBHandler implements CallbackHandler {

-

-    public void handle(Callback[] callbacks) throws IOException,

-            UnsupportedCallbackException {

-        for (int i = 0; i < callbacks.length; i++) {

-        	System.out.println("*** Calling Client UserId/Password Handler .... ");

-            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];

-            System.out.println("User Id = " + pwcb.getIdentifer());

-            System.out.println("Set Password = " + pwcb.getPassword());

-            System.out.println("Usage = " + pwcb.getUsage());

-            if ( pwcb.getUsage() == WSPasswordCallback.USERNAME_TOKEN ) {

-                if ( pwcb.getIdentifer().equals("CalculatorUser")){

-                    pwcb.setPassword("CalculatorUserPasswd");

-                } else {

-                    throw new UnsupportedCallbackException(pwcb, "Authentication Failed : UserId - Password mismatch");

-                }

-            } else if ( pwcb.getUsage() == WSPasswordCallback.SIGNATURE ) {

-                if ( pwcb.getIdentifer().equals("CalculatorUser")) {

-                    pwcb.setPassword("CalculatorUserPasswd");

-                } else {

-                    pwcb.setPassword("CalculatorAdmin");

-                }

-            }

-        }

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
deleted file mode 100644
index 23a62680c5..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.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 calculator.security;

-

-import java.io.IOException;

-

-import javax.security.auth.callback.Callback;

-import javax.security.auth.callback.CallbackHandler;

-import javax.security.auth.callback.UnsupportedCallbackException;

-

-import org.apache.ws.security.WSPasswordCallback;

-

-/**

- * Sample userid passwd generation class 

- */

-public class ServerPWCBHandler implements CallbackHandler {

-

-    public void handle(Callback[] callbacks) throws IOException,

-            UnsupportedCallbackException {

-    	for (int i = 0; i < callbacks.length; i++) {

-            System.out.println("*** Calling Server User/Passwd Handler....");

-            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];

-            System.out.println("User Id = " + pwcb.getIdentifer());

-            System.out.println("Password = " + pwcb.getPassword());

-            System.out.println("Usage = " + pwcb.getUsage());

-            if ( pwcb.getUsage() == WSPasswordCallback.USERNAME_TOKEN_UNKNOWN ) {

-                if ( pwcb.getIdentifer().equals("CalculatorUser") &&

-                        pwcb.getPassword().equals("CalculatorUserPasswd") ){

-                            return;

-                } else {

-                    throw new UnsupportedCallbackException(pwcb, "Authentication Failed : UserId - Password mismatch");

-                }

-            } else if ( pwcb.getUsage() == WSPasswordCallback.SIGNATURE ) {

-                if ( pwcb.getIdentifer().equals("CalculatorUser")) {

-                    pwcb.setPassword("CalculatorUserPasswd");

-                } else {

-                    pwcb.setPassword("CalculatorAdmin");

-                }

-            }

-        }

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
deleted file mode 100644
index 4d511f887e..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,67 +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:sca="http://www.osoa.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           xmlns:calc="http://calculator"

-           name="Calculator">

-

-    <component name="CalculatorServiceComponent">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <reference name="addService" >

-           <interface.java interface="calculator.AddService" />        

-            <binding.ws uri="http://localhost:8080/sample-calculator-ws-secure-webapp/AddServiceComponent"

-            			requires="authentication" />        

-        </reference>   

-        <reference name="subtractService">

-        	<interface.java interface="calculator.SubtractService" />        

-            <binding.ws uri="http://localhost:8080/sample-calculator-ws-secure-webapp/SubtractServiceComponent"

-            			requires="integrity" />

-        </reference>

-        <reference name="multiplyService" target="MultiplyServiceComponent"></reference>

-        <reference name="divideService" target="DivideServiceComponent"></reference>

-    </component>

-

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl"/>

-        <service name="AddService">

-             <interface.java interface="calculator.AddService" />  

-             <binding.ws requires="authentication"/>

-        </service>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl"/>

-        <service name="SubtractService">

-             <interface.java interface="calculator.SubtractService" />  

-             <binding.ws requires="integrity"/>

-        </service>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl"/>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
deleted file mode 100644
index 858e87a34f..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ /dev/null
@@ -1,21 +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.

-# 

-# PolicyHandlerClasses to interpret specific PolicyModels against specific QoS infrastructures

-# handler classname;qname=<policy intent addressed>;model=<policy model class>

-org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyHandler;intent=http://calculator#wsAuthentication,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy

-org.apache.tuscany.sca.policy.security.ws.WSSecurityPolicyHandler;intent=http://calculator#wsIntegrity,model=org.apache.neethi.Policy
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
deleted file mode 100644
index b6b244244b..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
+++ /dev/null
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
deleted file mode 100644
index 4611669bbd..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-<sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"

- 			targetNamespace="http://www.osoa.org/xmlns/sca/1.0"

- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

- 			xmlns:calc="http://calculator">

-

- 

- <!-- WS Security POLICY SETS -->

-  <sca:policySet name="calc:wsAuthenticationPolicy"

- 	provides="sca:authentication"

- 	appliesTo="sca:service/sca:binding.ws"

- 	>

- 	<tuscany:wsConfigParam>

- 		<parameter name="InflowSecurity">

- 			<action>

- 				<items>UsernameToken</items>

- 				<passwordCallbackClass>calculator.security.ServerPWCBHandler</passwordCallbackClass>

-       		</action>

-      	</parameter>

- 	</tuscany:wsConfigParam>

- </sca:policySet>

- 

- <sca:policySet name="calc:wsClientAuthenticationPolicy"

- 	provides="sca:authentication"

- 	appliesTo="sca:reference/sca:binding.ws">

- 	<tuscany:wsConfigParam>

- 		<parameter name="OutflowSecurity">

- 			<action>

- 				<items>UsernameToken</items>

- 				<user>CalculatorUser</user>

-				<passwordCallbackClass>calculator.security.ClientPWCBHandler</passwordCallbackClass>" +

-                <passwordType>PasswordText</passwordType>

-               </action>

-    	</parameter>

- 	</tuscany:wsConfigParam>

- </sca:policySet>

- 

- 

- <sca:policySet name="tuscany:wsSecurityPolicyForIntegrity"

- 	provides="sca:integrity"

- 	appliesTo="sca:service/sca:binding.ws">

- 	<wsp:Policy wsu:Id="SignOnly" 

- 		xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 

- 		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

-		<wsp:ExactlyOne>

-			<wsp:All>

-				<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<wsp:Policy>

-						<sp:InitiatorToken>

-							<wsp:Policy>

-								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">

-									<wsp:Policy>

-										<sp:WssX509V3Token10/>

-									</wsp:Policy>

-								</sp:X509Token>

-							</wsp:Policy>

-						</sp:InitiatorToken>

-						<sp:RecipientToken>

-							<wsp:Policy>

-								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">

-									<wsp:Policy>

-										<sp:WssX509V3Token10/>

-									</wsp:Policy>

-								</sp:X509Token>

-							</wsp:Policy>

-						</sp:RecipientToken>

-						<sp:AlgorithmSuite>

-							<wsp:Policy>

-								<sp:TripleDesRsa15/>

-							</wsp:Policy>

-						</sp:AlgorithmSuite>

-						<sp:Layout>

-							<wsp:Policy>

-								<sp:Strict/>

-							</wsp:Policy>

-						</sp:Layout>

-						<sp:IncludeTimestamp/>

-						<sp:OnlySignEntireHeadersAndBody/>

-					</wsp:Policy>

-				</sp:AsymmetricBinding>

-				<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<wsp:Policy>

-						<sp:MustSupportRefKeyIdentifier/>

-						<sp:MustSupportRefIssuerSerial/>

-					</wsp:Policy>

-				</sp:Wss10>

-				<sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<sp:Body/>

-				</sp:SignedParts>

-	

-				<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 

-					<ramp:user>CalculatorAdmin</ramp:user>

-					<ramp:encryptionUser>CalculatorAdmin</ramp:encryptionUser>

-					<ramp:passwordCallbackClass>calculator.security.ServerPWCBHandler</ramp:passwordCallbackClass>

-					

-					<ramp:signatureCrypto>

-						<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">

-							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>

-							<ramp:property name="org.apache.ws.security.crypto.merlin.file">calculatorKeys.jks</ramp:property>

-							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">CalculatorAdmin</ramp:property>

-						</ramp:crypto>

-					</ramp:signatureCrypto>

-				</ramp:RampartConfig>

-			</wsp:All>

-		</wsp:ExactlyOne>

-	</wsp:Policy>

- </sca:policySet>

- 

- <sca:policySet name="tuscany:wsSecurityPolicyForClientIntegrity"

- 	provides="sca:integrity"

- 	appliesTo="sca:reference/sca:binding.ws">

- 	<wsp:Policy wsu:Id="SignOnly" 

- 		xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 

- 		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

-		<wsp:ExactlyOne>

-			<wsp:All>

-				<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<wsp:Policy>

-						<sp:InitiatorToken>

-							<wsp:Policy>

-								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">

-									<wsp:Policy>

-										<sp:WssX509V3Token10/>

-									</wsp:Policy>

-								</sp:X509Token>

-							</wsp:Policy>

-						</sp:InitiatorToken>

-						<sp:RecipientToken>

-							<wsp:Policy>

-								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">

-									<wsp:Policy>

-										<sp:WssX509V3Token10/>

-									</wsp:Policy>

-								</sp:X509Token>

-							</wsp:Policy>

-						</sp:RecipientToken>

-						<sp:AlgorithmSuite>

-							<wsp:Policy>

-								<sp:TripleDesRsa15/>

-							</wsp:Policy>

-						</sp:AlgorithmSuite>

-						<sp:Layout>

-							<wsp:Policy>

-								<sp:Strict/>

-							</wsp:Policy>

-						</sp:Layout>

-						<sp:IncludeTimestamp/>

-						<sp:OnlySignEntireHeadersAndBody/>

-					</wsp:Policy>

-				</sp:AsymmetricBinding>

-				<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<wsp:Policy>

-						<sp:MustSupportRefKeyIdentifier/>

-						<sp:MustSupportRefIssuerSerial/>

-					</wsp:Policy>

-				</sp:Wss10>

-				<sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<sp:Body/>

-				</sp:SignedParts>

-	

-				<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 

-					<ramp:user>CalculatorAdmin</ramp:user>

-					<ramp:encryptionUser>CalculatorAdmin</ramp:encryptionUser>

-					<ramp:passwordCallbackClass>calculator.security.ClientPWCBHandler</ramp:passwordCallbackClass>

-					

-					<ramp:signatureCrypto>

-						<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">

-							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>

-							<ramp:property name="org.apache.ws.security.crypto.merlin.file">calculatorKeys.jks</ramp:property>

-							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">CalculatorAdmin</ramp:property>

-						</ramp:crypto>

-					</ramp:signatureCrypto>

-				</ramp:RampartConfig>

-			</wsp:All>

-		</wsp:ExactlyOne>

-	</wsp:Policy>

- </sca:policySet>

- 

- </sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/security.properties b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
deleted file mode 100644
index 8ef9928018..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
+++ /dev/null
@@ -1,20 +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.

-## ---------------------------------------------------------------------------

-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin

-org.apache.ws.security.crypto.merlin.keystore.type=jks

-org.apache.ws.security.crypto.merlin.keystore.password=CalculatorAdmin

-org.apache.ws.security.crypto.merlin.file=calculatorKeys.jks

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index fe09ab2e1b..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:Calculator"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index d5c02e354d..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,33 +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.    

--->

-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"

-    xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">

-

-    <d:environment>

-        <d:moduleId>

-            <d:groupId>org.apache.tuscany.sca</d:groupId>

-            <d:artifactId>sample-calculator-ws-webapp</d:artifactId>

-            <d:version>2.0-SNAPSHOT</d:version>

-            <d:type>war</d:type>

-        </d:moduleId>

-        <!-- TUSCANY-1986 -->

-        <d:inverse-classloading />

-    </d:environment>

-</web-app>

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d3a62d39f4..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<!--

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

--->

-

-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web

-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">

-<web-app>

-

-  <display-name>Apache Tuscany Calculator Web Service Sample</display-name>

-

-  <filter>

-    <filter-name>tuscany</filter-name> 

-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 

-  </filter>

-

-  <filter-mapping>

-    <filter-name>tuscany</filter-name> 

-    <url-pattern>/*</url-pattern> 

-  </filter-mapping>

-

-  <welcome-file-list id="WelcomeFileList">

-    <welcome-file>calc.jsp</welcome-file>

-  </welcome-file-list>

-

-</web-app>

diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp b/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
deleted file mode 100644
index 4c4366747d..0000000000
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
+++ /dev/null
@@ -1,50 +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.
---%>

-

-<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>

-<%@ page import="calculator.CalculatorService" %>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
-   SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");
-   CalculatorService calculatorService = (CalculatorService)scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");

-%>
-<html>
-<head><title>Calculator sample</title></head>
-
-<body>
-<table>
-    <tr>
-        <th>Expression</th><th>Result</th>
-    </tr>
-    <tr>
-        <td>2 + 3</td><td><%= calculatorService.add(2, 3) %></td>
-    </tr>
-    <tr>
-        <td>3 - 2</td><td><%= calculatorService.subtract(3, 2) %></td>
-    </tr>

-    <tr>

-        <td>3 * 2</td><td><%= calculatorService.multiply(3, 2) %></td>

-    </tr>

-    <tr>

-        <td>3 / 2</td><td><%= calculatorService.divide(3, 2) %></td>

-    </tr>    
-</table>
-</body>
-</html>

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/README b/java/sca-contrib/samples/calculator-ws-webapp/README
deleted file mode 100644
index a6e6c897e4..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/README
+++ /dev/null
@@ -1,108 +0,0 @@
-Calculator Sample Exposing Web Services In A WebApp

-===================================================

-This sample uses the same code as the calculator sample, it deploys the

-sample wrapped in a web app and exposes the AddService as a web service. 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-As this sample provides a web app there is a manual step where the WAR file

-that contains the sample is copied to your web app container. If you just want 

-to give this sample a go deploy the WAR file (target/sample-calculator-ws-webapp.war)

-to you web application server. 

-  

-Once the web app is deployed use your browser to visit the following URL;

-

-http://localhost:8080/sample-calculator-ws-webapp

-

-The sample is configured to use a service on port 8080. If your servlet container

-is using a port other than 8080 then you will need to edit the Calculator.composite

-and change the uri attribute of the <binding.ws> used by the CalculatorServiceComponent

-to use the correct port.

-

-Sample Overview

----------------

-The sample provides a single calculator service with a default SCA (java) 

-binding. The CalculatorClient exercises this interface by calling add, 

-subtract, multiply and divide operations. This results in messages passing to 

-the appropriate components in the composite.

-

-calculator-webapp/

-  src/

-    main/

-      java/

-        calculator/

-          AddService.java         - As calculator sample

-          AddServiceImpl.java

-          CalculatorClient.java   - As calculator sample

-          CalculatorService.java  - As calculator sample

-          CalculatorServiceImpl.java

-          DivideService.java      - As calculator sample

-          DivideServiceImpl.java

-          MultiplyService.java    - As calculator sample

-          MultiplyServiceImpl.java

-          SubtractService.java    - As calculator sample

-          SubtractServiceImpl.java

-      resources/

-        Calculator.composite      - As calculator sample except that the 

-                                    connection between the CalculatorService

-                                    and the AddService is web services

-      webapp

-        META-INF/

-          sca-contribution.xml    - specifies the composite to be deployed

-        WEB-INF/

-          web.xml                 - defines the listener that starts up the 

-                                    Tuscany SCA runtime and maps service

-                                    calls to the TuscanyServlet

-        calc.jsp                  - the web application that makes use of the

-                                    SCA application 

-           

-  calculator.png - a pictorial representation of the sample .composite file

-  build.xml      - the Ant build file

-  pom.xml        - the Maven build file

-  README         - this file  

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built using Ant as 

-follows

-

-cd calculator-ws-webapp

-ant package

-

-This should result in a war file (sample-calculator-ws-webapp.war) in the target 

-directory. Copy this war file to your web app deployment directory in you

-web app container. 

-

-The process for getting the web app running will depend on which web app container

-you are using. For example, if you are using Tomcat then it is simply a matter

-of copying the WAR file to the webapps directory. 

-

-Once the web app is deployed use your browser to visit the following URL;

-

-http://localhost:8080/sample-calculator-ws-webapp

-

-The port and hostname will of course vary depending on your local installation. 

-

-You should see the following output.

-

-Expression	Result

-2 + 3	5.0

-3 - 2	1.0

-3 * 2	6.0

-3 / 2	1.5

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd calculator-ws-webapp 

-mvn

-

-Again this should result in a war file (sample-calculator-ws-webapp.war) in the target 

-directory. Follow the steps described in the previous section for running the web 

-app and for the expected results.

-

-

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/calculator-web.png b/java/sca-contrib/samples/calculator-ws-webapp/calculator-web.png
deleted file mode 100644
index f482b8d1c8..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/calculator-web.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/calculator-web.svg b/java/sca-contrib/samples/calculator-ws-webapp/calculator-web.svg
deleted file mode 100644
index 1b7015b156..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/calculator-web.svg
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\calculator-ws-webapp"
-   sodipodi:docname="calculator-web.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Tuscany\java-head\sca\samples\calculator-ws-webapp\calculator-web.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lend"
-       style="overflow:visible;">
-      <path
-         id="path4252"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="330.5192"
-     inkscape:cy="378.84265"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="59"
-     inkscape:window-y="79" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1,0,0,1.144214,0,-27.53557)">
-      <rect
-         rx="15.307091"
-         ry="12.692303"
-         y="192.00233"
-         x="258.31146"
-         height="299.99988"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">Calculator</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="191.57716"
-       x="339.91632"
-       y="262.1673"
-       rx="6.9961648"
-       ry="15.892869" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(79.61125,62.65764)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Calculator</flowPara><flowPara
-         id="flowPara1895">Service</flowPara><flowPara
-         id="flowPara1897">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
-       id="path1883" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1885"
-       transform="translate(-46.16225,128.7269)"
-       style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
-         id="flowRegion1887"><rect
-           id="rect1889"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
-         id="flowPara1891">Calculator</flowPara><flowPara
-         id="flowPara1893">Service</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1899"
-       width="115.66247"
-       height="70.148659"
-       x="594.75488"
-       y="209.73451"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1901"
-       transform="translate(334.4498,10.22481)"><flowRegion
-         id="flowRegion1903"><rect
-           id="rect1905"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1907">Add</flowPara><flowPara
-         id="flowPara1909">Service</flowPara><flowPara
-         id="flowPara1911">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "
-       id="path1913" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1917"
-       width="115.66247"
-       height="70.148659"
-       x="594.06543"
-       y="292.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1919"
-       transform="translate(333.7604,93.08188)"><flowRegion
-         id="flowRegion1921"><rect
-           id="rect1923"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1925">Subtract</flowPara><flowPara
-         id="flowPara1927">Service</flowPara><flowPara
-         id="flowPara1929">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "
-       id="path1931" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1933"
-       width="115.66247"
-       height="70.148659"
-       x="594.77979"
-       y="371.87729"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1935"
-       transform="translate(334.4747,172.3676)"><flowRegion
-         id="flowRegion1937"><rect
-           id="rect1939"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1941">Multiply</flowPara><flowPara
-         id="flowPara1943">Service</flowPara><flowPara
-         id="flowPara1945">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "
-       id="path1947" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1949"
-       width="115.66247"
-       height="70.148659"
-       x="596.20831"
-       y="452.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1951"
-       transform="translate(335.9032,253.0819)"><flowRegion
-         id="flowRegion1953"><rect
-           id="rect1955"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1957">Divide</flowPara><flowPara
-         id="flowPara1959">Service</flowPara><flowPara
-         id="flowPara1961">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "
-       id="path1963" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1965"
-       transform="translate(161.0221,114.967)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1967"><rect
-           id="rect1969"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1973">add</flowPara><flowPara
-         id="flowPara1977">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
-       id="path1979" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1981"
-       transform="translate(160.6632,150.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1983"><rect
-           id="rect1985"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1987">subtract</flowPara><flowPara
-         id="flowPara1989">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
-       id="path1991" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1993"
-       transform="translate(161.3775,184.2583)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1995"><rect
-           id="rect1997"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1999">multiply</flowPara><flowPara
-         id="flowPara2001">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
-       id="path2003" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2005"
-       transform="translate(159.9489,215.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2007"><rect
-           id="rect2009"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara2011">divide</flowPara><flowPara
-         id="flowPara2013">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:4,1;stroke-dashoffset:0"
-       d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
-       id="path2015" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
-       id="path2017" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
-       id="path2019" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
-       id="path2021" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 292.85714,355.52305 L 330,354.80877"
-       id="path2023" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
-       id="path1950"
-       sodipodi:cx="179.28572"
-       sodipodi:cy="352.66592"
-       sodipodi:rx="32.857143"
-       sodipodi:ry="35"
-       d="M 197.59435,323.60313 A 32.857143,35 0 1 1 196.81963,323.06603"
-       sodipodi:start="5.3034219"
-       sodipodi:end="11.558474"
-       sodipodi:open="true"
-       transform="translate(-11.428568,5.714286)" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1952"
-       transform="translate(-134.69216,137.10973)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1954"><rect
-           id="rect1956"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1960">calc.jsp</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 235,356.23734 C 200.71429,356.23734 200.71429,356.23734 200.71429,356.23734"
-       id="path1972" />
-    <rect
-       style="opacity:0.21666667;fill:#3d2020;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:4, 1;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2246"
-       width="56.428566"
-       height="317.85715"
-       x="57.14286"
-       y="206.95161"
-       rx="4.7646294"
-       ry="7.7766709" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3221"
-       transform="translate(-214.7771,5.7407504)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3223"><rect
-           id="rect3225"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3227">App</flowPara><flowPara
-         id="flowPara3229">Server</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3231"
-       transform="translate(232.36576,64.312179)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3233"><rect
-           id="rect3235"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3237">SOAP</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3239"
-       transform="translate(249.50862,136.45504)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3241"><rect
-           id="rect3243"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3245">local</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3247"
-       transform="translate(247.27783,197.54805)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3249"><rect
-           id="rect3251"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3253">local</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3255"
-       transform="translate(235.13497,276.11948)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3257"><rect
-           id="rect3259"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3261">local</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
-       d="M 113.57143,238.80877 L 575.71429,238.80877"
-       id="path3263" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 112.85714,359.09448 C 135.71429,359.09448 135.71429,359.09448 135.71429,359.09448"
-       id="path3265" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
-       d="M 478.57143,334.09448 C 499.28571,291.95163 505.71429,287.66591 498.57143,273.3802 C 491.42857,259.09448 477.85714,254.09448 470.71429,253.3802 C 463.57143,252.66591 14.285714,252.66591 14.285714,252.66591 L 13.571429,234.09448 L 57.857143,234.80877"
-       id="path4244" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/pom.xml b/java/sca-contrib/samples/calculator-ws-webapp/pom.xml
deleted file mode 100644
index e0543d94a8..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/pom.xml
+++ /dev/null
@@ -1,102 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-calculator-ws-webapp</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Calculator Sample Web Service in a WebApp</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>   

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->

-        <dependency>

-            <groupId>stax</groupId>

-            <artifactId>stax-api</artifactId>

-            <version>1.0.1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <!-- marking dependency as provided to exclude from war file -->

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.3</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-       <plugins>

-            <plugin>

-                <groupId>org.apache.tuscany.sca</groupId>

-                <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>2.0-SNAPSHOT</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-       </plugins>       

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
deleted file mode 100644
index c7e6383559..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddService.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 calculator;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The interface for the add service

- */

-@Remotable

-public interface AddService {

-

-    double add(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 0af6d681ce..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,34 +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 calculator;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * An implementation of the Add service

- */

-@Service(AddService.class)

-public class AddServiceImpl implements AddService {

-

-    public double add(double n1, double n2) {

-        System.err.println("Adding " + n1 + " to " + n2);

-        return n1 + n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java b/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 4787b728f4..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,47 +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 calculator;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * and locate and invoke a SCA component

- * 

- * (not really necessary as this sample runs in a webapp)

- */

-public class CalculatorClient {

-    public static void main(String[] args) throws Exception {

-

-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");

-        CalculatorService calculatorService = 

-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");

-

-        // Calculate

-        System.out.println("3 + 2=" + calculatorService.add(3, 2));

-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-        

-        scaDomain.close();

-

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ad87375529..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;

-

-

-/**

- * The Calculator service interface.

- */

-public interface CalculatorService {

-

-    double add(double n1, double n2);

-

-    double subtract(double n1, double n2);

-

-    double multiply(double n1, double n2);

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 0f03d6e7a1..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,69 +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 calculator;

-

-import org.oasisopen.sca.annotation.Reference;

-

-/**

- * An implementation of the Calculator service.

- */

-public class CalculatorServiceImpl implements CalculatorService {

-

-    private AddService addService;

-    private SubtractService subtractService;

-    private MultiplyService multiplyService;

-    private DivideService divideService;

-

-    @Reference

-    public void setAddService(AddService addService) {

-        this.addService = addService;

-    }

-

-    @Reference

-    public void setSubtractService(SubtractService subtractService) {

-        this.subtractService = subtractService;

-    }

-

-    @Reference

-    public void setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-

-    @Reference

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-

-    public double add(double n1, double n2) {

-        return addService.add(n1, n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        return multiplyService.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        return divideService.divide(n1, n2);

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java b/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the divide service

- */

-public interface DivideService {

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Divide service.

- */

-public class DivideServiceImpl implements DivideService {

-

-    public double divide(double n1, double n2) {

-        return n1 / n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the multiply service

- */

-public interface MultiplyService {

-

-    double multiply(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the Multiply service.

- */

-public class MultiplyServiceImpl implements MultiplyService {

-

-    public double multiply(double n1, double n2) {

-        return n1 * n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java b/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 30e4e6a56a..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;

-

-/**

- * The interface for the subtract service

- */

-public interface SubtractService {

-

-    double subtract(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;

-

-/**

- * An implementation of the subtract service.

- */

-public class SubtractServiceImpl implements SubtractService {

-

-    public double subtract(double n1, double n2) {

-        return n1 - n2;

-    }

-

-}

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/resources/Calculator.composite b/java/sca-contrib/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
deleted file mode 100644
index 6415d5a896..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,56 +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://sample"

-           xmlns:sample="http://sample"

-           name="Calculator">

-

-    <component name="CalculatorServiceComponent">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <reference name="addService" >

-           <interface.java interface="calculator.AddService" />        

-            <binding.ws uri="http://localhost:8080/sample-calculator-ws-webapp/AddServiceComponent"/>        

-        </reference>   

-        <reference name="subtractService" target="SubtractServiceComponent"></reference>

-        <reference name="multiplyService" target="MultiplyServiceComponent"></reference>

-        <reference name="divideService" target="DivideServiceComponent"></reference>

-    </component>

-

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl"/>

-        <service name="AddService">

-             <interface.java interface="calculator.AddService" />  

-            <binding.ws/>

-        </service>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl"/>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index fe09ab2e1b..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:Calculator"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 59bbb0de83..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
-    xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
-    <d:environment>
-        <d:moduleId>
-            <d:groupId>org.apache.tuscany.sca</d:groupId>
-            <d:artifactId>sample-calculator-ws-webapp</d:artifactId>
-            <d:version>2.0-SNAPSHOT</d:version>
-            <d:type>war</d:type>
-        </d:moduleId>
-
-        <!-- TUSCANY-1986 -->
-        <d:inverse-classloading />
-    </d:environment>
-</web-app>
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d3a62d39f4..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<!--

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

--->

-

-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web

-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">

-<web-app>

-

-  <display-name>Apache Tuscany Calculator Web Service Sample</display-name>

-

-  <filter>

-    <filter-name>tuscany</filter-name> 

-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 

-  </filter>

-

-  <filter-mapping>

-    <filter-name>tuscany</filter-name> 

-    <url-pattern>/*</url-pattern> 

-  </filter-mapping>

-

-  <welcome-file-list id="WelcomeFileList">

-    <welcome-file>calc.jsp</welcome-file>

-  </welcome-file-list>

-

-</web-app>

diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/calc.jsp b/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
deleted file mode 100644
index 4c4366747d..0000000000
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
+++ /dev/null
@@ -1,50 +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.
---%>

-

-<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>

-<%@ page import="calculator.CalculatorService" %>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
-   SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");
-   CalculatorService calculatorService = (CalculatorService)scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");

-%>
-<html>
-<head><title>Calculator sample</title></head>
-
-<body>
-<table>
-    <tr>
-        <th>Expression</th><th>Result</th>
-    </tr>
-    <tr>
-        <td>2 + 3</td><td><%= calculatorService.add(2, 3) %></td>
-    </tr>
-    <tr>
-        <td>3 - 2</td><td><%= calculatorService.subtract(3, 2) %></td>
-    </tr>

-    <tr>

-        <td>3 * 2</td><td><%= calculatorService.multiply(3, 2) %></td>

-    </tr>

-    <tr>

-        <td>3 / 2</td><td><%= calculatorService.divide(3, 2) %></td>

-    </tr>    
-</table>
-</body>
-</html>

diff --git a/java/sca-contrib/samples/calculator2/README b/java/sca-contrib/samples/calculator2/README
deleted file mode 100644
index ceb532faed..0000000000
--- a/java/sca-contrib/samples/calculator2/README
+++ /dev/null
@@ -1,97 +0,0 @@
-Calculator Sample
-=================
-This sample implements a simple calculator using SCA components. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator.jar calculator.CalculatorClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java) 
-binding. The CalculatorClient exercises this interface by calling add, 
-subtract, multiply and divide operations. This results in messages passing to 
-the appropriate components in the composite across the local wires.
-
-calculator/
-  src/
-    main/
-      java/
-        calculator/
-          CalculatorService.java  - the first component, calls +-/* as 
-                                    appropriate
-          CalculatorServiceImpl.java
-          AddService.java         - adds two numbers
-          AddServiceImpl.java
-          SubtractService.java    - subtracts one number from another
-          SubtractServiceImpl.java
-          MultiplyService.java    - multiplies two numbers
-          MultiplyServiceImpl.java
-          DivideService.java      - divides one number by another
-          DivideServiceImpl.java
-          CalculatorClient.java   - starts the SCA Runtime and 
-                                    deploys the Calculator.composite. 
-                                    It then calls the deployed Calculator 
-                                    Components services
-      resources/
-        Calculator.composite      - the SCA assembly for this sample
-    test/
-      java/
-        calculator/
-          CalculatorTestCase.java - JUnit test case 
-  calculator.png                  - a pictorial representation of the sample 
-                                    .composite file
-  build.xml                       - the Ant build file
-  pom.xml                         - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd calculator
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] 3 + 2=5.0
-     [java] 3 - 2=1.0
-     [java] 3 * 2=6.0
-     [java] 3 / 2=1.5
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd calculator
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.272 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/calculator2/build.xml b/java/sca-contrib/samples/calculator2/build.xml
deleted file mode 100644
index c4b755ef94..0000000000
--- a/java/sca-contrib/samples/calculator2/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="calculator" default="compile">
-    <property name="test.class" value="calculator.CalculatorClient" />
-	<property name="test.jar"   value="sample-calculator.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>	
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/calculator2/calculator.png b/java/sca-contrib/samples/calculator2/calculator.png
deleted file mode 100644
index 995a57b1fd..0000000000
--- a/java/sca-contrib/samples/calculator2/calculator.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/calculator2/calculator.svg b/java/sca-contrib/samples/calculator2/calculator.svg
deleted file mode 100644
index 0615925c50..0000000000
--- a/java/sca-contrib/samples/calculator2/calculator.svg
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator"
-   sodipodi:docname="calculator.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator\calculator.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="471.80491"
-     inkscape:cy="378.84265"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="59"
-     inkscape:window-y="79" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1,0,0,1.144214,0,-27.53557)">
-      <rect
-         rx="15.307091"
-         ry="12.692303"
-         y="192.00233"
-         x="258.31146"
-         height="299.99988"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">Calculator</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="191.57716"
-       x="339.91632"
-       y="262.1673"
-       rx="6.9961648"
-       ry="15.892869" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(79.61125,62.65764)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Calculator</flowPara><flowPara
-         id="flowPara1895">Service</flowPara><flowPara
-         id="flowPara1897">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
-       id="path1883" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1885"
-       transform="translate(-46.16225,128.7269)"
-       style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
-         id="flowRegion1887"><rect
-           id="rect1889"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
-         id="flowPara1891">Calculator</flowPara><flowPara
-         id="flowPara1893">Service</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1899"
-       width="115.66247"
-       height="70.148659"
-       x="594.75488"
-       y="209.73451"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1901"
-       transform="translate(334.4498,10.22481)"><flowRegion
-         id="flowRegion1903"><rect
-           id="rect1905"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1907">Add</flowPara><flowPara
-         id="flowPara1909">Service</flowPara><flowPara
-         id="flowPara1911">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "
-       id="path1913" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1917"
-       width="115.66247"
-       height="70.148659"
-       x="594.06543"
-       y="292.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1919"
-       transform="translate(333.7604,93.08188)"><flowRegion
-         id="flowRegion1921"><rect
-           id="rect1923"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1925">Subtract</flowPara><flowPara
-         id="flowPara1927">Service</flowPara><flowPara
-         id="flowPara1929">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "
-       id="path1931" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1933"
-       width="115.66247"
-       height="70.148659"
-       x="594.77979"
-       y="371.87729"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1935"
-       transform="translate(334.4747,172.3676)"><flowRegion
-         id="flowRegion1937"><rect
-           id="rect1939"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1941">Multiply</flowPara><flowPara
-         id="flowPara1943">Service</flowPara><flowPara
-         id="flowPara1945">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "
-       id="path1947" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1949"
-       width="115.66247"
-       height="70.148659"
-       x="596.20831"
-       y="452.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1951"
-       transform="translate(335.9032,253.0819)"><flowRegion
-         id="flowRegion1953"><rect
-           id="rect1955"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1957">Divide</flowPara><flowPara
-         id="flowPara1959">Service</flowPara><flowPara
-         id="flowPara1961">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "
-       id="path1963" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1965"
-       transform="translate(161.0221,114.967)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1967"><rect
-           id="rect1969"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1973">add</flowPara><flowPara
-         id="flowPara1977">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
-       id="path1979" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1981"
-       transform="translate(160.6632,150.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1983"><rect
-           id="rect1985"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1987">subtract</flowPara><flowPara
-         id="flowPara1989">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
-       id="path1991" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1993"
-       transform="translate(161.3775,184.2583)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1995"><rect
-           id="rect1997"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1999">multiply</flowPara><flowPara
-         id="flowPara2001">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
-       id="path2003" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2005"
-       transform="translate(159.9489,215.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2007"><rect
-           id="rect2009"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara2011">divide</flowPara><flowPara
-         id="flowPara2013">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
-       id="path2015" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
-       id="path2017" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
-       id="path2019" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
-       id="path2021" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 292.85714,355.52305 L 330,354.80877"
-       id="path2023" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/calculator2/pom.xml b/java/sca-contrib/samples/calculator2/pom.xml
deleted file mode 100644
index 1f95585cbe..0000000000
--- a/java/sca-contrib/samples/calculator2/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-calculator2</artifactId>
-    <name>Apache Tuscany SCA Calculator Sample</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-scdl4j</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-runtime2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/AddService.java b/java/sca-contrib/samples/calculator2/src/main/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/samples/calculator2/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorClient.java b/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 9d180bf52e..0000000000
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorClient.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.    
- */
-
-package calculator;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
-        
-        CalculatorService calculatorService = 
-            scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-
-        // Calculate
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 17fad7de6b..0000000000
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/DivideService.java b/java/sca-contrib/samples/calculator2/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/samples/calculator2/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/SubtractService.java b/java/sca-contrib/samples/calculator2/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/calculator2/src/main/resources/Calculator.composite b/java/sca-contrib/samples/calculator2/src/main/resources/Calculator.composite
deleted file mode 100644
index 90872041b0..0000000000
--- a/java/sca-contrib/samples/calculator2/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,49 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java b/java/sca-contrib/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index 775ad15537..0000000000
--- a/java/sca-contrib/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java
+++ /dev/null
@@ -1,51 +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 calculator;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CalculatorTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCADomain scaDomain;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("Calculator.composite");
-        calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testCalculator() throws Exception {
-        // Calculate
-        assertEquals(calculatorService.add(3, 2), 5.0);
-        assertEquals(calculatorService.subtract(3, 2), 1.0);
-        assertEquals(calculatorService.multiply(3, 2), 6.0);
-        assertEquals(calculatorService.divide(3, 2), 1.5);
-    }
-}
diff --git a/java/sca-contrib/samples/callback-ws-client/README b/java/sca-contrib/samples/callback-ws-client/README
deleted file mode 100644
index 66121362c9..0000000000
--- a/java/sca-contrib/samples/callback-ws-client/README
+++ /dev/null
@@ -1,311 +0,0 @@
-Callback Web Services Client Sample

-===================================

-This sample demonstrates an SCA client that sends service requests to a

-remote server and receives asynchronous callbacks from the server, using

-Web service bindings for the service and the callback. 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples.  Take a look

-there first. 

-

-If you just want to run it to see what happens, you need to start the

-server first, so open a command prompt and navigate to the

-callback-ws-service sample directory and do: 

-

-ant run

-

-OR if you don't have ant, on Windows do:

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-callback-ws-service.jar myserver.CallbackServer

-

-and on *nix do:

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-callback-ws-service.jar myserver.CallbackServer

-

-Once the server is running open a command prompt, navigate to this sample 

-directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows do:

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-callback-ws-client.jar myapp.MyClientImpl

-

-and on *nix do:

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-callback-ws-client.jar myapp.MyClientImpl

-

-

-Sample Overview

----------------

-The sample has a single component that has a reference with a service

-interface and a callback interface, with Web service bindings for both

-these interfaces.  The service interface binding URI identifies the

-service exposed by the callback-ws-service sample.

-

-callback-ws-client/

-  src/

-    main/

-      java/

-        myapp/

-          MyClient.java                - interface description for 

-                                         MyClientComponent

-          MyClientImpl.java            - component implementation

-        myserver/

-          MyService.java               - interface description for 

-                                         MyServiceComponent

-          MyServiceCallback.java       - interface description for callback 

-      resources/

-        myapp.composite                - the SCA assembly for this sample

-    test/

-      java/

-        myapp/

-          CallbackClientTestCase.java  - JUnit test case 

-  callback-ws-client.png               - a pictorial representation of the 

-                                         sample .composite file

-  build.xml                            - the Ant build file

-  pom.xml                              - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant.

-Before you do this, run the callback-ws-service sample to start up the

-service that the client will talk to.  Take a look at the README in

-that sample and you will see you need the following commands:

-

-cd callback-ws-service

-ant run

-

-You can then compile and run this sample using the following commands:

-

-cd callback-ws-client

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] 15-Jan-2008 10:21:38 org.apache.tuscany.sca.node.impl.SCADomainProxy

-Impl init

-     [java] INFO: Domain will be started stand-alone as domain URL is not provid

-ed

-     [java] 15-Jan-2008 10:21:39 org.apache.tuscany.sca.domain.impl.SCADomainImp

-l registerNode

-     [java] INFO: Registered node: http://L3AW203:1336 at endpoint http://L3AW20

-3:1336

-     [java] 15-Jan-2008 10:21:39 org.apache.tuscany.sca.node.impl.SCADomainProxy

-Impl createRuntime

-     [java] INFO: Domain management configured from file:/C:/simon/tuscany/relea

-se/sca-r1.1-rc2/tuscany-sca-1.1-incubating-SNAPSHOT/lib/tuscany-sca-all-1.1-incu

-bating-SNAPSHOT.jar

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] 15-Jan-2008 10:21:48 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:1336/SCADomainEventServi

-ceProxyComponent

-     [java] 15-Jan-2008 10:21:48 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:1336/SCADomainAPIService

-ProxyComponent

-     [java] 15-Jan-2008 10:21:48 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:1336/SCANodeManagerCompo

-nent/SCANodeManagerService

-     [java] 15-Jan-2008 10:21:48 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:1336/SCANodeManagerCompo

-nent/ComponentManagerService/*

-     [java] 15-Jan-2008 10:21:48 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:1336/SCANodeManagerCompo

-nent/ComponentManagerService

-     [java] 15-Jan-2008 10:21:48 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:1336/SCADomain/scaDomain

-.js

-     [java] 15-Jan-2008 10:21:48 org.apache.tuscany.sca.node.impl.SCANodeImpl ac

-tivateComposite

-     [java] INFO: Building composite: {http://myapp}myapp

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] 15-Jan-2008 10:21:48 org.apache.tuscany.sca.node.impl.SCANodeImpl st

-artComposite

-     [java] INFO: Starting composite: {http://myapp}myapp

-     [java] 15-Jan-2008 10:21:48 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:1336/MyClientComponent/m

-yService

-     [java] aClientMethod on thread Thread[main,5,main]

-     [java] aClientMethod return from someMethod on thread Thread[main,5,main]

-     [java] receiveResult on thread Thread[pool-1-thread-2,5,main]

-     [java] Result:  -> someMethod  -> receiveResult

-     [java] Closing the domain

-     [java] 15-Jan-2008 10:21:54 org.apache.tuscany.sca.node.impl.SCANodeImpl st

-opComposite

-     [java] INFO: Stopping composite: {http://myapp}myapp

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and

-run  using Maven as follows.  When using Maven you don't need to run the

-callback-ws-service sample first as Maven does this for you.  With Maven,

-both client and server code run in the same JVM, which rather defeats the

-purpose of this sample (to show a standalone SCA client), but it's good

-enough for a unit test. 

-

-cd callback-ws-client

-mvn

-

-You should see the following output from the test phase.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running myapp.CallbackClientTestCase

-15-Jan-2008 10:17:46 org.apache.tuscany.sca.node.impl.SCADomainProxyImpl init

-INFO: Domain will be started stand-alone as domain URL is not provided

-15-Jan-2008 10:17:46 org.apache.tuscany.sca.domain.impl.SCADomainImpl registerNo

-de

-INFO: Registered node: http://L3AW203:1322 at endpoint http://L3AW203:1322

-15-Jan-2008 10:17:46 org.apache.tuscany.sca.node.impl.SCADomainProxyImpl createR

-untime

-INFO: Domain management configured from file:/C:/Documents%20and%20Settings/slaw

-s/.m2/repository/org/apache/tuscany/sca/tuscany-node-impl/1.1-incubating-SNAPSHO

-T/tuscany-node-impl-1.1-incubating-SNAPSHOT.jar

-15-Jan-2008 10:17:52 org.apache.catalina.core.StandardEngine start

-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10

-15-Jan-2008 10:17:53 org.apache.catalina.startup.ContextConfig defaultWebConfig

-INFO: No default web.xml

-15-Jan-2008 10:17:53 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd

-15-Jan-2008 10:17:53 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_

-1.dtd

-15-Jan-2008 10:17:53 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_

-2.dtd

-15-Jan-2008 10:17:53 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_

-0.xsd

-15-Jan-2008 10:17:53 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs

-d

-15-Jan-2008 10:17:53 org.apache.coyote.http11.Http11Protocol init

-INFO: Initializing Coyote HTTP/1.1 on http-1322

-15-Jan-2008 10:17:53 org.apache.coyote.http11.Http11Protocol start

-INFO: Starting Coyote HTTP/1.1 on http-1322

-15-Jan-2008 10:17:53 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1322/SCADomainEventServiceProxyCompo

-nent

-15-Jan-2008 10:17:53 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1322/SCADomainAPIServiceProxyCompone

-nt

-15-Jan-2008 10:17:53 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1322/SCANodeManagerComponent/SCANode

-ManagerService

-15-Jan-2008 10:17:53 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1322/SCANodeManagerComponent/Compone

-ntManagerService/*

-15-Jan-2008 10:17:53 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1322/SCANodeManagerComponent/Compone

-ntManagerService

-15-Jan-2008 10:17:53 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1322/SCADomain/scaDomain.js

-15-Jan-2008 10:17:53 org.apache.tuscany.sca.node.impl.SCANodeImpl activateCompos

-ite

-INFO: Building composite: {http://callbackws}callbackws

-15-Jan-2008 10:17:54 org.apache.tuscany.sca.node.impl.SCANodeImpl startComposite

-

-INFO: Starting composite: {http://callbackws}callbackws

-15-Jan-2008 10:17:54 org.apache.catalina.core.StandardEngine start

-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10

-15-Jan-2008 10:17:54 org.apache.catalina.startup.ContextConfig defaultWebConfig

-INFO: No default web.xml

-15-Jan-2008 10:17:54 org.apache.coyote.http11.Http11Protocol init

-INFO: Initializing Coyote HTTP/1.1 on http-8086

-15-Jan-2008 10:17:54 org.apache.coyote.http11.Http11Protocol start

-INFO: Starting Coyote HTTP/1.1 on http-8086

-15-Jan-2008 10:17:54 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:8086/MyServiceComponent

-15-Jan-2008 10:17:54 org.apache.tuscany.sca.node.impl.SCADomainProxyImpl init

-INFO: Domain will be started stand-alone as domain URL is not provided

-15-Jan-2008 10:17:54 org.apache.tuscany.sca.domain.impl.SCADomainImpl registerNo

-de

-INFO: Registered node: http://L3AW203:1323 at endpoint http://L3AW203:1323

-15-Jan-2008 10:17:54 org.apache.tuscany.sca.node.impl.SCADomainProxyImpl createR

-untime

-INFO: Domain management configured from file:/C:/Documents%20and%20Settings/slaw

-s/.m2/repository/org/apache/tuscany/sca/tuscany-node-impl/1.1-incubating-SNAPSHO

-T/tuscany-node-impl-1.1-incubating-SNAPSHOT.jar

-15-Jan-2008 10:17:56 org.apache.catalina.core.StandardEngine start

-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10

-15-Jan-2008 10:17:56 org.apache.catalina.startup.ContextConfig defaultWebConfig

-INFO: No default web.xml

-15-Jan-2008 10:17:56 org.apache.coyote.http11.Http11Protocol init

-INFO: Initializing Coyote HTTP/1.1 on http-1323

-15-Jan-2008 10:17:56 org.apache.coyote.http11.Http11Protocol start

-INFO: Starting Coyote HTTP/1.1 on http-1323

-15-Jan-2008 10:17:56 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1323/SCADomainEventServiceProxyCompo

-nent

-15-Jan-2008 10:17:56 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1323/SCADomainAPIServiceProxyCompone

-nt

-15-Jan-2008 10:17:56 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1323/SCANodeManagerComponent/SCANode

-ManagerService

-15-Jan-2008 10:17:56 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1323/SCANodeManagerComponent/Compone

-ntManagerService/*

-15-Jan-2008 10:17:56 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1323/SCANodeManagerComponent/Compone

-ntManagerService

-15-Jan-2008 10:17:56 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1323/SCADomain/scaDomain.js

-15-Jan-2008 10:17:56 org.apache.tuscany.sca.node.impl.SCANodeImpl activateCompos

-ite

-INFO: Building composite: {http://myapp}myapp

-15-Jan-2008 10:17:57 org.apache.tuscany.sca.node.impl.SCANodeImpl startComposite

-

-INFO: Starting composite: {http://myapp}myapp

-15-Jan-2008 10:17:57 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1323/MyClientComponent/myService

-aClientMethod on thread Thread[main,5,main]

-aClientMethod return from someMethod on thread Thread[main,5,main]

-setMyServiceCallback on thread Thread[pool-1-thread-1,5,main]

-someMethod on thread Thread[pool-1-thread-1,5,main]

-Sleeping ...

-receiveResult on thread Thread[pool-2-thread-1,5,main]

-Result:  -> someMethod  -> receiveResult

-Closing the domain

-15-Jan-2008 10:18:02 org.apache.tuscany.sca.node.impl.SCANodeImpl stopComposite

-INFO: Stopping composite: {http://myapp}myapp

-15-Jan-2008 10:18:03 org.apache.coyote.http11.Http11Protocol destroy

-INFO: Stopping Coyote HTTP/1.1 on http-1323

-15-Jan-2008 10:18:03 org.apache.tuscany.sca.node.impl.SCANodeImpl stopComposite

-INFO: Stopping composite: {http://callbackws}callbackws

-15-Jan-2008 10:18:03 org.apache.coyote.http11.Http11Protocol destroy

-INFO: Stopping Coyote HTTP/1.1 on http-8086

-15-Jan-2008 10:18:03 org.apache.coyote.http11.Http11Protocol destroy

-INFO: Stopping Coyote HTTP/1.1 on http-1322

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.343 sec

-

-This shows that the Junit test cases have run successfully. 

diff --git a/java/sca-contrib/samples/callback-ws-client/build.xml b/java/sca-contrib/samples/callback-ws-client/build.xml
deleted file mode 100644
index 8698c6018d..0000000000
--- a/java/sca-contrib/samples/callback-ws-client/build.xml
+++ /dev/null
@@ -1,73 +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.    

--->

-<project name="callback-ws-client" default="compile">

-    <property name="test.class"   value="myapp.MyClientImpl" />

-    <property name="test.jar"     value="sample-callback-ws-client.jar" />

-    <property name="manifest.jar" value="../../lib/tuscany-sca-manifest.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="${manifest.jar}"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="${manifest.jar}"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="${manifest.jar}"/>

-            </classpath>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/callback-ws-client/callback-ws-client.png b/java/sca-contrib/samples/callback-ws-client/callback-ws-client.png
deleted file mode 100644
index 802ef604a7..0000000000
--- a/java/sca-contrib/samples/callback-ws-client/callback-ws-client.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/callback-ws-client/callback-ws-client.svg b/java/sca-contrib/samples/callback-ws-client/callback-ws-client.svg
deleted file mode 100644
index f49aeadbbf..0000000000
--- a/java/sca-contrib/samples/callback-ws-client/callback-ws-client.svg
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-panic\sca\samples\callback-ws-client"
-   sodipodi:docname="callback-ws-client.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\tuscany\java-panic\sca\samples\callback-ws-client\callback-ws-client.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3156"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lend"
-       style="overflow:visible;">
-      <path
-         id="path3159"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="541.4664"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="20"
-     inkscape:window-y="108" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.991389,0,0,1,2.215655,0)">
-      <rect
-         rx="13.79423"
-         ry="12.692303"
-         y="192.00233"
-         x="258.3114"
-         height="299.99988"
-         width="446.72086"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">myapp</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.1793592;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.48311"
-       height="102.11218"
-       x="432.14886"
-       y="307.25729"
-       rx="6.9853158"
-       ry="8.4710283" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(176.75411,112.37196)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1883">MyClient</flowPara><flowPara
-         id="flowPara1885">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.66918468px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 522.56713,320.15377 L 601.02826,320.15377 L 615.2939,359.90348 L 598.65065,396.59555 L 522.56713,396.59555 L 540.39923,359.90348 L 522.56713,320.15377 z "
-       id="path3019" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1889"
-       transform="translate(428.94909,104.83236)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1891"><rect
-           id="rect1893"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1897">http://localhost:8086/MyServiceComponent</flowPara><flowPara
-         id="flowPara1899" /></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.1331737px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Lend);stroke-opacity:1"
-       d="M 615.78087,359.02789 C 771.36198,358.44679 771.36198,358.44679 771.36198,358.44679"
-       id="path1901" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.25983226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 590.28235,358.74035 L 548.70563,358.74035 L 541.14624,375.4515 L 549.96553,390.87719 L 590.28235,390.87719 L 580.83309,375.4515 L 590.28235,358.74035 z "
-       id="path3361" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3363"
-       transform="translate(259.75287,116.56324)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3365"><rect
-           id="rect3367"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3371">myservice</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3375"
-       transform="translate(261.18143,157.27752)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3377"><rect
-           id="rect3379"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3383">callback</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.2524904;stroke-linecap:butt;stroke-linejoin:miter;marker-end:none;stroke-opacity:1;marker-start:url(#Arrow1Lstart);stroke-miterlimit:4;stroke-dasharray:7.51494241,1.2524904;stroke-dashoffset:0"
-       d="M 580.12625,376.03803 C 772.7309,375.46458 772.7309,375.46458 772.7309,375.46458"
-       id="path3387" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/callback-ws-client/pom.xml b/java/sca-contrib/samples/callback-ws-client/pom.xml
deleted file mode 100644
index 4ac9e6cf81..0000000000
--- a/java/sca-contrib/samples/callback-ws-client/pom.xml
+++ /dev/null
@@ -1,86 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-callback-ws-client</artifactId>

-    <name>Apache Tuscany SCA Callback Web Service Remote Client Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>       

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>sample-callback-ws-service</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>        

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/callback-ws-client/src/main/java/myapp/MyClient.java b/java/sca-contrib/samples/callback-ws-client/src/main/java/myapp/MyClient.java
deleted file mode 100644
index 329edbe1c8..0000000000
--- a/java/sca-contrib/samples/callback-ws-client/src/main/java/myapp/MyClient.java
+++ /dev/null
@@ -1,29 +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 myapp;

-

-import org.oasisopen.sca.annotation.OneWay;

-

-/**

- * The client interface

- */

-public interface MyClient {

-

-    void aClientMethod();

-}

diff --git a/java/sca-contrib/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java b/java/sca-contrib/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
deleted file mode 100644
index 4f3a3bb63b..0000000000
--- a/java/sca-contrib/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
+++ /dev/null
@@ -1,64 +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 myapp;

-

-import myserver.MyService;

-import myserver.MyServiceCallback;

-

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Remote Web service client with callback interface

- */

-@Service(MyClient.class)

-@Scope("COMPOSITE")

-public class MyClientImpl implements MyClient, MyServiceCallback {

-    @Reference

-    protected MyService myService;

-

-    public void aClientMethod() {

-        System.out.println("aClientMethod on thread " + Thread.currentThread());

-        myService.someMethod(" -> someMethod ");  // calls the server

-        System.out.println("aClientMethod return from someMethod on thread " + Thread.currentThread());

-    }

-

-    public void receiveResult(String result) {

-        System.out.println("receiveResult on thread " + Thread.currentThread());

-        System.out.println("Result: " + result);  // callback from the server

-    }

-

-    public static void main(String[] args) throws Exception {

-        SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("myapp.composite", MyClientImpl.class.getClassLoader());

-        node.start();

-        run(node);

-        System.out.println("Closing the domain");

-        node.stop();

-    }

-

-    public static void run(SCANode node) throws InterruptedException {

-        MyClient myClient = ((SCAClient)node).getService(MyClient.class, "MyClientComponent");

-        myClient.aClientMethod();

-        Thread.sleep(5000);  // don't exit before callback arrives

-    }

-}

diff --git a/java/sca-contrib/samples/callback-ws-client/src/main/java/myserver/MyService.java b/java/sca-contrib/samples/callback-ws-client/src/main/java/myserver/MyService.java
deleted file mode 100644
index 9bc056318b..0000000000
--- a/java/sca-contrib/samples/callback-ws-client/src/main/java/myserver/MyService.java
+++ /dev/null
@@ -1,34 +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 myserver;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The remote service that will be invoked by the client

- */

-@Remotable

-@Callback(MyServiceCallback.class)

-public interface MyService {

-

-    @OneWay

-    void someMethod(String arg);

-}

diff --git a/java/sca-contrib/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java b/java/sca-contrib/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
deleted file mode 100644
index caef8fcc98..0000000000
--- a/java/sca-contrib/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
+++ /dev/null
@@ -1,30 +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 myserver;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The callback interface for {@link MyService}.

- */

-@Remotable

-public interface MyServiceCallback {

-

-    void receiveResult(String result);

-}

diff --git a/java/sca-contrib/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 314747d548..0000000000
--- a/java/sca-contrib/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:app="http://myapp">

-    <deployable composite="app:myapp" />

-</contribution>

diff --git a/java/sca-contrib/samples/callback-ws-client/src/main/resources/myapp.composite b/java/sca-contrib/samples/callback-ws-client/src/main/resources/myapp.composite
deleted file mode 100644
index 5b776d6df8..0000000000
--- a/java/sca-contrib/samples/callback-ws-client/src/main/resources/myapp.composite
+++ /dev/null
@@ -1,36 +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://myapp"

-        name="myapp">

-

-    <component name="MyClientComponent">

-        <implementation.java class="myapp.MyClientImpl" />

-        <reference name="myService">

-            <interface.java interface="myserver.MyService"

-                    callbackInterface="myserver.MyServiceCallback" />

-            <binding.ws uri="http://localhost:8086/MyServiceComponent" />

-            <callback>

-                <binding.ws uri="http://localhost:8087/MyServiceComponentCB"/>

-            </callback>

-        </reference>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java b/java/sca-contrib/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
deleted file mode 100644
index fb2f6952c4..0000000000
--- a/java/sca-contrib/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
+++ /dev/null
@@ -1,53 +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 myapp;

-

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests that the callback server is available

- */

-public class CallbackClientTestCase {

-

-    private SCANode node;

-

-    @Before

-    public void startServer() throws Exception {

-        try {

-            node = SCANodeFactory.newInstance().createSCANodeFromClassLoader(null, getClass().getClassLoader());

-            node.start();

-        } catch (Exception ex) {

-            System.out.println(ex.toString());

-        }

-    }

-

-    @Test

-    public void testClient() throws Exception {

-        MyClientImpl.run(node);

-    }

-

-    @After

-    public void stopServer() throws Exception {

-        node.stop();

-    }

-}

diff --git a/java/sca-contrib/samples/callback-ws-service/README b/java/sca-contrib/samples/callback-ws-service/README
deleted file mode 100644
index 2c65f745a6..0000000000
--- a/java/sca-contrib/samples/callback-ws-service/README
+++ /dev/null
@@ -1,227 +0,0 @@
-Callback Web Services Service Sample

-===================================

-This sample demonstrates an SCA service with callback to a remote client

-using Web service bindings for the service and the callback. 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples.  Take a look

-there first. 

-

-If you just want to run it to see what happens open a command prompt,

-navigate to this sample directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows do:

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-callback-ws-service.jar myserver.CallbackServer

-

-and on *nix do:

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-callback-ws-service.jar myserver.CallbackServer

-

-Now the server is started you can use the callback-ws-client sample to 

-exercise it. 

-

-Sample Overview

----------------

-The sample has a single component that provides a service that is

-invoked from a remote client over Web services and makes an SCA callback

-over Web services to the same remote client.

-

-callback-ws-service/

-  src/

-    main/

-      java/

-        myserver/

-          MyService.java               - interface description for 

-                                         MyServiceComponent

-          MyServiceCallback.java       - interface description for callback 

-          NyServiceImpl.java           - component implementation

-          CallbackServer.java          - starts the SCA runtime and 

-                                         deploys the callbackws.composite

-                                         and then waits for the service

-                                         to be called via Web services

-      resources/

-        callbackws.composite           - the SCA assembly for this sample

-    test/

-      java/

-        myserver/

-          CallbackServerTestCase.java  - JUnit test case 

-  callback-ws-service.png              - a pictorial representation of the 

-                                         sample .composite file

-  build.xml                            - the Ant build file

-  pom.xml                              - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant with

-the following commands:

-

-cd callback-ws-service

-ant compile

-ant run

-

-You should see the following output from the run target:

-

-run:

-     [java] 15-Jan-2008 10:21:14 org.apache.tuscany.sca.node.impl.SCADomainProxy

-Impl init

-     [java] INFO: Domain will be started stand-alone as domain URL is not provid

-ed

-     [java] 15-Jan-2008 10:21:14 org.apache.tuscany.sca.domain.impl.SCADomainImp

-l registerNode

-     [java] INFO: Registered node: http://L3AW203:1331 at endpoint http://L3AW20

-3:1331

-     [java] 15-Jan-2008 10:21:14 org.apache.tuscany.sca.node.impl.SCADomainProxy

-Impl createRuntime

-     [java] INFO: Domain management configured from file:/C:/simon/tuscany/relea

-se/sca-r1.1-rc2/tuscany-sca-1.1-incubating-SNAPSHOT/lib/tuscany-sca-all-1.1-incu

-bating-SNAPSHOT.jar

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] 15-Jan-2008 10:21:24 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:1331/SCADomainEventServi

-ceProxyComponent

-     [java] 15-Jan-2008 10:21:24 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:1331/SCADomainAPIService

-ProxyComponent

-     [java] 15-Jan-2008 10:21:24 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:1331/SCANodeManagerCompo

-nent/SCANodeManagerService

-     [java] 15-Jan-2008 10:21:24 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:1331/SCANodeManagerCompo

-nent/ComponentManagerService/*

-     [java] 15-Jan-2008 10:21:24 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:1331/SCANodeManagerCompo

-nent/ComponentManagerService

-     [java] 15-Jan-2008 10:21:24 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:1331/SCADomain/scaDomain

-.js

-     [java] 15-Jan-2008 10:21:24 org.apache.tuscany.sca.node.impl.SCANodeImpl ac

-tivateComposite

-     [java] INFO: Building composite: {http://callbackws}callbackws

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor

-     [java] 15-Jan-2008 10:21:24 org.apache.tuscany.sca.node.impl.SCANodeImpl st

-artComposite

-     [java] INFO: Starting composite: {http://callbackws}callbackws

-     [java] 15-Jan-2008 10:21:26 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] Callback server started (press enter to shutdown)

-     

-As this point the SCA service is exposed as a Web service by a Web server 

-started automatically by the SCA runtime.  To stop the server, press enter.

-

-To exercise the service, run the callback-ws-client sample.  Take a look at 

-the README in that sample and you will see you need the following commands:

-

-cd callback-ws-client

-ant run

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and

-run using Maven as follows.  When using Maven you don't need to run the

-callback-ws-client sample as the Maven build uses a simple ping test to

-make sure that the service is available.

-

-cd callback-ws-service

-mvn

-

-You should see the following output from the test phase:

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running myserver.CallbackServerTestCase

-15-Jan-2008 10:29:36 org.apache.tuscany.sca.node.impl.SCADomainProxyImpl init

-INFO: Domain will be started stand-alone as domain URL is not provided

-15-Jan-2008 10:29:36 org.apache.tuscany.sca.domain.impl.SCADomainImpl registerNo

-de

-INFO: Registered node: http://L3AW203:1365 at endpoint http://L3AW203:1365

-15-Jan-2008 10:29:36 org.apache.tuscany.sca.node.impl.SCADomainProxyImpl createR

-untime

-INFO: Domain management configured from file:/C:/Documents%20and%20Settings/slaw

-s/.m2/repository/org/apache/tuscany/sca/tuscany-node-impl/1.1-incubating-SNAPSHO

-T/tuscany-node-impl-1.1-incubating-SNAPSHOT.jar

-15-Jan-2008 10:29:42 org.apache.catalina.core.StandardEngine start

-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10

-15-Jan-2008 10:29:42 org.apache.catalina.startup.ContextConfig defaultWebConfig

-INFO: No default web.xml

-15-Jan-2008 10:29:42 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd

-15-Jan-2008 10:29:42 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_

-1.dtd

-15-Jan-2008 10:29:42 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_

-2.dtd

-15-Jan-2008 10:29:42 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_

-0.xsd

-15-Jan-2008 10:29:42 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs

-d

-15-Jan-2008 10:29:42 org.apache.coyote.http11.Http11Protocol init

-INFO: Initializing Coyote HTTP/1.1 on http-1365

-15-Jan-2008 10:29:42 org.apache.coyote.http11.Http11Protocol start

-INFO: Starting Coyote HTTP/1.1 on http-1365

-15-Jan-2008 10:29:42 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1365/SCADomainEventServiceProxyCompo

-nent

-15-Jan-2008 10:29:42 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1365/SCADomainAPIServiceProxyCompone

-nt

-15-Jan-2008 10:29:43 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1365/SCANodeManagerComponent/SCANode

-ManagerService

-15-Jan-2008 10:29:43 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1365/SCANodeManagerComponent/Compone

-ntManagerService/*

-15-Jan-2008 10:29:43 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1365/SCANodeManagerComponent/Compone

-ntManagerService

-15-Jan-2008 10:29:43 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:1365/SCADomain/scaDomain.js

-15-Jan-2008 10:29:43 org.apache.tuscany.sca.node.impl.SCANodeImpl activateCompos

-ite

-INFO: Building composite: {http://callbackws}callbackws

-15-Jan-2008 10:29:43 org.apache.tuscany.sca.node.impl.SCANodeImpl startComposite

-

-INFO: Starting composite: {http://callbackws}callbackws

-15-Jan-2008 10:29:43 org.apache.catalina.core.StandardEngine start

-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10

-15-Jan-2008 10:29:43 org.apache.catalina.startup.ContextConfig defaultWebConfig

-INFO: No default web.xml

-15-Jan-2008 10:29:43 org.apache.coyote.http11.Http11Protocol init

-INFO: Initializing Coyote HTTP/1.1 on http-8086

-15-Jan-2008 10:29:43 org.apache.coyote.http11.Http11Protocol start

-INFO: Starting Coyote HTTP/1.1 on http-8086

-15-Jan-2008 10:29:43 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:8086/MyServiceComponent

-15-Jan-2008 10:29:43 org.apache.tuscany.sca.node.impl.SCANodeImpl stopComposite

-INFO: Stopping composite: {http://callbackws}callbackws

-15-Jan-2008 10:29:43 org.apache.coyote.http11.Http11Protocol destroy

-INFO: Stopping Coyote HTTP/1.1 on http-8086

-15-Jan-2008 10:29:43 org.apache.coyote.http11.Http11Protocol destroy

-INFO: Stopping Coyote HTTP/1.1 on http-1365

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.422 sec

-

-This shows that the Junit test cases have run successfully. 

diff --git a/java/sca-contrib/samples/callback-ws-service/build.xml b/java/sca-contrib/samples/callback-ws-service/build.xml
deleted file mode 100644
index c91dd88a8c..0000000000
--- a/java/sca-contrib/samples/callback-ws-service/build.xml
+++ /dev/null
@@ -1,73 +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.    

--->

-<project name="callback-ws-service" default="compile">

-    <property name="test.class"   value="myserver.CallbackServer" />

-    <property name="test.jar"     value="sample-callback-ws-service.jar" />

-    <property name="manifest.jar" value="../../lib/tuscany-sca-manifest.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="${manifest.jar}"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="${manifest.jar}"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="${manifest.jar}"/>

-            </classpath>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/callback-ws-service/callback-ws-service.png b/java/sca-contrib/samples/callback-ws-service/callback-ws-service.png
deleted file mode 100644
index 772ac38431..0000000000
--- a/java/sca-contrib/samples/callback-ws-service/callback-ws-service.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/callback-ws-service/callback-ws-service.svg b/java/sca-contrib/samples/callback-ws-service/callback-ws-service.svg
deleted file mode 100644
index ff0a1d307b..0000000000
--- a/java/sca-contrib/samples/callback-ws-service/callback-ws-service.svg
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-panic\sca\samples\callback-ws-service"
-   sodipodi:docname="callback-ws-service.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\tuscany\java-panic\sca\samples\callback-ws-service\callback-ws-service.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3156"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lend"
-       style="overflow:visible;">
-      <path
-         id="path3159"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="541.4664"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="388"
-     inkscape:window-y="200" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.991389,0,0,1,2.215655,0)">
-      <rect
-         rx="13.79423"
-         ry="12.692303"
-         y="192.00233"
-         x="258.3114"
-         height="299.99988"
-         width="446.72086"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">callbackws</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.1793592;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.48311"
-       height="102.11218"
-       x="432.14886"
-       y="307.25729"
-       rx="6.9853158"
-       ry="8.4710283" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(176.75411,112.37196)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1883">MyService</flowPara><flowPara
-         id="flowPara1885">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.34265757px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 372.72286,323.25736 L 441.18554,323.25736 L 453.63329,358.34829 L 439.11093,390.73995 L 372.72286,390.73995 L 388.28257,358.34829 L 372.72286,323.25736 z "
-       id="path3017" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1889"
-       transform="translate(-56.05091,109.83236)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1891"><rect
-           id="rect1893"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1897">http://localhost:8086/MyServiceComponent</flowPara><flowPara
-         id="flowPara1899" /></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.1331737px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Lend);stroke-opacity:1"
-       d="M 231.49516,358.3136 C 387.07627,357.7325 387.07627,357.7325 387.07627,357.7325"
-       id="path1901" />
-    <path
-       style="fill:#b74aae;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.25983226px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 438.85378,352.31178 L 397.27706,352.31178 L 389.71767,369.02293 L 398.53696,384.44862 L 438.85378,384.44862 L 429.40452,369.02293 L 438.85378,352.31178 z "
-       id="path3361" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3363"
-       transform="translate(106.89573,117.99181)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3365"><rect
-           id="rect3367"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3371">myservice</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3375"
-       transform="translate(111.18143,149.42038)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3377"><rect
-           id="rect3379"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3383">callback</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.14703035;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#Arrow1Lstart);marker-end:none;stroke-miterlimit:4;stroke-dasharray:6.88218229, 1.14703038;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 232.21637,370.32429 C 392.06934,369.7448 392.06934,369.7448 392.06934,369.7448"
-       id="path3387" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/callback-ws-service/pom.xml b/java/sca-contrib/samples/callback-ws-service/pom.xml
deleted file mode 100644
index e39b4480a7..0000000000
--- a/java/sca-contrib/samples/callback-ws-service/pom.xml
+++ /dev/null
@@ -1,79 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-callback-ws-service</artifactId>

-    <name>Apache Tuscany SCA Callback Web Service Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>      

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java b/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
deleted file mode 100644
index 75ef05bc48..0000000000
--- a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
+++ /dev/null
@@ -1,48 +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 myserver;

-

-import java.io.IOException;

-

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

-

-/**

- * This server program shows how to create and start an SCA runtime that

- * activates the MyService Web service endpoint.

- */

-public class CallbackServer {

-

-    public static void main(String[] args) throws Exception {

-        

-        SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("callbackws.composite", null);

-        node.start();

-

-        try {

-            System.out.println("Callback server started (press enter to shutdown)");

-            System.in.read();

-        } catch (IOException e) {

-            e.printStackTrace();

-        }

-

-        node.stop();

-        System.out.println("Callback server stopped");

-    }

-

-}

diff --git a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyService.java b/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyService.java
deleted file mode 100644
index 9bc056318b..0000000000
--- a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyService.java
+++ /dev/null
@@ -1,34 +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 myserver;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The remote service that will be invoked by the client

- */

-@Remotable

-@Callback(MyServiceCallback.class)

-public interface MyService {

-

-    @OneWay

-    void someMethod(String arg);

-}

diff --git a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java b/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
deleted file mode 100644
index caef8fcc98..0000000000
--- a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
+++ /dev/null
@@ -1,30 +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 myserver;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The callback interface for {@link MyService}.

- */

-@Remotable

-public interface MyServiceCallback {

-

-    void receiveResult(String result);

-}

diff --git a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java b/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
deleted file mode 100644
index 98833338f0..0000000000
--- a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
+++ /dev/null
@@ -1,56 +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 myserver;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements MyService and uses a callback.

- */

-@Service(MyService.class)

-@Scope("COMPOSITE")

-public class MyServiceImpl implements MyService {

-

-    private MyServiceCallback myServiceCallback;

-

-    /**

-     * The setter used by the runtime to set the callback reference 

-     * @param myServiceCallback

-     */

-    @Callback

-    public void setMyServiceCallback(MyServiceCallback myServiceCallback) {

-        System.out.println("setMyServiceCallback on thread " + Thread.currentThread());

-        this.myServiceCallback = myServiceCallback;

-    }

-    

-    public void someMethod(String arg) {

-        System.out.println("someMethod on thread " + Thread.currentThread());

-        // invoke the callback

-        try {

-            System.out.println("Sleeping ...");

-            Thread.sleep(2000);

-            myServiceCallback.receiveResult(arg + " -> receiveResult ");

-        } catch(Exception e) {

-            System.out.println("RuntimeException invoking receiveResult: " + e.toString());

-            e.printStackTrace();

-        }

-    }

-}

diff --git a/java/sca-contrib/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 35f7f60c2e..0000000000
--- a/java/sca-contrib/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://callbackws"

-              xmlns:cbws="http://callbackws">

-    <deployable composite="cbws:callbackws" />

-</contribution>

diff --git a/java/sca-contrib/samples/callback-ws-service/src/main/resources/callbackws.composite b/java/sca-contrib/samples/callback-ws-service/src/main/resources/callbackws.composite
deleted file mode 100644
index a09e638896..0000000000
--- a/java/sca-contrib/samples/callback-ws-service/src/main/resources/callbackws.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://callbackws"

-	name="callbackws">

-

-    <component name="MyServiceComponent">

-        <implementation.java class="myserver.MyServiceImpl" />

-        <service name="MyService">

-            <interface.java interface="myserver.MyService"

-                callbackInterface="myserver.MyServiceCallback" />

-            <binding.ws uri="http://localhost:8086/MyServiceComponent" />

-            <callback>

-                <binding.ws />

-            </callback>

-        </service>

-    </component>

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java b/java/sca-contrib/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
deleted file mode 100644
index e87667cc3e..0000000000
--- a/java/sca-contrib/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.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 myserver;

-

-import java.io.IOException;

-import java.net.Socket;

-

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests that the callback server is available

- */

-public class CallbackServerTestCase {

-

-    private SCANode node;

-

-    @Before

-    public void startServer() throws Exception {

-        node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("callbackws.composite", null);

-        node.start();

-    }

-

-    @Test

-    public void testPing() throws IOException {

-        new Socket("127.0.0.1", 8086);

-    }

-

-    @After

-    public void stopServer() throws Exception {

-        node.stop();

-    }

-}

diff --git a/java/sca-contrib/samples/callbacks-jms/README b/java/sca-contrib/samples/callbacks-jms/README
deleted file mode 100644
index b5e130e2fc..0000000000
--- a/java/sca-contrib/samples/callbacks-jms/README
+++ /dev/null
@@ -1,73 +0,0 @@
-Callback JMS Sample

-===================

-This sample demonstrates SCA callbacks over the JMS binding. It implements the example

-described in the INFOQ article:

-

- "Can I call you back about that?" Building Asynchronous Services using Service Component Architecture

-   See: http://www.infoq.com/articles/async-sca

-

-It implements a service for placing an order for some widgets, where the service is asynchronous

-and the client is informed of progress via a callback interface.

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run it to see what happens open a command prompt, navigate

-to this sample directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-callbacks-jms.jar callbacks.CallbacksTestCase

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-callbacks-jms.jar callbacks.CallbacksTestCase

-

-Sample Overview

----------------

-

-The only changes over the sample code described in the INFOQ article are to add the @Remotable annotation

-to the service and callback interfaces, add the @Oneway annotation to the placeOrder and placeOrderResponse

-methods, and the composite XML is changed to use <binding.jms> instead of <binding.ws>. 

-

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd callbacks-jms

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] client placing order: callbacks.OrderRequest@c72243

-     [java] service received order: callbacks.OrderRequest@1f94884

-     [java] client callback received order response: callbacks.OrderResponse@14ab51b

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd callbacks-jms

-mvn

-

-You should see the following output from the test phase.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running callbacks.CallbacksTestCase

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.272 sec

-

-Results :

-

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

-

-This shows that the Junit test cases have run successfully. 

diff --git a/java/sca-contrib/samples/callbacks-jms/build.xml b/java/sca-contrib/samples/callbacks-jms/build.xml
deleted file mode 100644
index 665feeca71..0000000000
--- a/java/sca-contrib/samples/callbacks-jms/build.xml
+++ /dev/null
@@ -1,72 +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.    

--->

-<project name="calculator" default="compile">

-    <property name="test.class" value="callbacks.CallbacksTestCase" />

-	<property name="test.jar"   value="sample-callbacks-jms.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>    	

-    </target>	

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/callbacks-jms/pom.xml b/java/sca-contrib/samples/callbacks-jms/pom.xml
deleted file mode 100644
index d7bef36033..0000000000
--- a/java/sca-contrib/samples/callbacks-jms/pom.xml
+++ /dev/null
@@ -1,92 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-callbacks-jms</artifactId>

-    <name>Apache Tuscany SCA Callbacks with JMS Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-core</artifactId>

-            <version>5.1.0</version>

-            <scope>test</scope>

-        </dependency>

-<!-- 

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

--->

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java b/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
deleted file mode 100644
index 12533ff610..0000000000
--- a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
+++ /dev/null
@@ -1,30 +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 callbacks;

-

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface OrderCallback {

-

-    @OneWay

-    public void placeOrderResponse(OrderResponse orderResponse);

-}

diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java b/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
deleted file mode 100644
index 69f5751379..0000000000
--- a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
+++ /dev/null
@@ -1,24 +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 callbacks;

-

-public class OrderRequest {

-

-}

diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java b/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
deleted file mode 100644
index 882bcf8479..0000000000
--- a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
+++ /dev/null
@@ -1,24 +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 callbacks;

-

-public class OrderResponse {

-

-}

diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderService.java b/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
deleted file mode 100644
index d0161b1498..0000000000
--- a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
+++ /dev/null
@@ -1,33 +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 callbacks;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-@Callback(OrderCallback.class)

-public interface OrderService {

-

-    @OneWay

-    public void placeOrder(OrderRequest orderRequest);

-

-}

diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java b/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
deleted file mode 100644
index 757fe3ae41..0000000000
--- a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.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 callbacks;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(OrderServiceClient.class)

-public class OrderServiceClient implements OrderCallback {

-

-    // A field to hold the reference to the order service

-

-    private OrderService orderService;

-    public static OrderResponse oResponse;

-

-    public void doSomeOrdering() {

-

-        OrderRequest oRequest = new OrderRequest();

-

-        // … fill in the details of the order …

-

-        System.out.println("client placing order: " + oRequest);

-

-        orderService.placeOrder(oRequest);

-

-        // …the client code can continue to do processing

-    }

-

-    public void placeOrderResponse(OrderResponse oResponse) {

-

-        // …handle the response as needed

-

-        System.out.println("client callback received order response: " + oResponse);

-        OrderServiceClient.oResponse = oResponse;

-    }

-

-    // A setter method for the order service reference

-    @Reference

-    public void setOrderService(OrderService theService) {

-        orderService = theService;

-    }

-}

diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java b/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
deleted file mode 100644
index 9de7307391..0000000000
--- a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
+++ /dev/null
@@ -1,51 +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 callbacks;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(OrderService.class)

-public class OrderServiceImpl implements OrderService {

-

-    // A field for the callback reference object

-    private OrderCallback callbackReference;

-

-    // The place order operation itself

-    public void placeOrder(OrderRequest oRequest) {

-

-        // …do the work to process the order…

-        // …which may take some time…

-

-        System.out.println("service received order: " + oRequest);

-

-        // when ready to respond…

-

-        OrderResponse theResponse = new OrderResponse();

-

-        callbackReference.placeOrderResponse(theResponse);

-    }

-

-    // A setter method for the callback reference

-    @Callback

-    public void setCallbackReference(OrderCallback theCallback) {

-        callbackReference = theCallback;

-    }

-}

diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/resources/callbacks.composite b/java/sca-contrib/samples/callbacks-jms/src/main/resources/callbacks.composite
deleted file mode 100644
index 94dd29c45d..0000000000
--- a/java/sca-contrib/samples/callbacks-jms/src/main/resources/callbacks.composite
+++ /dev/null
@@ -1,44 +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://sample"

-           name="CallbacksComposite">

-

-    <component name="ClientComponent">

-        <implementation.java class="callbacks.OrderServiceClient" />

-        <reference name="orderService" target="ServiceComponent/OrderService">

-            <binding.jms uri="jms:OrderService"/>

-            <callback>

-                <binding.jms />

-            </callback>

-        </reference>

-    </component>

-

-    <component name="ServiceComponent">

-        <implementation.java class="callbacks.OrderServiceImpl" />

-        <service name="OrderService">

-            <binding.jms />

-            <callback>

-                <binding.jms />

-            </callback>

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/resources/jndi.properties b/java/sca-contrib/samples/callbacks-jms/src/main/resources/jndi.properties
deleted file mode 100644
index 698aeb1711..0000000000
--- a/java/sca-contrib/samples/callbacks-jms/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,30 +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.

-## ---------------------------------------------------------------------------

-

-# START SNIPPET: jndi

-

-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory

-

-# use the following property to configure the default connector

-java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx=false

-

-# use the following property to specify the JNDI name the connection factory should appear as. 

-connectionFactoryNames = ConnectionFactory

-

-# register some queues in JNDI using the form

-# queue.[jndiName] = [physicalName]

-queue.OrderService = OrderServiceQueue

diff --git a/java/sca-contrib/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java b/java/sca-contrib/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
deleted file mode 100644
index 967fc42c64..0000000000
--- a/java/sca-contrib/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
+++ /dev/null
@@ -1,64 +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 callbacks;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class CallbacksTestCase extends TestCase {

-

-    private OrderServiceClient orderServiceClient;

-    private SCADomain scaDomain;

-

-    @Override

-    protected void setUp() throws Exception {

-        scaDomain = SCADomain.newInstance("callbacks.composite");

-        orderServiceClient = scaDomain.getService(OrderServiceClient.class, "ClientComponent");

-    }

-

-    @Override

-    protected void tearDown() throws Exception {

-        scaDomain.close();

-    }

-

-    public void testOderClient() throws Exception {

-

-        orderServiceClient.doSomeOrdering();

-

-        // wait to give the service time to respond

-        Thread.sleep(500);

-    }

-    

-    public static void main(String[] args) {

-        try {

-

-            CallbacksTestCase runner = new CallbacksTestCase();

-            runner.setUp();

-            runner.testOderClient();

-            runner.tearDown();

-

-        } catch (Exception e) {

-            e.printStackTrace();

-        }

-    }

-}

diff --git a/java/sca-contrib/samples/chat-webapp/README b/java/sca-contrib/samples/chat-webapp/README
deleted file mode 100644
index 09b9c6f6be..0000000000
--- a/java/sca-contrib/samples/chat-webapp/README
+++ /dev/null
@@ -1,83 +0,0 @@
-Chat WebApp Sample

-==================

-This sample demonstrates the SCA DWR binding to implement the classic Ajax sample

-of a chat application which allows multiple users to chat from their browsers.

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-As this sample provides a web app there is a manual step where the WAR file

-that contains the sample is copied to your web app container. If you just want 

-to give this sample a go deploy the WAR file (target/sample-chat-webapp.war)

-to your web application server. 

-

-Once the web app is deployed use your browser to visit the following URL;

-

-http://localhost:8080/sample-chat-webapp

-

-The port and hostname will of course vary depending on your local installation. 

-

-Sample Overview

----------------

-The sample provides an SCA component which has an SCA service using the SCA DWR

-binding and an SCA reference also using the DWR binding. The component implementation 

-simply forwards every invocation of the service as an invocation on the reference. The

-component reference is scoped by the composite so every active client of the composite

-will receive every message sent to the component service, thus implementing the chat

-application with very little code.

-

-chat-webapp/

-  src/

-    main/

-      java/

-        sample/

-          ChatService.java            - service interface

-          ChatServiceImpl.java        - service implementation

-      resources/

-        chat.composite                - the SCA assembly for this sample

-      webapp

-        chat.html                     - the html UserInterface for this application

-        META-INF/

-          sca-contribution.xml        - specifies the composite to be deployed

-        WEB-INF/

-          web.xml                     - defines the listener that starts up the 

-                                        Tuscany SCA runtime

-           

-  pom.xml                             - the Maven build file  

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built using Ant as 

-follows

-

-cd chat-webapp

-ant package

-

-This should result in a war file (sample-chat-webapp.war) in the target 

-directory. Copy this war file to your web app deployment directory in you

-web app container. 

-

-The process for getting the web app running will depend on which web app container

-you are using. For example, if you are using Tomcat then it is simply a matter

-of copying the WAR file to the webapps directory. 

-

-Once the web app is deployed use your browser to visit the following URL;

-

-http://localhost:8080/sample-chat-webapp

-

-The port and hostname will of course vary depending on your local installation. 

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd chat-webapp 

-mvn

-

-Again this should result in a war file (sample-chat-webapp.war) in the target 

-directory. Follow the steps described in the previous section for running the web 

-app and for the expected results.

-

-

diff --git a/java/sca-contrib/samples/chat-webapp/chat-webapp.png b/java/sca-contrib/samples/chat-webapp/chat-webapp.png
deleted file mode 100644
index fdf540d243..0000000000
--- a/java/sca-contrib/samples/chat-webapp/chat-webapp.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/chat-webapp/chat-webapp.svg b/java/sca-contrib/samples/chat-webapp/chat-webapp.svg
deleted file mode 100644
index b37c1dc590..0000000000
--- a/java/sca-contrib/samples/chat-webapp/chat-webapp.svg
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\chat-webapp"
-   sodipodi:docname="chat-webapp.svg"
-   version="1.0"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\simon\tuscany\java-head\sca\samples\chat-webapp\chat-webapp.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="538.06165"
-     inkscape:cy="485.93773"
-     inkscape:document-units="px"
-     inkscape:current-layer="g2997"
-     inkscape:window-width="1467"
-     inkscape:window-height="831"
-     inkscape:window-x="116"
-     inkscape:window-y="80" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997">
-      <rect
-         rx="10.364296"
-         ry="11.940332"
-         y="196.8512"
-         x="447.00812"
-         height="282.22604"
-         width="335.64374"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.59621525;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="translate(189.90868,1.0101522)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2171">store</flowPara></flowRoot>      <rect
-         style="opacity:1;fill:#0064ff;fill-opacity:1;stroke:#000000;stroke-width:0.9612025;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2223"
-         width="104.08451"
-         height="113.17588"
-         x="256.22867"
-         y="297.25845"
-         rx="0"
-         ry="0.048917599" />
-      <path
-         style="fill:#1a73fe;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 256.07143,409.80877 L 233.21428,426.95163 L 385.71428,426.95163 L 359.64285,410.16591 L 256.07143,409.80877 z "
-         id="path3197" />
-      <rect
-         style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect3199"
-         width="92.5"
-         height="97.14286"
-         x="261.42859"
-         y="305.52304"
-         ry="3.6203461"
-         rx="3.9285715" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot3364"
-         transform="translate(-173.62276,-49.782291)"><flowRegion
-           id="flowRegion3366"><rect
-             id="rect3368"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara3370">DWR</flowPara></flowRoot>      <image
-         y="306.6889"
-         x="268.77594"
-         id="image2297"
-         height="89.285721"
-         width="70"
-         sodipodi:absref="C:\simon\tuscany\evangelism\whitepapers\chat.png"
-         xlink:href="C:\simon\tuscany\evangelism\whitepapers\chat.png" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 675,309.80877 L 696.42857,309.80877 L 696.42857,389.09448 L 335.71429,389.80877"
-         id="path2302"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 340,313.95163 C 530,313.95163 530,313.95163 530,313.95163"
-         id="path2306" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2316"
-         transform="translate(25.998466,-54.30712)"><flowRegion
-           id="flowRegion2318"><rect
-             id="rect2320"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara2322">DWR</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="540.14038"
-       y="268.41565"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(272.54962,62.477116)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Catalog</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 522.98989,300.26265 L 556.32493,300.26265 L 562.38584,313.39463 L 555.31478,325.51647 L 522.98989,325.51647 L 530.56604,313.39463 L 522.98989,300.26265 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 636.24233,298.42437 L 669.57737,298.42437 L 675.63828,311.55635 L 668.56722,323.67819 L 636.24233,323.67819 L 643.81848,311.55635 L 636.24233,298.42437 z "
-       id="path3019" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/chat-webapp/pom.xml b/java/sca-contrib/samples/chat-webapp/pom.xml
deleted file mode 100644
index 93fa269cf4..0000000000
--- a/java/sca-contrib/samples/chat-webapp/pom.xml
+++ /dev/null
@@ -1,97 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-chat-webapp</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Chat Sample WebApp</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-dwr</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->

-        <dependency>

-            <groupId>stax</groupId>

-            <artifactId>stax-api</artifactId>

-            <version>1.0.1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <!-- marking dependency as provided to exclude from war file -->

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.3</version>

-            <scope>provided</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-       <plugins>

-            <plugin>

-                <groupId>org.apache.tuscany.sca</groupId>

-                <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>2.0-SNAPSHOT</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-       </plugins>       

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/chat-webapp/src/main/java/sample/ChatService.java b/java/sca-contrib/samples/chat-webapp/src/main/java/sample/ChatService.java
deleted file mode 100644
index bf34675b8a..0000000000
--- a/java/sca-contrib/samples/chat-webapp/src/main/java/sample/ChatService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**

- *

- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.

- *

- *  Licensed 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 sample;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface ChatService {

-

-    public void chat(String msg);

-

-}

diff --git a/java/sca-contrib/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/java/sca-contrib/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
deleted file mode 100644
index f0725dd60c..0000000000
--- a/java/sca-contrib/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.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 sample;
-
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class ChatServiceImpl implements ChatService {
-
-    ChatService chatters;
-
-    public void chat(String msg) {
-        chatters.chat(msg);
-    }
-
-    public void setChatters(ChatService chatters) {
-        this.chatters = chatters;
-    }
-}
diff --git a/java/sca-contrib/samples/chat-webapp/src/main/resources/chat.composite b/java/sca-contrib/samples/chat-webapp/src/main/resources/chat.composite
deleted file mode 100644
index c9ce95e2dc..0000000000
--- a/java/sca-contrib/samples/chat-webapp/src/main/resources/chat.composite
+++ /dev/null
@@ -1,40 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="Chat">

-

-    <service name="ChatService" promote="ChatComponent">

-        <interface.java interface="sample.ChatService"/>

-        <tuscany:binding.dwr/>

-    </service>

-

-    <component name="ChatComponent">

-        <implementation.java class="sample.ChatServiceImpl"/>

-    </component>

-

-    <reference name="ChatReference" promote="ChatComponent/chatters">

-        <interface.java interface="sample.ChatService" />

-        <tuscany:binding.dwr/>

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 897849ff8d..0000000000
--- a/java/sca-contrib/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:Chat"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 97d91fec56..0000000000
--- a/java/sca-contrib/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<!--

-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.

-

-  Licensed 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.

- -->

-

-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web

-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">

-<web-app>

-    <display-name>Apache Tuscany AJAX/DWR Chat Sample</display-name>

-

-    <filter>

-       <filter-name>tuscany</filter-name>

-       <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>

-    </filter>

-  

-    <filter-mapping>

-       <filter-name>tuscany</filter-name>

-       <url-pattern>/*</url-pattern>

-    </filter-mapping>

-

-    <welcome-file-list>

-        <welcome-file>chat.html</welcome-file>

-    </welcome-file-list>

-

-</web-app>

diff --git a/java/sca-contrib/samples/chat-webapp/src/main/webapp/chat.html b/java/sca-contrib/samples/chat-webapp/src/main/webapp/chat.html
deleted file mode 100644
index 7a449a906a..0000000000
--- a/java/sca-contrib/samples/chat-webapp/src/main/webapp/chat.html
+++ /dev/null
@@ -1,70 +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.    
--->
-<html>
-  <head>
-    <title>Apache Tuscany Ajax/DWR Chat Sample</TITLE>
-
-    <script type="text/javascript" src="SCADomain/scaDomain.js"></script>
-
-    <script language="JavaScript">
-
-       function clickButton(e, buttonid){
-          var evt = e ? e : window.event;
-          var bt = document.getElementById(buttonid);
-          if (bt){
-              if (evt.keyCode == 13){
-                  bt.click();
-                  return false;
-              }
-          }
-       } 
-       
-       ChatReference.chat = function(msg) {
-          var chatLog = document.getElementById('chatLog');
-          chatLog.innerHTML = msg + '<br>' + chatLog.innerHTML;
-       }
-
-       function sendChat() {
-          var chatText = document.getElementById("chatText");
-          var nickName = document.getElementById("nickName").value;
-          var msg = nickName + ": " + chatText.value
-          chatText.value = "";
-          chatText.focus();
-          ChatService.chat(msg);
-       }
-    </script>
-
-  </head>
-  <body onLoad="scaDomain.open()">
-
-    <h2>Apache Tuscany Ajax/DWR Chat Sample</h2>
-     
-      A simple client to chat between multiple web browsers:<br><br>
-     
-      Nickname: <input type="text" id="nickName" size="10"/>
-      <br><br>
-
-      Enter text: <input type="text" id="chatText" size="80" onkeypress="return clickButton(event,'Send')"/>
-      <input type="button" name="Send" value="Send" id="Send" onclick="sendChat()" />
-
-      <br><br>
-      <div id="chatLog" style="overflow:auto; height:400px; border:1px solid"></div>
-
-  </body>
-</html>
diff --git a/java/sca-contrib/samples/chat2-webapp/README b/java/sca-contrib/samples/chat2-webapp/README
deleted file mode 100644
index 0186006211..0000000000
--- a/java/sca-contrib/samples/chat2-webapp/README
+++ /dev/null
@@ -1,61 +0,0 @@
-Chat WebApp Sample
-==================
-This sample demonstrates the SCA DWR binding to implement the classic Ajax sample
-of a chat application which allows multiple users to chat from their browsers.
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want 
-to give this sample a go deploy the WAR file (target/sample-chat-webapp.war)
-to your web application server. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-chat-webapp
-
-The port and hostname will of course vary depending on your local installation. 
-
-Sample Overview
----------------
-The sample provides an SCA component which has an SCA service using the SCA DWR
-binding and an SCA reference also using the DWR binding. The component implementation 
-simply forwards every invocation of the service as an invocation on the reference. The
-component reference is scoped by the composite so every active client of the composite
-will receive every message sent to the component service, thus implementing the chat
-application with very little code.
-
-chat-webapp/
-  src/
-    main/
-      java/
-        sample/
-          ChatService.java            - service interface
-          ChatServiceImpl.java        - service implementation
-      resources/
-        chat.composite                - the SCA assembly for this sample
-      webapp
-        chat.html                     - the html UserInterface for this application
-        META-INF/
-          sca-contribution.xml        - specifies the composite to be deployed
-        WEB-INF/
-          web.xml                     - defines the listener that starts up the 
-                                        Tuscany SCA runtime
-           
-  pom.xml                             - the Maven build file  
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd chat-webapp 
-mvn
-
-Again this should result in a war file (sample-chat-webapp.war) in the target 
-directory. Follow the steps described in the previous section for running the web 
-app and for the expected results.
-
-
diff --git a/java/sca-contrib/samples/chat2-webapp/build.xml b/java/sca-contrib/samples/chat2-webapp/build.xml
deleted file mode 100644
index 2d3fc0c5f3..0000000000
--- a/java/sca-contrib/samples/chat2-webapp/build.xml
+++ /dev/null
@@ -1,117 +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.
--->
-
-<project name="sample-chat2-webapp" default="compile">
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src\main\java"/>
-            <classpath>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
-            </classpath>
-        </javac>
-        <copy todir="target/classes">
-            <fileset dir="src\main\resources"/>
-            <fileset dir="." includes="*" excludes="src, target, pom.xml, build.xml"/>
-        </copy>
-        <war destfile="target/sample-chat2-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">
-            <fileset dir="src/main/webapp"/>
-            <lib refid="tuscany.jars"/>
-            <lib refid="3rdparty.jars"/>
-            <classes dir="target/classes"/>
-        </war>
-    </target>
-
-    <target name="package" depends="compile"/>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
-    <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-assembly-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xsd-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-dwr-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-java-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-resource-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-core-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-core-databinding-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-domain-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-domain-api-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-extensibility-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-extension-helper-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-host-http-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-host-webapp-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-web-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node-api-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-    </fileset>
-    <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="activation-1.1.jar"/>
-        <include name="axiom-api-1.2.5.jar"/>
-        <include name="axiom-impl-1.2.5.jar"/>
-        <include name="cglib-nodep-2.1_3.jar"/>
-        <include name="commons-logging-1.1.jar"/>
-        <include name="dwr-2.0.1.jar"/>
-        <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
-        <include name="jaxb-api-2.1.jar"/>
-        <include name="jaxb-impl-2.1.6.jar"/>
-        <include name="jaxb2-reflection-2.1.4.jar"/>
-        <include name="jaxen-1.1-beta-9.jar"/>
-        <include name="jaxws-api-2.1.jar"/>
-        <include name="jsr181-api-1.0-MR1.jar"/>
-        <include name="jsr250-api-1.0.jar"/>
-        <include name="mail-1.4.jar"/>
-        <include name="neethi-2.0.2.jar"/>
-        <include name="saaj-api-1.3.jar"/>
-        <include name="stax-api-1.0-2.jar"/>
-        <include name="wstx-asl-3.2.1.jar"/>
-        <include name="xalan-2.7.0.jar"/>
-        <include name="xercesImpl-2.8.1.jar"/>
-        <include name="xml-apis-1.3.03.jar"/>
-    </fileset>
-
-</project>
diff --git a/java/sca-contrib/samples/chat2-webapp/pom.xml b/java/sca-contrib/samples/chat2-webapp/pom.xml
deleted file mode 100644
index e35891561b..0000000000
--- a/java/sca-contrib/samples/chat2-webapp/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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-chat2-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Chat Sample WebApp using callbacks</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-dwr</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-web</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- marking dependency as provided to exclude from war file -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>       
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatCallback.java b/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatCallback.java
deleted file mode 100644
index 261eb12124..0000000000
--- a/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatCallback.java
+++ /dev/null
@@ -1,27 +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 sample;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface ChatCallback {
-    void newMsg(String msg);
-}
diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatService.java b/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatService.java
deleted file mode 100644
index a5aff8f316..0000000000
--- a/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed 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 sample;
-
-import javax.jws.Oneway;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-import org.oasisopen.sca.annotation.Scope;
-
-@Remotable
-@Scope("COMPOSITE")
-@Callback(ChatCallback.class)
-public interface ChatService {
-
-    @Oneway
-    public void addMsg(String msg);
-}
diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java b/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java
deleted file mode 100644
index fd22fb70e8..0000000000
--- a/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.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 sample;
-
-import org.oasisopen.sca.annotation.Callback;
-
-public class ChatServiceImpl implements ChatService {
-
-    ChatCallback chatCallback;
-
-    @Callback
-    public void setCallback(ChatCallback chatCallback) {
-        this.chatCallback = chatCallback;
-    }
-
-    public void addMsg(String msg) {
-        chatCallback.newMsg(msg);
-    }
-}
diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/resources/chat.composite b/java/sca-contrib/samples/chat2-webapp/src/main/resources/chat.composite
deleted file mode 100644
index 93a10d0fdf..0000000000
--- a/java/sca-contrib/samples/chat2-webapp/src/main/resources/chat.composite
+++ /dev/null
@@ -1,40 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="Chat">

-

-    <component name="webapp">

-        <t:implementation.web war="." />

-        <reference name="ChatService" target="ChatService">

-           <t:binding.dwr/>

-        </reference>

-    </component>

-

-    <component name="ChatService">

-        <implementation.java class="sample.ChatServiceImpl"/>

-        <service name="ChatService">

-           <t:binding.dwr/>

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 897849ff8d..0000000000
--- a/java/sca-contrib/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:Chat"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 6919372e87..0000000000
--- a/java/sca-contrib/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed 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.
- -->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>Apache Tuscany AJAX/DWR Chat Sample</display-name>
-
-    <filter>
-       <filter-name>tuscany</filter-name>
-       <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
-    </filter>
-  
-    <filter-mapping>
-       <filter-name>tuscany</filter-name>
-       <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <welcome-file-list>
-        <welcome-file>chat.jsp</welcome-file>
-    </welcome-file-list>
-
-</web-app>
diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/webapp/chat.html b/java/sca-contrib/samples/chat2-webapp/src/main/webapp/chat.html
deleted file mode 100644
index a063e27f8e..0000000000
--- a/java/sca-contrib/samples/chat2-webapp/src/main/webapp/chat.html
+++ /dev/null
@@ -1,73 +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.    
--->
-<html>
-  <head>
-    <title>Apache Tuscany Ajax/DWR Chat Sample</TITLE>
-
-    <script type="text/javascript" src="org.apache.tuscany.sca.componentContext.js" />
-
-    <script language="JavaScript">
-    
-       var chatService = componentContext.getService("ChatService");
-
-       chatService.callbacks.chatResponse = function(msg) {
-          var chatLog = document.getElementById('chatLog');
-          chatLog.innerHTML = msg + '<br>' + chatLog.innerHTML;
-       }
-
-       function sendChat() {
-          var chatText = document.getElementById("chatText");
-          var nickName = document.getElementById("nickName").value;
-          var msg = nickName + ": " + chatText.value
-          chatText.value = "";
-          chatText.focus();
-          ChatService.addMsg(msg);
-       }
-
-       function clickButton(e, buttonid){
-          var evt = e ? e : window.event;
-          var bt = document.getElementById(buttonid);
-          if (bt){
-              if (evt.keyCode == 13){
-                  bt.click();
-                  return false;
-              }
-          }
-       } 
-
-    </script>
-
-  </head>
-  <body >
-
-    <h2>Apache Tuscany Ajax/DWR Chat Sample</h2>
-     
-      A simple client to chat between multiple web browsers:<br><br>
-     
-      Nickname: <input type="text" id="nickName" size="10"/>
-      <br><br>
-
-      Enter text: <input type="text" id="chatText" size="80" onkeypress="return clickButton(event,'Send')"/>
-      <input type="button" name="Send" value="Send" id="Send" onclick="sendChat()" />
-
-      <br><br>
-      <div id="chatLog" style="overflow:auto; height:400px; border:1px solid"></div>
-
-  </body>
-</html>
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/README b/java/sca-contrib/samples/customer-dojo-webapp/README
deleted file mode 100644
index 9c1729123f..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/README
+++ /dev/null
@@ -1,104 +0,0 @@
-Customer Dojo RPC Sample
-===========================
-
-Note. This sample is currently not working correctly on WebSphere - see TUSCANY-1990
-
-This sample demostrates the SCA JSONRPC binding using a simple web app that
-uses the RPC support of the Dojo Toolkit to an SCA service.  
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want 
-to give this sample a go deploy the WAR file (target/sample-helloworld-dojo-webapp.war)
-to you web application server. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-dojo-webapp
-
-The port and hostname will of course vary depending on your local installation. 
-
-See also the similar helloworld-jsonrpc-webapp sample which also uses the SCA JSONRPC binding
-but uses SCA scaDomain.js script on the client instead of the Dojo Toolkit. 
-
-Sample Overview
----------------
-The sample provides a single service with an operation that reflects
-a greeting back to the caller. The service is exposed using the JSONRPC
-binding. The web app provided shows how the Dojo Toolkit JSON-RPC support can be 
-used to invoke the SCA service. 
-
-The web app provided shows how the service can be called by using the DOJO toolkit. 
-
-helloworld-dojo-webapp/
-  build-dojo.xml                      - This file is an Ant script used by the 
-                                        sample build process to download the Dojo Toolkit 
-                                        and get it included in the WAR file 
-                                        for use by the sample.
-  src/
-    main/
-      java/
-        helloworldjsonrpc/
-          HelloWorldService.java      - service interface
-          HelloWorldServiceImpl.java  - service implementation
-      resources/
-        jsonrpc.composite             - the SCA assembly for this sample
-      webapp
-        dojo/                         - the Dojo toolkit (this directory is created only 
-                                        when you build the samples from the source distribution)
-        META-INF/
-          sca-contribution.xml        - specifies the composite to be deployed
-        WEB-INF/
-          web.xml                     - defines the listener that starts up the 
-                                        Tuscany SCA runtime
-        HelloWorldJSONRPC.html        - the web application that calls the 
-                                        SCA service via JSONRPC
-        style.css                     - style sheet     
-           
-  helloworld-jsonrpc-webapp.png              - a pictorial representation of the 
-                                        sample .composite file
-  build.xml                           - the Ant build file that unpacks the
-                                        dojo installation
-  pom.xml                             - the Maven build file  
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as 
-follows
-
-cd helloworld-dojo-webapp
-ant package
-
-This should result in a war file (sample-helloworld-dojo-webapp.war) in the target 
-directory. Copy this war file to your web app deployment directory in your
-web app container. 
-
-The process for getting the web app running will depend on which web app container
-you are using. For example, if you are using Tomcat then it is simply a matter
-of copying the WAR file to the webapps directory. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-dojo-webapp
-
-The port and hostname will of course vary depending on your local installation. 
-
-You should see a web page that allows you to send messages, via JSONRPC, to the 
-application running in the Tuscany SCA Runtime
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd helloworld-dojo-webapp 
-mvn
-
-Again this should result in a war file (sample-helloworld-dojo-webapp.war) in the target 
-directory. Follow the steps described in the previous section for running the web 
-app and for the expected results.
-
-
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/build-dojo.xml b/java/sca-contrib/samples/customer-dojo-webapp/build-dojo.xml
deleted file mode 100644
index 534a1dacd9..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/build-dojo.xml
+++ /dev/null
@@ -1,92 +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 name="DojoZipInstaller">
-	
-
-    <property name="dojo.version" value="1.0.0"/>
-    <property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/>
-	
-
-    <target name="check-dojo-installed">
-        <condition property="already.installed" >
-            <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-        </condition>
-        <condition property="maven.suffix" value="">
-            <os family="unix"/>
-        </condition>
-        <condition property="maven.suffix" value=".bat">
-            <os family="windows"/>
-        </condition>
-    </target>
-	
-
-    <target name="check-dojo-unpacked">
-        <condition property="already.unpacked" >
-            <available file="${unpack.location}"/>
-        </condition>
-    </target>
-
-    <target name="install-dojo" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
-            <arg line="install:install-file -DgroupId=dojo  -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"/>
-        </exec>
-    </target>
-
-    <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" 
-              tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-    </target>
-	
-
-    <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">
-        <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
-        <mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
-        <unzip src="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"
-               dest="${basedir}/target/dojo-unpack-temp/"
-               overwrite="false">
-            <patternset>
-                <include name="dojo-release-${dojo.version}/dojo/**"/>
-                <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/>
-                <include name="dojo-release-${dojo.version}/dijit/**"/>
-                <exclude name="dojo-release-${dojo.version}/dojox/**"/>
-                <exclude name="dojo-release-${dojo.version}/util/**"/>
-            </patternset>
-        </unzip>
-        <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}"
-              tofile="${unpack.location}"
-              verbose="true"/>
-        <delete dir="${basedir}/target/dojo-unpack-temp/"/>
-    </target>
-	
-
-    <target name="clean-dojo-files">
-        <delete dir="${unpack.location}"/>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/build.xml b/java/sca-contrib/samples/customer-dojo-webapp/build.xml
deleted file mode 100644
index 95813af65a..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/build.xml
+++ /dev/null
@@ -1,70 +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.    
--->
-<!DOCTYPE project [
-<!ENTITY buildDependency SYSTEM "build-dependency.xml">
-]>
-
-<project name="sample-helloworld-dojo-webapp" default="compile">
-	
-	&buildDependency;
-	
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src\main\java"/>
-            <classpath>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
-            </classpath>
-        </javac>
-        <copy todir="target/classes">
-            <fileset dir="src\main\resources"/>
-            <fileset dir="src\main\resources"/>
-        </copy>
-    	
-        <ant antfile="./build-dojo.xml" target="install-dojo-nomaven">
-          <property name="localRepository" value="./target/repo"/>
-        </ant>
-        
-        <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-          <property name="localRepository" value="./target/repo"/>
-        </ant>  
-    	
-        <war destfile="target/sample-helloworld-dojo-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">
-            <fileset dir="src/main/webapp"/>
-            <lib refid="tuscany.jars"/>
-            <lib refid="3rdparty.jars"/>
-            <classes dir="target/classes"/>
-        </war>
-    	
-        <ant antfile="./build-dojo.xml" target="clean-dojo-files">
-          <property name="localRepository" value="./target/repo"/>
-        </ant>     	
-    </target>
-	
-    <target name="package" depends="compile"/>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
-
-</project>
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png b/java/sca-contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png
deleted file mode 100644
index 57f90aed01..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg b/java/sca-contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg
deleted file mode 100644
index d5c3bc5d3e..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

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

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.44"

-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp"

-   sodipodi:docname="helloworld-jsonrpc-webapp.svg"

-   version="1.0"

-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp\helloworld-jsonrpc.png"

-   inkscape:export-xdpi="52.84"

-   inkscape:export-ydpi="52.84">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="1.4"

-     inkscape:cx="516.28571"

-     inkscape:cy="414.63224"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="721"

-     inkscape:window-x="158"

-     inkscape:window-y="164" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997"

-       transform="translate(144.2857,52.85714)">

-      <rect

-         rx="8.0946665"

-         ry="12.692303"

-         y="192.00233"

-         x="258.31134"

-         height="299.99988"

-         width="262.14267"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999893;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">helloworldjsonrpc</flowPara></flowRoot>    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="85.862968"

-       x="449.91632"

-       y="349.31049"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(190.3256,143.3719)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">HelloWorld</flowPara><flowPara

-         id="flowPara1883">JSONService</flowPara><flowPara

-         id="flowPara1885">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 373.48019,364.72909 L 455.16689,364.72909 L 470.019,392.34681 L 452.69154,417.84009 L 373.48019,417.84009 L 392.04536,392.34681 L 373.48019,364.72909 z "

-       id="path3017" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1887"

-       transform="translate(113.6483,167.4037)"><flowRegion

-         id="flowRegion1889"><rect

-           id="rect1891"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1893">HelloWorld</flowPara><flowPara

-         id="flowPara1897">Service</flowPara></flowRoot>    <rect

-       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1888"

-       width="85"

-       height="97.85714"

-       x="214.28571"

-       y="340.52307"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1892"

-       transform="translate(-56.88742,135.3526)"><flowRegion

-         id="flowRegion1894"><rect

-           id="rect1896"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1900">WebApp</flowPara></flowRoot>    <rect

-       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1912"

-       width="45.714287"

-       height="40.714287"

-       x="277.85715"

-       y="370.52304"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1914"

-       transform="translate(1.400116,166.6895)"><flowRegion

-         id="flowRegion1916"><rect

-           id="rect1918"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1920">DOJO</flowPara></flowRoot>    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 324.28571,391.23734 C 391.42857,391.95163 391.42857,391.95163 391.42857,391.95163"

-       id="path1922" />

-  </g>

-</svg>

diff --git a/java/sca-contrib/samples/customer-dojo-webapp/customer.sql b/java/sca-contrib/samples/customer-dojo-webapp/customer.sql
deleted file mode 100644
index a3caf8e050..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/customer.sql
+++ /dev/null
@@ -1,33 +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.
---
-
-DROP TABLE CUSTOMER;
-
-CREATE TABLE CUSTOMER (
-   ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY, 
-   NAME VARCHAR(30),
-   PHONE VARCHAR(10),
-   ADDRESS VARCHAR(25),
-   CITY VARCHAR(15),
-   STATE VARCHAR(2),
-   ZIP VARCHAR(5));
-
-INSERT INTO CUSTOMER (NAME, PHONE, ADDRESS, CITY, STATE, ZIP ) VALUES('Joe Smith', '4081234567', '1440 N 1st ST', 'SAN JOSE', 'CA', '95134');
-INSERT INTO CUSTOMER (NAME, PHONE, ADDRESS, CITY, STATE, ZIP ) VALUES('Erik Johnson', '4081230987', '1440 N 1st ST', 'SAN JOSE', 'CA', '95134');
-INSERT INTO CUSTOMER (NAME, PHONE, ADDRESS, CITY, STATE, ZIP ) VALUES('Mark Pensacola', '4085679988', '1440 N 1st ST', 'SAN JOSE', 'CA', '95134');
\ No newline at end of file
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/pom.xml b/java/sca-contrib/samples/customer-dojo-webapp/pom.xml
deleted file mode 100644
index 2474a561fb..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/pom.xml
+++ /dev/null
@@ -1,232 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-customer-dojo-webapp</artifactId>
-	<packaging>war</packaging>
-    <name>Apache Tuscany SCA Customer DOJO Sample WebApp</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-         </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-         </dependency>
-		         
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-                        
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jpa_3.0_spec</artifactId>
-			<version>1.1</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.openjpa</groupId>
-			<artifactId>openjpa</artifactId>
-			<version>1.0.0</version>
-			<exclusions>
-				<exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </exclusion>
-			</exclusions>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>10.3.1.4</version>
-		</dependency>		
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <!-- version>1.1</version --> 
-			    <dependencies>
-			        <dependency>
-			    	    <groupId>ant</groupId>
-			    	    <artifactId>ant-trax</artifactId>
-			    	    <version>1.6.5</version>
-			        </dependency>
-			    </dependencies>                    
-                <executions>
-                    <execution> 
-                        <id>install-dojo</id>                       
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="install-dojo">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution> 
-                        <id>copy-dojo-files</id>                       
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                    <property name="artifactId" value="${artifactId}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution> 
-                        <id>clean-dojo-files</id>                       
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="clean-dojo-files">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                    <property name="artifactId" value="${artifactId}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin> 
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
-                        </configuration>                    
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-          <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sql-maven-plugin</artifactId>
-                <version>1.3</version> 
-
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.derby</groupId>
-                        <artifactId>derby</artifactId>
-                        <version>10.3.1.4</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-db</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                            <url>jdbc:derby:${pom.basedir}/target/classes/customer-db;create=true</url>
-                            <autocommit>true</autocommit>
-                            <onError>continue</onError>
-                            <onConnectionError>skip</onConnectionError>
-                            <delimiter>;</delimiter>
-                            <srcFiles>
-                                <srcFile>${pom.basedir}/customer.sql</srcFile>
-                            </srcFiles>
-                        </configuration>
-                    </execution>
-                    
-                    <!-- Shutdown DB in order to be able to run unit tests -->
-                    <execution>
-                    	<id>shutdown-database-sothat-test-can-run</id>
-                    	<phase>process-test-resources</phase>
-                    	<goals>
-                    		<goal>execute</goal>
-                    	</goals>
-                    	<configuration>
-                    	    <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                    		<url>jdbc:derby:${pom.basedir}/target/classes/customer-db;shutdown=true</url>
-                    		<skipOnConnectionError>true</skipOnConnectionError>
-                    	</configuration>
-                    </execution>
-                </executions>
-          </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/Customer.java b/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
deleted file mode 100644
index 6d207ea2ef..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/Customer.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 customer;
-
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class Customer {
-    
-    @Id    protected int id;
-    @Basic protected String name;
-    @Basic protected String phone;
-    @Basic protected String address;
-    @Basic protected String city;
-    @Basic protected String state;
-    @Basic protected String zip;
-    
-    public int getId() {
-        return id;
-    }
-    
-    public void setId(int id) {
-        this.id = id;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    public String getPhone() {
-        return phone;
-    }
-    
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-    
-    public String getAddress() {
-        return address;
-    }
-    
-    public void setAddress(String address) {
-        this.address = address;
-    }
-    
-    public String getCity() {
-        return city;
-    }
-    
-    public void setCity(String city) {
-        this.city = city;
-    }
-    
-    public String getState() {
-        return state;
-    }
-    
-    public void setState(String state) {
-        this.state = state;
-    }
-    
-    public String getZip() {
-        return zip;
-    }
-    
-    public void setZip(String zip) {
-        this.zip = zip;
-    }
-    
-}
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java b/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
deleted file mode 100644
index 5ad39aad5c..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
+++ /dev/null
@@ -1,26 +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 customer;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-
-
-public interface CustomerCollection extends Collection<String, Customer> {
-
-}
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java b/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
deleted file mode 100644
index c0a2f25f15..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
+++ /dev/null
@@ -1,101 +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 customer;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-
-
-public class CustomerCollectionImpl implements CustomerCollection {
-    EntityManagerFactory emf = null;
-    EntityManager em = null;
-
-    public CustomerCollectionImpl() {
-        System.out.println(">>>");
-        try {
-            emf = Persistence.createEntityManagerFactory("customer-openJPA");
-            em = emf.createEntityManager();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void delete(String arg0) throws NotFoundException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public Customer get(String arg0) throws NotFoundException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Entry<String, Customer>[] getAll() {
-        EntityTransaction tx = em.getTransaction();
-        try {
-            tx.begin();
-
-            Query q = em.createQuery("SELECT c FROM customer c");
-            List results = q.getResultList();
-            Iterator iter = results.iterator();
-            while (iter.hasNext()) {
-                Customer customer = (Customer)iter.next();
-
-                System.out.println(customer);
-            }
-
-            tx.commit();
-        } catch(Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-
-            em.close();
-        }
-
-        return null;
-    }
-
-    public String post(String arg0, Customer arg1) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void put(String arg0, Customer arg1) throws NotFoundException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public Entry<String, Customer>[] query(String arg0) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java b/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java
deleted file mode 100644
index b3c965f1f7..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.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 customer;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CustomerService {
-    
-    Customer[] get();
-    
-    Customer findCustomerByName(String name);
-
-}
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java b/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
deleted file mode 100644
index 2bd49e2cf1..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
+++ /dev/null
@@ -1,117 +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 customer;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-
-public class CustomerServiceImpl implements CustomerService {
-    EntityManagerFactory emf = null;
-    EntityManager em = null;
-
-    public CustomerServiceImpl() {
-
-    }
-    
-    @Init
-    public void init() {
-        System.out.println(">>> Initializing JPA");
-        try {
-            emf = Persistence.createEntityManagerFactory("customer-openJPA");
-            em = emf.createEntityManager();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }        
-    }
-    
-    @Destroy
-    public void destroy() {
-        emf.close();
-    }
-
-    public Customer[] get() {
-        EntityTransaction tx = em.getTransaction();
-        List<Customer> customers = new ArrayList<Customer>();
-        try {
-            tx.begin();
-
-            Query q = em.createQuery("SELECT c FROM customer c");
-            List results = q.getResultList();
-            Iterator iter = results.iterator();
-            while (iter.hasNext()) {
-                Customer customer = (Customer)iter.next();
-                customers.add(customer);
-            }
-
-            tx.commit();
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-
-            em.close();
-        }
-
-        Customer[] customerArray = new Customer[customers.size()];
-        customers.toArray(customerArray);
-        return customerArray;
-    }
-
-    public Customer findCustomerByName(String name) {
-        EntityTransaction tx = em.getTransaction();
-        Customer customer = null;
-
-        try {
-            tx.begin();
-
-            Query q = em.createQuery("SELECT c FROM customer c WHERE c.name = '" + name + "'");
-            List results = q.getResultList();
-            Iterator iter = results.iterator();
-            while (iter.hasNext()) {
-                customer = (Customer)iter.next();
-            }
-
-            tx.commit();
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-
-            em.close();
-        }
-
-        return customer;
-    }
-
-}
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/launch/Launch.java b/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
deleted file mode 100644
index d7f88b8dd4..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
+++ /dev/null
@@ -1,34 +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 launch;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class Launch {
-    public static void main(String[] args) throws Exception {
-        System.out.println("Starting ...");
-        SCADomain scaDomain = SCADomain.newInstance("customer.composite");
-        System.out.println("store.composite ready for big business !!!");
-        System.in.read();
-        System.out.println("Stopping ...");
-        scaDomain.close();
-        System.out.println();
-    }
-}
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml b/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
deleted file mode 100644
index 64be295302..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
+++ /dev/null
@@ -1,51 +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.    
--->
-
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
-    version="1.0">
-    <entity class="customer.Customer" name="customer">
-        <table name="CUSTOMER"/>
-        <attributes>
-            <id name="id">
-                <generated-value strategy="TABLE"/>
-            </id>
-            <basic name="name">
-                <column name="NAME" length="30"/>
-            </basic>
-            <basic name="phone">
-                <column name="PHONE" length="10"/>
-            </basic>
-            <basic name="address">
-                <column name="ADDRESS" length="25"/>
-            </basic>
-            <basic name="city">
-                <column name="CITY" length="15"/>
-            </basic>                        
-            <basic name="state">
-                <column name="STATE" length="2"/>
-            </basic>
-            <basic name="zip">
-                <column name="ZIP" length="5"/>
-            </basic>                        
-        </attributes>
-    </entity>
-</entity-mappings>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml b/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 5674dede06..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,40 +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.    
--->
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
-        http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
-
-    <persistence-unit name="customer-openJPA">
-        <mapping-file>orm.xml</mapping-file>
-        <class>customer.Customer</class>
-		
-		<properties>
-	        <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
-	        <property name="openjpa.ConnectionURL" value="jdbc:derby:/opt/apache-tomcat-6.0.16/webapps/sample-customer-dojo-webapp/WEB-INF/classes/customer-db"/>
-			<property name="openjpa.ConnectionUserName" value=""/>
-			<property name="openjpa.ConnectionPassword" value=""/>		
-			
-			<property name="openjpa.Log" value="DefaultLevel=TRACE, Tool=TRACE"/>	
-	    </properties>
-    </persistence-unit>
-
-</persistence>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 136326d1d3..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:customer"/>
-</contribution>
-
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/customer.composite b/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/customer.composite
deleted file mode 100644
index 8b8a413499..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/customer.composite
+++ /dev/null
@@ -1,37 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="customer">
-
-	<service name="CustomerService" promote="CustomerServiceComponent/CustomerService">
-         <interface.java interface="customer.CustomerService"/>
-         <tuscany:binding.jsonrpc/>
-     </service>   
-     
-    <component name="CustomerServiceComponent">
-        <implementation.java class="customer.CustomerServiceImpl"/>
-    </component>
-
-</composite>
-
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 32f11ab9d0..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:customer"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 3e72bf29a4..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
-    xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
-    <d:environment>
-        <d:moduleId>
-            <d:groupId>org.apache.tuscany.sca</d:groupId>
-            <d:artifactId>sample-customer-dojo-webapp</d:artifactId>
-            <d:version>2.0-SNAPSHOT</d:version>
-            <d:type>war</d:type>
-        </d:moduleId>
-
-        <!-- TUSCANY-1986 -->
-        <d:inverse-classloading />
-    </d:environment>
-</web-app>
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d90b4a7d62..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  * 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.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-  <display-name>Apache Tuscany Customer dojo web application sample</display-name>
-
-  <filter>
-    <filter-name>tuscany</filter-name> 
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
-  </filter>
-
-  <filter-mapping>
-    <filter-name>tuscany</filter-name> 
-    <url-pattern>/*</url-pattern> 
-  </filter-mapping>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>customer.jsp</welcome-file>
-  </welcome-file-list>
-
-</web-app>
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/customer.jsp b/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
deleted file mode 100644
index f7e864053e..0000000000
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
+++ /dev/null
@@ -1,80 +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.

---%>

-

-<%@ page contentType="text/html;charset=UTF-8" language="java" %>

-

-<html>

-<head>

-	<title>Tuscany Dojo JSON-RPC Customer Example</TITLE>

-

-	<style type="text/css">

-        @import "dojo/dijit/themes/soria/soria.css";

-        @import "dojo/dojo/resources/dojo.css"

-    </style>

-    	            	

-	<script type="text/javascript">

-	        var djConfig = {

-	    	        parseOnLoad: true,

-	    	        baseRelativePath: "dojo",

-	    	        isDebug: true,

-	    	        debugContainerId: "dojoDebug"

-		    };

-			djConfig.usePlainJson=true ;

-	        //djConfig.debugAtAllCosts = true;

-	</script>

-	

-	<script type="text/javascript" src="dojo/dojo/dojo.js"></script>

-	<script type="text/javascript" src="dojo/dijit/dijit.js"></script>

-	

-	<script type="text/javascript">

-            dojo.require("dojo.parser");

-	    	dojo.require("dojo.rpc.JsonService");

-            dojo.require("dijit.form.ValidationTextBox");	

-	    	dojo.require("dijit.form.Button");

-	</script>

-	

-	<link rel="stylesheet" type="text/css" href="style.css" />

-</head>

-

-<body class="soria">

-

-<h2>Tuscany Dojo JSON-RPC Customer Sample</h2>

-

-Customer Name :<br>

-<input type="text" id="name" size="30" value="Joe Smith" dojoType="dijit.form.TextBox" trim="true" propercase="true" required="true" />               

-<input type="button" dojoType="dijit.form.Button" onclick="findCustomerByName()" />

-

-

-<script type="text/javascript">

-	function findCustomerByName() {

-	    var name = document.getElementById("name").value;

-	    customerService.findCustomerByName(name).addCallback(contentCallBack);;

-	 }

-

-	   	function contentCallBack(result) {

-		   	alert(result.name);

-   		//var handlerNode = document.getElementById("ReturnedContent");

-   		//handlerNode.innerHTML = "<p>" + result + "</p>" ;

-   	}

-    

-    var customerService = new dojo.rpc.JsonService("CustomerService?smd");

-</script>

-

-</body>

-</html>

diff --git a/java/sca-contrib/samples/customer-dojo/README b/java/sca-contrib/samples/customer-dojo/README
deleted file mode 100644
index 9c1729123f..0000000000
--- a/java/sca-contrib/samples/customer-dojo/README
+++ /dev/null
@@ -1,104 +0,0 @@
-Customer Dojo RPC Sample
-===========================
-
-Note. This sample is currently not working correctly on WebSphere - see TUSCANY-1990
-
-This sample demostrates the SCA JSONRPC binding using a simple web app that
-uses the RPC support of the Dojo Toolkit to an SCA service.  
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want 
-to give this sample a go deploy the WAR file (target/sample-helloworld-dojo-webapp.war)
-to you web application server. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-dojo-webapp
-
-The port and hostname will of course vary depending on your local installation. 
-
-See also the similar helloworld-jsonrpc-webapp sample which also uses the SCA JSONRPC binding
-but uses SCA scaDomain.js script on the client instead of the Dojo Toolkit. 
-
-Sample Overview
----------------
-The sample provides a single service with an operation that reflects
-a greeting back to the caller. The service is exposed using the JSONRPC
-binding. The web app provided shows how the Dojo Toolkit JSON-RPC support can be 
-used to invoke the SCA service. 
-
-The web app provided shows how the service can be called by using the DOJO toolkit. 
-
-helloworld-dojo-webapp/
-  build-dojo.xml                      - This file is an Ant script used by the 
-                                        sample build process to download the Dojo Toolkit 
-                                        and get it included in the WAR file 
-                                        for use by the sample.
-  src/
-    main/
-      java/
-        helloworldjsonrpc/
-          HelloWorldService.java      - service interface
-          HelloWorldServiceImpl.java  - service implementation
-      resources/
-        jsonrpc.composite             - the SCA assembly for this sample
-      webapp
-        dojo/                         - the Dojo toolkit (this directory is created only 
-                                        when you build the samples from the source distribution)
-        META-INF/
-          sca-contribution.xml        - specifies the composite to be deployed
-        WEB-INF/
-          web.xml                     - defines the listener that starts up the 
-                                        Tuscany SCA runtime
-        HelloWorldJSONRPC.html        - the web application that calls the 
-                                        SCA service via JSONRPC
-        style.css                     - style sheet     
-           
-  helloworld-jsonrpc-webapp.png              - a pictorial representation of the 
-                                        sample .composite file
-  build.xml                           - the Ant build file that unpacks the
-                                        dojo installation
-  pom.xml                             - the Maven build file  
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as 
-follows
-
-cd helloworld-dojo-webapp
-ant package
-
-This should result in a war file (sample-helloworld-dojo-webapp.war) in the target 
-directory. Copy this war file to your web app deployment directory in your
-web app container. 
-
-The process for getting the web app running will depend on which web app container
-you are using. For example, if you are using Tomcat then it is simply a matter
-of copying the WAR file to the webapps directory. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-dojo-webapp
-
-The port and hostname will of course vary depending on your local installation. 
-
-You should see a web page that allows you to send messages, via JSONRPC, to the 
-application running in the Tuscany SCA Runtime
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd helloworld-dojo-webapp 
-mvn
-
-Again this should result in a war file (sample-helloworld-dojo-webapp.war) in the target 
-directory. Follow the steps described in the previous section for running the web 
-app and for the expected results.
-
-
diff --git a/java/sca-contrib/samples/customer-dojo/build-dojo.xml b/java/sca-contrib/samples/customer-dojo/build-dojo.xml
deleted file mode 100644
index 8c6bd99484..0000000000
--- a/java/sca-contrib/samples/customer-dojo/build-dojo.xml
+++ /dev/null
@@ -1,92 +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 name="DojoZipInstaller">
-	
-
-    <property name="dojo.version" value="1.0.0"/>
-    <property name="unpack.location" value="${basedir}/target/classes/content/dojo"/>
-	
-
-    <target name="check-dojo-installed">
-        <condition property="already.installed" >
-            <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-        </condition>
-        <condition property="maven.suffix" value="">
-            <os family="unix"/>
-        </condition>
-        <condition property="maven.suffix" value=".bat">
-            <os family="windows"/>
-        </condition>
-    </target>
-	
-
-    <target name="check-dojo-unpacked">
-        <condition property="already.unpacked" >
-            <available file="${unpack.location}"/>
-        </condition>
-    </target>
-
-    <target name="install-dojo" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
-            <arg line="install:install-file -DgroupId=dojo  -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"/>
-        </exec>
-    </target>
-
-    <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" 
-              tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-    </target>
-	
-
-    <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">
-        <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
-        <mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
-        <unzip src="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"
-               dest="${basedir}/target/dojo-unpack-temp/"
-               overwrite="false">
-            <patternset>
-                <include name="dojo-release-${dojo.version}/dojo/**"/>
-                <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/>
-                <include name="dojo-release-${dojo.version}/dijit/**"/>
-                <exclude name="dojo-release-${dojo.version}/dojox/**"/>
-                <exclude name="dojo-release-${dojo.version}/util/**"/>
-            </patternset>
-        </unzip>
-        <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}"
-              tofile="${unpack.location}"
-              verbose="true"/>
-        <delete dir="${basedir}/target/dojo-unpack-temp/"/>
-    </target>
-	
-
-    <target name="clean-dojo-files">
-        <delete dir="${unpack.location}"/>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/customer-dojo/build.xml b/java/sca-contrib/samples/customer-dojo/build.xml
deleted file mode 100644
index 95813af65a..0000000000
--- a/java/sca-contrib/samples/customer-dojo/build.xml
+++ /dev/null
@@ -1,70 +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.    
--->
-<!DOCTYPE project [
-<!ENTITY buildDependency SYSTEM "build-dependency.xml">
-]>
-
-<project name="sample-helloworld-dojo-webapp" default="compile">
-	
-	&buildDependency;
-	
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src\main\java"/>
-            <classpath>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
-            </classpath>
-        </javac>
-        <copy todir="target/classes">
-            <fileset dir="src\main\resources"/>
-            <fileset dir="src\main\resources"/>
-        </copy>
-    	
-        <ant antfile="./build-dojo.xml" target="install-dojo-nomaven">
-          <property name="localRepository" value="./target/repo"/>
-        </ant>
-        
-        <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-          <property name="localRepository" value="./target/repo"/>
-        </ant>  
-    	
-        <war destfile="target/sample-helloworld-dojo-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">
-            <fileset dir="src/main/webapp"/>
-            <lib refid="tuscany.jars"/>
-            <lib refid="3rdparty.jars"/>
-            <classes dir="target/classes"/>
-        </war>
-    	
-        <ant antfile="./build-dojo.xml" target="clean-dojo-files">
-          <property name="localRepository" value="./target/repo"/>
-        </ant>     	
-    </target>
-	
-    <target name="package" depends="compile"/>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
-
-</project>
diff --git a/java/sca-contrib/samples/customer-dojo/customer-dojo-jsonrpc.png b/java/sca-contrib/samples/customer-dojo/customer-dojo-jsonrpc.png
deleted file mode 100644
index 57f90aed01..0000000000
--- a/java/sca-contrib/samples/customer-dojo/customer-dojo-jsonrpc.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/customer-dojo/customer-dojo-jsonrpc.svg b/java/sca-contrib/samples/customer-dojo/customer-dojo-jsonrpc.svg
deleted file mode 100644
index d5c3bc5d3e..0000000000
--- a/java/sca-contrib/samples/customer-dojo/customer-dojo-jsonrpc.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

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

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.44"

-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp"

-   sodipodi:docname="helloworld-jsonrpc-webapp.svg"

-   version="1.0"

-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp\helloworld-jsonrpc.png"

-   inkscape:export-xdpi="52.84"

-   inkscape:export-ydpi="52.84">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="1.4"

-     inkscape:cx="516.28571"

-     inkscape:cy="414.63224"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="721"

-     inkscape:window-x="158"

-     inkscape:window-y="164" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997"

-       transform="translate(144.2857,52.85714)">

-      <rect

-         rx="8.0946665"

-         ry="12.692303"

-         y="192.00233"

-         x="258.31134"

-         height="299.99988"

-         width="262.14267"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999893;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">helloworldjsonrpc</flowPara></flowRoot>    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="85.862968"

-       x="449.91632"

-       y="349.31049"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(190.3256,143.3719)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">HelloWorld</flowPara><flowPara

-         id="flowPara1883">JSONService</flowPara><flowPara

-         id="flowPara1885">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 373.48019,364.72909 L 455.16689,364.72909 L 470.019,392.34681 L 452.69154,417.84009 L 373.48019,417.84009 L 392.04536,392.34681 L 373.48019,364.72909 z "

-       id="path3017" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1887"

-       transform="translate(113.6483,167.4037)"><flowRegion

-         id="flowRegion1889"><rect

-           id="rect1891"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1893">HelloWorld</flowPara><flowPara

-         id="flowPara1897">Service</flowPara></flowRoot>    <rect

-       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1888"

-       width="85"

-       height="97.85714"

-       x="214.28571"

-       y="340.52307"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1892"

-       transform="translate(-56.88742,135.3526)"><flowRegion

-         id="flowRegion1894"><rect

-           id="rect1896"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1900">WebApp</flowPara></flowRoot>    <rect

-       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1912"

-       width="45.714287"

-       height="40.714287"

-       x="277.85715"

-       y="370.52304"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1914"

-       transform="translate(1.400116,166.6895)"><flowRegion

-         id="flowRegion1916"><rect

-           id="rect1918"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1920">DOJO</flowPara></flowRoot>    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 324.28571,391.23734 C 391.42857,391.95163 391.42857,391.95163 391.42857,391.95163"

-       id="path1922" />

-  </g>

-</svg>

diff --git a/java/sca-contrib/samples/customer-dojo/customer.sql b/java/sca-contrib/samples/customer-dojo/customer.sql
deleted file mode 100644
index a3caf8e050..0000000000
--- a/java/sca-contrib/samples/customer-dojo/customer.sql
+++ /dev/null
@@ -1,33 +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.
---
-
-DROP TABLE CUSTOMER;
-
-CREATE TABLE CUSTOMER (
-   ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY, 
-   NAME VARCHAR(30),
-   PHONE VARCHAR(10),
-   ADDRESS VARCHAR(25),
-   CITY VARCHAR(15),
-   STATE VARCHAR(2),
-   ZIP VARCHAR(5));
-
-INSERT INTO CUSTOMER (NAME, PHONE, ADDRESS, CITY, STATE, ZIP ) VALUES('Joe Smith', '4081234567', '1440 N 1st ST', 'SAN JOSE', 'CA', '95134');
-INSERT INTO CUSTOMER (NAME, PHONE, ADDRESS, CITY, STATE, ZIP ) VALUES('Erik Johnson', '4081230987', '1440 N 1st ST', 'SAN JOSE', 'CA', '95134');
-INSERT INTO CUSTOMER (NAME, PHONE, ADDRESS, CITY, STATE, ZIP ) VALUES('Mark Pensacola', '4085679988', '1440 N 1st ST', 'SAN JOSE', 'CA', '95134');
\ No newline at end of file
diff --git a/java/sca-contrib/samples/customer-dojo/pom.xml b/java/sca-contrib/samples/customer-dojo/pom.xml
deleted file mode 100644
index 5c64caaad4..0000000000
--- a/java/sca-contrib/samples/customer-dojo/pom.xml
+++ /dev/null
@@ -1,244 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-customer-dojo</artifactId>
-    <name>Apache Tuscany SCA Customer DOJO Sample WebApp</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-                
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jpa_3.0_spec</artifactId>
-			<version>1.1</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.openjpa</groupId>
-			<artifactId>openjpa</artifactId>
-			<version>1.0.0</version>
-			<exclusions>
-				<exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </exclusion>
-			</exclusions>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>10.3.1.4</version>
-		</dependency>		
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <!-- version>1.1</version --> 
-			    <dependencies>
-			        <dependency>
-			    	    <groupId>ant</groupId>
-			    	    <artifactId>ant-trax</artifactId>
-			    	    <version>1.6.5</version>
-			        </dependency>
-			    </dependencies>                    
-                <executions>
-                    <execution> 
-                        <id>install-dojo</id>                       
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="install-dojo">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution> 
-                        <id>copy-dojo-files</id>                       
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                    <property name="artifactId" value="${artifactId}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution> 
-                        <id>clean-dojo-files</id>                       
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="clean-dojo-files">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                    <property name="artifactId" value="${artifactId}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin> 
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
-                        </configuration>                    
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-          <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sql-maven-plugin</artifactId>
-                <version>1.3</version> 
-
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.derby</groupId>
-                        <artifactId>derby</artifactId>
-                        <version>10.3.1.4</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-db</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                            <url>jdbc:derby:${pom.basedir}/target/classes/customer-db;create=true</url>
-                            <autocommit>true</autocommit>
-                            <onError>continue</onError>
-                            <onConnectionError>skip</onConnectionError>
-                            <delimiter>;</delimiter>
-                            <srcFiles>
-                                <srcFile>${pom.basedir}/customer.sql</srcFile>
-                            </srcFiles>
-                        </configuration>
-                    </execution>
-                    
-                    <!-- Shutdown DB in order to be able to run unit tests -->
-                    <execution>
-                    	<id>shutdown-database-sothat-test-can-run</id>
-                    	<phase>process-test-resources</phase>
-                    	<goals>
-                    		<goal>execute</goal>
-                    	</goals>
-                    	<configuration>
-                    	    <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                    		<url>jdbc:derby:${pom.basedir}/target/classes/customer-db;shutdown=true</url>
-                    		<skipOnConnectionError>true</skipOnConnectionError>
-                    	</configuration>
-                    </execution>
-                </executions>
-          </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/Customer.java b/java/sca-contrib/samples/customer-dojo/src/main/java/customer/Customer.java
deleted file mode 100644
index 6d207ea2ef..0000000000
--- a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/Customer.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 customer;
-
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class Customer {
-    
-    @Id    protected int id;
-    @Basic protected String name;
-    @Basic protected String phone;
-    @Basic protected String address;
-    @Basic protected String city;
-    @Basic protected String state;
-    @Basic protected String zip;
-    
-    public int getId() {
-        return id;
-    }
-    
-    public void setId(int id) {
-        this.id = id;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    public String getPhone() {
-        return phone;
-    }
-    
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-    
-    public String getAddress() {
-        return address;
-    }
-    
-    public void setAddress(String address) {
-        this.address = address;
-    }
-    
-    public String getCity() {
-        return city;
-    }
-    
-    public void setCity(String city) {
-        this.city = city;
-    }
-    
-    public String getState() {
-        return state;
-    }
-    
-    public void setState(String state) {
-        this.state = state;
-    }
-    
-    public String getZip() {
-        return zip;
-    }
-    
-    public void setZip(String zip) {
-        this.zip = zip;
-    }
-    
-}
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerCollection.java b/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
deleted file mode 100644
index 5ad39aad5c..0000000000
--- a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
+++ /dev/null
@@ -1,26 +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 customer;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-
-
-public interface CustomerCollection extends Collection<String, Customer> {
-
-}
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java b/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
deleted file mode 100644
index c0a2f25f15..0000000000
--- a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
+++ /dev/null
@@ -1,101 +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 customer;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-
-
-public class CustomerCollectionImpl implements CustomerCollection {
-    EntityManagerFactory emf = null;
-    EntityManager em = null;
-
-    public CustomerCollectionImpl() {
-        System.out.println(">>>");
-        try {
-            emf = Persistence.createEntityManagerFactory("customer-openJPA");
-            em = emf.createEntityManager();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void delete(String arg0) throws NotFoundException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public Customer get(String arg0) throws NotFoundException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Entry<String, Customer>[] getAll() {
-        EntityTransaction tx = em.getTransaction();
-        try {
-            tx.begin();
-
-            Query q = em.createQuery("SELECT c FROM customer c");
-            List results = q.getResultList();
-            Iterator iter = results.iterator();
-            while (iter.hasNext()) {
-                Customer customer = (Customer)iter.next();
-
-                System.out.println(customer);
-            }
-
-            tx.commit();
-        } catch(Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-
-            em.close();
-        }
-
-        return null;
-    }
-
-    public String post(String arg0, Customer arg1) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void put(String arg0, Customer arg1) throws NotFoundException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public Entry<String, Customer>[] query(String arg0) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerService.java b/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerService.java
deleted file mode 100644
index b3c965f1f7..0000000000
--- a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerService.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 customer;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CustomerService {
-    
-    Customer[] get();
-    
-    Customer findCustomerByName(String name);
-
-}
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java b/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
deleted file mode 100644
index 2bd49e2cf1..0000000000
--- a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
+++ /dev/null
@@ -1,117 +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 customer;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-
-public class CustomerServiceImpl implements CustomerService {
-    EntityManagerFactory emf = null;
-    EntityManager em = null;
-
-    public CustomerServiceImpl() {
-
-    }
-    
-    @Init
-    public void init() {
-        System.out.println(">>> Initializing JPA");
-        try {
-            emf = Persistence.createEntityManagerFactory("customer-openJPA");
-            em = emf.createEntityManager();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }        
-    }
-    
-    @Destroy
-    public void destroy() {
-        emf.close();
-    }
-
-    public Customer[] get() {
-        EntityTransaction tx = em.getTransaction();
-        List<Customer> customers = new ArrayList<Customer>();
-        try {
-            tx.begin();
-
-            Query q = em.createQuery("SELECT c FROM customer c");
-            List results = q.getResultList();
-            Iterator iter = results.iterator();
-            while (iter.hasNext()) {
-                Customer customer = (Customer)iter.next();
-                customers.add(customer);
-            }
-
-            tx.commit();
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-
-            em.close();
-        }
-
-        Customer[] customerArray = new Customer[customers.size()];
-        customers.toArray(customerArray);
-        return customerArray;
-    }
-
-    public Customer findCustomerByName(String name) {
-        EntityTransaction tx = em.getTransaction();
-        Customer customer = null;
-
-        try {
-            tx.begin();
-
-            Query q = em.createQuery("SELECT c FROM customer c WHERE c.name = '" + name + "'");
-            List results = q.getResultList();
-            Iterator iter = results.iterator();
-            while (iter.hasNext()) {
-                customer = (Customer)iter.next();
-            }
-
-            tx.commit();
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-
-            em.close();
-        }
-
-        return customer;
-    }
-
-}
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/java/launch/Launch.java b/java/sca-contrib/samples/customer-dojo/src/main/java/launch/Launch.java
deleted file mode 100644
index a51ab605bc..0000000000
--- a/java/sca-contrib/samples/customer-dojo/src/main/java/launch/Launch.java
+++ /dev/null
@@ -1,35 +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 launch;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class Launch {
-    public static void main(String[] args) throws Exception {
-        System.out.println("Starting ...");
-        SCADomain scaDomain = SCADomain.newInstance("customer.composite");
-        System.out.println("customer.composite ready for big business !!!");
-        System.out.println("url : http://localhost:8080/customer.html");
-        System.in.read();
-        System.out.println("Stopping ...");
-        scaDomain.close();
-        System.out.println();
-    }
-}
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/orm.xml b/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/orm.xml
deleted file mode 100644
index 64be295302..0000000000
--- a/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/orm.xml
+++ /dev/null
@@ -1,51 +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.    
--->
-
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
-    version="1.0">
-    <entity class="customer.Customer" name="customer">
-        <table name="CUSTOMER"/>
-        <attributes>
-            <id name="id">
-                <generated-value strategy="TABLE"/>
-            </id>
-            <basic name="name">
-                <column name="NAME" length="30"/>
-            </basic>
-            <basic name="phone">
-                <column name="PHONE" length="10"/>
-            </basic>
-            <basic name="address">
-                <column name="ADDRESS" length="25"/>
-            </basic>
-            <basic name="city">
-                <column name="CITY" length="15"/>
-            </basic>                        
-            <basic name="state">
-                <column name="STATE" length="2"/>
-            </basic>
-            <basic name="zip">
-                <column name="ZIP" length="5"/>
-            </basic>                        
-        </attributes>
-    </entity>
-</entity-mappings>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/persistence.xml b/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 5add897279..0000000000
--- a/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,40 +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.    
--->
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
-        http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
-
-    <persistence-unit name="customer-openJPA">
-        <mapping-file>orm.xml</mapping-file>
-        <class>customer.Customer</class>
-		
-		<properties>
-	        <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
-	        <property name="openjpa.ConnectionURL" value="jdbc:derby:target/classes/customer-db"/>
-			<property name="openjpa.ConnectionUserName" value=""/>
-			<property name="openjpa.ConnectionPassword" value=""/>		
-			
-			<property name="openjpa.Log" value="DefaultLevel=TRACE, Tool=TRACE"/>	
-	    </properties>
-    </persistence-unit>
-
-</persistence>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 136326d1d3..0000000000
--- a/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:customer"/>
-</contribution>
-
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/resources/content/customer.html b/java/sca-contrib/samples/customer-dojo/src/main/resources/content/customer.html
deleted file mode 100644
index dbc8aad9d0..0000000000
--- a/java/sca-contrib/samples/customer-dojo/src/main/resources/content/customer.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<html>
-<!--
- * 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.    
- -->
-<head>
-	<title>Tuscany Dojo JSON-RPC Customer Example</TITLE>
-
-	<style type="text/css">
-        @import "dojo/dijit/themes/soria/soria.css";
-        @import "dojo/dojo/resources/dojo.css"
-    </style>
-    	            	
-	<script type="text/javascript">
-	        var djConfig = {
-	    	        parseOnLoad: true,
-	    	        baseRelativePath: "dojo",
-	    	        isDebug: true,
-	    	        debugContainerId: "dojoDebug"
-		    };
-			djConfig.usePlainJson=true ;
-	        //djConfig.debugAtAllCosts = true;
-	</script>
-	
-	<script type="text/javascript" src="dojo/dojo/dojo.js"></script>
-	<script type="text/javascript" src="dojo/dijit/dijit.js"></script>
-	
-	<script type="text/javascript">
-            dojo.require("dojo.parser");
-	    	dojo.require("dojo.rpc.JsonService");
-            dojo.require("dijit.form.ValidationTextBox");	
-	    	dojo.require("dijit.form.Button");
-	</script>
-	
-	<link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-
-<body class="soria">
-
-<h2>Tuscany Dojo JSON-RPC Customer Sample</h2>
-
-Customer Name :<br>
-<input type="text" id="name" size="30" value="Joe Smith" dojoType="dijit.form.TextBox" trim="true" propercase="true" required="true" />               
-<input type="button" dojoType="dijit.form.Button" onclick="findCustomerByName()" />
-
-
-<script type="text/javascript">
-	function findCustomerByName() {
-	    var name = document.getElementById("name").value;
-	    customerService.findCustomerByName(name).addCallback(contentCallBack);;
-	 }
-
-	   	function contentCallBack(result) {
-		   	alert(result.name);
-   		//var handlerNode = document.getElementById("ReturnedContent");
-   		//handlerNode.innerHTML = "<p>" + result + "</p>" ;
-   	}
-    
-    var customerService = new dojo.rpc.JsonService("/CustomerService?smd");
-</script>
-
-</body>
-</html>
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/resources/customer.composite b/java/sca-contrib/samples/customer-dojo/src/main/resources/customer.composite
deleted file mode 100644
index 4c370f2a9f..0000000000
--- a/java/sca-contrib/samples/customer-dojo/src/main/resources/customer.composite
+++ /dev/null
@@ -1,44 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="customer">
-
-	<component name="ui">
-		<tuscany:implementation.resource location="content"/>
-		<service name="Resource">
-    		<tuscany:binding.http uri="/"/>
-    	</service>
-	</component>    
-
-	<service name="CustomerService" promote="CustomerServiceComponent/CustomerService">
-         <interface.java interface="customer.CustomerService"/>
-         <tuscany:binding.jsonrpc/>
-     </service>   
-     
-    <component name="CustomerServiceComponent">
-        <implementation.java class="customer.CustomerServiceImpl"/>
-    </component>
-
-</composite>
-
diff --git a/java/sca-contrib/samples/databinding-echo/README b/java/sca-contrib/samples/databinding-echo/README
deleted file mode 100644
index 67c1aa32d5..0000000000
--- a/java/sca-contrib/samples/databinding-echo/README
+++ /dev/null
@@ -1,143 +0,0 @@
-DataBinding Echo Sample
-=======================
-
-This sample demonstrates how databindings are used to convert data formats as 
-the data flows between components. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens, open a command prompt, navigate
-to this sample directory, and do
-
-ant run 
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;..\binding-echo-extension\target\sample-binding-echo-extension.jar;target\sample-databinding-echo.jar dbecho.EchoDataBindingClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:../binding-echo-extension/target/sample-binding-echo-extension.jar:target/sample-databinding-echo.jar dbecho.EchoDataBindingClient
-
-
-Sample Overview
----------------
-If reference and service interfaces are the same in all but the formats of 
-data being passed to and returned from the operations of the interfaces,
-then SCA will try to apply appropriate transformations to the data formats
-to allow messages to pass. 
-
-This sample shows this happening. ComponentA implements Interface1 which
-defines;
-
- String call(String msg)
- String call1(String msg) 
- 
-ComponentA defines a reference to ComponentB with Interface1. ComponentB 
-however implements Interface2 which defines;
-
- Node call(Node msg);
- XMLStreamReader call1(XMLStreamReader msg);
- 
-You can see from the test output below that SCA converts the call() msg from a 
-String to a DOM object (org.apache.xerces.dom.DeferredDocumentImpl). It
-converts the call1() msg from a String to a XML stream reader 
-(com.ctc.wstx.sr.ValidatingStreamReader).
-
-databinding-echo/
-  src/
-    main/
-      java/
-        dbecho/
-          ComponentAImpl.java                           - component implementation 
-          ComponentBImpl.java                           - component implementation
-          Echo.java                                     - service interface with data binding
-          EchoDataBindingClient.java                    - sample client code
-          Interface1.java                               - service interface with data binding
-          Interface2.java                               - service interface with data bindings
-      resources/
-        META-INF/
-          services/
-            org.apache.tuscany.sca.core.ModuleActivator - specifies the module activation class to call
-        EchoDataBinding.composite                       - composite definition
-        wsdl/
-          echo.wsdl                                     - WSDL deinitions
-    test/
-      java/ 
-        dbecho/
-          EchoDataBindingTestCase.java - junit test case
-  databinding-echo.png - pictorial representation of the sample .composite file
-  build.xml            - the Ant build file
-  pom.xml              - the Maven build file
-  
-TODO - Needs more description of what else is going on in this test
-       properties, wsdl?
-
-  
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows.
-
-cd databinding-echo
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] [Property] prefix: ABC
-     [java] [Property] prefix1: ABC
-     [java] [Property] bar: BAR
-     [java] ComponentA --> Received message: <message><foo>123</foo></message> [java.lang.String]
-     [java] ComponentB --> Received message: [#document: null] [org.apache.xerces.dom.DeferredDocumentImpl]
-     [java] ComponentB --> Returned message: [#document: null] [org.apache.xerces.dom.DeferredDocumentImpl]
-     [java] ComponentA --> Returned message: <?xml version="1.0" encoding="UTF-8"?><message><foo>123</foo></message> [java.lang.String]
-     [java] [Property] prefix: ABC
-     [java] [Property] prefix1: ABC
-     [java] [Property] bar: BAR
-     [java] ComponentA --> Received message: <message><foo>123</foo></message> [java.lang.String]
-     [java] ComponentB --> Received message: com.ctc.wstx.sr.ValidatingStreamReader@4c444c44 [com.ctc.wstx.sr.ValidatingStreamReader]
-     [java] ComponentB --> Returned message: com.ctc.wstx.sr.ValidatingStreamReader@4c444c44 [com.ctc.wstx.sr.ValidatingStreamReader]
-     [java] ComponentA --> Returned message: <?xml version='1.0' encoding='UTF-8'?><message><foo>123</foo></message> [java.lang.String]
-     [java] call  response = <?xml version="1.0" encoding="UTF-8"?><message><foo>123</foo></message>
-     [java] call1 response = <?xml version='1.0' encoding='UTF-8'?><message><foo>123</foo></message>
-
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd databinding-echo
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running dbecho.EchoDataBindingTestCase
-[Property] prefix: ABC
-[Property] prefix1: ABC
-[Property] bar: BAR
-ComponentA --> Received message: <message><foo>123</foo></message> [java.lang.String]
-ComponentB --> Received message: [#document: null] [org.apache.xerces.dom.DeferredDocumentImpl]
-ComponentB --> Returned message: [#document: null] [org.apache.xerces.dom.DeferredDocumentImpl]
-ComponentA --> Returned message: <?xml version="1.0" encoding="UTF-8"?><message><foo>123</foo></message> [java.lang.String]
-[Property] prefix: ABC
-[Property] prefix1: ABC
-[Property] bar: BAR
-ComponentA --> Received message: <message><foo>123</foo></message> [java.lang.String]
-ComponentB --> Received message: com.ctc.wstx.sr.ValidatingStreamReader@74e274e2 [com.ctc.wstx.sr.ValidatingStreamReader]
-ComponentB --> Returned message: com.ctc.wstx.sr.ValidatingStreamReader@74e274e2 [com.ctc.wstx.sr.ValidatingStreamReader]
-ComponentA --> Returned message: <?xml version='1.0' encoding='UTF-8'?><message><foo>123</foo></message> [java.lang.String]
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.653 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/databinding-echo/build.xml b/java/sca-contrib/samples/databinding-echo/build.xml
deleted file mode 100644
index 7f2483f6fb..0000000000
--- a/java/sca-contrib/samples/databinding-echo/build.xml
+++ /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.    
--->
-<project name="databinding-echo" default="compile">
-    <property name="test.class" value="dbecho.EchoDataBindingClient" />
-    <property name="test.jar"   value="sample-databinding-echo.jar" />
-
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-                <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-                <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar"/>
-            </classpath>
-        </javac>
-                    <copy todir="target/classes">
-                        <fileset dir="src/main/resources"/>
-                    </copy>
-                    <jar destfile="target/${test.jar}" basedir="target/classes">
-                        <manifest>
-                            <attribute name="Main-Class" value="${test.class}" />
-                        </manifest>
-                    </jar>
-    </target>
-
-                    <target name="run-classes">
-                        <java classname="${test.class}"
-                              fork="true">
-                            <classpath>
-                                <pathelement path="target/classes"/>
-                                <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-                                <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar"/> 
-                        </classpath>
-                        </java>
-                    </target>
-
-                    <target name="run">
-                        <java classname="${test.class}"
-                              fork="true">
-                            <classpath>
-                                <pathelement path="target/${test.jar}"/>
-                                <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-                                <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar"/> 
-                            </classpath>
-                        </java>
-                    </target>
-
-                    <target name="clean">
-                        <delete quiet="true" includeemptydirs="true">
-                            <fileset dir="target"/>
-                        </delete>
-                    </target>
-</project>
diff --git a/java/sca-contrib/samples/databinding-echo/databinding-echo.png b/java/sca-contrib/samples/databinding-echo/databinding-echo.png
deleted file mode 100644
index afbbfff285..0000000000
--- a/java/sca-contrib/samples/databinding-echo/databinding-echo.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/databinding-echo/databinding-echo.svg b/java/sca-contrib/samples/databinding-echo/databinding-echo.svg
deleted file mode 100644
index 87964abf86..0000000000
--- a/java/sca-contrib/samples/databinding-echo/databinding-echo.svg
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\databinding-echo"
-   sodipodi:docname="databinding-echo.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\databinding-echo\databinding-echo.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="651.92601"
-     inkscape:cy="392.43347"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="129"
-     inkscape:window-y="144" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="translate(-1.428571,-2.857143)">
-      <rect
-         rx="12.858844"
-         ry="14.71703"
-         y="192.00235"
-         x="258.31155"
-         height="347.85706"
-         width="416.42877"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">EchoDataBinding</flowPara></flowRoot>      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect1883"
-         width="115.66247"
-         height="85.862968"
-         x="383.82632"
-         y="385.59885"
-         rx="6.9961648"
-         ry="7.1230249" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot1885"
-         transform="translate(116.2356,179.6603)"><flowRegion
-           id="flowRegion1887"><rect
-             id="rect1889"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara1891">ComponentB</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 362.67592,417.44582 L 408.70328,417.44582 L 417.07188,430.5778 L 407.30852,442.69964 L 362.67592,442.69964 L 373.13669,430.5778 L 362.67592,417.44582 z "
-         id="path1895" />
-      <path
-         style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 479.92825,415.60754 L 513.26329,415.60754 L 519.3242,428.73952 L 512.25314,440.86136 L 479.92825,440.86136 L 487.5044,428.73952 L 479.92825,415.60754 z "
-         id="path1897" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 530.71429,300.52305 C 542.23557,306.08282 554.6675,310.12484 560.71429,324.80877 C 566.71449,361.72815 311.41635,367.01996 323.57143,396.95162 C 328.25255,419.41336 352.58793,422.22083 371.42857,430.52305"
-         id="path1985"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 636.0161,399.32486 L 697.75773,399.32486 L 708.98347,428.79969 L 695.88678,456.00726 L 636.0161,456.00726 L 650.0483,428.79969 L 636.0161,399.32486 z "
-         id="path1987" />
-    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="385.63062"
-       y="257.1676"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(120.1827,59.8005)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">ComponentA</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:0.99999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3006"
-       width="58.861061"
-       height="43.565228"
-       x="413.73505"
-       y="225.79604"
-       rx="29.430531"
-       ry="0" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 368.48016,289.0146 L 412.69432,289.0146 L 420.73325,302.14658 L 411.3545,314.26842 L 368.48016,314.26842 L 378.52884,302.14658 L 368.48016,289.0146 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.44718,289.31918 L 522.26576,289.31918 L 530.41458,302.45116 L 520.90763,314.573 L 477.44718,314.573 L 487.63323,302.45116 L 477.44718,289.31918 z "
-       id="path3019" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1929"
-       transform="translate(137.8698,15.88564)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1931"><rect
-           id="rect1933"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara1939">prefix</flowPara><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara1946">prefix1</flowPara><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara1948">bar</flowPara><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara1950" /></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1952"
-       transform="translate(206.8091,83.74868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1954"><rect
-           id="rect1956"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara1964">Interface1</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1975"
-       transform="translate(90.30101,207.3812)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1977"><rect
-           id="rect1979"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara1981">Interface2</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1989"
-       transform="translate(366.1555,195.5999)"><flowRegion
-         id="flowRegion1991"><rect
-           id="rect1993"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1995"
-         style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans">Echo</flowPara><flowPara
-         style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara1997">Reference</flowPara><flowPara
-         style="font-size:8;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara1999">binding.echo</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 517.28571,425.66591 C 645.85714,424.23734 645.85714,424.23734 645.85714,424.23734"
-       id="path2003" />
-    <rect
-       style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:0.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2005"
-       width="73.166656"
-       height="30.708084"
-       x="563.42657"
-       y="202.31184"
-       rx="36.583328"
-       ry="0" />
-    <rect
-       style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:0.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2007"
-       width="73.166656"
-       height="30.708084"
-       x="563.40656"
-       y="246.5976"
-       rx="36.583328"
-       ry="0" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2009"
-       transform="translate(285.8806,-8.394223)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2011"><rect
-           id="rect2013"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara2021">messagePrefix</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2023"
-       transform="translate(285.1663,39.46291)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2025"><rect
-           id="rect2027"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara2035">complexProperty</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 447.85714,241.95163 C 563.57143,215.52305 563.57143,215.52305 563.57143,215.52305"
-       id="path2055" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2061"
-       transform="translate(33.15817,261.6669)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2063"><rect
-           id="rect2065"
-           width="217.85715"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara2067">@DataBinding(&quot;org.w3c.dom.Node&quot;)</flowPara><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara2069">&amp;</flowPara><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara2071">@DataBinding(&quot;javax.xml.stream.XMLStreamReader&quot;)</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2073"
-       transform="translate(258.3449,71.60582)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2075"><rect
-           id="rect2077"
-           width="217.85715"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara2079">@DataBinding(&quot;java.lang.String&quot;)</flowPara><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara2083" /></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,1;stroke-dashoffset:0"
-       d="M 523.57143,293.3802 C 541.42857,289.09448 540.71429,289.09448 540.71429,289.09448"
-       id="path2087" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,1;stroke-dashoffset:0"
-       d="M 322.14286,471.95163 C 375,436.95163 375,436.95163 375,436.95163"
-       id="path2976" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2978"
-       transform="translate(275.4877,156.6059)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2980"><rect
-           id="rect2982"
-           width="286.42859"
-           height="42.85714"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara2988">&lt;db:databinding  name=&quot;org.apache.axiom.om.OMElement&quot; /&gt;</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,1;stroke-dashoffset:0"
-       d="M 677.85714,397.66591 C 684.28571,376.95163 684.28571,376.95163 684.28571,376.95163"
-       id="path2997" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3886"
-       transform="translate(96.76088,84.52404)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-       inkscape:transform-center-y="72.857143"
-       inkscape:transform-center-x="90.714286"><flowRegion
-         id="flowRegion3888"><rect
-           id="rect3890"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara3892">Interface1</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 445.71429,250.52305 C 563.57143,262.66591 563.57143,262.66591 563.57143,262.66591"
-       id="path1956" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1958"
-       transform="translate(205.618,209.9526)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1960"><rect
-           id="rect1962"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara1965">Echo</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1967"
-       transform="translate(259.7734,259.463)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1969"><rect
-           id="rect1971"
-           width="286.42859"
-           height="42.85714"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara1973">@DataBinding(&quot;org.w3c.dom.Node&quot;)</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,1;stroke-dashoffset:0"
-       d="M 540.71429,471.23734 C 510,433.3802 511.42857,434.80877 511.42857,434.80877"
-       id="path1975" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2867"
-       transform="translate(-47.64121,63.74863)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2869"><rect
-           id="rect2871"
-           width="217.85715"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara2873">@DataBinding(&quot;java.lang.String&quot;)</flowPara><flowPara
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
-         id="flowPara2875" /></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,1;stroke-dashoffset:0"
-       d="M 337.14286,286.23734 C 372.85714,294.80877 372.85714,294.80877 372.85714,294.80877"
-       id="path2877" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/databinding-echo/pom.xml b/java/sca-contrib/samples/databinding-echo/pom.xml
deleted file mode 100644
index 3010c7e89e..0000000000
--- a/java/sca-contrib/samples/databinding-echo/pom.xml
+++ /dev/null
@@ -1,82 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>sample-databinding-echo</artifactId>
-    <name>Apache Tuscany SCA Echo Data Binding Sample</name>    
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-binding-echo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>      
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>          
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
deleted file mode 100644
index 29a5e5c9ad..0000000000
--- a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
+++ /dev/null
@@ -1,74 +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 dbecho;
-
-import org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComponentAImpl implements Interface1 {
-
-    private Interface1 componentBReference;
-    
-    @Constructor
-    public ComponentAImpl(@Reference(name = "componentBReference", required = true)
-    Interface1 componentBReference) {
-        this.componentBReference = componentBReference;
-    }
-
-    public String call(String 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 (String) ret;
-    }
-
-    public String call1(String 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 (String) ret;
-    }
-
-    @Property(name="prefix")
-    public void setPrefix(String prefix) {
-        System.out.println("[Property] prefix: " + prefix);
-    }
-
-    @Property(name="prefix1")
-    public void setPrefix1(String prefix1) {
-        System.out.println("[Property] prefix1: " + prefix1);
-    }  
-    
-    /**
-     * @param bar the bar to set
-     */
-    @Property(name="bar")
-    public void setBar(String bar) {
-        System.out.println("[Property] bar: " + bar);
-    }
-
-}
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
deleted file mode 100644
index e98cd55bcf..0000000000
--- a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/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 dbecho;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.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/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/Echo.java b/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/Echo.java
deleted file mode 100644
index b47a9c1b85..0000000000
--- a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/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 dbecho;
-
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@DataBinding("org.w3c.dom.Node")
-@Remotable
-public interface Echo {
-    Object echo(Object msg);
-}
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
deleted file mode 100644
index 9ec3819899..0000000000
--- a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.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.    
- */
-package dbecho;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- * @version $Rev$ $Date$
- */
-public class EchoDataBindingClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain  = SCADomain.newInstance("EchoDataBinding.composite");
-        
-        Interface1 componentA = scaDomain.getService(Interface1.class, "ComponentA");
-        String response = componentA.call("<message><foo>123</foo></message>");
-        String response1= componentA.call1("<message><foo>123</foo></message>");
-        
-        
-        System.out.println("call  response = " + response );
-        System.out.println("call1 response = " + response1 );
-       
-        scaDomain.close();
-
-    }
-
-}
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/Interface1.java
deleted file mode 100644
index 9fff3bb4b9..0000000000
--- a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/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 dbecho;
-
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@DataBinding("java.lang.String")
-@Remotable
-public interface Interface1 {
-    String call(String msg);
-    String call1(String msg);
-}
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/Interface2.java
deleted file mode 100644
index 61ed7951e4..0000000000
--- a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/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 dbecho;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.oasisopen.sca.annotation.Remotable;
-import org.w3c.dom.Node;
-
-/**
- * @version $Rev$ $Date$
- */
-@DataBinding("org.w3c.dom.Node")
-@Remotable
-public interface Interface2 {
-    Node call(Node msg);
-    @DataBinding("javax.xml.stream.XMLStreamReader")
-    XMLStreamReader call1(XMLStreamReader msg);
-}
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/java/sca-contrib/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
deleted file mode 100644
index 30b77a6152..0000000000
--- a/java/sca-contrib/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ /dev/null
@@ -1,58 +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:local="http://tuscany.apache.org/xmlns/sca/binding/1.0"
-	xmlns:f="http://foo"
-    xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-    xmlns:e="http://echo"
-	name="EchoDataBinding">
-
-    <component name="ComponentA">
-        <implementation.java class="dbecho.ComponentAImpl" />
-        <reference name="componentBReference" target="ComponentB" />
-        <property name="prefix">ABC</property>
-        <property name="prefix1" source="$messagePrefix"></property>
-        <property name="bar" source="$complexProperty/*[local-name()='foo']/*[local-name()='bar']"></property>
-    </component>
-
-    <component name="ComponentB">
-        <implementation.java class="dbecho.ComponentBImpl" />
-    </component>
-
-    <reference name="EchoReference" promote="ComponentB/echoReference">
-        <interface.java interface="dbecho.Echo"/>
-    <!-- Replaced interface.wsdl by interface.java because TUSCANY-2324 fix uses the interface specified here
-        <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>
-    -->
-        <e: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>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/java/sca-contrib/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
deleted file mode 100644
index ef2308aa73..0000000000
--- a/java/sca-contrib/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.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.    

--->

-<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
diff --git a/java/sca-contrib/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/java/sca-contrib/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
deleted file mode 100644
index 43434d8cee..0000000000
--- a/java/sca-contrib/samples/databinding-echo/src/test/java/dbecho/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 dbecho;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoDataBindingTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("EchoDataBinding.composite");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    protected Interface1 componentA;
-
-    public void testTransform() {
-        componentA = scaDomain.getService(Interface1.class, "ComponentA");
-        componentA.call("<message><foo>123</foo></message>");
-        componentA.call1("<message><foo>123</foo></message>");
-    }
-}
diff --git a/java/sca-contrib/samples/domain-management/README b/java/sca-contrib/samples/domain-management/README
deleted file mode 100644
index 6280a28028..0000000000
--- a/java/sca-contrib/samples/domain-management/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Domain Management Sample Tasks
-==============================
-This sample implements the following sample domain management tasks:
-- list deployables in a contribution
-- list contribution dependencies
-- fuse includes in a composite
-- add deployables to a domain composite and wire them
-
diff --git a/java/sca-contrib/samples/domain-management/pom.xml b/java/sca-contrib/samples/domain-management/pom.xml
deleted file mode 100644
index a64e411922..0000000000
--- a/java/sca-contrib/samples/domain-management/pom.xml
+++ /dev/null
@@ -1,247 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-domain-management</artifactId>
-    <name>Apache Tuscany SCA Sample Domain Management Tasks</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.8.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       	<finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>assets</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/test/resources/assembly/assets.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <finalName>${artifactId}</finalName>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>store</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/test/resources/assembly/store.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <finalName>${artifactId}</finalName>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>client</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/test/resources/assembly/client.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <finalName>${artifactId}</finalName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java b/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
deleted file mode 100644
index 28eede693d..0000000000
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
+++ /dev/null
@@ -1,328 +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 manager;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.TransformerFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.binding.atom.AtomBindingFactory;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.implementation.node.NodeImplementation;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-import org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuilderImpl;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-/**
- * Sample RunComponents task
- *
- * Under construction... This sample is similar to the DistributeComponents sample,
- * with extra steps to configure SCA runtime nodes with the models, start and stop
- * them.
- *
- * @version $Rev$ $Date$
- */
-public class DistributeAndRunComponents {
-    
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    private static ModelResolverExtensionPoint modelResolvers;
-    private static ModelFactoryExtensionPoint modelFactories;
-    private static WorkspaceFactory workspaceFactory;
-    private static AssemblyFactory assemblyFactory;
-    private static XMLOutputFactory outputFactory;
-    private static DocumentBuilderFactory documentBuilderFactory;
-    private static TransformerFactory transformerFactory;
-    private static StAXArtifactProcessor<Object> xmlProcessor; 
-    private static ContributionDependencyBuilder contributionDependencyBuilder;
-    private static CompositeBuilder domainCompositeBuilder;
-    private static CompositeBuilder nodeCompositeBuilder;
-    private static NodeImplementationFactory nodeFactory;
-    private static AtomBindingFactory atomBindingFactory;
-
-    private static void init() {
-        
-        // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();        
-        
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            activator.start(extensionPoints);
-        }
-
-        // Get XML input/output factories
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class);
-        transformerFactory = modelFactories.getFactory(TransformerFactory.class);
-        
-        // Get contribution workspace and assembly model factories
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        nodeFactory = modelFactories.getFactory(NodeImplementationFactory.class);
-        atomBindingFactory = modelFactories.getFactory(AtomBindingFactory.class);
-        
-        // Create XML artifact processors
-        StAXArtifactProcessorExtensionPoint xmlProcessorExtensions = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        xmlProcessor = new ExtensibleStAXArtifactProcessor(xmlProcessorExtensions, inputFactory, outputFactory, monitor);
-        
-        // Create contribution content processor
-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
-        
-        // Get the model resolvers
-        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        
-        // Create a contribution dependency builder
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-        
-        // Create a composite builder
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
-        domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory,
-                                                          documentBuilderFactory, transformerFactory, contractMapper, monitor);
-        
-        // Create a node composite builder
-        nodeCompositeBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory,
-                                                            documentBuilderFactory, transformerFactory, contractMapper, null, monitor);
-    }
-    
-
-    public static void main(String[] args) throws Exception {
-        init();
-
-        // Create workspace model
-        Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI storeURI = URI.create("store");
-        URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL);
-        workspace.getContributions().add(storeContribution);
-
-        // Read the sample assets contribution
-        URI assetsURI = URI.create("assets");
-        URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL();
-        Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL);
-        workspace.getContributions().add(assetsContribution);
-
-        // Read the sample client contribution
-        URI clientURI = URI.create("client");
-        URL clientURL = new File("./target/sample-domain-management-client.jar").toURI().toURL();
-        Contribution clientContribution = contributionProcessor.read(null, clientURI, clientURL);
-        workspace.getContributions().add(clientContribution);
-
-        // Build the contribution dependencies
-        Map<Contribution, List<Contribution>> contributionDependencies = new HashMap<Contribution, List<Contribution>>();
-        Set<Contribution> resolved = new HashSet<Contribution>();
-        for (Contribution contribution: workspace.getContributions()) {
-            List<Contribution> dependencies = contributionDependencyBuilder.buildContributionDependencies(contribution, workspace);
-            
-            // Resolve contributions
-            for (Contribution dependency: dependencies) {
-                if (!resolved.contains(dependency)) {
-                    resolved.add(dependency);
-                    contributionProcessor.resolve(dependency, workspace.getModelResolver());
-                }
-            }
-            
-            contributionDependencies.put(contribution, dependencies);
-        }
-        
-        // Create a set of nodes, and assign the sample deployables to them
-        Map<Component, List<Contribution>> nodeDependencies = new HashMap<Component, List<Contribution>>();
-        Composite cloudComposite = assemblyFactory.createComposite();
-        cloudComposite.setName(new QName("http://sample", "cloud"));
-        int nodeID = 8100;
-        for (Contribution contribution: workspace.getContributions()) {
-            for (Composite deployable: contribution.getDeployables()) {
-                
-                // Create a node
-                Component node = assemblyFactory.createComponent();
-                node.setName("Node" + nodeID);
-                cloudComposite.getComponents().add(node);
-                
-                // Add default binding configuration to the node, our samples use
-                // Atom bindings so here we're just creating default Atom binding
-                // configurations, but all the other binding types can be configured
-                // like that too
-                ComponentService nodeService = assemblyFactory.createComponentService();
-                Binding binding = atomBindingFactory.createAtomBinding();
-                binding.setURI("http://localhost:" + (8100 + nodeID));
-                nodeService.getBindings().add(binding);
-                node.getServices().add(nodeService);
-
-                // Assign a deployable to the node
-                NodeImplementation nodeImplementation = nodeFactory.createNodeImplementation();
-                nodeImplementation.setComposite(deployable);
-                node.setImplementation(nodeImplementation);
-                
-                // Keep track of what contributions will be needed by the node
-                nodeDependencies.put(node, contributionDependencies.get(contribution));
-                
-                nodeID++;
-            }
-        }
-        
-        // Print the model describing the nodes that we just built
-        System.out.println("cloud.composite");
-        System.out.println(print(cloudComposite));
-        
-        // Build the nodes, this will apply their default binding configuration to the
-        // composites assigned to them
-        nodeCompositeBuilder.build(cloudComposite);
-        
-        // Create a composite model for the domain
-        Composite domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName("http://sample", "domain"));
-        
-        // Add all deployables to it, normally the domain administrator would select
-        // the deployables to include
-        domainComposite.getIncludes().addAll(workspace.getDeployables());
-        
-        // Build the domain composite and wire the components included in it
-        domainCompositeBuilder.build(domainComposite);
-
-        // Print out the resulting domain composite
-        System.out.println("domain.composite");
-        System.out.println(print(domainComposite));
-        
-        // Now start our SCA nodes
-        List<SCANode> runtimeNodes = new ArrayList<SCANode>();
-        NodeLauncher launcher = NodeLauncher.newInstance();
-        for (Component node: cloudComposite.getComponents()) {
-            
-            // Create a composite containing the components that we want to run
-            // on the node
-            Composite runnable = assemblyFactory.createComposite();
-            runnable.setName(new QName("http://sample", node.getName()));
-            NodeImplementation nodeImplementation = (NodeImplementation)node.getImplementation();
-            for (Component component: nodeImplementation.getComposite().getComponents()) {
-                for (Component configured: domainComposite.getComponents()) {
-                    if (configured.getName().equals(component.getName())) {
-                        runnable.getComponents().add(configured);
-                        break;
-                    }
-                }
-            }
-
-            // Create the SCA node, give it the composite and the list of contributions
-            // to use
-            List<Contribution> dependencies = nodeDependencies.get(node);
-            org.apache.tuscany.sca.node.launcher.Contribution[] contributions = new org.apache.tuscany.sca.node.launcher.Contribution[dependencies.size()];
-            for (int c =0, n = dependencies.size(); c < n; c++) {
-                Contribution dependency = dependencies.get(c);
-                contributions[c] = new org.apache.tuscany.sca.node.launcher.Contribution(dependency.getURI(), dependency.getLocation());
-            }
-            SCANode runtimeNode = launcher.createNode("http://sample/" + node.getName(), print(runnable), contributions);
-            
-            // Start the node
-            runtimeNode.start();
-            runtimeNodes.add(runtimeNode);
-        }
-        
-        System.out.println("Nodes are running, press enter to stop...");
-        System.in.read();
-        
-        for (SCANode runtimeNode: runtimeNodes) {
-            runtimeNode.stop();
-        }
-    }
-
-    private static String print(Composite composite) throws XMLStreamException, ContributionWriteException, ParserConfigurationException, SAXException, IOException {
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(bos);
-        xmlProcessor.write(composite, writer);
-        
-        // Parse and write again to pretty format it
-        DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        Document document = documentBuilder.parse(new ByteArrayInputStream(bos.toByteArray()));
-        OutputFormat format = new OutputFormat();
-        format.setIndenting(true);
-        format.setIndent(2);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        XMLSerializer serializer = new XMLSerializer(out, format);
-        serializer.serialize(document);
-        return out.toString();
-    }
-}
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeComponents.java b/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeComponents.java
deleted file mode 100644
index def0a1894f..0000000000
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeComponents.java
+++ /dev/null
@@ -1,288 +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 manager;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.TransformerFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.binding.atom.AtomBindingFactory;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.implementation.node.NodeImplementation;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-import org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuilderImpl;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-/**
- * Sample DistributeComponents task
- *
- * This sample shows how to use a subset of Tuscany to read contribution
- * metadata, analyze and resolve contribution dependencies, read and resolve
- * the artifacts that they contribute (in particular implementation artifacts,
- * interfaces, composites, componentTypes etc.) and assembe and wire the
- * deployable composites together in a composite model representing an SCA
- * domain composite.
- * 
- * The difference between this sample and the WireComponents sample is an
- * extra step to allocate deployable composites to SCA nodes. SCA nodes allow
- * you to provide default configuration for the deploayable composites allocated
- * to them, for example default binding configuration. 
- * 
- * The sample first reads the SCA metadata for three sample contributions,
- * reads and resolve the artifacts contained in the contributions, includes all their
- * deployable composites in a composite model representing an SCA domain, then
- * uses several composite builder utilities to configure them as specified in the
- * SCA nodes hosting them and assemble and wire them together.
- * Finally it prints the resulting domain composite model, showing service bindings
- * configured with the URIs from the nodes hosting them.
- *
- * @version $Rev$ $Date$
- */
-public class DistributeComponents {
-    
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    private static ModelResolverExtensionPoint modelResolvers;
-    private static ModelFactoryExtensionPoint modelFactories;
-    private static WorkspaceFactory workspaceFactory;
-    private static AssemblyFactory assemblyFactory;
-    private static XMLOutputFactory outputFactory;
-    private static DocumentBuilderFactory documentBuilderFactory;
-    private static TransformerFactory transformerFactory;
-    private static StAXArtifactProcessor<Object> xmlProcessor; 
-    private static ContributionDependencyBuilder contributionDependencyBuilder;
-    private static CompositeBuilder domainCompositeBuilder;
-    private static CompositeBuilder nodeCompositeBuilder;
-    private static NodeImplementationFactory nodeFactory;
-    private static AtomBindingFactory atomBindingFactory;
-
-    private static void init() {
-        
-        // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            activator.start(extensionPoints);
-        }
-
-        // Get XML input/output factories
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class);
-        transformerFactory = modelFactories.getFactory(TransformerFactory.class);
-        
-        // Get contribution workspace and assembly model factories
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        nodeFactory = modelFactories.getFactory(NodeImplementationFactory.class);
-        atomBindingFactory = modelFactories.getFactory(AtomBindingFactory.class);
-        
-        // Create XML artifact processors
-        StAXArtifactProcessorExtensionPoint xmlProcessorExtensions = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        xmlProcessor = new ExtensibleStAXArtifactProcessor(xmlProcessorExtensions, inputFactory, outputFactory, monitor);
-        
-        // Create contribution content processor
-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
-        
-        // Get the model resolvers
-        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        
-        // Create a contribution dependency builder
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-        
-        // Create a composite builder
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
-        domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory,
-                                                          documentBuilderFactory, transformerFactory, contractMapper, monitor);
-        
-        // Create a node composite builder
-        nodeCompositeBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory,
-                                                            documentBuilderFactory, transformerFactory, contractMapper, null, monitor);
-    }
-    
-
-    public static void main(String[] args) throws Exception {
-        init();
-
-        // Create workspace model
-        Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI storeURI = URI.create("store");
-        URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL);
-        workspace.getContributions().add(storeContribution);
-
-        // Read the sample assets contribution
-        URI assetsURI = URI.create("assets");
-        URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL();
-        Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL);
-        workspace.getContributions().add(assetsContribution);
-
-        // Read the sample client contribution
-        URI clientURI = URI.create("client");
-        URL clientURL = new File("./target/sample-domain-management-client.jar").toURI().toURL();
-        Contribution clientContribution = contributionProcessor.read(null, clientURI, clientURL);
-        workspace.getContributions().add(clientContribution);
-
-        // Build the contribution dependencies
-        Set<Contribution> resolved = new HashSet<Contribution>();
-        for (Contribution contribution: workspace.getContributions()) {
-            List<Contribution> dependencies = contributionDependencyBuilder.buildContributionDependencies(contribution, workspace);
-            
-            // Resolve contributions
-            for (Contribution dependency: dependencies) {
-                if (!resolved.contains(dependency)) {
-                    resolved.add(dependency);
-                    contributionProcessor.resolve(dependency, workspace.getModelResolver());
-                }
-            }
-        }
-        
-        // Create a set of nodes, and assign the sample deployables to them
-        Composite cloudComposite = assemblyFactory.createComposite();
-        cloudComposite.setName(new QName("http://sample", "cloud"));
-        for (int i = 0, n = workspace.getDeployables().size(); i < n; i++) {
-            
-            // Create a node
-            Component node = assemblyFactory.createComponent();
-            node.setName("Node" + i);
-            cloudComposite.getComponents().add(node);
-            
-            // Add default binding configuration to the node, our samples use
-            // Atom bindings so here we're just creating default Atom binding
-            // configurations, but all the other binding types can be configured
-            // like that too
-            ComponentService nodeService = assemblyFactory.createComponentService();
-            Binding binding = atomBindingFactory.createAtomBinding();
-            binding.setURI("http://localhost:" + (8100 + i));
-            nodeService.getBindings().add(binding);
-            node.getServices().add(nodeService);
-
-            // Assign a deployable to the node
-            NodeImplementation nodeImplementation = nodeFactory.createNodeImplementation();
-            Composite deployable = workspace.getDeployables().get(i);
-            nodeImplementation.setComposite(deployable);
-            node.setImplementation(nodeImplementation);
-        }
-        
-        // Print the model describing the nodes that we just built
-        System.out.println("cloud.composite");
-        print(cloudComposite);
-        System.out.println();
-        
-        // Build the nodes, this will apply their default binding configuration to the
-        // composites assigned to them
-        nodeCompositeBuilder.build(cloudComposite);
-        
-        // Create a composite model for the domain
-        Composite domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName("http://sample", "domain"));
-        
-        // Add all deployables to it, normally the domain administrator would select
-        // the deployables to include
-        domainComposite.getIncludes().addAll(workspace.getDeployables());
-        
-        // Build the domain composite and wire the components included in it
-        domainCompositeBuilder.build(domainComposite);
-
-        // Print out the resulting domain composite
-        System.out.println("domain.composite");
-        print(domainComposite);
-    }
-
-    private static void print(Composite composite) throws XMLStreamException, ContributionWriteException, ParserConfigurationException, SAXException, IOException {
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(bos);
-        xmlProcessor.write(composite, writer);
-        
-        // Parse and write again to pretty format it
-        DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        Document document = documentBuilder.parse(new ByteArrayInputStream(bos.toByteArray()));
-        OutputFormat format = new OutputFormat();
-        format.setIndenting(true);
-        format.setIndent(2);
-        XMLSerializer serializer = new XMLSerializer(System.out, format);
-        serializer.serialize(document);
-    }
-}
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListComponents.java b/java/sca-contrib/samples/domain-management/src/main/java/manager/ListComponents.java
deleted file mode 100644
index 27cb31d57f..0000000000
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListComponents.java
+++ /dev/null
@@ -1,158 +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 manager;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-
-/**
- * Sample ListComponents task.
- *
- * This sample shows how to use subset of Tuscany to read contribution
- * metadata, analyze and resolve contribution dependencies, read and resolve
- * the artifacts that they contribute (in particular implementation artifacts,
- * interfaces, composites and componentTypes).
- * 
- * The sample first reads the SCA metadata for two sample contributions, then displays
- * their dependencies, reads and resolve the artifacts contained in the contributions,
- * and finally prints the deployables composites and the components they declare as
- * well as their main characteristics (showing that their interfaces and implementations
- * for example are actually resolved).
- *
- * @version $Rev$ $Date$
- */
-public class ListComponents {
-    
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    private static ModelResolverExtensionPoint modelResolvers;
-    private static ModelFactoryExtensionPoint modelFactories;
-    private static WorkspaceFactory workspaceFactory;
-    private static ContributionDependencyBuilder contributionDependencyBuilder;
-
-    private static void init() {
-        
-        // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            activator.start(extensionPoints);
-        }
-
-        // Get workspace contribution factory
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
-        
-        // Create contribution content processor
-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
-        
-        // Get the model resolvers
-        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        
-        // Create a contribution dependency builder
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-    }
-    
-
-    public static void main(String[] args) throws Exception {
-        init();
-
-        // Create workspace model
-        Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI storeURI = URI.create("store");
-        URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL);
-        workspace.getContributions().add(storeContribution);
-
-        // Read the sample assets contribution
-        URI assetsURI = URI.create("assets");
-        URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL();
-        Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL);
-        workspace.getContributions().add(assetsContribution);
-
-        // Build the store contribution dependencies
-        List<Contribution> dependencies = contributionDependencyBuilder.buildContributionDependencies(storeContribution, workspace);
-        
-        // Resolve the contributions
-        for (Contribution contribution: dependencies) {
-            contributionProcessor.resolve(contribution, workspace.getModelResolver());
-        }
-        
-        // List the components declared in the deployables found in the
-        // contribution, their services, bindings, interfaces, and implementations
-        for (Composite deployable: storeContribution.getDeployables()) {
-            System.out.println("Deployable: " + deployable.getName());
-            for (Component component: deployable.getComponents()) {
-                System.out.println("  component: " + component.getName());
-                for (ComponentService componentService: component.getServices()) {
-                    System.out.println("    componentService: " + componentService.getName());
-                    for (Binding binding: componentService.getBindings()) {
-                        System.out.println("      binding: " + binding.getClass() + " - " + binding.getURI());
-                    }
-                }
-                Implementation implementation = component.getImplementation();
-                System.out.println("    implementation: " + implementation);
-                for (Service service: implementation.getServices()) {
-                    System.out.println("      service: " + service.getName());
-                    InterfaceContract contract = service.getInterfaceContract();
-                    System.out.println("        interface: " + contract.getInterface());
-                }
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDependencies.java b/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDependencies.java
deleted file mode 100644
index 1bf8124682..0000000000
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDependencies.java
+++ /dev/null
@@ -1,108 +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 manager;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-
-/**
- * Sample ListDependencies task.
- * 
- * This sample shows how to use a subset of Tuscany to read contribution
- * metadata, analyze and resolve contribution dependencies given a set of
- * available contributions.
- * 
- * The sample reads the SCA metadata for two sample contributions then
- * prints their dependencies.
- *
- * @version $Rev$ $Date$
- */
-public class ListDependencies {
-    
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    private static WorkspaceFactory workspaceFactory;
-    private static ContributionDependencyBuilder contributionDependencyBuilder;
-
-    private static void init() throws Exception {
-        
-        // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Get contribution, workspace and assembly model factories
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
-        
-        // Create contribution info processor
-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
-
-        // Create a monitor
-        UtilityExtensionPoint services = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = services.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        
-        // Create a contribution dependency builder
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-    }
-    
-
-    public static void main(String[] args) throws Exception {
-        init();
-        
-        // Create workspace model
-        Workspace workspace = workspaceFactory.createWorkspace();
-
-        // Read the contribution info for the sample contribution
-        URI storeURI = URI.create("store");
-        URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL();
-        Contribution storeContribution = (Contribution)contributionProcessor.read(null, storeURI, storeURL);
-        workspace.getContributions().add(storeContribution);
-        
-        // Read the contribution info for the assets contribution
-        URI assetsURI = URI.create("assets");
-        URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL();
-        Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL);
-        workspace.getContributions().add(assetsContribution);
-        
-        // List the contribution dependencies of each contribution
-        for (Contribution contribution: workspace.getContributions()) {
-            System.out.println("Contribution: " + contribution.getURI());
-            for (Contribution dependency: contributionDependencyBuilder.buildContributionDependencies(contribution, workspace)) {
-                System.out.println("  dependency: " + dependency.getURI());
-            }
-        }
-    }
-    
-}
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDeployables.java b/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDeployables.java
deleted file mode 100644
index f5f0b9c655..0000000000
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDeployables.java
+++ /dev/null
@@ -1,73 +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 manager;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-
-/**
- * Sample ListDeployables task.
- *
- * This sample shows how to use a subset of Tuscany to read contribution
- * metadata.
- * 
- * The sample reads the SCA metadata for two sample contributions then
- * prints the names of their deployable composites.
- *
- * @version $Rev$ $Date$
- */
-public class ListDeployables {
-    
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-
-    private static void init() {
-        
-        // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Create contribution info processor
-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
-    }
-
-    public static void main(String[] args) throws Exception {
-        init();
-
-        // Read the contribution info for the sample contribution
-        URI uri = URI.create("store");
-        URL url = new File("./target/sample-domain-management-store.jar").toURI().toURL();
-        Contribution contribution = contributionProcessor.read(null, uri, url);
-        
-        // List the deployables in the contribution
-        for (Composite deployable: contribution.getDeployables()) {
-            System.out.println("Deployable: " + deployable.getName());
-        }
-        
-    }
-    
-}
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/WireComponents.java b/java/sca-contrib/samples/domain-management/src/main/java/manager/WireComponents.java
deleted file mode 100644
index d24d5c67c9..0000000000
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/WireComponents.java
+++ /dev/null
@@ -1,218 +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 manager;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.TransformerFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.w3c.dom.Document;
-
-/**
- * Sample WireComponents task.
- * 
- * This sample shows how to use a subset of Tuscany to read contribution
- * metadata, analyze and resolve contribution dependencies, read and resolve
- * the artifacts that they contribute (in particular implementation artifacts,
- * interfaces, composites, componentTypes etc.) and assembe and wire the
- * deployable composites together in a composite model representing an SCA
- * domain composite.
- * 
- * The sample first reads the SCA metadata for three sample contributions,
- * reads and resolve the artifacts contained in the contributions, includes all their
- * deployable composites in a composite model representing an SCA domain, then
- * uses a composite builder utility to assemble and wire the composites together.
- * Finally it prints the resulting domain composite model.
- *
- * @version $Rev$ $Date$
- */
-public class WireComponents {
-    
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    private static ModelResolverExtensionPoint modelResolvers;
-    private static ModelFactoryExtensionPoint modelFactories;
-    private static WorkspaceFactory workspaceFactory;
-    private static AssemblyFactory assemblyFactory;
-    private static XMLOutputFactory outputFactory;
-    private static DocumentBuilderFactory documentBuilderFactory;
-    private static TransformerFactory transformerFactory;
-    private static StAXArtifactProcessor<Object> xmlProcessor; 
-    private static ContributionDependencyBuilder contributionDependencyBuilder;
-    private static CompositeBuilder domainCompositeBuilder;
-
-    private static void init() {
-        
-        // Create extension point registry 
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();        
-        
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            activator.start(extensionPoints);
-        }
-
-        // Get XML input/output factories
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class);
-        transformerFactory = modelFactories.getFactory(TransformerFactory.class);
-        
-        // Get contribution workspace and assembly model factories
-        workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); 
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        
-        // Create XML artifact processors
-        StAXArtifactProcessorExtensionPoint xmlProcessorExtensions = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        xmlProcessor = new ExtensibleStAXArtifactProcessor(xmlProcessorExtensions, inputFactory, outputFactory, monitor);
-        
-        // Create contribution content processor
-        URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class);
-        
-        // Get the model resolvers
-        modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        
-        // Create a contribution dependency builder
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-        
-        // Create a composite builder
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
-        domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory,
-                                                          documentBuilderFactory, transformerFactory, contractMapper, monitor);
-        
-    }
-    
-
-    public static void main(String[] args) throws Exception {
-        init();
-
-        // Create workspace model
-        Workspace workspace = workspaceFactory.createWorkspace();
-        workspace.setModelResolver(new ExtensibleModelResolver(workspace, modelResolvers, modelFactories));
-
-        // Read the sample store contribution
-        URI storeURI = URI.create("store");
-        URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL();
-        Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL);
-        workspace.getContributions().add(storeContribution);
-
-        // Read the sample assets contribution
-        URI assetsURI = URI.create("assets");
-        URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL();
-        Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL);
-        workspace.getContributions().add(assetsContribution);
-
-        // Read the sample client contribution
-        URI clientURI = URI.create("client");
-        URL clientURL = new File("./target/sample-domain-management-client.jar").toURI().toURL();
-        Contribution clientContribution = contributionProcessor.read(null, clientURI, clientURL);
-        workspace.getContributions().add(clientContribution);
-
-        // Build the contribution dependencies
-        Set<Contribution> resolved = new HashSet<Contribution>();
-        for (Contribution contribution: workspace.getContributions()) {
-            List<Contribution> dependencies = contributionDependencyBuilder.buildContributionDependencies(contribution, workspace);
-            
-            // Resolve contributions
-            for (Contribution dependency: dependencies) {
-                if (!resolved.contains(dependency)) {
-                    resolved.add(dependency);
-                    contributionProcessor.resolve(contribution, workspace.getModelResolver());
-                }
-            }
-        }
-        
-        // Create a composite model for the domain
-        Composite domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName("http://sample", "domain"));
-        
-        // Add all deployables to it, normally the domain administrator would select
-        // the deployables to include
-        domainComposite.getIncludes().addAll(workspace.getDeployables());
-        
-        // Build the domain composite and wire the components included in it
-        domainCompositeBuilder.build(domainComposite);
-
-        // Print out the resulting domain composite
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(bos);
-        xmlProcessor.write(domainComposite, writer);
-        
-        // Parse and write again to pretty format it
-        DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        Document document = documentBuilder.parse(new ByteArrayInputStream(bos.toByteArray()));
-        OutputFormat format = new OutputFormat();
-        format.setIndenting(true);
-        format.setIndent(2);
-        XMLSerializer serializer = new XMLSerializer(System.out, format);
-        serializer.serialize(document);
-    }
-
-}
diff --git a/java/sca-contrib/samples/domain-management/src/test/java/services/Cart.java b/java/sca-contrib/samples/domain-management/src/test/java/services/Cart.java
deleted file mode 100644
index 3fb5439bc3..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/java/services/Cart.java
+++ /dev/null
@@ -1,28 +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 services;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Cart extends Collection<String, Item> {
-
-}
diff --git a/java/sca-contrib/samples/domain-management/src/test/java/services/Item.java b/java/sca-contrib/samples/domain-management/src/test/java/services/Item.java
deleted file mode 100644
index 81cefcdbef..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/java/services/Item.java
+++ /dev/null
@@ -1,66 +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 services;
-
-
-public class Item {
-    private String name;
-    private String price;
-    private String origin;
-    
-    public Item() {
-    }
-    
-    public Item(String name, String price, String origin) {
-        this.name = name;
-        this.price = price;
-        this.origin = origin;
-    }
-    
-    public Item(String name, String price) {
-        this.name = name;
-        this.price = price;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    public String getPrice() {
-        return price;
-    }
-    
-    public void setPrice(String price) {
-        this.price = price;
-    }
-
-    public String getOrigin() {
-        return origin;
-    }
-
-    public void setOrigin(String origin) {
-        this.origin = origin;
-    }
-
-}
diff --git a/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java b/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
deleted file mode 100644
index f053ec9f48..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
+++ /dev/null
@@ -1,57 +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 services;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class ShoppingCartClientImpl implements Cart {
-    
-    @Reference
-    public Cart cart;
-    
-    public Entry<String, Item>[] getAll() {
-        return cart.getAll();
-    }
-
-    public Item get(String key) throws NotFoundException {
-        return cart.get(key);
-    }
-
-    public String post(String key, Item item) {
-        return cart.post(key, item);
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        cart.put(key, item);
-    }
-    
-    public void delete(String key) throws NotFoundException {
-        cart.delete(key);
-    }
-
-    public Entry<String, Item>[] query(String queryString) {
-        return cart.query(queryString);
-    }
-    
-}
diff --git a/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartImpl.java b/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
deleted file mode 100644
index 9ef59df7a8..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
+++ /dev/null
@@ -1,100 +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 services;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class ShoppingCartImpl implements Cart {
-    
-    private Map<String, Item> cart;
-    
-    @Init
-    public void init() {
-        cart = new HashMap<String, Item>();
-    }
-
-    public Entry<String, Item>[] getAll() {
-        Entry<String, Item>[] entries = new Entry[cart.size()];
-        int i = 0;
-        for (Map.Entry<String, Item> e: cart.entrySet()) {
-            entries[i++] = new Entry<String, Item>(e.getKey(), e.getValue());
-        }
-        return entries;
-    }
-
-    public Item get(String key) throws NotFoundException {
-        Item item = cart.get(key);
-        if (item == null) {
-            throw new NotFoundException(key);
-        } else {
-            return item;
-        }
-    }
-
-    public String post(String key, Item item) {
-        if (key == null) {
-            key ="cart-" + UUID.randomUUID().toString();
-        }
-        cart.put(key, item);
-        return key;
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        if (!cart.containsKey(key)) {
-            throw new NotFoundException(key);
-        }
-        cart.put(key, item);
-    }
-    
-    public void delete(String key) throws NotFoundException {
-        if (key == null || key.equals("")) {
-            cart.clear();
-        } else {
-            Item item = cart.remove(key);
-            if (item == null)
-                throw new NotFoundException(key);
-        }
-    }
-
-    public Entry<String, Item>[] query(String queryString) {
-        List<Entry<String, Item>> entries = new ArrayList<Entry<String,Item>>();
-        if (queryString.startsWith("name=")) {
-            String name = queryString.substring(5);
-            for (Map.Entry<String, Item> e: cart.entrySet()) {
-                Item item = e.getValue();
-                if (item.getName().equals(name)) {
-                    entries.add(new Entry<String, Item>(e.getKey(), e.getValue()));
-                }
-            }
-        }
-        return entries.toArray(new Entry[entries.size()]);
-    }
-    
-}
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/assets.xml b/java/sca-contrib/samples/domain-management/src/test/resources/assembly/assets.xml
deleted file mode 100644
index 10693a89e6..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/assets.xml
+++ /dev/null
@@ -1,38 +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.
--->
-<assembly>
-    <id>assets</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>jar</format>
-    </formats>
-
-    <fileSets>
-        <fileSet>
-            <directory>target/test-classes/assets</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>target/test-classes/services</directory>
-            <outputDirectory>/services</outputDirectory>
-        </fileSet>
-    </fileSets>
-        
-</assembly>
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/client.xml b/java/sca-contrib/samples/domain-management/src/test/resources/assembly/client.xml
deleted file mode 100644
index 5b34693bee..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/client.xml
+++ /dev/null
@@ -1,34 +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.
--->
-<assembly>
-    <id>client</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>jar</format>
-    </formats>
-
-    <fileSets>
-        <fileSet>
-            <directory>target/test-classes/client</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-    </fileSets>
-        
-</assembly>
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/store.xml b/java/sca-contrib/samples/domain-management/src/test/resources/assembly/store.xml
deleted file mode 100644
index d19b7eb161..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/store.xml
+++ /dev/null
@@ -1,34 +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.
--->
-<assembly>
-    <id>store</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>jar</format>
-    </formats>
-
-    <fileSets>
-        <fileSet>
-            <directory>target/test-classes/store</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-    </fileSets>
-        
-</assembly>
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml b/java/sca-contrib/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
deleted file mode 100644
index 33fe814c3a..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <export.java package="services"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml b/java/sca-contrib/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
deleted file mode 100644
index 14e1cdb672..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:s="http://store">
-   <import.java package="services"/>
-   <deployable composite="s:client"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/client/client.composite b/java/sca-contrib/samples/domain-management/src/test/resources/client/client.composite
deleted file mode 100644
index 1279b319c4..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/client/client.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"

-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="client">
-		
-	<component name="ShoppingCartClient">

-		<implementation.java class="services.ShoppingCartClientImpl"/>
-		<service name="Cart">
-			<t:binding.atom uri="/ShoppingCartClient/Cart"/>
-		</service>    	
-		<reference name="cart" target="ShoppingCart">
-			<t:binding.atom/>
-		</reference>		

-	</component>

-    

-</composite>

diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml b/java/sca-contrib/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
deleted file mode 100644
index 52348106f2..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:s="http://store">
-   <import.java package="services"/>
-   <deployable composite="s:store"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/store/store.composite b/java/sca-contrib/samples/domain-management/src/test/resources/store/store.composite
deleted file mode 100644
index d4f18771d8..0000000000
--- a/java/sca-contrib/samples/domain-management/src/test/resources/store/store.composite
+++ /dev/null
@@ -1,32 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="store">
-		
-	<component name="ShoppingCart">

-		<implementation.java class="services.ShoppingCartImpl"/>

-		<service name="Cart">

-			<t:binding.atom uri="/ShoppingCart/Cart"/>

-		</service>    	

-	</component>

-    

-</composite>

diff --git a/java/sca-contrib/samples/domain-webapp/README b/java/sca-contrib/samples/domain-webapp/README
deleted file mode 100644
index c01a0dd39a..0000000000
--- a/java/sca-contrib/samples/domain-webapp/README
+++ /dev/null
@@ -1,310 +0,0 @@
-Domain Webapp Sample

-====================

-

-Not actually a webapp just yet as webapp host need to use the new domain for it to work.

-If you run the DomainServer in a debugger you will get a server that provides a registry 

-for servide URLs, listens for Nodes starting and stopping and provides a web page where 

-you can see what nodes are registered and pull up their web pages.

-

-Use the nodes from the calculator-distributed to register with this domain

-

-

-==========================================

-Below copied from calculator sample as a template for when this gets done 

-

-

-This sample implements a simple calculator using SCA components.  It uses 

-exactly the same calculator application classes as the calculator sample but 

-runs the application distributed across three nodes.

-

-A node in this sample means an instance of the Tuscany SCA java runtime running

-in a Java virtual machine. 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run it to see what happens open four command prompts and 

-navigate to this sample directory in each one. There is one command to be run 

-in each command prompt:

-

-ant runDomainNode

-ant runNodeB

-ant runNodeC

-ant runNodeA

-

-Please run the commands in this order. 

-

-OR if you don't have ant, on Windows use

-

-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.DomainNode

-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeB

-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeC

-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeA

-

-and on *nix do

-

-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.DomainNode

-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeB

-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeC

-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeA

-

-

-The processes started on each of these command prompts can be ended by pressing 

-the <Enter> key.

-

-

-Sample Overview

----------------

-The sample provides a single calculator service with a default SCA (java) 

-binding. NodeA exercises this interface by calling add, subtract, multiply and 

-divide operations. 

-

-In the case of add and subtract the runtime recognises that

-it can't find these services locally and, using the remote (web services) 

-version of the default SCA binding contacts the add service running in NodeB 

-and the subtract service running in NodeC. 

-

-On the command prompt where you started NodeA, you would see output of invoking the 

-calculator functions distributed over NodeB and and NodeC.  On the command prompts 

-where you have started NodeB and NodeC, you would see log messages that indicate that

-the add and substract services where called on these nodes respectively.

-

-The sample demonstrates that the calculator application can be distributed

-across multiple nodes with no change to the application or to the SCA description

-files. 

-

-

-calculator/

-  src/

-    main/

-      java/

-        calculator/

-          CalculatorService.java  - the first component, calls +-/* as 

-                                    appropriate

-          AddService.java         - adds two numbers

-          AddServiceImpl.java

-          SubtractService.java    - subtracts one number from another

-          SubtractServiceImpl.java

-          MultiplyService.java    - multiplies two numbers

-          MultiplyServiceImpl.java

-          DivideService.java      - divides one number by another

-          DivideServiceImpl.java

-        node/

-          CalculatorNode.java     - runs up an sca application based on 

-                                    configuration given on the command 

-                                    line in the form

-                                    

-                                    CalculatorNode <domain name> <node name>

-                                    

-                                    it looks for a directory name the same

-                                    as <node name> and loads the composites

-                                    there

-                                    

-                                    if <node name> = nodeA it calls the 

-                                    +-/* operations otherwise it behaves

-                                    like a server and waits for service 

-                                    requests

-           DomainNode.java        - the node that provides the service 

-                                    discovery mechanism to the distributed

-                                    domain

-      resources/

-        domain                    - the SCA assembly for the service discovery

-                                    function

-        management/               - the SCA assembly for each nodes management

-                                    function

-        nodeA                     - the SCA assembly for nodeA's part of the 

-                                    calculator application

-        nodeB                     - the SCA assembly for nodeB's part of the 

-                                    calculator application

-        nodeC                     - the SCA assembly for nodeB's part of the 

-                                    calculator application

-    test/

-      java/

-        calculator/

-          DomainInMemoryTestCase.java - JUnit test case which runs all of the

-                                    separate ndes in a single VM for test

-                                    purposes

-  calculator-distributed.png      - a pictorial representation of the sample 

-                                    .composite files

-  build.xml                       - the Ant build file

-  pom.xml                         - the Maven build file        

-

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd calculator-distributed

-ant compile

-ant runDomainNode

-ant runNodeB

-ant runNodeC

-ant runNodeA

-

-You should see the following output from the four separate command prompt:

-

-runDomainNode:

-     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

-om.util.StAXUtils).

-     [java] log4j:WARN Please initialize the log4j system properly.

-     [java] 23-Aug-2007 17:40:40 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8080/ServiceDiscoveryC

-omponent/ServiceDiscovery

-     [java] Domain node started (press enter to shutdown)

-     [java] Registering service: [mydomain nodeB AddServiceComponent org.apache.

-tuscany.sca.assembly.SCABinding http://localhost:8085/AddServiceComponent]

-     [java] Registering service: [mydomain nodeC SubtractServiceComponent org.ap

-ache.tuscany.sca.assembly.SCABinding http://localhost:8086/SubtractServiceCompon

-ent]

-     [java] Finding service: [mydomain SubtractServiceComponent org.apache.tusca

-ny.sca.assembly.SCABinding]

-     [java] Matching service url: http://localhost:8086/SubtractServiceComponent

-

-     [java] Finding service: [mydomain AddServiceComponent org.apache.tuscany.sc

-a.assembly.SCABinding]

-     [java] Matching service url: http://localhost:8085/AddServiceComponent

-     [java] Java Result: 1

-Terminate batch job (Y/N)? y

-

-

-

-runNodeB:

-     [java] file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/

-target/classes/management/

-     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

-om.util.StAXUtils).

-     [java] log4j:WARN Please initialize the log4j system properly.

-     [java] Registering service: [mydomain nodeB AddServiceComponent/ org.apache

-.tuscany.sca.assembly.SCABinding http://localhost:8085/AddServiceComponent]

-     [java] 23-Aug-2007 17:41:25 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8085/AddServiceCompone

-nt

-     [java] Node started (press enter to shutdown)

-     [java] AddService - add 3.0 and 2.0

-     

-     

-runNodeC:

-     [java] file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/

-target/classes/management/

-     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

-om.util.StAXUtils).

-     [java] log4j:WARN Please initialize the log4j system properly.

-     [java] Registering service: [mydomain nodeC SubtractServiceComponent org.ap

-ache.tuscany.sca.assembly.SCABinding http://localhost:8086/SubtractServiceCompon

-ent]

-     [java] 23-Aug-2007 17:41:51 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] Node started (press enter to shutdown)

-     [java] INFO: Added Servlet mapping: http://localhost:8086/SubtractServiceCo

-mponent

-     [java] SubtractService - subtract 3.0 and 2.0

-Terminate batch job (Y/N)? y

-

-

-runNodeA:

-     [java] file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/

-target/classes/management/

-     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

-om.util.StAXUtils).

-     [java] log4j:WARN Please initialize the log4j system properly.

-     [java] 23-Aug-2007 17:42:12 org.apache.tuscany.sca.assembly.builder.impl.Co

-mpositeBuilderImpl$1 problem

-     [java] WARNING: [WARNING] Component reference target not found, it might be

- a remote service: AddServiceComponent null

-     [java]

-     [java] 23-Aug-2007 17:42:12 org.apache.tuscany.sca.assembly.builder.impl.Co

-mpositeBuilderImpl$1 problem

-     [java] WARNING: [WARNING] Component reference target not found, it might be

- a remote service: SubtractServiceComponent null

-     [java]

-     [java] Finding service: [mydomain SubtractServiceComponent org.apache.tusca

-ny.sca.assembly.SCABinding]

-     [java] Finding service: [mydomain AddServiceComponent org.apache.tuscany.sc

-a.assembly.SCABinding]

-     [java] CalculatorService - add 3.0 and 2.0

-     [java] 3 + 2=5.0

-     [java] CalculatorService - subtract 3.0 and 2.0

-     [java] 3 - 2=1.0

-     [java] CalculatorService - multiply 3.0 and 2.0

-     [java] 3 * 2=6.0

-     [java] CalculatorService - divide 3.0 and 2.0

-     [java] 3 / 2=1.5

-

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. When running from Maven the four nodes all run within 

-Java virtual machine. 

-

-cd calculator-distributed

-mvn

-

-You should see the following output from the test phase.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running calculator.DomainInMemoryTestCase

-Setting up distributed nodes

-file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class

-es/management/

-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX

-Utils).

-log4j:WARN Please initialize the log4j system properly.

-23-Aug-2007 18:18:41 org.apache.tuscany.sca.assembly.builder.impl.CompositeBuild

-erImpl$1 problem

-WARNING: [WARNING] Component reference target not found, it might be a remote se

-rvice: AddServiceComponent null

-

-23-Aug-2007 18:18:41 org.apache.tuscany.sca.assembly.builder.impl.CompositeBuild

-erImpl$1 problem

-WARNING: [WARNING] Component reference target not found, it might be a remote se

-rvice: SubtractServiceComponent null

-

-file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class

-es/management/

-Registering service: [mydomain nodeB AddServiceComponent org.apache.tuscany.sca.

-assembly.SCABinding http://localhost:8085/AddServiceComponent]

-file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class

-es/management/

-Registering service: [mydomain nodeC SubtractServiceComponent org.apache.tuscany

-.sca.assembly.SCABinding http://localhost:8086/SubtractServiceComponent]

-Finding service: [mydomain SubtractServiceComponent org.apache.tuscany.sca.assem

-bly.SCABinding]

-Matching service url: http://localhost:8086/SubtractServiceComponent

-Finding service: [mydomain AddServiceComponent org.apache.tuscany.sca.assembly.S

-CABinding]

-Matching service url: http://localhost:8085/AddServiceComponent

-23-Aug-2007 18:18:45 org.apache.tuscany.sca.http.jetty.JettyServer addServletMap

-ping

-INFO: Added Servlet mapping: http://localhost:8085/AddServiceComponent

-23-Aug-2007 18:18:47 org.apache.tuscany.sca.http.jetty.JettyServer addServletMap

-ping

-INFO: Added Servlet mapping: http://localhost:8086/SubtractServiceComponent

-CalculatorService - add 3.0 and 2.0

-AddService - add 3.0 and 2.0

-CalculatorService - subtract 3.0 and 2.0

-SubtractService - subtract 3.0 and 2.0

-CalculatorService - multiply 3.0 and 2.0

-CalculatorService - divide 3.0 and 2.0

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.14 sec

-

-Results :

-

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

-

-

-This shows that the Junit test cases have run successfully. 

-

-Known Bug : 

----------

-The processes that are running NodeB and NodeC do not seem to end on pressing the

-<Enter>.  This will be fixed for the next release.  For this release you should use

-^C (Control C) to exit these processes.

-

-

diff --git a/java/sca-contrib/samples/domain-webapp/build.xml b/java/sca-contrib/samples/domain-webapp/build.xml
deleted file mode 100644
index e008e3c9f0..0000000000
--- a/java/sca-contrib/samples/domain-webapp/build.xml
+++ /dev/null
@@ -1,296 +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.    

--->

-<project name="calculator" default="runDomainNode">

-    <property name="node.class" value="node.CalculatorNode" />

-	<property name="domain.class" value="node.DomainNode" />

-	<property name="test.jar"   value="sample-calculator-distributed.jar" 

-/>

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>

-	

-    <target name="runDomainNode">

-        <java classname="${domain.class}"

-              fork="true">

-            <classpath>

-            	<pathelement path="src/main/resources"/>

-                <pathelement path="target/classes"/>

-            	<pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>    	        	

-        </java>

-    </target>

-	

-    <target name="runNodeA">

-        <java classname="${node.class}"

-              fork="true">

-            <classpath>

-            	<pathelement path="src/main/resources"/>

-                <pathelement path="target/classes"/>

-            	<pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        	<arg value="mydomain"/>

-        	<arg value="nodeA"/>        	        	

-        </java>

-    </target>

-	

-    <target name="runNodeB">

-        <java classname="${node.class}"

-              fork="true">

-            <classpath>

-            	<pathelement path="src/main/resources"/>

-                <pathelement path="target/classes"/>

-            	<pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        	<arg value="mydomain"/>

-        	<arg value="nodeB"/>        	

-        </java>

-    </target>	

-	

-    <target name="runNodeC">

-        <java classname="${node.class}"

-              fork="true">

-            <classpath>

-            	<pathelement path="src/main/resources"/>

-                <pathelement path="target/classes"/>

-            	<pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        	<arg value="mydomain"/>

-        	<arg value="nodeC"/>        	

-        </java>

-    </target>	

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>	

-	

-	<!-- If you want to test without building the distribution jars set the       -->

-	<!-- localtion value of the m2.repo on your machine and use the targets below -->

-	<property name="m2.repo"   value="your dir here\.m2\repository" />

-    <path id="repo.classpath">

-        <!--pathelement location="${classpath}"/-->

-    	<!--pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>

-        <pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>

-        <pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>

-        <pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>

-    	<pathelement location="${m2.repo}\com\metaparadigm\json-rpc\1.0\json-rpc-1.0.jar"/>

-        <pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>

-        <pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>

-        <pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>

-        <pathelement location="${m2.repo}\commons-io\commons-io\1.1\commons-io-1.1.jar"/>

-        <pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>

-        <pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>

-        <pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>

-    	<pathelement location="${m2.repo}\javax\servlet\servlet-api\2.5\servlet-api-2.5.jar"/>

-        <pathelement location="${m2.repo}\jaxen\jaxen\1.1-beta-9\jaxen-1.1-beta-9.jar"/>

-        <pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>

-        <pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>

-        <pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>

-        <pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>

-        <pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.2\axis2-java2wsdl-1.2.jar"/>

-        <pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.2\axis2-kernel-1.2.jar"/>

-        <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>

-        <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>

-        <pathelement location="${m2.repo}\org\apache\httpcomponents\jakarta-httpcore\4.0-alpha4\jakarta-httpcore-4.0-alpha4.jar"/>

-        <pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.1\neethi-2.0.1.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\sca-api\1.4-SNAPSHOT\sca-api-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.4-SNAPSHOT\tuscany-assembly-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.4-SNAPSHOT\tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.4-SNAPSHOT\tuscany-binding-sca-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.4-SNAPSHOT\tuscany-binding-sca-axis2-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.4-SNAPSHOT\tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.4-SNAPSHOT\tuscany-binding-ws-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.4-SNAPSHOT\tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.4-SNAPSHOT\tuscany-binding-ws-xml-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.4-SNAPSHOT\tuscany-contribution-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.4-SNAPSHOT\tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.4-SNAPSHOT\tuscany-contribution-java-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.4-SNAPSHOT\tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.4-SNAPSHOT\tuscany-core-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.4-SNAPSHOT\tuscany-core-databinding-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.4-SNAPSHOT\tuscany-core-spi-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.4-SNAPSHOT\tuscany-databinding-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.4-SNAPSHOT\tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.4-SNAPSHOT\tuscany-distributed-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.4-SNAPSHOT\tuscany-distributed-impl-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.4-SNAPSHOT\tuscany-host-embedded-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.4-SNAPSHOT\tuscany-host-http-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-tomcat\1.4-SNAPSHOT\tuscany-host-jetty-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.4-SNAPSHOT\tuscany-implementation-java-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.4-SNAPSHOT\tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.4-SNAPSHOT\tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.4-SNAPSHOT\tuscany-interface-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.4-SNAPSHOT\tuscany-interface-java-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.4-SNAPSHOT\tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.4-SNAPSHOT\tuscany-interface-wsdl-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.4-SNAPSHOT\tuscany-interface-wsdl-xml-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.4-SNAPSHOT\tuscany-policy-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.4-SNAPSHOT\tuscany-policy-xml-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.4-SNAPSHOT\tuscany-topology-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.4-SNAPSHOT\tuscany-topology-xml-1.4-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7a\woden-1.0-incubating-M7a.jar"/>

-        <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.4\axiom-api-1.2.4.jar"/>

-        <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.4\axiom-dom-1.2.4.jar"/>

-        <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.4\axiom-impl-1.2.4.jar"/>

-        <pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.1\XmlSchema-1.3.1.jar"/>

-        <pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>

-        <pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>

-        <pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>

-        <pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>

-        <pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>    	

-    	<pathelement location="target/classes"/-->  

-    	<pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>

-    	<pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>

-    	<pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>

-    	<pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>

-    	<pathelement location="${m2.repo}\com\metaparadigm\json-rpc\1.0\json-rpc-1.0.jar"/>

-    	<pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>

-    	<pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>

-    	<pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>

-    	<pathelement location="${m2.repo}\commons-io\commons-io\1.1\commons-io-1.1.jar"/>

-    	<pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>

-    	<pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>

-    	<pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>

-    	<pathelement location="${m2.repo}\jaxen\jaxen\1.1-beta-9\jaxen-1.1-beta-9.jar"/>

-    	<pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>

-    	<pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-adb\1.2\axis2-adb-1.2.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.2\axis2-java2wsdl-1.2.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.2\axis2-kernel-1.2.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\httpcomponents\jakarta-httpcore\4.0-alpha4\jakarta-httpcore-4.0-alpha4.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.1\neethi-2.0.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\sca-api\1.4-SNAPSHOT\sca-api-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.4-SNAPSHOT\tuscany-assembly-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.4-SNAPSHOT\tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-http\1.4-SNAPSHOT\tuscany-binding-http-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-jsonrpc\1.4-SNAPSHOT\tuscany-binding-jsonrpc-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.4-SNAPSHOT\tuscany-binding-sca-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.4-SNAPSHOT\tuscany-binding-sca-axis2-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.4-SNAPSHOT\tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.4-SNAPSHOT\tuscany-binding-ws-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.4-SNAPSHOT\tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.4-SNAPSHOT\tuscany-binding-ws-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.4-SNAPSHOT\tuscany-contribution-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.4-SNAPSHOT\tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.4-SNAPSHOT\tuscany-contribution-java-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.4-SNAPSHOT\tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.4-SNAPSHOT\tuscany-core-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.4-SNAPSHOT\tuscany-core-databinding-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.4-SNAPSHOT\tuscany-core-spi-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.4-SNAPSHOT\tuscany-databinding-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.4-SNAPSHOT\tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.4-SNAPSHOT\tuscany-distributed-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.4-SNAPSHOT\tuscany-distributed-impl-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-extension-helper\1.4-SNAPSHOT\tuscany-extension-helper-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.4-SNAPSHOT\tuscany-host-embedded-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.4-SNAPSHOT\tuscany-host-http-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.4-SNAPSHOT\tuscany-interface-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.4-SNAPSHOT\tuscany-interface-java-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.4-SNAPSHOT\tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.4-SNAPSHOT\tuscany-interface-wsdl-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.4-SNAPSHOT\tuscany-interface-wsdl-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.4-SNAPSHOT\tuscany-policy-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.4-SNAPSHOT\tuscany-policy-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.4-SNAPSHOT\tuscany-topology-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.4-SNAPSHOT\tuscany-topology-xml-1.4-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7a\woden-1.0-incubating-M7a.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.4\axiom-api-1.2.4.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.4\axiom-dom-1.2.4.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.4\axiom-impl-1.2.4.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.1\XmlSchema-1.3.1.jar"/>

-    	<pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>

-    	<pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>

-    	<pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>

-    	<pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>

-    	<pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>    	

-    </path>	

-    	

-    <target name="runDomainNodeRepo">

-        <java classname="${domain.class}"

-              fork="true">

-            <classpath>

-            	<path refid="repo.classpath"/>

-            </classpath>    	        	

-        </java>

-    </target>

-	

-    <target name="runNodeARepo">

-        <java classname="${node.class}"

-              fork="true">

-            <classpath>

-            	<path refid="repo.classpath"/>

-            </classpath>

-        	<arg value="mydomain"/>

-        	<arg value="nodeA"/>        	        	

-        </java>

-    </target>

-	

-    <target name="runNodeBRepo">

-        <java classname="${node.class}"

-              fork="true">

-            <classpath>

-            	<path refid="repo.classpath"/>

-            </classpath>

-        	<arg value="mydomain"/>

-        	<arg value="nodeB"/>        	

-        </java>

-    </target>	

-	

-    <target name="runNodeCRepo">

-        <java classname="${node.class}"

-              fork="true">

-            <classpath>

-            	<path refid="repo.classpath"/>

-            </classpath>

-        	<arg value="mydomain"/>

-        	<arg value="nodeC"/>        	

-        </java>

-    </target>	

-	

-</project>

diff --git a/java/sca-contrib/samples/domain-webapp/pom.xml b/java/sca-contrib/samples/domain-webapp/pom.xml
deleted file mode 100644
index 0b4309a244..0000000000
--- a/java/sca-contrib/samples/domain-webapp/pom.xml
+++ /dev/null
@@ -1,101 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-domain-webapp</artifactId>

-    <name>Apache Tuscany SCA Domain Webapp Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

- 

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>      

-        

-         <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-domain-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-                                      

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jsonrpc</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>   

-        

-         <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-http</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-resource</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>                 

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/domain-webapp/src/main/java/node/DomainServer.java b/java/sca-contrib/samples/domain-webapp/src/main/java/node/DomainServer.java
deleted file mode 100644
index ea3cddc01b..0000000000
--- a/java/sca-contrib/samples/domain-webapp/src/main/java/node/DomainServer.java
+++ /dev/null
@@ -1,54 +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 node;
-
-import java.io.IOException;
-
-
-/**
- * This server program that loads a composite to provide simple registry function.
- * This server can be replaced with any registry that is appropriate but the components
- * in each node that talk to the registry should be replaced also. 
- */
-public class DomainServer {
-
-    public static void main(String[] args) {
-        try {
-/*            
-            NodeImpl node = new NodeImpl();
-            node.start();
-            node.getContributionManager().startContribution(DomainServer.class.getClassLoader().getResource("."));
-    
-            try {
-                System.out.println("Domain server started (press enter to shutdown)");
-                System.in.read();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-    
-            node.stop();
-            System.out.println("Domain server stopped");
-*/            
-        } catch (Exception ex) {
-            System.out.println("Exception in domain server " + 
-                               ex.toString());
-        }
-    }
-
-}
diff --git a/java/sca-contrib/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100755
index fbe5880db6..0000000000
--- a/java/sca-contrib/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:Domain"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/domain-webapp/src/main/resources/domain.composite b/java/sca-contrib/samples/domain-webapp/src/main/resources/domain.composite
deleted file mode 100644
index dbaaebd3c7..0000000000
--- a/java/sca-contrib/samples/domain-webapp/src/main/resources/domain.composite
+++ /dev/null
@@ -1,54 +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://sample"
-           xmlns:sample="http://sample"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           name="Domain">
-           
-    <component name="domain">
-        <service name="Resource">
-            <tuscany:binding.http/>
-        </service>
-       <tuscany:implementation.resource location="webroot"/>
-    </component>            
-           
-    <component name="DomainManagerComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.impl.DomainManagerServiceImpl"/>
-        <service name="DomainManagerService">
-            <interface.java interface="org.apache.tuscany.sca.domain.DomainManagerService"/>
-            <binding.ws uri="http://localhost:8080/DomainManagerComponent/DomainManager"/>
-            <tuscany:binding.jsonrpc uri="http://localhost:8080/DomainManagerComponent/DomainManagerJson"/>
-        </service>
-        <reference name="serviceDiscovery" target="ServiceDiscoveryComponent"/>
-
-    </component>
-    
-    <component name="ServiceDiscoveryComponent">
-        <implementation.java class="org.apache.tuscany.sca.domain.impl.ServiceDiscoveryServiceImpl" />
-        <service name="ServiceDiscoveryService">
-            <interface.java interface="org.apache.tuscany.sca.domain.ServiceDiscoveryService"/>
-            <binding.sca uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscoverySCA"/>
-            <binding.ws uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscovery"/>
-            <tuscany:binding.jsonrpc uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscoveryJson"/>            
-        </service>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/index.html b/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/index.html
deleted file mode 100644
index 425bd73734..0000000000
--- a/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/index.html
+++ /dev/null
@@ -1,354 +0,0 @@
-<html>
-<!--
- * 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.    
- -->
-<head>
-<title>Apache Tuscany Domain</TITLE>
-
-    <script type="text/javascript" src="../SCADomain/scaDomain.js"></script>
-
-    <script language="JavaScript">
-    
-       domainManager = new JSONRpcClient("../DomainManagerComponent/DomainManagerJson");
-
-       function getNodeInfo() {
-          domainManager.DomainManagerService.getNodeInfo(handleGetNodeInfo);
-       }
-       
-       function handleGetNodeInfo(result) {
-       
-          var text = ""
-          
-          for (var i in result.list){
-              var node = result.list[i];
-              
-              text = text + "<table>";
-              text = text + "<TR CLASS='source_1' >";
-              text = text + "  <TD>";
-              text = text + "    <IMG SRC='node.png'/>&nbsp;&nbsp;" + node.domainUri;
-              text = text + "  </TD>";
-              
-              var noProtocol = node.nodeManagerUrl.substring(7);
-              var colonPos = noProtocol.indexOf(':')
-              var nodeManagerWebUrl = noProtocol.substring(0, colonPos + 6);
-              nodeManagerWebUrl = "http://" + nodeManagerWebUrl + "node/index.html";
-              
-              text = text + "  <TD CLASS='clickable link' ONCLICK=\"showNode('" + nodeManagerWebUrl + "')\">" + node.nodeUri + "</TD>";
-              text = text + "</TR>";               
-          }
-
-          document.getElementById('domainInfo').innerHTML=text;
-       }
-       
-        function showNode(url)
-        {
-            document.getElementById("nodePage").innerHTML="<IFRAME CLASS='alert_data' SRC='"+url+"'/>";
-            window.location="#data";
-            return;    
-        }       
-
-    </script>
-
-    <link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-
-<body onload="getNodeInfo()">
-
-<!--script type="text/javascript">
-    
-        // The proxy for the alert and alertsources services running in Tuscany
-        var alertsService       = new dojo.rpc.JsonService("AlertsServiceJSONRPC?smd");
-        var alertSourcesService = new dojo.rpc.JsonService("AlertsSourcesServiceJSONRPC?smd");
-
-        // If you want to put an HTTP sniffer in the way to look at the JSONROPC packets you'll
-        // need to edit the target address of the service in the smd. The only way to do this easily
-        // is to read an smd from disc rather than generate one. There are two smds provided for this
-	    //var alertsService       = new dojo.rpc.JsonService("service.smd");
-        //var alertSourcesService = new dojo.rpc.JsonService("sources.smd");
-
-        // The global list of alerts sources
-        var alertSourceList = null;
-
-        // The global list of alerts 
-        var alertList       = null;
-
-        // the constructor for entries on the alert source list
-        function alertSourceType(name,id,address,feedAddress,feedType,popUsername,popPassword,popServer,lastChecked,javaClass) {
-          this.name        = name;
-          this.id          = id;
-          this.address     = address;
-          this.feedAddress = feedAddress;
-          this.feedType    = feedType;
-          this.lastChecked = lastChecked;
-          this.javaClass   = "org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl";
-
-        }
-
-        function errorCallback(result, error, id) {
-            var resultsNode = document.getElementById("errors");
-            // There seems to be a problem somewhere as I should be able to get the error
-            // details but all I can actually get is the Id from the error message
-            // resultsNode.innerHTML = "there was an error! message id = "  + " error code = " + result.error.code + " error message = " + result.error.msg ;
-           resultsNode.innerHTML = "An error was returned by the server. Message id = " +  result.id;
-        }
-
-        // Generate the alert sources table
-        function getAlertSources()
-        { 
-            response = alertSourcesService.getAlertSources("Dojo");
-            response.addCallbacks(getAlertSourcesCallback, errorCallback);
-
-            getAlerts();
-        }
-
-        function getAlertSourcesCallback(result) {
-            var resultsNode = document.getElementById("alertSourcesTable");
-            if ( result.error != null ) {
-                resultsNode.innerHTML = result.error;
-            } else {
-                // stash away the source list for when we come to edit it
-                alertSourceList = result.source.list;
-
-                // put out the html
-                var text = ""
-                var nextSourceId = 0
-                for (var i in result.source.list){
-                    var source = result.source.list[i];
-
-                    text = text + "<table>";
-                    text = text + "<TR CLASS='source_" + source.id + "' >";
-                    text = text + "  <TD CLASS='source_name clickable' ONCLICK=\"displayAlert('" + source.address + "')\">";
-                    text = text + "    <IMG SRC='rss.png'/>&nbsp;&nbsp;" + source.name;
-                    text = text + "  </TD>";
-                    text = text + "  <TD CLASS='clickable link' ONCLICK=\"showEditSource('" + source.id + "')\">Edit</TD>";
-                    text = text + "  <TD CLASS='clickable link' ONCLICK=\"deleteSource('" + source.id + "')\">Delete</TD>";
-                    text = text + "</TR>";
-                    text = text + "<TR ID='edit_source_" + source.id + "' CLASS='hidden source_" + source.id + "'>";
-                    text = text + "  <TD COLSPAN='3'>";
-                    text = text + "    <TABLE CLASS='sourceDetailsTable'>";
-                    text = text + "      <TR>";
-                    text = text + "        <TD>Source name:</TD>";
-                    text = text + "        <TD>";
-                    text = text + "          <INPUT ID='source_" + source.id + "_name' TYPE='TEXT' SIZE='50' VALUE='" + source.name + "'/>";
-                    text = text + "        </TD>";
-                    text = text + "      </TR>";
-                    text = text + "      <TR>";
-                    text = text + "       <TD>Source address:</TD>"
-                    text = text + "        <TD>";
-                    text = text + "          <INPUT ID='source_" + source.id + "_address' TYPE='TEXT' SIZE='50' VALUE='" + source.address + "'/>";
-                    text = text + "        </TD>";
-                    text = text + "      </TR>";
-                    text = text + "      <TR>";
-                    text = text + "        <TD>";
-                    text = text + "          <INPUT ID='source_" + source.id + "_type' TYPE='HIDDEN' VALUE='" + source.id + "'/>";
-                    text = text + "          <INPUT TYPE='BUTTON' VALUE='Update' ONCLICK=\"updateSource('" + source.id + "')\"/>";
-                    text = text + "          <INPUT TYPE='BUTTON' VALUE='Cancel' ONCLICK=\"hideEditSource('" + source.id + "')\"/>";
-                    text = text + "        </TD>";
-                    text = text + "      </TR>";
-                    text = text + "    </TABLE>";
-                    text = text + "  </TD>";
-                    text = text + "</TR>";
-               
-                    nextSourceId = eval(source.id);
-                }
-
-                nextSourceId = nextSourceId + 1;
-
-                text = text + "<TR CLASS='source_" + nextSourceId + "'>";
-                text = text + "  <TD COLSPAN='4' CLASS='clickable link' ONCLICK=\"showAddNewSource('" + nextSourceId + "')\">Add new Alert Source</TD>";
-                text = text + "</TR>";
-                text = text + "<TR ID='add_source_" + nextSourceId + "' CLASS='hidden source_" + nextSourceId + "'>";
-                text = text + "  <TD COLSPAN='4'>";
-                text = text + "    <TABLE CLASS='sourceDetailsTable'>";
-                text = text + "      <TR>";
-                text = text + "        <TD>Source name:</TD>";
-                text = text + "        <TD>";
-                text = text + "          <INPUT ID='source_" + nextSourceId + "_name' TYPE='TEXT' SIZE='50'>";
-                text = text + "        </TD>";
-                text = text + "      </TR>";
-                text = text + "      <TR>";
-                text = text + "        <TD>Source address:</TD>";
-                text = text + "        <TD>";
-                text = text + "          <INPUT ID='source_" + nextSourceId + "_address' TYPE='TEXT' SIZE='50'>";
-                text = text + "        </TD>";
-                text = text + "      </TR>";
-                text = text + "      <TR>";
-                text = text + "        <TD>Source type:</TD>";
-                text = text + "        <TD>";
-                text = text + "          <SELECT ID='source_" + nextSourceId + "_type' ONCHANGE=\"showSourceType('" + nextSourceId + "')\">";
-                text = text + "            <OPTION value='rss' selected='selected'>RSS/Atom feed</OPTION>";
-                text = text + "          </SELECT>";
-                text = text + "        </TD>";
-                text = text + "      </TR>";
-                text = text + "      <TR ID='add_rss_source'>";
-                text = text + "        <TD COLSPAN='2'>";
-                text = text + "          <TABLE CLASS='sourceDetailsTable'>";
-                text = text + "            <TR>";
-                text = text + "              <TD>Feed address:</TD>";
-                text = text + "              <TD>";
-                text = text + "                 <INPUT ID='source_" + nextSourceId + "_feedAddress' TYPE='TEXT' SIZE='50'/>";
-                text = text + "              </TD>";
-                text = text + "            </TR>";
-                text = text + "          </TABLE>";
-                text = text + "        </TD>";
-                text = text + "      </TR>";
-                text = text + "      <TR>";
-                text = text + "        <TD>";
-                text = text + "          <INPUT TYPE='BUTTON' VALUE='Add' ONCLICK=\"addSource('" + nextSourceId + "')\">";
-                text = text + "          <INPUT TYPE='BUTTON' VALUE='Cancel' ONCLICK=\"hideAddNewSource('" + nextSourceId + "')\">";
-                text = text + "        </TD>";
-                text = text + "      </TR>";
-                text = text + "    </TABLE>";
-                text = text + "  </TD>";
-                text = text + "</TR>";
-                text = text + "</table>";
-
-                resultsNode.innerHTML = text;  
-            }
-        }
-
-        function showEditSource(sourceid)
-        {
-            document.getElementById("edit_source_"+sourceid).className = "source_"+sourceid;
-        }
-
-        function hideEditSource(sourceid)
-        {
-             document.getElementById("edit_source_"+sourceid).className = "hidden source_"+sourceid;
-        }
- 
-        function updateSource(sourceid)
-        {
-            hideEditSource(sourceid);
-            var source = getSource(sourceId);
-            alertSourcesService.updateAlertSource(source);
-            getAlertSources();
-        }
- 
-        function deleteSource(sourceid)
-        {
-            alertSourcesService.removeAlertSource(sourceid);
-            getAlertSources();
-        }
-
-        function showAddNewSource(sourceid)
-        {
-            document.getElementById("add_source_"+sourceid).className = "source_"+sourceid;
-        }
-
-        function hideAddNewSource(sourceid)
-        {
-            document.getElementById("add_source_"+sourceid).className = "hidden source_"+sourceid;
-        }
-
-        function addSource(sourceid)
-        {
-            hideAddNewSource(sourceid);
-            var source = getSource(sourceid);
-            alertSourcesService.addAlertSource(source); 
-
-            // wait a little before getting the list back from the server
-            setTimeout("getAlertSources()",1250);       
-        }
-
-        function getSource(sourceid)
-        {
-            var source = alertSourceList[sourceid];
-
-            if ( source == null ){
-                source = new alertSourceType("name","id","address","feedAddress","feedType","popUsername","popPassword","popServer","lastChecked","javaClass");
-                alertSourceList[sourceid] = source;
-            }
-            
-            source.name     = document.getElementById("source_"+sourceid+"_name").value;
-            source.id       = sourceid;
-            source.address  = document.getElementById("source_"+sourceid+"_address").value;
-            var typeElem    = document.getElementById("source_"+sourceid+"_type");
-            source.feedType = typeElem.options[typeElem.selectedIndex].value; 
-
-            if(source.feedType=="rss")
-            {
-                source.feedAddress = document.getElementById("source_"+sourceid+"_feedAddress").value;
-                
-            }
-            else if(source.feedType=="pop")
-            {
-                source.popServer   = document.getElementById("source_"+sourceid+"_popServer").value;
-                source.popUsername = document.getElementById("source_"+sourceid+"_popUsername").value;
-                source.popPassword = document.getElementById("source_"+sourceid+"_popPassword").value;
-            } 
-            return source;     
-        }
-
-        // Generate the alerts table
-        function getAlerts()
-        { 
-            response = alertsService.getAllNewAlerts("Dojo");
-            response.addCallbacks(getAlertsCallback, errorCallback);
-        }
-
-        function getAlertsCallback(result) {
-            var resultsNode = document.getElementById("alertsTable");
-            if ( result.error != null ) {
-                resultsNode.innerHTML = result.error;
-            } else {
-                alertList = result.alert.list;
-                var text = ""
-                for (var i in result.alert.list){
-                    var alert = result.alert.list[i];
-
-                    text = text + "<table>";
-                    text = text + "<TR class='source_" + alert.sourceId + " clickable' onclick=\"displayAlert('" + alert.address + "')\">";
-                    text = text + " <TD class='alert_text'>";
-                    text = text + "   <SPAN id='" + alert.id + "' class='unread_title'>" + alert.title + "</SPAN>";
-                    text = text + "   <SPAN class='summary'> - " + alert.summary.substring(0, 80)  + "...</SPAN>";
-                    text = text + " </TD>";
-                    text = text + " <TD>";
-                    text = text +     alert.date;
-                    text = text + "  </TD>"
-                    text = text + "</TR>"
-                    text = text + "</table>";
-                }
-
-                resultsNode.innerHTML = text;  
-            }
-        }
-
-
-
-        function displayAlert(url)
-        {
-            document.getElementById("alertData").innerHTML="<IFRAME CLASS='alert_data' SRC='"+url+"'/>";
-            window.location="#data";
-            return;    
-        }
-</script-->
-
-<h1 id="top">Apache Tuscany Domain</h1>
-<div id="errors"></div>
-
-<p>Domain Name<span id="domainName"></span>:</p>
-
-<div id="domainInfo"></div>
-
-<p /><input type="button" value="Refresh" onclick="getNodeInfo()" />
-
-<div id="nodePage"></div>
-
-</body>
-</html>
diff --git a/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/node.png b/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/node.png
deleted file mode 100644
index b3c949d224..0000000000
--- a/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/node.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/style.css b/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/style.css
deleted file mode 100644
index f5bbf23379..0000000000
--- a/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/style.css
+++ /dev/null
@@ -1,176 +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.
- */
-
-p,table,li,h1,h2,h3
-{
-font-family: verdana, arial, 'sans serif'; 
-}
-
-p, h1, h2, h3, table, li, hr
-{
-margin-left: 10pt;
-}
-
-table
-{
-border-color: black;
-border-collapse: separate;
-border-spacing: 0px 1px;
-
-margin-right: 10pt;
-margin-left: 10pt;
-width: 800px;
-}
-
-.sourceDetailsTable
-{
-width: 600px;
-}
-
-tr, td
-{
-margin-left: 0pt;
-margin-right: 0pt;
-padding-left: 10pt;
-font-size: 90%;
-}
-
-p,li,th
-{
-font-size: 90%;
-margin-left: 10pt;
-}
-
-pre
-{
-margin-left: 10pt;
-}
-
-body
-{
-#ffffff;
-}
-
-h1,h2,h3,hr
-{
-color: firebrick;
-}
-
-a:link {COLOR: firebrick;}
-a:visited {COLOR: firebrick;}
-a:active {COLOR: navy;}
-
-.link
-{
-COLOR: firebrick;
-text-decoration: underline;
-}
-
-.clickable
-{
-cursor: pointer
-}
-
-.unread_title
-{
-font-weight: bold;
-}
-
-.read_title
-{
-font-weight: normal;
-}
-
-.summary
-{
-color: DimGrey;
-}
-
-.hidden
-{
-display: none;
-}
-
-.source_name
-{
-width: 600px;
-}
-
-.alert_text
-{
-width: 600px;
-}
-
-.alert_data
-{
-margin-left: 10px;
-width: 800px;
-height: 800px;
-}
-
-.source_0
-{
-background-color: LightGreen;
-}    
-
-.source_1
-{
-background-color: LightSkyBlue;
-}
-
-.source_2
-{
-background-color: Khaki;
-}
-
-.source_3
-{
-background-color: LightPink;
-}
-
-.source_4
-{
-background-color: Orange;
-}
-
-.source_5
-{
-background-color: LightCoral;
-}
-
-.source_6
-{
-background-color: Orchid;
-}
-
-.source_7
-{
-background-color: Peru;
-}
-
-.source_8
-{
-background-color: SpringGreen;
-}
-
-.source_9
-{
-background-color: LightGrey;
-}
-
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/README b/java/sca-contrib/samples/feed-aggregator-webapp/README
deleted file mode 100644
index 3668a7705e..0000000000
--- a/java/sca-contrib/samples/feed-aggregator-webapp/README
+++ /dev/null
@@ -1,55 +0,0 @@
-Feed-aggregator-webapp Sample
-=============================
-This sample demonstrates using the Feed binding to aggregate ATOM and RSS
-feeds and publish a new aggregated feed in a webapp.
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want 
-to give this sample a go deploy the WAR file
-(target/sample-feed-aggregator-webapp.war) to your web application server. 
-
-Once the web app is deployed use your browser to visit the following URL:
-
-http://localhost:8080/sample-feed-aggregator-webapp
-
-You will then see the following displayed in your Web browser. 
-
-http://localhost:8083/atomAggregator
-http://localhost:8083/atomAggregator/atomsvc 
-http://localhost:8083/rssAggregator
-
-** Please note that if your browser is not configured correctly to receive
-feed information, you will be prompted to open each file that contains the feed
-information in xml.
-
-
-Building And Running The Sample Using Ant 
--------------------------------------------
-With the binary distribution the sample can be built using Ant as 
-follows
-
-cd feed-aggregator-webapp
-ant package
-
-This should result in a war file (sample-feed-aggregator-webapp.war) in the
-target directory. Copy this war file to your web app deployment directory and
-follow instructions at the begining of this README.
-
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd feed-aggregator-webapp 
-mvn
-
-This should result in a war file (sample-feed-aggregator-webapp.war) in the
-target directory. Follow the steps described in the previous section for
-running the web app and for the expected results.
-
-
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.png b/java/sca-contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
deleted file mode 100644
index 1af95a5eff..0000000000
--- a/java/sca-contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg b/java/sca-contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
deleted file mode 100644
index a861a5c50f..0000000000
--- a/java/sca-contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-panic\sca\samples\feed-aggregator-webapp"
-   sodipodi:docname="feed-aggregator-webapp.svg"
-   version="1.0"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\simon\tuscany\java-panic\sca\samples\feed-aggregator-webapp\feed-aggregator-webapp.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lend"
-       style="overflow:visible;">
-      <path
-         id="path4836"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="414.03021"
-     inkscape:cy="456.67148"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1250"
-     inkscape:window-height="812"
-     inkscape:window-x="309"
-     inkscape:window-y="124" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="translate(-123.57143,-11.428571)">
-      <rect
-         rx="18.008654"
-         ry="15.124533"
-         y="194.32922"
-         x="263.49548"
-         height="357.48895"
-         width="583.20337"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.36807251;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">FeedAggregator</flowPara></flowRoot>      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2191"
-         width="115.66247"
-         height="85.862968"
-         x="690.82629"
-         y="338.0274"
-         rx="6.9961648"
-         ry="7.1230249" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2193"
-         transform="translate(423.23555,132.08885)"><flowRegion
-           id="flowRegion2195"><rect
-             id="rect2197"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2199">Sort</flowPara></flowRoot>      <rect
-         style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:1.71304226;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2201"
-         width="66.00518"
-         height="19.995022"
-         x="720.71613"
-         y="322.72653"
-         rx="33.00259"
-         ry="0" />
-      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 673.67581,369.87439 L 707.01085,369.87439 L 713.07176,383.00637 L 706.0007,395.12821 L 673.67581,395.12821 L 681.25196,383.00637 L 673.67581,369.87439 z "
-         id="path2203" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2207"
-         transform="matrix(1.0567037,0,0,1.4908917,429.12889,11.81052)"
-         style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Arial"><flowRegion
-           id="flowRegion2209"><rect
-             id="rect2211"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591"
-             style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Arial" /></flowRegion><flowPara
-           id="flowPara2213"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Arial">newFirst = true</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.47956681;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.1829"
-       height="132.52626"
-       x="315.87039"
-       y="222.40738"
-       rx="6.9671569"
-       ry="10.994121" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(51.611257,19.800501)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">RssAggregator</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 295.62295,271.87174 L 328.95799,271.87174 L 335.0189,285.00372 L 327.94784,297.12556 L 295.62295,297.12556 L 303.1991,285.00372 L 295.62295,271.87174 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 409.58968,317.89061 L 442.92472,317.89061 L 448.98563,331.02259 L 441.91457,343.14443 L 409.58968,343.14443 L 417.16583,331.02259 L 409.58968,317.89061 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.64855945px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 104.19773,263.9347 L 156.32465,263.9347 L 165.80226,286.758 L 154.74505,307.82567 L 104.19773,307.82567 L 116.04476,286.758 L 104.19773,263.9347 z "
-       id="path2171" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.64855945px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 107.05488,444.29186 L 159.1818,444.29186 L 168.65941,467.11516 L 157.6022,488.18283 L 107.05488,488.18283 L 118.90191,467.11516 L 107.05488,444.29186 z "
-       id="path2173" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.52499318;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2175"
-       width="115.13747"
-       height="137.48083"
-       x="311.08875"
-       y="388.28992"
-       rx="6.9644089"
-       ry="11.405141" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2177"
-       transform="translate(51.092672,193.51745)"><flowRegion
-         id="flowRegion2179"><rect
-           id="rect2181"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2183">AtomAggregator</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 294.39008,454.8744 L 327.72512,454.8744 L 333.78603,468.00638 L 326.71497,480.12822 L 294.39008,480.12822 L 301.96623,468.00638 L 294.39008,454.8744 z "
-       id="path2187" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 404.78538,423.7504 L 438.12042,423.7504 L 444.18133,436.88238 L 437.11027,449.00422 L 404.78538,449.00422 L 412.36153,436.88238 L 404.78538,423.7504 z "
-       id="path2189" />
-    <rect
-       style="opacity:1;fill:#fff62c;fill-opacity:1;fill-rule:nonzero;stroke:#060000;stroke-width:1.58481252;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2241"
-       width="56.133411"
-       height="20.123253"
-       x="343.00476"
-       y="211.17569"
-       rx="28.066706"
-       ry="0" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3831"
-       transform="matrix(0.7178392,0,0,0.807316,168.7694,106.36338)"><flowRegion
-         id="flowRegion3833"><rect
-           id="rect3835"
-           width="75.714287"
-           height="14.285714"
-           x="247.85715"
-           y="135.52306" /></flowRegion><flowPara
-         id="flowPara3837">Rss Sample</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:#fff62c;fill-opacity:1;fill-rule:nonzero;stroke:#060000;stroke-width:1.58481252;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3839"
-       width="56.133411"
-       height="20.123253"
-       x="342.64758"
-       y="376.17572"
-       rx="28.066706"
-       ry="0" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3841"
-       transform="matrix(0.7178392,0,0,0.807316,168.41222,271.3634)"><flowRegion
-         id="flowRegion3843"><rect
-           id="rect3845"
-           width="75.714287"
-           height="14.285714"
-           x="247.85715"
-           y="135.52306" /></flowRegion><flowPara
-         id="flowPara3847">Atom Sample</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 410.30203,282.89615 L 443.63707,282.89615 L 449.69798,296.02813 L 442.62692,308.14997 L 410.30203,308.14997 L 417.87818,296.02813 L 410.30203,282.89615 z "
-       id="path3849" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 410.30203,245.039 L 443.63707,245.039 L 449.69798,258.17098 L 442.62692,270.29282 L 410.30203,270.29282 L 417.87818,258.17098 L 410.30203,245.039 z "
-       id="path3851" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 403.87346,461.46758 L 437.2085,461.46758 L 443.26941,474.59956 L 436.19835,486.7214 L 403.87346,486.7214 L 411.44961,474.59956 L 403.87346,461.46758 z "
-       id="path3853" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 402.44488,492.89614 L 435.77992,492.89614 L 441.84083,506.02812 L 434.76977,518.14996 L 402.44488,518.14996 L 410.02103,506.02812 L 402.44488,492.89614 z "
-       id="path3855" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:none;marker-mid:none;marker-end:url(#Arrow1Lend)"
-       d="M 449.28571,257.66591 L 752.85714,257.66591"
-       id="path3857" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-mid:none;marker-end:url(#Arrow1Lend);stroke-opacity:1"
-       d="M 448.92857,296.23734 L 752.5,296.23734"
-       id="path5028" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01533759px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-mid:none;marker-end:url(#Arrow1Lend);stroke-opacity:1"
-       d="M 442.50767,474.80877 L 756.06376,474.80877"
-       id="path5030" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01425123px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-mid:none;marker-end:url(#Arrow1Lend);stroke-opacity:1"
-       d="M 441.79284,506.95163 L 754.63573,506.95163"
-       id="path5032" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 448.57143,331.23734 L 494.28571,331.23734 L 494.28571,367.66591 L 555,367.66591"
-       id="path5034" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.05817151px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 444.31479,436.92255 L 493.43055,436.92255 L 494.16361,377.69499 L 553.54235,378.47431"
-       id="path5036" />
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="757.85712"
-       y="259.09448"
-       id="text5038"><tspan
-         sodipodi:role="line"
-         id="tspan5040"
-         x="757.85712"
-         y="259.09448">Engadget</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="757.42694"
-       y="298.5553"
-       id="text5042"><tspan
-         sodipodi:role="line"
-         id="tspan5044"
-         x="757.42694"
-         y="298.5553">BBC</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="760.71429"
-       y="477.66589"
-       id="text5046"><tspan
-         sodipodi:role="line"
-         id="tspan5048"
-         x="760.71429"
-         y="477.66589">Oreilly</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="760"
-       y="510.52304"
-       id="text5050"><tspan
-         sodipodi:role="line"
-         id="tspan5052"
-         x="760"
-         y="510.52304">Apache</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 165.71429,286.23734 L 300.71429,286.23734"
-       id="path5054" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 168.57143,468.3802 L 300.71429,469.80877"
-       id="path5056" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot5058"><flowRegion
-         id="flowRegion5060"><rect
-           id="rect5062"
-           width="27.142857"
-           height="20.714285"
-           x="122.85714"
-           y="276.23734" /></flowRegion><flowPara
-         id="flowPara5064">RSS</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot5066"><flowRegion
-         id="flowRegion5068"><rect
-           id="rect5070"
-           width="36.428574"
-           height="19.285715"
-           x="122.85714"
-           y="459.80878" /></flowRegion><flowPara
-         id="flowPara5072">Atom</flowPara></flowRoot>    <rect
-       style="opacity:0.22777776;fill:#4ab772;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.26034534;stroke-miterlimit:4;stroke-dasharray:7.56207236, 1.26034539;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2264"
-       width="643.5636"
-       height="408.56357"
-       x="87.861069"
-       y="150.52698"
-       rx="6.9412122"
-       ry="11.587238" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3237"><flowRegion
-         id="flowRegion3239"><rect
-           id="rect3241"
-           width="211.42857"
-           height="17.857143"
-           x="95"
-           y="156.95163" /></flowRegion><flowPara
-         id="flowPara3243">sample-feed-aggregator-webapp.war</flowPara></flowRoot>  </g>
-</svg>
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/pom.xml b/java/sca-contrib/samples/feed-aggregator-webapp/pom.xml
deleted file mode 100644
index 874327c7b1..0000000000
--- a/java/sca-contrib/samples/feed-aggregator-webapp/pom.xml
+++ /dev/null
@@ -1,108 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-feed-aggregator-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Atom+RSS Feed Aggregator Sample Webapp</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- marking dependency as provided to exclude from war file -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>         
-       </plugins>         
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
deleted file mode 100644
index 2c90c0db8c..0000000000
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
+++ /dev/null
@@ -1,178 +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 feed;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.factory.Factory;
-import org.apache.abdera.model.Document;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.abdera.model.Person;
-import org.apache.abdera.parser.Parser;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.binding.atom.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
-import com.sun.syndication.io.SyndFeedOutput;
-
-/**
- * Implementation of an SCA component that aggregates several
- * Atom and RSS feeds.
- *
- * @version $Rev$ $Date$
- */
-public class AggregatorImpl implements org.apache.tuscany.sca.binding.atom.collection.Collection {
-
-    @Reference(required = false)
-    public Collection atomFeed1;
-    @Reference(required = false)
-    public Collection atomFeed2;
-    
-    @Reference(required = false)
-    public org.apache.tuscany.sca.binding.rss.collection.Collection rssFeed1;
-    @Reference(required = false)
-    public org.apache.tuscany.sca.binding.rss.collection.Collection rssFeed2;
-    
-    @Reference(required = false)
-    public Sort sort;
-
-    @Property
-    public String feedTitle = "Aggregated Feed";
-    @Property
-    public String feedDescription = "Anonymous Aggregated Feed";
-    @Property
-    public String feedAuthor = "anonymous";
-    
-    public Feed getFeed() {
-        
-        // Create a new Feed
-        Factory factory = Abdera.getNewFactory();
-        Feed feed = factory.newFeed();
-        feed.setTitle(feedTitle);
-        feed.setSubtitle(feedDescription);
-        Person author = factory.newAuthor();
-        author.setName(feedAuthor);
-        feed.addAuthor(author);
-        feed.addLink("http://tuscany.apache.org", "alternate");
-
-        // Aggregate entries from atomFeed1, atomFeed2, rssFeed1 and rssFeed2
-        List<Entry> entries = new ArrayList<Entry>();
-        if (atomFeed1 != null) {
-            try {
-                entries.addAll(atomFeed1.getFeed().getEntries());
-            } catch (Exception e) {}
-        }
-        if (atomFeed2 != null) {
-            try {
-                entries.addAll(atomFeed2.getFeed().getEntries());
-            } catch (Exception e) {}
-        }
-        if (rssFeed1 != null) {
-            try {
-                entries.addAll(atomFeed(rssFeed1.getFeed()).getEntries());
-            } catch (Exception e) {}
-        }
-        if (rssFeed2 != null) {
-            try {
-                entries.addAll(atomFeed(rssFeed2.getFeed()).getEntries());
-            } catch (Exception e) {}
-        }
-
-        // Sort entries by published date
-        if (sort != null) {
-            entries = sort.sort(entries);
-        }
-        
-        // Add the entries to the new feed
-        for (Entry entry: entries) {
-            feed.addEntry(entry);
-        }
-        
-        return feed;
-    }
-
-    public Feed query(String queryString) {
-        Factory factory = Abdera.getNewFactory();
-        Feed feed = factory.newFeed();
-        feed.setTitle(feedTitle);
-        feed.setSubtitle(feedDescription);
-        Person author = factory.newAuthor();
-        author.setName(feedAuthor);
-        feed.addAuthor(author);
-        feed.addLink("http://tuscany.apache.org", "alternate");
-        
-        Feed allFeed = getFeed();
-        if (queryString.startsWith("title=")) {
-            String title = queryString.substring(6);
-
-            for (Entry entry: allFeed.getEntries()) {
-                if (entry.getTitle().contains(title)) {
-                    feed.addEntry(entry);
-                }
-            }
-        }
-        return feed;
-    }
-
-    public void delete(String id) throws NotFoundException {
-    }
-
-    public Entry get(String id) throws NotFoundException {
-        return null;
-    }
-
-    public Entry post(Entry entry) {
-        return null;
-    }
-
-    public void put(String id, Entry entry) throws NotFoundException {
-    }
-
-    /**
-     * Convert a ROME feed to an Abdera feed.
-     * 
-     * @param romeFeed
-     * @return
-     */
-    private static Feed atomFeed(SyndFeed syndFeed) {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        
-        syndFeed.setFeedType("atom_1.0");
-        SyndFeedOutput syndOutput = new SyndFeedOutput();
-        try {
-            syndOutput.output(syndFeed, new OutputStreamWriter(bos));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        Parser parser = Abdera.getNewParser();
-        Document<Feed> document = parser.parse(new ByteArrayInputStream(bos.toByteArray()));
-        
-        return document.getRoot();
-    }
-}
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java b/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
deleted file mode 100644
index dec073c36b..0000000000
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
+++ /dev/null
@@ -1,38 +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 feed;
-
-import java.util.List;
-
-import org.apache.abdera.model.Entry;
-
-/**
- * The Sort service business interface.
- * 
- * @version $Rev$ $Date$
- */
-public interface Sort {
-
-    /**
-     * Sort feed entries by published date.
-     * @param entries
-     * @return
-     */
-    List<Entry> sort(List<Entry> entries);
-}
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
deleted file mode 100644
index 354ef2d369..0000000000
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
+++ /dev/null
@@ -1,57 +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 feed;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.abdera.model.Entry;
-import org.oasisopen.sca.annotation.Property;
-
-/**
- * Implementation of a Feed Sort service component.
- * 
- * @version $Rev$ $Date$
- */
-public class SortImpl implements Sort {
-
-    @Property
-    public boolean newFirst = true;
-
-    @SuppressWarnings("unchecked")
-    public List<Entry> sort(List<Entry> entries) {
-        Entry[] entriesArray = new Entry[entries.size()];
-        entriesArray = (Entry[])entries.toArray(entriesArray);
-        Arrays.sort(entriesArray, new Comparator() {
-            public int compare(final Object xObj, final Object yObj) {
-                Date xDate = ((Entry)xObj).getUpdated();
-                Date yDate = ((Entry)yObj).getUpdated();
-                if (xDate == null)
-                    return -1;
-                if (newFirst)
-                    return yDate.compareTo(xDate);
-                else
-                    return xDate.compareTo(yDate);
-            }
-        });
-        return Arrays.asList(entriesArray);
-    }
-}
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/java/sca-contrib/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
deleted file mode 100644
index 736563098f..0000000000
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
+++ /dev/null
@@ -1,60 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://aggregator"
-    name="FeedAggregator">
-
-	<service name="rssSample" promote="RssAggregator">
-		<tuscany:binding.atom uri="http://localhost:8083/rssAggregator"/>
-	</service>
-	<service name="atomSample" promote="AtomAggregator">
-		<tuscany:binding.atom  uri="http://localhost:8083/atomAggregator"/>
-	</service>	
-
-    <component name="RssAggregator">
-        <implementation.java class="feed.AggregatorImpl"/>             
-		<reference name="rssFeed1">
-   	 		<tuscany:binding.rss uri="http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml"/>
-   		</reference>
-   		<reference name="rssFeed2"> 	
-   	 		<tuscany:binding.rss uri="http://www.engadget.com/rss.xml"/>
-   		</reference>
-   		<reference name="sort" target="Sort"/> 	 		
-        <property name="feedTitle">RSS Aggregator Sample</property> 
-    </component>
-    <component name="Sort">
-        <implementation.java class="feed.SortImpl"/>       
-        <property name="newFirst">true</property> 
-    </component>    
-    
-    <component name="AtomAggregator">
-        <implementation.java class="feed.AggregatorImpl"/>        
-        <reference name="sort" target="Sort"/>          
-		<reference name="atomFeed1">
-   	 		<tuscany:binding.atom uri="http://www.oreillynet.com/pub/feed/35"/>
-   		</reference>
-   		<reference name="atomFeed2"> 	
-   	 		<tuscany:binding.atom uri="http://feeds.feedburner.com/blogspot/Dcni?format=xml"/>
-   		</reference>
-        <property name="feedTitle">Atom Aggregator Sample</property>    		           
-    </component>      
-
-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index b67fe843ca..0000000000
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://aggregator"
-              xmlns:a="http://aggregator">
-   <deployable composite="a:FeedAggregator"/>
-</contribution>
-
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index dea3980e4d..0000000000
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-    <display-name>Apache Tuscany Feed Aggregator Sample</display-name>
-    
-    <filter>
-        <filter-name>tuscany</filter-name>
-        <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
-    </filter>
- 
-    <filter-mapping>
-        <filter-name>tuscany</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <welcome-file-list id="WelcomeFileList">
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-
-</web-app>
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/index.html b/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/index.html
deleted file mode 100644
index 7b33391a87..0000000000
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-<!--
- * 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.    
- -->
-  <head>
-    <title>Apache Tuscany Feed Aggregator Sample</title>
-  </head>
-  <body>
-
-    <h2>Apache Tuscany Feed Aggregator Sample</h2>
-    <p>To read the aggregated feeds, point your Web browser to the following addresses:</p>
-    <br/><a href="atomAggregator">http://localhost:8083/sample-feed-aggregator-webapp/atomAggregator</a>
-    <br/><a href="atomAggregator/atomsvc">http://localhost:8083/sample-feed-aggregator-webapp/atomAggregator/atomsvc (for the Atom service document)</a>
-    <br/><a href="rssAggregator">http://localhost:8083/sample-feed-aggregator-webapp/rssAggregator</a>
-     
-  </body>
-</html>
diff --git a/java/sca-contrib/samples/feed-aggregator/README b/java/sca-contrib/samples/feed-aggregator/README
deleted file mode 100644
index f73baec2fd..0000000000
--- a/java/sca-contrib/samples/feed-aggregator/README
+++ /dev/null
@@ -1,110 +0,0 @@
-Feed Aggregator Sample
-======================================
-This sample demonstrates using the Feed binding to aggregate ATOM and RSS
-feeds and publish a new aggregated feed.
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you run the sample using ant, navigate to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-feed-aggregator.jar launch.LaunchFeedServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-feed-aggregator.jar launch.LaunchFeedServer
-
-You should see the following output on the screen.
-
-run:
-    [java] Added Servlet mapping: http://localhost:8083/rssAggregator
-    [java] Added Servlet mapping: http://localhost:8083/atomAggregator/*
-    [java] Sample Feed server started (press enter to shutdown)
-
-    [java] To read the aggregated feeds, point your Web browser to the following addresses:
-    [java] http://localhost:8083/atomAggregator
-    [java] http://localhost:8083/atomAggregator/atomsvc (for the Atom service document)
-    [java] http://localhost:8083/rssAggregator
-     
-As this point the aggregated Feeds are exposed by a web server started
-automatically by the SCA runtime. You can later stop the server by pressing enter.
-
-Now that the server is started you can point your Web browser to each URL of the
-aggregated feeds to see the information in your broswer. These URLs are:
-
-http://localhost:8083/atomAggregator
-http://localhost:8083/atomAggregator/atomsvc 
-http://localhost:8083/rssAggregator
-
-** Please note that if your browser is not configured correctly to receive
-feed information, you will be prompted to open each file that contains the feed
-information in xml.
-
-Sample Overview
----------------
-The sample provides a single component exposing a Web resource.
-
-web-resource/
-  src/
-    main/
-      java/
-        feed/
-          AggregatorImpl.java             - implementation of the Feed
-                                            aggregator component
-          Sort.java						  - utilty interface 
-          SortImpl.java					  - implementation of the Sort component
-        launch
-          LaunchFeedServer.java           - starts the SCA Runtime and 
-                                            publishes the aggregated feeds
-      resources/
-        FeedAggregator.composite          - the SCA assembly for this sample
-  feed-aggregator.png                     - a pictorial representation of the 
-                                            sample .composite file
-  build.xml                               - the Ant build file
-  pom.xml                                 - the Maven build file 
-  
-  
-Details of how this sample works
---------------------------------
-1. AggregatorImpl is used to implement the two main components here (RSSAggregator & AtomAggregator).
-2. AggregatorImpl directly implements the Tuscany Atom Collection interface. It is a component 
-   that provides an Atom feed to respond (see tuscany/modules/binding-atom-abdera) 
-3. The AggregatorImpl component is not explicitly configured using nested <service> element nor its 
-   implementation class is annotated with @Service annotation. Instead, the Tuscany Atom Collection interface 
-   defines its services using @Remotable annotation.
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant using the 
-following commands
-
-cd feed-aggregator
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-    [java] Added Servlet mapping: http://localhost:8083/rssAggregator
-    [java] Added Servlet mapping: http://localhost:8083/atomAggregator/*
-    [java] Sample Feed server started (press enter to shutdown)
-
-    [java] To read the aggregated feeds, point your Web browser to the following addresses:
-    [java] http://localhost:8083/atomAggregator
-    [java] http://localhost:8083/atomAggregator/atomsvc (for the Atom service document)
-    [java] http://localhost:8083/rssAggregator
-     
- 
-Building The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built using
-Maven as follows.
-
-cd feed-aggregator
-mvn
-
diff --git a/java/sca-contrib/samples/feed-aggregator/build.xml b/java/sca-contrib/samples/feed-aggregator/build.xml
deleted file mode 100644
index 0ab6fed7fc..0000000000
--- a/java/sca-contrib/samples/feed-aggregator/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="feed-aggregator" default="compile">
-    <property name="test.class" value="launch.LaunchFeedServer" />
-	<property name="test.jar"   value="sample-feed-aggregator.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>	
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/feed-aggregator/feed-aggregator.png b/java/sca-contrib/samples/feed-aggregator/feed-aggregator.png
deleted file mode 100644
index c8fea8a7b8..0000000000
--- a/java/sca-contrib/samples/feed-aggregator/feed-aggregator.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/feed-aggregator/feed-aggregator.svg b/java/sca-contrib/samples/feed-aggregator/feed-aggregator.svg
deleted file mode 100644
index 72fe6a00ac..0000000000
--- a/java/sca-contrib/samples/feed-aggregator/feed-aggregator.svg
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-panic\sca\samples\feed-aggregator"
-   sodipodi:docname="feed-aggregator.svg"
-   version="1.0"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\simon\tuscany\java-panic\sca\samples\feed-aggregator\feed-aggregator.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lend"
-       style="overflow:visible;">
-      <path
-         id="path4836"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="414.03021"
-     inkscape:cy="406.46344"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1250"
-     inkscape:window-height="812"
-     inkscape:window-x="309"
-     inkscape:window-y="124" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="translate(-123.57143,-11.428571)">
-      <rect
-         rx="18.008654"
-         ry="15.124533"
-         y="194.32922"
-         x="263.49548"
-         height="357.48895"
-         width="583.20337"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.36807251;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">FeedAggregator</flowPara></flowRoot>      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2191"
-         width="115.66247"
-         height="85.862968"
-         x="690.82629"
-         y="338.0274"
-         rx="6.9961648"
-         ry="7.1230249" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2193"
-         transform="translate(423.23555,132.08885)"><flowRegion
-           id="flowRegion2195"><rect
-             id="rect2197"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2199">Sort</flowPara></flowRoot>      <rect
-         style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:1.71304226;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2201"
-         width="66.00518"
-         height="19.995022"
-         x="720.71613"
-         y="322.72653"
-         rx="33.00259"
-         ry="0" />
-      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 673.67581,369.87439 L 707.01085,369.87439 L 713.07176,383.00637 L 706.0007,395.12821 L 673.67581,395.12821 L 681.25196,383.00637 L 673.67581,369.87439 z "
-         id="path2203" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2207"
-         transform="matrix(1.0567037,0,0,1.4908917,429.12889,11.81052)"
-         style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Arial"><flowRegion
-           id="flowRegion2209"><rect
-             id="rect2211"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591"
-             style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Arial" /></flowRegion><flowPara
-           id="flowPara2213"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Arial">newFirst = true</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.47956681;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.1829"
-       height="132.52626"
-       x="315.87039"
-       y="222.40738"
-       rx="6.9671569"
-       ry="10.994121" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(51.611257,19.800501)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">RssAggregator</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 295.62295,271.87174 L 328.95799,271.87174 L 335.0189,285.00372 L 327.94784,297.12556 L 295.62295,297.12556 L 303.1991,285.00372 L 295.62295,271.87174 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 409.58968,317.89061 L 442.92472,317.89061 L 448.98563,331.02259 L 441.91457,343.14443 L 409.58968,343.14443 L 417.16583,331.02259 L 409.58968,317.89061 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.64855945px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 104.19773,263.9347 L 156.32465,263.9347 L 165.80226,286.758 L 154.74505,307.82567 L 104.19773,307.82567 L 116.04476,286.758 L 104.19773,263.9347 z "
-       id="path2171" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.64855945px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 107.05488,444.29186 L 159.1818,444.29186 L 168.65941,467.11516 L 157.6022,488.18283 L 107.05488,488.18283 L 118.90191,467.11516 L 107.05488,444.29186 z "
-       id="path2173" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.52499318;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2175"
-       width="115.13747"
-       height="137.48083"
-       x="311.08875"
-       y="388.28992"
-       rx="6.9644089"
-       ry="11.405141" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2177"
-       transform="translate(51.092672,193.51745)"><flowRegion
-         id="flowRegion2179"><rect
-           id="rect2181"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2183">AtomAggregator</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 294.39008,454.8744 L 327.72512,454.8744 L 333.78603,468.00638 L 326.71497,480.12822 L 294.39008,480.12822 L 301.96623,468.00638 L 294.39008,454.8744 z "
-       id="path2187" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 404.78538,423.7504 L 438.12042,423.7504 L 444.18133,436.88238 L 437.11027,449.00422 L 404.78538,449.00422 L 412.36153,436.88238 L 404.78538,423.7504 z "
-       id="path2189" />
-    <rect
-       style="opacity:1;fill:#fff62c;fill-opacity:1;fill-rule:nonzero;stroke:#060000;stroke-width:1.58481252;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2241"
-       width="56.133411"
-       height="20.123253"
-       x="343.00476"
-       y="211.17569"
-       rx="28.066706"
-       ry="0" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3831"
-       transform="matrix(0.7178392,0,0,0.807316,168.7694,106.36338)"><flowRegion
-         id="flowRegion3833"><rect
-           id="rect3835"
-           width="75.714287"
-           height="14.285714"
-           x="247.85715"
-           y="135.52306" /></flowRegion><flowPara
-         id="flowPara3837">Rss Sample</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:#fff62c;fill-opacity:1;fill-rule:nonzero;stroke:#060000;stroke-width:1.58481252;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3839"
-       width="56.133411"
-       height="20.123253"
-       x="342.64758"
-       y="376.17572"
-       rx="28.066706"
-       ry="0" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3841"
-       transform="matrix(0.7178392,0,0,0.807316,168.41222,271.3634)"><flowRegion
-         id="flowRegion3843"><rect
-           id="rect3845"
-           width="75.714287"
-           height="14.285714"
-           x="247.85715"
-           y="135.52306" /></flowRegion><flowPara
-         id="flowPara3847">Atom Sample</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 410.30203,282.89615 L 443.63707,282.89615 L 449.69798,296.02813 L 442.62692,308.14997 L 410.30203,308.14997 L 417.87818,296.02813 L 410.30203,282.89615 z "
-       id="path3849" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 410.30203,245.039 L 443.63707,245.039 L 449.69798,258.17098 L 442.62692,270.29282 L 410.30203,270.29282 L 417.87818,258.17098 L 410.30203,245.039 z "
-       id="path3851" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 403.87346,461.46758 L 437.2085,461.46758 L 443.26941,474.59956 L 436.19835,486.7214 L 403.87346,486.7214 L 411.44961,474.59956 L 403.87346,461.46758 z "
-       id="path3853" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 402.44488,492.89614 L 435.77992,492.89614 L 441.84083,506.02812 L 434.76977,518.14996 L 402.44488,518.14996 L 410.02103,506.02812 L 402.44488,492.89614 z "
-       id="path3855" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:none;marker-mid:none;marker-end:url(#Arrow1Lend)"
-       d="M 449.28571,257.66591 L 752.85714,257.66591"
-       id="path3857" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-mid:none;marker-end:url(#Arrow1Lend);stroke-opacity:1"
-       d="M 448.92857,296.23734 L 752.5,296.23734"
-       id="path5028" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-mid:none;marker-end:url(#Arrow1Lend);stroke-opacity:1"
-       d="M 442.5,474.80877 L 746.07143,474.80877"
-       id="path5030" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-mid:none;marker-end:url(#Arrow1Lend);stroke-opacity:1"
-       d="M 441.78571,506.95163 L 745.35714,506.95163"
-       id="path5032" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 448.57143,331.23734 L 494.28571,331.23734 L 494.28571,367.66591 L 555,367.66591"
-       id="path5034" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.05817151px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 444.31479,436.92255 L 493.43055,436.92255 L 494.16361,377.69499 L 553.54235,378.47431"
-       id="path5036" />
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="757.85712"
-       y="259.09448"
-       id="text5038"><tspan
-         sodipodi:role="line"
-         id="tspan5040"
-         x="757.85712"
-         y="259.09448">Engadget</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="757.42694"
-       y="298.5553"
-       id="text5042"><tspan
-         sodipodi:role="line"
-         id="tspan5044"
-         x="757.42694"
-         y="298.5553">BBC</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="752.85718"
-       y="477.66589"
-       id="text5046"><tspan
-         sodipodi:role="line"
-         id="tspan5048"
-         x="752.85718"
-         y="477.66589">Oreilly</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="752.85712"
-       y="510.52304"
-       id="text5050"><tspan
-         sodipodi:role="line"
-         id="tspan5052"
-         x="752.85712"
-         y="510.52304">Apache</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 165.71429,286.23734 L 300.71429,286.23734"
-       id="path5054" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 168.57143,468.3802 L 300.71429,469.80877"
-       id="path5056" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot5058"><flowRegion
-         id="flowRegion5060"><rect
-           id="rect5062"
-           width="27.142857"
-           height="20.714285"
-           x="122.85714"
-           y="276.23734" /></flowRegion><flowPara
-         id="flowPara5064">RSS</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot5066"><flowRegion
-         id="flowRegion5068"><rect
-           id="rect5070"
-           width="36.428574"
-           height="19.285715"
-           x="122.85714"
-           y="459.80878" /></flowRegion><flowPara
-         id="flowPara5072">Atom</flowPara></flowRoot>  </g>
-</svg>
diff --git a/java/sca-contrib/samples/feed-aggregator/pom.xml b/java/sca-contrib/samples/feed-aggregator/pom.xml
deleted file mode 100644
index ae2aee112c..0000000000
--- a/java/sca-contrib/samples/feed-aggregator/pom.xml
+++ /dev/null
@@ -1,84 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-feed-aggregator</artifactId>
-    <name>Apache Tuscany SCA Atom+RSS Feed Aggregator Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
deleted file mode 100644
index 999e9d5520..0000000000
--- a/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
+++ /dev/null
@@ -1,188 +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 feed;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.factory.Factory;
-import org.apache.abdera.model.Document;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.abdera.model.Person;
-import org.apache.abdera.parser.Parser;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.binding.atom.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedOutput;
-
-/**
- * Implementation of an SCA component that aggregates several
- * Atom and RSS feeds.
- *
- * @version $Rev$ $Date$
- */
-public class AggregatorImpl implements org.apache.tuscany.sca.binding.atom.collection.Collection {
-
-    @Reference(required = false)
-    public Collection atomFeed1;
-    @Reference(required = false)
-    public Collection atomFeed2;
-    
-    @Reference(required = false)
-    public org.apache.tuscany.sca.binding.rss.collection.Collection rssFeed1;
-    @Reference(required = false)
-    public org.apache.tuscany.sca.binding.rss.collection.Collection rssFeed2;
-    
-    @Reference(required = false)
-    public Sort sort;
-
-    @Property
-    public String feedTitle = "Aggregated Feed";
-    @Property
-    public String feedDescription = "Anonymous Aggregated Feed";
-    @Property
-    public String feedAuthor = "anonymous";
-    
-    public Feed getFeed() {
-        
-        // Create a new Feed
-        Factory factory = Abdera.getNewFactory();
-        Feed feed = factory.newFeed();
-        feed.setTitle(feedTitle);
-        feed.setSubtitle(feedDescription);
-        Person author = factory.newAuthor();
-        author.setName(feedAuthor);
-        feed.addAuthor(author);
-        feed.addLink("http://tuscany.apache.org/", "alternate");
-
-        // Aggregate entries from atomFeed1, atomFeed2, rssFeed1 and rssFeed2
-        List<Entry> entries = new ArrayList<Entry>();
-        if (atomFeed1 != null) {
-            try {
-                entries.addAll(atomFeed1.getFeed().getEntries());
-            } catch (Exception e) {}
-        }
-        if (atomFeed2 != null) {
-            try {
-                entries.addAll(atomFeed2.getFeed().getEntries());
-            } catch (Exception e) {}
-        }
-        if (rssFeed1 != null) {
-            try {
-                entries.addAll(atomFeed(rssFeed1.getFeed()).getEntries());
-            } catch (Exception e) {}
-        }
-        if (rssFeed2 != null) {
-            try {
-                entries.addAll(atomFeed(rssFeed2.getFeed()).getEntries());
-            } catch (Exception e) {}
-        }
-
-        // Sort entries by updated date
-        if (sort != null) {
-            entries = sort.sort(entries);
-        }
-        
-        // Add the entries to the new feed
-        // Also synthesize a feed id and updated field base on entries
-        Date feedUpdated = new Date( 0 );
-        for (Entry entry: entries) {
-        	Date entryUpdated = entry.getUpdated();
-        	if (( entryUpdated != null ) && ( entryUpdated.compareTo( feedUpdated ) > 0 )) {
-        		feedUpdated = entryUpdated;
-        	}
-            feed.addEntry(entry);
-        }
-        feed.setUpdated( feedUpdated );
-        // Note that feed id should be permanent, immutable, and unique
-        // in order to support proper ETag creation.
-        // Tough to do when the feed is regenerated with each get.
-        feed.setId( "http://tuscany.apache.org/feed", true );
-        
-        return feed;
-    }
-
-    public Feed query(String queryString) {
-        Factory factory = Abdera.getNewFactory();
-        Feed feed = factory.newFeed();
-        feed.setTitle(feedTitle);
-        feed.setSubtitle(feedDescription);
-        Person author = factory.newAuthor();
-        author.setName(feedAuthor);
-        feed.addAuthor(author);
-        feed.addLink("http://tuscany.apache.org", "alternate");
-        
-        Feed allFeed = getFeed();
-        if (queryString.startsWith("title=")) {
-            String title = queryString.substring(6);
-
-            for (Entry entry: allFeed.getEntries()) {
-                if (entry.getTitle().contains(title)) {
-                    feed.addEntry(entry);
-                }
-            }
-        }
-        return feed;
-    }
-
-    public void delete(String id) throws NotFoundException {
-    }
-
-    public Entry get(String id) throws NotFoundException {
-        return null;
-    }
-
-    public Entry post(Entry entry) {
-        return null;
-    }
-
-    public void put(String id, Entry entry) throws NotFoundException {
-    }
-
-    /**
-     * Convert a ROME feed to an Abdera feed.
-     * 
-     * @param romeFeed
-     * @return
-     */
-    private static Feed atomFeed(SyndFeed syndFeed) {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        
-        syndFeed.setFeedType("atom_1.0");
-        SyndFeedOutput syndOutput = new SyndFeedOutput();
-        try {
-            syndOutput.output(syndFeed, new OutputStreamWriter(bos));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        Parser parser = Abdera.getNewParser();
-        Document<Feed> document = parser.parse(new ByteArrayInputStream(bos.toByteArray()));
-        
-        return document.getRoot();
-    }
-}
diff --git a/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/Sort.java b/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/Sort.java
deleted file mode 100644
index dec073c36b..0000000000
--- a/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/Sort.java
+++ /dev/null
@@ -1,38 +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 feed;
-
-import java.util.List;
-
-import org.apache.abdera.model.Entry;
-
-/**
- * The Sort service business interface.
- * 
- * @version $Rev$ $Date$
- */
-public interface Sort {
-
-    /**
-     * Sort feed entries by published date.
-     * @param entries
-     * @return
-     */
-    List<Entry> sort(List<Entry> entries);
-}
diff --git a/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/SortImpl.java
deleted file mode 100644
index 354ef2d369..0000000000
--- a/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/SortImpl.java
+++ /dev/null
@@ -1,57 +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 feed;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.abdera.model.Entry;
-import org.oasisopen.sca.annotation.Property;
-
-/**
- * Implementation of a Feed Sort service component.
- * 
- * @version $Rev$ $Date$
- */
-public class SortImpl implements Sort {
-
-    @Property
-    public boolean newFirst = true;
-
-    @SuppressWarnings("unchecked")
-    public List<Entry> sort(List<Entry> entries) {
-        Entry[] entriesArray = new Entry[entries.size()];
-        entriesArray = (Entry[])entries.toArray(entriesArray);
-        Arrays.sort(entriesArray, new Comparator() {
-            public int compare(final Object xObj, final Object yObj) {
-                Date xDate = ((Entry)xObj).getUpdated();
-                Date yDate = ((Entry)yObj).getUpdated();
-                if (xDate == null)
-                    return -1;
-                if (newFirst)
-                    return yDate.compareTo(xDate);
-                else
-                    return xDate.compareTo(yDate);
-            }
-        });
-        return Arrays.asList(entriesArray);
-    }
-}
diff --git a/java/sca-contrib/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java b/java/sca-contrib/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
deleted file mode 100644
index 1c549f7cd2..0000000000
--- a/java/sca-contrib/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
+++ /dev/null
@@ -1,47 +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 launch;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class LaunchFeedServer {
-    public static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("FeedAggregator.composite");
-
-        try {
-            System.out.println("Sample Feed server started (press enter to shutdown)");
-            System.out.println();
-            System.out.println("To read the aggregated feeds, point your Web browser to the following addresses:");
-            System.out.println("http://localhost:8083/atomAggregator");
-            System.out.println("http://localhost:8083/atomAggregator/atomsvc (for the Atom service document)");
-            System.out.println("http://localhost:8083/rssAggregator");
-            System.out.println();
-            System.in.read();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-
-        scaDomain.close();
-        System.out.println("Sample Feed server stopped");
-    }
-}
diff --git a/java/sca-contrib/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/java/sca-contrib/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
deleted file mode 100644
index 8a3a53b4d5..0000000000
--- a/java/sca-contrib/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
+++ /dev/null
@@ -1,60 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://aggregator"
-    name="FeedAggregator">
-
-	<service name="rssSample" promote="RssAggregator">
-		<tuscany:binding.atom uri="http://localhost:8083/rssAggregator"/>
-	</service>
-	<service name="atomSample" promote="AtomAggregator">
-		<tuscany:binding.atom  uri="http://localhost:8083/atomAggregator"/>
-	</service>	
-
-    <component name="RssAggregator">
-        <implementation.java class="feed.AggregatorImpl"/>             
-		<reference name="rssFeed1">
-   	 		<tuscany:binding.rss uri="http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml"/>
-   		</reference>
-   		<reference name="rssFeed2"> 	
-   	 		<tuscany:binding.rss uri="http://www.engadget.com/rss.xml"/>
-   		</reference>
-   		<reference name="sort" target="Sort"/> 	 		
-        <property name="feedTitle">RSS Aggregator Sample</property> 
-    </component>
-    <component name="Sort">
-        <implementation.java class="feed.SortImpl"/>       
-        <property name="newFirst">true</property> 
-    </component>    
-    
-    <component name="AtomAggregator">
-        <implementation.java class="feed.AggregatorImpl"/>        
-        <reference name="sort" target="Sort"/>          

-		<reference name="atomFeed1">
-   	 		<tuscany:binding.atom uri="http://www.oreillynet.com/pub/feed/35"/>
-   		</reference>
-   		<reference name="atomFeed2"> 	
-   	 		<tuscany:binding.atom uri="http://feeds.feedburner.com/blogspot/Dcni?format=xml"/>
-   		</reference>
-        <property name="feedTitle">Atom Aggregator Sample</property>    		           
-    </component>      
-
-</composite>
diff --git a/java/sca-contrib/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java b/java/sca-contrib/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
deleted file mode 100644
index 9fdfe711be..0000000000
--- a/java/sca-contrib/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
+++ /dev/null
@@ -1,332 +0,0 @@
-package feed;

-

-import java.io.IOException;

-import java.io.Reader;

-import java.text.SimpleDateFormat;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.Date;

-import java.util.List;

-

-import junit.framework.Assert;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-import org.apache.abdera.Abdera;

-import org.apache.abdera.i18n.iri.IRI;

-import org.apache.abdera.factory.Factory;

-import org.apache.abdera.model.Base;

-import org.apache.abdera.model.Content;

-import org.apache.abdera.model.Entry;

-import org.apache.abdera.model.Feed;

-import org.apache.abdera.model.Document;

-import org.apache.abdera.model.Collection;

-import org.apache.abdera.protocol.Response.ResponseType;

-import org.apache.abdera.protocol.client.AbderaClient;

-import org.apache.abdera.protocol.client.ClientResponse;

-import org.apache.abdera.protocol.client.RequestOptions;

-import org.apache.abdera.util.EntityTag;

-import org.apache.abdera.writer.Writer;

-import org.apache.abdera.writer.WriterFactory;

-import org.apache.abdera.parser.Parser;

-

-/**

- * Tests use of server provided feed entity tags for Atom binding in Tuscany.

- * Tests conditional gets (e.g. get if-none-match) or conditional posts (post if-match)

- * using entity tags and last modified entries in headers. 

- * Uses the SCA provided Provider composite to act as a server.

- * Uses the Abdera provided Client to act as a client.

- */

-public class FeedAggregatorTest {

-	public final static String providerURI = "http://localhost:8083/atomAggregator";

-	protected static SCADomain scaProviderDomain;

-    protected static Abdera abdera;

-    protected static AbderaClient client;

-    protected static Parser abderaParser;    

-    protected static String eTag;

-    protected static Date lastModified;

-    protected static long contentLength;

-    protected static int numberEntries;

-    protected static final SimpleDateFormat dateFormat = new SimpleDateFormat( "EEE, dd MMM yyyy HH:mm:ss Z" ); // RFC 822 date time

-

-	@BeforeClass

-	public static void init() throws Exception {

-		try {

-		System.out.println(">>>FeedAggregatorTest.init");

-		scaProviderDomain = SCADomain.newInstance("FeedAggregator.composite");

-		abdera = new Abdera();

-		client = new AbderaClient(abdera);

-		abderaParser = Abdera.getNewParser();

-		} catch ( Throwable e ) {

-			System.out.println( e );

-			e.printStackTrace();

-		}

-	}

-

-	@AfterClass

-	public static void destroy() throws Exception {

-		System.out.println(">>>FeedAggregatorTest.destroy");

-		scaProviderDomain.close();

-	}

-

-	@Test

-	public void testPrelim() throws Exception {

-		Assert.assertNotNull(scaProviderDomain);

-		Assert.assertNotNull( client );

-	}

-			

-	@Test

-    public void testFeedBasics() throws Exception {		

-		System.out.println(">>>FeedAggregatorTest.testFeedBasics");

-		RequestOptions opts = new RequestOptions();

-		// Normal feed request

-		ClientResponse res = client.get(providerURI, opts);

-		Assert.assertNotNull(res);

-		try {

-			// Asser feed provided since no predicates

-			Assert.assertEquals(200, res.getStatus());

-			Assert.assertEquals(ResponseType.SUCCESS, res.getType());

-	    	// AtomTestCaseUtils.printResponseHeaders( "Feed response headers:", "   ", res );

-

-	    	// Perform other tests on feed.

-	    	contentLength = getContentLength( res );

-	    	System.out.println( "FeedAggregatorTest.testFeedBasics full contentLength=" + contentLength );	    	

-

-	    	Document<Feed> doc = res.getDocument();

-			Assert.assertNotNull( doc );

-			Feed feed = doc.getRoot();

-			Assert.assertNotNull( feed );

-			

-			// printFeed( "Feed values", "   ", feed );

-			// RFC 4287 requires non-null id, title, updated elements

-			Assert.assertNotNull( feed.getId() );

-			Assert.assertNotNull( feed.getTitle() );

-			Assert.assertNotNull( feed.getUpdated() );

-			

-			eTag = res.getHeader("ETag");

-			Assert.assertNotNull( eTag );

-			lastModified = res.getLastModified();

-			Assert.assertNotNull( lastModified );

-			

-			numberEntries = getEntryCount( feed );

-			System.out.println( "FeedAggregatorTest.testFeedBasics number entries=" + numberEntries );

-

-			// printFeed( "Aggregated Feed Contents:", "   ", feed );

-			// System.out.println( "FeedAggregatorTest.testFeedBasics feed=" + feed );

-            // printResponseHeaders( "Aggregated Feed response headers:", "   ", res );

-	    	// System.out.println("Aggregated Feed response body:");

-	    	// prettyPrint(abdera, res.getDocument());	    	

-	    	// printEntryUpdates( "Aggregated Feed feed updates", "   ", feed );

-		} finally {

-			res.release();

-		}

-	}		

-

-	@Test

-    public void testUnmodifiedGetIfModified() throws Exception {		

-		System.out.println(">>>FeedAggregatorTest.testFeedUnmodifiedGetIfModified");

-		// Feed request with predicates

-		RequestOptions opts = new RequestOptions();

-		final String contentType = "application/atom+xml"; 

-		opts.setContentType(contentType);

-		opts.setHeader( "If-Modified-Since", dateFormat.format( new Date( 0 ) ));

-		

-		ClientResponse res = client.get(providerURI, opts);

-		Assert.assertNotNull(res);

-		try {

-			// Should return 200 - Feed provided since feed is changed.

-			Assert.assertEquals(200, res.getStatus());

-			Assert.assertEquals(ResponseType.SUCCESS, res.getType());

-

-			String thisETag = res.getHeader("ETag");

-			Assert.assertNotNull( thisETag );

-			Date thisLastModified = res.getLastModified();

-			Assert.assertNotNull( thisLastModified );

-			

-			// Entry count and body size should be equal to basic request

-	    	long thisContentLength = getContentLength( res );

-    	

-	    	Document<Feed> doc = res.getDocument();

-			Assert.assertNotNull( doc );

-			Feed feed = doc.getRoot();

-			Assert.assertNotNull( feed );

-	    	int thisNumberEntries = getEntryCount( feed );

-			// System.out.println( "FeedAggregatorTest.UnmodifiedGetIfModified number entries=" + numberEntries + ", this number entries=" + thisNumberEntries ) ;

-		} finally {

-			res.release();

-		}

-	}		

-

-	@Test

-    public void testUnmodifiedGetIfUnModified() throws Exception {		

-		System.out.println(">>>FeedAggregatorTest.testFeedUnmodifiedGetIfUnModified");

-		// Feed request with predicates

-		RequestOptions opts = new RequestOptions();

-		final String contentType = "application/atom+xml"; 

-		opts.setContentType(contentType);

-		opts.setHeader( "If-Unmodified-Since", dateFormat.format( new Date( 0 ) ));

-		

-		ClientResponse res = client.get(providerURI, opts);

-		Assert.assertNotNull(res);

-		try {

-			// Should return 304 - Feed not provided since feed is modified since.

-			Assert.assertEquals(304, res.getStatus());

-

-			// Entry count and body size should be equal to basic request

-	    	long thisContentLength = getContentLength( res );

-			System.out.println( "FeedAggregatorTest.UnModifiedGetIfUnModified saved " + (contentLength - thisContentLength) + " bytes of network traffic due to caching.");

-		} finally {

-			res.release();

-		}

-	}		

-

-	/** Print feed vital fields. */

-	public static void printFeed( String title, String indent, Feed feed ) {

-		if ( feed == null ) {

-			System.out.println( title + " feed is null");

-			return;

-		}

-			

-		System.out.println( title );

-		System.out.println( indent + "id=" + feed.getId() );

-		System.out.println( indent + "title=" + feed.getTitle() );

-		System.out.println( indent + "updated=" + feed.getUpdated() );

-		System.out.println( indent + "author=" + feed.getAuthor() );

-		System.out.println( indent + "self link=" + feed.getSelfLink() );

-		Collection collection = feed.getCollection();

-		if ( collection == null ) {

-			System.out.println( indent + "collection=null" );

-		} else {

-			System.out.println( indent + "collection=" + collection );

-		}

-	}

-

-	/* Print headers of request. */

-    public static void printRequestHeaders( String title, String indent, RequestOptions request ) {

-     	System.out.println( title );

-     	if ( request == null ) {

-     		System.out.println( indent + " request is null");

-     		return;

-     	}

-     	String [] headerNames = request.getHeaderNames();

-     	for ( String headerName: headerNames) {

-     		String header = request.getHeader(headerName);

-    	       System.out.println( indent + " header name,value=" + headerName + "," + header );	

-     	}    	               	           

-     }

-    

-	/* Print headers of response. */

-     public static void printResponseHeaders( String title, String indent, ClientResponse response ) {

-      	System.out.println( title );

-     	if ( response == null ) {

-     		System.out.println( indent + " response is null");

-     		return;

-     	}

-     	String [] headerNames = response.getHeaderNames();

-     	for ( String headerName: headerNames) {

-     	    String header = response.getHeader(headerName);

-     	    System.out.println( indent + " header name,value=" + headerName + "," + header );

-     	}

-     	               	           

-     }

-

-    /** Pretty print the document body. */

-	public static void prettyPrint(Abdera abdera, Base doc) throws IOException {

-        WriterFactory factory = abdera.getWriterFactory();

-        Writer writer = factory.getWriter("prettyxml");

-        writer.writeTo(doc, System.out);

-        System.out.println();

- 	}

-

-	/** Print the updated elements of the feed entries. */

-	public static void printEntryUpdates( String title, String indent, Feed feed ) {

-		if ( feed == null ) {

-			System.out.println( title + " feed is null");

-			return;

-		}

-

-		System.out.println( title );

-		List<Entry> entries = feed.getEntries();

-		if ( entries == null ) {

-			System.out.println( indent + " null entries");			

-		}

-		System.out.println( indent + "entries size=" + entries.size());			

-		

-		int i = 0;

-		for ( Entry entry: entries ) {

-			String entryTitle = entry.getTitle();

-			if (( entryTitle != null ) && ( entryTitle.length() > 20 ))

-				entryTitle = entryTitle.substring( 0, 20 );

-	        // System.out.println( indent + i++ + ": title=\"" + entryTitle + 

-	        // 		"\", updated=" + entry.getUpdated() + ", published=" + entry.getPublished() );

-	        System.out.println( indent + i++ + ": title=\"" + entryTitle + 

-	        		"\", updated=" + entry.getUpdated() );

-		}

-	}

-	

-	/** Get the length of the response body content. */

-	public static long getContentLength( ClientResponse response ) {

-		// getContentLenght returns -1

-    	// contentLength = response.getContentLength();

-		try { 

-			Reader reader = response.getReader();

-			long actualSkip = reader.skip( Long.MAX_VALUE );

-			return actualSkip;		

-		} catch ( IOException e ) {

-		}

-		return -1L;

-	}

-

-	/** Get a count of entries in the feed. */

-	public static int getEntryCount( Feed feed ) {

-		if ( feed == null ) {

-			return 0;

-		}

-

-		List<Entry> entries = feed.getEntries();

-		if ( entries == null ) {

-			return 0;			

-		}

-		return entries.size();

-	}

-

-	/** Given a feed, determine the median point of the entries.

-	 * Use the updated field of the entries to determine median.

-	 * @param feed

-	 * @return

-	 */

-	public static Date getUpdatedMedian( Feed feed ) {

-		Date sentinal = null;

-		if ( feed == null ) {

-			return sentinal;

-		}

-

-		List<Entry> entries = feed.getEntries();

-		if ( entries == null ) {

-			return sentinal;			

-		}

-		int size = entries.size();

-		if( size == 0 ) {

-			return sentinal;

-		}

-		// System.out.println( "getUpdatedMedian entries size=" + entries.size());

-		ArrayList<Date> updates = new ArrayList<Date>( size );

-		

-		for ( Entry entry: entries ) {

-			Date entryUpdated = entry.getUpdated();

-			if ( entryUpdated == null ) {

-				entryUpdated = new Date( 0 );

-			}

-			updates.add( entryUpdated );

-		}

-		Collections.sort( updates );

-		// System.out.println( "getUpdatedMedian entry min update=" + updates.get( 0 ));

-		// System.out.println( "getUpdatedMedian entry max update=" + updates.get( size - 1 ));

-		Date median = updates.get( size/2 );

-		// System.out.println( "getUpdatedMedian entry max median=" + median );

-		return median;

-	}	

-}

diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/README b/java/sca-contrib/samples/helloworld-bpel-ws/README
deleted file mode 100644
index 5c669f5da5..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel-ws/README
+++ /dev/null
@@ -1,151 +0,0 @@
-Hello World BPEL Webservices Sample

-======================================

-This sample demonstrates an SCA service implemented by a BPEL process, made available as a Web service. 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run it to see what happens open a command prompt, navigate

-to this sample directory, and do 

-

-ant compile run

-

-OR if you don't have ant, on Windows do

-

-mkdir target\classes

-mkdir target\wsdl2java-source

-java -cp ..\..\lib\tuscany-sca-manifest.jar org.apache.tuscany.sdo.generate.XSD2JavaGenerator -targetDirectory target/wsdl2java-source -prefix HelloWorld -noContainment -noUnsettable src/main/resources/helloworld.wsdl

-java -cp ..\..\lib\tuscany-sca-manifest.jar org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator -targetDirectory target/wsdl2java-source src/main/resources/helloworld.wsdl

-unzip ..\..\lib\ode-dao-jpa-ojpa-derby-1.1.zip -d target\database

-javac -d target\classes -cp target\classes;..\..\lib\tuscany-sca-manifest.jar -sourcepath src\main\java;target\wsdl2java-source -target 1.5 -g -source 1.5 src\main\java\helloworld\BPELClient.java

-copy src\main\resources\* target\classes

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\classes;target\database helloworld.BPELClient

-

-and on *nix do

-

-mkdir target/classes

-mkdir target/wsdl2java-source

-java -cp ../../lib/tuscany-sca-manifest.jar org.apache.tuscany.sdo.generate.XSD2JavaGenerator -targetDirectory target/wsdl2java-source -prefix HelloWorld -noContainment -noUnsettable src/main/resources/helloworld.wsdl

-java -cp ../../lib/tuscany-sca-manifest.jar org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator -targetDirectory target/wsdl2java-source src/main/resources/helloworld.wsdl

-unzip ../../lib/ode-dao-jpa-ojpa-derby-1.1.zip -d target/database

-javac -d target/classes -cp target/classes;../../lib/tuscany-sca-manifest.jar -sourcepath src/main/java;target/wsdl2java-source -target 1.5 -g -source 1.5 src/main/java/helloworld/BPELClient.java

-cp src/main/resources/* target/classes

-java -cp ../../lib/tuscany-sca-manifest.jar:target/classes:target/database helloworld.BPELClient

-

-The sample will start an embedded BPEL engine, deploy a process and invoke it.

-

-Sample Overview

----------------

-The sample provides a single component that is wired to a service with a 

-web service binding.

-

-helloworld-bpel/

-  src/

-    main/

-      java/

-        helloworld/

-          BPELClient.java          	  - client application for  

-                                            BEPELHelloWorldComponent

-

-      resources/

-          deploy.xml			  - ODE deployment descriptor

-          helloworld.bpel		  - helloworld bpel process

-          helloworld.componentType	  - helloworld bpel service description

-          helloworld.composite            - the SCA assembly for this sample

-          helloworld.wsdl                 - the service description that describes

-                                            the bpel process

-          log4j.properties                - logging configuration

-          

-    test/

-      java/

-        helloworld/

-          BPELHelloWorldTestCase.java     - JUnit test case 

-  helloworld-bpel.png                     - a pictorial representation of the 

-                                            sample .composite file

-  build.xml                               - the Ant build file

-  pom.xml                                 - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd helloworld-bpel

-ant compile

-ant run

-

-     

-You should see the following output from the run target.     

-

-run:

-     [java] Starting BPELHelloWorldComponent

-     [java] >>> Deploying : D:\temp\SCA1.1-RC1\tuscany-sca-1.1-incubating\samples\helloworld-bpel\target\classes

-     [java] ::arg:::::: <?xml version="1.0" encoding="UTF-8"?>

-     [java] <hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/implementation/bpel/exampl

-e/helloworld.wsdl">Hello</message></hello>

-     [java] ::message:: <?xml version="1.0" encoding="UTF-8"?>

-     [java] <message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/impleme

-ntation/bpel/example/helloworld.wsdl">Hello</message></hello></TestPart></message>

-     [java] Status: RESPONSE

-     [java] Response: <?xml version="1.0" encoding="UTF-8"?>

-     [java] <message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">Hello World</hello></TestPart></message>

-     [java] Hello World

-     [java] Stopping BPELHelloWorldComponent

-     [java] Stopped !!!

-

-BUILD SUCCESSFUL

-Total time: 36 seconds     

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. When using Maven, a simple test is present that exercise

-the same logic as the client to invoke the BPEl process.

-

-cd helloworld-bpel

-mvn

-

-You should see the following output from the test phase.

-

--

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running helloworld.BPELHelloWorldTestCase

-Starting BPELHelloWorldComponent

->>> Deploying : D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\classes

-::arg:::::: <?xml version="1.0" encoding="UTF-8"?>

-<hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld

-.wsdl">Hello</message></hello>

-::message:: <?xml version="1.0" encoding="UTF-8"?>

-<message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/implementation/bpel

-/example/helloworld.wsdl">Hello</message></hello></TestPart></message>

-Status: RESPONSE

-Response: <?xml version="1.0" encoding="UTF-8"?>

-<message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">Hello World</hello></TestPart></message>

-Stopping BPELHelloWorldComponent

-Stopped !!!

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.656 sec

-

-Results :

-

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

-

-[INFO] [jar:jar]

-[INFO] Building jar: D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\sample-helloworld-bpel.jar

-[INFO] [install:install]

-[INFO] Installing D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\sample-helloworld-bpel.jar to C:\Documents and Settings\lresend

-e\.m2\repository\org\apache\tuscany\sca\sample-helloworld-bpel\1.1-incubating-SNAPSHOT\sample-helloworld-bpel-1.1-incubating-SNAPSHOT.jar

-[INFO] ------------------------------------------------------------------------

-[INFO] BUILD SUCCESSFUL

-[INFO] ------------------------------------------------------------------------

-[INFO] Total time: 53 seconds

-[INFO] Finished at: Sun Jan 13 09:54:39 PST 2008

-[INFO] Final Memory: 24M/43M

-[INFO] ------------------------------------------------------------------------

-

-

-This shows that the Junit test cases have run successfully. 

diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/build.xml b/java/sca-contrib/samples/helloworld-bpel-ws/build.xml
deleted file mode 100644
index c8917007f1..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel-ws/build.xml
+++ /dev/null
@@ -1,95 +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.    

--->

-<project name="sample-helloworld-bpel" default="compile">

-    <property name="test.class"   value="helloworld.BPELClient" />

-    <property name="test.jar"     value="sample-helloworld-bpel.jar" />

-    <property name="manifest.jar" value="../../lib/tuscany-sca-manifest.jar" />

-

-    <target name="init">

-        <mkdir dir="target/classes"/>

-        <mkdir dir="target/wsdl2java-source"/>

-    </target>

-

-    <target name="generate-wsdl" depends="init">

-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">

-            <arg value="-targetDirectory"/>

-            <arg value="target/wsdl2java-source"/>

-            <arg value="-prefix"/>

-            <arg value="HelloWorld"/>

-            <arg value="-noContainment"/>

-            <arg value="-noUnsettable"/>

-            <arg value="src/main/resources/helloworld.wsdl"/>

-

-            <classpath>

-                <pathelement location="${manifest.jar}"/>

-            </classpath>

-        </java>

-        

-        <java classname="org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator" fork="true">

-            <arg value="-targetDirectory"/>

-            <arg value="target/wsdl2java-source"/>

-            <arg value="src/main/resources/helloworld.wsdl"/>

-

-            <classpath>

-                <pathelement location="${manifest.jar}"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="unzip-ode-db" depends="init">

-        <unzip src="../../lib/ode-dao-jpa-ojpa-derby-1.1.zip" dest="target/database"/>

-    </target> 

-

-    <target name="compile" depends="init,generate-wsdl,unzip-ode-db">

-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

-            <src path="src/main/java"/>

-            <src path="target/wsdl2java-source"/>

-            <classpath>

-                <pathelement location="${manifest.jar}"/>

-            </classpath>

-        </javac>

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>

-    </target>

-

-    <target name="run">

-        <java classname="${test.class}" fork="true">

-            <!-- jvmarg value="-Xdebug"/ -->

-            <!-- jvmarg value="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"/ -->

-            <classpath>

-                <pathelement location="target/classes"/>

-                <pathelement location="target/database"/>

-                <pathelement location="${manifest.jar}"/>

-            </classpath>

-        </java>

-    </target>

-    

-    <target name="clean">

-        <delete includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-

-</project>

diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/helloworld-bpel.png b/java/sca-contrib/samples/helloworld-bpel-ws/helloworld-bpel.png
deleted file mode 100644
index 5f53a3c5d1..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel-ws/helloworld-bpel.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/helloworld-bpel.svg b/java/sca-contrib/samples/helloworld-bpel-ws/helloworld-bpel.svg
deleted file mode 100644
index 5a98f1a07c..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel-ws/helloworld-bpel.svg
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-panic\sca\samples\helloworld-bpel"
-   sodipodi:docname="helloworld-bpel.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\tuscany\java-panic\sca\samples\helloworld-bpel\helloworld-bpel.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="519.38407"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1141"
-     inkscape:window-height="676"
-     inkscape:window-x="360"
-     inkscape:window-y="147" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.991389,0,0,1,2.215655,0)">
-      <rect
-         rx="13.79423"
-         ry="12.692303"
-         y="192.00233"
-         x="258.3114"
-         height="299.99988"
-         width="446.72086"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">helloworldws</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.77353811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="137.03178"
-       height="139.37514"
-       x="433.16025"
-       y="308.26868"
-       rx="8.2887468"
-       ry="11.562291" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(183.89697,109.51481)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">HelloWorld</flowPara><flowPara
-         id="flowPara1883">Service</flowPara><flowPara
-         id="flowPara1885">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "
-       id="path3017" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 226.73064,320.75315 L 293.91185,320.75315 L 306.1266,352.82797 L 291.87606,382.43553 L 226.73064,382.43553 L 241.99911,352.82797 L 226.73064,320.75315 z "
-       id="path1892" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1894"
-       transform="translate(-37.47944,122.8324)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1896"><rect
-           id="rect1898"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1900">HelloWorld</flowPara><flowPara
-         id="flowPara1906">Web</flowPara><flowPara
-         id="flowPara1904">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 305.71429,353.3802 L 422.85714,351.95163"
-       id="path1910"
-       inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-service\helloworld-ws-service.png"
-       inkscape:export-xdpi="52.84"
-       inkscape:export-ydpi="52.84" />
-    <rect
-       style="opacity:1;fill:#e4a637;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.03563392;stroke-miterlimit:4;stroke-dasharray:6.21380369, 1.03563395;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2179"
-       width="107.35972"
-       height="30.216856"
-       x="454.17728"
-       y="404.70035"
-       rx="1.1482089"
-       ry="1.0659764" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3152"
-       transform="matrix(0.8110318,0,0,0.9349147,74.607827,34.581873)"><flowRegion
-         id="flowRegion3154"><rect
-           id="rect3156"
-           width="114.28571"
-           height="12.857142"
-           x="450.71429"
-           y="376.23734" /></flowRegion><flowPara
-         id="flowPara3158">implementation.bpel</flowPara></flowRoot>    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="466.42856"
-       y="423.38019"
-       id="text3160"><tspan
-         sodipodi:role="line"
-         id="tspan3162"
-         x="466.42856"
-         y="423.38019">helloworld.bpel</tspan></text>
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/pom.xml b/java/sca-contrib/samples/helloworld-bpel-ws/pom.xml
deleted file mode 100644
index 09cb2cbd53..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel-ws/pom.xml
+++ /dev/null
@@ -1,205 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-bpel-ws</artifactId>

-    <name>Apache Tuscany SCA HelloWorld BPEL as Webservice Sample</name>

-

-    <repositories>

-        <repository>

-            <id>apache.incubator</id>

-            <url>http://people.apache.org/repo/m2-incubating-repository</url>

-        </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-bpel-ode</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sdo</groupId>

-            <artifactId>tuscany-sdo-impl</artifactId>

-            <version>1.1-incubating</version>

-        </dependency>

-

-        <dependency>

-            <groupId>xerces</groupId>

-            <artifactId>xercesImpl</artifactId>

-            <version>2.8.1</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-        <!--  dependencies that must be present in order that the build scripts work -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-wsdl2java</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sdo</groupId>

-            <artifactId>tuscany-sdo-tools</artifactId>

-            <version>1.1-incubating</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.codehaus.woodstox</groupId>

-            <artifactId>wstx-asl</artifactId>

-            <version>3.2.1</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>com.sun.xml.bind</groupId>

-            <artifactId>jaxb-impl</artifactId>

-            <version>2.1.7</version>

-            <scope>compile</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>javax.xml.stream</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-surefire-plugin</artifactId>

-                <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->

-                <version>2.3.1</version>

-                <configuration>

-                    <useFile>false</useFile>

-                    <trimStackTrace>false</trimStackTrace>

-                    <useSystemClassLoader>true</useSystemClassLoader>

-                </configuration>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-dependency-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>unpack</id>

-                        <phase>test-compile</phase>

-                        <goals>

-                            <goal>unpack</goal>

-                        </goals>

-                        <configuration>

-                            <artifactItems>

-                                <artifactItem>

-                                    <groupId>org.apache.ode</groupId>

-                                    <artifactId>ode-dao-jpa-ojpa-derby</artifactId>

-                                    <version>1.1</version>

-                                    <type>zip</type>

-                                    <overWrite>true</overWrite>

-                                    <outputDirectory>${project.build.directory}/test-classes/</outputDirectory>

-                                </artifactItem>

-                            </artifactItems>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.tuscany.sdo</groupId>

-                <artifactId>tuscany-sdo-plugin</artifactId>

-                <version>1.1-incubating</version>

-                <executions>

-                    <execution>

-                        <id>generate-bpel-helloworld</id>

-                        <phase>generate-sources</phase>

-                        <configuration>

-                            <schemaFile>${basedir}/src/main/resources/helloworld.wsdl</schemaFile>

-                            <targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>

-                            <prefix>HelloWorld</prefix>

-                            <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>2.0-SNAPSHOT</version>

-                <executions>

-                    <execution>

-                        <configuration>

-                            <wsdlFile>${basedir}/src/main/resources/helloworld.wsdl</wsdlFile>

-                        </configuration>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java b/java/sca-contrib/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
deleted file mode 100644
index 971a5373e9..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
+++ /dev/null
@@ -1,43 +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 helloworld;

-

-import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * Simple BPEL sample application invoking a helloworld 

- * 

- * @version $Rev: 613905 $ $Date: 2008-01-21 14:41:15 +0000 (Mon, 21 Jan 2008) $

- */

-public class BPELClient {

-    public static void main(String[] args) throws Exception {

-

-        SCADomain scaDomain = SCADomain.newInstance("helloworld.composite");

-        HelloPortType bpelService = scaDomain.getService(HelloPortType.class, "BPELHelloWorldComponent");

-        

-        String result = bpelService.hello("Hello");

-        System.out.println(result);

-        

-        scaDomain.close();

-

-        System.exit(0);

-    }

-}

diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/deploy.xml b/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
deleted file mode 100644
index d9d4363832..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
+++ /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.

-  -->

-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"

-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 

-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"

-	xmlns:tus="http://tuscany.apache.org">

-

-

-	<process name="tns:HelloWorld">

-		<active>true</active>

-		<provide partnerLink="helloPartnerLink">

-			<service name="tus:helloPartnerLink" port="HelloPort"/>

-		</provide>

-	</process>

-</deploy>

diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel b/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
deleted file mode 100644
index a88aa7960c..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
+++ /dev/null
@@ -1,66 +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.

-  -->

-<process name="HelloWorld"

-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"

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

-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"

-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"

-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">

-

-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"

-     namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>

-

-   <partnerLinks>

-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />

-   </partnerLinks>

-    

-   <variables>

-     <variable name="myVar" messageType="test:HelloMessage"/>

-     <variable name="tmpVar" type="xsd:string"/>

-   </variables>

-

-   <sequence>

-       <receive

-          name="start"

-          partnerLink="helloPartnerLink"

-          portType="test:HelloPortType"

-          operation="hello"

-          variable="myVar"

-          createInstance="yes"/>

-

-      <assign name="assign1">

-          <copy>

-              <from variable="myVar" part="TestPart"/>

-              <to variable="tmpVar"/>

-          </copy>

-          <copy>

-              <from>concat($tmpVar,' World')</from>

-              <to variable="myVar" part="TestPart"/>

-          </copy>

-      </assign>

-       <reply name="end"  

-              partnerLink="helloPartnerLink"

-              portType="test:HelloPortType" 

-              operation="hello"

-              variable="myVar"/>

-   </sequence>

-</process>

diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType b/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
deleted file mode 100644
index 70273245d7..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 

-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"

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

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

-

-  <service name="helloPartnerLink">

-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />

-  </service>

-

-</componentType>              

-       
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite b/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
deleted file mode 100644
index 97262109e6..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,33 +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://bpel"

-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"

-    name="bpel">

-    

-    <component name="BPELHelloWorldComponent">

-        <implementation.bpel process="hns:HelloWorld"/>

-        <service name="helloPartnerLink">

-        	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />

-        	<binding.ws />

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl b/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
deleted file mode 100644
index 1cb338b283..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
+++ /dev/null
@@ -1,82 +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://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"

-    xmlns="http://schemas.xmlsoap.org/wsdl/"

-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

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

-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">

-    

-    <wsdl:types>

-        <schema elementFormDefault="qualified" 

-           targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" 

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

-

-            <element name="hello">

-                <complexType>

-                    <sequence>

-                        <element name="message" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>            

-        </schema>

-    </wsdl:types>

-    

-    <wsdl:message name="HelloMessage">

-        <wsdl:part element="tns:hello" name="TestPart"/>

-    </wsdl:message>

-    

-    <wsdl:portType name="HelloPortType">

-        <wsdl:operation name="hello">

-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>

-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>

-        </wsdl:operation>    

-    </wsdl:portType>

-    

-

-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">

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

-        <wsdl:operation name="hello">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="TestIn">

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

-            </wsdl:input>

-            <wsdl:output name="TestOut">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>    

-    

-    <wsdl:service name="HelloService">

-		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">

-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>

-		</wsdl:port>

-    </wsdl:service>

-    

-   <plnk:partnerLinkType name="HelloPartnerLinkType">

-       <plnk:role name="me" portType="tns:HelloPortType"/>

-       <plnk:role name="you" portType="tns:HelloPortType"/>

-   </plnk:partnerLinkType>

-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/log4j.properties b/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
deleted file mode 100644
index c1bc0a0b81..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,35 +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.

-#

-

-# Set root logger level to WARN and its only appender to CONSOLE

-log4j.rootLogger=OFF, CONSOLE

-

-# log4j properties to work with commandline tools.

-log4j.category.org.mortbay=OFF

-log4j.category.org.hibernate.type=OFF

-log4j.category.org.objectweb=OFF

-log4j.category.org.apache.ode.sql=OFF

-log4j.category.org.apache.ode.axis2=OFF

-log4j.category.org.apache.ode.bpel.engine=OFF

-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF

-log4j.category.org.apache.ode.bpel.epr=OFF

-log4j.category.org.apache.openjpa.kernel=OFF

-

-# Console appender

-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender

-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout

-log4j.appender.CONSOLE.layout.ConversionPattern=%p - %C{1}.%M(%L) | %m%n
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java b/java/sca-contrib/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
deleted file mode 100644
index 6ad63f87d9..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.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 helloworld;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * Tests the BPEL service

- * 

- * @version $Rev: 636807 $ $Date: 2008-03-13 17:32:45 +0000 (Thu, 13 Mar 2008) $

- */

-public class BPELHelloWorldTestCase extends TestCase {

-

-    private SCADomain scaDomain;

-    HelloPortType bpelService = null;

-    

-    /**

-     * @throws java.lang.Exception

-     */

-    @Override

-    protected void setUp() throws Exception {

-        scaDomain = SCADomain.newInstance("helloworld.composite");

-        bpelService = scaDomain.getService(HelloPortType.class, "BPELHelloWorldComponent");

-

-    }

-

-    /**

-     * @throws java.lang.Exception

-     */

-    @Override

-    protected void tearDown() throws Exception {

-        scaDomain.close();

-    }

-    

-    public void testInvoke() throws Exception {

-        String response = bpelService.hello("Hello");

-        assertEquals("Hello World", response);

-    }

-}

diff --git a/java/sca-contrib/samples/helloworld-bpel/README b/java/sca-contrib/samples/helloworld-bpel/README
deleted file mode 100644
index bf5f500ef3..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel/README
+++ /dev/null
@@ -1,151 +0,0 @@
-Hello World BPEL Sample
-======================================
-This sample demonstrates an SCA service implemented by a BPEL process. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory, and do 
-
-ant compile run
-
-OR if you don't have ant, on Windows do
-
-mkdir target\classes
-mkdir target\wsdl2java-source
-java -cp ..\..\lib\tuscany-sca-manifest.jar org.apache.tuscany.sdo.generate.XSD2JavaGenerator -targetDirectory target/wsdl2java-source -prefix HelloWorld -noContainment -noUnsettable src/main/resources/helloworld.wsdl
-java -cp ..\..\lib\tuscany-sca-manifest.jar org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator -targetDirectory target/wsdl2java-source src/main/resources/helloworld.wsdl
-unzip ..\..\lib\ode-dao-jpa-ojpa-derby-1.1.zip -d target\database
-javac -d target\classes -cp target\classes;..\..\lib\tuscany-sca-manifest.jar -sourcepath src\main\java;target\wsdl2java-source -target 1.5 -g -source 1.5 src\main\java\helloworld\BPELClient.java
-copy src\main\resources\* target\classes
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\classes;target\database helloworld.BPELClient
-
-and on *nix do
-
-mkdir target/classes
-mkdir target/wsdl2java-source
-java -cp ../../lib/tuscany-sca-manifest.jar org.apache.tuscany.sdo.generate.XSD2JavaGenerator -targetDirectory target/wsdl2java-source -prefix HelloWorld -noContainment -noUnsettable src/main/resources/helloworld.wsdl
-java -cp ../../lib/tuscany-sca-manifest.jar org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator -targetDirectory target/wsdl2java-source src/main/resources/helloworld.wsdl
-unzip ../../lib/ode-dao-jpa-ojpa-derby-1.1.zip -d target/database
-javac -d target/classes -cp target/classes;../../lib/tuscany-sca-manifest.jar -sourcepath src/main/java;target/wsdl2java-source -target 1.5 -g -source 1.5 src/main/java/helloworld/BPELClient.java
-cp src/main/resources/* target/classes
-java -cp ../../lib/tuscany-sca-manifest.jar:target/classes:target/database helloworld.BPELClient
-
-The sample will start an embedded BPEL engine, deploy a process and invoke it.
-
-Sample Overview
----------------
-The sample provides a single component that is wired to a service with a 
-web service binding.
-
-helloworld-bpel/
-  src/
-    main/
-      java/
-        helloworld/
-          BPELClient.java          	  - client application for  
-                                            BEPELHelloWorldComponent
-
-      resources/
-          deploy.xml			  - ODE deployment descriptor
-          helloworld.bpel		  - helloworld bpel process
-          helloworld.componentType	  - helloworld bpel service description
-          helloworld.composite            - the SCA assembly for this sample
-          helloworld.wsdl                 - the service description that describes
-                                            the bpel process
-          log4j.properties                - logging configuration
-          
-    test/
-      java/
-        helloworld/
-          BPELHelloWorldTestCase.java     - JUnit test case 
-  helloworld-bpel.png                     - a pictorial representation of the 
-                                            sample .composite file
-  build.xml                               - the Ant build file
-  pom.xml                                 - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd helloworld-bpel
-ant compile
-ant run
-
-     
-You should see the following output from the run target.     
-
-run:
-     [java] Starting BPELHelloWorldComponent
-     [java] >>> Deploying : D:\temp\SCA1.1-RC1\tuscany-sca-1.1-incubating\samples\helloworld-bpel\target\classes
-     [java] ::arg:::::: <?xml version="1.0" encoding="UTF-8"?>
-     [java] <hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/implementation/bpel/exampl
-e/helloworld.wsdl">Hello</message></hello>
-     [java] ::message:: <?xml version="1.0" encoding="UTF-8"?>
-     [java] <message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/impleme
-ntation/bpel/example/helloworld.wsdl">Hello</message></hello></TestPart></message>
-     [java] Status: RESPONSE
-     [java] Response: <?xml version="1.0" encoding="UTF-8"?>
-     [java] <message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">Hello World</hello></TestPart></message>
-     [java] Hello World
-     [java] Stopping BPELHelloWorldComponent
-     [java] Stopped !!!
-
-BUILD SUCCESSFUL
-Total time: 36 seconds     
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. When using Maven, a simple test is present that exercise
-the same logic as the client to invoke the BPEl process.
-
-cd helloworld-bpel
-mvn
-
-You should see the following output from the test phase.
-
--
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running helloworld.BPELHelloWorldTestCase
-Starting BPELHelloWorldComponent
->>> Deploying : D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\classes
-::arg:::::: <?xml version="1.0" encoding="UTF-8"?>
-<hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld
-.wsdl">Hello</message></hello>
-::message:: <?xml version="1.0" encoding="UTF-8"?>
-<message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"><message xmlns="http://tuscany.apache.org/implementation/bpel
-/example/helloworld.wsdl">Hello</message></hello></TestPart></message>
-Status: RESPONSE
-Response: <?xml version="1.0" encoding="UTF-8"?>
-<message><TestPart><hello xmlns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl">Hello World</hello></TestPart></message>
-Stopping BPELHelloWorldComponent
-Stopped !!!
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.656 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-[INFO] [jar:jar]
-[INFO] Building jar: D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\sample-helloworld-bpel.jar
-[INFO] [install:install]
-[INFO] Installing D:\dev\Opensource\Apache\Tuscany\source\java-sca-1.1\samples\helloworld-bpel\target\sample-helloworld-bpel.jar to C:\Documents and Settings\lresend
-e\.m2\repository\org\apache\tuscany\sca\sample-helloworld-bpel\1.1-incubating-SNAPSHOT\sample-helloworld-bpel-1.1-incubating-SNAPSHOT.jar
-[INFO] ------------------------------------------------------------------------
-[INFO] BUILD SUCCESSFUL
-[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 53 seconds
-[INFO] Finished at: Sun Jan 13 09:54:39 PST 2008
-[INFO] Final Memory: 24M/43M
-[INFO] ------------------------------------------------------------------------
-
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/helloworld-bpel/build.xml b/java/sca-contrib/samples/helloworld-bpel/build.xml
deleted file mode 100644
index 890a6427b8..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel/build.xml
+++ /dev/null
@@ -1,95 +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.    
--->
-<project name="sample-helloworld-bpel" default="compile">
-    <property name="test.class"   value="helloworld.BPELClient" />
-    <property name="test.jar"     value="sample-helloworld-bpel.jar" />
-    <property name="manifest.jar" value="../../lib/tuscany-sca-manifest.jar" />
-
-    <target name="init">
-        <mkdir dir="target/classes"/>
-        <mkdir dir="target/wsdl2java-source"/>
-    </target>
-
-    <target name="generate-wsdl" depends="init">
-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">
-            <arg value="-targetDirectory"/>
-            <arg value="target/wsdl2java-source"/>
-            <arg value="-prefix"/>
-            <arg value="HelloWorld"/>
-            <arg value="-noContainment"/>
-            <arg value="-noUnsettable"/>
-            <arg value="src/main/resources/helloworld.wsdl"/>
-
-            <classpath>
-                <pathelement location="${manifest.jar}"/>
-            </classpath>
-        </java>
-        
-        <java classname="org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator" fork="true">
-            <arg value="-targetDirectory"/>
-            <arg value="target/wsdl2java-source"/>
-            <arg value="src/main/resources/helloworld.wsdl"/>
-
-            <classpath>
-                <pathelement location="${manifest.jar}"/>
-            </classpath>
-        </java>
-    </target>
-
-    <target name="unzip-ode-db" depends="init">
-        <unzip src="../../lib/ode-dao-jpa-ojpa-derby-1.1.zip" dest="target/database"/>
-    </target> 
-
-    <target name="compile" depends="init,generate-wsdl,unzip-ode-db">
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <src path="target/wsdl2java-source"/>
-            <classpath>
-                <pathelement location="${manifest.jar}"/>
-            </classpath>
-        </javac>
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="run">
-        <java classname="${test.class}" fork="true">
-            <!-- jvmarg value="-Xdebug"/ -->
-            <!-- jvmarg value="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"/ -->
-            <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="target/database"/>
-                <pathelement location="${manifest.jar}"/>
-            </classpath>
-        </java>
-    </target>
-    
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
-</project>
diff --git a/java/sca-contrib/samples/helloworld-bpel/helloworld-bpel.png b/java/sca-contrib/samples/helloworld-bpel/helloworld-bpel.png
deleted file mode 100644
index 5f53a3c5d1..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel/helloworld-bpel.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-bpel/helloworld-bpel.svg b/java/sca-contrib/samples/helloworld-bpel/helloworld-bpel.svg
deleted file mode 100644
index 5a98f1a07c..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel/helloworld-bpel.svg
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-panic\sca\samples\helloworld-bpel"
-   sodipodi:docname="helloworld-bpel.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\tuscany\java-panic\sca\samples\helloworld-bpel\helloworld-bpel.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="519.38407"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1141"
-     inkscape:window-height="676"
-     inkscape:window-x="360"
-     inkscape:window-y="147" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.991389,0,0,1,2.215655,0)">
-      <rect
-         rx="13.79423"
-         ry="12.692303"
-         y="192.00233"
-         x="258.3114"
-         height="299.99988"
-         width="446.72086"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">helloworldws</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.77353811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="137.03178"
-       height="139.37514"
-       x="433.16025"
-       y="308.26868"
-       rx="8.2887468"
-       ry="11.562291" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(183.89697,109.51481)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">HelloWorld</flowPara><flowPara
-         id="flowPara1883">Service</flowPara><flowPara
-         id="flowPara1885">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "
-       id="path3017" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 226.73064,320.75315 L 293.91185,320.75315 L 306.1266,352.82797 L 291.87606,382.43553 L 226.73064,382.43553 L 241.99911,352.82797 L 226.73064,320.75315 z "
-       id="path1892" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1894"
-       transform="translate(-37.47944,122.8324)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1896"><rect
-           id="rect1898"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1900">HelloWorld</flowPara><flowPara
-         id="flowPara1906">Web</flowPara><flowPara
-         id="flowPara1904">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 305.71429,353.3802 L 422.85714,351.95163"
-       id="path1910"
-       inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-service\helloworld-ws-service.png"
-       inkscape:export-xdpi="52.84"
-       inkscape:export-ydpi="52.84" />
-    <rect
-       style="opacity:1;fill:#e4a637;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.03563392;stroke-miterlimit:4;stroke-dasharray:6.21380369, 1.03563395;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2179"
-       width="107.35972"
-       height="30.216856"
-       x="454.17728"
-       y="404.70035"
-       rx="1.1482089"
-       ry="1.0659764" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3152"
-       transform="matrix(0.8110318,0,0,0.9349147,74.607827,34.581873)"><flowRegion
-         id="flowRegion3154"><rect
-           id="rect3156"
-           width="114.28571"
-           height="12.857142"
-           x="450.71429"
-           y="376.23734" /></flowRegion><flowPara
-         id="flowPara3158">implementation.bpel</flowPara></flowRoot>    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="466.42856"
-       y="423.38019"
-       id="text3160"><tspan
-         sodipodi:role="line"
-         id="tspan3162"
-         x="466.42856"
-         y="423.38019">helloworld.bpel</tspan></text>
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/helloworld-bpel/pom.xml b/java/sca-contrib/samples/helloworld-bpel/pom.xml
deleted file mode 100644
index d93676d77d..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel/pom.xml
+++ /dev/null
@@ -1,198 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-helloworld-bpel</artifactId>
-    <name>Apache Tuscany SCA HelloWorld BPEL Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-		<dependency>
-		    <groupId>xerces</groupId>
-		    <artifactId>xercesImpl</artifactId>
-		    <version>2.8.1</version>
-		</dependency>	
-		        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        <!--  dependencies that must be present in order that the build scripts work -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-wsdl2java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency> 
-                
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-tools</artifactId>
-            <version>1.1.1</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.stream</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-                
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.1.7</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-    </dependencies>
-    
-    <build>
-        <finalName>${artifactId}</finalName>
-		<plugins>
-			<plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-surefire-plugin</artifactId>
-			    <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
-			    <version>2.3.1</version>
-			    <configuration>
-			        <useFile>false</useFile>
-			        <trimStackTrace>false</trimStackTrace>
-			        <useSystemClassLoader>true</useSystemClassLoader>
-			    </configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack</id>
-						<phase>test-compile</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.apache.ode</groupId>
-									<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-									<version>1.1</version>
-									<type>zip</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tuscany.sdo</groupId>
-				<artifactId>tuscany-sdo-plugin</artifactId>
-				<version>1.1.1</version>
-				<executions>
-					<execution>
-						<id>generate-bpel-helloworld</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<schemaFile>${basedir}/src/main/resources/helloworld.wsdl</schemaFile>
-							<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>
-							<prefix>HelloWorld</prefix>
-							<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>2.0-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<configuration>
-							<wsdlFile>${basedir}/src/main/resources/helloworld.wsdl</wsdlFile>
-						</configuration>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/java/sca-contrib/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
deleted file mode 100644
index 1826c885c4..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
+++ /dev/null
@@ -1,43 +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 helloworld;
-
-import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Simple BPEL sample application invoking a helloworld 
- * 
- * @version $Rev$ $Date$
- */
-public class BPELClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("helloworld.composite");
-        HelloPortType bpelService = scaDomain.getService(HelloPortType.class, "BPELHelloWorldComponent");
-        
-        String result = bpelService.hello("Hello");
-        System.out.println(result);
-        
-        scaDomain.close();
-
-        System.exit(0);
-    }
-}
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/deploy.xml b/java/sca-contrib/samples/helloworld-bpel/src/main/resources/deploy.xml
deleted file mode 100644
index 9bd95b2c58..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/deploy.xml
+++ /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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-	xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" 
-	xmlns:wns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-	xmlns:tus="http://tuscany.apache.org">
-
-
-	<process name="tns:HelloWorld">
-		<active>true</active>
-		<provide partnerLink="helloPartnerLink">
-			<service name="tus:helloPartnerLink" port="HelloPort"/>
-		</provide>
-	</process>
-</deploy>
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.bpel
deleted file mode 100644
index a88aa7960c..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ /dev/null
@@ -1,66 +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.

-  -->

-<process name="HelloWorld"

-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"

-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"

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

-    xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"

-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"

-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">

-

-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"

-     namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>

-

-   <partnerLinks>

-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />

-   </partnerLinks>

-    

-   <variables>

-     <variable name="myVar" messageType="test:HelloMessage"/>

-     <variable name="tmpVar" type="xsd:string"/>

-   </variables>

-

-   <sequence>

-       <receive

-          name="start"

-          partnerLink="helloPartnerLink"

-          portType="test:HelloPortType"

-          operation="hello"

-          variable="myVar"

-          createInstance="yes"/>

-

-      <assign name="assign1">

-          <copy>

-              <from variable="myVar" part="TestPart"/>

-              <to variable="tmpVar"/>

-          </copy>

-          <copy>

-              <from>concat($tmpVar,' World')</from>

-              <to variable="myVar" part="TestPart"/>

-          </copy>

-      </assign>

-       <reply name="end"  

-              partnerLink="helloPartnerLink"

-              portType="test:HelloPortType" 

-              operation="hello"

-              variable="myVar"/>

-   </sequence>

-</process>

diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.componentType b/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="helloPartnerLink">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" />
-  </service>
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.composite b/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,29 +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://bpel"
-    xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    name="bpel">
-    
-    <component name="BPELHelloWorldComponent">
-        <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ /dev/null
@@ -1,82 +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://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-    
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-           targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" 
-           xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="hello">
-                <complexType>
-                    <sequence>
-                        <element name="message" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>            
-        </schema>
-    </wsdl:types>
-    
-    <wsdl:message name="HelloMessage">
-        <wsdl:part element="tns:hello" name="TestPart"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="HelloPortType">
-        <wsdl:operation name="hello">
-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>
-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>
-        </wsdl:operation>    
-    </wsdl:portType>
-    
-
-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="hello">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="TestIn">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="TestOut">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>    
-    
-    <wsdl:service name="HelloService">
-		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>
-		</wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="HelloPartnerLinkType">
-       <plnk:role name="me" portType="tns:HelloPortType"/>
-       <plnk:role name="you" portType="tns:HelloPortType"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/log4j.properties b/java/sca-contrib/samples/helloworld-bpel/src/main/resources/log4j.properties
deleted file mode 100644
index 8649a71550..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,35 +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.
-#
-
-# Set root logger level to WARN and its only appender to CONSOLE
-log4j.rootLogger=OFF, CONSOLE
-
-# log4j properties to work with commandline tools.
-log4j.category.org.mortbay=OFF
-log4j.category.org.hibernate.type=OFF
-log4j.category.org.objectweb=OFF
-log4j.category.org.apache.ode.sql=OFF
-log4j.category.org.apache.ode.axis2=OFF
-log4j.category.org.apache.ode.bpel.engine=OFF
-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF
-log4j.category.org.apache.ode.bpel.epr=OFF
-log4j.category.org.apache.openjpa.kernel=OFF
-
-# Console appender
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%p - %C{1}.%M(%L) | %m%n
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java b/java/sca-contrib/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
deleted file mode 100644
index 1caaa78878..0000000000
--- a/java/sca-contrib/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.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 helloworld;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL service
- * 
- * @version $Rev$ $Date$
- */
-public class BPELHelloWorldTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    HelloPortType bpelService = null;
-    
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("helloworld.composite");
-        bpelService = scaDomain.getService(HelloPortType.class, "BPELHelloWorldComponent");
-
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-    
-    public void testInvoke() throws Exception {
-        String response = bpelService.hello("Hello");
-        assertEquals("Hello World", response);
-    }
-}
diff --git a/java/sca-contrib/samples/helloworld-distributed/README b/java/sca-contrib/samples/helloworld-distributed/README
deleted file mode 100644
index 9462ae4218..0000000000
--- a/java/sca-contrib/samples/helloworld-distributed/README
+++ /dev/null
@@ -1,29 +0,0 @@
-Distributed Helloworld Sample

-=============================

-

-This sample demonstrates a distributed SCA domain using the JMS implementation of binding.sca which

-automatically discovers available nodes and the services they contain.

-

-In this sample there are two nodes in the domain, a standalone node containing a Helloworld component,

-and a webapp using a JSP with <implementation.web> which invokes the Helloworld service in the domain.

-

-To run the sample:

-

-- Build the two sample modules with mvn or Ant.

-- Deploy the helloworld-webapp war to Tomcat. 

-- Start the standalone node by:

-  in the helloworld-node folder do "mvn dependency:copy-dependencies" then:

-  java -Djava.ext.dirs=target\dependency -jar target\dependency\tuscany-node-dynamic-1.4-SNAPSHOT.jar target\sample-helloworld-node.jar

-

-- On a web browser go to:

-  http://localhost:8080/sample-helloworld-webapp

-

-You should see "Hello world" returned on the web page and the node console should show "HelloworldImpl.sayHello: world"

-

-How it works:

-

-

-

-

- 

-

diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/README b/java/sca-contrib/samples/helloworld-distributed/helloworld-node/README
deleted file mode 100644
index 9462ae4218..0000000000
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/README
+++ /dev/null
@@ -1,29 +0,0 @@
-Distributed Helloworld Sample

-=============================

-

-This sample demonstrates a distributed SCA domain using the JMS implementation of binding.sca which

-automatically discovers available nodes and the services they contain.

-

-In this sample there are two nodes in the domain, a standalone node containing a Helloworld component,

-and a webapp using a JSP with <implementation.web> which invokes the Helloworld service in the domain.

-

-To run the sample:

-

-- Build the two sample modules with mvn or Ant.

-- Deploy the helloworld-webapp war to Tomcat. 

-- Start the standalone node by:

-  in the helloworld-node folder do "mvn dependency:copy-dependencies" then:

-  java -Djava.ext.dirs=target\dependency -jar target\dependency\tuscany-node-dynamic-1.4-SNAPSHOT.jar target\sample-helloworld-node.jar

-

-- On a web browser go to:

-  http://localhost:8080/sample-helloworld-webapp

-

-You should see "Hello world" returned on the web page and the node console should show "HelloworldImpl.sayHello: world"

-

-How it works:

-

-

-

-

- 

-

diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/pom.xml b/java/sca-contrib/samples/helloworld-distributed/helloworld-node/pom.xml
deleted file mode 100644
index 1cdedf7d15..0000000000
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/pom.xml
+++ /dev/null
@@ -1,57 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-node</artifactId>

-    <name>Apache Tuscany SCA Helloworld Node Sample</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-dynamic</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java b/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java
deleted file mode 100644
index e2b7c698ac..0000000000
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java
+++ /dev/null
@@ -1,29 +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 sample;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Helloworld {

-    

-    String sayHello(String name);

-

-}

diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java b/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java
deleted file mode 100644
index 033b4088c8..0000000000
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java
+++ /dev/null
@@ -1,29 +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 sample;

-

-public class HelloworldImpl implements Helloworld {

-

-    public String sayHello(String name) {

-        System.out.println("HelloworldImpl.sayHello: " + name);

-        return "Hello " + name;

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite b/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite
deleted file mode 100644
index 0f827390c8..0000000000
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite
+++ /dev/null
@@ -1,28 +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://sample"

-           name="Helloworld">

-

-    <component name="HelloworldComponent">

-		<implementation.java class="sample.HelloworldImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/README b/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/README
deleted file mode 100644
index 9462ae4218..0000000000
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/README
+++ /dev/null
@@ -1,29 +0,0 @@
-Distributed Helloworld Sample

-=============================

-

-This sample demonstrates a distributed SCA domain using the JMS implementation of binding.sca which

-automatically discovers available nodes and the services they contain.

-

-In this sample there are two nodes in the domain, a standalone node containing a Helloworld component,

-and a webapp using a JSP with <implementation.web> which invokes the Helloworld service in the domain.

-

-To run the sample:

-

-- Build the two sample modules with mvn or Ant.

-- Deploy the helloworld-webapp war to Tomcat. 

-- Start the standalone node by:

-  in the helloworld-node folder do "mvn dependency:copy-dependencies" then:

-  java -Djava.ext.dirs=target\dependency -jar target\dependency\tuscany-node-dynamic-1.4-SNAPSHOT.jar target\sample-helloworld-node.jar

-

-- On a web browser go to:

-  http://localhost:8080/sample-helloworld-webapp

-

-You should see "Hello world" returned on the web page and the node console should show "HelloworldImpl.sayHello: world"

-

-How it works:

-

-

-

-

- 

-

diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/build.xml b/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/build.xml
deleted file mode 100644
index ef49524e39..0000000000
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/build.xml
+++ /dev/null
@@ -1,127 +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.

--->

-

-<project name="sample-helloworld-webapp" default="compile">

-

-    <target name="compile">

-        <mkdir dir="target/classes"/>

-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

-            <src path="src\main\java"/>

-            <classpath>

-                <fileset refid="tuscany.jars"/>

-                <fileset refid="3rdparty.jars"/>

-            </classpath>

-        </javac>

-        <copy todir="target/classes">

-            <fileset dir="src\main\resources"/>

-        </copy>

-        <war destfile="target/sample-helloworld-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">

-            <fileset dir="src/main/webapp"/>

-            <lib refid="tuscany.jars"/>

-            <lib refid="3rdparty.jars"/>

-            <classes dir="target/classes"/>

-        </war>

-    </target>

-

-    <target name="package" depends="compile"/>

-

-    <target name="clean">

-        <delete includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-

-    <fileset id="tuscany.jars" dir="../../modules">

-        <include name="tuscany-assembly-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-assembly-xsd-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-binding-jms-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-binding-jms-runtime-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-binding-sca-jms-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-contribution-java-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-contribution-xml-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-core-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-core-databinding-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-core-spi-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-definitions-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-definitions-xml-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-endpoint-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-extensibility-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-host-http-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-host-webapp-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-implementation-java-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-implementation-node-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-implementation-web-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-implementation-web-runtime-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-interface-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-interface-java-jaxws-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-monitor-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-node-api-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-node-impl-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-policy-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>

-        <include name="tuscany-xsd-1.4-SNAPSHOT.jar"/>

-    </fileset>

-    <fileset id="3rdparty.jars" dir="../../lib">

-        <include name="XmlSchema-1.3.2.jar"/>

-        <include name="activation-1.1.jar"/>

-        <include name="activeio-core-3.1.0-tests.jar"/>

-        <include name="activeio-core-3.1.0.jar"/>

-        <include name="activemq-core-5.1.0.jar"/>

-        <include name="asm-all-3.1.jar"/>

-        <include name="avalon-framework-4.1.3.jar"/>

-        <include name="axiom-api-1.2.5.jar"/>

-        <include name="axiom-impl-1.2.5.jar"/>

-        <include name="backport-util-concurrent-2.1.jar"/>

-        <include name="camel-core-1.3.0.jar"/>

-        <include name="cglib-nodep-2.1_3.jar"/>

-        <include name="commons-logging-1.1.jar"/>

-        <include name="commons-logging-api-1.1.jar"/>

-        <include name="geronimo-commonj_1.1_spec-1.0.jar"/>

-        <include name="geronimo-j2ee-management_1.0_spec-1.0.jar"/>

-        <include name="geronimo-jms_1.1_spec-1.1.1.jar"/>

-        <include name="jaxb-api-2.1.jar"/>

-        <include name="jaxb-impl-2.1.7.jar"/>

-        <include name="jaxen-1.1-beta-9.jar"/>

-        <include name="jaxws-api-2.1.jar"/>

-        <include name="jsr181-api-1.0-MR1.jar"/>

-        <include name="jsr250-api-1.0.jar"/>

-        <include name="log4j-1.2.12.jar"/>

-        <include name="logkit-1.0.1.jar"/>

-        <include name="mail-1.4.jar"/>

-        <include name="servlet-api-2.3.jar"/>

-        <include name="stax-api-1.0-2.jar"/>

-        <include name="wstx-asl-3.2.1.jar"/>

-    </fileset>

-

-</project>

diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/pom.xml b/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/pom.xml
deleted file mode 100644
index b298c4eb62..0000000000
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/pom.xml
+++ /dev/null
@@ -1,78 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-webapp</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Distributed Helloworld WebApp Sample</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca-jms</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-       <plugins>

-            <plugin>

-                <groupId>org.apache.tuscany.sca</groupId>

-                <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>2.0-SNAPSHOT</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-       </plugins>

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java b/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java
deleted file mode 100644
index 04918244f0..0000000000
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java
+++ /dev/null
@@ -1,27 +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 sample;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Helloworld {

-

-    String sayHello(String name);

-}

diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite b/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 0e8de1be42..0000000000
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,29 +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://sample"

-           name="Helloworld">

-

-    <component name="foo">

-		<implementation.web web-uri=""/>

-        <reference name="service" target="HelloworldComponent" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 1eefec1c48..0000000000
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<!--

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

--->

-

-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web

-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">

-<web-app>

-

-  <display-name>Apache Tuscany Distributed Helloworld Sample</display-name>

-

-  <filter>
-    <filter-name>tuscany</filter-name> 
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
-  </filter>
-
-  <filter-mapping>
-    <filter-name>tuscany</filter-name> 
-    <url-pattern>/*</url-pattern> 
-  </filter-mapping>
-
-  <welcome-file-list id="WelcomeFileList">

-    <welcome-file>hello.jsp</welcome-file>

-  </welcome-file-list>

-

-</web-app>

diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp b/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp
deleted file mode 100644
index 873329cf7c..0000000000
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp
+++ /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.    

--->

-<%@ page contentType="text/html;charset=UTF-8" language="java" %>

-<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %>

-

-<sca:reference name="service" type="sample.Helloworld" />

-

-<html>

-  <body >

-

-    <h2>Apache Tuscany Distributed Helloworld Sample</h2>

-

-    Calling service.sayHello("world") returns:

-

-    <p>

-

-    <%= service.sayHello("world") %>

-

-  </body>

-</html>

diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/README b/java/sca-contrib/samples/helloworld-dojo-webapp/README
deleted file mode 100644
index 38392a13b6..0000000000
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/README
+++ /dev/null
@@ -1,104 +0,0 @@
-Hello World Dojo RPC Sample
-===========================
-
-Note. This sample is currently not working correctly on WebSphere - see TUSCANY-1990
-
-This sample demostrates the SCA JSONRPC binding using a simple web app that
-uses the RPC support of the Dojo Toolkit to an SCA service.  
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want 
-to give this sample a go deploy the WAR file (target/sample-helloworld-dojo-webapp.war)
-to you web application server. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-dojo-webapp
-
-The port and hostname will of course vary depending on your local installation. 
-
-See also the similar helloworld-jsonrpc-webapp sample which also uses the SCA JSONRPC binding
-but uses SCA scaDomain.js script on the client instead of the Dojo Toolkit. 
-
-Sample Overview
----------------
-The sample provides a single service with an operation that reflects
-a greeting back to the caller. The service is exposed using the JSONRPC
-binding. The web app provided shows how the Dojo Toolkit JSON-RPC support can be 
-used to invoke the SCA service. 
-
-The web app provided shows how the service can be called by using the DOJO toolkit. 
-
-helloworld-dojo-webapp/
-  build-dojo.xml                      - This file is an Ant script used by the 
-                                        sample build process to download the Dojo Toolkit 
-                                        and get it included in the WAR file 
-                                        for use by the sample.
-  src/
-    main/
-      java/
-        helloworldjsonrpc/
-          HelloWorldService.java      - service interface
-          HelloWorldServiceImpl.java  - service implementation
-      resources/
-        jsonrpc.composite             - the SCA assembly for this sample
-      webapp
-        dojo/                         - the Dojo toolkit (this directory is created only 
-                                        when you build the samples from the source distribution)
-        META-INF/
-          sca-contribution.xml        - specifies the composite to be deployed
-        WEB-INF/
-          web.xml                     - defines the listener that starts up the 
-                                        Tuscany SCA runtime
-        HelloWorldJSONRPC.html        - the web application that calls the 
-                                        SCA service via JSONRPC
-        style.css                     - style sheet     
-           
-  helloworld-jsonrpc-webapp.png              - a pictorial representation of the 
-                                        sample .composite file
-  build.xml                           - the Ant build file that unpacks the
-                                        dojo installation
-  pom.xml                             - the Maven build file  
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as 
-follows
-
-cd helloworld-dojo-webapp
-ant package
-
-This should result in a war file (sample-helloworld-dojo-webapp.war) in the target 
-directory. Copy this war file to your web app deployment directory in your
-web app container. 
-
-The process for getting the web app running will depend on which web app container
-you are using. For example, if you are using Tomcat then it is simply a matter
-of copying the WAR file to the webapps directory. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-dojo-webapp
-
-The port and hostname will of course vary depending on your local installation. 
-
-You should see a web page that allows you to send messages, via JSONRPC, to the 
-application running in the Tuscany SCA Runtime
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd helloworld-dojo-webapp 
-mvn
-
-Again this should result in a war file (sample-helloworld-dojo-webapp.war) in the target 
-directory. Follow the steps described in the previous section for running the web 
-app and for the expected results.
-
-
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/build-dojo.xml b/java/sca-contrib/samples/helloworld-dojo-webapp/build-dojo.xml
deleted file mode 100644
index 534a1dacd9..0000000000
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/build-dojo.xml
+++ /dev/null
@@ -1,92 +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 name="DojoZipInstaller">
-	
-
-    <property name="dojo.version" value="1.0.0"/>
-    <property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/>
-	
-
-    <target name="check-dojo-installed">
-        <condition property="already.installed" >
-            <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-        </condition>
-        <condition property="maven.suffix" value="">
-            <os family="unix"/>
-        </condition>
-        <condition property="maven.suffix" value=".bat">
-            <os family="windows"/>
-        </condition>
-    </target>
-	
-
-    <target name="check-dojo-unpacked">
-        <condition property="already.unpacked" >
-            <available file="${unpack.location}"/>
-        </condition>
-    </target>
-
-    <target name="install-dojo" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
-            <arg line="install:install-file -DgroupId=dojo  -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"/>
-        </exec>
-    </target>
-
-    <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" 
-              tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-    </target>
-	
-
-    <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">
-        <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
-        <mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
-        <unzip src="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"
-               dest="${basedir}/target/dojo-unpack-temp/"
-               overwrite="false">
-            <patternset>
-                <include name="dojo-release-${dojo.version}/dojo/**"/>
-                <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/>
-                <include name="dojo-release-${dojo.version}/dijit/**"/>
-                <exclude name="dojo-release-${dojo.version}/dojox/**"/>
-                <exclude name="dojo-release-${dojo.version}/util/**"/>
-            </patternset>
-        </unzip>
-        <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}"
-              tofile="${unpack.location}"
-              verbose="true"/>
-        <delete dir="${basedir}/target/dojo-unpack-temp/"/>
-    </target>
-	
-
-    <target name="clean-dojo-files">
-        <delete dir="${unpack.location}"/>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/build.xml b/java/sca-contrib/samples/helloworld-dojo-webapp/build.xml
deleted file mode 100644
index 95813af65a..0000000000
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/build.xml
+++ /dev/null
@@ -1,70 +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.    
--->
-<!DOCTYPE project [
-<!ENTITY buildDependency SYSTEM "build-dependency.xml">
-]>
-
-<project name="sample-helloworld-dojo-webapp" default="compile">
-	
-	&buildDependency;
-	
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src\main\java"/>
-            <classpath>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
-            </classpath>
-        </javac>
-        <copy todir="target/classes">
-            <fileset dir="src\main\resources"/>
-            <fileset dir="src\main\resources"/>
-        </copy>
-    	
-        <ant antfile="./build-dojo.xml" target="install-dojo-nomaven">
-          <property name="localRepository" value="./target/repo"/>
-        </ant>
-        
-        <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-          <property name="localRepository" value="./target/repo"/>
-        </ant>  
-    	
-        <war destfile="target/sample-helloworld-dojo-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">
-            <fileset dir="src/main/webapp"/>
-            <lib refid="tuscany.jars"/>
-            <lib refid="3rdparty.jars"/>
-            <classes dir="target/classes"/>
-        </war>
-    	
-        <ant antfile="./build-dojo.xml" target="clean-dojo-files">
-          <property name="localRepository" value="./target/repo"/>
-        </ant>     	
-    </target>
-	
-    <target name="package" depends="compile"/>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
-
-</project>
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png b/java/sca-contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
deleted file mode 100644
index 57f90aed01..0000000000
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg b/java/sca-contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
deleted file mode 100644
index d5c3bc5d3e..0000000000
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

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

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.44"

-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp"

-   sodipodi:docname="helloworld-jsonrpc-webapp.svg"

-   version="1.0"

-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp\helloworld-jsonrpc.png"

-   inkscape:export-xdpi="52.84"

-   inkscape:export-ydpi="52.84">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="1.4"

-     inkscape:cx="516.28571"

-     inkscape:cy="414.63224"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="721"

-     inkscape:window-x="158"

-     inkscape:window-y="164" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997"

-       transform="translate(144.2857,52.85714)">

-      <rect

-         rx="8.0946665"

-         ry="12.692303"

-         y="192.00233"

-         x="258.31134"

-         height="299.99988"

-         width="262.14267"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999893;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">helloworldjsonrpc</flowPara></flowRoot>    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="85.862968"

-       x="449.91632"

-       y="349.31049"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(190.3256,143.3719)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">HelloWorld</flowPara><flowPara

-         id="flowPara1883">JSONService</flowPara><flowPara

-         id="flowPara1885">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 373.48019,364.72909 L 455.16689,364.72909 L 470.019,392.34681 L 452.69154,417.84009 L 373.48019,417.84009 L 392.04536,392.34681 L 373.48019,364.72909 z "

-       id="path3017" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1887"

-       transform="translate(113.6483,167.4037)"><flowRegion

-         id="flowRegion1889"><rect

-           id="rect1891"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1893">HelloWorld</flowPara><flowPara

-         id="flowPara1897">Service</flowPara></flowRoot>    <rect

-       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1888"

-       width="85"

-       height="97.85714"

-       x="214.28571"

-       y="340.52307"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1892"

-       transform="translate(-56.88742,135.3526)"><flowRegion

-         id="flowRegion1894"><rect

-           id="rect1896"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1900">WebApp</flowPara></flowRoot>    <rect

-       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect1912"

-       width="45.714287"

-       height="40.714287"

-       x="277.85715"

-       y="370.52304"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1914"

-       transform="translate(1.400116,166.6895)"><flowRegion

-         id="flowRegion1916"><rect

-           id="rect1918"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara1920">DOJO</flowPara></flowRoot>    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 324.28571,391.23734 C 391.42857,391.95163 391.42857,391.95163 391.42857,391.95163"

-       id="path1922" />

-  </g>

-</svg>

diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/pom.xml b/java/sca-contrib/samples/helloworld-dojo-webapp/pom.xml
deleted file mode 100644
index d839ecddc6..0000000000
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/pom.xml
+++ /dev/null
@@ -1,163 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-helloworld-dojo-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA HelloWorld DOJO Sample WebApp</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- marking dependency as provided to exclude from war file -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <!-- version>1.1</version --> 
-			    <dependencies>
-			        <dependency>
-			    	    <groupId>ant</groupId>
-			    	    <artifactId>ant-trax</artifactId>
-			    	    <version>1.6.5</version>
-			        </dependency>
-			    </dependencies>                    
-                <executions>
-                    <execution> 
-                        <id>install-dojo</id>                       
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="install-dojo">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution> 
-                        <id>copy-dojo-files</id>                       
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                    <property name="artifactId" value="${artifactId}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution> 
-                        <id>clean-dojo-files</id>                       
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="clean-dojo-files">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                    <property name="artifactId" value="${artifactId}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin> 
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
-                        </configuration>                    
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>           
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
deleted file mode 100644
index 3d8ea24f04..0000000000
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ /dev/null
@@ -1,28 +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 helloworldjsonrpc;
-
-/**
- * This is the business interface of the HelloWorld service component.
- */
-public interface HelloWorldService {
-
-    String getGreetings(String name);
-
-}
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
deleted file mode 100644
index b4997ba907..0000000000
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,38 +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 helloworldjsonrpc;
-
-import java.util.Date;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service component.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldServiceImpl implements HelloWorldService {
-
-    /*
-     * @see org.apache.tuscany.samples.helloworld.HelloWorldServiceComponent#getGreetings()
-     */
-    public String getGreetings(String name) {
-        return new Date() + ": [JSONRPC] Hello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite b/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
deleted file mode 100644
index e895ab455d..0000000000
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
+++ /dev/null
@@ -1,37 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="helloworldjsonrpc">

-           

-	<service name="HelloWorldService" promote="HelloWorldJSONServiceComponent/HelloWorldService">

-         <interface.java interface="helloworldjsonrpc.HelloWorldService"/>

-         <tuscany:binding.jsonrpc/>

-     </service>           

-

-    <component name="HelloWorldJSONServiceComponent">

-        <implementation.java class="helloworldjsonrpc.HelloWorldServiceImpl"/>

-    </component>

-

-</composite>

-

diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html b/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
deleted file mode 100644
index 4195f3288c..0000000000
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<html>
-<!--
- * 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.    
- -->
-<head>
-<title>Tuscany JSON-RPC HelloWorld Example</TITLE>
-
-<script type="text/javascript">
-        var djConfig = {isDebug: true,debugContainerId: "dojoDebug" };
-		djConfig.usePlainJson=true ;
-        //djConfig.debugAtAllCosts = true;
-    </script>
-<script type="text/javascript" src="dojo/dojo/dojo.js"> 
-    </script>
-<script type="text/javascript" src="dojo/dijit/dijit.js"> 
-    </script>
-
-<script type="text/javascript">
-    	dojo.require("dijit.form.Button");
-    	dojo.require("dojo.rpc.JsonService");    	
-    </script>
-
-<link rel="stylesheet" type="text/css" href="style.css" />
-
-</head>
-
-<body>
-
-<h2>Tuscany Dojo JSON-RPC HelloWorld Sample</h2>
-
-<table>
-	<tr>
-		<th colspan="2">Dojo Example</th>
-	</tr>
-	<tr>
-		<td colspan="2">
-		<p>This example uses the <a href="http://dojotoolkit.org/">Dojo
-		Toolkit</a> to create a JavaScript object <code>helloWorldService</code>
-		for the SCA service 'HelloWorldService' using <a
-			href="http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book9">Dojo's
-		RPC classes</a> and providing them with <a href="HelloWorldService?smd">HelloWorldService?smd</a>
-		for <a href="http://dojo.jot.com/SMD">Simple Method Description
-		(SMD)</a> input.</p>
-		<p>It then creates a Dojo button that will envoke the <code>getGreetings</code>
-		method of the <code>HelloWorldService</code> object.</p>
-	</tr>
-	<tr>
-		<td>Request</td>
-		<td>Response</td>
-	</tr>
-	<tr>
-		<td><br>
-		<button id="myecho" dojoType="dijit.form.Button"
-			onClick='helloWorldService.getGreetings("Dojo").addCallback(contentCallBack);'>Send
-		Request</button>
-		</td>
-		<td>
-		<div id="ReturnedContent">None Yet.</div>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-		<div id="dojoDebug">Dojo Debug:</div>
-		</td>
-	</tr>
-</table>
-
-
-
-
-<script type="text/javascript">
-    
-    	function contentCallBack(result) {
-    		var handlerNode = document.getElementById("ReturnedContent");
-    		handlerNode.innerHTML = "<p>" + result + "</p>" ;
-    	}
-    
-    	var helloWorldService = new dojo.rpc.JsonService("HelloWorldService?smd");
-    
-    </script>
-
-</body>
-</html>
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 2c178c1ddc..0000000000
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:helloworldjsonrpc"/>
-</contribution>
-
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 70cd67890a..0000000000
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-    <display-name>Apache Tuscany DOJO HelloWorld Sample</display-name>
-    
-    <filter>
-        <filter-name>tuscany</filter-name>
-        <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
-    </filter>
- 
-    <filter-mapping>
-        <filter-name>tuscany</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <welcome-file-list>
-        <welcome-file>HelloWorldJSONRPC.html</welcome-file>
-    </welcome-file-list>  
-
-</web-app>
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/style.css b/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/style.css
deleted file mode 100644
index 1071583264..0000000000
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/style.css
+++ /dev/null
@@ -1,22 +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.
- */
-* { font-family: arial; }
-
-table, th, td { border: 2px solid blue; border-collapse: collapse; }
-th { color: white; background-color: blue; }
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/README b/java/sca-contrib/samples/helloworld-jms-webapp/README
deleted file mode 100644
index 9be2e0b0f6..0000000000
--- a/java/sca-contrib/samples/helloworld-jms-webapp/README
+++ /dev/null
@@ -1,130 +0,0 @@
-JMS HelloWorld Sample
-=====================
-This sample demonstrates a simple webapp containing a hello world  style client
-and service using the JMS binding for request-response style messaging. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want 
-to give this sample a go deploy the WAR file (target/sample-helloworld-jms-webapp.war )
-to you web application server. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-jms-webapp/
-
-The port and hostname will of course vary depending on your local installation. 
-
-Configuring the JMS resources
------------------------------
-
-The sample requires JMS resources be manually configured in the server environment, these are: 
-
-- a JMS connection factory named "ConnectionFactory"
-- a JMS queue named "HelloWorldService"
-
-See the following for how to define these resources depending on the application server being used:
-
-Tuscany with embedded ActiveMQ broker
--------------------------------------
-
-
-Apache Tomcat
--------------
-
-No configuration is necessary for Tomcat as the sample WAR includes everything pre-configured to run 
-an ActiveMQ embedded JMS broker and to configure the JMS resources in JNDI.
-
-The JNDI resources are configured in the META-INF/comtext.xml file, for more information on running
-ActiveMQ in Tomcat see: http://activemq.apache.org/tomcat.html
-
-
-Apache Geronimo
----------------
-
-For Apache Geronimo 2.0.1 (2.0.2 fails to define JMS resources for me)
-
-Logon to the Geronimo Server Console (http://localhost:8080/console, uid system, pswd manager)
-
-In the Console Navigation on the left under Services click JMS Resources
-
-At the bottom of the JMS Resources panel click under Create a new JMS Resource Group click For ActiveMQ
-
-In Resource Group Name enter "MyRGN" and click next
-
-At JMS Resource Group click Add Connection Factory
-
-For JMS Factory Type choose javax.jms.ConnectionFactory and click Next
-
-In Connection Factory Name enter "ConnectionFactory" and click Next
-
-Click Add destination
-
-For JMS Destination Type choose javax.jms.Queue and click Next	
-	
-Enter "HelloWorldService" for both Message Destination Name and PhysicalName and click Next 	
-
-Click Deploy Now
-
-Thats it, you're done.
-
-
-WebSphere 
----------
-
-To define the JMS resources in a new WebSphere Application Server 6.1 installation:
-
-1) First define a Service integration bus:
-
-Logon to the WebSphere Integrated Solutions Console (http://localhost:9060/ibm/console)
-
-On the Left hand menu expand Service integration, and click on Buses.
-
-In the Buses panel click on New
-
-Enter a name for the bus, eg MyBus, and click Next, and then click Finish and Save the changes.
-
-In the Buses panel click on MyBus
-
-Find the Topology secion and click on Bus members
-
-Click on Add, leave the defaults and click Next, Next, Next, Finish, and Save the changes.
-
-Restart WebSphere and when back up logon back on to the Integrated Solutions Console
- 
-2) Now define the JMS rescources
-
-On the Left hand menu expand Resources, and JMS and click on Connection Facotories. 
-
-In the Connection factories panel click New.
-
-Leave the Default messaging provider and click OK
-
-Enter "ConnectionFactory" in the Name and JNDI name and in the Bus name in the Connection pane choose MyBus and click OK
-
-On the Left hand menu in JMS click on Queues 
-
-In the Queues panel click New, accept the defaults and click OK
-
-Enter "HelloWorldService" for the Name and JNDI name and in the Bus name in the Connection pane choose MyBus,
-and then in the Queue name drop down list choose "Create SIB destination"
-
-In the Set queue attributes panel enter "HelloWorldService" for the Identifier and click Next, Next, and Finish
-
-That should take you back to the Queues panel where you can click OK to create the new JMS queue.
-
-Save the changes
-
-Restart WebSphere and you're done.
-
-
-
-Others...
----------
-
-
-
- 
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/pom.xml b/java/sca-contrib/samples/helloworld-jms-webapp/pom.xml
deleted file mode 100644
index c2d6155233..0000000000
--- a/java/sca-contrib/samples/helloworld-jms-webapp/pom.xml
+++ /dev/null
@@ -1,72 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-helloworld-jms-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA JMS HelloWorld Sample in a WebApp</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>5.1.0</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java b/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index c24a741ee2..0000000000
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.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 helloworld;
-
-/**
- * The HelloWorld client implementation
- */
-public class HelloWorldClient implements HelloWorldService {
-   
-    HelloWorldService helloWorldRef;
-
-    public String sayHello(String name) {
-        System.out.println("HelloWorldClient.sayHello " + name);
-        return helloWorldRef.sayHello(name);
-    }
-
-    public void setHelloWorldRef(HelloWorldService helloWorldRef) {
-        System.out.println("HelloWorldClient .setHelloWorldService " + helloWorldRef);        
-        this.helloWorldRef = helloWorldRef;
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 17f997f60d..0000000000
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,29 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    public String sayHello(String name);
-}
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java b/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index 47756f46aa..0000000000
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,34 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldServiceImpl implements HelloWorldService {
-
-    public String sayHello(String name) {
-        System.out.println("HelloWorldServiceImpl .sayHello " + name);        
-        return "Hello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml b/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
deleted file mode 100644
index 2419887413..0000000000
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
+++ /dev/null
@@ -1,29 +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.    
--->
-
-<Context>
-
-   <Resource name="ConnectionFactory" auth="Container" type="org.apache.activemq.ActiveMQConnectionFactory" description="JMS Connection Factory"
-        factory="org.apache.activemq.jndi.JNDIReferenceFactory" brokerURL="vm://localhost?broker.persistent=false" brokerName="LocalActiveMQBroker"/>
-
-   <Resource name="HelloWorldService" auth="Container" type="org.apache.activemq.command.ActiveMQQueue" description="my Queue"
-        factory="org.apache.activemq.jndi.JNDIReferenceFactory" physicalName="RequestQueue"/>
-
-</Context>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite b/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
deleted file mode 100644
index f6328d156c..0000000000
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
+++ /dev/null
@@ -1,39 +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://sample"

-           xmlns:sample="http://sample"

-           name="HelloWorld">

-

-    <component name="HelloWorldClient">

-        <implementation.java class="helloworld.HelloWorldClient"/>

-        <reference name="helloWorldRef">

-            <binding.jms uri="jms:HelloWorldService"/>

-        </reference>

-    </component>

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldServiceImpl" />

-	    <service name="HelloWorldService">

-            <binding.jms />

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 86710435ae..0000000000
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<!--

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

--->

-

-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web

-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">

-<web-app>

-

-  <display-name>Apache Tuscany JMS Web Service Sample</display-name>

-

-  <filter>

-    <filter-name>tuscany</filter-name> 

-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 

-  </filter>

-

-  <filter-mapping>

-    <filter-name>tuscany</filter-name> 

-    <url-pattern>/*</url-pattern> 

-  </filter-mapping>

-

-  <welcome-file-list id="WelcomeFileList">

-    <welcome-file>hello.jsp</welcome-file>

-  </welcome-file-list>

-

-  <!-- Uncomment this to use an appserver thread pool

-  <resource-ref>

-     <res-ref-name>wm/TuscanyWorkManager</res-ref-name>

-     <res-type>commonj.work.WorkManager</res-type>

-     <res-auth>Container</res-auth>

-     <res-sharing-scope>Shareable</res-sharing-scope>

-  </resource-ref>

-  -->

-

-  <!-- Uncomment these to use local jndi name aliases

-  <resource-ref>

-     <res-ref-name>ConnectionFactory</res-ref-name>

-     <res-type>javax.jms.ConnectionFactory</res-type>

-     <res-auth>Container</res-auth>

-     <res-sharing-scope>Shareable</res-sharing-scope>

-  </resource-ref>

-

-  <resource-ref>

-     <res-ref-name>HelloWorldService</res-ref-name>

-     <res-type>javax.jms.Queue</res-type>

-     <res-auth>Container</res-auth>

-     <res-sharing-scope>Shareable</res-sharing-scope>

-  </resource-ref>

-  -->

-  

-</web-app>

diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp b/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
deleted file mode 100644
index bc6ef59a9b..0000000000
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
+++ /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.

---%>

-

-<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>

-<%@ page import="helloworld.HelloWorldService" %>

-

-<%@ page contentType="text/html;charset=UTF-8" language="java" %>

-<%

-   SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");

-   HelloWorldService helloWorldService = (HelloWorldService)scaDomain.getService(HelloWorldService.class, "HelloWorldClient");

-%>

-<html>

-<head><title>HelloWorld JMS sample</title></head>

-

-<body>

-

-If this sample is working correctly you should see "Hello World" on the next line...

-<p>

-<%= helloWorldService.sayHello("world") %>

-<p>

-If you do not see "Hello World" on the line above then there has been a problem.

-<p>

-The sample requires JMS resources be manually configured in the server environment, these are:

-a JMS connection factory named "ConnectionFactory", and a destination queues named "HelloWorldService".

-See the sample README file for more information.

-

-</body>

-</html>

diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/README b/java/sca-contrib/samples/helloworld-jsonrpc-webapp/README
deleted file mode 100644
index 07253d039b..0000000000
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/README
+++ /dev/null
@@ -1,90 +0,0 @@
-Hello World JSONRPC Sample
-==========================
-This sample demostrates the JSONRPC binding using a simple web app that
-talks JSONRPC to an SCA service.  
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want 
-to give this sample a go deploy the WAR file (target/sample-helloworld-jsonrpc-webapp.war)
-to you web application server. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-jsonrpc-webapp
-
-The port and hostname will of course vary depending on your local installation. 
-
-Sample Overview
----------------
-The sample provides a single service with an operation that reflects
-a greeting back to the caller. The service is exposed using the JSONRPC
-binding. The web app provided shows how the SCA-provided JSON client can be 
-used to invoke the SCA service. 
-
-helloworld-jsonrpc-webapp/
-  src/
-    main/
-      java/
-        helloworldjsonrpc/
-          HelloWorldService.java      - service interface
-          HelloWorldServiceImpl.java  - service implementation
-      resources/
-        jsonrpc.composite             - the SCA assembly for this sample
-      webapp
-        META-INF/
-          sca-contribution.xml        - specifies the composite to be deployed
-        WEB-INF/
-          web.xml                     - defines the listener that starts up the 
-                                        Tuscany SCA runtime
-        HelloWorldJSONRPC.html        - the web application that calls the 
-                                        SCA service via JSONRPC
-        style.css                     - style sheet     
-           
-  helloworld-jsonrpc-webapp.png              - a pictorial representation of the 
-                                        sample .composite file
-  build.xml                           - the Ant build file that unpacks the
-                                        dojo installation
-  pom.xml                             - the Maven build file  
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as 
-follows
-
-cd helloworld-jsonrpc-webapp
-ant package
-
-This should result in a war file (sample-helloworld-jsonrpc-webapp.war) in the target 
-directory. Copy this war file to your web app deployment directory in your
-web app container. 
-
-The process for getting the web app running will depend on which web app container
-you are using. For example, if you are using Tomcat then it is simply a matter
-of copying the WAR file to the webapps directory. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-jsonrpc-webapp
-
-The port and hostname will of course vary depending on your local installation. 
-
-You should see a web page that allows you to send messages, via JSONRPC, to the 
-application running in the Tuscany SCA Runtime
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd helloworld-jsonrpc-webapp 
-mvn
-
-Again this should result in a war file (sample-helloworld-jsonrpc-webapp.war) in the target 
-directory. Follow the steps described in the previous section for running the web 
-app and for the expected results.
-
-
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png b/java/sca-contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
deleted file mode 100644
index 57f90aed01..0000000000
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg b/java/sca-contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
deleted file mode 100644
index 6ef1f438fb..0000000000
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-    * 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.    
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp"
-   sodipodi:docname="helloworld-jsonrpc-webapp.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp\helloworld-jsonrpc.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="516.28571"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="158"
-     inkscape:window-y="164" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="translate(144.2857,52.85714)">
-      <rect
-         rx="8.0946665"
-         ry="12.692303"
-         y="192.00233"
-         x="258.31134"
-         height="299.99988"
-         width="262.14267"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999893;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">helloworldjsonrpc</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="449.91632"
-       y="349.31049"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(190.3256,143.3719)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">HelloWorld</flowPara><flowPara
-         id="flowPara1883">JSONService</flowPara><flowPara
-         id="flowPara1885">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 373.48019,364.72909 L 455.16689,364.72909 L 470.019,392.34681 L 452.69154,417.84009 L 373.48019,417.84009 L 392.04536,392.34681 L 373.48019,364.72909 z "
-       id="path3017" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1887"
-       transform="translate(113.6483,167.4037)"><flowRegion
-         id="flowRegion1889"><rect
-           id="rect1891"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1893">HelloWorld</flowPara><flowPara
-         id="flowPara1897">Service</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1888"
-       width="85"
-       height="97.85714"
-       x="214.28571"
-       y="340.52307"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1892"
-       transform="translate(-56.88742,135.3526)"><flowRegion
-         id="flowRegion1894"><rect
-           id="rect1896"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1900">WebApp</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1912"
-       width="45.714287"
-       height="40.714287"
-       x="277.85715"
-       y="370.52304"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1914"
-       transform="translate(1.400116,166.6895)"><flowRegion
-         id="flowRegion1916"><rect
-           id="rect1918"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1920">DOJO</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 324.28571,391.23734 C 391.42857,391.95163 391.42857,391.95163 391.42857,391.95163"
-       id="path1922" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/pom.xml b/java/sca-contrib/samples/helloworld-jsonrpc-webapp/pom.xml
deleted file mode 100644
index 9d3b27d8cc..0000000000
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/pom.xml
+++ /dev/null
@@ -1,103 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-helloworld-jsonrpc-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA HelloWorld JSON-RPC Sample WebApp</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- marking dependency as provided to exclude from war file -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>         
-       </plugins>      
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
deleted file mode 100644
index 3d8ea24f04..0000000000
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ /dev/null
@@ -1,28 +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 helloworldjsonrpc;
-
-/**
- * This is the business interface of the HelloWorld service component.
- */
-public interface HelloWorldService {
-
-    String getGreetings(String name);
-
-}
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
deleted file mode 100644
index 2234e21439..0000000000
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.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 helloworldjsonrpc;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service component.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldServiceImpl implements HelloWorldService {
-
-     /*
-      * @see org.apache.tuscany.samples.helloworld.HelloWorldServiceComponent#getGreetings()
-      */
-    public String getGreetings(String name) {
-        return "jsonrpcHello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite b/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
deleted file mode 100644
index e895ab455d..0000000000
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
+++ /dev/null
@@ -1,37 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="helloworldjsonrpc">

-           

-	<service name="HelloWorldService" promote="HelloWorldJSONServiceComponent/HelloWorldService">

-         <interface.java interface="helloworldjsonrpc.HelloWorldService"/>

-         <tuscany:binding.jsonrpc/>

-     </service>           

-

-    <component name="HelloWorldJSONServiceComponent">

-        <implementation.java class="helloworldjsonrpc.HelloWorldServiceImpl"/>

-    </component>

-

-</composite>

-

diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html b/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
deleted file mode 100644
index 75dd9050fa..0000000000
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<html>
-<!--
- * 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.    
- -->
-  <head>
-    <title>Tuscany JSON-RPC HelloWorld Example</TITLE>
-    
-    <script type="text/javascript" src="SCADomain/scaDomain.js"></script>
-
-    <script language="JavaScript">
-
-       function getGreeting() {
-          var name = document.getElementById("name").value;
-          HelloWorldService.getGreetings(name, handleResponse);
-       }
-       
-       function handleResponse(result) {
-          document.getElementById('greeting').innerHTML=result;
-       }
-
-    </script>
-    
-    <link rel="stylesheet" type="text/css" href="style.css" />
-  </head>
-
-  <body>
-
-    <h2>Tuscany JSON-RPC HelloWorld Sample</h2>
-     
-    <table>
-      <tr>
-        <th colspan="2">Non-Dojo Example</th>
-      </tr>
-      <tr>
-        <td colspan="2">
-           This example uses the JavaScript served from 
-           <a href="SCADomain/scaDomain.js">SCADomain/scaDomain.js</a> 
-           to make JSON-RPC requests to the SCA service 'HelloWorldService'
-      </tr>
-      <tr>
-        <td>Request</td>
-        <td>Response</td>
-      </tr>
-      <tr>
-        <td>
-            <p>
-              Name please: &nbsp;&nbsp;&nbsp;
-              <input type="text" id="name" size="30" value="World" />               
-              <input type="button" value="Submit" onclick="getGreeting()" />
-            </p>
-            
-        </td>
-        <td>           
-            <div id='greeting'>None Yet.</div>
-        </td>
-      </tr>
-    </table>
-           
-  </body>
-</html>
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index c8246e15a7..0000000000
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    

--->

-

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:helloworldjsonrpc"/>

-</contribution>

-

diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 267bed176c..0000000000
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-    <display-name>Apache Tuscany JSON-RPC HelloWorld Sample</display-name>
-    
-    <filter>
-        <filter-name>tuscany</filter-name>
-        <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
-    </filter>
- 
-    <filter-mapping>
-        <filter-name>tuscany</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <welcome-file-list>
-        <welcome-file>HelloWorldJSONRPC.html</welcome-file>
-    </welcome-file-list>  
-
-</web-app>
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css b/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
deleted file mode 100644
index 1071583264..0000000000
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
+++ /dev/null
@@ -1,22 +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.
- */
-* { font-family: arial; }
-
-table, th, td { border: 2px solid blue; border-collapse: collapse; }
-th { color: white; background-color: blue; }
diff --git a/java/sca-contrib/samples/helloworld-jsp/pom.xml b/java/sca-contrib/samples/helloworld-jsp/pom.xml
deleted file mode 100644
index c2604065ca..0000000000
--- a/java/sca-contrib/samples/helloworld-jsp/pom.xml
+++ /dev/null
@@ -1,54 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-jsp</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Helloworld JSP Sample</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>compile</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java b/java/sca-contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 2b92fd4661..0000000000
--- a/java/sca-contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package sample;

-

-public interface HelloworldService {

-	

-	String sayHello(String name);

-

-}

diff --git a/java/sca-contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/java/sca-contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 2664e75188..0000000000
--- a/java/sca-contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package sample;

-

-import org.oasisopen.sca.annotation.Service;

-

-@Service(HelloworldService.class)

-public class HelloworldServiceImpl implements HelloworldService {

-

-	public String sayHello(String name) {

-		return "Hello " + name;

-	}

-

-}

diff --git a/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite b/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index 16bc08fc10..0000000000
--- a/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
+++ /dev/null
@@ -1,34 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://samples"

-           name="Helloworld">

-

-    <component name="WebClient">

-        <implementation.web web-uri=""/>

-        <reference name="service" target="HelloworldService" />

-    </component>

-

-    <component name="HelloworldService">

-        <implementation.java class="sample.HelloworldServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 46285614da..0000000000
--- a/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,42 +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.

--->

-

-<web-app version="2.4"

-         xmlns="http://java.sun.com/xml/ns/j2ee"

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

-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >

-

-  <display-name>Apache Tuscany Helloworld JSP Sample</display-name>

-

-  <filter>

-    <filter-name>tuscany</filter-name> 

-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 

-  </filter>

-

-  <filter-mapping>

-    <filter-name>tuscany</filter-name> 

-    <url-pattern>/*</url-pattern> 

-  </filter-mapping>

-

-  <welcome-file-list id="WelcomeFileList">

-    <welcome-file>hello.jsp</welcome-file>

-  </welcome-file-list>

-

-</web-app>

diff --git a/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/hello.jsp b/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/hello.jsp
deleted file mode 100644
index beac8e457f..0000000000
--- a/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/hello.jsp
+++ /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.    

--->

-<%@ page contentType="text/html;charset=UTF-8" language="java" %>

-<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %>

-

-<sca:reference name="service" type="sample.HelloworldService" />

-

-<html>

-  <body >

-

-    <h2>Apache Tuscany Helloworld JSP Sample</h2>

-

-    Calling HelloworldService sayHello("world") returns:

-

-    <p>

-

-    <%= service.sayHello("world") %>

-

-  </body>

-</html>

diff --git a/java/sca-contrib/samples/helloworld-reference-jms/README b/java/sca-contrib/samples/helloworld-reference-jms/README
deleted file mode 100644
index 184e67a239..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/README
+++ /dev/null
@@ -1,114 +0,0 @@
-Hello World JMS References Sample

-=================================

-This sample demonstrates an SCA reference that uses a JMS binding 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run it to see what happens you need to run the server first 

-so open a command prompt, navigate to the helloworld-service-jms sample directory 

-and do 

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-service-jms.jar helloworld.HelloWorldServer

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-service-jms.jar helloworld.HelloWorldServer

-

-

-Once the server is running open a command prompt, navigate to this sample 

-directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-reference-jms.jar helloworld.HelloWorldJmsClient

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-reference-jms.jar helloworld.HelloWorldJmsClient

-

-

-Sample Overview

----------------

-The sample provides a component that has a reference with a JMS binding. 

-The binding refers to JMS queue and communicates with a service

-exposed by the helloworld-service-jms sample. 

-

-helloworld-reference-jms/

-  src/

-    main/

-      java/

-        helloworld/

-          HelloWorldService.java          - interface description for 

-                                            HelloWorldServiceComponent

-          HelloWorldServiceComponent.java - component implementation

-          HelloWorldJmsClient.java         - starts the SCA Runtime and 

-                                            deploys the helloworldwsjmsclient

-                                            .composite. It then calls the 

-                                            HelloWorldServiceComponent

-      resources/

-        helloworldjmsclient.composite     - the SCA assembly for this sample

-        helloworldjms.composite           - the SCA assembly for the server

-                                            that is used by the JUnit tests

-        logging.properties                - log4j configuration file

-    test/

-      java/

-        helloworld/

-          HelloWorldJMSClientTestCase.java - JUnit test case

-  helloworld-reference.png                - a pictorial representation of the 

-                                            sample .composite file

-  build.xml                               - the Ant build file

-  pom.xml                                 - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant. Before

-you do this start up the service that the reference will talk to. To do this

-run up the helloworld-service-jms test. Take a look at the README in that sample

-and you will see you need the following commands

-

-cd helloworld-service-jms

-ant run

-

-Once done you can now compile and run this sample using the following commands;

-

-cd helloworld-reference-jms

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

-om.util.StAXUtils).

-     [java] log4j:WARN Please initialize the log4j system properly.

-     [java] Injected helloWorldService

-     [java] Called getGreetings

-     [java] Hello World

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. When using Maven you don't need to run the helloworld-

-service-jms sample first as the JUnit test does this for you. 

-

-cd helloworld-reference-jms

-mvn

-

-You should see the following output from the test phase.

-

-run:

-     [java] Injected helloWorldService

-     [java] Called getGreetings

-     [java] javax.naming.NameNotFoundException: RequestQueue

-     ...

-     [java] Hello World

-

-This shows that the Junit test cases have run successfully. 

diff --git a/java/sca-contrib/samples/helloworld-reference-jms/build.xml b/java/sca-contrib/samples/helloworld-reference-jms/build.xml
deleted file mode 100644
index 4702beed0d..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/build.xml
+++ /dev/null
@@ -1,72 +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.    

--->

-<project name="helloworld-ws-reference-jms" default="compile">

-    <property name="test.class" value="helloworld.HelloWorldJmsClient" />

-	<property name="test.jar"   value="sample-helloworld-reference-jms.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/helloworld-reference-jms/helloworld-reference.png b/java/sca-contrib/samples/helloworld-reference-jms/helloworld-reference.png
deleted file mode 100644
index ab80b1f91c..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/helloworld-reference.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/helloworld-reference.svg b/java/sca-contrib/samples/helloworld-reference-jms/helloworld-reference.svg
deleted file mode 100644
index 40f4e8f271..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/helloworld-reference.svg
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-sca-1.3\samples\helloworld-reference-jms"
-   sodipodi:docname="helloworld-reference.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\tuscany\java-sca-1.3\samples\helloworld-reference-jms\helloworld-reference.png"
-   inkscape:export-xdpi="70.806541"
-   inkscape:export-ydpi="70.806541"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="519.38407"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="g2997"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="179"
-     inkscape:window-y="99" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.991389,0,0,1,2.215655,0)">
-      <rect
-         rx="13.79423"
-         ry="12.692303"
-         y="192.00233"
-         x="258.3114"
-         height="299.99988"
-         width="446.72086"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">helloworldjmsreference</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:4.47792912;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="231.75597"
-       height="214.81361"
-       x="364.72672"
-       y="246.978"
-       rx="14.018401"
-       ry="17.82052" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(167.4684,48.086243)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">HelloWorld</flowPara><flowPara
-         id="flowPara1883">Service</flowPara><flowPara
-         id="flowPara1885">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 342.05152,338.30031 L 375.38656,338.30031 L 381.44747,351.43229 L 374.37641,363.55413 L 342.05152,363.55413 L 349.62767,351.43229 L 342.05152,338.30031 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.52129698px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 544.84854,320.29968 L 650.26997,320.29968 L 669.4375,362.50343 L 647.0754,401.46079 L 544.84854,401.46079 L 568.80798,362.50343 L 544.84854,320.29968 z "
-       id="path1887" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1889"
-       transform="translate(288.9491,129.83236)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1891"><rect
-           id="rect1893"
-           width="179.28572"
-           height="60.714283"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1897">HelloWorldService </flowPara><flowPara
-         id="flowPara2184">Reference</flowPara><flowPara
-         id="flowPara2180">JMS</flowPara><flowPara
-         id="flowPara1899" /></flowRoot>  </g>
-</svg>
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/pom.xml b/java/sca-contrib/samples/helloworld-reference-jms/pom.xml
deleted file mode 100644
index 77d887509c..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/pom.xml
+++ /dev/null
@@ -1,92 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-reference-jms</artifactId>

-    <name>Apache Tuscany SCA HelloWorld Reference JMS Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>sample-helloworld-service-jms</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>apache-activemq</artifactId>

-            <version>4.1.1</version>

-            <scope>test</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.activemq</groupId>

-                    <artifactId>activemq-web-demo</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>     

-        

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 2186c00e57..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
deleted file mode 100644
index 5bec27a137..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ /dev/null
@@ -1,41 +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 helloworld;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * locate the HelloWorld service and invoke it.

- */

-public class HelloWorldJmsClient {

-

-    public  final static void main(String[] args) throws Exception {

-		//SCANode node = SCANodeFactory.createNodeWithComposite("helloworldjmsreference.composite");

-		//HelloWorldService helloWorldService = node.getDomain().getService(HelloWorldService.class, "HelloWorldServiceComponent");

-    	

-        SCADomain scaDomain = SCADomain.newInstance("helloworldjmsreference.composite");

-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");

-

-        String value = helloWorldService.getGreetings("World");

-        System.out.println(value);

-

-        scaDomain.close();

-    }

-}

diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index ca7c90f23e..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,29 +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 helloworld;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The interface for the helloworld service

- */

-@Remotable

-public interface HelloWorldService {

-    public String getGreetings(String name);

-}

diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 27cef47677..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,42 +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 helloworld;

-

-/**

- * The HelloWorld service implementation

- */

-public class HelloWorldServiceComponent implements HelloWorldService {

-   

-    HelloWorldService helloWorldService;

-

-    public String getGreetings(String name) {

-        System.out.println("Called getGreetings");

-        return helloWorldService.getGreetings(name);

-    }

-

-    public HelloWorldService getHelloWorldService() {

-        System.out.println("Got Injected helloWorldService");

-        return helloWorldService;

-    }

-

-    public void setHelloWorldService(HelloWorldService helloWorldService) {

-        System.out.println("Injected helloWorldService");        

-        this.helloWorldService = helloWorldService;

-    }

-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite b/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
deleted file mode 100644
index 3cf1104562..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
+++ /dev/null
@@ -1,40 +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://helloworld"

-	xmlns:hw="http://helloworld"

-	name="helloworldjmsreference">

-    

-    <!-- A component with a reference promoted as a composite reference -->

-    <component name="HelloWorldServiceComponent">

-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>

-      <reference name="helloWorldService">

-          <interface.java interface="helloworld.HelloWorldService"/>

-          <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory"

-                       jndiURL="tcp://localhost:61619">

-              <destination name="RequestQueue" create="always"/>

-              <response>

-                  <destination name="ResponseQueue" create="always"/>

-              </response> 

-          </binding.jms>

-      </reference>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite b/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
deleted file mode 100644
index e692ef8e4c..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
+++ /dev/null
@@ -1,39 +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://helloworld"

-	xmlns:hw="http://helloworld"

-    name="helloworld">

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldImpl" />

-	    <service name="HelloWorldService">

-                <interface.java interface="helloworld.HelloWorldService"/>

-                <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory"

-                             jndiURL="tcp://localhost:61619">

-                    <destination name="RequestQueue" create="always"/>

-                    <response>

-                        <destination name="ResponseQueue" create="always"/>

-                    </response> 

-                </binding.jms>

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/logging.properties b/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/logging.properties
deleted file mode 100644
index a2a4067921..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/logging.properties
+++ /dev/null
@@ -1,30 +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.    

-#

-#  $Rev: 582827 $ $Date: 2007-10-08 15:01:31 +0100 (Mon, 08 Oct 2007) $

-#

-

-# Custom logging configuration for Tuscany samples

-# By default, only INFO level logging is enabled and ALL messages get sent to the console

-# For more messages from the runtime, uncomment specific settings at the end of this file

-handlers = java.util.logging.ConsoleHandler

-java.util.logging.ConsoleHandler.level = ALL

-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter

-.level=INFO

-

-# Uncomment the next setting to get all Tuscany messages (this will be a lot)

-#org.apache.tuscany.level=FINEST

diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index e0ea596dd3..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,92 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-	name="helloworld">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-            

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapJmsBinding" name="HelloWorldSoapJmsPort">

-            <wsdlsoap:address location="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/java/sca-contrib/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
deleted file mode 100644
index f5380d9ccd..0000000000
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
+++ /dev/null
@@ -1,80 +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 helloworld;

-

-import junit.framework.Assert;

-

-import org.apache.activemq.broker.BrokerService;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-

-/**

- * Test case for helloworld web service client 

- */

-public class HelloWorldJmsClientTestCase {

-

-    private HelloWorldService helloWorldService;

-    private HelloWorldService helloTuscanyService;

-    private SCADomain scaClientDomain;

-    private SCADomain scaServiceDomain;

-    private BrokerService jmsBroker;

-   

-

-    @Before

-    public void startClient() throws Exception {

-        try {

-            startBroker();

-            scaServiceDomain = SCADomain.newInstance("helloworldjmsservice.composite");

-            scaClientDomain = SCADomain.newInstance("helloworldjmsreference.composite");

-            helloWorldService = scaClientDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");

-                

-        } catch (Throwable e) {

-            e.printStackTrace();

-        }

-    }

-    

-    @Test

-    public void testWSClient() throws Exception {

-        String msg = helloWorldService.getGreetings("Smith");

-        Assert.assertEquals("Hello Smith", msg);

-        Thread.sleep(2000);

-   }

-    

-    

-    @After

-    public void stopClient() throws Exception {

-        scaServiceDomain.close();

-        scaClientDomain.close();

-        if (jmsBroker != null) {

-            jmsBroker.stop();

-        }

-    }

-

-    protected void startBroker() throws Exception {

-        jmsBroker = new BrokerService(); 

-        jmsBroker.setPersistent(false);

-        jmsBroker.setUseJmx(false);

-        jmsBroker.addConnector("tcp://localhost:61619");

-        jmsBroker.start();

-    }

-}

diff --git a/java/sca-contrib/samples/helloworld-service-jms/README b/java/sca-contrib/samples/helloworld-service-jms/README
deleted file mode 100644
index 49feabaa07..0000000000
--- a/java/sca-contrib/samples/helloworld-service-jms/README
+++ /dev/null
@@ -1,101 +0,0 @@
-Hello World JMS Service Sample

-==============================

-This sample demonstrates an SCA service that uses a JMS binding 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run it to see what happens open a command prompt, navigate

-to this sample directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-service-jms.jar helloworld.HelloWorldServer

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-service-jms.jar helloworld.HelloWorldServer

-

-Now the server is started you can use the helloworld-reference-jms sample to 

-exercise it. 

-

-Sample Overview

----------------

-The sample provides a single component that is wired to a service with a 

-JMS binding.

-

-helloworld-service-jms/

-  src/

-    main/

-      java/

-        helloworld/

-          HelloWorldService.java          - interface description for 

-                                            HelloWorldServiceComponent

-          HelloWorldImpl.java             - component implementation

-          HelloWorldServer.java           - starts the SCA Runtime and 

-                                            deploys the helloworldjmsservice

-                                            .composite and then waits for the

-                                            service to be called via JMS

-      resources/

-        helloworldjmsservice.composite    - the SCA assembly for this sample

-

-    test/

-      java/

-        helloworld/

-          HelloWorldJMSServerTestCase.java- JUnit test case 

-  helloworld-service.png                  - a pictorial representation of the 

-                                            sample .composite file

-  build.xml                               - the Ant build file

-  pom.xml                                 - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant using the 

-following commands

-

-cd helloworld-service-jms

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

-om.util.StAXUtils).

-     [java] log4j:WARN Please initialize the log4j system properly.

-     [java] HelloWorld server started (press enter to shutdown)

-     

-As this point the SCA service is exposed as a JMS service via ActiveMQ which is

-started automatically by the SCA runtime. To stop the server just press 

-enter.

-

-To exercise the service run up the helloworld-reference-jms sample. Take a look at 

-the README in that sample and you will see you need the following commands

-

-cd helloworld-reference-jms

-ant run

-

-Building Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built 

-using Maven as follows. 

-

-cd helloworld-service-jms

-mvn

-

-You should see the following output 

-

-...

-[INFO] ------------------------------------------------------------------------

-[INFO] BUILD SUCCESSFUL

-[INFO] ------------------------------------------------------------------------

-[INFO] Total time: 15 seconds

-[INFO] Finished at: Wed Jul 02 12:50:24 BST 2008

-[INFO] Final Memory: 13M/51M

-[INFO] ------------------------------------------------------------------------

-

-

-This shows that the module has compiled successfully. 

diff --git a/java/sca-contrib/samples/helloworld-service-jms/build.xml b/java/sca-contrib/samples/helloworld-service-jms/build.xml
deleted file mode 100644
index 330de7f7e5..0000000000
--- a/java/sca-contrib/samples/helloworld-service-jms/build.xml
+++ /dev/null
@@ -1,72 +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.    

--->

-<project name="helloworld-ws-service-jms" default="compile">

-    <property name="test.class" value="helloworld.HelloWorldServer" />

-	<property name="test.jar"   value="sample-helloworld-ws-service-jms.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/helloworld-service-jms/helloworld-service.png b/java/sca-contrib/samples/helloworld-service-jms/helloworld-service.png
deleted file mode 100644
index ef27c71f54..0000000000
--- a/java/sca-contrib/samples/helloworld-service-jms/helloworld-service.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-service-jms/helloworld-service.svg b/java/sca-contrib/samples/helloworld-service-jms/helloworld-service.svg
deleted file mode 100644
index dd7a9dd87d..0000000000
--- a/java/sca-contrib/samples/helloworld-service-jms/helloworld-service.svg
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-sca-1.3\samples\helloworld-service-jms"
-   sodipodi:docname="helloworld-service.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\tuscany\java-sca-1.3\samples\helloworld-service-jms\helloworld-service.png"
-   inkscape:export-xdpi="70.806541"
-   inkscape:export-ydpi="70.806541"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="519.38407"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1111"
-     inkscape:window-height="783"
-     inkscape:window-x="204"
-     inkscape:window-y="141" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.991389,0,0,1,2.215655,0)">
-      <rect
-         rx="13.79423"
-         ry="12.692303"
-         y="192.00233"
-         x="258.3114"
-         height="299.99988"
-         width="446.72086"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">helloworld</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:3.70037222;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="201.81923"
-       height="168.4483"
-       x="387.1951"
-       y="262.30353"
-       rx="12.207596"
-       ry="13.974144" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(168.89697,70.2291)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">HelloWorld</flowPara><flowPara
-         id="flowPara1883">Service</flowPara><flowPara
-         id="flowPara1885">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 353.15921,319.32458 L 420.34042,319.32458 L 432.55517,351.3994 L 418.30463,381.00696 L 353.15921,381.00696 L 368.42768,351.3994 L 353.15921,319.32458 z "
-       id="path1892" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1894"
-       transform="translate(88.234846,118.54669)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1896"><rect
-           id="rect1898"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1900">HelloWorld</flowPara><flowPara
-         id="flowPara1904">Service</flowPara><flowPara
-         id="flowPara2181">JMS</flowPara></flowRoot>  </g>
-</svg>
diff --git a/java/sca-contrib/samples/helloworld-service-jms/pom.xml b/java/sca-contrib/samples/helloworld-service-jms/pom.xml
deleted file mode 100644
index c2be08fa75..0000000000
--- a/java/sca-contrib/samples/helloworld-service-jms/pom.xml
+++ /dev/null
@@ -1,85 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-service-jms</artifactId>

-    <name>Apache Tuscany SCA HelloWorld Service JMS Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>           

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>compile</scope>            

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>   

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>apache-activemq</artifactId>

-            <version>4.1.1</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.activemq</groupId>

-                    <artifactId>activemq-web-demo</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>           

-       

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 2186c00e57..0000000000
--- a/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java b/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index d4ea391a00..0000000000
--- a/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.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 helloworld;

-

-import java.io.IOException;

-

-import org.apache.activemq.broker.BrokerService;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This server program shows how to create an SCA runtime, and start it which

- * activates the helloworld Web service endpoint.

- */

-public class HelloWorldServer {

-

-    public static void main(String[] args) {

-        try {

-            BrokerService jmsBroker;

-            jmsBroker = new BrokerService(); 

-            jmsBroker.setPersistent(false);

-            jmsBroker.setUseJmx(false);

-            jmsBroker.addConnector("tcp://localhost:61619");

-            jmsBroker.start();

-            

-            SCADomain scaDomain = SCADomain.newInstance("helloworldjmsservice.composite");

-

-            System.out.println("HelloWorld server started (press enter to shutdown)");

-            System.in.read();

-

-            scaDomain.close();

-            

-            jmsBroker.stop();

-            System.out.println("HelloWorld server stopped");

-        

-        } catch (IOException e) {

-            e.printStackTrace();

-        } catch (Exception e) {

-            e.printStackTrace();

-        }

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index a0081be22d..0000000000
--- a/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.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 helloworld;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

-

diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/definitions.xml b/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/definitions.xml
deleted file mode 100644
index 8c881ab0bb..0000000000
--- a/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-<sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"

- 			targetNamespace="http://www.osoa.org/xmlns/sca/1.0"

- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

-

- <sca:intent name="transport"  

- 			 constrains="sca:binding.ws">

- 			 <sca:description>

- 			 The general intent that a transport is available over which SOAP messages flow 

- 			 </sca:description>

- </sca:intent>

-

- <sca:intent name="transport.jms">

- 			 <sca:description>

- 			 A JMS transport is required

- 			 </sca:description>

- </sca:intent>

- 

- <sca:intent name="transport.http">

-             <sca:description>

-             An HTTP transport is required

-             </sca:description>

- </sca:intent>

- 

- <!-- 

-   how does the following relate to confidentiality intents 

-   does confidentiality become a profile intent?

- -->

- <sca:intent name="transport.https">

-             <sca:description>

-             An HTTPS transport is required

-             </sca:description>

- </sca:intent>

-

- <sca:policySet name="wsJMSTransportPolicy"

- 	provides="transport.jms"

- 	appliesTo="sca:binding.ws">

- 	<tuscany:wsConfigParam>

-        <parameter name="TuscanyQueueConnectionFactory">

-            <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>

-            <parameter name="java.naming.provider.url">tcp://localhost:61619</parameter>

-            <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>

-        </parameter>

- 	</tuscany:wsConfigParam>

- </sca:policySet>

- 

- </sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite b/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
deleted file mode 100644
index 3135cdc320..0000000000
--- a/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
+++ /dev/null
@@ -1,40 +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:sca="http://www.osoa.org/xmlns/sca/1.0"

-	targetNamespace="http://helloworld"

-	xmlns:hw="http://helloworld"

-    name="helloworld">

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldImpl" />

-	    <service name="HelloWorldService">

-                <interface.java interface="helloworld.HelloWorldService"/>

-                <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory"

-                             jndiURL="tcp://localhost:61619">

-                    <destination name="RequestQueue" create="ifnotexist"/>

-                    <response>

-                        <destination name="ResponseQueue" create="ifnotexist"/>

-                    </response> 

-                </binding.jms>

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 3f9e00689e..0000000000
--- a/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,92 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-	name="helloworld">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-            

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldServiceComponent"/>

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java b/java/sca-contrib/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
deleted file mode 100644
index 7930f98716..0000000000
--- a/java/sca-contrib/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
+++ /dev/null
@@ -1,60 +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 helloworld;

-

-import static junit.framework.Assert.assertEquals;

-import static junit.framework.Assert.assertNotNull;

-

-import java.io.IOException;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests that the helloworld server is available

- */

-public class HelloWorldJmsServerTestCaseOff {

-

-    private SCADomain scaDomain;

-

-    @Before

-    public void startServer() throws Exception {

-        // ActiveMQModuleActivator.startBroker();

-        scaDomain = SCADomain.newInstance("helloworldjmsservice.composite");

-    }

-

-    @Test

-    public void testServiceCall() throws IOException {

-        HelloWorldService helloWorldService =

-            scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-

-        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

-    }

-

-    @After

-    public void stopServer() throws Exception {

-        if (scaDomain != null) {

-            scaDomain.close();

-        }

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-servlet/pom.xml b/java/sca-contrib/samples/helloworld-servlet/pom.xml
deleted file mode 100644
index 26fa4e62d2..0000000000
--- a/java/sca-contrib/samples/helloworld-servlet/pom.xml
+++ /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.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-servlet</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Helloworld Sample using a servlet</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>compile</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.3</version>

-            <scope>provided</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java b/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 2b92fd4661..0000000000
--- a/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package sample;

-

-public interface HelloworldService {

-	

-	String sayHello(String name);

-

-}

diff --git a/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 2664e75188..0000000000
--- a/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package sample;

-

-import org.oasisopen.sca.annotation.Service;

-

-@Service(HelloworldService.class)

-public class HelloworldServiceImpl implements HelloworldService {

-

-	public String sayHello(String name) {

-		return "Hello " + name;

-	}

-

-}

diff --git a/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
deleted file mode 100644
index 6b8af48161..0000000000
--- a/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
+++ /dev/null
@@ -1,65 +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 sample;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- */
-public class HelloworldServlet extends HttpServlet {
-    private static final long serialVersionUID = 1L;
-
-    @Reference
-    protected HelloworldService service;
-
-    @Override
-    public void init(ServletConfig config) {
-        if (service == null) {
-            // The helloworldService reference will only be injected from the @Reference 
-            // annotation in containers supporting SCA "deep" integration. In other 
-            // environments in can be looked up from the ComponentContext.
-            ComponentContext cc = (ComponentContext)config.getServletContext().getAttribute("org.oasisopen.sca.ComponentContext");
-            service = cc.getService(HelloworldService.class, "service");
-        }
-    }
-    
-    @Override
-    protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
-
-    	String name = request.getParameter("name");
-    	String greeting = service.sayHello(name);
-    	
-        Writer out = response.getWriter();
-        out.write("<html><head><title>Apache Tuscany Helloworld Servlet Sample</title></head><body>");
-        out.write("<h2>Apache Tuscany Helloworld Servlet Sample</h2>");
-        out.write("<br><strong>Result: </strong>" + greeting);
-        out.write("</body></html>");
-        out.flush();
-        out.close();
-    }
-}
diff --git a/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite b/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index 23fd33a408..0000000000
--- a/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
+++ /dev/null
@@ -1,33 +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://samples"

-           name="Helloworld">

-

-    <component name="WebClient">

-        <implementation.web web-uri=""/>

-        <reference name="service" target="HelloworldService"/>

-    </component>

-

-    <component name="HelloworldService">

-        <implementation.java class="sample.HelloworldServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 28cfdd3f6c..0000000000
--- a/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,52 +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.

--->

-

-<web-app version="2.4"

-         xmlns="http://java.sun.com/xml/ns/j2ee"

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

-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >

-

-    <display-name>Apache Tuscany Helloworld Servlet Sample</display-name>

-

-  <filter>

-    <filter-name>tuscany</filter-name> 

-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 

-  </filter>

-

-  <filter-mapping>

-    <filter-name>tuscany</filter-name> 

-    <url-pattern>/*</url-pattern> 

-  </filter-mapping>

-

-    <servlet>

-        <servlet-name>HelloworldServlet</servlet-name>

-        <servlet-class>sample.HelloworldServlet</servlet-class>

-    </servlet>

-

-    <servlet-mapping>

-        <servlet-name>HelloworldServlet</servlet-name>

-        <url-pattern>/HelloworldServlet</url-pattern>

-    </servlet-mapping>

-

-  <welcome-file-list id="WelcomeFileList">

-    <welcome-file>hello.html</welcome-file>

-  </welcome-file-list>

-

-</web-app>

diff --git a/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/hello.html b/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/hello.html
deleted file mode 100644
index c4484916aa..0000000000
--- a/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/hello.html
+++ /dev/null
@@ -1,46 +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.
--->
-<html>
-
-<head>
-<title>Apache Tuscany Helloworld Servlet Sample</title>
-</head>
-
-<body>
-
-<h2>Apache Tuscany Helloworld Servlet Sample</h2>
-
-<form action="HelloworldServlet" method="post">
-    <table>
-        <tr>
-            <td>Enter your name:</td>
-            <td>
-                <input type="text" name="name" width="10">
-            </td>
-        </tr>
-        <tr>
-            <td align="left" colspan="2">
-                <button name="submit" type="submit">Say hello</button>
-            </td>
-        </tr>
-    </table>
-</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-web-callback/pom.xml b/java/sca-contrib/samples/helloworld-web-callback/pom.xml
deleted file mode 100644
index 4a15d1a8ea..0000000000
--- a/java/sca-contrib/samples/helloworld-web-callback/pom.xml
+++ /dev/null
@@ -1,68 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-web-callback</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Web 2.0 Callbacks Sample</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>compile</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-dwr</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java b/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java
deleted file mode 100644
index 2ee8e97e51..0000000000
--- a/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java
+++ /dev/null
@@ -1,30 +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 sample;

-

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface HelloworldCallback {

-

-    @OneWay

-    void sayHelloCallback(String reply);

-}

diff --git a/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java b/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 9c1e645776..0000000000
--- a/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package sample;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-@Callback(HelloworldCallback.class)

-public interface HelloworldService {

-

-   @OneWay 

-   void sayHello(String name);

-

-}

diff --git a/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java b/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 5601bcd990..0000000000
--- a/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package sample;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(HelloworldService.class)

-public class HelloworldServiceImpl implements HelloworldService {

-

-    @Callback

-    public HelloworldCallback callback;

-    

-    public void sayHello(final String name) {

-        Thread t = new Thread(new Runnable() {

-            public void run() {

-                for (int i=0; i<5; i++) {

-                    callback.sayHelloCallback(i + "Hello " + name);

-                    try {

-                        Thread.sleep(5000);

-                    } catch (InterruptedException e) {

-                        e.printStackTrace();

-                    }

-                }

-            }});

-        t.start();

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite b/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index fdd5a95f58..0000000000
--- a/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite
+++ /dev/null
@@ -1,45 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://samples"

-           name="Helloworld">

-

-    <component name="WebClient">

-        <implementation.web web-uri=""/>

-        <reference name="service" target="HelloworldService">

-	        <tuscany:binding.dwr />

-            <callback>

-                <tuscany:binding.dwr />

-            </callback>

-        </reference>

-    </component>

-

-    <component name="HelloworldService">

-        <implementation.java class="sample.HelloworldServiceImpl"/>

-	    <service name="HelloworldService">

-	        <tuscany:binding.dwr />

-            <callback>

-                <tuscany:binding.dwr />

-            </callback>

-	    </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f29262a147..0000000000
--- a/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,42 +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.

--->

-

-<web-app version="2.4"

-         xmlns="http://java.sun.com/xml/ns/j2ee"

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

-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >

-

-    <display-name>Apache Tuscany Helloworld Servlet Sample</display-name>

-

-  <filter>

-    <filter-name>tuscany</filter-name> 

-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 

-  </filter>

-

-  <filter-mapping>

-    <filter-name>tuscany</filter-name> 

-    <url-pattern>/*</url-pattern> 

-  </filter-mapping>

-

-  <welcome-file-list id="WelcomeFileList">

-    <welcome-file>hello.html</welcome-file>

-  </welcome-file-list>

-

-</web-app>

diff --git a/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/hello.html b/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/hello.html
deleted file mode 100644
index a52cd5d59e..0000000000
--- a/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/hello.html
+++ /dev/null
@@ -1,63 +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.    

--->

-<html>

-

-  <head>

-    <title>Apache Tuscany Helloworld Web2.0 Callbacks Sample</title>

-    <script type="text/javascript" src="org.oasisopen.sca.componentContext.js"></script>

-

-    <script language="JavaScript">

-

-       componentContext.getService("service").sayHelloCallback = 

-          function(reply) {

-             document.getElementById('result').innerHTML=reply;

-          };

-    

-       function callSayHello() {

-          componentContext.getService("service").sayHello(document.getElementById('name').value);

-       }

-

-    </script>

-

-  </head>

-  <body >

-

-    <h2>Apache Tuscany Helloworld Web2.0 Callbacks Sample</h2>

-

-    <table>

-        <tr>

-            <td>Enter your name:</td>

-            <td>

-               <input type="text" id="name" width="10">

-            </td>

-        </tr>

-        <tr>

-            <td align="left" colspan="2">

-               <button name="submit" onclick="callSayHello()">Say hello</button>

-            </td>

-        </tr>

-        <tr>           

-            <td>

-               <div id='result'></div>

-            </td>

-        </tr>

-    </table>

-

-  </body>

-</html>

diff --git a/java/sca-contrib/samples/helloworld-web/pom.xml b/java/sca-contrib/samples/helloworld-web/pom.xml
deleted file mode 100644
index 48160e795a..0000000000
--- a/java/sca-contrib/samples/helloworld-web/pom.xml
+++ /dev/null
@@ -1,68 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-web</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Helloworld Web Sample</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>compile</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/helloworld-web/src/main/java/sample/HelloworldService.java b/java/sca-contrib/samples/helloworld-web/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 2b92fd4661..0000000000
--- a/java/sca-contrib/samples/helloworld-web/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package sample;

-

-public interface HelloworldService {

-	

-	String sayHello(String name);

-

-}

diff --git a/java/sca-contrib/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java b/java/sca-contrib/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 2664e75188..0000000000
--- a/java/sca-contrib/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package sample;

-

-import org.oasisopen.sca.annotation.Service;

-

-@Service(HelloworldService.class)

-public class HelloworldServiceImpl implements HelloworldService {

-

-	public String sayHello(String name) {

-		return "Hello " + name;

-	}

-

-}

diff --git a/java/sca-contrib/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite b/java/sca-contrib/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index 20cebc2d53..0000000000
--- a/java/sca-contrib/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
+++ /dev/null
@@ -1,39 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://samples"

-           name="Helloworld">

-

-    <component name="WebClient">

-        <implementation.web web-uri=""/>

-        <reference name="service" target="HelloworldService">

-	        <tuscany:binding.jsonrpc />

-        </reference>

-    </component>

-

-    <component name="HelloworldService">

-        <implementation.java class="sample.HelloworldServiceImpl"/>

-	    <service name="HelloworldService">

-	        <tuscany:binding.jsonrpc />

-	    </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f29262a147..0000000000
--- a/java/sca-contrib/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,42 +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.

--->

-

-<web-app version="2.4"

-         xmlns="http://java.sun.com/xml/ns/j2ee"

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

-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >

-

-    <display-name>Apache Tuscany Helloworld Servlet Sample</display-name>

-

-  <filter>

-    <filter-name>tuscany</filter-name> 

-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 

-  </filter>

-

-  <filter-mapping>

-    <filter-name>tuscany</filter-name> 

-    <url-pattern>/*</url-pattern> 

-  </filter-mapping>

-

-  <welcome-file-list id="WelcomeFileList">

-    <welcome-file>hello.html</welcome-file>

-  </welcome-file-list>

-

-</web-app>

diff --git a/java/sca-contrib/samples/helloworld-web/src/main/webapp/hello.html b/java/sca-contrib/samples/helloworld-web/src/main/webapp/hello.html
deleted file mode 100644
index f7f8b2d4a9..0000000000
--- a/java/sca-contrib/samples/helloworld-web/src/main/webapp/hello.html
+++ /dev/null
@@ -1,62 +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.    

--->

-<html>

-

-  <head>

-    <title>Apache Tuscany Helloworld Web Sample</title>

-    <script type="text/javascript" src="org.oasisopen.sca.componentContext.js"></script>

-

-    <script language="JavaScript">

-    

-       function callSayHello() {

-          componentContext.getService("service").sayHello(document.getElementById('name').value, 

-             function(reply) {

-                document.getElementById('result').innerHTML=reply;

-             }

-          );

-       }

-

-    </script>

-

-  </head>

-  <body >

-

-    <h2>Apache Tuscany Helloworld Web Sample</h2>

-

-    <table>

-        <tr>

-            <td>Enter your name:</td>

-            <td>

-               <input type="text" id="name" width="10">

-            </td>

-        </tr>

-        <tr>

-            <td align="left" colspan="2">

-               <button name="submit" onclick="callSayHello()">Say hello</button>

-            </td>

-        </tr>

-        <tr>           

-            <td>

-               <div id='result'></div>

-            </td>

-        </tr>

-    </table>

-

-  </body>

-</html>

diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/README b/java/sca-contrib/samples/helloworld-ws-deep-webapp/README
deleted file mode 100644
index 66040004f8..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/README
+++ /dev/null
@@ -1 +0,0 @@
-http://localhost:8080/sample-helloworld-ws-service-webapp/SCA/HelloWorldService?wsdl

diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/build.xml b/java/sca-contrib/samples/helloworld-ws-deep-webapp/build.xml
deleted file mode 100644
index bdb341d26a..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/build.xml
+++ /dev/null
@@ -1,158 +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.    

--->

-<project name="sample-helloworld-ws-service-webapp" default="package">

-    <property file="${user.home}/tuscany/build.properties" />

-    <property file="${user.home}/build.properties" />

-

-    <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>

-    <property name="tuscany.sca.lib.location" value="../../lib"/>

-    <property name="tuscany.sca.modules.location" value="../../modules"/>

-            

-    <path id="project.classpath">

-        <pathelement path="target/classes"/>

-        <pathelement path="target/sdo-source"/>

-        <pathelement location="${tuscany.sca.manifest.location}"/>

-    </path>

-    	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-        <mkdir dir="target/sdo-source"/>

-    </target>

-	

-    	

-    <target name="compile" depends="init">

-        <javac destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-               <src location="src/main/java"/>

-               <src location="target/sdo-source"/>

-               <classpath refid="project.classpath"/>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-            <fileset dir="target/sdo-source"/>

-        </copy>

-    </target>	

-	

-    <target name="package" depends="compile">

-        <war destfile="target/sample-helloworld-ws-service-webapp.war" 

-             webxml="src/main/webapp/WEB-INF/web.xml">

-            <fileset dir="src/main/webapp"/>       	

-            <zipfileset dir="${tuscany.sca.modules.location}" prefix="WEB-INF/lib">

-            	<include name="sca-api-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-assembly-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-feed-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-jsonrpc-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-xml-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-java-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-databinding-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-spi-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-sdo-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-distributed-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-extension-helper-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-http-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-webapp-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-runtime-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-xml-1.4-SNAPSHOT.jar"/>         	

-            	<include name="tuscany-policy-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>

-            </zipfileset>

-            <lib dir="${tuscany.sca.lib.location}">

-            	<include name="XmlSchema-1.3.1.jar"/>

-            	<include name="activation-1.1.jar"/>

-            	<include name="annogen-0.1.0.jar"/>

-            	<include name="ant-1.7.0.jar"/>

-            	<include name="ant-launcher-1.7.0.jar"/>

-            	<include name="axiom-api-1.2.4.jar"/>

-            	<include name="axiom-dom-1.2.4.jar"/>

-            	<include name="axiom-impl-1.2.4.jar"/>

-            	<include name="axis2-java2wsdl-1.2.jar"/>

-            	<include name="axis2-kernel-1.2.jar"/>

-            	<include name="backport-util-concurrent-2.2.jar"/>

-            	<include name="backport-util-concurrent-3.0.jar"/>

-            	<include name="cglib-nodep-2.1_3.jar"/>

-            	<include name="common-2.2.3.jar"/>

-            	<include name="commons-codec-1.3.jar"/>

-            	<include name="commons-fileupload-1.1.1.jar"/>

-            	<include name="commons-httpclient-3.0.1.jar"/>

-            	<include name="commons-io-1.1.jar"/>

-            	<include name="commons-logging-1.1.jar"/>

-            	<include name="ecore-2.2.3.jar"/>

-            	<include name="ecore-change-2.2.3.jar"/>

-            	<include name="ecore-xmi-2.2.3.jar"/>

-            	<include name="geronimo-commonj_1.1_spec-1.0.jar"/>

-            	<include name="geronimo-jms_1.1_spec-1.1.jar"/>

-            	<include name="jakarta-httpcore-4.0-alpha4.jar"/>

-            	<include name="jaxb-api-2.1.jar"/>

-            	<include name="jaxb-impl-2.1.4.jar"/>

-            	<include name="jaxen-1.1-beta-9.jar"/>

-            	<include name="jaxws-api-2.1.jar"/>

-            	<include name="jdom-1.0.jar"/>

-            	<include name="json-rpc-1.0.jar"/>

-            	<include name="jsr181-api-1.0-MR1.jar"/>

-            	<include name="jsr250-api-1.0.jar"/>

-            	<include name="mail-1.4.jar"/>

-            	<include name="neethi-2.0.1.jar"/>

-            	<include name="rome-0.9.jar"/>

-            	<include name="saaj-api-1.3.jar"/>

-            	<include name="sca-api-1.4-SNAPSHOT.jar"/>

-            	<include name="stax-api-1.0-2.jar"/>

-            	<include name="stax-api-1.0.1.jar"/>

-            	<include name="woden-1.0-incubating-M7a.jar"/>

-            	<include name="wsdl4j-1.6.2.jar"/>

-            	<include name="wstx-asl-3.2.1.jar"/>

-            	<include name="xercesImpl-2.8.1.jar"/>

-            	<include name="xml-apis-1.3.03.jar"/>

-            	<include name="xsd-2.2.3.jar"/>

-            	<include name="tuscany-sdo-api-r2.1-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-sdo-impl-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-sdo-lib-1.4-SNAPSHOT.jar"/>

-            </lib>        	

-            <classes dir="target/classes"/>

-            <classes dir="target/sdo-source"/>

-        </war>

-     </target>

-		

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/pom.xml b/java/sca-contrib/samples/helloworld-ws-deep-webapp/pom.xml
deleted file mode 100644
index 0595f43ec2..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/pom.xml
+++ /dev/null
@@ -1,45 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>sample-helloworld-ws-service-webapp</artifactId>
-    <name>Apache Tuscany SCA HelloWorld Web Service Sample Webapp</name>
-    <packaging>war</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index a75187f0d7..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 18f74b083f..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
deleted file mode 100644
index 114608e4d8..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
+++ /dev/null
@@ -1,32 +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"

-    name="helloworldws">

-

-    <service name="HelloWorldService" promote="HelloWorldComponent">

-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-        <binding.ws />

-    </service>

-

-    <component name="HelloWorldComponent">

-       <implementation.java class="helloworld.HelloWorldImpl" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 0b95fbd14f..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,79 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/services/HelloWorldWebService"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 182fd38fd9..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-    <display-name>Apache Tuscany HelloWorld Web Service Sample</display-name>
-    
-</web-app>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/README b/java/sca-contrib/samples/helloworld-ws-reference-jms/README
deleted file mode 100644
index abf10ef1f2..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/README
+++ /dev/null
@@ -1,127 +0,0 @@
-Hello World Web Service References Sample
-=========================================
-This sample demonstrates an SCA reference that uses a web service binding running
-over a JMS protocl. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens you need to run the server first 
-so open a command prompt, navigate to the helloworld-ws-service-jms sample directory 
-and do 
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service-jms.jar helloworld.HelloWorldServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service-jms.jar helloworld.HelloWorldServer
-
-
-Once the server is running open a command prompt, navigate to this sample 
-directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-reference-jms.jar helloworld.HelloWorldJmsClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-reference-jms.jar helloworld.HelloWorldJmsClient
-
-
-Sample Overview
----------------
-The sample provides two components that are have a reference with a 
-web service binding. The binding refers to WSDL that identifies the service
-exposed by the helloworld-ws-service-jms sample. 
-
-helloworld-ws-reference-jms/
-  src/
-    main/
-      java/
-        helloworld/
-          HelloWorldService.java          - interface description for 
-                                            HelloWorldServiceComponent
-          HelloWorldServiceComponent.java - component implementation
-          HelloWorldJmsClient.java         - starts the SCA Runtime and 
-                                            deploys the helloworldwsjmsclient
-                                            .composite. It then calls the 
-                                            HelloWorldServiceComponent
-      resources/
-        wsdl
-          helloworld.wsdl                 - the service description that the 
-                                            SCA reference uses to bind to 
-        helloworldwsjmsclient.composite   - the SCA assembly for this sample
-        helloworldwsjms.composite         - the SCA assembly for the server
-                                            that is used by the JUnit tests
-        logging.properties                - log4j configuration file
-    test/
-      java/
-        helloworld/
-          HelloWorldJMSClientTestCase.java - JUnit test case
-  helloworld-ws-reference.png             - a pictorial representation of the 
-                                            sample .composite file
-  build.xml                               - the Ant build file
-  pom.xml                                 - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant. Before
-you do this start up the service that the reference will talk to. To do this
-run up the helloworld-ws-service-jms test. Take a look at the README in that sample
-and you will see you need the following commands
-
-cd helloworld-ws-service-jms
-ant run
-
-Once done you can now compile and run this sample using the following commands;
-
-cd helloworld-ws-reference-jms
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.
-om.util.StAXUtils).
-     [java] log4j:WARN Please initialize the log4j system properly.
-     [java] Injected helloWorldService
-     [java] Called getGreetings
-     [java] Hello World
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. When using Maven you don't need to run the helloworld-
-ws-service-jms sample first as the JUnit test does this for you. 
-
-cd helloworld-ws-reference-jms
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running helloworld.HelloWorldJmsClientTestCase
-08-Jan-2008 10:40:15 org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvide
-r start
-INFO: Axis2 JMS URL=jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=Qu
-eueConnectionFactory&java.naming.factory.initial=org.apache.activemq.jndi.Active
-MQInitialContextFactory&java.naming.provider.url=tcp://localhost:61619
-Injected helloWorldService
-Called getGreetings
-Injected helloWorldService
-Called getGreetings
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.89 sec
-
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/build.xml b/java/sca-contrib/samples/helloworld-ws-reference-jms/build.xml
deleted file mode 100644
index 4f83c8ae9d..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="helloworld-ws-reference-jms" default="compile">
-    <property name="test.class" value="helloworld.HelloWorldJmsClient" />
-	<property name="test.jar"   value="sample-helloworld-ws-reference-jms.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png b/java/sca-contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg b/java/sca-contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
deleted file mode 100644
index 333ad53e0a..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

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

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.44"

-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference"

-   sodipodi:docname="helloworld-ws-reference.svg"

-   version="1.0"

-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference\helloworld-ws-reference.png"

-   inkscape:export-xdpi="52.84"

-   inkscape:export-ydpi="52.84">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="1.4"

-     inkscape:cx="519.38407"

-     inkscape:cy="414.63224"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="721"

-     inkscape:window-x="85"

-     inkscape:window-y="295" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997"

-       transform="matrix(0.991389,0,0,1,2.215655,0)">

-      <rect

-         rx="13.79423"

-         ry="12.692303"

-         y="192.00233"

-         x="258.3114"

-         height="299.99988"

-         width="446.72086"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">helloworldwsclient</flowPara></flowRoot>    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="85.862968"

-       x="432.05917"

-       y="307.1676"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(172.4684,115.2291)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">HelloWorld</flowPara><flowPara

-         id="flowPara1883">Service</flowPara><flowPara

-         id="flowPara1885">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "

-       id="path3017" />

-    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 528.16111,337.17632 L 561.49615,337.17632 L 567.55706,350.3083 L 560.486,362.43014 L 528.16111,362.43014 L 535.73726,350.3083 L 528.16111,337.17632 z "

-       id="path3019" />

-    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 651.01647,320.75333 L 718.80207,320.75333 L 731.12672,349.11387 L 716.74797,375.29287 L 651.01647,375.29287 L 666.4223,349.11387 L 651.01647,320.75333 z "

-       id="path1887" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1889"

-       transform="translate(388.9491,122.6895)"

-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion1891"><rect

-           id="rect1893"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara1895">HelloWorld</flowPara><flowPara

-         id="flowPara1897">Service</flowPara><flowPara

-         id="flowPara1899" /></flowRoot>    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 567.85714,349.09448 C 666.42857,348.3802 666.42857,348.3802 666.42857,348.3802"

-       id="path1901" />

-  </g>

-</svg>

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/pom.xml b/java/sca-contrib/samples/helloworld-ws-reference-jms/pom.xml
deleted file mode 100644
index d1e77ca628..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/pom.xml
+++ /dev/null
@@ -1,92 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-helloworld-ws-reference-jms</artifactId>
-    <name>Apache Tuscany SCA HelloWorld Web Service Reference JMS Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-helloworld-ws-service-jms</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>apache-activemq</artifactId>
-            <version>4.1.1</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-web-demo</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>          
-        
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 2186c00e57..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
deleted file mode 100644
index b3db243a1f..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ /dev/null
@@ -1,38 +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 helloworld;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate the HelloWorld service and invoke it.
- */
-public class HelloWorldJmsClient {
-
-    public  final static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("helloworldwsjmsclient.composite");
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
-
-        String value = helloWorldService.getGreetings("World");
-        System.out.println(value);
-
-        scaDomain.close();
-    }
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 8255364e99..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,29 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 0dee19550b..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,42 +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 helloworld;
-
-/**
- * The HelloWorld service implementation
- */
-public class HelloWorldServiceComponent implements HelloWorldService {
-   
-    HelloWorldService helloWorldService;
-
-    public String getGreetings(String name) {
-        System.out.println("Called getGreetings");
-        return helloWorldService.getGreetings(name);
-    }
-
-    public HelloWorldService getHelloWorldService() {
-        System.out.println("Got Injected helloWorldService");
-        return helloWorldService;
-    }
-
-    public void setHelloWorldService(HelloWorldService helloWorldService) {
-        System.out.println("Injected helloWorldService");        
-        this.helloWorldService = helloWorldService;
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite b/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
deleted file mode 100644
index d029ba3e1c..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
+++ /dev/null
@@ -1,34 +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://helloworld"

-	xmlns:hw="http://helloworld"

-    name="helloworldws">

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldImpl" />

-	    <service name="HelloWorldService">

-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-            <binding.ws wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapJmsBinding)"

-                    uri="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite b/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
deleted file mode 100644
index a4eb217310..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
+++ /dev/null
@@ -1,45 +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://helloworld"

-	xmlns:hw="http://helloworld"

-	name="helloworldwsclient">

-    

-    <!-- A component with an embedded reference definition connecting to an external webservice 

-         The wsdl interface for the reference is derived from the information specified by the 'wsdlElement'

-     -->

-    <component name="HelloTuscanyServiceComponent">

-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>

-      <reference name="helloWorldService">

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapJmsPort)"/>

-      </reference>

-    </component>

-    

-    <!-- A component with a reference promoted as a composite reference -->

-    <component name="HelloWorldServiceComponent">

-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>

-    </component>

-    

-    <reference name="HelloWorldService" promote="HelloWorldServiceComponent/helloWorldService">

-        <interface.java interface="helloworld.HelloWorldService" />

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapJmsPort)"/>

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties b/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
deleted file mode 100644
index 3dca310cdb..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
+++ /dev/null
@@ -1,30 +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.    
-#
-#  $Rev$ $Date$
-#
-
-# Custom logging configuration for Tuscany samples
-# By default, only INFO level logging is enabled and ALL messages get sent to the console
-# For more messages from the runtime, uncomment specific settings at the end of this file
-handlers = java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-.level=INFO
-
-# Uncomment the next setting to get all Tuscany messages (this will be a lot)
-#org.apache.tuscany.level=FINEST
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 013a55b61e..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,92 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapJmsBinding" name="HelloWorldSoapJmsPort">
-            <wsdlsoap:address location="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/java/sca-contrib/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
deleted file mode 100644
index 12b0716b5d..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.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 helloworld;
-
-import junit.framework.Assert;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * Test case for helloworld web service client 
- */
-public class HelloWorldJmsClientTestCase {
-
-    private HelloWorldService helloWorldService;
-    private HelloWorldService helloTuscanyService;
-    private SCADomain scaClientDomain;
-    private SCADomain scaServiceDomain;
-    private BrokerService jmsBroker;
-   
-
-    @Before
-    public void startClient() throws Exception {
-        try {
-            startBroker();
-            scaServiceDomain = SCADomain.newInstance("helloworldwsjms.composite");
-            scaClientDomain = SCADomain.newInstance("helloworldwsjmsclient.composite");
-            helloWorldService = scaClientDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
-            helloTuscanyService = scaClientDomain.getService(HelloWorldService.class, "HelloTuscanyServiceComponent");
-    
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Test
-    public void testWSClient() throws Exception {
-        String msg = helloWorldService.getGreetings("Smith");
-        Assert.assertEquals("Hello Smith", msg);
-        msg = helloTuscanyService.getGreetings("Green");
-        Assert.assertEquals("Hello Green", msg);
-        
-        Thread.sleep(2000);
-   }
-    
-    
-    @After
-    public void stopClient() throws Exception {
-        scaServiceDomain.close();
-        scaClientDomain.close();
-        if (jmsBroker != null) {
-            jmsBroker.stop();
-        }
-    }
-
-    protected void startBroker() throws Exception {
-        jmsBroker = new BrokerService(); 
-        jmsBroker.setPersistent(false);
-        jmsBroker.setUseJmx(false);
-        jmsBroker.addConnector("tcp://localhost:61619");
-        jmsBroker.start();
-    }
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/README b/java/sca-contrib/samples/helloworld-ws-reference-lean/README
deleted file mode 100644
index 13c89ab2f6..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/README
+++ /dev/null
@@ -1,178 +0,0 @@
-Hello World Web Service References Sample
-=========================================
-This sample demonstrates an SCA reference that uses a web service binding. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens you need to run the server first 
-so open a command prompt, navigate to the helloworld-ws-service sample directory 
-and do 
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service.jar helloworld.HelloWorldServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service.jar helloworld.HelloWorldServer
-
-
-Once the server is running open a command prompt, navigate to this sample 
-directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-reference.jar helloworld.HelloWorldClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-reference.jar helloworld.HelloWorldClient
-
-
-Sample Overview
----------------
-The sample provides a single component that is wired to a reference with a 
-web service binding. The binding refers to WSDL that identifies the service
-exposed by the helloworld-ws-service sample. 
-
-helloworld-ws-reference/
-  src/
-    main/
-      java/
-        helloworld/
-          HelloWorldService.java          - interface description for 
-                                            HelloWorldServiceComponent
-          HelloWorldServiceComponent.java - component implementation
-          HelloWorldClient.java           - starts the SCA Runtime and 
-                                            deploys the helloworldwsclient
-                                            .composite. It then calls the 
-                                            HelloWorldServiceComponent
-      resources/
-        wsdl
-          helloworld.wsdl                 - the service description that the 
-                                            SCA reference uses to bind to 
-        helloworldwsclient.composite      - the SCA assembly for this sample
-        logging.properties                - log4j configuration file
-    test/
-      java/
-        helloworld/
-          HelloWorldClientTestCase.java   - JUnit test case
-          HelloWorldServerTest.java       - starts the Web service
-  helloworld-ws-reference.png             - a pictorial representation of the 
-                                            sample .composite file
-  build.xml                               - the Ant build file
-  pom.xml                                 - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant. Before
-you do this start up the service that the reference will talk to. To do this
-run up the helloworld-ws-service test. Take a look at the README in that sample
-and you will see you need the following commands
-
-cd helloworld-ws-service
-ant run
-
-Once done you can now compile and run this sample using the following commands;
-
-cd helloworld-ws-reference
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] Injected helloWorldService
-     [java] Called getGreetings
-     [java] Hello World
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. When using Maven you don't need to run the helloworld-
-ws-service sample first as Maven does this for you. 
-
-cd helloworld-ws-reference
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running helloworld.HelloWorldClientTestCase
-14-Jan-2008 14:06:12 org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-14-Jan-2008 14:06:12 org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_1_4.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/xml.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_
-0.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/web-app_2_4.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs
-d
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_client
-_1_1.xsd
-14-Jan-2008 14:06:12 org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:12 org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:12 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM
-apping
-INFO: Added Servlet mapping: http://L3AW203:8085/HelloWorldService
-Injected helloWorldService
-Called getGreetings
-14-Jan-2008 14:06:14 org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:17 org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-14-Jan-2008 14:06:17 org.apache.catalina.loader.WebappLoader start
-INFO: Dual registration of jndi stream handler: factory already defined
-14-Jan-2008 14:06:17 org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_1_4.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/xml.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_
-0.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/web-app_2_4.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs
-d
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_client
-_1_1.xsd
-14-Jan-2008 14:06:17 org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:17 org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:17 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM
-apping
-INFO: Added Servlet mapping: http://L3AW203:8085/HelloWorldService
-Injected helloWorldService
-Called getGreetings
-14-Jan-2008 14:06:18 org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8085
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.625 sec
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png b/java/sca-contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg b/java/sca-contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
deleted file mode 100644
index 354ffbae8f..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference"
-   sodipodi:docname="helloworld-ws-reference.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference\helloworld-ws-reference.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="519.38407"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="85"
-     inkscape:window-y="295" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.991389,0,0,1,2.215655,0)">
-      <rect
-         rx="13.79423"
-         ry="12.692303"
-         y="192.00233"
-         x="258.3114"
-         height="299.99988"
-         width="446.72086"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">helloworldwsclient</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="432.05917"
-       y="307.1676"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(172.4684,115.2291)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">HelloWorld</flowPara><flowPara
-         id="flowPara1883">Service</flowPara><flowPara
-         id="flowPara1885">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 528.16111,337.17632 L 561.49615,337.17632 L 567.55706,350.3083 L 560.486,362.43014 L 528.16111,362.43014 L 535.73726,350.3083 L 528.16111,337.17632 z "
-       id="path3019" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 651.01647,320.75333 L 718.80207,320.75333 L 731.12672,349.11387 L 716.74797,375.29287 L 651.01647,375.29287 L 666.4223,349.11387 L 651.01647,320.75333 z "
-       id="path1887" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1889"
-       transform="translate(388.9491,122.6895)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1891"><rect
-           id="rect1893"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1895">HelloWorld</flowPara><flowPara
-         id="flowPara1897">Service</flowPara><flowPara
-         id="flowPara1899" /></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 567.85714,349.09448 C 666.42857,348.3802 666.42857,348.3802 666.42857,348.3802"
-       id="path1901" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/pom.xml b/java/sca-contrib/samples/helloworld-ws-reference-lean/pom.xml
deleted file mode 100644
index ff6907f223..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/pom.xml
+++ /dev/null
@@ -1,79 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-ws-reference-lean</artifactId>

-    <name>Apache Tuscany SCA HelloWorld Web Service Reference Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>sample-helloworld-ws-service</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-        

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index 7839c2366b..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
+++ /dev/null
@@ -1,47 +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 helloworld;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-/**
- * The HelloWorld client implementation
- */
-@Scope("COMPOSITE") @EagerInit
-public class HelloWorldClient {
-   
-    static HelloWorldService helloWorldService;
-
-    @Reference
-    public void setHelloWorldService(HelloWorldService service) {
-        helloWorldService = service;
-    }
-
-    public  final static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
-
-        String value = helloWorldService.getGreetings("World");
-        System.out.println(value);
-
-        scaDomain.close();
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
deleted file mode 100644
index 137894c469..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
+++ /dev/null
@@ -1,53 +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 helloworld;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-/**
- * The HelloWorld client implementation
- */
-@Scope("COMPOSITE") @EagerInit
-public class HelloWorldClient2 {
-    
-    private static HelloWorldClient2 client;
-   
-    @Reference
-    public HelloWorldService helloWorldService;
-
-    public HelloWorldClient2() {
-        client = this;
-    }
-    
-    public  final static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient2.composite");
-        
-        client.doit(args);
-
-        scaDomain.close();
-    }
-    
-    void doit(String[] args) {
-        String value = helloWorldService.getGreetings("World");
-        System.out.println(value);
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
deleted file mode 100644
index 663aa4c852..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
+++ /dev/null
@@ -1,47 +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 helloworld;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-/**
- * The HelloWorld client implementation
- */
-@Scope("COMPOSITE") @EagerInit
-public class HelloWorldClient3 {
-    
-    @Reference
-    public HelloWorldService helloWorldService;
-
-    public  final static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient3.composite");
-        
-        scaDomain.getService(HelloWorldClient3.class, "HelloWorldClient3").doit(args);
-
-        scaDomain.close();
-    }
-    
-    public void doit(String[] args) {
-        String value = helloWorldService.getGreetings("World");
-        System.out.println(value);
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
deleted file mode 100644
index d246225c76..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.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 helloworld;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Scope;
-
-/**
- * The HelloWorld client implementation
- */
-@Scope("COMPOSITE") @EagerInit
-public class HelloWorldClient4 {
-    
-    static ComponentContext clientContext;
-
-    @Context
-    public void setContext(ComponentContext context) {
-        clientContext = context;
-    }
-    
-    public  final static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient4.composite");
-
-        HelloWorldService helloWorldService = clientContext.getService(HelloWorldService.class, "helloWorldService");
-        String value = helloWorldService.getGreetings("World");
-        System.out.println(value);
-
-        scaDomain.close();
-    }
-    
-    public void doit(String[] args) {
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
deleted file mode 100644
index 5113a98530..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
+++ /dev/null
@@ -1,47 +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 helloworld;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-/**
- * The HelloWorld client implementation
- */
-@Scope("COMPOSITE") @EagerInit
-public class HelloWorldClient5 {
-    
-    @Reference
-    public HelloWorldService helloWorldService;
-
-    public  final static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient5.composite");
-        
-        scaDomain.close();
-    }
-
-    @Init
-    public void doit() {
-        String value = helloWorldService.getGreetings("World");
-        System.out.println(value);
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 8255364e99..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,29 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
deleted file mode 100644
index 991e4b4881..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
+++ /dev/null
@@ -1,33 +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://helloworld"
-	xmlns:hw="http://helloworld"
-	name="helloworldwsclient">
-    
-    <!-- A component representing the client program -->
-    <component name="HelloWorldClient">
-      <implementation.java class="helloworld.HelloWorldClient"/>
-      <reference name="helloWorldService">
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
-      </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
deleted file mode 100644
index 6ea14602b3..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
+++ /dev/null
@@ -1,33 +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://helloworld"
-	xmlns:hw="http://helloworld"
-	name="helloworldwsclient">
-    
-    <!-- A component representing the client program -->
-    <component name="HelloWorldClient2">
-      <implementation.java class="helloworld.HelloWorldClient2"/>
-      <reference name="helloWorldService">
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
-      </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
deleted file mode 100644
index 3d6364f55f..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
+++ /dev/null
@@ -1,33 +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://helloworld"
-	xmlns:hw="http://helloworld"
-	name="helloworldwsclient">
-    
-    <!-- A component representing the client program -->
-    <component name="HelloWorldClient3">
-      <implementation.java class="helloworld.HelloWorldClient3"/>
-      <reference name="helloWorldService">
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
-      </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
deleted file mode 100644
index 106e9db988..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
+++ /dev/null
@@ -1,34 +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://helloworld"
-	xmlns:hw="http://helloworld"
-	name="helloworldwsclient">
-    
-    <!-- A component representing the client program -->
-    <component name="HelloWorldClient4">
-      <implementation.java class="helloworld.HelloWorldClient4"/>
-      <reference name="helloWorldService">
-        <interface.java interface="helloworld.HelloWorldService"/>
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
-      </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
deleted file mode 100644
index bbac4c3703..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
+++ /dev/null
@@ -1,33 +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://helloworld"
-	xmlns:hw="http://helloworld"
-	name="helloworldwsclient">
-    
-    <!-- A component representing the client program -->
-    <component name="HelloWorldClient5">
-      <implementation.java class="helloworld.HelloWorldClient5"/>
-      <reference name="helloWorldService">
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
-      </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
deleted file mode 100644
index 3dca310cdb..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
+++ /dev/null
@@ -1,30 +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.    
-#
-#  $Rev$ $Date$
-#
-
-# Custom logging configuration for Tuscany samples
-# By default, only INFO level logging is enabled and ALL messages get sent to the console
-# For more messages from the runtime, uncomment specific settings at the end of this file
-handlers = java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-.level=INFO
-
-# Uncomment the next setting to get all Tuscany messages (this will be a lot)
-#org.apache.tuscany.level=FINEST
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 662c9affac..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,92 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
deleted file mode 100644
index 51b70f47c2..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.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 helloworld;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test case for helloworld web service client 
- */
-public class HelloWorldClientTestCase extends HelloWorldClient {
-
-    private SCADomain scaDomain;
-    private SCATestCaseRunner server;
-
-    @Before
-    public void startClient() throws Exception {
-        scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
-
-        server =  new SCATestCaseRunner(HelloWorldTestServer.class);
-        server.before();
-    }
-    
-    @Test
-    public void testWSClient() throws Exception {
-        String msg = helloWorldService.getGreetings("Smith");
-        Assert.assertEquals("Hello Smith", msg);
-   }
-    
-    @After
-    public void stopClient() throws Exception {
-    	server.after();
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java b/java/sca-contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
deleted file mode 100644
index 8226ec884e..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.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 helloworld;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Starts up the SCA runtime which starts listening for service requests
- */
-public class HelloWorldTestServer {
-
-    private SCADomain scaDomain;
-
-        @Before
-	public void startServer() throws Exception {
-            try {
-                scaDomain = SCADomain.newInstance("META-INF/sca-deployables/helloworldws.composite");
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-	}
-
-	@Test
-	public void testPing() throws IOException {
-		new Socket("127.0.0.1", 8085);
-	}
-
-	@After
-	public void stopServer() throws Exception {
-            scaDomain.close();
-	}
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/README b/java/sca-contrib/samples/helloworld-ws-reference-secure/README
deleted file mode 100644
index 167991c8f7..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/README
+++ /dev/null
@@ -1,176 +0,0 @@
-Hello World Secure Web Service References Sample

-================================================

-This sample demonstrates an SCA reference that uses a web service binding. 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run it to see what happens you need to run the server first 

-so open a command prompt, navigate to the helloworld-ws-service sample directory 

-and do 

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service-secure.jar helloworld.HelloWorldServer

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service-secure.jar helloworld.HelloWorldServer

-

-

-Once the server is running open a command prompt, navigate to this sample 

-directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-reference-secure.jar helloworld.HelloWorldClient

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-reference-secure.jar helloworld.HelloWorldClient

-

-

-Sample Overview

----------------

-The sample provides a single component that is wired to a reference with a 

-web service binding. The binding refers to WSDL that identifies the service

-exposed by the helloworld-ws-service-secure sample. This sample invokes a

-secure web-serivce and hence specifies a policy intent named 'authentication' 

-which is fulfilled by a suitable policyset that is defined for the SCA Domain.  

-Over the helloworld-ws-reference sample, this sample demonstrate generally 

-the use of policy intents and policy sets in Tuscany taking the specific instance 

-of a security policy.

-

-Note :

-------

-The policies mentioned and supported are instances of Tuscany specified policies and 

-not instnaces of WS-Policy.

-

-helloworld-ws-reference-secure/

-  src/

-    main/

-      java/

-        helloworld/

-          HelloWorldService.java          - interface description for 

-                                            HelloWorldServiceComponent

-          HelloWorldServiceComponent.java - component implementation

-          HelloWorldClient.java           - starts the SCA Runtime and 

-                                            deploys the helloworldwsclient

-                                            .composite. It then calls the 

-                                            HelloWorldServiceComponent

-          ClientPWCBHandler.java		  - Callback handler class to provide client password.  The 

-          									handle(Callback[] callbacks) method of this class is where

-          									code for accessing user registries and retrieving passwords 

-          									for given user identifiers can be encapsulated.  For example

-          									here is where one could access LDAP registries to obtain or

-          									compare user identities and passwords.

-         

-      resources/

-        wsdl

-          helloworld.wsdl                 - the service description that the 

-                                            SCA reference uses to bind to 

-        helloworldwsclient.composite      - the SCA assembly for this sample

-        logging.properties                - log4j configuration file

-        definitions.xml					  - the SCA Definitions file that contains intents and policysets 

-        									defined for the SCA Domain

-    test/

-      java/

-        helloworld/

-          HelloWorldClientTestCase.java   - JUnit test case

-          HelloWorldServerTest.java       - starts the Web service

-  helloworld-ws-reference-secure.png             - a pictorial representation of the 

-                                            sample .composite file

-  build.xml                               - the Ant build file

-  pom.xml                                 - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant. Before

-you do this start up the service that the reference will talk to. To do this

-run up the helloworld-ws-service-secure test. Take a look at the README in that sample

-and you will see you need the following commands

-

-cd helloworld-ws-service-secure

-ant run

-

-Once done you can now compile and run this sample using the following commands;

-

-cd helloworld-ws-reference-secure

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

-om.util.StAXUtils).

-     [java] log4j:WARN Please initialize the log4j system properly.

-     [java] Injected helloWorldService

-     [java] Called getGreetings

-     [java] *** Calling Client UserId/Password Handler ....

-     [java] Hello World

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. When using Maven you don't need to run the helloworld-

-ws-service-secure sample first as Maven does this for you. 

-

-cd helloworld-ws-reference-secure

-mvn

-

-You should see the following output from the test phase.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running helloworld.HelloWorldClientTestCase

-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX

-Utils).

-log4j:WARN Please initialize the log4j system properly.

-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX

-Utils).

-log4j:WARN Please initialize the log4j system properly.

-10-May-2007 13:40:34 org.apache.catalina.core.StandardEngine start

-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10

-10-May-2007 13:40:35 org.apache.catalina.startup.ContextConfig defaultWebConfig

-INFO: No default web.xml

-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/resources/j2ee_1_4.xsd

-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/resources/xml.xsd

-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd

-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_

-0.xsd

-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/resources/web-app_2_4.xsd

-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs

-d

-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_client

-_1_1.xsd

-10-May-2007 13:40:35 org.apache.coyote.http11.Http11Protocol init

-INFO: Initializing Coyote HTTP/1.1 on http-8085

-10-May-2007 13:40:35 org.apache.coyote.http11.Http11Protocol start

-INFO: Starting Coyote HTTP/1.1 on http-8085

-Injected helloWorldService

-Called getGreetings

-*** Calling Client UserId/Password Handler ....

-*** Calling Server User/Passwd Handler....

-10-May-2007 13:40:36 org.apache.coyote.http11.Http11Protocol destroy

-INFO: Stopping Coyote HTTP/1.1 on http-8085

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.349 sec

-

-Results :

-

-

-This shows that the Junit test cases have run successfully. Also note that the client side and server side

-callback handlers for authentication have been called.

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/build.xml b/java/sca-contrib/samples/helloworld-ws-reference-secure/build.xml
deleted file mode 100644
index 38f1b7549d..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/build.xml
+++ /dev/null
@@ -1,72 +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.    

--->

-<project name="helloworld-ws-reference-secure" default="compile">

-    <property name="test.class" value="helloworld.HelloWorldClient" />

-	<property name="test.jar"   value="sample-helloworld-ws-reference-secure.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png b/java/sca-contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg b/java/sca-contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
deleted file mode 100644
index 333ad53e0a..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

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

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.44"

-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference"

-   sodipodi:docname="helloworld-ws-reference.svg"

-   version="1.0"

-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference\helloworld-ws-reference.png"

-   inkscape:export-xdpi="52.84"

-   inkscape:export-ydpi="52.84">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="1.4"

-     inkscape:cx="519.38407"

-     inkscape:cy="414.63224"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="721"

-     inkscape:window-x="85"

-     inkscape:window-y="295" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997"

-       transform="matrix(0.991389,0,0,1,2.215655,0)">

-      <rect

-         rx="13.79423"

-         ry="12.692303"

-         y="192.00233"

-         x="258.3114"

-         height="299.99988"

-         width="446.72086"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">helloworldwsclient</flowPara></flowRoot>    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="85.862968"

-       x="432.05917"

-       y="307.1676"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(172.4684,115.2291)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">HelloWorld</flowPara><flowPara

-         id="flowPara1883">Service</flowPara><flowPara

-         id="flowPara1885">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "

-       id="path3017" />

-    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 528.16111,337.17632 L 561.49615,337.17632 L 567.55706,350.3083 L 560.486,362.43014 L 528.16111,362.43014 L 535.73726,350.3083 L 528.16111,337.17632 z "

-       id="path3019" />

-    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 651.01647,320.75333 L 718.80207,320.75333 L 731.12672,349.11387 L 716.74797,375.29287 L 651.01647,375.29287 L 666.4223,349.11387 L 651.01647,320.75333 z "

-       id="path1887" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1889"

-       transform="translate(388.9491,122.6895)"

-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion1891"><rect

-           id="rect1893"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara1895">HelloWorld</flowPara><flowPara

-         id="flowPara1897">Service</flowPara><flowPara

-         id="flowPara1899" /></flowRoot>    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 567.85714,349.09448 C 666.42857,348.3802 666.42857,348.3802 666.42857,348.3802"

-       id="path1901" />

-  </g>

-</svg>

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/pom.xml b/java/sca-contrib/samples/helloworld-ws-reference-secure/pom.xml
deleted file mode 100644
index 5694276870..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/pom.xml
+++ /dev/null
@@ -1,85 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-ws-reference-secure</artifactId>

-    <name>Apache Tuscany SCA HelloWorld Secure Web Service Reference Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.ws.security</groupId>

-            <artifactId>wss4j</artifactId>

-            <version>1.5.3</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>sample-helloworld-ws-service-secure</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java b/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
deleted file mode 100644
index 0f1ebf46d6..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.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.    

- */

-package helloworld;

-

-import java.io.IOException;

-

-import javax.security.auth.callback.Callback;

-import javax.security.auth.callback.CallbackHandler;

-import javax.security.auth.callback.UnsupportedCallbackException;

-

-import org.apache.ws.security.WSPasswordCallback;

-

-/**

- * Sample userid passwd generation class

- */

-public class ClientPWCBHandler implements CallbackHandler {

-

-    public void handle(Callback[] callbacks) throws IOException,

-            UnsupportedCallbackException {

-        for (int i = 0; i < callbacks.length; i++) {

-        	System.out.println("*** Calling Client UserId/Password Handler .... ");

-            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];

-            System.out.println("User Id = " + pwcb.getIdentifer());

-            pwcb.setPassword("TuscanyWsUserPasswd");

-            System.out.println("Set Password = " + pwcb.getPassword());

-        }

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java b/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index a21619fc8a..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
+++ /dev/null
@@ -1,42 +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 helloworld;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This client program shows how to create an SCA runtime, start it,

- * locate the HelloWorld service and invoke it.

- */

-public class HelloWorldClient {

-

-    public  final static void main(String[] args) throws Exception {

-        SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient.composite");

-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");

-

-        String value = helloWorldService.getGreetings("World");

-        System.out.println(value);

-        

-        helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldWsPolicyServiceComponent");

-        value = helloWorldService.getGreetings("WsPolicyWorld");

-        System.out.println(value);

-

-        scaDomain.close();

-    }

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index ca7c90f23e..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,29 +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 helloworld;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The interface for the helloworld service

- */

-@Remotable

-public interface HelloWorldService {

-    public String getGreetings(String name);

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 27cef47677..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,42 +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 helloworld;

-

-/**

- * The HelloWorld service implementation

- */

-public class HelloWorldServiceComponent implements HelloWorldService {

-   

-    HelloWorldService helloWorldService;

-

-    public String getGreetings(String name) {

-        System.out.println("Called getGreetings");

-        return helloWorldService.getGreetings(name);

-    }

-

-    public HelloWorldService getHelloWorldService() {

-        System.out.println("Got Injected helloWorldService");

-        return helloWorldService;

-    }

-

-    public void setHelloWorldService(HelloWorldService helloWorldService) {

-        System.out.println("Injected helloWorldService");        

-        this.helloWorldService = helloWorldService;

-    }

-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
deleted file mode 100644
index 8b089c7222..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ /dev/null
@@ -1,21 +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.

-# 

-# PolicyHandlerClasses to interpret specific PolicyModels against specific QoS infrastructures

-# handler classname;qname=<policy intent addressed>;model=<policy model class>

-org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyHandler;intent=http://helloworld#wsAuthentication,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy

-org.apache.tuscany.sca.policy.security.ws.WSSecurityPolicyHandler;intent=http://helloworld#wsIntegrity,model=org.apache.neethi.Policy
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml b/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
deleted file mode 100644
index 0ab3a5a9f1..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-<sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"

- 			targetNamespace="http://www.osoa.org/xmlns/sca/1.0"

- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

- 			xmlns:hw="http://helloworld">

- 

- <!-- WS Security POLICY SETS -->

- <sca:policySet name="hw:wsClientAuthenticationPolicy"

- 	provides="authentication"

- 	appliesTo="sca:reference/sca:binding.ws">

- 	<tuscany:wsConfigParam>

- 		<parameter name="OutflowSecurity">

- 			<action>

- 				<items>UsernameToken</items>

- 				<user>TuscanyWsUser</user>

-				<passwordCallbackClass>helloworld.ClientPWCBHandler</passwordCallbackClass>" +

-                <passwordType>PasswordText</passwordType>

-               </action>

-    	</parameter>

- 	</tuscany:wsConfigParam>

- </sca:policySet>

- 

- <!-- A policyset that uses WS Policy --> 

- <sca:policySet name="hw:wsSecurityPolicyForIntegrity"

- 	provides="integrity"

- 	appliesTo="sca:reference/sca:binding.ws">

- 	<wsp:Policy wsu:Id="SignOnly" 

- 		xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 

- 		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

-		<wsp:ExactlyOne>

-			<wsp:All>

-				<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<wsp:Policy>

-						<sp:InitiatorToken>

-							<wsp:Policy>

-								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">

-									<wsp:Policy>

-										<sp:WssX509V3Token10/>

-									</wsp:Policy>

-								</sp:X509Token>

-							</wsp:Policy>

-						</sp:InitiatorToken>

-						<sp:RecipientToken>

-							<wsp:Policy>

-								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">

-									<wsp:Policy>

-										<sp:WssX509V3Token10/>

-									</wsp:Policy>

-								</sp:X509Token>

-							</wsp:Policy>

-						</sp:RecipientToken>

-						<sp:AlgorithmSuite>

-							<wsp:Policy>

-								<sp:TripleDesRsa15/>

-							</wsp:Policy>

-						</sp:AlgorithmSuite>

-						<sp:Layout>

-							<wsp:Policy>

-								<sp:Strict/>

-							</wsp:Policy>

-						</sp:Layout>

-						<sp:IncludeTimestamp/>

-						<sp:OnlySignEntireHeadersAndBody/>

-					</wsp:Policy>

-				</sp:AsymmetricBinding>

-				<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<wsp:Policy>

-						<sp:MustSupportRefKeyIdentifier/>

-						<sp:MustSupportRefIssuerSerial/>

-					</wsp:Policy>

-				</sp:Wss10>

-				<sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<sp:Body/>

-				</sp:SignedParts>

-	

-				<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 

-					<ramp:user>TuscanyWsUser</ramp:user>

-					<ramp:encryptionUser>TuscanyWsUser</ramp:encryptionUser>

-					<ramp:passwordCallbackClass>helloworld.ClientPWCBHandler</ramp:passwordCallbackClass>

-					

-					<ramp:signatureCrypto>

-						<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">

-							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>

-							<ramp:property name="org.apache.ws.security.crypto.merlin.file">helloworldKeys.jks</ramp:property>

-							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">TuscanyWsUserPasswd</ramp:property>

-						</ramp:crypto>

-					</ramp:signatureCrypto>

-				</ramp:RampartConfig>

-	

-			</wsp:All>

-		</wsp:ExactlyOne>

-	</wsp:Policy>

- </sca:policySet>

- 

- 

- <!-- Policysets for unit tests that use the testHelloworldws.composite -->

- <!-- Since we use the helloworld-ws-service for the unit testing we need to 

-	 declare these policy sets and with the 'provides' set to the intents that the 

-	 composite in the helloworld-ws-service uses.  -->

- <sca:policySet name="hw:wsAuthenticationPolicy"

- 	provides="authentication"

- 	appliesTo="sca:service/sca:binding.ws"

- 	>

- 	<tuscany:wsConfigParam>

- 		<parameter name="InflowSecurity">

- 			<action>

- 				<items>UsernameToken</items>

- 				<passwordCallbackClass>helloworld.ServerPWCBHandler</passwordCallbackClass>

-       		</action>

-      	</parameter>

- 	</tuscany:wsConfigParam>

- </sca:policySet>

- 

- <sca:policySet name="hw:wsServerSecurityPolicyForIntegrity"

- 	provides="integrity"

- 	appliesTo="sca:service/sca:binding.ws">

- 	<wsp:Policy wsu:Id="SignOnly" 

- 		xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 

- 		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

-		<wsp:ExactlyOne>

-			<wsp:All>

-				<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<wsp:Policy>

-						<sp:InitiatorToken>

-							<wsp:Policy>

-								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">

-									<wsp:Policy>

-										<sp:WssX509V3Token10/>

-									</wsp:Policy>

-								</sp:X509Token>

-							</wsp:Policy>

-						</sp:InitiatorToken>

-						<sp:RecipientToken>

-							<wsp:Policy>

-								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">

-									<wsp:Policy>

-										<sp:WssX509V3Token10/>

-									</wsp:Policy>

-								</sp:X509Token>

-							</wsp:Policy>

-						</sp:RecipientToken>

-						<sp:AlgorithmSuite>

-							<wsp:Policy>

-								<sp:TripleDesRsa15/>

-							</wsp:Policy>

-						</sp:AlgorithmSuite>

-						<sp:Layout>

-							<wsp:Policy>

-								<sp:Strict/>

-							</wsp:Policy>

-						</sp:Layout>

-						<sp:IncludeTimestamp/>

-						<sp:OnlySignEntireHeadersAndBody/>

-					</wsp:Policy>

-				</sp:AsymmetricBinding>

-				<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<wsp:Policy>

-						<sp:MustSupportRefKeyIdentifier/>

-						<sp:MustSupportRefIssuerSerial/>

-					</wsp:Policy>

-				</sp:Wss10>

-				<sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<sp:Body/>

-				</sp:SignedParts>

-	

-				<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 

-					<ramp:user>TuscanyWsUser</ramp:user>

-					<ramp:encryptionUser>TuscanyWsUser</ramp:encryptionUser>

-					<ramp:passwordCallbackClass>helloworld.ServerPWCBHandler</ramp:passwordCallbackClass>

-					

-					<ramp:signatureCrypto>

-						<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">

-							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>

-							<ramp:property name="org.apache.ws.security.crypto.merlin.file">helloworldKeys.jks</ramp:property>

-							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">TuscanyWsUserPasswd</ramp:property>

-						</ramp:crypto>

-					</ramp:signatureCrypto>

-				</ramp:RampartConfig>

-			</wsp:All>

-		</wsp:ExactlyOne>

-	</wsp:Policy>

- </sca:policySet>

- 

- </sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks b/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
deleted file mode 100644
index 0b4f2399f0..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite b/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
deleted file mode 100644
index 904befaf60..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
+++ /dev/null
@@ -1,58 +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://helloworld"

-	xmlns:hw="http://helloworld"

-	xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-	name="helloworldwsclient">

-    

-    <!-- A component with an embedded reference definition connecting to an external webservice 

-         The wsdl interface for the reference is derived from the information specified by the 'wsdlElement'

-     -->

-    <component name="HelloTuscanyServiceComponent">

-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>

-      <reference name="helloWorldService" requires="authentication">

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>

-      </reference>

-    </component>

-    

-    <!-- A component with a reference promoted as a composite reference -->

-    <component name="HelloWorldServiceComponent">

-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>

-    </component>

-    

-    <!-- A component with a reference promoted as a composite reference with a ws policy -->

-    <component name="HelloWorldWsPolicyServiceComponent">

-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>

-    </component>

-    

-    <reference name="HelloWorldService" promote="HelloWorldServiceComponent/helloWorldService" 

-    			requires="authentication">

-        <interface.java interface="helloworld.HelloWorldService" />

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>

-    </reference>

-    

-    <reference name="HelloWorldWsPolicyService" promote="HelloWorldWsPolicyServiceComponent/helloWorldService"

-    			requires="integrity">

-        <interface.java interface="helloworld.HelloWorldService" />

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldWsPolicyService/HelloWorldSoapPort)"/>

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties b/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
deleted file mode 100644
index 3a4b43222d..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
+++ /dev/null
@@ -1,30 +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.    

-#

-#  $Rev: 463856 $ $Date: 2006-10-14 03:54:29 +0530 (Sat, 14 Oct 2006) $

-#

-

-# Custom logging configuration for Tuscany samples

-# By default, only INFO level logging is enabled and ALL messages get sent to the console

-# For more messages from the runtime, uncomment specific settings at the end of this file

-handlers = java.util.logging.ConsoleHandler

-java.util.logging.ConsoleHandler.level = ALL

-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter

-.level=INFO

-

-# Uncomment the next setting to get all Tuscany messages (this will be a lot)

-#org.apache.tuscany.level=FINEST

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index e6fcc6f4a6..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,85 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-	name="helloworld">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-            

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>

-        </wsdl:port>

-    </wsdl:service>

-    

-    <wsdl:service name="HelloWorldWsPolicyService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldWsPolicyService"/>

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java b/java/sca-contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
deleted file mode 100644
index 848c41d1c7..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ /dev/null
@@ -1,74 +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 helloworld;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Test case for helloworld web service client 

- */

-public class HelloWorldClientTestCase {

-

-    private HelloWorldService helloWorldService;

-    private HelloWorldService helloTuscanyService;

-    private SCADomain scaDomain;

-    

-    private SCATestCaseRunner server;

-

-    @Before

-    public void startClient() throws Exception {

-        try {

-            scaDomain = SCADomain.newInstance("helloworldwsclient.composite");

-            helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");

-            helloTuscanyService = scaDomain.getService(HelloWorldService.class, "HelloTuscanyServiceComponent");

-    

-            server =  new SCATestCaseRunner(HelloWorldTestServer.class);

-            server.before();

-

-        } catch (Throwable e) {

-            e.printStackTrace();

-        }

-    }

-    

-    @Test

-    public void testWSClient() throws Exception {

-        String msg = helloWorldService.getGreetings("Smith");

-        Assert.assertEquals("Hello Smith", msg);

-   }

-    

-    @Test

-    public void testEmbeddedReferenceClient() throws Exception {

-        String msg = helloTuscanyService.getGreetings("Tuscany");

-        Assert.assertEquals("Hello Tuscany", msg);

-    }

-    

-    @After

-    public void stopClient() throws Exception {

-    	server.after();

-        scaDomain.close();

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java b/java/sca-contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
deleted file mode 100644
index 21f2166560..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.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 helloworld;

-

-import java.io.IOException;

-import java.net.Socket;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Starts up the SCA runtime which starts listening for service requests

- */

-public class HelloWorldTestServer {

-

-    private SCADomain scaDomain;

-

-        @Before

-	public void startServer() throws Exception {

-            try {

-                scaDomain = SCADomain.newInstance("helloworldws.composite");

-            } catch (Exception e) {

-                e.printStackTrace();

-            }

-	}

-

-	@Test

-	public void testPing() throws IOException {

-		new Socket("127.0.0.1", 8085);

-	}

-

-	@After

-	public void stopServer() throws Exception {

-            scaDomain.close();

-	}

-

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-reference/README b/java/sca-contrib/samples/helloworld-ws-reference/README
deleted file mode 100644
index 13c89ab2f6..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference/README
+++ /dev/null
@@ -1,178 +0,0 @@
-Hello World Web Service References Sample
-=========================================
-This sample demonstrates an SCA reference that uses a web service binding. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens you need to run the server first 
-so open a command prompt, navigate to the helloworld-ws-service sample directory 
-and do 
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service.jar helloworld.HelloWorldServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service.jar helloworld.HelloWorldServer
-
-
-Once the server is running open a command prompt, navigate to this sample 
-directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-reference.jar helloworld.HelloWorldClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-reference.jar helloworld.HelloWorldClient
-
-
-Sample Overview
----------------
-The sample provides a single component that is wired to a reference with a 
-web service binding. The binding refers to WSDL that identifies the service
-exposed by the helloworld-ws-service sample. 
-
-helloworld-ws-reference/
-  src/
-    main/
-      java/
-        helloworld/
-          HelloWorldService.java          - interface description for 
-                                            HelloWorldServiceComponent
-          HelloWorldServiceComponent.java - component implementation
-          HelloWorldClient.java           - starts the SCA Runtime and 
-                                            deploys the helloworldwsclient
-                                            .composite. It then calls the 
-                                            HelloWorldServiceComponent
-      resources/
-        wsdl
-          helloworld.wsdl                 - the service description that the 
-                                            SCA reference uses to bind to 
-        helloworldwsclient.composite      - the SCA assembly for this sample
-        logging.properties                - log4j configuration file
-    test/
-      java/
-        helloworld/
-          HelloWorldClientTestCase.java   - JUnit test case
-          HelloWorldServerTest.java       - starts the Web service
-  helloworld-ws-reference.png             - a pictorial representation of the 
-                                            sample .composite file
-  build.xml                               - the Ant build file
-  pom.xml                                 - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant. Before
-you do this start up the service that the reference will talk to. To do this
-run up the helloworld-ws-service test. Take a look at the README in that sample
-and you will see you need the following commands
-
-cd helloworld-ws-service
-ant run
-
-Once done you can now compile and run this sample using the following commands;
-
-cd helloworld-ws-reference
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] Injected helloWorldService
-     [java] Called getGreetings
-     [java] Hello World
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. When using Maven you don't need to run the helloworld-
-ws-service sample first as Maven does this for you. 
-
-cd helloworld-ws-reference
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running helloworld.HelloWorldClientTestCase
-14-Jan-2008 14:06:12 org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-14-Jan-2008 14:06:12 org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_1_4.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/xml.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_
-0.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/web-app_2_4.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs
-d
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_client
-_1_1.xsd
-14-Jan-2008 14:06:12 org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:12 org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:12 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM
-apping
-INFO: Added Servlet mapping: http://L3AW203:8085/HelloWorldService
-Injected helloWorldService
-Called getGreetings
-14-Jan-2008 14:06:14 org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:17 org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-14-Jan-2008 14:06:17 org.apache.catalina.loader.WebappLoader start
-INFO: Dual registration of jndi stream handler: factory already defined
-14-Jan-2008 14:06:17 org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_1_4.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/xml.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_
-0.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/web-app_2_4.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs
-d
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_client
-_1_1.xsd
-14-Jan-2008 14:06:17 org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:17 org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:17 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM
-apping
-INFO: Added Servlet mapping: http://L3AW203:8085/HelloWorldService
-Injected helloWorldService
-Called getGreetings
-14-Jan-2008 14:06:18 org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8085
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.625 sec
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/build.xml b/java/sca-contrib/samples/helloworld-ws-reference/build.xml
deleted file mode 100644
index 71ee66b31e..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="helloworld-ws-reference" default="compile">
-    <property name="test.class" value="helloworld.HelloWorldClient" />
-	<property name="test.jar"   value="sample-helloworld-ws-reference.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/helloworld-ws-reference.png b/java/sca-contrib/samples/helloworld-ws-reference/helloworld-ws-reference.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference/helloworld-ws-reference.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/java/sca-contrib/samples/helloworld-ws-reference/helloworld-ws-reference.svg
deleted file mode 100644
index 354ffbae8f..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference/helloworld-ws-reference.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference"
-   sodipodi:docname="helloworld-ws-reference.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference\helloworld-ws-reference.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="519.38407"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="85"
-     inkscape:window-y="295" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.991389,0,0,1,2.215655,0)">
-      <rect
-         rx="13.79423"
-         ry="12.692303"
-         y="192.00233"
-         x="258.3114"
-         height="299.99988"
-         width="446.72086"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">helloworldwsclient</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="432.05917"
-       y="307.1676"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(172.4684,115.2291)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">HelloWorld</flowPara><flowPara
-         id="flowPara1883">Service</flowPara><flowPara
-         id="flowPara1885">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 528.16111,337.17632 L 561.49615,337.17632 L 567.55706,350.3083 L 560.486,362.43014 L 528.16111,362.43014 L 535.73726,350.3083 L 528.16111,337.17632 z "
-       id="path3019" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 651.01647,320.75333 L 718.80207,320.75333 L 731.12672,349.11387 L 716.74797,375.29287 L 651.01647,375.29287 L 666.4223,349.11387 L 651.01647,320.75333 z "
-       id="path1887" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1889"
-       transform="translate(388.9491,122.6895)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1891"><rect
-           id="rect1893"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1895">HelloWorld</flowPara><flowPara
-         id="flowPara1897">Service</flowPara><flowPara
-         id="flowPara1899" /></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 567.85714,349.09448 C 666.42857,348.3802 666.42857,348.3802 666.42857,348.3802"
-       id="path1901" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/pom.xml b/java/sca-contrib/samples/helloworld-ws-reference/pom.xml
deleted file mode 100644
index 175f7f7038..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference/pom.xml
+++ /dev/null
@@ -1,79 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-helloworld-ws-reference</artifactId>
-    <name>Apache Tuscany SCA HelloWorld Web Service Reference Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-helloworld-ws-service</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index 4559b282fe..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
+++ /dev/null
@@ -1,38 +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 helloworld;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate the HelloWorld service and invoke it.
- */
-public class HelloWorldClient {
-
-    public  final static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
-
-        String value = helloWorldService.getGreetings("World");
-        System.out.println(value);
-
-        scaDomain.close();
-    }
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 8255364e99..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,29 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 0dee19550b..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,42 +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 helloworld;
-
-/**
- * The HelloWorld service implementation
- */
-public class HelloWorldServiceComponent implements HelloWorldService {
-   
-    HelloWorldService helloWorldService;
-
-    public String getGreetings(String name) {
-        System.out.println("Called getGreetings");
-        return helloWorldService.getGreetings(name);
-    }
-
-    public HelloWorldService getHelloWorldService() {
-        System.out.println("Got Injected helloWorldService");
-        return helloWorldService;
-    }
-
-    public void setHelloWorldService(HelloWorldService helloWorldService) {
-        System.out.println("Injected helloWorldService");        
-        this.helloWorldService = helloWorldService;
-    }
-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
deleted file mode 100644
index 899ad5ce35..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
+++ /dev/null
@@ -1,45 +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://helloworld"
-	xmlns:hw="http://helloworld"
-	name="helloworldwsclient">
-    
-    <!-- A component with an embedded reference definition connecting to an external webservice 
-         The wsdl interface for the reference is derived from the information specified by the 'wsdlElement'
-     -->
-    <component name="HelloTuscanyServiceComponent">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
-      </reference>
-    </component>
-    
-    <!-- A component with a reference promoted as a composite reference -->
-    <component name="HelloWorldServiceComponent">
-      <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-    </component>
-    
-    <reference name="HelloWorldService" promote="HelloWorldServiceComponent/helloWorldService">
-        <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
-    </reference>
-
-</composite>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/logging.properties b/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/logging.properties
deleted file mode 100644
index 3dca310cdb..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/logging.properties
+++ /dev/null
@@ -1,30 +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.    
-#
-#  $Rev$ $Date$
-#
-
-# Custom logging configuration for Tuscany samples
-# By default, only INFO level logging is enabled and ALL messages get sent to the console
-# For more messages from the runtime, uncomment specific settings at the end of this file
-handlers = java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-.level=INFO
-
-# Uncomment the next setting to get all Tuscany messages (this will be a lot)
-#org.apache.tuscany.level=FINEST
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 662c9affac..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,92 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/java/sca-contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
deleted file mode 100644
index 7ce89179c2..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ /dev/null
@@ -1,74 +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 helloworld;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test case for helloworld web service client 
- */
-public class HelloWorldClientTestCase {
-
-    private HelloWorldService helloWorldService;
-    private HelloWorldService helloTuscanyService;
-    private SCADomain scaDomain;
-    
-    private SCATestCaseRunner server;
-
-    @Before
-    public void startClient() throws Exception {
-        try {
-            scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
-            helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
-            helloTuscanyService = scaDomain.getService(HelloWorldService.class, "HelloTuscanyServiceComponent");
-    
-            server =  new SCATestCaseRunner(HelloWorldTestServer.class);
-            server.before();
-
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Test
-    public void testWSClient() throws Exception {
-        String msg = helloWorldService.getGreetings("Smith");
-        Assert.assertEquals("Hello Smith", msg);
-   }
-    
-    @Test
-    public void testEmbeddedReferenceClient() throws Exception {
-        String msg = helloTuscanyService.getGreetings("Tuscany");
-        Assert.assertEquals("Hello Tuscany", msg);
-    }
-    
-    @After
-    public void stopClient() throws Exception {
-    	server.after();
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java b/java/sca-contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
deleted file mode 100644
index 8226ec884e..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.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 helloworld;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Starts up the SCA runtime which starts listening for service requests
- */
-public class HelloWorldTestServer {
-
-    private SCADomain scaDomain;
-
-        @Before
-	public void startServer() throws Exception {
-            try {
-                scaDomain = SCADomain.newInstance("META-INF/sca-deployables/helloworldws.composite");
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-	}
-
-	@Test
-	public void testPing() throws IOException {
-		new Socket("127.0.0.1", 8085);
-	}
-
-	@After
-	public void stopServer() throws Exception {
-            scaDomain.close();
-	}
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/README b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/README
deleted file mode 100644
index aa4819927a..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/README
+++ /dev/null
@@ -1,92 +0,0 @@
-Hello World Web Service SDO WebApp Sample

-=========================================

-This sample demonstrates an SCA web service binding which works with

-SDO and runs as a web application.  

-

-The README in the samples directory (the directory above this) provides

-general instructions about building and running samples. Take a look there

-first.

-

-As this sample provides a web app there is a manual step where the WAR file

-that contains the sample is is built and copied to your web app container. 

-See the sections below for instructions on building the war.

-

-Once the web app is deployed use your browser to visit the following URL;

-

-   http://localhost:8080/sample-helloworld-ws-sdo-webapp

-

-The port and hostname will of course vary depending on your local installation.

-

-The resulting web page displayed should show:

-

-   Hello John Smith, Jane Doe!

-   

-Sample Overview

----------------

-The sample builds a war with a single JSP (HelloWorld.jsp). This JSP 

-calls an SCA component with an SDO parameter. This in turn calls another

-SCA component with the SDO parameter. The contents of the SDO are then 

-returned as a simple string. This sample shows how SDO objects can 

-be passed into and between services in the context of a web application. 

-

-

-helloworld-jsonrpc-webapp/

-  src/

-    main/

-      java/

-        helloworld/ 

-          HelloWorld.java             - service interface

-          HelloWorldComponent.java    - first service implementation

-          HelloWorldmpl.java          - second service implementation

-      resources/

-        wsdl/

-          helloworld.wsdl             - the web services description

-          helloworld.xsd              - the SDO description

-        helloworldws.composite        - the SCA assembly for this sample

-      webapp

-        META-INF/

-          sca-contribution.xml        - specifies the composite to be deployed

-        WEB-INF/

-          web.xml                     - defines the listener that starts up the 

-                                        Tuscany SCA runtime

-        HelloWorld.jsp                - the web application that calls the 

-                                        SCA service passing in an SDO   

-           

-  helloworld-ws-sdo-webapp.png        - a pictorial representation of the 

-                                        sample .composite file

-  build.xml                           - the Ant build file 

-  pom.xml                             - the Maven build file     

-

-Building The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built using Ant as 

-follows

-

-cd helloworld-ws-sdo-webapp

-ant package

-

-This should result in a war file (sample-helloworld-ws-sdo-webapp.war) in the target 

-directory. Copy this war file to your web app deployment directory in your

-web app container. 

-

-The process for getting the web app running will depend on which web app container

-you are using. For example, if you are using Tomcat then it is simply a matter

-of copying the WAR file to the webapps directory. 

-

-Once the web app is deployed use your browser to visit the following URL;

-

-http://localhost:8080/sample-helloworld-ws-sdo-webapp

-

-The port and hostname will of course vary depending on your local installation. 

-

-Building The Sample Using Maven

--------------------------------

-With either the binary or source distributions the sample can be built and run

-using Maven as follows. When using Maven you don't need to run the helloworld-

-ws-service sample first as Maven does this for you.

-

-cd helloworld-ws-sdo-webapp

-mvn

-

-That should end with "BUILD SUCCESSFUL" and create the target/sample-helloworld-ws-sdo-webapp.war

-which you can copy to your server.

diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/build.xml b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/build.xml
deleted file mode 100644
index 386008e707..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/build.xml
+++ /dev/null
@@ -1,99 +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.    
--->
-<!DOCTYPE project [
-<!ENTITY buildDependency SYSTEM "build-dependency.xml">
-]>
-	
-<project name="sample-helloworld-ws-sdo-webapp" default="compile">
-	&buildDependency;
-	
-    <property file="${user.home}/tuscany/build.properties" />
-    <property file="${user.home}/build.properties" />
-
-    <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>
-    <property name="tuscany.sca.lib.location" value="../../lib"/>
-    <property name="tuscany.sca.modules.location" value="../../modules"/>
-            
-    <path id="project.classpath">
-        <pathelement path="target/classes"/>
-        <pathelement path="target/sdo-source"/>
-        <pathelement location="${tuscany.sca.manifest.location}"/>
-    </path>
-    	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-        <mkdir dir="target/sdo-source"/>
-    </target>
-	
-    <target name="generate-sdo" depends="init">
-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">
-            <arg value="-targetDirectory"/>
-            <arg value="target/sdo-source"/>
-            <arg value="-javaPackage"/>
-            <arg value="helloworld.type"/>
-            <arg value="-prefix"/>
-            <arg value="Type"/>
-            <arg value="-noNotification"/>
-            <arg value="src/main/resources/wsdl/helloworld.xsd"/>
-
-            <classpath refid="project.classpath"/>
-        </java>
-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">
-            <arg value="-targetDirectory"/>
-            <arg value="target/sdo-source"/>
-            <arg value="-javaPackage"/>
-            <arg value="helloworld"/>
-            <arg value="-prefix"/>
-            <arg value="Helloworld"/>
-            <arg value="-noNotification"/>
-            <arg value="src/main/resources/wsdl/helloworld.wsdl"/>
-
-            <classpath refid="project.classpath"/>
-        </java>
-    </target>
-    	
-    <target name="compile" depends="init,generate-sdo">
-        <javac destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-               <src location="src/main/java"/>
-               <src location="target/sdo-source"/>
-               <classpath refid="project.classpath"/>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <war destfile="target/sample-helloworld-ws-sdo-webapp.war" 
-             webxml="src/main/webapp/WEB-INF/web.xml">
-            <fileset dir="src/main/webapp"/>       	
-            <lib refid="tuscany.jars"/>
-            <lib refid="3rdparty.jars"/>
-            <classes dir="target/classes"/>
-        </war>
-    </target>	
-	
-    <target name="package" depends="compile"/>
-		
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
deleted file mode 100644
index 2590f02a45..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
deleted file mode 100644
index 56a29db23c..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-panic\sca\samples\helloworld-ws-sdo-webapp"
-   sodipodi:docname="helloworld-ws-sdo-webapp.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\tuscany\java-panic\sca\samples\helloworld-ws-sdo-webapp\helloworld-ws-sdo-webapp.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="474.33468"
-     inkscape:cy="392.43347"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3216"
-     inkscape:window-width="1163"
-     inkscape:window-height="721"
-     inkscape:window-x="357"
-     inkscape:window-y="72" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.991389,0,0,1,2.215655,0)">
-      <rect
-         rx="13.79423"
-         ry="12.692303"
-         y="192.00233"
-         x="258.3114"
-         height="299.99988"
-         width="446.72086"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">helloworldws</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="339.20203"
-       y="307.1676"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(79.611257,115.2291)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">HelloWorld</flowPara><flowPara
-         id="flowPara1883">Service</flowPara><flowPara
-         id="flowPara1885">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 322.05153,339.0146 L 355.38657,339.0146 L 361.44748,352.14658 L 354.37642,364.26842 L 322.05153,364.26842 L 329.62768,352.14658 L 322.05153,339.0146 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 435.30397,337.17632 L 468.63901,337.17632 L 474.69992,350.3083 L 467.62886,362.43014 L 435.30397,362.43014 L 442.88012,350.3083 L 435.30397,337.17632 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.76309967px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 230.68358,326.42055 L 285.13117,326.42055 L 295.03072,351.41286 L 283.48124,374.4827 L 230.68358,374.4827 L 243.05804,351.41286 L 230.68358,326.42055 z "
-       id="path2180" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2182"
-       width="115.66247"
-       height="85.862968"
-       x="535.82629"
-       y="305.44873"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2184"
-       transform="translate(283.37839,113.51021)"><flowRegion
-         id="flowRegion2186"><rect
-           id="rect2188"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2194">HelloWorld</flowPara><flowPara
-         id="flowPara2204">Impl</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 518.67581,337.29571 L 552.01085,337.29571 L 558.07176,350.42769 L 551.0007,362.54953 L 518.67581,362.54953 L 526.25196,350.42769 L 518.67581,337.29571 z "
-       id="path2196" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 473.57143,350.52305 C 525,350.52305 526.42857,350.52305 526.42857,350.52305"
-       id="path2206" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 295,351.52305 C 329.28571,351.52305 329.28571,351.52305 329.28571,351.52305"
-       id="path2208" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2210"><flowRegion
-         id="flowRegion2212"><rect
-           id="rect2214"
-           width="27.857143"
-           height="15.714286"
-           x="483.57144"
-           y="328.38019" /></flowRegion><flowPara
-         id="flowPara2216">SDO</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:#e4a637;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.32558763;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2218"
-       width="72.069756"
-       height="85.64119"
-       x="130.03654"
-       y="303.41675"
-       rx="1.4370956"
-       ry="0.69386131" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3194"
-       transform="matrix(0.7837401,0,0,1,28.844049,-2.1428568)"><flowRegion
-         id="flowRegion3196"><rect
-           id="rect3198"
-           width="95.714287"
-           height="22.857143"
-           x="135.71428"
-           y="310.52304" /></flowRegion><flowPara
-         id="flowPara3200">HelloWorld.jsp</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 202.14286,350.52305 C 242.85714,350.52305 242.85714,350.52305 242.85714,350.52305"
-       id="path3202" />
-    <g
-       id="g3216"
-       transform="matrix(1.4466337,0,0,1.2696311,-263.94558,-87.265114)">
-      <rect
-         rx="13.79423"
-         ry="12.692303"
-         y="192.00233"
-         x="258.3114"
-         height="299.99988"
-         width="446.72086"
-         id="rect3218"
-         style="opacity:0.18888889;fill:#223756;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         xml:space="preserve"
-         style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         x="130"
-         y="179.09448"
-         id="text4213"
-         transform="matrix(0.69126,0,0,0.7876304,182.45502,68.732653)"><tspan
-           sodipodi:role="line"
-           id="tspan4215"
-           x="130"
-           y="179.09448">sample-helloworld-ws-sdo-webapp.war</tspan></text>
-    </g>
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/pom.xml b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/pom.xml
deleted file mode 100644
index d714663dc8..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/pom.xml
+++ /dev/null
@@ -1,200 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-helloworld-ws-sdo-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA HelloWorld Web Service SDO Sample WebApp</name>
-
-    <repositories>
-        <repository>
-            <id>apache.incubator</id>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-api-r2.1</artifactId>
-            <version>1.1.1</version>
-        </dependency>    
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-lib</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-<!-- [rfeng] It doesn't work with the embedded Tomcat, see TUSCANY-1460 -->
-<!--         
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
--->        
-
-        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- marking dependency as provided to exclude from war file -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-helloworld-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFiles>
-                                <configuration>
-                                    <fileName>${basedir}/src/main/resources/wsdl/helloworld.xsd</fileName>
-                                    <javaPackage>helloworld.type</javaPackage>
-                                    <prefix>Type</prefix>
-                                    <noNotification>true</noNotification>
-                                </configuration>
-                                <configuration>
-                                    <fileName>${basedir}/src/main/resources/wsdl/helloworld.wsdl</fileName>
-                                    <javaPackage>helloworld</javaPackage>
-                                    <prefix>Helloworld</prefix>
-                                    <noNotification>true</noNotification>
-                                </configuration>
-                            </schemaFiles>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
-                        </configuration>                    
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>             
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
deleted file mode 100644
index 3123223cd3..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.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.    
- */
-
-/**
- * HelloWorld.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
- */
-package helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/*
- * HelloWorld java interface
- */
-
-@Remotable
-public interface HelloWorld {
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param getGreetings
-     */
-    public java.lang.String getGreetings(helloworld.Party getGreetings);
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
deleted file mode 100644
index fea4e2a16c..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
+++ /dev/null
@@ -1,40 +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 helloworld;
-
-
-public class HelloWorldComponent implements HelloWorld {
-
-    HelloWorld helloWorld;
-
-    public String getGreetings(Party party)  {
-        System.out.println("Called getGreetings");
-        return helloWorld.getGreetings(party);
-    }
-
-    public HelloWorld getHelloWorld() {
-        System.out.println("Got Injected helloWorld");      
-        return helloWorld;
-    }
-    
-    public void setHelloWorld(HelloWorld helloWorld) {
-        System.out.println("Injected helloWorld");        
-        this.helloWorld = helloWorld;
-    }
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index ed99edb2a2..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,48 +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 helloworld;
-
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Service;
-
-@Service(HelloWorld.class)
-public class HelloWorldImpl implements HelloWorld {
-
-    public String getGreetings(Party party) {
-        System.out.println("Greeting party");
-        StringBuffer greetings = new StringBuffer();
-        greetings.append("Hello ");
-        List<Person> people = party.getPeople();
-        int i=0;
-        for (Person person : people) {
-            greetings.append(person.getFirstName());
-            greetings.append(" ");
-            greetings.append(person.getLastName());
-            i++;
-            if (i < people.size()) {
-                greetings.append(", ");
-            }
-        }
-        greetings.append("!");
-        
-        return greetings.toString();
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
deleted file mode 100644
index 34396b1b02..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,43 +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://sample"

-            xmlns:sample="http://sample"

-            xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"

-            name="helloworldws">

-            

-    <service name="HelloWorld" promote="HelloWorldImpl">

-        <interface.java interface="helloworld.HelloWorld" />

-        <binding.ws wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapBinding)"/>

-    </service>

-    

-    <component name="HelloWorldImpl">

-        <implementation.java class="helloworld.HelloWorldImpl" />

-    </component>

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldComponent"/>

-        <reference name="helloWorld" >

-            <interface.java interface="helloworld.HelloWorld" />

-            <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>

-        </reference>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index fe79094b94..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,111 +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://helloworld"
-    xmlns:tns="http://helloworld"
-    xmlns:hw="http://helloworld/type"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified"
-            targetNamespace="http://helloworld"
-            xmlns:tns="http://helloworld"
-            xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <import namespace="http://helloworld/type"
-                schemaLocation="helloworld.xsd" />
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="party" type="tns:Party" />
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn"
-                            type="xsd:string" />
-                    </sequence>
-                </complexType>
-            </element>
-
-            <complexType name="Party">
-                <sequence>
-                    <element name="people" type="tns:Person"
-                        maxOccurs="unbounded" />
-                </sequence>
-            </complexType>
-
-            <complexType name="Person">
-                <complexContent>
-                    <extension base="hw:Person_Base">
-                        <sequence>
-                            <element name="lastName" type="xsd:string" />
-                        </sequence>
-                    </extension>
-                </complexContent>
-            </complexType>
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest"
-                name="getGreetingsRequest" />
-            <wsdl:output message="tns:getGreetingsResponse"
-                name="getGreetingsResponse" />
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document"
-            transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding"
-            name="HelloWorldSoapPort">
-            <wsdlsoap:address
-                location="http://localhost:8080/sample-helloworld-ws-sdo-webapp/HelloWorld" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
deleted file mode 100644
index a0b7c37cd9..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
+++ /dev/null
@@ -1,30 +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 xmlns="http://www.w3.org/2001/XMLSchema"

-    targetNamespace="http://helloworld/type"

-    xmlns:tns="http://helloworld/type"

-    elementFormDefault="qualified">

-    

-    <complexType name="Person_Base">

-        <sequence>

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

-        </sequence>

-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
deleted file mode 100644
index 4657c6cdc1..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
+++ /dev/null
@@ -1,48 +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.

---%>

-

-<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>

-<%@ page import="helloworld.HelloWorld" %>

-<%@ page import="helloworld.HelloworldFactory"%>

-<%@ page import="helloworld.Party"%>

-<%@ page import="helloworld.Person"%>

-

-<%@ page contentType="text/html;charset=UTF-8" language="java" %>

-<%

-    SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");

-    HelloWorld helloWorld = (HelloWorld)scaDomain.getService(HelloWorld.class, "HelloWorldServiceComponent");

-%>

-<html>

-<head><title>Hello World SDO sample</title></head>

-

-<body>

-<%

-	Party party = HelloworldFactory.INSTANCE.createParty();

-	Person person = HelloworldFactory.INSTANCE.createPerson();

-	person.setFirstName("John");

-	person.setLastName("Smith");

-	party.getPeople().add(person);

-	person = HelloworldFactory.INSTANCE.createPerson();

-	person.setFirstName("Jane");

-	person.setLastName("Doe");

-	party.getPeople().add(person);

-%>

-<%= helloWorld.getGreetings(party) %>

-</body>

-</html>

diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 6f241cc90c..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              targetNamespace="http://sample"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:helloworldws"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index b7a7df2c17..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,41 +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.    
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
-    xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
-    <d:environment>
-        <d:moduleId>
-            <d:groupId>org.apache.tuscany.sca</d:groupId>
-            <d:artifactId>sample-helloworld-ws-sdo-webapp</d:artifactId>
-            <d:version>2.0-SNAPSHOT</d:version>
-            <d:type>war</d:type>
-        </d:moduleId>
-        <!-- Using the shared library -->
-        <d:dependencies>
-            <d:dependency>
-                <d:groupId>org.apache.geronimo.configs</d:groupId>
-                <d:artifactId>sharedlib</d:artifactId>
-            </d:dependency>
-        </d:dependencies>
-
-        <!-- TUSCANY-1986 -->
-        <d:inverse-classloading />
-    </d:environment>
-</web-app>
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 257e65aad4..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    * 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.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-    <display-name>Apache Tuscany Hello World Web Service SDO Sample</display-name>
-    
-  <filter>
-    <filter-name>tuscany</filter-name> 
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
-  </filter>
-
-  <filter-mapping>
-    <filter-name>tuscany</filter-name> 
-    <url-pattern>/*</url-pattern> 
-  </filter-mapping>
-  
-  <filter-mapping>
-    <filter-name>tuscany</filter-name> 
-    <url-pattern>/services/*</url-pattern> 
-  </filter-mapping>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>HelloWorld.jsp</welcome-file>
-  </welcome-file-list>
-
-</web-app>
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/README b/java/sca-contrib/samples/helloworld-ws-sdo/README
deleted file mode 100644
index be947b1923..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/README
+++ /dev/null
@@ -1,214 +0,0 @@
-Hello World Web Service References using SDO Sample

-===================================================

-This sample demonstrates an SCA reference that uses a web service binding which works with SDO.  

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-To run this sample

-------------------

-This sample is dependent on helloworld-ws-service. Open a command prompt to start

-the service. If you are running ant do the following:

-

-cd helloworld-ws-service

-ant run

-

-if you don't have ant, issue one of the following commands for windows or *nix:

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service.jar helloworld.HelloWorldServer

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service.jar helloworld.HelloWorldServer

-

-You should see the following output:

-

-Buildfile: build.xml

-

-run-server:

-     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

-om.util.StAXUtils).

-     [java] log4j:WARN Please initialize the log4j system properly.

-     [java] Aug 24, 2007 11:17:33 AM org.apache.catalina.core.StandardEngine sta

-rt

-     [java] INFO: Starting Servlet Engine: Apache Tomcat/6.0.10

-     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.ContextConfig d

-efaultWebConfig

-     [java] INFO: No default web.xml

-     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory

- register

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.

-xsd

-     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory

- register

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt

-aglibrary_1_1.dtd

-     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory

- register

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt

-aglibrary_1_2.dtd

-     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory

- register

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt

-aglibrary_2_0.xsd

-     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory

- register

-     [java] WARNING: Could not get url for /javax/servlet/resources/j2ee_web_ser

-vices_1_1.xsd

-     [java] Aug 24, 2007 11:17:34 AM org.apache.coyote.http11.Http11Protocol ini

-t

-     [java] INFO: Initializing Coyote HTTP/1.1 on http-8085

-     [java] Aug 24, 2007 11:17:34 AM org.apache.coyote.http11.Http11Protocol sta

-rt

-     [java] INFO: Starting Coyote HTTP/1.1 on http-8085

-     [java] Aug 24, 2007 11:17:34 AM org.apache.tuscany.sca.http.tomcat.TomcatSe

-rver addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8085/HelloWorldService

-

-     [java] HelloWorld server started (press enter to shutdown)

-

-The server is now ready.

-

-

-Now, open another command window to run the client.  

-

-cd helloworld-ws-sdo

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-sdo.jar helloworld.HelloWorldClient

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-sdo.jar helloworl.HelloWorldClient

-

-You should be able to see the following result:

-

-Buildfile: build.xml

-

-run:

-     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

-om.util.StAXUtils).

-     [java] log4j:WARN Please initialize the log4j system properly.

-     [java] Injected helloWorldService

-     [java] Called getGreetings

-     [java] Hello David Haney

-

-BUILD SUCCESSFUL

-Total time: 9 seconds

-

-

-Sample Overview

----------------

-The sample provides a single component that is wired to a reference with a 

-web service binding. The binding refers to WSDL that identifies the service

-exposed by the helloworld-ws-service sample. 

-

-helloworld-ws-sdo/

-  src/

-    main/

-      java/

-        helloworld/

-          HelloWorldService.java          - interface description for 

-                                            HelloWorldServiceComponent

-          HelloWorldServiceComponent.java - component implementation

-          HelloWorldClient.java           - starts the SCA Runtime and 

-                                            deploys the helloworldwsclient

-                                            .composite. It then calls the 

-                                            HelloWorldServiceComponent

-      resources/

-        wsdl

-          helloworld.wsdl                 - the service description that the 

-                                            SCA reference uses to bind to service. 

-      

-    test/

-      java/

-        helloworld/

-          HelloWorldClientTestCase.java   - JUnit test case

-        helloworld-ws-sdo.png             - a pictorial representation of the 

-                                            sample .composite file

-  build.xml                               - the Ant build file

-  pom.xml                                 - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-You can build and run the sample with the binary distribution using Ant. 

-Make sure that you have started helloworld-ws-service which this sample is dependent on

-in a separate command window. You can either follow the instruction at the begining of this 

-sample file or if you want to build and run the service, follow the README under helloworld-ws-service.

-

-Now, let's build and run helloworld-ws-sdo sample:

-

-cd helloworld-ws-sdo                                             

-ant 

-ant run 

-

-You should see the following output from the run target.

-

-run:

-     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

-om.util.StAXUtils).

-     [java] log4j:WARN Please initialize the log4j system properly.

-     [java] Injected helloWorldService

-     [java] Called getGreetings

-     [java] Hello World

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-You can build and run the sample with either the binary or source distributions using Maven. Please note that you do not need to start helloworld-ws-service in this case since Maven does this for you.

-

-cd helloworld-ws-sdo

-mvn

-

-You should see the following output from the test phase.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running helloworld.HelloWorldClientTestCase

-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX

-Utils).

-log4j:WARN Please initialize the log4j system properly.

-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX

-Utils).

-log4j:WARN Please initialize the log4j system properly.

-Aug 23, 2007 2:27:32 PM org.apache.catalina.core.StandardEngine start

-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10

-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.ContextConfig defaultWebConf

-ig

-INFO: No default web.xml

-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd

-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_

-1.dtd

-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_

-2.dtd

-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_

-0.xsd

-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs

-d

-Aug 23, 2007 2:27:32 PM org.apache.coyote.http11.Http11Protocol init

-INFO: Initializing Coyote HTTP/1.1 on http-8085

-Aug 23, 2007 2:27:32 PM org.apache.coyote.http11.Http11Protocol start

-INFO: Starting Coyote HTTP/1.1 on http-8085

-Aug 23, 2007 2:27:32 PM org.apache.tuscany.sca.http.tomcat.TomcatServer addServl

-etMapping

-INFO: Added Servlet mapping: http://localhost:8085/HelloWorldService

-Injected helloWorldService

-Called getGreetings

-Aug 23, 2007 2:27:34 PM org.apache.coyote.http11.Http11Protocol destroy

-INFO: Stopping Coyote HTTP/1.1 on http-8085

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.502 sec

-

-Results :

-

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

-

-

-This shows that the Junit test cases have run successfully. 

diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/build.xml b/java/sca-contrib/samples/helloworld-ws-sdo/build.xml
deleted file mode 100644
index 401315d424..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/build.xml
+++ /dev/null
@@ -1,101 +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.    
--->
-<project name="helloworld-ws-sdo" default="compile" basedir=".">
-    <property file="${user.home}/tuscany/build.properties" />
-    <property file="${user.home}/build.properties" />
-
-    <property name="server.class" value="helloworld.HelloWorldServer" />    
-    <property name="client.class" value="helloworld.HelloWorldClient" />
-    <property name="test.jar"   value="sample-helloworld-ws-sdo.jar" />
-
-    <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>
-
-    <target name="init">
-        <mkdir dir="target/classes"/>
-        <mkdir dir="target/sdo-source"/>
-    </target>
-        
-    <path id="project.classpath">
-        <pathelement path="target/classes"/>
-        <pathelement path="target/sdo-source"/>
-        <pathelement location="${tuscany.sca.manifest.location}"/>
-    </path>
-        
-    <target name="generate-sdo" depends="init">
-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">
-            <arg value="-targetDirectory"/>
-            <arg value="target/sdo-source"/>
-            <arg value="-javaPackage"/>
-            <arg value="helloworld"/>
-            <arg value="-prefix"/>
-            <arg value="Helloworld"/>
-            <arg value="-noNotification"/>
-            <arg value="-noContainment"/>
-            <arg value="-noUnsettable"/>
-            <arg value="src/main/resources/wsdl/helloworld.wsdl"/>
-
-            <classpath refid="project.classpath"/>
-        </java>
-    </target>
-
-    <target name="compile" depends="init, generate-sdo">
-        <javac destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <src location="src/main/java"/>
-            <src location="target/sdo-source"/>
-            <classpath refid="project.classpath"/>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-            <fileset dir="target/sdo-source"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${client.class}" fork="true">
-        <classpath refid="project.classpath"/>        </java>
-    </target>
-
-    <target name="run-server">
-        <java classname="${server.class}" fork="true">
-            <classpath path="target/${test.jar}"/>
-            <classpath refid="project.classpath"/>
-        </java>    	
-    </target>
-
-    <target name="run">
-        <java classname="${client.class}" fork="true">
-            <classpath path="target/${test.jar}"/>
-            <classpath refid="project.classpath"/>
-        </java>    	
-    </target>
-		
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/java/sca-contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/java/sca-contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
deleted file mode 100644
index 333ad53e0a..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

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

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.44"

-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference"

-   sodipodi:docname="helloworld-ws-reference.svg"

-   version="1.0"

-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference\helloworld-ws-reference.png"

-   inkscape:export-xdpi="52.84"

-   inkscape:export-ydpi="52.84">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="1.4"

-     inkscape:cx="519.38407"

-     inkscape:cy="414.63224"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="721"

-     inkscape:window-x="85"

-     inkscape:window-y="295" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997"

-       transform="matrix(0.991389,0,0,1,2.215655,0)">

-      <rect

-         rx="13.79423"

-         ry="12.692303"

-         y="192.00233"

-         x="258.3114"

-         height="299.99988"

-         width="446.72086"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">helloworldwsclient</flowPara></flowRoot>    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="85.862968"

-       x="432.05917"

-       y="307.1676"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(172.4684,115.2291)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">HelloWorld</flowPara><flowPara

-         id="flowPara1883">Service</flowPara><flowPara

-         id="flowPara1885">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "

-       id="path3017" />

-    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 528.16111,337.17632 L 561.49615,337.17632 L 567.55706,350.3083 L 560.486,362.43014 L 528.16111,362.43014 L 535.73726,350.3083 L 528.16111,337.17632 z "

-       id="path3019" />

-    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 651.01647,320.75333 L 718.80207,320.75333 L 731.12672,349.11387 L 716.74797,375.29287 L 651.01647,375.29287 L 666.4223,349.11387 L 651.01647,320.75333 z "

-       id="path1887" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1889"

-       transform="translate(388.9491,122.6895)"

-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion1891"><rect

-           id="rect1893"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara1895">HelloWorld</flowPara><flowPara

-         id="flowPara1897">Service</flowPara><flowPara

-         id="flowPara1899" /></flowRoot>    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 567.85714,349.09448 C 666.42857,348.3802 666.42857,348.3802 666.42857,348.3802"

-       id="path1901" />

-  </g>

-</svg>

diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/pom.xml b/java/sca-contrib/samples/helloworld-ws-sdo/pom.xml
deleted file mode 100644
index 23c16b4981..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/pom.xml
+++ /dev/null
@@ -1,139 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-helloworld-ws-sdo</artifactId>
-    <name>Apache Tuscany SCA HelloWorld Web Service SDO Sample</name>
-
-    <repositories>
-        <repository>
-            <id>apache.incubator</id>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-lib</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-helloworld-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/helloworld.wsdl</schemaFile>
-                            <javaPackage>helloworld</javaPackage>
-                            <prefix>Helloworld</prefix>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index de4795ceaf..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.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 helloworld;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it, locate the
- * HelloWorld service and invoke it.
- */
-public class HelloWorldClient {
-
-    public final static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
-        HelloWorldService helloWorldService =
-            scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
-
-        Name name = HelloworldFactory.INSTANCE.createName();
-
-        name.setFirst("David");
-        name.setLast("Haney");
-
-        String value = helloWorldService.getGreetings(name);
-        System.out.println(value);
-
-        scaDomain.close();
-    }
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index c42a4d59c3..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(Name name) {
-        return "Hello " + name.getFirst() + " " + name.getLast();
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index e03ed4dc25..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ /dev/null
@@ -1,46 +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 helloworld;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This server program shows how to create an SCA runtime, and start it which
- * activates the helloworld Web service endpoint.
- */
-public class HelloWorldServer {
-
-    public static void main(String[] args) {
-
-        SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite");
-
-        try {
-            System.out.println("HelloWorld server started (press enter to shutdown)");
-            System.in.read();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        scaDomain.close();
-        System.out.println("HelloWorld server stopped");
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 0c3025f0c9..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,29 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    public String getGreetings(Name name);
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 711eef63b5..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,42 +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 helloworld;
-
-/**
- * The HelloWorld service implementation
- */
-public class HelloWorldServiceComponent implements HelloWorldService {
-   
-    HelloWorldService helloWorldService;
-
-    public String getGreetings(Name name) {
-        System.out.println("Called getGreetings");
-        return helloWorldService.getGreetings(name);
-    }
-
-    public HelloWorldService getHelloWorldService() {
-        System.out.println("Got Injected helloWorldService");
-        return helloWorldService;
-    }
-
-    public void setHelloWorldService(HelloWorldService helloWorldService) {
-        System.out.println("Injected helloWorldService");        
-        this.helloWorldService = helloWorldService;
-    }
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
deleted file mode 100644
index c255df2897..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,32 +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://helloworld"

-    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:hw="http://helloworld"

-    name="helloworldws">

-    

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldImpl" />
-        <service name="HelloWorldService">

-            <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-            <binding.ws uri="http://localhost:8085/HelloWorldService" />

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
deleted file mode 100644
index d4fba548d5..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ /dev/null
@@ -1,33 +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://helloworld"

-    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:hw="http://helloworld"

-    name="helloworldwsclient">

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldServiceComponent" />

-    </component>

-

-    <reference name="HelloWorldService" promote="HelloWorldServiceComponent/helloWorldService">

-        <interface.java interface="helloworld.HelloWorldService" />

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

-    </reference>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/logging.properties
deleted file mode 100644
index 3dca310cdb..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/logging.properties
+++ /dev/null
@@ -1,30 +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.    
-#
-#  $Rev$ $Date$
-#
-
-# Custom logging configuration for Tuscany samples
-# By default, only INFO level logging is enabled and ALL messages get sent to the console
-# For more messages from the runtime, uncomment specific settings at the end of this file
-handlers = java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-.level=INFO
-
-# Uncomment the next setting to get all Tuscany messages (this will be a lot)
-#org.apache.tuscany.level=FINEST
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 2ecc0bea43..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,88 +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://helloworld" xmlns:tns="http://helloworld"

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

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

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld"

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

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="tns:Name" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <complexType name="Name">

-                <sequence>

-                    <element name="first" type="xsd:string" />

-                    <element name="last" type="xsd:string" />

-                </sequence>

-            </complexType>

-

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest" />

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse" />

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction="" />

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldService" />

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/java/sca-contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
deleted file mode 100644
index 11564c370f..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ /dev/null
@@ -1,69 +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 helloworld;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test case for helloworld web service client 
- */
-public class HelloWorldClientTestCase {
-
-    private HelloWorldService helloWorldService;
-    private SCADomain scaDomain;
-    
-    private SCATestCaseRunner server;
-
-    @Before
-    public void startClient() throws Exception {
-        try {
-            scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
-            helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
-    
-            server =  new SCATestCaseRunner(HelloWorldTestServer.class);
-            server.before();
-
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-    
-    @Test
-    public void testWSClient() throws Exception {
-        Name name = HelloworldFactory.INSTANCE.createName();
-        name.setFirst("John");
-        name.setLast("Smith");
-        String msg = helloWorldService.getGreetings(name);
-        Assert.assertEquals("Hello John Smith", msg);
-    }
-    
-    @After
-    public void stopClient() throws Exception {
-    	server.after();
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/java/sca-contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
deleted file mode 100644
index 4b0c40dafd..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.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 helloworld;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Starts up the SCA runtime which starts listening for service requests
- */
-public class HelloWorldTestServer {
-
-    private SCADomain scaDomain;
-
-        @Before
-	public void startServer() throws Exception {
-            try {
-                scaDomain = SCADomain.newInstance("helloworldws.composite");
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-	}
-
-	@Test
-	public void testPing() throws IOException {
-		new Socket("127.0.0.1", 8085);
-	}
-
-	@After
-	public void stopServer() throws Exception {
-            scaDomain.close();
-	}
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/README b/java/sca-contrib/samples/helloworld-ws-service-jms/README
deleted file mode 100644
index 26272b1d91..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/README
+++ /dev/null
@@ -1,119 +0,0 @@
-Hello World SOAP/JMS Service Sample

-===================================

-This sample demonstrates an SCA service that uses a web service binding using 

-a SOAP/JMS protocol 

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run it to see what happens open a command prompt, navigate

-to this sample directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service-jms.jar helloworld.HelloWorldServer

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service-jms.jar helloworld.HelloWorldServer

-

-Now the server is started you can use the helloworld-ws-reference-jms sample to 

-exercise it. 

-

-Sample Overview

----------------

-The sample provides a single component that is wired to a service with a 

-web service binding.

-

-helloworld-ws-service-jms/

-  src/

-    main/

-      java/

-        helloworld/

-          HelloWorldService.java          - interface description for 

-                                            HelloWorldServiceComponent

-          HelloWorldImpl.java             - component implementation

-          HelloWorldServer.java           - starts the SCA Runtime and 

-                                            deploys the helloworldwsjms

-                                            .composite and then waits for the

-                                            service to be called via web services

-      resources/

-        wsdl/

-          helloworld.wsdl                 - the service description that describes

-                                            the exposed service

-        helloworldwsjms.composite         - the SCA assembly for this sample

-        helloworldwsjmspolicy.composite   - shows how the protocol can be 

-                                            selected using policy. Not run

-                                            by the sample

-    test/

-      java/

-        helloworld/

-          HelloWorldJMSServerTestCase.java- JUnit test case 

-          HelloWorldJMSPolicyServerTestCase.java- JUnit test case 

-  helloworld-ws-service.png               - a pictorial representation of the 

-                                            sample .composite file

-  build.xml                               - the Ant build file

-  pom.xml                                 - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant using the 

-following commands

-

-cd helloworld-ws-service-jms

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

-om.util.StAXUtils).

-     [java] log4j:WARN Please initialize the log4j system properly.

-     [java] HelloWorld server started (press enter to shutdown)

-     

-As this point the SCA service is exposed as a web service by a web server 

-started automatically by the SCA runtime. To stop the server just press 

-enter.

-

-To exercise the service run up the helloworld-ws-reference-jms sample. Take a look at 

-the README in that sample and you will see you need the following commands

-

-cd helloworld-ws-reference-jms

-ant run

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. When using Maven you don't need to run the helloworld-

-ws-reference-jms sample as Maven includes a simple ping test to make sure that the

-service is available

-

-cd helloworld-ws-service-jms

-mvn

-

-You should see the following output from the test phase.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running helloworld.HelloWorldJmsPolicyServerTestCase

-08-Jan-2008 10:41:17 org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvide

-r start

-INFO: Axis2 JMS URL=jms:/HelloWorldServiceComponent?java.naming.factory.initial=

-org.apache.activemq.jndi.ActiveMQInitialContextFactory&java.naming.provider.url=

-tcp://localhost:61619&transport.jms.ConnectionFactoryJNDIName=QueueConnectionFac

-tory

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.984 sec

-Running helloworld.HelloWorldJmsServerTestCase

-08-Jan-2008 10:41:22 org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvide

-r start

-INFO: Axis2 JMS URL=jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=Qu

-eueConnectionFactory&java.naming.factory.initial=org.apache.activemq.jndi.Active

-MQInitialContextFactory&java.naming.provider.url=tcp://localhost:61619

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.266 sec

-

-This shows that the Junit test cases have run successfully. 

diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/build.xml b/java/sca-contrib/samples/helloworld-ws-service-jms/build.xml
deleted file mode 100644
index 330de7f7e5..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/build.xml
+++ /dev/null
@@ -1,72 +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.    

--->

-<project name="helloworld-ws-service-jms" default="compile">

-    <property name="test.class" value="helloworld.HelloWorldServer" />

-	<property name="test.jar"   value="sample-helloworld-ws-service-jms.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.png b/java/sca-contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.png
deleted file mode 100644
index eab29d0bcd..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.svg b/java/sca-contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
deleted file mode 100644
index 8d2ae98c82..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

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

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.45.1"

-   sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\helloworld-ws-service"

-   sodipodi:docname="helloworld-ws-service.svg"

-   version="1.0"

-   inkscape:export-filename="C:\simon\tuscany\java-head\sca\samples\helloworld-ws-service\helloworld-ws-service.png"

-   inkscape:export-xdpi="52.84"

-   inkscape:export-ydpi="52.84"

-   inkscape:output_extension="org.inkscape.output.svg.inkscape">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="1.4"

-     inkscape:cx="519.38407"

-     inkscape:cy="414.63224"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="573"

-     inkscape:window-x="117"

-     inkscape:window-y="316" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997"

-       transform="matrix(0.991389,0,0,1,2.215655,0)">

-      <rect

-         rx="13.79423"

-         ry="12.692303"

-         y="192.00233"

-         x="258.3114"

-         height="299.99988"

-         width="446.72086"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">helloworldws</flowPara></flowRoot>    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="85.862968"

-       x="432.05917"

-       y="307.1676"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(172.4684,115.2291)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">HelloWorld</flowPara><flowPara

-         id="flowPara1883">Service</flowPara><flowPara

-         id="flowPara1885">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "

-       id="path3017" />

-    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 226.73064,320.75315 L 293.91185,320.75315 L 306.1266,352.82797 L 291.87606,382.43553 L 226.73064,382.43553 L 241.99911,352.82797 L 226.73064,320.75315 z "

-       id="path1892" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1894"

-       transform="translate(-37.47944,122.8324)"

-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion1896"><rect

-           id="rect1898"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara1900">HelloWorld</flowPara><flowPara

-         id="flowPara1906">Web</flowPara><flowPara

-         id="flowPara1904">Service</flowPara></flowRoot>    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 305.71429,353.3802 L 422.85714,351.95163"

-       id="path1910"

-       inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-service\helloworld-ws-service.png"

-       inkscape:export-xdpi="52.84"

-       inkscape:export-ydpi="52.84" />

-  </g>

-</svg>

diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/pom.xml b/java/sca-contrib/samples/helloworld-ws-service-jms/pom.xml
deleted file mode 100644
index 90f3e7f297..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/pom.xml
+++ /dev/null
@@ -1,87 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-ws-service-jms</artifactId>

-    <name>Apache Tuscany SCA HelloWorld Web Service JMS Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>compile</scope>            

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>compile</scope>            

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-core</artifactId>

-            <version>4.1.1</version>

-            <scope>compile</scope>            

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>    

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-       

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 2186c00e57..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java b/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index 5454487ff6..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
+++ /dev/null
@@ -1,60 +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 helloworld;

-

-import java.io.IOException;

-

-import org.apache.activemq.broker.BrokerService;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This server program shows how to create an SCA runtime, and start it which

- * activates the helloworld Web service endpoint.

- */

-public class HelloWorldServer {

-

-    protected static BrokerService startBroker() throws Exception {

-        BrokerService jmsBroker = new BrokerService();

-        jmsBroker.setPersistent(false);

-        jmsBroker.setUseJmx(false);

-        jmsBroker.addConnector("tcp://localhost:61619");

-        jmsBroker.start();

-        return jmsBroker;

-    }

-

-    public static void main(String[] args) throws Exception {

-

-        BrokerService broker = startBroker();

-        SCADomain scaDomain = SCADomain.newInstance("helloworldwsjms.composite");

-

-        try {

-            System.out.println("HelloWorld server started (press enter to shutdown)");

-            System.in.read();

-        } catch (IOException e) {

-            e.printStackTrace();

-        }

-

-        scaDomain.close();

-        broker.stop();

-        System.out.println("HelloWorld server stopped");

-        // FIXME: Workaround for http://issues.apache.org/jira/browse/AXIS2-3685

-        System.exit(0);

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index a0081be22d..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.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 helloworld;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

-

diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml b/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
deleted file mode 100644
index 8c881ab0bb..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-<sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"

- 			targetNamespace="http://www.osoa.org/xmlns/sca/1.0"

- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

-

- <sca:intent name="transport"  

- 			 constrains="sca:binding.ws">

- 			 <sca:description>

- 			 The general intent that a transport is available over which SOAP messages flow 

- 			 </sca:description>

- </sca:intent>

-

- <sca:intent name="transport.jms">

- 			 <sca:description>

- 			 A JMS transport is required

- 			 </sca:description>

- </sca:intent>

- 

- <sca:intent name="transport.http">

-             <sca:description>

-             An HTTP transport is required

-             </sca:description>

- </sca:intent>

- 

- <!-- 

-   how does the following relate to confidentiality intents 

-   does confidentiality become a profile intent?

- -->

- <sca:intent name="transport.https">

-             <sca:description>

-             An HTTPS transport is required

-             </sca:description>

- </sca:intent>

-

- <sca:policySet name="wsJMSTransportPolicy"

- 	provides="transport.jms"

- 	appliesTo="sca:binding.ws">

- 	<tuscany:wsConfigParam>

-        <parameter name="TuscanyQueueConnectionFactory">

-            <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>

-            <parameter name="java.naming.provider.url">tcp://localhost:61619</parameter>

-            <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>

-        </parameter>

- 	</tuscany:wsConfigParam>

- </sca:policySet>

- 

- </sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite b/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
deleted file mode 100644
index 67079f738e..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.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"

-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-	targetNamespace="http://helloworld"

-	xmlns:hw="http://helloworld"

-    name="helloworldws">

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldImpl" />

-	    <service name="HelloWorldService">

-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-            <binding.ws wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapJmsBinding)"

-                    uri="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite b/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
deleted file mode 100644
index 10faf374f3..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
+++ /dev/null
@@ -1,34 +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://helloworld"

-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-	xmlns:hw="http://helloworld"

-    name="helloworldws">

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldImpl" />

-	    <service name="HelloWorldService">

-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-            <binding.ws requires="transport.jms"/>

-        </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 3f9e00689e..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,92 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-	name="helloworld">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-            

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldServiceComponent"/>

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java b/java/sca-contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
deleted file mode 100644
index 34f8605d5d..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.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 helloworld;

-

-import static junit.framework.Assert.assertEquals;

-import static junit.framework.Assert.assertNotNull;

-

-import java.io.IOException;

-

-import org.apache.activemq.broker.BrokerService;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests that the helloworld server is available

- */

-public class HelloWorldJmsPolicyServerTestCase{

-

-    private SCADomain scaDomain;

-    private BrokerService jmsBroker;

-

-    @Before

-    public void startServer() throws Exception {

-    	startBroker();

-        scaDomain = SCADomain.newInstance("helloworldwsjmspolicy.composite");

-    }

-

-    protected void startBroker() throws Exception {

-        jmsBroker = new BrokerService(); 

-        jmsBroker.setPersistent(false);

-        jmsBroker.setUseJmx(false);

-        jmsBroker.addConnector("tcp://localhost:61619");

-        jmsBroker.start();

-    }

-

-    @Test

-    public void testServiceCall() throws IOException {

-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

-    }

- 

-    @After

-    public void stopServer() throws Exception {

-        scaDomain.close();

-        if (jmsBroker != null) {

-            jmsBroker.stop();

-        }

-    }

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java b/java/sca-contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
deleted file mode 100644
index 03d566cc17..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
+++ /dev/null
@@ -1,72 +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 helloworld;

-

-import static junit.framework.Assert.assertEquals;

-import static junit.framework.Assert.assertNotNull;

-

-import java.io.IOException;

-

-import org.apache.activemq.broker.BrokerService;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests that the helloworld server is available

- */

-public class HelloWorldJmsServerTestCase{

-

-    private SCADomain scaDomain;

-    private BrokerService jmsBroker;

-

-        @Before

-	public void startServer() throws Exception {

-            startBroker();

-            scaDomain = SCADomain.newInstance("helloworldwsjms.composite");

-	}

-

-        protected void startBroker() throws Exception {

-            jmsBroker = new BrokerService(); 

-            jmsBroker.setPersistent(false);

-            jmsBroker.setUseJmx(false);

-            jmsBroker.addConnector("tcp://localhost:61619");

-            jmsBroker.start();

-        }

-    

-    @Test

-    public void testServiceCall() throws IOException {

-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-        

-        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

-    }

-

-	@After

-	public void stopServer() throws Exception {

-            if (scaDomain != null) {

-                scaDomain.close();

-            }

-            if (jmsBroker != null) {

-                jmsBroker.stop();

-            }

-	}

-

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/README b/java/sca-contrib/samples/helloworld-ws-service-secure/README
deleted file mode 100644
index f32eb08b05..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/README
+++ /dev/null
@@ -1,152 +0,0 @@
-Hello World Secure Web Service Service Sample

-=============================================

-This sample demonstrates an SCA service that uses a web service binding that is enabled for simple

-authentication using UseridToken and PasswordText

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run it to see what happens open a command prompt, navigate

-to this sample directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service-secure.jar helloworld.HelloWorldServer

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service-secure.jar helloworld.HelloWorldServer

-

-Now the server is started you can use the helloworld-ws-reference-secure sample to 

-exercise it. 

-

-Sample Overview

----------------

-The sample provides a single component that is wired to a service with a 

-web service binding.  The service specifies a policy intent named 'authentication' 

-which is fulfilled by a suitable policyset that is defined for the SCA Domain.  Over 

-the helloworld-ws-service sample, this sample demonstrate generally the use of policy

-intents and policy sets in Tuscany taking the specific instance of a security policy.

-

-Note :

-------

-The policies mentioned and supported are instances of Tuscany specified policies and 

-not instnaces of WS-Policy.

-

-helloworld-ws-service-secure/

-  src/

-    main/

-      java/

-        helloworld/

-          HelloWorldService.java          - interface description for 

-                                            HelloWorldServiceComponent

-          HelloWorldImpl.java             - component implementation

-          HelloWorldServer.java           - starts the SCA Runtime and 

-                                            deploys the helloworldws

-                                            .composite and then waits for the

-                                            service to be called via web services

-		  ServerPWCBHandler.java		  - callback handler to authenticate client userid and password.  

-		  									The handle(Callback[] callbacks) method of this class typically contains

-          									code for accessing user registries and retrieving passwords 

-          									for user identifiers sent by the client and verifying them 

-          									against the password sent by the client.  For example

-          									here is where one could access LDAP registries to obtain or

-          									compare user identities and passwords.                                          

-      resources/

-        wsdl/

-          helloworld.wsdl                 - the service description that describes

-                                            the exposed service

-        helloworldws.composite            - the SCA assembly for this sample

-        definitions.xml					  - the SCA Definitions file that contains intents and policysets 

-        									defined for the SCA Domain

-    

-  helloworld-ws-service-secure.png               - a pictorial representation of the 

-                                            sample .composite file

-  build.xml                               - the Ant build file

-  pom.xml                                 - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant using the 

-following commands

-

-cd helloworld-ws-service-secure

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] 14-Jan-2008 14:22:07 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:8085/HelloWorldService

-     [java] 14-Jan-2008 14:22:07 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:8085/HelloWorldWsPolicyS

-ervice

-     [java] HelloWorld server started (press enter to shutdown)

-     

-As this point the SCA service is exposed as a web service by a web server 

-started automatically by the SCA runtime. The webservice requires clients to 

-have security headers that carry userid tonken and password text.

-

-To stop the server just press enter.

-

-To exercise the service run up the helloworld-ws-reference-secure sample. Take a look at 

-the README in that sample and you will see you need the following commands

-

-cd helloworld-ws-reference-secure

-ant run

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. When using Maven you don't need to run the helloworld-

-ws-reference-secure sample as Maven includes a simple ping test to make sure that the

-service is available

-

-cd helloworld-ws-service-secure

-mvn

-

-You should see the following output from the test phase.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running helloworld.HelloWorldServerTestCase

-14-Jan-2008 14:23:20 org.apache.catalina.core.StandardEngine start

-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10

-14-Jan-2008 14:23:20 org.apache.catalina.startup.ContextConfig defaultWebConfig

-INFO: No default web.xml

-14-Jan-2008 14:23:20 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd

-14-Jan-2008 14:23:20 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_

-1.dtd

-14-Jan-2008 14:23:20 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_

-2.dtd

-14-Jan-2008 14:23:20 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_

-0.xsd

-14-Jan-2008 14:23:20 org.apache.catalina.startup.DigesterFactory register

-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs

-d

-14-Jan-2008 14:23:21 org.apache.coyote.http11.Http11Protocol init

-INFO: Initializing Coyote HTTP/1.1 on http-8085

-14-Jan-2008 14:23:21 org.apache.coyote.http11.Http11Protocol start

-INFO: Starting Coyote HTTP/1.1 on http-8085

-14-Jan-2008 14:23:21 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:8085/HelloWorldService

-14-Jan-2008 14:23:21 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM

-apping

-INFO: Added Servlet mapping: http://L3AW203:8085/HelloWorldWsPolicyService

-14-Jan-2008 14:23:21 org.apache.coyote.http11.Http11Protocol destroy

-INFO: Stopping Coyote HTTP/1.1 on http-8085

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.734 sec

-

-This shows that the Junit test cases have run successfully. 

diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/build.xml b/java/sca-contrib/samples/helloworld-ws-service-secure/build.xml
deleted file mode 100644
index 29bbae0173..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/build.xml
+++ /dev/null
@@ -1,72 +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.    

--->

-<project name="helloworld-ws-service-secure" default="compile">

-    <property name="test.class" value="helloworld.HelloWorldServer" />

-	<property name="test.jar"   value="sample-helloworld-ws-service-secure.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png b/java/sca-contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
deleted file mode 100644
index 6f7d9dd450..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg b/java/sca-contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
deleted file mode 100644
index 53eb552923..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

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

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.44"

-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-service"

-   sodipodi:docname="helloworld-ws-service.svg"

-   version="1.0"

-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference\helloworld-ws-reference.png"

-   inkscape:export-xdpi="52.84"

-   inkscape:export-ydpi="52.84">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="1.4"

-     inkscape:cx="519.38407"

-     inkscape:cy="414.63224"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="573"

-     inkscape:window-x="117"

-     inkscape:window-y="316" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997"

-       transform="matrix(0.991389,0,0,1,2.215655,0)">

-      <rect

-         rx="13.79423"

-         ry="12.692303"

-         y="192.00233"

-         x="258.3114"

-         height="299.99988"

-         width="446.72086"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">helloworldws</flowPara></flowRoot>    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="85.862968"

-       x="432.05917"

-       y="307.1676"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(172.4684,115.2291)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">HelloWorld</flowPara><flowPara

-         id="flowPara1883">Service</flowPara><flowPara

-         id="flowPara1885">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "

-       id="path3017" />

-    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 226.73064,320.75315 L 293.91185,320.75315 L 306.1266,352.82797 L 291.87606,382.43553 L 226.73064,382.43553 L 241.99911,352.82797 L 226.73064,320.75315 z "

-       id="path1892" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1894"

-       transform="translate(-37.47944,122.8324)"

-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion1896"><rect

-           id="rect1898"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara1900">HelloWorld</flowPara><flowPara

-         id="flowPara1906">Web</flowPara><flowPara

-         id="flowPara1904">Service</flowPara></flowRoot>    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 305.71429,353.3802 L 422.85714,351.95163"

-       id="path1910"

-       inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-service\helloworld-ws-service.png"

-       inkscape:export-xdpi="52.84"

-       inkscape:export-ydpi="52.84" />

-  </g>

-</svg>

diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/pom.xml b/java/sca-contrib/samples/helloworld-ws-service-secure/pom.xml
deleted file mode 100644
index b2a1245d79..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/pom.xml
+++ /dev/null
@@ -1,85 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-helloworld-ws-service-secure</artifactId>

-    <name>Apache Tuscany SCA HelloWorld Secure Web Service Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.ws.security</groupId>

-            <artifactId>wss4j</artifactId>

-            <version>1.5.3</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 2186c00e57..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the HelloWorld service.

- */

-@Service(HelloWorldService.class)

-public class HelloWorldImpl implements HelloWorldService {

-

-    public String getGreetings(String name) {

-        return "Hello " + name;

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java b/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index 3d43290380..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
+++ /dev/null
@@ -1,46 +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 helloworld;

-

-import java.io.IOException;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This server program shows how to create an SCA runtime, and start it which

- * activates the helloworld Web service endpoint.

- */

-public class HelloWorldServer {

-

-    public static void main(String[] args) {

-

-        SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite");

-

-        try {

-            System.out.println("HelloWorld server started (press enter to shutdown)");

-            System.in.read();

-        } catch (IOException e) {

-            e.printStackTrace();

-        }

-

-        scaDomain.close();

-        System.out.println("HelloWorld server stopped");

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index a0081be22d..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.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 helloworld;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

-

diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java b/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
deleted file mode 100644
index ded02f09d6..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.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 helloworld;

-

-import java.io.IOException;

-

-import javax.security.auth.callback.Callback;

-import javax.security.auth.callback.CallbackHandler;

-import javax.security.auth.callback.UnsupportedCallbackException;

-

-import org.apache.ws.security.WSPasswordCallback;

-

-/**

- * Sample userid passwd generation class 

- */

-public class ServerPWCBHandler implements CallbackHandler {

-

-    public void handle(Callback[] callbacks) throws IOException,

-            UnsupportedCallbackException {

-    	for (int i = 0; i < callbacks.length; i++) {

-            System.out.println("*** Calling Server User/Passwd Handler....");

-            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];

-            System.out.println("User Id = " + pwcb.getIdentifer());

-            System.out.println("Password = " + pwcb.getPassword());

-            

-            if ( pwcb.getUsage() == WSPasswordCallback.USERNAME_TOKEN ) {

-                if ( pwcb.getIdentifer().equals("TuscanyWsUser") &&

-                        pwcb.getPassword().equals("TuscanyWsUserPasswd") ){

-                            return;

-                } else {

-                    throw new UnsupportedCallbackException(pwcb, "Authentication Failed : UserId - Password mismatch");

-                }

-            } else if ( pwcb.getUsage() == WSPasswordCallback.SIGNATURE ) {

-                pwcb.setPassword("TuscanyWsUserPasswd");

-            }

-        }

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml b/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
deleted file mode 100644
index 10fa7b8652..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-<sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"

- 			targetNamespace="http://www.osoa.org/xmlns/sca/1.0"

- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

- 			xmlns:hw="http://helloworld">

-

- <!-- WS Security POLICY SETS -->

-  <sca:policySet name="hw:wsAuthenticationPolicy"

- 	provides="authentication"

- 	appliesTo="sca:binding.ws"

- 	>

- 	<tuscany:wsConfigParam>

- 		<parameter name="InflowSecurity">

- 			<action>

- 				<items>UsernameToken</items>

- 				<passwordCallbackClass>helloworld.ServerPWCBHandler</passwordCallbackClass>

-       		</action>

-      	</parameter>

- 	</tuscany:wsConfigParam>

- </sca:policySet>

- 

- <!-- A policyset that uses WS Policy --> 

- <sca:policySet name="hw:wsSecurityPolicyForIntegrity"

- 	provides="integrity"

- 	appliesTo="sca:binding.ws">

- 	<wsp:Policy wsu:Id="SignOnly" 

- 		xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 

- 		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

-		<wsp:ExactlyOne>

-			<wsp:All>

-				<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<wsp:Policy>

-						<sp:InitiatorToken>

-							<wsp:Policy>

-								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">

-									<wsp:Policy>

-										<sp:WssX509V3Token10/>

-									</wsp:Policy>

-								</sp:X509Token>

-							</wsp:Policy>

-						</sp:InitiatorToken>

-						<sp:RecipientToken>

-							<wsp:Policy>

-								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">

-									<wsp:Policy>

-										<sp:WssX509V3Token10/>

-									</wsp:Policy>

-								</sp:X509Token>

-							</wsp:Policy>

-						</sp:RecipientToken>

-						<sp:AlgorithmSuite>

-							<wsp:Policy>

-								<sp:TripleDesRsa15/>

-							</wsp:Policy>

-						</sp:AlgorithmSuite>

-						<sp:Layout>

-							<wsp:Policy>

-								<sp:Strict/>

-							</wsp:Policy>

-						</sp:Layout>

-						<sp:IncludeTimestamp/>

-						<sp:OnlySignEntireHeadersAndBody/>

-					</wsp:Policy>

-				</sp:AsymmetricBinding>

-				<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<wsp:Policy>

-						<sp:MustSupportRefKeyIdentifier/>

-						<sp:MustSupportRefIssuerSerial/>

-					</wsp:Policy>

-				</sp:Wss10>

-				<sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-					<sp:Body/>

-				</sp:SignedParts>

-	

-				<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 

-					<ramp:user>TuscanyWsUser</ramp:user>

-					<ramp:encryptionUser>TuscanyWsUser</ramp:encryptionUser>

-					<ramp:passwordCallbackClass>helloworld.ServerPWCBHandler</ramp:passwordCallbackClass>

-					

-					<ramp:signatureCrypto>

-						<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">

-							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>

-							<ramp:property name="org.apache.ws.security.crypto.merlin.file">helloworldKeys.jks</ramp:property>

-							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">TuscanyWsUserPasswd</ramp:property>

-						</ramp:crypto>

-					</ramp:signatureCrypto>

-				</ramp:RampartConfig>

-	

-			</wsp:All>

-		</wsp:ExactlyOne>

-	</wsp:Policy>

- </sca:policySet>

- 

- </sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks b/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
deleted file mode 100644
index 0b4f2399f0..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite b/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
deleted file mode 100644
index d1e18d7929..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,41 +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://helloworld"

-	xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-	xmlns:hw="http://helloworld"

-    name="helloworldws">

-

-	<service name="HelloWorldService" requires="authentication" promote="HelloWorldServiceComponent/HelloWorldService">

-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-        <binding.ws uri="http://localhost:8085/HelloWorldService"/>

-    </service>

-    

-    <service name="HelloWorldWsPolicyService" promote="HelloWorldServiceComponent/HelloWorldService"

-    		 requires="integrity">

-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-        <binding.ws uri="http://localhost:8085/HelloWorldWsPolicyService"/>

-    </service>

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldImpl" />
-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 068229be6f..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,79 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-	name="helloworld">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">

-

-            <element name="getGreetings">

-                <complexType>

-                    <sequence>

-                        <element name="name" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="getGreetingsResponse">

-                <complexType>

-                    <sequence>

-                        <element name="getGreetingsReturn" type="xsd:string"/>

-                    </sequence>

-                </complexType>

-            </element>

-            

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="getGreetingsRequest">

-        <wsdl:part element="tns:getGreetings" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:message name="getGreetingsResponse">

-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>

-    </wsdl:message>

-

-    <wsdl:portType name="HelloWorld">

-        <wsdl:operation name="getGreetings">

-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>

-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

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

-        <wsdl:operation name="getGreetings">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input name="getGreetingsRequest">

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

-            </wsdl:input>

-            <wsdl:output name="getGreetingsResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="HelloWorldService">

-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/HelloWorldServiceComponent"/>

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java b/java/sca-contrib/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
deleted file mode 100644
index 4a14afcd9d..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ /dev/null
@@ -1,62 +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 helloworld;

-

-import static junit.framework.Assert.assertEquals;

-import static junit.framework.Assert.assertNotNull;

-

-import java.io.IOException;

-import java.net.Socket;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests that the helloworld server is available

- */

-public class HelloWorldServerTestCase{

-

-    private SCADomain scaDomain;

-

-    @Before

-	public void startServer() throws Exception {

-            scaDomain = SCADomain.newInstance("helloworldws.composite");

-	}

-

-	@Test

-	public void testPing() throws IOException {

-		new Socket("127.0.0.1", 8085);

-	}

-    

-    @Test

-    public void testServiceCall() throws IOException {

-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");

-        assertNotNull(helloWorldService);

-        

-        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

-    }

-

-	@After

-	public void stopServer() throws Exception {

-            scaDomain.close();

-	}

-

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/README b/java/sca-contrib/samples/helloworld-ws-service-webapp/README
deleted file mode 100644
index 66040004f8..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/README
+++ /dev/null
@@ -1 +0,0 @@
-http://localhost:8080/sample-helloworld-ws-service-webapp/SCA/HelloWorldService?wsdl

diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/build.xml b/java/sca-contrib/samples/helloworld-ws-service-webapp/build.xml
deleted file mode 100644
index ff850203b3..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/build.xml
+++ /dev/null
@@ -1,156 +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.    

--->

-<project name="sample-helloworld-ws-service-webapp" default="compile">

-    <property file="${user.home}/tuscany/build.properties" />

-    <property file="${user.home}/build.properties" />

-

-    <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>

-    <property name="tuscany.sca.lib.location" value="../../lib"/>

-    <property name="tuscany.sca.modules.location" value="../../modules"/>

-            

-    <path id="project.classpath">

-        <pathelement path="target/classes"/>

-        <pathelement path="target/sdo-source"/>

-        <pathelement location="${tuscany.sca.manifest.location}"/>

-    </path>

-    	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-        <mkdir dir="target/sdo-source"/>

-    </target>

-	

-    	

-    <target name="compile" depends="init">

-        <javac destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-               <src location="src/main/java"/>

-               <src location="target/sdo-source"/>

-               <classpath refid="project.classpath"/>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-            <fileset dir="target/sdo-source"/>

-        </copy>

-        <war destfile="target/sample-helloworld-ws-service-webapp.war" 

-             webxml="src/main/webapp/WEB-INF/web.xml">

-            <fileset dir="src/main/webapp"/>       	

-            <zipfileset dir="${tuscany.sca.modules.location}" prefix="WEB-INF/lib">

-            	<include name="sca-api-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-assembly-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-feed-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-jsonrpc-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-xml-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-java-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-databinding-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-spi-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-sdo-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-distributed-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-extension-helper-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-http-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-webapp-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-runtime-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-xml-1.4-SNAPSHOT.jar"/>         	

-            	<include name="tuscany-policy-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>

-            </zipfileset>

-            <lib dir="${tuscany.sca.lib.location}">

-            	<include name="XmlSchema-1.3.1.jar"/>

-            	<include name="activation-1.1.jar"/>

-            	<include name="annogen-0.1.0.jar"/>

-            	<include name="ant-1.7.0.jar"/>

-            	<include name="ant-launcher-1.7.0.jar"/>

-            	<include name="axiom-api-1.2.4.jar"/>

-            	<include name="axiom-dom-1.2.4.jar"/>

-            	<include name="axiom-impl-1.2.4.jar"/>

-            	<include name="axis2-java2wsdl-1.2.jar"/>

-            	<include name="axis2-kernel-1.2.jar"/>

-            	<include name="backport-util-concurrent-2.2.jar"/>

-            	<include name="backport-util-concurrent-3.0.jar"/>

-            	<include name="cglib-nodep-2.1_3.jar"/>

-            	<include name="common-2.2.3.jar"/>

-            	<include name="commons-codec-1.3.jar"/>

-            	<include name="commons-fileupload-1.1.1.jar"/>

-            	<include name="commons-httpclient-3.0.1.jar"/>

-            	<include name="commons-io-1.1.jar"/>

-            	<include name="commons-logging-1.1.jar"/>

-            	<include name="ecore-2.2.3.jar"/>

-            	<include name="ecore-change-2.2.3.jar"/>

-            	<include name="ecore-xmi-2.2.3.jar"/>

-            	<include name="geronimo-commonj_1.1_spec-1.0.jar"/>

-            	<include name="geronimo-jms_1.1_spec-1.1.jar"/>

-            	<include name="jakarta-httpcore-4.0-alpha4.jar"/>

-            	<include name="jaxb-api-2.1.jar"/>

-            	<include name="jaxb-impl-2.1.4.jar"/>

-            	<include name="jaxen-1.1-beta-9.jar"/>

-            	<include name="jaxws-api-2.1.jar"/>

-            	<include name="jdom-1.0.jar"/>

-            	<include name="json-rpc-1.0.jar"/>

-            	<include name="jsr181-api-1.0-MR1.jar"/>

-            	<include name="jsr250-api-1.0.jar"/>

-            	<include name="mail-1.4.jar"/>

-            	<include name="neethi-2.0.1.jar"/>

-            	<include name="rome-0.9.jar"/>

-            	<include name="saaj-api-1.3.jar"/>

-            	<include name="sca-api-1.4-SNAPSHOT.jar"/>

-            	<include name="stax-api-1.0-2.jar"/>

-            	<include name="stax-api-1.0.1.jar"/>

-            	<include name="woden-1.0-incubating-M7a.jar"/>

-            	<include name="wsdl4j-1.6.2.jar"/>

-            	<include name="wstx-asl-3.2.1.jar"/>

-            	<include name="xercesImpl-2.8.1.jar"/>

-            	<include name="xml-apis-1.3.03.jar"/>

-            	<include name="xsd-2.2.3.jar"/>

-            	<include name="tuscany-sdo-api-r2.1-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-sdo-impl-1.4-SNAPSHOT.jar"/>

-            	<include name="tuscany-sdo-lib-1.4-SNAPSHOT.jar"/>

-            </lib>        	

-            <classes dir="target/classes"/>

-            <classes dir="target/sdo-source"/>

-        </war>
    </target>	

-	

-    <target name="package" depends="compile"/>

-		

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/pom.xml b/java/sca-contrib/samples/helloworld-ws-service-webapp/pom.xml
deleted file mode 100644
index 63dd133c2c..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/pom.xml
+++ /dev/null
@@ -1,80 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>sample-helloworld-ws-service-webapp</artifactId>
-    <name>Apache Tuscany SCA HelloWorld Web Service Sample Webapp</name>
-    <packaging>war</packaging>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- marking dependency as provided to exclude from war file -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index a75187f0d7..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 18f74b083f..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 0b95fbd14f..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,79 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/services/HelloWorldWebService"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
deleted file mode 100644
index 114608e4d8..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
+++ /dev/null
@@ -1,32 +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"

-    name="helloworldws">

-

-    <service name="HelloWorldService" promote="HelloWorldComponent">

-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-        <binding.ws />

-    </service>

-

-    <component name="HelloWorldComponent">

-       <implementation.java class="helloworld.HelloWorldImpl" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index c514922045..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
-    xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
-    <d:environment>
-        <d:moduleId>
-            <d:groupId>org.apache.tuscany.sca</d:groupId>
-            <d:artifactId>sample-helloworld-ws-service-webapp</d:artifactId>
-            <d:version>2.0-SNAPSHOT</d:version>
-            <d:type>war</d:type>
-        </d:moduleId>
-        <!-- TUSCANY-1986 -->
-        <d:inverse-classloading />
-    </d:environment>
-</web-app>
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 3f3c92fa78..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-    <display-name>Apache Tuscany HelloWorld Web Service Sample</display-name>
-    
-    <listener>
-        <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
-    </listener>
-
-    <servlet>
-        <servlet-name>TuscanyServlet</servlet-name>
-        <servlet-class>org.apache.tuscany.sca.host.webapp.TuscanyServlet</servlet-class>
-    </servlet>
- 
-    <servlet-mapping>
-        <servlet-name>TuscanyServlet</servlet-name>
-        <url-pattern>/SCA/*</url-pattern>
-    </servlet-mapping>
-
-    <welcome-file-list id="WelcomeFileList">
-        <welcome-file>/SCA/HelloWorldComponent/HelloWorldService?wsdl</welcome-file>
-    </welcome-file-list>  
-
-</web-app>
diff --git a/java/sca-contrib/samples/helloworld-ws-service/README b/java/sca-contrib/samples/helloworld-ws-service/README
deleted file mode 100644
index 72417d3160..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/README
+++ /dev/null
@@ -1,140 +0,0 @@
-Holder Pattern Service Sample
-======================================
-This sample demonstrates an SCA service that uses a web service binding. The
-web service binding has been generated from a given WSDL file:
-   src/main/resources/wsdl/orderservice.wsdl
-The generated binding has been placed in src/main/java/org/examle/orderservice
-and was generated via the JDK tool wsimport and the command:
-    wsimport -d orderservice -keep orderservice.wsdl
-
-The interesting feature of this sample is that the generated service interface,
-OrderService, contains a method with the signature:
-    public void reviewOrder(
-        @WebParam(name = "myData", targetNamespace = "", mode = WebParam.Mode.INOUT)
-        javax.xml.ws.Holder<Order> orderData);
-The orderData parameter is an input/output parameter that is provided by the caller,
-updated by the service, and returned to the caller. The business object is updated
-in place, a common pattern in web services, and not returned as a response. Tuscany
-can handle limited instances of this pattern.
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-holder-ws-service.jar org.example.orderservice.OrderServiceTestCase
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-holder-ws-service.jar org.example.orderservice.OrderServiceTestCase
-
-Sample Overview
----------------
-The sample provides a single component that is wired to a service with a 
-web service binding.
-
-holder-ws-service/
-  src/
-    main/
-      java/
-        org/
-           example/
-              orderservice
-                 *.java                   - Web service binding generated from 
-                                            HelloWorldServiceComponent
-      resources/
-        wsdl/
-          orderservice.wsdl               - the service description that describes
-                                            the exposed service
-        orderws.composite                 - the SCA assembly that uses this service
-    test/
-      java/
-        helloworld/
-          org/
-             example/
-                orderservice/
-                   OrderServiceTestCase.java - JUnit test case 
-  build.xml                               - the Ant build file
-  pom.xml                                 - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant using the 
-following commands
-
-cd holder-ws-service
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] 14-Jan-2008 14:18:47 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:8085/HelloWorldService
-     [java] HelloWorld server started (press enter to shutdown)
-     
-As this point the SCA service is exposed as a web service by a web server 
-started automatically by the SCA runtime. To stop the server just press 
-enter.
-
-To exercise the service run up the helloworld-ws-reference sample. Take a look at 
-the README in that sample and you will see you need the following commands
-
-cd holder-ws-reference
-ant run
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. When using Maven you don't need to run the helloworld-
-ws-reference sample as Maven includes a simple ping test to make sure that the
-service is available
-
-cd holder-ws-service
-mvn
-
-You should see the following output from the test phase.
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running org.example.orderservice.OrderServiceTestCase
-Jan 21, 2009 9:31:11 AM org.apache.tuscany.sca.node.impl.NodeImpl <init>
-INFO: Creating node: META-INF/sca-deployables/orderws.composite
-Jan 21, 2009 9:31:13 AM org.apache.tuscany.sca.node.impl.NodeImpl configureNode
-INFO: Loading contribution: file:/E:/t/branches/sca-java-1.x/samples/holder-ws-webservice/target/classes/
-Jan 21, 2009 9:31:14 AM org.apache.tuscany.sca.node.impl.NodeImpl configureNode
-INFO: Loading composite: file:/E:/t/branches/sca-java-1.x/samples/holder-ws-webservice/target/classes/META-INF/sca-deployables/orderws.composite
-Jan 21, 2009 9:31:14 AM org.apache.tuscany.sca.node.impl.NodeImpl start
-INFO: Starting node: META-INF/sca-deployables/orderws.composite
-- No JMS connection factories are defined.Will not listen for any JMS messages
-Jan 21, 2009 9:31:15 AM org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.14
-Jan 21, 2009 9:31:15 AM org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-Jan 21, 2009 9:31:15 AM org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-Jan 21, 2009 9:31:15 AM org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-- No JMS connection factories are defined.Will not listen for any JMS messages
-Jan 21, 2009 9:31:15 AM org.apache.tuscany.sca.http.tomcat.TomcatServer addServletMapping
-INFO: Added Servlet mapping: http://T602010:8085/OrderService
->>> Order submitted=Order[customerId=cust1234,orderId=0,total=50.0,status=Created]
->>> OrderService.reviewOrder return=Order[customerId=cust1234,orderId=0,total=50.0,status=Approved]
->>> Order returned=Order[customerId=cust1234,orderId=0,total=50.0,status=Approved]
-Jan 21, 2009 9:31:16 AM org.apache.tuscany.sca.node.impl.NodeImpl stop
-INFO: Stopping node: META-INF/sca-deployables/orderws.composite
-Jan 21, 2009 9:31:17 AM org.apache.tuscany.sca.http.tomcat.TomcatServer removeServletMapping
-INFO: Removed Servlet mapping: http://T602010:8085/OrderService
-Jan 21, 2009 9:31:17 AM org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8085
-
-Note the console output with ">>>" prefix. This shows that an order was submitted in
-the "Created" state, handled by the OrderService reviewOrder method, and returned in
-the "Approved" state. This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/helloworld-ws-service/build.xml b/java/sca-contrib/samples/helloworld-ws-service/build.xml
deleted file mode 100644
index 7a59628c7b..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="holder-ws-service" default="compile">
-    <property name="test.class" value="org.example.orderservice.OrderServiceTestCase" />
-	<property name="test.jar"   value="sample-holder-ws-service.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/helloworld-ws-service/helloworld-ws-service.png b/java/sca-contrib/samples/helloworld-ws-service/helloworld-ws-service.png
deleted file mode 100644
index eab29d0bcd..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/helloworld-ws-service.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/helloworld-ws-service/helloworld-ws-service.svg b/java/sca-contrib/samples/helloworld-ws-service/helloworld-ws-service.svg
deleted file mode 100644
index 61cd93ead9..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/helloworld-ws-service.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\helloworld-ws-service"
-   sodipodi:docname="helloworld-ws-service.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\tuscany\java-head\sca\samples\helloworld-ws-service\helloworld-ws-service.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="519.38407"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="573"
-     inkscape:window-x="117"
-     inkscape:window-y="316" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.991389,0,0,1,2.215655,0)">
-      <rect
-         rx="13.79423"
-         ry="12.692303"
-         y="192.00233"
-         x="258.3114"
-         height="299.99988"
-         width="446.72086"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">helloworldws</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="432.05917"
-       y="307.1676"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(172.4684,115.2291)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">HelloWorld</flowPara><flowPara
-         id="flowPara1883">Service</flowPara><flowPara
-         id="flowPara1885">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "
-       id="path3017" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 226.73064,320.75315 L 293.91185,320.75315 L 306.1266,352.82797 L 291.87606,382.43553 L 226.73064,382.43553 L 241.99911,352.82797 L 226.73064,320.75315 z "
-       id="path1892" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1894"
-       transform="translate(-37.47944,122.8324)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1896"><rect
-           id="rect1898"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1900">HelloWorld</flowPara><flowPara
-         id="flowPara1906">Web</flowPara><flowPara
-         id="flowPara1904">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 305.71429,353.3802 L 422.85714,351.95163"
-       id="path1910"
-       inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-service\helloworld-ws-service.png"
-       inkscape:export-xdpi="52.84"
-       inkscape:export-ydpi="52.84" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/helloworld-ws-service/pom.xml b/java/sca-contrib/samples/helloworld-ws-service/pom.xml
deleted file mode 100644
index a895191917..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/pom.xml
+++ /dev/null
@@ -1,79 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>1.5-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-holder-ws-service</artifactId>
-    <name>Apache Tuscany SCA Holder Input/Output Web Service Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>compile</scope>            
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>    
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index a75187f0d7..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index c37bfcda65..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
+++ /dev/null
@@ -1,46 +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 helloworld;

-

-import java.io.IOException;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This server program shows how to create an SCA runtime, and start it which

- * activates the helloworld Web service endpoint.

- */

-public class HelloWorldServer {

-

-    public static void main(String[] args) {

-

-        SCADomain scaDomain = SCADomain.newInstance("META-INF/sca-deployables/helloworldws.composite");

-

-        try {

-            System.out.println("HelloWorld server started (press enter to shutdown)");

-            System.in.read();

-        } catch (IOException e) {

-            e.printStackTrace();

-        }

-

-        scaDomain.close();

-        System.out.println("HelloWorld server stopped");

-    }

-

-}

diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 513c2e3129..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
-
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java b/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
deleted file mode 100644
index e472b2bada..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-
-package org.example.orderservice;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the org.example.orderservice package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.example.orderservice
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link ReviewOrderResponse }
-     * 
-     */
-    public ReviewOrderResponse createReviewOrderResponse() {
-        return new ReviewOrderResponse();
-    }
-
-    /**
-     * Create an instance of {@link Order }
-     * 
-     */
-    public Order createOrder() {
-        return new Order();
-    }
-
-    /**
-     * Create an instance of {@link ReviewOrder }
-     * 
-     */
-    public ReviewOrder createReviewOrder() {
-        return new ReviewOrder();
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Order.java b/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Order.java
deleted file mode 100644
index 7508887a7d..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Order.java
+++ /dev/null
@@ -1,129 +0,0 @@
-
-package org.example.orderservice;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for order complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="order">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="customerId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="status" type="{http://www.example.org/OrderService/}status" minOccurs="0"/>
- *         &lt;element name="total" type="{http://www.w3.org/2001/XMLSchema}double"/>
- *         &lt;element name="orderId" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "order", propOrder = {
-    "customerId",
-    "status",
-    "total",
-    "orderId"
-})
-public class Order {
-
-    protected String customerId;
-    protected Status status;
-    protected double total;
-    protected int orderId;
-
-    /**
-     * Gets the value of the customerId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    /**
-     * Sets the value of the customerId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCustomerId(String value) {
-        this.customerId = value;
-    }
-
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Status }
-     *     
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Status }
-     *     
-     */
-    public void setStatus(Status value) {
-        this.status = value;
-    }
-
-    /**
-     * Gets the value of the total property.
-     * 
-     */
-    public double getTotal() {
-        return total;
-    }
-
-    /**
-     * Sets the value of the total property.
-     * 
-     */
-    public void setTotal(double value) {
-        this.total = value;
-    }
-
-    /**
-     * Gets the value of the orderId property.
-     * 
-     */
-    public int getOrderId() {
-        return orderId;
-    }
-
-    /**
-     * Sets the value of the orderId property.
-     * 
-     */
-    public void setOrderId(int value) {
-        this.orderId = value;
-    }
-
-    // Added manually from wsimport generated class to improve debugging.
-    public String toString() {
-        return "Order[customerId=" + customerId + ",orderId=" + orderId + ",total=" + total + ",status=" + status.value() + "]";
-    }
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService.java b/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService.java
deleted file mode 100644
index a11d733cc9..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-
-package org.example.orderservice;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.1 in JDK 6
- * Generated source version: 2.1
- * 
- */
-@WebService(name = "OrderService", targetNamespace = "http://www.example.org/OrderService/")
-@XmlSeeAlso({
-    ObjectFactory.class
-})
-public interface OrderService {
-
-
-    /**
-     * 
-     * @param myData
-     */
-    @WebMethod(action = "http://www.example.org/OrderService/reviewOrder")
-    @RequestWrapper(localName = "reviewOrder", targetNamespace = "http://www.example.org/OrderService/", className = "org.example.orderservice.ReviewOrder")
-    @ResponseWrapper(localName = "reviewOrderResponse", targetNamespace = "http://www.example.org/OrderService/", className = "org.example.orderservice.ReviewOrderResponse")
-    public void reviewOrder(
-        @WebParam(name = "myData", targetNamespace = "", mode = WebParam.Mode.INOUT)
-        Holder<Order> myData);
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java b/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
deleted file mode 100644
index 0e084bf459..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
+++ /dev/null
@@ -1,65 +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.example.orderservice;
-
-// import org.oasisopen.sca.annotation.Service;
-import java.util.Random;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-/**
- * This class implements the OrderService service.
- */
-// @Service(OrderService.class)
-public class OrderServiceImpl implements OrderService {
-
-    /** This dummy implementation approves or rejects orders:
-     * < 100 - always approved.
-     * 100-1100 - randomly approved. Probability = (1100 - amount)/10
-     * >1100 - always rejected.
-     */
-    // public Order reviewOrder(Order order) {
-    @WebMethod(action = "http://www.example.org/OrderService/reviewOrder")
-    @RequestWrapper(localName = "reviewOrder", targetNamespace = "http://www.example.org/OrderService/", className = "org.example.orderservice.ReviewOrder")
-    @ResponseWrapper(localName = "reviewOrderResponse", targetNamespace = "http://www.example.org/OrderService/", className = "org.example.orderservice.ReviewOrderResponse")
-    public void reviewOrder(
-        @WebParam(name = "myData", targetNamespace = "", mode = WebParam.Mode.INOUT)
-        Holder<Order> myData) {
-        Order order = myData.value;
-        double total = order.getTotal();
-        if ( total < 100.0 ) {
-            order.setStatus( Status.APPROVED );
-        } else if ( total > 1100.0 ) {
-            order.setStatus( Status.REJECTED );
-        } else {
-            int probability = (int) ((-100.0 + total) / 10.0);
-            Random approver = new Random();
-            if ( approver.nextInt( 100 ) < probability )
-                order.setStatus( Status.APPROVED );
-            else
-                order.setStatus( Status.REJECTED );
-        }
-        System.out.println( ">>> OrderService.reviewOrder return=" + order );
-        // return order;
-    }
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java b/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
deleted file mode 100644
index 9c8ff711ea..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package org.example.orderservice;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.1 in JDK 6
- * Generated source version: 2.1
- * 
- */
-@WebServiceClient(name = "OrderService", targetNamespace = "http://www.example.org/OrderService/", wsdlLocation = "META-INF/sca-deployables/orderservice.wsdl")
-public class OrderService_Service
-    extends Service
-{
-
-    private final static URL ORDERSERVICE_WSDL_LOCATION;
-
-    static {
-        URL url = null;
-        try {
-            url = new URL("META-INF/sca-deployables/orderservice.wsdl");
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        }
-        ORDERSERVICE_WSDL_LOCATION = url;
-    }
-
-    public OrderService_Service(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public OrderService_Service() {
-        super(ORDERSERVICE_WSDL_LOCATION, new QName("http://www.example.org/OrderService/", "OrderService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns OrderService
-     */
-    @WebEndpoint(name = "OrderServiceSOAP")
-    public OrderService getOrderServiceSOAP() {
-        return (OrderService)super.getPort(new QName("http://www.example.org/OrderService/", "OrderServiceSOAP"), OrderService.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns OrderService
-     */
-    @WebEndpoint(name = "OrderServiceSOAP")
-    public OrderService getOrderServiceSOAP(WebServiceFeature... features) {
-        return (OrderService)super.getPort(new QName("http://www.example.org/OrderService/", "OrderServiceSOAP"), OrderService.class, features);
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java b/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
deleted file mode 100644
index 9e7192a0d0..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
+++ /dev/null
@@ -1,64 +0,0 @@
-
-package org.example.orderservice;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="myData" type="{http://www.example.org/OrderService/}order"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "myData"
-})
-@XmlRootElement(name = "reviewOrder")
-public class ReviewOrder {
-
-    @XmlElement(required = true)
-    protected Order myData;
-
-    /**
-     * Gets the value of the myData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Order }
-     *     
-     */
-    public Order getMyData() {
-        return myData;
-    }
-
-    /**
-     * Sets the value of the myData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Order }
-     *     
-     */
-    public void setMyData(Order value) {
-        this.myData = value;
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java b/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
deleted file mode 100644
index 90dbc3f25e..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
+++ /dev/null
@@ -1,64 +0,0 @@
-
-package org.example.orderservice;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="myData" type="{http://www.example.org/OrderService/}order"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "myData"
-})
-@XmlRootElement(name = "reviewOrderResponse")
-public class ReviewOrderResponse {
-
-    @XmlElement(required = true)
-    protected Order myData;
-
-    /**
-     * Gets the value of the myData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Order }
-     *     
-     */
-    public Order getMyData() {
-        return myData;
-    }
-
-    /**
-     * Sets the value of the myData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Order }
-     *     
-     */
-    public void setMyData(Order value) {
-        this.myData = value;
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Status.java b/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Status.java
deleted file mode 100644
index 73a1b5c45e..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Status.java
+++ /dev/null
@@ -1,57 +0,0 @@
-
-package org.example.orderservice;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for status.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="status">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="Created"/>
- *     &lt;enumeration value="Submitted"/>
- *     &lt;enumeration value="Approved"/>
- *     &lt;enumeration value="Rejected"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "status")
-@XmlEnum
-public enum Status {
-
-    @XmlEnumValue("Created")
-    CREATED("Created"),
-    @XmlEnumValue("Submitted")
-    SUBMITTED("Submitted"),
-    @XmlEnumValue("Approved")
-    APPROVED("Approved"),
-    @XmlEnumValue("Rejected")
-    REJECTED("Rejected");
-    private final String value;
-
-    Status(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static Status fromValue(String v) {
-        for (Status c: Status.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/package-info.java b/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/package-info.java
deleted file mode 100644
index 64c056b7fb..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.example.org/OrderService/")
-package org.example.orderservice;
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
deleted file mode 100644
index d767625ae7..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
+++ /dev/null
@@ -1,33 +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://helloworld"

-	xmlns:hw="http://helloworld"

-    name="helloworldws">

-

-    <component name="HelloWorldServiceComponent">

-        <implementation.java class="helloworld.HelloWorldImpl" />

-	    <service name="HelloWorldService">

-	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-	        <binding.ws uri="http://localhost:8085/HelloWorldService"/>

-	    </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite b/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite
deleted file mode 100644
index d34891d1af..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite
+++ /dev/null
@@ -1,33 +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://orderservice"

-	xmlns:hw="http://orderservice"

-    name="orderws">

-

-    <component name="OrderServiceComponent">

-        <implementation.java class="org.example.orderservice.OrderServiceImpl" />

-	    <service name="OrderService">

-	        <interface.wsdl interface="http://www.example.org/OrderService/#wsdl.interface(OrderService)" />

-	        <binding.ws uri="http://localhost:8085/OrderService"/>

-	    </service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 454763410c..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,79 +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://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="helloworld">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorld">
-        <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="getGreetings">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldService">
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/HelloWorldServiceComponent"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/wsdl/orderservice.wsdl b/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/wsdl/orderservice.wsdl
deleted file mode 100644
index fd8ef74403..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/wsdl/orderservice.wsdl
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/OrderService/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="OrderService" targetNamespace="http://www.example.org/OrderService/">

-    <wsdl:types>

-        <xsd:schema targetNamespace="http://www.example.org/OrderService/">

-            <xsd:complexType name="order">

-                <xsd:sequence>

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

-                    <xsd:element name="status" type="tns:status" minOccurs="0" />

-                    <xsd:element name="total" type="xsd:double" />

-                    <xsd:element name="orderId" type="xsd:int" />

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:simpleType name="status">

-                <xsd:restriction base="xsd:string">

-                    <xsd:enumeration value="Created" />

-                    <xsd:enumeration value="Submitted" />

-                    <xsd:enumeration value="Approved" />

-                    <xsd:enumeration value="Rejected" />

-                </xsd:restriction>

-            </xsd:simpleType>

-

-            <xsd:element name="reviewOrder">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="myData" type="tns:order"

-                            minOccurs="1" maxOccurs="1" />

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            <xsd:element name="reviewOrderResponse">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="myData" type="tns:order"

-                            minOccurs="1" maxOccurs="1" />

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-

-        </xsd:schema>

-    </wsdl:types>

-    <wsdl:message name="reviewOrderRequest">

-        <wsdl:part element="tns:reviewOrder" name="myParameters"/>

-    </wsdl:message>

-    <wsdl:message name="reviewOrderResponse">

-        <wsdl:part element="tns:reviewOrderResponse" name="myResult"/>

-    </wsdl:message>

-    <wsdl:portType name="OrderService">

-        <wsdl:operation name="reviewOrder">

-            <wsdl:input message="tns:reviewOrderRequest"/>

-            <wsdl:output message="tns:reviewOrderResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="OrderServiceSOAP" type="tns:OrderService">

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

-        <wsdl:operation name="reviewOrder">

-            <soap:operation soapAction="http://www.example.org/OrderService/reviewOrder"/>

-            <wsdl:input>

-                <soap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="OrderService">

-        <wsdl:port binding="tns:OrderServiceSOAP" name="OrderServiceSOAP">

-            <soap:address location="http://www.example.org/"/>

-        </wsdl:port>

-    </wsdl:service>

-</wsdl:definitions>

diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/java/sca-contrib/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
deleted file mode 100644
index 189332be91..0000000000
--- a/java/sca-contrib/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ /dev/null
@@ -1,62 +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 helloworld;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that the helloworld server is available
- */
-public class HelloWorldServerTestCase{
-
-    private SCADomain scaDomain;
-
-        @Before
-	public void startServer() throws Exception {
-            scaDomain = SCADomain.newInstance("META-INF/sca-deployables/helloworldws.composite");
-	}
-
-	@Test
-	public void testPing() throws IOException {
-		new Socket("127.0.0.1", 8085);
-	}
-    
-    @Test
-    public void testServiceCall() throws IOException {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");
-        assertNotNull(helloWorldService);
-        
-        assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
-    }
-
-	@After
-	public void stopServer() throws Exception {
-            scaDomain.close();
-	}
-
-}
diff --git a/java/sca-contrib/samples/host-webapp-calculator/README b/java/sca-contrib/samples/host-webapp-calculator/README
deleted file mode 100644
index 690152ff65..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/README
+++ /dev/null
@@ -1,108 +0,0 @@
-Calculator Sample Exposing Web Services In A WebApp
-===================================================
-This sample uses the same code as the calculator sample, it deploys the
-sample wrapped in a web app and exposes the AddService as a web service. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want 
-to give this sample a go deploy the WAR file (target/sample-calculator-ws-webapp.war)
-to you web application server. 
-  
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-calculator-ws-webapp
-
-The sample is configured to use a service on port 8080. If your servlet container
-is using a port other than 8080 then you will need to edit the Calculator.composite
-and change the uri attribute of the <binding.ws> used by the CalculatorServiceComponent
-to use the correct port.
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java) 
-binding. The CalculatorClient exercises this interface by calling add, 
-subtract, multiply and divide operations. This results in messages passing to 
-the appropriate components in the composite.
-
-calculator-webapp/
-  src/
-    main/
-      java/
-        calculator/
-          AddService.java         - As calculator sample
-          AddServiceImpl.java
-          CalculatorClient.java   - As calculator sample
-          CalculatorService.java  - As calculator sample
-          CalculatorServiceImpl.java
-          DivideService.java      - As calculator sample
-          DivideServiceImpl.java
-          MultiplyService.java    - As calculator sample
-          MultiplyServiceImpl.java
-          SubtractService.java    - As calculator sample
-          SubtractServiceImpl.java
-      resources/
-        Calculator.composite      - As calculator sample except that the 
-                                    connection between the CalculatorService
-                                    and the AddService is web services
-      webapp
-        META-INF/
-          sca-contribution.xml    - specifies the composite to be deployed
-        WEB-INF/
-          web.xml                 - defines the listener that starts up the 
-                                    Tuscany SCA runtime and maps service
-                                    calls to the TuscanyServlet
-        calc.jsp                  - the web application that makes use of the
-                                    SCA application 
-           
-  calculator.png - a pictorial representation of the sample .composite file
-  build.xml      - the Ant build file
-  pom.xml        - the Maven build file
-  README         - this file  
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as 
-follows
-
-cd calculator-ws-webapp
-ant package
-
-This should result in a war file (sample-calculator-ws-webapp.war) in the target 
-directory. Copy this war file to your web app deployment directory in you
-web app container. 
-
-The process for getting the web app running will depend on which web app container
-you are using. For example, if you are using Tomcat then it is simply a matter
-of copying the WAR file to the webapps directory. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-calculator-ws-webapp
-
-The port and hostname will of course vary depending on your local installation. 
-
-You should see the following output.
-
-Expression	Result
-2 + 3	5.0
-3 - 2	1.0
-3 * 2	6.0
-3 / 2	1.5
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd calculator-ws-webapp 
-mvn
-
-Again this should result in a war file (sample-calculator-ws-webapp.war) in the target 
-directory. Follow the steps described in the previous section for running the web 
-app and for the expected results.
-
-
diff --git a/java/sca-contrib/samples/host-webapp-calculator/build.xml b/java/sca-contrib/samples/host-webapp-calculator/build.xml
deleted file mode 100644
index bef3f946e9..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/build.xml
+++ /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.
--->
-
-<project name="sample-host-webapp-calculator" default="compile">
-	<import file="../build-common.xml"/>
-		
-    <property name="sample.name" value="${ant.project.name}"/>
-	<property name="sample.root" value="."/>
-    <property name="sample.war" value="${sample.root}/target/${sample.name}.war" />
-	
-    <target name="compile" depends="common-war-compile"/>
-
-    <target name="clean" depends="common-clean"/>
-
-</project>
diff --git a/java/sca-contrib/samples/host-webapp-calculator/calculator-web.png b/java/sca-contrib/samples/host-webapp-calculator/calculator-web.png
deleted file mode 100644
index f482b8d1c8..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/calculator-web.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/host-webapp-calculator/calculator-web.svg b/java/sca-contrib/samples/host-webapp-calculator/calculator-web.svg
deleted file mode 100644
index 1b7015b156..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/calculator-web.svg
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\calculator-ws-webapp"
-   sodipodi:docname="calculator-web.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Tuscany\java-head\sca\samples\calculator-ws-webapp\calculator-web.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lend"
-       style="overflow:visible;">
-      <path
-         id="path4252"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="330.5192"
-     inkscape:cy="378.84265"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="59"
-     inkscape:window-y="79" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1,0,0,1.144214,0,-27.53557)">
-      <rect
-         rx="15.307091"
-         ry="12.692303"
-         y="192.00233"
-         x="258.31146"
-         height="299.99988"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">Calculator</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="191.57716"
-       x="339.91632"
-       y="262.1673"
-       rx="6.9961648"
-       ry="15.892869" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(79.61125,62.65764)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Calculator</flowPara><flowPara
-         id="flowPara1895">Service</flowPara><flowPara
-         id="flowPara1897">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
-       id="path1883" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1885"
-       transform="translate(-46.16225,128.7269)"
-       style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
-         id="flowRegion1887"><rect
-           id="rect1889"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
-         id="flowPara1891">Calculator</flowPara><flowPara
-         id="flowPara1893">Service</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1899"
-       width="115.66247"
-       height="70.148659"
-       x="594.75488"
-       y="209.73451"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1901"
-       transform="translate(334.4498,10.22481)"><flowRegion
-         id="flowRegion1903"><rect
-           id="rect1905"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1907">Add</flowPara><flowPara
-         id="flowPara1909">Service</flowPara><flowPara
-         id="flowPara1911">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "
-       id="path1913" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1917"
-       width="115.66247"
-       height="70.148659"
-       x="594.06543"
-       y="292.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1919"
-       transform="translate(333.7604,93.08188)"><flowRegion
-         id="flowRegion1921"><rect
-           id="rect1923"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1925">Subtract</flowPara><flowPara
-         id="flowPara1927">Service</flowPara><flowPara
-         id="flowPara1929">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "
-       id="path1931" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1933"
-       width="115.66247"
-       height="70.148659"
-       x="594.77979"
-       y="371.87729"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1935"
-       transform="translate(334.4747,172.3676)"><flowRegion
-         id="flowRegion1937"><rect
-           id="rect1939"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1941">Multiply</flowPara><flowPara
-         id="flowPara1943">Service</flowPara><flowPara
-         id="flowPara1945">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "
-       id="path1947" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1949"
-       width="115.66247"
-       height="70.148659"
-       x="596.20831"
-       y="452.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1951"
-       transform="translate(335.9032,253.0819)"><flowRegion
-         id="flowRegion1953"><rect
-           id="rect1955"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1957">Divide</flowPara><flowPara
-         id="flowPara1959">Service</flowPara><flowPara
-         id="flowPara1961">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "
-       id="path1963" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1965"
-       transform="translate(161.0221,114.967)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1967"><rect
-           id="rect1969"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1973">add</flowPara><flowPara
-         id="flowPara1977">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
-       id="path1979" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1981"
-       transform="translate(160.6632,150.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1983"><rect
-           id="rect1985"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1987">subtract</flowPara><flowPara
-         id="flowPara1989">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
-       id="path1991" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1993"
-       transform="translate(161.3775,184.2583)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1995"><rect
-           id="rect1997"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1999">multiply</flowPara><flowPara
-         id="flowPara2001">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
-       id="path2003" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2005"
-       transform="translate(159.9489,215.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2007"><rect
-           id="rect2009"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara2011">divide</flowPara><flowPara
-         id="flowPara2013">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:4,1;stroke-dashoffset:0"
-       d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
-       id="path2015" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
-       id="path2017" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
-       id="path2019" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
-       id="path2021" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 292.85714,355.52305 L 330,354.80877"
-       id="path2023" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
-       id="path1950"
-       sodipodi:cx="179.28572"
-       sodipodi:cy="352.66592"
-       sodipodi:rx="32.857143"
-       sodipodi:ry="35"
-       d="M 197.59435,323.60313 A 32.857143,35 0 1 1 196.81963,323.06603"
-       sodipodi:start="5.3034219"
-       sodipodi:end="11.558474"
-       sodipodi:open="true"
-       transform="translate(-11.428568,5.714286)" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1952"
-       transform="translate(-134.69216,137.10973)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1954"><rect
-           id="rect1956"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1960">calc.jsp</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 235,356.23734 C 200.71429,356.23734 200.71429,356.23734 200.71429,356.23734"
-       id="path1972" />
-    <rect
-       style="opacity:0.21666667;fill:#3d2020;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:4, 1;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2246"
-       width="56.428566"
-       height="317.85715"
-       x="57.14286"
-       y="206.95161"
-       rx="4.7646294"
-       ry="7.7766709" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3221"
-       transform="translate(-214.7771,5.7407504)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3223"><rect
-           id="rect3225"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3227">App</flowPara><flowPara
-         id="flowPara3229">Server</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3231"
-       transform="translate(232.36576,64.312179)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3233"><rect
-           id="rect3235"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3237">SOAP</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3239"
-       transform="translate(249.50862,136.45504)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3241"><rect
-           id="rect3243"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3245">local</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3247"
-       transform="translate(247.27783,197.54805)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3249"><rect
-           id="rect3251"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3253">local</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3255"
-       transform="translate(235.13497,276.11948)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion3257"><rect
-           id="rect3259"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara3261">local</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
-       d="M 113.57143,238.80877 L 575.71429,238.80877"
-       id="path3263" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 112.85714,359.09448 C 135.71429,359.09448 135.71429,359.09448 135.71429,359.09448"
-       id="path3265" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
-       d="M 478.57143,334.09448 C 499.28571,291.95163 505.71429,287.66591 498.57143,273.3802 C 491.42857,259.09448 477.85714,254.09448 470.71429,253.3802 C 463.57143,252.66591 14.285714,252.66591 14.285714,252.66591 L 13.571429,234.09448 L 57.857143,234.80877"
-       id="path4244" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/host-webapp-calculator/pom.xml b/java/sca-contrib/samples/host-webapp-calculator/pom.xml
deleted file mode 100644
index 2e1c719e7d..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/pom.xml
+++ /dev/null
@@ -1,162 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-host-webapp-calculator</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Host Webapp Calculator Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-api</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webservice</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webapp</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <plugins>
-           
-	       <plugin>
-	           <groupId>org.apache.maven.plugins</groupId>
-	           <artifactId>maven-antrun-plugin</artifactId>
-	           <version>1.1</version>
-	
-	           <dependencies>
-	               <dependency>
-	                   <groupId>ant</groupId>
-	                   <artifactId>ant-trax</artifactId>
-	                   <version>1.6.5</version>
-	               </dependency>
-	           </dependencies>
-	
-	           <executions>
-	               <execution>
-	                   <id>test-ant-scripts</id>
-	                   <phase>package</phase>
-	                   <goals>
-	                       <goal>run</goal>
-	                   </goals>
-	                   <configuration>
-	                       <tasks>
-	                           <ant antfile="./build.xml" target="compile"/>
-	                       </tasks>
-	                   </configuration>
-	               </execution>
-	           </executions>
-	       </plugin>
-	       
-	       <!-- The webapp self test doesn't work just now. For some reason it 
-	            can't find the composite file
-            <plugin>
-                <groupId>org.codehaus.cargo</groupId>
-                <artifactId>cargo-maven2-plugin</artifactId>
-                <version>1.0-beta-2</version>
-                <executions>
-                    <execution>
-                        <id>start-container</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>stop-container</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <container>
-                        <containerId>jetty6x</containerId>
-                        <type>embedded</type>  
-                        <systemProperties>
-                            <org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
-                        </systemProperties>
-                    </container>
-                    <wait>true</wait>
-                    <configuration>
-                        <properties>
-                            <cargo.servlet.port>8085</cargo.servlet.port>
-                        </properties>
-                        <deployables>
-                            <deployable>
-                                <location>
-                                    ${project.build.directory}/${project.build.finalName}.${project.packaging}
-                                </location>
-                                <pingURL>http://localhost:8085/sample-calculator-ws-webapp</pingURL>
-                                <type>war</type>
-                            </deployable>
-                        </deployables>
-                        <home>${project.build.directory}/cargo-jetty</home>
-                    </configuration>
-                </configuration>                
-            </plugin>	
-            -->       
-       </plugins>       
-    </build>
-</project>
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/AddService.java b/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/AddService.java
deleted file mode 100644
index 19e43317eb..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/AddService.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 calculator;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the add service
- */
-@Remotable
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java b/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e96b0faa96..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,34 +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 calculator;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the Add service
- */
-@Service(AddService.class)
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        System.err.println("Adding " + n1 + " to " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java b/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 39f55ca31f..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,69 +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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java b/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 497dafd4fd..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the divide service
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java b/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java b/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java b/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 376b3e5bb9..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the subtract service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 77b128ab8d..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/resources/Calculator.composite b/java/sca-contrib/samples/host-webapp-calculator/src/main/resources/Calculator.composite
deleted file mode 100644
index 6a00b85f62..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,49 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>  
-        <reference name="subtractService" target="SubtractServiceComponent"></reference>
-        <reference name="multiplyService" target="MultiplyServiceComponent"></reference>
-        <reference name="divideService" target="DivideServiceComponent"></reference>
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 8e3132eaa1..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:Calculator"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml b/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 59bbb0de83..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
-    xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
-    <d:environment>
-        <d:moduleId>
-            <d:groupId>org.apache.tuscany.sca</d:groupId>
-            <d:artifactId>sample-calculator-ws-webapp</d:artifactId>
-            <d:version>2.0-SNAPSHOT</d:version>
-            <d:type>war</d:type>
-        </d:moduleId>
-
-        <!-- TUSCANY-1986 -->
-        <d:inverse-classloading />
-    </d:environment>
-</web-app>
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite b/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index e839694501..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,24 +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:sample="http://sample"
-           name="Calculator">
-    <include name="sample:Calculator"/>
-</composite>
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml b/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 701ba48203..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  * 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.    
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-  <display-name>Apache Tuscany Calculator Web Service Sample</display-name>
-
-  <filter>
-    <filter-name>tuscany</filter-name> 
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
-  </filter>
-
-  <filter-mapping>
-    <filter-name>tuscany</filter-name> 
-    <url-pattern>/*</url-pattern> 
-  </filter-mapping>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>calc.jsp</welcome-file>
-  </welcome-file-list>
-
-</web-app>
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/calc.jsp b/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/calc.jsp
deleted file mode 100644
index 4c4366747d..0000000000
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/calc.jsp
+++ /dev/null
@@ -1,50 +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.
---%>

-

-<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>

-<%@ page import="calculator.CalculatorService" %>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
-   SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");
-   CalculatorService calculatorService = (CalculatorService)scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");

-%>
-<html>
-<head><title>Calculator sample</title></head>
-
-<body>
-<table>
-    <tr>
-        <th>Expression</th><th>Result</th>
-    </tr>
-    <tr>
-        <td>2 + 3</td><td><%= calculatorService.add(2, 3) %></td>
-    </tr>
-    <tr>
-        <td>3 - 2</td><td><%= calculatorService.subtract(3, 2) %></td>
-    </tr>

-    <tr>

-        <td>3 * 2</td><td><%= calculatorService.multiply(3, 2) %></td>

-    </tr>

-    <tr>

-        <td>3 / 2</td><td><%= calculatorService.divide(3, 2) %></td>

-    </tr>    
-</table>
-</body>
-</html>

diff --git a/java/sca-contrib/samples/implementation-composite/README b/java/sca-contrib/samples/implementation-composite/README
deleted file mode 100644
index 27de00e8ef..0000000000
--- a/java/sca-contrib/samples/implementation-composite/README
+++ /dev/null
@@ -1,116 +0,0 @@
-Composite Implementation Sample
-===============================
-
-This sample shows how composites can be used to implement components. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-implementation-composite.jar composite.CompositeClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-implementation-composite.jar composite.CompositeClient
-
-
-Sample Overview
----------------
-
-The sample is comprised of three composites. Take a look at the composite file 
-or the .svg/.png file which shows the composite file in pictorial form. The 
-OuterComposite defines three components two of which are implemented using 
-composites. The SourceComponent calls each TargetComponent in turn. There is a
-callback which returns from each TargetComponent to the SourceComponent. 
-
-implementation-composite/
-  src/
-    main/
-      java/
-        composite/
-          Source.java             - interface for the source component
-          SourceImpl.java         - implementation for the source component
-          SourceCallback.java     - source component callback interface
-          Target.java             - interface for the target component
-          TargetImpl.java         - implementation for the target component
-          CompositeClient.java    - starts the SCA Runtime and 
-                                    deploys the OuterComposite.composite. 
-                                    This in turn pulls in the two inner
-                                    composites
-      resources/
-        META-INF/
-          sca-contribution.xml    - specifies the composite to be deployed
-        OuterComposite.composite  - the top level SCA assembly for this sample
-        InnerComposite.composite  - included by OuterComposite.composite
-        InnerComposite2.composite - included by OuterComposite.composite
-    test/
-      java/
-        composite/
-          CompositeTestCase.java  - JUnit test case
-  implementation-composite.png    - a pictorial representation of the sample 
-                                    .composite file
-  build.xml                       - the Ant build file
-  pom.xml                         - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd implementation-composite
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-      [java] Main thread Thread[main,5,main]
-      [java] Source: Client.main -> Source.clientMethod
-      [java] Source: Client.main => Source.clientMethod2
-      [java] Sleeping ...
-      [java] Target: Client.main -> Source.clientMethod
-      [java] Work thread Thread[pool-1-thread-1,5,main]
-      [java] Result: Client.main -> Source.clientMethod -> Target.someMethod
-      [java] Target: Client.main => Source.clientMethod2
-      [java] Work thread Thread[pool-1-thread-2,5,main]
-      [java] Result: Client.main => Source.clientMethod2 -> Target.someMethod
-      
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd implementation-composite
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running composite.CompositeTestCase
-Main thread Thread[main,5,main]
-Source: Client.main -> Source.clientMethod
-Source: Client.main => Source.clientMethod2
-Sleeping ...
-Target: Client.main => Source.clientMethod2
-Work thread Thread[pool-1-thread-2,5,main]
-Result: Client.main => Source.clientMethod2 -> Target.someMethod
-Target: Client.main -> Source.clientMethod
-Work thread Thread[pool-1-thread-1,5,main]
-Result: Client.main -> Source.clientMethod -> Target.someMethod
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.973 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/implementation-composite/build.xml b/java/sca-contrib/samples/implementation-composite/build.xml
deleted file mode 100644
index 7aa31aab8b..0000000000
--- a/java/sca-contrib/samples/implementation-composite/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="implementation-composite" default="compile">
-    <property name="test.class" value="composite.CompositeClient" />
-	<property name="test.jar"   value="sample-implementation-composite.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/implementation-composite/implementation-composite.png b/java/sca-contrib/samples/implementation-composite/implementation-composite.png
deleted file mode 100644
index 4c6d71bc03..0000000000
--- a/java/sca-contrib/samples/implementation-composite/implementation-composite.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/implementation-composite/implementation-composite.svg b/java/sca-contrib/samples/implementation-composite/implementation-composite.svg
deleted file mode 100644
index 0e60354aab..0000000000
--- a/java/sca-contrib/samples/implementation-composite/implementation-composite.svg
+++ /dev/null
@@ -1,658 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\composite-impl"
-   sodipodi:docname="composite-impl.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\composite-impl\composite-impl.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="TriangleOutL"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="TriangleOutL"
-       style="overflow:visible">
-      <path
-         id="path3199"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8)" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleInL"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="TriangleInL"
-       style="overflow:visible">
-      <path
-         id="path3208"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(-0.8)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3279"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3276"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="422.9821"
-     inkscape:cy="472.08096"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1163"
-     inkscape:window-height="727"
-     inkscape:window-x="49"
-     inkscape:window-y="142" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00000072;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2067"
-       width="437.12573"
-       height="235.3502"
-       x="322.71631"
-       y="54.621651"
-       ry="9.9571238"
-       rx="13.497943" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2954"
-       transform="translate(52.97608,-147.3808)"><flowRegion
-         id="flowRegion2956"><rect
-           id="rect2958"
-           width="195.71428"
-           height="21.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2960">OuterComposite </flowPara></flowRoot>    <rect
-       style="fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3038"
-       width="387.65787"
-       height="235.3502"
-       x="90.543831"
-       y="383.98276"
-       ry="9.9571238"
-       rx="11.970432" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3040"
-       transform="translate(-176.3391,188.4089)"><flowRegion
-         id="flowRegion3042"><rect
-           id="rect3044"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3046">InnerComposite</flowPara></flowRoot>    <rect
-       style="fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00000048;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3048"
-       width="324.99875"
-       height="235.3502"
-       x="555.21411"
-       y="379.94214"
-       ry="9.9571238"
-       rx="10.03559" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#060000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:6,1;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3050"
-       width="501.42856"
-       height="300"
-       x="281.42856"
-       y="25.523054"
-       rx="2.4997854"
-       ry="0" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3052"
-       transform="translate(14.49567,-180.4534)"><flowRegion
-         id="flowRegion3054"><rect
-           id="rect3056"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3058">OuterComposite.composite</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#060000;stroke-width:1.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:6.00000127, 1.0000002;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3060"
-       width="469.99997"
-       height="277.14301"
-       x="34.999977"
-       y="355.52322"
-       rx="2.3431036"
-       ry="0" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3062"
-       transform="translate(-231.9329,149.5466)"><flowRegion
-         id="flowRegion3064"><rect
-           id="rect3066"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3068">InnerComposite.composite</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#060000;stroke-width:1.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:6.00000217, 1.00000036;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3070"
-       width="370.06677"
-       height="277.14301"
-       x="526.42865"
-       y="355.52322"
-       rx="1.8449039"
-       ry="0" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3072"
-       transform="translate(259.4957,149.5466)"><flowRegion
-         id="flowRegion3074"><rect
-           id="rect3076"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3078">InnerComposite2.composite</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3080"
-       width="115.66247"
-       height="107.29153"
-       x="339.39774"
-       y="120.88454"
-       rx="6.9961648"
-       ry="8.9006968" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3082"
-       transform="translate(61.09274,-82.91111)"><flowRegion
-         id="flowRegion3084"><rect
-           id="rect3086"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3088">SourceComponent</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 419.07104,149.4647 L 471.74673,149.4647 L 481.32412,162.59667 L 470.1505,174.71851 L 419.07104,174.71851 L 431.04279,162.59667 L 419.07104,149.4647 z "
-       id="path3094" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 417.44485,192.18187 L 470.12055,192.18187 L 479.69794,205.31384 L 468.52432,217.43568 L 417.44485,217.43568 L 429.41661,205.31384 L 417.44485,192.18187 z "
-       id="path3096" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3098"
-       transform="matrix(0.588577,0,0,0.522806,267.0549,40.55827)"><flowRegion
-         id="flowRegion3100"><rect
-           id="rect3102"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3104">Target</flowPara><flowPara
-         id="flowPara3106">Component</flowPara><flowPara
-         id="flowPara3108">Ref</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3110"
-       transform="matrix(0.588577,0,0,0.522806,266.7932,82.35649)"><flowRegion
-         id="flowRegion3112"><rect
-           id="rect3114"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3116">Target</flowPara><flowPara
-         id="flowPara3118">Component</flowPara><flowPara
-         id="flowPara3120">Ref2</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend);stroke-miterlimit:4;stroke-dasharray:6,1;stroke-dashoffset:0"
-       d="M 386.42857,191.23734 L 272.85714,354.80877"
-       id="path3304" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.99999964;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3306"
-       width="122.73349"
-       height="85.862968"
-       x="521.41876"
-       y="82.620422"
-       rx="7.4238753"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3308"
-       transform="translate(243.9718,-121.6444)"><flowRegion
-         id="flowRegion3310"><rect
-           id="rect3312"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3314">TargetComponent</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 508.55406,120.18171 L 546.16282,120.18171 L 553.00077,133.31368 L 545.02316,145.43552 L 508.55406,145.43552 L 517.10151,133.31368 L 508.55406,120.18171 z "
-       id="path3318" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000048;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3322"
-       width="124.75388"
-       height="85.862968"
-       x="625.0321"
-       y="185.9852"
-       rx="7.5460844"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3324"
-       transform="translate(347.5847,-18.27962)"><flowRegion
-         id="flowRegion3326"><rect
-           id="rect3328"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3330">TargetComponent2</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend);stroke-miterlimit:4;stroke-dasharray:6,1;stroke-dashoffset:0"
-       d="M 675.79205,235.98775 L 764.68548,355.18575"
-       id="path3336" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 481.33769,161.74154 L 496.99505,161.74154 L 496.99505,134.46742 L 515.1778,134.46742"
-       id="path3362" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 67.175117,493.80686 L 112.47656,493.80686 L 120.71318,512.19162 L 111.1038,529.1622 L 67.175117,529.1622 L 77.470908,512.19162 L 67.175117,493.80686 z "
-       id="path3364" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3366"
-       transform="matrix(0.764739,0,0,0.753419,-137.1237,335.169)"><flowRegion
-         id="flowRegion3368"><rect
-           id="rect3370"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3372">Inner</flowPara><flowPara
-         id="flowPara3374">Source</flowPara><flowPara
-         id="flowPara3376">Service</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3378"
-       width="115.66247"
-       height="123.2386"
-       x="222.2549"
-       y="461.59875"
-       rx="6.9961648"
-       ry="10.223635" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3380"
-       transform="translate(-41.0501,252.8032)"><flowRegion
-         id="flowRegion3382"><rect
-           id="rect3384"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3386">InnerSource</flowPara><flowPara
-         id="flowPara3398">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 207.36974,499.16011 L 246.68799,499.16011 L 253.83675,512.29208 L 245.49653,524.41392 L 207.36974,524.41392 L 216.30571,512.29208 L 207.36974,499.16011 z "
-       id="path3390" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 458.45503,498.7504 L 491.79007,498.7504 L 497.85098,511.88237 L 490.77992,524.00421 L 458.45503,524.00421 L 466.03118,511.88237 L 458.45503,498.7504 z "
-       id="path3394" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 457.8633,539.5488 L 491.19834,539.5488 L 497.25925,552.68077 L 490.18819,564.80261 L 457.8633,564.80261 L 465.43945,552.68077 L 457.8633,539.5488 z "
-       id="path3396" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 121.21831,512.76955 L 214.15234,512.76955"
-       id="path3402" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 313.13842,496.9668 L 365.81411,496.9668 L 375.3915,510.09877 L 364.21788,522.22061 L 313.13842,522.22061 L 325.11017,510.09877 L 313.13842,496.9668 z "
-       id="path3428" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 311.51223,539.68397 L 364.18793,539.68397 L 373.76532,552.81594 L 362.5917,564.93778 L 311.51223,564.93778 L 323.48399,552.81594 L 311.51223,539.68397 z "
-       id="path3430" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3432"
-       transform="matrix(0.588577,0,0,0.522806,161.1223,388.0604)"><flowRegion
-         id="flowRegion3434"><rect
-           id="rect3436"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3438">Target</flowPara><flowPara
-         id="flowPara3440">Component</flowPara><flowPara
-         id="flowPara3442">Ref</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3444"
-       transform="matrix(0.588577,0,0,0.522806,160.8606,429.8586)"><flowRegion
-         id="flowRegion3446"><rect
-           id="rect3448"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3450">Target</flowPara><flowPara
-         id="flowPara3452">Component</flowPara><flowPara
-         id="flowPara3454">Ref2</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 375,509.80877 L 465,510.52305"
-       id="path3456" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 374.28571,553.3802 L 465,553.3802"
-       id="path3458" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3460"
-       transform="matrix(0.768159,0,0,0.869201,176.2162,311.7866)"><flowRegion
-         id="flowRegion3462"><rect
-           id="rect3464"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3466">promote</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3468"
-       transform="matrix(0.768159,0,0,0.869201,176.8981,355.7265)"><flowRegion
-         id="flowRegion3470"><rect
-           id="rect3472"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3474">promote</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 538.20382,492.4365 L 583.50526,492.4365 L 591.74188,510.82126 L 582.1325,527.79184 L 538.20382,527.79184 L 548.49961,510.82126 L 538.20382,492.4365 z "
-       id="path3476" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3478"
-       transform="matrix(0.764739,0,0,0.753419,333.905,333.7986)"><flowRegion
-         id="flowRegion3480"><rect
-           id="rect3482"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3484">Inner</flowPara><flowPara
-         id="flowPara3486">Target</flowPara><flowPara
-         id="flowPara3488">Service</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000048;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3490"
-       width="124.75388"
-       height="85.862968"
-       x="698.64941"
-       y="459.73654"
-       rx="7.5460844"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3492"
-       transform="translate(445.4456,256.4819)"><flowRegion
-         id="flowRegion3494"><rect
-           id="rect3496"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3498">InnerTarget</flowPara><flowPara
-         id="flowPara3502">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 677.53028,495.80598 L 714.4917,495.80598 L 721.21196,510.79509 L 713.37166,524.63121 L 677.53028,524.63121 L 685.93061,510.79509 L 677.53028,495.80598 z "
-       id="path3500" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 916.90199,189.64981 L 1002.9382,189.64981 C 1002.9382,189.64981 1002.9382,235.81944 1002.9382,235.81944 C 989.62313,237.57221 976.30803,237.62595 962.99289,245.41312 C 953.65801,255.66964 935.10151,255.12922 917.92625,256.20602 L 916.90199,189.64981 z "
-       id="path3504"
-       sodipodi:nodetypes="cccccc" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3506"
-       transform="translate(646.5141,-15.23667)"><flowRegion
-         id="flowRegion3508"><rect
-           id="rect3510"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3514">TargetImpl</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3522"
-       transform="matrix(0.764739,0,0,0.753419,471.6381,345.0856)"><flowRegion
-         id="flowRegion3524"><rect
-           id="rect3526"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3532">Target</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 590.71429,511.23734 L 685,511.23734"
-       id="path3538" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 918.41044,67.959238 L 1004.4467,67.959238 C 1004.4467,67.959238 1004.4467,114.12887 1004.4467,114.12887 C 991.13163,115.88164 977.81652,115.93538 964.50132,123.72255 C 955.16646,133.97907 936.60996,133.43865 919.4347,134.51545 L 918.41044,67.959238 z "
-       id="path3576"
-       sodipodi:nodetypes="cccccc" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3578"
-       transform="translate(648.0226,-136.9272)"><flowRegion
-         id="flowRegion3580"><rect
-           id="rect3582"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3584">Target</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-mid:url(#TriangleInL);stroke-opacity:1"
-       d="M 961.42857,126.95163 L 961.42857,162.66591 L 961.42857,191.23734"
-       id="path3594" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 76.22763,193.09023 L 162.2639,193.09023 C 162.2639,193.09023 162.2639,239.25986 162.2639,239.25986 C 148.9488,241.01263 135.6337,241.06637 122.3185,248.85354 C 112.98365,259.11006 94.42715,258.56964 77.25189,259.64644 L 76.22763,193.09023 z "
-       id="path3600"
-       sodipodi:nodetypes="cccccc" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3602"
-       transform="translate(-194.1602,-11.79626)"><flowRegion
-         id="flowRegion3604"><rect
-           id="rect3606"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3608">SourceImpl</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 14.878937,64.256802 L 100.91526,64.256802 C 100.91526,64.256802 100.91526,110.42643 100.91526,110.42643 C 87.600157,112.1792 74.285057,112.23294 60.969857,120.02011 C 51.634957,130.27663 33.078457,129.73621 15.903197,130.81301 L 14.878937,64.256802 z "
-       id="path3610"
-       sodipodi:nodetypes="cccccc" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3612"
-       transform="translate(-255.5088,-140.6297)"><flowRegion
-         id="flowRegion3614"><rect
-           id="rect3616"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3618">Source</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 140.55329,63.673523 L 239.44669,63.673523 C 239.44669,63.673523 239.44669,109.84315 239.44669,109.84315 C 224.14179,111.59592 208.83699,111.64966 193.53189,119.43683 C 182.80209,129.69335 161.47249,129.15293 141.73059,130.22973 L 140.55329,63.673523 z "
-       id="path3622"
-       sodipodi:nodetypes="cccccc" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3624"
-       transform="translate(-135.5491,-141.213)"><flowRegion
-         id="flowRegion3626"><rect
-           id="rect3628"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3630">SourceCallback</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-mid:url(#TriangleOutL)"
-       d="M 108.08632,192.55119 L 77.781746,156.1857 L 51.51778,123.86082"
-       id="path3634" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-mid:url(#TriangleOutL)"
-       d="M 130.30968,192.55119 L 161.62441,159.21616 L 201.02036,117.7999"
-       id="path3636" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:6,1;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"
-       d="M 800,511.23734 L 917.14286,238.3802"
-       id="path3640" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,1;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"
-       d="M 610,125.52305 L 915.71429,216.95163"
-       id="path3646" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:6,1;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"
-       d="M 280,512.66591 L 132.85714,241.23734"
-       id="path3648" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3650"
-       transform="matrix(0.764739,0,0,0.753419,301.1926,-32.06018)"><flowRegion
-         id="flowRegion3652"><rect
-           id="rect3654"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3656">Target</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3658"
-       transform="matrix(0.764739,0,0,0.753419,1.177328,346.747)"><flowRegion
-         id="flowRegion3660"><rect
-           id="rect3662"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3664">Source</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 480.83261,205.68318 L 517.1981,205.68318 L 518.20826,511.7594 L 546.49253,511.7594"
-       id="path3670" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3672"
-       transform="translate(281.8571,183.8295)"><flowRegion
-         id="flowRegion3674"><rect
-           id="rect3676"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara3678">InnerComposite2</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2048"
-       transform="matrix(0.768159,0,0,0.869201,-73.32453,313.1674)"><flowRegion
-         id="flowRegion2050"><rect
-           id="rect2052"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2054">promote</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2056"
-       transform="matrix(0.768159,0,0,0.869201,397.4066,306.0963)"><flowRegion
-         id="flowRegion2058"><rect
-           id="rect2060"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2062">promote</flowPara></flowRoot>  </g>
-</svg>
diff --git a/java/sca-contrib/samples/implementation-composite/pom.xml b/java/sca-contrib/samples/implementation-composite/pom.xml
deleted file mode 100644
index 91f8af09f3..0000000000
--- a/java/sca-contrib/samples/implementation-composite/pom.xml
+++ /dev/null
@@ -1,72 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-implementation-composite</artifactId>
-    <name>Apache Tuscany SCA Composite Sample</name>
-    <description>A sample showing local wiring of a component implemented by a nested composite</description>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/java/sca-contrib/samples/implementation-composite/src/main/java/composite/CompositeClient.java
deleted file mode 100644
index bf743e1797..0000000000
--- a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/CompositeClient.java
+++ /dev/null
@@ -1,41 +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 composite;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Simple client program that invokes the components that we wired together.
- */
-public class CompositeClient {
-
-    public static void main(String[] args) throws Exception {
-    	SCADomain scaDomain = SCADomain.newInstance();
-    	
-        Source source = scaDomain.getService(Source.class, "SourceComponent");
-        
-        System.out.println("Main thread " + Thread.currentThread());
-        source.clientMethod("Client.main");
-        System.out.println("Sleeping ...");
-        Thread.sleep(1000);
-        
-        scaDomain.close();
-    }
-}
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/Source.java b/java/sca-contrib/samples/implementation-composite/src/main/java/composite/Source.java
deleted file mode 100644
index d0efcc1df1..0000000000
--- a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/Source.java
+++ /dev/null
@@ -1,24 +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 composite;
-
-public interface Source {
-
-    void clientMethod(String arg);
-}
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/java/sca-contrib/samples/implementation-composite/src/main/java/composite/SourceCallback.java
deleted file mode 100644
index baa95a8e39..0000000000
--- a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/SourceCallback.java
+++ /dev/null
@@ -1,24 +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 composite;
-
-public interface SourceCallback {
-
-    void receiveResult(String result);
-}
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/java/sca-contrib/samples/implementation-composite/src/main/java/composite/SourceImpl.java
deleted file mode 100644
index 8e2b347604..0000000000
--- a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/SourceImpl.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 composite;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-
-@Service(Source.class)
-@Scope("COMPOSITE")
-public class SourceImpl implements Source, SourceCallback {
-
-    private Target targetReference;
-    private Target targetReference2;
-
-    @Reference
-    public void setTargetReference(Target target) {
-        this.targetReference = target;
-    }
-
-    @Reference
-    public void setTargetReference2(Target target) {
-        this.targetReference2 = target;
-    }
-
-    public void clientMethod(String arg) {
-        System.out.println("Source: " + arg + " -> Source.clientMethod");
-        targetReference.someMethod(arg + " -> Source.clientMethod");
-
-        System.out.println("Source: " + arg + " => Source.clientMethod2");
-        targetReference2.someMethod(arg + " => Source.clientMethod2");
-    }
-
-    public void receiveResult(String result) {
-        System.out.println("Work thread " + Thread.currentThread());
-        System.out.println("Result: " + result);
-    }
-}
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/Target.java b/java/sca-contrib/samples/implementation-composite/src/main/java/composite/Target.java
deleted file mode 100644
index 703e72fc10..0000000000
--- a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/Target.java
+++ /dev/null
@@ -1,30 +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 composite;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.OneWay;
-
-
-@Callback(SourceCallback.class)
-public interface Target {
-
-    @OneWay
-    void someMethod(String arg);
-}
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/java/sca-contrib/samples/implementation-composite/src/main/java/composite/TargetImpl.java
deleted file mode 100644
index cd9a9746fa..0000000000
--- a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ /dev/null
@@ -1,41 +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 composite;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-
-@Service(Target.class)
-@Scope("COMPOSITE")
-public class TargetImpl implements Target {
-
-    private SourceCallback sourceCallback;
-
-    @Callback
-    public void setSourceCallback(SourceCallback sourceCallback) {
-        this.sourceCallback = sourceCallback;
-    }
-
-    public void someMethod(String arg) {
-        System.out.println("Target: " + arg);
-        sourceCallback.receiveResult(arg + " -> Target.someMethod");
-    }
-}
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/resources/InnerComposite.composite b/java/sca-contrib/samples/implementation-composite/src/main/resources/InnerComposite.composite
deleted file mode 100644
index 3376ac8ff5..0000000000
--- a/java/sca-contrib/samples/implementation-composite/src/main/resources/InnerComposite.composite
+++ /dev/null
@@ -1,41 +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://sample"
-    xmlns:sample="http://sample"
-    name="InnerComposite">
-
-    <service name="InnerSourceService" promote="InnerSourceComponent">
-        <interface.java interface="composite.Source"/>
-    </service>
-       
-    <component name="InnerSourceComponent">
-		<implementation.java class="composite.SourceImpl"/>
-    </component>
-	    
-    <reference name="targetComponentRef" promote="InnerSourceComponent/targetReference">
-        <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
-    </reference>
-    
-    <reference name="targetComponentRef2" promote="InnerSourceComponent/targetReference2">
-        <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/java/sca-contrib/samples/implementation-composite/src/main/resources/InnerComposite2.composite
deleted file mode 100644
index c9eff4fa9d..0000000000
--- a/java/sca-contrib/samples/implementation-composite/src/main/resources/InnerComposite2.composite
+++ /dev/null
@@ -1,33 +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://sample"
-    xmlns:sample="http://sample"
-    name="InnerComposite2">
-
-    <service name="InnerTargetService" promote="InnerTargetComponent"> 
-        <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
-    </service>
-       
-    <component name="InnerTargetComponent">
-		<implementation.java class="composite.TargetImpl"/>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index e675fd3624..0000000000
--- a/java/sca-contrib/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
+++ /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.    

- -->

-

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	      targetNamespace="http://sample"

-              xmlns:sample="http://sample">

-   <deployable composite="sample:OuterComposite"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/resources/OuterComposite.composite b/java/sca-contrib/samples/implementation-composite/src/main/resources/OuterComposite.composite
deleted file mode 100644
index cb1c1e13d4..0000000000
--- a/java/sca-contrib/samples/implementation-composite/src/main/resources/OuterComposite.composite
+++ /dev/null
@@ -1,39 +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://sample"
-    xmlns:sample="http://sample"
-    name="OuterComposite">
-
-    <component name="SourceComponent">
-        <implementation.composite name="sample:InnerComposite"/>
-        <reference name="targetComponentRef" target="TargetComponent"/>
-        <reference name="targetComponentRef2" target="TargetComponent2/InnerTargetService"/>
-    </component>
-
-    <component name="TargetComponent">
-		<implementation.java class="composite.TargetImpl"/>
-    </component>
-    
-    <component name="TargetComponent2">
-        <implementation.composite name="sample:InnerComposite2"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/java/sca-contrib/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
deleted file mode 100644
index 9e9a4b44a4..0000000000
--- a/java/sca-contrib/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
+++ /dev/null
@@ -1,51 +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 composite;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CompositeTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private Source source;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance();
-        source = scaDomain.getService(Source.class, "SourceComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-        try {
-            System.out.println("Main thread " + Thread.currentThread());
-            source.clientMethod("Client.main");
-            System.out.println("Sleeping ...");
-            Thread.sleep(1000);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/java/sca-contrib/samples/implementation-crud-extension/README b/java/sca-contrib/samples/implementation-crud-extension/README
deleted file mode 100644
index 5e8190648f..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/README
+++ /dev/null
@@ -1,83 +0,0 @@
-Implementation CRUD Sample
-==========================
-This sample demonstrates how new implementation types are constructed for 
-Apache Tuscany SCA. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you want to try out the CRUD implementation type that this sample provides
-please see the implementation-crud sample that provides the necessary client
-code to bring up an application that uses this implementation extension.
-
-Sample Overview
----------------
-This sample contains a CRUD implementation type as an example of how to create
-new implementation types. Components using this implementation type always
-expose the same Create, Retrieve, Update and Delete interface. This sample
-uses a singleton ResourceManager to perform the CRUD operations but of course
-a real component would provide a real implementation. 
-
-implementation-crud-extension/
-  src/
-    main/
-      java/
-        crud/                  - implementation model interfaces
-          backend/             - fake component implementation
-          impl/                - implementations of the model interfaces
-          provider/            - runtime implementation
-      resources/
-        META-INF/
-          services/            - declares the extension
-    test/
-      java/
-        crud/
-          CRUDTestCase.java    - JUnit test case
-      resources/
-        crud.composite         - the SCA assembly used during unit testing
-
-  build.xml                    - the Ant build file
-  pom.xml                      - the Maven build file
-  
-Building The Sample Extension Using Ant
------------------------------------------
-With the binary distribution the sample extension can be built using Ant as 
-follows
-
-cd implementation-crud-extension
-ant compile
-
-See the implementation-crud sample to run a sample that uses this
-implementation extension.
-
-Building The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built 
-using Maven as follows. 
-
-cd implementation-crud-extension
-mvn
-
-Maven will also test that the sample extension built properly. You should see 
-the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running crud.CRUDTestCase
-Starting CRUDServiceComponent
-create(ABC) in tmp
-retrieve(0)
-update(0)
-retrieve(0)
-delete(0)
-retrieve(0)
-Stopping CRUDServiceComponent
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.212 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/implementation-crud-extension/build.xml b/java/sca-contrib/samples/implementation-crud-extension/build.xml
deleted file mode 100644
index 88d308e6fc..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/build.xml
+++ /dev/null
@@ -1,51 +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.    
--->
-<project name="implementation-crud-extension" default="compile">
-	<property name="test.jar"   value="sample-implementation-crud-extension.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-		
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/implementation-crud-extension/pom.xml b/java/sca-contrib/samples/implementation-crud-extension/pom.xml
deleted file mode 100644
index 6e044bd68e..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/pom.xml
+++ /dev/null
@@ -1,77 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-implementation-crud-extension</artifactId>
-    <name>Apache Tuscany SCA CRUD Implementation Extension Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
deleted file mode 100644
index b23d85887b..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
+++ /dev/null
@@ -1,54 +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 crud;
-
-/**
- * The service interface of the single CRUD service provided by CRUD components.
- */
-public interface CRUD {
-
-    /**
-     * Create a new resource.
-     * @param resource
-     * @return
-     */
-    String create(Object resource);
-
-    /**
-     * Retrieve a resource.
-     * @param id
-     * @return
-     */
-    Object retrieve(String id);
-
-    /**
-     * Update a resource.
-     * @param id
-     * @param resource
-     * @return
-     */
-    Object update(String id, Object resource);
-
-    /**
-     * Delete a resource.
-     * @param id
-     */
-    void delete(String id);
-
-}
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
deleted file mode 100644
index 49be844f93..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
+++ /dev/null
@@ -1,50 +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 crud;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-
-/**
- * The model representing a sample CRUD implementation in an SCA assembly model.
- * 
- * The sample CRUD implementation is not a full blown implementation, it only
- * supports a subset of what a component implementation can support:
- * - a single fixed service (as opposed to a list of services typed by different interfaces
- * - a directory attribute used to specify where a CRUD component is going to persist
- * resources
- * - no references or properties
- * - no policy intents or policy sets
- */
-public interface CRUDImplementation extends Implementation {
-
-    /**
-     * Returns the directory used by CRUD implementations to persist resources.
-     * 
-     * @return the directory used to persist resources
-     */
-    public String getDirectory();
-
-    /**
-     * Sets the directory used by CRUD implementations to persist resources.
-     * 
-     * @param directory the directory used to persist resources
-     */
-    public void setDirectory(String directory);
-
-}
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
deleted file mode 100644
index fa83c63c1b..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.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 crud;
-
-import crud.CRUDImplementation;
-
-
-/**
- * A factory for the sample CRUD implementation model.
- */
-public interface CRUDImplementationFactory {
-    
-    /**
-     * Creates a new CRUD implementation.
-     * 
-     * @return
-     */
-    CRUDImplementation createCRUDImplementation();
-
-}
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
deleted file mode 100644
index cc0795a735..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
+++ /dev/null
@@ -1,90 +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 crud.backend;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A fake resource manager implementation used as a backend by the sample
- * CRUD component implementation.
- */
-public class ResourceManager {
-    private static int counter;
-    private static final Map<String, Object> store = new HashMap<String, Object>();
-    private String directory;
-
-    /**
-     * Constructs a new resource manager.
-     * 
-     * @param directory the directory where to persist resources
-     */
-    public ResourceManager(String directory) {
-        super();
-        this.directory = directory;
-    }
-
-    /**
-     * Creates a new resource.
-     * 
-     * @param resource
-     * @return
-     */
-    public String createResource(Object resource) {
-        System.out.println("create(" + resource + ") in " + directory);
-        String key = String.valueOf(counter++);
-        store.put(key, resource);
-        return key;
-    }
-
-    /**
-     * Deletes a resource.
-     * 
-     * @param id
-     */
-    public void deleteResource(String id) {
-        System.out.println("delete(" + id + ")");
-        store.remove(id);
-    }
-
-    /**
-     * Retrieves a resource.
-     * 
-     * @param id
-     * @return
-     */
-    public Object retrieveResource(String id) {
-        System.out.println("retrieve(" + id + ")");
-        return store.get(id);
-    }
-
-    /**
-     * Updates a resource.
-     * 
-     * @param id
-     * @param resource
-     * @return
-     */
-    public Object updateResource(String id, Object resource) {
-        System.out.println("update(" + id + ")");
-        return store.put(id, resource);
-    }
-
-}
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java b/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
deleted file mode 100644
index 2f1e5fcba8..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
+++ /dev/null
@@ -1,47 +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 crud.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-import crud.CRUDImplementation;
-import crud.CRUDImplementationFactory;
-
-
-/**
- * A factory for the CRUD implementation model.
- */
-public class CRUDImplementationFactoryImpl implements CRUDImplementationFactory {
-    
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-    
-    public CRUDImplementationFactoryImpl(ModelFactoryExtensionPoint modelFactories) {
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-    }
-
-    public CRUDImplementation createCRUDImplementation() {
-        return new CRUDImplementationImpl(assemblyFactory, javaFactory);
-    }
-
-}
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
deleted file mode 100644
index 383a035e69..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
+++ /dev/null
@@ -1,117 +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 crud.impl;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-import crud.CRUD;
-import crud.CRUDImplementation;
-
-
-/**
- * The model representing a sample CRUD implementation in an SCA assembly model.
- */
-class CRUDImplementationImpl implements CRUDImplementation {
-
-    private Service crudService;
-    private String directory;
-
-    /**
-     * Constructs a new CRUD implementation.
-     */
-    CRUDImplementationImpl(AssemblyFactory assemblyFactory,
-                              JavaInterfaceFactory javaFactory) {
-
-        // CRUD implementation always provide a single service exposing
-        // the CRUD interface, and have no references and properties
-        crudService = assemblyFactory.createService();
-        crudService.setName("CRUD");
-        JavaInterface javaInterface;
-        try {
-            javaInterface = javaFactory.createJavaInterface(CRUD.class);
-        } catch (InvalidInterfaceException e) {
-            throw new IllegalArgumentException(e);
-        }
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        interfaceContract.setInterface(javaInterface);
-        crudService.setInterfaceContract(interfaceContract);
-    }
-
-    public String getDirectory() {
-        return directory;
-    }
-
-    public void setDirectory(String directory) {
-        this.directory = directory;
-    }
-
-    public ConstrainingType getConstrainingType() {
-        // The sample CRUD implementation does not support constrainingTypes
-        return null;
-    }
-
-    public List<Property> getProperties() {
-        // The sample CRUD implementation does not support properties
-        return Collections.emptyList();
-    }
-
-    public List<Service> getServices() {
-        // The sample CRUD implementation provides a single fixed CRUD service
-        return Collections.singletonList(crudService);
-    }
-    
-    public List<Reference> getReferences() {
-        // The sample CRUD implementation does not support properties
-        return Collections.emptyList();
-    }
-
-    public String getURI() {
-        // The sample CRUD implementation does not have a URI
-        return null;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        // The sample CRUD implementation does not support constrainingTypes
-    }
-
-    public void setURI(String uri) {
-        // The sample CRUD implementation does not have a URI
-    }
-
-    public boolean isUnresolved() {
-        // The sample CRUD implementation is always resolved
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // The sample CRUD implementation is always resolved
-    }
-
-}
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java b/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
deleted file mode 100644
index b212ee3c9b..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
+++ /dev/null
@@ -1,79 +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 crud.provider;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-import crud.backend.ResourceManager;
-
-
-/**
- * Implements an invoker for CRUD component implementations.
- * 
- * The invoker is responsible for handling invocations of a business operation.
- * Input business data is passed to the invoke method in a Message object.
- * The invoke method is responsible for handling the invocation and returning a Message with
- * the output business data. 
- * 
- * In this example we are simply delegating the CRUD operation invocations to the
- * corresponding methods on our fake resource manager class.
- * 
- * More sophisticated invokers can delegate the invocation to an implementation artifact directly
- * (for example a Java class using reflection as in the implementation-pojo sample) or call a runtime
- * engine like a BPEL engine or an XQuery engine for example (this is what the Tuscany
- * implementation-bpel and implementation-xquery extensions do).
- */
-class CRUDImplementationInvoker implements Invoker {
-    private Operation operation;
-    private ResourceManager resourceManager;
-    
-    CRUDImplementationInvoker(Operation operation, ResourceManager resourceManager) {
-        this.operation = operation;
-        this.resourceManager = resourceManager;
-    }
-    
-    public Message invoke(Message msg) {
-        try {
-            Object[] args = msg.getBody();
-            Object resp = null;
-            
-            if (operation.getName().equals("create")) {
-                resp = resourceManager.createResource(args[0]);
-                
-            } else if (operation.getName().equals("retrieve")) {
-                resp = resourceManager.retrieveResource((String)args[0]);
-                
-            } else if (operation.getName().equals("update")) {
-                resp = resourceManager.updateResource((String)args[0], args[1]);
-                
-            } else if (operation.getName().equals("delete")) {
-                resourceManager.deleteResource((String)args[0]);
-            }
-            
-            msg.setBody(resp);
-        } catch (Exception e) {
-            msg.setFaultBody(e.getCause());
-        }
-        return msg;
-    }
-
-}
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
deleted file mode 100644
index 8f11f9d910..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.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 crud.provider;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-import crud.CRUDImplementation;
-import crud.backend.ResourceManager;
-
-
-/**
- * An implementation provider for sample CRUD implementations.
- * 
- * The implementation provider is responsible for handling the lifecycle of a component
- * implementation and creating operation invokers for the service operations provided
- * by the implementation.
- * 
- * The start() and stop() methods are called when a component is started
- * and stopped.
- *
- * The createInvoker method is called for each operation provided by the component
- * implementation. The implementation provider can create an invoker and initialize it
- * at that time to minimize the amount of work to be performed on each invocation.  
- */
-class CRUDImplementationProvider implements ImplementationProvider {
-    
-    private RuntimeComponent component;
-    private CRUDImplementation implementation;
-
-    /**
-     * Constructs a new CRUD implementation.
-     */
-    CRUDImplementationProvider(RuntimeComponent component, CRUDImplementation implementation) {
-        this.component = component;
-        this.implementation = implementation;
-    }
-
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        CRUDImplementationInvoker invoker = new CRUDImplementationInvoker(operation, new ResourceManager(implementation.getDirectory()));
-        return invoker;
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-        System.out.println("Starting " + component.getName());
-    }
-
-    public void stop() {
-        System.out.println("Stopping " + component.getName());
-    }
-
-}
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
deleted file mode 100644
index 4566cb7155..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
+++ /dev/null
@@ -1,51 +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 crud.provider;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-import crud.CRUDImplementation;
-import crud.provider.CRUDImplementationProvider;
-
-
-/**
- * A factory for CRUD implementation providers.
- * 
- *  The factory is called to create an implementation provider for each component using
- *  the CRUD implementation.
- */
-public class CRUDImplementationProviderFactory implements ImplementationProviderFactory<CRUDImplementation> {
-
-    /**
-     * Constructs a new CRUD implementation.
-     */
-    public CRUDImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
-    }
-
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component, CRUDImplementation implementation) {
-        return new CRUDImplementationProvider(component, implementation);
-    }
-    
-    public Class<CRUDImplementation> getModelType() {
-        return CRUDImplementation.class;
-    }
-}
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory b/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
deleted file mode 100644
index 3cf5de5fa1..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the implementation model factory

-crud.impl.CRUDImplementationFactoryImpl

diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 17c98cf706..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://crud#implementation.crud,model=crud.CRUDImplementation,factory=crud.CRUDImplementationFactory
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
deleted file mode 100644
index 527c626418..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ /dev/null
@@ -1,19 +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. 
-
-# URI of the XML schema to be used for validation
-sample-implementation-crud.xsd
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 6ce605197a..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the implementation extension

-crud.provider.CRUDImplementationProviderFactory;model=crud.CRUDImplementation

diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd b/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
deleted file mode 100644
index 447e31bf93..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://crud" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:c="http://crud" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0"/>
-
-    <element name="implementation.crud" type="c:CRUDImplementation"/>
-    	
-    <complexType name="CRUDImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <attribute name="directory" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/java/sca-contrib/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
deleted file mode 100644
index 0bb5cfc361..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
+++ /dev/null
@@ -1,60 +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 crud;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import crud.CRUD;
-
-/**
- * Tests the CRUD implementation extension.
- */
-public class CRUDTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private CRUD crudService;
-    
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("crud.composite");
-        crudService = scaDomain.getService(CRUD.class, "CRUDServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-    
-    public void testCRUD() throws Exception {
-        String id = crudService.create("ABC");
-        Object result = crudService.retrieve(id);
-        assertEquals("ABC", result);
-        
-        crudService.update(id, "EFG");
-        result = crudService.retrieve(id);
-        assertEquals("EFG", result);
-        
-        crudService.delete(id);
-        result = crudService.retrieve(id);
-        assertNull(result);
-    }
-}
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/test/resources/crud.composite b/java/sca-contrib/samples/implementation-crud-extension/src/test/resources/crud.composite
deleted file mode 100644
index 18745033bb..0000000000
--- a/java/sca-contrib/samples/implementation-crud-extension/src/test/resources/crud.composite
+++ /dev/null
@@ -1,30 +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://sample/crud"
-	xmlns:sc="http://sample/crud"
-	xmlns:c="http://crud"
-	name="crud">

-

-    <component name="CRUDServiceComponent">

-        <c:implementation.crud directory="tmp" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/implementation-crud/README b/java/sca-contrib/samples/implementation-crud/README
deleted file mode 100644
index 50da631c04..0000000000
--- a/java/sca-contrib/samples/implementation-crud/README
+++ /dev/null
@@ -1,113 +0,0 @@
-Implementation CRUD Sample Client
-=================================
-This sample demonstrates how to use the new implementation extension, 
-implementation-crud-extension.
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens, open a command prompt,
-navigate to this sample directory, and do
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;..\implementation-crud-extension\target\sample-implementation-crud-extension.jar;target\sample-implementation-crud.jar crud.client.CRUDClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:../implementation-crud-extension/target/sample-implementation-crud-extension.jar:target/sample-implementation-crud.jar crud.client.CRUDClient
-
-This looks like a long command. The three things we add to the classpath are
-
-tuscany-sca-manifest.jar                 - all of the standard Tuscany SCA 
-                                           runtime and extension classes
-sample-implementation-crud-extension.jar - the new crud implementation
-                                           extension 
-sample-implementation-crud.jar           - the application that uses the crud
-                                           implementation  
-
-Sample Overview
----------------
-This sample contains a client application for a CRUD implementation type that
-shows how to create new implementation types. See the README for the
-mplementation-crud-extension sample for details of this implementation type.
-
-implementation-crud/
-  src/
-    main/
-      java/
-        crud/
-          client/
-            CRUDClient.java    - sample client
-      resources/
-        crud.composite         - the SCA assembly used by this sample
-          
-    test/
-      java/
-        crud/
-          client/
-            CRUDTestCase.java  - sample JUnit test case for the sample client
-          
-  implementation-crud.png      - a pictorial representation of the sample 
-                                 .composite file          
-  build.xml                    - the Ant build file
-  pom.xml                      - the Maven build file
-  
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd implementation-crud
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] Starting CRUDServiceComponent
-     [java] create(ABC) in tmp
-     [java] retrieve(0)
-     [java] Result from create: ABC
-     [java] update(0)
-     [java] retrieve(0)
-     [java] Result from update: EFG
-     [java] delete(0)
-     [java] retrieve(0)
-     [java] Result from delete: null
-     [java] Stopping CRUDServiceComponent
-
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and
-run using Maven as follows. 
-
-cd implementation-crud
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running crud.client.CRUDTestCase
-Starting CRUDServiceComponent
-create(ABC) in tmp
-retrieve(0)
-update(0)
-retrieve(0)
-delete(0)
-retrieve(0)
-Stopping CRUDServiceComponent
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.641 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/implementation-crud/build.xml b/java/sca-contrib/samples/implementation-crud/build.xml
deleted file mode 100644
index 10b26b5a94..0000000000
--- a/java/sca-contrib/samples/implementation-crud/build.xml
+++ /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.    
--->
-<project name="implementation-crud" default="compile">
-    <property name="test.class" value="crud.client.CRUDClient" />
-	<property name="test.jar"   value="sample-implementation-crud.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-                <pathelement location="../implementation-crud-extension/target/sample-implementation-crud-extension.jar"/>
-                <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>      
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-                <pathelement location="../implementation-crud-extension/target/sample-implementation-crud-extension.jar"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement location="target/${test.jar}"/>
-                <pathelement location="../implementation-crud-extension/target/sample-implementation-crud-extension.jar"/>
-                <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>	
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/implementation-crud/implementation-crud.png b/java/sca-contrib/samples/implementation-crud/implementation-crud.png
deleted file mode 100644
index a292037e7a..0000000000
--- a/java/sca-contrib/samples/implementation-crud/implementation-crud.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/implementation-crud/implementation-crud.svg b/java/sca-contrib/samples/implementation-crud/implementation-crud.svg
deleted file mode 100644
index dbb37be208..0000000000
--- a/java/sca-contrib/samples/implementation-crud/implementation-crud.svg
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\implementation-crud"
-   sodipodi:docname="implementation-crud.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\implementation-crud\implementation-crud.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="528.85714"
-     inkscape:cy="406.01174"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1142"
-     inkscape:window-height="722"
-     inkscape:window-x="107"
-     inkscape:window-y="128" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1.038749,0,0,1.009461,-29.25616,-1.807024)">
-      <rect
-         rx="8.7034655"
-         ry="12.692303"
-         y="192.00233"
-         x="375.89822"
-         height="299.99988"
-         width="281.85843"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.95312572;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="translate(104.5213,-10.61387)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">crud</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="450.63062"
-       y="302.8819"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(183.0398,96.94336)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">CRUDService</flowPara><flowPara
-         id="flowPara1894">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 433.4801,334.72889 L 466.81514,334.72889 L 472.87605,347.86087 L 465.80499,359.98271 L 433.4801,359.98271 L 441.05625,347.86087 L 433.4801,334.72889 z "
-       id="path3017" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1904"
-       transform="translate(158.2681,129.761)"><flowRegion
-         id="flowRegion1906"><rect
-           id="rect1908"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1912"
-         style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans">CRUD</flowPara></flowRoot>  </g>
-</svg>
diff --git a/java/sca-contrib/samples/implementation-crud/pom.xml b/java/sca-contrib/samples/implementation-crud/pom.xml
deleted file mode 100644
index 3fb4252e92..0000000000
--- a/java/sca-contrib/samples/implementation-crud/pom.xml
+++ /dev/null
@@ -1,64 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-implementation-crud</artifactId>
-    <name>Apache Tuscany SCA CRUD Implementation Extension Sample Client</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-implementation-crud-extension</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/java/sca-contrib/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
deleted file mode 100644
index ea87cb3001..0000000000
--- a/java/sca-contrib/samples/implementation-crud/src/main/java/crud/client/CRUDClient.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 crud.client;
-
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import crud.CRUD;
-
-/**
- * A sample client that shows how to create an SCA domain, get a service, and
- * invoke service methods of a CRUD component.
- * 
- * The CRUD component uses an <implementation.crud> implementation extension
- * from module implementation-crud-extension.
- *  
- * @version $Rev$ $Date$
- */
-public class CRUDClient {
-
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("crud.composite");
-        CRUD crudService = scaDomain.getService(CRUD.class, "CRUDServiceComponent");
-        
-        String id = crudService.create("ABC");
-        
-        Object result = crudService.retrieve(id);
-        System.out.println("Result from create: " + result);
-
-        crudService.update(id, "EFG");
-        result = crudService.retrieve(id);
-        System.out.println("Result from update: " + result);
-        
-        crudService.delete(id);
-        result = crudService.retrieve(id);
-        System.out.println("Result from delete: " + result);
-        
-        scaDomain.close();
-    }
-
-}
diff --git a/java/sca-contrib/samples/implementation-crud/src/main/resources/crud.composite b/java/sca-contrib/samples/implementation-crud/src/main/resources/crud.composite
deleted file mode 100644
index 18745033bb..0000000000
--- a/java/sca-contrib/samples/implementation-crud/src/main/resources/crud.composite
+++ /dev/null
@@ -1,30 +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://sample/crud"
-	xmlns:sc="http://sample/crud"
-	xmlns:c="http://crud"
-	name="crud">

-

-    <component name="CRUDServiceComponent">

-        <c:implementation.crud directory="tmp" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/java/sca-contrib/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
deleted file mode 100644
index 7e0476a8b1..0000000000
--- a/java/sca-contrib/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
+++ /dev/null
@@ -1,61 +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 crud.client;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import crud.CRUD;
-
-
-/**
- * Tests the sample crud composite.
- */
-public class CRUDTestCase extends TestCase {
-    
-    private SCADomain scaDomain;
-    
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("crud.composite");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-        CRUD crudService = scaDomain.getService(CRUD.class, "CRUDServiceComponent");
-        
-        String id = crudService.create("ABC");
-        Object result = crudService.retrieve(id);
-        assertEquals(result, "ABC");
-
-        crudService.update(id, "EFG");
-        result = crudService.retrieve(id);
-        assertEquals(result, "EFG");
-        
-        crudService.delete(id);
-        result = crudService.retrieve(id);
-        assertNull(result);
-    }
-}
diff --git a/java/sca-contrib/samples/implementation-notification/README b/java/sca-contrib/samples/implementation-notification/README
deleted file mode 100644
index 7adfa4e5dc..0000000000
--- a/java/sca-contrib/samples/implementation-notification/README
+++ /dev/null
@@ -1,97 +0,0 @@
-Notification Implementation Sample

-===============================

-

-This sample illustrates the use of <implementation.notification/>

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run it to see what happens open a command prompt, navigate

-to this sample directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows, use following command:

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-implementation-notification.jar notification.TrafficAdvisoryClient

-

-on *nix, use following command:

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-implementation-notification.jar notification.TrafficAdvisoryClient

-

-OR you can also use Maven to test:

-

-mvn test

-

-Sample Overview

----------------

-

-This sample consists of a single composite that contains a notification component,

-a producer component and two consumer components. Take a look at the composite file 

-or the .svg file which shows the composite file in pictorial form. The notification

-component has an <implementation.notification/> that refers to the component type

-that defines the TrafficAdvisory java interface. This interface indicates the

-makeup of the messages being sent and received and is also implemented by the

-consumer components.

-

-Sample directory structure:

-

-implementation-notification/

-  src/

-    main/

-      java/

-        notification/

-          TestCaseProducer.java                    - interface for the producer component

-          TrafficAdvisory.java                     - interface for the notification and consumer components

-          TrafficAdvisoryConsumer.java             - implementation for the consumer components

-          TrafficAdvisoryProducer.java             - implementation for the producer component

-    test/

-      java/

-        notification/

-          TrafficAdvisoryTestCase.java             - JUnit test case

-      resources/

-        TrafficAdvisoryNotification.componentType  - the component type referred to by

-                                                     <implementation.notification/>

-        TrafficAdvisoryNotification.composite      - the main composite including producer,

-                                                     notification component, and consumers

-  pom.xml                                          - the Maven build file        

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd implementation-notification

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] Consumer [Consumer1] received report: Nothing to report today

-     [java] Consumer [Consumer2] received report: Nothing to report today

-     

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd implementation-notification

-mvn

-

-You should see the following output from the test phase.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running notification.TrafficAdvisoryTestCase

-Consumer [Consumer1] received report: Nothing to report today

-Consumer [Consumer2] received report: Nothing to report today

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.742 sec

-

-Results :

-

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

-

-This shows that the Junit test cases have run successfully. 

diff --git a/java/sca-contrib/samples/implementation-notification/build.xml b/java/sca-contrib/samples/implementation-notification/build.xml
deleted file mode 100644
index 110c7b84c1..0000000000
--- a/java/sca-contrib/samples/implementation-notification/build.xml
+++ /dev/null
@@ -1,72 +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.    

--->

-<project name="implementation-notification" default="compile">

-    <property name="test.class" value="notification.TrafficAdvisoryClient" />

-	<property name="test.jar"   value="sample-implementation-notification.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/implementation-notification/implementation-notification.png b/java/sca-contrib/samples/implementation-notification/implementation-notification.png
deleted file mode 100644
index 0b7ee34bf7..0000000000
--- a/java/sca-contrib/samples/implementation-notification/implementation-notification.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/implementation-notification/pom.xml b/java/sca-contrib/samples/implementation-notification/pom.xml
deleted file mode 100644
index 0ebb3ff7a3..0000000000
--- a/java/sca-contrib/samples/implementation-notification/pom.xml
+++ /dev/null
@@ -1,76 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-implementation-notification</artifactId>

-    <name>Apache Tuscany SCA Notification Implementation Sample</name>

-    <version>2.0-SNAPSHOT</version>

-    <description>A sample illustrating use of implementation.notification</description>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-notification</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <!-- if this is not in, BuilderRegistryImpl throws NPE (line 96) -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-        <!-- end -->

-		        

-        <!-- test dependencies -->

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-	<finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-compiler-plugin</artifactId>

-                <configuration>

-                    <source>1.5</source>

-                    <target>1.5</target>

-                </configuration>

-            </plugin>

-        </plugins>

-        <defaultGoal>install</defaultGoal>

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java b/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
deleted file mode 100644
index bf8c72e0ce..0000000000
--- a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
+++ /dev/null
@@ -1,24 +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 notification;

-

-public interface TestCaseProducer {

-

-    public void produceTrafficNotification(String report);

-}

diff --git a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java b/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
deleted file mode 100644
index 7bbfda2122..0000000000
--- a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
+++ /dev/null
@@ -1,24 +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 notification;

-

-public interface TrafficAdvisory {

-

-    void trafficNotification(String report);

-}

diff --git a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java b/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
deleted file mode 100644
index da32bab58d..0000000000
--- a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.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.    

- */

-package notification;

-

-import notification.TestCaseProducer;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-public class TrafficAdvisoryClient {

-    

-    public static void main(String[] args) throws Exception {

-        try {

-            SCADomain domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");

-            TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");

-

-            testCaseProducer.produceTrafficNotification("Nothing to report today");

-

-            domain.close();

-        } catch(Throwable e) {

-            e.printStackTrace();

-            if (e instanceof Exception) {

-                throw (Exception)e;

-            }

-            else {

-                throw new Exception(e);

-            }

-        }

-    }

-}

diff --git a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java b/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
deleted file mode 100644
index 17d7933d9e..0000000000
--- a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
+++ /dev/null
@@ -1,39 +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 notification;

-

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * @version $Rev$ $Date$

- */

-@Service(TrafficAdvisory.class)

-@Scope("COMPOSITE")

-public class TrafficAdvisoryConsumer implements TrafficAdvisory {

-    

-    @Property

-    protected String name;

-

-    public void trafficNotification(String report) {

-        

-        System.out.println("Consumer [" + name + "] received report: " + report);

-    }

-}

diff --git a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java b/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
deleted file mode 100644
index e16b509993..0000000000
--- a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.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 notification;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(TestCaseProducer.class)

-@Scope("COMPOSITE")

-public class TrafficAdvisoryProducer implements TestCaseProducer {

-    

-    @Reference

-    protected TrafficAdvisory destination;

-

-    public void produceTrafficNotification(String report) {

-        

-        destination.trafficNotification(report);

-    }

-}

diff --git a/java/sca-contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType b/java/sca-contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 873e200613..0000000000
--- a/java/sca-contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-     <service name="TrafficAdvisoryNotificationService">

-           <interface.java interface="notification.TrafficAdvisory"/>

-     </service>

-

-     <reference name="TrafficAdvisoryNotificationReference"

-                multiplicity="0..n">

-           <interface.java interface="notification.TrafficAdvisory"/>

-     </reference>

-</componentType>

diff --git a/java/sca-contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite b/java/sca-contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index bbf2281352..0000000000
--- a/java/sca-contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

- * 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="TrafficAdvisoryNotificationLocalComposite">

-

-    <component name="TrafficAdvisoryProducer">

-        <implementation.java class="notification.TrafficAdvisoryProducer"/>

-        <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>

-    </component>

-

-    <component name="TrafficAdvisoryNotificationComponent">

-        <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>

-        <!-- Never use > 1 reference elements here !! -->

-        <reference name="TrafficAdvisoryNotificationReference"

-                   multiplicity="0..n"

-                   target="TrafficAdvisoryConsumer1 TrafficAdvisoryConsumer2"/>

-    </component>

-

-    <component name="TrafficAdvisoryConsumer1">

-        <implementation.java class="notification.TrafficAdvisoryConsumer"/>

-        <property name="name">Consumer1</property>

-    </component>

-

-    <component name="TrafficAdvisoryConsumer2">

-        <implementation.java class="notification.TrafficAdvisoryConsumer"/>

-        <property name="name">Consumer2</property>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java b/java/sca-contrib/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
deleted file mode 100644
index 719141c94b..0000000000
--- a/java/sca-contrib/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
+++ /dev/null
@@ -1,60 +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 notification;

-

-import junit.framework.TestCase;

-

-import notification.TestCaseProducer;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-public class TrafficAdvisoryTestCase extends TestCase {

-    

-    private SCADomain domain;

-    private TestCaseProducer testCaseProducer;

-    

-    public void testTrafficAdvisoryNotification() throws Exception {

-        try {

-            testCaseProducer.produceTrafficNotification("Nothing to report today");

-        } catch(Throwable e) {

-            e.printStackTrace();

-        }

-    }

-

-    @Override

-    protected void setUp() throws Exception {

-        try {

-            domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");

-            testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");

-        } catch(Throwable e) {

-            e.printStackTrace();

-            if (e instanceof Exception) {

-                throw (Exception)e;

-            }

-            else {

-                throw new Exception(e);

-            }

-        }

-    }

-    

-    @Override

-    protected void tearDown() throws Exception {

-        domain.close();

-    }

-}

diff --git a/java/sca-contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType b/java/sca-contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 873e200613..0000000000
--- a/java/sca-contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-     <service name="TrafficAdvisoryNotificationService">

-           <interface.java interface="notification.TrafficAdvisory"/>

-     </service>

-

-     <reference name="TrafficAdvisoryNotificationReference"

-                multiplicity="0..n">

-           <interface.java interface="notification.TrafficAdvisory"/>

-     </reference>

-</componentType>

diff --git a/java/sca-contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite b/java/sca-contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index bbf2281352..0000000000
--- a/java/sca-contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

- * 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="TrafficAdvisoryNotificationLocalComposite">

-

-    <component name="TrafficAdvisoryProducer">

-        <implementation.java class="notification.TrafficAdvisoryProducer"/>

-        <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>

-    </component>

-

-    <component name="TrafficAdvisoryNotificationComponent">

-        <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>

-        <!-- Never use > 1 reference elements here !! -->

-        <reference name="TrafficAdvisoryNotificationReference"

-                   multiplicity="0..n"

-                   target="TrafficAdvisoryConsumer1 TrafficAdvisoryConsumer2"/>

-    </component>

-

-    <component name="TrafficAdvisoryConsumer1">

-        <implementation.java class="notification.TrafficAdvisoryConsumer"/>

-        <property name="name">Consumer1</property>

-    </component>

-

-    <component name="TrafficAdvisoryConsumer2">

-        <implementation.java class="notification.TrafficAdvisoryConsumer"/>

-        <property name="name">Consumer2</property>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/implementation-pojo-extension/README b/java/sca-contrib/samples/implementation-pojo-extension/README
deleted file mode 100644
index 3b201779e1..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/README
+++ /dev/null
@@ -1,70 +0,0 @@
-Implementation POJO Sample
-==========================
-This sample demonstrates how new implementation types are constructed for 
-Apache Tuscany SCA. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-Sample Overview
----------------
-This sample contains a POJO implementation type as an example of how to create
-new implementation types.
-
-implementation-pojo-extension/
-  src/
-    main/
-      java/
-        pojo/                  - implementation model interfaces
-          impl/                - implementations of the model interfaces
-          provider/            - runtime implementation
-      resources/
-        META-INF/
-          services/            - declares the extension
-    test/
-      java/
-        helloworld/
-          HelloWorldTestCase.java - JUnit test case
-      resources/
-        helloworld.composite   - the SCA assembly used during unit testing
-
-  build.xml                    - the Ant build file
-  pom.xml                      - the Maven build file
-  
-Building The Sample Extension Using Ant
------------------------------------------
-With the binary distribution the sample extension can be built using Ant as 
-follows
-
-cd implementation-pojo-extension
-ant compile
-
-Building The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built 
-using Maven as follows. 
-
-cd implementation-pojo-extension
-mvn
-
-Maven will also test that the sample extension built properly. You should see 
-the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running helloworld.HelloWorldTestCase
-Initializing POJO
-Initializing POJO
-Executing POJO sayHello
-Initializing POJO
-Initializing POJO
-Executing POJO sayHello
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.616 sec
-
-Results :
-
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/build.xml b/java/sca-contrib/samples/implementation-pojo-extension/build.xml
deleted file mode 100644
index 78bae79859..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/build.xml
+++ /dev/null
@@ -1,51 +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.    
--->
-<project name="implementation-pojo-extension" default="compile">
-	<property name="test.jar"   value="sample-implementation-pojo-extension.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-		
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/pom.xml b/java/sca-contrib/samples/implementation-pojo-extension/pom.xml
deleted file mode 100644
index 6fa7ab7f1c..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/pom.xml
+++ /dev/null
@@ -1,77 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-implementation-pojo-extension</artifactId>
-    <name>Apache Tuscany SCA POJO Implementation Extension Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java b/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
deleted file mode 100644
index 7c2f5d236f..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
+++ /dev/null
@@ -1,65 +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 pojo;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-
-
-/**
- * Represents a POJO implementation in an SCA assembly.
- *
- * @version $Rev$ $Date$
- */
-public interface POJOImplementation extends Implementation {
-    
-    /**
-     * Returns the POJO class name
-     * @return
-     */
-    public String getPOJOName();
-
-    /**
-     * Sets the POJO class name
-     * @param pojoName
-     */
-    public void setPOJOName(String pojoName);
-    
-    /**
-     * Returns the POJO class.
-     * @return
-     */
-    public Class<?> getPOJOClass();
-    
-    /**
-     * Sets the POJO class.
-     * @param pojoClass
-     */
-    public void setPOJOClass(Class<?> pojoClass);
-  
-    /**
-     * Returns the POJO's methods.
-     * @return
-     */
-    public Map<String, Method> getMethods();
-
-}
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java b/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
deleted file mode 100644
index bbcfb3d0dc..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.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 pojo;
-
-
-/**
- * Factory for the POJO implementation model. 
- *
- * @version $Rev$ $Date$
- */
-public interface POJOImplementationFactory {
-
-    /**
-     * Creates a new POJO implementation model object.
-     * @return a new POJO implementation model object
-     */
-    POJOImplementation createPOJOImplementation();
-    
-}
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java b/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
deleted file mode 100644
index 0dad270a6c..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.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 pojo.impl;
-
-import pojo.POJOImplementation;
-import pojo.POJOImplementationFactory;
-
-/**
- * A factory for the POJO implementation model.
- *
- * @version $Rev$ $Date$
- */
-public class POJOImplementationFactoryImpl implements POJOImplementationFactory {
-
-    public POJOImplementation createPOJOImplementation() {
-        return new POJOImplementationImpl();
-    }
-
-}
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java b/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
deleted file mode 100644
index f2d6871039..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
+++ /dev/null
@@ -1,155 +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 pojo.impl;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-
-import pojo.POJOImplementation;
-
-
-/**
- * Represents a POJO implementation in an SCA assembly.
- *
- * @version $Rev$ $Date$
- */
-class POJOImplementationImpl implements POJOImplementation {
-    
-    private String pojoName;
-    private Class<?> pojoClass;
-    private String uri;
-    private Map<String, Method> methods;
-    private List<Service> services = new ArrayList<Service>();
-    private List<Reference> references = new ArrayList<Reference>();
-    private List<Property> properties = new ArrayList<Property>();
-    private boolean unresolved;
-
-    POJOImplementationImpl() {
-    }
-    
-    /**
-     * Returns the POJO class name
-     * @return
-     */
-    public String getPOJOName() {
-        return pojoName;
-    }
-
-    /**
-     * Sets the POJO class name
-     * @param pojoName
-     */
-    public void setPOJOName(String pojoName) {
-        this.pojoName = pojoName;
-        setURI(pojoName.replace('.', '/'));
-    }
-    
-    /**
-     * Returns the POJO class.
-     * @return
-     */
-    public Class<?> getPOJOClass() {
-        return pojoClass;
-    }
-    
-    /**
-     * Sets the POJO class.
-     * @param pojoClass
-     */
-    public void setPOJOClass(Class<?> pojoClass) {
-        this.pojoClass = pojoClass;
-        setPOJOName(pojoClass.getName());
-        
-        // Index the POJO's methods
-        methods = new HashMap<String, Method>();
-        Method[] m = pojoClass.getMethods();
-        for (int i = 0; i < m.length; i++) {
-            methods.put(m[i].getName(), m[i]);
-        }
-    }
-  
-    /**
-     * Returns the POJO's methods.
-     * @return
-     */
-    public Map<String, Method> getMethods() {
-        return methods;
-    }
-
-    public ConstrainingType getConstrainingType() {
-        // The sample POJO implementation does not support constrainingTypes
-        return null;
-    }
-
-    public List<Property> getProperties() {
-        return properties;
-    }
-
-    public List<Service> getServices() {
-        return services;
-    }
-    
-    public List<Reference> getReferences() {
-        return references;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        // The sample POJO implementation does not support constrainingTypes
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-
-    @Override
-    public int hashCode() {
-        return uri.hashCode();
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof POJOImplementationImpl) {
-            return ((POJOImplementationImpl)obj).getURI().equals(uri);
-        } else {
-            return false;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java b/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
deleted file mode 100644
index 44a2cc0aa8..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
+++ /dev/null
@@ -1,174 +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 pojo.impl;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-import pojo.POJOImplementation;
-import pojo.POJOImplementationFactory;
-
-/**
- * Implements a STAX based artifact processor for POJO implementations.
- * 
- * The artifact processor is responsible for processing <implementation.pojo>
- * elements in SCA assembly XML composite files and populating the POJO
- * implementation model, resolving its references to other artifacts in the SCA
- * contribution, and optionally write the model back to SCA assembly XML. 
- */
-public class POJOImplementationProcessor implements StAXArtifactProcessor<POJOImplementation> {
-    private static final QName IMPLEMENTATION_POJO = new QName("http://pojo", "implementation.pojo");
-    
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-    private POJOImplementationFactory pojoImplementationFactory;
-    private PolicyFactory policyFactory;
-    private PolicyAttachPointProcessor policyProcessor;
-    
-    public POJOImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        
-        // Get the assembly and Java interface factories as we'll need them to
-        // create model objects 
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-        policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        pojoImplementationFactory = modelFactories.getFactory(POJOImplementationFactory.class);
-        policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-    }
-
-    public QName getArtifactType() {
-        // Returns the qname of the XML element processed by this processor
-        return IMPLEMENTATION_POJO;
-    }
-
-    public Class<POJOImplementation> getModelType() {
-        // Returns the type of model processed by this processor
-        return POJOImplementation.class;
-    }
-
-    public POJOImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-    
-        // Read an <implementation.pojo> element
-        POJOImplementation implementation = pojoImplementationFactory.createPOJOImplementation();
-        
-        // Read policies
-        policyProcessor.readPolicies(implementation, reader);
-        
-        // Read the POJO class attribute.
-        String className = reader.getAttributeValue(null, "class");
-        implementation.setPOJOName(className);
-        
-        // Mark the POJO model unresolved to track the fact that it's not
-        // completely initialized, its class is not loaded yet and services
-        // and references not initialized either
-        implementation.setUnresolved(true);
-        
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && IMPLEMENTATION_POJO.equals(reader.getName())) {
-                break;
-            }
-        }
-        
-        return implementation;
-    }
-
-    public void resolve(POJOImplementation implementation, ModelResolver resolver) throws ContributionResolveException {
-        
-        // Resolve the POJO implementation
-        
-        // First resolve its class
-        ClassReference classReference = new ClassReference(implementation.getPOJOName());
-        classReference = resolver.resolveModel(ClassReference.class, classReference);
-        Class<?> pojoClass = classReference.getJavaClass();
-        if (pojoClass == null) {
-            throw new ContributionResolveException("Class could not be resolved: " + implementation.getPOJOName());
-        }
-        implementation.setPOJOClass(pojoClass);
-        
-        // Check to see if we have a .componentType file describing the POJO class
-        ComponentType componentType = assemblyFactory.createComponentType();
-        componentType.setUnresolved(true);
-        componentType.setURI(implementation.getURI() + ".componentType");
-        componentType = resolver.resolveModel(ComponentType.class, componentType);
-        if (!componentType.isUnresolved()) {
-            
-            // We have a component type description, merge it into the POJO model
-            implementation.getServices().addAll(componentType.getServices());
-            implementation.getReferences().addAll(componentType.getReferences());
-            implementation.getProperties().addAll(componentType.getProperties());
-            
-        } else {
-            
-            // We have no component type description, simply introspect the POJO and
-            // create a single Service for it
-            Service service = assemblyFactory.createService();
-            service.setName(pojoClass.getSimpleName());
-            JavaInterface javaInterface;
-            try {
-                javaInterface = javaFactory.createJavaInterface(pojoClass);
-            } catch (InvalidInterfaceException e) {
-                throw new ContributionResolveException(e);
-            }
-            JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-            interfaceContract.setInterface(javaInterface);
-            service.setInterfaceContract(interfaceContract);
-            implementation.getServices().add(service);
-        }
-        
-        // Mark the implementation resolved now
-        implementation.setUnresolved(false);
-    }
-
-    public void write(POJOImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <implementation.pojo> element
-        policyProcessor.writePolicyPrefixes(implementation, writer);
-        writer.writeStartElement(IMPLEMENTATION_POJO.getNamespaceURI(), IMPLEMENTATION_POJO.getLocalPart());
-        policyProcessor.writePolicyAttributes(implementation, writer);
-        
-        if (implementation.getPOJOName() != null) {
-            writer.writeAttribute("class", implementation.getPOJOName());
-        }
-        
-        writer.writeEndElement();
-    }
-}
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
deleted file mode 100644
index 0654cb93e5..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.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 pojo.provider;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * Implements an invoker for POJO component implementations.
- * 
- * The invoker is responsible for handling invocations of a business operation.
- * Input business data is passed to the invoke method in a Message object.
- * The invoke method is responsible for handling the invocation and returning a Message with
- * the output business data. 
- * 
- * In this example we are simply delegating the operation invocations to the
- * corresponding methods on the POJO implementation class using Java reflection.
- * 
- * Depending on the type of implementation being handled, more sophisticated invokers can
- * use other techniques to delegate the invocation to the implementation artifact directly, call a
- * runtime engine like a BPEL engine or an XQuery engine (this is what the Tuscany 
- * implementation-bpel and implementation-xquery extensions do) or just completely handle the
- * invocation in the invoker itself if the implementation has a fixed behavior for example.
- */
-class POJOImplementationInvoker implements Invoker {
-
-    private Object pojoInstance;
-    private Method method;
-    
-    POJOImplementationInvoker(Object pojoInstance, Operation operation, Method method) {
-        this.pojoInstance = pojoInstance;
-        this.method = method;
-    }
-    
-    public Message invoke(Message msg) {
-        try {
-            msg.setBody(method.invoke(pojoInstance, (Object[])msg.getBody()));
-        } catch (InvocationTargetException e) {
-            msg.setFaultBody(e);
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-        return msg;
-    }
-    
-}
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
deleted file mode 100644
index 30a9885ea9..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
+++ /dev/null
@@ -1,106 +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 pojo.provider;
-
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-import pojo.POJOImplementation;
-
-/**
- * An implementation provider for sample CRUD implementations.
- * 
- * The implementation provider is responsible for handling the lifecycle of a component
- * implementation and creating operation invokers for the service operations provided
- * by the implementation.
- * 
- * The start() and stop() methods are called when a component is started
- * and stopped. In this example we are using that opportunity to call init and destroy methods
- * on the POJO instance if these methods exist.
- *
- * The createInvoker method is called for each operation provided by the component
- * implementation. The implementation provider can create an invoker and initialize it
- * at that time to minimize the amount of work to be performed on each invocation.
- * 
- * For example here we are looking up the Java method corresponding to the service operation
- * at passing it to the invoker constructor. This way the invoker won't have to lookup the Java
- * method on each invocation.  
- */
-class POJOImplementationProvider implements ImplementationProvider {
-    
-    private POJOImplementation implementation;
-    private Object pojoInstance;
-
-    /**
-     * Constructs a new CRUD implementation.
-     */
-    POJOImplementationProvider(RuntimeComponent component, POJOImplementation implementation) {
-        this.implementation = implementation;
-        
-        // Create a new instance of the POJO
-        try {
-            pojoInstance = implementation.getPOJOClass().newInstance();
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public void start() {
-        try {
-            // Invoke the POJO's init method
-            Method initMethod = implementation.getMethods().get("init");
-            if (initMethod != null) {
-                initMethod.invoke(pojoInstance);
-            }
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public void stop() {
-        try {
-            // Invoke the POJO's destroy method
-            Method destroyMethod = implementation.getMethods().get("destroy");
-            if (destroyMethod != null) {
-                destroyMethod.invoke(pojoInstance);
-            }
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        } finally {
-            pojoInstance = null;
-        }
-    }
-    
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        Method method = implementation.getMethods().get(operation.getName()); 
-        POJOImplementationInvoker invoker = new POJOImplementationInvoker(pojoInstance, operation, method);
-        return invoker;
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-}
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java b/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
deleted file mode 100644
index 22f2be09e9..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.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.    
- */
-package pojo.provider;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-import pojo.POJOImplementation;
-
-/**
- * A factory for POJO implementation providers.
- */
-public class POJOImplementationProviderFactory implements ImplementationProviderFactory<POJOImplementation> {
-    
-    public POJOImplementationProviderFactory(ExtensionPointRegistry registry) {
-    }
-
-    public Class<POJOImplementation> getModelType() {
-        // Returns the type of model processed by this processor
-        return POJOImplementation.class;
-    }
-
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component, POJOImplementation implementation) {
-        return new POJOImplementationProvider(component, implementation);
-    }
-    
-}
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 8337e81c5f..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-pojo.impl.POJOImplementationProcessor;qname=http://pojo#implementation.pojo,model=pojo.POJOImplementation,factory=pojo.POJOImplementationFactory
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
deleted file mode 100644
index 64dd230a15..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ /dev/null
@@ -1,19 +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. 
-
-# URI of the XML schema to be used for validation
-sample-implementation-pojo.xsd
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index b30ea3b9cf..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the implementation extension

-pojo.provider.POJOImplementationProviderFactory;model=pojo.POJOImplementation

diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory b/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
deleted file mode 100644
index 075af98240..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for implementation model factory
-pojo.impl.POJOImplementationFactoryImpl
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd b/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
deleted file mode 100644
index c9d170770b..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
+++ /dev/null
@@ -1,38 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://pojo" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:p="http://pojo" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0"/>
-
-    <element name="implementation.pojo" type="p:POJOImplementation"/>
-    	
-    <complexType name="POJOImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <attribute name="class" type="NCName" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java b/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
deleted file mode 100644
index cc32929f09..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
+++ /dev/null
@@ -1,26 +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 helloworld;
-
-public interface HelloWorld {
-    
-    String sayHello(String name);
-
-}
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 0580e30aba..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.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 helloworld;
-
-public class HelloWorldImpl {
-    
-    public void init() {
-        System.out.println("Initializing POJO");
-    }
-
-    public void destroy() {
-        System.out.println("Destroying POJO");
-    }
-
-    public String sayHello(String name) {
-        System.out.println("Executing POJO sayHello");
-        return "Hello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java b/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
deleted file mode 100644
index 69ab1f567e..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.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 helloworld;
-
-public class HelloWorldImpl2 {
-    
-    public void init() {
-        System.out.println("Initializing POJO");
-    }
-
-    public void destroy() {
-        System.out.println("Destroying POJO");
-    }
-
-    public String sayHello(String name) {
-        System.out.println("Executing POJO sayHello");
-        return "Hello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java b/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index d8b5f41adc..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
+++ /dev/null
@@ -1,51 +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 helloworld;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the POJO implementation extension.
- */
-public class HelloWorldTestCase extends TestCase {
-    
-    private SCADomain scaDomain;
-    
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("helloworld/helloworld.composite");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testHello() throws Exception {
-        HelloWorld helloworld = scaDomain.getService(HelloWorld.class, "HelloWorldComponent");
-        assertEquals("Hello petra", helloworld.sayHello("petra"));
-    }
-
-    public void testHello2() throws Exception {
-        HelloWorld helloworld = scaDomain.getService(HelloWorld.class, "HelloWorldComponent2/HelloWorld2");
-        assertEquals("Hello petra", helloworld.sayHello("petra"));
-    }
-}
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType b/java/sca-contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
deleted file mode 100644
index a92c5ab8db..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
+++ /dev/null
@@ -1,26 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
-    <service name="HelloWorld2">
-        <interface.java interface="helloworld.HelloWorld"/>
-    </service>
-
-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite b/java/sca-contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index c38094dfc9..0000000000
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
+++ /dev/null
@@ -1,33 +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://test/helloworld"
-	xmlns:p="http://pojo"
-	name="helloworld">
-
-    <component name="HelloWorldComponent">
-        <p:implementation.pojo class="helloworld.HelloWorldImpl" />
-    </component>
-
-    <component name="HelloWorldComponent2">
-        <p:implementation.pojo class="helloworld.HelloWorldImpl2" />
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/loanapplication/pom.xml b/java/sca-contrib/samples/loanapplication/pom.xml
deleted file mode 100644
index ad76cde4f1..0000000000
--- a/java/sca-contrib/samples/loanapplication/pom.xml
+++ /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.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-loanapplication</artifactId>

-    <name>Apache Tuscany SCA Loan Application Conversation Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java b/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
deleted file mode 100644
index 4fedb70782..0000000000
--- a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplication.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 loanapplication;
-
-public class LoanApplication {
-    
-    private String customerName;
-    private float loanAmount;
-    
-    public LoanApplication(String customerName, float loanAmount) {
-        this.customerName = customerName;
-        this.loanAmount = loanAmount;
-    }
-    
-    @Override
-    public String toString() {
-        return "[Customer: " + customerName + ", loan amount: "
-            + loanAmount + "]";
-    }
-}
diff --git a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java b/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
deleted file mode 100644
index 5183ece867..0000000000
--- a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.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 loanapplication;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-
-public class LoanApplicationClient {
-    
-    public static void main(String[] args) throws Exception {
-    	SCADomain domain = SCADomain.newInstance("loanapplication.composite");
-    	
-        // Locate the MyClient component and invoke it
-        LoanClient loanClient = domain.getService(LoanClient.class, "LoanClientComponent");
-        loanClient.applyForLoan("John Doe", 1000.0f);
-        System.out.println(loanClient.displayLoan());
-        System.out.println("Loan approved: " + loanClient.isApproved());
-        
-        domain.close();
-    }
-}
diff --git a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanClient.java b/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
deleted file mode 100644
index 7e4438bbff..0000000000
--- a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
+++ /dev/null
@@ -1,29 +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 loanapplication;
-
-public interface LoanClient {
-
-    void applyForLoan(String customerName, float amount);
-    boolean isApproved();
-    boolean isCancelled();
-    String displayLoan();
-    void cancelLoan();
-    void closeLoan();
-}
diff --git a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
deleted file mode 100644
index 023199b14b..0000000000
--- a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
+++ /dev/null
@@ -1,64 +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 loanapplication;
-
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class LoanClientImpl implements LoanClient {
-    
-    private LoanService loanService;
-    
-    @Reference
-    public void setLoanService(LoanService loanService) {
-        this.loanService = loanService;
-    }
-
-    public void applyForLoan(String customerName, float amount) {
-        loanService.apply(new LoanApplication(customerName, amount));
-    }
-    
-    public boolean isApproved() {
-        if (loanService.getLoanStatus() == null) {
-            return false;
-        }
-        return loanService.getLoanStatus().equals("approved");
-    }
-    
-    public boolean isCancelled() {
-        if (loanService.getLoanStatus() == null) {
-            return false;
-        }
-        return loanService.getLoanStatus().equals("cancelled");
-    }
-    
-    public String displayLoan() {
-        return loanService.display();
-    }
-    
-    public void cancelLoan() {
-        loanService.cancelApplication();
-    }
-    
-    public void closeLoan() {
-        loanService.close();
-    }
-}
diff --git a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanService.java
deleted file mode 100644
index 8d16b04caf..0000000000
--- a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanService.java
+++ /dev/null
@@ -1,43 +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 loanapplication;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.EndsConversation;
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Conversational
-@Remotable
-public interface LoanService {
-    
-    void apply(LoanApplication application);
-    
-    void lockCurrentRate(int termInYears);
-    
-    @OneWay
-    void cancelApplication();
-    
-    String getLoanStatus();
-    
-    String display();
-    
-    @EndsConversation
-    void close();
-}
diff --git a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
deleted file mode 100644
index a88dc0b56b..0000000000
--- a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
+++ /dev/null
@@ -1,63 +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 loanapplication;
-
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("CONVERSATION")
-@AllowsPassByReference
-public class LoanServiceImpl implements LoanService {
-    
-    private LoanApplication application;
-    private String status;
-    private int termLocked = 0;
-    @ConversationID
-    protected String conversationID;
-
-    public void apply(LoanApplication application) {
-        this.application = application;
-        status = "open";
-    }
-    
-    public void lockCurrentRate(int termInYears) {
-        termLocked = termInYears;
-        status = "locked";
-    }
-    
-    public void cancelApplication() {
-        status = "cancelled";
-    }
-    
-    public String getLoanStatus() {
-        return status;
-    }
-    
-    public String display() {
-        return "Loan application: " + application + ", term: "
-        + termLocked + ", status: " + status
-        + ", conversationID: " + conversationID;
-    }
-    
-    public void close() {
-        this.application = null;
-        this.status = "closed";
-    }
-}
diff --git a/java/sca-contrib/samples/loanapplication/src/main/resources/loanapplication.composite b/java/sca-contrib/samples/loanapplication/src/main/resources/loanapplication.composite
deleted file mode 100644
index 3aa8d030b7..0000000000
--- a/java/sca-contrib/samples/loanapplication/src/main/resources/loanapplication.composite
+++ /dev/null
@@ -1,34 +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://loanapplication"
-	xmlns:la="http://loanapplication"
-	name="loanapplication">
-
-    <component name="LoanClientComponent">
-        <implementation.java class="loanapplication.LoanClientImpl"/>
-        <reference name="loanService" target="LoanServiceComponent"/>
-    </component>
-    
-    <component name="LoanServiceComponent">
-        <implementation.java class="loanapplication.LoanServiceImpl"/>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java b/java/sca-contrib/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
deleted file mode 100644
index e88e48a53a..0000000000
--- a/java/sca-contrib/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
+++ /dev/null
@@ -1,83 +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 loanapplication;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class LoanApplicationTestCase extends TestCase {
-
-    private LoanClient loanClient;
-    private SCADomain domain;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("loanapplication.composite");
-
-        loanClient = domain.getService(LoanClient.class, "LoanClientComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-    	domain.close();
-    }
-
-    public void test() throws Exception {
-        try {
-            loanClient.applyForLoan("John Doe", 1000.0f);
-            System.out.println("Applied: " + loanClient.displayLoan());
-            System.out.println("Loan approved: " + loanClient.isApproved());
-            loanClient.cancelLoan();
-            System.out.println("Sleeping to let cancel complete ...");
-            Thread.sleep(500);
-            if (!loanClient.isCancelled()) {
-                fail("Loan should be cancelled");
-            }
-            System.out.println("Cancelled: " + loanClient.displayLoan());
-            loanClient.closeLoan();
-            
-            /* This is a mistake, after @EndsConversation, a new conversation is
-             * started automatically, so we should not get TargetNotFoundException.
-             * Keep this for the timeout case, where we should get the exception
-            try {
-                System.out.println("Trying to use the closed loan in the ended conversation ...");            
-                System.out.println("Closed: " + loanClient.displayLoan());
-                fail("Target should not be found");
-            } catch(TargetNotFoundException e) {
-                System.out.println("Target not found as expected");            
-            }
-            */
-
-            // Now check that a new conversation's loan is not cancelled
-            
-            if (loanClient.isCancelled()) {
-                fail("Loan should not be cancelled");
-            }
-        } catch(Throwable e) {
-            e.printStackTrace();
-            if (e instanceof Exception) {
-                throw (Exception)e;
-            }
-            if (e instanceof Error) {
-                throw (Error)e;
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/README b/java/sca-contrib/samples/osgi-supplychain/README
deleted file mode 100644
index 11fecf2ae8..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/README
+++ /dev/null
@@ -1,161 +0,0 @@
-osgi-supplychain Sample
-=======================
-
-The Tuscany OSGi supply chain sample shows using the Tuscany SCA runtime in a J2SE environment executing the SCA asynchronous API with OSGi and Java implementation types.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-In the directory samples\osgi-supplychain use the JDK 1.5 java command to run the class supplychain.SupplyChainClient 
-
-Linux:   java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-osgi-supplychain.jar supplychain.SupplyChainClient
-Windows: java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-osgi-supplychain.jar supplychain.SupplyChainClient
-
-Results
-----------
-The sample when run should simply display on the standard output some startup messages followed by:
-
-Work thread Thread[Thread-1,5,main] - Order, submitted, fulfilled, shipped
-
-
-Sample Overview
----------------
-
-The sample provides a Customer service with a purchaseGoods operation
-and a notifyShipment operation annotated with the SCA @OneWay annotation.
-The SupplyChainClient exercises this interface by calling the
-purchaseGoods operation. This results in messages passing to 
-the Retailer, Warehouse, and Shipper components and the result returned
-to the Customer service on a separate callback thread. The Customer
-and Shipper components are implemented as OSGi bundles which use
-implementation.osgi, while the Retailer and Warehouse components are
-implemented using implementation.java.
-
-
-src
-+---main
-    +---java
-    ¦   +---supplychain
-    ¦          OSGiBundleImpl.java
-    ¦          SupplyChainClient.java
-    ¦         +---customer
-    ¦                Customer.java
-    ¦                JavaCustomerComponentImpl.java
-    ¦                OSGiCustomerComponentImpl.java
-    ¦                OSGiCustomerImpl.java
-    ¦         +---retailer
-    ¦                Retailer.java
-    ¦                JavaRetailerComponentImpl.java
-    ¦                OSGiRetailerComponentImpl.java
-    ¦                OSGiRetailerImpl.java
-    ¦         +---shipper
-    ¦                Shipper.java
-    ¦                JavaShipperComponentImpl.java
-    ¦                OSGiShipperComponentImpl.java
-    ¦                OSGiShipperImpl.java
-    ¦         +---warehouse
-    ¦               Warehouse.java
-    ¦               JavaWarehouseComponentImpl.java
-    ¦               OSGiWarehouseComponentImpl.java
-    ¦               OSGiWarehouseImpl.java
-    ¦
-    +---resources
-    ¦   +---osgi
-    ¦          Customer.mf
-    ¦          Retailer.mf
-    ¦          Shipper.mf
-    ¦          Warehouse.mf
-    ¦        +---ds
-    ¦               Customer.mf
-    ¦               Retailer.mf
-    ¦               Shipper.mf
-    ¦               Warehouse.mf
-    ¦               Customer.xml
-    ¦               Retailer.xml
-    ¦               Shipper.xml
-    ¦               Warehouse.xml
-    ¦      Customer.componentType
-    ¦      Retailer.componentType
-    ¦      Shipper.componentType
-    ¦      Warehouse.componentType
-    ¦      supplychain.composite
-    ¦--    supplychain.ds.composite
-   
-
-  build.xml                            - the Ant build file
-  pom.xml                              - the Maven build file   
-
-Understanding OSGI implementation files
----------------------------------------
-Some of the files introduced by OSGI implementation are explained below.
-
-OSG files related to customer. java are:
-OSGiCustomerComponentImpl.java: OSGi Declarative Services Implementation of the SCA Customer component. 
-OSGiCustomerImpl.java: OSGi Procedural Services Implementation of the SCA Customer component. 
-
-You notice the same pattern for shipper.java, retailer.java, SupplyChainClient.java.
-
-The rest of OSGI related files are:
-OSGiBundleImpl.java: Common code for OSGi Procedural Services Implementation of the SCA components
- 
-resources/osgi/*.mf: Manifest files for OSGi bundles for OSGi procedural services implementation
- 
-resources/osgi/ds/*.m:f Manifest files for OSGi bundles for OSGi declarative services implementation 
-
-resources/osgi/ds/*.xml: OSGi Declarative services component xml files
- 
-resources/*.componentType: Component types used by OSGi implementation provider for SCA
- 
-resources/supplychain.composite:  Composite file using OSGi and Java implementation types
- 
-resources/supplychain.ds.composite: Composite file using OSGi (declarative services) and Java implementation types 
- 
-Building And Running The Sample Using Ant
------------------------------------------
-cd osgi-supplychain
-ant compile 
-ant run
-
-you should see: 
-Buildfile: build.xml
-
-run:
-     [java] Main thread Thread[main,5,main]
-     [java] Started OSGi bundle with activator OSGiCustomerImpl
-     [java] Started OSGi bundle with activator OSGiShipperImpl
-     [java] Main thread sleeping ...
-     [java] Work thread Thread[pool-1-thread-1,5,main] - Order, submitted, fulfi
-lled, shipped
-     [java] Stop OSGi bundle with activator OSGiShipperImpl
-     [java] Stop OSGi bundle with activator OSGiCustomerImpl
-
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd osgi-supplychain
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running supplychain.SupplyChainClientTestCase
-Started OSGi bundle with activator OSGiCustomerImpl
-Started OSGi bundle with activator OSGiShipperImpl
-Sleeping ...
-Work thread Thread[pool-1-thread-1,5,main] - Order, submitted, fulfilled, shippe
-d
-Test complete
-Stop OSGi bundle with activator OSGiShipperImpl
-Stop OSGi bundle with activator OSGiCustomerImpl
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.062 sec
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/osgi-supplychain/build-bundles.xml b/java/sca-contrib/samples/osgi-supplychain/build-bundles.xml
deleted file mode 100644
index 7a31e6016b..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/build-bundles.xml
+++ /dev/null
@@ -1,32 +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 name="OSGiBundleCreator">
-
-    <target name="create-bundles">
-
-        <jar jarfile="${jar.dir}/${jar.file.name}" manifest="${files.dir}/${manifest.file.name}" >
-            <fileset dir="${files.dir}" includes="${files.list}">
-                <!-- include name="${files.list}"/-->
-            </fileset>
-        </jar>
-    </target>
-
-
-</project>
diff --git a/java/sca-contrib/samples/osgi-supplychain/build.xml b/java/sca-contrib/samples/osgi-supplychain/build.xml
deleted file mode 100644
index 2e103e5a15..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/build.xml
+++ /dev/null
@@ -1,128 +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.    
--->
-<project name="sample-osgi-supplychain" default="compile">
-    <property name="test.class" value="supplychain.SupplyChainClient" />
-    <property name="test.jar"   value="sample-osgi-supplychain.jar" />
-    
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-    
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-                <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar jarfile="target/classes/Customer.jar" manifest="target/classes/osgi/Customer.mf" >
-            <fileset dir="target/classes" 
-                     includes="supplychain/customer/Customer.class \
-                               supplychain/OSGiBundleImpl.class \
-                               supplychain/customer/OSGiCustomerImpl.class"
-            />
-        </jar>  
-        <jar jarfile="target/classes/Retailer.jar" manifest="target/classes/osgi/Retailer.mf" >
-            <fileset dir="target/classes" 
-                     includes="supplychain/retailer/Retailer.class \
-                               supplychain/OSGiBundleImpl.class \
-                               supplychain/retailer/OSGiRetailerImpl.class"
-            />
-        </jar>  
-        <jar jarfile="target/classes/Warehouse.jar" manifest="target/classes/osgi/Warehouse.mf" >
-            <fileset dir="target/classes" 
-                     includes="supplychain/warehouse/Warehouse.class \
-                               supplychain/OSGiBundleImpl.class \
-                               supplychain/warehouse/OSGiWarehouseImpl.class"
-            />
-        </jar>  
-        <jar jarfile="target/classes/Shipper.jar" manifest="target/classes/osgi/Shipper.mf" >
-            <fileset dir="target/classes" 
-                     includes="supplychain/shipper/Shipper.class \
-                               supplychain/OSGiBundleImpl.class \
-                               supplychain/shipper/OSGiShipperImpl.class"
-            />
-        </jar>  
-        <jar jarfile="target/classes/DSCustomer.jar" manifest="target/classes/osgi/ds/Customer.mf" >
-            <fileset dir="target/classes" 
-                     includes="supplychain/customer/Customer.class \
-                               osgi/ds/Customer.xml \
-                               supplychain/customer/OSGiCustomerComponentImpl.class"
-            />
-        </jar>  
-        <jar jarfile="target/classes/DSRetailer.jar" manifest="target/classes/osgi/ds/Retailer.mf" >
-            <fileset dir="target/classes" 
-                     includes="supplychain/retailer/Retailer.class \
-                               Vosgi/ds/Retailer.xml \
-                               supplychain/retailer/OSGiRetailerComponentImpl.class"
-            />
-        </jar>  
-        <jar jarfile="target/classes/DSWarehouse.jar" manifest="target/classes/osgi/ds/Warehouse.mf" >
-            <fileset dir="target/classes" 
-                     includes="supplychain/warehouse/Warehouse.class \
-                               osgi/ds/Warehouse.xml \
-                               supplychain/warehouse/OSGiWarehouseComponentImpl.class"
-            />
-        </jar>  
-        <jar jarfile="target/classes/DSShipper.jar" manifest="target/classes/osgi/ds/Shipper.mf" >
-            <fileset dir="target/classes" 
-                     includes="supplychain/shipper/Shipper.class \
-                               osgi/ds/Shipper.xml \
-                               supplychain/shipper/OSGiShipperComponentImpl.class"
-            />
-        </jar>  
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>  
-    </target>    
-    
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-                <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-    
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-                <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>        
-    </target>    
-    
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/osgi-supplychain/osgi-supplychain.png b/java/sca-contrib/samples/osgi-supplychain/osgi-supplychain.png
deleted file mode 100644
index 2bec57ac8a..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/osgi-supplychain.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/osgi-supplychain/osgi-supplychain.svg b/java/sca-contrib/samples/osgi-supplychain/osgi-supplychain.svg
deleted file mode 100644
index 43cb427944..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/osgi-supplychain.svg
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-panic\sca\samples\osgi-supplychain"
-   sodipodi:docname="osgi-supplychain.svg"
-   version="1.0"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\simon\tuscany\java-panic\sca\samples\osgi-supplychain\osgi-supplychain.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="521.44872"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1128"
-     inkscape:window-height="721"
-     inkscape:window-x="132"
-     inkscape:window-y="141" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1.047575,0,0,1,-9.726882,0)">
-      <rect
-         rx="19.999123"
-         ry="12.692303"
-         y="192.00233"
-         x="205.45438"
-         height="299.99988"
-         width="647.66394"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.95405793;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="translate(-38.86527,-2.857143)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">supplychain</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="241.34489"
-       y="300.02475"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(-17.674461,94.08621)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Customer</flowPara><flowPara
-         id="flowPara1939">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 224.19438,331.87174 L 257.52942,331.87174 L 263.59033,345.00372 L 256.51927,357.12556 L 224.19438,357.12556 L 231.77053,345.00372 L 224.19438,331.87174 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 337.44682,330.03346 L 370.78186,330.03346 L 376.84277,343.16544 L 369.77171,355.28728 L 337.44682,355.28728 L 345.02297,343.16544 L 337.44682,330.03346 z "
-       id="path3019" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1897"
-       width="115.66247"
-       height="85.862968"
-       x="405.82632"
-       y="298.30585"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1899"
-       transform="translate(146.80693,92.36731)"><flowRegion
-         id="flowRegion1901"><rect
-           id="rect1903"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1905">Retailer</flowPara><flowPara
-         id="flowPara1941">Component </flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 388.67581,330.15284 L 422.01085,330.15284 L 428.07176,343.28482 L 421.0007,355.40666 L 388.67581,355.40666 L 396.25196,343.28482 L 388.67581,330.15284 z "
-       id="path1907" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 501.92825,328.31456 L 535.26329,328.31456 L 541.3242,341.44654 L 534.25314,353.56838 L 501.92825,353.56838 L 509.5044,341.44654 L 501.92825,328.31456 z "
-       id="path1909" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1911"
-       width="115.66247"
-       height="85.862968"
-       x="567.96918"
-       y="296.87729"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1913"
-       transform="translate(306.80697,90.93874)"><flowRegion
-         id="flowRegion1915"><rect
-           id="rect1917"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1919">Wharehouse</flowPara><flowPara
-         id="flowPara1943">Component </flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 550.81867,328.72427 L 584.15371,328.72427 L 590.21462,341.85625 L 583.14356,353.97809 L 550.81867,353.97809 L 558.39482,341.85625 L 550.81867,328.72427 z "
-       id="path1921" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 664.07111,326.88599 L 697.40615,326.88599 L 703.46706,340.01797 L 696.396,352.13981 L 664.07111,352.13981 L 671.64726,340.01797 L 664.07111,326.88599 z "
-       id="path1923" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1925"
-       width="115.66247"
-       height="85.862968"
-       x="727.25488"
-       y="294.73444"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1927"
-       transform="translate(472.52126,89.510176)"><flowRegion
-         id="flowRegion1929"><rect
-           id="rect1931"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1933">Shipper</flowPara><flowPara
-         id="flowPara1945">Component </flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 710.81866,326.58142 L 744.1537,326.58142 L 750.21461,339.7134 L 743.14355,351.83524 L 710.81866,351.83524 L 718.39481,339.7134 L 710.81866,326.58142 z "
-       id="path1935" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 824.0711,324.74314 L 857.40614,324.74314 L 863.46705,337.87512 L 856.39599,349.99696 L 824.0711,349.99696 L 831.64725,337.87512 L 824.0711,324.74314 z "
-       id="path1937" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 376.42857,343.3802 C 395.71429,343.3802 395.71429,343.3802 395.71429,343.3802"
-       id="path1947" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 540.71429,341.23734 C 557.85714,341.23734 557.85714,341.23734 557.85714,341.23734"
-       id="path1949" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 702.14286,340.52305 C 717.85714,340.52305 717.85714,340.52305 717.85714,340.52305"
-       id="path1951" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 863.57143,337.66591 C 875.71429,337.66591 875.71429,337.66591 875.71429,337.66591 L 875,427.66591 L 212.14286,429.09448 L 210.71429,344.09448 L 231.42857,344.09448"
-       id="path1953"
-       inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\supplychain\supplychain.png"
-       inkscape:export-xdpi="52.84"
-       inkscape:export-ydpi="52.84" />
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="273.57144"
-       y="359.09448"
-       id="text2199"><tspan
-         sodipodi:role="line"
-         id="tspan2201"
-         x="273.57144"
-         y="359.09448">OSGi</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="445"
-       y="359.80878"
-       id="text2203"><tspan
-         sodipodi:role="line"
-         id="tspan2205"
-         x="445"
-         y="359.80878">Java</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="608.57141"
-       y="358.38022"
-       id="text2207"><tspan
-         sodipodi:role="line"
-         id="tspan2209"
-         x="608.57141"
-         y="358.38022">Java</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="772.85712"
-       y="358.38019"
-       id="text2211"><tspan
-         sodipodi:role="line"
-         id="tspan2213"
-         x="772.85712"
-         y="358.38019">OSGi</tspan></text>
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/osgi-supplychain/pom.xml b/java/sca-contrib/samples/osgi-supplychain/pom.xml
deleted file mode 100644
index a3140094c5..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/pom.xml
+++ /dev/null
@@ -1,187 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-osgi-supplychain</artifactId>
-    <name>Apache Tuscany SCA OSGi Supply Chain Sample</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.main</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>sample-osgi-supplychain</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-bundles</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Customer.jar" />
-                                    <property name="manifest.file.name" value="osgi/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/customer/OSGiCustomerImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Retailer.jar" />
-                                    <property name="manifest.file.name" value="osgi/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/retailer/OSGiRetailerImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Shipper.jar" />
-                                    <property name="manifest.file.name" value="osgi/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/shipper/OSGiShipperImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="Warehouse.jar" />
-                                    <property name="manifest.file.name" value="osgi/Warehouse.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    supplychain/OSGiBundleImpl.class \
-                                                    supplychain/warehouse/OSGiWarehouseImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="DSCustomer.jar" />
-                                    <property name="manifest.file.name" value="osgi/ds/Customer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/customer/Customer.class \
-                                                    osgi/ds/Customer.xml \
-                                                    supplychain/customer/OSGiCustomerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="DSRetailer.jar" />
-                                    <property name="manifest.file.name" value="osgi/ds/Retailer.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/retailer/Retailer.class \
-                                                    osgi/ds/Retailer.xml \
-                                                    supplychain/retailer/OSGiRetailerComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="DSShipper.jar" />
-                                    <property name="manifest.file.name" value="osgi/ds/Shipper.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/shipper/Shipper.class \
-                                                    osgi/ds/Shipper.xml \
-                                                    supplychain/shipper/OSGiShipperComponentImpl.class" />
-
-                                </ant>
-                                <ant antfile="./build-bundles.xml" target="create-bundles">
-                                    <property name="jar.dir" value="target/classes" />
-                                    <property name="files.dir" value="target/classes" />
-                                    <property name="jar.file.name" value="DSWarehouse.jar" />
-                                    <property name="manifest.file.name" value="osgi/ds/Warehouse.mf" />
-                                    <property name="files.list"
-                                        value="supplychain/warehouse/Warehouse.class \
-                                                    osgi/ds/Warehouse.xml \
-                                                    supplychain/warehouse/OSGiWarehouseComponentImpl.class" />
-
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index 5f40054ada..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
+++ /dev/null
@@ -1,121 +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 supplychain;
-
-
-import java.lang.reflect.Field;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-
-
-/**
- * Common code for all OSGi bundles which dont use declarative services.
- * Registers services and sets references.
- */
-public class OSGiBundleImpl implements ServiceListener, BundleActivator {
-    
-
-    String name;
-    String serviceName;
-    String[] references;
-    Class<?>[] referenceClasses;
-    Field[] referenceFields;
-    
-    Class myClass;
-    
-	private BundleContext bundleContext;
-    
-    public OSGiBundleImpl(String serviceName, String... references) {
-        
-        myClass = this.getClass();
-        this.name = this.getClass().getSimpleName();
-        this.serviceName = serviceName;
-        this.references = references;
-        
-        try {
-            referenceClasses = new Class[references.length];
-            referenceFields = new Field[references.length];
-            for (int i = 0; i < references.length; i++) {
-                referenceFields[i] = this.getClass().getDeclaredField(references[i]);
-                referenceFields[i].setAccessible(true);
-                referenceClasses[i] = referenceFields[i].getType();
-            }
-            
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        
-    }
-    
-    public void start(BundleContext bc) {
-    	
-    	System.out.println("Started OSGi bundle with activator " + name);
-    	
-    	this.bundleContext = bc;
-    	
-        bundleContext.registerService(serviceName, this, new Hashtable());
-        
-        for (int i = 0; i < references.length; i++) {
-
-            try {
-                
-    	        ServiceReference ref = bundleContext.getServiceReference(referenceClasses[i].getName());
-	            if (ref != null) {
-                    Object obj = bundleContext.getService(ref);
-                    referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                } else {
-				    String filter = "(objectclass=" + referenceClasses[i].getName() + ")";
-				    this.bundleContext.addServiceListener(this, filter);				
-	            }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    
-    public void stop(BundleContext bc)  {
-        System.out.println("Stop OSGi bundle with activator " + name);
-
-    }
-    
-
-	public void serviceChanged(ServiceEvent event) {
-		try {
-			if (event.getType() == ServiceEvent.REGISTERED) {
-                
-                ServiceReference ref = event.getServiceReference();
-                Object obj = bundleContext.getService(ref);
-                for (int i = 0; i < references.length; i++) {
-                    if (referenceClasses[i].isAssignableFrom(obj.getClass())) {
-                        referenceFields[i].set(this, referenceClasses[i].cast(obj));
-                    }
-                }
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-    
-
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
deleted file mode 100644
index 64814487cb..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ /dev/null
@@ -1,43 +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 supplychain;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import supplychain.customer.Customer;
-
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate a Customer service component and invoke it.
- */
-public class SupplyChainClient {
-
-    public static final void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("supplychain.composite");
-        Customer customer = scaDomain.getService(Customer.class, "CustomerComponent");
-
-        System.out.println("Main thread " + Thread.currentThread());
-        customer.purchaseGoods();
-        System.out.println("Main thread sleeping ...");
-        Thread.sleep(1000);
-
-        scaDomain.close();
-    }
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index b70ddede4f..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
+++ /dev/null
@@ -1,33 +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 supplychain.customer;
-
-import org.oasisopen.sca.annotation.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-    
-    public void purchaseGoods();
-    
-    @OneWay
-    public void notifyShipment(String order);
-
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index cad0749218..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,50 +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 supplychain.customer;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-    
-    private Retailer retailer;
-    
-    @Reference
-    public void setRetailer(Retailer retailer) {
-        this.retailer = retailer;
-    }
-    
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a1c7fce60a..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ /dev/null
@@ -1,51 +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 supplychain.customer;
-
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi declarative services implementation).
- */
-public class OSGiCustomerComponentImpl implements Customer {
-    
-
-    private Retailer retailer;
-    
-   
-    protected void setRetailer(Retailer retailer) {
-    	this.retailer = retailer;
-    }
-    
-    protected void unsetRetailer(Retailer retailer) {
-    	this.retailer = null;
-    }
-   
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 4647a716c7..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.customer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi procedural services implementation).
- */
-public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
-    
-    private Retailer retailer;
-    
-    public OSGiCustomerImpl() {
-        super("supplychain.customer.Customer", "retailer");
-                
-    }
-   
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-    
-    
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index 4c2c8d7604..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,53 +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 supplychain.retailer;
-
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (POJO implementation).
- */
-@Service(Retailer.class)
-@Scope("STATELESS")
-public class JavaRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    
-    @Reference
-    public void setWarehouse(Warehouse warehouse) {
-        this.warehouse = warehouse;
-    }
-    
-       
-    public void submitOrder(String order) {
-    	
-        warehouse.fulfillOrder(order + ", submitted");
-        
-    }
-
-    
-    
-   
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index 1b7fb15bf1..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ /dev/null
@@ -1,46 +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 supplychain.retailer;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi declarative services implementation).
- */
-public class OSGiRetailerComponentImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    
-    protected void setWarehouse(Warehouse warehouse) {
-    	this.warehouse = warehouse;
-    }
-    
-    protected void unsetWarehouse(Warehouse warehouse) {
-    	this.warehouse = null;
-    }
-    
-    public void submitOrder(String order) {
-    	
-        warehouse.fulfillOrder(order + ", submitted");
-       
-    }
-
-   
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e97331c06c..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.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 supplychain.retailer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi procedural services implementation).
- */
-public class OSGiRetailerImpl extends OSGiBundleImpl implements Retailer {
-    
-    private Warehouse warehouse;
-    
-    public OSGiRetailerImpl() {
-
-        super("supplychain.retailer.Retailer", "warehouse");
-    }
-    
-    public void submitOrder(String order) {
-        warehouse.fulfillOrder(order + ", submitted");        
-        
-    }
-
-    
-   
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
+++ /dev/null
@@ -1,28 +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 supplychain.retailer;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-    
-    public void submitOrder(String order);
-
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 8f1276c4e7..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.shipper;
-
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (POJO implementation).
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-    
-    private Customer customer;
-    
-    @Reference
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index 0f88cca213..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.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.    
- */
-package supplychain.shipper;
-
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi declarative services implementation).
- */
-public class OSGiShipperComponentImpl implements Shipper {
-
-    private Customer customer;
-    
-    
-    protected void setCustomer(Customer customer) {
-    	this.customer = customer;
-    }
-    
-    protected void unsetCustomer(Customer customer) {
-    	this.customer = null;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index f55a068ede..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ /dev/null
@@ -1,42 +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 supplychain.shipper;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi procedural services implementation).
- */
-public class OSGiShipperImpl extends OSGiBundleImpl implements Shipper {
-
-    private Customer customer;
-    
-    public OSGiShipperImpl() {
-    	super("supplychain.shipper.Shipper", "customer");
-    }
-    
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
+++ /dev/null
@@ -1,28 +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 supplychain.shipper;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-    
-    public void processShipment(String order);
-
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index 3c0bc6aa83..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.warehouse;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (POJO implementation).
- */
-@Service(Warehouse.class)
-@Scope("STATELESS")
-public class JavaWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    
-    @Reference
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    }
-    
-    
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 600f3f0c74..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ /dev/null
@@ -1,47 +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 supplychain.warehouse;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (OSGi declarative services implementation).
- */
-
-public class OSGiWarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-   
-    protected void setShipper(Shipper shipper) {
-    	this.shipper = shipper;
-    }
-    
-    protected void unsetShipper(Shipper shipper) {
-    	this.shipper = null;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-   
-
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index b8bca97bd0..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.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 supplychain.warehouse;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service componentm (OSGi procedural services implementation).
- */
-
-public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    public OSGiWarehouseImpl() {
-    	super("supplychain.warehouse.Warehouse", "shipper");
-    }
-    
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    	
-    }
-    
-   
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
+++ /dev/null
@@ -1,28 +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 supplychain.warehouse;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-    
-    public void fulfillOrder(String order);
-
-}
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Customer.componentType b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Customer.componentType
deleted file mode 100644
index 5c61a0961c..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Customer.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="supplychain.customer.Customer">
-        <interface.java interface="supplychain.customer.Customer"/>
-    </service>
-    <reference name="retailer">
-            <interface.java interface="supplychain.retailer.Retailer"/>
-    </reference>
-    
-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
deleted file mode 100644
index 87a184d968..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.customer.Customer">

-        <interface.java interface="supplychain.customer.Customer"/>

-    </service>

-    <reference name="retailer">

-            <interface.java interface="supplychain.retailer.Retailer"/>

-    </reference>

-    

-</componentType>

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
deleted file mode 100644
index 872ab6601a..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.retailer.Retailer">

-        <interface.java interface="supplychain.retailer.Retailer"/>

-    </service>

-    <reference name="warehouse">

-            <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSShipper.componentType b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
deleted file mode 100644
index 57fcbbc5d1..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.shipper.Shipper">

-        <interface.java interface="supplychain.shipper.Shipper"/>

-    </service>

-    <reference name="customer">

-            <interface.java interface="supplychain.customer.Customer"/>

-    </reference>

-      

-</componentType>

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
deleted file mode 100644
index 75fa8029f7..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
+++ /dev/null
@@ -1,28 +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.    

--->

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">

-    <service name="supplychain.warehouse.Warehouse">

-        <interface.java interface="supplychain.warehouse.Warehouse"/>

-    </service>

-    

-    <reference name="shipper">

-            <interface.java interface="supplychain.shipper.Shipper"/>

-    </reference>

-</componentType>

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Retailer.componentType
deleted file mode 100644
index 15185f2bf9..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Retailer.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="supplychain.retailer.Retailer">
-        <interface.java interface="supplychain.retailer.Retailer"/>
-    </service>
-    <reference name="warehouse">
-            <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </reference>
-      
-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Shipper.componentType
deleted file mode 100644
index 675597d80b..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Shipper.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="supplychain.shipper.Shipper">
-        <interface.java interface="supplychain.shipper.Shipper"/>
-    </service>
-    <reference name="customer">
-            <interface.java interface="supplychain.customer.Customer"/>
-    </reference>
-      
-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
deleted file mode 100644
index 6e1ac3e5a9..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-    <service name="supplychain.warehouse.Warehouse">
-        <interface.java interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    
-    <reference name="shipper">
-            <interface.java interface="supplychain.shipper.Shipper"/>
-    </reference>
-</componentType>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
deleted file mode 100644
index 88d79e5219..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.retailer

-Export-Package: supplychain.customer

-Bundle-Activator: supplychain.customer.OSGiCustomerImpl

-

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
deleted file mode 100644
index d95ef5d582..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
deleted file mode 100644
index de7ac7ec7a..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.customer

-Export-Package: supplychain.shipper

-Bundle-Activator: supplychain.shipper.OSGiShipperImpl

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
deleted file mode 100644
index 21241a6899..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

-                supplychain.shipper

-Export-Package: supplychain.warehouse

-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
deleted file mode 100644
index b5c5a862be..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Customer

-Bundle-SymbolicName: ds.supplychain.customer.Customer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.retailer

-Export-Package: supplychain.customer

-Service-Component: osgi/ds/Customer.xml

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
deleted file mode 100644
index 5b368afd5b..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="CustomerComponent" immediate="true">
-    <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
-    <service>
-         <provide interface="supplychain.customer.Customer" />
-    </service>
-    <reference 
-        name="retailer" 
-        interface="supplychain.retailer.Retailer" 
-        bind="setRetailer"
-        unbind="unsetRetailer"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
deleted file mode 100644
index 47897d16ca..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Retailer

-Bundle-SymbolicName: ds.supplychain.retailer.Retailer

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.warehouse

-Export-Package: supplychain.retailer

-Service-Component: osgi/ds/Retailer.xml

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
deleted file mode 100644
index cae7fdfde2..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="RetailerComponent" immediate="true" >
-    <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
-    <service>
-         <provide interface="supplychain.retailer.Retailer" />
-    </service>
-    <reference 
-        name="warehouse" 
-        interface="supplychain.warehouse.Warehouse" 
-        bind="setWarehouse"
-        unbind="unsetWarehouse"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
deleted file mode 100644
index f5333c7caa..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Shipper

-Bundle-SymbolicName: ds.supplychain.shipper.Shipper

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component, supplychain.customer

-Export-Package: supplychain.shipper

-Service-Component: osgi/ds/Shipper.xml

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
deleted file mode 100644
index d894309b71..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<component name="ShipperComponent"  immediate="true">
-    <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
-    <service>
-         <provide interface="supplychain.shipper.Shipper"/>
-    </service>
-    <reference 
-        name="customer" 
-        interface="supplychain.customer.Customer" 
-        bind="setCustomer"
-        unbind="unsetCustomer"
-        cardinality="0..1"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
deleted file mode 100644
index 6166549e5a..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Warehouse

-Bundle-SymbolicName: ds.supplychain.warehouse.Warehouse

-Bundle-Version: 1.0.0

-Bundle-Localization: plugin

-Import-Package: org.osgi.framework,

- org.osgi.service.component,

- supplychain.shipper

-Export-Package: supplychain.warehouse

-Service-Component: osgi/ds/Warehouse.xml

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
deleted file mode 100644
index fc86a76784..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<component name="WarehouseComponent"  immediate="true">
-    <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
-    <service>
-         <provide interface="supplychain.warehouse.Warehouse"/>
-    </service>
-    <reference 
-        name="shipper" 
-        interface="supplychain.shipper.Shipper" 
-        bind="setShipper"
-        unbind="unsetShipper"
-        policy="dynamic"
-    />
-</component>
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/supplychain.composite b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/supplychain.composite
deleted file mode 100644
index 0bbfed9176..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/supplychain.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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponent">

-        <tuscany:implementation.osgi 

-            bundleSymbolicName="supplychain.customer.Customer"          

-        />

-            

-        <!--implementation.java class="supplychain.customer.JavaCustomerComponentImpl" -->

-        <reference name="retailer" target="RetailerComponent" />

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <!--implementation.osgi

-            bundleSymbolicName="supplychain.retailer.Retailer" 

-        /-->

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <!--implementation.osgi

-            bundleSymbolicName="supplychain.warehouse.Warehouse" 

-        /-->

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <tuscany:implementation.osgi

-            bundleSymbolicName="supplychain.shipper.Shipper"   

-        />

-        <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /-->

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/java/sca-contrib/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
deleted file mode 100644
index d1e11168e2..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/supplychain.ds.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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://supplychain"

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

-	xmlns:sp="http://supplychain"

-	name="supplychain">

-	

-    <component name="CustomerComponent">

-        <tuscany:implementation.osgi 

-            bundleSymbolicName="ds.supplychain.customer.Customer" 

-        />

-            

-        <!--implementation.java class="supplychain.customer.JavaCustomerComponentImpl" -->

-        <reference name="retailer" target="RetailerComponent" />

-    </component>

-

-    <component name="RetailerComponent">

-        <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />

-        <!--tuscany:implementation.osgi

-            bundleSymbolicName="ds.supplychain.retailer.Retailer" 

-        /-->

-        <reference name="warehouse" target="WarehouseComponent"/>

-    </component>

-

-    <component name="WarehouseComponent">

-        <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />

-        <!--implementation.osgi

-            bundleSymbolicName="ds.supplychain.warehouse.Warehouse" 

-        /-->

-        <reference name="shipper" target="ShipperComponent" />

-    </component>

-

-    <component name="ShipperComponent">

-        <tuscany:implementation.osgi

-            bundleSymbolicName="ds.supplychain.shipper.Shipper" 

-        />

-        <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /-->

-        <reference name="customer" target="CustomerComponent" />

-    </component>

-    

-    

-</composite>

diff --git a/java/sca-contrib/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/java/sca-contrib/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
deleted file mode 100644
index ff15c0d9a2..0000000000
--- a/java/sca-contrib/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ /dev/null
@@ -1,60 +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 supplychain;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-
-import supplychain.customer.Customer;
-
-/**
- * This client program shows how to create an SCA runtime, start it, locate a simple HelloWorld service component and
- * invoke it.
- */
-public class SupplyChainClientTestCase extends TestCase {
-
-	private SCADomain scaDomain;
-    private Customer customer;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("supplychain.composite");
-        customer = scaDomain.getService(Customer.class, "CustomerComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-
-    public void test() throws Exception {
-    	    	
-        customer.purchaseGoods();
-        
-        System.out.println("Sleeping ...");
-        Thread.sleep(2000);
-        System.out.println("Test complete");
-        
-    }
-    
-    
-}
diff --git a/java/sca-contrib/samples/photo-gallery/README b/java/sca-contrib/samples/photo-gallery/README
deleted file mode 100644
index c66edea985..0000000000
--- a/java/sca-contrib/samples/photo-gallery/README
+++ /dev/null
@@ -1,28 +0,0 @@
-Photo-Gallery Sample
-======================================
-
-This is a sample store scenario that is used as a getting started guide
-for Tuscany SCA. For detailed information, please see:
-
-http://tuscany.apache.org/getting-started-with-tuscany.html
-
-or
-
-http://tuscany.apache.org/getting-started-with-tuscany-using-tuscany-eclipse-plugin.html
-
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as follows:
-
-cd store
-ant compile
-
-and then, to run:
-
-ant run
-
-Once the store application is running use your browser to visit the following
-URL:
-
-http://localhost:8080/gallery/
diff --git a/java/sca-contrib/samples/photo-gallery/build.xml b/java/sca-contrib/samples/photo-gallery/build.xml
deleted file mode 100644
index 652afc3570..0000000000
--- a/java/sca-contrib/samples/photo-gallery/build.xml
+++ /dev/null
@@ -1,79 +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.    
--->
-<project name="store" default="compile">
-    <property name="test.class" value="launch.Launch" />
-	<property name="test.jar"   value="sample-store.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<fileset refid="3rdparty.jars"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<fileset refid="3rdparty.jars"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<fileset refid="3rdparty.jars"/>
-            </classpath>
-        </java>    	
-    </target>	
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-    
-    <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="saxon-9.0.0.2.jar"/>
-    </fileset>
-</project>
diff --git a/java/sca-contrib/samples/photo-gallery/photo-gallery.png b/java/sca-contrib/samples/photo-gallery/photo-gallery.png
deleted file mode 100644
index da413edeee..0000000000
--- a/java/sca-contrib/samples/photo-gallery/photo-gallery.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/photo-gallery.svg b/java/sca-contrib/samples/photo-gallery/photo-gallery.svg
deleted file mode 100644
index 74f8ecd36d..0000000000
--- a/java/sca-contrib/samples/photo-gallery/photo-gallery.svg
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\store"
-   sodipodi:docname="store.svg"
-   version="1.0"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\simon\tuscany\java-head\sca\samples\store\store.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="538.06165"
-     inkscape:cy="341.69129"
-     inkscape:document-units="px"
-     inkscape:current-layer="g2997"
-     inkscape:window-width="1466"
-     inkscape:window-height="831"
-     inkscape:window-x="117"
-     inkscape:window-y="80" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997">
-      <rect
-         rx="14.335117"
-         ry="17.743465"
-         y="197.1973"
-         x="447.35422"
-         height="419.39099"
-         width="464.23727"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.28840661;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="translate(189.90868,1.0101522)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2171">store</flowPara></flowRoot>      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.30182266;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2175"
-         width="118.21779"
-         height="111.27543"
-         x="491.60019"
-         y="247.75989"
-         rx="7.1507306"
-         ry="9.2311935" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2177"
-         transform="translate(223.8585,41.670449)"><flowRegion
-           id="flowRegion2179"><rect
-             id="rect2181"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2183">ufs</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 474.29877,279.45598 L 507.63381,279.45598 L 513.69472,292.58796 L 506.62366,304.7098 L 474.29877,304.7098 L 481.87492,292.58796 L 474.29877,279.45598 z "
-         id="path2187" />
-      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2191"
-         width="115.66247"
-         height="85.862968"
-         x="493.07068"
-         y="503.27759"
-         rx="6.9961648"
-         ry="7.1230249" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2193"
-         transform="translate(225.47992,297.33908)"><flowRegion
-           id="flowRegion2195"><rect
-             id="rect2197"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2199">ShoppingCart</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 475.92019,535.12461 L 509.25523,535.12461 L 515.31614,548.25659 L 508.24508,560.37843 L 475.92019,560.37843 L 483.49634,548.25659 L 475.92019,535.12461 z "
-         id="path2203" />
-      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2207"
-         width="115.66247"
-         height="85.862968"
-         x="761.44415"
-         y="391.31604"
-         rx="6.9961648"
-         ry="7.1230249" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2209"
-         transform="translate(487.8534,185.37751)"><flowRegion
-           id="flowRegion2211"><rect
-             id="rect2213"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2215">CurrencyConverter</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 744.29367,423.16304 L 777.62871,423.16304 L 783.68962,436.29502 L 776.61856,448.41686 L 744.29367,448.41686 L 751.86982,436.29502 L 744.29367,423.16304 z "
-         id="path2219" />
-      <rect
-         style="opacity:1;fill:#0064ff;fill-opacity:1;stroke:#000000;stroke-width:0.9612025;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2223"
-         width="104.08451"
-         height="113.17588"
-         x="138.37151"
-         y="350.1156"
-         rx="0"
-         ry="0.048917599" />
-      <path
-         style="fill:#1a73fe;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-         d="M 138.21429,462.66591 L 115.35714,479.80877 L 267.85714,479.80877 L 241.78571,463.02305 L 138.21429,462.66591 z "
-         id="path3197" />
-      <rect
-         style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect3199"
-         width="92.5"
-         height="97.14286"
-         x="143.57143"
-         y="358.38019"
-         ry="3.6203461"
-         rx="3.9285715" />
-      <image
-         y="366.6889"
-         x="156.24066"
-         id="image3323"
-         height="78.571434"
-         width="58.57143"
-         sodipodi:absref="C:\simon\tuscany\evangelism\whitepapers\shoppingcart.png"
-         xlink:href="C:\simon\tuscany\evangelism\whitepapers\shoppingcart.png" />
-      <image
-         y="270.52304"
-         x="526.42859"
-         id="image3342"
-         height="78.571434"
-         width="58.57143"
-         sodipodi:absref="C:\simon\tuscany\evangelism\whitepapers\shoppingcart.png"
-         xlink:href="C:\simon\tuscany\evangelism\whitepapers\shoppingcart.png" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 242.85714,374.80877 C 245.71429,374.80877 345.71429,374.80877 345.71429,374.80877 L 345.71429,291.95162 L 481.42858,291.95162"
-         id="path3348"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 210.71429,406.95163 L 345,406.95163 L 345,437.66591 L 481.42857,437.66591"
-         id="path3350"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 210.71429,439.09448 L 325.71429,439.09448 L 325.71429,548.3802 L 482.85714,548.3802"
-         id="path3352"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 626.42857,436.23734 C 750,437.66591 752.14286,436.23734 752.14286,436.23734"
-         id="path3354"
-         sodipodi:nodetypes="cc" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot3356"
-         transform="translate(-94.285714,25)"><flowRegion
-           id="flowRegion3358"><rect
-             id="rect3360"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara3362">CurrenyCode</flowPara></flowRoot>      <flowRoot
-         xml:space="preserve"
-         id="flowRoot3364"
-         transform="translate(-250.76562,-76.210859)"><flowRegion
-           id="flowRegion3366"><rect
-             id="rect3368"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara3370">HTTP</flowPara></flowRoot>      <flowRoot
-         xml:space="preserve"
-         id="flowRoot3372"
-         transform="translate(-273.62277,70.931998)"><flowRegion
-           id="flowRegion3374"><rect
-             id="rect3376"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara3378">JSONRPC</flowPara></flowRoot>      <flowRoot
-         xml:space="preserve"
-         id="flowRoot3380"
-         transform="translate(-243.62277,183.07485)"><flowRegion
-           id="flowRegion3382"><rect
-             id="rect3384"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara3386">Atom</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="491.56897"
-       y="392.70135"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(223.97819,186.76283)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Catalog</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3006"
-       width="21.718224"
-       height="20.708065"
-       x="537.53094"
-       y="377.04398"
-       rx="10.859112"
-       ry="0" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 474.41846,424.54836 L 507.7535,424.54836 L 513.81441,437.68034 L 506.74335,449.80218 L 474.41846,449.80218 L 481.99461,437.68034 L 474.41846,424.54836 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 587.6709,422.71008 L 621.00594,422.71008 L 627.06685,435.84206 L 619.99579,447.9639 L 587.6709,447.9639 L 595.24705,435.84206 L 587.6709,422.71008 z "
-       id="path3019" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/photo-gallery/pom.xml b/java/sca-contrib/samples/photo-gallery/pom.xml
deleted file mode 100644
index b96a89f0fc..0000000000
--- a/java/sca-contrib/samples/photo-gallery/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-photo-gallery</artifactId>
-    <name>Apache Tuscany SCA Getting Started Online Store Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-		<dependency>
-		    <groupId>org.apache.derby</groupId>
-		    <artifactId>derby</artifactId>
-		    <version>10.2.1.6</version>
-		</dependency> 
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.3.0</version>
-        </dependency>
-      
-	    <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.3.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
-            <version>1.3.0</version>
-        </dependency>
-
-		<dependency>
-		    <groupId>javax.jcr</groupId>
-		    <artifactId>jcr</artifactId>
-		    <version>1.0</version>
-		</dependency> 
-
-        <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-core</artifactId>
-            <version>1.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-api</artifactId>
-            <version>1.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/java/launch/LaunchGallery.java b/java/sca-contrib/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
deleted file mode 100644
index 1007cd49b0..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
+++ /dev/null
@@ -1,34 +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 launch;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class LaunchGallery {
-    public static void main(String[] args) throws Exception {
-        System.out.println("Starting ...");
-        SCADomain scaDomain = SCADomain.newInstance("photo-gallery.composite");
-        System.out.println("photo.gallery.composite ready for big business !!!");
-        System.in.read();
-        System.out.println("Stopping ...");
-        scaDomain.close();
-        System.out.println();
-    }
-}
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java b/java/sca-contrib/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
deleted file mode 100644
index d07dc63592..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
+++ /dev/null
@@ -1,34 +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 launch;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class LaunchGalleryJCR {
-    public static void main(String[] args) throws Exception {
-        System.out.println("Starting ...");
-        SCADomain scaDomain = SCADomain.newInstance("photo-gallery-jcr.composite");
-        System.out.println("photo.gallery.composite ready for big business !!!");
-        System.in.read();
-        System.out.println("Stopping ...");
-        scaDomain.close();
-        System.out.println();
-    }
-}
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/java/services/Album.java b/java/sca-contrib/samples/photo-gallery/src/main/java/services/Album.java
deleted file mode 100644
index d614b6a504..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/java/services/Album.java
+++ /dev/null
@@ -1,29 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Album {
-    
-    public String[] getPictures();
-
-}
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/java/services/AlbumImpl.java b/java/sca-contrib/samples/photo-gallery/src/main/java/services/AlbumImpl.java
deleted file mode 100644
index 3cdc56e641..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/java/services/AlbumImpl.java
+++ /dev/null
@@ -1,95 +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 services;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-
-public class AlbumImpl implements Album {
-    private String gallery;
-    private String album;
-    private String location;
-    private List<String> pictures = new ArrayList<String>();
-    
-    @Property
-    public void setGallery(String gallery) {
-        this.gallery = gallery;
-        this.location = null;
-    }
-    @Property
-    public void setAlbum(String album) {
-        this.album = album;
-        this.location = null;
-    }
-    
-    protected String getLocation() {
-        if (location == null) {
-            location = gallery + "/" + album + "/"; 
-        }
-        return location;
-        
-    }
-
-    @Init
-    public void init() {
-        try {
-            URL albumURL = this.getClass().getClassLoader().getResource(getLocation());
-            if(albumURL != null) {
-                File album = new File(albumURL.toURI());
-                if (album.isDirectory() && album.exists()) {
-                    String[] listPictures = album.list(new ImageFilter(".jpg"));
-                    for(String image : listPictures) {
-                        image = getLocation() + image;
-                        pictures.add(image);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            // FIXME: ignore for now
-            e.printStackTrace();
-        }   
-    }
-    
-    public String[] getPictures() {
-        String[] pictureArray = new String[pictures.size()];
-        pictures.toArray(pictureArray);
-        return pictureArray;
-    }
-    
-    /**
-     * Inner fileFilter class
-     */
-    private class ImageFilter implements FilenameFilter {
-        String afn;
-        ImageFilter(String afn) { this.afn = afn; }
-        public boolean accept(File dir, String name) {
-          // Strip path information:
-          String f = new File(name).getName();
-          return f.indexOf(afn) != -1;
-        }
-      } ///:~ 
-
-}
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java b/java/sca-contrib/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
deleted file mode 100644
index 8ede831ea0..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
+++ /dev/null
@@ -1,159 +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 services.jcr;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.Repository;
-import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
-
-import org.apache.jackrabbit.core.TransientRepository;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-
-import services.Album;
-
-public class AlbumImpl implements Album {
-    private String gallery;
-    private String album;
-    private String location;
-    private Repository repository=null;
-    private Session session=null;
-    
-    @Property
-    public void setGallery(String gallery) {
-        this.gallery = gallery;
-        this.location = null;
-    }
-    @Property
-    public void setAlbum(String album) {
-        this.album = album;
-        this.location = null;
-    }
-    
-    protected String getLocation() {
-        if (location == null) {
-            location = gallery + "/" + album + "/"; 
-        }
-        return location;
-        
-    }
-
-    @Init
-    public void init() {
-        try {
-            URL albumURL = this.getClass().getClassLoader().getResource(getLocation());
-            if(albumURL != null) {
-            	repository = new TransientRepository();
-                session = repository.login(
-                    new SimpleCredentials("username", "password".toCharArray()));
-                try {
-                  File album = new File(albumURL.toURI());
-                  if (album.isDirectory() && album.exists()) {
-                      String[] listPictures = album.list(new ImageFilter(".jpg"));
-                    for(String image : listPictures) {
-                    	Node root=session.getRootNode();
-                    	Node picNode=root.addNode(image);
-                        InputStream inFile = getClass().getClassLoader().getResourceAsStream(getLocation()+image);
-                        picNode.setProperty("image", inFile );
-                        picNode.setProperty("name", image);
-                        picNode.setProperty("location", getLocation()+image);
-                    	//image = getLocation() + image;
-                        //pictures.add(image);
-                      }
-                  }
-                            
-                  session.save();
-                }catch (Exception e){
-                    // FIXME: ignore for now
-                    e.printStackTrace();     	
-                }
-            }
-        } catch (Exception e) {
-            // FIXME: ignore for now
-            e.printStackTrace();
-        }   
-    }
-    
-    public String[] getPictures() {
-      List<String> pictures = new ArrayList<String>();
-    	
-      try{	
-    	Node root=session.getRootNode();
-        NodeIterator nodes = root.getNodes();
-
-        while(nodes.hasNext()){
-        	Node node=nodes.nextNode();
-        	if(node.getPath().equals("/jcr:system")) continue;
-        	
-        	pictures.add(node.getProperty("location").getString());
-        	//System.out.println(node.getProperty("name").getString());
-        	//System.out.println(node.getPath());
-        }
-      }catch (Exception e) {
-          // FIXME: ignore for now
-          e.printStackTrace();
-      }
-      
-      String[] pictureArray = new String[pictures.size()];
-      pictures.toArray(pictureArray);
-      removeNodes();
-      return pictureArray;
-    }
-    
-    
-    public void removeNodes(){
-      try{
-    	Node root=session.getRootNode();
-        NodeIterator nodes = root.getNodes();
-        while(nodes.hasNext()){
-        	Node node=nodes.nextNode();
-        	if(node.getPath().equals("/jcr:system")) continue;
-        	else node.remove();
-        }
-        session.save();
-      }catch (Exception e) {
-          // FIXME: ignore for now
-          e.printStackTrace();
-      }
-        
-    }
-    /**
-     * Inner fileFilter class
-     */
-    private class ImageFilter implements FilenameFilter {
-        String afn;
-        ImageFilter(String afn) { this.afn = afn; }
-        public boolean accept(File dir, String name) {
-          // Strip path information:
-          String f = new File(name).getName();
-          return f.indexOf(afn) != -1;
-        }
-      } ///:~ 
-
-}
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery.html b/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery.html
deleted file mode 100644
index f6566e88ec..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery.html
+++ /dev/null
@@ -1,135 +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.    
--->
-<html>
-<head>
-<title>Photo Gallery</title>
-
-<link href="styles.css" rel="stylesheet">
-
-<script type="text/javascript" src="gallery.js"></script>
-<script language="JavaScript">
-
-	//@Reference
-	var album = new Reference("album");
-		
-	var albumItems;
-	var currPos = 0;
-
-	function album_getResponse(items, exception) {
-		if(exception) {
-			alert(exception.msg);
-			return;
-		}
-		albumItems = items;
-		showAlbum();
-	}
-
-   function showImage(pos) {
-   	var img = document.createElement("img");
-	img.onload = function(evt) {
-		document.getElementById("albumImage").src = this.src;
-        document.getElementById("albumImage").width=this.width;
-        document.getElementById("albumImage").height=this.height;
-    }
-    img.src = albumItems[pos];
-    return false;   	
-   }
-   
-   function showAlbum() {
-      if(albumItems.length > 0) {
-		showImage(currPos);
-	  }	
-   }
-   
-   function goNext() {
-   	 if(currPos < albumItems.length) {
-	 	currPos++;
-		showImage(currPos);
-	 }
-   }
-   
-   function goPrevious() {
-   	if(currPos > 0) {
-		currPos--;
-		showImage(currPos);
-	}
-   }	
-		
-	function init() {
-		try {
-			album.getPictures(album_getResponse);
-		} catch(exception) {
-			alert(e);
-		}
-	}
-	
-	
-	index_off= new Image(31,31); index_off.src = "index.gif";
-    index_on = new Image(31,31); index_on.src = "index_on.gif";
-    next_off = new Image(31,31); next_off.src = "next.gif";
-	next_on  = new Image(31,31); next_on.src = "next_on.gif";
-	prev_off = new Image(31,31); prev_off.src = "prev.gif";
-	prev_on  = new Image(31,31); prev_on.src = "prev_on.gif";
-	
-</script>
-
-</head>
-
-<body onload="init()">
-<br>
-<h1><center>Apache Tuscany Photo Gallery</center></h1>
-<br>
-<br>
-  <div id="gallery">
-	<div id="album">
-		<!--img id="albumImage" border="0" src=""-->
-	</div>
-	<br>
-  </div>
-  
-  <center>
-
-  <table style="height:54px;" cellspacing="0" cellpadding="0" border="0">
-     <tr>
-     	<td valign="middle">
-     	   <!-- Navigation Header -->
-		   <table style="width:100%;" cellspacing="0" cellpadding="0" border="0">
-             <tr>
-             	<td style="width:31px;"><a href="javascript:showAlbum()" onmouseover="document.index.src=index_on.src" onmouseout="document.index.src=index_off.src"><img src="index.gif" width="31" height="31" border="0" title="Index page" name="index" alt=""></a></td>
-                <td style="width:31px;"><a href="javascript:goPrevious()" onmouseover="document.previous.src=prev_on.src" onmouseout="document.previous.src=prev_off.src"><img src="prev.gif" width="31" height="31" border="0" title="Previous image" name="previous" alt=""></a></td>
-                <td style="width:31px;"><a href="javascript:goNext()" onmouseover="document.next.src=next_on.src" onmouseout="document.next.src=next_off.src"><img src="next.gif" width="31" height="31" border="0" title="Next image" name="next" alt=""></a></td>
-                <td style="width:31px;"><a href="javascript:void(0)" onmouseover="show_over();" onmouseout="show_out();" onmousedown="show_down();" ondblclick="change_delay();"><img src="show_slide.gif" width="31" height="31" border="0" title="Start/Stop slideshow - DoubleClick to change speed" name="show" alt=""></a></td>
-             </tr>
-		   </table>
-		</td>
-	</tr>
-  </table>
-
-  <table style="width:720px;" border="0" cellspacing="0" cellpadding="0">
-    <tr>
-     	<td align="center"> <!-- Image without original -->
-        <img id="albumImage" src="space.gif" class="slideImage" width="720" height="540" ondragstart="return false" onselectstart="return false" oncontextmenu="return false" galleryimg="no" usemap="#imagemap" alt="">
-		</td>
-    </tr>
-  </table>
-		   
-  </center>
-  
-</body>
-</html>
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg b/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
deleted file mode 100644
index 9437b321e2..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg b/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
deleted file mode 100644
index 07f37ec505..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg b/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
deleted file mode 100644
index 2193784271..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg b/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
deleted file mode 100644
index 1532ee2c1b..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg b/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
deleted file mode 100644
index 17ffd73aec..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg b/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
deleted file mode 100644
index 19e9ec37df..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg b/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
deleted file mode 100644
index 022416dbce..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg b/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
deleted file mode 100644
index c78a974714..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg b/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
deleted file mode 100644
index a98070925a..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg b/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
deleted file mode 100644
index dc83889116..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg b/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
deleted file mode 100644
index 0e33548135..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/index.gif b/java/sca-contrib/samples/photo-gallery/src/main/resources/index.gif
deleted file mode 100755
index 7599ac7686..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/index.gif
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/index_on.gif b/java/sca-contrib/samples/photo-gallery/src/main/resources/index_on.gif
deleted file mode 100755
index 153e9879d6..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/index_on.gif
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/next.gif b/java/sca-contrib/samples/photo-gallery/src/main/resources/next.gif
deleted file mode 100755
index 002eaf6951..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/next.gif
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/next_disabled.gif b/java/sca-contrib/samples/photo-gallery/src/main/resources/next_disabled.gif
deleted file mode 100755
index 38b1298453..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/next_disabled.gif
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/next_on.gif b/java/sca-contrib/samples/photo-gallery/src/main/resources/next_on.gif
deleted file mode 100755
index 4e5bb3e7ef..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/next_on.gif
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite b/java/sca-contrib/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
deleted file mode 100644
index 23190de555..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
+++ /dev/null
@@ -1,47 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://photo-gallery"
-		name="photo-gallery">
-		
-    <component name="Gallery">
-        <t:implementation.widget location="gallery.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/gallery"/>
-        </service>
-		<reference name="album" target="Album">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-    
-	<component name="Album">
-		<implementation.java class="services.jcr.AlbumImpl"/> 
-		<property name="gallery">gallery</property>
-		<property name="album">boston</property>
-		<service name="Album">
-			<t:binding.jsonrpc/>
-   		</service>
-	</component> 
-	
-	<component name="GalleryPictures">
-		<t:implementation.resource location="gallery"></t:implementation.resource>
-	</component>
-</composite>
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/photo-gallery.composite b/java/sca-contrib/samples/photo-gallery/src/main/resources/photo-gallery.composite
deleted file mode 100644
index 0bb3c4b4db..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/photo-gallery.composite
+++ /dev/null
@@ -1,47 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://photo-gallery"
-		name="photo-gallery">
-		
-    <component name="Gallery">
-        <t:implementation.widget location="gallery.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/gallery"/>
-        </service>
-		<reference name="album" target="Album">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-    
-	<component name="Album">
-		<implementation.java class="services.AlbumImpl"/> 
-		<property name="gallery">gallery</property>
-		<property name="album">boston</property>
-		<service name="Album">
-			<t:binding.jsonrpc/>
-   		</service>
-	</component> 
-	
-	<component name="GalleryPictures">
-		<t:implementation.resource location="gallery"></t:implementation.resource>
-	</component>
-</composite>
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/prev.gif b/java/sca-contrib/samples/photo-gallery/src/main/resources/prev.gif
deleted file mode 100755
index 4eea10f1dc..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/prev.gif
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/prev_disabled.gif b/java/sca-contrib/samples/photo-gallery/src/main/resources/prev_disabled.gif
deleted file mode 100755
index 7e35f07076..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/prev_disabled.gif
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/prev_on.gif b/java/sca-contrib/samples/photo-gallery/src/main/resources/prev_on.gif
deleted file mode 100755
index 3ef9a776bb..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/prev_on.gif
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/show_slide.gif b/java/sca-contrib/samples/photo-gallery/src/main/resources/show_slide.gif
deleted file mode 100644
index a5b6a15c2b..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/show_slide.gif
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/space.gif b/java/sca-contrib/samples/photo-gallery/src/main/resources/space.gif
deleted file mode 100644
index 170fe82b65..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/space.gif
+++ /dev/null
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/styles.css b/java/sca-contrib/samples/photo-gallery/src/main/resources/styles.css
deleted file mode 100755
index d23d949858..0000000000
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/styles.css
+++ /dev/null
@@ -1,121 +0,0 @@
-body {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #888888;
-	background-color: #000000;
-	margin-top: 0px;
-}
-
-html {
-	scrollbar-face-color:#444444;
-	scrollbar-highlight-color:#000000;
-	scrollbar-3dlight-color:#000000;
-	scrollbar-darkshadow-color:#000000;
-	scrollbar-shadow-color:#000000;
-	scrollbar-arrow-color:#888888;
-	scrollbar-track-color:#000000;
-}
-
-a:link {
-	text-decoration: none;
- 	color: #AAAAAA;
-}
-
-a:visited {
-	text-decoration: none;
-	color: #AAAAAA;
-}
-
-a:hover {
-	text-decoration: none;
-	color: #FFFFFF;
-}
-
-.current {
-	font-weight: bold;
- 	color: #AAAAAA;
-	background-color: #666666;
-}
-
-.cthumb {
-	background-color: #666666;
-	border: 0px; border-width: 0px;
-}
-
-.thumb {
-	background-color: #333333;
-	border: 0px; border-width: 0px;
-}
-
-.image { margin: 0px; border-width: 1px; border: 1px solid;}
-a:link .image { border-color: #aaaaaa; color: #aaaaaa;}
-a:visited .image { border-color: #666666; color: #666666;}
-a:hover .image { border-color: #ffffff; color: #ffffff;}
-
-.slideImage { border-width: 0px; border: 0px solid; border-color: #ffffff;}
-a:link .slideImage { border-color: #ffffff;}
-a:visited .slideImage { border-color: #ffffff;}
-
-.title {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	font-weight: bold;
-	color: #000000;
-}
-
-.title a:link {
-	text-decoration: none;
-	color: #000000;
-}
-
-.title a:visited {
-	text-decoration: none;
-	color: #000000;
-}
-
-.title a:hover {
-	text-decoration: none;
-	color: #ffffff;
-}
-
-.infotable {
-	border: 1px solid #444444;
-	border-collapse: collapse;
-}
-
-.infotable td {
-	border: 1px solid #444444;
-}
-
-.infotable table td {
-	border: 0px;
-}
-
-.dirname {
-	font-size: 12px;
-	font-weight: bold;
-	color: #AAAAAA;
-}
-
-.comment {
-	color: #CCCCCC;
-	font-weight: bold;
-	font-size: 12px;
-}
-
-.smalltxt {
-	color: #888888;
-	font-size: 11px;
-}
-
-.xsmalltxt {
-	color: #888888;
-	font-size: 9px;
-}
-
-.newlabel {
-	font-size: 8px;
-	font-weight: bold;
-	color: #EEEEEE;
-	background-color: #558800;
-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/quote-xquery/README b/java/sca-contrib/samples/quote-xquery/README
deleted file mode 100644
index cf8a4609a6..0000000000
--- a/java/sca-contrib/samples/quote-xquery/README
+++ /dev/null
@@ -1,450 +0,0 @@
-Quote Xquery Sample

-===================

-

- This sample covers the most important integration scenarios for the xquery

- implementation type and its corresponding saxon data bindings.

- 

-If you just want to run it to see what happens open two command prompts (one for the server

-and the other for the client), navigate to this sample directory and do:

-

-Command Prompt 1:

-ant

-ant run-server

-

-Command Prompt 2:

-ant run

-

-OR if you don't have ant, on Windows do

-

-In the directory samples\quote-xquery use the JDK 1.5 java command to run the class xquery.quote.XQueryQuoteClient 

-

-Linux:   java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-quote-xquery.jar xquery.quote.XQueryQuoteServer

-Linux:   java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-quote-xquery.jar xquery.quote.XQueryQuoteClient

-

-Windows: java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-quote-xquery.jar xquery.quote.XQueryQuoteServer

-Windows: java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-quote-xquery.jar xquery.quote.XQueryQuoteClient

-

-Results

-----------

-The sample when run should simply display on the standard output some startup messages followed by:

-

-The compilation:

-

-Buildfile: build.xml

-

-init:

-

-generate-sdo:

-     [java] >>  Generating code

-     [java] >>  Generating packages

-     [java] >>  Generating package QuotePackageImpl

-     [java] >>  Generating Java interface org.example.quote.QuoteFactory

-     [java] >>  Generating /TargetProject/org/example/quote/QuoteFactory.java

-     [java] >>  Examining old /TargetProject/org/example/quote/QuoteFactory.java

-     [java] >>  Generating Java class org.example.quote.impl.QuoteFactoryImpl

-     [java] >>  Generating /TargetProject/org/example/quote/impl/QuoteFactoryImpl.java

-     [java] >>  Examining old /TargetProject/org/example/quote/impl/QuoteFactoryImpl.java

-     [java] >>  Generating Quote

-     [java] >>  Generating Java interface org.example.quote.Quote

-     [java] >>  Generating /TargetProject/org/example/quote/Quote.java

-     [java] >>  Examining old /TargetProject/org/example/quote/Quote.java

-     [java] >>  Generating Java class org.example.quote.impl.QuoteImpl

-     [java] >>  Generating /TargetProject/org/example/quote/impl/QuoteImpl.java

-     [java] >>  Examining old /TargetProject/org/example/quote/impl/QuoteImpl.java

-     [java] >>  Generating Response

-     [java] >>  Generating Java interface org.example.quote.QuoteResponse

-     [java] >>  Generating /TargetProject/org/example/quote/QuoteResponse.java

-     [java] >>  Examining old /TargetProject/org/example/quote/QuoteResponse.java

-     [java] >>  Generating Java class org.example.quote.impl.QuoteResponseImpl

-     [java] >>  Generating /TargetProject/org/example/quote/impl/QuoteResponseImpl.java

-     [java] >>  Examining old /TargetProject/org/example/quote/impl/QuoteResponseImpl.java

-     [java] >>  Generating code

-     [java] >>  Generating packages

-     [java] >>  Generating package AvailPackageImpl

-     [java] >>  Generating Java interface org.example.avail.AvailFactory

-     [java] >>  Generating /TargetProject/org/example/avail/AvailFactory.java

-     [java] >>  Examining old /TargetProject/org/example/avail/AvailFactory.java

-     [java] >>  Generating Java class org.example.avail.impl.AvailFactoryImpl

-     [java] >>  Generating /TargetProject/org/example/avail/impl/AvailFactoryImpl.java

-     [java] >>  Examining old /TargetProject/org/example/avail/impl/AvailFactoryImpl.java

-     [java] >>  Generating Quote

-     [java] >>  Generating Java interface org.example.avail.AvailQuote

-     [java] >>  Generating /TargetProject/org/example/avail/AvailQuote.java

-     [java] >>  Examining old /TargetProject/org/example/avail/AvailQuote.java

-     [java] >>  Generating Java class org.example.avail.impl.AvailQuoteImpl

-     [java] >>  Generating /TargetProject/org/example/avail/impl/AvailQuoteImpl.java

-     [java] >>  Examining old /TargetProject/org/example/avail/impl/AvailQuoteImpl.java

-     [java] >>  Generating Request

-     [java] >>  Generating Java interface org.example.avail.AvailRequest

-     [java] >>  Generating /TargetProject/org/example/avail/AvailRequest.java

-     [java] >>  Examining old /TargetProject/org/example/avail/AvailRequest.java

-     [java] >>  Generating Java class org.example.avail.impl.AvailRequestImpl

-     [java] >>  Generating /TargetProject/org/example/avail/impl/AvailRequestImpl.java

-     [java] >>  Examining old /TargetProject/org/example/avail/impl/AvailRequestImpl.java

-     [java] >>  Generating code

-     [java] >>  Generating packages

-     [java] >>  Generating package PricePackageImpl

-     [java] >>  Generating Java interface org.example.price.PriceFactory

-     [java] >>  Generating /TargetProject/org/example/price/PriceFactory.java

-     [java] >>  Examining old /TargetProject/org/example/price/PriceFactory.java

-     [java] >>  Generating Java class org.example.price.impl.PriceFactoryImpl

-     [java] >>  Generating /TargetProject/org/example/price/impl/PriceFactoryImpl.java

-     [java] >>  Examining old /TargetProject/org/example/price/impl/PriceFactoryImpl.java

-     [java] >>  Generating Quote

-     [java] >>  Generating Java interface org.example.price.PriceQuote

-     [java] >>  Generating /TargetProject/org/example/price/PriceQuote.java

-     [java] >>  Examining old /TargetProject/org/example/price/PriceQuote.java

-     [java] >>  Generating Java class org.example.price.impl.PriceQuoteImpl

-     [java] >>  Generating /TargetProject/org/example/price/impl/PriceQuoteImpl.java

-     [java] >>  Examining old /TargetProject/org/example/price/impl/PriceQuoteImpl.java

-     [java] >>  Generating Request

-     [java] >>  Generating Java interface org.example.price.PriceRequest

-     [java] >>  Generating /TargetProject/org/example/price/PriceRequest.java

-     [java] >>  Examining old /TargetProject/org/example/price/PriceRequest.java

-     [java] >>  Generating Java class org.example.price.impl.PriceRequestImpl

-     [java] >>  Generating /TargetProject/org/example/price/impl/PriceRequestImpl.java

-     [java] >>  Examining old /TargetProject/org/example/price/impl/PriceRequestImpl.java

-     [java] >>  Generating Requests

-     [java] >>  Generating Java interface org.example.price.PriceRequests

-     [java] >>  Generating /TargetProject/org/example/price/PriceRequests.java

-     [java] >>  Examining old /TargetProject/org/example/price/PriceRequests.java

-     [java] >>  Generating Java class org.example.price.impl.PriceRequestsImpl

-     [java] >>  Generating /TargetProject/org/example/price/impl/PriceRequestsImpl.java

-     [java] >>  Examining old /TargetProject/org/example/price/impl/PriceRequestsImpl.java

-     [java] >>  Generating Ship Address

-     [java] >>  Generating Java interface org.example.price.ShipAddress

-     [java] >>  Generating /TargetProject/org/example/price/ShipAddress.java

-     [java] >>  Examining old /TargetProject/org/example/price/ShipAddress.java

-     [java] >>  Generating Java class org.example.price.impl.ShipAddressImpl

-     [java] >>  Generating /TargetProject/org/example/price/impl/ShipAddressImpl.java

-     [java] >>  Examining old /TargetProject/org/example/price/impl/ShipAddressImpl.java

-

-compile:

-      [jar] Building jar: C:\Apache\tuscany-sca-1.0-incubating-SNAPSHOT\samples\quote-xquery\target\sample-quote-xquery.jar

-BUILD SUCCESSFUL

-

-

-The service side:

-

-run-server:

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.core.StandardEngine start

-     [java] INFO: Starting Servlet Engine: Apache Tomcat/6.0.10

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.startup.ContextConfig defaultWebConfig

-     [java] INFO: No default web.xml

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.startup.DigesterFactory register

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.startup.DigesterFactory register

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.startup.DigesterFactory register

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.startup.DigesterFactory register

-     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd

-     [java] Sep 18, 2007 1:14:16 PM org.apache.catalina.startup.DigesterFactory register

-     [java] WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xsd

-     [java] Sep 18, 2007 1:14:17 PM org.apache.coyote.http11.Http11Protocol init

-     [java] INFO: Initializing Coyote HTTP/1.1 on http-8085

-     [java] Sep 18, 2007 1:14:17 PM org.apache.coyote.http11.Http11Protocol start

-     [java] INFO: Starting Coyote HTTP/1.1 on http-8085

-     [java] Sep 18, 2007 1:14:17 PM org.apache.tuscany.sca.http.tomcat.TomcatServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8085/QuoteJoinService

-     [java] Sep 18, 2007 1:14:17 PM org.apache.tuscany.sca.http.tomcat.TomcatServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8085/AvailQuoteProviderService

-     [java] XQuery Quote server started (press enter to shutdown)

-     [java] Sep 18, 2007 1:16:54 PM org.apache.coyote.http11.Http11Protocol destroy

-     [java] INFO: Stopping Coyote HTTP/1.1 on http-8085

-

-BUILD SUCCESSFUL

-Total time: 2 minutes 51 seconds

-

-The client side:

-Buildfile: build.xml

-

-run:

-     [java] Input quote for the price list:

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <priceQuote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pri="http://www.example.org/price" xsi:type="pri:PriceQuote">

-     [java]   <customerName>Acme Inc</customerName>

-     [java]   <shipAddress street="12 Springs Rd" city="Morris Plains" state="nj" zip="07960"/>

-     [java]   <priceRequests>

-     [java]     <priceRequest>

-     [java]       <widgetId>12</widgetId>

-     [java]       <price>1.0</price>

-     [java]     </priceRequest>

-     [java]     <priceRequest>

-     [java]       <widgetId>134</widgetId>

-     [java]       <price>34.1</price>

-     [java]     </priceRequest>

-     [java]     <priceRequest>

-     [java]       <widgetId>211</widgetId>

-     [java]       <price>10.0</price>

-     [java]     </priceRequest>

-     [java]   </priceRequests>

-     [java] </priceQuote>

-     [java] 

-     [java] Input quote for the availability:

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <availQuote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ava="http://www.example.org/avail" xsi:type="ava:AvailQuote">

-     [java]   <availRequest>

-     [java]     <widgetId>12</widgetId>

-     [java]     <requestedQuantity>10</requestedQuantity>

-     [java]     <quantityAvail>true</quantityAvail>

-     [java]     <shipDate>2003-03-22</shipDate>

-     [java]   </availRequest>

-     [java]   <availRequest>

-     [java]     <widgetId>134</widgetId>

-     [java]     <requestedQuantity>345</requestedQuantity>

-     [java]     <quantityAvail>false</quantityAvail>

-     [java]     <shipDate>BackOrder</shipDate>

-     [java]   </availRequest>

-     [java]   <availRequest>

-     [java]     <widgetId>211</widgetId>

-     [java]     <requestedQuantity>100</requestedQuantity>

-     [java]     <quantityAvail>true</quantityAvail>

-     [java]     <shipDate>2003-04-21</shipDate>

-     [java]   </availRequest>

-     [java] </availQuote>

-     [java] 

-     [java] 

-     [java] Output quote from local join:

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <quote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:quo="http://www.example.org/quote" xsi:type="quo:Quote">

-     [java]   <name>Acme Inc</name>

-     [java]   <address>12 Springs Rd,Morris Plains,NJ,07960</address>

-     [java]   <quoteResponse>

-     [java]     <widgetId>12</widgetId>

-     [java]     <unitPrice>1.0</unitPrice>

-     [java]     <requestedQuantity>10</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-03-22</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>11.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>134</widgetId>

-     [java]     <unitPrice>34.1</unitPrice>

-     [java]     <requestedQuantity>345</requestedQuantity>

-     [java]     <fillOrder>false</fillOrder>

-     [java]     <shipDate>BackOrder</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>0.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>211</widgetId>

-     [java]     <unitPrice>10.0</unitPrice>

-     [java]     <requestedQuantity>100</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-04-21</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>1100.0</totalCost>

-     [java]   </quoteResponse>

-     [java] </quote>

-     [java] 

-     [java] 

-     [java] Output quote from local join (second invokation):

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <quote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:quo="http://www.example.org/quote" xsi:type="quo:Quote">

-     [java]   <name>Acme Inc</name>

-     [java]   <address>12 Springs Rd,Morris Plains,NJ,07960</address>

-     [java]   <quoteResponse>

-     [java]     <widgetId>12</widgetId>

-     [java]     <unitPrice>1.0</unitPrice>

-     [java]     <requestedQuantity>10</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-03-22</shipDate>

-     [java]     <taxRate>0.2</taxRate>

-     [java]     <totalCost>12.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>134</widgetId>

-     [java]     <unitPrice>34.1</unitPrice>

-     [java]     <requestedQuantity>345</requestedQuantity>

-     [java]     <fillOrder>false</fillOrder>

-     [java]     <shipDate>BackOrder</shipDate>

-     [java]     <taxRate>0.2</taxRate>

-     [java]     <totalCost>0.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>211</widgetId>

-     [java]     <unitPrice>10.0</unitPrice>

-     [java]     <requestedQuantity>100</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-04-21</shipDate>

-     [java]     <taxRate>0.2</taxRate>

-     [java]     <totalCost>1200.0</totalCost>

-     [java]   </quoteResponse>

-     [java] </quote>

-     [java] 

-     [java] 

-     [java] Output quote from web service join:

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <quote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:quo="http://www.example.org/quote" xsi:type="quo:Quote">

-     [java]   <name>Acme Inc</name>

-     [java]   <address>12 Springs Rd,Morris Plains,NJ,07960</address>

-     [java]   <quoteResponse>

-     [java]     <widgetId>12</widgetId>

-     [java]     <unitPrice>1.0</unitPrice>

-     [java]     <requestedQuantity>10</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-03-22</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>11.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>134</widgetId>

-     [java]     <unitPrice>34.1</unitPrice>

-     [java]     <requestedQuantity>345</requestedQuantity>

-     [java]     <fillOrder>false</fillOrder>

-     [java]     <shipDate>BackOrder</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>0.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>211</widgetId>

-     [java]     <unitPrice>10.0</unitPrice>

-     [java]     <requestedQuantity>100</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-04-21</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>1100.0</totalCost>

-     [java]   </quoteResponse>

-     [java] </quote>

-     [java] 

-     [java] 

-     [java] Output quote from properties join:

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <quote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:quo="http://www.example.org/quote" xsi:type="quo:Quote">

-     [java]   <name>Acme Inc</name>

-     [java]   <address>12 Springs Rd,Morris Plains,NJ,07960</address>

-     [java]   <quoteResponse>

-     [java]     <widgetId>12</widgetId>

-     [java]     <unitPrice>1.0</unitPrice>

-     [java]     <requestedQuantity>10</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-03-22</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>11.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>134</widgetId>

-     [java]     <unitPrice>34.1</unitPrice>

-     [java]     <requestedQuantity>345</requestedQuantity>

-     [java]     <fillOrder>false</fillOrder>

-     [java]     <shipDate>BackOrder</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>0.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>211</widgetId>

-     [java]     <unitPrice>10.0</unitPrice>

-     [java]     <requestedQuantity>100</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-04-21</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>1100.0</totalCost>

-     [java]   </quoteResponse>

-     [java] </quote>

-     [java] 

-     [java] 

-     [java] Output quote from external references join:

-     [java] <?xml version="1.0" encoding="ASCII"?>

-     [java] <quote xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:quo="http://www.example.org/quote" xsi:type="quo:Quote">

-     [java]   <name>Acme Inc</name>

-     [java]   <address>12 Springs Rd,Morris Plains,NJ,07960</address>

-     [java]   <quoteResponse>

-     [java]     <widgetId>12</widgetId>

-     [java]     <unitPrice>1.0</unitPrice>

-     [java]     <requestedQuantity>10</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-03-22</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>11.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>134</widgetId>

-     [java]     <unitPrice>34.1</unitPrice>

-     [java]     <requestedQuantity>345</requestedQuantity>

-     [java]     <fillOrder>false</fillOrder>

-     [java]     <shipDate>BackOrder</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>0.0</totalCost>

-     [java]   </quoteResponse>

-     [java]   <quoteResponse>

-     [java]     <widgetId>211</widgetId>

-     [java]     <unitPrice>10.0</unitPrice>

-     [java]     <requestedQuantity>100</requestedQuantity>

-     [java]     <fillOrder>true</fillOrder>

-     [java]     <shipDate>2003-04-21</shipDate>

-     [java]     <taxRate>0.1</taxRate>

-     [java]     <totalCost>1100.0</totalCost>

-     [java]   </quoteResponse>

-     [java] </quote>

-     [java] 

-

-BUILD SUCCESSFUL

-Total time: 16 seconds

-

-

-

-Sample Overview

----------------

-

- 1. There is a central component for invoking the different

-    scenarios: QuoteJoinLocalComponent

- 2. It provides the following cases:

-    - invoke XQuery component in the current assembly, by providing all needed

-      information as input parameters

-    - invoke XQuery component in external assembly, which is exposed as a web 

-      service

-    - invoke XQuery component in the current assembly, which retrieves the needed

-      information from the component properties

-    - invoke XQuery component in the current assembly, which retrieves the needed

-      information from its references to other components:

-         - one of the components is in the current assembly

-         - the other component is in anther assembly and it is exposed (and accessed)

-           as web service

-    

-  3. All of the XQuery components have reference to a component for calculation of the

-    total price 

-  4. SDO is used for data interchange

-

-src/main/resources

-    wsdl

-        AvailQuote.xsd 

-        PriceQuote.xsd

-        Quote.xsd

-        quotejoin.wsdl

-    META-INF

-        sca

-            quote_join_external_references.xq --- the external references xquery script

-            quote_join_properties.xq --- the property-based join xquery script

-            quote_join.xq --- the join xquery script

-    xqueryquotews.composite --- composite file for the client side

-    xqueryquotewsclient.composite --- composite file for the service side

-    

-    build.xml                            - the Ant build file

-    pom.xml                              - the Maven build file   

-

-

-Building And Running The Sample Using Ant

------------------------------------------

-cd quote-xquery

-ant compile 

-ant run-server

-

-you should see: 

-Buildfile: build.xml

-

-run:

- 

-

-

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd quote-xquery

-mvn

-

-

-This shows that the Junit test cases have run successfully. 

diff --git a/java/sca-contrib/samples/quote-xquery/build.xml b/java/sca-contrib/samples/quote-xquery/build.xml
deleted file mode 100644
index a3a5acf102..0000000000
--- a/java/sca-contrib/samples/quote-xquery/build.xml
+++ /dev/null
@@ -1,120 +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.    

--->

-<project name="sample-quote-xquery" default="compile">

-    <property name="test.class" value="xquery.quote.XQueryQuoteClient" />

-    <property name="test.server.class" value="xquery.quote.XQueryQuoteServer" />

-    <property name="test.jar" value="sample-quote-xquery.jar" />

-

-    <target name="init">

-        <mkdir dir="target/classes" />

-    </target>

-

-    <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar" />

-

-    <path id="project.classpath">

-        <pathelement path="target/classes" />

-        <pathelement path="target/sdo-source" />

-        <pathelement location="${tuscany.sca.manifest.location}" />

-    </path>

-

-    <target name="generate-sdo" depends="init">

-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">

-            <arg value="-targetDirectory" />

-            <arg value="target/sdo-source" />

-            <arg value="-noNotification" />

-            <!-- Make sure the -noUnsettable is not used, otherwise, the SDO cannot be

-            properly transformed to Node as some properties are treated as unset -->

-            <arg value="src/main/resources/wsdl/Quote.xsd" />

-

-            <classpath refid="project.classpath" />

-        </java>

-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">

-            <arg value="-targetDirectory" />

-            <arg value="target/sdo-source" />

-            <arg value="-noNotification" />

-            <!-- Make sure the -noUnsettable is not used, otherwise, the SDO cannot be

-            properly transformed to Node as some properties are treated as unset -->

-            <arg value="src/main/resources/wsdl/AvailQuote.xsd" />

-

-            <classpath refid="project.classpath" />

-        </java>

-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">

-            <arg value="-targetDirectory" />

-            <arg value="target/sdo-source" />

-            <arg value="-noNotification" />

-            <!-- Make sure the -noUnsettable is not used, otherwise, the SDO cannot be

-            properly transformed to Node as some properties are treated as unset -->

-            <arg value="src/main/resources/wsdl/PriceQuote.xsd" />

-

-            <classpath refid="project.classpath" />

-        </java>

-

-    </target>

-

-

-    <target name="compile" depends="init, generate-sdo">

-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

-            <src path="target/sdo-source"/>

-            <src path="src/main/java"/>

-            <classpath refid="project.classpath" />

-        </javac>

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources" />

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" />

-            </manifest>

-        </jar>

-

-    </target>

-

-    <target name="run-classes">

-        <java classname="${test.class}" fork="true">

-            <classpath>

-                <pathelement path="target/classes" />

-            </classpath>

-            <classpath refid="project.classpath" />

-        </java>

-    </target>

-

-    <target name="run">

-        <java classname="${test.class}" fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}" />

-            </classpath>

-            <classpath refid="project.classpath" />

-        </java>

-    </target>

-

-    <target name="run-server">

-        <java classname="${test.server.class}" fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}" />

-            </classpath>

-            <classpath refid="project.classpath" />

-        </java>

-    </target>

-

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target" />

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/quote-xquery/pom.xml b/java/sca-contrib/samples/quote-xquery/pom.xml
deleted file mode 100644
index 2fa134132c..0000000000
--- a/java/sca-contrib/samples/quote-xquery/pom.xml
+++ /dev/null
@@ -1,184 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-quote-xquery</artifactId>
-    <name>Apache Tuscany SCA XQuery Quote Implementation Sample</name>
-
-    <repositories>
-        <repository>
-            <id>apache.incubator</id>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-lib</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <!--dependency>
-            <groupId>net.sf.saxon</groupId>
-            <artifactId>saxon</artifactId>
-            <version>9.0.0.2</version>
-        </dependency-->
-
-        <dependency>
-            <groupId>net.sf.saxon</groupId>
-            <artifactId>saxon</artifactId>
-            <version>8.7</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-quotejoin-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/quotejoin.wsdl</schemaFile>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>generate-quote-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/Quote.xsd</schemaFile>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>generate-avail-quote-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/AvailQuote.xsd</schemaFile>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>generate-price-quote-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/PriceQuote.xsd</schemaFile>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
deleted file mode 100644
index 81396b056a..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
+++ /dev/null
@@ -1,30 +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 xquery.quote;
-
-import org.example.avail.AvailQuote;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AvailQuoteProviderService.class)
-public class AvailQuoteProviderImpl implements AvailQuoteProviderService {
-
-    public AvailQuote provideAvailQuote(String dummyString) {
-        return QuoteDataUtil.buildAvailQuoteData();
-    }
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
deleted file mode 100644
index fb097c46f8..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
+++ /dev/null
@@ -1,28 +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 xquery.quote;
-
-import net.sf.saxon.om.NodeInfo;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface AvailQuoteProviderNodeInfo {
-    NodeInfo provideAvailQuote(String dummyString);
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
deleted file mode 100644
index c54febcd14..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
+++ /dev/null
@@ -1,27 +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 xquery.quote;
-
-import org.example.avail.AvailQuote;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface AvailQuoteProviderService {
-    AvailQuote provideAvailQuote(String dummyString);
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
deleted file mode 100644
index ebe0cd51ae..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
+++ /dev/null
@@ -1,27 +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 xquery.quote;
-
-import org.example.quote.Quote;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface ExternalReferencesQuoteJoin {
-    public Quote joinPriceAndAvailQuotes(float taxRate);
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
deleted file mode 100644
index 92341ea26f..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
+++ /dev/null
@@ -1,28 +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 xquery.quote;
-
-import org.example.price.PriceQuote;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface PriceQuoteProvider {
-
-    public PriceQuote providePriceQuote();
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
deleted file mode 100644
index d2d175430b..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
+++ /dev/null
@@ -1,27 +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 xquery.quote;
-
-import org.example.price.PriceQuote;
-
-public class PriceQuoteProviderImpl implements PriceQuoteProvider {
-    public PriceQuote providePriceQuote() {
-        return QuoteDataUtil.buildPriceQuoteData();
-    }
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
deleted file mode 100644
index 5669738c98..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
+++ /dev/null
@@ -1,28 +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 xquery.quote;
-
-import net.sf.saxon.om.NodeInfo;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface PriceQuoteProviderNodeInfo {
-    public NodeInfo providePriceQuote();
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
deleted file mode 100644
index 1a71abab81..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.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 xquery.quote;
-
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-import org.example.quote.Quote;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface PropertiesQuoteJoin {
-    @RequestWrapper(className="xquery.quote.joinPriceAndAvailQuotes")
-    @ResponseWrapper(className="xquery.quote.joinPriceAndAvailQuotesResponse")
-    public Quote joinPriceAndAvailQuotes();
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
deleted file mode 100644
index 5aea04bfb1..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
+++ /dev/null
@@ -1,26 +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 xquery.quote;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface QuoteCalculator {
-    public float calculateTotalPrice(float taxRate, int quantity, float price, boolean fillOrder);
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
deleted file mode 100644
index 26331381a8..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
+++ /dev/null
@@ -1,38 +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 xquery.quote;
-
-public class QuoteCalculatorImpl implements QuoteCalculator {
-
-    public float calculateTotalPrice(float taxRate, int quantity, float price, boolean fillOrder) {
-        float totalTax, costNoTax, totalCost;
-        if (fillOrder) {
-            // Calculate the total tax
-            totalTax = taxRate * quantity * price;
-            // Calculate the total cost without tax
-            costNoTax = quantity * price;
-            // Add the tax and the cost to get the total cost
-            totalCost = totalTax + costNoTax;
-        } else {
-            totalCost = 0;
-        }
-        return totalCost;
-    }
-
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
deleted file mode 100644
index 8ed02dc1ef..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
+++ /dev/null
@@ -1,107 +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 xquery.quote;

-

-import java.io.IOException;

-import java.math.BigInteger;

-

-

-import org.example.avail.AvailFactory;

-import org.example.avail.AvailQuote;

-import org.example.avail.AvailRequest;

-import org.example.price.PriceFactory;

-import org.example.price.PriceQuote;

-import org.example.price.PriceRequest;

-import org.example.price.PriceRequests;

-import org.example.price.ShipAddress;

-

-import commonj.sdo.DataObject;

-import commonj.sdo.helper.XMLHelper;

-

-public class QuoteDataUtil {

-

-    public static AvailQuote buildAvailQuoteData() {

-        AvailQuote availQuote = AvailFactory.INSTANCE.createAvailQuote();

-        AvailRequest availRequest = AvailFactory.INSTANCE.createAvailRequest();

-        availRequest.setWidgetId(BigInteger.valueOf(12));

-        availRequest.setRequestedQuantity(10);

-        availRequest.setQuantityAvail(true);

-        availRequest.setShipDate("2003-03-22");

-        availQuote.getAvailRequest().add(availRequest);

-

-        availRequest = AvailFactory.INSTANCE.createAvailRequest();

-        availRequest.setWidgetId(BigInteger.valueOf(134));

-        availRequest.setRequestedQuantity(345);

-        availRequest.setQuantityAvail(false);

-        availRequest.setShipDate("BackOrder");

-        availQuote.getAvailRequest().add(availRequest);

-

-        availRequest = AvailFactory.INSTANCE.createAvailRequest();

-        availRequest.setWidgetId(BigInteger.valueOf(211));

-        availRequest.setRequestedQuantity(100);

-        availRequest.setQuantityAvail(true);

-        availRequest.setShipDate("2003-04-21");

-        availQuote.getAvailRequest().add(availRequest);

-

-        return availQuote;

-    }

-

-    public static PriceQuote buildPriceQuoteData() {

-        PriceQuote priceQuote = PriceFactory.INSTANCE.createPriceQuote();

-        priceQuote.setCustomerName("Acme Inc");

-

-        ShipAddress shipAddress = PriceFactory.INSTANCE.createShipAddress();

-        shipAddress.setStreet("12 Springs Rd");

-        shipAddress.setCity("Morris Plains");

-        shipAddress.setState("nj");

-        shipAddress.setZip("07960");

-        priceQuote.setShipAddress(shipAddress);

-

-        PriceRequests priceRequests = PriceFactory.INSTANCE.createPriceRequests();

-        PriceRequest priceRequest = PriceFactory.INSTANCE.createPriceRequest();

-        priceRequest.setWidgetId(BigInteger.valueOf(12));

-        priceRequest.setPrice(1.00f);

-        priceRequests.getPriceRequest().add(priceRequest);

-

-        priceRequest = PriceFactory.INSTANCE.createPriceRequest();

-        priceRequest.setWidgetId(BigInteger.valueOf(134));

-        priceRequest.setPrice(34.10f);

-        priceRequests.getPriceRequest().add(priceRequest);

-

-        priceRequest = PriceFactory.INSTANCE.createPriceRequest();

-        priceRequest.setWidgetId(BigInteger.valueOf(211));

-        priceRequest.setPrice(10.00f);

-        priceRequests.getPriceRequest().add(priceRequest);

-

-        priceQuote.setPriceRequests(priceRequests);

-

-        return priceQuote;

-    }

-

-    public static void serializeToSystemOut(DataObject object, String name) {

-        XMLHelper helper = XMLHelper.INSTANCE;

-

-        try {

-            helper.save(object, null, name, System.out);

-            System.out.println();

-        } catch (IOException e) {

-            e.printStackTrace();

-        }

-    }

-}

diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
deleted file mode 100644
index 103d19e59d..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
+++ /dev/null
@@ -1,34 +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 xquery.quote;
-
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-import org.example.avail.AvailQuote;
-import org.example.price.PriceQuote;
-import org.example.quote.Quote;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface QuoteJoin {
-    @RequestWrapper(className="xquery.quote.joinPriceAndAvailQuotes")
-    @ResponseWrapper(className="xquery.quote.joinPriceAndAvailQuotesResponse")
-    public Quote joinPriceAndAvailQuotes(PriceQuote priceQuote, AvailQuote availQuote, float taxRate);
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
deleted file mode 100644
index cfd201f883..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
+++ /dev/null
@@ -1,34 +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 xquery.quote;
-
-import org.example.avail.AvailQuote;
-import org.example.price.PriceQuote;
-import org.example.quote.Quote;
-
-public interface QuoteJoinLocal {
-    public Quote joinPriceAndAvailQuotes(PriceQuote priceQuote, AvailQuote availQuote, float taxRate);
-
-    public Quote joinPriceAndAvailQuotesWs(PriceQuote priceQuote, AvailQuote availQuote, float taxRate);
-
-    public Quote joinPriceAndAvailQuotes();
-
-    public Quote joinPriceAndAvailQuotes(float taxRate);
-
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
deleted file mode 100644
index 26bcfe9707..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
+++ /dev/null
@@ -1,67 +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 xquery.quote;
-
-import org.example.avail.AvailQuote;
-import org.example.price.PriceQuote;
-import org.example.quote.Quote;
-import org.oasisopen.sca.annotation.Reference;
-
-public class QuoteJoinLocalImpl implements QuoteJoinLocal {
-    private QuoteJoin quoteJoin;
-    private QuoteJoin quoteJoinWs;
-    private PropertiesQuoteJoin propertiesQuoteJoin;
-    private ExternalReferencesQuoteJoin externalServicesQuoteJoin;
-
-    @Reference
-    public void setQuoteJoin(QuoteJoin quoteJoin) {
-        this.quoteJoin = quoteJoin;
-    }
-
-    @Reference
-    public void setQuoteJoinWs(QuoteJoin quoteJoinWs) {
-        this.quoteJoinWs = quoteJoinWs;
-    }
-
-    @Reference
-    public void setPropertiesQuoteJoin(PropertiesQuoteJoin propertiesQuoteJoin) {
-        this.propertiesQuoteJoin = propertiesQuoteJoin;
-    }
-
-    @Reference
-    public void setExternalServicesQuoteJoin(ExternalReferencesQuoteJoin externalServicesQuoteJoin) {
-        this.externalServicesQuoteJoin = externalServicesQuoteJoin;
-    }
-
-    public Quote joinPriceAndAvailQuotes(PriceQuote priceQuote, AvailQuote availQuote, float taxRate) {
-        return quoteJoin.joinPriceAndAvailQuotes(priceQuote, availQuote, taxRate);
-    }
-
-    public Quote joinPriceAndAvailQuotesWs(PriceQuote priceQuote, AvailQuote availQuote, float taxRate) {
-        return quoteJoinWs.joinPriceAndAvailQuotes(priceQuote, availQuote, taxRate);
-    }
-
-    public Quote joinPriceAndAvailQuotes(float taxRate) {
-        return externalServicesQuoteJoin.joinPriceAndAvailQuotes(taxRate);
-    }
-
-    public Quote joinPriceAndAvailQuotes() {
-        return propertiesQuoteJoin.joinPriceAndAvailQuotes();
-    }
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
deleted file mode 100644
index adc852acd4..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
+++ /dev/null
@@ -1,145 +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 xquery.quote;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.example.avail.AvailQuote;

-import org.example.price.PriceQuote;

-import org.example.quote.Quote;

-

-import commonj.sdo.DataObject;

-

-/**

- * Integration test for the XQuery implementation type

- * @version $Rev: 577067 $ $Date: 2007-09-18 22:10:03 +0100 (Tue, 18 Sep 2007) $

- * This test covers the most important integration scenarios for the xquery

- * implementation type and its corresponding saxon data bindings:

- * 

- * 1. There is a central component for invoking the different

- *    scenarios: QuoteJoinLocalComponent

- * 2. It provides the following tests:

- *    - invoke XQuery component in the current assembly, by providing all needed

- *      information as input parameters

- *    - invoke XQuery component in external assembly, which is exposed as a web 

- *      service

- *    - invoke XQuery component in the current assembly, which retrieves the needed

- *      information from the component properties

- *    - invoke XQuery component in the current assembly, which retrieves the needed

- *      information from its references to other components:

- *         - one of the components is in the current assembly

- *         - the other component is in anther assembly and it is exposed (and accessed)

- *           as web service

- *    

- *  3. All of the XQuery components have reference to a component for calculation of the

- *    total price 

- *  4. SDO is used for data interchange

- */

-public class XQueryQuoteClient {

-

-    public static boolean SHOW_DEBUG_MSG = false;

-

-    private SCADomain scaDomain;

-

-    private QuoteJoinLocal quoteJoinLocal;

-

-    public void startClient() throws Exception {

-        try {

-            scaDomain = SCADomain.newInstance("xqueryquotewsclient.composite");

-            quoteJoinLocal = scaDomain.getService(QuoteJoinLocal.class, "QuoteJoinLocalComponent");

-        } catch (Throwable t) {

-            t.printStackTrace();

-        }

-    }

-

-    public void testQuoteJoin() {

-        AvailQuote availQuote = QuoteDataUtil.buildAvailQuoteData();

-        PriceQuote priceQuote = QuoteDataUtil.buildPriceQuoteData();

-

-        if (SHOW_DEBUG_MSG) {

-            System.out.println("Input quote for the price list:");

-            QuoteDataUtil.serializeToSystemOut((DataObject)priceQuote, "priceQuote");

-            System.out.println();

-            System.out.println("Input quote for the availability:");

-            QuoteDataUtil.serializeToSystemOut((DataObject)availQuote, "availQuote");

-            System.out.println();

-        }

-

-        Quote quote = quoteJoinLocal.joinPriceAndAvailQuotes(priceQuote, availQuote, 0.1f);

-        if (SHOW_DEBUG_MSG) {

-            System.out.println();

-            System.out.println("Output quote from local join:");

-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");

-            System.out.println();

-        }

-        //        TestHelper.assertQuote(availQuote, priceQuote, quote, 0.1f);

-

-        quote = quoteJoinLocal.joinPriceAndAvailQuotes(priceQuote, availQuote, 0.2f);

-        if (SHOW_DEBUG_MSG) {

-            System.out.println();

-            System.out.println("Output quote from local join (second invokation):");

-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");

-            System.out.println();

-        }

-        //        TestHelper.assertQuote(availQuote, priceQuote, quote, 0.2f);

-

-        quote = quoteJoinLocal.joinPriceAndAvailQuotesWs(priceQuote, availQuote, 0.1f);

-        if (SHOW_DEBUG_MSG) {

-            System.out.println();

-            System.out.println("Output quote from web service join:");

-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");

-            System.out.println();

-        }

-        //        TestHelper.assertQuote(availQuote, priceQuote, quote, 0.1f);

-

-        quote = quoteJoinLocal.joinPriceAndAvailQuotes();

-        if (SHOW_DEBUG_MSG) {

-            System.out.println();

-            System.out.println("Output quote from properties join:");

-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");

-            System.out.println();

-        }

-        // TestHelper.assertQuote(availQuote, priceQuote, quote, 0.1f);

-

-        quote = quoteJoinLocal.joinPriceAndAvailQuotes(0.1f);

-        if (SHOW_DEBUG_MSG) {

-            System.out.println();

-            System.out.println("Output quote from external references join:");

-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");

-            System.out.println();

-        }

-        // TestHelper.assertQuote(availQuote, priceQuote, quote, 0.1f);

-    }

-

-    public void stopClient() throws Exception {

-        if (scaDomain != null) {

-            scaDomain.close();

-        }

-    }

-

-    public static void main(String[] args) throws Exception {

-        SHOW_DEBUG_MSG = true;

-        XQueryQuoteClient client = new XQueryQuoteClient();

-        client.startClient();

-        try {

-            client.testQuoteJoin();

-        } finally {

-            client.stopClient();

-        }

-    }

-}

diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java b/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
deleted file mode 100644
index 3fa3cdb637..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
+++ /dev/null
@@ -1,39 +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 xquery.quote;

-

-import java.io.IOException;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-public class XQueryQuoteServer {

-

-    public static void main(String[] args) {

-        SCADomain scaDomain = SCADomain.newInstance("xqueryquotews.composite");

-        try {

-            System.out.println("XQuery Quote server is started (press enter to shutdown).");

-            System.in.read();

-            System.out.println("XQuery Quote server is stopping...");

-        } catch (IOException e) {

-            e.printStackTrace();

-        }

-        scaDomain.close();

-        System.out.println("XQuery Quote server is now stopped.");

-    }

-}

diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq b/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
deleted file mode 100644
index d504f40f04..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
+++ /dev/null
@@ -1,61 +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.    

-:)

-

-declare namespace quoteJoin="scaservice:java/xquery.quote.QuoteJoin";

-

-declare namespace quoteCalculator="scareference:java/xquery.quote.QuoteCalculator";

-

-declare namespace quo="http://www.example.org/quote";

-

-declare variable $quoteCalculator external;

-

-declare function quoteJoin:joinPriceAndAvailQuotes($priceQuoteDoc, $availQuoteDoc, $taxRate) {

-<quo:quote>

-    <quo:name>{ data($priceQuoteDoc/*/customerName) }</quo:name>

-    <quo:address>{ concat($priceQuoteDoc/*/shipAddress/@street , ",", $priceQuoteDoc/*/shipAddress/@city ,",", fn:upper-case($priceQuoteDoc/*/shipAddress/@state) , ",", $priceQuoteDoc/*/shipAddress/@zip) }</quo:address>

-    {

-        for $priceRequest in $priceQuoteDoc/*/priceRequests/priceRequest,

-            $availRequest in $availQuoteDoc/*/availRequest

-        where data($priceRequest/widgetId) = data($availRequest/widgetId)

-        return

-            <quo:quoteResponse>

-                <quo:widgetId>{ data($priceRequest/widgetId) }</quo:widgetId>

-                <quo:unitPrice>{ data($priceRequest/price) }</quo:unitPrice>

-                <quo:requestedQuantity>{ data($availRequest/requestedQuantity) }</quo:requestedQuantity>

-                <quo:fillOrder>{ data($availRequest/quantityAvail) }</quo:fillOrder>

-                {

-                    for $shipDate in $availRequest/shipDate

-                    return

-                        <quo:shipDate>{ data($shipDate) }</quo:shipDate>

-                }

-                <quo:taxRate>{ $taxRate }</quo:taxRate>

-                <quo:totalCost>{ quoteCalculator:calculateTotalPrice(

-                				  $quoteCalculator,

-                				  

-                				  xs:float($taxRate),

-

-                                  $availRequest/requestedQuantity,

-

-                                  $priceRequest/price,

-

-                                  $availRequest/quantityAvail) }</quo:totalCost>

-            </quo:quoteResponse>

-    }

-    </quo:quote>

-};

diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq b/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
deleted file mode 100644
index cc50da164a..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
+++ /dev/null
@@ -1,69 +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.    
-:)
-declare namespace quoteJoin="scaservice:java/xquery.quote.ExternalReferencesQuoteJoin";
-
-declare namespace quoteCalculator="scareference:java/xquery.quote.QuoteCalculator";
-
-declare namespace priceQuoteProvider="scareference:java/xquery.quote.PriceQuoteProviderNodeInfo";
-declare namespace availQuoteProvider="scareference:java/xquery.quote.AvailQuoteProviderNodeInfo";
-
-declare namespace quo="http://www.example.org/quote";
-
-declare variable $quoteCalculator external;
-
-declare variable $priceQuoteProvider external;
-declare variable $availQuoteProvider external;
-
-declare function quoteJoin:joinPriceAndAvailQuotes($taxRate) {
-let $priceQuoteDoc := priceQuoteProvider:providePriceQuote($priceQuoteProvider)
-let $availQuoteDoc := availQuoteProvider:provideAvailQuote($availQuoteProvider, 'dummy')
-return
-<quo:quote>
-    <quo:name>{ data($priceQuoteDoc/priceQuote/customerName) }</quo:name>
-    <quo:address>{ concat($priceQuoteDoc/priceQuote/shipAddress/@street , ",", $priceQuoteDoc/priceQuote/shipAddress/@city ,",", fn:upper-case($priceQuoteDoc/priceQuote/shipAddress/@state) , ",", $priceQuoteDoc/priceQuote/shipAddress/@zip) }</quo:address>
-    {
-        for $priceRequest in $priceQuoteDoc/priceQuote/priceRequests/priceRequest,
-            $availRequest in $availQuoteDoc/availQuote/availRequest
-        where data($priceRequest/widgetId) = data($availRequest/widgetId)
-        return
-            <quo:quoteResponse>
-                <quo:widgetId>{ data($priceRequest/widgetId) }</quo:widgetId>
-                <quo:unitPrice>{ data($priceRequest/price) }</quo:unitPrice>
-                <quo:requestedQuantity>{ data($availRequest/requestedQuantity) }</quo:requestedQuantity>
-                <quo:fillOrder>{ data($availRequest/quantityAvail) }</quo:fillOrder>
-                {
-                    for $shipDate in $availRequest/shipDate
-                    return
-                        <quo:shipDate>{ data($shipDate) }</quo:shipDate>
-                }
-                <quo:taxRate>{ $taxRate }</quo:taxRate>
-                <quo:totalCost>{ quoteCalculator:calculateTotalPrice(
-                				  $quoteCalculator,
-                				  
-                				  $taxRate,
-
-                                  $availRequest/requestedQuantity,
-
-                                  $priceRequest/price,
-
-                                  $availRequest/quantityAvail) }</quo:totalCost>
-            </quo:quoteResponse>
-    }
-    </quo:quote>
-};
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq b/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
deleted file mode 100644
index cf41ab528d..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
+++ /dev/null
@@ -1,74 +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.    
-:)
-
-declare namespace quoteJoin="scaservice:java/xquery.quote.PropertiesQuoteJoin";
-
-declare namespace quoteCalculator="scareference:java/xquery.quote.QuoteCalculator";
-
-declare namespace priceQuoteDoc="scaproperty:xml/http://www.example.org/price:priceQuote";
-declare namespace availQuoteDoc="scaproperty:xml/http://www.example.org/avail:availQuote";
-declare namespace taxRate="scaproperty:java/java.lang.Float";
-
-declare namespace pri="http://www.example.org/price";
-declare namespace ava="http://www.example.org/avail";
-declare namespace quo="http://www.example.org/quote";
-
-declare variable $quoteCalculator external;
-
-declare variable $priceQuoteDoc external;
-declare variable $availQuoteDoc external;
-declare variable $taxRate external;
-
-declare function quoteJoin:joinPriceAndAvailQuotes() {
-<quo:quote>
-    <quo:name>{ data($priceQuoteDoc/pri:priceQuote/customerName) }</quo:name>
-    <quo:address>{ concat($priceQuoteDoc/pri:priceQuote/shipAddress/@street , ",", 
-    $priceQuoteDoc/pri:priceQuote/shipAddress/@city ,",", 
-    fn:upper-case($priceQuoteDoc/pri:priceQuote/shipAddress/@state) , ",", 
-    $priceQuoteDoc/pri:priceQuote/shipAddress/@zip) }</quo:address>
-    {
-        for $priceRequest in $priceQuoteDoc/pri:priceQuote/priceRequests/priceRequest,
-            $availRequest in $availQuoteDoc/ava:availQuote/availRequest
-        where data($priceRequest/widgetId) = data($availRequest/widgetId)
-        return
-            <quo:quoteResponse>
-                <quo:widgetId>{ data($priceRequest/widgetId) }</quo:widgetId>
-                <quo:unitPrice>{ data($priceRequest/price) }</quo:unitPrice>
-                <quo:requestedQuantity>{ data($availRequest/requestedQuantity) }</quo:requestedQuantity>
-                <quo:fillOrder>{ data($availRequest/quantityAvail) }</quo:fillOrder>
-                {
-                    for $shipDate in $availRequest/shipDate
-                    return
-                        <quo:shipDate>{ data($shipDate) }</quo:shipDate>
-                }
-                <quo:taxRate>{ $taxRate }</quo:taxRate>
-                <quo:totalCost>{ quoteCalculator:calculateTotalPrice(
-                				  $quoteCalculator,
-                				  
-                				  $taxRate,
-
-                                  $availRequest/requestedQuantity,
-
-                                  $priceRequest/price,
-
-                                  $availRequest/quantityAvail) }</quo:totalCost>
-            </quo:quoteResponse>
-    }
-    </quo:quote>
-};
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd b/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
deleted file mode 100644
index e7f3e67068..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.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.    

--->

-<xsd:schema targetNamespace="http://www.example.org/avail" xmlns:ava="http://www.example.org/avail" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
-	<xsd:element name="availQuote" type="ava:AvailQuote"/>

-	<xsd:complexType name="AvailRequest">

-		<xsd:sequence>

-			<xsd:element name="widgetId" type="xsd:integer"/>

-			<xsd:element name="requestedQuantity" type="xsd:int"/>

-			<xsd:element name="quantityAvail" type="xsd:boolean"/>

-			<xsd:element name="shipDate" type="xsd:string" minOccurs="0" maxOccurs="1"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="AvailQuote">

-		<xsd:sequence>

-			<xsd:element name="availRequest" type="ava:AvailRequest" minOccurs="1" maxOccurs="10">

-			</xsd:element>

-		</xsd:sequence>

-	</xsd:complexType>

-</xsd:schema>

-

-

-

diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd b/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
deleted file mode 100644
index 4c437586ef..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.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.    
--->
-<xsd:schema targetNamespace="http://www.example.org/price" xmlns:pri="http://www.example.org/price" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
-	<xsd:element name="priceQuote" type="pri:PriceQuote"/>
-	<xsd:complexType name="PriceRequest">
-		<xsd:sequence>
-			<xsd:element name="widgetId" type="xsd:integer"/>
-			<xsd:element name="price" type="xsd:float"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="PriceRequests">
-		<xsd:sequence>
-			<xsd:element name="priceRequest" type="pri:PriceRequest" minOccurs="1" maxOccurs="10"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="ShipAddress">
-        <xsd:attribute name="street" type="xsd:string"/>
-        <xsd:attribute name="city" type="xsd:string"/>
-        <xsd:attribute name="state" type="xsd:string"/>
-        <xsd:attribute name="zip" type="xsd:string"/>
-	</xsd:complexType>		
-	<xsd:complexType name="PriceQuote">
-		<xsd:sequence>
-			<xsd:element name="customerName" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-			<xsd:element name="shipAddress" type="pri:ShipAddress" minOccurs="1" maxOccurs="1"/>
-			<xsd:element name="priceRequests" type="pri:PriceRequests"/>
-		</xsd:sequence>
-	</xsd:complexType>
-</xsd:schema>
-
-
-
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd b/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
deleted file mode 100644
index 4f64850056..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.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.    

--->

-<xsd:schema targetNamespace="http://www.example.org/quote" xmlns:quo="http://www.example.org/quote" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="unqualified">

-	<xsd:element name="quote" type="quo:Quote"/>

-	<xsd:complexType name="Quote">

-		<xsd:sequence>

-			<xsd:element name="name" type="xsd:string"/>

-			<xsd:element name="address" type="xsd:string"/>

-			<xsd:element name="quoteResponse" type="quo:QuoteResponse" minOccurs="1" maxOccurs="10"/>

-		</xsd:sequence>

-	</xsd:complexType>
-	<xsd:complexType name="QuoteResponse">
-		<xsd:sequence>
-			<xsd:element name="widgetId" type="xsd:integer"/>
-			<xsd:element name="unitPrice" type="xsd:float" minOccurs="0" maxOccurs="1"/>
-			<xsd:element name="requestedQuantity" type="xsd:int"/>
-			<xsd:element name="fillOrder" type="xsd:boolean"/>
-			<xsd:element name="shipDate" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-			<xsd:element name="taxRate" type="xsd:float" minOccurs="0" maxOccurs="1"/>
-			<xsd:element name="totalCost" type="xsd:float" minOccurs="0" maxOccurs="1"/>
-		</xsd:sequence>
-	</xsd:complexType>

-</xsd:schema>

diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl b/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
deleted file mode 100644
index 96c2af138a..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
+++ /dev/null
@@ -1,137 +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://quote.xquery" xmlns:tns="http://quote.xquery"

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ava="http://www.example.org/avail"

-    xmlns:pri="http://www.example.org/price" xmlns:quo="http://www.example.org/quote" name="quotejoin">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://quote.xquery"

-            xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ava="http://www.example.org/avail"

-            xmlns:pri="http://www.example.org/price" xmlns:quo="http://www.example.org/quote">

-

-            <import namespace="http://www.example.org/avail" schemaLocation="AvailQuote.xsd" />

-            <import namespace="http://www.example.org/price" schemaLocation="PriceQuote.xsd" />

-            <import namespace="http://www.example.org/quote" schemaLocation="Quote.xsd" />

-

-            <element name="joinPriceAndAvailQuotes">

-                <complexType>

-                    <sequence>

-                        <element name="priceQuote" type="pri:PriceQuote" />

-                        <element name="availQuote" type="ava:AvailQuote" />

-                        <element name="taxRate" type="xsd:float" />

-                    </sequence>

-                </complexType>

-            </element>

-

-            <element name="joinPriceAndAvailQuotesResponse">

-                <complexType>

-                    <sequence>

-                        <element name="joinPriceAndAvailQuotesReturn" type="quo:Quote" />

-                    </sequence>

-                </complexType>

-            </element>

-            <element name="provideAvailQuote">

-                <complexType>

-                    <sequence>

-                        <element name="provideAvailQuote" type="xsd:string" />

-                    </sequence>

-                </complexType>

-            </element>

-            <element name="provideAvailQuoteResponse">

-                <complexType>

-                    <sequence>

-                        <element name="provideAvailQuoteReturn" type="ava:AvailQuote" />

-                    </sequence>

-                </complexType>

-            </element>

-        </schema>

-    </wsdl:types>

-

-    <wsdl:message name="joinPriceAndAvailQuotesRequest">

-        <wsdl:part element="tns:joinPriceAndAvailQuotes" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="joinPriceAndAvailQuotesResponse">

-        <wsdl:part element="tns:joinPriceAndAvailQuotesResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:portType name="QuoteJoin">

-        <wsdl:operation name="joinPriceAndAvailQuotes">

-            <wsdl:input message="tns:joinPriceAndAvailQuotesRequest" name="joinPriceAndAvailQuotesRequest" />

-            <wsdl:output message="tns:joinPriceAndAvailQuotesResponse" name="joinPriceAndAvailQuotesResponse" />

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="QuoteJoinSoapBinding" type="tns:QuoteJoin">

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

-        <wsdl:operation name="joinPriceAndAvailQuotes">

-            <wsdlsoap:operation soapAction="" />

-            <wsdl:input name="joinPriceAndAvailQuotesRequest">

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

-            </wsdl:input>

-            <wsdl:output name="joinPriceAndAvailQuotesResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="QuoteJoinService">

-        <wsdl:port binding="tns:QuoteJoinSoapBinding" name="QuoteJoinSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/QuoteJoinService" />

-        </wsdl:port>

-    </wsdl:service>

-

-

-

-    <wsdl:message name="provideAvailQuoteRequest">

-        <wsdl:part element="tns:provideAvailQuote" name="parameters" />

-    </wsdl:message>

-    <wsdl:message name="provideAvailQuoteResponse">

-        <wsdl:part element="tns:provideAvailQuoteResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:portType name="AvailQuoteProvider">

-        <wsdl:operation name="provideAvailQuote">

-            <wsdl:input message="tns:provideAvailQuoteRequest" name="provideAvailQuoteRequest" />

-            <wsdl:output message="tns:provideAvailQuoteResponse" name="provideAvailQuoteResponse" />

-        </wsdl:operation>

-    </wsdl:portType>

-

-    <wsdl:binding name="AvailQuoteProviderSoapBinding" type="tns:AvailQuoteProvider">

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

-        <wsdl:operation name="provideAvailQuote">

-            <wsdlsoap:operation soapAction="" />

-            <wsdl:input name="provideAvailQuoteRequest">

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

-            </wsdl:input>

-            <wsdl:output name="provideAvailQuoteResponse">

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-

-    <wsdl:service name="AvailQuoteProviderService">

-        <wsdl:port binding="tns:AvailQuoteProviderSoapBinding" name="AvailQuoteProviderSoapPort">

-            <wsdlsoap:address location="http://localhost:8085/AvailQuoteProviderService" />

-        </wsdl:port>

-    </wsdl:service>

-

-</wsdl:definitions>

diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/xqueryquotews.composite b/java/sca-contrib/samples/quote-xquery/src/main/resources/xqueryquotews.composite
deleted file mode 100644
index 9e35e2ecb2..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/xqueryquotews.composite
+++ /dev/null
@@ -1,55 +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://quote.xquery"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:xq="http://quote.xquery"
-    name="xqueryquotews">
-
-<!-- 
-    <dbsdo:import.sdo factory="org.example.avail.AvailFactory" />
-    <dbsdo:import.sdo factory="org.example.price.PriceFactory" />
-    <dbsdo:import.sdo factory="org.example.quote.QuoteFactory" />
-    <dbsdo:import.sdo location="wsdl/quotejoin.wsdl" />
-     -->
-     <dbsdo:import.sdo factory="xquery.quote.QuoteFactory"/>
-    
-    <component name="QuoteJoinServerComponent">
-        <tuscany:implementation.xquery location="META-INF/sca/quote_join.xq" />
-        <service name="quoteJoin">
-            <interface.java interface="xquery.quote.QuoteJoin" />
-            <binding.ws wsdlElement="http://quote.xquery#wsdl.port(QuoteJoinService/QuoteJoinSoapPort)" />
-        </service>
-        <reference name="quoteCalculator" target="QuoteCalculatorServerComponent" />
-    </component>
-
-    <component name="QuoteCalculatorServerComponent">
-        <implementation.java class="xquery.quote.QuoteCalculatorImpl" />
-    </component>
-
-    <component name="AvailQuoteProviderComponent">
-        <implementation.java class="xquery.quote.AvailQuoteProviderImpl" />
-        <service name="AvailQuoteProviderService">
-            <interface.java interface="xquery.quote.AvailQuoteProviderService" />
-            <binding.ws
-                wsdlElement="http://quote.xquery#wsdl.port(AvailQuoteProviderService/AvailQuoteProviderSoapPort)" />
-        </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite b/java/sca-contrib/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
deleted file mode 100644
index 35306b9f89..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
+++ /dev/null
@@ -1,113 +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://quote.xquery/client"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:xq="http://quote.xquery/client"
-    name="xqueryquotewsclient">
-
-    <component name="QuoteJoinLocalComponent">
-        <implementation.java class="xquery.quote.QuoteJoinLocalImpl" />
-        <reference name="quoteJoin" target="QuoteJoinComponent" />
-        <reference name="propertiesQuoteJoin" target="QuoteJoinPropertiesComponent" />
-        <reference name="externalServicesQuoteJoin" target="QuoteJoinExternalReferencesComponent" />
-    </component>
-
-    <component name="QuoteJoinComponent">
-        <tuscany:implementation.xquery location="META-INF/sca/quote_join.xq" />
-        <reference name="quoteCalculator" target="QuoteCalculatorComponent" />
-    </component>
-
-    <component name="QuoteJoinPropertiesComponent">
-        <tuscany:implementation.xquery location="META-INF/sca/quote_join_properties.xq" />
-        <!-- Reset the default namespace as the sub-elements under pri:priceQuote are
-            unqualified -->
-        <property name="priceQuoteDoc">
-            <pri:priceQuote xmlns:pri="http://www.example.org/price" xmlns="">
-                <customerName>Acme Inc</customerName>
-                <shipAddress street="12 Springs Rd" city="Morris Plains" state="nj" zip="07960" />
-                <priceRequests>
-                    <priceRequest>
-                        <widgetId>12</widgetId>
-                        <price>1.0</price>
-                    </priceRequest>
-                    <priceRequest>
-                        <widgetId>134</widgetId>
-                        <price>34.1</price>
-                    </priceRequest>
-                    <priceRequest>
-                        <widgetId>211</widgetId>
-                        <price>10.0</price>
-                    </priceRequest>
-                </priceRequests>
-            </pri:priceQuote>
-        </property>
-        <!-- Reset the default namespace as the sub-elements under ava:availQuote are
-            unqualified -->
-
-        <property name="availQuoteDoc">
-            <ava:availQuote xmlns:ava="http://www.example.org/avail" xmlns="">
-                <availRequest>
-                    <widgetId>12</widgetId>
-                    <requestedQuantity>10</requestedQuantity>
-                    <quantityAvail>true</quantityAvail>
-                    <shipDate>2003-03-22</shipDate>
-                </availRequest>
-                <availRequest>
-                    <widgetId>134</widgetId>
-                    <requestedQuantity>345</requestedQuantity>
-                    <quantityAvail>false</quantityAvail>
-                    <shipDate>BackOrder</shipDate>
-                </availRequest>
-                <availRequest>
-                    <widgetId>211</widgetId>
-                    <requestedQuantity>100</requestedQuantity>
-                    <quantityAvail>true</quantityAvail>
-                    <shipDate>2003-04-21</shipDate>
-                </availRequest>
-            </ava:availQuote>
-        </property>
-        <property name="taxRate">0.1</property>
-        <reference name="quoteCalculator" target="QuoteCalculatorComponent" />
-    </component>
-
-    <component name="QuoteJoinExternalReferencesComponent">
-        <tuscany:implementation.xquery location="META-INF/sca/quote_join_external_references.xq" />
-        <reference name="quoteCalculator" target="QuoteCalculatorComponent" />
-        <reference name="priceQuoteProvider" target="PriceQuoteProviderComponent" />
-    </component>
-
-    <component name="QuoteCalculatorComponent">
-        <implementation.java class="xquery.quote.QuoteCalculatorImpl" />
-    </component>
-
-    <component name="PriceQuoteProviderComponent">
-        <implementation.java class="xquery.quote.PriceQuoteProviderImpl" />
-    </component>
-
-    <reference name="availQuoteProvider" promote="QuoteJoinExternalReferencesComponent/availQuoteProvider">
-        <!-- removed because it doesn't work with TUSCANY-2324 fix
-        <interface.java interface="xquery.quote.AvailQuoteProviderService" />
-        -->
-        <binding.ws wsdlElement="http://quote.xquery#wsdl.port(AvailQuoteProviderService/AvailQuoteProviderSoapPort)" />
-    </reference>
-    <reference name="quoteJoinWs" promote="QuoteJoinLocalComponent/quoteJoinWs">
-        <interface.java interface="xquery.quote.QuoteJoin" />
-        <binding.ws wsdlElement="http://quote.xquery#wsdl.port(QuoteJoinService/QuoteJoinSoapPort)" />
-    </reference>
-</composite>
diff --git a/java/sca-contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java b/java/sca-contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
deleted file mode 100644
index 9555532b3e..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
+++ /dev/null
@@ -1,192 +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 xquery.quote;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
-import org.example.avail.AvailQuote;
-import org.example.avail.AvailRequest;
-import org.example.price.PriceQuote;
-import org.example.price.PriceRequest;
-import org.example.price.ShipAddress;
-import org.example.quote.Quote;
-import org.example.quote.QuoteResponse;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import commonj.sdo.DataObject;
-
-/**
- * Integration test for the XQuery implementation type
- * @version $Rev$ $Date$
- * This test covers the most important integration scenarios for the xquery
- * implementation type and its corresponding saxon data bindings:
- * 
- * 1. There is a central component for invoking the different
- *    scenarios: QuoteJoinLocalComponent
- * 2. It provides the following tests:
- *    - invoke XQuery component in the current assembly, by providing all needed
- *      information as input parameters
- *    - invoke XQuery component in external assembly, which is exposed as a web 
- *      service
- *    - invoke XQuery component in the current assembly, which retrieves the needed
- *      information from the component properties
- *    - invoke XQuery component in the current assembly, which retrieves the needed
- *      information from its references to other components:
- *         - one of the components is in the current assembly
- *         - the other component is in anther assembly and it is exposed (and accessed)
- *           as web service
- *    
- *  3. All of the XQuery components have reference to a component for calculation of the
- *    total price 
- *  4. SDO is used for data interchange
- */
-public class XQueryQuoteClientTestCase {
-
-    public static boolean SHOW_DEBUG_MSG = false;
-
-    private SCADomain scaDomain;
-    private SCATestCaseRunner server;
-
-    private QuoteJoinLocal quoteJoinLocal;
-
-    @Before
-    public void startClient() throws Exception {
-        try {
-            scaDomain = SCADomain.newInstance("xqueryquotewsclient.composite");
-
-            quoteJoinLocal = scaDomain.getService(QuoteJoinLocal.class, "QuoteJoinLocalComponent");
-
-            server = new SCATestCaseRunner(XQueryQuoteTestServer.class);
-            server.before();
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-
-    @Test
-    public void testQuoteJoin() {
-        AvailQuote availQuote = QuoteDataUtil.buildAvailQuoteData();
-        PriceQuote priceQuote = QuoteDataUtil.buildPriceQuoteData();
-
-        if (SHOW_DEBUG_MSG) {
-            System.out.println("Input quote for the price list:");
-            QuoteDataUtil.serializeToSystemOut((DataObject)priceQuote, "priceQuote");
-            System.out.println();
-            System.out.println("Input quote for the availability:");
-            QuoteDataUtil.serializeToSystemOut((DataObject)availQuote, "availQuote");
-            System.out.println();
-        }
-
-        Quote quote = quoteJoinLocal.joinPriceAndAvailQuotes(priceQuote, availQuote, 0.1f);
-        if (SHOW_DEBUG_MSG) {
-            System.out.println();
-            System.out.println("Output quote from local join:");
-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");
-            System.out.println();
-        }
-        XQueryQuoteClientTestCase.assertQuote(availQuote, priceQuote, quote, 0.1f);
-
-        quote = quoteJoinLocal.joinPriceAndAvailQuotes(priceQuote, availQuote, 0.2f);
-        if (SHOW_DEBUG_MSG) {
-            System.out.println();
-            System.out.println("Output quote from local join (second invokation):");
-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");
-            System.out.println();
-        }
-        XQueryQuoteClientTestCase.assertQuote(availQuote, priceQuote, quote, 0.2f);
-
-        quote = quoteJoinLocal.joinPriceAndAvailQuotesWs(priceQuote, availQuote, 0.1f);
-        if (SHOW_DEBUG_MSG) {
-            System.out.println();
-            System.out.println("Output quote from web service join:");
-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");
-            System.out.println();
-        }
-        XQueryQuoteClientTestCase.assertQuote(availQuote, priceQuote, quote, 0.1f);
-
-        quote = quoteJoinLocal.joinPriceAndAvailQuotes();
-        if (SHOW_DEBUG_MSG) {
-            System.out.println();
-            System.out.println("Output quote from properties join:");
-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");
-            System.out.println();
-        }
-        XQueryQuoteClientTestCase.assertQuote(availQuote, priceQuote, quote, 0.1f);
-
-        quote = quoteJoinLocal.joinPriceAndAvailQuotes(0.1f);
-        if (SHOW_DEBUG_MSG) {
-            System.out.println();
-            System.out.println("Output quote from external references join:");
-            QuoteDataUtil.serializeToSystemOut((DataObject)quote, "quote");
-            System.out.println();
-        }
-        XQueryQuoteClientTestCase.assertQuote(availQuote, priceQuote, quote, 0.1f);
-    }
-
-    @After
-    public void stopClient() throws Exception {
-        server.after();
-        scaDomain.close();
-    }
-
-    public static void assertQuote(AvailQuote availQuote, PriceQuote priceQuote, Quote quote, float taxRate) {
-        QuoteCalculatorImpl quoteCalculatorImpl = new QuoteCalculatorImpl();
-    
-        TestCase.assertEquals(priceQuote.getCustomerName(), quote.getName());
-        ShipAddress shipAddress = priceQuote.getShipAddress();
-        TestCase.assertEquals(shipAddress.getStreet() + ","
-            + shipAddress.getCity()
-            + ","
-            + shipAddress.getState().toUpperCase()
-            + ","
-            + shipAddress.getZip(), quote.getAddress());
-        List availRequests = availQuote.getAvailRequest();
-        List priceRequests = priceQuote.getPriceRequests().getPriceRequest();
-        List quoteResponses = quote.getQuoteResponse();
-        TestCase.assertEquals(availRequests.size(), priceRequests.size());
-        TestCase.assertEquals(availRequests.size(), quoteResponses.size());
-    
-        for (int i = 0; i < availRequests.size(); i++) {
-            AvailRequest availRequest = (AvailRequest)availRequests.get(i);
-            PriceRequest priceRequest = (PriceRequest)priceRequests.get(i);
-            QuoteResponse quoteResponse = (QuoteResponse)quoteResponses.get(i);
-            TestCase.assertEquals(availRequest.getWidgetId(), quoteResponse.getWidgetId());
-            TestCase.assertEquals(priceRequest.getPrice(), quoteResponse.getUnitPrice());
-            TestCase.assertEquals(availRequest.getRequestedQuantity(), quoteResponse.getRequestedQuantity());
-            TestCase.assertEquals(availRequest.isQuantityAvail(), quoteResponse.isFillOrder());
-            if (availRequest.getShipDate() == null) {
-                TestCase.assertNull(quoteResponse.getShipDate());
-            } else {
-                TestCase.assertEquals(availRequest.getShipDate(), quoteResponse.getShipDate());
-            }
-            TestCase.assertEquals(taxRate, quoteResponse.getTaxRate());
-            TestCase.assertEquals(quoteCalculatorImpl.calculateTotalPrice(taxRate,
-                                                                          availRequest.getRequestedQuantity(),
-                                                                          priceRequest.getPrice(),
-                                                                          availRequest.isQuantityAvail()),
-                                                                          quoteResponse.getTotalCost());
-        }
-    }
-}
diff --git a/java/sca-contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java b/java/sca-contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
deleted file mode 100644
index 9a4be5bda6..0000000000
--- a/java/sca-contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
+++ /dev/null
@@ -1,50 +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 xquery.quote;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class XQueryQuoteTestServer {
-    private SCADomain scaDomain;
-
-    @Before
-    public void startServer() throws Exception {
-        try {
-            scaDomain = SCADomain.newInstance("xqueryquotews.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void testPing() throws IOException {
-        new Socket("127.0.0.1", 8085);
-    }
-
-    @After
-    public void stopServer() throws Exception {
-        scaDomain.close();
-    }
-}
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/README b/java/sca-contrib/samples/simple-bigbank-spring/README
deleted file mode 100644
index bb44d63719..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/README
+++ /dev/null
@@ -1,148 +0,0 @@
-Spring Bigbank Sample
-======================
-This sample is made of 3 modules that represent the different aspects of a fictitious banking application.
-
-To run the simple-bigbank-spring sample you need to first run spring-bigbank-calculator, spring-bigbank-checkaccount and spring-bigbank-stockquote composites. 
-This will bring up Tuscany runtime and load the three applications and make them available as services.
-Bigbank-Spring is dependent on these services.
-
-This demo uses ant. This is just one way of running this demo.
-
-Start Spring-Bigbank-calculator Composite
------------------------------------------
-
-Spring-Bigbank-calculator is a calculator application which handles add, subtract, multiply and divide operations. Each of these operations is implemented in a different language, including JavaScript, groovy, Ruby and Python.
-
-To run the spring-bigbank-calculator composite and make it available as a service for this demo do the following:
-
-cd spring-bigbank-calculator
-ant compile  
-ant run
-
-.. Leave the server running
-
-Note that 'ant compile' needs to be done the first time you run this demo out of the binary distribution. No need to do 'ant compile' from there on.
-
-Start Spring-Bigbank-checkaccount Composite
--------------------------------------------
-
-This contains all artifacts that deal with the account management within the bigbank.  The services offered by the bigbank-account module are used by the bigbank.
-
-cd spring-bigbank-checkaccount
-ant compile  
-ant run
-
-.. Leave the server running
-
-Note that 'ant compile' needs to be done the first time you run this demo out of the binary distribution. No need to do 'ant compile' from there on.
-
-Start Spring-Bigbank-stockquote Composite
------------------------------------------
-
-A very simple web services based stock quote application which returns random 
-stock quotes on request. Please note that the stockquote service is not live and is implemented instead to allow for this application to always run without dependency on the availability of a webservice.
-
-cd spring-bigbank-stockquote
-ant compile  
-ant run
-
-.. Leave the server running
-
-Start Spring Bigbank
---------------------
-This contains all artifacts that make up the bigbank application.  This is the application that the end user interacts with
-
-Start spring-bigbank in the following way:
-
-i ) Compile the spring-bigbank as follows :
-    
-    cd simple-bigbank-spring                  
-    ant compile
-    
-ii) Now start the bigbank service as follows :
-    
-    cd bigbank
-    ant compile 
-    ant run
-
-    .. Leave the server running
-
-Note that 'ant compile' needs to be done the first time you run this demo out ofthe  binary distribution. 
-No need to do 'ant compile' from there on.
-
-Sample Overview
----------------
-This sample demonstrates a simple bank summary transaction using Spring for one of the components.
- 
-A request to the AccountComponent results in a request to the AccountDataComponent to get account data
-which is based on a random stock quote price. Therefore result for this sample will vary on each run.
-
-
-simple-bigbank-spring/
-  src/
-    main/
-      java/
-        bigbank/
-          account/                - AccountComponent implementation using Spring
-          accountdata/            - AccountDataComponent implementation using Spring
-          sockquote/              - stockquote implementation using Java
-          client/                 - starts the SCA Runtime and 
-                                    deploys the BigBank.composite. 
-                                    It then calls the deployed AccountService 
-      resources/
-        Account.composite         - SCA assembly for this sample
-        BigBank.composite         - SCA assembly for this sample
-        StockQuote.composite      - SCA assembly for this sample
-    test/
-      java/
-        bigbank/
-          BigBankTestCase.java    - JUnit test case 
-  simple-bigbank-spring.png       - a pictorial representation of the sample 
-                                    .composite file
-  build.xml                       - the Ant build file
-  pom.xml                         - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd simple-bigbank-spring
-ant compile
-ant run
-
-You should see the following output. 
-** Please note that balance amount will vary depending on the random stock value.
-
-run:
-     [java] Spring parent context - getBean called for name: stockQuoteService
-     [java] Getting stock quote for: IBM, value: 104.97
-     [java] Account summary: currency: USD, [ID:Foo_CHA12345, balance:1500.0, ID
-:Foo_SAA12345, balance:1500.0, ID:Foo_STA12345, symbol:IBM, quantity:100, balance:10497.0]
-
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd simple-bigbank-spring
-mvn
-
-You should see the following output from the test phase.
-** Please note that balance amount will vary depending on the random stock value.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running bigbank.BigBankTestCase
-Getting stock quote for: IBM, value: 104.02
-Account summary: currency: USD, [ID:Foo_CHA12345, balance:1500.0, ID:Foo_SAA1234
-5, balance:1500.0, ID:Foo_STA12345, symbol:IBM, quantity:100, balance:10402.0]
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.502 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/build-dojo.xml b/java/sca-contrib/samples/simple-bigbank-spring/build-dojo.xml
deleted file mode 100644
index 9d282c2dd2..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/build-dojo.xml
+++ /dev/null
@@ -1,92 +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 name="DojoZipInstaller">
-	
-
-    <property name="dojo.version" value="1.0.0"/>
-    <property name="unpack.location" value="${basedir}/src/main/resources/web/dojo"/>
-	
-
-    <target name="check-dojo-installed">
-        <condition property="already.installed" >
-            <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-        </condition>
-        <condition property="maven.suffix" value="">
-            <os family="unix"/>
-        </condition>
-        <condition property="maven.suffix" value=".bat">
-            <os family="windows"/>
-        </condition>
-    </target>
-	
-
-    <target name="check-dojo-unpacked">
-        <condition property="already.unpacked" >
-            <available file="${unpack.location}"/>
-        </condition>
-    </target>
-
-    <target name="install-dojo" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
-            <arg line="install:install-file -DgroupId=dojo  -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"/>
-        </exec>
-    </target>
-
-    <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/dojo-download/"/>
-        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
-            dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" 
-              tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-    </target>
-	
-
-    <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">
-        <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
-        <mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
-        <unzip src="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"
-               dest="${basedir}/target/dojo-unpack-temp/"
-               overwrite="false">
-            <patternset>
-                <include name="dojo-release-${dojo.version}/dojo/**"/>
-                <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/>
-                <include name="dojo-release-${dojo.version}/dijit/**"/>
-                <exclude name="dojo-release-${dojo.version}/dojox/**"/>
-                <exclude name="dojo-release-${dojo.version}/util/**"/>
-            </patternset>
-        </unzip>
-        <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}"
-              tofile="${unpack.location}"
-              verbose="true"/>
-        <delete dir="${basedir}/target/dojo-unpack-temp/"/>
-    </target>
-	
-
-    <target name="clean-dojo-files">
-        <delete dir="${unpack.location}"/>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/build.xml b/java/sca-contrib/samples/simple-bigbank-spring/build.xml
deleted file mode 100644
index ecc2596d71..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="spring-bigbank" default="compile">
-    <property name="test.class" value="bigbank.client.BigBankClient" />
-	<property name="test.jar"   value="sample-simple-bigbank-spring.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/pom.xml b/java/sca-contrib/samples/simple-bigbank-spring/pom.xml
deleted file mode 100644
index 5e71de9a6b..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/pom.xml
+++ /dev/null
@@ -1,277 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-simple-bigbank-spring</artifactId>
-    <name>Apache Tuscany SCA Spring-Based Simplified BigBank Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-            <version>1.5.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.0.1</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-spring-bigbank-checkaccount</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>2.5.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>2.5.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>2.5.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-            <finalName>${artifactId}</finalName>
-            <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                    
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-                
-                    <executions>
-                        <execution> 
-                            <id>install-dojo</id>                       
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <tasks>
-                                    <ant antfile="./build-dojo.xml" target="install-dojo">
-                                        <property name="localRepository" value="${settings.localRepository}"/>
-                                    </ant>
-                                </tasks>
-                            </configuration>
-                        </execution>
-                        <execution> 
-                            <id>copy-dojo-files</id>                       
-                            <phase>generate-resources</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <tasks>
-                                    <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-                                        <property name="localRepository" value="${settings.localRepository}"/>
-                                        <property name="artifactId" value="${artifactId}"/>
-                                    </ant>
-                                </tasks>
-                            </configuration>
-                        </execution>
-                        <execution> 
-                            <id>clean-dojo-files</id>                       
-                            <phase>clean</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <tasks>
-                                    <ant antfile="./build-dojo.xml" target="clean-dojo-files">
-                                        <property name="localRepository" value="${settings.localRepository}"/>
-                                        <property name="artifactId" value="${artifactId}"/>
-                                    </ant>
-                                </tasks>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>            
-                </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/simple-bigbank-spring.png b/java/sca-contrib/samples/simple-bigbank-spring/simple-bigbank-spring.png
deleted file mode 100644
index 593c047f6a..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/simple-bigbank-spring.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/simple-bigbank-spring.svg b/java/sca-contrib/samples/simple-bigbank-spring/simple-bigbank-spring.svg
deleted file mode 100644
index c64f6de6b9..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/simple-bigbank-spring.svg
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-bigbank"
-   sodipodi:docname="simple-bigbank.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-bigbank\simple-bigbank.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="468.4064"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="120"
-     inkscape:window-y="172" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997">
-      <rect
-         rx="15.307091"
-         ry="12.692303"
-         y="192.00233"
-         x="258.31146"
-         height="299.99988"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999964;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">BigBank</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="339.91632"
-       y="310.73904"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(84.32554,112.8005)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Account</flowPara><flowPara
-         id="flowPara1883">Service</flowPara><flowPara
-         id="flowPara1885">Component</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:0.99999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3006"
-       width="43.861084"
-       height="29.993773"
-       x="376.59262"
-       y="285.79593"
-       rx="21.930542"
-       ry="0" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 436.01825,340.74775 L 469.35329,340.74775 L 475.4142,353.87973 L 468.34314,366.00157 L 436.01825,366.00157 L 443.5944,353.87973 L 436.01825,340.74775 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 226.73063,330.75341 L 280.61512,330.75341 L 290.41229,356.14253 L 278.98226,379.57867 L 226.73063,379.57867 L 238.97711,356.14253 L 226.73063,330.75341 z "
-       id="path1887" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1889"
-       width="115.66247"
-       height="85.862968"
-       x="557.25488"
-       y="308.38455"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1891"
-       transform="translate(301.6641,110.446)"><flowRegion
-         id="flowRegion1893"><rect
-           id="rect1895"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1897">Account</flowPara><flowPara
-         id="flowPara1909">Data</flowPara><flowPara
-         id="flowPara1899">Service</flowPara><flowPara
-         id="flowPara1901">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 540.10438,340.23154 L 573.43942,340.23154 L 579.50033,353.36352 L 572.42927,365.48536 L 540.10438,365.48536 L 547.68053,353.36352 L 540.10438,340.23154 z "
-       id="path1905" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 290,355.52305 C 329.28571,355.52305 329.28571,355.52305 329.28571,355.52305"
-       id="path1913" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 475,353.3802 C 547.14286,352.66591 547.14286,352.66591 547.14286,352.66591"
-       id="path1919" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1921"
-       transform="translate(95.23912,80.79069)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1923"><rect
-           id="rect1925"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1931">currency</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1933"
-       transform="translate(-42.61803,130.0764)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1935"><rect
-           id="rect1937"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1939">Account</flowPara><flowPara
-         id="flowPara1941">Service</flowPara><flowPara
-         id="flowPara1943" /></flowRoot>  </g>
-</svg>
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
deleted file mode 100644
index 1625ff5b65..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
+++ /dev/null
@@ -1,43 +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 bigbank.account;
-
-import java.util.List;
-
-/**
- */
-public class AccountReport {
-    private List<String> summaries;
-    private String currency;
-    
-    public AccountReport(String currency, List<String> summaries) {
-        this.currency = currency;
-        this.summaries = summaries;
-    }
-
-    public List getAccountSummaries() { return summaries; }
-    
-    public String getCurrency() { return currency; }
-    
-    @Override
-    public String toString() {
-        return "currency: "+ currency + ", " + summaries;
-    }
-    
-}
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
deleted file mode 100644
index 7c9082b944..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
+++ /dev/null
@@ -1,26 +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 bigbank.account;
-
-/**
- * Interface for a account service
- */
-public interface AccountService {
-    public AccountReport getAccountReport(String customerID);
-}
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
deleted file mode 100644
index 6252697ffe..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
+++ /dev/null
@@ -1,145 +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 bigbank.account;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Service;
-
-import bigbank.account.checking.CheckingAccountDetails;
-import bigbank.account.checking.CheckingAccountService;
-import bigbank.account.savings.SavingsAccountDetails;
-import bigbank.account.savings.SavingsAccountService;
-import bigbank.account.stock.StockAccountDetails;
-import bigbank.account.stock.StockAccountService;
-import bigbank.stockquote.StockQuoteService;
-import bigbank.calculator.CalculatorService;
-
-/**
- * Account service implementation
- */
-@Service(AccountService.class)
-public class AccountServiceImpl implements AccountService {
-
-    private SavingsAccountService savingsAccountService;
-    
-    private CheckingAccountService checkingAccountService;
-    
-    private StockAccountService stockAccountService;
-    
-    private CalculatorService calculatorService;
-    
-    private StockQuoteService stockQuoteService;
-    
-    private String currency;
-
-    public AccountReport getAccountReport(String customerID) {
-
-        // Get the checking, savings and stock accounts from the AccountData
-        // service component
-        CheckingAccountDetails checking = null;
-        List<String> summaries = new ArrayList<String>();
-        try {
-            checking = checkingAccountService.getAccountDetails(customerID);
-            System.out.println("Checking account: " + checking);
-            summaries.add(checking.toString());
-
-            SavingsAccountDetails savings = savingsAccountService.getAccountDetails(customerID);
-            System.out.println("Savings account: " + savings);
-            summaries.add(savings.toString());
-
-            StockAccountDetails stock = stockAccountService.getAccountDetails(customerID);
-            System.out.println("Stock account: " + stock);
-            summaries.add(stock.toString());
-            
-            // Get the stock price in USD
-            double price = stockQuoteService.getQuote(stock.getSymbol());
-            System.out.println("Stock price for " + stock.getSymbol() + ": " + price);
-            
-            // Convert to the configured currency
-            if (currency.equals("EURO")) {
-                
-                // Use our fancy calculator service to convert to the target currency
-                price = calculatorService.multiply(price, 0.70);
-                
-                System.out.println("Converted to " + currency + ": " + price);
-            }       
-              
-            // Calculate the value of the stock account
-            double stockValue = price * stock.getQuantity();
-            summaries.add(stock.toString());
-            
-            AccountReport report = new AccountReport(currency, summaries);
-            
-            return report;
-        } catch ( Throwable e ) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-    
-    public SavingsAccountService getSavingsAccountService() {
-        return savingsAccountService;
-    }
-
-    public void setSavingsAccountService(SavingsAccountService savingsAccountService) {
-        this.savingsAccountService = savingsAccountService;
-    }
-    
-    public CheckingAccountService getCheckingAccountService() {
-        return checkingAccountService;
-    }
-
-    public void setCheckingAccountService(CheckingAccountService checkingAccountService) {
-        this.checkingAccountService = checkingAccountService;
-    }
-    
-    public StockAccountService getStockAccountService() {
-        return stockAccountService;
-    }
-
-    public void setStockAccountService(StockAccountService stockAccountService) {
-        this.stockAccountService = stockAccountService;
-    }
-
-    public String getCurrency() {
-        return currency;
-    }
-
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-    
-    public CalculatorService getCalculatorService() {
-        return calculatorService;
-    }
-
-    public void setCalculatorService(CalculatorService calculatorService) {
-        this.calculatorService = calculatorService;
-    }
-
-    public StockQuoteService getStockQuoteService() {
-        return stockQuoteService;
-    }
-
-    public void setStockQuoteService(StockQuoteService stockQuoteService) {
-        this.stockQuoteService = stockQuoteService;
-    }
-}
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
deleted file mode 100644
index 3f81f48fb9..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.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.    

- */

-package bigbank.account.checking;

-

-public class CheckingAccountDetails {

-    private String accountNumber;

-    private double balance;

-

-    public String getAccountNumber() {

-        return accountNumber;

-    }

-

-    public void setAccountNumber(String n) {

-        this.accountNumber = n;

-    }

-

-    public double getBalance() {

-        return balance;

-    }

-

-    public void setBalance(double b) {

-        this.balance = b;

-    }

-

-    @Override

-    public String toString() {

-        return accountNumber + ", balance:" + balance;

-    }

-}

diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
deleted file mode 100644
index 8596181d7f..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ /dev/null
@@ -1,34 +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 bigbank.account.checking;

-

-import org.oasisopen.sca.annotation.Remotable;

-import org.oasisopen.sca.annotation.Service;

-

-@Service

-@Remotable

-public interface CheckingAccountService {

-    

-    public CheckingAccountDetails getAccountDetails(String customerID);

-    

-    public double deposit(String accountNo, double depositAmt);

-    

-    public double withdraw(String accountNo, double withdrawalAmount);

-    

-}

diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
deleted file mode 100644
index 2b086ec467..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
+++ /dev/null
@@ -1,71 +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 bigbank.account.feed;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import bigbank.account.AccountService;
-import bigbank.account.AccountReport;
-
-/**
- * @version $$Rev$$ $$Date$$
- */
-
-@Service(Collection.class)
-public class AccountFeedImpl implements Collection<String, String> {
-
-    @Reference
-    protected AccountService accountService;
-    
-    public Entry<String, String>[] getAll() {
-
-        // Add the Account report entry 
-        String report = get("1234");
-        Entry<String, String> entry = new Entry<String, String>("1234", report);
-
-        return new Entry[] { entry } ;
-    }
-
-    public String get(String id) {
-
-        // Get the account report for the specified customer ID
-        AccountReport accreport = accountService.getAccountReport(id);
-        String report = accreport.getCurrency();
-        
-        return report;
-    }
-
-    public void delete(String key) throws NotFoundException {
-    }
-
-    public String post(String key, String item) {
-        return null;
-    }
-
-    public void put(String key, String item) throws NotFoundException {
-    }
-
-    public Entry<String, String>[] query(String queryString) {
-        return null;
-    }
-}
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
deleted file mode 100644
index bcac678cd7..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
+++ /dev/null
@@ -1,47 +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 bigbank.account.savings;

-

-import java.io.Serializable;

-

-public class SavingsAccountDetails implements Serializable {

-    private String accountNumber;

-    private double balance;

-

-    public String getAccountNumber() {

-        return accountNumber;

-    }

-

-    public void setAccountNumber(String n) {

-        this.accountNumber = n;

-    }

-

-    public double getBalance() {

-        return balance;

-    }

-

-    public void setBalance(double b) {

-        this.balance = b;

-    }

-

-    @Override

-    public String toString() {

-        return accountNumber + ", balance:" + balance;

-    }

-}

diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
deleted file mode 100644
index 070cfe12db..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.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 bigbank.account.savings;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface SavingsAccountService {

-    

-    public SavingsAccountDetails getAccountDetails(String customerID);

-    

-    public double deposit(String accountNo, double depositAmt);

-    

-    public double withdraw(String accountNo, double withdrawalAmount);

-    

-}

diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
deleted file mode 100644
index 7682b729c3..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
+++ /dev/null
@@ -1,62 +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 bigbank.account.savings;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.oasisopen.sca.annotation.Service;

-

-@Service(SavingsAccountService.class)

-public class SavingsAccountServiceImpl implements SavingsAccountService {

-    private Map<String, String> custAcctMap = new HashMap<String, String>();

-    private Map<String, Double> savingsAccts = new HashMap<String, Double>();

-    

-    public SavingsAccountServiceImpl() {

-        custAcctMap.put("Customer_01", "SVA_Customer_01");

-        custAcctMap.put("Customer_02", "SVA_Customer_02");

-        custAcctMap.put("Customer_03", "SVA_Customer_03");

-        

-        savingsAccts.put("SVA_Customer_01", new Double(1000));

-        savingsAccts.put("SVA_Customer_02", new Double(1500));

-        savingsAccts.put("SVA_Customer_03", new Double(2000));

-    }

-    

-	public double deposit(String accountNo, double depositAmt) {

-        savingsAccts.put(accountNo, new Double(savingsAccts.get(accountNo).doubleValue() + depositAmt));

-        return savingsAccts.get(accountNo).doubleValue();

-    }

-

-    public SavingsAccountDetails getAccountDetails(String customerID) {

-        SavingsAccountDetails savingsAccount = new SavingsAccountDetails();

-        savingsAccount.setAccountNumber(custAcctMap.get(customerID));

-        savingsAccount.setBalance(savingsAccts.get(savingsAccount.getAccountNumber()).doubleValue());

-

-        return savingsAccount;

-    }

-

-    public double withdraw(String accountNo, double withdrawalAmount) {

-        double balance = savingsAccts.get(accountNo).doubleValue();

-        if ( balance - withdrawalAmount > 0 ) {

-            balance = balance - withdrawalAmount;

-            savingsAccts.put(accountNo, balance);

-        }

-        return balance;

-    }

-}

diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
deleted file mode 100644
index 9f06a71bae..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
+++ /dev/null
@@ -1,63 +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 bigbank.account.stock;

-

-public class StockAccountDetails {

-    private String accountNumber;

-    private String symbol;

-    private int quantity;

-    

-    public StockAccountDetails() {

-    }

-    

-    public StockAccountDetails(String acNo, String symbol, int qty) {

-        this.accountNumber = acNo;

-        this.symbol = symbol;

-        this.quantity = qty;

-    }

-    

-    public String getAccountNumber() {

-        return accountNumber;

-    }

-

-    public void setAccountNumber(String n) {

-        this.accountNumber = n;

-    }

-

-    public int getQuantity() {

-        return quantity;

-    }

-

-    public void setQuantity(int a) {

-        this.quantity = a;

-    }

-

-    public String getSymbol() {

-        return symbol;

-    }

-

-    public void setSymbol(String s) {

-        this.symbol = s;

-    }

-

-    @Override

-    public String toString() {

-        return accountNumber + ", symbol:" + symbol + ", quantity:" + quantity;

-    }

-}

diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
deleted file mode 100644
index f86fda7c0f..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
+++ /dev/null
@@ -1,33 +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 bigbank.account.stock;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface StockAccountService {

-    

-    public StockAccountDetails getAccountDetails(String customerID);

-    

-    public StockAccountDetails buy(String accountNo, String symbol, int quantity);

-    

-    public StockAccountDetails sell(String accountNo, String symbol, int quantity);

-    

-    

-}

diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
deleted file mode 100644
index 488146ebeb..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
+++ /dev/null
@@ -1,56 +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 bigbank.account.stock;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.oasisopen.sca.annotation.Service;

-

-@Service(StockAccountService.class)

-public class StockAccountServiceImpl implements StockAccountService {

-    private Map<String, String> custAcctMap = new HashMap<String, String>();

-    private Map<String, StockAccountDetails> stockAccts = new HashMap<String, StockAccountDetails>();

-    

-    public StockAccountServiceImpl() {

-        custAcctMap.put("Customer_01", "STA_Customer_01");

-        custAcctMap.put("Customer_02", "STA_Customer_02");

-        custAcctMap.put("Customer_03", "STA_Customer_03");

-        

-        stockAccts.put("STA_Customer_01", new StockAccountDetails("STA_Customer_01", "IBM", 100));

-        stockAccts.put("STA_Customer_02", new StockAccountDetails("STA_Customer_02", "IBM", 200));

-        stockAccts.put("STA_Customer_03", new StockAccountDetails("STA_Customer_03", "SYM_3", 125));

-    }

-    

-    

-    public StockAccountDetails buy(String accountNo, String symbol, int quantity) {

-        return null;

-    }

-

-    public StockAccountDetails getAccountDetails(String customerID) {

-       return stockAccts.get(custAcctMap.get(customerID));

-    }

-

-    public StockAccountDetails sell(String accountNo, String symbol, int quantity) {

-        return null;

-    }

-    

-	

-    

-}

diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
deleted file mode 100644
index 66a0ba0e63..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
+++ /dev/null
@@ -1,34 +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 bigbank.calculator;

-

-/**

- * The Calculator service interface.

- */

-public interface CalculatorService {

-

-    double add(double n1, double n2);

-

-    double subtract(double n1, double n2);

-

-    double multiply(double n1, double n2);

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
deleted file mode 100644
index f7b940f873..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
+++ /dev/null
@@ -1,46 +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 bigbank.client;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-import bigbank.account.AccountService;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class BigBankClient {
-    public static void main(String[] args) throws Exception {
-
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        SCANode node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankClient.class.getClassLoader());
-        node.start();
-        
-        AccountService accountService = ((SCAClient)node).getService(AccountService.class, "AccountServiceComponent");
-
-        System.out.println("Account summary: " + accountService.getAccountReport("Customer_01") );
-
-        node.stop();
-    }  
-
-}
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
deleted file mode 100644
index 241347e417..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
+++ /dev/null
@@ -1,54 +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 bigbank.server;
-
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class BigBankServer {
-
-    public static void main(String[] args) throws Exception {
-        long timeout = -1L;
-        if (args.length > 0) {
-            timeout = Long.parseLong(args[0]);
-        }
-        
-        System.out.println("Starting the Sample SCA Spring BigBank server...");
-                
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        SCANode node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankServer.class.getClassLoader());
-        node.start();
-
-        if (timeout < 0) {
-            System.out.println("Press Enter to Exit...");
-            System.in.read();
-        } else {
-            Thread.sleep(timeout);
-        }
-
-        node.stop();
-        
-        System.out.println("Bye");
-    }
-}
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
deleted file mode 100644
index be86627882..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.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 bigbank.stockquote;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the StockQuote service.
- */
-@Remotable
-public interface StockQuoteService {
-
-    public double getQuote(String symbol);
-}
-
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/BigBank.composite b/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
deleted file mode 100644
index ea2dbc7e1c..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
+++ /dev/null
@@ -1,88 +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:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    targetNamespace="http://bigbank"
-    xmlns:bb="http://bigbank"
-    xmlns:bbsv="http://bigbank/savings"
-    xmlns:bbst="http://bigbank/stock"
-    xmlns:bbck="http://bigbank/checkings"
-    xmlns:s="http://stockquote"
-    name="BigBank">
-
-    <component name="AccountServiceComponent">
-        <implementation.spring location="spring-context/Account-spring-context.xml"/>
-        
-        <service name="AccountService">
-            <interface.java interface="bigbank.account.AccountService"/>
-            <tuscany:binding.jsonrpc uri="http://localhost:8085/SpringAccountJSONService"/>
-            <binding.sca/>
-        </service>
-
-        <reference name="savingsAccountService" target="SavingsAccountServiceComponent"/>
-        
-        <reference name="checkingAccountService">
-          <interface.java interface="bigbank.account.checking.CheckingAccountService"/>
-          <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory"
-                       jndiURL="tcp://localhost:61619">
-              <destination name="RequestQueue" create="always"/>
-              <response>
-                  <destination name="ResponseQueue" create="always"/>
-              </response> 
-          </binding.jms>
-        </reference>
-        
-        <reference name="stockAccountService" target="StockAccountServiceComponent"/>
-        
-        <reference name="calculatorService">
-            <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
-        </reference>      
-        
-        <reference name="stockQuoteService">
-            <binding.ws uri="http://localhost:8081/services/StockQuoteWebService"/>
-        </reference>
-    </component>
-
-    <component name="SavingsAccountServiceComponent">
-        <implementation.composite name="bbsv:SavingsAccountDept"/>
-    </component>
-
-    <component name="StockAccountServiceComponent">
-        <implementation.composite name="bbst:StockAccountDept"/>
-    </component>
-    
-    <component name="AccountFeedComponent">
-        <implementation.java class="bigbank.account.feed.AccountFeedImpl"/>
-        <service name="Collection">
-            <tuscany:binding.rss uri="http://localhost:8085/rss"/>
-            <tuscany:binding.atom uri="http://localhost:8085/atom"/>
-        </service>
-        <reference name="accountService" target="AccountServiceComponent"/>
-    </component>
-    
-    <component name="WebResourceComponent">
-        <tuscany:implementation.resource location="web"/>
-        <service name="Resource">
-            <tuscany:binding.http uri="http://localhost:8085/"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite b/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
deleted file mode 100644
index 4bb2ce61ef..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
+++ /dev/null
@@ -1,32 +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://bigbank/savings"

-	xmlns:bbsv="http://bigbank/savings"

-	xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-	name="SavingsAccountDept">

-

-    <service name="SavingsAccountService" promote="SavingsAccountServiceComponent"/>

-

-    <component name="SavingsAccountServiceComponent">

-        <implementation.spring location="spring-context/SavingsAccount-context.xml"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite b/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
deleted file mode 100644
index 97dff499ba..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
+++ /dev/null
@@ -1,32 +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://bigbank/stock"

-	xmlns:bbst="http://bigbank/stock"

-	xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-	name="StockAccountDept">

-

-    <service name="StockAccountService" promote="StockAccountServiceComponent"/>

-

-    <component name="StockAccountServiceComponent">

-        <implementation.spring location="spring-context/StockAccount"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml b/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
deleted file mode 100644
index 899d8d7d62..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
+++ /dev/null
@@ -1,53 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <!-- <sca:service name="AccountService"
-        type="bigbank.account.AccountService" target="AccountServiceBean"/> -->
-    
-    <bean id="AccountServiceBean" class="bigbank.account.AccountServiceImpl">     
-        <property name="calculatorService" ref="calculatorService"/>
-        <property name="stockQuoteService" ref="stockQuoteService"/>
-        <property name="checkingAccountService" ref="checkingAccountService"/>
-        
-        <!-- Here are some implicit references & properties - a property with a ref not satisifed 
-        * within the Spring application context.
-         -->
-        <property name="savingsAccountService" ref="savingsAccountService"/>
-        <property name="stockAccountService" ref="stockAccountService"/>              
-        <property name="currency" value="EURO"/>
-    </bean>
-    
-    <sca:reference name="checkingAccountService" type="bigbank.account.checking.CheckingAccountService"/>
-    
-    <sca:reference name="calculatorService" type="bigbank.calculator.CalculatorService"/>
-    
-    <sca:reference name="stockQuoteService" type="bigbank.stockquote.StockQuoteService"/>
-    
-    <!-- <sca:reference name="savingsAccountServiceRef" type="bigbank.account.savings.SavingsAccountService"/>-->
-    
-    <!-- <sca:reference name="stockAccountServiceRef" type="bigbank.account.stock.StockAccountService"/>-->
-
-</beans>
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml b/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
deleted file mode 100644
index b9e26bf81b..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <sca:service name="SavingsAccountService"
-        type="bigbank.account.savings.SavingsAccountService" target="SavingsAccountServiceBean"/>
-
-    <bean id="SavingsAccountServiceBean" class="bigbank.account.savings.SavingsAccountServiceImpl">
-    </bean>
-
-</beans>
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF b/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
deleted file mode 100644
index 32fa070ffb..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0

-Spring-Context: META-INF/spring/StockAccount-context.xml

-

-

diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml b/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
deleted file mode 100644
index b30f821f7e..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <sca:service name="StockAccountService"
-        type="bigbank.account.stock.StockAccountService" target="StockAccountServiceBean"/>
-
-    <bean id="StockAccountServiceBean" class="bigbank.account.stock.StockAccountServiceImpl">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/web/style.css b/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/web/style.css
deleted file mode 100644
index 1071583264..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/web/style.css
+++ /dev/null
@@ -1,22 +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.
- */
-* { font-family: arial; }
-
-table, th, td { border: 2px solid blue; border-collapse: collapse; }
-th { color: white; background-color: blue; }
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java b/java/sca-contrib/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
deleted file mode 100644
index d82e383e46..0000000000
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
+++ /dev/null
@@ -1,34 +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 bigbank;
-
-import junit.framework.TestCase;
-
-import bigbank.server.BigBankServer;
-
-/**
- * Tests out the big bank service
- *
- */
-public class BigBankTestCase extends TestCase {
-
-    public void testServer() throws Exception {
-        BigBankServer.main(new String[] {"1000"});
-    }
-}
diff --git a/java/sca-contrib/samples/simple-bigbank/README b/java/sca-contrib/samples/simple-bigbank/README
deleted file mode 100644
index acbe93a4d3..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/README
+++ /dev/null
@@ -1,101 +0,0 @@
-Calculator Sample
-=================
-This sample implements a simple a version of the BigBank scenrio used in 
-various places in the SCA specification documents. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-simple-bigbank.jar bigbank.client.BigBankClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-simple-bigbank.jar bigbank.client.BigBankClient
-
-
-Sample Overview
----------------
-This sample demonstrates a simple bank summary transaction while using Java components wired together.
-SCA default binding is used.
- 
-A request to the AccountComponent results in a request to the AccountDataComponent to get account data
-which is based on a random stock quote price. Therefore result for this sample will vary on each run.
-
-calculator/
-  src/
-    main/
-      java/
-        bigbank/
-          account/                - AccountComponent implementation
-          accountdata/            - AccountDataComponent implementation
-          stockquote/             - generates random stock prices
-          client/                 - starts the SCA Runtime and 
-                                    deploys the BigBank.composite. 
-                                    It then calls the deployed AccountService 
-      resources/
-        Account.composite         - SCA assembly for this sample
-        BigBank.composite         - SCA assembly for this sample
-        StockQuote.composite      - SCA assembly for this sample
-    test/
-      java/
-        bigbank/
-          BigBankTestCase.java    - JUnit test case 
-  simple-bigbank.png              - a pictorial representation of the sample 
-                                    .composite file
-  build.xml                       - the Ant build file
-  pom.xml                         - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd simple-bigbank
-ant compile
-ant run
-
-You should see the following output from the run target. 
-** Please note that the balance amount is dependent on the random sotck quote price and the 
-numbers may vary on each run.
-
-run:
-     [java] Getting stock quote for: IBM, value: 104.06
-     [java] Account summary: currency: USD, [ID:Foo_CHA12345, balance:1500.0, ID
-:Foo_SAA12345, balance:1500.0, ID:Foo_STA12345, symbol:IBM, quantity:100, balanc
-e:10406.0]
-
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd simple-bigbank
-mvn
-
-You should see the following output from the test phase.
-** Please note that the balance amount is dependent on the random sotck quote price and the numbers may vary on each run.
-
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running bigbank.BigBankTestCase
-Getting stock quote for: IBM, value: 104.02
-Account summary: currency: USD, [ID:Foo_CHA12345, balance:1500.0, ID:Foo_SAA1234
-5, balance:1500.0, ID:Foo_STA12345, symbol:IBM, quantity:100, balance:10402.0]
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.502 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/simple-bigbank/build.xml b/java/sca-contrib/samples/simple-bigbank/build.xml
deleted file mode 100644
index a814014eae..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="simple-bigbank" default="compile">
-    <property name="test.class" value="bigbank.client.BigBankClient" />
-	<property name="test.jar"   value="sample-simple-bigbank.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/simple-bigbank/pom.xml b/java/sca-contrib/samples/simple-bigbank/pom.xml
deleted file mode 100644
index 82cbdfe4b6..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-simple-bigbank</artifactId>
-    <name>Apache Tuscany SCA Simplified BigBank Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/simple-bigbank/simple-bigbank.png b/java/sca-contrib/samples/simple-bigbank/simple-bigbank.png
deleted file mode 100644
index 593c047f6a..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/simple-bigbank.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/simple-bigbank/simple-bigbank.svg b/java/sca-contrib/samples/simple-bigbank/simple-bigbank.svg
deleted file mode 100644
index c64f6de6b9..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/simple-bigbank.svg
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-bigbank"
-   sodipodi:docname="simple-bigbank.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-bigbank\simple-bigbank.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="468.4064"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="120"
-     inkscape:window-y="172" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997">
-      <rect
-         rx="15.307091"
-         ry="12.692303"
-         y="192.00233"
-         x="258.31146"
-         height="299.99988"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999964;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">BigBank</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="339.91632"
-       y="310.73904"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(84.32554,112.8005)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Account</flowPara><flowPara
-         id="flowPara1883">Service</flowPara><flowPara
-         id="flowPara1885">Component</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:0.99999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3006"
-       width="43.861084"
-       height="29.993773"
-       x="376.59262"
-       y="285.79593"
-       rx="21.930542"
-       ry="0" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 436.01825,340.74775 L 469.35329,340.74775 L 475.4142,353.87973 L 468.34314,366.00157 L 436.01825,366.00157 L 443.5944,353.87973 L 436.01825,340.74775 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 226.73063,330.75341 L 280.61512,330.75341 L 290.41229,356.14253 L 278.98226,379.57867 L 226.73063,379.57867 L 238.97711,356.14253 L 226.73063,330.75341 z "
-       id="path1887" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1889"
-       width="115.66247"
-       height="85.862968"
-       x="557.25488"
-       y="308.38455"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1891"
-       transform="translate(301.6641,110.446)"><flowRegion
-         id="flowRegion1893"><rect
-           id="rect1895"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1897">Account</flowPara><flowPara
-         id="flowPara1909">Data</flowPara><flowPara
-         id="flowPara1899">Service</flowPara><flowPara
-         id="flowPara1901">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 540.10438,340.23154 L 573.43942,340.23154 L 579.50033,353.36352 L 572.42927,365.48536 L 540.10438,365.48536 L 547.68053,353.36352 L 540.10438,340.23154 z "
-       id="path1905" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 290,355.52305 C 329.28571,355.52305 329.28571,355.52305 329.28571,355.52305"
-       id="path1913" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 475,353.3802 C 547.14286,352.66591 547.14286,352.66591 547.14286,352.66591"
-       id="path1919" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1921"
-       transform="translate(95.23912,80.79069)"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1923"><rect
-           id="rect1925"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1931">currency</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1933"
-       transform="translate(-42.61803,130.0764)"
-       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1935"><rect
-           id="rect1937"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1939">Account</flowPara><flowPara
-         id="flowPara1941">Service</flowPara><flowPara
-         id="flowPara1943" /></flowRoot>  </g>
-</svg>
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
deleted file mode 100644
index 1625ff5b65..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
+++ /dev/null
@@ -1,43 +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 bigbank.account;
-
-import java.util.List;
-
-/**
- */
-public class AccountReport {
-    private List<String> summaries;
-    private String currency;
-    
-    public AccountReport(String currency, List<String> summaries) {
-        this.currency = currency;
-        this.summaries = summaries;
-    }
-
-    public List getAccountSummaries() { return summaries; }
-    
-    public String getCurrency() { return currency; }
-    
-    @Override
-    public String toString() {
-        return "currency: "+ currency + ", " + summaries;
-    }
-    
-}
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
deleted file mode 100644
index 7c9082b944..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
+++ /dev/null
@@ -1,26 +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 bigbank.account;
-
-/**
- * Interface for a account service
- */
-public interface AccountService {
-    public AccountReport getAccountReport(String customerID);
-}
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
deleted file mode 100644
index 7a3c184cb2..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.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 bigbank.account;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-import bigbank.accountdata.AccountDataService;
-import bigbank.accountdata.CheckingAccount;
-import bigbank.accountdata.SavingsAccount;
-import bigbank.accountdata.StockAccount;
-import bigbank.stockquote.StockQuoteService;
-
-/**
- * Account service implementation
- */
-public class AccountServiceImpl implements AccountService {
-
-    @Reference
-    public AccountDataService accountDataService;
-    
-    @Reference
-    public StockQuoteService stockQuoteService;
-    
-    @Property
-    public String currency;
-
-    public AccountReport getAccountReport(String s) {
-        List<String> summaries = new ArrayList<String>();
-
-        CheckingAccount ca = accountDataService.getCheckingAccount(s);
-        summaries.add(ca.getSummary());
-
-        SavingsAccount sa = accountDataService.getSavingsAccount(s);
-        summaries.add(sa.getSummary());
-
-        StockAccount sk = accountDataService.getStockAccount(s);
-        
-        double price = stockQuoteService.getQuote(sk.getSymbol());
-        sk.setBalance(sk.getQuantity() * price);
-        
-        summaries.add(sk.getSummary());
-
-        AccountReport report = new AccountReport(currency, summaries);
-        
-        return report;
-    }
-
-}
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
deleted file mode 100644
index a5ae7b3955..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
+++ /dev/null
@@ -1,26 +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 bigbank.accountdata;
-
-/**
- * Interface for a account service
- */
-public interface Account {
-    String getSummary();
-}
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
deleted file mode 100644
index c354de387b..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
+++ /dev/null
@@ -1,28 +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 bigbank.accountdata;
-
-/**
- * Interface for a account data service
- */
-public interface AccountDataService {
-    public CheckingAccount getCheckingAccount(String customerID);
-    public SavingsAccount getSavingsAccount(String customerID);
-    public StockAccount getStockAccount(String customerID);
-}
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index 000acb935c..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ /dev/null
@@ -1,54 +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 bigbank.accountdata;
-
-
-/**
- * Account data service implementation
- */
-public class AccountDataServiceImpl implements AccountDataService {
-
-	public CheckingAccount getCheckingAccount(String customerID) {
-
-		CheckingAccount checkingAccount = new CheckingAccount();
-		checkingAccount.setAccountNumber(customerID+"_"+"CHA12345");
-		checkingAccount.setBalance(1500.0f);
-
-		return checkingAccount;
-	}
-
-	public SavingsAccount getSavingsAccount(String customerID) {
-
-		SavingsAccount savingsAccount = new SavingsAccount();
-		savingsAccount.setAccountNumber(customerID+"_"+"SAA12345");
-		savingsAccount.setBalance(1500.0f);
-
-		return savingsAccount;
-	}
-
-	public StockAccount getStockAccount(String customerID) {
-
-		StockAccount stockAccount = new StockAccount();
-		stockAccount.setAccountNumber(customerID+"_"+"STA12345");
-		stockAccount.setSymbol("IBM");
-		stockAccount.setQuantity(100);
-
-		return stockAccount;
-	}
-}
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
deleted file mode 100644
index 11bdff757e..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ /dev/null
@@ -1,35 +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 bigbank.accountdata;
-
-/**
- * An account service implementation for a checking account
- */
-public class CheckingAccount implements Account {
-    private String accountNumber;
-    private double balance;
-
-    public String getAccountNumber() { return accountNumber; }
-    public void setAccountNumber(String n) { this.accountNumber = n; }
-
-    public double getBalance() { return balance; }
-    public void setBalance(double b) { this.balance = b; }
-
-    public String getSummary() { return "ID:" + accountNumber + ", balance:" + balance; }
-}
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
deleted file mode 100644
index b791024076..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ /dev/null
@@ -1,35 +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 bigbank.accountdata;
-
-/**
- * An account service implementation for a savings account
- */
-public class SavingsAccount implements Account {
-    private String accountNumber;
-    private double balance;
-
-    public String getAccountNumber() { return accountNumber; }
-    public void setAccountNumber(String n) { this.accountNumber = n; }
-
-    public double getBalance() { return balance; }
-    public void setBalance(double b) { this.balance = b; }
-
-    public String getSummary() { return "ID:" + accountNumber + ", balance:" + balance; }    
-}
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
deleted file mode 100644
index 86246a3f84..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
+++ /dev/null
@@ -1,43 +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 bigbank.accountdata;
-
-/**
- * An account service implementation for a stock account
- */
-public class StockAccount implements Account {
-    private String accountNumber;
-    private String symbol;
-    private int quantity;
-    private double balance;
-
-    public String getAccountNumber() { return accountNumber; }
-    public void setAccountNumber(String n) { this.accountNumber = n; }
-
-    public double getQuantity() { return quantity; }
-    public void setQuantity(int a) { this.quantity = a; }
-
-    public String getSymbol() { return symbol; }
-    public void setSymbol(String s) { this.symbol = s; }
-    
-    public double getBalance() { return balance; }
-    public void setBalance(double balance) { this.balance = balance; }
-
-    public String getSummary() { return "ID:" + accountNumber + ", symbol:" + symbol + ", quantity:" + quantity + ", balance:" + balance; }
-}
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
deleted file mode 100644
index edbf910d37..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ /dev/null
@@ -1,43 +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 bigbank.client;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import bigbank.account.AccountService;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class BigBankClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("BigBank.composite");
-        
-        AccountService accountService = scaDomain.getService(AccountService.class,
-                                                          "AccountServiceComponent");
-
-        System.out.println("Account summary: " + accountService.getAccountReport("Foo") );
-
-        scaDomain.close();
-    }  
-
-}
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
deleted file mode 100644
index 0512d40b0b..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.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 bigbank.stockquote;
-
-
-/**
- * This class implements the StockQuote service.
- */
-public class StockQuoteImpl implements StockQuoteService {
-
-    public double getQuote(String symbol) {
-        double price = 104.0 + Math.random();
-        price = ((int)(price * 100)) / 100.0;
-
-        System.out.println("Getting stock quote for: " + symbol + ", value: "+ price);
-
-        return price;
-    }
-
-}
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
deleted file mode 100644
index 4770c214ab..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.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 bigbank.stockquote;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-/**
- * This is the business interface of the StockQuote service.
- */
-@Remotable
-public interface StockQuoteService {
-
-    public double getQuote(String symbol);
-}
-
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/resources/Account.composite b/java/sca-contrib/samples/simple-bigbank/src/main/resources/Account.composite
deleted file mode 100644
index e71615e27e..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/resources/Account.composite
+++ /dev/null
@@ -1,38 +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://account"
-	name="Account">
-           
-    <service name="AccountService" promote="AccountServiceComponent"/>
-
-    <component name="AccountServiceComponent">
-        <implementation.java class="bigbank.account.AccountServiceImpl"/>
-        <reference name="accountDataService" target="AccountDataServiceComponent"/>
-        <property name="currency">USD</property>
-    </component>
-
-    <component name="AccountDataServiceComponent">
-        <implementation.java class="bigbank.accountdata.AccountDataServiceImpl"/>
-    </component>
-    
-    <reference name="stockQuoteService" promote="AccountServiceComponent/stockQuoteService"/>
-
-</composite>
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/resources/BigBank.composite b/java/sca-contrib/samples/simple-bigbank/src/main/resources/BigBank.composite
deleted file mode 100644
index c870f39cab..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/resources/BigBank.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://bigbank"
-	xmlns:a="http://account"
-	xmlns:s="http://stockquote"
-	name="BigBank">
-
-    <component name="AccountServiceComponent">
-        <implementation.composite name="a:Account"/>
-        <reference name="stockQuoteService" target="StockQuoteServiceComponent"/>
-    </component>
-
-    <component name="StockQuoteServiceComponent">
-        <implementation.composite name="s:StockQuote"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/resources/StockQuote.composite b/java/sca-contrib/samples/simple-bigbank/src/main/resources/StockQuote.composite
deleted file mode 100644
index 4f29c14851..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/main/resources/StockQuote.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"
-	   targetNamespace="http://stockquote"
-           name="StockQuote">
-
-    <service name="StockQuoteService" promote="StockQuoteServiceComponent"/>
-
-    <component name="StockQuoteServiceComponent">
-        <implementation.java class="bigbank.stockquote.StockQuoteImpl" />
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/java/sca-contrib/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
deleted file mode 100644
index ba6c1dd797..0000000000
--- a/java/sca-contrib/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
+++ /dev/null
@@ -1,50 +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 bigbank;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import bigbank.account.AccountService;
-
-/**
- * Tests out the big bank service
- *
- */
-public class BigBankTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    AccountService accountService;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("BigBank.composite");
-        accountService = scaDomain.getService(AccountService.class, "AccountServiceComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-        System.out.println("Account summary: " + accountService.getAccountReport("Foo") );
-    }
-}
diff --git a/java/sca-contrib/samples/simple-callback-ws/README b/java/sca-contrib/samples/simple-callback-ws/README
deleted file mode 100644
index 6b27718f74..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/README
+++ /dev/null
@@ -1,144 +0,0 @@
-Simple Callback Sample Using Web Services
-=========================================
-This sample demonstrates asynchronous messaging using a callback over the
-Web Service binding.  It is very similar to the simple-callback sample.
-The only differences are that simplecallback.composite has been updated
-to use the Web Service binding, and there is a simplecallback.wsdl file.
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-simple-callback.jar simplecallback.SimpleCallbackClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-simple-callback.jar simplecallback.SimpleCallbackClient
-
-
-Sample Overview
----------------
-The sample provides a single composite with two components. MyClientComponent is 
-wired to MyServiceComponent. The interface of MyServiceComponent describes one
-method as ONEWAY and with a callback semantic. When a message passes from 
-client to service the response is returned via the callback asynchronously.  
-
-simple-callback/
-  src/
-    main/
-      java/
-        simplecallback/
-          MyClient.java           - client interface 
-          MyClientImpl.java       - implements the client and service callback
-                                    interfaces
-          MyService.java          - service interface
-          MyServiceCallback.java  - service callback interface, implemented by the 
-                                    client
-          MyServiceImpl.java      - implements the service interface
-          SimpleCallbackClient.java - starts the SCA Runtime and 
-                                    deploys the simplecallback.composite. 
-                                    It then calls MyClientComponent which in turn
-                                    calls MyServiceComponent
-      resources/
-        simplecallback.composite  - the SCA assembly for this sample
-        wsdl/
-          simplecallback.wsdl     - the service description and callback binding  
-    test/
-      java/
-        simplecallback/
-          SimpleCallbackTestCase.java - JUnit test case 
-  simple-callback.png             - a pictorial representation of the sample 
-                                    .composite file
-  build.xml                       - the Ant build file
-  pom.xml                         - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd simple-callback-ws
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] 14-Jan-2008 14:25:02 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:8085/MyServiceCallbackCo
-mponent
-     [java] 14-Jan-2008 14:25:02 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:8085/MyServiceComponent
-     [java] Main thread Thread[main,5,main]
-     [java] aClientMethod on thread Thread[main,5,main]
-     [java] aClientMethod return from someMethod on thread Thread[main,5,main]
-     [java] setMyServiceCallback on thread Thread[pool-1-thread-2,5,main]
-     [java] someMethod on thread Thread[pool-1-thread-2,5,main]
-     [java] receiveResult on thread Thread[pool-1-thread-4,5,main]
-     [java] Result: -> someMethod -> receiveResult
-
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd simple-callback-ws
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running simplecallback.SimpleCallbackTestCase
-14-Jan-2008 14:26:28 org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-14-Jan-2008 14:26:28 org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-14-Jan-2008 14:26:28 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-14-Jan-2008 14:26:28 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_
-1.dtd
-14-Jan-2008 14:26:28 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_
-2.dtd
-14-Jan-2008 14:26:28 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_
-0.xsd
-14-Jan-2008 14:26:28 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs
-d
-14-Jan-2008 14:26:28 org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:26:28 org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:26:28 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM
-apping
-INFO: Added Servlet mapping: http://L3AW203:8085/MyServiceCallbackComponent
-14-Jan-2008 14:26:28 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM
-apping
-INFO: Added Servlet mapping: http://L3AW203:8085/MyServiceComponent
-Main thread Thread[main,5,main]
-aClientMethod on thread Thread[main,5,main]
-aClientMethod return from someMethod on thread Thread[main,5,main]
-Sleeping ...
-setMyServiceCallback on thread Thread[pool-1-thread-1,5,main]
-someMethod on thread Thread[pool-1-thread-1,5,main]
-receiveResult on thread Thread[pool-1-thread-2,5,main]
-Result: -> someMethod -> receiveResult
-14-Jan-2008 14:26:31 org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8085
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.312 sec
-
-This shows that the Junit test cases have run successfully.
diff --git a/java/sca-contrib/samples/simple-callback-ws/build.xml b/java/sca-contrib/samples/simple-callback-ws/build.xml
deleted file mode 100644
index 10b69bd395..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="simple-callback-ws" default="compile">
-    <property name="test.class" value="simplecallback.SimpleCallbackClient" />
-	<property name="test.jar"   value="sample-simple-callback-ws.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/simple-callback-ws/pom.xml b/java/sca-contrib/samples/simple-callback-ws/pom.xml
deleted file mode 100644
index 5b5d5e666b..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/pom.xml
+++ /dev/null
@@ -1,79 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-simple-callback-ws</artifactId>
-    <name>Apache Tuscany SCA Simple Callback Web Service Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/simple-callback-ws/simple-callback-ws.png b/java/sca-contrib/samples/simple-callback-ws/simple-callback-ws.png
deleted file mode 100644
index 1b6353f5cf..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/simple-callback-ws.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/simple-callback-ws/simple-callback-ws.svg b/java/sca-contrib/samples/simple-callback-ws/simple-callback-ws.svg
deleted file mode 100644
index 7d9e3de510..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/simple-callback-ws.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

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

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.44"

-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-callback"

-   sodipodi:docname="simple-callback.svg"

-   version="1.0">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="1.4"

-     inkscape:cx="375"

-     inkscape:cy="414.63224"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="721"

-     inkscape:window-x="74"

-     inkscape:window-y="306" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997">

-      <rect

-         rx="15.307091"

-         ry="12.692303"

-         y="192.00233"

-         x="258.31146"

-         height="299.99988"

-         width="495.71429"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999964;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">simplecallback</flowPara></flowRoot>      <rect

-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-         id="rect1883"

-         width="115.66247"

-         height="85.862968"

-         x="549.39777"

-         y="308.7417"

-         rx="6.9961648"

-         ry="7.1230249" />

-      <flowRoot

-         xml:space="preserve"

-         id="flowRoot1885"

-         transform="translate(281.807,102.8031)"><flowRegion

-           id="flowRegion1887"><rect

-             id="rect1889"

-             width="170"

-             height="61.42857"

-             x="281.42856"

-             y="212.66591" /></flowRegion><flowPara

-           id="flowPara1891">MyService</flowPara><flowPara

-           id="flowPara1915">Component</flowPara></flowRoot>      <path

-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-         d="M 532.24723,340.58867 L 565.58227,340.58867 L 571.64318,353.72065 L 564.57212,365.84249 L 532.24723,365.84249 L 539.82338,353.72065 L 532.24723,340.58867 z "

-         id="path1895" />

-    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="85.862968"

-       x="339.91632"

-       y="310.73904"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(72.32554,104.8005)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">MyClient</flowPara><flowPara

-         id="flowPara1913">Component</flowPara></flowRoot>    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 436.01825,340.74775 L 469.35329,340.74775 L 475.4142,353.87973 L 468.34314,366.00157 L 436.01825,366.00157 L 443.5944,353.87973 L 436.01825,340.74775 z "

-       id="path3019" />

-    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 474.28571,353.3802 L 539.28571,354.09448"

-       id="path1917"

-       inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-callback\simple-callback.png"

-       inkscape:export-xdpi="52.84"

-       inkscape:export-ydpi="52.84" />

-  </g>

-</svg>

diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java b/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
deleted file mode 100644
index 4cc00d6d0f..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
+++ /dev/null
@@ -1,27 +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 simplecallback;
-
-/**
- * The client interface
- */
-public interface MyClient {
-
-    void aClientMethod();
-}
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
deleted file mode 100644
index 7ecb51036f..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
+++ /dev/null
@@ -1,51 +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 simplecallback;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Demonstrates a component-to-component callback invocation
- */
-@Service(MyClient.class)
-@Scope("COMPOSITE")
-public class MyClientImpl implements MyClient, MyServiceCallback {
-
-    private MyService myService;
-    static String result;
-
-    @Reference
-    public void setMyService(MyService myService) {
-        this.myService = myService;
-    }
-
-    public void aClientMethod() {
-        System.out.println("aClientMethod on thread " + Thread.currentThread());
-        myService.someMethod("-> someMethod");
-        System.out.println("aClientMethod return from someMethod on thread " + Thread.currentThread());
-    }
-
-    public void receiveResult(String result) {
-        System.out.println("receiveResult on thread " + Thread.currentThread());
-        System.out.println("Result: " + result);
-        MyClientImpl.result = result;
-    }
-}
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
deleted file mode 100644
index 7a72f50964..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
+++ /dev/null
@@ -1,34 +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 simplecallback;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This service that will be invoked in a non-blocking fashion
- */
-@Remotable
-@Callback(MyServiceCallback.class)
-public interface MyService {
-
-    @OneWay
-    void someMethod(String arg);
-}
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
deleted file mode 100644
index dd26439619..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
+++ /dev/null
@@ -1,30 +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 simplecallback;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The callback interface for {@link MyService}.
- */
-@Remotable
-public interface MyServiceCallback {
-
-    void receiveResult(String result);
-}
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
deleted file mode 100644
index 6a31d90458..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
+++ /dev/null
@@ -1,54 +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 simplecallback;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements MyService and uses a callback.
- */
-@Service(MyService.class)
-@Scope("COMPOSITE")
-public class MyServiceImpl implements MyService {
-
-    private MyServiceCallback myServiceCallback;
-
-    /**
-     * The setter used by the runtime to set the callback reference 
-     * @param myServiceCallback
-     */
-    @Callback
-    public void setMyServiceCallback(MyServiceCallback myServiceCallback) {
-        System.out.println("setMyServiceCallback on thread " + Thread.currentThread());
-        this.myServiceCallback = myServiceCallback;
-    }
-    
-    public void someMethod(String arg) {
-        System.out.println("someMethod on thread " + Thread.currentThread());
-        // invoke the callback
-        try {
-            myServiceCallback.receiveResult(arg + " -> receiveResult");
-        } catch(RuntimeException e) {
-            System.out.println("RuntimeException invoking receiveResult: " + e.toString());
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java b/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
deleted file mode 100644
index eeb0e52163..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
+++ /dev/null
@@ -1,38 +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 simplecallback;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Demonstrates resolving the client service and initiating the callback sequence
- */
-public class SimpleCallbackClient {
-
-    public static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("simplecallback.composite");
-        MyClient myClient = scaDomain.getService(MyClient.class, "MyClientComponent");
-        
-        System.out.println("Main thread " + Thread.currentThread());
-        myClient.aClientMethod();
-        Thread.sleep(1000);
-        
-        scaDomain.close();
-    }
-}
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/resources/simplecallback.composite b/java/sca-contrib/samples/simple-callback-ws/src/main/resources/simplecallback.composite
deleted file mode 100644
index 53e7fe66af..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/resources/simplecallback.composite
+++ /dev/null
@@ -1,49 +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://simplecallback"

-	xmlns:cb="http://simplecallback"

-	name="simplecallback">

-

-    <component name="MyClientComponent">

-        <implementation.java class="simplecallback.MyClientImpl" />
-        <reference name="myService">

-            <interface.java interface="simplecallback.MyService"

-                callbackInterface="simplecallback.MyServiceCallback" />

-            <binding.ws wsdlElement="http://simplecallback#wsdl.port(MyServiceSoapService/MyServiceSoapPort)" />

-            <callback>

-                <binding.ws wsdlElement="http://simplecallback#wsdl.port(MyServiceCallbackSoapService/MyServiceCallbackSoapPort)" />

-            </callback>

-        </reference>

-    </component>

-

-    <component name="MyServiceComponent">

-        <implementation.java class="simplecallback.MyServiceImpl" />
-        <service name="MyService">

-            <interface.wsdl interface="http://simplecallback#wsdl.interface(MyService)"

-                callbackInterface="http://simplecallback#wsdl.interface(MyServiceCallback)" />

-            <binding.ws wsdlElement="http://simplecallback#wsdl.port(MyServiceSoapService/MyServiceSoapPort)" />

-            <callback>

-                <binding.ws wsdlElement="http://simplecallback#wsdl.port(MyServiceCallbackSoapService/MyServiceCallbackSoapPort)" />

-            </callback>

-        </service>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl b/java/sca-contrib/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
deleted file mode 100644
index 8a6465de3a..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
+++ /dev/null
@@ -1,109 +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://simplecallback" xmlns:tns="http://simplecallback" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    name="simplecallback">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://simplecallback" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="someMethod">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="receiveResult">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="receiveResultResponse">
-                <complexType/>
-            </element>
-
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="someMethodRequest">
-        <wsdl:part element="tns:someMethod" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="receiveResultRequest">
-        <wsdl:part element="tns:receiveResult" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="receiveResultResponse">
-        <wsdl:part element="tns:receiveResultResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="MyService">
-        <wsdl:operation name="someMethod">
-            <wsdl:input message="tns:someMethodRequest" name="someMethodRequest"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:portType name="MyServiceCallback">
-        <wsdl:operation name="receiveResult">
-            <wsdl:input message="tns:receiveResultRequest" name="receiveResultRequest"/>
-            <wsdl:output message="tns:receiveResultResponse" name="receiveResultResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="MyServiceSoapBinding" type="tns:MyService">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="someMethod">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="someMethodRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:binding name="MyServiceCallbackSoapBinding" type="tns:MyServiceCallback">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="receiveResult">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="receiveResultRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="receiveResultResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="MyServiceSoapService">
-        <wsdl:port binding="tns:MyServiceSoapBinding" name="MyServiceSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/MyServiceComponent"/>
-        </wsdl:port>
-    </wsdl:service>
-
-    <wsdl:service name="MyServiceCallbackSoapService">
-        <wsdl:port binding="tns:MyServiceCallbackSoapBinding" name="MyServiceCallbackSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/MyServiceCallbackComponent"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java b/java/sca-contrib/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
deleted file mode 100644
index 580a7f6b0c..0000000000
--- a/java/sca-contrib/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ /dev/null
@@ -1,53 +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 simplecallback;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * A testcase that demonstrates resolving the client service and initiating the callback sequence
- */
-public class SimpleCallbackTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private MyClient myClient;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("simplecallback.composite");
-        myClient = scaDomain.getService(MyClient.class, "MyClientComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-        System.out.println("Main thread " + Thread.currentThread());
-        myClient.aClientMethod();
-        System.out.println("Sleeping ...");
-        Thread.sleep(2000);
-        assertEquals("-> someMethod -> receiveResult", MyClientImpl.result);
-    }
-}
-
-
diff --git a/java/sca-contrib/samples/simple-callback/README b/java/sca-contrib/samples/simple-callback/README
deleted file mode 100644
index 719376f254..0000000000
--- a/java/sca-contrib/samples/simple-callback/README
+++ /dev/null
@@ -1,97 +0,0 @@
-Simple Callback Sample
-======================
-This sample demonstrates asynchronous messaging using a callback. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-simple-callback.jar simplecallback.SimpleCallbackClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-simple-callback.jar simplecallback.SimpleCallbackClient
-
-
-Sample Overview
----------------
-The sample provides a single composite with two components. MyClientComponent is 
-wired to MyServiceComponent. The interface of MyServiceComponent describes one
-method as ONEWAY and with a callback semantic. When a message passes from 
-client to service the response is returned via the callback asynchronously.  
-
-simple-callback/
-  src/
-    main/
-      java/
-        simplecallback/
-          MyClient.java           - client interface 
-          MyClientImpl.java       - implements the client and service callback
-                                    interfaces
-          MyService.java          - service interface
-          MyServiceCallback.java  - service callback interface, implemented by the 
-                                    client
-          MyServiceImpl.java      - implements the service interface
-          SimpleCallbackClient.java - starts the SCA Runtime and 
-                                    deploys the simplecallback.composite. 
-                                    It then calls MyClientComponent which in turn
-                                    calls MyServiceComponent
-      resources/
-        simplecallback.composite  - the SCA assembly for this sample
-    test/
-      java/
-        simplecallback/
-          SimpleCallbackTestCase.java - JUnit test case 
-  simple-callback.png             - a pictorial representation of the sample 
-                                    .composite file
-  build.xml                       - the Ant build file
-  pom.xml                         - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd simple-callback
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] Main thread Thread[main,5,main]
-     [java] Work thread Thread[pool-1-thread-1,5,main]
-     [java] Result: -> someMethod -> receiveResult
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd simple-callback
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running simplecallback.SimpleCallbackTestCase
-Main thread Thread[main,5,main]
-Sleeping ...
-Work thread Thread[pool-1-thread-1,5,main]
-Result: -> someMethod -> receiveResult
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.692 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
diff --git a/java/sca-contrib/samples/simple-callback/build.xml b/java/sca-contrib/samples/simple-callback/build.xml
deleted file mode 100644
index 47d1ea4bc1..0000000000
--- a/java/sca-contrib/samples/simple-callback/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="simple-callback" default="compile">
-    <property name="test.class" value="simplecallback.SimpleCallbackClient" />
-	<property name="test.jar"   value="sample-simple-callback.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/simple-callback/pom.xml b/java/sca-contrib/samples/simple-callback/pom.xml
deleted file mode 100644
index 056aef6a1e..0000000000
--- a/java/sca-contrib/samples/simple-callback/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-simple-callback</artifactId>
-    <name>Apache Tuscany SCA Simple Callback Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/simple-callback/simple-callback.png b/java/sca-contrib/samples/simple-callback/simple-callback.png
deleted file mode 100644
index 1b6353f5cf..0000000000
--- a/java/sca-contrib/samples/simple-callback/simple-callback.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/simple-callback/simple-callback.svg b/java/sca-contrib/samples/simple-callback/simple-callback.svg
deleted file mode 100644
index 484b65df9d..0000000000
--- a/java/sca-contrib/samples/simple-callback/simple-callback.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-callback"
-   sodipodi:docname="simple-callback.svg"
-   version="1.0">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="375"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1054"
-     inkscape:window-height="721"
-     inkscape:window-x="74"
-     inkscape:window-y="306" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997">
-      <rect
-         rx="15.307091"
-         ry="12.692303"
-         y="192.00233"
-         x="258.31146"
-         height="299.99988"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999964;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">simplecallback</flowPara></flowRoot>      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect1883"
-         width="115.66247"
-         height="85.862968"
-         x="549.39777"
-         y="308.7417"
-         rx="6.9961648"
-         ry="7.1230249" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot1885"
-         transform="translate(281.807,102.8031)"><flowRegion
-           id="flowRegion1887"><rect
-             id="rect1889"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara1891">MyService</flowPara><flowPara
-           id="flowPara1915">Component</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 532.24723,340.58867 L 565.58227,340.58867 L 571.64318,353.72065 L 564.57212,365.84249 L 532.24723,365.84249 L 539.82338,353.72065 L 532.24723,340.58867 z "
-         id="path1895" />
-    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="339.91632"
-       y="310.73904"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(72.32554,104.8005)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">MyClient</flowPara><flowPara
-         id="flowPara1913">Component</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 436.01825,340.74775 L 469.35329,340.74775 L 475.4142,353.87973 L 468.34314,366.00157 L 436.01825,366.00157 L 443.5944,353.87973 L 436.01825,340.74775 z "
-       id="path3019" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 474.28571,353.3802 L 539.28571,354.09448"
-       id="path1917"
-       inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-callback\simple-callback.png"
-       inkscape:export-xdpi="52.84"
-       inkscape:export-ydpi="52.84" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyClient.java
deleted file mode 100644
index 4cc00d6d0f..0000000000
--- a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyClient.java
+++ /dev/null
@@ -1,27 +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 simplecallback;
-
-/**
- * The client interface
- */
-public interface MyClient {
-
-    void aClientMethod();
-}
diff --git a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
deleted file mode 100644
index 18e159edc3..0000000000
--- a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.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 simplecallback;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Demonstrates a component-to-component callback invocation
- */
-@Service(MyClient.class)
-@Scope("COMPOSITE")
-public class MyClientImpl implements MyClient, MyServiceCallback {
-
-    private MyService myService;
-    static String result;
-
-    @Reference
-    public void setMyService(MyService myService) {
-        this.myService = myService;
-    }
-
-    public void aClientMethod() {
-        myService.someMethod("-> someMethod");
-    }
-
-    public void receiveResult(String result) {
-        System.out.println("Work thread " + Thread.currentThread());
-        System.out.println("Result: " + result);
-        MyClientImpl.result = result;
-    }
-}
diff --git a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyService.java b/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyService.java
deleted file mode 100644
index a065408954..0000000000
--- a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyService.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 simplecallback;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.OneWay;
-
-/**
- * This service that will be invoked in a non-blocking fashion
- */
-@Callback(MyServiceCallback.class)
-public interface MyService {
-
-    @OneWay
-    void someMethod(String arg);
-}
diff --git a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
deleted file mode 100644
index b27eea44f5..0000000000
--- a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
+++ /dev/null
@@ -1,27 +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 simplecallback;
-
-/**
- * The callback interface for {@link MyService}.
- */
-public interface MyServiceCallback {
-
-    void receiveResult(String result);
-}
diff --git a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
deleted file mode 100644
index dc5493babe..0000000000
--- a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
+++ /dev/null
@@ -1,51 +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 simplecallback;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements MyService and uses a callback.
- */
-@Service(MyService.class)
-@Scope("COMPOSITE")
-public class MyServiceImpl implements MyService {
-
-    private MyServiceCallback myServiceCallback;
-
-    /**
-     * The setter used by the runtime to set the callback reference 
-     * @param myServiceCallback
-     */
-    @Callback
-    public void setMyServiceCallback(MyServiceCallback myServiceCallback) {
-        this.myServiceCallback = myServiceCallback;
-    }
-    
-    public void someMethod(String arg) {
-        // invoke the callback
-        try {
-            myServiceCallback.receiveResult(arg + " -> receiveResult");
-        } catch(RuntimeException e) {
-            System.out.println("RuntimeException invoking receiveResult: " + e.toString());
-        }
-    }
-}
diff --git a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
deleted file mode 100644
index b8987fcd07..0000000000
--- a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
+++ /dev/null
@@ -1,38 +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 simplecallback;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Demonstrates resolving the client service and initiating the callback sequence
- */
-public class SimpleCallbackClient {
-
-    public static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("simplecallback.composite");
-        MyClient myClient = scaDomain.getService(MyClient.class, "MyClientComponent");
-        
-        System.out.println("Main thread " + Thread.currentThread());
-        myClient.aClientMethod();
-        Thread.sleep(500);
-        
-        scaDomain.close();
-    }
-}
diff --git a/java/sca-contrib/samples/simple-callback/src/main/resources/simplecallback.composite b/java/sca-contrib/samples/simple-callback/src/main/resources/simplecallback.composite
deleted file mode 100644
index 33e6f60601..0000000000
--- a/java/sca-contrib/samples/simple-callback/src/main/resources/simplecallback.composite
+++ /dev/null
@@ -1,34 +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://simplecallback"
-	xmlns:cb="http://simplecallback"
-	name="simplecallback">
-
-    <component name="MyClientComponent">
-        <implementation.java class="simplecallback.MyClientImpl"/>
-        <reference name="myService" target="MyServiceComponent"/>
-    </component>
-    
-    <component name="MyServiceComponent">
-        <implementation.java class="simplecallback.MyServiceImpl"/>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/java/sca-contrib/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
deleted file mode 100644
index cbaab8af83..0000000000
--- a/java/sca-contrib/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ /dev/null
@@ -1,51 +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 simplecallback;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * A testcase that demonstrates resolving the client service and initiating the callback sequence
- */
-public class SimpleCallbackTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private MyClient myClient;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("simplecallback.composite");
-        myClient = scaDomain.getService(MyClient.class, "MyClientComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-        System.out.println("Main thread " + Thread.currentThread());
-        myClient.aClientMethod();
-        System.out.println("Sleeping ...");
-        Thread.sleep(300);
-        assertEquals("-> someMethod -> receiveResult", MyClientImpl.result);
-    }
-}
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/pom.xml b/java/sca-contrib/samples/spi-implementation-pojo/pom.xml
deleted file mode 100644
index 870c67b5f2..0000000000
--- a/java/sca-contrib/samples/spi-implementation-pojo/pom.xml
+++ /dev/null
@@ -1,59 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-spi-implementation-java</artifactId>
-    <name>Apache Tuscany Java Implementation SPI Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extension-helper</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java b/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
deleted file mode 100644
index 73104c3166..0000000000
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
+++ /dev/null
@@ -1,35 +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 sample;
-
-
-public class JavaImplementation {
-    
-    private String className;
-
-    public String getClass_() {
-        return className;
-    }
-
-    public void setClass_(String className) {
-        this.className = className;
-    }
-
-}
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java b/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
deleted file mode 100644
index 43efae32ca..0000000000
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.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 sample;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.spi.ImplementationActivator;
-import org.apache.tuscany.sca.spi.InvokerFactory;
-
-public class JavaImplementationActivator implements ImplementationActivator<JavaImplementation> {
-
-    public Class<JavaImplementation> getImplementationClass() {
-        return JavaImplementation.class;
-    }
-
-    public InvokerFactory createInvokerFactory(RuntimeComponent rc, ComponentType ct, JavaImplementation implementation) {
-        return new JavaInvokerFactory(rc, ct, implementation);
-    }
-
-}
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java b/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
deleted file mode 100644
index b33d9a3644..0000000000
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.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 sample;
-
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-public class JavaInvoker implements Invoker {
-
-    protected Class clazz;
-    protected Object instance;
-    protected Operation operation;
-    
-    public JavaInvoker(Class clazz, Object instance, Operation operation) {
-        this.clazz = clazz;
-        this.instance = instance;
-        this.operation = operation;
-    }
-    
-    public Message invoke(Message msg) {
-        try {
-            msg.setBody(getMethod().invoke(instance, (Object[])msg.getBody()));
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-        return msg;
-    }
-    
-    protected Method getMethod() {
-        for (Method method : clazz.getMethods()) {
-            if (method.getName().equals(operation.getName())) {
-                return method;
-            }
-        }
-        throw new ServiceRuntimeException("no method found for operation: " + operation.getName());
-    }
-
-}
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java b/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
deleted file mode 100644
index 92c92eb309..0000000000
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
+++ /dev/null
@@ -1,47 +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 sample;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.spi.InvokerFactory;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-public class JavaInvokerFactory implements InvokerFactory {
-
-    protected Object instance;
-    protected Class clazz;
-    
-    public JavaInvokerFactory(RuntimeComponent rc, ComponentType ct, JavaImplementation implementation) {
-        try {
-            this.clazz = Class.forName(implementation.getClass_());
-            this.instance = clazz.newInstance();
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public Invoker createInvoker(Operation operation) {
-       return new JavaInvoker(clazz, instance, operation);
-    }
-
-}
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator b/java/sca-contrib/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
deleted file mode 100644
index 95ee37c1aa..0000000000
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
+++ /dev/null
@@ -1,18 +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. 

-# Implementation class for the ExtensionActivator

-sample.JavaImplementationActivator

diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java b/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
deleted file mode 100644
index cc32929f09..0000000000
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
+++ /dev/null
@@ -1,26 +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 helloworld;
-
-public interface HelloWorld {
-    
-    String sayHello(String name);
-
-}
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java b/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 02af1ccf22..0000000000
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,28 +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 helloworld;
-
-public class HelloWorldImpl implements HelloWorld {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java b/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index 5813fda330..0000000000
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
+++ /dev/null
@@ -1,35 +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 helloworld;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- */
-public class HelloWorldTestCase extends TestCase {
-
-    public void testHello() throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("helloworld/helloworld.composite");
-        HelloWorld helloworld = scaDomain.getService(HelloWorld.class, "HelloWorldComponent");
-        assertEquals("Hello petra", helloworld.sayHello("petra"));
-        scaDomain.close();
-    }
-}
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite b/java/sca-contrib/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index fa9cecc160..0000000000
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
+++ /dev/null
@@ -1,28 +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://test/helloworld"
-	name="helloworld">

-

-    <component name="HelloWorldComponent">

-        <implementation.java class="helloworld.HelloWorldImpl" />

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/README b/java/sca-contrib/samples/spring-bigbank-calculator/README
deleted file mode 100644
index 3869ea6a12..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Spring-bigbank-calculator is part of a spring-bigbank sample. 

-Please see the Readme file under spring-bigbank to understand how spring-bigbank-calculator fits into the overall picture.

diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/build.xml b/java/sca-contrib/samples/spring-bigbank-calculator/build.xml
deleted file mode 100644
index 9d69ee9ba0..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/build.xml
+++ /dev/null
@@ -1,72 +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.    

--->

-<project name="spring-bigbank-calculator" default="run">

-    <property name="test.class" value="bigbank.calculator.server.CalculatorServer" />

-    <property name="test.jar"   value="sample-spring-bigbank-calculator.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/pom.xml b/java/sca-contrib/samples/spring-bigbank-calculator/pom.xml
deleted file mode 100644
index 5f2b2452ab..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/pom.xml
+++ /dev/null
@@ -1,110 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-spring-bigbank-calculator</artifactId>

-    <name>Apache Tuscany SCA Spring-Based BigBank Calculator Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-script</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-spring</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-core</artifactId>

-            <version>2.5.5</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-beans</artifactId>

-            <version>2.5.5</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-context</artifactId>

-            <version>2.5.5</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java b/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
deleted file mode 100644
index ecaa4e28de..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
+++ /dev/null
@@ -1,25 +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 bigbank.calculator;

-

-public interface AddService {

-

-    double add(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java b/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
deleted file mode 100644
index 66a0ba0e63..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
+++ /dev/null
@@ -1,34 +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 bigbank.calculator;

-

-/**

- * The Calculator service interface.

- */

-public interface CalculatorService {

-

-    double add(double n1, double n2);

-

-    double subtract(double n1, double n2);

-

-    double multiply(double n1, double n2);

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java b/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 665dbbf9ac..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,72 +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 bigbank.calculator;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * An implementation of the Calculator service.

- */

-@Service(CalculatorService.class)

-public class CalculatorServiceImpl implements CalculatorService {

-

-    private AddService addService;

-    private SubtractService subtractService;

-    private MultiplyService multiplyService;

-    private DivideService divideService;

-

-    @Reference

-    public void setAddService(AddService addService) {

-        this.addService = addService;

-    }

-

-    @Reference

-    public void setSubtractService(SubtractService subtractService) {

-        this.subtractService = subtractService;

-    }

-

-    @Reference

-    public void setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-

-    @Reference

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-

-    public double add(double n1, double n2) {

-        return addService.add(n1, n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        System.err.println("Multiply");

-        return multiplyService.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        return divideService.divide(n1, n2);

-    }

-

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java b/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
deleted file mode 100644
index 22e9d58a94..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
+++ /dev/null
@@ -1,25 +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 bigbank.calculator;

-

-public interface DivideService {

-

-    double divide(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java b/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
deleted file mode 100644
index ba3d43448e..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
+++ /dev/null
@@ -1,25 +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 bigbank.calculator;

-

-public interface MultiplyService {

-

-    double multiply(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java b/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
deleted file mode 100644
index 17691af0e8..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
+++ /dev/null
@@ -1,25 +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 bigbank.calculator;

-

-public interface SubtractService {

-

-    double subtract(double n1, double n2);

-

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java b/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
deleted file mode 100644
index c6a230fcb4..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
+++ /dev/null
@@ -1,50 +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 bigbank.calculator.server;
-
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-public class CalculatorServer {
-
-    public static void main(String[] args) throws Exception {
-        long timeout = -1L;
-        if (args.length > 0) {
-            timeout = Long.parseLong(args[0]);
-        }
-
-        System.out.println("Starting the Sample SCA Calculator...");
-
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        SCANode node = factory.createSCANodeFromClassLoader("Calculator.composite", CalculatorServer.class.getClassLoader());
-        node.start();
-
-        if (timeout < 0) {
-            System.out.println("Press Enter to Exit...");
-            System.in.read();
-        } else {
-            Thread.sleep(timeout);
-        }
-
-        node.stop();
-        System.out.println("Bye");
-    }
-
-}
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite b/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
deleted file mode 100644
index 504a4ccfcd..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,56 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://calc"

-	xmlns:c="http://calc"

-	name="Calculator">

-	

-	<service name="CalculatorService" promote="CalculatorServiceComponent">

-	    <interface.java interface="bigbank.calculator.CalculatorService"/>

-        <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>

-    </service>

-

-    <component name="CalculatorServiceComponent">

-		<implementation.spring location="META-INF/spring/CalculatorService-context.xml"/> 

-

-        <reference name="addService" target="AddServiceComponent" />

-        <reference name="subtractService" target="SubtractServiceComponent" />

-        <reference name="multiplyService" target="MultiplyServiceComponent" />

-        <reference name="divideService" target="DivideServiceComponent" />

-    </component>

-

-    <component name="AddServiceComponent">

-        <tuscany:implementation.script script="calculator/AddServiceImpl.js"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <tuscany:implementation.script script="calculator/SubtractServiceImpl.rb"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <tuscany:implementation.script script="calculator/MultiplyServiceImpl.py"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <tuscany:implementation.script script="calculator/DivideServiceImpl.groovy"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml b/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
deleted file mode 100644
index 42e5f824f9..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
+++ /dev/null
@@ -1,45 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <sca:service name="CalculatorService"
-        type="bigbank.calculator.CalculatorService" target="CalculatorServiceBean"/>
-
-    <bean id="CalculatorServiceBean" class="bigbank.calculator.CalculatorServiceImpl">
-        <!-- Here are some implicit references - a property with a ref not satisifed within the
-         * Spring application context.
-         -->
-        <property name="addService" ref="addService"/>
-        <property name="subtractService" ref="subtractService"/>
-        <property name="multiplyService" ref="multiplyService"/>
-        <property name="divideService" ref="divideService"/>
-    </bean>
-
-    <sca:reference name="addService" type="bigbank.calculator.AddService"/>    
-    <sca:reference name="subtractService" type="bigbank.calculator.SubtractService"/>    
-    <sca:reference name="multiplyService" type="bigbank.calculator.MultiplyService"/>    
-    <sca:reference name="divideService" type="bigbank.calculator.DivideService"/>
-
-</beans>
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
deleted file mode 100644
index 6f11106ddd..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ /dev/null
@@ -1,22 +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.    

- */

-

-function add(n1, n2) {

-   return n1 + n2;

-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
deleted file mode 100644
index c31c1e8fd6..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ /dev/null
@@ -1,22 +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.    

- */

- 

-def divide(n1, n2) {

-   return n1 / n2

-}
\ No newline at end of file
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
deleted file mode 100644
index cfd96f287a..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ /dev/null
@@ -1,21 +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.

-#

- 

-def multiply(n1, n2):

-   print "Python Calculator component: multiply(", n1, ",", n2, ")"

-   return n1 * n2
\ No newline at end of file
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
deleted file mode 100644
index 8e7a884d41..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ /dev/null
@@ -1,22 +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.

-#

- 

-def subtract(n1, n2)

-    print "Ruby Calculator subtract(", n1, ",", n2, ")\n"

-    return n1 - n2

-end
\ No newline at end of file
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java b/java/sca-contrib/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java
deleted file mode 100644
index 02a11485cd..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java
+++ /dev/null
@@ -1,33 +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 bigbank.calculator;

-

-import junit.framework.TestCase;

-import bigbank.calculator.server.CalculatorServer;

-

-/**

- * Tests out the big bank service

- *

- */

-public class CalculatorServiceTestCase extends TestCase {

-

-    public void testServer() throws Exception {

-        CalculatorServer.main(new String[] {"1000"});

-    }

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/README b/java/sca-contrib/samples/spring-bigbank-checkaccount/README
deleted file mode 100644
index 17b71e7590..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Spring-bigbank-checkaccount is a part of a spring-bigbank sample.

-Please see the Readme file under spring-bigbank to understand how spring-bigbank-checkaccount fits into the overall picture.

- 

-

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/build.xml b/java/sca-contrib/samples/spring-bigbank-checkaccount/build.xml
deleted file mode 100644
index 26d71c146f..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/build.xml
+++ /dev/null
@@ -1,73 +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 name="spring-bigbank-checkaccount" default="run">    

-    <property name="test.class" value="bigbank.account.checking.server.CheckingAccountServer" />

-    <property name="test.jar"   value="sample-spring-bigbank-calculator.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/pom.xml b/java/sca-contrib/samples/spring-bigbank-checkaccount/pom.xml
deleted file mode 100644
index b46074b8c8..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/pom.xml
+++ /dev/null
@@ -1,133 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-spring-bigbank-checkaccount</artifactId>

-    <name>Apache Tuscany SCA Spring-Based BigBank Checking Accounts Sample</name>

-

-    <repositories>

-        <repository>

-            <id>apache.incubator</id>

-            <url>http://people.apache.org/repo/m2-incubating-repository</url>

-        </repository>

-    </repositories>

-

-    <dependencies>  

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-policy-security</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-core-spi</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-	    <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-spring</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-core</artifactId>

-            <version>2.5.5</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-beans</artifactId>

-            <version>2.5.5</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-context</artifactId>

-            <version>2.5.5</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.ws.security</groupId>

-            <artifactId>wss4j</artifactId>

-            <version>1.5.3</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>apache-activemq</artifactId>

-            <version>4.1.1</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.activemq</groupId>

-                    <artifactId>activemq-web-demo</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-    </dependencies>  

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
deleted file mode 100644
index 9737ac27eb..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
+++ /dev/null
@@ -1,50 +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 bigbank.account.checking;

-

-/**

- * @version $$Rev: 635619 $$ $$Date: 2007-04-09 12:03:34 -0700 (Mon, 09 Apr

- *          2007) $$

- */

-

-public class CheckingAccountDetails {

-    private String accountNumber;

-    private double balance;

-

-    public String getAccountNumber() {

-        return accountNumber;

-    }

-

-    public void setAccountNumber(String n) {

-        this.accountNumber = n;

-    }

-

-    public double getBalance() {

-        return balance;

-    }

-

-    public void setBalance(double b) {

-        this.balance = b;

-    }

-

-    @Override

-    public String toString() {

-        return accountNumber + ", balance:" + balance;

-    }

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
deleted file mode 100644
index 4d8b03fc7d..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.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 bigbank.account.checking;

-

-import org.oasisopen.sca.annotation.Remotable;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * @version $$Rev: 636465 $$ $$Date: 2008-03-13 00:49:26 +0530 (Thu, 13 Mar 2008) $$

- */

-@Service

-@Remotable

-public interface CheckingAccountService {

-    

-    public CheckingAccountDetails getAccountDetails(String customerID);

-    

-    public double deposit(String accountNo, double depositAmt);

-    

-    public double withdraw(String accountNo, double withdrawalAmount);

-    

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
deleted file mode 100644
index 3ed3086dbd..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
+++ /dev/null
@@ -1,66 +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 bigbank.account.checking;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * 

- *  */

-

-@Service(CheckingAccountService.class)

-public class CheckingAccountServiceImpl implements CheckingAccountService {

-    private Map<String, String> custAcctMap = new HashMap<String, String>();

-    private Map<String, Double> checkingAccts = new HashMap<String, Double>();

-    

-    public CheckingAccountServiceImpl() {

-        custAcctMap.put("Customer_01", "CHA_Customer_01");

-        custAcctMap.put("Customer_02", "CHA_Customer_02");

-        custAcctMap.put("Customer_03", "CHA_Customer_03");

-        

-        checkingAccts.put("CHA_Customer_01", new Double(1000));

-        checkingAccts.put("CHA_Customer_02", new Double(1500));

-        checkingAccts.put("CHA_Customer_03", new Double(2000));

-    }

-    

-	public double deposit(String accountNo, double depositAmt) {

-        checkingAccts.put(accountNo, new Double(checkingAccts.get(accountNo).doubleValue() + depositAmt));

-        return checkingAccts.get(accountNo).doubleValue();

-    }

-

-    public CheckingAccountDetails getAccountDetails(String customerID) {

-        CheckingAccountDetails checkingAccount = new CheckingAccountDetails();

-        checkingAccount.setAccountNumber(custAcctMap.get(customerID));

-        checkingAccount.setBalance(checkingAccts.get(checkingAccount.getAccountNumber()).doubleValue());

-

-        return checkingAccount;

-    }

-

-    public double withdraw(String accountNo, double withdrawalAmount) {

-        double balance = checkingAccts.get(accountNo).doubleValue();

-        if ( balance - withdrawalAmount > 0 ) {

-            balance = balance - withdrawalAmount;

-            checkingAccts.put(accountNo, balance);

-        }

-        return balance;

-    }

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
deleted file mode 100644
index 562314230a..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
+++ /dev/null
@@ -1,70 +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 bigbank.account.checking.server;
-
-import java.io.IOException;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-/**
- * This server program shows how to create an SCA runtime, and start it which
- * activates the Spring BigBank CheckingsAccount JMS endpoint.
- */
-public class CheckingAccountServer {
-
-    public static void main(String[] args) {
-        long timeout = -1L;
-        if (args.length > 0) {
-            timeout = Long.parseLong(args[0]);
-        }
-        
-        try {
-            BrokerService jmsBroker;
-            jmsBroker = new BrokerService(); 
-            jmsBroker.setPersistent(false);
-            jmsBroker.setUseJmx(false);
-            jmsBroker.addConnector("tcp://localhost:61619");
-            jmsBroker.start();
-            
-            SCANodeFactory factory = SCANodeFactory.newInstance();
-            SCANode node = factory.createSCANodeFromClassLoader("CheckingsAccount.composite", CheckingAccountServer.class.getClassLoader());
-            node.start();
-
-            if (timeout < 0) {
-                System.out.println("CheckingsAccount server started (press enter to shutdown)");
-                System.in.read();
-            } else {
-                Thread.sleep(timeout);
-            }            
-
-            node.stop();
-            
-            jmsBroker.stop();
-            System.out.println("CheckingsAccount server stopped");
-        
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-}
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
deleted file mode 100644
index ad17ab8cf5..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
+++ /dev/null
@@ -1,54 +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 bigbank.account.security;

-

-import java.io.IOException;

-

-import javax.security.auth.callback.Callback;

-import javax.security.auth.callback.CallbackHandler;

-import javax.security.auth.callback.UnsupportedCallbackException;

-

-import org.apache.ws.security.WSPasswordCallback;

-

-/**

- * Sample userid passwd generation class 

- */

-public class AccountsDataPasswordCallbackHandler implements CallbackHandler {

-

-    public void handle(Callback[] callbacks) throws IOException,

-            UnsupportedCallbackException {

-        for (int i = 0; i < callbacks.length; i++) {

-            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];

-            if ( pwcb.getUsage() == WSPasswordCallback.SIGNATURE ) {

-                System.out.println(" Usage is SIGNATURE ... ");

-                pwcb.setPassword("bbservice");

-            } else if ( pwcb.getUsage() == WSPasswordCallback.USERNAME_TOKEN_UNKNOWN ) {

-                System.out.println("*** Calling ACCOUNTS-DATA Passwd Handler for AUTHENTICATING userID = " 

-                                   + pwcb.getIdentifer() + " and password = " + pwcb.getPassword() );

-                if ( pwcb.getIdentifer().equals("bbaservice") && pwcb.getPassword().equals("bbaservice")) {

-                    System.out.println("AUTHENTICATION SUCCESSFUL!");

-                } else {

-                    System.out.println("AUTHENTICATION FAILED!");

-                    throw new UnsupportedCallbackException(pwcb, "UserId - Password Authentication Failed!");

-                }

-            }

-        }

-    }

-

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
deleted file mode 100644
index 7b44a28bc9..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
+++ /dev/null
@@ -1,48 +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 bigbank.account.security;

-

-import java.security.Principal;

-import java.util.Hashtable;

-import java.util.Map;

-

-/**

- * @version $Rev: 635619 $ $Date: 2008-03-10 23:24:29 +0530 (Mon, 10 Mar 2008) $

- */

-public class BigbankCheckingsAcl {

-    private static Map<String, String>checkingsAcl = new Hashtable<String, String>();

-    

-    static {

-        checkingsAcl.put("bbaservice", "Customer_01");

-        checkingsAcl.put("bbUser01", "Customer_01");

-    }

-    

-    

-    public static void authorize(Principal principal, String resource) {

-        if ( checkingsAcl.get(principal.getName()) == null ||

-            !checkingsAcl.get(principal.getName()).equals(resource) ) {

-            throw new RuntimeException("User - " + principal.getName() + " not authorized to access account " +

-                                       resource);

-        } else {

-            System.out.println("Successfully Authorized '" + principal.getName() + " to access accounts of " + resource);

-        }

-    }

-

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
deleted file mode 100644
index bbd5b0c325..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
+++ /dev/null
@@ -1,90 +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 bigbank.account.security;

-

-import org.apache.tuscany.sca.assembly.ConfiguredOperation;

-import org.apache.tuscany.sca.assembly.Implementation;

-import org.apache.tuscany.sca.assembly.OperationsConfigurator;

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.Interceptor;

-import org.apache.tuscany.sca.invocation.Phase;

-import org.apache.tuscany.sca.policy.PolicySet;

-import org.apache.tuscany.sca.provider.PolicyProvider;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-

-/**

- * @version $Rev: 641726 $ $Date: 2008-03-27 12:54:37 +0530 (Thu, 27 Mar 2008) $

- */

-public class CheckingsDeptAuthImplementationPolicyProvider implements PolicyProvider {

-    private RuntimeComponent component;

-    private Implementation implementation;

-

-    public CheckingsDeptAuthImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) {

-        super();

-        this.component = component;

-        this.implementation = implementation;

-    }

-

-    private String getContext() {

-        return "component.implementation: " + component.getURI() + "(" + implementation.getClass().getName() + ")";

-    }

-

-    private PolicySet findPolicySet(Operation operation) {

-    	for (PolicySet ps : component.getPolicySets()) {

-            for (Object p : ps.getPolicies()) {

-                if (CheckingsDeptAuthPolicy.class.isInstance(p)) {

-                    return ps;

-                }

-            }

-        }

-        

-        if ( component instanceof OperationsConfigurator ) {

-        	for ( ConfiguredOperation confOp : ((OperationsConfigurator)component).getConfiguredOperations() ) {

-        		if ( confOp.getName().equals(operation.getName())) {

-        			for (PolicySet ps : confOp.getPolicySets()) {

-        	            for (Object p : ps.getPolicies()) {

-        	                if (CheckingsDeptAuthPolicy.class.isInstance(p)) {

-        	                    return ps;

-        	                }

-        	            }

-        	        }

-        		}

-        	}

-        }

-        

-        return null;

-    }

-

-    /**

-     * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation)

-     */

-    public Interceptor createInterceptor(Operation operation) {

-        PolicySet ps = findPolicySet(operation);

-        return ps == null ? null : new CheckingsDeptAuthPolicyInterceptor(getContext(), operation, ps);

-    }

-

-    /**

-     * @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase()

-     */

-    public String getPhase() {

-        return Phase.IMPLEMENTATION_POLICY;

-    }

-

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
deleted file mode 100644
index cb26ca809d..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
+++ /dev/null
@@ -1,46 +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 bigbank.account.security;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.policy.Policy;

-

-/**

- * @version $Rev: 641726 $ $Date: 2008-03-27 12:54:37 +0530 (Thu, 27 Mar 2008) $

- */

-public class CheckingsDeptAuthPolicy implements Policy {

-

-    public QName getSchemaName() {

-        // TODO Auto-generated method stub

-        return null;

-    }

-

-    public boolean isUnresolved() {

-        // TODO Auto-generated method stub

-        return false;

-    }

-

-    public void setUnresolved(boolean unresolved) {

-        // TODO Auto-generated method stub

-        

-    }

-

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
deleted file mode 100644
index 5c692df4ec..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package bigbank.account.security;

-

-import java.security.Principal;

-

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.Interceptor;

-import org.apache.tuscany.sca.invocation.Invoker;

-import org.apache.tuscany.sca.invocation.Message;

-import org.apache.tuscany.sca.policy.PolicySet;

-import org.apache.tuscany.sca.policy.SecurityUtil;

-

-/*

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

- */

-

-/**

- * Policy handler to handle PolicySet related to Logging with the QName

- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy

- */

-public class CheckingsDeptAuthPolicyInterceptor implements Interceptor {

-    private Invoker next;

-

-    public CheckingsDeptAuthPolicyInterceptor(String context, Operation operation, PolicySet policySet) {

-        super();

-        init();

-    }

-

-    private final void init() {

-    }

-

-    public Message invoke(Message msg) {

-        Object msgBody = msg.getBody();

-        if (msgBody instanceof Object[]) {

-        	Object args[] = (Object[])msg.getBody();

-            Principal principal = SecurityUtil.getPrincipal(msg);

-            if (principal != null){

-                BigbankCheckingsAcl.authorize(principal,

-                                             (String)args[0]);

-            }        	

-        } 

-        

-        Message responseMsg = null;

-        try {

-            responseMsg = getNext().invoke(msg);

-            return responseMsg;

-        } catch (RuntimeException e) {

-            throw e;

-        } 

-    }

-

-    public Invoker getNext() {

-        return next;

-    }

-

-    public void setNext(Invoker next) {

-        this.next = next;

-    }

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
deleted file mode 100644
index 24da9878a5..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.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 bigbank.account.security;

-

-import org.apache.tuscany.sca.assembly.Binding;

-import org.apache.tuscany.sca.assembly.Implementation;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.apache.tuscany.sca.provider.PolicyProvider;

-import org.apache.tuscany.sca.provider.PolicyProviderFactory;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;

-import org.apache.tuscany.sca.runtime.RuntimeComponentService;

-

-/**

- * @version $Rev: 641726 $ $Date: 2008-03-27 12:54:37 +0530 (Thu, 27 Mar 2008) $

- */

-public class CheckingsDeptAuthPolicyProviderFactory implements PolicyProviderFactory<CheckingsDeptAuthPolicy> {

-    private ExtensionPointRegistry registry;

-    

-    public CheckingsDeptAuthPolicyProviderFactory(ExtensionPointRegistry registry) {

-        super();

-        this.registry = registry;

-    }

-

-    /**

-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createImplementationPolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.assembly.Implementation)

-     */

-    public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) {

-        return new CheckingsDeptAuthImplementationPolicyProvider(component, implementation);

-    }

-

-    /**

-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createReferencePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentReference, org.apache.tuscany.sca.assembly.Binding)

-     */

-    public PolicyProvider createReferencePolicyProvider(RuntimeComponent component,

-                                                        RuntimeComponentReference reference,

-                                                        Binding binding) {

-        return null;

-    }

-

-    /**

-     * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createServicePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentService, org.apache.tuscany.sca.assembly.Binding)

-     */

-    public PolicyProvider createServicePolicyProvider(RuntimeComponent component,

-                                                      RuntimeComponentService service,

-                                                      Binding binding) {

-        return null;

-    }

-

-    /**

-     * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()

-     */

-    public Class getModelType() {

-        // TODO Auto-generated method stub

-        return null;

-    }

-

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
deleted file mode 100644
index b023adf907..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
+++ /dev/null
@@ -1,67 +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 bigbank.account.security;

-

-import java.security.Principal;

-

-import org.apache.tuscany.sca.invocation.Message;

-import org.apache.tuscany.sca.policy.PolicySet;

-import org.apache.tuscany.sca.policy.SecurityUtil;

-import org.apache.tuscany.sca.policy.util.PolicyHandler;

-

-/**

- * @version $Rev: 635619 $ $Date: 2008-03-10 23:24:29 +0530 (Mon, 10 Mar 2008) $

- */

-public class CheckingsDeptAuthorizationPolicyHandler implements PolicyHandler {

-    private PolicySet applicablePolicySet = null;

-

-    public void afterInvoke(Object... context) {

-    }

-

-    public void beforeInvoke(Object... context) {

-        for ( int count = 0 ; count < context.length ; ++count ) {

-            if ( context[count] instanceof Message ) {

-                Message msg = (Message)context[count];

-                Object args[] = (Object[])msg.getBody();

-                Principal principal = SecurityUtil.getPrincipal(msg);

-                if (principal != null){

-                    BigbankCheckingsAcl.authorize(principal,

-                                                 (String)args[0]);

-                }                

-            }

-        }

-    }

-

-    public void cleanUp(Object... arg0) {

-    }

-

-    public PolicySet getApplicablePolicySet() {

-        return this.applicablePolicySet;

-    }

-

-    public void setApplicablePolicySet(PolicySet policySet) {

-        this.applicablePolicySet = policySet;

-    }

-

-    public void setUp(Object... arg0) {

-

-    }

-

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
deleted file mode 100644
index 96a5b2ca1f..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
+++ /dev/null
@@ -1,72 +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 bigbank.account.security;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.contribution.service.ContributionReadException;

-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;

-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;

-

-/**

- * Implementation of a Policy Processor 

- *

- */

-public class CheckingsDeptAuthorizationPolicyProcessor implements StAXArtifactProcessor<CheckingsDeptAuthPolicy> {

-    private static final QName CHECKINGS_DEPT_AUTHORIZATION_POLICY_QNAME = new QName("http://bigbank/checkings", "AuthPolicy");

-    public QName getArtifactType() {

-        return CHECKINGS_DEPT_AUTHORIZATION_POLICY_QNAME;

-    }

-    

-    public CheckingsDeptAuthorizationPolicyProcessor(ModelFactoryExtensionPoint modelFactories) {

-    }

-

-    

-    public CheckingsDeptAuthPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {

-        CheckingsDeptAuthPolicy policy = new CheckingsDeptAuthPolicy();

-        return policy;

-    }

-

-    public void write(CheckingsDeptAuthPolicy policy, XMLStreamWriter writer) throws ContributionWriteException,

-                                                        XMLStreamException {

-        String prefix = "tuscany";

-        writer.writeStartElement(prefix, 

-                                 CHECKINGS_DEPT_AUTHORIZATION_POLICY_QNAME.getLocalPart(),

-                                 CHECKINGS_DEPT_AUTHORIZATION_POLICY_QNAME.getNamespaceURI());

-        writer.writeNamespace("chk", "http://bigbank/checkings");

-        

-       

-        writer.writeEndElement();

-    }

-

-    public Class<CheckingsDeptAuthPolicy> getModelType() {

-        return CheckingsDeptAuthPolicy.class;

-    }

-

-    public void resolve(CheckingsDeptAuthPolicy arg0, ModelResolver arg1) throws ContributionResolveException {

-

-    }

-    

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
deleted file mode 100644
index 371a1afd32..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
+++ /dev/null
@@ -1,41 +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://bigbank/checkings"

-	xmlns:bbck="http://bigbank/checkings"

-	xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-	xmlns:bba="http://bigbankAccount"

-	name="CheckingsAccountDept">

-	

-    <service name="CheckingsAccountService" promote="CheckingAccountServiceComponent" requires="authentication">

-        <interface.java interface="bigbank.account.checking.CheckingAccountService"/>

-        <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory"

-                      jndiURL="tcp://localhost:61619">

-             <destination name="RequestQueue" create="ifnotexist"/>

-             <response>

-                 <destination name="ResponseQueue" create="ifnotexist"/>

-             </response> 

-        </binding.jms>

-    </service>

-

-    <component name="CheckingAccountServiceComponent">

-        <implementation.spring location="spring-context/META-INF/spring/CheckingAccountService-context.xml" requires="bba:authorization"/>

-    </component>

-</composite>

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 6491a0d326..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-bigbank.account.security.CheckingsDeptAuthorizationPolicyProcessor;qname=http://bigbank/checkings#AuthPolicy,model=bigbank.account.security.CheckingsDeptAuthPolicy
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
deleted file mode 100644
index b1bce4339d..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ /dev/null
@@ -1,20 +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.

-# 

-# PolicyHandlerClasses to interpret specific PolicyModels against specific QoS infrastructures

-# handler classname;qname=<policy intent addressed>;model=<policy model class>

-bigbank.account.security.CheckingsDeptAuthorizationPolicyHandler;intent=http://bigbankAccount#authorization,model=bigbank.account.security.CheckingsDeptAuthPolicy

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
deleted file mode 100644
index d6bfe2167e..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the policy extension

-bigbank.account.security.CheckingsDeptAuthPolicyProviderFactory;model=bigbank.account.security.CheckingsDeptAuthPolicy
\ No newline at end of file
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
deleted file mode 100644
index 0ce1440ddf..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

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

--->

-<sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"

- 			targetNamespace="http://bigbankAccount"

- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-			xmlns:chk="http://bigbank/checkings"

- 			xmlns:bb="http://bigbank"

- 			xmlns:bba="http://bigbankAccount">

-

-  

-<sca:intent name="authorization" 

- 			 constrains="sca:implementation.spring">

- 			 <description>

- 				Authorization Intent

- 			 </description>

-</sca:intent>

- 

- <!-- WS Security POLICY SETS -->

- <sca:policySet name="wsAuthenticationPolicy"

- 	provides="authentication"

- 	appliesTo="sca:service/sca:binding.jms">

- 	<tuscany:wsConfigParam>

- 		<parameter name="InflowSecurity">

- 			<action>

- 				<items>UsernameToken</items>

- 				<passwordCallbackClass>bigbank.account.security.AccountsDataPasswordCallbackHandler</passwordCallbackClass>

-       		</action>

-      	</parameter>

- 	</tuscany:wsConfigParam>

- </sca:policySet>

- 

- <sca:policySet name="chkDeptAuthorizationPolicy"

- 	provides="bba:authorization"

- 	appliesTo="sca:implementation.spring">

- 	<chk:AuthPolicy>

- 		<!-- need to evolve what should go in here -->

- 	</chk:AuthPolicy>

- </sca:policySet>

- 

-</sca:definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
deleted file mode 100644
index 6b2338f611..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
+++ /dev/null
@@ -1,33 +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.    

--->

-<beans xmlns="http://www.springframework.org/schema/beans"

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

-       xmlns:sca="http://www.springframework.org/schema/sca"

-       xsi:schemaLocation="

-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

-

-    <sca:service name="CheckingsAccountService"

-        type="bigbank.account.checking.CheckingAccountService" target="CheckingAccountServiceBean"/>

-

-    <bean id="CheckingAccountServiceBean" class="bigbank.account.checking.CheckingAccountServiceImpl">

-    </bean>

-

-</beans>

diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java b/java/sca-contrib/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java
deleted file mode 100644
index a45630278b..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java
+++ /dev/null
@@ -1,33 +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 bigbank.checkaccount;

-

-import junit.framework.TestCase;

-import bigbank.account.checking.server.CheckingAccountServer;

-

-/**

- * Tests out the big bank service

- *

- */

-public class CheckAccountServiceTestCase extends TestCase {

-

-    public void testServer() throws Exception {

-        CheckingAccountServer.main(new String[] {"1000"});

-    }

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/README b/java/sca-contrib/samples/spring-bigbank-stockquote/README
deleted file mode 100644
index b90bafeb59..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Spring-bigbank-stockquote is a part of a spring-bigbank sample.

-Please see the Readme file under spring-bigbank to understand how spring-bigbank-stockquote fits into the overall picture.

- 

-

diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/build.xml b/java/sca-contrib/samples/spring-bigbank-stockquote/build.xml
deleted file mode 100644
index 1b38a40495..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/build.xml
+++ /dev/null
@@ -1,73 +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.    

--->

-<project name="spring-bigbank-stockquote" default="run">

-    <property name="test.class" value="bigbank.stockquote.server.StockQuoteServer" />

-    <property name="test.jar"   value="sample-spring-bigbank-stockquote.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

-

diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/pom.xml b/java/sca-contrib/samples/spring-bigbank-stockquote/pom.xml
deleted file mode 100644
index 4bf37e88fa..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/pom.xml
+++ /dev/null
@@ -1,110 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-spring-bigbank-stockquote</artifactId>

-    <name>Apache Tuscany SCA Spring-Based BigBank StockQuote Sample</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-spring</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-core</artifactId>

-            <version>2.5.5</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-beans</artifactId>

-            <version>2.5.5</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-context</artifactId>

-            <version>2.5.5</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
deleted file mode 100644
index 833cc50f71..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ /dev/null
@@ -1,38 +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 bigbank.stockquote;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * This class implements the StockQuote service.

- */

-@Service(StockQuoteService.class)

-public class StockQuoteImpl implements StockQuoteService {

-

-    public double getQuote(String symbol) {

-        double price = 104.0 + Math.random();

-        price = ((int)(price * 100)) / 100.0;

-

-        System.out.println("Getting stock quote for: " + symbol + ", value: "+ price);

-

-        return price;

-    }

-

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java b/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
deleted file mode 100644
index d6db2bd182..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ /dev/null
@@ -1,30 +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 bigbank.stockquote;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * This is the business interface of the StockQuote service.

- */

-@Remotable

-public interface StockQuoteService {

-

-    public double getQuote(String symbol);

-}

diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java b/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
deleted file mode 100644
index 643f9a187c..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package bigbank.stockquote.server;
-
-import org.springframework.beans.BeansException;   
-import org.springframework.context.ApplicationContext;   
-import org.springframework.context.ApplicationContextAware;
-
-public class SCAApplicationContextProvider implements ApplicationContextAware {
-    
-    private static ApplicationContext ctx;
-    
-    public void setApplicationContext(ApplicationContext appContext) throws BeansException {
-        // Wiring the ApplicationContext into a static method           
-        ctx = appContext;      
-    }
-    
-    public static ApplicationContext getApplicationContext() {           
-        return ctx;       
-    }
-}
diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java b/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
deleted file mode 100644
index da96f29b0c..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.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 bigbank.stockquote.server;
-
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.springframework.context.ApplicationContext;
-
-/**
- * This server program shows how to bootstrap SCA from a simple J2SE program
- * and start it which activates the StockQuote Web service endpoint.
- */
-public class StockQuoteServer {
-
-    public static void main(String[] args) throws Exception {
-        long timeout = -1L;
-        if (args.length > 0) {
-            timeout = Long.parseLong(args[0]);
-        }
-        
-        System.out.println("Starting the Sample SCA StockQuote Service...");
-
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        SCANode node = factory.createSCANodeFromClassLoader("StockQuote.composite", StockQuoteServer.class.getClassLoader());
-        node.start();
-        
-        // Method 1: To access the Spring Application Context instance
-        ApplicationContext ctx = SCAApplicationContextProvider.getApplicationContext();
-        if (ctx.containsBean("StockQuoteServiceBean"))
-            System.out.println("StockQuoteServiceBean is now available for use...");        
-        
-        if (timeout < 0) {
-            System.out.println("Press Enter to Exit...");
-            System.in.read();
-        } else {
-            Thread.sleep(timeout);
-        }
-
-        node.stop();
-        System.out.println("Bye");
-    }
-}
diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml b/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
deleted file mode 100644
index 87dd006b5a..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
+++ /dev/null
@@ -1,36 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-       
-    <sca:service name="StockQuoteService"
-        type="bigbank.stockquote.StockQuoteService" target="StockQuoteServiceBean"/>
-
-    <bean id="StockQuoteServiceBean" class="bigbank.stockquote.StockQuoteImpl">
-    </bean>
-    
-    <bean id="applicationContextProvider" class="bigbank.stockquote.server.SCAApplicationContextProvider">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite b/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
deleted file mode 100644
index 06544c6883..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.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"

-	xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-	targetNamespace="http://stockquote"

-	xmlns:hw="http://stockquote"

-    name="StockQuote">

-    

-    <service name="StockQuoteService" promote="StockQuoteServiceComponent">

-        <interface.java interface="bigbank.stockquote.StockQuoteService"/>

-        <binding.ws uri="http://localhost:8081/services/StockQuoteWebService"/>

-    </service>

-

-    <component name="StockQuoteServiceComponent">

-        <implementation.spring location="META-INF/spring/StockQuoteService-context.xml"/>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java b/java/sca-contrib/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java
deleted file mode 100644
index 4b36d0694d..0000000000
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java
+++ /dev/null
@@ -1,33 +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 bigbank.stockquote;

-

-import junit.framework.TestCase;

-import bigbank.stockquote.server.StockQuoteServer;

-

-/**

- * Tests out the big bank service

- *

- */

-public class StockQuoteServiceTestCase extends TestCase {

-

-    public void testServer() throws Exception {

-        StockQuoteServer.main(new String[] {"1000"});

-    }

-}

diff --git a/java/sca-contrib/samples/store-distributed/README b/java/sca-contrib/samples/store-distributed/README
deleted file mode 100644
index 46e71bf51e..0000000000
--- a/java/sca-contrib/samples/store-distributed/README
+++ /dev/null
@@ -1,28 +0,0 @@
-Store Sample
-======================================
-
-This is a sample store scenario that is used as a getting started guide
-for Tuscany SCA. For detailed information, please see:
-
-http://tuscany.apache.org/getting-started-with-tuscany.html
-
-or
-
-http://tuscany.apache.org/getting-started-with-tuscany-using-tuscany-eclipse-plugin.html
-
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as follows:
-
-cd store
-ant compile
-
-and then, to run:
-
-ant run
-
-Once the store application is running use your browser to visit the following
-URL:
-
-http://localhost:8080/store/
diff --git a/java/sca-contrib/samples/store-distributed/build.xml b/java/sca-contrib/samples/store-distributed/build.xml
deleted file mode 100644
index 652afc3570..0000000000
--- a/java/sca-contrib/samples/store-distributed/build.xml
+++ /dev/null
@@ -1,79 +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.    
--->
-<project name="store" default="compile">
-    <property name="test.class" value="launch.Launch" />
-	<property name="test.jar"   value="sample-store.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<fileset refid="3rdparty.jars"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<fileset refid="3rdparty.jars"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<fileset refid="3rdparty.jars"/>
-            </classpath>
-        </java>    	
-    </target>	
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-    
-    <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="saxon-9.0.0.2.jar"/>
-    </fileset>
-</project>
diff --git a/java/sca-contrib/samples/store-distributed/cloud.composite b/java/sca-contrib/samples/store-distributed/cloud.composite
deleted file mode 100644
index 7bd13d5b6f..0000000000
--- a/java/sca-contrib/samples/store-distributed/cloud.composite
+++ /dev/null
@@ -1,27 +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 name="cloud.composite"
-  targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-  xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-  xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
-  <include name="ns2:NodeA" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://store/cloud"/>
-  <include name="ns2:NodeB" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://store/cloud"/>
-  <include name="ns2:NodeC" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://store/cloud"/>
-</composite>
diff --git a/java/sca-contrib/samples/store-distributed/domain.composite b/java/sca-contrib/samples/store-distributed/domain.composite
deleted file mode 100644
index 6898c454af..0000000000
--- a/java/sca-contrib/samples/store-distributed/domain.composite
+++ /dev/null
@@ -1,27 +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 name="domain.composite"
-  targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-  xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-  xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
-  <include name="ns2:storeA" uri="nodeA" xmlns:ns2="http://store"/>
-  <include name="ns2:storeB" uri="nodeB" xmlns:ns2="http://store"/>
-  <include name="ns2:storeC" uri="nodeC" xmlns:ns2="http://store"/>  
-</composite>
diff --git a/java/sca-contrib/samples/store-distributed/pom.xml b/java/sca-contrib/samples/store-distributed/pom.xml
deleted file mode 100644
index e812ae0b10..0000000000
--- a/java/sca-contrib/samples/store-distributed/pom.xml
+++ /dev/null
@@ -1,119 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-store-distributed</artifactId>
-    <name>Apache Tuscany SCA Getting Started Online Store Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency> 
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchDomain.java b/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchDomain.java
deleted file mode 100644
index dd19f6b49b..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchDomain.java
+++ /dev/null
@@ -1,33 +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 node;
-
-import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
-
-/**
- * This server program that loads a composite to provide simple registry function.
- * This server can be replaced with any registry that is appropriate but the components
- * in each node that talk to the registry should be replaced also. 
- */
-public class LaunchDomain {
-    public static void main(String[] args) throws Exception {
-        DomainManagerLauncher.main(args);
-    }
-
-}
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java b/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
deleted file mode 100644
index 9016e515fb..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
+++ /dev/null
@@ -1,28 +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 node;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreNodeA {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/NodeA"});
-    }
-}
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java b/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
deleted file mode 100644
index 2b387aec82..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
+++ /dev/null
@@ -1,28 +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 node;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreNodeB {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/NodeB"});
-    }
-}
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java b/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
deleted file mode 100644
index fb138e484f..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
+++ /dev/null
@@ -1,28 +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 node;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreNodeC {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/NodeC"});        
-    }
-}
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/Cart.java b/java/sca-contrib/samples/store-distributed/src/main/java/services/Cart.java
deleted file mode 100644
index 3fb5439bc3..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/Cart.java
+++ /dev/null
@@ -1,28 +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 services;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Cart extends Collection<String, Item> {
-
-}
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/Catalog.java b/java/sca-contrib/samples/store-distributed/src/main/java/services/Catalog.java
deleted file mode 100644
index b5e504fe11..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/Catalog.java
+++ /dev/null
@@ -1,27 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Catalog {
-    Item[] get();
-}
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/CurrencyConverter.java b/java/sca-contrib/samples/store-distributed/src/main/java/services/CurrencyConverter.java
deleted file mode 100644
index a064f3dd69..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/CurrencyConverter.java
+++ /dev/null
@@ -1,29 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CurrencyConverter {
-    public double getConversion(String fromCurrenycCode, String toCurrencyCode, double amount);
-
-    public String getCurrencySymbol(String currencyCode);
-}
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java b/java/sca-contrib/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
deleted file mode 100644
index c354aed447..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
+++ /dev/null
@@ -1,38 +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 services;
-
-public class CurrencyConverterImpl implements CurrencyConverter {
-    public double getConversion(String fromCurrencyCode, String toCurrencyCode, double amount) {
-        if (toCurrencyCode.equals("USD"))
-            return amount;
-        else if (toCurrencyCode.equals("EUR"))
-            return ((double)Math.round(amount * 0.7256 * 100)) /100;
-        return 0;
-    }
-
-    public String getCurrencySymbol(String currencyCode) {
-        if (currencyCode.equals("USD"))
-            return "$";
-        else if (currencyCode.equals("EUR"))
-            return "E"; //"€";
-        return "?";
-    }
-}
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java b/java/sca-contrib/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
deleted file mode 100644
index d132a24b00..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.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 services;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-public class FruitsCatalogImpl implements Catalog {
-    
-    @Property
-    public String currencyCode = "USD";
-    
-    @Reference
-    public CurrencyConverter currencyConverter;
-    
-    private List<Item> catalog = new ArrayList<Item>();
-
-    @Init
-    public void init() {
-        String currencySymbol = currencyConverter.getCurrencySymbol(currencyCode);
-        catalog.add(new Item("Apple",  currencySymbol + currencyConverter.getConversion("USD", currencyCode, 2.99)));
-        catalog.add(new Item("Orange", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 3.55)));
-        catalog.add(new Item("Pear", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 1.55)));
-    }
-
-    public Item[] get() {
-        Item[] catalogArray = new Item[catalog.size()];
-        catalog.toArray(catalogArray);
-        return catalogArray;
-    }
-}
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/Item.java b/java/sca-contrib/samples/store-distributed/src/main/java/services/Item.java
deleted file mode 100644
index 27abd4f016..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/Item.java
+++ /dev/null
@@ -1,51 +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 services;
-
-
-public class Item {
-    private String name;
-    private String price;
-    
-    public Item() {
-    }
-    
-    public Item(String name, String price) {
-        this.name = name;
-        this.price = price;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    public String getPrice() {
-        return price;
-    }
-    
-    public void setPrice(String price) {
-        this.price = price;
-    }
-
-}
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java b/java/sca-contrib/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
deleted file mode 100644
index 698614212d..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
+++ /dev/null
@@ -1,112 +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 services;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class ShoppingCartImpl implements Cart, Total {
-    
-    private Map<String, Item> cart;
-    
-    @Init
-    public void init() {
-        cart = new HashMap<String, Item>();
-    }
-
-    public Entry<String, Item>[] getAll() {
-        Entry<String, Item>[] entries = new Entry[cart.size()];
-        int i = 0;
-        for (Map.Entry<String, Item> e: cart.entrySet()) {
-            entries[i++] = new Entry<String, Item>(e.getKey(), e.getValue());
-        }
-        return entries;
-    }
-
-    public Item get(String key) throws NotFoundException {
-        Item item = cart.get(key);
-        if (item == null) {
-            throw new NotFoundException(key);
-        } else {
-            return item;
-        }
-    }
-
-    public String post(String key, Item item) {
-        if (key == null) {
-            key ="cart-" + UUID.randomUUID().toString();
-        }
-        cart.put(key, item);
-        return key;
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        if (!cart.containsKey(key)) {
-            throw new NotFoundException(key);
-        }
-        cart.put(key, item);
-    }
-    
-    public void delete(String key) throws NotFoundException {
-        if (key == null || key.equals("")) {
-            cart.clear();
-        } else {
-            Item item = cart.remove(key);
-            if (item == null)
-                throw new NotFoundException(key);
-        }
-    }
-
-    public Entry<String, Item>[] query(String queryString) {
-        List<Entry<String, Item>> entries = new ArrayList<Entry<String,Item>>();
-        if (queryString.startsWith("name=")) {
-            String name = queryString.substring(5);
-            for (Map.Entry<String, Item> e: cart.entrySet()) {
-                Item item = e.getValue();
-                if (item.getName().equals(name)) {
-                    entries.add(new Entry<String, Item>(e.getKey(), e.getValue()));
-                }
-            }
-        }
-        return entries.toArray(new Entry[entries.size()]);
-    }
-    
-    public String getTotal() {
-        double total = 0;
-        String currencySymbol = "";
-        if (!cart.isEmpty()) {
-            Item item = cart.values().iterator().next();
-            currencySymbol = item.getPrice().substring(0, 1);
-        }
-        for (Item item : cart.values()) {
-            total += Double.valueOf(item.getPrice().substring(1));
-        }
-        return currencySymbol + String.valueOf(total);
-    }
-}
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/Total.java b/java/sca-contrib/samples/store-distributed/src/main/java/services/Total.java
deleted file mode 100644
index b77cc1c7ac..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/Total.java
+++ /dev/null
@@ -1,29 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Total {
-    
-    String getTotal();
-
-}
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeA.composite b/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeA.composite
deleted file mode 100644
index f7bfd0fcb6..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeA.composite
+++ /dev/null
@@ -1,36 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store/cloud"
-		xmlns:store="http://store"
-		name="NodeA">
-
-    <component name="NodeA">
-        <t:implementation.node uri="nodeA" composite="store:storeA"/>
-        <service name="Node">
-            <binding.sca uri="http://localhost:8100"/>
-            <t:binding.jsonrpc uri="http://localhost:8100"/>
-            <t:binding.atom uri="http://localhost:8100"/>
-            <t:binding.http uri="http://localhost:8100"/>
-        </service>
-    </component>
-     
-</composite>
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeB.composite b/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeB.composite
deleted file mode 100644
index 187c5caf1c..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeB.composite
+++ /dev/null
@@ -1,36 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store/cloud"
-		xmlns:store="http://store"
-		name="NodeB">
-
-    <component name="NodeB">
-        <t:implementation.node uri="nodeB" composite="store:storeB"/>
-        <service name="Node">
-            <binding.sca uri="http://localhost:8200"/>
-            <t:binding.jsonrpc uri="http://localhost:8200"/>
-            <t:binding.atom uri="http://localhost:8200"/>
-            <t:binding.http uri="http://localhost:8200"/>            
-        </service>
-    </component>     
-
-</composite>
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeC.composite b/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeC.composite
deleted file mode 100644
index 98113a3576..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeC.composite
+++ /dev/null
@@ -1,36 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store/cloud"
-		xmlns:store="http://store"
-		name="NodeC">
-
-	<component name="NodeC">
-		<t:implementation.node uri="nodeC" composite="store:storeC"/>
-		<service name="Node">
-			<binding.sca uri="http://localhost:8300"/>
-            <t:binding.jsonrpc uri="http://localhost:8300"/>
-            <t:binding.atom uri="http://localhost:8300"/>
-            <t:binding.http uri="http://localhost:8300"/>			
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/java/sca-contrib/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index f165ee0e29..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://store"
-          xmlns:store="http://store">
-   <deployable composite="store:storeA"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeA/store.composite b/java/sca-contrib/samples/store-distributed/src/main/resources/nodeA/store.composite
deleted file mode 100644
index 2ac608d43f..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeA/store.composite
+++ /dev/null
@@ -1,38 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="storeA">
-    
-	<component name="Catalog">
-		<implementation.java class="services.FruitsCatalogImpl"/> 
-		<property name="currencyCode">USD</property>
-		<service name="Catalog">
-			<t:binding.jsonrpc/>
-   		</service>
-		<reference name="currencyConverter" target="CurrencyConverter"/>	
-	</component> 
- 	    
-	<component name="CurrencyConverter">
-		<implementation.java class="services.CurrencyConverterImpl"/>
-	</component>     
-
-</composite>
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/java/sca-contrib/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index 0f8e76ccd7..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://store"
-          xmlns:store="http://store">
-   <deployable composite="store:storeB"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeB/store.composite b/java/sca-contrib/samples/store-distributed/src/main/resources/nodeB/store.composite
deleted file mode 100644
index 062a7aa2cd..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeB/store.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"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="storeB">
-		
-	<component name="ShoppingCart">
-		<implementation.java class="services.ShoppingCartImpl"/>
-		<service name="Cart">
-			<t:binding.atom uri="/ShoppingCart/Cart"/>
-		</service>    	
-		<service name="Total">
-			<t:binding.jsonrpc/>
-		</service>    	
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
deleted file mode 100644
index 15bab17c1a..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	      targetNamespace="http://store"
-          xmlns:store="http://store">
-   <deployable composite="store:storeC"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/store.composite b/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/store.composite
deleted file mode 100644
index 5de310128d..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/store.composite
+++ /dev/null
@@ -1,41 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="storeC">
-		
-    <component name="Store">
-        <t:implementation.widget location="uiservices/store.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/store"/>
-        </service>
-		<reference name="catalog" target="Catalog">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-		 <reference name="shoppingCart" target="ShoppingCart/Cart">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="shoppingTotal" target="ShoppingCart/Total">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-</composite>
-
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html b/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
deleted file mode 100644
index 45604463d1..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
+++ /dev/null
@@ -1,162 +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.    
--->
-<html>
-<head>
-<title>Store</title>
-
-<script type="text/javascript" src="store.js"></script>
-
-<script language="JavaScript">
-
-	//@Reference
-	var catalog = new Reference("catalog");
-	
-	//@Reference
-	var shoppingCart = new Reference("shoppingCart");
-
-	//@Reference
-	var shoppingTotal = new Reference("shoppingTotal");
-	
-	var catalogItems;
-
-	function catalog_getResponse(items,exception) {
-		if(exception){
-			alert(exception.message);
-			return;
-		}
-		var catalog = "";
-		
-			for (var i=0; i<items.length; i++) {
-				var item = items[i].name + ' - ' + items[i].price;
-				catalog += '<input name="items" type="checkbox" value="' + 
-							item + '">' + item + ' <br>';
-			}
-			document.getElementById('catalog').innerHTML=catalog;
-			catalogItems = items;
-	}
-	
-	function shoppingCart_getResponse(feed) {
-		if (feed != null) {
-			var entries = feed.getElementsByTagName("entry"); 
-			var list = "";
-			for (var i=0; i<entries.length; i++) {
-				var content = entries[i].getElementsByTagName("content")[0];
-				var name = content.getElementsByTagName("name")[0].firstChild.nodeValue;
-				var price = content.getElementsByTagName("price")[0].firstChild.nodeValue;
-				list += name + ' - ' + price + ' <br>';
-			}
-			document.getElementById("shoppingCart").innerHTML = list;
-
-			if (entries.length != 0) {			
-					try	{
-						shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
-					}
-					catch(e){
-						alert(e);
-					}
-			}
-		}
-	}
-	
-	function shoppingTotal_getTotalResponse(total,exception) {
-		if(exception) { 
-			alert(exception.message); 
-			return;
-		}
-		document.getElementById('total').innerHTML = total;
-	}
-	
-	function shoppingCart_postResponse(entry) {
-		shoppingCart.get("", shoppingCart_getResponse);
-	}				
-
-	function addToCart() {
-		var items  = document.catalogForm.items;
-		var j = 0;
-		for (var i=0; i<items.length; i++)
-			if (items[i].checked) {
-					
-				var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>item</title><content type="text/xml">' +
-                	'<Item xmlns="http://services/">' +
-                	'<name xmlns="">' + catalogItems[i].name + '</name>' + '<price xmlns="">' + catalogItems[i].price + '</price>' +
-                 	'</Item>' + '</content></entry>';
-				shoppingCart.post(entry, shoppingCart_postResponse);
-				items[i].checked = false;
-			}
-	}
-	function checkoutCart() {
-		document.getElementById('store').innerHTML='<h2>' +
-				'Thanks for Shopping With Us!</h2>'+
-				'<h2>Your Order</h2>'+
-				'<form name="orderForm">'+
-					document.getElementById('shoppingCart').innerHTML+
-					'<br>'+
-					document.getElementById('total').innerHTML+
-					'<br>'+
-					'<br>'+
-					'<input type="submit" value="Continue Shopping">'+ 
-				'</form>';
-		shoppingCart.del("", null);
-	}
-	function deleteCart() {
-		shoppingCart.del("", null);
-		document.getElementById('shoppingCart').innerHTML = "";
-		document.getElementById('total').innerHTML = "";	
-	}	
-
-	function init() {
-			
-			try	{
-				catalog.get(catalog_getResponse);
-				shoppingCart.get("", shoppingCart_getResponse);
-			}
-			catch(e){
-				alert(e);
-			}
-		}
-	
-</script>
-
-</head>
-
-<body onload="init()">
-<h1>Store</h1>
-  <div id="store">
-   	<h2>Catalog</h2>
-   	<form name="catalogForm">
-		<div id="catalog" ></div>
-		<br>
-		<input type="button" onClick="addToCart()"  value="Add to Cart">
-   	</form>
- 
- 	<br>
-  
-   	<h2>Your Shopping Cart</h2>
-   	<form name="shoppingCartForm">
-		<div id="shoppingCart"></div>
-		<br>
-		<div id="total"></div>
-		<br>		
-		<input type="button" onClick="checkoutCart()" value="Checkout"> 
-		<input type="button" onClick="deleteCart()" value="Empty">     
-	   	<a href="../ShoppingCart/Cart/">(feed)</a>
-	</form>    
-  </div>
-</body>
-</html>
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/uiservices/store.html b/java/sca-contrib/samples/store-distributed/src/main/resources/uiservices/store.html
deleted file mode 100644
index 45604463d1..0000000000
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/uiservices/store.html
+++ /dev/null
@@ -1,162 +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.    
--->
-<html>
-<head>
-<title>Store</title>
-
-<script type="text/javascript" src="store.js"></script>
-
-<script language="JavaScript">
-
-	//@Reference
-	var catalog = new Reference("catalog");
-	
-	//@Reference
-	var shoppingCart = new Reference("shoppingCart");
-
-	//@Reference
-	var shoppingTotal = new Reference("shoppingTotal");
-	
-	var catalogItems;
-
-	function catalog_getResponse(items,exception) {
-		if(exception){
-			alert(exception.message);
-			return;
-		}
-		var catalog = "";
-		
-			for (var i=0; i<items.length; i++) {
-				var item = items[i].name + ' - ' + items[i].price;
-				catalog += '<input name="items" type="checkbox" value="' + 
-							item + '">' + item + ' <br>';
-			}
-			document.getElementById('catalog').innerHTML=catalog;
-			catalogItems = items;
-	}
-	
-	function shoppingCart_getResponse(feed) {
-		if (feed != null) {
-			var entries = feed.getElementsByTagName("entry"); 
-			var list = "";
-			for (var i=0; i<entries.length; i++) {
-				var content = entries[i].getElementsByTagName("content")[0];
-				var name = content.getElementsByTagName("name")[0].firstChild.nodeValue;
-				var price = content.getElementsByTagName("price")[0].firstChild.nodeValue;
-				list += name + ' - ' + price + ' <br>';
-			}
-			document.getElementById("shoppingCart").innerHTML = list;
-
-			if (entries.length != 0) {			
-					try	{
-						shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
-					}
-					catch(e){
-						alert(e);
-					}
-			}
-		}
-	}
-	
-	function shoppingTotal_getTotalResponse(total,exception) {
-		if(exception) { 
-			alert(exception.message); 
-			return;
-		}
-		document.getElementById('total').innerHTML = total;
-	}
-	
-	function shoppingCart_postResponse(entry) {
-		shoppingCart.get("", shoppingCart_getResponse);
-	}				
-
-	function addToCart() {
-		var items  = document.catalogForm.items;
-		var j = 0;
-		for (var i=0; i<items.length; i++)
-			if (items[i].checked) {
-					
-				var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>item</title><content type="text/xml">' +
-                	'<Item xmlns="http://services/">' +
-                	'<name xmlns="">' + catalogItems[i].name + '</name>' + '<price xmlns="">' + catalogItems[i].price + '</price>' +
-                 	'</Item>' + '</content></entry>';
-				shoppingCart.post(entry, shoppingCart_postResponse);
-				items[i].checked = false;
-			}
-	}
-	function checkoutCart() {
-		document.getElementById('store').innerHTML='<h2>' +
-				'Thanks for Shopping With Us!</h2>'+
-				'<h2>Your Order</h2>'+
-				'<form name="orderForm">'+
-					document.getElementById('shoppingCart').innerHTML+
-					'<br>'+
-					document.getElementById('total').innerHTML+
-					'<br>'+
-					'<br>'+
-					'<input type="submit" value="Continue Shopping">'+ 
-				'</form>';
-		shoppingCart.del("", null);
-	}
-	function deleteCart() {
-		shoppingCart.del("", null);
-		document.getElementById('shoppingCart').innerHTML = "";
-		document.getElementById('total').innerHTML = "";	
-	}	
-
-	function init() {
-			
-			try	{
-				catalog.get(catalog_getResponse);
-				shoppingCart.get("", shoppingCart_getResponse);
-			}
-			catch(e){
-				alert(e);
-			}
-		}
-	
-</script>
-
-</head>
-
-<body onload="init()">
-<h1>Store</h1>
-  <div id="store">
-   	<h2>Catalog</h2>
-   	<form name="catalogForm">
-		<div id="catalog" ></div>
-		<br>
-		<input type="button" onClick="addToCart()"  value="Add to Cart">
-   	</form>
- 
- 	<br>
-  
-   	<h2>Your Shopping Cart</h2>
-   	<form name="shoppingCartForm">
-		<div id="shoppingCart"></div>
-		<br>
-		<div id="total"></div>
-		<br>		
-		<input type="button" onClick="checkoutCart()" value="Checkout"> 
-		<input type="button" onClick="deleteCart()" value="Empty">     
-	   	<a href="../ShoppingCart/Cart/">(feed)</a>
-	</form>    
-  </div>
-</body>
-</html>
diff --git a/java/sca-contrib/samples/store-distributed/store.png b/java/sca-contrib/samples/store-distributed/store.png
deleted file mode 100644
index da413edeee..0000000000
--- a/java/sca-contrib/samples/store-distributed/store.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/store-distributed/store.svg b/java/sca-contrib/samples/store-distributed/store.svg
deleted file mode 100644
index 74f8ecd36d..0000000000
--- a/java/sca-contrib/samples/store-distributed/store.svg
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\store"
-   sodipodi:docname="store.svg"
-   version="1.0"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\simon\tuscany\java-head\sca\samples\store\store.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="538.06165"
-     inkscape:cy="341.69129"
-     inkscape:document-units="px"
-     inkscape:current-layer="g2997"
-     inkscape:window-width="1466"
-     inkscape:window-height="831"
-     inkscape:window-x="117"
-     inkscape:window-y="80" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997">
-      <rect
-         rx="14.335117"
-         ry="17.743465"
-         y="197.1973"
-         x="447.35422"
-         height="419.39099"
-         width="464.23727"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.28840661;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="translate(189.90868,1.0101522)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2171">store</flowPara></flowRoot>      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.30182266;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2175"
-         width="118.21779"
-         height="111.27543"
-         x="491.60019"
-         y="247.75989"
-         rx="7.1507306"
-         ry="9.2311935" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2177"
-         transform="translate(223.8585,41.670449)"><flowRegion
-           id="flowRegion2179"><rect
-             id="rect2181"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2183">ufs</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 474.29877,279.45598 L 507.63381,279.45598 L 513.69472,292.58796 L 506.62366,304.7098 L 474.29877,304.7098 L 481.87492,292.58796 L 474.29877,279.45598 z "
-         id="path2187" />
-      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2191"
-         width="115.66247"
-         height="85.862968"
-         x="493.07068"
-         y="503.27759"
-         rx="6.9961648"
-         ry="7.1230249" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2193"
-         transform="translate(225.47992,297.33908)"><flowRegion
-           id="flowRegion2195"><rect
-             id="rect2197"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2199">ShoppingCart</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 475.92019,535.12461 L 509.25523,535.12461 L 515.31614,548.25659 L 508.24508,560.37843 L 475.92019,560.37843 L 483.49634,548.25659 L 475.92019,535.12461 z "
-         id="path2203" />
-      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2207"
-         width="115.66247"
-         height="85.862968"
-         x="761.44415"
-         y="391.31604"
-         rx="6.9961648"
-         ry="7.1230249" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2209"
-         transform="translate(487.8534,185.37751)"><flowRegion
-           id="flowRegion2211"><rect
-             id="rect2213"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2215">CurrencyConverter</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 744.29367,423.16304 L 777.62871,423.16304 L 783.68962,436.29502 L 776.61856,448.41686 L 744.29367,448.41686 L 751.86982,436.29502 L 744.29367,423.16304 z "
-         id="path2219" />
-      <rect
-         style="opacity:1;fill:#0064ff;fill-opacity:1;stroke:#000000;stroke-width:0.9612025;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2223"
-         width="104.08451"
-         height="113.17588"
-         x="138.37151"
-         y="350.1156"
-         rx="0"
-         ry="0.048917599" />
-      <path
-         style="fill:#1a73fe;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-         d="M 138.21429,462.66591 L 115.35714,479.80877 L 267.85714,479.80877 L 241.78571,463.02305 L 138.21429,462.66591 z "
-         id="path3197" />
-      <rect
-         style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect3199"
-         width="92.5"
-         height="97.14286"
-         x="143.57143"
-         y="358.38019"
-         ry="3.6203461"
-         rx="3.9285715" />
-      <image
-         y="366.6889"
-         x="156.24066"
-         id="image3323"
-         height="78.571434"
-         width="58.57143"
-         sodipodi:absref="C:\simon\tuscany\evangelism\whitepapers\shoppingcart.png"
-         xlink:href="C:\simon\tuscany\evangelism\whitepapers\shoppingcart.png" />
-      <image
-         y="270.52304"
-         x="526.42859"
-         id="image3342"
-         height="78.571434"
-         width="58.57143"
-         sodipodi:absref="C:\simon\tuscany\evangelism\whitepapers\shoppingcart.png"
-         xlink:href="C:\simon\tuscany\evangelism\whitepapers\shoppingcart.png" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 242.85714,374.80877 C 245.71429,374.80877 345.71429,374.80877 345.71429,374.80877 L 345.71429,291.95162 L 481.42858,291.95162"
-         id="path3348"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 210.71429,406.95163 L 345,406.95163 L 345,437.66591 L 481.42857,437.66591"
-         id="path3350"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 210.71429,439.09448 L 325.71429,439.09448 L 325.71429,548.3802 L 482.85714,548.3802"
-         id="path3352"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 626.42857,436.23734 C 750,437.66591 752.14286,436.23734 752.14286,436.23734"
-         id="path3354"
-         sodipodi:nodetypes="cc" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot3356"
-         transform="translate(-94.285714,25)"><flowRegion
-           id="flowRegion3358"><rect
-             id="rect3360"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara3362">CurrenyCode</flowPara></flowRoot>      <flowRoot
-         xml:space="preserve"
-         id="flowRoot3364"
-         transform="translate(-250.76562,-76.210859)"><flowRegion
-           id="flowRegion3366"><rect
-             id="rect3368"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara3370">HTTP</flowPara></flowRoot>      <flowRoot
-         xml:space="preserve"
-         id="flowRoot3372"
-         transform="translate(-273.62277,70.931998)"><flowRegion
-           id="flowRegion3374"><rect
-             id="rect3376"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara3378">JSONRPC</flowPara></flowRoot>      <flowRoot
-         xml:space="preserve"
-         id="flowRoot3380"
-         transform="translate(-243.62277,183.07485)"><flowRegion
-           id="flowRegion3382"><rect
-             id="rect3384"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara3386">Atom</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="491.56897"
-       y="392.70135"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(223.97819,186.76283)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Catalog</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3006"
-       width="21.718224"
-       height="20.708065"
-       x="537.53094"
-       y="377.04398"
-       rx="10.859112"
-       ry="0" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 474.41846,424.54836 L 507.7535,424.54836 L 513.81441,437.68034 L 506.74335,449.80218 L 474.41846,449.80218 L 481.99461,437.68034 L 474.41846,424.54836 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 587.6709,422.71008 L 621.00594,422.71008 L 627.06685,435.84206 L 619.99579,447.9639 L 587.6709,447.9639 L 595.24705,435.84206 L 587.6709,422.71008 z "
-       id="path3019" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/store-distributed/workspace.xml b/java/sca-contrib/samples/store-distributed/workspace.xml
deleted file mode 100644
index d6cb2bfc81..0000000000
--- a/java/sca-contrib/samples/store-distributed/workspace.xml
+++ /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.    
--->
-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
-  <contribution location="file:./src/main/resources/nodeA"  uri="nodeA"/>
-  <contribution location="file:./src/main/resources/nodeB"  uri="nodeB"/>
-  <contribution location="file:./src/main/resources/nodeC"  uri="nodeC"/>  
-  <contribution location="file:./src/main/resources/cloud"  uri="http://tuscany.apache.org/cloud"/>  
-</workspace>
diff --git a/java/sca-contrib/samples/store/README b/java/sca-contrib/samples/store/README
deleted file mode 100644
index 46e71bf51e..0000000000
--- a/java/sca-contrib/samples/store/README
+++ /dev/null
@@ -1,28 +0,0 @@
-Store Sample
-======================================
-
-This is a sample store scenario that is used as a getting started guide
-for Tuscany SCA. For detailed information, please see:
-
-http://tuscany.apache.org/getting-started-with-tuscany.html
-
-or
-
-http://tuscany.apache.org/getting-started-with-tuscany-using-tuscany-eclipse-plugin.html
-
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as follows:
-
-cd store
-ant compile
-
-and then, to run:
-
-ant run
-
-Once the store application is running use your browser to visit the following
-URL:
-
-http://localhost:8080/store/
diff --git a/java/sca-contrib/samples/store/build.xml b/java/sca-contrib/samples/store/build.xml
deleted file mode 100644
index 652afc3570..0000000000
--- a/java/sca-contrib/samples/store/build.xml
+++ /dev/null
@@ -1,79 +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.    
--->
-<project name="store" default="compile">
-    <property name="test.class" value="launch.Launch" />
-	<property name="test.jar"   value="sample-store.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<fileset refid="3rdparty.jars"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<fileset refid="3rdparty.jars"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<fileset refid="3rdparty.jars"/>
-            </classpath>
-        </java>    	
-    </target>	
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-    
-    <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="saxon-9.0.0.2.jar"/>
-    </fileset>
-</project>
diff --git a/java/sca-contrib/samples/store/pom.xml b/java/sca-contrib/samples/store/pom.xml
deleted file mode 100644
index d68563807a..0000000000
--- a/java/sca-contrib/samples/store/pom.xml
+++ /dev/null
@@ -1,106 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-store</artifactId>
-    <name>Apache Tuscany SCA Getting Started Online Store Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/store/src/main/java/launch/Launch.java b/java/sca-contrib/samples/store/src/main/java/launch/Launch.java
deleted file mode 100644
index 801697abea..0000000000
--- a/java/sca-contrib/samples/store/src/main/java/launch/Launch.java
+++ /dev/null
@@ -1,34 +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 launch;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class Launch {
-    public static void main(String[] args) throws Exception {
-        System.out.println("Starting ...");
-        SCADomain scaDomain = SCADomain.newInstance("store.composite");
-        System.out.println("store.composite ready for big business !!!");
-        System.in.read();
-        System.out.println("Stopping ...");
-        scaDomain.close();
-        System.out.println();
-    }
-}
diff --git a/java/sca-contrib/samples/store/src/main/java/services/Cart.java b/java/sca-contrib/samples/store/src/main/java/services/Cart.java
deleted file mode 100644
index 3fb5439bc3..0000000000
--- a/java/sca-contrib/samples/store/src/main/java/services/Cart.java
+++ /dev/null
@@ -1,28 +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 services;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Cart extends Collection<String, Item> {
-
-}
diff --git a/java/sca-contrib/samples/store/src/main/java/services/Catalog.java b/java/sca-contrib/samples/store/src/main/java/services/Catalog.java
deleted file mode 100644
index b5e504fe11..0000000000
--- a/java/sca-contrib/samples/store/src/main/java/services/Catalog.java
+++ /dev/null
@@ -1,27 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Catalog {
-    Item[] get();
-}
diff --git a/java/sca-contrib/samples/store/src/main/java/services/CurrencyConverter.java b/java/sca-contrib/samples/store/src/main/java/services/CurrencyConverter.java
deleted file mode 100644
index a064f3dd69..0000000000
--- a/java/sca-contrib/samples/store/src/main/java/services/CurrencyConverter.java
+++ /dev/null
@@ -1,29 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CurrencyConverter {
-    public double getConversion(String fromCurrenycCode, String toCurrencyCode, double amount);
-
-    public String getCurrencySymbol(String currencyCode);
-}
diff --git a/java/sca-contrib/samples/store/src/main/java/services/CurrencyConverterImpl.java b/java/sca-contrib/samples/store/src/main/java/services/CurrencyConverterImpl.java
deleted file mode 100644
index c354aed447..0000000000
--- a/java/sca-contrib/samples/store/src/main/java/services/CurrencyConverterImpl.java
+++ /dev/null
@@ -1,38 +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 services;
-
-public class CurrencyConverterImpl implements CurrencyConverter {
-    public double getConversion(String fromCurrencyCode, String toCurrencyCode, double amount) {
-        if (toCurrencyCode.equals("USD"))
-            return amount;
-        else if (toCurrencyCode.equals("EUR"))
-            return ((double)Math.round(amount * 0.7256 * 100)) /100;
-        return 0;
-    }
-
-    public String getCurrencySymbol(String currencyCode) {
-        if (currencyCode.equals("USD"))
-            return "$";
-        else if (currencyCode.equals("EUR"))
-            return "E"; //"€";
-        return "?";
-    }
-}
diff --git a/java/sca-contrib/samples/store/src/main/java/services/FruitsCatalogImpl.java b/java/sca-contrib/samples/store/src/main/java/services/FruitsCatalogImpl.java
deleted file mode 100644
index d132a24b00..0000000000
--- a/java/sca-contrib/samples/store/src/main/java/services/FruitsCatalogImpl.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 services;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-public class FruitsCatalogImpl implements Catalog {
-    
-    @Property
-    public String currencyCode = "USD";
-    
-    @Reference
-    public CurrencyConverter currencyConverter;
-    
-    private List<Item> catalog = new ArrayList<Item>();
-
-    @Init
-    public void init() {
-        String currencySymbol = currencyConverter.getCurrencySymbol(currencyCode);
-        catalog.add(new Item("Apple",  currencySymbol + currencyConverter.getConversion("USD", currencyCode, 2.99)));
-        catalog.add(new Item("Orange", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 3.55)));
-        catalog.add(new Item("Pear", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 1.55)));
-    }
-
-    public Item[] get() {
-        Item[] catalogArray = new Item[catalog.size()];
-        catalog.toArray(catalogArray);
-        return catalogArray;
-    }
-}
diff --git a/java/sca-contrib/samples/store/src/main/java/services/Item.java b/java/sca-contrib/samples/store/src/main/java/services/Item.java
deleted file mode 100644
index 27abd4f016..0000000000
--- a/java/sca-contrib/samples/store/src/main/java/services/Item.java
+++ /dev/null
@@ -1,51 +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 services;
-
-
-public class Item {
-    private String name;
-    private String price;
-    
-    public Item() {
-    }
-    
-    public Item(String name, String price) {
-        this.name = name;
-        this.price = price;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    public String getPrice() {
-        return price;
-    }
-    
-    public void setPrice(String price) {
-        this.price = price;
-    }
-
-}
diff --git a/java/sca-contrib/samples/store/src/main/java/services/ShoppingCartImpl.java b/java/sca-contrib/samples/store/src/main/java/services/ShoppingCartImpl.java
deleted file mode 100644
index 698614212d..0000000000
--- a/java/sca-contrib/samples/store/src/main/java/services/ShoppingCartImpl.java
+++ /dev/null
@@ -1,112 +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 services;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class ShoppingCartImpl implements Cart, Total {
-    
-    private Map<String, Item> cart;
-    
-    @Init
-    public void init() {
-        cart = new HashMap<String, Item>();
-    }
-
-    public Entry<String, Item>[] getAll() {
-        Entry<String, Item>[] entries = new Entry[cart.size()];
-        int i = 0;
-        for (Map.Entry<String, Item> e: cart.entrySet()) {
-            entries[i++] = new Entry<String, Item>(e.getKey(), e.getValue());
-        }
-        return entries;
-    }
-
-    public Item get(String key) throws NotFoundException {
-        Item item = cart.get(key);
-        if (item == null) {
-            throw new NotFoundException(key);
-        } else {
-            return item;
-        }
-    }
-
-    public String post(String key, Item item) {
-        if (key == null) {
-            key ="cart-" + UUID.randomUUID().toString();
-        }
-        cart.put(key, item);
-        return key;
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        if (!cart.containsKey(key)) {
-            throw new NotFoundException(key);
-        }
-        cart.put(key, item);
-    }
-    
-    public void delete(String key) throws NotFoundException {
-        if (key == null || key.equals("")) {
-            cart.clear();
-        } else {
-            Item item = cart.remove(key);
-            if (item == null)
-                throw new NotFoundException(key);
-        }
-    }
-
-    public Entry<String, Item>[] query(String queryString) {
-        List<Entry<String, Item>> entries = new ArrayList<Entry<String,Item>>();
-        if (queryString.startsWith("name=")) {
-            String name = queryString.substring(5);
-            for (Map.Entry<String, Item> e: cart.entrySet()) {
-                Item item = e.getValue();
-                if (item.getName().equals(name)) {
-                    entries.add(new Entry<String, Item>(e.getKey(), e.getValue()));
-                }
-            }
-        }
-        return entries.toArray(new Entry[entries.size()]);
-    }
-    
-    public String getTotal() {
-        double total = 0;
-        String currencySymbol = "";
-        if (!cart.isEmpty()) {
-            Item item = cart.values().iterator().next();
-            currencySymbol = item.getPrice().substring(0, 1);
-        }
-        for (Item item : cart.values()) {
-            total += Double.valueOf(item.getPrice().substring(1));
-        }
-        return currencySymbol + String.valueOf(total);
-    }
-}
diff --git a/java/sca-contrib/samples/store/src/main/java/services/Total.java b/java/sca-contrib/samples/store/src/main/java/services/Total.java
deleted file mode 100644
index b77cc1c7ac..0000000000
--- a/java/sca-contrib/samples/store/src/main/java/services/Total.java
+++ /dev/null
@@ -1,29 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Total {
-    
-    String getTotal();
-
-}
diff --git a/java/sca-contrib/samples/store/src/main/resources/store.composite b/java/sca-contrib/samples/store/src/main/resources/store.composite
deleted file mode 100644
index 571678839d..0000000000
--- a/java/sca-contrib/samples/store/src/main/resources/store.composite
+++ /dev/null
@@ -1,64 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="store">
-		
-    <component name="Store">
-        <t:implementation.widget location="uiservices/store.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/store"/>
-        </service>
-		<reference name="catalog" target="Catalog">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-		 <reference name="shoppingCart" target="ShoppingCart/Cart">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="shoppingTotal" target="ShoppingCart/Total">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-    
-	<component name="Catalog">
-		<implementation.java class="services.FruitsCatalogImpl"/> 
-		<property name="currencyCode">USD</property>
-		<service name="Catalog">
-			<t:binding.jsonrpc/>
-   		</service>
-		<reference name="currencyConverter" target="CurrencyConverter"/>	
-	</component> 
- 	
-	<component name="ShoppingCart">
-		<implementation.java class="services.ShoppingCartImpl"/>
-		<service name="Cart">
-			<t:binding.atom uri="/ShoppingCart/Cart"/>
-		</service>    	
-		<service name="Total">
-			<t:binding.jsonrpc/>
-		</service>    	
-	</component>
-    
-	<component name="CurrencyConverter">
-		<implementation.java class="services.CurrencyConverterImpl"/>
-	</component>     
-
-</composite>
diff --git a/java/sca-contrib/samples/store/src/main/resources/uiservices/store.html b/java/sca-contrib/samples/store/src/main/resources/uiservices/store.html
deleted file mode 100644
index 45604463d1..0000000000
--- a/java/sca-contrib/samples/store/src/main/resources/uiservices/store.html
+++ /dev/null
@@ -1,162 +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.    
--->
-<html>
-<head>
-<title>Store</title>
-
-<script type="text/javascript" src="store.js"></script>
-
-<script language="JavaScript">
-
-	//@Reference
-	var catalog = new Reference("catalog");
-	
-	//@Reference
-	var shoppingCart = new Reference("shoppingCart");
-
-	//@Reference
-	var shoppingTotal = new Reference("shoppingTotal");
-	
-	var catalogItems;
-
-	function catalog_getResponse(items,exception) {
-		if(exception){
-			alert(exception.message);
-			return;
-		}
-		var catalog = "";
-		
-			for (var i=0; i<items.length; i++) {
-				var item = items[i].name + ' - ' + items[i].price;
-				catalog += '<input name="items" type="checkbox" value="' + 
-							item + '">' + item + ' <br>';
-			}
-			document.getElementById('catalog').innerHTML=catalog;
-			catalogItems = items;
-	}
-	
-	function shoppingCart_getResponse(feed) {
-		if (feed != null) {
-			var entries = feed.getElementsByTagName("entry"); 
-			var list = "";
-			for (var i=0; i<entries.length; i++) {
-				var content = entries[i].getElementsByTagName("content")[0];
-				var name = content.getElementsByTagName("name")[0].firstChild.nodeValue;
-				var price = content.getElementsByTagName("price")[0].firstChild.nodeValue;
-				list += name + ' - ' + price + ' <br>';
-			}
-			document.getElementById("shoppingCart").innerHTML = list;
-
-			if (entries.length != 0) {			
-					try	{
-						shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
-					}
-					catch(e){
-						alert(e);
-					}
-			}
-		}
-	}
-	
-	function shoppingTotal_getTotalResponse(total,exception) {
-		if(exception) { 
-			alert(exception.message); 
-			return;
-		}
-		document.getElementById('total').innerHTML = total;
-	}
-	
-	function shoppingCart_postResponse(entry) {
-		shoppingCart.get("", shoppingCart_getResponse);
-	}				
-
-	function addToCart() {
-		var items  = document.catalogForm.items;
-		var j = 0;
-		for (var i=0; i<items.length; i++)
-			if (items[i].checked) {
-					
-				var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>item</title><content type="text/xml">' +
-                	'<Item xmlns="http://services/">' +
-                	'<name xmlns="">' + catalogItems[i].name + '</name>' + '<price xmlns="">' + catalogItems[i].price + '</price>' +
-                 	'</Item>' + '</content></entry>';
-				shoppingCart.post(entry, shoppingCart_postResponse);
-				items[i].checked = false;
-			}
-	}
-	function checkoutCart() {
-		document.getElementById('store').innerHTML='<h2>' +
-				'Thanks for Shopping With Us!</h2>'+
-				'<h2>Your Order</h2>'+
-				'<form name="orderForm">'+
-					document.getElementById('shoppingCart').innerHTML+
-					'<br>'+
-					document.getElementById('total').innerHTML+
-					'<br>'+
-					'<br>'+
-					'<input type="submit" value="Continue Shopping">'+ 
-				'</form>';
-		shoppingCart.del("", null);
-	}
-	function deleteCart() {
-		shoppingCart.del("", null);
-		document.getElementById('shoppingCart').innerHTML = "";
-		document.getElementById('total').innerHTML = "";	
-	}	
-
-	function init() {
-			
-			try	{
-				catalog.get(catalog_getResponse);
-				shoppingCart.get("", shoppingCart_getResponse);
-			}
-			catch(e){
-				alert(e);
-			}
-		}
-	
-</script>
-
-</head>
-
-<body onload="init()">
-<h1>Store</h1>
-  <div id="store">
-   	<h2>Catalog</h2>
-   	<form name="catalogForm">
-		<div id="catalog" ></div>
-		<br>
-		<input type="button" onClick="addToCart()"  value="Add to Cart">
-   	</form>
- 
- 	<br>
-  
-   	<h2>Your Shopping Cart</h2>
-   	<form name="shoppingCartForm">
-		<div id="shoppingCart"></div>
-		<br>
-		<div id="total"></div>
-		<br>		
-		<input type="button" onClick="checkoutCart()" value="Checkout"> 
-		<input type="button" onClick="deleteCart()" value="Empty">     
-	   	<a href="../ShoppingCart/Cart/">(feed)</a>
-	</form>    
-  </div>
-</body>
-</html>
diff --git a/java/sca-contrib/samples/store/store.png b/java/sca-contrib/samples/store/store.png
deleted file mode 100644
index da413edeee..0000000000
--- a/java/sca-contrib/samples/store/store.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/store/store.svg b/java/sca-contrib/samples/store/store.svg
deleted file mode 100644
index 74f8ecd36d..0000000000
--- a/java/sca-contrib/samples/store/store.svg
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\store"
-   sodipodi:docname="store.svg"
-   version="1.0"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\simon\tuscany\java-head\sca\samples\store\store.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="538.06165"
-     inkscape:cy="341.69129"
-     inkscape:document-units="px"
-     inkscape:current-layer="g2997"
-     inkscape:window-width="1466"
-     inkscape:window-height="831"
-     inkscape:window-x="117"
-     inkscape:window-y="80" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997">
-      <rect
-         rx="14.335117"
-         ry="17.743465"
-         y="197.1973"
-         x="447.35422"
-         height="419.39099"
-         width="464.23727"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.28840661;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="translate(189.90868,1.0101522)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2171">store</flowPara></flowRoot>      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.30182266;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2175"
-         width="118.21779"
-         height="111.27543"
-         x="491.60019"
-         y="247.75989"
-         rx="7.1507306"
-         ry="9.2311935" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2177"
-         transform="translate(223.8585,41.670449)"><flowRegion
-           id="flowRegion2179"><rect
-             id="rect2181"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2183">ufs</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 474.29877,279.45598 L 507.63381,279.45598 L 513.69472,292.58796 L 506.62366,304.7098 L 474.29877,304.7098 L 481.87492,292.58796 L 474.29877,279.45598 z "
-         id="path2187" />
-      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2191"
-         width="115.66247"
-         height="85.862968"
-         x="493.07068"
-         y="503.27759"
-         rx="6.9961648"
-         ry="7.1230249" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2193"
-         transform="translate(225.47992,297.33908)"><flowRegion
-           id="flowRegion2195"><rect
-             id="rect2197"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2199">ShoppingCart</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 475.92019,535.12461 L 509.25523,535.12461 L 515.31614,548.25659 L 508.24508,560.37843 L 475.92019,560.37843 L 483.49634,548.25659 L 475.92019,535.12461 z "
-         id="path2203" />
-      <rect
-         style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2207"
-         width="115.66247"
-         height="85.862968"
-         x="761.44415"
-         y="391.31604"
-         rx="6.9961648"
-         ry="7.1230249" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot2209"
-         transform="translate(487.8534,185.37751)"><flowRegion
-           id="flowRegion2211"><rect
-             id="rect2213"
-             width="170"
-             height="61.42857"
-             x="281.42856"
-             y="212.66591" /></flowRegion><flowPara
-           id="flowPara2215">CurrencyConverter</flowPara></flowRoot>      <path
-         style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 744.29367,423.16304 L 777.62871,423.16304 L 783.68962,436.29502 L 776.61856,448.41686 L 744.29367,448.41686 L 751.86982,436.29502 L 744.29367,423.16304 z "
-         id="path2219" />
-      <rect
-         style="opacity:1;fill:#0064ff;fill-opacity:1;stroke:#000000;stroke-width:0.9612025;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2223"
-         width="104.08451"
-         height="113.17588"
-         x="138.37151"
-         y="350.1156"
-         rx="0"
-         ry="0.048917599" />
-      <path
-         style="fill:#1a73fe;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-         d="M 138.21429,462.66591 L 115.35714,479.80877 L 267.85714,479.80877 L 241.78571,463.02305 L 138.21429,462.66591 z "
-         id="path3197" />
-      <rect
-         style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect3199"
-         width="92.5"
-         height="97.14286"
-         x="143.57143"
-         y="358.38019"
-         ry="3.6203461"
-         rx="3.9285715" />
-      <image
-         y="366.6889"
-         x="156.24066"
-         id="image3323"
-         height="78.571434"
-         width="58.57143"
-         sodipodi:absref="C:\simon\tuscany\evangelism\whitepapers\shoppingcart.png"
-         xlink:href="C:\simon\tuscany\evangelism\whitepapers\shoppingcart.png" />
-      <image
-         y="270.52304"
-         x="526.42859"
-         id="image3342"
-         height="78.571434"
-         width="58.57143"
-         sodipodi:absref="C:\simon\tuscany\evangelism\whitepapers\shoppingcart.png"
-         xlink:href="C:\simon\tuscany\evangelism\whitepapers\shoppingcart.png" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 242.85714,374.80877 C 245.71429,374.80877 345.71429,374.80877 345.71429,374.80877 L 345.71429,291.95162 L 481.42858,291.95162"
-         id="path3348"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 210.71429,406.95163 L 345,406.95163 L 345,437.66591 L 481.42857,437.66591"
-         id="path3350"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 210.71429,439.09448 L 325.71429,439.09448 L 325.71429,548.3802 L 482.85714,548.3802"
-         id="path3352"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 626.42857,436.23734 C 750,437.66591 752.14286,436.23734 752.14286,436.23734"
-         id="path3354"
-         sodipodi:nodetypes="cc" />
-      <flowRoot
-         xml:space="preserve"
-         id="flowRoot3356"
-         transform="translate(-94.285714,25)"><flowRegion
-           id="flowRegion3358"><rect
-             id="rect3360"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara3362">CurrenyCode</flowPara></flowRoot>      <flowRoot
-         xml:space="preserve"
-         id="flowRoot3364"
-         transform="translate(-250.76562,-76.210859)"><flowRegion
-           id="flowRegion3366"><rect
-             id="rect3368"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara3370">HTTP</flowPara></flowRoot>      <flowRoot
-         xml:space="preserve"
-         id="flowRoot3372"
-         transform="translate(-273.62277,70.931998)"><flowRegion
-           id="flowRegion3374"><rect
-             id="rect3376"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara3378">JSONRPC</flowPara></flowRoot>      <flowRoot
-         xml:space="preserve"
-         id="flowRoot3380"
-         transform="translate(-243.62277,183.07485)"><flowRegion
-           id="flowRegion3382"><rect
-             id="rect3384"
-             width="142.14285"
-             height="21.428572"
-             x="655"
-             y="349.80878" /></flowRegion><flowPara
-           id="flowPara3386">Atom</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="491.56897"
-       y="392.70135"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(223.97819,186.76283)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Catalog</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3006"
-       width="21.718224"
-       height="20.708065"
-       x="537.53094"
-       y="377.04398"
-       rx="10.859112"
-       ry="0" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 474.41846,424.54836 L 507.7535,424.54836 L 513.81441,437.68034 L 506.74335,449.80218 L 474.41846,449.80218 L 481.99461,437.68034 L 474.41846,424.54836 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 587.6709,422.71008 L 621.00594,422.71008 L 627.06685,435.84206 L 619.99579,447.9639 L 587.6709,447.9639 L 595.24705,435.84206 L 587.6709,422.71008 z "
-       id="path3019" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/supplychain/README b/java/sca-contrib/samples/supplychain/README
deleted file mode 100644
index ea4493fdd4..0000000000
--- a/java/sca-contrib/samples/supplychain/README
+++ /dev/null
@@ -1,101 +0,0 @@
-SupplyChain Sample
-==================
-
-This sample demonstrates SCA components using the asynchronous API.
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-supplychain.jar supplychain.SupplyChainClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-supplychain.jar supplychain.SupplyChainClient
-
-
-Sample Overview
----------------
-
-The sample provides a Customer service with a purchaseGoods operation
-and a notifyShipment operation annotated with the SCA @OneWay annotation.
-The SupplyChainClient exercises this interface by calling the
-purchaseGoods operation. This results in messages passing to 
-the Retailer, Warehouse, and Shipper components and the result returned
-to the Customer service on a separate callback thread.
-
-supplychain/
-  src/
-    main/
-      java/
-        supplychain/
-          Customer.java                - Defines the Java interface implemented
-                                         by the Customer component
-          CustomerComponentImpl.java   - Implements the SCA Customer component
-          Retailer.java                - Defines the Java interface implemented
-                                         by the Retailer component
-          RetailerComponentImpl.java   - Implements the SCA RetailerComponent component
-          Shipper.java                 - Defines the Java interface implemented 
-                                         by the Shipper component
-          ShipperComponentImpl.java    - Implements the SCA ShipperComponent component
-          SupplyChainClient.java       - SupplyChainClient.java loads SCA runtime
-          Warehouse.java               - Defines the Java interface implemented
-                                         by the Warehouse component
-          WarehouseComponentImpl.java  - Implements the SCA WarehouseComponent component
-                                       
-      resources/                        
-        supplychain.composite          - the SCA assembly for this sample
-    test/
-      java/
-        supplychain/
-          SupplyChainClientTestCase.java - JUnit test case
-  build.xml                            - the Ant build file
-  pom.xml                              - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd supplychain
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] Main thread Thread[main,5,main]
-     [java] Main thread sleeping ...
-     [java] Work thread Thread[pool-1-thread-1,5,main] - Order, submitted, fulfilled, shipped
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd supplychain
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running supplychain.SupplyChainClientTestCase
-Main thread Thread[main,5,main]
-Sleeping ...
-Work thread Thread[pool-1-thread-1,5,main] - Order, submitted, fulfilled, shipped
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.625 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. 
\ No newline at end of file
diff --git a/java/sca-contrib/samples/supplychain/build.xml b/java/sca-contrib/samples/supplychain/build.xml
deleted file mode 100644
index 506180b8b1..0000000000
--- a/java/sca-contrib/samples/supplychain/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="sample-supplychain" default="compile">
-    <property name="test.class" value="supplychain.SupplyChainClient" />
-	<property name="test.jar"   value="sample-supplychain.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>	
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/supplychain/pom.xml b/java/sca-contrib/samples/supplychain/pom.xml
deleted file mode 100644
index 2e85d79793..0000000000
--- a/java/sca-contrib/samples/supplychain/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-supplychain</artifactId>
-    <name>Apache Tuscany SCA Supply Chain Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Customer.java b/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Customer.java
deleted file mode 100644
index 6c19a1108e..0000000000
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Customer.java
+++ /dev/null
@@ -1,33 +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 supplychain;
-
-import org.oasisopen.sca.annotation.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-    
-    public void purchaseGoods();
-    
-    @OneWay
-    public void notifyShipment(String order);
-
-}
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/java/sca-contrib/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
deleted file mode 100644
index 0323cebe11..0000000000
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.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 supplychain;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * This class implements the Customer service component.
- */
-public class CustomerComponentImpl implements Customer {
-    
-    private Retailer retailer;
-    
-    @Reference
-    public void setRetailer(Retailer retailer) {
-        this.retailer = retailer;
-    }
-    
-    public void purchaseGoods() {
-        retailer.submitOrder("Order");
-    }
-    
-    public void notifyShipment(String order) {
-        System.out.print("Work thread " + Thread.currentThread() + " - ");
-        System.out.println(order);
-    }
-
-}
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Retailer.java b/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Retailer.java
deleted file mode 100644
index 1add63fb4e..0000000000
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Retailer.java
+++ /dev/null
@@ -1,28 +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 supplychain;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-    
-    public void submitOrder(String order);
-
-}
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/java/sca-contrib/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
deleted file mode 100644
index 809e2b7b89..0000000000
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ /dev/null
@@ -1,39 +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 supplychain;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * This class implements the Customer service component.
- */
-public class RetailerComponentImpl implements Retailer {
-
-    private Warehouse warehouse;
-
-    @Reference
-    public void setWarehouse(Warehouse warehouse) {
-        this.warehouse = warehouse;
-    }
-
-    public void submitOrder(String order) {
-        warehouse.fulfillOrder(order + ", submitted");
-    }
-
-}
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Shipper.java b/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Shipper.java
deleted file mode 100644
index d4d49a922b..0000000000
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Shipper.java
+++ /dev/null
@@ -1,28 +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 supplychain;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-    
-    public void processShipment(String order);
-
-}
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/java/sca-contrib/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
deleted file mode 100644
index 59513eca5d..0000000000
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ /dev/null
@@ -1,39 +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 supplychain;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * This class implements the Warehouse service component.
- */
-public class ShipperComponentImpl implements Shipper {
-    
-    private Customer customer;
-    
-    @Reference
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
-    
-    public void processShipment(String order) {
-        customer.notifyShipment(order + ", shipped");
-    }
-
-}
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/java/sca-contrib/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
deleted file mode 100644
index 7072f582d1..0000000000
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ /dev/null
@@ -1,40 +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 supplychain;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate a Customer service component and invoke it.
- */
-public class SupplyChainClient {
-
-    public static final void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("supplychain.composite");
-        Customer customer = scaDomain.getService(Customer.class, "CustomerComponent");
-
-        System.out.println("Main thread " + Thread.currentThread());
-        customer.purchaseGoods();
-        System.out.println("Main thread sleeping ...");
-        Thread.sleep(1000);
-
-        scaDomain.close();
-    }
-}
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Warehouse.java b/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Warehouse.java
deleted file mode 100644
index 0be499f569..0000000000
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Warehouse.java
+++ /dev/null
@@ -1,28 +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 supplychain;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-    
-    public void fulfillOrder(String order);
-
-}
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/java/sca-contrib/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
deleted file mode 100644
index ff4f5e62eb..0000000000
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ /dev/null
@@ -1,39 +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 supplychain;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * This class implements the Warehouse service component.
- */
-public class WarehouseComponentImpl implements Warehouse {
-    
-    private Shipper shipper;
-    
-    @Reference
-    public void setShipper(Shipper shipper) {
-        this.shipper = shipper;
-    }
-    
-    public void fulfillOrder(String order) {
-        shipper.processShipment(order + ", fulfilled");
-    }
-
-}
diff --git a/java/sca-contrib/samples/supplychain/src/main/resources/supplychain.composite b/java/sca-contrib/samples/supplychain/src/main/resources/supplychain.composite
deleted file mode 100644
index 301efcaf1f..0000000000
--- a/java/sca-contrib/samples/supplychain/src/main/resources/supplychain.composite
+++ /dev/null
@@ -1,45 +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://supplychain"
-	xmlns:sp="http://supplychain"
-	name="supplychain">
-
-    <component name="CustomerComponent">
-        <implementation.java class="supplychain.CustomerComponentImpl" />
-        <reference name="retailer" target="RetailerComponent"/>
-    </component>
-
-    <component name="RetailerComponent">
-        <implementation.java class="supplychain.RetailerComponentImpl" />
-        <reference name="warehouse" target="WarehouseComponent"/>
-    </component>
-
-    <component name="WarehouseComponent">
-        <implementation.java class="supplychain.WarehouseComponentImpl" />
-        <reference name="shipper" target="ShipperComponent"/>
-    </component>
-
-    <component name="ShipperComponent">
-        <implementation.java class="supplychain.ShipperComponentImpl" />
-        <reference name="customer" target="CustomerComponent"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/java/sca-contrib/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
deleted file mode 100644
index 88e0eb7ab8..0000000000
--- a/java/sca-contrib/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.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 supplychain;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate a the Customer service component and invoke it.
- */
-public class SupplyChainClientTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private Customer customer;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("supplychain.composite");
-        customer = scaDomain.getService(Customer.class, "CustomerComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-
-        System.out.println("Main thread " + Thread.currentThread());
-        customer.purchaseGoods();
-        System.out.println("Sleeping ...");
-        Thread.sleep(1000);
-    }
-}
diff --git a/java/sca-contrib/samples/supplychain/supplychain.png b/java/sca-contrib/samples/supplychain/supplychain.png
deleted file mode 100644
index 51a384e827..0000000000
--- a/java/sca-contrib/samples/supplychain/supplychain.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/supplychain/supplychain.svg b/java/sca-contrib/samples/supplychain/supplychain.svg
deleted file mode 100644
index f72e77acab..0000000000
--- a/java/sca-contrib/samples/supplychain/supplychain.svg
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\supplychain"
-   sodipodi:docname="supplychain.svg"
-   version="1.0">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="521.44872"
-     inkscape:cy="414.63224"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1128"
-     inkscape:window-height="721"
-     inkscape:window-x="89"
-     inkscape:window-y="126" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1.047575,0,0,1,-9.726882,0)">
-      <rect
-         rx="19.999123"
-         ry="12.692303"
-         y="192.00233"
-         x="205.45438"
-         height="299.99988"
-         width="647.66394"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.95405793;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="translate(-38.86527,-2.857143)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">supplychain</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="85.862968"
-       x="241.34489"
-       y="300.02475"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(-26.24589,94.08621)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Customer</flowPara><flowPara
-         id="flowPara1939">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 224.19438,331.87174 L 257.52942,331.87174 L 263.59033,345.00372 L 256.51927,357.12556 L 224.19438,357.12556 L 231.77053,345.00372 L 224.19438,331.87174 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 337.44682,330.03346 L 370.78186,330.03346 L 376.84277,343.16544 L 369.77171,355.28728 L 337.44682,355.28728 L 345.02297,343.16544 L 337.44682,330.03346 z "
-       id="path3019" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1897"
-       width="115.66247"
-       height="85.862968"
-       x="405.82632"
-       y="298.30585"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1899"
-       transform="translate(138.2355,92.36731)"><flowRegion
-         id="flowRegion1901"><rect
-           id="rect1903"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1905">Retailer</flowPara><flowPara
-         id="flowPara1941">Component </flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 388.67581,330.15284 L 422.01085,330.15284 L 428.07176,343.28482 L 421.0007,355.40666 L 388.67581,355.40666 L 396.25196,343.28482 L 388.67581,330.15284 z "
-       id="path1907" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 501.92825,328.31456 L 535.26329,328.31456 L 541.3242,341.44654 L 534.25314,353.56838 L 501.92825,353.56838 L 509.5044,341.44654 L 501.92825,328.31456 z "
-       id="path1909" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1911"
-       width="115.66247"
-       height="85.862968"
-       x="567.96918"
-       y="296.87729"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1913"
-       transform="translate(300.3784,90.93874)"><flowRegion
-         id="flowRegion1915"><rect
-           id="rect1917"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1919">Wharehouse</flowPara><flowPara
-         id="flowPara1943">Component </flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 550.81867,328.72427 L 584.15371,328.72427 L 590.21462,341.85625 L 583.14356,353.97809 L 550.81867,353.97809 L 558.39482,341.85625 L 550.81867,328.72427 z "
-       id="path1921" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 664.07111,326.88599 L 697.40615,326.88599 L 703.46706,340.01797 L 696.396,352.13981 L 664.07111,352.13981 L 671.64726,340.01797 L 664.07111,326.88599 z "
-       id="path1923" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1925"
-       width="115.66247"
-       height="85.862968"
-       x="727.96918"
-       y="294.73444"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1927"
-       transform="translate(460.3784,88.79589)"><flowRegion
-         id="flowRegion1929"><rect
-           id="rect1931"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1933">Shipper</flowPara><flowPara
-         id="flowPara1945">Component </flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 710.81866,326.58142 L 744.1537,326.58142 L 750.21461,339.7134 L 743.14355,351.83524 L 710.81866,351.83524 L 718.39481,339.7134 L 710.81866,326.58142 z "
-       id="path1935" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 824.0711,324.74314 L 857.40614,324.74314 L 863.46705,337.87512 L 856.39599,349.99696 L 824.0711,349.99696 L 831.64725,337.87512 L 824.0711,324.74314 z "
-       id="path1937" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 376.42857,343.3802 C 395.71429,343.3802 395.71429,343.3802 395.71429,343.3802"
-       id="path1947" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 540.71429,341.23734 C 557.85714,341.23734 557.85714,341.23734 557.85714,341.23734"
-       id="path1949" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 702.14286,340.52305 C 717.85714,340.52305 717.85714,340.52305 717.85714,340.52305"
-       id="path1951" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 863.57143,337.66591 C 875.71429,337.66591 875.71429,337.66591 875.71429,337.66591 L 875,427.66591 L 212.14286,429.09448 L 210.71429,344.09448 L 231.42857,344.09448"
-       id="path1953"
-       inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\supplychain\supplychain.png"
-       inkscape:export-xdpi="52.84"
-       inkscape:export-ydpi="52.84" />
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/web-resource/README b/java/sca-contrib/samples/web-resource/README
deleted file mode 100644
index 56bffba6a3..0000000000
--- a/java/sca-contrib/samples/web-resource/README
+++ /dev/null
@@ -1,76 +0,0 @@
-Web Resource Component Sample
-======================================
-This sample demonstrates an SCA Web resource component.
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-web-resource.jar web.resource.SampleServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-web-resource.jar web.resource.SampleServer
-
-Now the server is started you can point your Web browser to the URL of the Web resource.
-
-Sample Overview
----------------
-The sample provides a single component exposing a Web resource.
-
-web-resource/
-  src/
-    main/
-      java/
-        web/resource/
-          SampleServer.java               - starts the SCA Runtime and 
-                                            deploys the WebResource.composite
-      resources/
-        myContent/
-          index.html                      - a Web HTML resource
-        WebResource.composite             - the SCA assembly for this sample
-  web-resource.png                        - a pictorial representation of the 
-                                            sample .composite file
-  build.xml                               - the Ant build file
-  pom.xml                                 - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant using the 
-following commands
-
-cd web-resource
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] 14-Jan-2008 14:28:07 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:8080/myWeb/*
-     [java] Sample server started (press enter to shutdown)
-     [java]
-     [java] To get the Web resource, point your Web browser to the following add
-ress:
-     [java] http://localhost:8080/myWeb/index.html
-     [java]
-     
-As this point the Web resource is exposed by a web server started automatically
-by the SCA runtime. To stop the server just press enter.
-
-Building The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built using
-Maven as follows.
-
-cd web-resource
-mvn
-
diff --git a/java/sca-contrib/samples/web-resource/build.xml b/java/sca-contrib/samples/web-resource/build.xml
deleted file mode 100644
index 5f6b6091e7..0000000000
--- a/java/sca-contrib/samples/web-resource/build.xml
+++ /dev/null
@@ -1,72 +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.    
--->
-<project name="web-resource" default="compile">
-    <property name="test.class" value="web.resource.SampleServer" />
-	<property name="test.jar"   value="sample-web-resource.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>	
-	
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-               <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>  
-    </target>
-
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/samples/web-resource/pom.xml b/java/sca-contrib/samples/web-resource/pom.xml
deleted file mode 100644
index eaa6269819..0000000000
--- a/java/sca-contrib/samples/web-resource/pom.xml
+++ /dev/null
@@ -1,79 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-web-resource</artifactId>
-    <name>Apache Tuscany SCA Web Resource Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/samples/web-resource/src/main/java/web/resource/SampleServer.java b/java/sca-contrib/samples/web-resource/src/main/java/web/resource/SampleServer.java
deleted file mode 100644
index 9410de08c4..0000000000
--- a/java/sca-contrib/samples/web-resource/src/main/java/web/resource/SampleServer.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 web.resource;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class SampleServer {
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("WebResource.composite");
-
-        try {
-            System.out.println("Sample server started (press enter to shutdown)");
-            System.out.println();
-            System.out.println("To get the Web resource, point your Web browser to the following address:");
-            System.out.println("http://localhost:8080/myWeb/index.html");
-            System.out.println();
-            System.in.read();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        scaDomain.close();
-        System.out.println("Sample server stopped");
-    }
-}
diff --git a/java/sca-contrib/samples/web-resource/src/main/resources/WebResource.composite b/java/sca-contrib/samples/web-resource/src/main/resources/WebResource.composite
deleted file mode 100644
index 4536136a8b..0000000000
--- a/java/sca-contrib/samples/web-resource/src/main/resources/WebResource.composite
+++ /dev/null
@@ -1,32 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://web"
-	name="WebResource">
-
-    <component name="myWeb">
-       <tuscany:implementation.resource location="myContent"/>
-        <service name="Resource">
-            <tuscany:binding.http/>
-        </service>
-    </component>      
-
-</composite>
diff --git a/java/sca-contrib/samples/web-resource/src/main/resources/myContent/index.html b/java/sca-contrib/samples/web-resource/src/main/resources/myContent/index.html
deleted file mode 100644
index 55de048373..0000000000
--- a/java/sca-contrib/samples/web-resource/src/main/resources/myContent/index.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<html>
-<!--
- * 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.    
- -->
-  <head>
-    <title>Tuscany Sample Web Resource</TITLE>
-  </head>
-
-  <body>
-  	<h1>A Sample Web Resource</h1>
-
-  	<p>Tuscany allows you to publish Web resources using SCA components declared with an
-	<b>&lt;implementation.resource&gt;</b> component implementation type and made available
-	to HTTP clients using a <b>&lt;binding.http&gt;</b> binding.</p>
-
-  	<p>Here is the SCA composite that publishes this page:</p>
-  	
-  	<pre>
-&lt;composite xmlns=&quot;http://www.osoa.org/xmlns/sca/1.0&quot;
-  targetNamespace=&quot;http://web&quot;
-  name=&quot;WebResource&quot;&gt;
-
-  &lt;component name=&quot;myWeb&quot;&gt;
-    &lt;implementation.resource location=&quot;myContent&quot;/&gt;
-    &lt;service name=&quot;Resource&quot;&gt;
-      &lt;binding.http/&gt;
-    &lt;/service&gt;
-  &lt;/component&gt;      
-
-&lt;/composite&gt;
-  	</pre>
-  	
-  </body>
-</html>
diff --git a/java/sca-contrib/samples/web-resource/web-resource.png b/java/sca-contrib/samples/web-resource/web-resource.png
deleted file mode 100644
index 7259447b65..0000000000
--- a/java/sca-contrib/samples/web-resource/web-resource.png
+++ /dev/null
diff --git a/java/sca-contrib/samples/web-resource/web-resource.svg b/java/sca-contrib/samples/web-resource/web-resource.svg
deleted file mode 100644
index 0d1257316c..0000000000
--- a/java/sca-contrib/samples/web-resource/web-resource.svg
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\simon\tuscany\java-panic\sca\samples\web-resource"
-   sodipodi:docname="web-resource.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\tuscany\java-panic\sca\samples\web-resource\web-resource.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="525.73551"
-     inkscape:cy="374.31238"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1143"
-     inkscape:window-height="653"
-     inkscape:window-x="342"
-     inkscape:window-y="109" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(0.991389,0,0,0.9858089,2.215655,2.7105357)">
-      <rect
-         rx="13.798461"
-         ry="11.012117"
-         y="201.35284"
-         x="261.12485"
-         height="260.28641"
-         width="446.85785"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.87128341;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">WebResource</flowPara></flowRoot>      <text
-         xml:space="preserve"
-         style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         x="447.14285"
-         y="370.52304"
-         id="text2184"
-         transform="matrix(1.0086858,0,0,1.0143954,-2.2348997,-2.7495549)"><tspan
-           sodipodi:role="line"
-           id="tspan2186"
-           x="447.14285"
-           y="370.52304" /></text>
-    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.24079084;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="137.56453"
-       height="90.622177"
-       x="419.32242"
-       y="262.28799"
-       rx="8.3209715"
-       ry="7.5178399" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(158.89697,68.086243)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1885">myWeb</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.64851415px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 371.6615,289.33886 L 427.41483,289.33886 L 437.55179,310.67646 L 425.72534,330.37273 L 371.6615,330.37273 L 384.33272,310.67646 L 371.6615,289.33886 z "
-       id="path3017" />
-    <text
-       xml:space="preserve"
-       style="font-size:10.96820259px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="479.19058"
-       y="292.96347"
-       id="text2202"
-       transform="scale(0.9140169,1.0940717)"><tspan
-         sodipodi:role="line"
-         id="tspan2204"
-         x="479.19058"
-         y="292.96347">implementation.resource</tspan></text>
-    <rect
-       style="opacity:0.18888891;fill:#223756;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.2524904;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2206"
-       width="252.14285"
-       height="55.714287"
-       x="514.28571"
-       y="469.80875"
-       rx="8.3209715"
-       ry="7.5178399" />
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="530.71429"
-       y="484.09448"
-       id="text2208"><tspan
-         sodipodi:role="line"
-         id="tspan2210"
-         x="530.71429"
-         y="484.09448">File System</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="532.85718"
-       y="500.52304"
-       id="text2212"><tspan
-         sodipodi:role="line"
-         id="tspan2214"
-         x="532.85718"
-         y="500.52304">./myContent</tspan><tspan
-         sodipodi:role="line"
-         x="532.85718"
-         y="515.52304"
-         id="tspan2216">     /index.html</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:6,1;stroke-dashoffset:0"
-       d="M 482.85714,324.80877 L 482.85714,493.3802 L 531.42857,493.3802"
-       id="path2218" />
-    <text
-       xml:space="preserve"
-       style="font-size:9.94491482px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="390.92761"
-       y="302.53455"
-       id="text3193"
-       transform="scale(0.9925021,1.0075545)"><tspan
-         sodipodi:role="line"
-         id="tspan3195"
-         x="390.92761"
-         y="302.53455">binding.</tspan><tspan
-         sodipodi:role="line"
-         x="390.92761"
-         y="314.96569"
-         id="tspan3197">http</tspan></text>
-  </g>
-</svg>
diff --git a/java/sca-contrib/samples/zipcode-jaxws/LICENSE b/java/sca-contrib/samples/zipcode-jaxws/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/samples/zipcode-jaxws/NOTICE b/java/sca-contrib/samples/zipcode-jaxws/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/samples/zipcode-jaxws/README b/java/sca-contrib/samples/zipcode-jaxws/README
deleted file mode 100644
index 12f81543f0..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/README
+++ /dev/null
@@ -1,72 +0,0 @@
-ZipCode JAX-WS Sample

-======================================

-This sample demonstrates how to access an existing web service using JAX-WS/JAXB generated java interfaces/classes.

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-If you just want to run it to see what happens open a command prompt, navigate

-to this sample directory and do:

-

-ant run

-

-OR if you don't have ant, on Windows do

-

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-zipcode-jaxws.jar zipcode.ZipCodeClient

-

-and on *nix do

-

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-zipcode-jaxws.jar zipcode.ZipCodeClient

-

-

-Sample Overview

----------------

-The sample provides a single component exposing a Web resource.

-

-zipcode-jaxws/

-  src/

-    main/

-      java/

-

-      resources/

-        ZipCode.composite                 - the SCA assembly for this sample

-  zipcode-jaxws.png                       - a pictorial representation of the 

-                                            sample .composite file

-  build.xml                               - the Ant build file

-  pom.xml                                 - the Maven build file        

-

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant using the 

-following commands

-

-cd zipcode-jaxws

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] 14-Jan-2008 14:28:07 org.apache.tuscany.sca.http.jetty.JettyServer a

-ddServletMapping

-     [java] INFO: Added Servlet mapping: http://L3AW203:8080/myWeb/*

-     [java] Sample server started (press enter to shutdown)

-     [java]

-     [java] To get the Web resource, point your Web browser to the following add

-ress:

-     [java] http://localhost:8080/myWeb/index.html

-     [java]

-     

-As this point the Web resource is exposed by a web server started automatically

-by the SCA runtime. To stop the server just press enter.

-

-Building The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built using

-Maven as follows.

-

-cd zipcode-jaxws

-mvn

-

diff --git a/java/sca-contrib/samples/zipcode-jaxws/build.xml b/java/sca-contrib/samples/zipcode-jaxws/build.xml
deleted file mode 100644
index 85caf5954e..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/build.xml
+++ /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.
--->
-<!DOCTYPE project [
-<!ENTITY buildDependency SYSTEM "build-dependency.xml">
-]>    
-
-<project name="sample-jaxws" default="compile">
-	&buildDependency;
-    <target name="compile" depends="download-wsdl">
-		<mkdir dir="target/classes"/>
-		<javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-			<src path="src/main/java"/>
-			<classpath>
-				<fileset refid="tuscany.jars"/>
-				<fileset refid="3rdparty.jars"/>
-			</classpath>
-		</javac>
-		<copy todir="target/classes">
-			<fileset dir="src/main/resources"/>
-		</copy>
-		<jar destfile="target/sample-zipcode-jaxws.jar" basedir="target/classes">
-			<manifest>
-				<attribute name="Main-Class" value="zipcode.ZipCodeClient"/>
-			</manifest>
-		</jar>
-	</target>
-
-	<target name="download-wsdl">
-		<mkdir dir="target/classes/wsdl/" />
-		<get src="http://www.webservicex.net/uszip.asmx?wsdl" dest="target/classes/wsdl//uszip.wsdl" verbose="true" usetimestamp="true" />
-		<get src="http://www.webservicex.net/WeatherForecast.asmx?wsdl" dest="target/classes/wsdl/WeatherForecast.wsdl" verbose="true" usetimestamp="true" />
-	</target>
-	
-	<target name="package" depends="compile" />
-
-	<target name="run">
-		<java classname="zipcode.ZipCodeClient" fork="true">
-			<classpath>
-				<pathelement location="target/sample-zipcode-jaxws.jar"/>
-				<fileset refid="tuscany.jars"/>
-				<fileset refid="3rdparty.jars"/>
-			</classpath>
-		</java>
-	</target>
-
-	<target name="clean">
-		<delete includeemptydirs="true">
-			<fileset dir="target"/>
-		</delete>
-	</target>
-
-</project>
diff --git a/java/sca-contrib/samples/zipcode-jaxws/pom.xml b/java/sca-contrib/samples/zipcode-jaxws/pom.xml
deleted file mode 100644
index 686b948d03..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/pom.xml
+++ /dev/null
@@ -1,245 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-zipcode-jaxws</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA US Zip Code JAX-WS Sample</name>
-    <description>Apache Tuscany SCA US Zip Code JAX-WS Sample</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <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>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <!-- comment out the following to build offline -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <executions>
-                    <execution>
-                        <id>install-wsdl</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${project.build.outputDirectory}/wsdl/" />
-                                <get src="http://www.webservicex.net/uszip.asmx?wsdl"
-                                    dest="${project.build.outputDirectory}/wsdl/uszip.wsdl" verbose="true"
-                                    usetimestamp="true" />
-                                <get src="http://www.webservicex.net/WeatherForecast.asmx?wsdl"
-                                    dest="${project.build.outputDirectory}/wsdl/WeatherForecast.wsdl" verbose="true"
-                                    usetimestamp="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- end of offline excluded section -->
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>location.LocationClient</mainClass>
-                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </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>
-            <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.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.9</version>
-                <executions>
-                    <execution>
-                        <id>wsimport1</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.example.uszip</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>uszip.wsdl</wsdlFile>
-                            </wsdlFiles>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>wsimport2</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.example.weather</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>WeatherForecast.wsdl</wsdlFile>
-                            </wsdlFiles>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                    <target>2.1</target>
-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                    <verbose>false</verbose>
-                    <xnocompile>true</xnocompile>
-                </configuration>
-            </plugin>
-            -->
-        </plugins>
-    </build>
-
-
-</project>
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
deleted file mode 100644
index 8c9a48bf40..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
+++ /dev/null
@@ -1,81 +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 com.example.uszip;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="USAreaCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "usAreaCode"
-})
-@XmlRootElement(name = "GetInfoByAreaCode")
-public class GetInfoByAreaCode {
-
-    @XmlElement(name = "USAreaCode")
-    protected String usAreaCode;
-
-    /**
-     * Gets the value of the usAreaCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUSAreaCode() {
-        return usAreaCode;
-    }
-
-    /**
-     * Sets the value of the usAreaCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUSAreaCode(String value) {
-        this.usAreaCode = value;
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
deleted file mode 100644
index 93847c8809..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
+++ /dev/null
@@ -1,158 +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 com.example.uszip;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="GetInfoByAreaCodeResult" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 &lt;sequence>
- *                   &lt;any/>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "getInfoByAreaCodeResult"
-})
-@XmlRootElement(name = "GetInfoByAreaCodeResponse")
-public class GetInfoByAreaCodeResponse {
-
-    @XmlElement(name = "GetInfoByAreaCodeResult")
-    protected GetInfoByAreaCodeResponse.GetInfoByAreaCodeResult getInfoByAreaCodeResult;
-
-    /**
-     * Gets the value of the getInfoByAreaCodeResult property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GetInfoByAreaCodeResponse.GetInfoByAreaCodeResult }
-     *     
-     */
-    public GetInfoByAreaCodeResponse.GetInfoByAreaCodeResult getGetInfoByAreaCodeResult() {
-        return getInfoByAreaCodeResult;
-    }
-
-    /**
-     * Sets the value of the getInfoByAreaCodeResult property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GetInfoByAreaCodeResponse.GetInfoByAreaCodeResult }
-     *     
-     */
-    public void setGetInfoByAreaCodeResult(GetInfoByAreaCodeResponse.GetInfoByAreaCodeResult value) {
-        this.getInfoByAreaCodeResult = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence>
-     *         &lt;any/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "content"
-    })
-    public static class GetInfoByAreaCodeResult {
-
-        @XmlMixed
-        @XmlAnyElement(lax = true)
-        protected List<Object> content;
-
-        /**
-         * Gets the value of the content property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a <CODE>set</CODE> method for the content property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * <pre>
-         *    getContent().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list
-         * {@link String }
-         * {@link Object }
-         * 
-         * 
-         */
-        public List<Object> getContent() {
-            if (content == null) {
-                content = new ArrayList<Object>();
-            }
-            return this.content;
-        }
-
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
deleted file mode 100644
index cf9276d417..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
+++ /dev/null
@@ -1,81 +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 com.example.uszip;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="USCity" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "usCity"
-})
-@XmlRootElement(name = "GetInfoByCity")
-public class GetInfoByCity {
-
-    @XmlElement(name = "USCity")
-    protected String usCity;
-
-    /**
-     * Gets the value of the usCity property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUSCity() {
-        return usCity;
-    }
-
-    /**
-     * Sets the value of the usCity property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUSCity(String value) {
-        this.usCity = value;
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
deleted file mode 100644
index 9dc0e41b2b..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
+++ /dev/null
@@ -1,158 +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 com.example.uszip;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="GetInfoByCityResult" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 &lt;sequence>
- *                   &lt;any/>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "getInfoByCityResult"
-})
-@XmlRootElement(name = "GetInfoByCityResponse")
-public class GetInfoByCityResponse {
-
-    @XmlElement(name = "GetInfoByCityResult")
-    protected GetInfoByCityResponse.GetInfoByCityResult getInfoByCityResult;
-
-    /**
-     * Gets the value of the getInfoByCityResult property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GetInfoByCityResponse.GetInfoByCityResult }
-     *     
-     */
-    public GetInfoByCityResponse.GetInfoByCityResult getGetInfoByCityResult() {
-        return getInfoByCityResult;
-    }
-
-    /**
-     * Sets the value of the getInfoByCityResult property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GetInfoByCityResponse.GetInfoByCityResult }
-     *     
-     */
-    public void setGetInfoByCityResult(GetInfoByCityResponse.GetInfoByCityResult value) {
-        this.getInfoByCityResult = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence>
-     *         &lt;any/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "content"
-    })
-    public static class GetInfoByCityResult {
-
-        @XmlMixed
-        @XmlAnyElement(lax = true)
-        protected List<Object> content;
-
-        /**
-         * Gets the value of the content property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a <CODE>set</CODE> method for the content property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * <pre>
-         *    getContent().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list
-         * {@link String }
-         * {@link Object }
-         * 
-         * 
-         */
-        public List<Object> getContent() {
-            if (content == null) {
-                content = new ArrayList<Object>();
-            }
-            return this.content;
-        }
-
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
deleted file mode 100644
index 48be94b14a..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
+++ /dev/null
@@ -1,81 +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 com.example.uszip;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="USState" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "usState"
-})
-@XmlRootElement(name = "GetInfoByState")
-public class GetInfoByState {
-
-    @XmlElement(name = "USState")
-    protected String usState;
-
-    /**
-     * Gets the value of the usState property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUSState() {
-        return usState;
-    }
-
-    /**
-     * Sets the value of the usState property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUSState(String value) {
-        this.usState = value;
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
deleted file mode 100644
index 1645e11ca2..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
+++ /dev/null
@@ -1,158 +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 com.example.uszip;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="GetInfoByStateResult" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 &lt;sequence>
- *                   &lt;any/>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "getInfoByStateResult"
-})
-@XmlRootElement(name = "GetInfoByStateResponse")
-public class GetInfoByStateResponse {
-
-    @XmlElement(name = "GetInfoByStateResult")
-    protected GetInfoByStateResponse.GetInfoByStateResult getInfoByStateResult;
-
-    /**
-     * Gets the value of the getInfoByStateResult property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GetInfoByStateResponse.GetInfoByStateResult }
-     *     
-     */
-    public GetInfoByStateResponse.GetInfoByStateResult getGetInfoByStateResult() {
-        return getInfoByStateResult;
-    }
-
-    /**
-     * Sets the value of the getInfoByStateResult property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GetInfoByStateResponse.GetInfoByStateResult }
-     *     
-     */
-    public void setGetInfoByStateResult(GetInfoByStateResponse.GetInfoByStateResult value) {
-        this.getInfoByStateResult = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence>
-     *         &lt;any/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "content"
-    })
-    public static class GetInfoByStateResult {
-
-        @XmlMixed
-        @XmlAnyElement(lax = true)
-        protected List<Object> content;
-
-        /**
-         * Gets the value of the content property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a <CODE>set</CODE> method for the content property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * <pre>
-         *    getContent().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list
-         * {@link String }
-         * {@link Object }
-         * 
-         * 
-         */
-        public List<Object> getContent() {
-            if (content == null) {
-                content = new ArrayList<Object>();
-            }
-            return this.content;
-        }
-
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
deleted file mode 100644
index 45c948b4b4..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
+++ /dev/null
@@ -1,81 +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 com.example.uszip;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="USZip" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "usZip"
-})
-@XmlRootElement(name = "GetInfoByZIP")
-public class GetInfoByZIP {
-
-    @XmlElement(name = "USZip")
-    protected String usZip;
-
-    /**
-     * Gets the value of the usZip property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUSZip() {
-        return usZip;
-    }
-
-    /**
-     * Sets the value of the usZip property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUSZip(String value) {
-        this.usZip = value;
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
deleted file mode 100644
index 9e78dc6d0a..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
+++ /dev/null
@@ -1,158 +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 com.example.uszip;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="GetInfoByZIPResult" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 &lt;sequence>
- *                   &lt;any/>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "getInfoByZIPResult"
-})
-@XmlRootElement(name = "GetInfoByZIPResponse")
-public class GetInfoByZIPResponse {
-
-    @XmlElement(name = "GetInfoByZIPResult")
-    protected GetInfoByZIPResponse.GetInfoByZIPResult getInfoByZIPResult;
-
-    /**
-     * Gets the value of the getInfoByZIPResult property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GetInfoByZIPResponse.GetInfoByZIPResult }
-     *     
-     */
-    public GetInfoByZIPResponse.GetInfoByZIPResult getGetInfoByZIPResult() {
-        return getInfoByZIPResult;
-    }
-
-    /**
-     * Sets the value of the getInfoByZIPResult property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GetInfoByZIPResponse.GetInfoByZIPResult }
-     *     
-     */
-    public void setGetInfoByZIPResult(GetInfoByZIPResponse.GetInfoByZIPResult value) {
-        this.getInfoByZIPResult = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence>
-     *         &lt;any/>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "content"
-    })
-    public static class GetInfoByZIPResult {
-
-        @XmlMixed
-        @XmlAnyElement(lax = true)
-        protected List<Object> content;
-
-        /**
-         * Gets the value of the content property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a <CODE>set</CODE> method for the content property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * <pre>
-         *    getContent().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list
-         * {@link String }
-         * {@link Object }
-         * 
-         * 
-         */
-        public List<Object> getContent() {
-            if (content == null) {
-                content = new ArrayList<Object>();
-            }
-            return this.content;
-        }
-
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
deleted file mode 100644
index ced83ff09a..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
+++ /dev/null
@@ -1,145 +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 com.example.uszip;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.example.uszip package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.example.uszip
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link GetInfoByCity }
-     * 
-     */
-    public GetInfoByCity createGetInfoByCity() {
-        return new GetInfoByCity();
-    }
-
-    /**
-     * Create an instance of {@link GetInfoByState }
-     * 
-     */
-    public GetInfoByState createGetInfoByState() {
-        return new GetInfoByState();
-    }
-
-    /**
-     * Create an instance of {@link GetInfoByZIPResponse.GetInfoByZIPResult }
-     * 
-     */
-    public GetInfoByZIPResponse.GetInfoByZIPResult createGetInfoByZIPResponseGetInfoByZIPResult() {
-        return new GetInfoByZIPResponse.GetInfoByZIPResult();
-    }
-
-    /**
-     * Create an instance of {@link GetInfoByStateResponse.GetInfoByStateResult }
-     * 
-     */
-    public GetInfoByStateResponse.GetInfoByStateResult createGetInfoByStateResponseGetInfoByStateResult() {
-        return new GetInfoByStateResponse.GetInfoByStateResult();
-    }
-
-    /**
-     * Create an instance of {@link GetInfoByAreaCodeResponse.GetInfoByAreaCodeResult }
-     * 
-     */
-    public GetInfoByAreaCodeResponse.GetInfoByAreaCodeResult createGetInfoByAreaCodeResponseGetInfoByAreaCodeResult() {
-        return new GetInfoByAreaCodeResponse.GetInfoByAreaCodeResult();
-    }
-
-    /**
-     * Create an instance of {@link GetInfoByZIP }
-     * 
-     */
-    public GetInfoByZIP createGetInfoByZIP() {
-        return new GetInfoByZIP();
-    }
-
-    /**
-     * Create an instance of {@link GetInfoByAreaCodeResponse }
-     * 
-     */
-    public GetInfoByAreaCodeResponse createGetInfoByAreaCodeResponse() {
-        return new GetInfoByAreaCodeResponse();
-    }
-
-    /**
-     * Create an instance of {@link GetInfoByCityResponse }
-     * 
-     */
-    public GetInfoByCityResponse createGetInfoByCityResponse() {
-        return new GetInfoByCityResponse();
-    }
-
-    /**
-     * Create an instance of {@link GetInfoByStateResponse }
-     * 
-     */
-    public GetInfoByStateResponse createGetInfoByStateResponse() {
-        return new GetInfoByStateResponse();
-    }
-
-    /**
-     * Create an instance of {@link GetInfoByCityResponse.GetInfoByCityResult }
-     * 
-     */
-    public GetInfoByCityResponse.GetInfoByCityResult createGetInfoByCityResponseGetInfoByCityResult() {
-        return new GetInfoByCityResponse.GetInfoByCityResult();
-    }
-
-    /**
-     * Create an instance of {@link GetInfoByZIPResponse }
-     * 
-     */
-    public GetInfoByZIPResponse createGetInfoByZIPResponse() {
-        return new GetInfoByZIPResponse();
-    }
-
-    /**
-     * Create an instance of {@link GetInfoByAreaCode }
-     * 
-     */
-    public GetInfoByAreaCode createGetInfoByAreaCode() {
-        return new GetInfoByAreaCode();
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
deleted file mode 100644
index 22493ba9b8..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
+++ /dev/null
@@ -1,89 +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 com.example.uszip;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.3-b02-
- * Generated source version: 2.1
- * 
- */
-@WebServiceClient(name = "USZip", targetNamespace = "http://www.webserviceX.NET", wsdlLocation = "file:/C:/Tuscany/java/sca/demos/us-location/src/main/resources/wsdl/uszip.wsdl")
-public class USZip
-    extends Service
-{
-
-    private final static URL USZIP_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.example.uszip.USZip.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.example.uszip.USZip.class.getResource(".");
-            url = new URL(baseUrl, "file:/C:/Tuscany/java/sca/demos/us-location/src/main/resources/wsdl/uszip.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/C:/Tuscany/java/sca/demos/us-location/src/main/resources/wsdl/uszip.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        USZIP_WSDL_LOCATION = url;
-    }
-
-    public USZip(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public USZip() {
-        super(USZIP_WSDL_LOCATION, new QName("http://www.webserviceX.NET", "USZip"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns USZipSoap
-     */
-    @WebEndpoint(name = "USZipSoap")
-    public USZipSoap getUSZipSoap() {
-        return super.getPort(new QName("http://www.webserviceX.NET", "USZipSoap"), USZipSoap.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns USZipSoap
-     */
-    @WebEndpoint(name = "USZipSoap")
-    public USZipSoap getUSZipSoap(WebServiceFeature... features) {
-        return super.getPort(new QName("http://www.webserviceX.NET", "USZipSoap"), USZipSoap.class, features);
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
deleted file mode 100644
index 5ac370005f..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
+++ /dev/null
@@ -1,103 +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 com.example.uszip;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.3-b02-
- * Generated source version: 2.1
- * 
- */
-@WebService(name = "USZipSoap", targetNamespace = "http://www.webserviceX.NET")
-@XmlSeeAlso({
-    ObjectFactory.class
-})
-public interface USZipSoap {
-
-
-    /**
-     * Get State Code,City,Area Code,Time Zone,Zip Code by Zip Code
-     * 
-     * @param usZip
-     * @return
-     *     returns com.example.uszip.GetInfoByZIPResponse.GetInfoByZIPResult
-     */
-    @WebMethod(operationName = "GetInfoByZIP", action = "http://www.webserviceX.NET/GetInfoByZIP")
-    @WebResult(name = "GetInfoByZIPResult", targetNamespace = "http://www.webserviceX.NET")
-    @RequestWrapper(localName = "GetInfoByZIP", targetNamespace = "http://www.webserviceX.NET", className = "com.example.uszip.GetInfoByZIP")
-    @ResponseWrapper(localName = "GetInfoByZIPResponse", targetNamespace = "http://www.webserviceX.NET", className = "com.example.uszip.GetInfoByZIPResponse")
-    public com.example.uszip.GetInfoByZIPResponse.GetInfoByZIPResult getInfoByZIP(
-        @WebParam(name = "USZip", targetNamespace = "http://www.webserviceX.NET")
-        String usZip);
-
-    /**
-     * Get State Code,City,Area Code,Time Zone,Zip Code by City
-     * 
-     * @param usCity
-     * @return
-     *     returns com.example.uszip.GetInfoByCityResponse.GetInfoByCityResult
-     */
-    @WebMethod(operationName = "GetInfoByCity", action = "http://www.webserviceX.NET/GetInfoByCity")
-    @WebResult(name = "GetInfoByCityResult", targetNamespace = "http://www.webserviceX.NET")
-    @RequestWrapper(localName = "GetInfoByCity", targetNamespace = "http://www.webserviceX.NET", className = "com.example.uszip.GetInfoByCity")
-    @ResponseWrapper(localName = "GetInfoByCityResponse", targetNamespace = "http://www.webserviceX.NET", className = "com.example.uszip.GetInfoByCityResponse")
-    public com.example.uszip.GetInfoByCityResponse.GetInfoByCityResult getInfoByCity(
-        @WebParam(name = "USCity", targetNamespace = "http://www.webserviceX.NET")
-        String usCity);
-
-    /**
-     * Get State Code,City,Area Code,Time Zone,Zip Code by state
-     * 
-     * @param usState
-     * @return
-     *     returns com.example.uszip.GetInfoByStateResponse.GetInfoByStateResult
-     */
-    @WebMethod(operationName = "GetInfoByState", action = "http://www.webserviceX.NET/GetInfoByState")
-    @WebResult(name = "GetInfoByStateResult", targetNamespace = "http://www.webserviceX.NET")
-    @RequestWrapper(localName = "GetInfoByState", targetNamespace = "http://www.webserviceX.NET", className = "com.example.uszip.GetInfoByState")
-    @ResponseWrapper(localName = "GetInfoByStateResponse", targetNamespace = "http://www.webserviceX.NET", className = "com.example.uszip.GetInfoByStateResponse")
-    public com.example.uszip.GetInfoByStateResponse.GetInfoByStateResult getInfoByState(
-        @WebParam(name = "USState", targetNamespace = "http://www.webserviceX.NET")
-        String usState);
-
-    /**
-     * Get State Code,City,Area Code,Time Zone,Zip Code by Area Code
-     * 
-     * @param usAreaCode
-     * @return
-     *     returns com.example.uszip.GetInfoByAreaCodeResponse.GetInfoByAreaCodeResult
-     */
-    @WebMethod(operationName = "GetInfoByAreaCode", action = "http://www.webserviceX.NET/GetInfoByAreaCode")
-    @WebResult(name = "GetInfoByAreaCodeResult", targetNamespace = "http://www.webserviceX.NET")
-    @RequestWrapper(localName = "GetInfoByAreaCode", targetNamespace = "http://www.webserviceX.NET", className = "com.example.uszip.GetInfoByAreaCode")
-    @ResponseWrapper(localName = "GetInfoByAreaCodeResponse", targetNamespace = "http://www.webserviceX.NET", className = "com.example.uszip.GetInfoByAreaCodeResponse")
-    public com.example.uszip.GetInfoByAreaCodeResponse.GetInfoByAreaCodeResult getInfoByAreaCode(
-        @WebParam(name = "USAreaCode", targetNamespace = "http://www.webserviceX.NET")
-        String usAreaCode);
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
deleted file mode 100644
index d120f34ee5..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
+++ /dev/null
@@ -1,20 +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.    
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.webserviceX.NET", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package com.example.uszip;
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
deleted file mode 100644
index 5385fb57be..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
+++ /dev/null
@@ -1,87 +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 com.example.weather;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ArrayOfWeatherData complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ArrayOfWeatherData">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="WeatherData" type="{http://www.webservicex.net}WeatherData" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ArrayOfWeatherData", propOrder = {
-    "weatherData"
-})
-public class ArrayOfWeatherData {
-
-    @XmlElement(name = "WeatherData")
-    protected List<WeatherData> weatherData;
-
-    /**
-     * Gets the value of the weatherData property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the weatherData property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getWeatherData().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link WeatherData }
-     * 
-     * 
-     */
-    public List<WeatherData> getWeatherData() {
-        if (weatherData == null) {
-            weatherData = new ArrayList<WeatherData>();
-        }
-        return this.weatherData;
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
deleted file mode 100644
index 9eb205e75d..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
+++ /dev/null
@@ -1,81 +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 com.example.weather;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="PlaceName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "placeName"
-})
-@XmlRootElement(name = "GetWeatherByPlaceName")
-public class GetWeatherByPlaceName {
-
-    @XmlElement(name = "PlaceName")
-    protected String placeName;
-
-    /**
-     * Gets the value of the placeName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPlaceName() {
-        return placeName;
-    }
-
-    /**
-     * Sets the value of the placeName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPlaceName(String value) {
-        this.placeName = value;
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
deleted file mode 100644
index e281509623..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
+++ /dev/null
@@ -1,81 +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 com.example.weather;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="GetWeatherByPlaceNameResult" type="{http://www.webservicex.net}WeatherForecasts"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "getWeatherByPlaceNameResult"
-})
-@XmlRootElement(name = "GetWeatherByPlaceNameResponse")
-public class GetWeatherByPlaceNameResponse {
-
-    @XmlElement(name = "GetWeatherByPlaceNameResult", required = true)
-    protected WeatherForecasts getWeatherByPlaceNameResult;
-
-    /**
-     * Gets the value of the getWeatherByPlaceNameResult property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link WeatherForecasts }
-     *     
-     */
-    public WeatherForecasts getGetWeatherByPlaceNameResult() {
-        return getWeatherByPlaceNameResult;
-    }
-
-    /**
-     * Sets the value of the getWeatherByPlaceNameResult property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link WeatherForecasts }
-     *     
-     */
-    public void setGetWeatherByPlaceNameResult(WeatherForecasts value) {
-        this.getWeatherByPlaceNameResult = value;
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
deleted file mode 100644
index 08d4a70364..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
+++ /dev/null
@@ -1,81 +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 com.example.weather;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="ZipCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "zipCode"
-})
-@XmlRootElement(name = "GetWeatherByZipCode")
-public class GetWeatherByZipCode {
-
-    @XmlElement(name = "ZipCode")
-    protected String zipCode;
-
-    /**
-     * Gets the value of the zipCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getZipCode() {
-        return zipCode;
-    }
-
-    /**
-     * Sets the value of the zipCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setZipCode(String value) {
-        this.zipCode = value;
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
deleted file mode 100644
index 9288f5332e..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
+++ /dev/null
@@ -1,81 +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 com.example.weather;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="GetWeatherByZipCodeResult" type="{http://www.webservicex.net}WeatherForecasts"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "getWeatherByZipCodeResult"
-})
-@XmlRootElement(name = "GetWeatherByZipCodeResponse")
-public class GetWeatherByZipCodeResponse {
-
-    @XmlElement(name = "GetWeatherByZipCodeResult", required = true)
-    protected WeatherForecasts getWeatherByZipCodeResult;
-
-    /**
-     * Gets the value of the getWeatherByZipCodeResult property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link WeatherForecasts }
-     *     
-     */
-    public WeatherForecasts getGetWeatherByZipCodeResult() {
-        return getWeatherByZipCodeResult;
-    }
-
-    /**
-     * Sets the value of the getWeatherByZipCodeResult property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link WeatherForecasts }
-     *     
-     */
-    public void setGetWeatherByZipCodeResult(WeatherForecasts value) {
-        this.getWeatherByZipCodeResult = value;
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
deleted file mode 100644
index 0c4fdbcde1..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
+++ /dev/null
@@ -1,118 +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 com.example.weather;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.example.weather package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _WeatherForecasts_QNAME = new QName("http://www.webservicex.net", "WeatherForecasts");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.example.weather
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link WeatherData }
-     * 
-     */
-    public WeatherData createWeatherData() {
-        return new WeatherData();
-    }
-
-    /**
-     * Create an instance of {@link GetWeatherByPlaceName }
-     * 
-     */
-    public GetWeatherByPlaceName createGetWeatherByPlaceName() {
-        return new GetWeatherByPlaceName();
-    }
-
-    /**
-     * Create an instance of {@link GetWeatherByPlaceNameResponse }
-     * 
-     */
-    public GetWeatherByPlaceNameResponse createGetWeatherByPlaceNameResponse() {
-        return new GetWeatherByPlaceNameResponse();
-    }
-
-    /**
-     * Create an instance of {@link GetWeatherByZipCodeResponse }
-     * 
-     */
-    public GetWeatherByZipCodeResponse createGetWeatherByZipCodeResponse() {
-        return new GetWeatherByZipCodeResponse();
-    }
-
-    /**
-     * Create an instance of {@link GetWeatherByZipCode }
-     * 
-     */
-    public GetWeatherByZipCode createGetWeatherByZipCode() {
-        return new GetWeatherByZipCode();
-    }
-
-    /**
-     * Create an instance of {@link WeatherForecasts }
-     * 
-     */
-    public WeatherForecasts createWeatherForecasts() {
-        return new WeatherForecasts();
-    }
-
-    /**
-     * Create an instance of {@link ArrayOfWeatherData }
-     * 
-     */
-    public ArrayOfWeatherData createArrayOfWeatherData() {
-        return new ArrayOfWeatherData();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link WeatherForecasts }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.webservicex.net", name = "WeatherForecasts")
-    public JAXBElement<WeatherForecasts> createWeatherForecasts(WeatherForecasts value) {
-        return new JAXBElement<WeatherForecasts>(_WeatherForecasts_QNAME, WeatherForecasts.class, null, value);
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
deleted file mode 100644
index a4ca6190b5..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
+++ /dev/null
@@ -1,219 +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 com.example.weather;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for WeatherData complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="WeatherData">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="Day" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="WeatherImage" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="MaxTemperatureF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="MinTemperatureF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="MaxTemperatureC" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="MinTemperatureC" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "WeatherData", propOrder = {
-    "day",
-    "weatherImage",
-    "maxTemperatureF",
-    "minTemperatureF",
-    "maxTemperatureC",
-    "minTemperatureC"
-})
-public class WeatherData {
-
-    @XmlElement(name = "Day")
-    protected String day;
-    @XmlElement(name = "WeatherImage")
-    protected String weatherImage;
-    @XmlElement(name = "MaxTemperatureF")
-    protected String maxTemperatureF;
-    @XmlElement(name = "MinTemperatureF")
-    protected String minTemperatureF;
-    @XmlElement(name = "MaxTemperatureC")
-    protected String maxTemperatureC;
-    @XmlElement(name = "MinTemperatureC")
-    protected String minTemperatureC;
-
-    /**
-     * Gets the value of the day property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDay() {
-        return day;
-    }
-
-    /**
-     * Sets the value of the day property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDay(String value) {
-        this.day = value;
-    }
-
-    /**
-     * Gets the value of the weatherImage property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getWeatherImage() {
-        return weatherImage;
-    }
-
-    /**
-     * Sets the value of the weatherImage property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setWeatherImage(String value) {
-        this.weatherImage = value;
-    }
-
-    /**
-     * Gets the value of the maxTemperatureF property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMaxTemperatureF() {
-        return maxTemperatureF;
-    }
-
-    /**
-     * Sets the value of the maxTemperatureF property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMaxTemperatureF(String value) {
-        this.maxTemperatureF = value;
-    }
-
-    /**
-     * Gets the value of the minTemperatureF property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMinTemperatureF() {
-        return minTemperatureF;
-    }
-
-    /**
-     * Sets the value of the minTemperatureF property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMinTemperatureF(String value) {
-        this.minTemperatureF = value;
-    }
-
-    /**
-     * Gets the value of the maxTemperatureC property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMaxTemperatureC() {
-        return maxTemperatureC;
-    }
-
-    /**
-     * Sets the value of the maxTemperatureC property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMaxTemperatureC(String value) {
-        this.maxTemperatureC = value;
-    }
-
-    /**
-     * Gets the value of the minTemperatureC property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMinTemperatureC() {
-        return minTemperatureC;
-    }
-
-    /**
-     * Sets the value of the minTemperatureC property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMinTemperatureC(String value) {
-        this.minTemperatureC = value;
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
deleted file mode 100644
index 0902ce67fe..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
+++ /dev/null
@@ -1,91 +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 com.example.weather;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * Get one week weather forecast for valid zip code or Place name in USA
- * 
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.3-b02-
- * Generated source version: 2.1
- * 
- */
-@WebServiceClient(name = "WeatherForecast", targetNamespace = "http://www.webservicex.net", wsdlLocation = "file:/C:/Tuscany/java/sca/demos/us-location/src/main/resources/wsdl/WeatherForecast.wsdl")
-public class WeatherForecast
-    extends Service
-{
-
-    private final static URL WEATHERFORECAST_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.example.weather.WeatherForecast.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.example.weather.WeatherForecast.class.getResource(".");
-            url = new URL(baseUrl, "file:/C:/Tuscany/java/sca/demos/us-location/src/main/resources/wsdl/WeatherForecast.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/C:/Tuscany/java/sca/demos/us-location/src/main/resources/wsdl/WeatherForecast.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        WEATHERFORECAST_WSDL_LOCATION = url;
-    }
-
-    public WeatherForecast(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public WeatherForecast() {
-        super(WEATHERFORECAST_WSDL_LOCATION, new QName("http://www.webservicex.net", "WeatherForecast"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns WeatherForecastSoap
-     */
-    @WebEndpoint(name = "WeatherForecastSoap")
-    public WeatherForecastSoap getWeatherForecastSoap() {
-        return super.getPort(new QName("http://www.webservicex.net", "WeatherForecastSoap"), WeatherForecastSoap.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns WeatherForecastSoap
-     */
-    @WebEndpoint(name = "WeatherForecastSoap")
-    public WeatherForecastSoap getWeatherForecastSoap(WebServiceFeature... features) {
-        return super.getPort(new QName("http://www.webservicex.net", "WeatherForecastSoap"), WeatherForecastSoap.class, features);
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
deleted file mode 100644
index aa000a44d2..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
+++ /dev/null
@@ -1,73 +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 com.example.weather;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.3-b02-
- * Generated source version: 2.1
- * 
- */
-@WebService(name = "WeatherForecastSoap", targetNamespace = "http://www.webservicex.net")
-@XmlSeeAlso({
-    ObjectFactory.class
-})
-public interface WeatherForecastSoap {
-
-
-    /**
-     * Get one week weather forecast for a valid Zip Code(USA)
-     * 
-     * @param zipCode
-     * @return
-     *     returns com.example.weather.WeatherForecasts
-     */
-    @WebMethod(operationName = "GetWeatherByZipCode", action = "http://www.webservicex.net/GetWeatherByZipCode")
-    @WebResult(name = "GetWeatherByZipCodeResult", targetNamespace = "http://www.webservicex.net")
-    @RequestWrapper(localName = "GetWeatherByZipCode", targetNamespace = "http://www.webservicex.net", className = "com.example.weather.GetWeatherByZipCode")
-    @ResponseWrapper(localName = "GetWeatherByZipCodeResponse", targetNamespace = "http://www.webservicex.net", className = "com.example.weather.GetWeatherByZipCodeResponse")
-    public WeatherForecasts getWeatherByZipCode(
-        @WebParam(name = "ZipCode", targetNamespace = "http://www.webservicex.net")
-        String zipCode);
-
-    /**
-     * Get one week  weather forecast for a place name(USA)
-     * 
-     * @param placeName
-     * @return
-     *     returns com.example.weather.WeatherForecasts
-     */
-    @WebMethod(operationName = "GetWeatherByPlaceName", action = "http://www.webservicex.net/GetWeatherByPlaceName")
-    @WebResult(name = "GetWeatherByPlaceNameResult", targetNamespace = "http://www.webservicex.net")
-    @RequestWrapper(localName = "GetWeatherByPlaceName", targetNamespace = "http://www.webservicex.net", className = "com.example.weather.GetWeatherByPlaceName")
-    @ResponseWrapper(localName = "GetWeatherByPlaceNameResponse", targetNamespace = "http://www.webservicex.net", className = "com.example.weather.GetWeatherByPlaceNameResponse")
-    public WeatherForecasts getWeatherByPlaceName(
-        @WebParam(name = "PlaceName", targetNamespace = "http://www.webservicex.net")
-        String placeName);
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
deleted file mode 100644
index 8ded0946d9..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
+++ /dev/null
@@ -1,251 +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 com.example.weather;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for WeatherForecasts complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="WeatherForecasts">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="Latitude" type="{http://www.w3.org/2001/XMLSchema}float"/>
- *         &lt;element name="Longitude" type="{http://www.w3.org/2001/XMLSchema}float"/>
- *         &lt;element name="AllocationFactor" type="{http://www.w3.org/2001/XMLSchema}float"/>
- *         &lt;element name="FipsCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="PlaceName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="StateCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="Status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="Details" type="{http://www.webservicex.net}ArrayOfWeatherData" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "WeatherForecasts", propOrder = {
-    "latitude",
-    "longitude",
-    "allocationFactor",
-    "fipsCode",
-    "placeName",
-    "stateCode",
-    "status",
-    "details"
-})
-public class WeatherForecasts {
-
-    @XmlElement(name = "Latitude")
-    protected float latitude;
-    @XmlElement(name = "Longitude")
-    protected float longitude;
-    @XmlElement(name = "AllocationFactor")
-    protected float allocationFactor;
-    @XmlElement(name = "FipsCode")
-    protected String fipsCode;
-    @XmlElement(name = "PlaceName")
-    protected String placeName;
-    @XmlElement(name = "StateCode")
-    protected String stateCode;
-    @XmlElement(name = "Status")
-    protected String status;
-    @XmlElement(name = "Details")
-    protected ArrayOfWeatherData details;
-
-    /**
-     * Gets the value of the latitude property.
-     * 
-     */
-    public float getLatitude() {
-        return latitude;
-    }
-
-    /**
-     * Sets the value of the latitude property.
-     * 
-     */
-    public void setLatitude(float value) {
-        this.latitude = value;
-    }
-
-    /**
-     * Gets the value of the longitude property.
-     * 
-     */
-    public float getLongitude() {
-        return longitude;
-    }
-
-    /**
-     * Sets the value of the longitude property.
-     * 
-     */
-    public void setLongitude(float value) {
-        this.longitude = value;
-    }
-
-    /**
-     * Gets the value of the allocationFactor property.
-     * 
-     */
-    public float getAllocationFactor() {
-        return allocationFactor;
-    }
-
-    /**
-     * Sets the value of the allocationFactor property.
-     * 
-     */
-    public void setAllocationFactor(float value) {
-        this.allocationFactor = value;
-    }
-
-    /**
-     * Gets the value of the fipsCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFipsCode() {
-        return fipsCode;
-    }
-
-    /**
-     * Sets the value of the fipsCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFipsCode(String value) {
-        this.fipsCode = value;
-    }
-
-    /**
-     * Gets the value of the placeName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPlaceName() {
-        return placeName;
-    }
-
-    /**
-     * Sets the value of the placeName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPlaceName(String value) {
-        this.placeName = value;
-    }
-
-    /**
-     * Gets the value of the stateCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStateCode() {
-        return stateCode;
-    }
-
-    /**
-     * Sets the value of the stateCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStateCode(String value) {
-        this.stateCode = value;
-    }
-
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStatus(String value) {
-        this.status = value;
-    }
-
-    /**
-     * Gets the value of the details property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ArrayOfWeatherData }
-     *     
-     */
-    public ArrayOfWeatherData getDetails() {
-        return details;
-    }
-
-    /**
-     * Sets the value of the details property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ArrayOfWeatherData }
-     *     
-     */
-    public void setDetails(ArrayOfWeatherData value) {
-        this.details = value;
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
deleted file mode 100644
index 6543ed7abf..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
+++ /dev/null
@@ -1,20 +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.    
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.webservicex.net", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package com.example.weather;
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/location/LocationClient.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
deleted file mode 100644
index 35c114093a..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/location/LocationClient.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 location;
-
-import java.io.StringWriter;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import com.example.uszip.GetInfoByZIPResponse;
-import com.example.uszip.USZipSoap;
-
-/**
- * This client program to invoke the Mortgage LoanApproval service
- */
-public class LocationClient {
-
-    public static void main(String[] args) throws Exception {
-
-        SCADomain domain = SCADomain.newInstance("USLocation.composite");
-        USZipSoap zipService = domain.getService(USZipSoap.class, "USLocationService");
-
-        GetInfoByZIPResponse.GetInfoByZIPResult result = zipService.getInfoByZIP("94555");
-
-        GetInfoByZIPResponse response = new GetInfoByZIPResponse();
-        response.setGetInfoByZIPResult(result);
-
-        JAXBContext context = JAXBContext.newInstance(GetInfoByZIPResponse.class);
-        StringWriter writer = new StringWriter();
-        Marshaller marshaller = context.createMarshaller();
-        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-        marshaller.marshal(response, writer);
-
-        String xml = writer.toString();
-        System.out.println(xml);
-    }
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
deleted file mode 100644
index 8865d5fe82..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
+++ /dev/null
@@ -1,56 +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 location;
-
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.example.uszip.USZipSoap;
-import com.example.uszip.GetInfoByAreaCodeResponse.GetInfoByAreaCodeResult;
-import com.example.uszip.GetInfoByCityResponse.GetInfoByCityResult;
-import com.example.uszip.GetInfoByStateResponse.GetInfoByStateResult;
-import com.example.uszip.GetInfoByZIPResponse.GetInfoByZIPResult;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(USZipSoap.class)
-@AllowsPassByReference
-public class USLocationImpl implements USZipSoap {
-    @Reference
-    protected USZipSoap usZipService;
-    
-    public GetInfoByAreaCodeResult getInfoByAreaCode(String usAreaCode) {
-        return usZipService.getInfoByAreaCode(usAreaCode);
-    }
-
-    public GetInfoByCityResult getInfoByCity(String usCity) {
-        return usZipService.getInfoByCity(usCity);
-    }
-
-    public GetInfoByStateResult getInfoByState(String usState) {
-        return usZipService.getInfoByState(usState);
-    }
-
-    public GetInfoByZIPResult getInfoByZIP(String usZip) {
-        return usZipService.getInfoByZIP(usZip);
-    }
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
deleted file mode 100644
index c03cf2955f..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
+++ /dev/null
@@ -1,60 +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 weather;
-
-import java.io.StringWriter;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import com.example.weather.GetWeatherByZipCodeResponse;
-import com.example.weather.WeatherForecastSoap;
-import com.example.weather.WeatherForecasts;
-
-/**
- * This client program to invoke the Mortgage LoanApproval service
- */
-public class WeatherForecastClient {
-
-    public static void main(String[] args) throws Exception {
-
-        SCADomain domain = SCADomain.newInstance("WeatherForecast.composite");
-        WeatherForecastSoap weatherService = domain.getService(WeatherForecastSoap.class, "WeatherForecastService");
-
-        WeatherForecasts result = weatherService.getWeatherByZipCode("94555");
-
-        // Dump the result as XML
-        
-        // Wrap the result so that it can be marshaled 
-        GetWeatherByZipCodeResponse response = new GetWeatherByZipCodeResponse();
-        response.setGetWeatherByZipCodeResult(result);
-
-        // Marshal the JAXB object into XML
-        JAXBContext context = JAXBContext.newInstance(GetWeatherByZipCodeResponse.class);
-        StringWriter writer = new StringWriter();
-        Marshaller marshaller = context.createMarshaller();
-        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-        marshaller.marshal(response, writer);
-
-        String xml = writer.toString();
-        System.out.println(xml);
-    }
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
deleted file mode 100644
index 5ad5f11344..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
+++ /dev/null
@@ -1,43 +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 weather;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.example.weather.WeatherForecastSoap;
-import com.example.weather.WeatherForecasts;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(WeatherForecastSoap.class)
-public class WeatherForecastImpl implements WeatherForecastSoap{
-    @Reference
-    protected WeatherForecastSoap weatherForecast;
-
-    public WeatherForecasts getWeatherByPlaceName(String placeName) {
-        return weatherForecast.getWeatherByPlaceName(placeName);
-    }
-
-    public WeatherForecasts getWeatherByZipCode(String zipCode) {
-        return weatherForecast.getWeatherByZipCode(zipCode);
-    }
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
deleted file mode 100644
index f181d9bd0e..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
+++ /dev/null
@@ -1,38 +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 zipcode;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program to invoke the Mortgage LoanApproval service
- */
-public class ZipCodeClient {
-
-    public static void main(String[] args) throws Exception {
-
-	System.out.println("Please wait...");
-
-        SCADomain domain = SCADomain.newInstance("ZipCode.composite");
-        ZipCodeService zipService = domain.getService(ZipCodeService.class, "ZipCodeService");
-
-        String result = zipService.lookup("94555");
-        System.out.println(result);
-    }
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
deleted file mode 100644
index 53c112b8a3..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
+++ /dev/null
@@ -1,30 +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 zipcode;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface ZipCodeService {
-    String lookup(String zipCode);
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java b/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
deleted file mode 100644
index 7c68a77cf2..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
+++ /dev/null
@@ -1,82 +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 zipcode;
-
-import java.io.StringWriter;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.example.uszip.GetInfoByZIPResponse;
-import com.example.uszip.USZipSoap;
-import com.example.uszip.GetInfoByZIPResponse.GetInfoByZIPResult;
-import com.example.weather.GetWeatherByZipCodeResponse;
-import com.example.weather.WeatherForecastSoap;
-import com.example.weather.WeatherForecasts;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(ZipCodeService.class)
-@AllowsPassByReference
-public class ZipCodeServiceImpl implements ZipCodeService {
-    @Reference
-    protected USZipSoap usZipService;
-
-    @Reference
-    protected WeatherForecastSoap weatherForecast;
-
-    public String lookup(String zipCode) {
-        GetInfoByZIPResult result1 = usZipService.getInfoByZIP(zipCode);
-
-        GetInfoByZIPResponse response1 = new GetInfoByZIPResponse();
-        response1.setGetInfoByZIPResult(result1);
-
-        String xml1 = toXML(response1);
-
-        WeatherForecasts result2 = weatherForecast.getWeatherByZipCode(zipCode);
-        // Wrap the result so that it can be marshaled 
-        GetWeatherByZipCodeResponse response2 = new GetWeatherByZipCodeResponse();
-        response2.setGetWeatherByZipCodeResult(result2);
-
-        String xml2 = toXML(response2);
-        // Marshal the JAXB object into XML
-        return xml1 + "\n" + xml2;
-    }
-
-    private String toXML(Object jaxb) {
-        try {
-            JAXBContext context = JAXBContext.newInstance(jaxb.getClass());
-            StringWriter writer = new StringWriter();
-            Marshaller marshaller = context.createMarshaller();
-            marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-            marshaller.marshal(jaxb, writer);
-            return writer.toString();
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/USLocation.composite b/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/USLocation.composite
deleted file mode 100644
index a171fe62c9..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/USLocation.composite
+++ /dev/null
@@ -1,30 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-    targetNamespace="http://location" name="USLocation">

-

-    <component name="USLocationService">

-        <implementation.java class="location.USLocationImpl" />

-        <reference name="usZipService">

-            <binding.ws wsdlElement="http://www.webserviceX.NET#wsdl.port(USZip/USZipSoap)" />

-        </reference>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite b/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
deleted file mode 100644
index 0e1b118e44..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
+++ /dev/null
@@ -1,30 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-    targetNamespace="http://weather" name="WeatherForecast">

-

-    <component name="WeatherForecastService">

-        <implementation.java class="weather.WeatherForecastImpl" />

-        <reference name="weatherForecast">

-            <binding.ws wsdlElement="http://www.webservicex.net#wsdl.port(WeatherForecast/WeatherForecastSoap)" />

-        </reference>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/ZipCode.composite b/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
deleted file mode 100644
index 28d674c29b..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
+++ /dev/null
@@ -1,33 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    targetNamespace="http://zipcode" name="ZipCode">
-
-    <component name="ZipCodeService">
-        <implementation.java class="zipcode.ZipCodeServiceImpl" />
-        <reference name="usZipService">
-            <binding.ws uri="http://www.webservicex.net/uszip.asmx" />
-        </reference>
-        <reference name="weatherForecast">
-            <binding.ws wsdlElement="http://www.webservicex.net#wsdl.port(WeatherForecast/WeatherForecastSoap)" />
-        </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java b/java/sca-contrib/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
deleted file mode 100644
index 019fce26d6..0000000000
--- a/java/sca-contrib/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
+++ /dev/null
@@ -1,51 +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 zipcode;
-
-import location.LocationClient;
-import weather.WeatherForecastClient;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that the callback server is available
- */
-public class ZipCodeClientTestCase {
-
-    @Before
-	public void startServer() throws Exception {
-	}
-
-	@Test
-	public void testClient() throws Exception {
-        /*
-        System.out.println("Running LocationClient...");
-		LocationClient.main(null);
-        System.out.println("Running WeatherForecastClient...");
-        WeatherForecastClient.main(null);
-        */
-        System.out.println("Running ZipCodeClient...");
-        ZipCodeClient.main(null);
-	}
-    
-	@After
-	public void stopServer() throws Exception {
-	}
-}
diff --git a/java/sca-contrib/stest/pom.xml b/java/sca-contrib/stest/pom.xml
deleted file mode 100644
index efdfdd7383..0000000000
--- a/java/sca-contrib/stest/pom.xml
+++ /dev/null
@@ -1,57 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-stests</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Specification Tests</name>

-

-    <repositories>

-        <repository>

-            <id>apache.incubator</id>

-            <url>http://people.apache.org/repo/m2-incubating-repository</url>

-        </repository>

-    </repositories>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>sampleTest</module>

-            </modules>

-        </profile>

-        <profile>

-            <id>old</id>

-            <modules>

-                <module>binding-echo</module>

-            </modules>

-        </profile>

-    </profiles>

-    

-</project>

diff --git a/java/sca-contrib/stest/sampleTest/pom.xml b/java/sca-contrib/stest/sampleTest/pom.xml
deleted file mode 100644
index 4bae6b445a..0000000000
--- a/java/sca-contrib/stest/sampleTest/pom.xml
+++ /dev/null
@@ -1,98 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-stests</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>stest-sampleTest</artifactId>

-    <name>Apache Tuscany SCA Specification Sample Testcase</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-launcher-equinox</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>   

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-extensibility-equinox</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-xml</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <!-- <scope>runtime</scope>  -->

-        </dependency>

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0001_Client.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0001_Client.java
deleted file mode 100644
index dff88ce8ca..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0001_Client.java
+++ /dev/null
@@ -1,67 +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 test;

-

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Basic test initiation class

- * @author MikeEdwards

- *

- */

-@Service(TestInvocation.class)

-public class ASM_0001_Client implements TestInvocation {

-

-    private String testName = "ASM_0001";

-

-    /**

-     * This method is offered as a service and is 

-     * invoked by the test client to run the test

-     */

-    public String invokeTest(String input) throws TestException {

-        String response = null;

-

-        response = runTest(input);

-

-        return response;

-    } // end method invokeTest

-

-    /**

-     * This method actually runs the test - and is subclassed by classes that run other tests.

-     * @param input - an input string

-     * @return - a response string = "ASM_0001 inputString invoked ok";

-     * 

-     */

-    public String runTest(String input) {

-        String response = null;

-

-        response = testName + " " + input + " invoked ok";

-

-        return response;

-    } // end method runTest

-

-    /**

-     * Sets the name of the test

-     * @param name - the test name

-     */

-    protected void setTestName(String name) {

-        testName = name;

-    }

-

-} // 

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0002_Client.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0002_Client.java
deleted file mode 100644
index 673dde9590..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0002_Client.java
+++ /dev/null
@@ -1,80 +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 test;

-

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Test initiation class with a single reference of multiplicity 1..1

- * @author MikeEdwards

- *

- */

-@Service(TestInvocation.class)

-public class ASM_0002_Client implements TestInvocation {

-

-    @Property

-    public String testName = "ASM_xxxx";

-

-    @Reference

-    public Service1 reference1;

-

-    /**

-     * This method is offered as a service and is 

-     * invoked by the test client to run the test

-     */

-    public String invokeTest(String input) throws TestException {

-        String response = null;

-

-        try {

-            response = runTest(input);

-        } catch (Exception e) {

-            throw new TestException("Test service got an exception during execution: " + e.getClass().getName()

-                + " "

-                + e.getMessage());

-        } // end try

-        return response;

-    } // end method invokeTest

-

-    /**

-     * This method actually runs the test - and is subclassed by classes that run other tests.

-     * @param input - an input string

-     * @return - a response string = "ASM_0001 inputString invoked ok";

-     * 

-     */

-    public String runTest(String input) {

-        String response = null;

-

-        String response1 = reference1.operation1(input);

-

-        response = testName + " " + input + " " + response1;

-

-        return response;

-    } // end method runTest

-

-    /**

-     * Sets the name of the test

-     * @param name - the test name

-     */

-    protected void setTestName(String name) {

-        testName = name;

-    }

-

-} // 

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0003_Client.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0003_Client.java
deleted file mode 100644
index f6f4f1ccb8..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0003_Client.java
+++ /dev/null
@@ -1,79 +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 test;

-

-import java.util.List;

-

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Basic test initiation class

- * @author MikeEdwards

- *

- */

-@Service(TestInvocation.class)

-public class ASM_0003_Client implements TestInvocation {

-

-    @Property

-    public String testName = "ASM_xxxx";

-

-    @Reference

-    public List<Service1> reference1;

-

-    /**

-     * This method is offered as a service and is 

-     * invoked by the test client to run the test

-     */

-    public String invokeTest(String input) throws TestException {

-        String response = null;

-

-        response = runTest(input);

-

-        return response;

-    } // end method invokeTest

-

-    /**

-     * This method actually runs the test - and is subclassed by classes that run other tests.

-     * @param input - an input string

-     * @return - a response string = "ASM_0001 inputString invoked ok";

-     * 

-     */

-    public String runTest(String input) {

-        String response = "";

-

-        for (Service1 reference : reference1) {

-            response += reference.operation1(input);

-        } // end for

-

-        response = testName + " " + input + " " + response;

-

-        return response;

-    } // end method runTest

-

-    /**

-     * Sets the name of the test

-     * @param name - the test name

-     */

-    protected void setTestName(String name) {

-        testName = name;

-    }

-

-} // 

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/Service1.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/Service1.java
deleted file mode 100644
index 713fa40563..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/Service1.java
+++ /dev/null
@@ -1,39 +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 test;

-

-// TODO: Need to change *ALL* annotations to org.oasisopen.xxxx

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * A test service interface

- * @author MikeEdwards

- *

- */

-@Remotable

-public interface Service1 {

-

-    /**

-     * Method for invoking testcase service

-     * @param input - input parameter(s) as a String

-     * @return - output data as a String

-     */

-    public String operation1(String input);

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/Service1Superset.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/Service1Superset.java
deleted file mode 100644
index 7d3a2f2e9f..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/Service1Superset.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.    

- */

-package test;

-

-/**

- * A superset of the basic test service interface

- * @author MikeEdwards

- *

- */

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Service1Superset {

-

-    /**

-     * Method for invoking testcase service

-     * @param input - input parameter(s) as a String

-     * @return - output data as a String

-     */

-    public String operation1(String input);

-

-    /**

-     * A second method for invoking a testcase service

-     * @param input - input parameter(s) as a String

-     * @return - output data as a String

-     */

-    public String operation2(String input);

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/Service2.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/Service2.java
deleted file mode 100644
index f834a4fbf1..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/Service2.java
+++ /dev/null
@@ -1,35 +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 test;

-

-/**

- * A test service interface, designed to be incompatible with the Service1 interface

- * @author MikeEdwards

- *

- */

-public interface Service2 {

-

-    /**

-     * Method for invoking testcase service

-     * @param input - input parameter(s) as a String

-     * @return - output data as a String

-     */

-    public int operation2(int input);

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/TestException.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/TestException.java
deleted file mode 100644
index 158c5f4522..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/TestException.java
+++ /dev/null
@@ -1,47 +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 test;

-

-/*

- * Exception thrown by SCA Test services

- */

-public class TestException extends Exception {

-

-    /**

-     * Required serialVersionUID field

-     */

-    private static final long serialVersionUID = -6978058912756564824L;

-

-    public TestException() {

-        super();

-    };

-

-    public TestException(String msg) {

-        super(msg);

-    };

-

-    public TestException(String msg, Throwable cause) {

-        super(msg, cause);

-    };

-

-    public TestException(Throwable cause) {

-        super(cause);

-    };

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/TestInvocation.class b/java/sca-contrib/stest/sampleTest/src/main/java/test/TestInvocation.class
deleted file mode 100644
index 64e43c20c9..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/TestInvocation.class
+++ /dev/null
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/TestInvocation.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/TestInvocation.java
deleted file mode 100644
index e5d781095f..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/TestInvocation.java
+++ /dev/null
@@ -1,42 +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 test;

-

-import javax.jws.WebMethod;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * Basic interface to invoke testcases

- * @author MikeEdwards

- *

- */

-@Remotable

-public interface TestInvocation {

-

-    /**

-     * Method for invoking testcase

-     * @param input - input parameter(s) as a String

-     * @return - output data as a String

-     * @throws - a TestException is thrown in cases where the test service fails internally

-     */

-    @WebMethod

-    public String invokeTest(String input) throws TestException;

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl.java
deleted file mode 100644
index a505f895a2..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl.java
+++ /dev/null
@@ -1,39 +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 test;

-

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Simple Java component implementation for business interface Service1

- * @author MikeEdwards

- *

- */

-@Service(Service1.class)

-public class service1Impl implements Service1 {

-

-    @Property

-    public String serviceName = "service1";

-

-    public String operation1(String input) {

-        return serviceName + " operation1 invoked";

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl2.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl2.java
deleted file mode 100644
index 0f639fbbf3..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl2.java
+++ /dev/null
@@ -1,46 +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 test;

-

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Enhanced Java component implementation for business interface Service1,

- * where the implementation also has a single reference using the Service1

- * interface and which gets called when operation1 is invoked

- * @author MikeEdwards

- *

- */

-@Service(Service1.class)

-public class service1Impl2 implements Service1 {

-

-    @Property

-    public String serviceName = "service1";

-    // Reference with an implied multiplicity of (1..1) since required=true is the default

-    @Reference

-    public Service1 reference1 = null;

-

-    public String operation1(String input) {

-        String result = reference1.operation1(input);

-        return serviceName + " operation1 invoked" + " " + result;

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl3.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl3.java
deleted file mode 100644
index 834dc3ddf7..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl3.java
+++ /dev/null
@@ -1,51 +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 test;

-

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Enhanced Java component implementation for business interface Service1,

- * where the implementation also has a single reference using the Service1

- * interface with mutiplicity 1..n all of which and which get called when 

- * operation1 is invoked

- * @author MikeEdwards

- *

- */

-@Service(Service1.class)

-public class service1Impl3 implements Service1 {

-

-    @Property

-    public String serviceName = "service1";

-    // Required = true + an array -> multiplicity 1..n

-    @Reference(required = true)

-    public Service1[] reference1 = null;

-

-    public String operation1(String input) {

-        String result = "";

-        // Call each of the references in the array, concatenating the results

-        for (int i = 0; i < reference1.length; i++) {

-            result = result.concat(reference1[i].operation1(input));

-        } // end for

-        return serviceName + " operation1 invoked" + " " + result;

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl4.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl4.java
deleted file mode 100644
index 4799d777c7..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl4.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 test;

-

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Enhanced Java component implementation for business interface Service1,

- * where the implementation also has a single reference using the Service1

- * interface with multiplicity 0..n all of which and which get called when 

- * operation1 is invoked

- * @author MikeEdwards

- *

- */

-@Service(Service1.class)

-public class service1Impl4 implements Service1 {

-

-    @Property

-    public String serviceName = "service1";

-    // Required = false + an array -> multiplicity 0..n

-    @Reference(required = false)

-    public Service1[] reference1 = null;

-

-    public String operation1(String input) {

-        String result = serviceName + " operation1 invoked";

-        // Call each of the references in the array, concatenating the results

-        for (int i = 0; i < reference1.length; i++) {

-            result = result.concat(" ");

-            result = result.concat(reference1[i].operation1(input));

-        } // end for

-        return result;

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl5.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl5.java
deleted file mode 100644
index dd69308c95..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl5.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.    

- */

-package test;

-

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Java component implementation for business interface Service1

- * - no references

- * - 3 properties

- * @author MikeEdwards

- *

- */

-@Service(Service1.class)

-public class service1Impl5 implements Service1 {

-

-    @Property

-    public String serviceName = "service1";

-    @Property

-    public String serviceData1;

-    @Property

-    public String serviceData2;

-

-    public String operation1(String input) {

-        return serviceName + " operation1 invoked" + serviceData1 + serviceData2;

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl6.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl6.java
deleted file mode 100644
index 1810686194..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl6.java
+++ /dev/null
@@ -1,50 +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 test;

-

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Enhanced Java component implementation for business interface Service1,

- * where the implementation also has a single reference using the Service1

- * interface with multiplicity 0..1 which gets called when 

- * operation1 is invoked, if present

- * @author MikeEdwards

- *

- */

-@Service(Service1.class)

-public class service1Impl6 implements Service1 {

-

-    @Property

-    public String serviceName = "service1";

-    // Required = false -> multiplicity 0..1

-    @Reference(required = false)

-    public Service1 reference1 = null;

-

-    public String operation1(String input) {

-        String result = serviceName + " operation1 invoked";

-        // Call the reference if present

-        if (reference1 != null)

-            result = result.concat(reference1.operation1(input));

-        return result;

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1SupersetImpl.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/service1SupersetImpl.java
deleted file mode 100644
index f137b7f1b4..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1SupersetImpl.java
+++ /dev/null
@@ -1,43 +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 test;

-

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Simple Java component implementation for business interface Service1Superset

- * @author MikeEdwards

- *

- */

-@Service(Service1Superset.class)

-public class service1SupersetImpl implements Service1Superset {

-

-    @Property

-    public String serviceName = "service1";

-

-    public String operation1(String input) {

-        return serviceName + " operation1 invoked";

-    }

-

-    public String operation2(String input) {

-        return serviceName + " operation2 invoked";

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service2Impl.java b/java/sca-contrib/stest/sampleTest/src/main/java/test/service2Impl.java
deleted file mode 100644
index 919b33014c..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service2Impl.java
+++ /dev/null
@@ -1,39 +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 test;

-

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Service;

-

-/**

- * Simple Java component implementation for business interface Service2

- * @author MikeEdwards

- *

- */

-@Service(Service2.class)

-public class service2Impl implements Service2 {

-

-    @Property

-    public String serviceName = "service1";

-

-    public int operation2(int input) {

-        return input + 1;

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient.wsdl b/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient.wsdl
deleted file mode 100644
index f9475a016a..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient.wsdl
+++ /dev/null
@@ -1,102 +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.    

--->

-<!-- Produced from the TestInvocation,java interface by running a service

-     based on that interface in an SCA runtime using a Web services binding

-

-     Mike Edwards, 6th January 2008

--->

-<wsdl:definitions name="TestInvocationService" 

-  targetNamespace="http://test/" 

-  xmlns:tns="http://test/" 

-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

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

-  xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/" 

-  xmlns:SOAP11="http://schemas.xmlsoap.org/wsdl/soap/">

-  <wsdl:types>

-    <xs:schema targetNamespace="http://test/" version="1.0" xmlns:tns="http://test/" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-      <xs:element name="TestException" type="tns:TestException"/>

-      <xs:complexType name="TestException">

-        <xs:sequence>

-          <xs:element minOccurs="0" name="message" type="xs:string"/>

-        </xs:sequence>

-      </xs:complexType>

-    </xs:schema>

-    <xs:schema attributeFormDefault="qualified" elementFormDefault="unqualified" 

-      targetNamespace="http://test/" 

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

-      <xs:element name="invokeTest">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-      <xs:element name="invokeTestResponse">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-    </xs:schema>

-  </wsdl:types>

-  <wsdl:message name="invokeTest">

-    <wsdl:part name="invokeTest" element="tns:invokeTest">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="invokeTestResponse">

-    <wsdl:part name="invokeTestResponse" element="tns:invokeTestResponse">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:message name="TestException">

-    <wsdl:part name="TestException" element="tns:TestException">

-    </wsdl:part>

-  </wsdl:message>

-  <wsdl:portType name="TestInvocation">

-    <wsdl:operation name="invokeTest">

-      <wsdl:input message="tns:invokeTest">

-    </wsdl:input>

-      <wsdl:output message="tns:invokeTestResponse">

-    </wsdl:output>

-      <wsdl:fault name="TestException" message="tns:TestException">

-    </wsdl:fault>

-    </wsdl:operation>

-  </wsdl:portType>

-  <wsdl:binding name="TestInvocationBinding" type="tns:TestInvocation">

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

-    <wsdl:operation name="invokeTest">

-      <SOAP:operation soapAction=""/>

-      <wsdl:input>

-        <SOAP:body use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <SOAP:body use="literal"/>

-      </wsdl:output>

-      <wsdl:fault name="TestException">

-        <SOAP:fault name="TestException" use="literal"/>

-      </wsdl:fault>

-    </wsdl:operation>

-  </wsdl:binding>

-  <wsdl:service name="TestInvocationService">

-    <wsdl:port name="TestInvocationPort" binding="tns:TestInvocationBinding">

-      <SOAP:address location="http://localhost:8080/TestClient"/>

-    </wsdl:port>

-  </wsdl:service>

-</wsdl:definitions>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient_0002.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient_0002.composite
deleted file mode 100644
index cf29e199d1..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient_0002.composite
+++ /dev/null
@@ -1,47 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestClient_0002">

-
-	<service name="TestInvocation" promote="TestClient/TestInvocation">
-		<interface.java interface="test.TestInvocation"/>
-	</service>
-	
-	<property name="testName" type="string"/>
-           
-    <component name="TestClient">

-		<implementation.java class="test.ASM_0002_Client"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-		</service>

-        <reference name="reference1">
-        	<interface.java interface="test.Service1"/>
-        </reference>

-        <property name="testName" source="$testName"/>

-    </component>
-    
-    <reference name="reference1" promote="TestClient/reference1">
-    	<interface.java interface="test.Service1"/>
-    </reference>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient_0003.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient_0003.composite
deleted file mode 100644
index 810a4e761a..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient_0003.composite
+++ /dev/null
@@ -1,47 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestClient_0003">

-
-	<service name="TestInvocation" promote="TestClient/TestInvocation">
-		<interface.java interface="test.TestInvocation"/>
-	</service>
-	
-	<property name="testName" type="string"/>
-           
-    <component name="TestClient">

-		<implementation.java class="test.ASM_0003_Client"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-		</service>

-        <reference name="reference1">
-        	<interface.java interface="test.Service1"/>
-        </reference>

-        <property name="testName" source="$testName"/>

-    </component>
-    
-    <reference name="reference1" promote="TestClient/reference1" multiplicity="1..n">
-    	<interface.java interface="test.Service1"/>
-    </reference>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite1.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite1.composite
deleted file mode 100644
index 9221a57ba5..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite1.composite
+++ /dev/null
@@ -1,40 +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.    
--->
-<!-- A simple composite which provides a single service and no references -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite1">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>

-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite10.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite10.composite
deleted file mode 100644
index 51f5de625b..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite10.composite
+++ /dev/null
@@ -1,47 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference, but where the reference has a binding
-     applied to it, with a target service identified   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite10">

-           
-	<service name="Service1" promote="Composite10Component1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="Composite10Component1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-    
-    <reference name="Reference1" promote="Composite10Component1/reference1">
-        <interface.java interface="test.Service1"/>
-        <binding.sca uri="TestComponent2/Service1"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite11.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite11.composite
deleted file mode 100644
index 3cc3a4542b..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite11.composite
+++ /dev/null
@@ -1,59 +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.    
--->
-<!-- An example of a composite which has one component with a reference
-     that is multiplicity 1..1 and which is both wired to a service of a
-     second component in the same composite and is also promoted by a 
-     composite reference   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite11">

-           
-	<service name="Service1" promote="Composite11Component1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="Composite11Component1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <!-- reference is multiplicity 1..1 -->
-        <reference name="reference1" target="Composite11Component2/Service1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
- 
-    <component name="Composite11Component2">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">Composite11-C2</property>
-    </component>
-    
-    <reference name="Reference1" promote="Composite11Component1/reference1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite12.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite12.composite
deleted file mode 100644
index 81552d9802..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite12.composite
+++ /dev/null
@@ -1,45 +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.    
--->
-<!-- A simple composite which provides a single service and no references
-     plus a property with a complex type -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TestComposite12">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>

-
-    <property name="serviceName" type="string"/>
-    
-    <property name="complexType" type="test:ComplexType1"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl5"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <property name="serviceData1" source="$complexType/firstData"/>
-        <property name="serviceData2" source="$complexType/secondData"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite13.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite13.composite
deleted file mode 100644
index 6790a83bc8..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite13.composite
+++ /dev/null
@@ -1,46 +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.    
--->
-<!-- A simple composite which provides a single service and no references
-     plus a property with a complex type with a type which is an XSD global
-     element -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TestComposite13">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>

-
-    <property name="serviceName" type="string"/>
-    
-    <property name="complexType" element="test:globalElement1"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl5"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <property name="serviceData1" source="$complexType/firstData"/>
-        <property name="serviceData2" source="$complexType/secondData"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite14.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite14.composite
deleted file mode 100644
index 82a5f98280..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite14.composite
+++ /dev/null
@@ -1,45 +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.    
--->
-<!-- A simple composite which provides a single service and no references
-     plus a property with a simple type -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:test="http://oasis/tests"
-           name="TestComposite14">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>

-
-    <property name="serviceName" type="string"/>
-    
-    <property name="simpleType" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl5"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <property name="serviceData1" source="$simpleType"/>
-        <property name="serviceData2" source="$simpleType"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite15.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite15.composite
deleted file mode 100644
index 7444094622..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite15.composite
+++ /dev/null
@@ -1,43 +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.    
--->
-<!-- A simple composite which provides a single service and no references,
-     where the service is configured with multiple explicit bindings -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite15">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-		<binding.sca/>
-		<binding.ws/>
-	</service>

-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite16.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite16.composite
deleted file mode 100644
index 35301ce4cb..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite16.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<!-- A composite which has multiple <service/> subelements with the same @name and no references -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite16">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>

-
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-	<service name="Service2" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite17.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite17.composite
deleted file mode 100644
index aff1c2c0e4..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite17.composite
+++ /dev/null
@@ -1,46 +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.    
--->
-<!-- A composite which has a single service with a @promote attribute
-     that does not reference the <service/> of a <component/> within the
-     <composite/> and no references -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite17">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-	
-	<service name="Service2" promote="SpuriousComponent/SpuriousService">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>

-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite18.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite18.composite
deleted file mode 100644
index 2ae3589b48..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite18.composite
+++ /dev/null
@@ -1,42 +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.    
--->
-<!-- A composite which has a single service with a declared <interface/>
-     that is a compatible subset of the interface of the component service
-     declared in the @promote attribute -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite18">

-           
-	<service name="Service1" promote="TestComponent1/Service1Superset">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-	
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1SupersetImpl"/>
-        <service name="Service1Superset">

-        	<interface.java interface="test.Service1Superset"></interface.java>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite19.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite19.composite
deleted file mode 100644
index 17a1d99b0a..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite19.composite
+++ /dev/null
@@ -1,52 +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.    
--->
-<!-- A composite which has a single <service/> subelement and multiple <reference/> 
-     subelements with the same @name value -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite19">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl4"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="0..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..n">
-        <interface.java interface="test.Service1"/>
-    </reference>
-
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..n">
-        <interface.java interface="test.Service1"/>
-    </reference>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite2.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite2.composite
deleted file mode 100644
index c0770c6d81..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite2.composite
+++ /dev/null
@@ -1,43 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite2">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>
-	
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>

-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite20.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite20.composite
deleted file mode 100644
index 73f1376947..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite20.composite
+++ /dev/null
@@ -1,58 +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.    
--->
-<!-- A composite which has a <composite/> <reference/> that is in error
-     since its @promote attribute is not the URI of a <component/> <reference/>
-     within the <composite/>   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite20">

-           
-	<service name="Service1" promote="Composite20Component1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="Composite20Component1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1"/>
-    </component>
- 
-    <component name="Composite20Component2">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">Composite11-C2</property>
-        <reference name="reference1"/>
-    </component>
-    
-    <!-- @promote deliberately incorrect - component names are non-existent -->
-    <reference name="Reference1" 
-        promote="Composite20Componentz/reference1 Composite20Componenty/reference1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite21.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite21.composite
deleted file mode 100644
index 6cd7451a02..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite21.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<!-- A composite which has a <composite/> <reference/> that declares an interface
-     which is a superset of the interface declared by the <component/> <reference/>
-     promoted by the composite reference   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite21">

-           
-	<service name="Service1" promote="Composite21Component1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="Composite21Component1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1"/>
-    </component>
-   
-    <!-- reference declares a superset interface -->
-    <reference name="Reference1" promote="Composite21Component1/reference1">
-        <interface.java interface="test.Service1Superset"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite22.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite22.composite
deleted file mode 100644
index 0e645f0425..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite22.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.    
--->
-<!-- A composite which has a <composite/> <reference/> that has no interface
-     declared that promotes 2 <component/> <reference/>s that have different
-     interfaces declared on them   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite22">

-           
-	<service name="Service1" promote="Composite22Component1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="Composite22Component1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
- 
-    <component name="Composite22Component2">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">Composite11-C2</property>
-        <reference name="reference1">
-            <interface.java interface="test.Service1Superset"/>
-        </reference>
-    </component>
-    
-    <!-- @promote deliberately incorrect - component names are non-existent -->
-    <reference name="Reference1" 
-        promote="Composite22Component1/reference1 Composite22Component2/reference1">
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite23.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite23.composite
deleted file mode 100644
index 5f2a5c7193..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite23.composite
+++ /dev/null
@@ -1,49 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference with multiplicity 1..1 which promotes a 
-     component reference of multiplcity 0..1  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite23">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl6"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="0..1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="1..1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite24.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite24.composite
deleted file mode 100644
index 758a593235..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite24.composite
+++ /dev/null
@@ -1,49 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference with multiplicity 0..1 which promotes a 
-     component reference of multiplicity 0..n  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite24">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl4"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="0..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite25.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite25.composite
deleted file mode 100644
index 6e6caed073..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite25.composite
+++ /dev/null
@@ -1,49 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference with multiplicity 1..1 which promotes a 
-     component reference of multiplicity 1..n  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite25">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl3"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="1..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="1..1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite26.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite26.composite
deleted file mode 100644
index bd777dc376..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite26.composite
+++ /dev/null
@@ -1,53 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference and multiple <property/> elements all of
-     which have the same @name value  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite26">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
-    
-    <property name="propertyName" type="string"/>
-    <property name="propertyName" type="string"/>
-    <property name="propertyName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite27.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite27.composite
deleted file mode 100644
index edc5bdddad..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite27.composite
+++ /dev/null
@@ -1,53 +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.    
--->
-<!-- An example of a composite which which has a <component/> with a <reference/> 
-     element which has @autowire=true and where there is a compatible <component/>
-     <service/> in the same composite  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite27">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
-     
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" autowire="true">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <component name="TestComponent2">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName">third</property>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite3.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite3.composite
deleted file mode 100644
index a465f45510..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite3.composite
+++ /dev/null
@@ -1,49 +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.    
--->
-<!-- An example of a composite which is invalid because it has two
-     composite level references with the same @name attribute  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite3">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/Reference">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-    <reference name="Reference1" promote="TestComponent1/Reference">
-        <interface.java interface="test.Service1"/>
-    </reference>
-   
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite4.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite4.composite
deleted file mode 100644
index f89546b8da..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite4.composite
+++ /dev/null
@@ -1,45 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite4">

-           
-	<service name="Service1" promote="Composite4Component1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="Composite4Component1">
-		<implementation.java class="test.service1Impl2"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-    
-    <reference name="Reference1" promote="Composite4Component1/reference1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite5.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite5.composite
deleted file mode 100644
index d5f7e21dc6..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite5.composite
+++ /dev/null
@@ -1,41 +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 offering a single service, with a modified interface
-     type -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite5">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service2"></interface.java>
-	</service>

-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service2Impl"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service2"></interface.java>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite6.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite6.composite
deleted file mode 100644
index 7f5a588e31..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite6.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference with multiplicity 1..n   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite6">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl3"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="1..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="1..n">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite7.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite7.composite
deleted file mode 100644
index ea432f9145..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite7.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference with multiplicity 0..n   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite7">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl4"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="0..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..n">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite8.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite8.composite
deleted file mode 100644
index ef5d75af39..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite8.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<!-- An example of a composite which has a single service and
-     a single reference with multiplicity 0..1   -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite8">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
-	</service>
-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl4"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="0..n">
-        	<interface.java interface="test.Service1"/>
-        </reference>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..1">
-        <interface.java interface="test.Service1"/>
-    </reference>
-    
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite9.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite9.composite
deleted file mode 100644
index a71d0d4e0b..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite9.composite
+++ /dev/null
@@ -1,41 +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 that provides a single service with the extended
-     Service1Superset interface -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TestComposite9">

-           
-	<service name="Service1" promote="Composite9Component1/Service1Superset">
-		<interface.java interface="test.Service1Superset"></interface.java>
-	</service>

-
-    <property name="serviceName" type="string"/>

- 
-    <component name="Composite9Component1">
-		<implementation.java class="test.service1SupersetImpl"/>
-        <service name="Service1Superset">

-        	<interface.java interface="test.Service1Superset"></interface.java>

-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestDuplicate1.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestDuplicate1.composite
deleted file mode 100644
index 193ab924bc..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestDuplicate1.composite
+++ /dev/null
@@ -1,41 +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.    
--->
-<!-- 1st of a pair of composite files where the composites have duplicated
-     names and targetNamespaces -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="DuplicateComposite">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>

-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>
-        <property name="serviceName">duplicate1</property>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestDuplicate2.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/TestDuplicate2.composite
deleted file mode 100644
index 3445d07a85..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestDuplicate2.composite
+++ /dev/null
@@ -1,41 +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.    
--->
-<!-- 2nd of a pair of composite files where the composites have duplicated
-     names and targetNamespaces -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="DuplicateComposite">

-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"></interface.java>
-	</service>

-
-    <property name="serviceName" type="string"/>

- 
-    <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>
-        <property name="serviceName">duplicate2</property>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0001.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0001.composite
deleted file mode 100644
index ae5885596e..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0001.composite
+++ /dev/null
@@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0001">

-           

-    <component name="TestClient">

-		<implementation.java class="test.ASM_0001_Client"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-			<binding.sca/>

-		</service>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0002.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
deleted file mode 100644
index 0d50dc4f4c..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<!--
- ASM_0002_TestCase tests that component with a single reference can be wired to a single
- component service in the same composite.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0002">

-           
-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>
-			<binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0002</property>

-    </component>

-
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>
-        <property name="serviceName">service1</property>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0003.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0003.composite
deleted file mode 100644
index cfce6d0d48..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0003.composite
+++ /dev/null
@@ -1,64 +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.    
--->
-<!-- Test case that verifies that an implementation with a reference with multiplicity 1..n can
-     be validly wired to 3 target services and invoke them all correctly.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:tns="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0003">

-           
-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0003"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>
-			<binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1 TestComponent2/Service1 TestComponent3/Service1" />

-        <property name="testName">ASM_0003</property>

-    </component>

-

- 
-    <component name="TestComponent1">
-		<implementation.composite name="tns:TestComposite1"/>
-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service1</property>
-    </component>

-    

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>

-    

-    <component name="TestComponent3">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service3</property>

-    </component>
-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0004.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0004.composite
deleted file mode 100644
index ca75c33a71..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0004.composite
+++ /dev/null
@@ -1,62 +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.    

--->

-<!-- Test that verifies that a reference with multiplicity 1..1 which is provided

-	 with multiple wire targets in the component configuration is marked as an error  -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0004">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1 TestComponent2/Service1 TestComponent3/Service1" />

-        <property name="testName">ASM_0004</property>

-    </component>

-

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service1</property>

-    </component>

-    

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>

-    

-    <component name="TestComponent3">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service3</property>

-    </component>

-

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0005.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0005.composite
deleted file mode 100644
index aa9b8af911..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0005.composite
+++ /dev/null
@@ -1,49 +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.    

--->

-<!-- Test that a component with multiple <service/> elements must have unique @name attributes for each 

-     service - negative test that has a component with 2 services with the same name   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0005">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0005</property>

-    </component>

-

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite2"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service1</property>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0006.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0006.composite
deleted file mode 100644
index 3212c595b3..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0006.composite
+++ /dev/null
@@ -1,47 +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.    

--->

-<!-- Test checks that the @name attribute of a <service/>

-     element of a <component/> matches the @name attribute of a <service/> element of the

-     componentType of the <implementation/> used by the <component/>   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0006">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/InvalidName" />

-        <property name="testName">ASM_0005</property>

-    </component>

-

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="InvalidName">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service1</property>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0007.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0007.composite
deleted file mode 100644
index 1f63746464..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0007.composite
+++ /dev/null
@@ -1,60 +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.    

--->

-<!-- Test that the @name attribute of a <reference/> element of a 

-     component is not equal to the @name attribute of any other 

-     <reference/> element of the same component   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0007">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0005</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite3"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- Two references with the same name - the implementation also has

-             two references of the same name so that the component type

-             matches the configuration of the component -->

-        <reference name="Reference1" target="TestComponent2/Service1"/>

-        <reference name="Reference1" target="TestComponent2/Service1"/>

-    </component>

-

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0008.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0008.composite
deleted file mode 100644
index 4b078ca7a3..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0008.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.    

--->

-<!-- Tests that the @name attribute of a <reference/> element of a 

-     component is equal to the @name attribute of a <reference/> 

-     element of the <componentType/> of the <implementation/> of 

-     the <component/>  - negative test in that here there is a 

-     reference @name which does NOT match a reference name in the

-     component type -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0008">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0005</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite4"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- This reference has a name that does not match the name of a

-             Reference in the implementation -->

-        <reference name="InvalidName" target="TestComponent2/Service1"/>

-    </component>

-

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0009.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0009.composite
deleted file mode 100644
index 62ba494dcd..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0009.composite
+++ /dev/null
@@ -1,63 +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.    

--->

-<!-- Tests that the @name attribute of a <component/> element 

-     in a <composite/> is not the same as the @name 

-     attribute of a second component in the same <composite/> -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0009">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0009</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-    </component>

-

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0010.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0010.composite
deleted file mode 100644
index 4454a75278..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0010.composite
+++ /dev/null
@@ -1,51 +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.    

--->

-<!-- Tests interface specified by the <interface/> child element of a 

-     <service/> element is a compatible subset of the interface declared 

-     for the <service/> element with the same @name attribute in the 

-     <componentType/> of the <implementation/> of the <component/> 

-     parent of the <service/> -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0010">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0010</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite5"/>

-		<!-- This service declares interface Service1 while the implementation offers

-		     Service2, which is not compatible with Service1 -->

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0011.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0011.composite
deleted file mode 100644
index 447cbcc83d..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0011.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.    

--->

-<!-- Tests the multiplicity of a <reference/> element of a <component/> 

-     can be 1..1 where the multiplicity of the equivalent <reference/> 

-     element in the <componentType/> of the <implementation/> of the 

-     <component/> is 1..n -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0011">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0011</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite6"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- The multiplicity declared for this reference is 1..1 while the multiplicity of

-             the corresponding reference on the componentType of the implementation is 1..n -->

-        <reference name="Reference1" target="TestComponent2/Service1" multiplicity="1..1">

-        	<interface.java interface="test.Service1"/>

-        </reference>

-    </component>

-    

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0012.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0012.composite
deleted file mode 100644
index c48b5ca601..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0012.composite
+++ /dev/null
@@ -1,101 +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.    

--->

-<!-- Tests that the the multiplicity 

-     of a <reference/> element of a <component/> can be any one of 0..1, 

-     1..1, 0..n, 1..n where the multiplicity of the equivalent <reference/> 

-     element in the <componentType/> of the <implementation/> of the 

-     <component/> is 0..n -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0012">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0012</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite7"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- The multiplicity declared for this reference is 0..1 while the multiplicity of

-             the corresponding reference on the componentType of the implementation is 0..n -->

-        <reference name="Reference1" target="TestComponent2/Service1" multiplicity="0..1">

-        	<interface.java interface="test.Service1"/>

-        </reference>

-    </component>

-    

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite7"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service2</property>

-        <!-- The multiplicity declared for this reference is 1..1 while the multiplicity of

-             the corresponding reference on the componentType of the implementation is 0..n -->

-        <reference name="Reference1" target="TestComponent3/Service1" multiplicity="1..1">

-        	<interface.java interface="test.Service1"/>

-        </reference>

-    </component>

-    

-    <component name="TestComponent3">

-		<implementation.composite name="tns:TestComposite7"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service3</property>

-        <!-- The multiplicity declared for this reference is 0..n while the multiplicity of

-             the corresponding reference on the componentType of the implementation is 0..n -->

-        <reference name="Reference1" target="TestComponent4/Service1" multiplicity="0..n">

-        	<interface.java interface="test.Service1"/>

-        </reference>

-    </component>

-    

-    <component name="TestComponent4">

-		<implementation.composite name="tns:TestComposite7"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service4</property>

-        <!-- The multiplicity declared for this reference is 1..n while the multiplicity of

-             the corresponding reference on the componentType of the implementation is 0..n -->

-        <reference name="Reference1" target="TestComponent5/Service1" multiplicity="1..n">

-        	<interface.java interface="test.Service1"/>

-        </reference>

-    </component>

-    

-    <component name="TestComponent5">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service5</property>

-    </component>    

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0013.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0013.composite
deleted file mode 100644
index 91cca790ad..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0013.composite
+++ /dev/null
@@ -1,62 +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.    

--->

-<!-- Tests that the the multiplicity 

-     of a <reference/> element of a <component/> is 

-     1..1 where the multiplicity of the equivalent <reference/> 

-     element in the <componentType/> of the <implementation/> of the 

-     <component/> is 1..1 -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0013">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0013</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite4"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- The multiplicity declared for this reference is 1..1 while the multiplicity of

-             the corresponding reference on the componentType of the implementation is 1..1 -->

-        <reference name="Reference1" target="TestComponent2/Service1" multiplicity="1..1">

-        	<interface.java interface="test.Service1"/>

-        </reference>

-    </component>

-    

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>    

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0014.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0014.composite
deleted file mode 100644
index 698f7896a3..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0014.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.    

--->

-<!-- Tests that the multiplicity of a <reference/> element of a 

-     <component/>  is 0..n where the multiplicity of the equivalent 

-     <reference/> element in the <componentType/> of the 

-     <implementation/> of the <component/> is 1..1 -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0014">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0014</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite4"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- The multiplicity declared for this reference is 0..n while the multiplicity of

-             the corresponding reference on the componentType of the implementation is 1..1 -->

-        <reference name="Reference1" target="TestComponent2/Service1" multiplicity="0..n">

-        	<interface.java interface="test.Service1"/>

-        </reference>

-    </component>

-    

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>    

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0015.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0015.composite
deleted file mode 100644
index 01c1d1d450..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0015.composite
+++ /dev/null
@@ -1,62 +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.    

--->

-<!-- Tests that the the multiplicity 

-     of a <reference/> element of a <component/> is 

-     1..1 where the multiplicity of the equivalent <reference/> 

-     element in the <componentType/> of the <implementation/> of the 

-     <component/> is 0..1 -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0015">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0015</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite8"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- The multiplicity declared for this reference is 1..1 while the multiplicity of

-             the corresponding reference on the componentType of the implementation is 0..1 -->

-        <reference name="Reference1" target="TestComponent2/Service1" multiplicity="1..1">

-        	<interface.java interface="test.Service1"/>

-        </reference>

-    </component>

-    

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>    

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0016.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0016.composite
deleted file mode 100644
index 98e2ffa41a..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0016.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.    

--->

-<!-- Tests that the interface declared by the <interface/> child element 

-     of a <reference/> of a <component/> is a compatible superset of the 

-     interface declared on the corresponding <reference/> of the 

-     componentType of the <implementation/> of the <component/> -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0016">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0016</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite4"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" target="TestComponent2/Service1">

-            <!-- Component type has the interface = test.Service1 - here

-                 we use an interface that is a superset -->

-        	<interface.java interface="test.Service1Superset"/>

-        </reference>

-    </component>

-    

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite9"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1Superset"></interface.java>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>    

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0017.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0017.composite
deleted file mode 100644
index d2c065ffd1..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0017.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.    

--->

-<!-- Tests that where a <reference/> of a <component/> has no <binding/> 

-     child element, but the corresponding <reference/> element in the 

-     componentType does have a binding child element, the <binding/> 

-     from the componentType is used for the reference -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0017">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0017</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite10"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- ComponentType has a binding for this reference that 

-             identifies the target for this reference -->

-        <reference name="Reference1">

-        	<interface.java interface="test.Service1"/>

-        </reference>

-    </component>

-    

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>    

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0018.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0018.composite
deleted file mode 100644
index 4684bd5afe..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0018.composite
+++ /dev/null
@@ -1,72 +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.    

--->

-<!-- Tests that where a <reference/> of a <component/> has a <binding/> 

-     child element and the corresponding <reference/> element in the 

-     componentType has a binding child element, the <binding/> 

-     from the <reference/> is used for the reference -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0018">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0018</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite10"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- ComponentType has a binding for this reference that 

-             identifies a target for this reference -->

-        <reference name="Reference1">

-        	<interface.java interface="test.Service1"/>

-        	<binding.sca uri="TestComponent3/Service1"/>

-        </reference>

-    </component>

-    

-    <!-- This component is the target identified by the Component Type -->

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>    

-    

-    <!-- This component is the target identified by the reference -->

-    <component name="TestComponent3">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service3</property>

-    </component>    

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0019.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0019.composite
deleted file mode 100644
index 106ed5e5bd..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0019.composite
+++ /dev/null
@@ -1,69 +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.    

--->

-<!-- Tests that where a <reference/> of a <component/> has autowire=true

-     and also has target identifying a single target service that the 

-     reference is wired only to the single service identified by the 

-     target attribute -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0019">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0019</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite7"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" autowire="true" target="TestComponent3/Service1">

-        	<interface.java interface="test.Service1"/>

-        </reference>

-    </component>

-    

-    <!-- This component is the target identified by the Component Type -->

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>    

-    

-    <!-- This component is the target identified by the reference -->

-    <component name="TestComponent3">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service3</property>

-    </component>    

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0020.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0020.composite
deleted file mode 100644
index 70b5a7b3c1..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0020.composite
+++ /dev/null
@@ -1,71 +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.    

--->

-<!-- Tests that where a <reference/> of a <component/> has 

-     @autowire=true and where there is also a single <wire/> element 

-     which as that <reference/> as its source that the reference is 

-     wired only to the single service identified by the <wire/> element  -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0020">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0020</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite7"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" autowire="true">

-        	<interface.java interface="test.Service1"/>

-        </reference>

-    </component>

-    

-    <wire source="TestComponent1/Reference1" target="TestComponent3/Service1"/>

-    

-    <!-- This component is the target identified by the Component Type -->

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>    

-    

-    <!-- This component is the target identified by the reference -->

-    <component name="TestComponent3">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service3</property>

-    </component>    

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0021.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0021.composite
deleted file mode 100644
index e40949b012..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0021.composite
+++ /dev/null
@@ -1,70 +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.    

--->

-<!-- Tests that where a <reference/> of a <component/> has @autowire=true 

-     and where the <reference/> has a <binding/> child element which 

-     declares a single target service,  the reference is wired only to 

-     the single service identified by the <wire/> element   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0021">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0021</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite7"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" autowire="true">

-        	<interface.java interface="test.Service1"/>

-        	<binding.sca uri="TestComponent3/Service1"/>

-        </reference>

-    </component>

-    

-    <!-- This component is the target identified by the Component Type -->

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>    

-    

-    <!-- This component is the target identified by the reference -->

-    <component name="TestComponent3">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service3</property>

-    </component>    

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0022.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0022.composite
deleted file mode 100644
index 1bd3b43b2c..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0022.composite
+++ /dev/null
@@ -1,50 +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.    

--->

-<!-- Tests that where a <component/> <reference/> with multiplicity=0..1 

-     is unwired (by any means) that the component executes correctly   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0022">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0022</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite8"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- Reference is 0..1 and is deliberately left unwired -->

-        <reference name="Reference1">

-        	<interface.java interface="test.Service1"/>

-        </reference>

-    </component>

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0023.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0023.composite
deleted file mode 100644
index a3a6465c09..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0023.composite
+++ /dev/null
@@ -1,60 +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.    

--->

-<!-- Tests that where a <component/> <reference/> with multiplicity=1..1 

-     is wired to a component service in the same composite and is also 

-     promoted by a <composite/> <reference/> which is wired to a target 

-     service by a component using the <composite/> as its implementation, 

-     that this is an error   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0023">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0023</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite11"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" target="TestComponent2/Service1">

-        	<interface.java interface="test.Service1"/>

-        </reference>

-    </component>

-    

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"></interface.java>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>    

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0024.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
deleted file mode 100644
index a140e3bfd5..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
+++ /dev/null
@@ -1,60 +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.    

--->

-<!-- Tests that where a <component/> <reference/> has @target set to 

-     some service, that the reference can have no child <binding/> elements   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:sample="http://oasis/tests"

-           name="TEST_ASM_0024">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0024</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite4"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" target="TestComponent2/Service1">

-        	<interface.java interface="test.Service1"/>

-        	<!-- A binding which contradicts the @target attribute -->

-        	<binding.ws/>

-        </reference>

-    </component>

-    

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        	<binding.ws/>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>    

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0025.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
deleted file mode 100644
index 3209916612..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
+++ /dev/null
@@ -1,54 +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.    

--->

-<!-- Tests that where a <component/> <property/> has its value set by means 

-     of a child <value/> element, that the type of the <value/> element matches 

-     the type declared for the <property/> element   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_0025">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0025</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite12"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- Property with complex type with a value declared using a <value/> subelement -->

-        <property name="complexType" type="test:ComplexType1">

-            <value>

-            	<firstData>complex1</firstData>

-            	<secondData>complex2</secondData>

-            </value>

-        </property>

-    </component> 

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0026.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0026.composite
deleted file mode 100644
index 45e7420646..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0026.composite
+++ /dev/null
@@ -1,57 +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.    

--->

-<!-- Tests that where a <component/> <property/> has its value set by means 

-     of a child element that is NOT a <value/> element, that a) the type of 

-     the <property/> element is declared as an XML Schema global element by 

-     its @element attribute and that the child element is an instance of that 

-     global element   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_0026">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0026</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite13"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- Property with complex type with a value declared using a subelement 

-             with the correct XSD global element type -->

-        <property name="complexType" element="test:globalElement1">

-            <test:globalElement1>

-            	<firstData>complex1</firstData>

-            	<secondData>complex2</secondData>

-            </test:globalElement1>

-        </property>

-    </component> 

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0027.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0027.composite
deleted file mode 100644
index aa411a1955..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0027.composite
+++ /dev/null
@@ -1,49 +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.    

--->

-<!-- Tests that where a <component/> has 2 or more <property/> child elements 

-     that each <property/> element has a unique @name attribute value   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_0027">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0027</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- Multiple properties with the same @name attribute value - an error -->

-        <property name="serviceName">service2</property>

-        <property name="serviceName">service3</property>

-    </component> 

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0028.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0028.composite
deleted file mode 100644
index 07d36a29fd..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0028.composite
+++ /dev/null
@@ -1,51 +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.    

--->

-<!-- Tests that a <component/> <property/> @name attribute matches the 

-     @name attribute of one of the <property/> elements of the 

-     <componentType/> of the <implementation/> of the <component/>   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_0028">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0028</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- Property with @name attribute that does not match the @name

-             attribute of any of the <property/> elements in the 

-             <componentType/> of the <implementation/> -->

-        <property name="randomName">randomValue</property>

-    </component> 

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0029.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0029.composite
deleted file mode 100644
index c35c2a4dca..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0029.composite
+++ /dev/null
@@ -1,58 +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.    

--->

-<!-- Tests that that where a <component/> <property/> has @many=false that 

-     there is only one <value/> child element of the <property/>   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_0029">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0029</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite12"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- Property with complex type with many=false but 2 <value/>

-             subelements - which is an error -->

-        <property name="complexType" type="test:ComplexType1">

-        	<value>

-        		<test:firstData>SomeData</test:firstData>

-        		<test:secondData>MoreData</test:secondData>

-        	</value>

-        	<value>        	

-        		<test:firstData>SomeData2</test:firstData>

-        		<test:secondData>MoreData2</test:secondData>  	

-        	</value>

-        </property>

-    </component> 

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0030.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0030.composite
deleted file mode 100644
index 27a652958d..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0030.composite
+++ /dev/null
@@ -1,51 +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.    

--->

-<!-- Tests that a <component/> <property/> with a @value attribute set 

-does not have any <value/> child elements   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_0030">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0030</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite14"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <!-- Property with value set via a @value attribute and also having 

-             <value/> child elements, which is an error -->

-        <property name="simpleType" value="someValue">

-        	<value>someOtherValue</value>

-        </property>

-    </component> 

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0031.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0031.composite
deleted file mode 100644
index d68fcac87d..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0031.composite
+++ /dev/null
@@ -1,68 +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.    

--->

-<!-- Tests that where a <component/> <reference/> has its @target attribute set 

-     to a valid service and the <composite/> also contains a <wire/> element with 

-     @source set to the <component/> <reference/> and @target set to a second valid 

-     service and has @replace=true,  the <reference/> is wired to the second service 

-     only   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_0031">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0031</property>

-    </component>

-    

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite4"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" target="TestComponent2/Service1"/>

-    </component> 

-    

-    <!-- Here is a wire that overrides the reference target of TestComponent1/Reference1 -->

-    <wire source="TestComponent1/Reference1" target="TestComponent3/Service1" replace="true"/>

-    

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>

-     

-    <component name="TestComponent3">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service3</property>

-    </component> 

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0032.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0032.composite
deleted file mode 100644
index 06cce10ffe..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0032.composite
+++ /dev/null
@@ -1,66 +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.    

--->

-<!-- Tests that where a <component/> <service/> has no <binding/> subelements 

-     and the corresponding <service/> element of the <componentType/> of the 

-     <component/> <implementation/> has one or more <binding/> subelements, 

-     the <component/> <service/> is made available with all the bindings 

-     declared on the <service/> element of the <componentType/>   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_0032">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0032</property>

-    </component>

-    

-    <!-- Implementation with a single reference with multiplicity 1..n which

-         has multiple concrete bindings applied to it -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite6"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1">

-        	<interface.java interface="test.Service1"/>

-        	<binding.sca uri="TestComponent2/Service1"/>

-        	<binding.ws uri="http://localhost:8080/TestComponent2"/>

-        </reference>

-    </component> 

-

-    <!-- A component with a service that has no bindings but where the service in the

-         componentType has multiple bindings explicitly set on it -->

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite15"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>

-     

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0033.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0033.composite
deleted file mode 100644
index 070b23d1ec..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0033.composite
+++ /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.    

--->

-<!-- Tests that where a <component/> <service/> has no <binding/> subelements 

-     and the corresponding <service/> element of the <componentType/> of the 

-     <component/> <implementation/> has no <binding/> subelements, the 

-     <component/> <service/> is made available with binding.sca   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_0033">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0033</property>

-    </component>

-    

-    <!-- Implementation with a single reference with multiplicity 1..n which

-         has multiple concrete bindings applied to it -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite6"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1">

-        	<interface.java interface="test.Service1"/>

-        	<binding.sca uri="TestComponent2/Service1"/>

-        	<binding.sca uri="TestComponent2/Service1"/>

-        </reference>

-    </component> 

-

-    <!-- A component with a service that has no bindings set and where the service 

-         in the componentType has no bindings explicitly set on it -->

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>

-     

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0034.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0034.composite
deleted file mode 100644
index 37e282b5d5..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0034.composite
+++ /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.    

--->

-<!-- Tests that where a <component/> <service/> has 1 or more <binding/> 

-     subelements the <component/> <service/> is made available with 

-     all the bindings declared on the <service/> element    -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_0034">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_0034</property>

-    </component>

-    

-    <!-- Implementation with a single reference with multiplicity 1..n which

-         has multiple concrete bindings applied to it -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite6"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1">

-        	<interface.java interface="test.Service1"/>

-        	<binding.sca uri="TestComponent2/Service1"/>

-        	<binding.ws uri="http://localhost:8080/TestComponent2"/>

-        </reference>

-    </component> 

-

-    <!-- A component with a service that has multiple bindings explicitly set on it -->

-    <component name="TestComponent2">

-		<implementation.composite name="tns:TestComposite1"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        	<binding.sca/>

-		    <binding.ws/>

-        </service>

-        <property name="serviceName">service2</property>

-    </component>

-     

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0101.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0101.composite
deleted file mode 100644
index 9a5e53e75c..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0101.composite
+++ /dev/null
@@ -1,42 +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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://oasis/tests"
-           xmlns:sample="http://oasis/tests"
-           name="TEST_ASM_0101">

-           
-    <component name="TestClient">

-		<implementation.java class="test.ASM_0001_Client"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-			<binding.sca/>

-			<binding.ws/>

-		</service>

-        <!--  reference name="testRef1" target="TestComponent1/service1" / -->

-    </component>

-

-<!--  
-    <component name="TestComponent1">
-		<implementation.java class="test.ASM_0001_Impl1"/>
-        <service name="service1"/>
-    </component>
--->

-
-</composite>
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6001.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6001.composite
deleted file mode 100644
index cd4701ff57..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6001.composite
+++ /dev/null
@@ -1,49 +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.    

--->

-<!-- Tests that where a <component/> <service/> has 1 or more <binding/> 

-     subelements the <component/> <service/> is made available with 

-     all the bindings declared on the <service/> element    -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_6001">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_6001</property>

-    </component>

-    

-    <!-- Component which uses a composite as its implementation where the contribution 

-         contains 2 <composite/> artifacts which have identical names and targetNamspaces -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:DuplicateComposite"/>

-        <service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-    </component> 

-  

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6002.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6002.composite
deleted file mode 100644
index e5d59e186a..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6002.composite
+++ /dev/null
@@ -1,45 +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.    

--->

-<!-- Tests that where a <composite/> has multiple <service/> subelements 

-     that the @name attributes are unique across those subelements    -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_6002">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_6002</property>

-    </component>

-    

-    <!-- Component which uses a composite which has 2 <service/> subelements with

-         the same @name attribute -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite16"/>

-        <property name="serviceName">service1</property>

-    </component> 

-  

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6003.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6003.composite
deleted file mode 100644
index c65c8634f8..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6003.composite
+++ /dev/null
@@ -1,50 +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.    

--->

-<!-- Tests that where a <composite/> has a <service/> subelement that the 

-     @promote attribute identifies a <service/> of a <component/> in the 

-     <composite/>    -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_6003">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_6003</property>

-    </component>

-    

-    <!-- Component which uses a composite which has a <service/> subelements with

-         a @promote attribute which does not contain the name of a <service/> of 

-         one of the <component/> within the <composite/> -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite17"/>

-		<service name="Service1">

-        	<interface.java interface="test.Service1"/>

-        </service>

-        <property name="serviceName">service1</property>

-    </component> 

-  

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6004.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6004.composite
deleted file mode 100644
index 779358b5d3..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6004.composite
+++ /dev/null
@@ -1,47 +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.    

--->

-<!-- Tests that the <interface/> declared on a <service/> subelement of a 

-     <composite/> is a compatible subset of the <interface/> declared on 

-     the <component/> <service/> reference by the @promote attribute    -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_6004">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_6004</property>

-    </component>

-    

-    <!-- Component which uses a composite which has a <service/> subelement which

-         has an <interface/> declared which is a compatible subset of the interface

-         of the promoted component service -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite18"/>

-        <property name="serviceName">service1</property>

-    </component> 

-  

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6005.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6005.composite
deleted file mode 100644
index ea27808b17..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6005.composite
+++ /dev/null
@@ -1,48 +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.    

--->

-<!-- Tests that the @name attribute of a <composite/> <reference/> element 

-is unique amongst the @name attributes of all the <reference/> elements of 

-that <composite/>    -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_6005">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_6005</property>

-    </component>

-    

-    <!-- Component which uses a composite which has a single <service/> subelement 

-         and which has 2 <reference/> subelements with the same name - references

-         are 0..n multiplicity and so do not require wiring -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite19"/>

-		<service name="Service1"/>

-        <property name="serviceName">service1</property>

-    </component> 

-  

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6006.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6006.composite
deleted file mode 100644
index 04647af815..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6006.composite
+++ /dev/null
@@ -1,55 +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.    

--->

-<!-- Tests that the @promote attribute of a <composite/> <reference/> contains 

-     one or more URIs that each point to a <reference/> of a <component/> in the 

-     <composite/>  -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_6006">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_6006</property>

-    </component>

-    

-    <!-- Component which uses a composite which has a single <service/> subelement 

-         and which has 2 <reference/> subelements with the same name - references

-         are 0..n multiplicity and so do not require wiring -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite20"/>

-		<service name="Service1"/>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" target="TestComponent2/Service1"/>

-    </component> 

-    

-    <component name="TestComponent2">

-    	<implementation.composite name="tns:TestComposite1"/>

-    	<service name="Service1"/>

-    	<property name="serviceName">service2</property>

-    </component>

-  

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6007.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6007.composite
deleted file mode 100644
index ed7f358e8d..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6007.composite
+++ /dev/null
@@ -1,55 +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.    

--->

-<!-- Tests that a <composite/> <reference/> can declare an <interface/> 

-     that is a compatible superset of the <interface/> declared by each 

-     <component/> <reference/> promoted by the composite reference   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_6007">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_6007</property>

-    </component>

-    

-    <!-- Component which uses a composite which has a <reference/> element which

-         declares a superset interface -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite21"/>

-		<service name="Service1"/>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" target="TestComponent2/Service1"/>

-    </component> 

-    

-    <!-- Implementation of the superset service -->

-    <component name="TestComponent2">

-    	<implementation.composite name="tns:TestComposite9"/>

-    	<service name="Service1"/>

-    	<property name="serviceName">service2</property>

-    </component>

-  

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6008.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6008.composite
deleted file mode 100644
index 6f69735871..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6008.composite
+++ /dev/null
@@ -1,54 +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.    

--->

-<!-- Tests that where a <composite/> <reference/> has no <interface/> subelement, 

-     and that <reference/> promotes 2 or more <component/> <reference/>s, that the 

-     <interface/> declared on each of the <component/> <reference/>s are the same   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_6008">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_6008</property>

-    </component>

-    

-    <!-- Component which uses a composite which has a <reference/> element which

-         promotes multiple component references which use different interfaces -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite22"/>

-		<service name="Service1"/>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" target="TestComponent2/Service1"/>

-    </component> 

-    

-    <component name="TestComponent2">

-    	<implementation.composite name="tns:TestComposite1"/>

-    	<service name="Service1"/>

-    	<property name="serviceName">service2</property>

-    </component>

-  

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6009.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6009.composite
deleted file mode 100644
index fd1cadd870..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6009.composite
+++ /dev/null
@@ -1,54 +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.    

--->

-<!-- Tests that a <component/> <reference/> with @multiplicity=0..1 can be 

-     promoted by a <composite/> <reference/> with @multiplicity=1..1   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_6009">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_6009</property>

-    </component>

-    

-    <!-- Component which uses a composite which has a <reference/> element which

-         has @multiplicity=1..1 and which promotes a component reference which has

-         @multiplicity=0..1 -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite23"/>

-		<service name="Service1"/>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" target="TestComponent2/Service1"/>

-    </component> 

-    

-    <component name="TestComponent2">

-    	<implementation.composite name="tns:TestComposite1"/>

-    	<service name="Service1"/>

-    	<property name="serviceName">service2</property>

-    </component>

-  

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6010.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6010.composite
deleted file mode 100644
index f9525f171e..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6010.composite
+++ /dev/null
@@ -1,54 +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.    

--->

-<!-- Tests that a <component/> <reference/> with @multiplicity=0..n can be 

-     promoted by a <composite/> <reference/> with @multiplicity=0..1   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_6010">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_6010</property>

-    </component>

-    

-    <!-- Component which uses a composite which has a <reference/> element which

-         has @multiplicity=0..1 and which promotes a component reference which has

-         @multiplicity=0..n -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite24"/>

-		<service name="Service1"/>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" target="TestComponent2/Service1"/>

-    </component> 

-    

-    <component name="TestComponent2">

-    	<implementation.composite name="tns:TestComposite1"/>

-    	<service name="Service1"/>

-    	<property name="serviceName">service2</property>

-    </component>

-  

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6011.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6011.composite
deleted file mode 100644
index a702d7b342..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6011.composite
+++ /dev/null
@@ -1,54 +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.    

--->

-<!-- Tests that a <component/> <reference/> with @multiplicity=1..n can be 

-     promoted by a <composite/> <reference/> with @multiplicity=1..1   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_6011">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_6011</property>

-    </component>

-    

-    <!-- Component which uses a composite which has a <reference/> element which

-         has @multiplicity=1..1 and which promotes a component reference which has

-         @multiplicity=1..n -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite25"/>

-		<service name="Service1"/>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" target="TestComponent2/Service1"/>

-    </component> 

-    

-    <component name="TestComponent2">

-    	<implementation.composite name="tns:TestComposite1"/>

-    	<service name="Service1"/>

-    	<property name="serviceName">service2</property>

-    </component>

-  

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6012.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6012.composite
deleted file mode 100644
index f032838b50..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6012.composite
+++ /dev/null
@@ -1,54 +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.    

--->

-<!-- Tests that the @name attribute of a <property/> element of a <composite/> is 

-     unique amongst the @name attribute values of all the <property/> elements of 

-     that <composite/>   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_6012">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_6012</property>

-    </component>

-    

-    <!-- Component which uses a composite which has multiple <property/>

-         elements and where they all have the same @name value -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite26"/>

-		<service name="Service1"/>

-        <property name="serviceName">service1</property>

-        <reference name="Reference1" target="TestComponent2/Service1"/>

-    </component> 

-    

-    <component name="TestComponent2">

-    	<implementation.composite name="tns:TestComposite1"/>

-    	<service name="Service1"/>

-    	<property name="serviceName">service2</property>

-    </component>

-  

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6013.composite b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6013.composite
deleted file mode 100644
index 1e3dd250d5..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6013.composite
+++ /dev/null
@@ -1,47 +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.    

--->

-<!-- Tests that a <component/> <reference/> with @autowire=true is wired 

-     to a compatible <component/> <service/> in the same <composite/>   -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://oasis/tests"

-           xmlns:tns="http://oasis/tests"

-           xmlns:test="http://oasis/tests"

-           name="TEST_ASM_6013">

-           

-    <component name="TestClient">

-		<implementation.composite name="tns:TestClient_0002"/>

-		<service name="TestInvocation">

-			<interface.java interface="test.TestInvocation"/>

-            <binding.ws/>

-		</service>

-        <reference name="reference1" target="TestComponent1/Service1" />

-        <property name="testName">ASM_6013</property>

-    </component>

-    

-    <!-- Component which uses a composite which has a <component/> with a <reference/> 

-         element which has @autowire=true and where there is a compatible <component/>

-         <service/> in the same composite -->

-    <component name="TestComponent1">

-		<implementation.composite name="tns:TestComposite27"/>

-		<service name="Service1"/>

-        <property name="serviceName">service1</property>

-    </component> 

-    

-</composite>

diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_Types.xsd b/java/sca-contrib/stest/sampleTest/src/main/resources/Test_Types.xsd
deleted file mode 100644
index 98c57b1a55..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_Types.xsd
+++ /dev/null
@@ -1,38 +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 for Schema types used by the SCA TestCases -->

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

-    targetNamespace="http://oasis/tests"

-    xmlns:test="http://oasis/tests"

-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-    elementFormDefault="qualified">

-

-    <!-- A complex type -->

-    <complexType name="ComplexType1">

-        <sequence>

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

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

-        </sequence>

-    </complexType>

-    

-    <!-- A global element with a complex type -->

-    <element name="globalElement1" type="test:ComplexType1"/>

-       

-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java
deleted file mode 100644
index 531a5a817b..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java
+++ /dev/null
@@ -1,41 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * ASM_0002_TestCase

- */

-public class ASM_0002_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0002";

-        config.input = "request";

-        config.output = config.testName + " " + config.input + " service1 operation1 invoked";

-        config.composite = "Test_ASM_0002.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0002

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java
deleted file mode 100644
index 2f60ad5fca..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java
+++ /dev/null
@@ -1,46 +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 client;

-

-import test.ASM_0003_Client;

-import testClient.TestInvocation;

-

-/**

- * A generic test client based on Tuscany APIs

- */

-public class ASM_0003_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0003";

-        config.input = "request";

-        config.output =

-            config.testName + " "

-                + config.input

-                + " service1 operation1 invoked"

-                + "service2 operation1 invoked"

-                + "service3 operation1 invoked";

-        config.composite = "Test_ASM_0003.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0003_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java
deleted file mode 100644
index 6991447961..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java
+++ /dev/null
@@ -1,41 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * A generic test client based on Tuscany APIs

- */

-public class ASM_0004_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0004";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0004.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java
deleted file mode 100644
index a27c1cc08e..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java
+++ /dev/null
@@ -1,42 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0005_TestCase, which checks that a component with multiple <service/>

- * elements with the same @name attribute is an error

- */

-public class ASM_0005_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0005";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0005.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java
deleted file mode 100644
index 36e1e53d6e..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0006_TestCase, which checks that the @name attribute of a <service/>

- * element of a <component/> matches the @name attribute of a <service/> element of the

- * componentType of the <implementation/> used by the <component/>

- */

-public class ASM_0006_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0006";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0006.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java
deleted file mode 100644
index b5528b35b3..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0007_TestCase, which tests that the @name attribute of a <reference/> 

- * element of a component is not equal to the @name attribute of any other <reference/> 

- * element of the same component

- */

-public class ASM_0007_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0007";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0007.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.java
deleted file mode 100644
index 0c6c9201c9..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0008_TestCase, which Tests that the @name attribute of a 

- * <reference/> element of a component is equal to the @name attribute of a 

- * <reference/> element of the <componentType/> of the <implementation/> of 

- * the <component/>

- */

-public class ASM_0008_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0008";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0008.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java
deleted file mode 100644
index 415e23a6b2..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0009_TestCase, which tests that the @name attribute of a 

- * <component/> element in a <composite/> is not the same as the @name 

- * attribute of a second component in the same <composite/>

- */

-public class ASM_0009_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0009";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0009.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.java
deleted file mode 100644
index f74589ff1a..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.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.    

- */

-package client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0009_TestCase, which tests that the interface specified 

- * by the <interface/> child element of a <service/> element is a compatible 

- * subset of the interface declared for the <service/> element with the 

- * same @name attribute in the <componentType/> of the <implementation/> 

- * of the <component/> parent of the <service/>

- */

-public class ASM_0010_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0010";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0010.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.java
deleted file mode 100644
index 309c2a7ae6..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0011_TestCase, which tests that the the multiplicity 

- * of a <reference/> element of a <component/> can be 1..1 where the 

- * multiplicity of the equivalent <reference/> element in the 

- * <componentType/> of the <implementation/> of the <component/> is 1..n

- */

-public class ASM_0011_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0011";

-        config.input = "request";

-        config.output = "ASM_0011 request service1 operation1 invoked service2 operation1 invoked";

-        config.composite = "Test_ASM_0011.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java
deleted file mode 100644
index d5c166134d..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java
+++ /dev/null
@@ -1,46 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0012_TestCase, which tests that the the multiplicity 

- * of a <reference/> element of a <component/> can be any one of 0..1, 

- * 1..1, 0..n, 1..n where the multiplicity of the equivalent <reference/> 

- * element in the <componentType/> of the <implementation/> of the 

- * <component/> is 0..n

- */

-public class ASM_0012_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0012";

-        config.input = "request";

-        config.output =

-            "ASM_0012 request service1 operation1 invoked service2 operation1 invoked" + " service3 operation1 invoked service4 operation1 invoked service5 operation1 invoked";

-        config.composite = "Test_ASM_0012.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.java
deleted file mode 100644
index 11ec31907a..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0013_TestCase, which tests that the the multiplicity 

- * of a <reference/> element of a <component/> is 1..1 where the 

- * multiplicity of the equivalent <reference/> element in the 

- * <componentType/> of the <implementation/> of the <component/> is 1..1

- */

-public class ASM_0013_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0013";

-        config.input = "request";

-        config.output = "ASM_0013 request service1 operation1 invoked service2 operation1 invoked";

-        config.composite = "Test_ASM_0013.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.java
deleted file mode 100644
index 35b8383c91..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0014_TestCase, which tests that the multiplicity of a 

- * <reference/> element of a <component/>  is 0..n where the multiplicity 

- * of the equivalent <reference/> element in the <componentType/> of the 

- * <implementation/> of the <component/> is 1..1

- */

-public class ASM_0014_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0014";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0014.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.java
deleted file mode 100644
index e0c64e8851..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0015_TestCase, which tests that the the multiplicity 

- * of a <reference/> element of a <component/> is 1..1 where the 

- * multiplicity of the equivalent <reference/> element in the 

- * <componentType/> of the <implementation/> of the <component/> is 0..1

- */

-public class ASM_0015_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0015";

-        config.input = "request";

-        config.output = "ASM_0015 request service1 operation1 invoked service2 operation1 invoked";

-        config.composite = "Test_ASM_0015.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.java
deleted file mode 100644
index 9ad6bb27c7..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0016_TestCase, which tests that the interface declared 

- * by the <interface/> child element of a <reference/> of a <component/> 

- * is a compatible superset of the interface declared on the corresponding 

- * <reference/> of the componentType of the <implementation/> of the <component/> 

- */

-public class ASM_0016_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0016";

-        config.input = "request";

-        config.output = "ASM_0016 request service1 operation1 invoked service2 operation1 invoked";

-        config.composite = "Test_ASM_0016.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.java
deleted file mode 100644
index d1638fd809..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.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.    

- */

-package client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0017_TestCase, which tests that where a <reference/> 

- * of a <component/> has no <binding/> child element, but the 

- * corresponding <reference/> element in the componentType does have 

- * a binding child element, the <binding/> from the componentType is 

- * used for the reference 

- */

-public class ASM_0017_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0017";

-        config.input = "request";

-        config.output = "ASM_0017 request service1 operation1 invoked service2 operation1 invoked";

-        config.composite = "Test_ASM_0017.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.java
deleted file mode 100644
index db49cee512..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.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.    

- */

-package client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0018_TestCase, which tests that where a <reference/> 

- * of a <component/> has a <binding/> child element and the 

- * corresponding <reference/> element in the componentType has 

- * a binding child element, the <binding/> from the <reference/> is 

- * used for the reference 

- */

-public class ASM_0018_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0018";

-        config.input = "request";

-        config.output = "ASM_0018 request service1 operation1 invoked service3 operation1 invoked";

-        config.composite = "Test_ASM_0018.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.java
deleted file mode 100644
index f4189fcaf5..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0018_TestCase, which tests that where a <reference/> 

- * of a <component/> has @autowire=”true” and also has @target identifying 

- * a single target service that the reference is wired only to the single 

- * service identified by the @target attribute 

- */

-public class ASM_0019_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0019";

-        config.input = "request";

-        config.output = "ASM_0019 request service1 operation1 invoked service3 operation1 invoked";

-        config.composite = "Test_ASM_0019.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.java
deleted file mode 100644
index 50fec1f0a9..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.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.    

- */

-package client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0020_TestCase, which tests that where a <reference/> 

- * of a <component/> has @autowire=true and where there is also a single 

- * <wire/> element which as that <reference/> as its source that the 

- * reference is wired only to the single service identified by the 

- * <wire/> element  

- */

-public class ASM_0020_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0020";

-        config.input = "request";

-        config.output = "ASM_0020 request service1 operation1 invoked service3 operation1 invoked";

-        config.composite = "Test_ASM_0020.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.java
deleted file mode 100644
index 286533a9ee..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.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.    

- */

-package client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0021_TestCase, which tests that where a <reference/> 

- * of a <component/> has @autowire=true and where the <reference/> has 

- * a <binding/> child element which declares a single target service,  

- * the reference is wired only to the single service identified by the 

- * <wire/> element   

- */

-public class ASM_0021_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0021";

-        config.input = "request";

-        config.output = "ASM_0021 request service1 operation1 invoked service3 operation1 invoked";

-        config.composite = "Test_ASM_0021.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java
deleted file mode 100644
index 6b64407545..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0022_TestCase, which tests that where a <component/> 

- * <reference/> with multiplicity=0..1 is unwired (by any means) that 

- * the component executes correctly   

- */

-public class ASM_0022_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0022";

-        config.input = "request";

-        config.output = "ASM_0022 request service1 operation1 invoked";

-        config.composite = "Test_ASM_0022.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.java
deleted file mode 100644
index f3814b6b0a..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.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.    

- */

-package client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0021_TestCase, which tests that where a <component/> 

- * <reference/> with multiplicity=1..1 is wired to a component service 

- * in the same composite and is also promoted by a <composite/> <reference/> 

- * which is wired to a target service by a component using the <composite/> 

- * as its implementation, that this is an error   

- */

-public class ASM_0023_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0023";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0023.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java
deleted file mode 100644
index 7f0ce03ae2..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0024_TestCase, which tests that where a <component/> 

- * <reference/> has @target set to some service, that the reference 

- * can have no child <binding/> elements   

- */

-public class ASM_0024_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0024";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0024.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java
deleted file mode 100644
index 6f022457cc..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0025_TestCase, which tests that where a <component/> 

- * <property/> has its value set by means of a child <value/> element, 

- * that the type of the <value/> element matches the type declared for 

- * the <property/> element   

- */

-public class ASM_0025_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0025";

-        config.input = "request";

-        config.output = "ASM_0025 request service1 operation1 invokedcomplex1complex2";

-        config.composite = "Test_ASM_0025.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.java
deleted file mode 100644
index 56be980561..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.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.    

- */

-package client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0026_TestCase, which tests that where a <component/> <property/> 

- * has its value set by means of a child element that is NOT a <value/> element, 

- * that a) the type of the <property/> element is declared as an XML Schema global 

- * element by its @element attribute and b) that the child element is an instance 

- * of that global element 

- */

-public class ASM_0026_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0026";

-        config.input = "request";

-        config.output = "ASM_0026 request service1 operation1 invokedcomplex1complex2";

-        config.composite = "Test_ASM_0026.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java
deleted file mode 100644
index cbe3841832..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0027_TestCase, which tests that where a <component/> has 

- * 2 or more <property/> child elements that each <property/> element has a 

- * unique @name attribute value

- */

-public class ASM_0027_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0027";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0027.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0027

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java
deleted file mode 100644
index 86f73c02cf..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0028_TestCase, which tests a <component/> <property/> @name 

- * attribute matches the @name attribute of one of the <property/> elements of 

- * the <componentType/> of the <implementation/> of the <component/> 

- */

-public class ASM_0028_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0028";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0028.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0028

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java
deleted file mode 100644
index aa4cbd44d4..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java
+++ /dev/null
@@ -1,42 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0029_TestCase, which tests that where a <component/> <property/> 

- * has @many=false that there is only one <value/> child element of the <property/> 

- */

-public class ASM_0029_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0029";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0029.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0029

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java
deleted file mode 100644
index cc34a7f33b..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java
+++ /dev/null
@@ -1,42 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0030_TestCase, which tests that a <component/> <property/> 

- * with a @value attribute set does not have any <value/> child elements 

- */

-public class ASM_0030_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0030";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_0030.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0030

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.java
deleted file mode 100644
index d7d9904290..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.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.    

- */

-package client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0031_TestCase, which tests that where a <component/> <reference/> 

- * has its @target attribute set  to a valid service and the <composite/> also 

- * contains a <wire/> element with @source set to the <component/> <reference/> 

- * and @target set to a second valid service and has @replace=true, the <reference/> 

- * is wired to the second service only

- */

-public class ASM_0031_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0031";

-        config.input = "request";

-        config.output = "ASM_0031 request service1 operation1 invoked service3 operation1 invoked";

-        config.composite = "Test_ASM_0031.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0031

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0032_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0032_TestCase.java
deleted file mode 100644
index 97b952b139..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0032_TestCase.java
+++ /dev/null
@@ -1,46 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0032_TestCase, which tests where a <component/> <service/> 

- * has no <binding/> subelements and the corresponding <service/> element of 

- * the <componentType/> of the <component/> <implementation/> has one or more 

- * <binding/> subelements, the <component/> <service/> is made available with 

- * all the bindings declared on the <service/> element of the <componentType/>

- */

-public class ASM_0032_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0032";

-        config.input = "request";

-        config.output =

-            "ASM_0032 request service1 operation1 invoked service2 operation1 invokedservice2 operation1 invoked";

-        config.composite = "Test_ASM_0032.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0032

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0033_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0033_TestCase.java
deleted file mode 100644
index 87fa6cdde5..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0033_TestCase.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.    

- */

-package client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0033_TestCase, which tests that where a <component/> <service/> 

- * has no <binding/> subelements and the corresponding <service/> element of the 

- * <componentType/> of the <component/> <implementation/> has no <binding/> subelements, 

- * the <component/> <service/> is made available with binding.sca

- */

-public class ASM_0033_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0033";

-        config.input = "request";

-        config.output =

-            "ASM_0033 request service1 operation1 invoked service2 operation1 invokedservice2 operation1 invoked";

-        config.composite = "Test_ASM_0033.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0032

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0034_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0034_TestCase.java
deleted file mode 100644
index 69f4e55012..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0034_TestCase.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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_0034_TestCase, which tests that where a <component/> <service/> 

- * has 1 or more <binding/> subelements the <component/> <service/> is made 

- * available with all the bindings declared on the <service/> element

- */

-public class ASM_0034_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0034";

-        config.input = "request";

-        config.output =

-            "ASM_0034 request service1 operation1 invoked service2 operation1 invokedservice2 operation1 invoked";

-        config.composite = "Test_ASM_0034.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_0034

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6001_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6001_TestCase.java
deleted file mode 100644
index ba1666f2cb..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6001_TestCase.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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_6001_TestCase, which tests that where an SCA contribution 

- * contains two <composite/> elements with the same name and same 

- * targetNamespace that an SCA application using that composite does not run 

- * and that the SCA runtime reports an error

- */

-public class ASM_6001_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_6001";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_6001.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_6001

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6002_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6002_TestCase.java
deleted file mode 100644
index 7827b2dbda..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6002_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_6002_TestCase, which tests that where a <composite/> has 

- * multiple <service/>  subelements that the @name attributes are unique 

- * across those subelements

- */

-public class ASM_6002_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_6002";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_6002.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_6002

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6003_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6003_TestCase.java
deleted file mode 100644
index c6ebf7134f..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6003_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_6003_TestCase, which tests that where a <composite/> has a 

- * <service/> subelement that the @promote attribute identifies a <service/> 

- * of a <component/> in the <composite/>

- */

-public class ASM_6003_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_6003";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_6003.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_6003

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6004_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6004_TestCase.java
deleted file mode 100644
index 41e7e5719e..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6004_TestCase.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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_6004_TestCase, which tests that the <interface/> declared 

- * on a <service/> subelement of a <composite/> is a compatible subset of the 

- * <interface/> declared on the <component/> <service/> reference by the 

- * @promote attribute

- */

-public class ASM_6004_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_6004";

-        config.input = "request";

-        config.output = "ASM_6004 request service1 operation1 invoked";

-        config.composite = "Test_ASM_6004.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_6004

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6005_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6005_TestCase.java
deleted file mode 100644
index 46a76d351a..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6005_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_6005_TestCase, which tests that the the @name attribute 

- * of a <composite/> <reference/> element is unique amongst the @name 

- * attributes of all the <reference/> elements of that <composite/> 

- */

-public class ASM_6005_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_6005";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_6005.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_6004

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6006_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6006_TestCase.java
deleted file mode 100644
index 4fef884d1a..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6006_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_6006_TestCase, which tests that the @promote attribute of a 

- * <composite/> <reference/> contains one or more URIs that each point to a 

- * <reference/> of a <component/> in the <composite/> 

- */

-public class ASM_6006_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_6006";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_6006.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_6004

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6007_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6007_TestCase.java
deleted file mode 100644
index da23a732e8..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6007_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_6007_TestCase, which tests that a <composite/> <reference/> 

- * can declare an <interface/> that is a compatible superset of the <interface/> 

- * declared by each  <component/> <reference/> promoted by the composite reference  

- */

-public class ASM_6007_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_6007";

-        config.input = "request";

-        config.output = "ASM_6007 request service1 operation1 invoked service2 operation1 invoked";

-        config.composite = "Test_ASM_6007.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_6007

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6008_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6008_TestCase.java
deleted file mode 100644
index 54c85059bd..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6008_TestCase.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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_6008_TestCase, which tests that where a <composite/> <reference/> 

- * has no <interface/> subelement, and that <reference/> promotes 2 or more 

- * <component/> <reference/>s, that the <interface/> declared on each of the 

- * <component/> <reference/>s are the same  

- */

-public class ASM_6008_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_6008";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_6008.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_6008

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6009_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6009_TestCase.java
deleted file mode 100644
index eaff618911..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6009_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_6009_TestCase, which tests that a <component/> <reference/> 

- * with @multiplicity=0..1 can be promoted by a <composite/> <reference/> with 

- * @multiplicity=1..1  

- */

-public class ASM_6009_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_6009";

-        config.input = "request";

-        config.output = "ASM_6009 request service1 operation1 invokedservice2 operation1 invoked";

-        config.composite = "Test_ASM_6009.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_6009

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6010_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6010_TestCase.java
deleted file mode 100644
index e354e84787..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6010_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_6010_TestCase, which tests a <component/> <reference/> 

- * with @multiplicity=0..n can be promoted by a <composite/> <reference/> 

- * with @multiplicity=0..1  

- */

-public class ASM_6010_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_6010";

-        config.input = "request";

-        config.output = "ASM_6010 request service1 operation1 invoked service2 operation1 invoked";

-        config.composite = "Test_ASM_6010.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_6010

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6011_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6011_TestCase.java
deleted file mode 100644
index 35e0d93093..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6011_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_6011_TestCase, which tests that a <component/> <reference/> 

- * with @multiplicity=1..n can be promoted by a <composite/> <reference/> with 

- * @multiplicity=1..1  

- */

-public class ASM_6011_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_6011";

-        config.input = "request";

-        config.output = "ASM_6011 request service1 operation1 invoked service2 operation1 invoked";

-        config.composite = "Test_ASM_6011.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_6009

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6012_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6012_TestCase.java
deleted file mode 100644
index 60f35f399c..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6012_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_6009_TestCase, which tests that a <component/> <reference/> 

- * with @multiplicity=0..1 can be promoted by a <composite/> <reference/> with 

- * @multiplicity=1..1  

- */

-public class ASM_6012_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_6012";

-        config.input = "request";

-        config.output = "exception";

-        config.composite = "Test_ASM_6012.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_6012

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6013_TestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6013_TestCase.java
deleted file mode 100644
index c3b0642019..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6013_TestCase.java
+++ /dev/null
@@ -1,43 +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 client;

-

-import test.ASM_0002_Client;

-import testClient.TestInvocation;

-

-/**

- * Client for ASM_6009_TestCase, which tests that a <component/> <reference/> 

- * with @autowire=true is wired to a compatible <component/> <service/> in 

- * the same <composite/>  

- */

-public class ASM_6013_TestCase extends BaseJAXWSTestCase {

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_6013";

-        config.input = "request";

-        config.output = "ASM_6013 request service1 operation1 invoked third operation1 invoked";

-        config.composite = "Test_ASM_6013.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0002_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class Test_ASM_6013

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java
deleted file mode 100644
index bf2142b41d..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java
+++ /dev/null
@@ -1,159 +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 client;

-

-import static org.junit.Assert.assertEquals;

-

-import java.net.URL;

-

-import javax.xml.namespace.QName;

-import javax.xml.ws.Service;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.equinox.launcher.Contribution;

-import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper;

-import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import test.ASM_0001_Client;

-import testClient.TestException;

-import testClient.TestException_Exception;

-import testClient.TestInvocation;

-

-/**

- * A generic test client based on JAX-WS APIs

- */

-public class BaseJAXWSTestCase {

-

-    protected NodeLauncher launcher;

-    protected Node node;

-    protected TestConfiguration testConfiguration = getTestConfiguration();

-    static boolean proceed = true;

-

-    public static void main(String[] args) throws Exception {

-        BaseJAXWSTestCase test = new BaseJAXWSTestCase();

-        test.setUp();

-        test.tearDown();

-    }

-

-    @Before

-    public void setUp() throws Exception {

-        try {

-            startContribution();

-        } catch (Exception e) {

-            // If the SCA runtime refuses to start an invalid contribution, then this is also

-            // regarded as a successful outcome

-            System.out.println("Exception received - detail: " + e.getMessage());

-            assertEquals(testConfiguration.getExpectedOutput(), "exception");

-            System.out.println("Test " + testConfiguration.getTestName() + " completed successfully");

-            // Mark this test as not to proceed further

-            proceed = false;

-        } // end try

-    }

-

-    @After

-    public void tearDown() throws Exception {

-        stopContribution();

-    }

-

-    @Test

-    public void testDummy() throws Exception {

-        // If an exception were thrown during initialization, let's go no further

-        if (proceed == false)

-            return;

-

-        // System.out.println("Test " + testName + " starting");

-        String output = null;

-        try {

-            output = invokeTest(testConfiguration.getInput());

-

-        } catch (TestException_Exception e) {

-            TestException exceptionContent = e.getFaultInfo();

-            System.out.println("Service fault received - detail: " + exceptionContent.getMessage());

-            assertEquals(testConfiguration.getExpectedOutput(), "exception");

-            System.out.println("Test " + testConfiguration.getTestName() + " completed successfully");

-            return;

-        } catch (Throwable e) {

-            e.printStackTrace();

-            System.out.println("Exception received - detail: " + e.getMessage());

-            assertEquals(testConfiguration.getExpectedOutput(), "exception");

-            System.out.println("Test " + testConfiguration.getTestName() + " completed successfully");

-            return;

-        }

-        assertEquals(testConfiguration.getExpectedOutput(), output);

-        System.out.println("Test " + testConfiguration.getTestName() + " completed successfully");

-    }

-

-    public String invokeTest(String input) throws Exception {

-        //Web service invocation via JAXWS

-        QName serviceName = new QName("http://test/", "TestInvocationService");

-        URL wsdlLocation = this.getClass().getClassLoader().getResource("TestClient.wsdl");

-        javax.xml.ws.Service webService = Service.create(wsdlLocation, serviceName);

-        TestInvocation wsProxy = (TestInvocation)webService.getPort(testConfiguration.getServiceInterface());

-

-        String output = wsProxy.invokeTest(input);

-

-        return output;

-    } // end method invokeTest

-

-    protected <T> T getService(Class<T> interfaze, String serviceName) {

-        T service = node.getService(interfaze, serviceName);

-        return service;

-    } // end getService

-

-    protected void startContribution() throws Exception {

-        // Tuscany specific code which starts the contribution holding the test

-        launcher = NodeLauncher.newInstance();

-        node =

-            launcher.createNode(testConfiguration.getComposite(), new Contribution(testConfiguration.getTestName(),

-                                                                                   getContributionURI()));

-        System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader());

-        node.start();

-    } // end method startContribution

-

-    protected void stopContribution() throws Exception {

-        if (node != null) {

-            node.stop();

-            node.destroy();

-        }

-        if (launcher != null) {

-            launcher.destroy();

-        }

-    } // end method stopContribution

-

-    protected String getContributionURI() {

-        String location = ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass());

-        return location;

-    }

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0001";

-        config.input = "request";

-        config.output = config.testName + " " + config.input + " invoked ok";

-        config.composite = "Test_ASM_0101.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0001_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class BaseTest

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/BaseTestCase.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/BaseTestCase.java
deleted file mode 100644
index 739417e0d7..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/BaseTestCase.java
+++ /dev/null
@@ -1,122 +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 client;

-

-import static org.junit.Assert.assertEquals;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.equinox.launcher.Contribution;

-import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper;

-import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import test.ASM_0001_Client;

-import test.TestInvocation;

-

-/**

- * A generic test client based on Tuscany APIs

- */

-public class BaseTestCase {

-

-    protected NodeLauncher launcher;

-    protected Node node;

-    protected TestConfiguration testConfiguration = getTestConfiguration();

-

-    public static void main(String[] args) throws Exception {

-        BaseTestCase test = new BaseTestCase();

-        test.setUp();

-        test.tearDown();

-    }

-

-    @Before

-    public void setUp() throws Exception {

-        startContribution();

-    }

-

-    @After

-    public void tearDown() throws Exception {

-        stopContribution();

-    }

-

-    @Test

-    public void testDummy() throws Exception {

-        // System.out.println("Test " + testName + " starting");

-        try {

-            String output = invokeTest(testConfiguration.getInput());

-            assertEquals(testConfiguration.getExpectedOutput(), output);

-        } catch (Exception e) {

-            assertEquals(testConfiguration.getExpectedOutput(), "exception");

-            System.out.println("Expected exception - detail: " + e.getMessage());

-        }

-        System.out.println("Test " + testConfiguration.getTestName() + " completed successfully");

-    }

-

-    public String invokeTest(String input) throws Exception {

-

-        TestInvocation service =

-            (TestInvocation)getService(testConfiguration.getServiceInterface(), testConfiguration.getTestServiceName());

-

-        return service.invokeTest(input);

-    } // end method invokeTest

-

-    protected <T> T getService(Class<T> interfaze, String serviceName) {

-        T service = node.getService(interfaze, serviceName);

-        return service;

-    } // end getService

-

-    protected void startContribution() throws Exception {

-        // Tuscany specific code which starts the contribution holding the test

-        launcher = NodeLauncher.newInstance();

-        node =

-            launcher.createNode(testConfiguration.getComposite(), new Contribution(testConfiguration.getTestName(),

-                                                                                   getContributionURI()));

-        System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader());

-        node.start();

-    } // end method startContribution

-

-    protected void stopContribution() throws Exception {

-        if (node != null) {

-            node.stop();

-            node.destroy();

-        }

-        if (launcher != null) {

-            launcher.destroy();

-        }

-    } // end method stopContribution

-

-    protected String getContributionURI() {

-        String location = ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass());

-        return location;

-    }

-

-    protected TestConfiguration getTestConfiguration() {

-        TestConfiguration config = new TestConfiguration();

-        config.testName = "ASM_0001";

-        config.input = "request";

-        config.output = config.testName + " " + config.input + " invoked ok";

-        config.composite = "Test_ASM_0001.composite";

-        config.testServiceName = "TestClient";

-        config.testClass = ASM_0001_Client.class;

-        config.serviceInterface = TestInvocation.class;

-        return config;

-    }

-

-} // end class BaseTest

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/TestConfiguration.java b/java/sca-contrib/stest/sampleTest/src/test/java/client/TestConfiguration.java
deleted file mode 100644
index 99e9937bcb..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/TestConfiguration.java
+++ /dev/null
@@ -1,67 +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 client;

-

-/** 

- * A class to hold the metadata about the test

- * @author MikeEdwards

- *

- */

-class TestConfiguration {

-

-    public String testName;

-    public String input;

-    public String output;

-    public String composite;

-    public String testServiceName;

-    public Class<?> testClass; //TODO - does the client need this??

-    public Class<?> serviceInterface;

-

-    public TestConfiguration() {

-    }

-

-    public String getTestName() {

-        return testName;

-    }

-

-    public String getInput() {

-        return input;

-    }

-

-    public String getExpectedOutput() {

-        return output;

-    }

-

-    public String getComposite() {

-        return composite;

-    }

-

-    public String getTestServiceName() {

-        return testServiceName;

-    }

-

-    public Class<?> getTestClass() {

-        return testClass;

-    }

-

-    public Class<?> getServiceInterface() {

-        return serviceInterface;

-    }

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/InvokeTest.java b/java/sca-contrib/stest/sampleTest/src/test/java/testClient/InvokeTest.java
deleted file mode 100644
index 4b6011e2e3..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/InvokeTest.java
+++ /dev/null
@@ -1,79 +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 testClient;

-

-import javax.xml.bind.JAXBElement;

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlElementRef;

-import javax.xml.bind.annotation.XmlRootElement;

-import javax.xml.bind.annotation.XmlType;

-

-/**

- * <p>Java class for anonymous complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType>

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "", propOrder = {"arg0"})

-@XmlRootElement(name = "invokeTest")

-public class InvokeTest {

-

-    @XmlElementRef(name = "arg0", type = JAXBElement.class)

-    protected JAXBElement<String> arg0;

-

-    /**

-     * Gets the value of the arg0 property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link JAXBElement }{@code <}{@link String }{@code >}

-     *     

-     */

-    public JAXBElement<String> getArg0() {

-        return arg0;

-    }

-

-    /**

-     * Sets the value of the arg0 property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link JAXBElement }{@code <}{@link String }{@code >}

-     *     

-     */

-    public void setArg0(JAXBElement<String> value) {

-        this.arg0 = ((JAXBElement<String>)value);

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java b/java/sca-contrib/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java
deleted file mode 100644
index 934e13b744..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java
+++ /dev/null
@@ -1,79 +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 testClient;

-

-import javax.xml.bind.JAXBElement;

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlElementRef;

-import javax.xml.bind.annotation.XmlRootElement;

-import javax.xml.bind.annotation.XmlType;

-

-/**

- * <p>Java class for anonymous complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType>

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "", propOrder = {"_return"})

-@XmlRootElement(name = "invokeTestResponse")

-public class InvokeTestResponse {

-

-    @XmlElementRef(name = "return", type = JAXBElement.class)

-    protected JAXBElement<String> _return;

-

-    /**

-     * Gets the value of the return property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link JAXBElement }{@code <}{@link String }{@code >}

-     *     

-     */

-    public JAXBElement<String> getReturn() {

-        return _return;

-    }

-

-    /**

-     * Sets the value of the return property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link JAXBElement }{@code <}{@link String }{@code >}

-     *     

-     */

-    public void setReturn(JAXBElement<String> value) {

-        this._return = ((JAXBElement<String>)value);

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/ObjectFactory.java b/java/sca-contrib/stest/sampleTest/src/test/java/testClient/ObjectFactory.java
deleted file mode 100644
index 1cdc02c2d2..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/ObjectFactory.java
+++ /dev/null
@@ -1,105 +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 testClient;

-

-import javax.xml.bind.JAXBElement;

-import javax.xml.bind.annotation.XmlElementDecl;

-import javax.xml.bind.annotation.XmlRegistry;

-import javax.xml.namespace.QName;

-

-/**

- * This object contains factory methods for each 

- * Java content interface and Java element interface 

- * generated in the testClient package. 

- * <p>An ObjectFactory allows you to programatically 

- * construct new instances of the Java representation 

- * for XML content. The Java representation of XML 

- * content can consist of schema derived interfaces 

- * and classes representing the binding of schema 

- * type definitions, element declarations and model 

- * groups.  Factory methods for each of these are 

- * provided in this class.

- * 

- */

-@XmlRegistry

-public class ObjectFactory {

-

-    private final static QName _TestException_QNAME = new QName("http://test/", "TestException");

-    private final static QName _InvokeTestArg0_QNAME = new QName("", "arg0");

-    private final static QName _InvokeTestResponseReturn_QNAME = new QName("", "return");

-

-    /**

-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: testClient

-     * 

-     */

-    public ObjectFactory() {

-    }

-

-    /**

-     * Create an instance of {@link InvokeTest }

-     * 

-     */

-    public InvokeTest createInvokeTest() {

-        return new InvokeTest();

-    }

-

-    /**

-     * Create an instance of {@link InvokeTestResponse }

-     * 

-     */

-    public InvokeTestResponse createInvokeTestResponse() {

-        return new InvokeTestResponse();

-    }

-

-    /**

-     * Create an instance of {@link TestException }

-     * 

-     */

-    public TestException createTestException() {

-        return new TestException();

-    }

-

-    /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link TestException }{@code >}}

-     * 

-     */

-    @XmlElementDecl(namespace = "http://test/", name = "TestException")

-    public JAXBElement<TestException> createTestException(TestException value) {

-        return new JAXBElement<TestException>(_TestException_QNAME, TestException.class, null, value);

-    }

-

-    /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}

-     * 

-     */

-    @XmlElementDecl(namespace = "", name = "arg0", scope = InvokeTest.class)

-    public JAXBElement<String> createInvokeTestArg0(String value) {

-        return new JAXBElement<String>(_InvokeTestArg0_QNAME, String.class, InvokeTest.class, value);

-    }

-

-    /**

-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}

-     * 

-     */

-    @XmlElementDecl(namespace = "", name = "return", scope = InvokeTestResponse.class)

-    public JAXBElement<String> createInvokeTestResponseReturn(String value) {

-        return new JAXBElement<String>(_InvokeTestResponseReturn_QNAME, String.class, InvokeTestResponse.class, value);

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/README.txt b/java/sca-contrib/stest/sampleTest/src/test/java/testClient/README.txt
deleted file mode 100644
index d376ab955d..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/README.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-This README describes the JAX-WS client files for the SCA Assembly test invocation interface.

-

-The test invocation interface is in the TestInvocation.java interface file.

-This is presented as a Web service by the SCA runtime, for invocation by a general Web service client.

-The WSDL is captured in the file TestClient.wsdl in the resources directory for the testcases.

-

-The JAX-WS client files for invoking the Web service contained in TestClient.wsdl are contained in this

-package.  They are generated from the WSDL using the wsimport tool (a standard part of JDK 1.6.x):

-

-wsimport TestClient.wsdl -keep -p testClient

-

-"-keep" is used to ensure that the generated .java files are retained (otherwise all that is created are 

-the binary .class files).

-

-"-p testClient" is used to force the generated Java files to belong to the package "testClient" - this package

-name is used to keep a clean separation between the client files and the test service files

-

-

-Mike Edwards, 6th January 2009.
\ No newline at end of file
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestException.java b/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestException.java
deleted file mode 100644
index a400c1a362..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestException.java
+++ /dev/null
@@ -1,74 +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 testClient;

-

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlType;

-

-/**

- * <p>Java class for TestException complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="TestException">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "TestException", propOrder = {"message"})

-public class TestException {

-

-    protected String message;

-

-    /**

-     * Gets the value of the message property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getMessage() {

-        return message;

-    }

-

-    /**

-     * Sets the value of the message property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setMessage(String value) {

-        this.message = value;

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestException_Exception.java b/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestException_Exception.java
deleted file mode 100644
index 7e58b83da3..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestException_Exception.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 testClient;

-

-import javax.xml.ws.WebFault;

-

-/**

- * This class was generated by the JAX-WS RI.

- * JAX-WS RI 2.1.1 in JDK 6

- * Generated source version: 2.1

- * 

- */

-@WebFault(name = "TestException", targetNamespace = "http://test/")

-public class TestException_Exception extends Exception {

-

-    /**

-     * Java type that goes as soapenv:Fault detail element.

-     * 

-     */

-    private TestException faultInfo;

-

-    /**

-     * 

-     * @param message

-     * @param faultInfo

-     */

-    public TestException_Exception(String message, TestException faultInfo) {

-        super(message);

-        this.faultInfo = faultInfo;

-    }

-

-    /**

-     * 

-     * @param message

-     * @param faultInfo

-     * @param cause

-     */

-    public TestException_Exception(String message, TestException faultInfo, Throwable cause) {

-        super(message, cause);

-        this.faultInfo = faultInfo;

-    }

-

-    /**

-     * 

-     * @return

-     *     returns fault bean: testClient.TestException

-     */

-    public TestException getFaultInfo() {

-        return faultInfo;

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestInvocation.java b/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestInvocation.java
deleted file mode 100644
index e9b74e2ae4..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestInvocation.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 testClient;

-

-import javax.jws.WebMethod;

-import javax.jws.WebParam;

-import javax.jws.WebResult;

-import javax.jws.WebService;

-import javax.xml.bind.annotation.XmlSeeAlso;

-import javax.xml.ws.RequestWrapper;

-import javax.xml.ws.ResponseWrapper;

-

-/**

- * This class was generated by the JAX-WS RI.

- * JAX-WS RI 2.1.1 in JDK 6

- * Generated source version: 2.1

- * 

- */

-@WebService(name = "TestInvocation", targetNamespace = "http://test/")

-@XmlSeeAlso( {ObjectFactory.class})

-public interface TestInvocation {

-

-    /**

-     * 

-     * @param arg0

-     * @return

-     *     returns java.lang.String

-     * @throws TestException_Exception

-     */

-    @WebMethod

-    @WebResult(targetNamespace = "")

-    @RequestWrapper(localName = "invokeTest", targetNamespace = "http://test/", className = "testClient.InvokeTest")

-    @ResponseWrapper(localName = "invokeTestResponse", targetNamespace = "http://test/", className = "testClient.InvokeTestResponse")

-    public String invokeTest(@WebParam(name = "arg0", targetNamespace = "") String arg0) throws TestException_Exception;

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestInvocationService.java b/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestInvocationService.java
deleted file mode 100644
index b13e69087c..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestInvocationService.java
+++ /dev/null
@@ -1,83 +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 testClient;

-

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import javax.xml.namespace.QName;

-import javax.xml.ws.Service;

-import javax.xml.ws.WebEndpoint;

-import javax.xml.ws.WebServiceClient;

-import javax.xml.ws.WebServiceFeature;

-

-/**

- * This class was generated by the JAX-WS RI.

- * JAX-WS RI 2.1.1 in JDK 6

- * Generated source version: 2.1

- * 

- */

-@WebServiceClient(name = "TestInvocationService", targetNamespace = "http://test/", wsdlLocation = "file:/C:/temp/Tuscany_2_0_Work/TestClient.wsdl")

-public class TestInvocationService extends Service {

-

-    private final static URL TESTINVOCATIONSERVICE_WSDL_LOCATION;

-

-    static {

-        URL url = null;

-        try {

-            url = new URL("file:/C:/temp/Tuscany_2_0_Work/TestClient.wsdl");

-        } catch (MalformedURLException e) {

-            e.printStackTrace();

-        }

-        TESTINVOCATIONSERVICE_WSDL_LOCATION = url;

-    }

-

-    public TestInvocationService(URL wsdlLocation, QName serviceName) {

-        super(wsdlLocation, serviceName);

-    }

-

-    public TestInvocationService() {

-        super(TESTINVOCATIONSERVICE_WSDL_LOCATION, new QName("http://test/", "TestInvocationService"));

-    }

-

-    /**

-     * 

-     * @return

-     *     returns TestInvocation

-     */

-    @WebEndpoint(name = "TestInvocationPort")

-    public TestInvocation getTestInvocationPort() {

-        return (TestInvocation)super.getPort(new QName("http://test/", "TestInvocationPort"), TestInvocation.class);

-    }

-

-    /**

-     * 

-     * @param features

-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.

-     * @return

-     *     returns TestInvocation

-     */

-    @WebEndpoint(name = "TestInvocationPort")

-    public TestInvocation getTestInvocationPort(WebServiceFeature... features) {

-        return (TestInvocation)super.getPort(new QName("http://test/", "TestInvocationPort"),

-                                             TestInvocation.class,

-                                             features);

-    }

-

-}

diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/package-info.java b/java/sca-contrib/stest/sampleTest/src/test/java/testClient/package-info.java
deleted file mode 100644
index 847e70af9f..0000000000
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/package-info.java
+++ /dev/null
@@ -1,21 +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.    

- */

-@javax.xml.bind.annotation.XmlSchema(namespace = "http://test/")

-package testClient;

-

diff --git a/java/sca-contrib/tools/eclipse/features/core/LICENSE b/java/sca-contrib/tools/eclipse/features/core/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/eclipse/features/core/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/eclipse/features/core/META-INF/MANIFEST.MF b/java/sca-contrib/tools/eclipse/features/core/META-INF/MANIFEST.MF
deleted file mode 100644
index 63215d7c6f..0000000000
--- a/java/sca-contrib/tools/eclipse/features/core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Tools Core Feature

-Bundle-SymbolicName: org.apache.tuscany.sca.feature.core

-Bundle-Version: 1.4.0

-Bundle-Vendor: Apache Software Foundation

diff --git a/java/sca-contrib/tools/eclipse/features/core/NOTICE b/java/sca-contrib/tools/eclipse/features/core/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/tools/eclipse/features/core/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/tools/eclipse/features/core/build.properties b/java/sca-contrib/tools/eclipse/features/core/build.properties
deleted file mode 100644
index f36e15c5d3..0000000000
--- a/java/sca-contrib/tools/eclipse/features/core/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = feature.xml,\
-               NOTICE,\
-               LICENSE,\
-               META-INF/
-src.includes = .project,\
-               LICENSE,\
-               NOTICE,\
-               build.properties,\
-               feature.xml,\
-               META-INF/
diff --git a/java/sca-contrib/tools/eclipse/features/core/feature.xml b/java/sca-contrib/tools/eclipse/features/core/feature.xml
deleted file mode 100644
index 1a20ac1eb1..0000000000
--- a/java/sca-contrib/tools/eclipse/features/core/feature.xml
+++ /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.    
--->
-<feature
-      id="org.apache.tuscany.sca.feature.core"
-      label="Apache Tuscany SCA Core Eclipse Feature"
-      version="1.4.0"
-      provider-name="Apache Software Foundation">
-
-   <description url="http://incubator.apache.org/tuscany">
-      Apache Tuscany SCA Tools Core Feature.
-   </description>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.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 &quot;License&quot;); 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 &quot;AS IS&quot; 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.
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.jobs"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.ui.workbench"/>
-   </requires>
-
-   <plugin
-         id="org.apache.tuscany.sca.plugin.core"
-         download-size="0"
-         install-size="0"
-         version="1.4.0"/>
-
-</feature>
diff --git a/java/sca-contrib/tools/eclipse/features/core/pom.xml b/java/sca-contrib/tools/eclipse/features/core/pom.xml
deleted file mode 100644
index f2f273bb65..0000000000
--- a/java/sca-contrib/tools/eclipse/features/core/pom.xml
+++ /dev/null
@@ -1,57 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-eclipse-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>org.apache.tuscany.sca.feature.core</artifactId>

-    <name>Apache Tuscany SCA Core Eclipse Feature</name>

-

-    <build>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.*</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-

-       <plugins>

-           <plugin>

-               <groupId>org.apache.maven.plugins</groupId>

-               <artifactId>maven-jar-plugin</artifactId>

-               <configuration>

-                   <archive>

-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                   </archive>

-               </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/features/ejava/LICENSE b/java/sca-contrib/tools/eclipse/features/ejava/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/eclipse/features/ejava/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/eclipse/features/ejava/META-INF/MANIFEST.MF b/java/sca-contrib/tools/eclipse/features/ejava/META-INF/MANIFEST.MF
deleted file mode 100644
index f363ae7b2a..0000000000
--- a/java/sca-contrib/tools/eclipse/features/ejava/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA JEE Eclipse Feature

-Bundle-SymbolicName: org.apache.tuscany.sca.feature.ejava

-Bundle-Version: 1.4.0

-Bundle-Vendor: Apache Software Foundation

diff --git a/java/sca-contrib/tools/eclipse/features/ejava/NOTICE b/java/sca-contrib/tools/eclipse/features/ejava/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/tools/eclipse/features/ejava/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/tools/eclipse/features/ejava/build.properties b/java/sca-contrib/tools/eclipse/features/ejava/build.properties
deleted file mode 100644
index f36e15c5d3..0000000000
--- a/java/sca-contrib/tools/eclipse/features/ejava/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = feature.xml,\
-               NOTICE,\
-               LICENSE,\
-               META-INF/
-src.includes = .project,\
-               LICENSE,\
-               NOTICE,\
-               build.properties,\
-               feature.xml,\
-               META-INF/
diff --git a/java/sca-contrib/tools/eclipse/features/ejava/feature.xml b/java/sca-contrib/tools/eclipse/features/ejava/feature.xml
deleted file mode 100644
index ef2ab6c2ba..0000000000
--- a/java/sca-contrib/tools/eclipse/features/ejava/feature.xml
+++ /dev/null
@@ -1,63 +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.    
--->
-<feature
-      id="org.apache.tuscany.sca.feature.ejava"
-      label="Apache Tuscany SCA JEE Eclipse Feature"
-      version="1.4.0"
-      provider-name="Apache Software Foundation">
-
-   <description url="http://incubator.apache.org/tuscany">
-      Apache Tuscany SCA JEE Eclipse Feature.
-   </description>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.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 &quot;License&quot;); 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 &quot;AS IS&quot; 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.
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.jobs"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.apache.tuscany.sca.plugin.core"/>
-      <import plugin="org.eclipse.ui.workbench"/>
-      <import feature="org.apache.tuscany.sca.feature.core" version="1.4.0"/>
-   </requires>
-
-   <plugin
-         id="org.apache.tuscany.sca.plugin.ejava"
-         download-size="0"
-         install-size="0"
-         version="1.4.0"/>
-
-</feature>
diff --git a/java/sca-contrib/tools/eclipse/features/ejava/pom.xml b/java/sca-contrib/tools/eclipse/features/ejava/pom.xml
deleted file mode 100644
index 36fa3c4e47..0000000000
--- a/java/sca-contrib/tools/eclipse/features/ejava/pom.xml
+++ /dev/null
@@ -1,57 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-eclipse-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>org.apache.tuscany.sca.feature.ejava</artifactId>

-    <name>Apache Tuscany SCA JEE Eclipse Feature</name>

-

-    <build>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.*</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-

-       <plugins>

-           <plugin>

-               <groupId>org.apache.maven.plugins</groupId>

-               <artifactId>maven-jar-plugin</artifactId>

-               <configuration>

-                   <archive>

-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                   </archive>

-               </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/features/manager/LICENSE b/java/sca-contrib/tools/eclipse/features/manager/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/eclipse/features/manager/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/eclipse/features/manager/META-INF/MANIFEST.MF b/java/sca-contrib/tools/eclipse/features/manager/META-INF/MANIFEST.MF
deleted file mode 100644
index 8d8f5b271d..0000000000
--- a/java/sca-contrib/tools/eclipse/features/manager/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Domain Manager Eclipse Feature

-Bundle-SymbolicName: org.apache.tuscany.sca.feature.manager

-Bundle-Version: 1.4.0

-Bundle-Vendor: Apache Software Foundation

diff --git a/java/sca-contrib/tools/eclipse/features/manager/NOTICE b/java/sca-contrib/tools/eclipse/features/manager/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/tools/eclipse/features/manager/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/tools/eclipse/features/manager/build.properties b/java/sca-contrib/tools/eclipse/features/manager/build.properties
deleted file mode 100644
index f36e15c5d3..0000000000
--- a/java/sca-contrib/tools/eclipse/features/manager/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = feature.xml,\
-               NOTICE,\
-               LICENSE,\
-               META-INF/
-src.includes = .project,\
-               LICENSE,\
-               NOTICE,\
-               build.properties,\
-               feature.xml,\
-               META-INF/
diff --git a/java/sca-contrib/tools/eclipse/features/manager/feature.xml b/java/sca-contrib/tools/eclipse/features/manager/feature.xml
deleted file mode 100644
index 189342993d..0000000000
--- a/java/sca-contrib/tools/eclipse/features/manager/feature.xml
+++ /dev/null
@@ -1,67 +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.    
--->
-<feature
-      id="org.apache.tuscany.sca.feature.manager"
-      label="Apache Tuscany SCA Domain Manager Eclipse Feature"
-      version="1.4.0"
-      provider-name="Apache Software Foundation">
-
-   <description url="http://incubator.apache.org/tuscany">
-      Apache Tuscany SCA Domain Manager Eclipse Feature.
-   </description>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.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 &quot;License&quot;); 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 &quot;AS IS&quot; 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.
-   </license>
-
-   <includes
-         id="org.apache.tuscany.sca.feature.core"
-         version="1.4.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.jobs"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.apache.tuscany.sca.plugin.core"/>
-      <import plugin="org.eclipse.ui.workbench"/>
-      <import feature="org.apache.tuscany.sca.feature.core" version="1.4.0"/>
-   </requires>
-
-   <plugin
-         id="org.apache.tuscany.sca.plugin.manager"
-         download-size="0"
-         install-size="0"
-         version="1.4.0"/>
-
-</feature>
diff --git a/java/sca-contrib/tools/eclipse/features/manager/pom.xml b/java/sca-contrib/tools/eclipse/features/manager/pom.xml
deleted file mode 100644
index 520b252773..0000000000
--- a/java/sca-contrib/tools/eclipse/features/manager/pom.xml
+++ /dev/null
@@ -1,57 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-eclipse-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>org.apache.tuscany.sca.feature.manager</artifactId>

-    <name>Apache Tuscany SCA Domain Manager Eclipse Feature</name>

-

-    <build>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.*</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-

-       <plugins>

-           <plugin>

-               <groupId>org.apache.maven.plugins</groupId>

-               <artifactId>maven-jar-plugin</artifactId>

-               <configuration>

-                   <archive>

-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                   </archive>

-               </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/features/process/LICENSE b/java/sca-contrib/tools/eclipse/features/process/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/eclipse/features/process/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/eclipse/features/process/META-INF/MANIFEST.MF b/java/sca-contrib/tools/eclipse/features/process/META-INF/MANIFEST.MF
deleted file mode 100644
index 7f10d43405..0000000000
--- a/java/sca-contrib/tools/eclipse/features/process/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Process Eclipse Feature

-Bundle-SymbolicName: org.apache.tuscany.sca.feature.process

-Bundle-Version: 1.4.0

-Bundle-Vendor: Apache Software Foundation

diff --git a/java/sca-contrib/tools/eclipse/features/process/NOTICE b/java/sca-contrib/tools/eclipse/features/process/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/tools/eclipse/features/process/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/tools/eclipse/features/process/build.properties b/java/sca-contrib/tools/eclipse/features/process/build.properties
deleted file mode 100644
index f36e15c5d3..0000000000
--- a/java/sca-contrib/tools/eclipse/features/process/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = feature.xml,\
-               NOTICE,\
-               LICENSE,\
-               META-INF/
-src.includes = .project,\
-               LICENSE,\
-               NOTICE,\
-               build.properties,\
-               feature.xml,\
-               META-INF/
diff --git a/java/sca-contrib/tools/eclipse/features/process/feature.xml b/java/sca-contrib/tools/eclipse/features/process/feature.xml
deleted file mode 100644
index 08332be61e..0000000000
--- a/java/sca-contrib/tools/eclipse/features/process/feature.xml
+++ /dev/null
@@ -1,67 +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.    
--->
-<feature
-      id="org.apache.tuscany.sca.feature.process"
-      label="Apache Tuscany SCA Process Eclipse Feature"
-      version="1.4.0"
-      provider-name="Apache Software Foundation">
-
-   <description url="http://incubator.apache.org/tuscany">
-      Apache Tuscany SCA Process Eclipse Feature.
-   </description>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.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 &quot;License&quot;); 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 &quot;AS IS&quot; 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.
-   </license>
-
-   <includes
-         id="org.apache.tuscany.sca.feature.core"
-         version="1.4.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.jobs"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.apache.tuscany.sca.plugin.core"/>
-      <import plugin="org.eclipse.ui.workbench"/>
-      <import feature="org.apache.tuscany.sca.feature.core" version="1.4.0"/>
-   </requires>
-
-   <plugin
-         id="org.apache.tuscany.sca.plugin.process"
-         download-size="0"
-         install-size="0"
-         version="1.4.0"/>
-
-</feature>
diff --git a/java/sca-contrib/tools/eclipse/features/process/pom.xml b/java/sca-contrib/tools/eclipse/features/process/pom.xml
deleted file mode 100644
index cb09cf3cd4..0000000000
--- a/java/sca-contrib/tools/eclipse/features/process/pom.xml
+++ /dev/null
@@ -1,57 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-eclipse-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>org.apache.tuscany.sca.feature.process</artifactId>

-    <name>Apache Tuscany SCA Process Eclipse Feature</name>

-

-    <build>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.*</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-

-       <plugins>

-           <plugin>

-               <groupId>org.apache.maven.plugins</groupId>

-               <artifactId>maven-jar-plugin</artifactId>

-               <configuration>

-                   <archive>

-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                   </archive>

-               </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/features/web20/LICENSE b/java/sca-contrib/tools/eclipse/features/web20/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/eclipse/features/web20/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/eclipse/features/web20/META-INF/MANIFEST.MF b/java/sca-contrib/tools/eclipse/features/web20/META-INF/MANIFEST.MF
deleted file mode 100644
index 2dc129ebaa..0000000000
--- a/java/sca-contrib/tools/eclipse/features/web20/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Web 2.0 Eclipse Feature

-Bundle-SymbolicName: org.apache.tuscany.sca.feature.web20

-Bundle-Version: 1.4.0

-Bundle-Vendor: Apache Software Foundation

diff --git a/java/sca-contrib/tools/eclipse/features/web20/NOTICE b/java/sca-contrib/tools/eclipse/features/web20/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/tools/eclipse/features/web20/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/tools/eclipse/features/web20/build.properties b/java/sca-contrib/tools/eclipse/features/web20/build.properties
deleted file mode 100644
index f36e15c5d3..0000000000
--- a/java/sca-contrib/tools/eclipse/features/web20/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = feature.xml,\
-               NOTICE,\
-               LICENSE,\
-               META-INF/
-src.includes = .project,\
-               LICENSE,\
-               NOTICE,\
-               build.properties,\
-               feature.xml,\
-               META-INF/
diff --git a/java/sca-contrib/tools/eclipse/features/web20/feature.xml b/java/sca-contrib/tools/eclipse/features/web20/feature.xml
deleted file mode 100644
index 8fe97d24a3..0000000000
--- a/java/sca-contrib/tools/eclipse/features/web20/feature.xml
+++ /dev/null
@@ -1,67 +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.    
--->
-<feature
-      id="org.apache.tuscany.sca.feature.web20"
-      label="Apache Tuscany SCA Web 2.0 Eclipse Feature"
-      version="1.4.0"
-      provider-name="Apache Software Foundation">
-
-   <description url="http://incubator.apache.org/tuscany">
-      Apache Tuscany SCA Web 2.0 Eclipse Feature.
-   </description>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.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 &quot;License&quot;); 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 &quot;AS IS&quot; 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.
-   </license>
-
-   <includes
-         id="org.apache.tuscany.sca.feature.core"
-         version="1.4.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.jobs"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.apache.tuscany.sca.plugin.core"/>
-      <import plugin="org.eclipse.ui.workbench"/>
-      <import feature="org.apache.tuscany.sca.feature.core" version="1.4.0"/>
-   </requires>
-
-   <plugin
-         id="org.apache.tuscany.sca.plugin.web20"
-         download-size="0"
-         install-size="0"
-         version="1.4.0"/>
-
-</feature>
diff --git a/java/sca-contrib/tools/eclipse/features/web20/pom.xml b/java/sca-contrib/tools/eclipse/features/web20/pom.xml
deleted file mode 100644
index 3045db912f..0000000000
--- a/java/sca-contrib/tools/eclipse/features/web20/pom.xml
+++ /dev/null
@@ -1,57 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-eclipse-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>org.apache.tuscany.sca.feature.web20</artifactId>

-    <name>Apache Tuscany SCA Web 2.0 Eclipse Feature</name>

-

-    <build>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.*</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-

-       <plugins>

-           <plugin>

-               <groupId>org.apache.maven.plugins</groupId>

-               <artifactId>maven-jar-plugin</artifactId>

-               <configuration>

-                   <archive>

-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                   </archive>

-               </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/features/webservice/LICENSE b/java/sca-contrib/tools/eclipse/features/webservice/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/eclipse/features/webservice/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/eclipse/features/webservice/META-INF/MANIFEST.MF b/java/sca-contrib/tools/eclipse/features/webservice/META-INF/MANIFEST.MF
deleted file mode 100644
index 9fb9f1282b..0000000000
--- a/java/sca-contrib/tools/eclipse/features/webservice/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Web Service Eclipse Feature

-Bundle-SymbolicName: org.apache.tuscany.sca.feature.webservice

-Bundle-Version: 1.4.0

-Bundle-Vendor: Apache Software Foundation

diff --git a/java/sca-contrib/tools/eclipse/features/webservice/NOTICE b/java/sca-contrib/tools/eclipse/features/webservice/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/tools/eclipse/features/webservice/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/tools/eclipse/features/webservice/build.properties b/java/sca-contrib/tools/eclipse/features/webservice/build.properties
deleted file mode 100644
index f36e15c5d3..0000000000
--- a/java/sca-contrib/tools/eclipse/features/webservice/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = feature.xml,\
-               NOTICE,\
-               LICENSE,\
-               META-INF/
-src.includes = .project,\
-               LICENSE,\
-               NOTICE,\
-               build.properties,\
-               feature.xml,\
-               META-INF/
diff --git a/java/sca-contrib/tools/eclipse/features/webservice/feature.xml b/java/sca-contrib/tools/eclipse/features/webservice/feature.xml
deleted file mode 100644
index d905b6475c..0000000000
--- a/java/sca-contrib/tools/eclipse/features/webservice/feature.xml
+++ /dev/null
@@ -1,67 +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.    
--->
-<feature
-      id="org.apache.tuscany.sca.feature.webservice"
-      label="Apache Tuscany SCA Web Service Eclipse Feature"
-      version="1.4.0"
-      provider-name="Apache Software Foundation">
-
-   <description url="http://incubator.apache.org/tuscany">
-      Apache Tuscany SCA Web Service Eclipse Feature.
-   </description>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.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 &quot;License&quot;); 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 &quot;AS IS&quot; 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.
-   </license>
-
-   <includes
-         id="org.apache.tuscany.sca.feature.core"
-         version="1.4.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.jobs"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.apache.tuscany.sca.plugin.core"/>
-      <import plugin="org.eclipse.ui.workbench"/>
-      <import feature="org.apache.tuscany.sca.feature.core" version="1.4.0"/>
-   </requires>
-
-   <plugin
-         id="org.apache.tuscany.sca.plugin.webservice"
-         download-size="0"
-         install-size="0"
-         version="1.4.0"/>
-
-</feature>
diff --git a/java/sca-contrib/tools/eclipse/features/webservice/pom.xml b/java/sca-contrib/tools/eclipse/features/webservice/pom.xml
deleted file mode 100644
index 0929fef267..0000000000
--- a/java/sca-contrib/tools/eclipse/features/webservice/pom.xml
+++ /dev/null
@@ -1,57 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-eclipse-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>org.apache.tuscany.sca.feature.webservice</artifactId>

-    <name>Apache Tuscany SCA Web Service Eclipse Feature</name>

-

-    <build>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.*</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-

-       <plugins>

-           <plugin>

-               <groupId>org.apache.maven.plugins</groupId>

-               <artifactId>maven-jar-plugin</artifactId>

-               <configuration>

-                   <archive>

-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                   </archive>

-               </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/plugins/core/LICENSE b/java/sca-contrib/tools/eclipse/plugins/core/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/META-INF/MANIFEST.MF b/java/sca-contrib/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
deleted file mode 100644
index 0d8b1053bf..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Core Eclipse Plugin

-Bundle-SymbolicName: org.apache.tuscany.sca.plugin.core;singleton:=true

-Bundle-Version: 1.4.0

-Import-Package: org.eclipse.core.resources,

- org.eclipse.core.runtime,

- org.eclipse.core.runtime.jobs,

- org.eclipse.debug.core,

- org.eclipse.debug.core.model,

- org.eclipse.debug.ui,

- org.eclipse.debug.ui.sourcelookup,

- org.eclipse.jdt.core,

- org.eclipse.jdt.debug.ui.launchConfigurations,

- org.eclipse.jdt.launching,

- org.eclipse.jdt.ui.wizards,

- org.eclipse.jface.dialogs,

- org.eclipse.jface.operation,

- org.eclipse.jface.resource,

- org.eclipse.jface.viewers,

- org.eclipse.jface.wizard,

- org.eclipse.osgi.service.datalocation;version="1.0.0",

- org.eclipse.swt,

- org.eclipse.swt.graphics,

- org.eclipse.swt.widgets,

- org.eclipse.ui,

- org.eclipse.ui.progress,

- org.osgi.framework;version="1.3.0"

-Bundle-Vendor: Apache Software Foundation

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.ui.ide

-Export-Package: org.apache.tuscany.sca.plugin.core.classpath

diff --git a/java/sca-contrib/tools/eclipse/plugins/core/NOTICE b/java/sca-contrib/tools/eclipse/plugins/core/NOTICE
deleted file mode 100644
index 8591680386..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/build.properties b/java/sca-contrib/tools/eclipse/plugins/core/build.properties
deleted file mode 100644
index c402b2eb45..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               xsd/,\
-               icons/,\
-               .,\
-               LICENSE,\
-               NOTICE,\
-               org/
-src.includes = xsd/,\
-               plugin.xml,\
-               .classpath,\
-               .project,\
-               LICENSE,\
-               META-INF/,\
-               NOTICE,\
-               build.properties,\
-               icons/,\
-               .settings/,\
-               org/,\
-               pom.xml
-jars.compile.order = .
-source.. = .
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd b/java/sca-contrib/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
deleted file mode 100644
index 6b6d79d45b..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.apache.tuscany.sca.plugin.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.apache.tuscany.sca.plugin.core" id="runtimeClasspathContainerInitializer" name="Tuscany Runtime Classpath Container Initializers"/>
-      </appinfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="runtimeClasspathContainerInitializer">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.jdt.core.IClasspathContainer"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="apiInfo"/>
-      </appinfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="implementation"/>
-      </appinfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/icons/t.gif b/java/sca-contrib/tools/eclipse/plugins/core/icons/t.gif
deleted file mode 100644
index ba896ced08..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/icons/t.gif
+++ /dev/null
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/icons/tuscany.gif b/java/sca-contrib/tools/eclipse/plugins/core/icons/tuscany.gif
deleted file mode 100644
index 849dd76d4a..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/icons/tuscany.gif
+++ /dev/null
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
deleted file mode 100644
index ee9a3d2de9..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
+++ /dev/null
@@ -1,253 +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.plugin.core.classpath;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.osgi.framework.Bundle;
-
-/**
- * A base classpath container implementation.
- * 
- * @version $Rev$ $Date$
- */
-public class BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    private String pluginID;
-    private String libraryID;
-    private String libraryName;
-    private String distributionName;
-    private String sourceDistributionName;
-    private String distributionVersion;
-    private String homeProperty;
-    private String sourceProperty;
-    
-    /**
-     * Constructs a new Classpath container.
-     * 
-     * @param pluginID
-     * @param libraryID
-     * @param libraryName
-     * @param distributionName
-     * @param distributionVersion
-     * @param homeProperty
-     * @param sourceProperty
-     */
-    public BaseClasspathContainer(String pluginID, String libraryID, String libraryName,
-                                  String distributionName, String sourceDistributionName, String distributionVersion,
-                                  String homeProperty, String sourceProperty) {
-        this.pluginID = pluginID;
-        this.libraryID = libraryID;
-        this.libraryName = libraryName;
-        this.distributionName = distributionName;
-        this.sourceDistributionName = sourceDistributionName;
-        this.distributionVersion = distributionVersion;
-        this.homeProperty = homeProperty;
-        this.sourceProperty = sourceProperty;
-    }
-
-    public IClasspathEntry[] getClasspathEntries() {
-        List<IClasspathEntry> list = new ArrayList<IClasspathEntry>();
-        
-        // Get the runtime distribution location
-        IPath runtimePath = runtimePath();
-        
-        // Get the source distribution location
-        IPath sourcePath = sourcePath();
-        
-        // Add the JARs from runtime/lib and runtime/modules as classpath entries
-        if (runtimePath != null) {
-            
-            // Add the jars from runtime/modules
-            File modulesDirectory = runtimePath.append("modules").toFile();
-            if (modulesDirectory != null && modulesDirectory.exists()) {
-                for (File file : modulesDirectory.listFiles()) {
-                    IPath path = new Path(file.getPath());
-                    String name = path.lastSegment();
-                    String extension = path.getFileExtension();
-                    
-                    // Only include API and launcher JARs
-                    if (!"jar".equals(extension)) {
-                        continue;
-                    }
-                    if (name.indexOf("-api-") == -1 && name.indexOf("-launcher-") == -1) {
-                        continue;
-                    }
-
-                    list.add(JavaCore.newLibraryEntry(path, sourcePath, null));
-                }
-            }
-
-            // Add the jars from runtime/lib
-            File libDirectory = runtimePath.append("lib").toFile();
-            if (libDirectory != null && libDirectory.exists()) {
-                for (File file : libDirectory.listFiles()) {
-                    IPath path = new Path(file.getPath());
-                    String name = path.lastSegment();
-                    String extension = path.getFileExtension();
-                    
-                    // Only include jaxb, jaxws and jsr API JARs
-                    if (!"jar".equals(extension)) {
-                        continue;
-                    }
-                    if (name.indexOf("-api-") != -1) {
-                        if (name.startsWith("jaxb") || name.startsWith("jaxws") || name.startsWith("jsr")) {
-                            list.add(JavaCore.newLibraryEntry(path, sourcePath, null));
-                        }
-                    }
-                }
-            }
-        }
-        
-        return (IClasspathEntry[])list.toArray(new IClasspathEntry[list.size()]);
-    }
-
-    public IClasspathEntry[] getRuntimeClasspathEntries() {
-        
-        // Get the runtime distribution location
-        IPath runtimePath = runtimePath();
-
-        if (runtimePath != null) {
-            return new IClasspathEntry[] {JavaCore.newLibraryEntry(runtimePath, null, null)};
-        } else {
-            return new IClasspathEntry[0];
-        }
-    }
-
-    public String getDescription() {
-        return libraryName;
-    }
-
-    public int getKind() {
-        return IClasspathContainer.K_APPLICATION;
-    }
-
-    public IPath getPath() {
-        return new Path(libraryID);
-    }
-
-    /**
-     * Returns the location of the runtime distribution.
-     * 
-     * @return
-     */
-    private IPath runtimePath() {
-        IPath path = artifactLocation(pluginID, distributionName, distributionVersion, null, null);
-        
-        if (path == null) {
-            
-            // Try to get the location of the distribution from
-            // the HOME property or environment variable
-            String home = System.getProperty(homeProperty);
-            if (home == null || home.length() == 0) {
-                home = System.getenv(homeProperty);
-            }
-            if (home != null && home.length() != 0) {
-                if (new File(home).exists()) {
-                    path = new Path(home);
-                }
-            }
-        }
-        return path;
-    }
-    
-    /**
-     * Returns the location of the source distribution.
-     * 
-     * @return
-     */
-    private IPath sourcePath() {
-        IPath path = artifactLocation(pluginID, sourceDistributionName, distributionVersion, "src", ".zip");
-
-        if (path == null) {
-            
-            // Try to get the location of the source distribution from
-            // the SRC property or environment variable
-            String source = System.getProperty(sourceProperty);
-            if (source == null || source.length() == 0) {
-                source = System.getenv(sourceProperty);
-            }
-            if (source != null && source.length() != 0) {
-                if (new File(source).exists()) {
-                    path = new Path(source);
-                }
-            }
-        }
-        return path;
-    }
-
-    /**
-     * Returns the location of the specified artifact.
-     *  
-     * @param pluginId
-     * @param artifactId
-     * @param version
-     * @param classifier
-     * @param extension
-     * @return
-     */
-    private IPath artifactLocation(String pluginId, String artifactId, String version, String classifier, String extension) {
-        String artifactName;
-        if (classifier != null) {
-            artifactName = artifactId + '-' + version + '-' + classifier; 
-        } else {
-            artifactName = artifactId + '-' + version; 
-        }
-        if (extension != null) {
-            artifactName += extension;
-        }
-        try {
-            Bundle bundle = Platform.getBundle(pluginId);
-            URL location = FileLocator.find(bundle, new Path(artifactName), null);
-            location = FileLocator.toFileURL(location);
-            IPath path = new Path(new File(location.toURI()).getPath());
-            return path;
-        } catch (Exception e) {
-            error("Artifact not found: " + artifactName, e);
-            return null;
-        }
-    }
-
-    /**
-     * Log an error.
-     * 
-     * @param msg
-     * @param e
-     */
-    private void error(String msg, Exception e) {
-        Platform.getLog(
-                        Platform.getBundle(pluginID)).log(
-                        new Status(IStatus.ERROR, pluginID, IStatus.OK, msg, e));
-    }
-
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
deleted file mode 100644
index 7ea8d700f7..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
+++ /dev/null
@@ -1,77 +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.plugin.core.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * A base classpath container implementation.
- *
- * @version $Rev$ $Date$
- */
-public class BaseClasspathContainerInitializer extends ClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    private RuntimeClasspathContainer container;
-    
-    public BaseClasspathContainerInitializer(RuntimeClasspathContainer container) {
-        this.container = container;
-    }
-
-    @Override
-    public void initialize(IPath containerPath, IJavaProject project) throws CoreException {
-        JavaCore.setClasspathContainer(containerPath,
-                                       new IJavaProject[] {project},
-                                       new IClasspathContainer[] {container},
-                                       null);
-    }
-
-    @Override
-    public boolean canUpdateClasspathContainer(IPath containerPath, IJavaProject project) {
-        return true;
-    }
-    
-    public IClasspathContainer getRuntimeClasspathContainer() {
-        return new IClasspathContainer() {
-            public IClasspathEntry[] getClasspathEntries() {
-                return container.getRuntimeClasspathEntries();
-            }
-            
-            public String getDescription() {
-                return container.getDescription();
-            }
-            
-            public int getKind() {
-                return container.getKind();
-            }
-            
-            public IPath getPath() {
-                return container.getPath();
-            }
-        };
-    }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
deleted file mode 100644
index 70e794d2ce..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
+++ /dev/null
@@ -1,74 +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.plugin.core.classpath;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * A base classpath container page implementation.
- *
- * @version $Rev$ $Date$
- */
-public class BaseLibraryEntryPage extends WizardPage implements IClasspathContainerPage {
-
-    private String name;
-    private String id;
-    private IClasspathEntry classpathEntry;
-
-    public BaseLibraryEntryPage(String id, String name) {
-        super(name);
-        this.name = name;
-        this.id = id;
-    }
-
-    public void createControl(Composite parent) {
-        setTitle(name);
-
-        Label label = new Label(parent, SWT.NONE);
-        label.setText("Press Finish to add the library.");
-        label.setFont(parent.getFont());
-
-        setControl(label);
-    }
-
-    public boolean finish() {
-        classpathEntry = JavaCore.newContainerEntry(new Path(id));
-        return true;
-    }
-
-    public boolean isPageComplete() {
-        return true;
-    }
-
-    public IClasspathEntry getSelection() {
-        return classpathEntry;
-    }
-
-    public void setSelection(IClasspathEntry containerEntry) {
-        this.classpathEntry = containerEntry;
-    }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
deleted file mode 100644
index 53a8f8b32f..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
+++ /dev/null
@@ -1,39 +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.plugin.core.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-
-
-/**
- * A classpath container for the core runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class CoreClasspathContainer extends BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    public CoreClasspathContainer() {
-        super("org.apache.tuscany.sca.plugin.core",
-              "org.apache.tuscany.sca.plugin.core.runtime.library", "Tuscany SCA Core Library", 
-              "tuscany-sca", "tuscany-distribution-core", "1.4-EQUINOX-SNAPSHOT",
-              "TUSCANY_HOME", "TUSCANY_SRC");
-    }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
deleted file mode 100644
index 883c7c0781..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
+++ /dev/null
@@ -1,38 +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.plugin.core.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.core.classpath.CoreClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-
-
-/**
- * A classpath container initializer for the core runtime.
- *
- * @version $Rev$ $Date$
- */
-public class CoreClasspathContainerInitializer extends BaseClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    public CoreClasspathContainerInitializer() {
-        super(new CoreClasspathContainer());
-    }
-
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
deleted file mode 100644
index f90483a00d..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.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 org.apache.tuscany.sca.plugin.core.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseLibraryEntryPage;
-
-
-/**
- * A classpath container page for the core runtime library.
- *
- * @version $Rev$ $Date$
- */
-public class CoreLibraryEntryPage extends BaseLibraryEntryPage {
-
-    public CoreLibraryEntryPage() {
-        super("org.apache.tuscany.sca.plugin.core.runtime.library", "Tuscany SCA Core Library");
-    }
-
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
deleted file mode 100644
index 4830268272..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
+++ /dev/null
@@ -1,40 +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.plugin.core.classpath;
-
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-
-/**
- * A provider of a classpath container for use when launching the Tuscany
- * runtime.
- *
- * @version $Rev: $ $Date: $
- */
-public interface RuntimeClasspathContainer extends IClasspathContainer {
-
-    /**
-     * Returns the classpath entries to use at runtime.
-     * 
-     * @return
-     */
-    IClasspathEntry[] getRuntimeClasspathEntries();
-        
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
deleted file mode 100644
index 18850d9333..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
+++ /dev/null
@@ -1,39 +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.plugin.core.classpath;
-
-import org.eclipse.jdt.core.IClasspathContainer;
-
-/**
- * A provider of a classpath container for use when launching the Tuscany
- * runtime.
- *
- * @version $Rev: $ $Date: $
- */
-public interface RuntimeClasspathContainerInitializer {
-
-    /**
-     * Returns the classpath container to use.
-     * 
-     * @return
-     */
-    IClasspathContainer getRuntimeClasspathContainer();
-        
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
deleted file mode 100644
index 909290859a..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
+++ /dev/null
@@ -1,74 +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.plugin.core.classpath;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.List;

-

-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExtension;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.jdt.core.IClasspathContainer;

-import org.eclipse.jdt.core.IClasspathEntry;

-

-/**

- * Utility functions to help list extensions registered in the runtime classpath

- * extension point.

- *

- * @version $Rev: $ $Date: $

- */

-public class RuntimeClasspathContainerInitializerExtensionPoint {

-

-    private static final String EXTENSION_POINT_ID = "org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer";

-

-    /**

-     * Return the installed runtime classpath entries.

-     * 

-     * @return

-     * @throws CoreException

-     */

-    public static String installedRuntimeClasspath() throws CoreException {

-        

-        List<IClasspathEntry> classpathEntries = new ArrayList<IClasspathEntry>(); 

-        for (IExtension extension: Platform.getExtensionRegistry().getExtensionPoint(EXTENSION_POINT_ID).getExtensions()) {

-            for (IConfigurationElement configuration: extension.getConfigurationElements()) {

-                RuntimeClasspathContainerInitializer initializer = (RuntimeClasspathContainerInitializer)configuration.createExecutableExtension("class");

-                IClasspathContainer container = initializer.getRuntimeClasspathContainer();

-                classpathEntries.addAll(Arrays.asList(container.getClasspathEntries()));

-            }

-        }

-        

-        String separator = System.getProperty("path.separator");

-        StringBuffer classpath = new StringBuffer();

-        for (int i = 0, n = classpathEntries.size(); i < n; i++) {

-            IClasspathEntry entry = classpathEntries.get(i);

-            if (i >0) {

-                classpath.append(separator);

-            }

-            classpath.append(entry.getPath().toFile().toURI().getPath());

-        }

-        

-        return classpath.toString();

-    }

-

-}

diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
deleted file mode 100644
index 060f6ff6cb..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
+++ /dev/null
@@ -1,255 +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.plugin.core.launch;
-
-import static org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchConfigurationDelegate.TUSCANY_LAUNCH_CONFIGURATIONTYPE;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.plugin.core.classpath.CoreClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializerExtensionPoint;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * Provides utility methods to launch the SCA Domain Manager.
- *
- * @version $Rev: $ $Date: $
- */
-public class DomainManagerLauncherUtil {
-    
-    private static final String TUSCANY_DOMAIN_LAUNCH_CONFIGURATION = "SCA Domain Manager";
-    private static final String TUSCANY_SCA_DOMAIN_PROJECT = "tuscany-sca-domain";
-
-    private static final String PING_HEADER =
-        "GET /ping HTTP/1.0\n" + "Host: localhost\n"
-            + "Content-Type: text/xml\n"
-            + "Connection: close\n"
-            + "Content-Length: ";
-    private static final String PING_CONTENT = "";
-    private static final String PING =
-        PING_HEADER + PING_CONTENT.getBytes().length + "\n\n" + PING_CONTENT;
-    
-    /**
-     * Returns the SCA domain project.
-     * 
-     * @return
-     * @throws CoreException
-     */
-    static IProject domainProject(IProgressMonitor progressMonitor) throws CoreException {
-        
-        IProject domainProject = ResourcesPlugin.getWorkspace().getRoot().getProject(TUSCANY_SCA_DOMAIN_PROJECT);
-        if (progressMonitor.isCanceled()) {
-            return domainProject;
-        }
-        if (!domainProject.exists()) {
-            progressMonitor.subTask("Creating SCA domain resources");
-            
-            // Create SCA domain project if necessary 
-            domainProject.create(new SubProgressMonitor(progressMonitor, 5));
-            domainProject.open(new SubProgressMonitor(progressMonitor, 5));
-            
-            String html = "<html>\n" +
-                "<head>\n" +
-                "<meta http-equiv=\"refresh\" content=\"0;url=http://localhost:9990/ui/home\">\n" +
-                "</head>\n" +
-                "<body>\n" +
-                "<a href=\"http://localhost:9990/ui/home\">SCA Domain</a>\n" +
-                "</body>\n" +
-                "</html>"; 
-            
-            IFile file = domainProject.getFile(new Path("domain.html"));
-            file.create(new ByteArrayInputStream(html.getBytes()), true, new SubProgressMonitor(progressMonitor, 5));
-            
-            IProjectDescription description = domainProject.getDescription();
-            String[] prevNatures= description.getNatureIds();
-            String[] newNatures= new String[prevNatures.length + 1];
-            System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-            newNatures[prevNatures.length]= JavaCore.NATURE_ID;
-            description.setNatureIds(newNatures);
-            domainProject.setDescription(description, new SubProgressMonitor(progressMonitor, 5));
-            
-            IJavaProject javaProject = JavaCore.create(domainProject);
-            javaProject.setOutputLocation(domainProject.getFullPath(), new SubProgressMonitor(progressMonitor, 5));
-            
-            IClasspathEntry classPath = JavaCore.newContainerEntry(new CoreClasspathContainer().getPath());
-            IClasspathEntry jrePath = JavaRuntime.getDefaultJREContainerEntry();
-            javaProject.setRawClasspath(new IClasspathEntry[] {jrePath, classPath}, new SubProgressMonitor(progressMonitor, 5));
-        
-        } else {
-            domainProject.open(new SubProgressMonitor(progressMonitor, 5));
-        }
-        
-        return domainProject;
-    }
-
-    /**
-     * Returns true if the SCA domain controller is running.
-     * 
-     * @return
-     */
-    private static boolean isDomainManagerRunning() {
-        try {
-            Socket client = new Socket("localhost", 9990);
-            OutputStream os = client.getOutputStream();
-            os.write(DomainManagerLauncherUtil.PING.getBytes());
-            os.flush();
-            String response = DomainManagerLauncherUtil.read(client);
-            if (response.indexOf("<span id=\"ping\">") != -1) {
-                return true;
-            } else {
-                return false;
-            }
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    /**
-     * Wait for domain to be running.
-     * 
-     * @return
-     */
-    private static boolean waitForDomainManager(IProgressMonitor progressMonitor) throws InterruptedException {
-        progressMonitor.subTask("Contacting SCA domain manager");
-        for (int i = 0; i < 40; i++) {
-            if (progressMonitor.isCanceled()) {
-                return false;
-            }
-            if (isDomainManagerRunning()) {
-                return true;
-            }
-            Thread.sleep(500);
-        }
-        return false;
-    }
-
-    static void launchDomainManager(IProgressMonitor progressMonitor) throws JavaModelException, CoreException, InterruptedException {
-        
-        progressMonitor.beginTask("Starting SCA Domain Manager", 100);
-        
-        // If the SCA domain controller is not running yet, launch it
-        if (!isDomainManagerRunning()) {
-
-            progressMonitor.subTask("Starting SCA domain manager");
-            if (progressMonitor.isCanceled()) {
-                return;
-            }
-            
-            // Get the SCA domain project
-            IProject domainProject = domainProject(progressMonitor);
-            
-            // Get the domain manager launch configuration
-            ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
-            ILaunchConfigurationType launchConfigurationType =launchManager.getLaunchConfigurationType(TUSCANY_LAUNCH_CONFIGURATIONTYPE);
-            ILaunchConfiguration configuration = null;
-            for (ILaunchConfiguration c : launchManager.getLaunchConfigurations(launchConfigurationType)) {
-                if (TUSCANY_DOMAIN_LAUNCH_CONFIGURATION.equals(c.getName())) {
-                    configuration = c;
-                    break;
-                }
-            }
-            
-            if (configuration == null) {
-                progressMonitor.worked(10);
-                if (progressMonitor.isCanceled()) {
-                    return;
-                }
-    
-                // Create a new launch configuration
-                ILaunchConfigurationWorkingCopy newConfiguration = launchConfigurationType.newInstance(null, TUSCANY_DOMAIN_LAUNCH_CONFIGURATION);
-
-                // Set the project and type to launch
-                newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, domainProject.getProject().getName());
-                newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher");
-                newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, domainProject.getLocation().toString());
-                
-                // Pass the runtime classpath as a system property
-                newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "\"-DTUSCANY_PATH=" + RuntimeClasspathContainerInitializerExtensionPoint.installedRuntimeClasspath() + "\"");
-
-                // Save the configuration
-                newConfiguration.doSave();
-
-                configuration = newConfiguration;
-            }
-
-            // Launch
-            configuration.launch(ILaunchManager.RUN_MODE, new SubProgressMonitor(progressMonitor, 20));
-            
-            if (progressMonitor.isCanceled()) {
-                return;
-            }
-            if (!waitForDomainManager(progressMonitor)) {
-                throw new RuntimeException("SCA Domain Manager could not be started.");
-            }
-        }
-        if (progressMonitor.isCanceled()) {
-            return;
-        }
-        progressMonitor.done();
-            
-    }
-
-    /**
-     * Read a String from a socket.
-     * 
-     * @param socket
-     * @return
-     * @throws IOException
-     */
-    static String read(Socket socket) throws IOException {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
-            StringBuffer sb = new StringBuffer();
-            String str;
-            while ((str = reader.readLine()) != null) {
-                sb.append(str);
-            }
-            return sb.toString();
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
deleted file mode 100644
index edbe4b3e69..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
+++ /dev/null
@@ -1,244 +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.plugin.core.launch;
-
-import static org.apache.tuscany.sca.plugin.core.launch.DomainManagerLauncherUtil.domainProject;
-import static org.apache.tuscany.sca.plugin.core.launch.DomainManagerLauncherUtil.launchDomainManager;
-import static org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchConfigurationDelegate.TUSCANY_LAUNCH_CONFIGURATIONTYPE;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializerExtensionPoint;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
-/**
- * Provides utility methods to launch SCA nodes.
- *
- * @version $Rev: $ $Date: $
- */
-public class NodeLauncherUtil {
-
-    private static final String START_HEADER1 =
-        "GET /quickstart?";
-    private static final String START_HEADER2 =
-        " HTTP/1.0\n" + "Host: localhost\n"
-            + "Content-Type: text/xml\n"
-            + "Connection: close\n"
-            + "Content-Length: ";
-    private static final String START_CONTENT = "";
-
-    /**
-     * Launch an SCA node.
-     * 
-     * @param mode
-     * @param file
-     * @param launchManager
-     * @param launchConfigurationType
-     * @throws CoreException
-     * @throws JavaModelException
-     */
-    static void launchNode(String mode,
-                            IFile file,
-                            IProgressMonitor progressMonitor) throws CoreException, JavaModelException, IOException, InterruptedException {
-        progressMonitor.subTask("Starting SCA node");
-        if (progressMonitor.isCanceled()) {
-            return;
-        }
-        
-        // First start the SCA domain manager
-        launchDomainManager(new SubProgressMonitor(progressMonitor, 20));
-        
-        // Get the Java project
-        IJavaProject javaProject = JavaCore.create(file.getProject());
-        
-        // Get the contribution location and URI
-        String contributionLocation = contributionLocation(javaProject);
-        String contributionURI = contributionURI(javaProject);
-    
-        // Determine the composite file URI
-        String compositeURI = compositeURI(javaProject, file);
-        
-        // Configure the node
-        String nodeName = configureNode(contributionURI, contributionLocation, compositeURI, progressMonitor);
-    
-        // Get the node launch configuration
-        ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
-        ILaunchConfigurationType launchConfigurationType =launchManager.getLaunchConfigurationType(TUSCANY_LAUNCH_CONFIGURATIONTYPE);
-        ILaunchConfiguration configuration = null;
-        for (ILaunchConfiguration c : launchManager.getLaunchConfigurations(launchConfigurationType)) {
-            if (file.getFullPath().toString().equals(c.getAttribute("COMPOSITE_PATH", ""))) {
-                configuration = c;
-                break;
-            }
-        }
-        
-        if (configuration == null) {
-            progressMonitor.worked(10);
-            if (progressMonitor.isCanceled()) {
-                return;
-            }
-
-            // Create a new launch configuration
-            ILaunchConfigurationWorkingCopy newConfiguration = launchConfigurationType.newInstance(null,
-                                        launchManager.generateUniqueLaunchConfigurationNameFrom(file.getName()));
-
-            // Set the project and type to launch
-            newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, file.getProject().getName());
-            newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.apache.tuscany.sca.node.launcher.NodeLauncher");
-
-            // Pass the URL of the node install image to the launcher
-            newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
-                                       "http://localhost:9990/node-config/" + nodeName);
-            
-            // Save the composite path in the launch configuration
-            newConfiguration.setAttribute("COMPOSITE_PATH", file.getFullPath().toString());
-
-            // Pass the runtime classpath as a system property
-            newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "\"-DTUSCANY_PATH=" + RuntimeClasspathContainerInitializerExtensionPoint.installedRuntimeClasspath() + "\"");
-
-            // Save the configuration
-            newConfiguration.doSave();
-
-            configuration = newConfiguration;
-        }
-
-        // Launch
-        configuration.launch(mode, null);
-    }
-
-    /**
-     * Returns the location of the SCA contribution representing a Java project. 
-     * @param javaProject
-     * @return
-     * @throws MalformedURLException
-     * @throws JavaModelException
-     */
-    private static String contributionLocation(IJavaProject javaProject) throws MalformedURLException, JavaModelException {
-        IPath location = javaProject.getOutputLocation();
-        IResource resource;
-        if (location.segmentCount() == 1) {
-            resource = javaProject.getProject();
-        } else {
-            resource = javaProject.getProject().getWorkspace().getRoot().getFolder(location);
-        }
-        location = resource.getLocation();
-        String url = location.toFile().toURI().toURL().toString();
-        if (url.endsWith("/")) {
-            url = url.substring(0, url.length() - 1);
-        }
-        return url;
-    }
-
-    /**
-     * Returns the URI of the SCA contribution representing a Java project. 
-     * @param javaProject
-     * @return
-     */
-    private static String contributionURI(IJavaProject javaProject) {
-        return javaProject.getProject().getName();
-    }
-
-    /**
-     * Returns the SCA artifact URI of a composite file inside a Java project.
-     * 
-     * @param javaProject
-     * @param file
-     * @return
-     * @throws JavaModelException
-     */
-    private static String compositeURI(IJavaProject javaProject, IFile file) throws JavaModelException {
-    
-        // Find the Java source container containing the specified file
-        IClasspathEntry[] classpathEntries = javaProject.getRawClasspath();
-        int sourceFolderSegments = 0;
-        for (IClasspathEntry entry : classpathEntries) {
-            if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-                sourceFolderSegments = entry.getPath().matchingFirstSegments(file.getFullPath());
-                if (sourceFolderSegments > 0)
-                    break;
-            }
-        }
-    
-        // Determine the composite URI
-        String compositeURI = file.getFullPath().removeFirstSegments(sourceFolderSegments).toString();
-        return compositeURI;
-    }
-
-    /**
-     * Send a request to the SCA domain manager to configure an SCA node for
-     * the specified composite.
-     *  
-     * @param contributionURI
-     * @param contributionLocation
-     * @param compositeURI
-     * @return
-     * @throws IOException
-     */
-    private static String configureNode(String contributionURI, String contributionLocation, String compositeURI,
-                                        IProgressMonitor progressMonitor) throws IOException, CoreException {
-        progressMonitor.subTask("Configuring node");
-        
-        // Send the request to configure the node
-        Socket client = new Socket("localhost", 9990);
-        OutputStream os = client.getOutputStream();
-        String request = START_HEADER1 +
-            "contribution=" + contributionURI + "&location=" + contributionLocation + "&composite=" + compositeURI +
-            START_HEADER2 + START_CONTENT.getBytes().length + "\n\n" + START_CONTENT;
-        os.write(request.getBytes());
-        os.flush();
-        String response = DomainManagerLauncherUtil.read(client);
-        
-        // Refresh the domain project
-        domainProject(progressMonitor).refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-        
-        int i = response.indexOf("<span id=\"node\">");
-        if (i != -1) {
-            
-            // Extract the node name
-            response = response.substring(i + 16);
-            i = response.indexOf("</span>");
-            String nodeName = response.substring(0, i);
-            return nodeName;
-            
-        } else {
-            throw new RuntimeException("Node could not be configured: " + response);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
deleted file mode 100644
index 056deb5b27..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.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.plugin.core.launch;
-
-import java.io.File;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.ExecutionArguments;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMRunner;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-
-/**
- * Launch configuration delegate for the Tuscany launch configuration.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyLaunchConfigurationDelegate extends AbstractJavaLaunchConfigurationDelegate implements
-    ILaunchConfigurationDelegate {
-
-    public static final String TUSCANY_LAUNCH_CONFIGURATIONTYPE = "org.apache.tuscany.sca.plugin.core.launch.configurationtype";
-
-    public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor)
-        throws CoreException {
-
-        // Verify the configuration
-        String mainTypeName = verifyMainTypeName(configuration);
-        IVMInstall vm = verifyVMInstall(configuration);
-        IVMRunner runner = vm.getVMRunner(mode);
-
-        ExecutionArguments execArgs =
-            new ExecutionArguments(getVMArguments(configuration), getProgramArguments(configuration));
-        Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
-        String[] classpath = getClasspath(configuration);
-
-        File workingDir = verifyWorkingDirectory(configuration);
-        String workingDirName = null;
-        if (workingDir != null)
-            workingDirName = workingDir.getAbsolutePath();
-
-        // Create a VM runner configuration
-        VMRunnerConfiguration runConfig = new VMRunnerConfiguration(mainTypeName, classpath);
-        runConfig.setProgramArguments(execArgs.getProgramArgumentsArray());
-        runConfig.setVMArguments(execArgs.getVMArgumentsArray());
-        runConfig.setVMSpecificAttributesMap(vmAttributesMap);
-        runConfig.setWorkingDirectory(workingDirName);
-        runConfig.setBootClassPath(getBootpath(configuration));
-
-        // Run!!
-        runner.run(runConfig, launch, monitor);
-    }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
deleted file mode 100644
index 5f8ea73db4..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
+++ /dev/null
@@ -1,48 +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.plugin.core.launch;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.EnvironmentTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.ILaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-
-/**
- * Tab groups from the Tuscany launch configuration.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyLaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup implements
-    ILaunchConfigurationTabGroup {
-
-    public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-        ILaunchConfigurationTab[] tabs =
-            new ILaunchConfigurationTab[] {new JavaArgumentsTab(), new JavaJRETab(), new JavaClasspathTab(),
-                                           new SourceLookupTab(), new EnvironmentTab(), new CommonTab()};
-
-        setTabs(tabs);
-    }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
deleted file mode 100644
index f66fa71191..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
+++ /dev/null
@@ -1,79 +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.plugin.core.launch;
-
-import static org.apache.tuscany.sca.plugin.core.launch.DomainManagerLauncherUtil.launchDomainManager;
-import static org.apache.tuscany.sca.plugin.core.log.LogUtil.error;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * Launch the SCA DomainManager.
- * 
- * @version $Rev: $ $Date: $
- */
-public class TuscanyLaunchDomainManagerAction implements IWorkbenchWindowActionDelegate {
-    
-    private IWorkbenchWindow window;
-
-    public TuscanyLaunchDomainManagerAction() {
-    }
-
-    public void run(IAction action) {
-
-        try {
-            
-            // Run with a progress monitor
-            window.run(true, true, new IRunnableWithProgress() {
-
-                public void run(IProgressMonitor progressMonitor) throws InvocationTargetException, InterruptedException {
-                    try {
-                        
-                        launchDomainManager(progressMonitor);
-                            
-                    } catch (Exception e) {
-                        throw new InvocationTargetException(e);
-                    } finally {
-                        progressMonitor.done();
-                    }
-                }
-            });
-
-        } catch (Exception e) {
-            error("Could not launch SCA Domain Manager", e);
-        }
-    }
-
-    public void selectionChanged(IAction action, ISelection selection) {
-    }
-
-    public void dispose() {
-    }
-
-    public void init(IWorkbenchWindow window) {
-        this.window = window;
-    }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
deleted file mode 100644
index 6eba5ffdc2..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
+++ /dev/null
@@ -1,29 +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.plugin.core.launch;
-
-/**
- * TuscanyLaunchNodeFilter
- *
- * @version $Rev: $ $Date: $
- */
-public class TuscanyLaunchNodeFilter {
-
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
deleted file mode 100644
index 2a4c7206db..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
+++ /dev/null
@@ -1,88 +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.plugin.core.launch;
-
-import static org.apache.tuscany.sca.plugin.core.launch.NodeLauncherUtil.launchNode;
-import static org.apache.tuscany.sca.plugin.core.log.LogUtil.error;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A launch shortcut for SCA .composite files.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyLaunchNodeShortcut implements ILaunchShortcut {
-    
-    public void launch(final ISelection selection, final String mode) {
-
-        try {
-            
-            // Make sure we have a .composite file selected
-            if (!(selection instanceof IStructuredSelection)) {
-                return;
-            }
-            Object[] selections = ((IStructuredSelection)selection).toArray();
-            if (selections.length == 0) {
-                return;
-            }
-            final IFile file = (IFile)selections[0];
-            if (!file.getFileExtension().equals("composite")) {
-                return;
-            }
-            
-            // Run with a progress monitor
-            PlatformUI.getWorkbench().getActiveWorkbenchWindow().run(true, true, new IRunnableWithProgress() {
-
-                public void run(IProgressMonitor progressMonitor) throws InvocationTargetException, InterruptedException {
-                    try {
-                        progressMonitor.beginTask("Starting SCA Composite", 100);
-                        
-                        launchNode(mode, file, progressMonitor);
-                        
-                        progressMonitor.done();
-                            
-                    } catch (Exception e) {
-                        throw new InvocationTargetException(e);
-                    } finally {
-                        progressMonitor.done();
-                    }
-                }
-            });
-
-        } catch (Exception e) {
-            error("Could not launch SCA composite", e);
-        }
-    }
-
-    public void launch(IEditorPart editor, String mode) {
-        //TODO later...
-    }
-    
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
deleted file mode 100644
index 5fc1a75960..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
+++ /dev/null
@@ -1,39 +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.plugin.core.log;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-
-/**
- * A log utility
- *
- * @version $Rev: $ $Date: $
- */
-public class LogUtil {
-    
-    public static void error(String msg, Exception e) {
-        Platform.getLog(
-                        Platform.getBundle("org.apache.tuscany.sca.plugin.core")).log(
-                        new Status(IStatus.ERROR, "org.apache.tuscany.sca.plugin.core", IStatus.OK, msg, e));
-    }
-
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
deleted file mode 100644
index 702da9701e..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
+++ /dev/null
@@ -1,53 +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.plugin.core.newwizards;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-
-/**
- * A wizard to create new .componentType files.
- *
- * @version $Rev$ $Date$
- */
-public class NewComponentTypeWizard extends Wizard implements IWorkbenchWizard {
-
-	private IWorkbench workbench;
-	private IStructuredSelection selection;
-	private NewComponentTypeWizardPage mainPage;
-
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	      this.workbench = workbench;
-	      this.selection = selection;
-	      setWindowTitle("New SCA ComponentType");
-	}
-	
-	public void addPages() {
-		mainPage = new NewComponentTypeWizardPage(workbench, selection);
-		addPage(mainPage);
-	}	
-	
-	@Override
-	public boolean performFinish() {
-		return mainPage.finish();
-	}
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
deleted file mode 100644
index a1c6cb86a7..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
+++ /dev/null
@@ -1,98 +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.plugin.core.newwizards;
-
-import static org.apache.tuscany.sca.plugin.core.log.LogUtil.error;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.PrintWriter;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.ide.IDE;
-
-/**
- * Wizard page for the new .componentType file wizard.
- *
- * @version $Rev$ $Date$
- */
-public class NewComponentTypeWizardPage extends WizardNewFileCreationPage {
-        
-        private IWorkbench workbench;
-
-        public NewComponentTypeWizardPage(IWorkbench workbench, IStructuredSelection selection)  {
-                super("New SCA ComponentType Page", selection);
-                
-                this.workbench = workbench;
-                
-                setTitle("SCA ComponentType");
-                setDescription("Create a new SCA ComponentType.");
-                
-                try {
-                        String location = FileLocator.toFileURL(Platform.getBundle("org.apache.tuscany.sca.plugin.core").getEntry("/")).getFile().toString();
-                        setImageDescriptor(ImageDescriptor.createFromImageData((new ImageLoader()).load(location + "/icons/tuscany.gif")[0]));
-                } catch (Exception e) {
-                    error("Could not create wizard", e);
-                }
-                
-                setFileName("sample.componentType");
-                
-        }
-        
-        public boolean finish() {
-                try {
-                        IFile file = createNewFile();
-                        
-            IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-                IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
-                IDE.openEditor(workbenchPage, file, true);
-                } catch (Exception e) {
-                    error("Could not open editor", e);
-                    return false;
-                }
-                return true;
-        }
-
-        @Override
-        protected InputStream getInitialContents() {
-                
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                PrintWriter printWriter = new PrintWriter(outputStream);
-                printWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-                printWriter.println("<componentType xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"");
-                printWriter.println("    xmlns:t=\"http://tuscany.apache.org/xmlns/sca/1.0\">");        
-                printWriter.println();
-                printWriter.println();
-                printWriter.println("</componentType>");
-                printWriter.close();
-                
-                return new ByteArrayInputStream(outputStream.toByteArray());
-        }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
deleted file mode 100644
index 5e059308e6..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
+++ /dev/null
@@ -1,53 +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.plugin.core.newwizards;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-
-/**
- * A wizard to create new .composite files.
- *
- * @version $Rev$ $Date$
- */
-public class NewCompositeWizard extends Wizard implements IWorkbenchWizard {
-	
-	private IWorkbench workbench;
-	private IStructuredSelection selection;
-	private NewCompositeWizardPage mainPage;
-
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	      this.workbench = workbench;
-	      this.selection = selection;
-	      setWindowTitle("New SCA Composite");
-	}
-	
-	public void addPages() {
-		mainPage = new NewCompositeWizardPage(workbench, selection);
-		addPage(mainPage);
-	}	
-	
-	@Override
-	public boolean performFinish() {
-		return mainPage.finish();
-	}
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java b/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
deleted file mode 100644
index 5d9f2bdf70..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
+++ /dev/null
@@ -1,105 +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.plugin.core.newwizards;
-
-import static org.apache.tuscany.sca.plugin.core.log.LogUtil.error;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.PrintWriter;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.ide.IDE;
-
-/**
- * Wizard page for the new .composite file wizard.
- *
- * @version $Rev$ $Date$
- */
-public class NewCompositeWizardPage extends WizardNewFileCreationPage {
-        
-        private IWorkbench workbench;
-
-        public NewCompositeWizardPage(IWorkbench workbench, IStructuredSelection selection)  {
-                super("New SCA Composite Page", selection);
-                
-                this.workbench = workbench;
-                
-                setTitle("SCA Composite");
-                setDescription("Create a new SCA Composite.");
-                
-                try {
-                        String location = FileLocator.toFileURL(Platform.getBundle("org.apache.tuscany.sca.plugin.core").getEntry("/")).getFile().toString();
-                        setImageDescriptor(ImageDescriptor.createFromImageData((new ImageLoader()).load(location + "/icons/tuscany.gif")[0]));
-                } catch (Exception e) {
-                    error("Could not create wizard", e);
-                }
-                
-                setFileName("sample.composite");
-                
-        }
-        
-        public boolean finish() {
-                try {
-                        IFile file = createNewFile();
-                        
-            IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-                IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
-                IDE.openEditor(workbenchPage, file, true);
-                } catch (Exception e) {
-                    error("Could not open editor", e);
-                        return false;
-                }
-                return true;
-        }
-
-        @Override
-        protected InputStream getInitialContents() {
-
-                IPath path = new Path(getFileName());
-                String name = path.removeFileExtension().toString();
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                PrintWriter printWriter = new PrintWriter(outputStream);
-                printWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");              
-                printWriter.println("<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"");
-                printWriter.println("    xmlns:t=\"http://tuscany.apache.org/xmlns/sca/1.0\"");
-                printWriter.println("    xmlns:c=\"http://" + name + "\"");     
-                printWriter.println("    targetNamespace=\"http://" + name + "\"");      
-                printWriter.println("    name=\"" + name + "\">");
-                printWriter.println();
-                printWriter.println();
-                printWriter.println("</composite>");
-                printWriter.close();
-                
-                return new ByteArrayInputStream(outputStream.toByteArray());
-        }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/plugin.xml b/java/sca-contrib/tools/eclipse/plugins/core/plugin.xml
deleted file mode 100644
index edc17c5ee2..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/plugin.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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.    
--->
-<plugin>
-
-	<extension-point id="runtimeClasspathContainerInitializer"
-		name="Tuscany Runtime Classpath Container Initializers"
-		schema="exsd/runtimeClasspathContainerInitializer.exsd"/>
-
-	<extension point = "org.eclipse.wst.xml.core.catalogContributions">
-		<catalogContribution id="default">
-			<uri name="http://www.osoa.org/xmlns/sca/1.0" uri="xsd/sca-all.xsd"/>
-		</catalogContribution>
-	</extension>
-	
-	<extension point = "org.eclipse.wst.xml.core.catalogContributions">
-		<catalogContribution id="default">
-			<uri name="http://tuscany.apache.org/xmlns/sca/1.0" uri="xsd/tuscany-sca.xsd"/>
-		</catalogContribution>
-	</extension>	
-	
-	<extension point="org.eclipse.core.runtime.contentTypes"> 
-      <file-association content-type="org.eclipse.core.runtime.xml" file-extensions="composite"/>
-      <file-association content-type="org.eclipse.core.runtime.xml" file-extensions="componentType"/>       
-	</extension>
-	
-	<extension
-       point="org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer">
-    	<runtimeClasspathContainerInitializer
-    			id="org.apache.tuscany.sca.plugin.core.runtime.library"
-				class="org.apache.tuscany.sca.plugin.core.classpath.CoreClasspathContainerInitializer"/>                       
-	</extension>	
-
-	<extension point="org.eclipse.jdt.core.classpathContainerInitializer">
-    	<classpathContainerInitializer 
-    			id="org.apache.tuscany.sca.plugin.core.runtime.library"
-				class="org.apache.tuscany.sca.plugin.core.classpath.CoreClasspathContainerInitializer"/>                       
-	</extension>
-	
-	<extension point="org.eclipse.jdt.ui.classpathContainerPage">
-		<classpathContainerPage 
-				id="org.apache.tuscany.sca.plugin.core.runtime.library"
-				name="Tuscany SCA Core Library"
-				class="org.apache.tuscany.sca.plugin.core.classpath.CoreLibraryEntryPage">
-		</classpathContainerPage>
-	</extension>
-
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="Tuscany"
-            visible="true"
-            id="org.apache.tuscany.sca.plugin.core.launch.actionSet">
-         <action
-               label="&amp;Start SCA Domain Manager"
-               icon="icons/t.gif"
-               class="org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchDomainManagerAction"
-               tooltip="Start SCA Domain Manager"
-               toolbarPath="tuscanyGroup"
-               id="org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchDomainManagerAction">
-         </action>
-      </actionSet>
-   </extension>
-
-	<extension point="org.eclipse.debug.core.launchConfigurationTypes">
-		<launchConfigurationType
-       		name="Tuscany"
-        	delegate="org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchConfigurationDelegate"
-        	modes="run, debug"
-			sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-    		sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer"
-        	id="org.apache.tuscany.sca.plugin.core.launch.configurationtype">        
-    	</launchConfigurationType>
-	</extension>
-	
-	<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-    	<launchConfigurationTypeImage
-        	icon="icons/t.gif"
-        	configTypeID="org.apache.tuscany.sca.plugin.core.launch.configurationtype"
-        	id="org.apache.tuscany.sca.plugin.core.launch.configurationtypeimage">
-    	</launchConfigurationTypeImage>
-	</extension>
-	
-	<extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-    	<launchConfigurationTabGroup
-        	type="org.apache.tuscany.sca.plugin.core.launch.configurationtype"
-        	class="org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchConfigurationTabGroup"
-        	id="org.apache.tuscany.sca.plugin.core.launch.configurationtypetabgroup">
-    	</launchConfigurationTabGroup>
-	</extension>	
-	
-	<extension point="org.eclipse.debug.ui.launchShortcuts">
-		<shortcut
-			id="org.apache.tuscany.sca.plugin.core.launchshortcut"
-			class="org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchNodeShortcut"
-			label="Tuscany"
-			icon="icons/t.gif"
-			modes="run, debug">
-			<contextualLaunch>
-				<enablement>
-					<with variable="selection">
-						<count value="1"/>
-						<iterate>
-							<or>
-								<test property="org.eclipse.debug.ui.matchesPattern" value="*.composite"/>
-							</or>
-						</iterate>
-					</with>
-			 	</enablement>
-			</contextualLaunch>
-		</shortcut>
-	</extension>
-
-	<extension point="org.eclipse.ui.newWizards">
-		<category name="Tuscany" id="org.apache.tuscany.sca.plugin.core.newwizards" /> 
-		<wizard name="Composite" icon="icons/t.gif" 
-				category="org.apache.tuscany.sca.plugin.core.newwizards" 
-				class="org.apache.tuscany.sca.plugin.core.newwizards.NewCompositeWizard" 
-				preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective" 
-				id="org.apache.tuscany.sca.plugin.core.newwizards.newcompositewizard">
-			<description>Create a new SCA Composite</description> 
-		</wizard>
-		<wizard name="ComponentType" icon="icons/t.gif" 
-				category="org.apache.tuscany.sca.plugin.core.newwizards" 
-				class="org.apache.tuscany.sca.plugin.core.newwizards.NewComponentTypeWizard" 
-				preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective" 
-				id="org.apache.tuscany.sca.plugin.core.newwizards.newcompositewizard">
-			<description>Create a new SCA ComponentType</description> 
-		</wizard>		
-	</extension>
-	
-</plugin>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/pom.xml b/java/sca-contrib/tools/eclipse/plugins/core/pom.xml
deleted file mode 100644
index faf0f41e8c..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/pom.xml
+++ /dev/null
@@ -1,145 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-eclipse-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

-    <name>Apache Tuscany SCA Core Eclipse Plugin</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.eclipse.jdt.debug</groupId>

-            <artifactId>ui</artifactId>

-            <version>3.2.100-v20070531-1800</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.eclipse.equinox</groupId>

-                    <artifactId>common</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.eclipse.equinox</groupId>

-                    <artifactId>app</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.eclipse.equinox</groupId>

-            <artifactId>app</artifactId>

-            <version>1.0.0-v20070606</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.eclipse.equinox</groupId>

-            <artifactId>common</artifactId>

-            <version>3.3.0-v20070426</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.eclipse.swt.win32.win32</groupId>

-            <artifactId>x86</artifactId>

-            <version>3.3.0-v3346</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-core</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <type>zip</type>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-core</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <classifier>src</classifier>

-            <type>zip</type>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <sourceDirectory>${basedir}</sourceDirectory>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/*.java</exclude>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.*</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-       

-       <plugins>

-           <plugin>

-               <groupId>org.apache.maven.plugins</groupId>

-               <artifactId>maven-jar-plugin</artifactId>

-               <configuration>

-                   <classifier>tmp</classifier>

-                   <archive>

-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                   </archive>

-               </configuration>

-            </plugin>

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-assembly-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>distribution-package</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>single</goal>

-                        </goals>

-                        <configuration>

-                            <descriptors>

-                                <descriptor>src/main/assembly/jar.xml</descriptor>

-                            </descriptors>

-                            <tarLongFileMode>gnu</tarLongFileMode>

-                            <appendAssemblyId>false</appendAssemblyId>

-                            <archive>

-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                            </archive>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-    <repositories>

-        <repository>

-            <id>repo1.eclipse</id>

-            <url>http://repo1.maven.org/eclipse/</url>

-            <snapshots>

-                <enabled>true</enabled>

-            </snapshots>

-        </repository>

-    </repositories>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/plugins/core/src/main/assembly/jar.xml b/java/sca-contrib/tools/eclipse/plugins/core/src/main/assembly/jar.xml
deleted file mode 100644
index 7832ba5131..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/src/main/assembly/jar.xml
+++ /dev/null
@@ -1,81 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>plugin</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>jar</format>
-    </formats>
-
-    <fileSets>
-
-        <!-- Add the classes -->
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory></outputDirectory>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>src/</exclude>
-                <exclude>src/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-
-        <!-- Add the distributions -->
-        <dependencySet>
-            <useTransitiveDependencies>false</useTransitiveDependencies>
-            <unpack>true</unpack>
-            <includes>
-                <include>*:zip</include>
-            </includes>
-            <excludes>
-                <exclude>*:zip:src</exclude>
-            </excludes>
-            <unpackOptions>
-                <excludes>
-                    <exclude>*/samples</exclude>
-                    <exclude>*/samples/**/*</exclude>
-                </excludes>
-            </unpackOptions>
-        </dependencySet>
-
-        <dependencySet>
-            <useTransitiveDependencies>false</useTransitiveDependencies>
-            <unpack>false</unpack>
-            <includes>
-                <include>*:zip:src</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-
-</assembly>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-all.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-all.xsd
deleted file mode 100644
index 1b19ede427..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-all.xsd
+++ /dev/null
@@ -1,34 +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 xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <include schemaLocation="sca.xsd"/>
-
-    <include schemaLocation="sca-contribution.xsd"/>
-    
-    <include schemaLocation="sca-binding-ejb.xsd"/>
-
-    <include schemaLocation="sca-implementation-bpel.xsd"/>
-    <include schemaLocation="sca-implementation-spring.xsd"/>
-    <include schemaLocation="sca-implementation-ejb.xsd"/>
-
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
deleted file mode 100644
index 26bedfcce5..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-   <include schemaLocation="sca-core.xsd"/>
-
-   <element name="binding.ejb" type="sca:EJBSessionBeanBinding" 
-            substitutionGroup="sca:binding" />
-
-    <simpleType name="BeanType">
-        <restriction base="string">
-            <enumeration value="stateless"/>
-            <enumeration value="stateful"/>
-        </restriction>
-    </simpleType>
-
-    <simpleType name="VersionValue">
-        <restriction base="string">
-            <enumeration value="EJB2"/>
-            <enumeration value="EJB3"/>
-        </restriction>
-    </simpleType>
-
-
-     <complexType name="EJBSessionBeanBinding">
-	 <complexContent>
-	  <extension base="sca:Binding">
-         <sequence>
-            <any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="homeInterface" type="NCName" use="optional"/>
-         <attribute name="ejb-link-name" type="NCName" use="optional"/>
-         <attribute name="session-type" type="sca:BeanType" use="optional" default="stateless"/>
-         <attribute name="ejb-version" type="sca:VersionValue" use="optional" default="EJB2"/>
-         <anyAttribute namespace="##any" processContents="lax"/>
-	  </extension>
-	 </complexContent>
-     </complexType>
-
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
deleted file mode 100644
index 850f32b56a..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core.xsd"/>
-
-   <complexType name="JMSBinding">
-      <complexContent>
-         <extension base="sca:Binding">
-            <sequence>
-               <element name="destination" type="sca:Destination" minOccurs="0"/>
-   	         <element name="connectionFactory" type="sca:ConnectionFactory"  
-                        minOccurs="0"/>
- 	         <element name="activationSpec" type="sca:ActivationSpec" 
-                        minOccurs="0"/>
-  	         <element name="response" type="sca:Response" minOccurs="0"/>
-               <element name="headers" type="sca:Headers" minOccurs="0"/>
-    	         <element name="resourceAdapter" type="sca:ResourceAdapter" 
-                        minOccurs="0"/>
-               <element name="operationProperties" type="sca:OperationProperties" 
-                        minOccurs="0" maxOccurs="unbounded"/>
-               <any namespace="##other" processContents="lax" 
-                    minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-    	      <attribute name="correlationScheme"
-                       default="RequestMsgIDToCorrelID">
-    	         <simpleType>
-                  <restriction base="string">
-                     <enumeration value="RequestMsgIDToCorrelID"/>
-                     <enumeration value="RequestCorrelIDToCorrelID"/>
-                     <enumeration value="None"/>
-                  </restriction>
-               </simpleType>
-            </attribute>
-
-            <attribute name="initialContextFactory" type="anyURI"/>
-            <attribute name="jndiURL" type="anyURI"/>
-            <attribute name="requestConnection" type="QName"/>
-            <attribute name="responseConnection" type="QName"/>
-            <attribute name="operationProperties" type="QName"/>
-            <anyAttribute/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <simpleType name="CreateResource">
-      <restriction base="string">
-         <enumeration value="always"/>
-         <enumeration value="never"/>
-         <enumeration value="ifnotexist"/>
-      </restriction>
-   </simpleType>
-
-   <complexType name="Destination">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="name" type="anyURI" use="required"/>
-      <attribute name="type" use="optional" default="queue">
-         <simpleType>
-            <restriction base="string">
-               <enumeration value="queue"/>
-               <enumeration value="topic"/>
-            </restriction>
-         </simpleType>
-      </attribute>
-      <attribute name="create" type="sca:CreateResource" 
-                 use="optional" default="ifnotexist"/>
-   </complexType>
-
-   <complexType name="ConnectionFactory">
-    	<sequence>          <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-    	</sequence>
-    	<attribute name="name" type="anyURI" use="required"/>
-    	<attribute name="create" type="sca:CreateResource" 
-                 use="optional" default="ifnotexist"/>
-   </complexType>
-
-   <complexType name="ActivationSpec">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="name" type="anyURI" use="required"/>
-      <attribute name="create" type="sca:CreateResource"
-                 use="optional" default="ifnotexist"/>
-   </complexType>
-
-   <complexType name="Response">
-      <sequence>
-         <element name="destination" type="sca:Destination" minOccurs="0"/>
-         <element name="connectionFactory" type="sca:ConnectionFactory" 
-                  minOccurs="0"/>
-         <element name="activationSpec" type="sca:ActivationSpec" minOccurs="0"/>
-      </sequence>
-   </complexType>
-
-   <complexType name="Headers">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="JMSType" type="string"/>
-      <attribute name="JMSCorrelationID" type="string"/>
-      <attribute name="JMSDeliveryMode" type="string"/>
-      <attribute name="JMSTimeToLive" type="int"/>
-      <attribute name="JMSPriority" type="string"/>
-   </complexType>
-
-   <complexType name="ResourceAdapter">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="name" type="string" use="required"/>
-   </complexType>
-
-   <complexType name="OperationProperties">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-         <element name="headers" type="sca:Headers"/>
-      </sequence>
-      <attribute name="name" type="string" use="required"/>
-      <attribute name="nativeOperation" type="string"/>
-   </complexType>
-
-   <element name="binding.jms" type="sca:JMSBinding" 
-            substitutionGroup="sca:binding"/>
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
deleted file mode 100644
index 02703402ef..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 

-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 

-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-        elementFormDefault="qualified">

-

-    <include schemaLocation="sca-core.xsd"/>

-

-    <element name="binding.sca" type="sca:SCABinding" 

-    	substitutionGroup="sca:binding"/>

-    <complexType name="SCABinding">

-        <complexContent>

-            <extension base="sca:Binding">

-		    	<sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-		    	</sequence>

-                <anyAttribute namespace="##any" processContents="lax"/>

-            </extension>

-        </complexContent>

-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
deleted file mode 100644
index 3e92de193b..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-    xmlns:wsa="http://www.w3.org/2004/12/addressing"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.ws" type="sca:WebServiceBinding"
-             substitutionGroup="sca:binding"/>
-    <complexType name="WebServiceBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-			 <attribute name="wsdlElement" type="anyURI" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-contribution.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
deleted file mode 100644
index 6861d7afd9..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->

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

-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 

-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

-        elementFormDefault="qualified">

-

-    <include schemaLocation="sca-core.xsd"/>

-

-    <element name="contribution" type="sca:Contribution"/>

-    

-    <complexType name="Contribution">

-        <sequence>

-            <choice minOccurs="0" maxOccurs="unbounded">

-                <any namespace="##any" processContents="lax"/>

-            </choice>

-        </sequence>

-        <anyAttribute namespace="##any" processContents="lax"/>

-    </complexType>

-    

-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-core.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-core.xsd
deleted file mode 100644
index 1c6291792b..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-core.xsd
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <element name="componentType" type="sca:ComponentType"/>
-    <complexType name="ComponentType">
-    	<sequence>
-             <choice minOccurs="0" maxOccurs="1">
-	             <element ref="sca:implementation"/>
-	             <any namespace="##other" processContents="lax"/>
-             </choice>
-        	<choice minOccurs="0" maxOccurs="unbounded">
-            	<element name="service" type="sca:ComponentService" />
-            	<element name="reference" type="sca:ComponentReference"/>
-            	<element name="property" type="sca:Property"/>
-        	</choice>
-        	<!-- 
-        	<any namespace="##other" processContents="lax" minOccurs="0" 
-        		maxOccurs="unbounded"/>
-        	-->
-        </sequence>
-        <attribute name="constrainingType" type="QName" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-
-    <element name="composite" type="sca:Composite"/>
-    <complexType name="Composite">
-         <sequence>
-             <choice minOccurs="0" maxOccurs="unbounded">
-	             <element name="include" type="sca:Include"/>
-                 <element name="service" type="sca:Service"/>
-                 <element name="property" type="sca:Property"/>
-                 <element name="component" type="sca:Component"/>
-                 <element name="reference" type="sca:Reference"/>
-                 <element name="wire" type="sca:Wire"/>
-                 <any namespace="##other" processContents="lax"/>
-             </choice>
-             <!-- 
-             <any namespace="##other" processContents="lax" minOccurs="0" 
-             	maxOccurs="unbounded"/>
-             -->
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="targetNamespace" type="anyURI" use="optional"/>
-        <attribute name="local" type="boolean" use="optional" default="false"/>
-        <attribute name="autowire" type="boolean" use="optional" default="false"/>
-        <attribute name="constrainingType" type="QName" use="optional"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-    <complexType name="Service">
-    	<sequence>
-    		<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-    		<element name="operation" type="sca:Operation" minOccurs="0" 
-    			maxOccurs="unbounded" />
-    		<choice minOccurs="0" maxOccurs="unbounded">
-    			<element ref="sca:binding" />
-    			<any namespace="##other" processContents="lax"/>
-    		</choice>
-    		<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-    		<!--
-    		<any namespace="##other" processContents="lax" minOccurs="0"
-    			maxOccurs="unbounded" />
-    		-->
-    	</sequence>
-    	<attribute name="name" type="NCName" use="required" />
-    	<attribute name="promote" type="anyURI" use="required" />
-    	<attribute name="requires" type="sca:listOfQNames" use="optional" />
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax" />
-    </complexType>
-
-    <element name="interface" type="sca:Interface" abstract="true" />
-    <complexType name="Interface" abstract="true"/>
-
-    <complexType name="Reference">
-    	<sequence>
-    		<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-    		<element name="operation" type="sca:Operation" minOccurs="0" 
-    			maxOccurs="unbounded" />
-    		<choice minOccurs="0" maxOccurs="unbounded">
-    			<element ref="sca:binding" />
-    			<any namespace="##other" processContents="lax" />
-    		</choice>
-    		<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-    		<!--
-    		<any namespace="##other" processContents="lax" minOccurs="0"
-    			maxOccurs="unbounded" />
-    		-->
-    	</sequence>
-    	<attribute name="name" type="NCName" use="required" />
-    	<attribute name="target" type="sca:listOfAnyURIs" use="optional"/>
-    	<attribute name="wiredByImpl" type="boolean" use="optional" default="false"/>
-    	<attribute name="multiplicity" type="sca:Multiplicity"
-    		use="optional" default="1..1" />
-    	<attribute name="promote" type="sca:listOfAnyURIs" use="required" />
-    	<attribute name="requires" type="sca:listOfQNames" use="optional" />
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax" />
-    </complexType>
-
-    <complexType name="SCAPropertyBase" mixed="true">
-    	<!-- mixed="true" to handle simple type -->
-    	<sequence>
-    		<any namespace="##any" processContents="lax" minOccurs="0"
-    			maxOccurs="1" />
-    		<!-- NOT an extension point; This xsd:any exists to accept
-    			 the element-based or complex type property
-    			 i.e. no element-based extension point under "sca:property" -->
-    	</sequence>
-    </complexType>
-
-    <!-- complex type for sca:property declaration --> 
-    <complexType name="Property" mixed="true">
-       <complexContent>
-	       <extension base="sca:SCAPropertyBase">  
-	          <!-- extension defines the place to hold default value --> 
-	          <attribute name="name" type="NCName" use="required"/>
-	          <attribute name="type" type="QName" use="optional"/> 
-	          <attribute name="element" type="QName" use="optional"/>
-	          <attribute name="many" type="boolean" default="false" 
-	          	use="optional"/>
-	          <attribute name="noDefault" type="boolean" default="false" 
-	          	use="optional"/>
-	          <anyAttribute namespace="##any" processContents="lax"/>
-	          <!-- an extension point ; attribute-based only --> 
-	       </extension>
-       </complexContent> 
-    </complexType>
-    
-    <complexType name="PropertyValue" mixed="true">
-       <complexContent>
-          <extension base="sca:SCAPropertyBase">
-             <attribute name="name" type="NCName" use="required"/>
-	         <attribute name="type" type="QName" use="optional"/> 
-	         <attribute name="element" type="QName" use="optional"/> 
-	         <attribute name="many" type="boolean" default="false" 
-	         	use="optional"/>            
-             <attribute name="source" type="string" use="optional"/>
-             <attribute name="file" type="anyURI" use="optional"/> 
-             <anyAttribute namespace="##any" processContents="lax"/>
-             <!-- an extension point ; attribute-based only --> 
-          </extension> 
-       </complexContent> 
-    </complexType>
-
-    <element name="binding" type="sca:Binding" abstract="true"/>
-    <complexType name="Binding" abstract="true">
-    	<sequence>
-    		<element name="operation" type="sca:Operation" minOccurs="0" 
-    			maxOccurs="unbounded" />
-    	</sequence>
-        <attribute name="uri" type="anyURI" use="optional"/>
-        <attribute name="name" type="QName" use="optional"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    </complexType>
-    
-    <element name="bindingType" type="sca:BindingType"/>
-    <complexType name="BindingType">
-    	<sequence minOccurs="0" maxOccurs="unbounded">
-    		<any namespace="##other" processContents="lax" />
-    	</sequence>
-    	<attribute name="type" type="QName" use="required"/>
-    	<attribute name="alwaysProvides" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="mayProvide" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-    <element name="callback" type="sca:Callback"/>
-    <complexType name="Callback">
-    	<choice minOccurs="0" maxOccurs="unbounded">
-        	<element ref="sca:binding"/>
-        	<any namespace="##other" processContents="lax"/>
-        </choice>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>  
-      
-    <complexType name="Component">
-        <sequence>
-             <choice minOccurs="0" maxOccurs="1">
-	             <element ref="sca:implementation"/>
-	             <any namespace="##other" processContents="lax"/>
-             </choice>
-             <choice minOccurs="0" maxOccurs="unbounded">
-             	<element name="service" type="sca:ComponentService"/>
-                <element name="reference" type="sca:ComponentReference"/>
-                <element name="property" type="sca:PropertyValue" />
-             </choice>
-             <!-- 
-             <any namespace="##other" processContents="lax" minOccurs="0" 
-             	maxOccurs="unbounded"/>
-             -->
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="autowire" type="boolean" use="optional" default="false"/>
-        <attribute name="constrainingType" type="QName" use="optional"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-
-    <complexType name="ComponentService">
-        <sequence>
-        	 <element ref="sca:interface" minOccurs="0" maxOccurs="1"/>
-        	 <element name="operation" type="sca:Operation" minOccurs="0" 
-  					maxOccurs="unbounded" />
-    		<choice minOccurs="0" maxOccurs="unbounded">
-    			<element ref="sca:binding" />
-    			<any namespace="##other" processContents="lax"/>
-    		</choice>
-             <element ref="sca:callback" minOccurs="0" maxOccurs="1"/>
-             <!--
-             <any namespace="##other" processContents="lax" minOccurs="0" 
-             	maxOccurs="unbounded"/>
-             -->
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="requires" type="sca:listOfQNames" 
-        	use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" 
-        	use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-
-    <complexType name="ComponentReference">
-		<sequence>
-			<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-			<element name="operation" type="sca:Operation" minOccurs="0" 
-				maxOccurs="unbounded" />
-			<choice minOccurs="0" maxOccurs="unbounded">
-				<element ref="sca:binding" />
-				<any namespace="##other" processContents="lax" />
-			</choice>
-			<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-			<!--
-			<any namespace="##other" processContents="lax" minOccurs="0" 
-				maxOccurs="unbounded" />
-			-->
-		</sequence>
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="target" type="sca:listOfAnyURIs" use="optional"/>
-		<attribute name="multiplicity" type="sca:Multiplicity" 
-			use="optional" default="1..1" />
-		<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-   		<attribute name="policySets" type="sca:listOfQNames" 
-   			use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax" />
-    </complexType>
-
-    <element name="implementation" type="sca:Implementation"
-    	abstract="true" />
-    <complexType name="Implementation" abstract="true">
-    	<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    </complexType>
-
-    <element name="implementationType" type="sca:ImplementationType"/>
-    <complexType name="ImplementationType">
-    	<sequence minOccurs="0" maxOccurs="unbounded">
-    		<any namespace="##other" processContents="lax" />
-    	</sequence>
-    	<attribute name="type" type="QName" use="required"/>
-    	<attribute name="alwaysProvides" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="mayProvide" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-    <complexType name="Wire">
-        <sequence>
-            <any namespace="##other" processContents="lax" minOccurs="0" 
-            	maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="source" type="anyURI" use="required"/>
-        <attribute name="target" type="anyURI" use="required"/>
-        <anyAttribute namespace="##any" processContents="lax"/>     
-    </complexType>
-    
-    <element name="include" type="sca:Include"/>
-    <complexType name="Include">
-		<attribute name="name" type="QName"/>
-		<anyAttribute namespace="##any" processContents="lax"/>   
-	</complexType>
-    
-    <complexType name="Operation">
-    	<attribute name="name" type="NCName" use="required"/>
-    	<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax"/>  	
-    </complexType>
-    
-    <element name="constrainingType" type="sca:ConstrainingType"/>
-    <complexType name="ConstrainingType">
-        <sequence>
-        	<choice minOccurs="0" maxOccurs="unbounded">
-                <element name="service" type="sca:ComponentService"/>
-                <element name="reference" type="sca:ComponentReference"/>
-                <element name="property" type="sca:Property" />
-            </choice>
-            <any namespace="##other" processContents="lax" minOccurs="0"
-            	maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="targetNamespace" type="anyURI"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-
-    <simpleType name="Multiplicity">
-        <restriction base="string">
-            <enumeration value="0..1"/>
-            <enumeration value="1..1"/>
-            <enumeration value="0..n"/>
-            <enumeration value="1..n"/>
-        </restriction>
-    </simpleType>
-
-    <simpleType name="OverrideOptions">
-        <restriction base="string">
-            <enumeration value="no"/>
-            <enumeration value="may"/>
-            <enumeration value="must"/>
-        </restriction>
-    </simpleType>
-    
-    <!-- Global attribute definition for @requires to permit use of intents
-         within WSDL documents -->
-    <attribute name="requires" type="sca:listOfQNames"/>
-    
-    <!-- Global attribute defintion for @endsConversation to mark operations 
-         as ending a conversation -->
-    <attribute name="endsConversation" type="boolean" default="false"/>
-    
-    <simpleType name="listOfQNames">
-    	<list itemType="QName"/>
-    </simpleType>
-    
-    <simpleType name="listOfAnyURIs">
-        <list itemType="anyURI"/>
-    </simpleType>
-
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-definitions.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
deleted file mode 100644
index 0249882a92..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-    <include schemaLocation="sca-policy.xsd"/>
-
-    <element name="definitions">
-       <complexType>
-          <choice minOccurs="0" maxOccurs="unbounded">
-             <element ref="sca:intent"/>
-             <element ref="sca:policySet"/>
-             <element ref="sca:binding"/>
-             <element ref="sca:bindingType"/>
-             <element ref="sca:implementationType"/>
-             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-          </choice>
-          <attribute name="targetNamespace" type="anyURI" use="optional"/>
-       </complexType>
-    </element>
-   
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
deleted file mode 100644
index 87b443fb36..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<xsd:schema xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="qualified">
-
-	<xsd:include schemaLocation="sca-core.xsd" />
-
-	<xsd:element name="implementation.bpel" type="BpelImplementation"
-		substitutionGroup="implementation" />
-
-	<xsd:complexType name="BpelImplementation">
-		<xsd:complexContent>
-			<xsd:extension base="Implementation">
-				<xsd:sequence>
-					<xsd:any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</xsd:sequence>
-				<xsd:attribute name="process" type="xsd:QName" use="required" />
-				<xsd:anyAttribute namespace="##any" processContents="lax" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:element name="interface.partnerLinkType" type="BpelPartnerLinkType"
-		substitutionGroup="interface" />
-
-	<xsd:complexType name="BpelPartnerLinkType">
-		<xsd:complexContent>
-			<xsd:extension base="Interface">
-				<xsd:sequence>
-					<xsd:any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</xsd:sequence>
-				<xsd:attribute name="type" type="xsd:QName" use="required" />
-				<xsd:attribute name="serviceRole" type="xsd:NCName" use="optional" />
-				<xsd:anyAttribute namespace="##any" processContents="lax" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
deleted file mode 100644
index 99669bc672..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-    
-    <include schemaLocation="sca-core.xsd"/>
-    <element name="implementation.composite" type="sca:SCAImplementation"
-        substitutionGroup="sca:implementation"/>
-    <complexType name="SCAImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0"
-                        maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="name" type="QName" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
deleted file mode 100644
index 6f1cf14a4b..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  (c) Copyright SCA Collaboration 2006  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sdo="commonj.sdo/XML"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.cpp" type="sca:CPPImplementation" substitutionGroup="sca:implementation" />
-    <complexType name="CPPImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <element name="method" type="sca:CPPImplementationMethod" minOccurs="0" maxOccurs="unbounded" />
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="library" type="NCName" use="required"/>
-                <attribute name="header" type="NCName" use="required"/>
-                <attribute name="path" type="NCName" use="optional"/>
-                <attribute name="class" type="Name" use="optional"/>
-                <attribute name="scope" type="sca:CPPImplementationScope" use="optional"/>
-                <attribute name="eagerInit" type="boolean" use="optional"/>
-                <attribute name="allowsPassByReference" type="boolean" use="optional"/>
-                <attribute name="conversationMaxAge" type="string" use="optional"/>
-                <attribute name="conversationMaxIdle" type="string" use="optional"/>
-                <attribute name="conversationSinglePrincipal" type="boolean" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <simpleType name="CPPImplementationScope">
-        <restriction base="string">
-            <enumeration value="stateless"/>
-            <enumeration value="composite"/>
-            <enumeration value="request"/>
-            <enumeration value="converstion"/>
-        </restriction>
-    </simpleType>
-
-    <complexType name="CPPImplementationMethod">
-        <complexContent>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="allowsPassByReference" type="boolean" use="optional"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
-        </complexContent>
-    </complexType>
-
-</schema>
-
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
deleted file mode 100644
index 1bca6199cb..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.ejb" type="sca:EJBImplementation" 
-    	substitutionGroup="sca:implementation"/>
-    <complexType name="EJBImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <!--  we might want to make this refer to the JEE ejb-link type -->
-                <attribute name="ejb-link" type="token" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
deleted file mode 100644
index f9d8171b8e..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.java" type="sca:JavaImplementation" 
-    	substitutionGroup="sca:implementation"/>
-    <complexType name="JavaImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="class" type="NCName" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
deleted file mode 100644
index 1cf9fb3ea9..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.spring" type="sca:SpringImplementation" 
-    	substitutionGroup="sca:implementation"/>
-    <complexType name="SpringImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
deleted file mode 100644
index 44f14e5ed5..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  (c) Copyright SCA Collaboration 2006  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.commonj.org/xmlns/sca/1.0/"
-    xmlns:sca="http://www.commonj.org/xmlns/sca/1.0/"
-    xmlns:sdo="commonj.sdo/XML"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="interface.cpp" type="sca:CPPInterface" substitutionGroup="sca:interface"/>
-
-    <complexType name="CPPInterface">
-        <complexContent>
-            <extension base="sca:Interface">
-                <sequence>
-                    <element name="method" type="sca:CPPMethod" minOccurs="0" maxOccurs="unbounded" />
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="header" type="NCName" use="required"/>
-                <attribute name="class" type="Name" use="required"/>
-                <attribute name="callbackHeader" type="NCName" use="optional"/>
-                <attribute name="callbackClass" type="Name" use="optional"/>
-                <attribute name="remotable" type="boolean" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="CPPMethod">
-        <complexContent>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="oneWay" type="boolean" use="optional"/>
-            <attribute name="endConversation" type="boolean" use="optional"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
-        </complexContent>
-    </complexType>
-
-</schema>
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
deleted file mode 100644
index 81f939bdb4..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="interface.java" type="sca:JavaInterface" substitutionGroup="sca:interface"/>
-    <complexType name="JavaInterface">
-        <complexContent>
-            <extension base="sca:Interface">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="interface" type="NCName" use="required"/>
-                <attribute name="callbackInterface" type="NCName" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
deleted file mode 100644
index c1fdfd8f3c..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="interface.wsdl" type="sca:WSDLPortType" substitutionGroup="sca:interface"/>
-    <complexType name="WSDLPortType">
-        <complexContent>
-            <extension base="sca:Interface">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="interface" type="anyURI" use="required"/>
-                <attribute name="callbackInterface" type="anyURI" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-policy.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-policy.xsd
deleted file mode 100644
index c22ffd6618..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-policy.xsd
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
-        elementFormDefault="qualified">
-        
-    <include schemaLocation="sca-core.xsd"/>
-		
-	<element name="intent" type="sca:Intent"/>	
-	<complexType name="Intent">
-		<sequence>
-			<element name="description" type="string" minOccurs="0" maxOccurs="1" />
-			<any namespace="##other" processContents="lax"
-				minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-        <attribute name="name" type="QName" use="required"/>
-		<attribute name="constrains" type="sca:listOfQNames" use="optional"/>
-		<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-		
-	<element name="policySet" type="sca:PolicySet"/>
-	<complexType name="PolicySet">
-		<choice minOccurs="0" maxOccurs="unbounded">
-			<element name="policySetReference" type="sca:PolicySetReference"/>
-			<element name="intentMap" type="sca:IntentMap"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="name" type="QName" use="required"/>
-		<attribute name="provides" type="sca:listOfQNames" use="optional"/>
-		<attribute name="appliesTo" type="string" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-
-	<complexType name="PolicySetReference">
-		<attribute name="name" type="QName" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-	
-	<complexType name="IntentMap">
-		<choice minOccurs="1" maxOccurs="unbounded">
-			<element name="qualifier" type="sca:Qualifier"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="provides" type="QName" use="required"/>
-		<attribute name="default" type="string" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-	
-	<complexType name="Qualifier">
-		<choice minOccurs="1" maxOccurs="unbounded">
-			<element name="intentMap" type="sca:IntentMap"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="name" type="string" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-
-	<element name="allow" type="sca:Allow"/>
-	<complexType name="Allow">
-		<attribute name="roles" type="string" use="required"/>
-	</complexType>
-
-	<element name="permitAll" type="sca:PermitAll"/>
-	<complexType name="PermitAll"/>
-
-	<element name="denyAll" type="sca:DenyAll"/>
-	<complexType name="DenyAll"/>
-
-	<element name="runAs" type="sca:RunAs"/>
-	<complexType name="RunAs">
-		<attribute name="role" type="string" use="required"/>
-	</complexType>
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca.xsd
deleted file mode 100644
index 10f54275d0..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <include schemaLocation="sca-interface-java.xsd"/>
-    <include schemaLocation="sca-interface-wsdl.xsd"/>
-
-    <include schemaLocation="sca-implementation-java.xsd"/>
-    <include schemaLocation="sca-implementation-composite.xsd"/>
-
-    <include schemaLocation="sca-binding-webservice.xsd"/>
-    <include schemaLocation="sca-binding-jms.xsd"/>
-    <include schemaLocation="sca-binding-sca.xsd"/>
-    
-    <include schemaLocation="sca-definitions.xsd"/>
-    <include schemaLocation="sca-policy.xsd"/>
-    
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
deleted file mode 100644
index c93a1d72de..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
+++ /dev/null
@@ -1,41 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.atom" type="t:AtomBinding"/>
-    
-    <complexType name="AtomBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="title" type="string" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
deleted file mode 100644
index d0da5421ec..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
+++ /dev/null
@@ -1,40 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.dwr" type="t:DWRBinding"/>
-    
-    <complexType name="DWRBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
deleted file mode 100644
index ff48b97d7a..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
+++ /dev/null
@@ -1,40 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.http" type="t:HTTPBinding"/>
-    
-    <complexType name="HTTPBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
deleted file mode 100644
index 7c79738898..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
+++ /dev/null
@@ -1,40 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
-    
-    <complexType name="JSONRPCBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
deleted file mode 100644
index 6d5468b2f9..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
+++ /dev/null
@@ -1,42 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.notification" type="t:NotificationBinding"/>
-    
-    <complexType name="NotificationBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="ntm" type="anyURI" use="optional"/>
-                <attribute name="notificationType" type="anyURI" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
deleted file mode 100644
index 26be6feae5..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
+++ /dev/null
@@ -1,40 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.rmi" type="t:RMIBinding"/>
-    
-    <complexType name="RMIBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
deleted file mode 100644
index 821f323d73..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
+++ /dev/null
@@ -1,41 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.rss" type="t:RSSBinding"/>
-    
-    <complexType name="RSSBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="title" type="string" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
deleted file mode 100644
index 1b5c8aece2..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
+++ /dev/null
@@ -1,43 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.node" type="t:NodeImplementation"/>
-    	
-    <complexType name="NodeImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="uri" type="string" use="required"/>
-                <attribute name="composite" type="QName" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
deleted file mode 100644
index f8d437310e..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
+++ /dev/null
@@ -1,42 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.notification" type="t:NotificationImplementation"/>
-    	
-    <complexType name="NotificationImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="name" type="NCName" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
deleted file mode 100644
index f8ece54a07..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
+++ /dev/null
@@ -1,43 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.osgi" type="t:OSGiImplementation"/>
-    	
-    <!-- TODO Declare the proper attributes and elements -->
-    <complexType name="OSGiImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##any" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
deleted file mode 100644
index dd596821ea..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
+++ /dev/null
@@ -1,42 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.resource" type="t:ResourceImplementation"/>
-    	
-    <complexType name="ResourceImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
deleted file mode 100644
index e1723d65f0..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
+++ /dev/null
@@ -1,43 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.script" type="t:ScriptImplementation"/>
-    	
-    <complexType name="ScriptImplementation">
-        <complexContent mixed="true">
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="script" type="anyURI" use="optional"/>
-                <attribute name="language" type="NCName" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
deleted file mode 100644
index 0c0998595f..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
+++ /dev/null
@@ -1,42 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.widget" type="t:WidgetImplementation"/>
-    	
-    <complexType name="WidgetImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
deleted file mode 100644
index cdabb697aa..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
+++ /dev/null
@@ -1,42 +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 xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.xquery" type="t:XQueryImplementation"/>
-    	
-    <complexType name="XQueryImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd b/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
deleted file mode 100644
index da5e696e01..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
+++ /dev/null
@@ -1,45 +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 xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0">
-    
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-all.xsd"/>
-
-    <include schemaLocation="tuscany-sca-binding-atom.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-dwr.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-http.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-jsonrpc.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-notification.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-rmi.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-rss.xsd"/>
-    
-    <!--
-    <include schemaLocation="tuscany-sca-implementation-das.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-data.xsd"/>
-    -->
-    <include schemaLocation="tuscany-sca-implementation-node.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-notification.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-osgi.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-resource.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-script.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-widget.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-xquery.xsd"/>
-    
-</schema>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/LICENSE b/java/sca-contrib/tools/eclipse/plugins/ejava/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF b/java/sca-contrib/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF
deleted file mode 100644
index fb238f04b1..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA JEE Eclipse Plugin

-Bundle-SymbolicName: org.apache.tuscany.sca.plugin.ejava;singleton:=true

-Bundle-Version: 1.4.0

-Import-Package: org.apache.tuscany.sca.plugin.core.classpath,

- org.eclipse.core.resources,

- org.eclipse.core.runtime,

- org.eclipse.core.runtime.jobs,

- org.eclipse.debug.core,

- org.eclipse.debug.core.model,

- org.eclipse.debug.ui,

- org.eclipse.debug.ui.sourcelookup,

- org.eclipse.jdt.core,

- org.eclipse.jdt.debug.ui.launchConfigurations,

- org.eclipse.jdt.launching,

- org.eclipse.jdt.ui.wizards,

- org.eclipse.jface.dialogs,

- org.eclipse.jface.operation,

- org.eclipse.jface.resource,

- org.eclipse.jface.viewers,

- org.eclipse.jface.wizard,

- org.eclipse.osgi.service.datalocation;version="1.0.0",

- org.eclipse.swt,

- org.eclipse.swt.graphics,

- org.eclipse.swt.widgets,

- org.eclipse.ui,

- org.eclipse.ui.progress,

- org.osgi.framework;version="1.3.0"

-Bundle-Vendor: Apache Software Foundation

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.ui.ide

diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/NOTICE b/java/sca-contrib/tools/eclipse/plugins/ejava/NOTICE
deleted file mode 100644
index 8591680386..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/build.properties b/java/sca-contrib/tools/eclipse/plugins/ejava/build.properties
deleted file mode 100644
index c402b2eb45..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               xsd/,\
-               icons/,\
-               .,\
-               LICENSE,\
-               NOTICE,\
-               org/
-src.includes = xsd/,\
-               plugin.xml,\
-               .classpath,\
-               .project,\
-               LICENSE,\
-               META-INF/,\
-               NOTICE,\
-               build.properties,\
-               icons/,\
-               .settings/,\
-               org/,\
-               pom.xml
-jars.compile.order = .
-source.. = .
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java b/java/sca-contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
deleted file mode 100644
index eae6682e3b..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
+++ /dev/null
@@ -1,39 +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.plugin.ejava.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-
-
-/**
- * A classpath container for the core runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class EJavaClasspathContainer extends BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    public EJavaClasspathContainer() {
-        super("org.apache.tuscany.sca.plugin.ejava",
-              "org.apache.tuscany.sca.plugin.ejava.runtime.library", "Tuscany SCA JEE Library", 
-              "tuscany-sca", "tuscany-distribution-ejava", "1.4-EQUINOX-SNAPSHOT",
-              "TUSCANY_HOME", "TUSCANY_SRC");
-    }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java b/java/sca-contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
deleted file mode 100644
index 9b7c199c79..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
+++ /dev/null
@@ -1,38 +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.plugin.ejava.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.ejava.classpath.EJavaClasspathContainer;
-
-
-/**
- * A classpath container initializer for the core runtime.
- *
- * @version $Rev$ $Date$
- */
-public class EJavaClasspathContainerInitializer extends BaseClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    public EJavaClasspathContainerInitializer() {
-        super(new EJavaClasspathContainer());
-    }
-
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/plugin.xml b/java/sca-contrib/tools/eclipse/plugins/ejava/plugin.xml
deleted file mode 100644
index fef1afe0b9..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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.    
--->
-<plugin>
-
-	<extension
-       point="org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer">
-    	<runtimeClasspathContainerInitializer
-    			id="org.apache.tuscany.sca.plugin.ejava.runtime.library"
-				class="org.apache.tuscany.sca.plugin.ejava.classpath.EJavaClasspathContainerInitializer"/>                       
-	</extension>	
-
-</plugin>
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/pom.xml b/java/sca-contrib/tools/eclipse/plugins/ejava/pom.xml
deleted file mode 100644
index 8ee4460619..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/pom.xml
+++ /dev/null
@@ -1,151 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-eclipse-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>org.apache.tuscany.sca.plugin.ejava</artifactId>

-    <name>Apache Tuscany SCA JEE Eclipse Plugin</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.eclipse.jdt.debug</groupId>

-            <artifactId>ui</artifactId>

-            <version>3.2.100-v20070531-1800</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.eclipse.equinox</groupId>

-                    <artifactId>common</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.eclipse.equinox</groupId>

-                    <artifactId>app</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.eclipse.equinox</groupId>

-            <artifactId>app</artifactId>

-            <version>1.0.0-v20070606</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.eclipse.equinox</groupId>

-            <artifactId>common</artifactId>

-            <version>3.3.0-v20070426</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.eclipse.swt.win32.win32</groupId>

-            <artifactId>x86</artifactId>

-            <version>3.3.0-v3346</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-ejava</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <type>zip</type>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-ejava</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <classifier>src</classifier>

-            <type>zip</type>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <sourceDirectory>${basedir}</sourceDirectory>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/*.java</exclude>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.*</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-       

-       <plugins>

-           <plugin>

-               <groupId>org.apache.maven.plugins</groupId>

-               <artifactId>maven-jar-plugin</artifactId>

-               <configuration>

-                   <classifier>tmp</classifier>

-                   <archive>

-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                   </archive>

-               </configuration>

-            </plugin>

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-assembly-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>distribution-package</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>single</goal>

-                        </goals>

-                        <configuration>

-                            <descriptors>

-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>

-                            </descriptors>

-                            <tarLongFileMode>gnu</tarLongFileMode>

-                            <appendAssemblyId>false</appendAssemblyId>

-                            <archive>

-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                            </archive>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-    <repositories>

-        <repository>

-            <id>repo1.eclipse</id>

-            <url>http://repo1.maven.org/eclipse/</url>

-            <snapshots>

-                <enabled>true</enabled>

-            </snapshots>

-        </repository>

-    </repositories>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/LICENSE b/java/sca-contrib/tools/eclipse/plugins/manager/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/manager/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF b/java/sca-contrib/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF
deleted file mode 100644
index 2a70682fae..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Domain Manager Eclipse Plugin

-Bundle-SymbolicName: org.apache.tuscany.sca.plugin.manager;singleton:=true

-Bundle-Version: 1.4.0

-Import-Package: org.apache.tuscany.sca.plugin.core.classpath,

- org.eclipse.core.resources,

- org.eclipse.core.runtime,

- org.eclipse.core.runtime.jobs,

- org.eclipse.debug.core,

- org.eclipse.debug.core.model,

- org.eclipse.debug.ui,

- org.eclipse.debug.ui.sourcelookup,

- org.eclipse.jdt.core,

- org.eclipse.jdt.debug.ui.launchConfigurations,

- org.eclipse.jdt.launching,

- org.eclipse.jdt.ui.wizards,

- org.eclipse.jface.dialogs,

- org.eclipse.jface.operation,

- org.eclipse.jface.resource,

- org.eclipse.jface.viewers,

- org.eclipse.jface.wizard,

- org.eclipse.osgi.service.datalocation;version="1.0.0",

- org.eclipse.swt,

- org.eclipse.swt.graphics,

- org.eclipse.swt.widgets,

- org.eclipse.ui,

- org.eclipse.ui.progress,

- org.osgi.framework;version="1.3.0"

-Bundle-Vendor: Apache Software Foundation

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.ui.ide

diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/NOTICE b/java/sca-contrib/tools/eclipse/plugins/manager/NOTICE
deleted file mode 100644
index 8591680386..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/manager/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/build.properties b/java/sca-contrib/tools/eclipse/plugins/manager/build.properties
deleted file mode 100644
index c402b2eb45..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/manager/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               xsd/,\
-               icons/,\
-               .,\
-               LICENSE,\
-               NOTICE,\
-               org/
-src.includes = xsd/,\
-               plugin.xml,\
-               .classpath,\
-               .project,\
-               LICENSE,\
-               META-INF/,\
-               NOTICE,\
-               build.properties,\
-               icons/,\
-               .settings/,\
-               org/,\
-               pom.xml
-jars.compile.order = .
-source.. = .
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java b/java/sca-contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
deleted file mode 100644
index 3676883f87..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
+++ /dev/null
@@ -1,39 +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.plugin.manager.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-
-
-/**
- * A classpath container for the core runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class ManagerClasspathContainer extends BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    public ManagerClasspathContainer() {
-        super("org.apache.tuscany.sca.plugin.manager",
-              "org.apache.tuscany.sca.plugin.manager.runtime.library", "Tuscany SCA Domain Manager Library", 
-              "tuscany-sca", "tuscany-distribution-manager", "1.4-EQUINOX-SNAPSHOT",
-              "TUSCANY_HOME", "TUSCANY_SRC");
-    }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java b/java/sca-contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
deleted file mode 100644
index 9c7df0f488..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
+++ /dev/null
@@ -1,38 +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.plugin.manager.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.manager.classpath.ManagerClasspathContainer;
-
-
-/**
- * A classpath container initializer for the core runtime.
- *
- * @version $Rev$ $Date$
- */
-public class ManagerClasspathContainerInitializer extends BaseClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    public ManagerClasspathContainerInitializer() {
-        super(new ManagerClasspathContainer());
-    }
-
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/plugin.xml b/java/sca-contrib/tools/eclipse/plugins/manager/plugin.xml
deleted file mode 100644
index 2e09146dfd..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/manager/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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.    
--->
-<plugin>
-
-	<extension
-       point="org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer">
-    	<runtimeClasspathContainerInitializer
-    			id="org.apache.tuscany.sca.plugin.manager.runtime.library"
-				class="org.apache.tuscany.sca.plugin.manager.classpath.ManagerClasspathContainerInitializer"/>                       
-	</extension>	
-
-</plugin>
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/pom.xml b/java/sca-contrib/tools/eclipse/plugins/manager/pom.xml
deleted file mode 100644
index 52c70147c0..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/manager/pom.xml
+++ /dev/null
@@ -1,151 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-eclipse-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>org.apache.tuscany.sca.plugin.manager</artifactId>

-    <name>Apache Tuscany SCA Domain Manager Eclipse Plugin</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.eclipse.jdt.debug</groupId>

-            <artifactId>ui</artifactId>

-            <version>3.2.100-v20070531-1800</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.eclipse.equinox</groupId>

-                    <artifactId>common</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.eclipse.equinox</groupId>

-                    <artifactId>app</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.eclipse.equinox</groupId>

-            <artifactId>app</artifactId>

-            <version>1.0.0-v20070606</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.eclipse.equinox</groupId>

-            <artifactId>common</artifactId>

-            <version>3.3.0-v20070426</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.eclipse.swt.win32.win32</groupId>

-            <artifactId>x86</artifactId>

-            <version>3.3.0-v3346</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-manager</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <type>zip</type>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-manager</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <classifier>src</classifier>

-            <type>zip</type>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <sourceDirectory>${basedir}</sourceDirectory>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/*.java</exclude>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.*</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-       

-       <plugins>

-           <plugin>

-               <groupId>org.apache.maven.plugins</groupId>

-               <artifactId>maven-jar-plugin</artifactId>

-               <configuration>

-                   <classifier>tmp</classifier>

-                   <archive>

-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                   </archive>

-               </configuration>

-            </plugin>

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-assembly-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>distribution-package</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>single</goal>

-                        </goals>

-                        <configuration>

-                            <descriptors>

-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>

-                            </descriptors>

-                            <tarLongFileMode>gnu</tarLongFileMode>

-                            <appendAssemblyId>false</appendAssemblyId>

-                            <archive>

-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                            </archive>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-    <repositories>

-        <repository>

-            <id>repo1.eclipse</id>

-            <url>http://repo1.maven.org/eclipse/</url>

-            <snapshots>

-                <enabled>true</enabled>

-            </snapshots>

-        </repository>

-    </repositories>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/plugins/process/LICENSE b/java/sca-contrib/tools/eclipse/plugins/process/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/process/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/META-INF/MANIFEST.MF b/java/sca-contrib/tools/eclipse/plugins/process/META-INF/MANIFEST.MF
deleted file mode 100644
index 0acd32e51c..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/process/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Process Eclipse Plugin

-Bundle-SymbolicName: org.apache.tuscany.sca.plugin.process;singleton:=true

-Bundle-Version: 1.4.0

-Import-Package: org.apache.tuscany.sca.plugin.core.classpath,

- org.eclipse.core.resources,

- org.eclipse.core.runtime,

- org.eclipse.core.runtime.jobs,

- org.eclipse.debug.core,

- org.eclipse.debug.core.model,

- org.eclipse.debug.ui,

- org.eclipse.debug.ui.sourcelookup,

- org.eclipse.jdt.core,

- org.eclipse.jdt.debug.ui.launchConfigurations,

- org.eclipse.jdt.launching,

- org.eclipse.jdt.ui.wizards,

- org.eclipse.jface.dialogs,

- org.eclipse.jface.operation,

- org.eclipse.jface.resource,

- org.eclipse.jface.viewers,

- org.eclipse.jface.wizard,

- org.eclipse.osgi.service.datalocation;version="1.0.0",

- org.eclipse.swt,

- org.eclipse.swt.graphics,

- org.eclipse.swt.widgets,

- org.eclipse.ui,

- org.eclipse.ui.progress,

- org.osgi.framework;version="1.3.0"

-Bundle-Vendor: Apache Software Foundation

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.ui.ide

diff --git a/java/sca-contrib/tools/eclipse/plugins/process/NOTICE b/java/sca-contrib/tools/eclipse/plugins/process/NOTICE
deleted file mode 100644
index 8591680386..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/process/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/build.properties b/java/sca-contrib/tools/eclipse/plugins/process/build.properties
deleted file mode 100644
index c402b2eb45..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/process/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               xsd/,\
-               icons/,\
-               .,\
-               LICENSE,\
-               NOTICE,\
-               org/
-src.includes = xsd/,\
-               plugin.xml,\
-               .classpath,\
-               .project,\
-               LICENSE,\
-               META-INF/,\
-               NOTICE,\
-               build.properties,\
-               icons/,\
-               .settings/,\
-               org/,\
-               pom.xml
-jars.compile.order = .
-source.. = .
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java b/java/sca-contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
deleted file mode 100644
index 225fa67b58..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
+++ /dev/null
@@ -1,39 +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.plugin.process.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-
-
-/**
- * A classpath container for the core runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class ProcessClasspathContainer extends BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    public ProcessClasspathContainer() {
-        super("org.apache.tuscany.sca.plugin.process",
-              "org.apache.tuscany.sca.plugin.process.runtime.library", "Tuscany SCA Process Library", 
-              "tuscany-sca", "tuscany-distribution-process", "1.4-EQUINOX-SNAPSHOT",
-              "TUSCANY_HOME", "TUSCANY_SRC");
-    }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java b/java/sca-contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
deleted file mode 100644
index dab0eeaadc..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
+++ /dev/null
@@ -1,38 +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.plugin.process.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.process.classpath.ProcessClasspathContainer;
-
-
-/**
- * A classpath container initializer for the core runtime.
- *
- * @version $Rev$ $Date$
- */
-public class ProcessClasspathContainerInitializer extends BaseClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    public ProcessClasspathContainerInitializer() {
-        super(new ProcessClasspathContainer());
-    }
-
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/plugin.xml b/java/sca-contrib/tools/eclipse/plugins/process/plugin.xml
deleted file mode 100644
index 3e5f87f634..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/process/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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.    
--->
-<plugin>
-
-	<extension
-       point="org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer">
-    	<runtimeClasspathContainerInitializer
-    			id="org.apache.tuscany.sca.plugin.process.runtime.library"
-				class="org.apache.tuscany.sca.plugin.process.classpath.ProcessClasspathContainerInitializer"/>                       
-	</extension>	
-
-</plugin>
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/pom.xml b/java/sca-contrib/tools/eclipse/plugins/process/pom.xml
deleted file mode 100644
index 5bb4e38656..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/process/pom.xml
+++ /dev/null
@@ -1,151 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-eclipse-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>org.apache.tuscany.sca.plugin.process</artifactId>

-    <name>Apache Tuscany SCA Process Eclipse Plugin</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.eclipse.jdt.debug</groupId>

-            <artifactId>ui</artifactId>

-            <version>3.2.100-v20070531-1800</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.eclipse.equinox</groupId>

-                    <artifactId>common</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.eclipse.equinox</groupId>

-                    <artifactId>app</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.eclipse.equinox</groupId>

-            <artifactId>app</artifactId>

-            <version>1.0.0-v20070606</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.eclipse.equinox</groupId>

-            <artifactId>common</artifactId>

-            <version>3.3.0-v20070426</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.eclipse.swt.win32.win32</groupId>

-            <artifactId>x86</artifactId>

-            <version>3.3.0-v3346</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-process</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <type>zip</type>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-process</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <classifier>src</classifier>

-            <type>zip</type>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <sourceDirectory>${basedir}</sourceDirectory>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/*.java</exclude>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.*</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-       

-       <plugins>

-           <plugin>

-               <groupId>org.apache.maven.plugins</groupId>

-               <artifactId>maven-jar-plugin</artifactId>

-               <configuration>

-                   <classifier>tmp</classifier>

-                   <archive>

-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                   </archive>

-               </configuration>

-            </plugin>

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-assembly-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>distribution-package</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>single</goal>

-                        </goals>

-                        <configuration>

-                            <descriptors>

-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>

-                            </descriptors>

-                            <tarLongFileMode>gnu</tarLongFileMode>

-                            <appendAssemblyId>false</appendAssemblyId>

-                            <archive>

-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                            </archive>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-    <repositories>

-        <repository>

-            <id>repo1.eclipse</id>

-            <url>http://repo1.maven.org/eclipse/</url>

-            <snapshots>

-                <enabled>true</enabled>

-            </snapshots>

-        </repository>

-    </repositories>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/LICENSE b/java/sca-contrib/tools/eclipse/plugins/web20/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/web20/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF b/java/sca-contrib/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF
deleted file mode 100644
index 3c2816ec4b..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Web 2.0 Eclipse Plugin

-Bundle-SymbolicName: org.apache.tuscany.sca.plugin.web20;singleton:=true

-Bundle-Version: 1.4.0

-Import-Package: org.apache.tuscany.sca.plugin.core.classpath,

- org.eclipse.core.resources,

- org.eclipse.core.runtime,

- org.eclipse.core.runtime.jobs,

- org.eclipse.debug.core,

- org.eclipse.debug.core.model,

- org.eclipse.debug.ui,

- org.eclipse.debug.ui.sourcelookup,

- org.eclipse.jdt.core,

- org.eclipse.jdt.debug.ui.launchConfigurations,

- org.eclipse.jdt.launching,

- org.eclipse.jdt.ui.wizards,

- org.eclipse.jface.dialogs,

- org.eclipse.jface.operation,

- org.eclipse.jface.resource,

- org.eclipse.jface.viewers,

- org.eclipse.jface.wizard,

- org.eclipse.osgi.service.datalocation;version="1.0.0",

- org.eclipse.swt,

- org.eclipse.swt.graphics,

- org.eclipse.swt.widgets,

- org.eclipse.ui,

- org.eclipse.ui.progress,

- org.osgi.framework;version="1.3.0"

-Bundle-Vendor: Apache Software Foundation

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.ui.ide

diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/NOTICE b/java/sca-contrib/tools/eclipse/plugins/web20/NOTICE
deleted file mode 100644
index 8591680386..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/web20/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/build.properties b/java/sca-contrib/tools/eclipse/plugins/web20/build.properties
deleted file mode 100644
index c402b2eb45..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/web20/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               xsd/,\
-               icons/,\
-               .,\
-               LICENSE,\
-               NOTICE,\
-               org/
-src.includes = xsd/,\
-               plugin.xml,\
-               .classpath,\
-               .project,\
-               LICENSE,\
-               META-INF/,\
-               NOTICE,\
-               build.properties,\
-               icons/,\
-               .settings/,\
-               org/,\
-               pom.xml
-jars.compile.order = .
-source.. = .
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java b/java/sca-contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
deleted file mode 100644
index e153ad3d25..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
+++ /dev/null
@@ -1,39 +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.plugin.web20.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-
-
-/**
- * A classpath container for the core runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class Web20ClasspathContainer extends BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    public Web20ClasspathContainer() {
-        super("org.apache.tuscany.sca.plugin.web20",
-              "org.apache.tuscany.sca.plugin.web20.runtime.library", "Tuscany SCA Web 2.0 Library", 
-              "tuscany-sca", "tuscany-distribution-web20", "1.4-EQUINOX-SNAPSHOT",
-              "TUSCANY_HOME", "TUSCANY_SRC");
-    }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java b/java/sca-contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
deleted file mode 100644
index 96026db08e..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
+++ /dev/null
@@ -1,38 +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.plugin.web20.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.web20.classpath.Web20ClasspathContainer;
-
-
-/**
- * A classpath container initializer for the core runtime.
- *
- * @version $Rev$ $Date$
- */
-public class Web20ClasspathContainerInitializer extends BaseClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    public Web20ClasspathContainerInitializer() {
-        super(new Web20ClasspathContainer());
-    }
-
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/plugin.xml b/java/sca-contrib/tools/eclipse/plugins/web20/plugin.xml
deleted file mode 100644
index 6bf9087474..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/web20/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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.    
--->
-<plugin>
-
-	<extension
-       point="org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer">
-    	<runtimeClasspathContainerInitializer
-    			id="org.apache.tuscany.sca.plugin.web20.runtime.library"
-				class="org.apache.tuscany.sca.plugin.web20.classpath.Web20ClasspathContainerInitializer"/>                       
-	</extension>	
-
-</plugin>
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/pom.xml b/java/sca-contrib/tools/eclipse/plugins/web20/pom.xml
deleted file mode 100644
index 8c6c60ceed..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/web20/pom.xml
+++ /dev/null
@@ -1,151 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-eclipse-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>org.apache.tuscany.sca.plugin.web20</artifactId>

-    <name>Apache Tuscany SCA Web 2.0 Eclipse Plugin</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.eclipse.jdt.debug</groupId>

-            <artifactId>ui</artifactId>

-            <version>3.2.100-v20070531-1800</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.eclipse.equinox</groupId>

-                    <artifactId>common</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.eclipse.equinox</groupId>

-                    <artifactId>app</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.eclipse.equinox</groupId>

-            <artifactId>app</artifactId>

-            <version>1.0.0-v20070606</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.eclipse.equinox</groupId>

-            <artifactId>common</artifactId>

-            <version>3.3.0-v20070426</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.eclipse.swt.win32.win32</groupId>

-            <artifactId>x86</artifactId>

-            <version>3.3.0-v3346</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-web20</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <type>zip</type>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-web20</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <classifier>src</classifier>

-            <type>zip</type>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <sourceDirectory>${basedir}</sourceDirectory>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/*.java</exclude>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.*</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-       

-       <plugins>

-           <plugin>

-               <groupId>org.apache.maven.plugins</groupId>

-               <artifactId>maven-jar-plugin</artifactId>

-               <configuration>

-                   <classifier>tmp</classifier>

-                   <archive>

-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                   </archive>

-               </configuration>

-            </plugin>

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-assembly-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>distribution-package</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>single</goal>

-                        </goals>

-                        <configuration>

-                            <descriptors>

-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>

-                            </descriptors>

-                            <tarLongFileMode>gnu</tarLongFileMode>

-                            <appendAssemblyId>false</appendAssemblyId>

-                            <archive>

-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                            </archive>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-    <repositories>

-        <repository>

-            <id>repo1.eclipse</id>

-            <url>http://repo1.maven.org/eclipse/</url>

-            <snapshots>

-                <enabled>true</enabled>

-            </snapshots>

-        </repository>

-    </repositories>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/LICENSE b/java/sca-contrib/tools/eclipse/plugins/webservice/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF b/java/sca-contrib/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF
deleted file mode 100644
index 9d83fd9b6b..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Web Service Eclipse Plugin

-Bundle-SymbolicName: org.apache.tuscany.sca.plugin.webservice;singleton:=true

-Bundle-Version: 1.4.0

-Import-Package: org.apache.tuscany.sca.plugin.core.classpath,

- org.eclipse.core.resources,

- org.eclipse.core.runtime,

- org.eclipse.core.runtime.jobs,

- org.eclipse.debug.core,

- org.eclipse.debug.core.model,

- org.eclipse.debug.ui,

- org.eclipse.debug.ui.sourcelookup,

- org.eclipse.jdt.core,

- org.eclipse.jdt.debug.ui.launchConfigurations,

- org.eclipse.jdt.launching,

- org.eclipse.jdt.ui.wizards,

- org.eclipse.jface.dialogs,

- org.eclipse.jface.operation,

- org.eclipse.jface.resource,

- org.eclipse.jface.viewers,

- org.eclipse.jface.wizard,

- org.eclipse.osgi.service.datalocation;version="1.0.0",

- org.eclipse.swt,

- org.eclipse.swt.graphics,

- org.eclipse.swt.widgets,

- org.eclipse.ui,

- org.eclipse.ui.progress,

- org.osgi.framework;version="1.3.0"

-Bundle-Vendor: Apache Software Foundation

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.ui.ide

diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/NOTICE b/java/sca-contrib/tools/eclipse/plugins/webservice/NOTICE
deleted file mode 100644
index 8591680386..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/build.properties b/java/sca-contrib/tools/eclipse/plugins/webservice/build.properties
deleted file mode 100644
index c402b2eb45..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               xsd/,\
-               icons/,\
-               .,\
-               LICENSE,\
-               NOTICE,\
-               org/
-src.includes = xsd/,\
-               plugin.xml,\
-               .classpath,\
-               .project,\
-               LICENSE,\
-               META-INF/,\
-               NOTICE,\
-               build.properties,\
-               icons/,\
-               .settings/,\
-               org/,\
-               pom.xml
-jars.compile.order = .
-source.. = .
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java b/java/sca-contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
deleted file mode 100644
index f588dc191c..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
+++ /dev/null
@@ -1,39 +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.plugin.webservice.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-
-
-/**
- * A classpath container for the core runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class WebServiceClasspathContainer extends BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    public WebServiceClasspathContainer() {
-        super("org.apache.tuscany.sca.plugin.webservice",
-              "org.apache.tuscany.sca.plugin.webservice.runtime.library", "Tuscany SCA Web Service Library", 
-              "tuscany-sca", "tuscany-distribution-webservice", "1.4-EQUINOX-SNAPSHOT",
-              "TUSCANY_HOME", "TUSCANY_SRC");
-    }
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java b/java/sca-contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
deleted file mode 100644
index 6310209c3a..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
+++ /dev/null
@@ -1,38 +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.plugin.webservice.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.webservice.classpath.WebServiceClasspathContainer;
-
-
-/**
- * A classpath container initializer for the core runtime.
- *
- * @version $Rev$ $Date$
- */
-public class WebServiceClasspathContainerInitializer extends BaseClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    public WebServiceClasspathContainerInitializer() {
-        super(new WebServiceClasspathContainer());
-    }
-
-}
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/plugin.xml b/java/sca-contrib/tools/eclipse/plugins/webservice/plugin.xml
deleted file mode 100644
index 1fd46d3e75..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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.    
--->
-<plugin>
-
-	<extension
-       point="org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer">
-    	<runtimeClasspathContainerInitializer
-    			id="org.apache.tuscany.sca.plugin.webservice.runtime.library"
-				class="org.apache.tuscany.sca.plugin.webservice.classpath.WebServiceClasspathContainerInitializer"/>                       
-	</extension>	
-
-</plugin>
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/pom.xml b/java/sca-contrib/tools/eclipse/plugins/webservice/pom.xml
deleted file mode 100644
index 9576b496e7..0000000000
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/pom.xml
+++ /dev/null
@@ -1,151 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-eclipse-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>org.apache.tuscany.sca.plugin.webservice</artifactId>

-    <name>Apache Tuscany SCA Web Service Eclipse Plugin</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.eclipse.jdt.debug</groupId>

-            <artifactId>ui</artifactId>

-            <version>3.2.100-v20070531-1800</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.eclipse.equinox</groupId>

-                    <artifactId>common</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.eclipse.equinox</groupId>

-                    <artifactId>app</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.eclipse.equinox</groupId>

-            <artifactId>app</artifactId>

-            <version>1.0.0-v20070606</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.eclipse.equinox</groupId>

-            <artifactId>common</artifactId>

-            <version>3.3.0-v20070426</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.eclipse.swt.win32.win32</groupId>

-            <artifactId>x86</artifactId>

-            <version>3.3.0-v3346</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-webservice</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <type>zip</type>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-webservice</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <classifier>src</classifier>

-            <type>zip</type>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <sourceDirectory>${basedir}</sourceDirectory>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/*.java</exclude>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.*</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-       

-       <plugins>

-           <plugin>

-               <groupId>org.apache.maven.plugins</groupId>

-               <artifactId>maven-jar-plugin</artifactId>

-               <configuration>

-                   <classifier>tmp</classifier>

-                   <archive>

-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                   </archive>

-               </configuration>

-            </plugin>

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-assembly-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>distribution-package</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>single</goal>

-                        </goals>

-                        <configuration>

-                            <descriptors>

-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>

-                            </descriptors>

-                            <tarLongFileMode>gnu</tarLongFileMode>

-                            <appendAssemblyId>false</appendAssemblyId>

-                            <archive>

-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>

-                            </archive>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-    <repositories>

-        <repository>

-            <id>repo1.eclipse</id>

-            <url>http://repo1.maven.org/eclipse/</url>

-            <snapshots>

-                <enabled>true</enabled>

-            </snapshots>

-        </repository>

-    </repositories>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/pom.xml b/java/sca-contrib/tools/eclipse/pom.xml
deleted file mode 100644
index 085218098c..0000000000
--- a/java/sca-contrib/tools/eclipse/pom.xml
+++ /dev/null
@@ -1,75 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <packaging>pom</packaging>

-    <artifactId>tuscany-sca-eclipse-tools</artifactId>

-    <name>Apache Tuscany SCA Eclipse Tools</name>

-

-    <profiles>

-        <profile>

-            <id>distribution</id>

-            <modules>

-<!-- 

-                <module>features/core</module>

-                <module>features/ejava</module>

-                <module>features/manager</module>

-                <module>features/process</module>

-                <module>features/web20</module>

-                <module>features/webservice</module>

-                <module>plugins/core</module>

-                <module>plugins/ejava</module>

-                <module>plugins/manager</module>

-                <module>plugins/process</module>

-                <module>plugins/web20</module>

-                <module>plugins/webservice</module>

-                <module>site/updatesite</module>

--->

-            </modules>

-        </profile>

-

-        <profile>

-            <id>eclipse</id>

-            <modules>

-                <module>features/core</module>

-                <module>features/ejava</module>

-                <module>features/manager</module>

-                <module>features/process</module>

-                <module>features/web20</module>

-                <module>features/webservice</module>

-                <module>plugins/core</module>

-                <module>plugins/ejava</module>

-                <module>plugins/manager</module>

-                <module>plugins/process</module>

-                <module>plugins/web20</module>

-                <module>plugins/webservice</module>

-                <module>site/updatesite</module>

-            </modules>

-        </profile>

-    </profiles>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/site/updatesite/LICENSE b/java/sca-contrib/tools/eclipse/site/updatesite/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/eclipse/site/updatesite/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/eclipse/site/updatesite/NOTICE b/java/sca-contrib/tools/eclipse/site/updatesite/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/tools/eclipse/site/updatesite/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/tools/eclipse/site/updatesite/etc/generate-p2.sh b/java/sca-contrib/tools/eclipse/site/updatesite/etc/generate-p2.sh
deleted file mode 100755
index ea2eb865f4..0000000000
--- a/java/sca-contrib/tools/eclipse/site/updatesite/etc/generate-p2.sh
+++ /dev/null
@@ -1,29 +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. 
-
-# After building the updatesite Zip, this script can be used to generate the
-# Eclipse Ganymede P2 metadata for the site.
-
-rm -rf target/p2-tmp
-mkdir target/p2-tmp
-cd target/p2-tmp
-unzip ../apache-tuscany-sca-1.4-SNAPSHOT-updatesite.zip
-
-eclipse -nosplash -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator -updateSite tuscany-sca-1.4-SNAPSHOT-updatesite/ -site file:tuscany-sca-1.4-SNAPSHOT-updatesite/site.xml -metadataRepository file:tuscany-sca-1.4-SNAPSHOT-updatesite/ -metadataRepositoryName "Apache Tuscany SCA Eclipse Update Site." -artifactRepository file:tuscany-sca-1.4-SNAPSHOT-updatesite/ -artifactRepositoryName "Eclipse Ganymede Artifacts" -noDefaultIUs -vmargs -Xmx256m
-
-zip ../apache-tuscany-sca-1.4-SNAPSHOT-updatesite.zip tuscany-sca-1.4-SNAPSHOT-updatesite/artifacts.xml tuscany-sca-1.4-SNAPSHOT-updatesite/content.xml
-
diff --git a/java/sca-contrib/tools/eclipse/site/updatesite/pom.xml b/java/sca-contrib/tools/eclipse/site/updatesite/pom.xml
deleted file mode 100644
index 7d09e62517..0000000000
--- a/java/sca-contrib/tools/eclipse/site/updatesite/pom.xml
+++ /dev/null
@@ -1,145 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-eclipse-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>org.apache.tuscany.sca.updatesite</artifactId>

-    <name>Apache Tuscany SCA Eclipse Update Site</name>

-

-    <properties>

-        <tuscany.version>${pom.version}</tuscany.version>

-    </properties>

-    

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.feature.core</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.plugin.ejava</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.feature.ejava</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.plugin.manager</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.feature.manager</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.plugin.process</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.feature.process</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.plugin.web20</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.feature.web20</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.plugin.webservice</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>org.apache.tuscany.sca.feature.webservice</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.*</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-       

-       <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-assembly-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>updatesite-package</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>single</goal>

-                        </goals>

-                        <configuration>

-                            <descriptors>

-                                <descriptor>src/main/assembly/updatesite.xml</descriptor>

-                            </descriptors>

-                            <tarLongFileMode>gnu</tarLongFileMode>

-                            <finalName>apache-tuscany-sca-${pom.version}</finalName>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/tools/eclipse/site/updatesite/site.xml b/java/sca-contrib/tools/eclipse/site/updatesite/site.xml
deleted file mode 100644
index 3cc6241929..0000000000
--- a/java/sca-contrib/tools/eclipse/site/updatesite/site.xml
+++ /dev/null
@@ -1,90 +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.

--->

-<site>

-   <description url="http://incubator.apache.org/tuscany">

-      Apache Tuscany SCA Eclipse Update Site.

-   </description>

-   

-   <feature url="features/org.apache.tuscany.sca.feature.core-2.0-SNAPSHOT.jar"

-      id="org.apache.tuscany.sca.feature.core" version="1.4.0">

-      <category name="org.apache.tuscany.sca.core.features"/>

-   </feature>

-   

-   <feature url="features/org.apache.tuscany.sca.feature.ejava-2.0-SNAPSHOT.jar"

-      id="org.apache.tuscany.sca.feature.ejava" version="1.4.0">

-      <category name="org.apache.tuscany.sca.optional.features"/>

-   </feature>

-   

-   <feature url="features/org.apache.tuscany.sca.feature.manager-2.0-SNAPSHOT.jar"

-      id="org.apache.tuscany.sca.feature.manager" version="1.4.0">

-      <category name="org.apache.tuscany.sca.core.features"/>

-   </feature>

-   

-   <feature url="features/org.apache.tuscany.sca.feature.process-2.0-SNAPSHOT.jar"

-      id="org.apache.tuscany.sca.feature.process" version="1.4.0">

-      <category name="org.apache.tuscany.sca.optional.features"/>

-   </feature>

-   

-   <feature url="features/org.apache.tuscany.sca.feature.web20-2.0-SNAPSHOT.jar"

-      id="org.apache.tuscany.sca.feature.web20" version="1.4.0">

-      <category name="org.apache.tuscany.sca.optional.features"/>

-   </feature>

-   

-   <feature url="features/org.apache.tuscany.sca.feature.webservice-2.0-SNAPSHOT.jar"

-      id="org.apache.tuscany.sca.feature.webservice" version="1.4.0">

-      <category name="org.apache.tuscany.sca.optional.features"/>

-   </feature>

-   

-   <archive path="features/org.apache.tuscany.sca.feature.core_1.4.0.jar"

-      url="features/org.apache.tuscany.sca.feature.core-2.0-SNAPSHOT.jar"/>

-   <archive path="plugins/org.apache.tuscany.sca.plugin.core_1.4.0.jar"

-      url="plugins/org.apache.tuscany.sca.plugin.core-2.0-SNAPSHOT.jar"/>

-      

-   <archive path="features/org.apache.tuscany.sca.feature.ejava_1.4.0.jar"

-      url="features/org.apache.tuscany.sca.feature.ejava-2.0-SNAPSHOT.jar"/>

-   <archive path="plugins/org.apache.tuscany.sca.plugin.ejava_1.4.0.jar"

-      url="plugins/org.apache.tuscany.sca.plugin.ejava-2.0-SNAPSHOT.jar"/>

-      

-   <archive path="features/org.apache.tuscany.sca.feature.manager_1.4.0.jar"

-      url="features/org.apache.tuscany.sca.feature.manager-2.0-SNAPSHOT.jar"/>

-   <archive path="plugins/org.apache.tuscany.sca.plugin.manager_1.4.0.jar"

-      url="plugins/org.apache.tuscany.sca.plugin.manager-2.0-SNAPSHOT.jar"/>

-      

-   <archive path="features/org.apache.tuscany.sca.feature.process_1.4.0.jar"

-      url="features/org.apache.tuscany.sca.feature.process-2.0-SNAPSHOT.jar"/>

-   <archive path="plugins/org.apache.tuscany.sca.plugin.process_1.4.0.jar"

-      url="plugins/org.apache.tuscany.sca.plugin.process-2.0-SNAPSHOT.jar"/>

-      

-   <archive path="features/org.apache.tuscany.sca.feature.web20_1.4.0.jar"

-      url="features/org.apache.tuscany.sca.feature.web20-2.0-SNAPSHOT.jar"/>

-   <archive path="plugins/org.apache.tuscany.sca.plugin.web20_1.4.0.jar"

-      url="plugins/org.apache.tuscany.sca.plugin.web20-2.0-SNAPSHOT.jar"/>

-

-   <archive path="features/org.apache.tuscany.sca.feature.webservice_1.4.0.jar"

-      url="features/org.apache.tuscany.sca.feature.webservice-2.0-SNAPSHOT.jar"/>

-   <archive path="plugins/org.apache.tuscany.sca.plugin.webservice_1.4.0.jar"

-      url="plugins/org.apache.tuscany.sca.plugin.webservice-2.0-SNAPSHOT.jar"/>

-

-   <category-def name="org.apache.tuscany.sca.core.features"

-      label="Core Features"/>

-   <category-def name="org.apache.tuscany.sca.optional.features"

-      label="Optional Features"/>

-      

-</site>

diff --git a/java/sca-contrib/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml b/java/sca-contrib/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
deleted file mode 100644
index c1225e320b..0000000000
--- a/java/sca-contrib/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
+++ /dev/null
@@ -1,58 +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.
--->
-<assembly>
-    <id>updatesite</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <fileSets>
-        <fileSet>
-             <outputDirectory>tuscany-sca-${tuscany.version}-updatesite</outputDirectory>
-            <includes>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-                <include>site.xml</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-        
-    <dependencySets>
-        <dependencySet>
-             <outputDirectory>tuscany-sca-${tuscany.version}-updatesite/plugins</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:org.apache.tuscany.sca.plugin.*</include>
-            </includes>
-            <scope>runtime</scope>
-        </dependencySet>
-
-        <dependencySet>
-            <outputDirectory>tuscany-sca-${tuscany.version}-updatesite/features</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:org.apache.tuscany.sca.feature.*</include>
-            </includes>
-            <scope>runtime</scope>
-        </dependencySet>
-    </dependencySets>
-
-</assembly>
diff --git a/java/sca-contrib/tools/maven/maven-ant-generator/LICENSE b/java/sca-contrib/tools/maven/maven-ant-generator/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/maven/maven-ant-generator/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/maven/maven-ant-generator/NOTICE b/java/sca-contrib/tools/maven/maven-ant-generator/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/tools/maven/maven-ant-generator/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/tools/maven/maven-ant-generator/pom.xml b/java/sca-contrib/tools/maven/maven-ant-generator/pom.xml
deleted file mode 100644
index 35ee115ab0..0000000000
--- a/java/sca-contrib/tools/maven/maven-ant-generator/pom.xml
+++ /dev/null
@@ -1,64 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-maven-ant-generator</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>Apache Tuscany SCA Ant Build Generator Maven Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>2.0.5</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-project</artifactId>
-            <version>2.0.5</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-settings</artifactId>
-            <version>2.0.5</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-artifact</artifactId>
-            <version>2.0.5</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-model</artifactId>
-            <version>2.0.5</version>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/java/sca-contrib/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
deleted file mode 100644
index d7b80bd67c..0000000000
--- a/java/sca-contrib/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
+++ /dev/null
@@ -1,534 +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.tools.ant.generator.plugin;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.model.FileSet;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.PluginExecution;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.settings.Settings;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-
-/**
- * A Maven plugin that generates an Ant build.xml file for Tuscany SCA samples.
- * 
- * Build dependencies and additional build steps like WSDL2Java for example are
- * automatically determined from the pom.xml file describing the module's Maven build.
- * 
- * @version $Rev$ $Date$
- * @goal generate
- * @phase generate-sources
- * @requiresDependencyResolution test
- * @description Generate Ant build script for an SCA project
- */
-public class AntGeneratorMojo extends AbstractMojo {
-
-    /**
-     * The project to generate an Ant build for.
-     *
-     * @parameter expression="${project}"
-     * @required
-     */
-    private MavenProject project;
-
-    /**
-     * Used for resolving artifacts
-     *
-     * @component
-     */
-    private ArtifactResolver resolver;
-
-    /**
-     * Factory for creating artifact objects
-     *
-     * @component
-     */
-    private ArtifactFactory factory;
-
-    /**
-     * The local repository where the artifacts are located
-     *
-     * @parameter expression="${localRepository}"
-     * @required
-     */
-    private ArtifactRepository localRepository;
-
-    /**
-     * The remote repositories where artifacts are located
-     *
-     * @parameter expression="${project.remoteArtifactRepositories}"
-     */
-    private List remoteRepositories;
-
-    /**
-     * The current user system settings for use in Maven.
-     *
-     * @parameter expression="${settings}"
-     * @required
-     * @readonly
-     */
-    private Settings settings;
-
-    /**
-     * The main class name.
-     * @parameter
-     */
-    private String mainClass;
-    
-    /**
-     * If set true then only the dependency file is created. The dependency
-     * file can then be included in a hand generated build.xml file
-     * @parameter
-     */
-    private Boolean buildDependencyFileOnly;    
-    
-    /**
-     * The build.xml file to generate.
-     * @parameter expression="${basedir}/build.xml"
-     */
-    private String buildFile;
-    
-    /**
-     * The build-dependency.xml file to generate.
-     * @parameter expression="${basedir}/build-dependency.xml"
-     */
-    private String buildDependencyFile;    
-    
-    public void execute() throws MojoExecutionException {
-        if ((buildDependencyFileOnly != null) &&
-            (buildDependencyFileOnly == true)){
-            generateBuildDependencyFile();
-        } else {
-            generateBuildFile();
-        }
-    }
-
-    /**
-     * Generate Ant build dependency XML file
-     */ 
-    private void generateBuildDependencyFile() throws MojoExecutionException {
-        
-        getLog().info("Generating " + buildDependencyFile);
-        
-        // Open the target build-dependency.xml file
-        File targetFile = new File(buildDependencyFile);
-        PrintWriter pw;
-        try {
-            pw = new PrintWriter(new FileOutputStream(targetFile));
-        } catch (FileNotFoundException e) {
-            throw new MojoExecutionException(e.toString());
-        }
-
-        // Generate the Apache license header
-        generateLicenseHeader(pw);
-
-        // Generate Ant filesets representing the build dependencies
-        generateBuildDependencies(pw);
-        
-        pw.close();
-    }
-    
-    /**
-     * Generate Ant build XML file
-     */ 
-    private void generateBuildFile() throws MojoExecutionException {
-        
-        getLog().info("Generating " + buildFile);
-        
-        // Open the target build.xml file
-        File targetFile = new File(buildFile);
-        PrintWriter pw;
-        try {
-            pw = new PrintWriter(new FileOutputStream(targetFile));
-        } catch (FileNotFoundException e) {
-            throw new MojoExecutionException(e.toString());
-        }
-
-        // Determine the project packaging
-        String packaging = project.getPackaging().toLowerCase();
-
-        // Generate the Apache license header
-        generateLicenseHeader(pw);
-        
-        pw.println("<project name=\"" + project.getArtifactId() + "\" default=\"compile\">");
-        pw.println();
-        
-        // Generate the compile target
-        int base = project.getBasedir().toString().length() + 1;
-        pw.println("    <target name=\"compile\">");
-        pw.println("        <mkdir dir=\"target/classes\"/>");
-
-        // Generate any pre-compilation tasks
-        generatePreCompileTasks(pw);
-        
-        // Generate the compile task
-        pw.println("        <javac destdir=\"target/classes\" debug=\"on\" source=\"1.5\" target=\"1.5\">");
-        for (String source: (List<String>)project.getCompileSourceRoots()) {
-            if (source.length() > base) {
-                source = source.substring(base);
-            } else {
-                source = ".";
-            }
-            pw.println("            <src path=\"" + source + "\"/>");
-        }
-        pw.println("            <classpath>");
-        pw.println("                <fileset refid=\"tuscany.jars\"/>");
-        pw.println("                <fileset refid=\"3rdparty.jars\"/>");
-        pw.println("            </classpath>");
-        pw.println("        </javac>");
-        pw.println("        <copy todir=\"target/classes\">");
-        for (FileSet resource: (List<FileSet>)project.getResources()) {
-            String source = resource.getDirectory();
-            if (source.length() > base) {
-                source = source.substring(base);
-                
-                if (source.equals(".")){
-                    pw.println("            <fileset dir=\".\" includes=\"*\" excludes=\"src, target, pom.xml, build.xml\"/>");
-                } else {
-                    pw.println("            <fileset dir=\"" + source + "\"/>");
-                }
-            } else {
-                if (project.getResources().size() > 1) {
-                    break;
-                }
-                pw.println("            <fileset dir=\".\" excludes=\"**/*.java, pom.xml, build.xml, target\"/>");
-                source = ".";
-            }
-        }
-        pw.println("        </copy>");
-        
-        // Build a JAR
-        if (packaging.equals("jar")) {
-            pw.println("        <jar destfile=\"target/" + project.getArtifactId() + ".jar\" basedir=\"target/classes\">");
-            pw.println("            <manifest>");
-            if (mainClass != null) {
-                pw.println("                <attribute name=\"Main-Class\" value=\"" + mainClass + "\"/>");
-            }
-            pw.println("            </manifest>");
-            pw.println("        </jar>");
-            
-        } else if (packaging.equals("war")) {
-            
-            // Build a WAR
-            pw.println("        <war destfile=\"target/" + project.getArtifactId() + ".war\" webxml=\"src/main/webapp/WEB-INF/web.xml\">");
-            pw.println("            <fileset dir=\"src/main/webapp\"/>");
-            pw.println("            <lib refid=\"tuscany.jars\"/>");
-            pw.println("            <lib refid=\"3rdparty.jars\"/>");
-            pw.println("            <classes dir=\"target/classes\"/>");
-            pw.println("        </war>");
-        }
-        pw.println("    </target>");
-        pw.println();
-        
-        
-        // Generate a package target alongside the compile target 
-        // Tuscany SCA samples use "package" as the target for webapps
-        pw.println("    <target name=\"package\" depends=\"compile\"/>");
-        pw.println();
-    
-        // Generate the run target
-        if (mainClass != null) {
-            pw.println("    <target name=\"run\">");
-            pw.println("        <java classname=\"" + mainClass + "\" fork=\"true\">");
-            pw.println("            <classpath>");
-            pw.println("                <pathelement location=\"target/" + project.getArtifactId() + ".jar\"/>");
-            pw.println("                <fileset refid=\"tuscany.jars\"/>");
-            pw.println("                <fileset refid=\"3rdparty.jars\"/>");
-            pw.println("            </classpath>");
-            pw.println("        </java>");
-            pw.println("    </target>");
-            pw.println();
-        }
-        
-        // Generate the clean target
-        pw.println("    <target name=\"clean\">");
-        pw.println("        <delete includeemptydirs=\"true\">");
-        pw.println("            <fileset dir=\"target\"/>");
-        pw.println("        </delete>");
-        pw.println("    </target>");
-        pw.println();
-
-        // Generate Ant filesets representing the build dependencies
-        generateBuildDependencies(pw);
-        
-        pw.println("</project>");
-        pw.close();
-    }
-
-    /**
-     * Generate Ant filesets representing the build dependencies. 
-     * @param pw PrintWriter to write to
-     */
-    private void generateBuildDependencies(PrintWriter pw) {
-
-        // Determine the module dependencies
-        List<String> tuscanyModules = new ArrayList<String>();
-        List<String> otherModules = new ArrayList<String>();
-        for (Artifact artifact: (List<Artifact>)project.getRuntimeArtifacts()) {
-            if (artifact.getGroupId().startsWith("org.apache.tuscany.sca")) {
-                tuscanyModules.add(artifact.getFile().getName());
-            } else {
-                otherModules.add(artifact.getFile().getName());
-            }
-        }
-        
-        // Sort lists of modules, making output deterministic
-        Collections.sort(tuscanyModules);
-        Collections.sort(otherModules);
-
-        // Generate filesets for the tuscany and 3rd party dependencies
-        pw.println("    <fileset id=\"tuscany.jars\" dir=\"../../modules\">");
-        for (String name: tuscanyModules) {
-            pw.println("        <include name=\"" + name +"\"/>");
-        }
-        pw.println("    </fileset>");
-        pw.println("    <fileset id=\"3rdparty.jars\" dir=\"../../lib\">");
-        for (String name: otherModules) {
-            pw.println("        <include name=\"" + name +"\"/>");
-        }
-        pw.println("    </fileset>");
-        pw.println();
-    }
-    
-    /**
-     * Extract plugin execution configurations out of the Maven model. This handles
-     * nested configurations with a base configuration and a collection of nested
-     * configuration elements, for example: 
-     * <configuration>
-     *     <schemaFiles>
-     *         <configuration>
-     *             <fileName>x.wsdl</fileName>
-     *         </configuration>
-     *         <configuration>
-     *             <fileName>y.wsdl</fileName>
-     *         </configuration>
-     *     </schemaFiles>
-     *     <noNotification>true</noNotification>
-     * </configuration>
-     *                         
-     * @param execution Maven plugin execution model
-     * @return a list of maps containing the plugin configuration key value pairs
-     */
-    private static List<Map<String, String>> pluginConfigurations(PluginExecution execution) {
-        List<Map<String, String>> configurations = new ArrayList<Map<String,String>>();
-        Map<String, String> topConfiguration = new HashMap<String, String>();
-        
-        Xpp3Dom dom = (Xpp3Dom)execution.getConfiguration();
-        for (Xpp3Dom element: dom.getChildren()) {
-            if (element.getChildCount() != 0) {
-                // Handle nested configuration element, create a child configuration
-                // for each
-                for (Xpp3Dom childConfigurationElement: element.getChildren()) {
-                    Map<String, String> childConfiguration = new HashMap<String, String>();
-                    for (Xpp3Dom childElement: childConfigurationElement.getChildren()) {
-                        childConfiguration.put(childElement.getName(), childElement.getValue());
-                    }
-                    configurations.add(childConfiguration);
-                }
-            } else {
-                // Handle top level key value pair element
-                topConfiguration.put(element.getName(), element.getValue());
-            }
-        }
-        // Return the top configuration or the child configurations merged
-        // with the top one
-        if (configurations.isEmpty()) {
-            configurations.add(topConfiguration);
-        } else {
-            for (Map<String, String> configuration: configurations) {
-                configuration.putAll(topConfiguration);
-            }
-        }
-        return configurations;
-    }
-    
-    /**
-     * Generate Ant tasks for the pre-compilation generation plugins
-     * used in the Maven module.
-     * @param pw PrintWriter to write to
-     * @return list of directories containing generated source to compile
-     */
-    private void generatePreCompileTasks(PrintWriter pw) {
-        String baseDir = project.getBasedir().getAbsolutePath() + '/';
-        
-        List<Plugin> plugins = (List<Plugin>)project.getBuildPlugins();
-        for (Plugin plugin: plugins) {
-            
-            // Generate Ant task equivalent to the Tuscany SDO plugin
-            if ("org.apache.tuscany.sdo".equals(plugin.getGroupId()) && "tuscany-sdo-plugin".equals(plugin.getArtifactId())) {
-                for (PluginExecution execution: (List<PluginExecution>)plugin.getExecutions()) {
-                    for (Map<String, String> configuration: pluginConfigurations(execution)) {
-                        
-                        pw.println("        <java classname=\"org.apache.tuscany.sdo.generate.XSD2JavaGenerator\" fork=\"true\">");
-                        
-                        // Generate the various code generation options
-                        for (Map.Entry<String, String> element: configuration.entrySet()) {
-                            String key = element.getKey();
-                            String value = element.getValue();
-                            if (key.equals("schemaNamespace")) {
-                                pw.println("            <arg value=\"-schemaNamespace\"/>");
-                                pw.println("            <arg value=\"" + value + "\"/>");
-                            }
-                            if (key.equals("javaPackage")) {
-                                pw.println("            <arg value=\"-javaPackage\"/>");
-                                pw.println("            <arg value=\"" + value + "\"/>");
-                            }
-                            if (key.equals("prefix")) {
-                                pw.println("            <arg value=\"-prefix\"/>");
-                                pw.println("            <arg value=\"" + value + "\"/>");
-                            }
-                            if (key.equals("noInterfaces") && "true".equals(value)) {
-                                pw.println("            <arg value=\"-noInterfaces\"/>");
-                            }
-                            if (key.equals("noNotification") && "true".equals(value)) {
-                                pw.println("            <arg value=\"-noNotification\"/>");
-                            }
-                            if (key.equals("noContainer") && "true".equals(value)) {
-                                pw.println("            <arg value=\"-noContainment\"/>");
-                            }
-                            if (key.equals("noUnsettable") && "true".equals(value)) {
-                                pw.println("            <arg value=\"-noUnsettable\"/>");
-                            }
-                        }
-                        
-                        // Generate target directory parameter
-                        String targetDirectory = configuration.get("targetDirectory");
-                        if (targetDirectory == null) {
-                            targetDirectory = "target/sdo-source";
-                        } else if (targetDirectory.startsWith(baseDir)) {
-                            targetDirectory = targetDirectory.substring(baseDir.length());
-                        }
-                        pw.println("            <arg value=\"-targetDirectory\"/>");
-                        pw.println("            <arg value=\"" + targetDirectory + "\"/>");
-                        
-                        // Generate schema file parameter
-                        String schemaFile = configuration.get("schemaFile");
-                        if (schemaFile == null) {
-                            schemaFile = configuration.get("fileName");
-                        }
-                        if (schemaFile != null) {
-                            if (schemaFile.startsWith(baseDir)) {
-                                schemaFile = schemaFile.substring(baseDir.length());
-                            }
-                            pw.println("            <arg value=\"" + schemaFile + "\"/>");
-                        }
-
-                        pw.println("            <classpath>");
-                        pw.println("                <fileset refid=\"tuscany.jars\"/>");
-                        pw.println("                <fileset refid=\"3rdparty.jars\"/>");
-                        pw.println("            </classpath>");
-                        pw.println("        </java>");
-                    }
-                }
-            }
-            
-            // Generate Ant task equivalent to the Tuscany WSDL2Java plugin
-            else if ("org.apache.tuscany.sca".equals(plugin.getGroupId()) && "tuscany-maven-wsdl2java".equals(plugin.getArtifactId())) {
-                for (PluginExecution execution: (List<PluginExecution>)plugin.getExecutions()) {
-                    for (Map<String, String> configuration: pluginConfigurations(execution)) {
-
-                        pw.println("        <java classname=\"org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator\" fork=\"true\">");
-                        
-                        // Generate the various code generation options
-                        for (Map.Entry<String, String> element: configuration.entrySet()) {
-                            String key = element.getKey();
-                            String value = element.getValue();
-                            if (key.equals("javaPackage")) {
-                                pw.println("            <arg value=\"-javaPackage\"/>");
-                                pw.println("            <arg value=\"" + value + "\"/>");
-                            }
-                        }
-                        
-                        // Generate target directory parameter
-                        String targetDirectory = configuration.get("targetDirectory");
-                        if (targetDirectory == null) {
-                            targetDirectory = "target/wsdl2java-source";
-                        } else if (targetDirectory.startsWith(baseDir)) {
-                            targetDirectory = targetDirectory.substring(baseDir.length());
-                        }
-                        pw.println("            <arg value=\"-targetDirectory\"/>");
-                        pw.println("            <arg value=\"" + targetDirectory + "\"/>");
-                        
-                        // Generate WSDL file parameter
-                        String wsdlFile = configuration.get("wsdlFile");
-                        if (wsdlFile == null) {
-                            wsdlFile = configuration.get("fileName");
-                        }
-                        if (wsdlFile != null) {
-                            if (wsdlFile.startsWith(baseDir)) {
-                                wsdlFile = wsdlFile.substring(baseDir.length());
-                            }
-                            pw.println("            <arg value=\"" + wsdlFile + "\"/>");
-                        }
-
-                        pw.println("            <classpath>");
-                        pw.println("                <fileset refid=\"tuscany.jars\"/>");
-                        pw.println("                <fileset refid=\"3rdparty.jars\"/>");
-                        pw.println("            </classpath>");
-                        pw.println("        </java>");
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Generate license header.
-     * 
-     * @param pw PrintWriter to write to
-     */
-    private void generateLicenseHeader(PrintWriter pw) {
-        pw.println("<!--");
-        pw.println(" * Licensed to the Apache Software Foundation (ASF) under one");
-        pw.println(" * or more contributor license agreements.  See the NOTICE file");
-        pw.println(" * distributed with this work for additional information");
-        pw.println(" * regarding copyright ownership.  The ASF licenses this file");
-        pw.println(" * to you under the Apache License, Version 2.0 (the");
-        pw.println(" * \"License\"); you may not use this file except in compliance");
-        pw.println(" * with the License.  You may obtain a copy of the License at");
-        pw.println(" * ");
-        pw.println(" *   http://www.apache.org/licenses/LICENSE-2.0");
-        pw.println(" * ");
-        pw.println(" * Unless required by applicable law or agreed to in writing,");
-        pw.println(" * software distributed under the License is distributed on an");
-        pw.println(" * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY");
-        pw.println(" * KIND, either express or implied.  See the License for the");
-        pw.println(" * specific language governing permissions and limitations");
-        pw.println(" * under the License.");
-        pw.println("-->");
-        pw.println();
-    }
-
-}
\ No newline at end of file
diff --git a/java/sca-contrib/tools/maven/maven-dependency-lister/LICENSE b/java/sca-contrib/tools/maven/maven-dependency-lister/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/tools/maven/maven-dependency-lister/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/tools/maven/maven-dependency-lister/NOTICE b/java/sca-contrib/tools/maven/maven-dependency-lister/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/tools/maven/maven-dependency-lister/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/tools/maven/maven-dependency-lister/README b/java/sca-contrib/tools/maven/maven-dependency-lister/README
deleted file mode 100644
index d53760029f..0000000000
--- a/java/sca-contrib/tools/maven/maven-dependency-lister/README
+++ /dev/null
@@ -1,46 +0,0 @@
-Tuscany SCA Dependency Lister

-=============================

-

-Makes use of the extension Maven dependency support to list out all of the 

-dependencis in the module where the plugin is used. The module is

-analysed and a report (dependency.txt) is written into the modules directory including

-each dependency and the path through the maven transitive dependencies that caused

-the original dependency to be included. For example, Here is a line which lists

-a a jar dependency, the phase in which it was found, the module being processed 

-and he path that causes the dependency

-

-DEPENDENCY              PHASE   MODULE                                                          PATH TO DEPENDENCY

-jaxb-api-2.1.jar	compile	Apache Tuscany SCA Atom+RSS Feed Aggregator Sample Webapp	tuscany-host-webapp-1.1-incubating-SNAPSHOT	tuscany-host-embedded-1.1-incubating-SNAPSHOT	tuscany-core-databinding-1.1-incubating-SNAPSHOT	tuscany-databinding-jaxb-1.1-incubating-SNAPSHOT	jaxb-api-2.1

-

-It is often convenient to further analyse these entries using the spreadsheet of your

-choice so the columns are tab separated to allow for easy conversion.

-

-The plugin can be included in a module using the following,

-

-<plugin>

-    <groupId>org.apache.tuscany.sca</groupId>

-    <artifactId>tuscany-maven-dependency-lister</artifactId>

-    <version>1.1-incubating-SNAPSHOT</version>

-    <executions>

-        <execution>

-            <goals>

-                <goal>execute</goal>

-            </goals>

-        </execution>

-    </executions>

-</plugin>  

-

-If you include this at the top level of you project and have it run for each model you

-will get a report for each model independently. For example, in the Tuscany SCA project

-the plugin is included in the pom.xml files at the sca level under the profile 

-"dependecies" so to generate a dependencies report for the Tuscany SCA project:

-

-cd sca

-mvn -o -Pdependencies -Dmaven.test.skip=true 

-

-Once you have dependency.txt files in your modules

-the you favourite command line tools can be used to concatenate and sort them

-to get a full picture of the dependencies in you project, for example, with linux you

-could do,

-

-find . -name dependency.txt -exec cat '{}' >> deptotal.txt \;

diff --git a/java/sca-contrib/tools/maven/maven-dependency-lister/pom.xml b/java/sca-contrib/tools/maven/maven-dependency-lister/pom.xml
deleted file mode 100644
index 97de3a156f..0000000000
--- a/java/sca-contrib/tools/maven/maven-dependency-lister/pom.xml
+++ /dev/null
@@ -1,71 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-maven-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-maven-dependency-lister</artifactId>

-    <packaging>maven-plugin</packaging>

-    <name>Apache Tuscany SCA Dependency Lister Maven Plugin</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.maven</groupId>

-            <artifactId>maven-plugin-api</artifactId>

-            <version>2.0.7</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.maven</groupId>

-            <artifactId>maven-project</artifactId>

-            <version>2.0.7</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.maven</groupId>

-            <artifactId>maven-settings</artifactId>

-            <version>2.0.7</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.maven</groupId>

-            <artifactId>maven-artifact</artifactId>

-            <version>2.0.7</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.maven</groupId>

-            <artifactId>maven-model</artifactId>

-            <version>2.0.7</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.maven.shared</groupId>

-            <artifactId>maven-dependency-tree</artifactId>

-            <version>1.0</version>

-        </dependency>        

-        

-        

-    </dependencies>

-</project>

diff --git a/java/sca-contrib/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java b/java/sca-contrib/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
deleted file mode 100644
index b904ac4804..0000000000
--- a/java/sca-contrib/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
+++ /dev/null
@@ -1,198 +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.tools.sca.dependency.lister.plugin;

-

-import java.io.File;

-import java.io.FileNotFoundException;

-import java.io.FileOutputStream;

-import java.io.PrintWriter;

-import java.util.Iterator;

-import java.util.List;

-

-import org.apache.maven.artifact.Artifact;

-import org.apache.maven.artifact.factory.ArtifactFactory;

-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;

-import org.apache.maven.artifact.repository.ArtifactRepository;

-import org.apache.maven.artifact.resolver.ArtifactCollector;

-import org.apache.maven.artifact.resolver.ArtifactResolver;

-import org.apache.maven.plugin.AbstractMojo;

-import org.apache.maven.plugin.MojoExecutionException;

-import org.apache.maven.project.MavenProject;

-import org.apache.maven.project.MavenProjectBuilder;

-import org.apache.maven.settings.Settings;

-import org.apache.maven.shared.dependency.tree.DependencyNode;

-import org.apache.maven.shared.dependency.tree.DependencyTree;

-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder;

-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;

-

-/**

- * @version $Rev: 588816 $ $Date: 2007-10-27 01:22:38 +0100 (Sat, 27 Oct 2007) $

- * @goal execute

- * @phase generate-sources

- * @requiresDependencyResolution test

- * @description List dependencies for an SCA project

- */

-public class DependencyListerMojo extends AbstractMojo {

-    /**

-     * The project to create a build for.

-     *

-     * @parameter expression="${project}"

-     * @required

-     */

-    private MavenProject project;

-

-    /**

-     * Used for resolving artifacts

-     *

-     * @component

-     */

-    private ArtifactResolver artifactResolver;

-

-    /**

-     * Factory for creating artifact objects

-     *

-     * @component

-     */

-    private ArtifactFactory artifactFactory;

-    

-    /**

-     * @component

-     */

-    private ArtifactMetadataSource artifactMetadataSource;    

-    

-    /**

-     * @component

-     */

-    private DependencyTreeBuilder dependencyTreeBuilder;

-

-    /**

-     * @component

-     */

-    private ArtifactCollector collector;

-

-    /**

-     * @component

-     */

-    private MavenProjectBuilder mavenProjectBuilder;    

-

-    /**

-     * The local repository where the artifacts are located

-     *

-     * @parameter expression="${localRepository}"

-     * @required

-     */

-    private ArtifactRepository localRepository;

-

-    /**

-     * The remote repositories where artifacts are located

-     *

-     * @parameter expression="${project.remoteArtifactRepositories}"

-     */

-    private List remoteRepositories;

-

-    /**

-     * The current user system settings for use in Maven.

-     *

-     * @parameter expression="${settings}"

-     * @required

-     * @readonly

-     */

-    private Settings settings;

-

-    

-    /**

-     * The build.xml file to generate.

-     * @parameter expression="${basedir}/target/dependency.txt"

-     */

-    private String buildFile;

-    

-    public void execute() throws MojoExecutionException {

-

-        System.out.println("Analysing " + buildFile);

-        

-        // Open the target build.xml file

-        File targetFile = new File(buildFile);

-        PrintWriter pw;

-        try {

-            pw = new PrintWriter(new FileOutputStream(targetFile));

-        } catch (FileNotFoundException e) {

-            System.out.println(e.toString());

-            return;

-        }

-

-        DependencyTree dependencyTree;

-

-        try

-        {

-            dependencyTree = dependencyTreeBuilder.buildDependencyTree( project, localRepository, artifactFactory,

-                                                                        artifactMetadataSource, collector );

-        }

-        catch ( DependencyTreeBuilderException e )

-        {

-            throw new MojoExecutionException( "Can't build dependency tree", e );

-        }

-        

- //       processNode(dependencyTree.getRootNode(), "--", pw);   

-      

-        for (Artifact artifact: (List<Artifact>)project.getTestArtifacts()) {

-            pw.println( artifact.getFile().getName() + "\t" + 

-                        artifact.getScope() + "\t" + 

-                        project.getName() + "\t" + 

-                        findArtifactPath(dependencyTree.getRootNode(), artifact));

-        }          

-        

-        pw.close();        

-    }

-    

-    private void processNode(DependencyNode node, String indent, PrintWriter pw){

-        

-        pw.println(indent + node.getArtifact().getScope() + " " + node.getArtifact().toString());

-        

-        Iterator it = node.getChildren().iterator();

-        while ( it.hasNext() )

-        {

-            DependencyNode child = (DependencyNode) it.next();

-            

-            processNode(child, indent + "--", pw);

-        }

-    }

-    

-    private String findArtifactPath(DependencyNode node, Artifact artifact){

-        String path = null;

-        

-        Iterator it = node.getChildren().iterator();

-        while ( it.hasNext() && (path == null) )

-        {

-            DependencyNode child = (DependencyNode) it.next();

-            

-            if (child.getArtifact().getArtifactId().equals(artifact.getArtifactId())) {

-                path = child.getArtifact().getArtifactId() + "-" + child.getArtifact().getVersion();

-            } else {

-                path = findArtifactPath(child, artifact);

-                

-                if (path != null){

-                    path = child.getArtifact().getArtifactId() + "-" + child.getArtifact().getVersion() + "\t" + path;

-                }

-            }

-        }

-       

-        return path;

-    }    

-

-}
\ No newline at end of file
diff --git a/java/sca-contrib/tools/maven/maven-incremental-build/LICENSE b/java/sca-contrib/tools/maven/maven-incremental-build/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/maven/maven-incremental-build/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/maven/maven-incremental-build/NOTICE b/java/sca-contrib/tools/maven/maven-incremental-build/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/tools/maven/maven-incremental-build/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/tools/maven/maven-incremental-build/pom.xml b/java/sca-contrib/tools/maven/maven-incremental-build/pom.xml
deleted file mode 100644
index 854d31cbc0..0000000000
--- a/java/sca-contrib/tools/maven/maven-incremental-build/pom.xml
+++ /dev/null
@@ -1,108 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-maven-incremental-build</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>Apache Tuscany SCA Incremental Build Generator Maven Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>2.0.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-project</artifactId>
-            <version>2.0.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-settings</artifactId>
-            <version>2.0.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-artifact</artifactId>
-            <version>2.0.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-model</artifactId>
-            <version>2.0.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-core</artifactId>
-            <version>2.0.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-invoker</artifactId>
-            <version>2.0.7</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-compiler-api</artifactId>
-            <version>1.5.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-compiler-manager</artifactId>
-            <version>1.5.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-compiler-javac</artifactId>
-            <version>1.5.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <version>LATEST</version>
-                <configuration>
-                    <goalPrefix>incremental</goalPrefix>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java b/java/sca-contrib/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
deleted file mode 100644
index 3a6870732b..0000000000
--- a/java/sca-contrib/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
+++ /dev/null
@@ -1,415 +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.tools.incremental.build.plugin;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.settings.Settings;
-import org.apache.maven.shared.invoker.DefaultInvocationRequest;
-import org.apache.maven.shared.invoker.InvocationResult;
-import org.apache.maven.shared.invoker.Invoker;
-import org.apache.maven.shared.invoker.MavenInvocationException;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.cli.CommandLineException;
-
-/**
- * @version $Rev$ $Date$
- * @goal build
- * @phase validate
- * @requiresDependencyResolution test
- * @description Incrementally build project modules that depend on modified modules.
- */
-public class IncrementalBuildMojo extends AbstractMojo {
-
-    /**
-     * Keep track of modified projects.
-     */
-    private static Set<String> modifiedProjectIDs = new HashSet<String>();
-
-    /**
-     * The current user system settings for use in Maven.
-     *
-     * @parameter expression="${settings}"
-     * @required
-     * @readonly
-     */
-    private Settings settings;
-    
-    /**
-     * Used to invoke Maven builds.
-     *
-     * @component
-     */
-    private Invoker invoker;
-
-    /**
-     * The target directory of the compiler if fork is true.
-     *
-     * @parameter expression="${project.build.directory}"
-     * @required
-     * @readonly
-     */
-    private File buildDirectory;
-
-    /**
-     * The project to create a build for.
-     *
-     * @parameter expression="${project}"
-     * @required
-     * @readonly
-     */
-    private MavenProject project;
-
-    private File outputFile;
-
-    public void execute() throws MojoExecutionException {
-        String projectID = id(project);
-        outputFile = getOutputFile();
-
-        File testMarkerFile = new File(project.getBasedir().getPath() + "/.test");
-        
-        List<String> goals = new ArrayList<String>();
-        String type = project.getArtifact().getType();
-        if ("pom".equals(type)) {
-            
-            // Always install pom modules
-            goals.add("install");
-
-        } else {
-
-            // Check if anything has changed in the project
-            boolean changed = false;
-            boolean testChanged = false;
-            boolean testFailed = false;
-            if (new File(project.getBasedir().getPath() + "/.modified").exists()) {
-                getLog().info("Found .modified marker file.");
-                changed = true;
-            } else {
-                changed = areSourcesStale() || areResourcesStale() || isPOMStale();
-            }
-            if (changed) {
-                modifiedProjectIDs.add(projectID);
-            } else {
-                testChanged = areTestSourcesStale() || areTestResourcesStale();
-            }
-            
-            // Check if a project has compile dependencies on the modified projects
-            // and will need to be recompiled, or has runtime or test dependencies
-            // on the modified projects and needs to be retested
-            if (changed) {
-                goals.add("clean");
-                goals.add("install");
-                getLog().info("Project " + projectID + " has changed and will be recompiled.");
-                
-            } else {
-                for (Artifact artifact : (List<Artifact>)project.getCompileArtifacts()) {
-                    String artifactID = id(artifact);
-                    if (modifiedProjectIDs.contains(artifactID)) {
-                        getLog().info("Project " + projectID + " depends on modified project " + artifactID + " and will be recompiled.");
-                        goals.add("clean");
-                        goals.add("install");
-                        break;
-                    }
-                }
-
-                if (goals.isEmpty()) {
-                    List<Artifact> artifacts = new ArrayList<Artifact>();
-                    artifacts.addAll(project.getRuntimeArtifacts());
-                    artifacts.addAll(project.getTestArtifacts());
-                    for (Artifact artifact : artifacts) {
-                        String artifactID = id(artifact);
-                        if (modifiedProjectIDs.contains(artifactID)) {
-                            getLog().info("Project " + projectID + " depends on modified project " + artifactID + " and will be retested.");
-                            goals.add("test");
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (testChanged && goals.isEmpty()) {
-                getLog().info("Project " + projectID + " has changed and will be retested.");
-                goals.add("test");
-            }
-
-            if (goals.isEmpty()) {
-                if (testMarkerFile.exists()) {
-                    testFailed = true;
-                    getLog().info("Project " + projectID + " contains failed tests and will be retested.");
-                    goals.add("test");
-                }
-            }
-        }
-
-        // Invoke Maven with the necessary goals
-        if (!goals.isEmpty()) {
-            DefaultInvocationRequest request = new DefaultInvocationRequest();
-            request.setGoals(goals);
-            // FIXME: The maven invoker doesn't handle the directory names with spaces
-            // request.setLocalRepositoryDirectory(new File(localRepository.getBasedir()));
-            request.setInteractive(false);
-            request.setShowErrors(false);
-            request.setRecursive(false);
-            // request.setDebug(true);
-            request.setOffline(settings.isOffline());
-            request.setBaseDirectory(project.getBasedir());
-            request.setPomFile(project.getFile());
-
-            boolean success = false;
-            try {
-                try {
-                    InvocationResult result = invoker.execute(request);
-    
-                    CommandLineException cle = result.getExecutionException();
-                    if (cle != null) {
-                        throw new MojoExecutionException(cle.getMessage(), cle);
-                    }
-    
-                    int ec = result.getExitCode();
-                    if (ec != 0) {
-                        throw new MojoExecutionException("Maven invocation exit code: " + ec);
-                    }
-                    
-                    success = true;
-                    
-                    
-                    
-                } catch (MavenInvocationException e) {
-                    throw new MojoExecutionException(e.getMessage(), e);
-                }
-            } finally {
-                
-                // Create or delete a .test marker file to keep track of the latest
-                // test result status and trigger testing again next time the build
-                // is run
-                if (!success) {
-                    try {
-                        if (!testMarkerFile.exists()) {
-                            testMarkerFile.createNewFile();
-                        }
-                    } catch (IOException e) {
-                        throw new MojoExecutionException(e.getMessage(), e);
-                    }
-                } else {
-                    if (testMarkerFile.exists()) {
-                        testMarkerFile.delete();
-                    }
-                }
-            }
-        } else {
-            getLog().info("The project is up-to-date. No build is required.");
-        }
-    }
-
-    private File getOutputFile() {
-        File basedir = buildDirectory;
-        String finalName = project.getBuild().getFinalName();
-        String classifier = project.getArtifact().getClassifier();
-        if (classifier == null) {
-            classifier = "";
-        } else if (classifier.trim().length() > 0 && !classifier.startsWith("-")) {
-            classifier = "-" + classifier;
-        }
-    
-        String pkg = project.getPackaging();
-        if ("maven-plugin".equals(pkg)) {
-            pkg = "jar";
-        }
-        return new File(basedir, finalName + classifier + "." + pkg);
-    }
-
-    /**
-     * Test if any of the resources are stale
-     * @param resources
-     * @param outputDirectory
-     * @return
-     * @throws MojoExecutionException
-     */
-    private boolean areStale(List<Resource> resources, String outputDirectory) throws MojoExecutionException {
-        
-        for (Resource resource: resources) {
-            
-            File resourceDirectory = new File(resource.getDirectory());
-            if (!resourceDirectory.exists()) {
-                continue;
-            }
-    
-            DirectoryScanner scanner = new DirectoryScanner();
-    
-            scanner.setBasedir(resource.getDirectory());
-            if (resource.getIncludes() != null && !resource.getIncludes().isEmpty()) {
-                scanner.setIncludes((String[])resource.getIncludes().toArray(new String[]{}));
-            } else {
-                scanner.setIncludes(new String[]{"**/**"});
-            }
-            if (resource.getExcludes() != null && !resource.getExcludes().isEmpty()) {
-                scanner.setExcludes((String[])resource.getExcludes().toArray(new String[]{}));
-            }
-
-            scanner.addDefaultExcludes();
-            scanner.scan();
-    
-            List<String> includedFiles = Arrays.asList(scanner.getIncludedFiles());
-            String targetPath = resource.getTargetPath();
-            for (String source: includedFiles) {
-                String target;
-                if (source.endsWith(".java")) {
-                    target = source.substring(0, source.length() - 5) + ".class";
-                } else {
-                    target = source;
-                }
-                
-                String destination;
-                if (targetPath != null) {
-                    destination = targetPath + "/" + target;
-                } else {
-                    destination = target;
-                }
-    
-                File sourceFile = new File(resource.getDirectory(), source);
-                File destinationFile = new File(outputDirectory, destination);
-                
-                if (!destinationFile.exists()) {
-                    getLog().info("Source file " + sourceFile + ".");
-                    getLog().info("Target file " + destinationFile + " could not be found.");
-                    return true;
-                } else {
-                    if (sourceFile.lastModified() > destinationFile.lastModified()) {
-                        getLog().info("Source file " + sourceFile + " has changed.");
-                        getLog().info("Target file " + destinationFile + " is stale.");
-                        return true;
-                    } else if (sourceFile.lastModified() > outputFile.lastModified()) {
-                        getLog().info("Source file " + sourceFile + " has changed.");
-                        getLog().info("Target build output file " + outputFile + " is stale.");
-                        return true;
-                    } else if (outputFile.lastModified() == 0) {
-                        getLog().info("Target build output file " + outputFile + " could not be found.");
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Test if the POM resource is stale.
-     * 
-     * @return
-     */
-    private boolean isPOMStale() {
-        File pom = project.getFile();
-        if (pom.lastModified() > outputFile.lastModified()) {
-            getLog().info("File " + pom + " has changed.");
-            getLog().info("Target build output file " + pom + " is stale.");
-            return true;
-        } else if (outputFile.lastModified() == 0) {
-            getLog().info("Target build output file " + outputFile + " could not be found.");
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Test if the project resources are stale.
-     * 
-     * @return
-     * @throws MojoExecutionException
-     */
-    private boolean areResourcesStale() throws MojoExecutionException {
-        return areStale(project.getResources(), project.getBuild().getOutputDirectory());
-    }
-
-    /**
-     * Test if the project sources are stale.
-     * 
-     * @return
-     * @throws MojoExecutionException
-     */
-    private boolean areSourcesStale() throws MojoExecutionException {
-        List<Resource> resources = new ArrayList<Resource>();
-        for (String root: (List<String>)project.getCompileSourceRoots()) {
-            if (new File(root).exists()) {
-                Resource resource = new Resource();
-                resource.setDirectory(root);
-                resource.addInclude("*.java");
-                resources.add(resource);
-            }
-        }
-        return areStale(resources, project.getBuild().getOutputDirectory());
-    }
-
-    /**
-     * Tests if the project test resources are stale.
-     * 
-     * @return
-     * @throws MojoExecutionException
-     */
-    private boolean areTestResourcesStale() throws MojoExecutionException {
-        return areStale(project.getTestResources(), project.getBuild().getTestOutputDirectory());
-    }
-
-    /**
-     * Tests if the project test sources are stale.
-     * 
-     * @return
-     * @throws MojoExecutionException
-     */
-    private boolean areTestSourcesStale() throws MojoExecutionException {
-        List<Resource> resources = new ArrayList<Resource>();
-        for (String root: (List<String>)project.getTestCompileSourceRoots()) {
-            if (new File(root).exists()) { 
-                Resource resource = new Resource();
-                resource.setDirectory(root);
-                resources.add(resource);
-            }
-        }
-        return areStale(resources, project.getBuild().getTestOutputDirectory());
-    }
-
-    /**
-     * Returns the qualified id of a Maven artifact .
-     * @param p a Maven artifact
-     * @return a qualified id
-     */
-    private static String id(Artifact a) {
-        return a.getGroupId() + ':' + a.getArtifactId();
-    }
-
-    /**
-     * Returns the qualified id of a Maven project.
-     * @param p a Maven project
-     * @return a qualified id
-     */
-    private static String id(MavenProject p) {
-        return p.getGroupId() + ':' + p.getArtifactId();
-    }
-}
diff --git a/java/sca-contrib/tools/maven/maven-web-junit/LICENSE b/java/sca-contrib/tools/maven/maven-web-junit/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/java/sca-contrib/tools/maven/maven-web-junit/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/java/sca-contrib/tools/maven/maven-web-junit/NOTICE b/java/sca-contrib/tools/maven/maven-web-junit/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/java/sca-contrib/tools/maven/maven-web-junit/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/java/sca-contrib/tools/maven/maven-web-junit/pom.xml b/java/sca-contrib/tools/maven/maven-web-junit/pom.xml
deleted file mode 100644
index 9078ba586c..0000000000
--- a/java/sca-contrib/tools/maven/maven-web-junit/pom.xml
+++ /dev/null
@@ -1,52 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-maven-web-junit</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>Apache Tuscany SCA Web JUnit Maven Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.0-alpha2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>2.0.7</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-project</artifactId>
-            <version>2.0.7</version>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java b/java/sca-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
deleted file mode 100644
index d1afe2c995..0000000000
--- a/java/sca-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
+++ /dev/null
@@ -1,181 +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.tools.sca.web.junit.plugin;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-
-/**
- * @version $Rev$ $Date$
- * @goal generate
- * @phase process-resources
- * @requiresDependencyResolution runtime
- * @description Generate the web.xml and geronimo-web.xml
- */
-public class WebJUnitGeneratorMojo extends AbstractMojo {
-    private final static String ASL_HEADER =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "\n<!--"
-            + "\n   * Licensed to the Apache Software Foundation (ASF) under one"
-            + "\n   * or more contributor license agreements.  See the NOTICE file"
-            + "\n   * distributed with this work for additional information"
-            + "\n   * regarding copyright ownership.  The ASF licenses this file"
-            + "\n   * to you under the Apache License, Version 2.0 (the"
-            + "\n   * \"License\"); you may not use this file except in compliance"
-            + "\n   * with the License.  You may obtain a copy of the License at"
-            + "\n   * "
-            + "\n   *   http://www.apache.org/licenses/LICENSE-2.0"
-            + "\n   * "
-            + "\n   * Unless required by applicable law or agreed to in writing,"
-            + "\n   * software distributed under the License is distributed on an"
-            + "\n   * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"
-            + "\n   * KIND, either express or implied.  See the License for the"
-            + "\n   * specific language governing permissions and limitations"
-            + "\n   * under the License.    "
-            + "\n-->";
-
-    private final static String GERONIMO_WEB_XML =
-        ASL_HEADER + "\n<web-app xmlns=\"http://geronimo.apache.org/xml/ns/j2ee/web-2.0\""
-            + "\n    xmlns:d=\"http://geronimo.apache.org/xml/ns/deployment-1.2\">"
-            // + "\n     <context-root>${context.root}</context-root>"
-            + "\n    <d:environment>"
-            + "\n        <d:moduleId>"
-            + "\n            <d:groupId>${groupId}</d:groupId>"
-            + "\n            <d:artifactId>${artifactId}</d:artifactId>"
-            + "\n            <d:version>${version}</d:version>"
-            + "\n            <d:type>war</d:type>"
-            + "\n        </d:moduleId>"
-            + "\n        <d:inverse-classloading />"
-            + "\n    </d:environment>"
-            + "\n</web-app>\n";
-
-    private final static String WEB_XML =
-        ASL_HEADER + "\n<!DOCTYPE web-app PUBLIC \"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN\" \"http://java.sun.com/dtd/web-app_2_3.dtd\">"
-            + "\n<web-app>"
-            + "\n       <display-name>${display-name}</display-name>"
-            + "\n       <filter>"
-            + "\n           <filter-name>tuscany</filter-name>"
-            + "\n           <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>"
-            + "\n       </filter>"
-            + "\n       <filter>"
-            + "\n           <filter-name>junit</filter-name>"
-            + "\n           <filter-class>org.apache.tuscany.sca.host.webapp.junit.JUnitServletFilter</filter-class>"
-            + "\n           <init-param>"
-            + "\n               <param-name>junit.tests.path</param-name>"
-            + "\n               <param-value>${junit.tests.path}</param-value>"
-            + "\n           </init-param>"
-            + "\n       </filter>"
-            + "\n       <filter-mapping>"
-            + "\n           <filter-name>tuscany</filter-name>"
-            + "\n           <url-pattern>/*</url-pattern>"
-            + "\n       </filter-mapping>"
-            + "\n       <filter-mapping>"
-            + "\n           <filter-name>junit</filter-name>"
-            + "\n           <url-pattern>/junit/*</url-pattern>"
-            + "\n       </filter-mapping>"
-            + "\n</web-app>\n";
-
-    /**
-     * @parameter
-     */
-    private String testsPath;
-
-    /**
-     * @parameter
-     */
-    private boolean geronimo;
-
-    /**
-     * The project to create a build for.
-     *
-     * @parameter expression="${project}"
-     * @required
-     * @readonly
-     */
-    private MavenProject project;
-
-    public void execute() throws MojoExecutionException {
-        File base =
-            new File(project.getBasedir(), "target" + File.separator
-                + project.getBuild().getFinalName()
-                + File.separator
-                + "WEB-INF");
-        base.mkdirs();
-        // Create the dir to work around the complaint from maven-war-plugin on non-existent folders
-        new File(project.getBasedir(), "target/classes/META-INF".replace('/', File.separatorChar)).mkdirs();
-        File webxml = new File(base, "web.xml");
-        getLog().info("Generating " + webxml.toString());
-
-        String name = project.getName();
-        if (name == null) {
-            name = project.getGroupId() + "-" + project.getArtifactId();
-        }
-        String content = setParameter(WEB_XML, "display-name", name);
-
-        if (testsPath == null) {
-            testsPath = "/WEB-INF/classes/";
-        }
-        content = setParameter(content, "junit.tests.path", testsPath);
-
-        try {
-            FileWriter writer = new FileWriter(webxml);
-            writer.append(content);
-            writer.close();
-        } catch (IOException e) {
-            throw new MojoExecutionException(e.getMessage(), e);
-        }
-
-        if (geronimo) {
-            File geronimoxml = new File(base, "geronimo-web.xml");
-            getLog().info("Generating " + geronimoxml.toString());
-            content = setParameter(GERONIMO_WEB_XML, "groupId", project.getGroupId());
-            content = setParameter(content, "artifactId", project.getArtifactId());
-            content = setParameter(content, "version", project.getVersion());
-            // content = setParameter(content, "context.root", "/" + project.getBuild().getFinalName());
-            try {
-                geronimoxml.getParentFile().mkdirs();
-                FileWriter writer = new FileWriter(geronimoxml);
-                writer.append(content);
-                writer.close();
-            } catch (IOException e) {
-                throw new MojoExecutionException(e.getMessage(), e);
-            }
-        }
-
-        // Workaround: maven-war-plugin doesn't like non-existing folders
-        // create target/test-classes
-        new File(project.getBasedir(), "target" + File.separator + "test-classes").mkdirs();
-
-    }
-
-    private String setParameter(String xml, String name, String value) {
-        String pattern = "${" + name + "}";
-        int index = xml.indexOf(pattern);
-        if (index != -1) {
-            String content = xml.substring(0, index) + value + xml.substring(index + pattern.length());
-            return content;
-        }
-        return xml;
-    }
-
-}
diff --git a/java/sca-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java b/java/sca-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
deleted file mode 100644
index 658d65d7c3..0000000000
--- a/java/sca-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
+++ /dev/null
@@ -1,205 +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.tools.sca.web.junit.plugin;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import org.apache.commons.logging.LogFactory;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.StatusLine;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-
-/**
- * @version $Rev$ $Date$
- * @goal test
- * @phase integration-test
- * @requiresDependencyResolution test
- * @description Run the unit test over HTTP
- */
-public class WebJUnitMojo extends AbstractMojo {
-    /**
-     * The project to create a build for.
-     *
-     * @parameter expression="${project}"
-     * @required
-     * @readonly
-     */
-    private MavenProject project;
-
-    /**
-     * The test cases to run
-     * @parameter 
-     */
-    private String testCases[];
-
-    /**
-     * The URL for the web site
-     * @parameter
-     */
-    private String url;
-
-    /**
-     * Timeout for the HTTP connection
-     * @parameter
-     */
-    private int timeout = 300000; // 5 minutes
-
-    /**
-     * To avoid throwing exceptions because we want the stop container plugin to be executed
-     * @parameter
-     */
-    private boolean ignoreErrors = true;
-
-    public void execute() throws MojoExecutionException {
-        if (project.getPackaging().equals("pom")) {
-            return;
-        }
-
-        reset();
-
-        if (url == null) {
-            url = "http://localhost:8080/" + project.getBuild().getFinalName() + "/junit?op=runAll";
-        }
-
-        if (testCases != null) {
-            StringBuffer buf = new StringBuffer(url);
-            for (int i = 0; i < testCases.length; i++) {
-                if (i == 0) {
-                    buf.append('?');
-                }
-                buf.append(testCases[i]);
-                if (i != testCases.length - 1) {
-                    buf.append(',');
-                }
-            }
-            url = buf.toString();
-        }
-
-        getLog().info("Connecting to " + url);
-
-        int runs = 0, errors = 0, failures = 0;
-        String xml = "";
-
-        try {
-            HttpClient client = new DefaultHttpClient();
-            HttpGet httpget = new HttpGet(url);
-            httpget.getParams().setParameter("http.socket.timeout", new Integer(timeout));
-
-            // Execute HTTP request
-            HttpResponse response = client.execute(httpget);
-
-            StatusLine status = response.getStatusLine();
-            if (status.getStatusCode() != HttpStatus.SC_OK) {
-                if (!ignoreErrors) {
-                    throw new MojoExecutionException(status.getStatusCode() + ": " + status.getReasonPhrase());
-                }
-                getLog().error(status.getStatusCode() + ": " + status.getReasonPhrase());
-                return;
-            }
-            Header header = response.getFirstHeader("junit.errors");
-            errors = header == null ? 0 : Integer.parseInt(header.getValue());
-            header = response.getFirstHeader("junit.failures");
-            failures = header == null ? 0 : Integer.parseInt(header.getValue());
-            header = response.getFirstHeader("junit.runs");
-            runs = header == null ? 0 : Integer.parseInt(header.getValue());
-            getLog().info("Runs: " + runs + ", Failures: " + failures + ", Errors: " + errors);
-
-            // Get hold of the response entity
-            HttpEntity entity = response.getEntity();
-
-            // If the response does not enclose an entity, there is no need
-            // to bother about connection release
-            if (entity != null) {
-                BufferedReader reader = new BufferedReader(new InputStreamReader(entity.getContent()));
-                try {
-                    StringBuffer sb = new StringBuffer();
-                    while (true) {
-                        String line = reader.readLine();
-                        if (line == null) {
-                            break;
-                        }
-                        sb.append(line);
-                    }
-                    xml = sb.toString();
-                    getLog().debug(xml);
-
-                } catch (IOException ex) {
-
-                    // In case of an IOException the connection will be released
-                    // back to the connection manager automatically
-                    throw ex;
-
-                } catch (RuntimeException ex) {
-
-                    // In case of an unexpected exception you may want to abort
-                    // the HTTP request in order to shut down the underlying 
-                    // connection and release it back to the connection manager.
-                    httpget.abort();
-                    throw ex;
-
-                } finally {
-
-                    // Closing the input stream will trigger connection release
-                    reader.close();
-
-                }
-
-            }
-        } catch (Exception e) {
-            if (!ignoreErrors) {
-                throw new MojoExecutionException(e.getMessage(), e);
-            }
-            getLog().error(e);
-        }
-        if (errors != 0 || failures != 0) {
-            if (!ignoreErrors) {
-                throw new MojoExecutionException(xml);
-            }
-            getLog().error(xml);
-        }
-
-    }
-
-    /**
-     * A workaround to avoid logging conflict with Geronimo
-     */
-    private static void reset() {
-        LogFactory.releaseAll();
-
-        // Restore a reasonable default log impl
-        System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog");
-
-        // Make SimpleLog look more like Maven logs
-        System.setProperty("org.apache.commons.logging.simplelog.showShortLogname", "false");
-
-        // Restore default Geronimo bootstrap behavior
-        System.getProperties().remove("geronimo.bootstrap.logging.enabled");
-    }
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/LICENSE b/java/sca-contrib/tools/runtime-inspector/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/runtime-inspector/NOTICE b/java/sca-contrib/tools/runtime-inspector/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/tools/runtime-inspector/pom.xml b/java/sca-contrib/tools/runtime-inspector/pom.xml
deleted file mode 100644
index 8fc3e83948..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/pom.xml
+++ /dev/null
@@ -1,71 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca-tools</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tools-runtime-inspector</artifactId>

-    <name>Apache Tuscany SCA Tools Runtime Inspector</name>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-http</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java b/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
deleted file mode 100644
index ce91155b53..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
+++ /dev/null
@@ -1,64 +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.tools.inspector;
-
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-
-/**
- * Prints out the composite XML.
- */
-public class AssemblyInspector {
-    
-
-    public String assemblyAsString(Node node) {
-        StringBuffer assemblyString = new StringBuffer();
-        
-        // get at the node internals
-        Composite composite = ((NodeImpl)node).getComposite();
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        
-        // Get the output factory 
-        FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class);
-        XMLOutputFactory outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        StAXArtifactProcessorExtensionPoint staxProcessors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        StAXArtifactProcessor<Composite> compositeProcessor = (StAXArtifactProcessor<Composite>)staxProcessors.getProcessor(Composite.class);
-        
-        // Write the composite
-        try {
-            XMLStreamWriter writer = outputFactory.createXMLStreamWriter(System.out);
-            compositeProcessor.write(composite, writer);
-        } catch (Exception e) {
-            assemblyString.append(e.toString());
-        }
-
-        return assemblyString.toString();
-    }
-    
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java b/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
deleted file mode 100644
index 10eb0716e9..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
+++ /dev/null
@@ -1,66 +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.tools.inspector;
-
-import java.lang.reflect.Field;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-
-/**
- * An implementation of the ExtensionPointRegistryInspector service.
- */
-public class RegistryInspector {
-
-    public String registryAsString(Node node) {
-        StringBuffer extensionPointRegistryString = new StringBuffer("Extension Point Registry \n");
-        
-        // Get the interesting extension points out of the registry and print them out
-        
-        try {
-            
-            // get the extension point registry we are hanging onto
-            // We have to assume the type of the extension point registry here!
-            DefaultExtensionPointRegistry extensionPointRegistry = (DefaultExtensionPointRegistry)((NodeImpl)node).getExtensionPointRegistry();
-                                                                    
-            // get the Map of extension points
-            // This is a private (!) field so a bit of sneaky reflection is required
-            Field extensionPointsField = extensionPointRegistry.getClass().getDeclaredField("extensionPoints");
-            extensionPointsField.setAccessible(true);
-            Map<Class<?>, Object> extensionPoints = (Map<Class<?>, Object>) extensionPointsField.get(extensionPointRegistry);
-            
-            // Record all the registered extension points
-            Set<Class<?>> keySet = extensionPoints.keySet();
-            for(Class<?>key : keySet){
-                extensionPointRegistryString.append(key.getName());
-                extensionPointRegistryString.append("\n");                 
-            }
-            
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-        }
-
-        return extensionPointRegistryString.toString();
-    }
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java b/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
deleted file mode 100644
index 883f042172..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
+++ /dev/null
@@ -1,284 +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.tools.inspector;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-
-/**
- * Prints out the assembly and the runtime hierarchy as XML
- */
-public class RuntimeInspector {
-    
-    private boolean useGetters = false;
-    private PrintWriter out;
-    private int indent;
-
-
-    void indent() {
-        for (int i = 0; i < indent; i++) {
-            out.print("  ");
-        }
-    }    
-
-    public String runtimeAsString(Node node) {
-        StringBuffer assemblyString = new StringBuffer();
-        this.out = new PrintWriter(new OutputStreamWriter(System.out), true);
-        
-        // Get the interesting extension points out of the registry and print them out
-        
-        try {
-            Composite composite = ((NodeImpl)node).getComposite();
-            
-            print(composite);
-
-            
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-        }
-
-        return assemblyString.toString();
-    }
-    
-    /**
-     * Print an object.
-     * 
-     * @param object
-     */
-    public void print(Object object) {
-        Set<Integer> objects = new HashSet<Integer>();
-        print(object, objects);
-    }
-
-    /**
-     * Print an object.
-     * 
-     * @param object
-     */
-    private void print(Object object, Set<Integer> printed) {
-        if (object == null) {
-            return;
-        }
-        int id = System.identityHashCode(object);
-        if (printed.contains(id)) {
-
-            // If we've already printed an object, print just it's HashCode
-            indent();
-            out.println("<" + object.getClass().getName() + " IDREF=\"" + id + "\"/>");
-        } else {
-            printed.add(id);
-            try {
-
-                // Print the object class name
-                indent();
-                out.println("<" + object.getClass().getName() + " ID=\"" + id + "\">");
-                
-                // Get the object's properties
-                ValueAccessor accessor = useGetters ? new PropertyAccessor(object) : new FieldAccessor(object);
-                for (int i = 0; i < accessor.size(); i++) {
-                    try {
-
-                        // Get the value of each property
-                        Object value = accessor.getValue(i);
-                        if (value != null) {
-
-                            // Convert array value into a list
-                            if (value.getClass().isArray()) {
-                                value = Arrays.asList((Object[])value);
-                            }
-
-                            // Print elements in a list
-                            if (value instanceof List) {
-                                if (!((List)value).isEmpty()) {
-                                    indent++;
-                                    indent();
-                                    out.println("<" + accessor.getName(i) + ">");
-                                    // Print each element, recursively
-                                    for (Object element : (List)value) {
-                                        indent++;
-                                        print(element, printed);
-                                        indent--;
-                                    }
-                                    indent();
-                                    out.println("</" + accessor.getName(i) + ">");
-                                    indent--;
-                                }
-                            } else {
-                                Class<?> valueClass = value.getClass();
-
-                                // Print a primitive, java built in type or
-                                // enum, using toString()
-                                if (valueClass.isPrimitive() || valueClass.getName().startsWith("java.")
-                                    || valueClass.getName().startsWith("javax.")
-                                    || valueClass.isEnum()) {
-                                    if (!accessor.getName(i).equals("class")) {
-                                        if (!(Boolean.FALSE.equals(value))) {
-                                            indent++;
-                                            indent();
-                                            out.println("<" + accessor.getName(i) + ">" + value.toString() + "</" + accessor.getName(i) + ">" );
-                                            indent--;
-                                        }
-                                    }
-                                } else if (value instanceof Node) {
-                                    indent++;
-                                    indent();
-                                    out.println("<" + accessor.getName(i) + ">" + value.toString() + "</" + accessor.getName(i) + ">");
-                                    indent--;
-                                } else {
-
-                                    // Print an object, recursively
-                                    indent++;
-                                    indent();
-                                    out.println("<" + accessor.getName(i) + ">");
-                                    indent++;
-                                    print(value, printed);
-                                    indent--;
-                                    indent();
-                                    out.println("</" + accessor.getName(i) + ">");
-                                    indent--;
-                                }
-                            }
-                        }
-                    } catch (Exception e) {
-                    }
-                }
-                indent();
-                out.println("</" + object.getClass().getName() + ">");
-            } catch (Exception e) {
-                indent();
-                out.println(e);
-            }
-        }
-    }
-
-    public static interface ValueAccessor {
-        int size();
-
-        String getName(int i);
-
-        Object getValue(int i) throws Exception;
-    }
-
-    /**
-     * Java field reflection based value accessor
-     */
-    private static class FieldAccessor implements ValueAccessor {
-
-        private Object object;
-        private List<Field> fields;
-
-        public FieldAccessor(Object object) {
-            this.fields = getAllFields(object.getClass());
-            this.object = object;
-        }
-
-        public String getName(int i) {
-            return fields.get(i).getName();
-        }
-
-        public Object getValue(int i) throws Exception {
-            return fields.get(i).get(object);
-        }
-
-        public int size() {
-            return fields.size();
-        }
-
-    }
-
-    /**
-     * JavaBean-based value accessor
-     */
-    private static class PropertyAccessor implements ValueAccessor {
-
-        private Object object;
-        private PropertyDescriptor[] fields;
-
-        public PropertyAccessor(Object object) throws IntrospectionException {
-            BeanInfo beanInfo = Introspector.getBeanInfo(object.getClass());
-            this.fields = beanInfo.getPropertyDescriptors();
-            this.object = object;
-        }
-
-        public String getName(int i) {
-            return fields[i].getName();
-        }
-
-        public Object getValue(int i) throws Exception {
-            Method getter = fields[i].getReadMethod();
-            if (getter != null) {
-                return getter.invoke(object);
-            }
-            return null;
-        }
-
-        public int size() {
-            return fields.length;
-        }
-
-    }
-
-    /**
-     * Returns a collection of fields declared by a class
-     * or one of its supertypes
-     */
-    private static List<Field> getAllFields(Class<?> clazz) {
-        return getAllFields(clazz, new ArrayList<Field>());
-    }
-
-    /**
-     * Recursively evaluates the type hierarchy to return all fields 
-     */
-    private static List<Field> getAllFields(Class<?> clazz, List<Field> fields) {
-        if (clazz == null || clazz.isArray() || Object.class.equals(clazz)) {
-            return fields;
-        }
-        fields = getAllFields(clazz.getSuperclass(), fields);
-        Field[] declaredFields = clazz.getDeclaredFields();
-        for (final Field field : declaredFields) {
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    field.setAccessible(true); // ignore Java accessibility
-                    return null;
-                }
-            });
-            fields.add(field);
-        }
-        return fields;
-    }
-    
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/AddService.java b/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java b/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java b/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
deleted file mode 100644
index 8001ab7818..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,48 +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 calculator;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
-    public static void main(String[] args) throws Exception {
-
-        SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("Calculator.composite", CalculatorClient.class.getClassLoader());
-        node.start();
-        
-        CalculatorService calculatorService = 
-            ((SCAClient) node).getService(CalculatorService.class, "CalculatorServiceComponent");
-
-        // Calculate
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
-        node.stop();
-    }
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java b/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java b/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 17fad7de6b..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/DivideService.java b/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java b/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java b/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java b/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractService.java b/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java b/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java b/java/sca-contrib/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
deleted file mode 100644
index 0710b670cd..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.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 org.apache.tuscany.sca.tools.inspector;

-

-import java.io.File;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

-

-import calculator.CalculatorService;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class RegistryInspectorTestCase extends TestCase {

-

-    private CalculatorService calculatorService;

-    private SCANode node;

-

-    @Override

-    protected void setUp() throws Exception {

-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-        node = nodeFactory.createSCANode(new File("src/test/resources/Calculator.composite").toURL().toString(),

-                                         new SCAContribution("TestContribution", 

-                                                             new File("src/test/resources").toURL().toString()));

-        node.start();

-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");

-    }

-

-    @Override

-    protected void tearDown() throws Exception {

-        node.stop();

-    }

-

-    public void testCalculator() throws Exception {

-        RegistryInspector registryInspector = new RegistryInspector();

-        

-        System.out.println(registryInspector.registryAsString(node)); 

-        

-        RuntimeInspector runtimeInspector = new RuntimeInspector();

-        

-        //System.out.println(runtimeInspector.runtimeAsString(node)); 

-        

-        AssemblyInspector assemblyInspector = new AssemblyInspector();

-        

-        //System.out.println(assemblyInspector.assemblyAsString(node)); 

-    }

-}

diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/resources/Calculator.composite b/java/sca-contrib/tools/runtime-inspector/src/test/resources/Calculator.composite
deleted file mode 100644
index 90872041b0..0000000000
--- a/java/sca-contrib/tools/runtime-inspector/src/test/resources/Calculator.composite
+++ /dev/null
@@ -1,49 +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://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/LICENSE b/java/sca-contrib/tools/sdo/java2wsdl/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/NOTICE b/java/sca-contrib/tools/sdo/java2wsdl/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/pom.xml b/java/sca-contrib/tools/sdo/java2wsdl/pom.xml
deleted file mode 100644
index 1a72028147..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/pom.xml
+++ /dev/null
@@ -1,180 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca-sdo-tools</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-java2wsdl</artifactId>
-    <name>Apache Tuscany SCA Java2WSDL Tool</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.stream</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0-2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.neethi</groupId>
-            <artifactId>neethi</artifactId>
-            <version>2.0.4</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>wsdl4j</groupId>
-                    <artifactId>wsdl4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
- 
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-java2wsdl</artifactId>
-            <version>1.4.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-codegen</artifactId>
-            <version>1.4.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-activation_1.1_spec</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>codegen</artifactId>
-            <version>2.2.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>codegen-ecore</artifactId>
-            <version>2.2.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl
-                            </schemaFile>
-                            <javaPackage>org.example.creditscore.doclit</javaPackage>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <!-- temporarily using indiana state univ as eclipse site diesnt have 2.2.2 at the moment -->
-            <id>indiana</id>
-            <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/
-            </url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-</project>
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
deleted file mode 100644
index 60afe70534..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
+++ /dev/null
@@ -1,423 +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.tools.java2wsdl.generate;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.apache.axis2.description.java2wsdl.Java2WSDLUtils;
-import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
-
-/**
- * This class encapsulates the parameters that effect the generation of the WSDL. For example they contain all user settings such as source class,
- * target location etc.
- *
- */
-public class GenerationParameters implements TuscanyJava2WSDLConstants {
-    public static final String WSDL_FILENAME_SUFFIX = ".wsdl";
-
-    public static final String XSD_IMPORT_DELIMITER = "[,]";
-
-    private Map cmdLineOptions = null;
-
-    private File outputFile = null;
-
-    private FileOutputStream outputFileStream = null;
-
-    private String sourceClassName = null;
-
-    private ArrayList extraClasses;
-
-    private ArrayList factoryClassNames;
-
-    private String attrFormDefault = null;
-
-    private String elementFormDefault = null;
-
-    private String targetNamespace = null;
-
-    private String targetNamespacePrefix = null;
-
-    private String schemaTargetNamespace = null;
-
-    private String schemaTargetNamespacePrefix = null;
-
-    private String outputFileName = null;
-
-    private ClassLoader classLoader = null;
-
-    private String serviceName = null;
-
-    private String style = DOCUMENT;
-
-    private String use = LITERAL;
-
-    private String locationUri = DEFAULT_LOCATION_URL;
-
-    private Map schemaLocationMap = null;
-
-    public GenerationParameters(Map cmdLineOptions) throws Exception {
-        this.cmdLineOptions = cmdLineOptions;
-        loadParameters();
-    }
-
-    protected void loadParameters() throws Exception {
-        initializeSourceClassName();
-        resolveFileOutputStream();
-        resolveClassLoader4InputClasspath();
-        loadSchemaLocationMap();
-        initializeOtherParams();
-    }
-
-    private Java2WSDLCommandLineOption loadOption(String shortOption, String longOption) {
-        // short option gets precedence
-        Java2WSDLCommandLineOption option = null;
-        if (longOption != null) {
-            option = (Java2WSDLCommandLineOption) cmdLineOptions.get(longOption);
-            if (option != null) {
-                return option;
-            }
-        }
-        if (shortOption != null) {
-            option = (Java2WSDLCommandLineOption) cmdLineOptions.get(shortOption);
-        }
-
-        return option;
-    }
-
-    protected void initializeSourceClassName() throws Exception {
-        Java2WSDLCommandLineOption option = loadOption(CLASSNAME_OPTION, CLASSNAME_OPTION_LONG);
-        sourceClassName = option == null ? null : option.getOptionValue();
-
-        if (sourceClassName == null || sourceClassName.equals("")) {
-            throw new Exception("class name must be present!");
-        }
-    }
-
-    /**
-     * @throws Exception
-     */
-    protected void resolveFileOutputStream() throws Exception {
-        File outputFolder;
-        Java2WSDLCommandLineOption option = loadOption(OUTPUT_LOCATION_OPTION, OUTPUT_LOCATION_OPTION_LONG);
-        String outputFolderName = option == null ? System.getProperty("user.dir") : option.getOptionValue();
-
-        outputFolder = new File(outputFolderName);
-        if (!outputFolder.exists()) {
-            outputFolder.mkdirs();
-        } else if (!outputFolder.isDirectory()) {
-            throw new Exception("The specified location " + outputFolderName + "is not a folder");
-        }
-
-        option = loadOption(OUTPUT_FILENAME_OPTION, OUTPUT_FILENAME_OPTION_LONG);
-        String outputFileName = option == null ? null : option.getOptionValue();
-        // derive a file name from the class name if the filename is not specified
-        if (outputFileName == null) {
-            outputFileName = Java2WSDLUtils.getSimpleClassName(sourceClassName) + WSDL_FILENAME_SUFFIX;
-        }
-
-        // first create a file in the given location
-        File outputFile = new File(outputFolder, outputFileName);
-        try {
-            if (!outputFile.exists()) {
-                outputFile.createNewFile();
-            }
-            outputFileStream = new FileOutputStream(outputFile);
-        } catch (IOException e) {
-            throw new Exception(e);
-        }
-    }
-
-    protected void addToSchemaLocationMap(String optionValue) throws Exception {
-        // option value will be of the form [namespace, schemalocation]
-        // hence we take the two substrings starting after '[' and upto ',' and
-        // starting after ',' and upto ']'
-        getSchemaLocationMap().put(optionValue.substring(1, optionValue.indexOf(COMMA)),
-                optionValue.substring(optionValue.indexOf(COMMA) + 1, optionValue.length() - 1));
-    }
-
-    protected void loadSchemaLocationMap() throws Exception {
-        Java2WSDLCommandLineOption option = loadOption(IMPORT_XSD_OPTION, IMPORT_XSD_OPTION_LONG);
-
-        if (option != null) {
-            ArrayList optionValues = option.getOptionValues();
-
-            for (int count = 0; count < optionValues.size(); ++count) {
-                addToSchemaLocationMap(((String) optionValues.get(count)).trim());
-            }
-        }
-    }
-
-    protected void resolveClassLoader4InputClasspath() throws Exception {
-        URL[] urls = null;
-        Java2WSDLCommandLineOption option = loadOption(CLASSPATH_OPTION, CLASSPATH_OPTION_LONG);
-
-        if (option != null) {
-            ArrayList optionValues = option.getOptionValues();
-            urls = new URL[optionValues.size()];
-            String[] classPathEntries = (String[]) optionValues.toArray(new String[optionValues.size()]);
-
-            try {
-                for (int i = 0; i < classPathEntries.length; i++) {
-                    String classPathEntry = classPathEntries[i];
-                    // this should be a file(or a URL)
-                    if (Java2WSDLUtils.isURL(classPathEntry)) {
-                        urls[i] = new URL(classPathEntry);
-                    } else {
-                        urls[i] = new File(classPathEntry).toURL();
-                    }
-                }
-            } catch (MalformedURLException e) {
-                throw new Exception(e);
-            }
-
-        } else {
-            //Default to pwd
-            urls = new URL[1];
-            File pwd = new File(".");
-            urls[0] = pwd.toURL();
-        }
-
-        classLoader = new URLClassLoader(urls, Thread.currentThread().getContextClassLoader());
-    }
-
-    protected void initializeOtherParams() {
-        // set the other parameters to the builder
-        Java2WSDLCommandLineOption option =
-            loadOption(SCHEMA_TARGET_NAMESPACE_OPTION, SCHEMA_TARGET_NAMESPACE_OPTION_LONG);
-        schemaTargetNamespace = (option == null) ? null : option.getOptionValue();
-
-        option = loadOption(SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION, SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION_LONG);
-        schemaTargetNamespacePrefix = (option == null) ? null : option.getOptionValue();
-
-        option = loadOption(TARGET_NAMESPACE_OPTION, TARGET_NAMESPACE_OPTION_LONG);
-        targetNamespace = (option == null) ? null : option.getOptionValue();
-
-        option = loadOption(TARGET_NAMESPACE_PREFIX_OPTION, TARGET_NAMESPACE_PREFIX_OPTION_LONG);
-        targetNamespacePrefix = (option == null) ? null : option.getOptionValue();
-
-        option = loadOption(SERVICE_NAME_OPTION, SERVICE_NAME_OPTION_LONG);
-        serviceName = (option == null) ? Java2WSDLUtils.getSimpleClassName(sourceClassName) : option.getOptionValue();
-
-        option = loadOption(STYLE_OPTION, STYLE_OPTION);
-        style = (option == null) ? null : option.getOptionValue();
-
-        option = loadOption(LOCATION_OPTION, LOCATION_OPTION);
-        locationUri = (option == null) ? null : option.getOptionValue();
-
-        option = loadOption(USE_OPTION, USE_OPTION);
-        use = (option == null) ? null : option.getOptionValue();
-
-        option = loadOption(ATTR_FORM_DEFAULT_OPTION, ATTR_FORM_DEFAULT_OPTION_LONG);
-        attrFormDefault = (option == null) ? null : option.getOptionValue();
-
-        option = loadOption(ELEMENT_FORM_DEFAULT_OPTION, ELEMENT_FORM_DEFAULT_OPTION_LONG);
-        elementFormDefault = option == null ? null : option.getOptionValue();
-
-        option = loadOption(TuscanyJava2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION, TuscanyJava2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION_LONG);
-        extraClasses = option == null ? new ArrayList() : option.getOptionValues();
-
-        option = loadOption(TuscanyJava2WSDLConstants.FACTORY_CLASSNAMES_OPTION, TuscanyJava2WSDLConstants.FACTORY_CLASSNAMES_OPTION_LONG);
-        factoryClassNames = option == null ? new ArrayList() : option.getOptionValues();
-    }
-
-    public ClassLoader getClassLoader() {
-        return classLoader;
-    }
-
-    public void setClassLoader(ClassLoader classLoader) {
-        this.classLoader = classLoader;
-    }
-
-    public String getLocationUri() {
-        if (locationUri == null) {
-            locationUri = DEFAULT_LOCATION_URL;
-        }
-        return locationUri;
-    }
-
-    public void setLocationUri(String locationUri) {
-        this.locationUri = locationUri;
-    }
-
-    public FileOutputStream getOutputFileStream() {
-        return outputFileStream;
-    }
-
-    public void setOutputFileStream(FileOutputStream outputFileStream) {
-        this.outputFileStream = outputFileStream;
-    }
-
-    public String getSchemaTargetNamespace() throws Exception {
-        if (schemaTargetNamespace == null || schemaTargetNamespace.trim().equals("")) {
-            // This amounts to assuming we want the wrapper elements in the same TNS
-            // as the WSDL definitions.
-            //
-            // If the user neither specifies a TNS nor a SchemaTNS then both of these two
-            // will continue to default to the same NS calculated from the input class' package name.
-            //
-            // The wrapper elements aren't really interesting outside the context of the WSDL types
-            // section, so it seems reasonable to think that a user who cares to select a non-default
-            // TNS for the WSDL definitions might want the wrapper elements defined in that same
-            // NS.
-            //
-            // The user can always override this default.
-
-            this.schemaTargetNamespace = this.getTargetNamespace();
-        }
-        return schemaTargetNamespace;
-    }
-
-    public void setSchemaTargetNamespace(String schemaTargetNamespace) {
-        this.schemaTargetNamespace = schemaTargetNamespace;
-    }
-
-    public String getSchemaTargetNamespacePrefix() {
-        if (schemaTargetNamespacePrefix == null || schemaTargetNamespacePrefix.trim().equals("")) {
-            this.schemaTargetNamespacePrefix = SCHEMA_NAMESPACE_PRFIX;
-        }
-
-        return schemaTargetNamespacePrefix;
-    }
-
-    public void setSchemaTargetNamespacePrefix(String schemaTargetNamespacePrefix) {
-        this.schemaTargetNamespacePrefix = schemaTargetNamespacePrefix;
-    }
-
-    public String getServiceName() {
-        if (serviceName == null) {
-            serviceName = Java2WSDLUtils.getSimpleClassName(getSourceClassName());
-        }
-        return serviceName;
-    }
-
-    public void setServiceName(String serviceName) {
-        this.serviceName = serviceName;
-    }
-
-    public String getSourceClassName() {
-        return sourceClassName;
-    }
-
-    public void setSourceClassName(String sourceClassName) {
-        this.sourceClassName = sourceClassName;
-    }
-
-    public String getStyle() {
-        if (style == null) {
-            style = DOCUMENT;
-        }
-        return style;
-    }
-
-    public void setStyle(String style) {
-        this.style = style;
-    }
-
-    public String getTargetNamespace() throws Exception {
-        if (targetNamespace == null) {
-            targetNamespace = Java2WSDLUtils.namespaceFromClassName(this.sourceClassName, this.classLoader).toString();
-        }
-        return targetNamespace;
-    }
-
-    public void setTargetNamespace(String targetNamespace) {
-        this.targetNamespace = targetNamespace;
-    }
-
-    public String getTargetNamespacePrefix() {
-        return targetNamespacePrefix;
-    }
-
-    public void setTargetNamespacePrefix(String targetNamespacePrefix) {
-        this.targetNamespacePrefix = targetNamespacePrefix;
-    }
-
-    public String getUse() {
-        if (use == null) {
-            use = LITERAL;
-        }
-        return use;
-    }
-
-    public void setUse(String use) {
-        this.use = use;
-    }
-
-    public Map getSchemaLocationMap() {
-        if (schemaLocationMap == null) {
-            schemaLocationMap = new Hashtable();
-        }
-        return schemaLocationMap;
-    }
-
-    public void setSchemaLocationMap(Map schemaLocationMap) {
-        this.schemaLocationMap = schemaLocationMap;
-    }
-
-    public String getAttrFormDefault() {
-        if (attrFormDefault == null) {
-            attrFormDefault = FORM_DEFAULT_UNQUALIFIED;
-        }
-        return attrFormDefault;
-    }
-
-    public void setAttrFormDefault(String attrFormDefault) {
-        this.attrFormDefault = attrFormDefault;
-    }
-
-    public String getElementFormDefault() {
-        if (elementFormDefault == null) {
-            elementFormDefault = FORM_DEFAULT_QUALIFIED;
-        }
-        return elementFormDefault;
-    }
-
-    public void setElementFormDefault(String elementFormDefault) {
-        this.elementFormDefault = elementFormDefault;
-    }
-
-    public ArrayList getExtraClasses() {
-        return extraClasses;
-    }
-
-    public void setExtraClasses(ArrayList extraClasses) {
-        this.extraClasses = extraClasses;
-    }
-
-    public ArrayList getFactoryClassNames() {
-        return factoryClassNames;
-    }
-
-    public void setFactoryClassNames(ArrayList factoryClassNames) {
-        this.factoryClassNames = factoryClassNames;
-    }
-
-    // Not a command-line parameter, but will be useful for printing status message
-    protected File getOutputFile() {
-        return outputFile;
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
deleted file mode 100644
index a890dd624d..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
+++ /dev/null
@@ -1,82 +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.tools.java2wsdl.generate;
-
-import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOptionParser;
-
-/**
- * This class provides the tooling abstraction to Tuscany Java2WSDL and can be
- * invoked from command line with the following options as with Axis2 Java2WSDL
- */
-public class Java2WSDL {
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-        // parse the cmd line args
-        Java2WSDLCommandLineOptionParser commandLineOptionParser = new Java2WSDLCommandLineOptionParser(args);
-
-        // validate the arguments
-        validateCommandLineOptions(commandLineOptionParser);
-
-        Java2WSDLGeneratorFactory.getInstance().createGenerator().generateWSDL(commandLineOptionParser.getAllOptions());
-
-        // Uncomment the following statement to directly run the Axis2 tool
-        // without
-        // runAxis2Tool(args);
-    }
-
-    private static void runAxis2Tool(String[] args) {
-        org.apache.ws.java2wsdl.Java2WSDL.main(args);
-    }
-
-    private static void validateCommandLineOptions(Java2WSDLCommandLineOptionParser parser) {
-        if (parser.getAllOptions().size() == 0) {
-            printUsage();
-        } else if (parser.getInvalidOptions(new TuscanyJava2WSDLOptionsValidator()).size() > 0) {
-            printUsage();
-        }
-
-    }
-
-    public static void printUsage() {
-        System.out.println("Usage java2wsdl -cn <fully qualified class name> : class file name");
-        System.out.println("-o <output Location> : output file location");
-        System.out.println("-cp <class path uri> : list of classpath entries - (urls)");
-        System.out.println("-tn <target namespace> : target namespace");
-        System.out.println("-tp <target namespace prefix> : target namespace prefix");
-        System.out.println("-stn <schema target namespace> : target namespace for schema");
-        System.out.println("-stp <schema target namespace prefix> : target namespace prefix for schema");
-        System.out.println("-sn <service name> : service name");
-        System.out.println("-of <output file name> : output file name for the WSDL");
-        System.out.println("-st <binding style> : style for the WSDL");
-        System.out.println("-u <binding use> : use for the WSDL");
-        System.out.println("-l <soap address> : address of the port for the WSDL");
-        System.out
-            .println("-ixsd [<schema namespace 1>,<schema loc 1>] [<schema namespace 2>,<schema loc 2>] ... [<schema namespace N>,<schema loc N>]   : schemas to be imported (without a comma in between brackets)");
-        System.out.println("-efd <unqualified> : Setting for elementFormDefault (defaults to qualified)");
-        System.out.println("-afd <unqualified> : Setting for attributeFormDefault (defaults to qualified)");
-        System.out
-            .println("-fcn <Generated SDO Factory classname 1> <Generated SDO Factory classname 2> ...   <Generated SDO Factory classname N> (without a comma in between) ");
-
-        System.out
-            .println("-xc <extra class> : Extra class for which schematype must be generated.  " + "\t\tUse as : -xc class1 -xc class2 ...");
-        System.exit(0);
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
deleted file mode 100644
index 9c8ff9df9e..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
+++ /dev/null
@@ -1,46 +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.tools.java2wsdl.generate;
-
-import java.io.OutputStream;
-import java.util.Map;
-
-/**
- * This is the Java2WSDL Generator facade that will be used by Tuscany
- * components for Java to WSDL conversion.
- * 
- */
-public interface Java2WSDLGenerator {
-	public void generateWSDL(String[] args);
-
-	public void generateWSDL(Map commandLineOptions);
-
-	public void addWSDLGenListener(WSDLGenListener l);
-
-	public void removeWSDLGenListener(WSDLGenListener l);
-
-	public Map getCommandLineOptions();
-
-	public void setCommandLineOptoins(Map cmdLineOpts);
-
-	public OutputStream getOutputStream();
-
-	public void setOutputStream(OutputStream outStream);
-
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
deleted file mode 100644
index e8f3db95b0..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
+++ /dev/null
@@ -1,89 +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.tools.java2wsdl.generate;
-
-import java.util.Vector;
-
-/**
- * Factory that creates Java2WSDL Generators. Presently the there is a Default
- * Generator that wraps around the AXIS2 Java2WSDL implementation. The factory
- * can be extended to create generators that wrap around other implementations
- * if required.
- */
-
-public class Java2WSDLGeneratorFactory {
-	/*
-	 * singleton instance of this factory class
-	 */
-	private static Java2WSDLGeneratorFactory factory = null;
-
-	/**
-	 * code for the default generator
-	 */
-	public static final int DEFAULT_GENERATOR = 0;
-
-	/**
-	 * Default Generator class name
-	 */
-	public static final String DEFAULT_GENERATOR_CLASSNAME = "org.apache.tuscany.tools.java2wsdl.generate.Java2WSDLGeneratorImpl";
-
-	/**
-	 * list of generator classnames in a position that corresponds to their
-	 * code. For example the default generator's code is 0 and hence this
-	 * generator's classname is stored at index '0' of the list
-	 */
-	protected Vector<String> generatorClassNames = new Vector<String>();
-
-	/**
-	 * @return the singleton instance of this generator factory
-	 */
-	public static Java2WSDLGeneratorFactory getInstance() {
-		if (factory == null) {
-			factory = new Java2WSDLGeneratorFactory();
-		}
-		return factory;
-	}
-
-	private Java2WSDLGeneratorFactory() {
-		generatorClassNames.addElement(DEFAULT_GENERATOR_CLASSNAME);
-	}
-
-	public Java2WSDLGenerator createGenerator() {
-		return createGenerator(DEFAULT_GENERATOR);
-	}
-
-	/**
-	 * creates an instance of a Java2WSDL Generator based on the input type
-	 * 
-	 * @param genType
-	 *            type of the generator to be created
-	 * @return an instance of a Java2WSDL Generator
-	 */
-	public Java2WSDLGenerator createGenerator(int genType) {
-		try {
-			return (Java2WSDLGenerator) (Class.forName(generatorClassNames
-					.elementAt(genType)).newInstance());
-		} catch (Exception e) {
-			System.out
-					.println(" Unable to create Java2WSDL generator due to .....");
-			System.out.println(e);
-			return null;
-		}
-	}
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
deleted file mode 100644
index f60f7b8ca5..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
+++ /dev/null
@@ -1,221 +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.tools.java2wsdl.generate;
-
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axis2.util.XMLPrettyPrinter;
-import org.apache.ws.java2wsdl.Java2WSDL;
-import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
-import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOptionParser;
-import org.apache.ws.java2wsdl.utils.Java2WSDLOptionsValidator;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * This is an implementation of the Java2WSDLGenerator facade. This
- * implementation is a decorator around the Axis2 implementation of the
- * Java2WSDL conversion. The WSDL generation is divided into phases that are
- * stringed up as a template method. The phases are - User Input Validation -
- * WSDL Java Model Generation - Serialization of WSDL Java Model The function of
- * each phase is accomplished by delegation to the appropriate classes in Axis2.
- * At the start and end of each phase an event is published to subscribers
- * denoting the start and end of the phase. Such a splitting up of the Java2WSDL
- * conversion into phases has been designed to enable interceptors to modify the
- * model or apply transformations to the output. Typically the interceptors can
- * subscribe to the start and end events of these phases and hence be able to
- * intercept. Note: This class contains substantial AXIS2 Java2WSDL code
- * refactored into it. These will be removed as and when the Axis2 code is
- * fixed.
- */
-public class Java2WSDLGeneratorImpl implements Java2WSDLGenerator, TuscanyJava2WSDLConstants {
-    private List<WSDLGenListener> genPhaseListeners = new Vector<WSDLGenListener>();
-    private GenerationParameters genParams = null;
-    private Map<String, Java2WSDLCommandLineOption> commandLineOptions = null;
-    private TuscanyJava2WSDLBuilder java2WsdlBuilder;
-    private OutputStream outputStream = null;
-
-    public Java2WSDLGeneratorImpl() {
-
-    }
-
-    private void multicastGenPhaseCompletionEvent(int genPhase) {
-        WSDLGenEvent event = new WSDLGenEvent(this, genPhase);
-        Iterator iterator = genPhaseListeners.iterator();
-        while (iterator.hasNext()) {
-            ((WSDLGenListener)iterator.next()).WSDLGenPhaseCompleted(event);
-        }
-    }
-
-    private void initJava2WSDLBuilder() throws Exception {
-        // Now we are done with loading the basic values - time to create the
-        // builder
-        java2WsdlBuilder = new TuscanyJava2WSDLBuilder(genParams);
-    }
-
-    protected boolean validateInputArgs(String[] args) {
-        boolean isValid = true;
-        Java2WSDLCommandLineOptionParser parser = new Java2WSDLCommandLineOptionParser(args);
-        if (parser.getAllOptions().size() == 0) {
-            Java2WSDL.printUsage();
-            isValid = false;
-        } else if (parser.getInvalidOptions(new Java2WSDLOptionsValidator()).size() > 0) {
-            Java2WSDL.printUsage();
-            isValid = false;
-        }
-
-        if (isValid) {
-            commandLineOptions = parser.getAllOptions();
-        }
-
-        return isValid;
-    }
-
-    public boolean buildWSDLDocument() throws Exception {
-        boolean isComplete = true;
-        initJava2WSDLBuilder();
-        java2WsdlBuilder.buildWSDL();
-
-        return isComplete;
-    }
-
-    public boolean serializeWSDLDocument() throws Exception {
-        boolean isComplete = true;
-
-        if (getOutputStream() == null) {
-            setOutputStream(genParams.getOutputFileStream());
-        }
-
-        // transform the OMElement
-        OMElement om = java2WsdlBuilder.getWsdlDocument();
-        XMLPrettyPrinter.prettify(om, getOutputStream());        
-        
-        return isComplete;
-
-    }
-
-    /*
-     * This is the template method that splits the Java2WSDL generation cycle
-     * into phase / steps.
-     * 
-     * @see tuscany.tools.Java2WSDLGeneratorIfc#generateWSDL(java.lang.String[])
-     */
-    public void generateWSDL(Map commandLineOptions) {
-        try {
-            // load the user options into an easy to access abstraction
-            genParams = new GenerationParameters(commandLineOptions);
-
-            // if the WSDL Model generation was successful
-            if (buildWSDLDocument()) {
-                // multicast event for generation of WSDL model
-                multicastGenPhaseCompletionEvent(WSDLGenListener.WSDL_MODEL_CREATION);
-                // if the Serialization of the generated (and fixed) model
-                // is successful
-                if (serializeWSDLDocument()) {
-                    // multicast event for writing of the WSDL Model to
-                    // supplied output stream
-                    multicastGenPhaseCompletionEvent(WSDLGenListener.WSDL_MODEL_WRITING);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void generateWSDL(String[] args) {
-        // if the argument input are found to be valid
-        if (validateInputArgs(args)) {
-            // multicast event for input args validation complete
-            multicastGenPhaseCompletionEvent(WSDLGenListener.INPUT_ARGS_VALIDATION);
-            generateWSDL(commandLineOptions);
-        }
-    }
-
-    public void addWSDLGenListener(WSDLGenListener l) {
-        genPhaseListeners.add(l);
-
-    }
-
-    public void removeWSDLGenListener(WSDLGenListener l) {
-        genPhaseListeners.remove(l);
-    }
-
-    public Map getCommandLineOptions() {
-        return commandLineOptions;
-    }
-
-    public void setCommandLineOptoins(Map cmdLineOpts) {
-        commandLineOptions = cmdLineOpts;
-    }
-
-    public OutputStream getOutputStream() {
-        return outputStream;
-    }
-
-    public void setOutputStream(OutputStream outStream) {
-        outputStream = outStream;
-    }
-
-    public TuscanyJava2WSDLBuilder getJava2WsdlBuilder() {
-        return java2WsdlBuilder;
-    }
-
-    public void setJava2WsdlBuilder(TuscanyJava2WSDLBuilder java2WsdlBuilder) {
-        this.java2WsdlBuilder = java2WsdlBuilder;
-    }
-
-    // 
-    // Works recursively with node's entire subtree
-    // There's no tie to fields in this object so I made this public.
-    // 
-    public static void removeTextNodes(Node node) {
-
-        if (node == null)
-            return;
-
-        if (node.getNodeType() == Node.TEXT_NODE) {
-            node.getParentNode().removeChild(node);
-        } else {
-            int origNumNodes;
-            NodeList children = null;
-            do {
-                children = node.getChildNodes();
-                origNumNodes = children.getLength();
-
-                for (int i = 0; i < origNumNodes; i++) {
-                    removeTextNodes(children.item(i));
-                }
-            } while (node.getChildNodes().getLength() != origNumNodes);
-        }
-    }
-
-    protected void printGenerationMessage() {
-        System.out.println("");
-        System.out.println("Generating " + genParams.getOutputFile()
-            + " from Java class "
-            + genParams.getSourceClassName()
-            + ".");
-        System.out.println("");
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
deleted file mode 100644
index 897700ffd9..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
+++ /dev/null
@@ -1,613 +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.tools.java2wsdl.generate;
-
-import java.io.StringReader;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axis2.description.java2wsdl.Java2WSDLUtils;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaForm;
-import org.apache.ws.commons.schema.XmlSchemaGroupBase;
-import org.apache.ws.commons.schema.XmlSchemaImport;
-import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.ws.commons.schema.utils.NamespaceMap;
-import org.codehaus.jam.JClass;
-import org.codehaus.jam.JProperty;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XSDHelper;
-
-public class SchemaBuilder implements TuscanyJava2WSDLConstants {
-    public static final String NAME_SPACE_PREFIX = "stn_";
-
-    private static int prefixCount = 1;
-
-    public static final String MIXED = "mixed";
-
-    public static final String GROUP = "group";
-
-    protected String attrFormDefault = null;
-
-    protected String elementFormDefault = null;
-
-    protected XmlSchemaCollection xmlSchemaCollection = new XmlSchemaCollection();
-
-    private Hashtable schemaMap = new Hashtable();
-
-    protected Hashtable targetNamespacePrefixMap = new Hashtable();
-
-    protected TuscanyTypeTable typeTable = new TuscanyTypeTable();
-
-    protected Map schemaLocationMap = null;
-
-    private ClassLoader classLoader = null;
-
-    private ArrayList factoryClassNames = null;
-
-    private HelperContext helperContext = null;
-    
-    private XSDHelper xsdHelper = null;
-
-    private Set<String> registeredSDOFactories = new HashSet<String>();
-    
-    boolean alreadyPrintedDefaultSDOFactoryFound = false;
-    
-    boolean alreadyPrintedDefaultSDOFactoryNotFound = false;
-
-    protected SchemaBuilder(XmlSchemaCollection schemaCollection,
-                            Hashtable schemaMap,
-                            Hashtable nsPrefixMap,
-                            TuscanyTypeTable typeTable,
-                            String attrFormDef,
-                            String eleFormDef,
-                            Map schemaLocMap,
-                            ClassLoader classLoader,
-                            ArrayList factoryClassNames) {
-        this.schemaMap = schemaMap;
-        this.xmlSchemaCollection = schemaCollection;
-        this.targetNamespacePrefixMap = nsPrefixMap;
-        this.typeTable = typeTable;
-        this.schemaLocationMap = schemaLocMap;
-        this.classLoader = classLoader;
-        this.attrFormDefault = attrFormDef;
-        this.elementFormDefault = eleFormDef;
-        this.factoryClassNames = factoryClassNames;
-  
-        // Register the types in the generated SDO factories
-        this.helperContext = org.apache.tuscany.sdo.api.SDOUtil.createHelperContext();
-        this.xsdHelper = helperContext.getXSDHelper();
-
-        Class factoryClass = null;
-        for (Object factoryClassName : this.factoryClassNames) {
-            try {
-                factoryClass = Class.forName((String)factoryClassName, true, classLoader);
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace(); 
-                System.out.println("");
-                System.out.println("Generated SDO Factory class with name: " + factoryClassName + " could not be loaded.  Exiting.");
-                throw new IllegalArgumentException(e); 
-            }
-            registerSDOFactory(factoryClass);
-        }
-   }
-
-    private boolean isSDO(JClass javaType) throws Exception {
-
-        Class sdoClass = Class.forName(javaType.getQualifiedName(), true, classLoader);
-
-        return DataObject.class.isAssignableFrom(sdoClass);
-    }
-
-    private void buildComplexTypeContents_JavaType(JClass javaType,
-                                                   XmlSchemaComplexType complexType,
-                                                   XmlSchema xmlSchema) throws Exception {
-        JProperty[] properties = javaType.getDeclaredProperties();
-
-        for (int i = 0; i < properties.length; i++) {
-            JProperty property = properties[i];
-            String propertyName = property.getType().getQualifiedName();
-            boolean isArryType = property.getType().isArrayType();
-            if (isArryType) {
-                propertyName = property.getType().getArrayComponentType().getQualifiedName();
-            }
-
-            if (typeTable.isSimpleType(propertyName)) {
-                XmlSchemaElement elt1 = new XmlSchemaElement();
-                elt1.setName(getCorrectName(property.getSimpleName()));
-                elt1.setSchemaTypeName(typeTable.getSimpleSchemaTypeName(propertyName));
-                ((XmlSchemaGroupBase) complexType.getParticle()).getItems().add(elt1);
-                if (isArryType) {
-                    elt1.setMaxOccurs(Long.MAX_VALUE);
-                    elt1.setMinOccurs(0);
-                }
-            } else {
-                QName schemaTypeName = null;
-                if (isArryType) {
-                    schemaTypeName = generateSchema(property.getType().getArrayComponentType());
-                } else {
-                    schemaTypeName = generateSchema(property.getType());
-                }
-
-                XmlSchemaElement elt1 = new XmlSchemaElement();
-                elt1.setName(getCorrectName(property.getSimpleName()));
-                elt1.setSchemaTypeName(schemaTypeName);
-                ((XmlSchemaGroupBase) complexType.getParticle()).getItems().add(elt1);
-
-                if (isArryType) {
-                    elt1.setMaxOccurs(Long.MAX_VALUE);
-                    elt1.setMinOccurs(0);
-                }
-
-                addImports(xmlSchema,
-                           schemaTypeName);
-            }
-        }
-    }
-
-    protected QName buildSchema_JavaType(JClass javaType) throws Exception {
-        QName schemaTypeName = typeTable.getComplexSchemaTypeName(javaType, this.classLoader);
-        if (schemaTypeName == null) {
-            String simpleName = javaType.getSimpleName(); 
-
-            String packageName = javaType.getContainingPackage().getQualifiedName();
-
-            String targetNameSpace = 
-            	Java2WSDLUtils.schemaNamespaceFromClassName(javaType.getQualifiedName(), this.classLoader)
-                                                   .toString();
-
-            XmlSchema xmlSchema = getXmlSchema(targetNameSpace);
-            String targetNamespacePrefix = (String) targetNamespacePrefixMap.get(targetNameSpace);
-
-            schemaTypeName = new QName(targetNameSpace, simpleName, targetNamespacePrefix);
-            XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
-            complexType.setName(simpleName);
-
-            XmlSchemaSequence sequence = new XmlSchemaSequence();
-            complexType.setParticle(sequence);
-
-            createGlobalElement(xmlSchema,
-                                complexType,
-                                schemaTypeName);
-            xmlSchema.getItems().add(complexType);
-            xmlSchema.getSchemaTypes().add(schemaTypeName,
-                                           complexType);
-
-            // adding this type to the table
-            // typeTable.addComplexScheam(name, complexType.getQName());
-            typeTable.addComplexSchemaType(targetNameSpace,
-                                           simpleName,
-                                           schemaTypeName);
-            buildComplexTypeContents_JavaType(javaType,
-                                              complexType,
-                                              xmlSchema);
-        }
-        return schemaTypeName;
-    }
-
-    protected QName buildSchema_SDO(Type dataType) // throws Exception
-    {
-        QName schemaTypeName = typeTable.getComplexSchemaTypeName(dataType.getURI(),
-                                                                  dataType.getName());
-
-        if (schemaTypeName == null) {
-            // We can't load the XSDs into an XSDHelper and match them against the static SDOs; they will
-            // never match.  Instead let's take an all-or-nothing approach and say, if we've got this NS
-            // in our map then we assume we have this Type as well in the corresponding XSD file.  
-            //
-            boolean inXSDForm = schemaLocationMap.get(dataType.getURI()) != null;
-
-            if (inXSDForm) {
-                // if schemalocations for XSD has been specified, include them
-
-                // External XSDs will be handled in processing the schema TNS of the wrapper elements.
-                // This is partly because SDO codegen needs some modification in this area 
-                // So we won't bother including the external XSDs here at all.
-                //
-                //  includeExtXSD(dataType);
-            } else {
-                List<Type> typeList = new Vector<Type>();
-                typeList.add(dataType);
-
-                // the xsdhelper returns a string that contains the schemas for this type
-                String schemaDefns = xsdHelper.generate(typeList, schemaLocationMap);
-
-                // extract the schema elements and store them in the schema map
-                extractSchemas(schemaDefns);
-            }
-            // since the XSDHelper will not return the type name, create it and store it in typetable
-            schemaTypeName = new QName(dataType.getURI(), dataType.getName(), generatePrefix());
-            typeTable.addComplexSchemaType(dataType.getURI(),
-                                           dataType.getName(),
-                                           schemaTypeName);
-
-        }
-        return schemaTypeName;
-    }
-
-    /**
-     * Identify the java type (pojo versus sdo) and build the schema accordingly
-     * 
-     * @param javaType reference to the class
-     * @return
-     * @throws Exception
-     */
-    public QName generateSchema(JClass javaType) throws Exception {
-        if (isSDO(javaType)) {
-            Type dataType = createDataObject(javaType).getType();
-            return buildSchema_SDO(dataType);
-        } else {
-            return buildSchema_JavaType(javaType);
-        }
-    }
-
-    private XmlSchema getXmlSchema(String targetNamespace) {
-        XmlSchema xmlSchema;
-
-        if ((xmlSchema = (XmlSchema) schemaMap.get(targetNamespace)) == null) {
-            String targetNamespacePrefix = generatePrefix();
-
-            xmlSchema = new XmlSchema(targetNamespace, xmlSchemaCollection);
-            xmlSchema.setAttributeFormDefault(getAttrFormDefaultSetting());
-            xmlSchema.setElementFormDefault(getElementFormDefaultSetting());
-
-            targetNamespacePrefixMap.put(targetNamespace, targetNamespacePrefix);
-            schemaMap.put(targetNamespace, xmlSchema);
-
-            NamespaceMap prefixmap = new NamespaceMap();
-            prefixmap.put(TuscanyTypeTable.XS_URI_PREFIX, TuscanyTypeTable.XML_SCHEMA_URI);
-            prefixmap.put(targetNamespacePrefix, targetNamespace);
-            xmlSchema.setNamespaceContext(prefixmap);
-        }
-        return xmlSchema;
-    }
-
-    /**
-     * JAM convert first name of an attribute into UpperCase as an example if there is a instance variable called foo in a bean , then Jam give that
-     * as Foo so this method is to correct that error
-     * 
-     * @param wrongName
-     * @return the right name, using English as the locale for case conversion
-     */
-    public static String getCorrectName(String wrongName) {
-        if (wrongName.length() > 1) {
-            return wrongName.substring(0, 1).toLowerCase(Locale.ENGLISH) + wrongName.substring(1, wrongName.length());
-        } else {
-            return wrongName.substring(0, 1).toLowerCase(Locale.ENGLISH);
-        }
-    }
-
-    private String addImports(XmlSchema xmlSchema, QName schemaTypeName) {
-        String prefix = null;
-        String[] prefixes = xmlSchema.getNamespaceContext().getDeclaredPrefixes();
-        for (int count = 0; count < prefixes.length; ++count) {
-            if (schemaTypeName.getNamespaceURI().
-                    equals(xmlSchema.getNamespaceContext().getNamespaceURI(prefixes[count])) ) {
-                return prefixes[count];
-            }
-        }
-
-        XmlSchemaImport importElement = new XmlSchemaImport();
-        importElement.setNamespace(schemaTypeName.getNamespaceURI());
-        xmlSchema.getItems().add(importElement);
-        prefix = generatePrefix();
-        //it is safe to cast like this since it was this class that instantiated the
-        //NamespaceContext and assigned it to an instance of a NamespaceMap (see method getXmlSchema)
-        ((NamespaceMap)xmlSchema.getNamespaceContext()).put(prefix,
-                                                schemaTypeName.getNamespaceURI());
-
-        return prefix;
-    }
-
-    private String formGlobalElementName(String typeName) {
-        String firstChar = typeName.substring(0, 1);
-        return typeName.replaceFirst(firstChar, firstChar.toLowerCase());
-    }
-
-    private void createGlobalElement(XmlSchema xmlSchema, XmlSchemaComplexType complexType, QName elementName) {
-        XmlSchemaElement globalElement = new XmlSchemaElement();
-        globalElement.setSchemaTypeName(complexType.getQName());
-        globalElement.setName(formGlobalElementName(complexType.getName()));
-        globalElement.setQName(elementName);
-
-        xmlSchema.getItems().add(globalElement);
-        xmlSchema.getElements().add(elementName, globalElement);
-    }
-
-    private DataObject createDataObject(JClass sdoClass) throws Exception {
-        Class sdoType = Class.forName(sdoClass.getQualifiedName(), true, classLoader);
-
-        //register the factory
-        detectAndRegisterFactory(sdoType);
-        
-        //create data object
-        Constructor constructor = sdoType.getDeclaredConstructor(new Class[0]);
-        constructor.setAccessible(true);
-        Object instance = constructor.newInstance(new Object[0]);
-        return (DataObject) instance;
-    }
-
-    private String generatePrefix() {
-        return NAME_SPACE_PREFIX + prefixCount++;
-    }
-
-    private void includeExtXSD(Type dataType) {
-        // now we know there is a type for which the XSD must come from outside
-        // create a schema for the namespace of this type and add an include in it for
-        // the xsd that is defined externally
-        XmlSchema xmlSchema = getXmlSchema(dataType.getURI());
-
-        // ideally there could be more than one external schema definitions for a namespace
-        // and hence schemalocations will be a list of locations
-        // List schemaLocations = (List)schemaLocationMap.get(dataType.getURI());
-
-        // since as per the specs the input to XSDHelper is a map of <String, String> allowing
-        // only one schemalocation for a namespace. So for now this single location will be
-        // picked up and put into a list
-        List schemaLocations = new Vector();
-
-        if (schemaLocationMap.get(dataType.getURI()) != null) {
-            schemaLocations.add(schemaLocationMap.get(dataType.getURI()));
-        }
-
-        if (schemaLocations.size() <= 0) {
-            schemaLocations.add(DEFAULT_SCHEMA_LOCATION);
-        }
-
-        Iterator includesIterator = xmlSchema.getIncludes().getIterator();
-        Iterator schemaLocIterator = schemaLocations.iterator();
-        String aSchemaLocation = null;
-        boolean includeExists = false;
-        // include all external schema locations
-        while (schemaLocIterator.hasNext()) {
-            aSchemaLocation = (String) schemaLocIterator.next();
-            while (includesIterator.hasNext()) {
-                if (!includeExists
-                        && aSchemaLocation.equals(((XmlSchemaInclude) includesIterator.next()).getSchemaLocation())) {
-                    includeExists = true;
-                }
-            }
-
-            if (!includeExists) {
-                XmlSchemaInclude includeElement = new XmlSchemaInclude();
-                includeElement.setSchemaLocation(aSchemaLocation);
-                xmlSchema.getIncludes().add(includeElement);
-                xmlSchema.getItems().add(includeElement);
-            }
-        }
-
-    }
-
-    private void extractSchemas(String schemaDefns) {
-        // load each schema element and add it to the schema map
-
-        String token = getToken(schemaDefns);
-        int curIndex = schemaDefns.indexOf(token);
-        int nextIndex = schemaDefns.indexOf(token,
-                                            curIndex + token.length());
-
-        while (curIndex != -1) {
-            StringReader sr = null;
-            if (nextIndex != -1)
-                sr = new StringReader(schemaDefns.substring(curIndex,
-                                                            nextIndex));
-            else
-                sr = new StringReader(schemaDefns.substring(curIndex));
-
-            XmlSchemaCollection collection = new XmlSchemaCollection();
-            XmlSchema aSchema = collection.read(sr,
-                                                null);
-            addSchemaToMap(aSchema);
-
-            curIndex = nextIndex;
-            nextIndex = schemaDefns.indexOf(token,
-                                            curIndex + token.length());
-        }
-    }
-
-    private void addSchemaToMap(XmlSchema extractedSchema) {
-        // check if a Schema object already exists in schema map for targetNamespace of this schema element
-        // if it does then copy the contents of this schema element to the existing one, ensuring that
-        // duplicate elements are not created. i.e. before adding some child element like 'include' or 'import'
-        // check if it already exists, if it does don't add this
-        XmlSchema existingSchema = (XmlSchema) schemaMap.get(extractedSchema.getTargetNamespace());
-
-        if (existingSchema == null) {
-            extractedSchema.setAttributeFormDefault(getAttrFormDefaultSetting());
-            extractedSchema.setElementFormDefault(getElementFormDefaultSetting());
-            schemaMap.put(extractedSchema.getTargetNamespace(), extractedSchema);
-
-        } else {
-            copySchemaItems(existingSchema,
-                            extractedSchema);
-        }
-    }
-
-    private void copySchemaItems(XmlSchema existingSchema, XmlSchema aSchema) {
-        // items to copy are imports, includes, elements, types ...
-        // each item is checked if it is a duplicate entry and copied only if it isn't
-        Iterator itemsIterator = aSchema.getItems().getIterator();
-        Object schemaObject = null;
-        XmlSchemaElement schemaElement = null;
-        XmlSchemaType schemaType = null;
-        XmlSchemaInclude schemaInclude = null;
-        QName qName = null;
-        List existingIncludes = getExistingIncludes(existingSchema);
-
-        while (itemsIterator.hasNext()) {
-            schemaObject = itemsIterator.next();
-            if (schemaObject instanceof XmlSchemaElement) {
-                schemaElement = (XmlSchemaElement) schemaObject;
-                qName = schemaElement.getQName();
-                // if the element does not exist in the existing schema
-                if (existingSchema.getElementByName(qName) == null) {
-                    // add it to the existing schema
-                    existingSchema.getElements().add(qName, schemaElement);
-                    existingSchema.getItems().add(schemaElement);
-                }
-            } else if (schemaObject instanceof XmlSchemaType) {
-                schemaType = (XmlSchemaType) itemsIterator.next();
-                qName = schemaType.getQName();
-                // if the element does not exist in the existing schema
-                if (existingSchema.getElementByName(qName) == null) {
-                    // add it to the existing schema
-                    existingSchema.getSchemaTypes().add(qName, schemaType);
-                    existingSchema.getItems().add(schemaType);
-                    // add imports
-                    addImports(existingSchema, qName);
-                }
-            } else if (schemaObject instanceof XmlSchemaInclude) {
-                schemaInclude = (XmlSchemaInclude) itemsIterator.next();
-                if (!existingIncludes.contains(schemaInclude.getSchemaLocation())) {
-                    existingSchema.getIncludes().add(schemaInclude);
-                    existingSchema.getItems().add(schemaInclude);
-                }
-            }
-        }
-    }
-
-    private List getExistingIncludes(XmlSchema xmlSchema) {
-        List includeSchemaLocations = new Vector();
-        Iterator iterator = xmlSchema.getIncludes().getIterator();
-
-        while (iterator.hasNext()) {
-            includeSchemaLocations.add(((XmlSchemaInclude) iterator.next()).getSchemaLocation());
-        }
-        return includeSchemaLocations;
-    }
-
-    private XmlSchemaForm getAttrFormDefaultSetting() {
-        if (FORM_DEFAULT_UNQUALIFIED.equals(getAttrFormDefault())) {
-            return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
-        } else {
-            return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
-        }
-    }
-
-    private XmlSchemaForm getElementFormDefaultSetting() {
-        if (FORM_DEFAULT_UNQUALIFIED.equals(getElementFormDefault())) {
-            return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
-        } else {
-            return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
-        }
-    }
-
-    private String getToken(String s) {
-        // get the schema element name e.g. <xs:schema or <xsd:schema. We only know that 'schema' will be used
-        // but not sure what suffix is used. Hence this method to get the actual element name used
-        int i = s.indexOf(SCHEMA_ELEMENT_NAME);
-        int j = s.substring(0,
-                            i).lastIndexOf("<");
-        return s.substring(j,
-                           i + SCHEMA_ELEMENT_NAME.length());
-    }
-
-    public String getAttrFormDefault() {
-        return attrFormDefault;
-    }
-
-    public void setAttrFormDefault(String attrFormDefault) {
-        this.attrFormDefault = attrFormDefault;
-    }
-
-    public String getElementFormDefault() {
-        return elementFormDefault;
-    }
-
-    public void setElementFormDefault(String elementFormDefault) {
-        this.elementFormDefault = elementFormDefault;
-    }
-
-    private static String getPackageName(Class<?> cls) {
-        String name = cls.getName();
-        int index = name.lastIndexOf('.');
-        return index == -1 ? "" : name.substring(0, index);
-    }
-    
-    /**
-     * Recognize the pattern of generated SDO type names vs. SDO factory names.
-     * E.g. SDO class:   test.sca.w2j.gen.Company will be associated with 
-     *      SDO factory: test.sca.w2j.gen.GenFactory
-     */
-    private void detectAndRegisterFactory(Class sdoClass) {
-        String pkgName = getPackageName(sdoClass);
-
-        // Find last segment, e.g. from 'test.sca.w2j.gen' produce 'gen'.
-        int lastDot = pkgName.lastIndexOf('.');
-        String lastSegment = pkgName.substring(lastDot+1);
-
-        String rest = lastSegment.substring(1);
-        String firstChar = lastSegment.substring(0,1).toUpperCase();
-
-        String factoryBaseName = pkgName + "." + firstChar + rest + "Factory";
-
-        Class factoryClass = null;
-        try {
-            factoryClass = Class.forName(factoryBaseName, true, classLoader);
-            if (!alreadyPrintedDefaultSDOFactoryFound) {
-                System.out.println("Found default generated SDO Factory with name: " + factoryBaseName + "; Registering.");
-                alreadyPrintedDefaultSDOFactoryFound = true;
-            }
-            registerSDOFactory(factoryClass);
-        } catch (ClassNotFoundException e) {
-            if (!alreadyPrintedDefaultSDOFactoryNotFound) {
-                System.out.println("Did not find default generated SDO Factory with name: " + factoryBaseName + "; Continue." );
-                alreadyPrintedDefaultSDOFactoryNotFound = true;
-            }
-        }
-    }
-
-    private void registerSDOFactory(Class factoryClass) {
-        String factoryClassName = factoryClass.getName();
-        if (!registeredSDOFactories.contains(factoryClassName)) {
-            try {                
-                Field field = factoryClass.getField("INSTANCE");
-                Object factoryImpl = field.get(null);
-                Method method = factoryImpl.getClass().getMethod("register", new Class[] {HelperContext.class});
-                method.invoke(factoryImpl, new Object[] {this.helperContext});
-            } catch (Exception e) { 
-                e.printStackTrace(); 
-                System.out.println("");
-                System.out.println("Fatal error registering factoryClassName = " + factoryClassName);
-                throw new IllegalArgumentException(e); 
-            }
-            registeredSDOFactories.add(factoryClassName);
-        }
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
deleted file mode 100644
index b793a8ea98..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
+++ /dev/null
@@ -1,429 +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.tools.java2wsdl.generate;
-
-import java.io.ByteArrayInputStream;
-import java.io.StringWriter;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.codehaus.jam.JMethod;
-
-public class TuscanyJava2OMBuilder implements TuscanyJava2WSDLConstants {
-
-    private TuscanyTypeTable typeTable = null;
-
-    private static int prefixCount = 1;
-
-    private static final String NAMESPACE_PREFIX = "ns";
-
-    private JMethod method[];
-
-    private Collection schemaCollection;
-
-    private GenerationParameters generationParams;
-
-    private OMNamespace ns1;
-
-    private OMNamespace soap;
-
-    private OMNamespace soap12;
-
-    private OMNamespace tns;
-
-    private OMNamespace wsdl;
-
-    private OMNamespace mime;
-
-    private OMNamespace http;
-
-    public TuscanyJava2OMBuilder(JMethod[] method,
-                                 Collection schemaCollection,
-                                 TuscanyTypeTable typeTab,
-                                 GenerationParameters genParams) {
-        this.method = method;
-        this.schemaCollection = schemaCollection;
-        this.typeTable = typeTab;
-        this.generationParams = genParams;
-    }
-
-    public OMElement generateOM() throws Exception {
-        OMFactory fac = OMAbstractFactory.getOMFactory();
-        wsdl = fac.createOMNamespace(WSDL_NAMESPACE, DEFAULT_WSDL_NAMESPACE_PREFIX);
-        OMElement ele = fac.createOMElement("definitions", wsdl);
-
-        ele.addAttribute("targetNamespace", generationParams.getTargetNamespace(), null);
-        generateNamespaces(fac, ele);
-        generateTypes(fac, ele);
-        generateMessages(fac, ele);
-        generatePortType(fac, ele);
-        generateBinding(fac, ele);
-        generateService(fac, ele);
-        return ele;
-    }
-
-    private void generateNamespaces(OMFactory fac, OMElement defintions) throws Exception {
-        soap = defintions.declareNamespace(URI_WSDL11_SOAP, SOAP11_PREFIX);
-        tns =
-            defintions.declareNamespace(generationParams.getTargetNamespace(), generationParams
-                .getTargetNamespacePrefix());
-        soap12 = defintions.declareNamespace(URI_WSDL12_SOAP, SOAP12_PREFIX);
-        http = defintions.declareNamespace(HTTP_NAMESPACE, HTTP_PREFIX);
-        mime = defintions.declareNamespace(MIME_NAMESPACE, MIME_PREFIX);
-    }
-
-    private void generateTypes(OMFactory fac, OMElement defintions) throws Exception {
-        OMElement wsdlTypes = fac.createOMElement("types", wsdl);
-        StringWriter writer = new StringWriter();
-
-        // wrap the Schema elements with this start and end tags to create a
-        // document root
-        // under which the schemas can fall into
-        writer.write("<xmlSchemas>");
-        writeSchemas(writer);
-        writer.write("</xmlSchemas>");
-
-        XMLStreamReader xmlReader =
-            XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(writer.toString().getBytes()));
-
-        StAXOMBuilder staxOMBuilders = new StAXOMBuilder(fac, xmlReader);
-        OMElement documentElement = staxOMBuilders.getDocumentElement();
-
-        Iterator iterator = documentElement.getChildElements();
-        while (iterator.hasNext()) {
-            wsdlTypes.addChild((OMNode)iterator.next());
-        }
-        defintions.addChild(wsdlTypes);
-    }
-
-    private void writeSchemas(StringWriter writer) {
-        Iterator iterator = schemaCollection.iterator();
-        XmlSchema xmlSchema = null;
-
-        while (iterator.hasNext()) {
-            xmlSchema = (XmlSchema)iterator.next();
-            // typeIterator = xmlSchema.getSchemaTypes().getValues();
-            /*
-             * while (typeIterator.hasNext()) {
-             * xmlSchema.getItems().add((XmlSchemaObject) typeIterator.next()); }
-             */
-            xmlSchema.write(writer);
-        }
-    }
-
-    private void generateMessages(OMFactory fac, OMElement definitions) throws Exception {
-        Hashtable namespaceMap = new Hashtable();
-        String namespacePrefix = null;
-        String namespaceURI = null;
-        QName messagePartType = null;
-        for (int i = 0; i < method.length; i++) {
-            JMethod jmethod = method[i];
-
-            if (jmethod.isPublic()) {
-                // Request Message
-                OMElement requestMessge = fac.createOMElement(MESSAGE_LOCAL_NAME, wsdl);
-                requestMessge.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName() + MESSAGE_SUFFIX, null);
-                definitions.addChild(requestMessge);
-
-                // only if a type for the message part has already been defined
-                if ((messagePartType =
-                    typeTable.getComplexSchemaTypeName(generationParams.getSchemaTargetNamespace(), jmethod
-                        .getSimpleName())) != null) {
-                    namespaceURI = messagePartType.getNamespaceURI();
-                    // avoid duplicate namespaces
-                    if ((namespacePrefix = (String)namespaceMap.get(namespaceURI)) == null) {
-                        namespacePrefix = generatePrefix();
-                        namespaceMap.put(namespaceURI, namespacePrefix);
-                    }
-
-                    OMElement requestPart = fac.createOMElement(PART_ATTRIBUTE_NAME, wsdl);
-                    requestMessge.addChild(requestPart);
-                    requestPart.addAttribute(ATTRIBUTE_NAME, "part1", null);
-
-                    requestPart.addAttribute(ELEMENT_ATTRIBUTE_NAME, namespacePrefix + COLON_SEPARATOR
-                        + jmethod.getSimpleName(), null);
-                }
-
-                // only if a type for the message part has already been defined
-                if ((messagePartType =
-                    typeTable.getComplexSchemaTypeName(generationParams.getSchemaTargetNamespace(), jmethod
-                        .getSimpleName() + RESPONSE)) != null) {
-                    namespaceURI = messagePartType.getNamespaceURI();
-                    if ((namespacePrefix = (String)namespaceMap.get(namespaceURI)) == null) {
-                        namespacePrefix = generatePrefix();
-                        namespaceMap.put(namespaceURI, namespacePrefix);
-                    }
-                    // Response Message
-                    OMElement responseMessge = fac.createOMElement(MESSAGE_LOCAL_NAME, wsdl);
-                    responseMessge.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName() + RESPONSE_MESSAGE, null);
-                    definitions.addChild(responseMessge);
-                    OMElement responsePart = fac.createOMElement(PART_ATTRIBUTE_NAME, wsdl);
-                    responseMessge.addChild(responsePart);
-                    responsePart.addAttribute(ATTRIBUTE_NAME, "part1", null);
-
-                    responsePart.addAttribute(ELEMENT_ATTRIBUTE_NAME, namespacePrefix + COLON_SEPARATOR
-                        + jmethod.getSimpleName()
-                        + RESPONSE, null);
-                }
-            }
-        }
-
-        // now add these unique namespaces to the the definitions element
-        Enumeration enumeration = namespaceMap.keys();
-        while (enumeration.hasMoreElements()) {
-            namespaceURI = (String)enumeration.nextElement();
-            definitions.declareNamespace(namespaceURI, (String)namespaceMap.get(namespaceURI));
-        }
-    }
-
-    /**
-     * Generate the porttypes
-     */
-    private void generatePortType(OMFactory fac, OMElement defintions) {
-        JMethod jmethod = null;
-        OMElement operation = null;
-        OMElement message = null;
-        OMElement portType = fac.createOMElement(PORT_TYPE_LOCAL_NAME, wsdl);
-        defintions.addChild(portType);
-        // changed default PortType name to match Java interface name
-        // instead of appending "PortType".
-        portType.addAttribute(ATTRIBUTE_NAME, generationParams.getServiceName(), null);
-        // adding message refs
-        for (int i = 0; i < method.length; i++) {
-            jmethod = method[i];
-
-            if (jmethod.isPublic()) {
-                operation = fac.createOMElement(OPERATION_LOCAL_NAME, wsdl);
-                portType.addChild(operation);
-                operation.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName(), null);
-
-                message = fac.createOMElement(IN_PUT_LOCAL_NAME, wsdl);
-                message.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix() + COLON_SEPARATOR
-                    + jmethod.getSimpleName()
-                    + MESSAGE_SUFFIX, null);
-                operation.addChild(message);
-
-                if (!jmethod.getReturnType().isVoidType() ||
-                    jmethod.getAnnotation("org.oasisopen.sca.annotation.OneWay") == null) {
-                    message = fac.createOMElement(OUT_PUT_LOCAL_NAME, wsdl);
-                    message.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix() + COLON_SEPARATOR
-                        + jmethod.getSimpleName()
-                        + RESPONSE_MESSAGE, null);
-                    operation.addChild(message);
-                }
-            }
-        }
-
-    }
-
-    /**
-     * Generate the service
-     */
-    public void generateService(OMFactory fac, OMElement defintions) {
-        OMElement service = fac.createOMElement(SERVICE_LOCAL_NAME, wsdl);
-        defintions.addChild(service);
-        // Add "WebService" to the end of WSDL service name
-        service.addAttribute(ATTRIBUTE_NAME, generationParams.getServiceName() + WSDL_SERVICE_SUFFIX, null);
-        OMElement port = fac.createOMElement(PORT, wsdl);
-        service.addChild(port);
-        port.addAttribute(ATTRIBUTE_NAME, generationParams.getServiceName() + SOAP11PORT, null);
-        port.addAttribute(BINDING_LOCAL_NAME, tns.getPrefix() + COLON_SEPARATOR
-            + generationParams.getServiceName()
-            + BINDING_NAME_SUFFIX, null);
-        addExtensionElement(fac,
-                            port,
-                            soap,
-                            SOAP_ADDRESS,
-                            LOCATION,
-                            generationParams.getLocationUri() + generationParams.getServiceName());
-
-        port = fac.createOMElement(PORT, wsdl);
-        service.addChild(port);
-        port.addAttribute(ATTRIBUTE_NAME, generationParams.getServiceName() + SOAP12PORT, null);
-        port.addAttribute(BINDING_LOCAL_NAME, tns.getPrefix() + COLON_SEPARATOR
-            + generationParams.getServiceName()
-            + SOAP12BINDING_NAME_SUFFIX, null);
-        addExtensionElement(fac,
-                            port,
-                            soap12,
-                            SOAP_ADDRESS,
-                            LOCATION,
-                            generationParams.getLocationUri() + generationParams.getServiceName());
-    }
-
-    /**
-     * Generate the bindings
-     */
-    private void generateBinding(OMFactory fac, OMElement defintions) throws Exception {
-        generateSoap11Binding(fac, defintions);
-        generateSoap12Binding(fac, defintions);
-    }
-
-    private void generateSoap11Binding(OMFactory fac, OMElement defintions) throws Exception {
-        OMElement binding = fac.createOMElement(BINDING_LOCAL_NAME, wsdl);
-        defintions.addChild(binding);
-        binding.addAttribute(ATTRIBUTE_NAME, generationParams.getServiceName() + BINDING_NAME_SUFFIX, null);
-        // changed default PortType name to match Java interface name
-        // instead of appending "PortType".
-        binding.addAttribute("type", tns.getPrefix() + COLON_SEPARATOR + generationParams.getServiceName(), null);
-
-        addExtensionElement(fac, binding, soap, BINDING_LOCAL_NAME, TRANSPORT, TRANSPORT_URI, STYLE, generationParams
-            .getStyle());
-
-        for (int i = 0; i < method.length; i++) {
-            JMethod jmethod = method[i];
-            if (jmethod.isPublic()) {
-                OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME, wsdl);
-                binding.addChild(operation);
-
-                addExtensionElement(fac,
-                                    operation,
-                                    soap,
-                                    OPERATION_LOCAL_NAME,
-                                    SOAP_ACTION,
-                                    URN_PREFIX + COLON_SEPARATOR + jmethod.getSimpleName(),
-                                    STYLE,
-                                    generationParams.getStyle());
-                operation.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName(), null);
-
-                OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME, wsdl);
-                addExtensionElement(fac,
-                                    input,
-                                    soap,
-                                    SOAP_BODY,
-                                    SOAP_USE,
-                                    generationParams.getUse(),
-                                    "namespace",
-                                    generationParams.getTargetNamespace());
-                operation.addChild(input);
-
-                if (!jmethod.getReturnType().isVoidType()) {
-                    OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME, wsdl);
-                    addExtensionElement(fac,
-                                        output,
-                                        soap,
-                                        SOAP_BODY,
-                                        SOAP_USE,
-                                        generationParams.getUse(),
-                                        "namespace",
-                                        generationParams.getTargetNamespace());
-                    operation.addChild(output);
-                }
-            }
-        }
-    }
-
-    private void generateSoap12Binding(OMFactory fac, OMElement defintions) throws Exception {
-        OMElement binding = fac.createOMElement(BINDING_LOCAL_NAME, wsdl);
-        defintions.addChild(binding);
-        binding.addAttribute(ATTRIBUTE_NAME, generationParams.getServiceName() + SOAP12BINDING_NAME_SUFFIX, null);
-        // changed default PortType name to match Java interface name
-        // instead of appending "PortType".
-        binding.addAttribute("type", tns.getPrefix() + COLON_SEPARATOR + generationParams.getServiceName(), null);
-
-        addExtensionElement(fac, binding, soap12, BINDING_LOCAL_NAME, TRANSPORT, TRANSPORT_URI, STYLE, generationParams
-            .getStyle());
-
-        for (int i = 0; i < method.length; i++) {
-            JMethod jmethod = method[i];
-
-            if (jmethod.isPublic()) {
-                OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME, wsdl);
-                binding.addChild(operation);
-                operation.declareNamespace(URI_WSDL12_SOAP, SOAP12_PREFIX);
-
-                addExtensionElement(fac,
-                                    operation,
-                                    soap12,
-                                    OPERATION_LOCAL_NAME,
-                                    SOAP_ACTION,
-                                    URN_PREFIX + COLON_SEPARATOR + jmethod.getSimpleName(),
-                                    STYLE,
-                                    generationParams.getStyle());
-                operation.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName(), null);
-
-                OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME, wsdl);
-                addExtensionElement(fac,
-                                    input,
-                                    soap12,
-                                    SOAP_BODY,
-                                    SOAP_USE,
-                                    generationParams.getUse(),
-                                    "namespace",
-                                    generationParams.getTargetNamespace());
-                operation.addChild(input);
-
-                if (!jmethod.getReturnType().isVoidType()) {
-                    OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME, wsdl);
-                    addExtensionElement(fac,
-                                        output,
-                                        soap12,
-                                        SOAP_BODY,
-                                        SOAP_USE,
-                                        generationParams.getUse(),
-                                        "namespace",
-                                        generationParams.getTargetNamespace());
-                    operation.addChild(output);
-                }
-            }
-        }
-    }
-
-    private void addExtensionElement(OMFactory fac,
-                                     OMElement element,
-                                     OMNamespace namespace,
-                                     String name,
-                                     String att1Name,
-                                     String att1Value,
-                                     String att2Name,
-                                     String att2Value) {
-        OMElement soapbinding = fac.createOMElement(name, namespace);
-        element.addChild(soapbinding);
-        soapbinding.addAttribute(att1Name, att1Value, null);
-        soapbinding.addAttribute(att2Name, att2Value, null);
-    }
-
-    private void addExtensionElement(OMFactory fac,
-                                     OMElement element,
-                                     OMNamespace namespace,
-                                     String name,
-                                     String att1Name,
-                                     String att1Value) {
-        OMElement soapbinding = fac.createOMElement(name, namespace);
-        element.addChild(soapbinding);
-        soapbinding.addAttribute(att1Name, att1Value, null);
-    }
-
-    private String generatePrefix() {
-        return NAMESPACE_PREFIX + prefixCount++;
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
deleted file mode 100644
index 18cfafa4e3..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
+++ /dev/null
@@ -1,81 +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.tools.java2wsdl.generate;
-
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
-
-public class TuscanyJava2WSDLBuilder implements Java2WSDLConstants {
-
-    private OutputStream out;
-    private String className;
-    private ClassLoader classLoader;
-    private String wsdlPrefix = "wsdl";
-
-    // these apply for the WSDL
-    private GenerationParameters generationParams;
-
-    private OMElement wsdlDocument = null;
-
-    public String getWsdlPrefix() {
-        return wsdlPrefix;
-    }
-
-    public void setWsdlPrefix(String wsdlPrefix) {
-        this.wsdlPrefix = wsdlPrefix;
-    }
-
-    public TuscanyJava2WSDLBuilder(GenerationParameters genParams) {
-        this.generationParams = genParams;
-    }
-
-    /**
-     * Externally visible generator method
-     * 
-     * @throws Exception
-     */
-    public void buildWSDL() throws Exception {
-        ArrayList excludeOpeartion = new ArrayList();
-        excludeOpeartion.add("init");
-        excludeOpeartion.add("setOperationContext");
-        excludeOpeartion.add("destroy");
-
-        TuscanyWSDLTypesGenerator typesGenerator = new TuscanyWSDLTypesGenerator(generationParams);
-        typesGenerator.setExcludeMethods(excludeOpeartion);
-        Collection schemaCollection = typesGenerator.buildWSDLTypes();
-
-        TuscanyJava2OMBuilder java2OMBuilder =
-            new TuscanyJava2OMBuilder(typesGenerator.getMethods(), schemaCollection, typesGenerator
-                .getTypeTable(), generationParams);
-
-        wsdlDocument = java2OMBuilder.generateOM();
-    }
-
-    public OMElement getWsdlDocument() {
-        return wsdlDocument;
-    }
-
-    public void setWsdlDocument(OMElement wsdlDocument) {
-        this.wsdlDocument = wsdlDocument;
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
deleted file mode 100644
index 3750dc27f5..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
+++ /dev/null
@@ -1,56 +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.tools.java2wsdl.generate;
-
-import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
-
-/**
- * This is a extension from the Axis2 Java2WSDLConstants to handle additions specific to Tuscany.
- * This class can be done away with once Axis2 is also enhanced to support these 
- * additional options. 
- *
- */
-public interface TuscanyJava2WSDLConstants extends Java2WSDLConstants 
-{
-    public static final char OPEN_BRACKET = '[';
-    public static final char COMMA = ',';
-    public static final char CLOSE_BRACKET = ']';
-    public static final String DEFAULT_SCHEMA_LOCATION = "*.xsd";
-    public static final String SCHEMA_ELEMENT_NAME = "schema";
-    
-    String FORM_DEFAULT_QUALIFIED = "qualified";
-    String FORM_DEFAULT_UNQUALIFIED = "unqualified";
-    
-    //short options
-    String IMPORT_XSD_OPTION = "ixsd";      //option for importing XSDs
-    String ATTR_FORM_DEFAULT_OPTION = "afd";
-    String ELEMENT_FORM_DEFAULT_OPTION = "efd";
-    String EXTRA_CLASSES_DEFAULT_OPTION = "xc";
-    String FACTORY_CLASSNAMES_OPTION = "fcn";
-    
-    //long options
-    String IMPORT_XSD_OPTION_LONG = "import_xsd";       //option for importing XSDs
-    String ATTR_FORM_DEFAULT_OPTION_LONG = "attributeFormDefault";
-    String ELEMENT_FORM_DEFAULT_OPTION_LONG = "elementFormDefault";
-    String EXTRA_CLASSES_DEFAULT_OPTION_LONG = "extraClasses";
-    String FACTORY_CLASSNAMES_OPTION_LONG = "factoryClassNames";
-    
-    //  This is a new creation, not an override.
-    String WSDL_SERVICE_SUFFIX = "WebService";
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
deleted file mode 100644
index d6cd8a7f57..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
+++ /dev/null
@@ -1,73 +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.tools.java2wsdl.generate;
-
-import java.util.ArrayList;
-
-import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
-import org.apache.ws.java2wsdl.utils.Java2WSDLOptionsValidator;
-
-/**
- * This class is an extension from the Axis2 implementation in order to handle
- * additional options specific to Tuscany. This class can be done away with once
- * Axis2 is also enhanced to support these additional options.
- */
-public class TuscanyJava2WSDLOptionsValidator extends Java2WSDLOptionsValidator implements TuscanyJava2WSDLConstants {
-    @Override
-    public boolean isInvalid(Java2WSDLCommandLineOption option) {
-        boolean invalid;
-        String optionType = option.getOptionType();
-
-        invalid =
-            !((IMPORT_XSD_OPTION).equalsIgnoreCase(optionType) || (IMPORT_XSD_OPTION_LONG).equalsIgnoreCase(optionType)
-                || (TuscanyJava2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION_LONG).equalsIgnoreCase(optionType)
-                || (TuscanyJava2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION).equalsIgnoreCase(optionType)
-                || (TuscanyJava2WSDLConstants.FACTORY_CLASSNAMES_OPTION_LONG).equalsIgnoreCase(optionType)
-                || (TuscanyJava2WSDLConstants.FACTORY_CLASSNAMES_OPTION).equalsIgnoreCase(optionType) || !super
-                .isInvalid(option));
-
-        invalid = validateImportXSDOption(invalid, option);
-
-        return invalid;
-    }
-
-    private boolean validateImportXSDOption(boolean invalid, Java2WSDLCommandLineOption option) {
-        String optionType = option.getOptionType();
-        String schemaNSLocationPair = null;
-
-        if (!invalid && (IMPORT_XSD_OPTION).equalsIgnoreCase(optionType)
-            || (IMPORT_XSD_OPTION_LONG).equalsIgnoreCase(optionType)) {
-            ArrayList optionValues = option.getOptionValues();
-
-            for (int count = 0; count < optionValues.size(); ++count) {
-                schemaNSLocationPair = ((String)optionValues.get(count)).trim();
-                if ((schemaNSLocationPair.charAt(0) != OPEN_BRACKET) || (schemaNSLocationPair
-                    .charAt(schemaNSLocationPair.length() - 1) != CLOSE_BRACKET)
-                    || (schemaNSLocationPair.indexOf(COMMA) == -1))
-
-                {
-                    System.out.println("Schema Namespace-Location pair option not specified properly!!");
-                    invalid = true;
-                }
-            }
-        }
-
-        return invalid;
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
deleted file mode 100644
index 03291428a2..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
+++ /dev/null
@@ -1,348 +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.tools.java2wsdl.generate;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axis2.description.java2wsdl.bytecode.MethodTable;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaForm;
-import org.apache.ws.commons.schema.XmlSchemaImport;
-import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.utils.NamespaceMap;
-import org.codehaus.jam.JClass;
-import org.codehaus.jam.JMethod;
-import org.codehaus.jam.JParameter;
-import org.codehaus.jam.JamClassIterator;
-import org.codehaus.jam.JamService;
-import org.codehaus.jam.JamServiceFactory;
-import org.codehaus.jam.JamServiceParams;
-
-public class TuscanySchemaGenerator implements TuscanyJava2WSDLConstants {
-    public static final String NAME_SPACE_PREFIX = "stn_";
-    public static final String PERIOD_SEPARATOR = ".";
-    private static int prefixCount = 1;
-
-    protected String attrFormDefault = null;
-    protected String elementFormDefault = null;
-    protected Hashtable targetNamespacePrefixMap = new Hashtable();
-    protected Hashtable schemaMap = new Hashtable();
-    protected Hashtable sdoAnnoMap = new Hashtable();
-    protected XmlSchemaCollection xmlSchemaCollection = new XmlSchemaCollection();
-    private TuscanyTypeTable typeTable = new TuscanyTypeTable();
-    protected SchemaBuilder schemaBuilder = null;
-    protected Map schemaLocationMap = null;
-
-    private ClassLoader classLoader;
-    private String className;
-
-    // to keep loaded method using JAM
-    private JMethod methods[];
-
-    // to store byte code method using Axis 1.x codes
-    private MethodTable methodTable;
-    private String schemaTargetNameSpace;
-    private String schema_namespace_prefix;
-    private Class clazz;
-    private ArrayList excludeMethods = new ArrayList();
-
-    public TuscanySchemaGenerator(ClassLoader loader,
-                                  String className,
-                                  String schematargetNamespace,
-                                  String schematargetNamespacePrefix,
-                                  Map schemaLocMap) throws Exception {
-        DataObjectUtil.initRuntime();
-        this.classLoader = loader;
-        this.className = className;
-        clazz = Class.forName(className, true, loader);
-        methodTable = new MethodTable(clazz);
-        this.schemaTargetNameSpace = schematargetNamespace;
-        this.schema_namespace_prefix = schematargetNamespacePrefix;
-        this.schemaLocationMap = schemaLocMap;
-
-        initializeSchemaMap(this.schemaTargetNameSpace, this.schema_namespace_prefix);
-        schemaBuilder =
-            new SchemaBuilder(xmlSchemaCollection, schemaMap, targetNamespacePrefixMap, typeTable,
-                              getAttrFormDefault(), getElementFormDefault(), schemaLocMap, this.classLoader, null);
-    }
-
-    /**
-     * Generates schema for all the parameters in method. First generates schema
-     * for all different parameter type and later refers to them.
-     * 
-     * @return Returns XmlSchema.
-     * @throws Exception
-     */
-    public Collection buildWSDLTypes() throws Exception {
-        JamServiceFactory factory = JamServiceFactory.getInstance();
-        JamServiceParams jam_service_parms = factory.createServiceParams();
-        // setting the classLoder
-        // jam_service_parms.setParentClassLoader(factory.createJamClassLoader(classLoader));
-        // it can possible to add the classLoader as well
-        jam_service_parms.addClassLoader(classLoader);
-        jam_service_parms.includeClass(className);
-        JamService service = factory.createService(jam_service_parms);
-
-        JamClassIterator jClassIter = service.getClasses();
-        // all most all the time the ittr will have only one class in it
-        while (jClassIter.hasNext()) {
-            JClass jclass = (JClass)jClassIter.next();
-            // serviceName = jclass.getSimpleName();
-            // todo in the future , when we support annotation we can use this
-            // JAnnotation[] annotations = jclass.getAnnotations();
-
-            /**
-             * Schema generation done in two stage 1. Load all the methods and
-             * create type for methods parameters (if the parameters are Bean
-             * then it will create Complex types for those , and if the
-             * parameters are simple type which describe in SimpleTypeTable
-             * nothing will happen) 2. In the next stage for all the methods
-             * messages and port types will be created
-             */
-            methods = jclass.getDeclaredMethods();
-
-            // since we do not support overload
-            HashMap uniqueMethods = new HashMap();
-            XmlSchemaComplexType methodSchemaType = null;
-            XmlSchemaSequence sequence = null;
-            for (int i = 0; i < methods.length; i++) {
-                String methodName = methods[i].getSimpleName();
-                JMethod jMethod = methods[i];
-                // no need to think about this method , since that is system
-                // config method
-                if (excludeMethods.contains(jMethod.getSimpleName())) {
-                    continue;
-                }
-                // if (jMethod.getSimpleName().equals("init")
-                // || "setOperationContext".equals(jMethod.getSimpleName())
-                // || "destroy".equals(jMethod.getSimpleName()))
-                // continue;
-                if (uniqueMethods.get(jMethod.getSimpleName()) != null) {
-                    throw new Exception(" Sorry we don't support methods overloading !!!! ");
-                }
-
-                if (!jMethod.isPublic()) {
-                    // no need to generate Schema for non public methods
-                    continue;
-                }
-
-                uniqueMethods.put(jMethod.getSimpleName(), jMethod);
-                JParameter[] paras = jMethod.getParameters();
-                String parameterNames[] = null;
-                if (paras.length > 0) {
-                    parameterNames = methodTable.getParameterNames(methodName);
-                    sequence = new XmlSchemaSequence();
-
-                    // create the schema type for the method wrapper
-                    methodSchemaType = createSchemaTypeForMethodPart(jMethod.getSimpleName());
-                    methodSchemaType.setParticle(sequence);
-                }
-
-                for (int j = 0; j < paras.length; j++) {
-                    JParameter methodParameter = paras[j];
-                    JClass paraType = methodParameter.getType();
-                    generateSchemaForType(sequence, paraType, (parameterNames != null && parameterNames[j] != null)
-                        ? parameterNames[j] : methodParameter.getSimpleName());
-                }
-                // for its return type
-                JClass returnType = jMethod.getReturnType();
-                if (!returnType.isVoidType()) {
-                    methodSchemaType = createSchemaTypeForMethodPart(jMethod.getSimpleName() + RESPONSE);
-                    sequence = new XmlSchemaSequence();
-                    methodSchemaType.setParticle(sequence);
-                    generateSchemaForType(sequence, returnType, "return");
-                }
-            }
-            // generateWrapperElements(methods);
-        }
-        return schemaMap.values();
-    }
-
-    private QName generateSchemaForType(XmlSchemaSequence sequence, JClass type, String partName) throws Exception {
-        boolean isArrayType = type.isArrayType();
-        if (isArrayType) {
-            type = type.getArrayComponentType();
-        }
-
-        String classTypeName = type.getQualifiedName();
-
-        QName schemaTypeName = typeTable.getSimpleSchemaTypeName(classTypeName);
-        if (schemaTypeName == null) {
-            schemaTypeName = schemaBuilder.generateSchema(type);
-            addContentToMethodSchemaType(sequence, schemaTypeName, partName, type.isArrayType());
-            addImportORInclude((XmlSchema)schemaMap.get(schemaTargetNameSpace), schemaTypeName);
-
-        } else {
-            addContentToMethodSchemaType(sequence, schemaTypeName, partName, type.isArrayType());
-        }
-
-        return schemaTypeName;
-    }
-
-    private void addContentToMethodSchemaType(XmlSchemaSequence sequence,
-                                              QName schemaTypeName,
-                                              String paraName,
-                                              boolean isArray) {
-        XmlSchemaElement elt1 = new XmlSchemaElement();
-        elt1.setName(paraName);
-        elt1.setSchemaTypeName(schemaTypeName);
-        sequence.getItems().add(elt1);
-
-        if (isArray) {
-            elt1.setMaxOccurs(Long.MAX_VALUE);
-            elt1.setMinOccurs(0);
-        }
-    }
-
-    private XmlSchemaComplexType createSchemaTypeForMethodPart(String localPartName) {
-        XmlSchema xmlSchema = (XmlSchema)schemaMap.get(schemaTargetNameSpace);
-        QName elementName = new QName(this.schemaTargetNameSpace, localPartName, this.schema_namespace_prefix);
-        XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
-
-        XmlSchemaElement globalElement = new XmlSchemaElement();
-        globalElement.setSchemaType(complexType);
-        globalElement.setName(formGlobalElementName(localPartName));
-        globalElement.setQName(elementName);
-
-        xmlSchema.getItems().add(globalElement);
-        xmlSchema.getElements().add(elementName, globalElement);
-
-        typeTable.addComplexSchemaType(this.schemaTargetNameSpace, globalElement.getName(), elementName);
-
-        return complexType;
-    }
-
-    private String formGlobalElementName(String typeName) {
-        String firstChar = typeName.substring(0, 1);
-        return typeName.replaceFirst(firstChar, firstChar.toLowerCase());
-    }
-
-    public TuscanyTypeTable getTypeTable() {
-        return typeTable;
-    }
-
-    public JMethod[] getMethods() {
-        return methods;
-    }
-
-    private String generatePrefix() {
-        return NAME_SPACE_PREFIX + prefixCount++;
-    }
-
-    public void setExcludeMethods(ArrayList excludeMethods) {
-        this.excludeMethods = excludeMethods;
-    }
-
-    private void initializeSchemaMap(String targetNamespace, String targetNamespacePrefix) {
-        XmlSchema xmlSchema = new XmlSchema(targetNamespace, xmlSchemaCollection);
-        xmlSchema.setAttributeFormDefault(getAttrFormDefaultSetting());
-        xmlSchema.setElementFormDefault(getElementFormDefaultSetting());
-
-        targetNamespacePrefixMap.put(targetNamespace, targetNamespacePrefix);
-        schemaMap.put(targetNamespace, xmlSchema);
-
-        NamespaceMap prefixmap = new NamespaceMap();
-        prefixmap.put(TuscanyTypeTable.XS_URI_PREFIX, TuscanyTypeTable.XML_SCHEMA_URI);
-        prefixmap.put(targetNamespacePrefix, targetNamespace);
-        xmlSchema.setNamespaceContext(prefixmap);
-    }
-
-    private void setFormDefaults() {
-
-    }
-
-    public Hashtable getSdoAnnoMap() {
-        return sdoAnnoMap;
-    }
-
-    public void setSdoAnnoMap(Hashtable sdoAnnoMap) {
-        this.sdoAnnoMap = sdoAnnoMap;
-    }
-
-    private void addImportORInclude(XmlSchema xmlSchema, QName schemaTypeName) {
-        // decide whether there must be an import or an include
-        if (xmlSchema.getTargetNamespace().equals(schemaTypeName.getNamespaceURI())) {
-            XmlSchema containingSchema = (XmlSchema)schemaMap.get(schemaTypeName.getNamespaceURI());
-            // if the type is not defined in the Schema then include
-            if (containingSchema.getTypeByName(schemaTypeName) == null) {
-                String schemaLocation = null;
-                if ((schemaLocation = (String)schemaLocationMap.get(schemaTypeName.getNamespaceURI())) != null) {
-                    schemaLocation = DEFAULT_SCHEMA_LOCATION;
-                }
-
-                XmlSchemaInclude includeElement = new XmlSchemaInclude();
-                includeElement.setSchemaLocation(schemaLocation);
-
-                if (!xmlSchema.getIncludes().contains(includeElement)) {
-                    xmlSchema.getIncludes().add(includeElement);
-                }
-            }
-        } else {
-            if (!((NamespaceMap)xmlSchema.getNamespaceContext()).values().contains(schemaTypeName.getNamespaceURI())) {
-                XmlSchemaImport importElement = new XmlSchemaImport();
-                importElement.setNamespace(schemaTypeName.getNamespaceURI());
-                xmlSchema.getItems().add(importElement);
-                ((NamespaceMap)xmlSchema.getNamespaceContext()).put(generatePrefix(), schemaTypeName.getNamespaceURI());
-            }
-        }
-    }
-
-    private XmlSchemaForm getAttrFormDefaultSetting() {
-        if (FORM_DEFAULT_UNQUALIFIED.equals(getAttrFormDefault())) {
-            return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
-        } else {
-            return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
-        }
-    }
-
-    private XmlSchemaForm getElementFormDefaultSetting() {
-        if (FORM_DEFAULT_UNQUALIFIED.equals(getElementFormDefault())) {
-            return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
-        } else {
-            return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
-        }
-    }
-
-    public String getAttrFormDefault() {
-        return attrFormDefault;
-    }
-
-    public void setAttrFormDefault(String attrFormDefault) {
-        this.attrFormDefault = attrFormDefault;
-    }
-
-    public String getElementFormDefault() {
-        return elementFormDefault;
-    }
-
-    public void setElementFormDefault(String elementFormDefault) {
-        this.elementFormDefault = elementFormDefault;
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
deleted file mode 100644
index cb41c56b94..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
+++ /dev/null
@@ -1,220 +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.tools.java2wsdl.generate;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axis2.description.java2wsdl.Java2WSDLUtils;
-import org.codehaus.jam.JClass;
-
-import commonj.sdo.DataObject;
-
-public class TuscanyTypeTable 
-{
-    public static final String XML_SCHEMA_URI = "http://www.w3.org/2001/XMLSchema";
-    public static final String XS_URI_PREFIX = "xs";
-    public static final QName XS_QNAME = new QName(XML_SCHEMA_URI, "schema", XS_URI_PREFIX);
-    public static final String DELIMITER = "#";
-    
-    private Hashtable<String, QName> simpleXSDTypes;
-    private Hashtable<String, QName> complexXSDTypes;
-    
-    public static String asQualifiedName(String uri, String typeName)
-    {
-        return (uri + DELIMITER + typeName);
-    }
-
-    
-    public  TuscanyTypeTable() 
-    {
-        simpleXSDTypes = new Hashtable<String, QName>();
-        complexXSDTypes = new Hashtable<String, QName>();
-        populateSimpleXSDTypes();
-        populateStdSDOTypes();
-    }
-
-    private void populateStdSDOTypes() 
-    {
-        simpleXSDTypes.put("Boolean",
-                new QName(XML_SCHEMA_URI, "boolean", XS_URI_PREFIX));
-        simpleXSDTypes.put("Byte",
-                new QName(XML_SCHEMA_URI, "byte", XS_URI_PREFIX));
-        simpleXSDTypes.put("Bytes",
-                new QName(XML_SCHEMA_URI, "hexBinary", XS_URI_PREFIX));
-        simpleXSDTypes.put("Character",
-                new QName(XML_SCHEMA_URI, "string", XS_URI_PREFIX));
-        simpleXSDTypes.put("DataObject",
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put("Date",
-                new QName(XML_SCHEMA_URI, "dateTime", XS_URI_PREFIX));
-        simpleXSDTypes.put("Day",
-                new QName(XML_SCHEMA_URI, "gDay", XS_URI_PREFIX));
-        simpleXSDTypes.put("Decimal",
-                new QName(XML_SCHEMA_URI, "decimal", XS_URI_PREFIX));
-        simpleXSDTypes.put("Double",
-                new QName(XML_SCHEMA_URI, "double", XS_URI_PREFIX));
-        simpleXSDTypes.put("Duration",
-                new QName(XML_SCHEMA_URI, "duration", XS_URI_PREFIX));
-        simpleXSDTypes.put("Float",
-                new QName(XML_SCHEMA_URI, "float", XS_URI_PREFIX));
-        simpleXSDTypes.put("Int",
-                new QName(XML_SCHEMA_URI, "int", XS_URI_PREFIX));
-        simpleXSDTypes.put("Integer",
-                new QName(XML_SCHEMA_URI, "integer", XS_URI_PREFIX));
-        simpleXSDTypes.put("Long",
-                new QName(XML_SCHEMA_URI, "long", XS_URI_PREFIX));
-        simpleXSDTypes.put("Month",
-                new QName(XML_SCHEMA_URI, "gMonth", XS_URI_PREFIX));
-        simpleXSDTypes.put("monthDay",
-                new QName(XML_SCHEMA_URI, "gMonthDay", XS_URI_PREFIX));
-        simpleXSDTypes.put("Object",
-                new QName(XML_SCHEMA_URI, "anySimpleType", XS_URI_PREFIX));
-        simpleXSDTypes.put("Short",
-                new QName(XML_SCHEMA_URI, "short", XS_URI_PREFIX));
-        simpleXSDTypes.put("String",
-                new QName(XML_SCHEMA_URI, "string", XS_URI_PREFIX));
-        simpleXSDTypes.put("Strings",
-                new QName(XML_SCHEMA_URI, "string", XS_URI_PREFIX));
-        simpleXSDTypes.put("Time",
-                new QName(XML_SCHEMA_URI, "time", XS_URI_PREFIX));
-        simpleXSDTypes.put("Year",
-                new QName(XML_SCHEMA_URI, "gYear", XS_URI_PREFIX));
-        simpleXSDTypes.put("YearMonth",
-                new QName(XML_SCHEMA_URI, "gYearMonth", XS_URI_PREFIX));
-        simpleXSDTypes.put("YearMonthDay",
-                new QName(XML_SCHEMA_URI, "date", XS_URI_PREFIX));
-        simpleXSDTypes.put("URI",
-                new QName(XML_SCHEMA_URI, "anyURI", XS_URI_PREFIX));
-    }
-    
-    private void populateSimpleXSDTypes() {
-        //todo pls use the types from org.apache.ws.commons.schema.constants.Constants
-        simpleXSDTypes.put("int",
-                new QName(XML_SCHEMA_URI, "int", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.String",
-                new QName(XML_SCHEMA_URI, "string", XS_URI_PREFIX));
-        simpleXSDTypes.put("boolean",
-                new QName(XML_SCHEMA_URI, "boolean", XS_URI_PREFIX));
-        simpleXSDTypes.put("float",
-                new QName(XML_SCHEMA_URI, "float", XS_URI_PREFIX));
-        simpleXSDTypes.put("double",
-                new QName(XML_SCHEMA_URI, "double", XS_URI_PREFIX));
-        simpleXSDTypes.put("short",
-                new QName(XML_SCHEMA_URI, "short", XS_URI_PREFIX));
-        simpleXSDTypes.put("long",
-                new QName(XML_SCHEMA_URI, "long", XS_URI_PREFIX));
-        simpleXSDTypes.put("byte",
-                new QName(XML_SCHEMA_URI, "byte", XS_URI_PREFIX));
-        simpleXSDTypes.put("char",
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Integer",
-                new QName(XML_SCHEMA_URI, "int", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Double",
-                new QName(XML_SCHEMA_URI, "double", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Float",
-                new QName(XML_SCHEMA_URI, "float", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Long",
-                new QName(XML_SCHEMA_URI, "long", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Character",
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Boolean",
-                new QName(XML_SCHEMA_URI, "boolean", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Byte",
-                new QName(XML_SCHEMA_URI, "byte", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Short",
-                new QName(XML_SCHEMA_URI, "short", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.util.Date",
-                new QName(XML_SCHEMA_URI, "dateTime", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.util.Calendar",
-                new QName(XML_SCHEMA_URI, "dateTime", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Object",
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.math.BigDecimal",
-                new QName(XML_SCHEMA_URI, "decimal", XS_URI_PREFIX));
-
-        // Any types
-        simpleXSDTypes.put(OMElement.class.getName(),
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put(ArrayList.class.getName(),
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put(Vector.class.getName(),
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put(List.class.getName(),
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-
-        // I'm unsure what populateStdSDOTypes is supposed to be setting up,
-        // given that I still have to do this to map "commonj.sdo.DataObject" 
-        // to xsd:anyType, but I'll do it anyway.
-        //
-        simpleXSDTypes.put(DataObject.class.getName(),
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-    }
-    
-    public QName getStdSdoType(String typename) {
-        return (QName) simpleXSDTypes.get(typename);
-    }
-
-    public QName getComplexSchemaTypeName(String sdoURI, String sdoTypeName) {
-        return (QName) complexXSDTypes.get(asQualifiedName(sdoURI, sdoTypeName));
-    }
-
-    public QName getComplexSchemaTypeName(JClass javaClass, ClassLoader cl) throws Exception {
-        String namespace = Java2WSDLUtils.schemaNamespaceFromClassName(javaClass.getQualifiedName(), cl).toString();
-        return (QName) complexXSDTypes.get(asQualifiedName(namespace, javaClass.getSimpleName()));
-    }
-
-    public boolean isSimpleType(String typeName) {
-        Iterator keys = simpleXSDTypes.keySet().iterator();
-        while (keys.hasNext()) {
-            String s = (String) keys.next();
-            if (s.equals(typeName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    public QName getSimpleSchemaTypeName(String typename) {
-        return (QName) simpleXSDTypes.get(typename);
-    }
-
-    public void addSimpleSchemaType(String typeName, QName schemaType) {
-        simpleXSDTypes.put(typeName, schemaType);
-    }
-
-    public void addComplexSchemaType(String namespaceURI, String name, QName schemaType) {
-        complexXSDTypes.put(asQualifiedName(namespaceURI, name), schemaType);
-    }
-
-    public QName getQNamefortheType(String namespaceURI, String typeName) {
-        if (XML_SCHEMA_URI.equals(namespaceURI)) {
-            return getSimpleSchemaTypeName(typeName);
-        } else {
-            return getComplexSchemaTypeName(namespaceURI, typeName);
-        }
-    }
-}
-
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
deleted file mode 100644
index 66c9100ef9..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
+++ /dev/null
@@ -1,370 +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.tools.java2wsdl.generate;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axis2.description.java2wsdl.bytecode.MethodTable;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaForm;
-import org.apache.ws.commons.schema.XmlSchemaImport;
-import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.utils.NamespaceMap;
-import org.codehaus.jam.JClass;
-import org.codehaus.jam.JMethod;
-import org.codehaus.jam.JParameter;
-import org.codehaus.jam.JamClassIterator;
-import org.codehaus.jam.JamService;
-import org.codehaus.jam.JamServiceFactory;
-import org.codehaus.jam.JamServiceParams;
-
-public class TuscanyWSDLTypesGenerator implements TuscanyJava2WSDLConstants {
-    public static final String NAME_SPACE_PREFIX = "stn_";
-
-    public static final String PERIOD_SEPARATOR = ".";
-
-    private static int prefixCount = 1;
-
-    protected GenerationParameters generationParams;
-
-    protected Hashtable targetNamespacePrefixMap = new Hashtable();
-
-    protected Hashtable schemaMap = new Hashtable();
-
-    protected XmlSchemaCollection xmlSchemaCollection = new XmlSchemaCollection();
-
-    private TuscanyTypeTable typeTable = new TuscanyTypeTable();
-
-    protected SchemaBuilder schemaBuilder = null;
-
-    protected Map schemaLocationMap = null;
-
-    // to keep loaded method using JAM
-    private JMethod methods[];
-
-    // to store byte code method using Axis 1.x codes
-    private MethodTable methodTable;
-
-    private Class clazz;
-
-    private ArrayList excludeMethods = new ArrayList();
-
-    boolean alreadyPrintedArrayWarningMessage = false;
-
-    public TuscanyWSDLTypesGenerator(GenerationParameters genParams) throws Exception {
-        this.generationParams = genParams;
-
-        String inputClassName = generationParams.getSourceClassName();
-
-        try {
-            clazz = Class.forName(inputClassName, true, generationParams.getClassLoader());
-        } catch (ClassNotFoundException cfne) {
-            printInputSourceClassNotFoundMessage(inputClassName);
-            throw new IllegalArgumentException("Input className not found:" + inputClassName, cfne);
-        }
-
-        methodTable = new MethodTable(clazz);
-
-        initializeSchemaMap(generationParams.getSchemaTargetNamespace(), generationParams
-            .getSchemaTargetNamespacePrefix());
-
-        this.schemaLocationMap = generationParams.getSchemaLocationMap();
-        schemaBuilder =
-            new SchemaBuilder(xmlSchemaCollection, schemaMap, targetNamespacePrefixMap, typeTable, generationParams
-                .getAttrFormDefault(), generationParams.getElementFormDefault(), generationParams
-                .getSchemaLocationMap(), generationParams.getClassLoader(), generationParams.getFactoryClassNames());
-    }
-
-    /**
-     * Generates schema for all the parameters in method. First generates schema
-     * for all different parameter type and later refers to them.
-     * 
-     * @return Returns XmlSchema.
-     * @throws Exception
-     */
-    public Collection buildWSDLTypes() throws Exception {
-        JamServiceFactory factory = JamServiceFactory.getInstance();
-        JamServiceParams jam_service_parms = factory.createServiceParams();
-        // setting the classLoder
-        // jam_service_parms.setParentClassLoader(factory.createJamClassLoader(classLoader));
-        // it can possible to add the classLoader as well
-        jam_service_parms.addClassLoader(generationParams.getClassLoader());
-        jam_service_parms.includeClass(generationParams.getSourceClassName());
-
-        for (int count = 0; count < generationParams.getExtraClasses().size(); ++count) {
-            jam_service_parms.includeClass((String)generationParams.getExtraClasses().get(count));
-        }
-
-        JamService service = factory.createService(jam_service_parms);
-        QName extraSchemaTypeName = null;
-        JamClassIterator jClassIter = service.getClasses();
-        // all most all the time the ittr will have only one class in it
-        while (jClassIter.hasNext()) {
-            JClass jclass = (JClass)jClassIter.next();
-            // serviceName = jclass.getSimpleName();
-            // todo in the future , when we support annotation we can use this
-            // JAnnotation[] annotations = jclass.getAnnotations();
-
-            if (jclass.getQualifiedName().equals(generationParams.getSourceClassName())) {
-                /**
-                 * Schema generation done in two stage 1. Load all the methods
-                 * and create type for methods parameters (if the parameters are
-                 * Bean then it will create Complex types for those , and if the
-                 * parameters are simple type which describe in SimpleTypeTable
-                 * nothing will happen) 2. In the next stage for all the methods
-                 * messages and port types will be created
-                 */
-                methods = jclass.getDeclaredMethods();
-                // short the elements in the array
-                Arrays.sort(methods);
-
-                // since we do not support overload
-                HashMap uniqueMethods = new HashMap();
-                XmlSchemaComplexType methodSchemaType;
-                XmlSchemaSequence sequence = null;
-
-                for (int i = 0; i < methods.length; i++) {
-                    JMethod jMethod = methods[i];
-
-                    String methodName = methods[i].getSimpleName();
-                    // no need to think about this method , since that is system
-                    // config method
-                    if (excludeMethods.contains(jMethod.getSimpleName())) {
-                        continue;
-                    }
-
-                    if (uniqueMethods.get(jMethod.getSimpleName()) != null) {
-                        throw new Exception(" Sorry we don't support methods overloading !!!! ");
-                    }
-
-                    if (!jMethod.isPublic()) {
-                        // no need to generate Schema for non public methods
-                        continue;
-                    }
-                    uniqueMethods.put(jMethod.getSimpleName(), jMethod);
-                    // create the schema type for the method wrapper
-
-                    uniqueMethods.put(jMethod.getSimpleName(), jMethod);
-                    JParameter[] paras = jMethod.getParameters();
-                    String parameterNames[] = null;
-                    // better to handle void types too
-                    parameterNames = methodTable.getParameterNames(methodName);
-                    sequence = new XmlSchemaSequence();
-
-                    methodSchemaType = createSchemaTypeForMethodPart(jMethod.getSimpleName());
-                    methodSchemaType.setParticle(sequence);
-
-                    for (int j = 0; j < paras.length; j++) {
-                        JParameter methodParameter = paras[j];
-                        JClass paraType = methodParameter.getType();
-                        generateSchemaForType(sequence, paraType, (parameterNames != null && parameterNames[j] != null)
-                            ? parameterNames[j] : methodParameter.getSimpleName());
-                    }
-                    // for its return type
-                    JClass returnType = jMethod.getReturnType();
-
-                    // better to handle void types too
-                    methodSchemaType = createSchemaTypeForMethodPart(jMethod.getSimpleName() + RESPONSE);
-                    sequence = new XmlSchemaSequence();
-                    methodSchemaType.setParticle(sequence);
-                    generateSchemaForType(sequence, returnType, "return");
-                }
-            } else {
-                // generate the schema type for extra classes
-                extraSchemaTypeName = typeTable.getSimpleSchemaTypeName(jclass.getQualifiedName());
-                if (extraSchemaTypeName == null) {
-                    extraSchemaTypeName = schemaBuilder.generateSchema(jclass);
-                }
-            }
-        }
-        return schemaMap.values();
-    }
-
-    private QName generateSchemaForType(XmlSchemaSequence sequence, JClass type, String partName) throws Exception {
-        if (type.isVoidType()) {
-            return null;
-        }
-        boolean isArrayType = type.isArrayType();
-        if (isArrayType) {
-            type = type.getArrayComponentType();
-        }
-
-        String classTypeName = type.getQualifiedName();
-
-        QName schemaTypeName = typeTable.getSimpleSchemaTypeName(classTypeName);
-        if (schemaTypeName == null) {
-            schemaTypeName = schemaBuilder.generateSchema(type);
-            addContentToMethodSchemaType(sequence, schemaTypeName, partName, type.isArrayType());
-            addImportORInclude((XmlSchema)schemaMap.get(generationParams.getSchemaTargetNamespace()), schemaTypeName);
-
-        } else {
-            addContentToMethodSchemaType(sequence, schemaTypeName, partName, type.isArrayType());
-        }
-
-        return schemaTypeName;
-    }
-
-    private void addContentToMethodSchemaType(XmlSchemaSequence sequence,
-                                              QName schemaTypeName,
-                                              String paraName,
-                                              boolean isArray) {
-        XmlSchemaElement elt1 = new XmlSchemaElement();
-        elt1.setName(paraName);
-        elt1.setSchemaTypeName(schemaTypeName);
-        sequence.getItems().add(elt1);
-
-        if (isArray) {
-            // FIXME: lresende to check this
-            if (!alreadyPrintedArrayWarningMessage) {
-                alreadyPrintedArrayWarningMessage = true;
-                System.out.println("Warning!: Array type detected as Java method parameter. The WSDL");
-                System.out.println("will be generated anyway in spite of the fact that round-trip (WSDL2Java)");
-                System.out.println("may not be handled in the expected manner.  There may be runtime issues as ");
-                System.out.println("well as array types are not necessarily supported yet.");
-                System.out.println("");
-            }
-            elt1.setMaxOccurs(Long.MAX_VALUE);
-            elt1.setMinOccurs(0);
-        }
-    }
-
-    private XmlSchemaComplexType createSchemaTypeForMethodPart(String localPartName) throws Exception {
-        XmlSchema xmlSchema = (XmlSchema)schemaMap.get(generationParams.getSchemaTargetNamespace());
-        QName elementName =
-            new QName(generationParams.getSchemaTargetNamespace(), localPartName, generationParams
-                .getSchemaTargetNamespacePrefix());
-        XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
-
-        XmlSchemaElement globalElement = new XmlSchemaElement();
-        globalElement.setSchemaType(complexType);
-        globalElement.setName(localPartName);
-        globalElement.setQName(elementName);
-
-        xmlSchema.getItems().add(globalElement);
-        xmlSchema.getElements().add(elementName, globalElement);
-
-        typeTable.addComplexSchemaType(generationParams.getSchemaTargetNamespace(),
-                                       globalElement.getName(),
-                                       elementName);
-
-        return complexType;
-    }
-
-    public TuscanyTypeTable getTypeTable() {
-        return typeTable;
-    }
-
-    public JMethod[] getMethods() {
-        return methods;
-    }
-
-    private String generatePrefix() {
-        return NAME_SPACE_PREFIX + prefixCount++;
-    }
-
-    public void setExcludeMethods(ArrayList excludeMethods) {
-        this.excludeMethods = excludeMethods;
-    }
-
-    private void initializeSchemaMap(String targetNamespace, String targetNamespacePrefix) {
-        XmlSchema xmlSchema = new XmlSchema(targetNamespace, xmlSchemaCollection);
-        xmlSchema.setAttributeFormDefault(getAttrFormDefaultSetting());
-        xmlSchema.setElementFormDefault(getElementFormDefaultSetting());
-
-        targetNamespacePrefixMap.put(targetNamespace, targetNamespacePrefix);
-        schemaMap.put(targetNamespace, xmlSchema);
-
-        NamespaceMap prefixmap = new NamespaceMap();
-        prefixmap.put(TuscanyTypeTable.XS_URI_PREFIX, TuscanyTypeTable.XML_SCHEMA_URI);
-        prefixmap.put(targetNamespacePrefix, targetNamespace);
-        xmlSchema.setNamespaceContext(prefixmap);
-    }
-
-    /*
-     * Adds to 'xmlSchema' an import or include of the XMLSchema containing
-     * 'schemaTypeName'
-     */
-    private void addImportORInclude(XmlSchema xmlSchema, QName schemaTypeName) {
-        // decide whether there must be an import or an include
-        if (xmlSchema.getTargetNamespace().equals(schemaTypeName.getNamespaceURI())) {
-            XmlSchema containingSchema = (XmlSchema)schemaMap.get(schemaTypeName.getNamespaceURI());
-            // if the type is not defined in the Schema then include
-            if (containingSchema.getTypeByName(schemaTypeName) == null) {
-                String schemaLocation = null;
-                // This looked backwards so I flipped it
-                if ((schemaLocation = (String)schemaLocationMap.get(schemaTypeName.getNamespaceURI())) != null) {
-                    schemaLocation = DEFAULT_SCHEMA_LOCATION;
-                }
-
-                XmlSchemaInclude includeElement = new XmlSchemaInclude();
-                includeElement.setSchemaLocation(schemaLocation);
-
-                if (!xmlSchema.getIncludes().contains(includeElement)) {
-                    xmlSchema.getIncludes().add(includeElement);
-                    // Add this so it will be serialized
-                    xmlSchema.getItems().add(includeElement);
-                }
-            }
-        } else {
-            if (!((NamespaceMap)xmlSchema.getNamespaceContext()).values().contains(schemaTypeName.getNamespaceURI())) {
-                XmlSchemaImport importElement = new XmlSchemaImport();
-                importElement.setNamespace(schemaTypeName.getNamespaceURI());
-
-                // Add schemaLocation on imports
-                String schemaLocation = (String)schemaLocationMap.get(schemaTypeName.getNamespaceURI());
-                importElement.setSchemaLocation(schemaLocation);
-                xmlSchema.getItems().add(importElement);
-                ((NamespaceMap)xmlSchema.getNamespaceContext()).put(generatePrefix(), schemaTypeName.getNamespaceURI());
-            }
-        }
-    }
-
-    private XmlSchemaForm getAttrFormDefaultSetting() {
-        if (FORM_DEFAULT_UNQUALIFIED.equals(generationParams.getAttrFormDefault())) {
-            return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
-        } else {
-            return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
-        }
-    }
-
-    private XmlSchemaForm getElementFormDefaultSetting() {
-        if (FORM_DEFAULT_UNQUALIFIED.equals(generationParams.getElementFormDefault())) {
-            return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
-        } else {
-            return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
-        }
-    }
-
-    private void printInputSourceClassNotFoundMessage(String inputClassName) {
-        System.out.println("ERROR!!:  The input class: " + inputClassName + " could not be found.");
-        System.out.println("Please check the value you provided for the -cp <class path uri> option.");
-        System.out.println("");
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
deleted file mode 100644
index e30ada3af5..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
+++ /dev/null
@@ -1,42 +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.tools.java2wsdl.generate;
-
-import java.util.EventObject;
-
-public class WSDLGenEvent extends EventObject {
-	/**
-     * 
-     */
-    private static final long serialVersionUID = -356100754190514245L;
-    private int generationPhase = WSDLGenListener.UNKNOWN;
-
-	public WSDLGenEvent(Object source, int genPhase) {
-		super(source);
-		this.generationPhase = genPhase;
-	}
-
-	public int getGenerationPhase() {
-		return generationPhase;
-	}
-
-	public void setGenerationPhase(int generationPhase) {
-		this.generationPhase = generationPhase;
-	}
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
deleted file mode 100644
index 788d162f34..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
+++ /dev/null
@@ -1,39 +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.tools.java2wsdl.generate;
-
-public interface WSDLGenListener {
-	public static int UNKNOWN = 0;
-
-	public static int INPUT_ARGS_PARSING = 1;
-
-	public static int INPUT_ARGS_VALIDATION = 2;
-
-	public static int WSDL_MODEL_CREATION = 3;
-
-	public static int WSDL_MODEL_WRITING = 4;
-
-	public static String[] phaseAsString = { "Unknown",
-			"Input Arguments Parsing", "Input Arguments Validation",
-			"WSDL Model Creation", "WSDL Model Writing" };
-
-	public void WSDLGenPhaseStarted(WSDLGenEvent event);
-
-	public void WSDLGenPhaseCompleted(WSDLGenEvent event);
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java b/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
deleted file mode 100644
index b30b8cd62b..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
+++ /dev/null
@@ -1,143 +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.tools.java2wsdl.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class XMLNameUtil {
-
-    /**
-     * Returns a valid Java name from an XML Name.
-     *
-     * @param name
-     * @param isUpperCase
-     * @return a valid Java name from an XML Name
-     */
-    public static String getJavaNameFromXMLName(String name, boolean isUpperCase) {
-        List<String> parsedName = parseName(name, '_');
-        StringBuilder result = new StringBuilder(64 * parsedName.size());
-        for (String nameComponent: parsedName) {
-            if (nameComponent.length() > 0) {
-                if (result.length() > 0 || isUpperCase) {
-                    result.append(Character.toUpperCase(nameComponent.charAt(0)));
-                    result.append(nameComponent.substring(1));
-                } else {
-                    result.append(nameComponent);
-                }
-            }
-        }
-    
-        if (result.length() == 0) {
-            return "_";
-        }
-        if (Character.isJavaIdentifierStart(result.charAt(0))) {
-            return isUpperCase ? result.toString() : decapitalizeName(result.toString());
-        }
-        return "_" + result;
-    }
-
-    /**
-     * Decapitalize a name.
-     * @param name
-     * @return a decapitalized name
-     */
-    public static String decapitalizeName(String name) {
-        if (name.length() == 0) {
-            return name;
-        } else {
-            String lowerName = name.toLowerCase();
-            int i;
-            for (i = 0; i < name.length(); i++) {
-                if (name.charAt(i) == lowerName.charAt(i)) {
-                    break;
-                }
-            }
-            if (i > 1 && i < name.length()) {
-                --i;
-            }
-            return name.substring(0, i).toLowerCase() + name.substring(i);
-        }
-    }
-
-    /**
-     * Parse the given name.
-     *
-     * @param sourceName
-     * @param separator
-     * @return some stuff parsed from the name
-     */
-    private static List<String> parseName(String sourceName, char separator) {
-        List<String> result = new ArrayList<String>();
-        if (sourceName != null) {
-            StringBuilder currentWord = new StringBuilder(64);
-            boolean lastIsLower = false;
-            int index;
-            int length;
-            for (index = 0, length = sourceName.length(); index < length; ++index) {
-                char curChar = sourceName.charAt(index);
-                if (!Character.isJavaIdentifierPart(curChar)) {
-                    curChar = separator;
-                }
-                if (Character.isUpperCase(curChar)
-                    || (!lastIsLower && Character.isDigit(curChar))
-                    || curChar == separator) {
-                    
-                    if (lastIsLower && currentWord.length() > 1 
-                        || curChar == separator && currentWord.length() > 0) {
-                        result.add(currentWord.toString());
-                        currentWord = new StringBuilder(64);
-                    }
-                    lastIsLower = false;
-                } else {
-                    if (!lastIsLower) {
-                        int currentWordLength = currentWord.length();
-                        if (currentWordLength > 1) {
-                            char lastChar = currentWord.charAt(--currentWordLength);
-                            currentWord.setLength(currentWordLength);
-                            result.add(currentWord.toString());
-                            currentWord = new StringBuilder(64);
-                            currentWord.append(lastChar);
-                        }
-                    }
-                    lastIsLower = true;
-                }
-    
-                if (curChar != separator) {
-                    currentWord.append(curChar);
-                }
-            }
-    
-            result.add(currentWord.toString());
-        }
-        return result;
-    }
-    
-    /**
-     * Return an EPackage name for the given namespace.
-     *
-     * @param namespace
-     * @return an EPackage name for the given namespace
-     */
-    public static String getPackageNameFromNamespace(String namespace) {
-       return org.apache.tuscany.sdo.helper.SDOXSDEcoreBuilder.getDefaultPackageName(namespace);
-    }
-
-
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/resources/META-INF/LICENSE.txt b/java/sca-contrib/tools/sdo/java2wsdl/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 0084319535..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, serviceDefinition marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java b/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
deleted file mode 100644
index 135b374357..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
+++ /dev/null
@@ -1,41 +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.tools.java2wsdl.generate;
-
-import org.apache.tuscany.tools.java2wsdl.generate.customer.Customer;
-
-public class CustomerValue {
-
-    public int getValue(String custId, String stockSymbol) {
-        return 0;
-    }
-
-    public Customer getCustomerDetails(String custId) {
-        return new Customer();
-    }
-
-    public String noArgsServiceMethod() {
-        return new String();
-    }
-
-    private void privateServiceMethod() {
-
-    }
-
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java b/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
deleted file mode 100644
index dfebd77215..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.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 org.apache.tuscany.tools.java2wsdl.generate;
-
-import org.apache.tuscany.tools.java2wsdl.generate.account.Account;
-import org.apache.tuscany.tools.java2wsdl.generate.customer.Customer;
-
-public class CustomerWithAccount {
-
-    private Customer customer = new Customer();
-
-    private Account[] accounts;
-
-    public int getValue(String custId, String stockSymbol) {
-        return 123;
-    }
-
-    public Customer getCustomerDetails(String custId) {
-        return customer;
-    }
-
-    public Account getCustomerAccount(String custId, String accountId) {
-        return accounts[0];
-    }
-
-    public Account[] getAccounts() {
-        return accounts;
-    }
-
-    public void setAccounts(Account[] accounts) {
-        this.accounts = accounts;
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java b/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
deleted file mode 100644
index ccc2d3f628..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.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.tools.java2wsdl.generate;

-

-import org.oasisopen.sca.annotation.OneWay;

-

-public interface ExampleService {

-

-    void sayHelloTwoWay(String name);

-

-    @OneWay

-    void sayHelloOneWay(String name);

-    

-    String getGreeting();

-}

diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java b/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
deleted file mode 100644
index c587252d23..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
+++ /dev/null
@@ -1,114 +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.tools.java2wsdl.generate;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-/**
- * A JUnit test case to test the Tuscany Java 2 WSDL Generation
- */
-public class TuscanyJava2WSDLTestCase extends TestCase {
-
-    /**
-     * setup the pre-requisites for the test case to run
-     * 
-     * @exception Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    /**
-     * @exception Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    /**
-     * Simple WSDL generation test.
-     */
-    public void testSimpleWSDLGeneration() {
-        String[] arguments =
-            new String[] {"-cn", "org.apache.tuscany.tools.java2wsdl.generate.CustomerValue", 
-                          "-o",  "target/java2wsdl-source", "-xc",
-                          "org.apache.tuscany.tools.java2wsdl.generate.extra.GoldCustomer"};
-
-        Java2WSDL.main(arguments);
-
-        File file = new File("target/java2wsdl-source/CustomerValue.wsdl");
-        assertTrue(file.exists() && file.isFile());
-    }
-
-    /**
-     * Test WSDL generation where a parameter Object[] is involved.
-     */
-    public void testWsdlGeneration2() {
-
-        String[] arguments =
-            new String[] {"-cn", "org.apache.tuscany.tools.java2wsdl.generate.CustomerWithAccount", 
-                          "-o", "target/java2wsdl-source",};
-        Java2WSDL.main(arguments);
-
-        File file = new File("target/java2wsdl-source/CustomerWithAccount.wsdl");
-        assertTrue(file.exists() && file.isFile());
-    }
-
-    public void testWsdlGeneration_SDO_Static() {
-        // tests for SDOs where XSD exist. Hence no XSDs must be generated
-        String[] arguments =
-            new String[] {"-cn", "org.soapinterop.CreditScoreDocLit",
-                          "-o", "target/java2wsdl-source",
-                          "-ixsd", "[http://www.example.org/creditscore/doclit/," + "http://www.example.org/creditscore/doclit/xsd]"};
-        Java2WSDL.main(arguments);
-
-        File file = new File("target/java2wsdl-source/CreditScoreDocLit.wsdl");
-        assertTrue(file.exists() && file.isFile());
-    }
-
-    /**
-     * Test WSDL generation for a service interface.
-     */
-    public void testServiceWSDLGeneration() {
-        String[] arguments =
-            new String[] {"-cn", "org.apache.tuscany.tools.java2wsdl.generate.ExampleService", 
-                          "-o",  "target/java2wsdl-source"};
-
-        Java2WSDL.main(arguments);
-
-        File file = new File("target/java2wsdl-source/ExampleService.wsdl");
-        assertTrue(file.exists() && file.isFile());
-    }
-
-    /**
-     * Test WSDL generation from a java interface and then generate the java
-     * interface using the generated WSDL.
-     */
-    public void _testRoundTrip() {
-        // TODO implement round trip
-        // this should re-generate java interfaces from the generated wsdl
-        // and compile (?) the generated java code.
-        // fail();
-
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java b/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
deleted file mode 100644
index bf49d98888..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
+++ /dev/null
@@ -1,53 +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.tools.java2wsdl.generate.account;
-
-import java.math.BigDecimal;
-
-public class Account {
-    int accountType;
-
-    String accountNo;
-
-    BigDecimal balance;
-
-    public String getAccountNo() {
-        return accountNo;
-    }
-
-    public void setAccountNo(String accountNo) {
-        this.accountNo = accountNo;
-    }
-
-    public int getAccountType() {
-        return accountType;
-    }
-
-    public void setAccountType(int accountType) {
-        this.accountType = accountType;
-    }
-
-    public BigDecimal getBalance() {
-        return balance;
-    }
-
-    public void setBalance(BigDecimal balance) {
-        this.balance = balance;
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java b/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
deleted file mode 100644
index cf83095852..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
+++ /dev/null
@@ -1,29 +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.tools.java2wsdl.generate.customer;
-
-public class Customer {
-    private String name = "";
-
-    public int custType = 0;
-
-    public String getName() {
-        return name;
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java b/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
deleted file mode 100644
index 901da8e551..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
+++ /dev/null
@@ -1,33 +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.tools.java2wsdl.generate.extra;
-
-import org.apache.tuscany.tools.java2wsdl.generate.customer.Customer;
-
-public class GoldCustomer extends Customer {
-    public String goldCustNumber = "";
-
-    public String getGoldCustNumber() {
-        return goldCustNumber;
-    }
-
-    public void setGoldCustNumber(String goldCustNumber) {
-        this.goldCustNumber = goldCustNumber;
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java b/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
deleted file mode 100644
index 78a64dcc64..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ /dev/null
@@ -1,24 +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.soapinterop;
-
-public interface CreditScoreDocLit {
-    public org.example.creditscore.doclit.CreditReport getCreditScore(org.example.creditscore.doclit.Customer param0)
-        throws java.rmi.RemoteException;
-}
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/AccountService.wsdl b/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/AccountService.wsdl
deleted file mode 100644
index 6f2fed1e2a..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/AccountService.wsdl
+++ /dev/null
@@ -1,242 +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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-                  xmlns:tns="http://www.bigbank.com/Account/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

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

-                  xmlns:account="http://www.bigbank.com/Account/"

-                  targetNamespace="http://www.bigbank.com/Account/"
-                  name="AccountService">

-

-    <wsdl:types>

-        <xsd:schema targetNamespace="http://www.bigbank.com/Account/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:account="http://www.bigbank.com/Account/"
-		xmlns:sdojava="commonj.sdo/java"
-		sdojava:package="org.apache.tuscany.samples.bigbank.account">

-

-            <xsd:element name="getAccountReportWrapped0">

-                <xsd:complexType>

-                    <xsd:sequence>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            <xsd:element name="getAccountReportWrapped0Response">

-                <xsd:complexType>

-                    <xsd:sequence>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-

-            <xsd:element name="getAccountReportWrapped1">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="customerID" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>

-            <xsd:element name="getAccountReportWrapped1Response">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="accountReport" type="account:AccountReport"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-

-            <xsd:element name="getAccountReportWrappedN">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="customerID" type="xsd:string"/>

-                        <xsd:element name="customerID2" type="xsd:int"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            <xsd:element name="getAccountReportWrappedNResponse">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="accountReport" type="account:AccountReport"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            

-            <xsd:element name="getAccountReportBare0" type="xsd:string"/>

-            <xsd:element name="getAccountReportBare0Response" type="xsd:int"/>

-            

-            <xsd:element name="getAccountReportBare1Simple" type="xsd:string"/>

-            <xsd:element name="getAccountReportBare1SimpleResponse" type="xsd:int"/>

-            

-            <xsd:element name="getAccountReportBare1Complex" type="account:AccountRequest"/>

-            <xsd:element name="getAccountReportBare1ComplexResponse" type="account:AccountReport"/>

-

-            <xsd:complexType name="AccountRequest">

-                <xsd:sequence>

-                    <xsd:element name="customerID" type="xsd:string"/>

-                </xsd:sequence>

-            </xsd:complexType>

-            

-            <xsd:complexType name="AccountReport">

-                <xsd:sequence>

-                    <xsd:element name="accountSummaries" type="account:AccountSummary" maxOccurs="unbounded"/>

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:complexType name="AccountSummary">

-                <xsd:attribute name="accountNumber" type="xsd:string"/>

-                <xsd:attribute name="accountType" type="xsd:string"/>

-                <xsd:attribute name="balance" type="xsd:float"/>

-            </xsd:complexType>

-

-        </xsd:schema>

-    </wsdl:types>

-

-    <wsdl:message name="getAccountReportWrapped0Request">

-        <wsdl:part element="account:getAccountReportWrapped0" name="getAccountReportWrapped0Request"/>

-    </wsdl:message>

-    <wsdl:message name="getAccountReportWrapped0Response">

-        <wsdl:part element="account:getAccountReportWrapped0Response" name="getAccountReportWrapped0Response"/>

-    </wsdl:message>

-

-    <wsdl:message name="getAccountReportWrapped1Request">

-        <wsdl:part element="account:getAccountReportWrapped1" name="getAccountReportWrapped1Request"/>

-    </wsdl:message>

-    <wsdl:message name="getAccountReportWrapped1Response">

-        <wsdl:part element="account:getAccountReportWrapped1Response" name="getAccountReportWrapped1Response"/>

-    </wsdl:message>

-

-    <wsdl:message name="getAccountReportWrappedNRequest">

-        <wsdl:part element="account:getAccountReportWrappedN" name="getAccountReportWrappedNRequest"/>

-    </wsdl:message>

-    <wsdl:message name="getAccountReportWrappedNResponse">

-        <wsdl:part element="account:getAccountReportWrappedNResponse" name="getAccountReportWrappedNResponse"/>

-    </wsdl:message>

-

-    <wsdl:message name="getAccountReportBare0Request">

-    </wsdl:message>

-    <wsdl:message name="getAccountReportBare0Response">

-    </wsdl:message>

-

-    <wsdl:message name="getAccountReportBare1SimpleRequest">

-        <wsdl:part element="account:getAccountReportBare1Simple" name="getAccountReportBare1SimpleRequest"/>

-    </wsdl:message>

-    <wsdl:message name="getAccountReportBare1SimpleResponse">

-        <wsdl:part element="account:getAccountReportBare1SimpleResponse" name="getAccountReportBare1SimpleResponse"/>

-    </wsdl:message>

-

-    <wsdl:message name="getAccountReportBare1ComplexRequest">

-        <wsdl:part element="account:getAccountReportBare1Complex" name="getAccountReportBare1ComplexRequest"/>

-    </wsdl:message>

-    <wsdl:message name="getAccountReportBare1ComplexResponse">

-        <wsdl:part element="account:getAccountReportBare1ComplexResponse" name="getAccountReportBare1ComplexResponse"/>

-    </wsdl:message>

-

-    <wsdl:portType name="Account_Service">

-        <wsdl:operation name="getAccountReportWrapped0">

-            <wsdl:input message="tns:getAccountReportWrapped0Request"/>

-            <wsdl:output message="tns:getAccountReportWrapped0Response"/>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportWrapped1">

-            <wsdl:input message="tns:getAccountReportWrapped1Request"/>

-            <wsdl:output message="tns:getAccountReportWrapped1Response"/>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportWrappedN">

-            <wsdl:input message="tns:getAccountReportWrappedNRequest"/>

-            <wsdl:output message="tns:getAccountReportWrappedNResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportBare0">

-            <wsdl:input message="tns:getAccountReportBare0Request"/>

-            <wsdl:output message="tns:getAccountReportBare0Response"/>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportBare1Simple">

-            <wsdl:input message="tns:getAccountReportBare1SimpleRequest"/>

-            <wsdl:output message="tns:getAccountReportBare1SimpleResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportBare1Complex">

-            <wsdl:input message="tns:getAccountReportBare1ComplexRequest"/>

-            <wsdl:output message="tns:getAccountReportBare1ComplexResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="AccountServiceSOAP" type="tns:Account_Service">

-        <soap:binding style="document"

-                      transport="http://schemas.xmlsoap.org/soap/http"/>

-        <wsdl:operation name="getAccountReportWrapped0">

-            <soap:operation

-                    soapAction="http://www.bigbank.com/Account/getAccountReportWrapped0"/>

-            <wsdl:input>

-                <soap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportWrapped1">

-            <soap:operation

-                    soapAction="http://www.bigbank.com/Account/getAccountReportWrapped1"/>

-            <wsdl:input>

-                <soap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportWrappedN">

-            <soap:operation

-                    soapAction="http://www.bigbank.com/Account/getAccountReportWrappedN"/>

-            <wsdl:input>

-                <soap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportBare0">

-            <soap:operation

-                    soapAction="http://www.bigbank.com/Account/getAccountReportBare0"/>

-            <wsdl:input>

-                <soap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportBare1Simple">

-            <soap:operation

-                    soapAction="http://www.bigbank.com/Account/getAccountReportBare1Simple"/>

-            <wsdl:input>

-                <soap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportBare1Complex">

-            <soap:operation

-                    soapAction="http://www.bigbank.com/Account/getAccountReportBare1Complex"/>

-            <wsdl:input>

-                <soap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="AccountService">

-        <wsdl:port binding="tns:AccountServiceSOAP"

-                   name="AccountServiceSOAP">

-            <soap:address location="http://localhost:8085/sample-account/services/AccountService"/>

-        </wsdl:port>

-    </wsdl:service>

-</wsdl:definitions>

diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl b/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
deleted file mode 100644
index 09d1a58589..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.

-

-  Licensed 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 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-	xmlns:tns="http://www.example.org/creditscore/doclit/"

-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="CreditScore"

-	targetNamespace="http://www.example.org/creditscore/doclit/">

-	<wsdl:types>

-		<xsd:schema

-			targetNamespace="http://www.example.org/creditscore/doclit/"

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

-			<xsd:element name="getCreditScoreRequest" type="tns:Customer" />

-			<xsd:complexType name="Customer">

-				<xsd:sequence>

-					<xsd:element name="ssn" type="xsd:string" />

-					<xsd:element name="firstName" type="xsd:string" />

-					<xsd:element name="lastName" type="xsd:string" />

-				</xsd:sequence>

-			</xsd:complexType>				

-			<xsd:element name="getCreditScoreResponse" type="tns:CreditReport"/>

-			<xsd:complexType name="CreditReport">

-				<xsd:sequence>

-					<xsd:element name="score" type="xsd:int"/>

-				</xsd:sequence>

-			</xsd:complexType>				

-		</xsd:schema>

-	</wsdl:types>

-	<wsdl:message name="getCreditScoreResponse">

-		<wsdl:part element="tns:getCreditScoreResponse"

-			name="getCreditScoreResponse" />

-	</wsdl:message>

-	<wsdl:message name="getCreditScoreRequest">

-		<wsdl:part element="tns:getCreditScoreRequest"

-			name="getCreditScoreRequest" />

-	</wsdl:message>

-	<wsdl:portType name="CreditScoreDocLit">

-		<wsdl:operation name="getCreditScore">

-			<wsdl:input message="tns:getCreditScoreRequest" />

-			<wsdl:output message="tns:getCreditScoreResponse" />

-		</wsdl:operation>

-	</wsdl:portType>

-	<wsdl:binding name="CreditScoreDocLitSOAP" type="tns:CreditScoreDocLit">

-		<soap:binding style="document"

-			transport="http://schemas.xmlsoap.org/soap/http" />

-		<wsdl:operation name="getCreditScore">

-			<soap:operation

-				soapAction="http://www.example.org/creditscore/doclit/getCreditScore" />

-			<wsdl:input>

-				<soap:body parts="getCreditScoreRequest" use="literal" />

-			</wsdl:input>

-			<wsdl:output>

-				<soap:body parts="getCreditScoreResponse" use="literal" />

-			</wsdl:output>

-		</wsdl:operation>

-	</wsdl:binding>

-	<wsdl:service name="CreditScore">

-		<wsdl:port binding="tns:CreditScoreDocLitSOAP"

-			name="CreditScoreDocLitSOAP">

-			<soap:address location="http://www.example.org/" />

-		</wsdl:port>

-	</wsdl:service>

-</wsdl:definitions>

diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/helloworld.wsdl b/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/helloworld.wsdl
deleted file mode 100644
index 051f604bb2..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/helloworld.wsdl
+++ /dev/null
@@ -1,121 +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://helloworldaxis.samples.tuscany.apache.org" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://helloworldaxis.samples.tuscany.apache.org" xmlns:intf="http://helloworldaxis.samples.tuscany.apache.org" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="stockquote">
-    <!--WSDL created by Apache Axis version: 1.2.1
-Built on Jun 14, 2005 (09:15:57 EDT)-->
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-        	xmlns:hello="http://helloworldaxis.samples.tuscany.apache.org" 
-        	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        	targetNamespace="http://helloworldaxis.samples.tuscany.apache.org" xmlns="http://www.w3.org/2001/XMLSchema">
-        	<complexType name="ComplexGreetings">
-                <sequence>
-                    <element name="greet1" type="xsd:string"/>
-                    <element name="greet2" type="xsd:double"/>
-                </sequence>
-        	</complexType>
-        	<element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="in0" type="xsd:string"/>
-                        <element name="in1" type="xsd:double"/>
-                        <element name="in2" type="hello:ComplexGreetings"/>
-                    </sequence>
-                    <xsd:attribute name="language" type="xsd:string"/>
-                </complexType>
-            </element>
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-
-        <wsdl:part element="impl:getGreetings" name="parameters"/>
-
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-
-        <wsdl:part element="impl:getGreetingsResponse" name="parameters"/>
-
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorldServiceImpl">
-
-        <wsdl:operation name="getGreetings">
-
-            <wsdl:input message="impl:getGreetingsRequest" name="getGreetingsRequest"/>
-
-            <wsdl:output message="impl:getGreetingsResponse" name="getGreetingsResponse"/>
-
-        </wsdl:operation>
-
-    </wsdl:portType>
-
-    <wsdl:binding name="helloworldSoapBinding" type="impl:HelloWorldServiceImpl">
-
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-        <wsdl:operation name="getGreetings">
-
-            <wsdlsoap:operation soapAction=""/>
-
-            <wsdl:input name="getGreetingsRequest">
-
-                <wsdlsoap:body use="literal"/>
-
-            </wsdl:input>
-
-            <wsdl:output name="getGreetingsResponse">
-
-                <wsdlsoap:body use="literal"/>
-
-            </wsdl:output>
-
-        </wsdl:operation>
-
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldServiceImplService">
-
-        <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
-
-            <!-- Tuscany SCA Service -->
-<!--
-            <wsdlsoap:address location="http://localhost:8080/tuscany-samples-helloworldws-service/services/HelloWorldService"/>
--->
-            <wsdlsoap:address location="http://localhost:9876/tuscany-samples-helloworldws-service/services/HelloWorldService"/>
-
-            <!-- Axis Web Service -->
-            <!--
-            <wsdlsoap:address location="http://localhost:8081/helloworldaxissvc-incubating-M1/services/helloworld"/>
-            -->
-
-        </wsdl:port>
-
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/interopdoc.wsdl b/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/interopdoc.wsdl
deleted file mode 100644
index 820c26ca34..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/interopdoc.wsdl
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.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.    
- -->
-<definitions name="InteropTestDoc" targetNamespace="http://soapinterop.org/"
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:tns="http://soapinterop.org/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-	<types>
-
-		<xsd:schema elementFormDefault="qualified" targetNamespace="http://soapinterop.org/" xmlns:interop="http://soapinterop.org/">
-
-			<xsd:element name="SingleTag">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="SingleTag"/>
-			<xsd:element name="SingleTagResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="SimpleDocument">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="SimpleDocument">
-				<xsd:simpleContent>
-					<xsd:extension base="xsd:string"/>
-				</xsd:simpleContent>
-			</xsd:complexType>
-			<xsd:element name="SimpleDocumentResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="ComplexDocument">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="ComplexDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="1" name="simpleDoc" type="interop:ArrayOfSimpleDocument"/>
-					<xsd:element minOccurs="0" maxOccurs="1" name="child" type="interop:ChildDocument"/>
-				</xsd:sequence>
-				<xsd:attribute name="AnAttribute" type="xsd:string"/>
-			</xsd:complexType>
-			<xsd:complexType name="ArrayOfSimpleDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="unbounded" name="SimpleDocument" nillable="true" type="interop:SimpleDocument"/>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="ChildDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="1" name="childSimpleDoc" type="interop:ArrayOfSimpleDocument"/>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:element name="ComplexDocumentResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-		</xsd:schema>
-
-	</types>
-
-	<message name="SingleTagSoapIn">
-		<part name="parameters" element="tns:SingleTag"/>
-	</message>
-	<message name="SingleTagSoapOut">
-		<part name="outputDoc" element="tns:SingleTagResponse"/>
-	</message>
-	<message name="SimpleDocumentSoapIn">
-		<part name="parameters" element="tns:SimpleDocument"/>
-	</message>
-	<message name="SimpleDocumentSoapOut">
-		<part name="outputDoc" element="tns:SimpleDocumentResponse"/>
-	</message>
-	<message name="ComplexDocumentSoapIn">
-		<part name="parameters" element="tns:ComplexDocument"/>
-	</message>
-	<message name="ComplexDocumentSoapOut">
-		<part name="outputDoc" element="tns:ComplexDocumentResponse"/>
-	</message>
-
-	<portType name="DocTestPortType">
-
-		<operation name="SingleTag">
-			<input message="tns:SingleTagSoapIn"/>
-			<output message="tns:SingleTagSoapOut"/>
-		</operation>
-		<operation name="SimpleDocument">
-			<input message="tns:SimpleDocumentSoapIn"/>
-			<output message="tns:SimpleDocumentSoapOut"/>
-		</operation>
-		<operation name="ComplexDocument">
-			<input message="tns:ComplexDocumentSoapIn"/>
-			<output message="tns:ComplexDocumentSoapOut"/>
-		</operation>
-
-	</portType>
-
-	<binding name="doc_test_binding" type="tns:DocTestPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-		<operation name="SingleTag">
-			<soap:operation soapAction="http://soapinterop.org/SingleTag"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation> 
-
-		<operation name="SimpleDocument">
-			<soap:operation soapAction="http://soapinterop.org/SimpleDocument"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation> 
-
-		<operation name="ComplexDocument">
-			<soap:operation soapAction="http://soapinterop.org/ComplexDocument"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation> 
-	</binding>
-
-	<service name="interopDocSvc">
-
-  		<port name="interopDocPort" binding="tns:doc_test_binding">
-    			<soap:address location="http://www.whitemesa.net/interopdoc"/>
-  		</port>
-
-	</service>
-
-</definitions>
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/sequences.xsd b/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/sequences.xsd
deleted file mode 100644
index a565f3fa65..0000000000
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/sequences.xsd
+++ /dev/null
@@ -1,100 +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.    
- -->
-<xsd:schema xmlns:seq="http://www.example.com/sequences"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://www.example.com/sequences">
-
-	<xsd:element name="mixedStockQuote" type="seq:MixedQuote" />
-	<xsd:element name="rc" type="seq:RepeatingChoice" />
-	<xsd:element name="mrc" type="seq:MixedRepeatingChoice" />
-	<xsd:element name="rc2" type="seq:TwoRCs" />
-	<xsd:element name="mrc2" type="seq:TwoRCsMixed" />
-
-
-
-	<xsd:complexType mixed="true" name="MixedQuote">
-		<xsd:sequence>
-			<xsd:element name="symbol" type="xsd:string" />
-			<xsd:element name="companyName" type="xsd:string" />
-			<xsd:element name="price" type="xsd:decimal" />
-			<xsd:element name="open1" type="xsd:decimal" />
-			<xsd:element name="high" type="xsd:decimal" />
-			<xsd:element name="low" type="xsd:decimal" />
-			<xsd:element name="volume" type="xsd:double" />
-			<xsd:element name="change1" type="xsd:double" />
-			<xsd:element maxOccurs="unbounded" minOccurs="0"
-				name="quotes" type="seq:MixedQuote" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="RepeatingChoice">
-		<xsd:choice maxOccurs="unbounded" minOccurs="0">
-			<xsd:element name="a" type="xsd:string" />
-			<xsd:element name="b" type="xsd:int" />
-		</xsd:choice>
-	</xsd:complexType>
-
-
-	<xsd:complexType mixed="true" name="MixedRepeatingChoice">
-		<xsd:choice maxOccurs="unbounded" minOccurs="0">
-			<xsd:element name="a" type="xsd:string" />
-			<xsd:element name="b" type="xsd:int" />
-		</xsd:choice>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="TwoRCs">
-		<xsd:sequence>
-
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:element name="a" type="xsd:string" />
-				<xsd:element name="b" type="xsd:int" />
-			</xsd:choice>
-
-			<xsd:element name="split" type="xsd:string" />
-
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:element name="y" type="xsd:string" />
-				<xsd:element name="z" type="xsd:int" />
-			</xsd:choice>
-
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType mixed="true" name="TwoRCsMixed">
-		<xsd:sequence>
-
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:element name="a" type="xsd:string" />
-				<xsd:element name="b" type="xsd:int" />
-			</xsd:choice>
-
-			<xsd:element name="split" type="xsd:string" />
-
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:element name="y" type="xsd:string" />
-				<xsd:element name="z" type="xsd:int" />
-			</xsd:choice>
-
-		</xsd:sequence>
-	</xsd:complexType>
-
-</xsd:schema>
diff --git a/java/sca-contrib/tools/sdo/pom.xml b/java/sca-contrib/tools/sdo/pom.xml
deleted file mode 100644
index a73d7aa725..0000000000
--- a/java/sca-contrib/tools/sdo/pom.xml
+++ /dev/null
@@ -1,55 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca-tools</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <packaging>pom</packaging>
-    <artifactId>tuscany-sca-sdo-tools</artifactId>
-    <name>Apache Tuscany SCA SDO Tools</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>java2wsdl</module>
-                <module>wsdl2java</module>
-            </modules>
-        </profile>
-    </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-</project>
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/LICENSE b/java/sca-contrib/tools/sdo/wsdl2java/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/NOTICE b/java/sca-contrib/tools/sdo/wsdl2java/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/pom.xml b/java/sca-contrib/tools/sdo/wsdl2java/pom.xml
deleted file mode 100644
index 2a11edf41e..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/pom.xml
+++ /dev/null
@@ -1,225 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca-sdo-tools</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-wsdl2java</artifactId>
-    <name>Apache Tuscany SCA WSDL2Java Tool</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-tools</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-            <version>2.1.7</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.1.7</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jsr173_api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.stream</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0-2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.neethi</groupId>
-            <artifactId>neethi</artifactId>
-            <version>2.0.4</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>wsdl4j</groupId>
-                    <artifactId>wsdl4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
- 
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-java2wsdl</artifactId>
-            <version>1.4.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-codegen</artifactId>
-            <version>1.4.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-activation_1.1_spec</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>codegen</artifactId>
-            <version>2.2.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>codegen-ecore</artifactId>
-            <version>2.2.3</version>
-        </dependency>
- 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>generate-test-sources</phase>
-                        <configuration>
-                            <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl
-                            </schemaFile>
-                            <javaPackage>org.example.creditscore.doclit</javaPackage>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <!-- temporarily using indiana state univ as eclipse site diesnt have 2.2.2 at the moment -->
-            <id>indiana</id>
-            <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/
-            </url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-</project>
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java b/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
deleted file mode 100644
index 08c7131208..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
+++ /dev/null
@@ -1,224 +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.tools.wsdl2java.generate;
-
-import static org.apache.tuscany.tools.wsdl2java.util.XMLNameUtil.getJavaNameFromXMLName;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axis2.description.AxisBindingOperation;
-import org.apache.axis2.description.AxisMessage;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.util.FileWriter;
-import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis2.wsdl.codegen.emitter.JavaEmitter;
-import org.apache.axis2.wsdl.codegen.writer.InterfaceWriter;
-import org.apache.axis2.wsdl.databinding.TypeMapper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-/**
- * Overrides the Axis2 JavaEmitter to generate unwrapped methods.
- */
-public class JavaInterfaceEmitter extends JavaEmitter {
-
-    private CodeGenConfiguration codegenConfiguration;
-    private TypeMapper typeMapper;
-
-    @Override
-    public void setCodeGenConfiguration(CodeGenConfiguration configuration) {
-        super.setCodeGenConfiguration(configuration);
-        codegenConfiguration = configuration;
-    }
-
-    @Override
-    public void setMapper(TypeMapper typeMapper) {
-        super.setMapper(typeMapper);
-        this.typeMapper = typeMapper;
-    }
-
-    private List getParameterElementList(Document doc, AxisMessage message, boolean wrapped) {
-        List parameterElementList = new ArrayList();
-
-        if (message != null && message.getElementQName() != null) {
-
-            SDODataBindingTypeMappingEntry typeMappingEntry =
-                (SDODataBindingTypeMappingEntry)this.typeMapper.getTypeMappingObject(message.getElementQName());
-            List typeMappings;
-            if (wrapped) {
-                typeMappings = typeMappingEntry.getPropertyClassNames();
-                if(typeMappings == null) {
-                    typeMappings = new ArrayList();
-                    typeMappings.add(typeMappingEntry.getClassName());
-                }
-            } else {
-                typeMappings = new ArrayList();
-                typeMappings.add(typeMappingEntry.getClassName());
-            }
-
-            for (int i = 0; i < typeMappings.size(); i++) {
-                Element param = doc.createElement("param");
-                parameterElementList.add(param);
-
-                String typeMapping = (String)typeMappings.get(i);
-
-                addAttribute(doc, "name", this.typeMapper.getParameterName(message.getElementQName()), param);
-                addAttribute(doc, "type", (typeMapping == null) ? "" : typeMapping, param);
-
-                // add an extra attribute to say whether the type mapping is the
-                // default
-                // if (TypeMapper.DEFAULT_CLASS_NAME.equals(typeMapping)) {
-                if (typeMapper.getDefaultMappingName().equals(typeMapping)) {
-
-                    addAttribute(doc, "default", "yes", param);
-                }
-
-                addAttribute(doc, "value", null, param);
-
-                // add this as a body parameter
-                addAttribute(doc, "location", "body", param);
-
-            }
-        }
-
-        return parameterElementList;
-    }
-
-    @Override
-    public List getParameterElementList(Document doc, List parameters, String location) {
-        List parameterElementList = new ArrayList();
-
-        if ((parameters != null) && !parameters.isEmpty()) {
-            int count = parameters.size();
-
-            for (int i = 0; i < count; i++) {
-                Element param = doc.createElement("param");
-                QName name = (QName)parameters.get(i);
-
-                addAttribute(doc, "name", this.typeMapper.getParameterName(name), param);
-
-                String typeMapping = this.typeMapper.getTypeMappingName(name);
-                String typeMappingStr = (typeMapping == null) ? "" : typeMapping;
-
-                addAttribute(doc, "type", typeMappingStr, param);
-                addAttribute(doc, "location", location, param);
-                parameterElementList.add(param);
-            }
-        }
-
-        return parameterElementList;
-    }
-
-    @Override
-    protected Element getInputElement(Document doc, AxisBindingOperation operation, List headerParameterQNameList) {
-        return getElement(doc,
-                          "input",
-                          operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE),
-                          operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE).isWrapped(),
-                          headerParameterQNameList);
-    }
-
-    @Override
-    protected Element getOutputElement(Document doc, AxisBindingOperation operation, List headerParameterQNameList) {
-        return getElement(doc,
-                          "output",
-                          operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE),
-                          operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE).isWrapped(),
-                          headerParameterQNameList);
-    }
-
-    protected Element getElement(Document doc,
-                                 String elementName,
-                                 AxisMessage message,
-                                 boolean wrapped,
-                                 List headerParameterQNameList) {
-        Element element = doc.createElement(elementName);
-
-        List parameterElementList = getParameterElementList(doc, message, wrapped);
-        for (int i = 0; i < parameterElementList.size(); i++) {
-            element.appendChild((Element)parameterElementList.get(i));
-        }
-
-        List outputElementList = getParameterElementList(doc, headerParameterQNameList, "header");
-
-        for (int i = 0; i < outputElementList.size(); i++) {
-            element.appendChild((Element)outputElementList.get(i));
-        }
-
-        return element;
-    }
-
-    @Override
-    protected void writeInterface(boolean writeDatabinders) throws Exception {
-        Document interfaceModel = createDOMDocumentForInterface(writeDatabinders);
-        if (!codegenConfiguration.getOutputLocation().exists()) {
-            codegenConfiguration.getOutputLocation().mkdirs();
-        }
-        InterfaceWriter interfaceWriter =
-            new RemotableInterfaceWritter(this.codegenConfiguration.getOutputLocation(), this.codegenConfiguration
-                .getOutputLanguage());
-
-        String packageName = interfaceModel.getDocumentElement().getAttribute("package");
-        String className = interfaceModel.getDocumentElement().getAttribute("name");
-
-        System.out.println(">>  Generating Java class " + packageName + "." + className);
-        File outputFile =
-            FileWriter.createClassFile(this.codegenConfiguration.getOutputLocation(), packageName, className, ".java");
-        if (outputFile.exists()) {
-            outputFile.delete();
-        }
-
-//      JIRA TUSCANY-1561 Port to Axis2 1.3                
-//        writeClass(interfaceModel, interfaceWriter);
-
-        writeFile(interfaceModel, interfaceWriter);
-    }
-
-    @Override
-    protected String makeJavaClassName(String word) {
-        // return XMLNameUtil.getJavaNameFromXMLName(word, true);
-        return getJavaNameFromXMLName(word, true);
-    }
-
-    @Override
-    protected Element[] getFaultParamElements(Document doc, AxisOperation operation) {
-        ArrayList params = new ArrayList();
-        ArrayList faultMessages = operation.getFaultMessages();
-
-        if (faultMessages != null && !faultMessages.isEmpty()) {
-            Element paramElement;
-            AxisMessage msg;
-            for (int i = 0; i < faultMessages.size(); i++) {
-                paramElement = doc.createElement("param");
-                msg = (AxisMessage)faultMessages.get(i);
-                String msgClassName = WSDL2JavaGenerator.normalizeClassName(msg.getName());
-                addAttribute(doc, "name", msgClassName, paramElement);
-                params.add(paramElement);
-            }
-
-            return (Element[])params.toArray(new Element[params.size()]);
-        } else {
-            return new Element[] {};// return empty array
-        }
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java b/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
deleted file mode 100644
index 8e0c3683a3..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
+++ /dev/null
@@ -1,327 +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.tools.wsdl2java.generate;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
-import org.apache.axis2.util.FileWriter;
-import org.apache.axis2.util.XMLUtils;
-import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis2.wsdl.codegen.CodeGenerationException;
-import org.apache.axis2.wsdl.codegen.extension.CodeGenExtension;
-import org.apache.axis2.wsdl.codegen.extension.DefaultDatabindingExtension;
-import org.apache.axis2.wsdl.codegen.extension.PackageFinder;
-import org.apache.axis2.wsdl.codegen.extension.WSDLValidatorExtension;
-import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-import com.sun.tools.xjc.api.XJC;
-
-public class JavaInterfaceGenerator {
-
-    private List codegenExtensions = new ArrayList();
-    private List<CodeGenConfiguration> codegenConfigurations= new LinkedList<CodeGenConfiguration>();
-    private String outputLocation;
-    
-
-
-    public JavaInterfaceGenerator(String uri, String ports[], String outputLocation, String packageName,
-                                  Map<QName, SDODataBindingTypeMappingEntry> typeMapping) throws CodeGenerationException {
-        this.outputLocation = outputLocation;
-        
-        Definition definition;
-        try {
-            definition = readWSDL(uri);
-        } catch (WSDLException e) {
-            throw new CodeGenerationException(e);
-        }
-        
-        HashSet<String> interestedPorts = ports == null ? null : new HashSet<String>(Arrays.asList(ports));
-        
-       // Service service=(Service)definition.getServices().values().().next();
-        
-        HashSet<QName> donePortTypes= new HashSet<QName>();
-        
-        for (Iterator sIter  = definition.getServices().values().iterator(); sIter.hasNext(); ) {
-            Service service = (Service) sIter.next();
-            
-            QName serviceQname = service.getQName();
-             for (Iterator pIter= service.getPorts().values().iterator(); pIter.hasNext(); ) {
-                 Port port= (Port) pIter.next();
-                if(interestedPorts != null && ! interestedPorts.contains(port.getName())) continue;//not iterested.
-                 PortType portType= getPortType(port);
-                 if(null == portType) continue; // not connected.
-                 QName pQName= portType.getQName();
-                 if(donePortTypes.contains(pQName)) continue; //allready did it.
-                 donePortTypes.add(pQName);
-              
-                if (packageName == null) {
-                    //use JAXWS/JAXB NS->package default algorithm, not the SDO/EMF one
-                    packageName = XJC.getDefaultPackageName(definition.getTargetNamespace());
-                }
-                //
-                // Use WSDL4J object to generate exception classes
-                //
-                generateFaults(packageName, portType, typeMapping);
-                JavaTypeMapper typeMapper = new JavaTypeMapper();
-                for (Map.Entry<QName, SDODataBindingTypeMappingEntry> e : typeMapping.entrySet()) {
-                    typeMapper.addTypeMappingObject(e.getKey(), e.getValue());
-                    // Added for generation of exceptions from faults
-                    typeMapper.addTypeMappingName(e.getKey(), e.getValue().getClassName());
-                }
-
-
-                AxisService axisService;
-                WSDL11ToAxisServiceBuilder builder;
-                try {
-                    //
-                    // Added since at a newer level of Axis2, this doesn't work 
-                    //  without the setCodegen(true)
-                    //
-                    builder = new WSDL11ToAxisServiceBuilder(definition, serviceQname, port.getName());
-                    builder.setCodegen(true);
-                    axisService = builder.populateService();
-                } catch (AxisFault e) {
-                    throw new CodeGenerationException(e);
-                }
-
-                axisService.setName(port.getBinding().getPortType().getQName().getLocalPart());
-                CodeGenConfiguration codegenConfiguration = new CodeGenConfiguration(Collections.EMPTY_MAP);
-                codegenConfigurations.add(codegenConfiguration);
-                codegenConfiguration.setAxisService(axisService);
-                codegenConfiguration.setAdvancedCodeGenEnabled(false);
-                codegenConfiguration.setAsyncOn(false);
-                codegenConfiguration.setDatabindingType("sdo");
-                codegenConfiguration.setGenerateAll(true);
-                codegenConfiguration.setGenerateDeployementDescriptor(false);
-                codegenConfiguration.setOutputLanguage("java");
-                codegenConfiguration.setOutputLocation(new File(outputLocation));
-                codegenConfiguration.setPackageName(packageName);
-                codegenConfiguration.setPackClasses(false);
-                codegenConfiguration.setPolicyMap(Collections.EMPTY_MAP);
-                codegenConfiguration.setPortName(port.getName());
-                codegenConfiguration.setServerSide(false);
-                codegenConfiguration.setServiceName(service.getQName().getLocalPart());
-                // This lines up with the sync/async variable from the XSL template
-                codegenConfiguration.setSyncOn(true);
-                codegenConfiguration.setTypeMapper(typeMapper);
-
-// JIRA TUSCANY-1561 Port to Axis2 1.3                
-//                codegenConfiguration.setWriteMessageReceiver(false);
-                codegenConfiguration.setSkipMessageReceiver(true);
-                
-                codegenConfiguration.setWriteTestCase(false);
-                addExtension(new WSDLValidatorExtension(), codegenConfiguration);
-                addExtension(new PackageFinder(), codegenConfiguration);
-                addExtension(new SDODataBindingCodegenExtension(typeMapper), codegenConfiguration);
-                addExtension(new DefaultDatabindingExtension(), codegenConfiguration);
-            }            
-        }        
-    }
-
-
-    private PortType getPortType(Port port) {
-       Binding binding = port.getBinding();
-       if(null != binding){
-          return binding.getPortType();
-       }
-       return null;
-        
-    }
-
-
-    @SuppressWarnings("unchecked")
-    private void addExtension(CodeGenExtension ext, CodeGenConfiguration codegenConfiguration) {
-        //ext.init(codegenConfiguration);
-        codegenExtensions.add(new Object[]{ext, codegenConfiguration});
-    }
-
-    public void generate() throws CodeGenerationException {
-        try {
-            for (int i = 0; i < codegenExtensions.size(); i++) {
-                // CodeGenExtension
-                Object[] pair = (Object[])codegenExtensions.get(i);
-
-                CodeGenExtension cge = (CodeGenExtension)pair[0];
-                CodeGenConfiguration cgf = (CodeGenConfiguration)pair[1];
-
-                cge.engage(cgf);
-            }
-
-            for (CodeGenConfiguration codegenConfiguration : codegenConfigurations) {
-                JavaInterfaceEmitter emitter = new JavaInterfaceEmitter();
-                emitter.setCodeGenConfiguration(codegenConfiguration);
-                emitter.setMapper(codegenConfiguration.getTypeMapper());
-
-                emitter.writeInterface(false);
-            }
-
-        } catch (Exception e) {
-            throw new CodeGenerationException(e);
-        }
-    }
-
-    /**
-     * Read the WSDL file
-     * 
-     * @param uri
-     * @return
-     * @throws WSDLException
-     */
-    private Definition readWSDL(String uri) throws WSDLException {
-
-        WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
-        reader.setFeature("javax.wsdl.importDocuments", true);
-
-        File file = new File(uri);
-        String baseURI;
-
-        if (uri.startsWith("http://")) {
-            baseURI = uri;
-        } else {
-            if (file.getParentFile() == null) {
-                try {
-                    baseURI = new File(".").getCanonicalFile().toURI().toString();
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            } else {
-                baseURI = file.getParentFile().toURI().toString();
-            }
-        }
-
-        Document doc;
-        try {
-            doc = XMLUtils.newDocument(uri);
-        } catch (ParserConfigurationException e) {
-            throw new WSDLException(WSDLException.PARSER_ERROR, "Parser Configuration Error", e);
-        } catch (SAXException e) {
-            throw new WSDLException(WSDLException.PARSER_ERROR, "Parser SAX Error", e);
-
-        } catch (IOException e) {
-            throw new WSDLException(WSDLException.INVALID_WSDL, "IO Error", e);
-        }
-
-        return reader.readWSDL(baseURI, doc);
-    }
-    
-    private void generateFaults(String packageName, PortType portType, Map<QName, SDODataBindingTypeMappingEntry> typeMapping) 
-        throws CodeGenerationException{
-        
-        for (Object o: portType.getOperations()) {
-            Operation op = (Operation)o;
-            Map messageMap = op.getFaults();
-            Iterator iter = messageMap.values().iterator();
-            while (iter.hasNext()) {
-                Fault fault = (Fault)iter.next();
-                Message faultMsg = fault.getMessage();
-                Iterator iter2 = faultMsg.getParts().values().iterator();
-                Part faultMsgPart = (Part)iter2.next();
-                // TODO - if other parts throw exc
-                QName faultMsgQName = faultMsg.getQName();
-                QName faultMsgPartElementQName = faultMsgPart.getElementName();
-                String faultClassName = typeMapping.get(faultMsgPartElementQName).getClassName();                
-                writeException(packageName, faultMsgQName, faultClassName, faultMsgPartElementQName);
-            }
-        }
-    }
-    
-    private void writeException(String packageName, QName faultMsgQName, String faultClassName, QName faultMsgPartElementQName) 
-        throws CodeGenerationException{        
-        
-        try {
-            String faultWrapperClassName = 
-                WSDL2JavaGenerator.normalizeClassName(faultMsgQName.getLocalPart());
-            
-            File outputDir = new File(this.outputLocation);
-            
-            if (!outputDir.exists()) {
-                outputDir.mkdirs();
-            }
-            File outputFile = FileWriter.createClassFile(outputDir,
-                    packageName, faultWrapperClassName, ".java");
-
-            FileOutputStream fileStream = new FileOutputStream(outputFile);       
-            PrintStream stream = new PrintStream(fileStream); 
-
-            System.out.println(">>  Generating Java exception class " + packageName + "." + faultWrapperClassName);
-
-            stream.println();
-            stream.println("package " + packageName + ";");
-            stream.println();
-            stream.println("import javax.xml.ws.WebFault;");
-            stream.println();
-            stream.println("@WebFault(name=\"" + faultMsgPartElementQName.getLocalPart()
-                + "\", targetNamespace=\""
-                + faultMsgPartElementQName.getNamespaceURI()
-                + "\")");
-            stream.println("public class " + faultWrapperClassName  + " extends Exception {");
-            stream.println();
-            stream.println("    private " + faultClassName + " fault;");
-            stream.println();
-            stream.println("    public " + faultWrapperClassName + "(String message, " + faultClassName + " fault) {");
-            stream.println("        super(message);");
-            stream.println("        this.fault = fault;");
-            stream.println("    }");
-            stream.println();
-            stream.println("    public " + faultWrapperClassName + "(String message, " + faultClassName + " fault, Throwable cause) {");
-            stream.println("        super(message, cause);");
-            stream.println("        this.fault = fault;");
-            stream.println("    }");
-            stream.println();
-            stream.println("    public " + faultClassName + " getFaultInfo() {");
-            stream.println("        return this.fault;");
-            stream.println("    }");
-            stream.println("}");
-            stream.println();
-        } catch (Exception e) {
-            throw new CodeGenerationException(e);
-        }
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java b/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
deleted file mode 100644
index 0c4f42633a..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
+++ /dev/null
@@ -1,53 +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.tools.wsdl2java.generate;
-
-import java.io.File;
-
-import org.apache.axis2.wsdl.codegen.CodeGenerationException;
-import org.apache.axis2.wsdl.codegen.writer.InterfaceWriter;
-
-/**
- *
- */
-public class RemotableInterfaceWritter extends InterfaceWriter {
-    private static final String REMOTABLE_INTERFACE_TEMPLATE="/RemotableInterfaceTemplate.xsl";
-
-    public RemotableInterfaceWritter(String outputFileLocation) {
-        super(outputFileLocation);
-    }
-
-    public RemotableInterfaceWritter(File outputFileLocation, String language) {
-        super(outputFileLocation, language);
-    }
-
-    /**
-     * Loads the template.
-     */
-    @Override
-    public void loadTemplate() throws CodeGenerationException {
-        // the default behavior for the class writers is to use the property map from the language specific types
-        // The properties are arranged in the following order
-        // <lang-name>.* .template=<write-class>,<template-name>
-
-        //override original behaviour to always load the template we specified
-        this.xsltStream = this.getClass().getResourceAsStream(REMOTABLE_INTERFACE_TEMPLATE);
-
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java b/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
deleted file mode 100644
index 4ab152fb90..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
+++ /dev/null
@@ -1,63 +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.tools.wsdl2java.generate;
-
-import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis2.wsdl.codegen.CodeGenerationException;
-import org.apache.axis2.wsdl.codegen.extension.AbstractDBProcessingExtension;
-import org.apache.axis2.wsdl.databinding.TypeMapper;
-
-/**
- * SDO data binding codegen extension.
- */
-public class SDODataBindingCodegenExtension extends AbstractDBProcessingExtension {
-
-    private TypeMapper typeMapper;
-    
-    public SDODataBindingCodegenExtension(TypeMapper typeMapper) {
-        this.typeMapper=typeMapper;
-    }
-    
-    @Override
-    protected boolean testFallThrough(String dbFrameworkName) {
-        return !dbFrameworkName.equals("sdo");
-    }
-
-//    public void engage() {
-//        if (testFallThrough(configuration.getDatabindingType())) {
-//            return;
-//        }
-//        
-//        // Set the type mapper into the config
-//        configuration.setTypeMapper(typeMapper);
-//
-//    }
-
-    public void engage(CodeGenConfiguration configuration) throws CodeGenerationException {
-        if (testFallThrough(configuration.getDatabindingType())) {
-            return;
-        }
-        
-        // Set the type mapper into the config
-        configuration.setTypeMapper(typeMapper);
-
-        
-    }
-
-}
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java b/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
deleted file mode 100644
index 2d81ef12bf..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
+++ /dev/null
@@ -1,51 +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.tools.wsdl2java.generate;
-
-import java.util.List;
-
-/**
- * This represents a type mapping entry, used by the JavaInterfaceEmitter to generate
- * method signatures.  
- */
-public class SDODataBindingTypeMappingEntry {
-
-    private final boolean anonymous;
-    private final List<String> propertyClassNames;
-    private final String className;
-
-    public SDODataBindingTypeMappingEntry(String className, boolean anonymous, List<String> propertyClassNames) {
-        this.className = className;
-        this.anonymous = anonymous;
-        this.propertyClassNames = propertyClassNames;
-    }
-
-    public boolean isAnonymous() {
-        return anonymous;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    public List<String> getPropertyClassNames() {
-        return propertyClassNames;
-    }
-
-}
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java b/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
deleted file mode 100644
index f6d1f3a64a..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
+++ /dev/null
@@ -1,529 +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.tools.wsdl2java.generate;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sdo.generate.XSD2JavaGenerator;
-import org.apache.tuscany.sdo.helper.HelperContextImpl;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModelFactory;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XSDHelper;
-
-public class WSDL2JavaGenerator {
-    //Note: Dynamic SDO is defined as 0x4000 to avoid conflict with XSD2Java genOptions
-    static protected final int DYNAMIC_SDO = 0x1;
-    static protected final int GENERATE_SDO = 0x2;
-    static protected final int VERBOSE_MODE = 0x4;
-    static protected final String NO_GEN_PARM = "-noGenerate";
-    static protected final String TARGET_DIR_PARM = "-targetDirectory";
-    static protected final String JAVA_PACKAGE_PARM = "-javaPackage";
-    static protected final String ALL_NAMESPACES_PARM = "-schemaNamespace all";
-
-    /**
-     * Generate Java interfaces from WSDL Usage arguments: [ -targetDirectory
-     * <target-root-directory> ] [ -javaPackage <java-package-name> ]
-     * <wsdl-file> For example: generate somedir/somefile.wsdl Basic options:
-     * -targetDirectory Generates the Java source code in the specified
-     * directory. By default, the code is generated in the same directory as the
-     * input WSDL file. -javaPackage Overrides the Java package for the
-     * generated classes. By default the package name is derived from the
-     * targetNamespace of the WSDL definition being generated. For example, if
-     * the targetNamespace is "http://www.example.com/simple", the default
-     * package will be "com.example.simple".
-     */
-    public static void main(String args[]) {
-        if (args.length == 0) {
-            printUsage();
-            return;
-        }
-
-        String portName = null;
-        String targetDirectory = null;
-        String wsdlJavaPackage = null;
-        String xsdJavaPackage = null;
-        String sdoGenArgs = null;
-        String sdoGenArgsString = null;
-        int genOptions = 0;
-
-        int index = 0;
-        for (; index < args.length && args[index].startsWith("-"); ++index) {
-            if (args[index].equalsIgnoreCase("-port")) {
-                portName = args[++index];
-            } else if (args[index].equalsIgnoreCase("-targetDirectory")) {
-                targetDirectory = args[++index];
-            } else if (args[index].equalsIgnoreCase("-javaPackage")) {
-                wsdlJavaPackage = args[++index];
-            } else if (args[index].equalsIgnoreCase("-dynamicSDO")) {
-                genOptions |= DYNAMIC_SDO;
-            } else if (args[index].equalsIgnoreCase("-generateSDO")){
-                genOptions |= GENERATE_SDO;
-            } else if (args[index].equalsIgnoreCase("-sdoGenArgs")){
-                sdoGenArgs = args[++index];
-            } else if (args[index].equalsIgnoreCase("-verbose")){
-               genOptions |= VERBOSE_MODE; 
-            }
-            // else if (...)
-            else {
-                printUsage();
-                return;
-            }
-        }
-        if (sdoGenArgs!=null && (GENERATE_SDO & genOptions)== 0){
-            genOptions |= GENERATE_SDO;
-        }
-        
-        if (targetDirectory == null) {
-            targetDirectory = ".";
-        }
-        String wsdlFileName = args[index];
-        if (wsdlFileName == null || ((DYNAMIC_SDO & genOptions)!=0 && (GENERATE_SDO & genOptions)!= 0)) {
-            printUsage();
-            return;
-        }
-        if (sdoGenArgs !=null){
-            try {
-                    File inFile = new File(sdoGenArgs).getAbsoluteFile();
-                    FileReader inputFile = new FileReader(inFile);
-                    BufferedReader bufRead = new BufferedReader(inputFile);
-                    StringBuffer fileContents= new StringBuffer();
-                    String line;
-                    while ((line = bufRead.readLine())!=null){
-                        fileContents.append(line + " ");
-                    }
-                    sdoGenArgsString = fileContents.toString();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                    throw new IllegalArgumentException(e);
-                }
-        } else {
-                sdoGenArgsString = null;
-        }
-        
-        if ((DYNAMIC_SDO & genOptions) != 0){
-            generateDynamicFromWSDL(wsdlFileName, portName!=null? new String[]{portName}:null, targetDirectory, wsdlJavaPackage, xsdJavaPackage, genOptions);
-        } else {
-            generateFromWSDL(wsdlFileName, portName!=null? new String[]{portName}:null, targetDirectory, wsdlJavaPackage, genOptions, sdoGenArgsString);   
-        }
-        
-    }
-    
-    @SuppressWarnings("unchecked")
-    public static void generateFromWSDL(String wsdlFileName, String[] ports, String targetDirectory, String wsdlJavaPackage, int genOptions, String sdoGenArgsString)
-    {
-        try {        
-                if (targetDirectory == null) {
-                    targetDirectory = new File(wsdlFileName).getCanonicalFile().getParent();
-                } else {
-                    targetDirectory = new File(targetDirectory).getCanonicalPath();
-                }
-                          
-                // Populate the typeMapping table that will be given to the Axis2 WSDL2Java 
-                Map<QName, SDODataBindingTypeMappingEntry> typeMapping =
-                                        new HashMap<QName, SDODataBindingTypeMappingEntry>();
-                StringBuffer buildCommand = new StringBuffer();
-                //build XSD command lines
-                //build generic command for simple case & dynamic SDO
-                buildCommand.append(ALL_NAMESPACES_PARM);
-                if (sdoGenArgsString == null){
-                     buildCommand.append(" " + TARGET_DIR_PARM + " " + targetDirectory);
-                     if (wsdlJavaPackage != null && (genOptions & GENERATE_SDO)!=0){
-                         buildCommand.append(" " + JAVA_PACKAGE_PARM + " " + wsdlJavaPackage);
-                     }
-                     if ((genOptions & GENERATE_SDO)==0){
-                          buildCommand.append(" ");
-                          buildCommand.append(NO_GEN_PARM);        
-                     }
-                } else {
-                    buildCommand.append(" ");
-                    buildCommand.append(sdoGenArgsString);
-                }
-                
-                //TUSCANY-1642 - We shouldn't split the wsdlFileName as it my contain a filename with spaces
-                Vector sdoCommand = new Vector(java.util.Arrays.asList(buildCommand.toString().split("\\s+")));
-                sdoCommand.add(wsdlFileName);
-
-                String[] sdoGenCommand = new String[sdoCommand.size()];
-                sdoCommand.toArray(sdoGenCommand);  
-                
-                if ((genOptions & VERBOSE_MODE)!=0){
-                        System.out.println("Options passed to XSD2Java: ");
-                        for (int i=0; i<sdoGenCommand.length; i++){ System.out.println("\"" + sdoGenCommand[i] + "\"");}        
-                }
-                
-                XSD2JavaGenerator codeGen = new XSD2JavaGenerator();
-                try {
-                        codeGen.generateFromXMLSchema( sdoGenCommand );  
-                } catch (IllegalArgumentException e) {
-                            System.out.println("Specified Invalid XSD2Java Arguments.\nFollow the XSD2Java usage, omitting the wsdl/xsd file argument.");
-                            throw new IllegalArgumentException(e);
-                }
-                                    
-                List packages = codeGen.getGeneratedPackageInfo();
-                     
-                for (Iterator iter = packages.iterator(); iter.hasNext();)
-                {
-                    XSD2JavaGenerator.GeneratedPackage packageInfo = (XSD2JavaGenerator.GeneratedPackage)iter.next();
-                    for (Iterator iterClass = packageInfo.getClasses().iterator(); iterClass.hasNext();)
-                    {
-                        XSD2JavaGenerator.GeneratedPackage.PackageClassInfo classInfo = (XSD2JavaGenerator.GeneratedPackage.PackageClassInfo)iterClass.next();
-                        SDODataBindingTypeMappingEntry typeMappingEntry;
-                        if ((genOptions & DYNAMIC_SDO)==0){
-                            
-                            typeMappingEntry = new SDODataBindingTypeMappingEntry(classInfo.getClassName(), classInfo.getAnonymous(), classInfo.getProperties());
-                        } else {
-                            // TO DO implement dynamic sdo case
-                            typeMappingEntry = null;
-                            System.out.println();
-                        }                              
-                        QName qname = new QName(packageInfo.getNamespace(),classInfo.getName());
-                        
-                        //FIXME Workaround for JIRA TUSCANY-1673
-                        // Do not overwrite a typemapping entry describing a element typed by an anonymous
-                        // complex type with a typemapping entry describing a complex type named like the
-                        // element
-                        SDODataBindingTypeMappingEntry existingTypeMapping = typeMapping.get(qname);
-                        if (existingTypeMapping == null || !existingTypeMapping.isAnonymous()) {
-                            typeMapping.put(qname, typeMappingEntry);
-                        }
-                    }          
-                }
-       
-                JavaInterfaceGenerator codeGenerator = new JavaInterfaceGenerator(wsdlFileName,
-                                                                                  ports,
-                                                                                  targetDirectory,
-                                                                                  wsdlJavaPackage,
-                                                                                  typeMapping);
-                codeGenerator.generate();
-        } catch (Exception e) {
-                e.printStackTrace();
-                throw new IllegalArgumentException(e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void generateFromWSDL(String wsdlFileName, String targetDirectory,
-            String wsdlJavaPackage,
-            String xsdJavaPackage, int genOptions){
-        String sdoGenArgsString = null;
-        if (xsdJavaPackage != null){
-            sdoGenArgsString = JAVA_PACKAGE_PARM + " " + xsdJavaPackage;
-        }
-        generateFromWSDL( wsdlFileName, null, targetDirectory, wsdlJavaPackage, genOptions, sdoGenArgsString);
-        
-    }
-    
-    public static void generateFromWSDL(String wsdlFileName, String[] ports,
-                    String targetDirectory, String wsdlJavaPackage,
-                    String xsdJavaPackage, int genOptions) {
-        String sdoGenArgsString = null;
-        if (xsdJavaPackage != null){
-           sdoGenArgsString = JAVA_PACKAGE_PARM + " " + xsdJavaPackage;
-        }
-        generateFromWSDL( wsdlFileName, null, targetDirectory, wsdlJavaPackage, genOptions, sdoGenArgsString);
-    }
-    
-    @SuppressWarnings("unchecked")
-      public static void generateDynamicFromWSDL(String wsdlFileName, String[] ports,
-                 String targetDirectory, String wsdlJavaPackage,
-                 String xsdJavaPackage, int genOptions) 
-     {
-
-        // Initialize the SDO runtime
-        DataObjectUtil.initRuntime();
-        EPackage.Registry packageRegistry = new EPackageRegistryImpl(EPackage.Registry.INSTANCE);
-        ExtendedMetaData extendedMetaData = new BasicExtendedMetaData(packageRegistry);
-        HelperContext context = new HelperContextImpl(extendedMetaData, false);
-        XSDHelper xsdHelper = context.getXSDHelper();
-
-        try {
-            
-            // Load the WSDL file
-            File inputFile = new File(wsdlFileName).getAbsoluteFile();
-            InputStream inputStream = new FileInputStream(inputFile);
-            
-            // Define SDO metadata
-            xsdHelper.define(inputStream, inputFile.toURI().toString());
-
-            if (targetDirectory == null) {
-                targetDirectory = new File(wsdlFileName).getCanonicalFile().getParent();
-            } else {
-                targetDirectory = new File(targetDirectory).getCanonicalPath();
-            }
-
-            // Populate the typeMapping table that will be given to the Axis2 WSDL2Java 
-            Map<QName, SDODataBindingTypeMappingEntry> typeMapping =
-                                    new HashMap<QName, SDODataBindingTypeMappingEntry>();
-            if (!packageRegistry.values().isEmpty()) {
-                ResourceSet resourceSet = DataObjectUtil.createResourceSet();
-
-                // Populate list of GenPackages and a map of GenClasses keyed by EClass 
-                List<GenPackage> genPackages = new ArrayList<GenPackage>();
-                Map<EClass, GenClass> genClasses = new HashMap<EClass, GenClass>();
-                for (Iterator iter = packageRegistry.values().iterator(); iter.hasNext();) {
-                    EPackage currentEPackage = (EPackage)iter.next();
-                    String currentBasePackage = extractBasePackageName(currentEPackage, xsdJavaPackage);
-                    String currentPrefix = CodeGenUtil.capName(currentEPackage.getName());
-
-                    GenPackage currentGenPackage = createGenPackage(currentEPackage, currentBasePackage,
-                                                                    currentPrefix, genOptions, resourceSet);
-                    genPackages.add(currentGenPackage);
-                    for (GenClass genClass : (List<GenClass>)currentGenPackage.getGenClasses()) {
-                        genClasses.put(genClass.getEcoreClass(), genClass);
-                    }
-
-                }
-
-                // Process all the SDO packages
-                // Populate the QName -> interfaceName typeMapping table
-                for (GenPackage currentGenPackage : genPackages) {
-                    EPackage currentEPackage = currentGenPackage.getEcorePackage();
-                    
-                    // Populate the type mappings for all the complex types
-                    for (GenClass genClass : (List<GenClass>)currentGenPackage.getGenClasses()) {
-                        QName qname = new QName(extendedMetaData.getNamespace(currentEPackage),
-                                                extendedMetaData.getName(genClass.getEcoreClass()));
-                        String interfaceName = (DYNAMIC_SDO & genOptions) == DYNAMIC_SDO ? "commonj.sdo.DataObject" : currentGenPackage
-                                .getInterfacePackageName()
-                                + '.' + genClass.getInterfaceName();
-                        SDODataBindingTypeMappingEntry typeMappingEntry =
-                                new SDODataBindingTypeMappingEntry(interfaceName, false, null);
-                        typeMapping.put(qname, typeMappingEntry);
-                    }
-
-                    // Process all the global XSD elements
-                    EClass documentRoot = extendedMetaData.getDocumentRoot(currentEPackage);
-                    if (documentRoot != null) {
-                        for (EStructuralFeature element : (List<EStructuralFeature>)extendedMetaData
-                            .getElements(documentRoot)) {
-                            EClassifier elementType = element.getEType();
-                            
-                            // Handle a complex type
-                            if (elementType instanceof EClass) {
-                                EClass eClass = (EClass)elementType;
-
-                                GenClass genClass = genClasses.get(elementType);
-                                QName qname = new QName(extendedMetaData.getNamespace(currentEPackage),
-                                        extendedMetaData.getName(element));
-                                String interfaceName = (DYNAMIC_SDO & genOptions) == DYNAMIC_SDO ? "commonj.sdo.DataObject" : genClass
-                                        .getGenPackage().getInterfacePackageName()
-                                + '.' + genClass.getInterfaceName();
-                                boolean anonymous = extendedMetaData.isAnonymous(eClass);
-                                
-                                // Build list of property class names
-                                List<String> propertyClassNames=new ArrayList<String>();
-                                for (EStructuralFeature feature : (List<EStructuralFeature>)eClass.getEStructuralFeatures()) {
-                                    EClassifier propertyType = feature.getEType();
-                                    if (propertyType instanceof EClass) {
-                                        GenClass propertyGenClass = genClasses.get(propertyType);
-                                        String propertyClassName = (DYNAMIC_SDO & genOptions) == DYNAMIC_SDO ? "commonj.sdo.DataObject"
-                                                : propertyGenClass.getGenPackage().getInterfacePackageName() + '.'
-                                                               + '.' + propertyGenClass.getInterfaceName();
-                                        propertyClassNames.add(propertyClassName);
-                                    } else if (propertyType instanceof EClassifier) {
-                                        String propertyClassName = propertyType.getInstanceClass().getName();
-                                        propertyClassNames.add(propertyClassName);
-                                    }
-                                }
-
-                                SDODataBindingTypeMappingEntry typeMappingEntry = 
-                                    new SDODataBindingTypeMappingEntry(interfaceName, anonymous, propertyClassNames);
-                                typeMapping.put(qname, typeMappingEntry);
-                                
-                            } else {
-                                
-                                // Handle a simple type
-                                QName qname = new QName(extendedMetaData.getNamespace(currentEPackage),
-                                                        extendedMetaData.getName(element));
-                                String className = elementType.getInstanceClass().getName();
-                                SDODataBindingTypeMappingEntry typeMappingEntry = 
-                                        new SDODataBindingTypeMappingEntry(className, false, null);
-                                typeMapping.put(qname, typeMappingEntry);
-                            }
-                        }
-                    }
-                }
-            }
-
-            try {
-                JavaInterfaceGenerator codeGenerator = new JavaInterfaceGenerator(wsdlFileName,
-                                                                                  ports,
-                                                                                  targetDirectory,
-                                                                                  wsdlJavaPackage,
-                                                                                  typeMapping);
-                codeGenerator.generate();
-            } catch (Exception e) {
-                e.printStackTrace();
-                throw new IllegalArgumentException(e);
-            }
-
-        } catch (IOException e) {
-                e.printStackTrace();
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static GenPackage createGenPackage(EPackage ePackage, String basePackage, String prefix,
-                                              int genOptions, ResourceSet resourceSet) {
-        GenModel genModel = ecore2GenModel(ePackage, basePackage, prefix, genOptions);
-
-        URI ecoreURI = URI.createURI("file:///" + ePackage.getName() + ".ecore");
-        URI genModelURI = ecoreURI.trimFileExtension().appendFileExtension("genmodel");
-
-        Resource ecoreResource = resourceSet.createResource(ecoreURI);
-        ecoreResource.getContents().add(ePackage);
-
-        Resource genModelResource = resourceSet.createResource(genModelURI);
-        genModelResource.getContents().add(genModel);
-
-        return (GenPackage)genModel.getGenPackages().get(0);
-    }
-
-    public static GenModel ecore2GenModel(EPackage ePackage, String basePackage,
-                                          String prefix, int genOptions) {
-        GenModel genModel = GenModelFactory.eINSTANCE.createGenModel();
-        genModel.initialize(Collections.singleton(ePackage));
-
-        genModel.setRootExtendsInterface("");
-        genModel.setRootImplementsInterface("commonj.sdo.DataObject");
-        genModel.setRootExtendsClass("org.apache.tuscany.sdo.impl.DataObjectImpl");
-        genModel.setFeatureMapWrapperInterface("commonj.sdo.Sequence");
-        genModel.setFeatureMapWrapperInternalInterface("org.apache.tuscany.sdo.util.BasicSequence");
-        genModel.setFeatureMapWrapperClass("org.apache.tuscany.sdo.util.BasicSequence");
-        genModel.setSuppressEMFTypes(true);
-        genModel.setSuppressEMFMetaData(true);
-        genModel.setSuppressEMFModelTags(true);
-        genModel.setCanGenerate(true);
-        // FIXME workaround java.lang.NoClassDefFoundError:
-        // org/eclipse/jdt/core/jdom/IDOMNode with 02162006 build
-        genModel.setFacadeHelperClass("Hack");
-        genModel.setForceOverwrite(true);
-
-        GenPackage genPackage = (GenPackage)genModel.getGenPackages().get(0);
-
-        if (basePackage != null) {
-            genPackage.setBasePackage(basePackage);
-        }
-        if (prefix != null) {
-            genPackage.setPrefix(prefix);
-        }
-
-        return genModel;
-    }
-
-    public static String extractBasePackageName(EPackage ePackage, String javaPackage) {
-        String qualifiedName = javaPackage != null ? javaPackage : ePackage.getName();
-        String name = /* CodeGenUtil. */shortName(qualifiedName);
-        String baseName = qualifiedName.substring(0, qualifiedName.length() - name.length());
-        if (javaPackage != null || !name.equals(qualifiedName)) {
-            ePackage.setName(name);
-        }
-        return baseName != null ? /* CodeGenUtil. */safeQualifiedName(baseName) : null;
-    }
-
-    public static String shortName(String qualifiedName) {
-        int index = qualifiedName.lastIndexOf(".");
-        return index != -1 ? qualifiedName.substring(index + 1) : qualifiedName;
-    }
-
-    public static String safeQualifiedName(String qualifiedName) {
-        StringBuffer safeQualifiedName = new StringBuffer();
-        for (StringTokenizer stringTokenizer = new StringTokenizer(qualifiedName, ".");
-            stringTokenizer.hasMoreTokens();) {
-            String name = stringTokenizer.nextToken();
-            safeQualifiedName.append(CodeGenUtil.safeName(name));
-            if (stringTokenizer.hasMoreTokens()) {
-                safeQualifiedName.append('.');
-            }
-        }
-        return safeQualifiedName.toString();
-    }
-    /*
-     * Converts myClassName to MyClassName
-     */
-    public static String normalizeClassName(String className) {
-
-        StringBuffer normalizedClassName = new StringBuffer();
-        
-        String beginPart = className.substring(0,1);
-        String endPart = className.substring(1);
-        
-        normalizedClassName.append(beginPart.toUpperCase());
-        normalizedClassName.append(endPart);
-
-        return normalizedClassName.toString();
-    }
-
-    protected static void printDiagnostic(Diagnostic diagnostic, String indent) {
-        System.out.print(indent);
-        System.out.println(diagnostic.getMessage());
-        for (Iterator i = diagnostic.getChildren().iterator(); i.hasNext();) {
-            printDiagnostic((Diagnostic)i.next(), indent + "  ");
-        }
-    }
-
-    protected static void printUsage() {
-        System.out.println("Usage arguments:");
-        System.out.println("  [ -targetDirectory <target-root-directory> ]");
-        System.out.println("  [ -javaPackage <java-package-name> ]");
-        System.out.println("  [ -dynamicSDO | -generateSDO [ -sdoGenArgs <command-file-name> ]]");
-        System.out.println("  [ -verbose ]");
-        System.out.println("  <wsdl-file>");
-        System.out.println("");
-        System.out.println("Where <command-file-name> is a text file containing valid XSD2Java command\narguments (w/o the wsdl/xsd file name)");
-        System.out.println("For example:");
-        System.out.println("");
-        System.out.println("    WSDL2JavaGenerator -targetDirectory myDir somedir/somefile.wsdl");
-    }
-
-
-}
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java b/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
deleted file mode 100644
index d0b325982c..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
+++ /dev/null
@@ -1,143 +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.tools.wsdl2java.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class XMLNameUtil {
-
-    /**
-     * Returns a valid Java name from an XML Name.
-     *
-     * @param name
-     * @param isUpperCase
-     * @return a valid Java name from an XML Name
-     */
-    public static String getJavaNameFromXMLName(String name, boolean isUpperCase) {
-        List<String> parsedName = parseName(name, '_');
-        StringBuilder result = new StringBuilder(64 * parsedName.size());
-        for (String nameComponent: parsedName) {
-            if (nameComponent.length() > 0) {
-                if (result.length() > 0 || isUpperCase) {
-                    result.append(Character.toUpperCase(nameComponent.charAt(0)));
-                    result.append(nameComponent.substring(1));
-                } else {
-                    result.append(nameComponent);
-                }
-            }
-        }
-    
-        if (result.length() == 0) {
-            return "_";
-        }
-        if (Character.isJavaIdentifierStart(result.charAt(0))) {
-            return isUpperCase ? result.toString() : decapitalizeName(result.toString());
-        }
-        return "_" + result;
-    }
-
-    /**
-     * Decapitalize a name.
-     * @param name
-     * @return a decapitalized name
-     */
-    public static String decapitalizeName(String name) {
-        if (name.length() == 0) {
-            return name;
-        } else {
-            String lowerName = name.toLowerCase();
-            int i;
-            for (i = 0; i < name.length(); i++) {
-                if (name.charAt(i) == lowerName.charAt(i)) {
-                    break;
-                }
-            }
-            if (i > 1 && i < name.length()) {
-                --i;
-            }
-            return name.substring(0, i).toLowerCase() + name.substring(i);
-        }
-    }
-
-    /**
-     * Parse the given name.
-     *
-     * @param sourceName
-     * @param separator
-     * @return some stuff parsed from the name
-     */
-    private static List<String> parseName(String sourceName, char separator) {
-        List<String> result = new ArrayList<String>();
-        if (sourceName != null) {
-            StringBuilder currentWord = new StringBuilder(64);
-            boolean lastIsLower = false;
-            int index;
-            int length;
-            for (index = 0, length = sourceName.length(); index < length; ++index) {
-                char curChar = sourceName.charAt(index);
-                if (!Character.isJavaIdentifierPart(curChar)) {
-                    curChar = separator;
-                }
-                if (Character.isUpperCase(curChar)
-                    || (!lastIsLower && Character.isDigit(curChar))
-                    || curChar == separator) {
-                    
-                    if (lastIsLower && currentWord.length() > 1 
-                        || curChar == separator && currentWord.length() > 0) {
-                        result.add(currentWord.toString());
-                        currentWord = new StringBuilder(64);
-                    }
-                    lastIsLower = false;
-                } else {
-                    if (!lastIsLower) {
-                        int currentWordLength = currentWord.length();
-                        if (currentWordLength > 1) {
-                            char lastChar = currentWord.charAt(--currentWordLength);
-                            currentWord.setLength(currentWordLength);
-                            result.add(currentWord.toString());
-                            currentWord = new StringBuilder(64);
-                            currentWord.append(lastChar);
-                        }
-                    }
-                    lastIsLower = true;
-                }
-    
-                if (curChar != separator) {
-                    currentWord.append(curChar);
-                }
-            }
-    
-            result.add(currentWord.toString());
-        }
-        return result;
-    }
-    
-    /**
-     * Return an EPackage name for the given namespace.
-     *
-     * @param namespace
-     * @return an EPackage name for the given namespace
-     */
-    public static String getPackageNameFromNamespace(String namespace) {
-       return org.apache.tuscany.sdo.helper.SDOXSDEcoreBuilder.getDefaultPackageName(namespace);
-    }
-
-
-}
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/resources/META-INF/LICENSE.txt b/java/sca-contrib/tools/sdo/wsdl2java/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 0084319535..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, serviceDefinition marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl b/java/sca-contrib/tools/sdo/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
deleted file mode 100644
index 3782fa8932..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
+++ /dev/null
@@ -1,130 +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.    
--->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output method="text"/>
-
-    <!-- import the databinding template-->
-    <xsl:include href="databindsupporter"/>
-    <!-- import the other templates for databinding
-         Note  -  these names would be handled by a special
-         URI resolver during the xslt transformations
-     -->
-    <xsl:include href="externalTemplate"/>
-
-
-    <xsl:template match="/interface">
-
-    <xsl:variable name="isSync"><xsl:value-of select="@isSync"/></xsl:variable>
-    <xsl:variable name="isAsync"><xsl:value-of select="@isAsync"/></xsl:variable>
-    <xsl:variable name="callbackname"><xsl:value-of select="@callbackname"/></xsl:variable>
-    <xsl:variable name="package"><xsl:value-of select="@package"/></xsl:variable>
-
-    /**
-     * <xsl:value-of select="@name"/>.java
-     *
-     * This file was auto-generated from WSDL
-     * by the Apache Axis2 version: #axisVersion# #today#
-     */
-    package <xsl:value-of select="$package"/>;
-
-    import org.oasisopen.sca.annotation.Remotable;
-    import org.oasisopen.sca.annotation.Service;
-    
-    /*
-     *  <xsl:value-of select="@name"/> java interface
-     */
-
-    @Remotable
-    @Service
-    public interface <xsl:value-of select="@name"></xsl:value-of> {
-          <xsl:for-each select="method">
-
-            <!-- Code for in-out mep -->
-         <xsl:if test="@mep='12'">
-         <xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"></xsl:value-of></xsl:variable>
-
-        <!-- start of the sync block -->                                          
-         <xsl:if test="$isSync='1'">
-        /**
-         * Auto generated method signatures
-         <xsl:for-each select="input/param[@type!='']">* @param <xsl:value-of select="@name"></xsl:value-of><xsl:text>&#10;         </xsl:text></xsl:for-each>
-         <xsl:for-each select="fault/param[@name!='']">* @throws <xsl:value-of select="@name"></xsl:value-of><xsl:text>&#10;         *</xsl:text></xsl:for-each>
-
-         */
-         public <xsl:choose><xsl:when test="$outputtype=''">void</xsl:when><xsl:otherwise><xsl:value-of select="$outputtype"/></xsl:otherwise></xsl:choose>
-        <xsl:text> </xsl:text><xsl:value-of select="@name"/>(
-         <xsl:for-each select="input/param[@type!='']">
-            <xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>
-          </xsl:for-each>) throws <xsl:for-each select="fault/param[@name!='']">
-            <xsl:if test="position()>1">,</xsl:if><xsl:text> </xsl:text><xsl:value-of select="@name"/><xsl:if test="position()=last()">,</xsl:if>
-
-          </xsl:for-each> java.rmi.RemoteException;
-        <!-- end of the sync block -->
-        </xsl:if>
-
-       <!-- start of the async block -->
-        <xsl:if test="$isAsync='1'">
-         /**
-          * Auto generated method signature
-         <xsl:for-each select="input/param[@type!='']">* @param <xsl:value-of select="@name"></xsl:value-of><xsl:text>&#10;         </xsl:text></xsl:for-each>
-         <xsl:for-each select="fault/param[@name!='']">* @throws <xsl:value-of select="@name"></xsl:value-of><xsl:text>&#10;         *</xsl:text></xsl:for-each>
-
-          */
-
-        public void start<xsl:value-of select="@name"/>(
-         <xsl:variable name="paramCount"><xsl:value-of select="count(input/param[@type!=''])"></xsl:value-of></xsl:variable>
-               <xsl:for-each select="input/param">
-            <xsl:if test="@type!=''"><xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="@name"></xsl:value-of></xsl:if></xsl:for-each>
-           <xsl:if test="$paramCount>0">,</xsl:if>final <xsl:value-of select="$package"/>.<xsl:value-of select="$callbackname"/> callback) throws <xsl:for-each select="fault/param[@name!='']">
-            <xsl:if test="position()>1">,</xsl:if><xsl:text> </xsl:text><xsl:value-of select="@name"/><xsl:if test="position()=last()">,</xsl:if>
-          </xsl:for-each> java.rmi.RemoteException;
-        </xsl:if>
-       <!-- end of async block-->
-
-     </xsl:if>
-        <!-- Code for in-only mep -->
-       <xsl:if test="@mep='10'">
-
-       <!-- For in-only meps there would not be any asynchronous methods since there is no output -->
-         /**
-         * Auto generated method signature
-         <xsl:for-each select="input/param[@type!='']">* @param <xsl:value-of select="@name"></xsl:value-of><xsl:text>&#10;         </xsl:text></xsl:for-each>
-         <xsl:for-each select="fault/param[@name!='']">* @throws <xsl:value-of select="@name"></xsl:value-of><xsl:text>&#10;         *</xsl:text></xsl:for-each>
-         */
-         public  void
-        <xsl:text> </xsl:text><xsl:value-of select="@name"/>(
-         <xsl:for-each select="input/param">
-
-            <xsl:if test="@type!=''"><xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>
-            </xsl:if>
-         </xsl:for-each>) throws <xsl:for-each select="fault/param[@name!='']">
-            <xsl:if test="position()>1">,</xsl:if><xsl:text> </xsl:text><xsl:value-of select="@name"/><xsl:if test="position()=last()">,</xsl:if>
-          </xsl:for-each> java.rmi.RemoteException;
-
-        </xsl:if>
-
-       </xsl:for-each>
-
-       <!-- Apply other templates --> 
-       //<xsl:apply-templates/>
-       }
-
-
-    </xsl:template>
-   </xsl:stylesheet>
\ No newline at end of file
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java b/java/sca-contrib/tools/sdo/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
deleted file mode 100644
index 92581d6ac2..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
+++ /dev/null
@@ -1,80 +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.tools.wsdl2java.generate;
-
-import junit.framework.TestCase;
-
-/**
- * Test case for WSDL2Java
- */
-public class WSDL2JavaGeneratorTestCase extends TestCase {
-    
-
-    public void testAccountService() {
-
-        String basedir = System.getProperty("basedir");
-        if (basedir == null)
-            basedir = ".";
-
-        String[] args =
-            new String[] {"-targetDirectory", basedir + "/target/wsdl2java-source", 
-                          "-javaPackage", "org.apache.tuscany.tools.wsdl2java.generate.account",
-                          basedir + "/src/test/resources/AccountService.wsdl"};
-
-        WSDL2JavaGenerator.main(args);
-
-    }
-
-    /**
-     * Test WSDL with faults
-     * Sample WSDL originated from BigBank and Tuscany 978
-     */
-    public void testAccountServiceWithFaults() {
-
-        String basedir = System.getProperty("basedir");
-        if (basedir == null)
-            basedir = ".";
-
-        String[] args =
-            new String[] {"-targetDirectory", basedir + "/target/wsdl2java-source", 
-                          "-javaPackage", "org.apache.tuscany.tools.wsdl2java.generate.account",
-                          basedir + "/src/test/resources/AccountServiceWithFault.wsdl"};
-
-        WSDL2JavaGenerator.main(args);
-
-    }
-
-    /**
-     * Test Interopdoc WSDL
-     */
-    public void testInteropdocWsdl() {
-
-        String basedir = System.getProperty("basedir");
-        if (basedir == null)
-            basedir = ".";
-
-        String[] args =
-            new String[] {"-targetDirectory", basedir + "/target/wsdl2java-source", 
-                          "-javaPackage", "org.apache.tuscany.tools.wsdl2java.generate.account",
-                          basedir + "/src/test/resources/interopdoc.wsdl"};
-
-        WSDL2JavaGenerator.main(args);
-
-    }
-}
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java b/java/sca-contrib/tools/sdo/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
deleted file mode 100644
index e9e8aa882a..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ /dev/null
@@ -1,25 +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.soapinterop;
-
-public interface CreditScoreDocLit {
-    public org.example.creditscore.doclit.CreditReport getCreditScore(
-       org.example.creditscore.doclit.Customer param0) throws java.rmi.RemoteException;
-   }
-
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/AccountService.wsdl b/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/AccountService.wsdl
deleted file mode 100644
index 6f2fed1e2a..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/AccountService.wsdl
+++ /dev/null
@@ -1,242 +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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-                  xmlns:tns="http://www.bigbank.com/Account/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

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

-                  xmlns:account="http://www.bigbank.com/Account/"

-                  targetNamespace="http://www.bigbank.com/Account/"
-                  name="AccountService">

-

-    <wsdl:types>

-        <xsd:schema targetNamespace="http://www.bigbank.com/Account/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:account="http://www.bigbank.com/Account/"
-		xmlns:sdojava="commonj.sdo/java"
-		sdojava:package="org.apache.tuscany.samples.bigbank.account">

-

-            <xsd:element name="getAccountReportWrapped0">

-                <xsd:complexType>

-                    <xsd:sequence>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            <xsd:element name="getAccountReportWrapped0Response">

-                <xsd:complexType>

-                    <xsd:sequence>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-

-            <xsd:element name="getAccountReportWrapped1">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="customerID" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>

-            <xsd:element name="getAccountReportWrapped1Response">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="accountReport" type="account:AccountReport"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-

-            <xsd:element name="getAccountReportWrappedN">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="customerID" type="xsd:string"/>

-                        <xsd:element name="customerID2" type="xsd:int"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            <xsd:element name="getAccountReportWrappedNResponse">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="accountReport" type="account:AccountReport"/>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            

-            <xsd:element name="getAccountReportBare0" type="xsd:string"/>

-            <xsd:element name="getAccountReportBare0Response" type="xsd:int"/>

-            

-            <xsd:element name="getAccountReportBare1Simple" type="xsd:string"/>

-            <xsd:element name="getAccountReportBare1SimpleResponse" type="xsd:int"/>

-            

-            <xsd:element name="getAccountReportBare1Complex" type="account:AccountRequest"/>

-            <xsd:element name="getAccountReportBare1ComplexResponse" type="account:AccountReport"/>

-

-            <xsd:complexType name="AccountRequest">

-                <xsd:sequence>

-                    <xsd:element name="customerID" type="xsd:string"/>

-                </xsd:sequence>

-            </xsd:complexType>

-            

-            <xsd:complexType name="AccountReport">

-                <xsd:sequence>

-                    <xsd:element name="accountSummaries" type="account:AccountSummary" maxOccurs="unbounded"/>

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:complexType name="AccountSummary">

-                <xsd:attribute name="accountNumber" type="xsd:string"/>

-                <xsd:attribute name="accountType" type="xsd:string"/>

-                <xsd:attribute name="balance" type="xsd:float"/>

-            </xsd:complexType>

-

-        </xsd:schema>

-    </wsdl:types>

-

-    <wsdl:message name="getAccountReportWrapped0Request">

-        <wsdl:part element="account:getAccountReportWrapped0" name="getAccountReportWrapped0Request"/>

-    </wsdl:message>

-    <wsdl:message name="getAccountReportWrapped0Response">

-        <wsdl:part element="account:getAccountReportWrapped0Response" name="getAccountReportWrapped0Response"/>

-    </wsdl:message>

-

-    <wsdl:message name="getAccountReportWrapped1Request">

-        <wsdl:part element="account:getAccountReportWrapped1" name="getAccountReportWrapped1Request"/>

-    </wsdl:message>

-    <wsdl:message name="getAccountReportWrapped1Response">

-        <wsdl:part element="account:getAccountReportWrapped1Response" name="getAccountReportWrapped1Response"/>

-    </wsdl:message>

-

-    <wsdl:message name="getAccountReportWrappedNRequest">

-        <wsdl:part element="account:getAccountReportWrappedN" name="getAccountReportWrappedNRequest"/>

-    </wsdl:message>

-    <wsdl:message name="getAccountReportWrappedNResponse">

-        <wsdl:part element="account:getAccountReportWrappedNResponse" name="getAccountReportWrappedNResponse"/>

-    </wsdl:message>

-

-    <wsdl:message name="getAccountReportBare0Request">

-    </wsdl:message>

-    <wsdl:message name="getAccountReportBare0Response">

-    </wsdl:message>

-

-    <wsdl:message name="getAccountReportBare1SimpleRequest">

-        <wsdl:part element="account:getAccountReportBare1Simple" name="getAccountReportBare1SimpleRequest"/>

-    </wsdl:message>

-    <wsdl:message name="getAccountReportBare1SimpleResponse">

-        <wsdl:part element="account:getAccountReportBare1SimpleResponse" name="getAccountReportBare1SimpleResponse"/>

-    </wsdl:message>

-

-    <wsdl:message name="getAccountReportBare1ComplexRequest">

-        <wsdl:part element="account:getAccountReportBare1Complex" name="getAccountReportBare1ComplexRequest"/>

-    </wsdl:message>

-    <wsdl:message name="getAccountReportBare1ComplexResponse">

-        <wsdl:part element="account:getAccountReportBare1ComplexResponse" name="getAccountReportBare1ComplexResponse"/>

-    </wsdl:message>

-

-    <wsdl:portType name="Account_Service">

-        <wsdl:operation name="getAccountReportWrapped0">

-            <wsdl:input message="tns:getAccountReportWrapped0Request"/>

-            <wsdl:output message="tns:getAccountReportWrapped0Response"/>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportWrapped1">

-            <wsdl:input message="tns:getAccountReportWrapped1Request"/>

-            <wsdl:output message="tns:getAccountReportWrapped1Response"/>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportWrappedN">

-            <wsdl:input message="tns:getAccountReportWrappedNRequest"/>

-            <wsdl:output message="tns:getAccountReportWrappedNResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportBare0">

-            <wsdl:input message="tns:getAccountReportBare0Request"/>

-            <wsdl:output message="tns:getAccountReportBare0Response"/>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportBare1Simple">

-            <wsdl:input message="tns:getAccountReportBare1SimpleRequest"/>

-            <wsdl:output message="tns:getAccountReportBare1SimpleResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportBare1Complex">

-            <wsdl:input message="tns:getAccountReportBare1ComplexRequest"/>

-            <wsdl:output message="tns:getAccountReportBare1ComplexResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="AccountServiceSOAP" type="tns:Account_Service">

-        <soap:binding style="document"

-                      transport="http://schemas.xmlsoap.org/soap/http"/>

-        <wsdl:operation name="getAccountReportWrapped0">

-            <soap:operation

-                    soapAction="http://www.bigbank.com/Account/getAccountReportWrapped0"/>

-            <wsdl:input>

-                <soap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportWrapped1">

-            <soap:operation

-                    soapAction="http://www.bigbank.com/Account/getAccountReportWrapped1"/>

-            <wsdl:input>

-                <soap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportWrappedN">

-            <soap:operation

-                    soapAction="http://www.bigbank.com/Account/getAccountReportWrappedN"/>

-            <wsdl:input>

-                <soap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportBare0">

-            <soap:operation

-                    soapAction="http://www.bigbank.com/Account/getAccountReportBare0"/>

-            <wsdl:input>

-                <soap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportBare1Simple">

-            <soap:operation

-                    soapAction="http://www.bigbank.com/Account/getAccountReportBare1Simple"/>

-            <wsdl:input>

-                <soap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="getAccountReportBare1Complex">

-            <soap:operation

-                    soapAction="http://www.bigbank.com/Account/getAccountReportBare1Complex"/>

-            <wsdl:input>

-                <soap:body use="literal"/>

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal"/>

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="AccountService">

-        <wsdl:port binding="tns:AccountServiceSOAP"

-                   name="AccountServiceSOAP">

-            <soap:address location="http://localhost:8085/sample-account/services/AccountService"/>

-        </wsdl:port>

-    </wsdl:service>

-</wsdl:definitions>

diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl b/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
deleted file mode 100644
index dda5a36085..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
+++ /dev/null
@@ -1,475 +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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:account="http://www.bigbank.com/account"
-	targetNamespace="http://www.bigbank.com/account"
-	name="AccountServiceWithFault">
-
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.bigbank.com/account"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:account="http://www.bigbank.com/account">
-			
-			<xsd:element name="getAccountReport">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID"
-							type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountReportResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountReport"
-							type="account:AccountReport" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountReport">
-				<xsd:sequence>
-					<xsd:element name="accountSummaries"
-						type="account:AccountSummary" maxOccurs="unbounded" />
-					<xsd:element name="stockSummaries"
-						type="account:StockSummary" maxOccurs="unbounded" />
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="AccountSummary">
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="accountType" type="xsd:string" />
-				<xsd:attribute name="balance" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockSummary">
-			    <!-- xsd:attribute name="id" type="xsd:int" / -->
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-				<!-- unique id for this purchase -->
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="purchaseDate" type="xsd:dateTime" />
-				<xsd:attribute name="purchasePrice" type="xsd:float" />
-				<xsd:attribute name="currentPrice" type="xsd:float" />
-				<xsd:attribute name="company" type="xsd:string" />
-				<xsd:attribute name="highPrice" type="xsd:float" />
-				<xsd:attribute name="lowPrice" type="xsd:float" />
-				
-			</xsd:complexType>
-
-			<!-- Profile in data base  -->
-			<xsd:element name="getCustomerProfile">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="loginID" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="CustomerProfileData">
-				<xsd:sequence>
-					<xsd:element name="firstName" type="xsd:string" />
-					<xsd:element name="lastName" type="xsd:string" />
-					<xsd:element name="address" type="xsd:string" />
-					<xsd:element name="email" type="xsd:string" />
-					<xsd:element name="loginID" type="xsd:string" />
-					<xsd:element name="password" type="xsd:string" />
-					<xsd:element name="id" type="xsd:int" />
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:element name="getCustomerProfileResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="withdraw">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="withdrawResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-                        </xsd:element>
-                        <!-- @start added fault -->
-                        <xsd:element name="insufficientFundsFault">
-                            <xsd:complexType name="insufficientFundsFault">
-                                <xsd:sequence>
-                                    <xsd:element name="message" type="xsd:string"/>
-                                </xsd:sequence>
-                            </xsd:complexType>
-                        </xsd:element>
-                        <!-- @end added fault -->
-
-			<xsd:element name="deposit">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="depositResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="id" type="xsd:int" />
-						<xsd:element name="stock" type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStockResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseSummary"
-							type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-
-
-			<xsd:element name="sellStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseLotNumber"
-							type="xsd:int" /><!-- unique id for this purchase -->
-						<xsd:element name="quantity" type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="createAccount">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-                        <xsd:element name="createSavings"
-							type="xsd:boolean" />
-                        <xsd:element name="createCheckings"
-							type="xsd:boolean" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>	
-			<xsd:element name="createAccountResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-				
-			</xsd:element>
-
-			<xsd:element name="getAccountLog">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID"
-							type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountLogResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountLog"
-							type="account:AccountLog" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountLog">
-				<xsd:sequence>
-					<xsd:element name="accountLogEntries"
-						type="account:AccountLogEntry" maxOccurs="unbounded" />
-					<xsd:element name="stockLogEntries"
-						type="account:StockLogEntry" maxOccurs="unbounded" />
-						
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:complexType name="AccountLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="amount" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockLogEntry">
-				<xsd:attribute name="logSeqNo" type="xsd:int" />
-				<xsd:attribute name="id" type="xsd:int" />
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="actionType" type="xsd:string" />
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-			</xsd:complexType>
-
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="getAccountReportRequest">
-		<wsdl:part element="account:getAccountReport"
-			name="getAccountReportRequest" />
-	</wsdl:message>
-	<wsdl:message name="getAccountReportResponse">
-		<wsdl:part element="account:getAccountReportResponse"
-			name="getAccountReportResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getCustomerProfileRequest">
-		<wsdl:part element="account:getCustomerProfile"
-			name="getCustomerProfile" />
-	</wsdl:message>
-	<wsdl:message name="getCustomerProfileResponse">
-		<wsdl:part element="account:getCustomerProfileResponse"
-			name="getCustomerProfileResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawRequest">
-		<wsdl:part element="account:withdraw" name="withdrawRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawResponse">
-		<wsdl:part element="account:withdrawResponse"
-			name="withdrawResponse" />
-        </wsdl:message>
-
-        <!-- @start added fault -->
-        <wsdl:message name="insufficientFundsFault">
-            <wsdl:part element="account:insufficientFundsFault" name="insufficientFundsFault" />
-        </wsdl:message>
-        <!-- @end added fault -->
-
-	<wsdl:message name="depositRequest">
-		<wsdl:part element="account:deposit" name="depositRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="depositResponse">
-		<wsdl:part element="account:depositResponse"
-			name="depositResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockRequest">
-		<wsdl:part element="account:purchaseStock"
-			name="purchaseStockRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockResponse">
-		<wsdl:part element="account:purchaseStockResponse"
-			name="purchaseStockResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="sellStockRequest">
-		<wsdl:part element="account:sellStock" name="sellStockRequest" />
-	</wsdl:message>
-	
-	<wsdl:message name="createAccountRequest">
-		<wsdl:part element="account:createAccount" name="createAccountRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="createAccountResponse">
-		<wsdl:part element="account:createAccountResponse" name="createAccountResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getAccountLogRequest">
-		<wsdl:part element="account:getAccountLog"
-			name="getAccountLogRequest" />
-	</wsdl:message>
-	
-	<wsdl:message name="getAccountLogResponse">
-		<wsdl:part element="account:getAccountLogResponse"
-			name="getAccountLogResponse" />
-	</wsdl:message>
-
-	<wsdl:portType name="AccountServiceWithFault">
-		<wsdl:operation name="getAccountReport">
-			<wsdl:input message="account:getAccountReportRequest" />
-			<wsdl:output message="account:getAccountReportResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getCustomerProfile">
-			<wsdl:input message="account:getCustomerProfileRequest" />
-			<wsdl:output message="account:getCustomerProfileResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<wsdl:input message="account:withdrawRequest" />
-                        <wsdl:output message="account:withdrawResponse" />
-                        <!-- @start added fault -->
-                        <wsdl:fault message="account:insufficientFundsFault" name="insufficientFundsFault"/>
-                        <!-- @end added fault -->
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<wsdl:input message="account:depositRequest" />
-			<wsdl:output message="account:depositResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<wsdl:input message="account:purchaseStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<wsdl:input message="account:sellStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-
-		<wsdl:operation name="createAccount">
-			<wsdl:input message="account:createAccountRequest" />
-			<wsdl:output message="account:createAccountResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<wsdl:input message="account:getAccountLogRequest" />
-			<wsdl:output message="account:getAccountLogResponse" />
-		</wsdl:operation>
-
-	</wsdl:portType>
-
-
-
-	<wsdl:binding name="AccountServiceWithFaultSOAP" type="account:AccountServiceWithFault">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getAccountReport">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountReport" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getCustomerProfile">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getCustomerProfile" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/withdraw" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-                        </wsdl:output>
-                        <!-- @start added fault -->
-                        <wsdl:fault name="insufficientFundsFault">
-                            <soap:fault name="insufficientFundsFault" use="literal"/>
-                        </wsdl:fault>
-                        <!-- @end added fault -->
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/deposit" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/purchaseStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/sellStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="createAccount">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/createAccount" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="getAccountLog">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountLog" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-	</wsdl:binding>
-	<wsdl:service name="AccountServiceWithFault">
-		<wsdl:port binding="account:AccountServiceWithFaultSOAP"
-			name="AccountServiceSOAP">
-			<soap:address
-				location="http://localhost:8080/sample-bigbank-account/services/AccountServiceWithFault" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl b/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
deleted file mode 100644
index 09d1a58589..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.

-

-  Licensed 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 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-	xmlns:tns="http://www.example.org/creditscore/doclit/"

-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="CreditScore"

-	targetNamespace="http://www.example.org/creditscore/doclit/">

-	<wsdl:types>

-		<xsd:schema

-			targetNamespace="http://www.example.org/creditscore/doclit/"

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

-			<xsd:element name="getCreditScoreRequest" type="tns:Customer" />

-			<xsd:complexType name="Customer">

-				<xsd:sequence>

-					<xsd:element name="ssn" type="xsd:string" />

-					<xsd:element name="firstName" type="xsd:string" />

-					<xsd:element name="lastName" type="xsd:string" />

-				</xsd:sequence>

-			</xsd:complexType>				

-			<xsd:element name="getCreditScoreResponse" type="tns:CreditReport"/>

-			<xsd:complexType name="CreditReport">

-				<xsd:sequence>

-					<xsd:element name="score" type="xsd:int"/>

-				</xsd:sequence>

-			</xsd:complexType>				

-		</xsd:schema>

-	</wsdl:types>

-	<wsdl:message name="getCreditScoreResponse">

-		<wsdl:part element="tns:getCreditScoreResponse"

-			name="getCreditScoreResponse" />

-	</wsdl:message>

-	<wsdl:message name="getCreditScoreRequest">

-		<wsdl:part element="tns:getCreditScoreRequest"

-			name="getCreditScoreRequest" />

-	</wsdl:message>

-	<wsdl:portType name="CreditScoreDocLit">

-		<wsdl:operation name="getCreditScore">

-			<wsdl:input message="tns:getCreditScoreRequest" />

-			<wsdl:output message="tns:getCreditScoreResponse" />

-		</wsdl:operation>

-	</wsdl:portType>

-	<wsdl:binding name="CreditScoreDocLitSOAP" type="tns:CreditScoreDocLit">

-		<soap:binding style="document"

-			transport="http://schemas.xmlsoap.org/soap/http" />

-		<wsdl:operation name="getCreditScore">

-			<soap:operation

-				soapAction="http://www.example.org/creditscore/doclit/getCreditScore" />

-			<wsdl:input>

-				<soap:body parts="getCreditScoreRequest" use="literal" />

-			</wsdl:input>

-			<wsdl:output>

-				<soap:body parts="getCreditScoreResponse" use="literal" />

-			</wsdl:output>

-		</wsdl:operation>

-	</wsdl:binding>

-	<wsdl:service name="CreditScore">

-		<wsdl:port binding="tns:CreditScoreDocLitSOAP"

-			name="CreditScoreDocLitSOAP">

-			<soap:address location="http://www.example.org/" />

-		</wsdl:port>

-	</wsdl:service>

-</wsdl:definitions>

diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/helloworld.wsdl b/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/helloworld.wsdl
deleted file mode 100644
index 051f604bb2..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/helloworld.wsdl
+++ /dev/null
@@ -1,121 +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://helloworldaxis.samples.tuscany.apache.org" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://helloworldaxis.samples.tuscany.apache.org" xmlns:intf="http://helloworldaxis.samples.tuscany.apache.org" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="stockquote">
-    <!--WSDL created by Apache Axis version: 1.2.1
-Built on Jun 14, 2005 (09:15:57 EDT)-->
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-        	xmlns:hello="http://helloworldaxis.samples.tuscany.apache.org" 
-        	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        	targetNamespace="http://helloworldaxis.samples.tuscany.apache.org" xmlns="http://www.w3.org/2001/XMLSchema">
-        	<complexType name="ComplexGreetings">
-                <sequence>
-                    <element name="greet1" type="xsd:string"/>
-                    <element name="greet2" type="xsd:double"/>
-                </sequence>
-        	</complexType>
-        	<element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="in0" type="xsd:string"/>
-                        <element name="in1" type="xsd:double"/>
-                        <element name="in2" type="hello:ComplexGreetings"/>
-                    </sequence>
-                    <xsd:attribute name="language" type="xsd:string"/>
-                </complexType>
-            </element>
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="getGreetingsRequest">
-
-        <wsdl:part element="impl:getGreetings" name="parameters"/>
-
-    </wsdl:message>
-
-    <wsdl:message name="getGreetingsResponse">
-
-        <wsdl:part element="impl:getGreetingsResponse" name="parameters"/>
-
-    </wsdl:message>
-
-    <wsdl:portType name="HelloWorldServiceImpl">
-
-        <wsdl:operation name="getGreetings">
-
-            <wsdl:input message="impl:getGreetingsRequest" name="getGreetingsRequest"/>
-
-            <wsdl:output message="impl:getGreetingsResponse" name="getGreetingsResponse"/>
-
-        </wsdl:operation>
-
-    </wsdl:portType>
-
-    <wsdl:binding name="helloworldSoapBinding" type="impl:HelloWorldServiceImpl">
-
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-        <wsdl:operation name="getGreetings">
-
-            <wsdlsoap:operation soapAction=""/>
-
-            <wsdl:input name="getGreetingsRequest">
-
-                <wsdlsoap:body use="literal"/>
-
-            </wsdl:input>
-
-            <wsdl:output name="getGreetingsResponse">
-
-                <wsdlsoap:body use="literal"/>
-
-            </wsdl:output>
-
-        </wsdl:operation>
-
-    </wsdl:binding>
-
-    <wsdl:service name="HelloWorldServiceImplService">
-
-        <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
-
-            <!-- Tuscany SCA Service -->
-<!--
-            <wsdlsoap:address location="http://localhost:8080/tuscany-samples-helloworldws-service/services/HelloWorldService"/>
--->
-            <wsdlsoap:address location="http://localhost:9876/tuscany-samples-helloworldws-service/services/HelloWorldService"/>
-
-            <!-- Axis Web Service -->
-            <!--
-            <wsdlsoap:address location="http://localhost:8081/helloworldaxissvc-incubating-M1/services/helloworld"/>
-            -->
-
-        </wsdl:port>
-
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/interopdoc.wsdl b/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/interopdoc.wsdl
deleted file mode 100644
index 820c26ca34..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/interopdoc.wsdl
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.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.    
- -->
-<definitions name="InteropTestDoc" targetNamespace="http://soapinterop.org/"
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:tns="http://soapinterop.org/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-	<types>
-
-		<xsd:schema elementFormDefault="qualified" targetNamespace="http://soapinterop.org/" xmlns:interop="http://soapinterop.org/">
-
-			<xsd:element name="SingleTag">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="SingleTag"/>
-			<xsd:element name="SingleTagResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SingleTag" type="interop:SingleTag"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="SimpleDocument">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="SimpleDocument">
-				<xsd:simpleContent>
-					<xsd:extension base="xsd:string"/>
-				</xsd:simpleContent>
-			</xsd:complexType>
-			<xsd:element name="SimpleDocumentResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="SimpleDocument" type="interop:SimpleDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="ComplexDocument">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:complexType name="ComplexDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="1" name="simpleDoc" type="interop:ArrayOfSimpleDocument"/>
-					<xsd:element minOccurs="0" maxOccurs="1" name="child" type="interop:ChildDocument"/>
-				</xsd:sequence>
-				<xsd:attribute name="AnAttribute" type="xsd:string"/>
-			</xsd:complexType>
-			<xsd:complexType name="ArrayOfSimpleDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="unbounded" name="SimpleDocument" nillable="true" type="interop:SimpleDocument"/>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="ChildDocument">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" maxOccurs="1" name="childSimpleDoc" type="interop:ArrayOfSimpleDocument"/>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:element name="ComplexDocumentResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element minOccurs="0" maxOccurs="1" name="ComplexDocument" type="interop:ComplexDocument"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-		</xsd:schema>
-
-	</types>
-
-	<message name="SingleTagSoapIn">
-		<part name="parameters" element="tns:SingleTag"/>
-	</message>
-	<message name="SingleTagSoapOut">
-		<part name="outputDoc" element="tns:SingleTagResponse"/>
-	</message>
-	<message name="SimpleDocumentSoapIn">
-		<part name="parameters" element="tns:SimpleDocument"/>
-	</message>
-	<message name="SimpleDocumentSoapOut">
-		<part name="outputDoc" element="tns:SimpleDocumentResponse"/>
-	</message>
-	<message name="ComplexDocumentSoapIn">
-		<part name="parameters" element="tns:ComplexDocument"/>
-	</message>
-	<message name="ComplexDocumentSoapOut">
-		<part name="outputDoc" element="tns:ComplexDocumentResponse"/>
-	</message>
-
-	<portType name="DocTestPortType">
-
-		<operation name="SingleTag">
-			<input message="tns:SingleTagSoapIn"/>
-			<output message="tns:SingleTagSoapOut"/>
-		</operation>
-		<operation name="SimpleDocument">
-			<input message="tns:SimpleDocumentSoapIn"/>
-			<output message="tns:SimpleDocumentSoapOut"/>
-		</operation>
-		<operation name="ComplexDocument">
-			<input message="tns:ComplexDocumentSoapIn"/>
-			<output message="tns:ComplexDocumentSoapOut"/>
-		</operation>
-
-	</portType>
-
-	<binding name="doc_test_binding" type="tns:DocTestPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-		<operation name="SingleTag">
-			<soap:operation soapAction="http://soapinterop.org/SingleTag"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation> 
-
-		<operation name="SimpleDocument">
-			<soap:operation soapAction="http://soapinterop.org/SimpleDocument"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation> 
-
-		<operation name="ComplexDocument">
-			<soap:operation soapAction="http://soapinterop.org/ComplexDocument"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation> 
-	</binding>
-
-	<service name="interopDocSvc">
-
-  		<port name="interopDocPort" binding="tns:doc_test_binding">
-    			<soap:address location="http://www.whitemesa.net/interopdoc"/>
-  		</port>
-
-	</service>
-
-</definitions>
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/sequences.xsd b/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/sequences.xsd
deleted file mode 100644
index a565f3fa65..0000000000
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/sequences.xsd
+++ /dev/null
@@ -1,100 +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.    
- -->
-<xsd:schema xmlns:seq="http://www.example.com/sequences"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://www.example.com/sequences">
-
-	<xsd:element name="mixedStockQuote" type="seq:MixedQuote" />
-	<xsd:element name="rc" type="seq:RepeatingChoice" />
-	<xsd:element name="mrc" type="seq:MixedRepeatingChoice" />
-	<xsd:element name="rc2" type="seq:TwoRCs" />
-	<xsd:element name="mrc2" type="seq:TwoRCsMixed" />
-
-
-
-	<xsd:complexType mixed="true" name="MixedQuote">
-		<xsd:sequence>
-			<xsd:element name="symbol" type="xsd:string" />
-			<xsd:element name="companyName" type="xsd:string" />
-			<xsd:element name="price" type="xsd:decimal" />
-			<xsd:element name="open1" type="xsd:decimal" />
-			<xsd:element name="high" type="xsd:decimal" />
-			<xsd:element name="low" type="xsd:decimal" />
-			<xsd:element name="volume" type="xsd:double" />
-			<xsd:element name="change1" type="xsd:double" />
-			<xsd:element maxOccurs="unbounded" minOccurs="0"
-				name="quotes" type="seq:MixedQuote" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="RepeatingChoice">
-		<xsd:choice maxOccurs="unbounded" minOccurs="0">
-			<xsd:element name="a" type="xsd:string" />
-			<xsd:element name="b" type="xsd:int" />
-		</xsd:choice>
-	</xsd:complexType>
-
-
-	<xsd:complexType mixed="true" name="MixedRepeatingChoice">
-		<xsd:choice maxOccurs="unbounded" minOccurs="0">
-			<xsd:element name="a" type="xsd:string" />
-			<xsd:element name="b" type="xsd:int" />
-		</xsd:choice>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="TwoRCs">
-		<xsd:sequence>
-
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:element name="a" type="xsd:string" />
-				<xsd:element name="b" type="xsd:int" />
-			</xsd:choice>
-
-			<xsd:element name="split" type="xsd:string" />
-
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:element name="y" type="xsd:string" />
-				<xsd:element name="z" type="xsd:int" />
-			</xsd:choice>
-
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType mixed="true" name="TwoRCsMixed">
-		<xsd:sequence>
-
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:element name="a" type="xsd:string" />
-				<xsd:element name="b" type="xsd:int" />
-			</xsd:choice>
-
-			<xsd:element name="split" type="xsd:string" />
-
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:element name="y" type="xsd:string" />
-				<xsd:element name="z" type="xsd:int" />
-			</xsd:choice>
-
-		</xsd:sequence>
-	</xsd:complexType>
-
-</xsd:schema>
diff --git a/java/sca-contrib/tutorials/pom.xml b/java/sca-contrib/tutorials/pom.xml
deleted file mode 100644
index 331a268016..0000000000
--- a/java/sca-contrib/tutorials/pom.xml
+++ /dev/null
@@ -1,46 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-tutorials</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Tutorials</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>store</module>

-                <!-- <module>photo-gallery</module> -->

-            </modules>

-        </profile>

-

-    </profiles>

-

-</project>

diff --git a/java/sca-contrib/tutorials/store/README b/java/sca-contrib/tutorials/store/README
deleted file mode 100644
index 6169a05292..0000000000
--- a/java/sca-contrib/tutorials/store/README
+++ /dev/null
@@ -1,29 +0,0 @@
-Store Tutorial
-======================================
-
-This is a tutorial that shows how to use SCA and Tuscany to build multiple
-variations of an online Store application.
-
-For an overview of the scenarios covered here, please refer to Tutorial.pdf.
-
-For more detailed information, please see:
-
-http://incubator.apache.org/tuscany/sca-java-tutorial.html
-
-
-Running The Tutorial Application
---------------------------------
-
-Start the SCA Domain Manager:
-   cd domain
-   java -jar ../../modules/tuscany-node2-launcher-1.2-incubating.jar domain
-
-To access the SCA Manager application, point your Web browser to:
-   http://localhost:9990/ui/cloud/
-
-Select the node you want to start (e.g StoreNode), then click the Start button.
-
-You should now be able to access the online Store application. Point your Web
-browser to:
-   http://localhost:8100/ui/
-
diff --git a/java/sca-contrib/tutorials/store/Tutorial.pdf b/java/sca-contrib/tutorials/store/Tutorial.pdf
deleted file mode 100644
index e22f1b4c9d..0000000000
--- a/java/sca-contrib/tutorials/store/Tutorial.pdf
+++ /dev/null
diff --git a/java/sca-contrib/tutorials/store/assets/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/assets/META-INF/sca-contribution.xml
deleted file mode 100644
index cba1564cb4..0000000000
--- a/java/sca-contrib/tutorials/store/assets/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,27 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <export.java package="services"/>
-   <export.java package="services.market"/>
-   <export.java package="services.merger"/>
-   <export.java package="services.db"/>
-   <export.java package="services.map"/>
-   <export.resource uri="uiservices/store.html"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/assets/pom.xml b/java/sca-contrib/tutorials/store/assets/pom.xml
deleted file mode 100644
index befd197c3f..0000000000
--- a/java/sca-contrib/tutorials/store/assets/pom.xml
+++ /dev/null
@@ -1,89 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-assets</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Reusable Assets</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.3.1.4</version>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/assets/services/Cart.java b/java/sca-contrib/tutorials/store/assets/services/Cart.java
deleted file mode 100644
index 3fb5439bc3..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/Cart.java
+++ /dev/null
@@ -1,28 +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 services;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Cart extends Collection<String, Item> {
-
-}
diff --git a/java/sca-contrib/tutorials/store/assets/services/Catalog.java b/java/sca-contrib/tutorials/store/assets/services/Catalog.java
deleted file mode 100644
index b5e504fe11..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/Catalog.java
+++ /dev/null
@@ -1,27 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Catalog {
-    Item[] get();
-}
diff --git a/java/sca-contrib/tutorials/store/assets/services/CurrencyConverter.java b/java/sca-contrib/tutorials/store/assets/services/CurrencyConverter.java
deleted file mode 100644
index a064f3dd69..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/CurrencyConverter.java
+++ /dev/null
@@ -1,29 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CurrencyConverter {
-    public double getConversion(String fromCurrenycCode, String toCurrencyCode, double amount);
-
-    public String getCurrencySymbol(String currencyCode);
-}
diff --git a/java/sca-contrib/tutorials/store/assets/services/CurrencyConverterImpl.java b/java/sca-contrib/tutorials/store/assets/services/CurrencyConverterImpl.java
deleted file mode 100644
index c354aed447..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/CurrencyConverterImpl.java
+++ /dev/null
@@ -1,38 +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 services;
-
-public class CurrencyConverterImpl implements CurrencyConverter {
-    public double getConversion(String fromCurrencyCode, String toCurrencyCode, double amount) {
-        if (toCurrencyCode.equals("USD"))
-            return amount;
-        else if (toCurrencyCode.equals("EUR"))
-            return ((double)Math.round(amount * 0.7256 * 100)) /100;
-        return 0;
-    }
-
-    public String getCurrencySymbol(String currencyCode) {
-        if (currencyCode.equals("USD"))
-            return "$";
-        else if (currencyCode.equals("EUR"))
-            return "E"; //"€";
-        return "?";
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/assets/services/FruitsCatalogImpl.java b/java/sca-contrib/tutorials/store/assets/services/FruitsCatalogImpl.java
deleted file mode 100644
index d132a24b00..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/FruitsCatalogImpl.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 services;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-public class FruitsCatalogImpl implements Catalog {
-    
-    @Property
-    public String currencyCode = "USD";
-    
-    @Reference
-    public CurrencyConverter currencyConverter;
-    
-    private List<Item> catalog = new ArrayList<Item>();
-
-    @Init
-    public void init() {
-        String currencySymbol = currencyConverter.getCurrencySymbol(currencyCode);
-        catalog.add(new Item("Apple",  currencySymbol + currencyConverter.getConversion("USD", currencyCode, 2.99)));
-        catalog.add(new Item("Orange", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 3.55)));
-        catalog.add(new Item("Pear", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 1.55)));
-    }
-
-    public Item[] get() {
-        Item[] catalogArray = new Item[catalog.size()];
-        catalog.toArray(catalogArray);
-        return catalogArray;
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/assets/services/Item.java b/java/sca-contrib/tutorials/store/assets/services/Item.java
deleted file mode 100644
index 81cefcdbef..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/Item.java
+++ /dev/null
@@ -1,66 +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 services;
-
-
-public class Item {
-    private String name;
-    private String price;
-    private String origin;
-    
-    public Item() {
-    }
-    
-    public Item(String name, String price, String origin) {
-        this.name = name;
-        this.price = price;
-        this.origin = origin;
-    }
-    
-    public Item(String name, String price) {
-        this.name = name;
-        this.price = price;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    public String getPrice() {
-        return price;
-    }
-    
-    public void setPrice(String price) {
-        this.price = price;
-    }
-
-    public String getOrigin() {
-        return origin;
-    }
-
-    public void setOrigin(String origin) {
-        this.origin = origin;
-    }
-
-}
diff --git a/java/sca-contrib/tutorials/store/assets/services/ShoppingCartImpl.java b/java/sca-contrib/tutorials/store/assets/services/ShoppingCartImpl.java
deleted file mode 100644
index 698614212d..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/ShoppingCartImpl.java
+++ /dev/null
@@ -1,112 +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 services;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class ShoppingCartImpl implements Cart, Total {
-    
-    private Map<String, Item> cart;
-    
-    @Init
-    public void init() {
-        cart = new HashMap<String, Item>();
-    }
-
-    public Entry<String, Item>[] getAll() {
-        Entry<String, Item>[] entries = new Entry[cart.size()];
-        int i = 0;
-        for (Map.Entry<String, Item> e: cart.entrySet()) {
-            entries[i++] = new Entry<String, Item>(e.getKey(), e.getValue());
-        }
-        return entries;
-    }
-
-    public Item get(String key) throws NotFoundException {
-        Item item = cart.get(key);
-        if (item == null) {
-            throw new NotFoundException(key);
-        } else {
-            return item;
-        }
-    }
-
-    public String post(String key, Item item) {
-        if (key == null) {
-            key ="cart-" + UUID.randomUUID().toString();
-        }
-        cart.put(key, item);
-        return key;
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        if (!cart.containsKey(key)) {
-            throw new NotFoundException(key);
-        }
-        cart.put(key, item);
-    }
-    
-    public void delete(String key) throws NotFoundException {
-        if (key == null || key.equals("")) {
-            cart.clear();
-        } else {
-            Item item = cart.remove(key);
-            if (item == null)
-                throw new NotFoundException(key);
-        }
-    }
-
-    public Entry<String, Item>[] query(String queryString) {
-        List<Entry<String, Item>> entries = new ArrayList<Entry<String,Item>>();
-        if (queryString.startsWith("name=")) {
-            String name = queryString.substring(5);
-            for (Map.Entry<String, Item> e: cart.entrySet()) {
-                Item item = e.getValue();
-                if (item.getName().equals(name)) {
-                    entries.add(new Entry<String, Item>(e.getKey(), e.getValue()));
-                }
-            }
-        }
-        return entries.toArray(new Entry[entries.size()]);
-    }
-    
-    public String getTotal() {
-        double total = 0;
-        String currencySymbol = "";
-        if (!cart.isEmpty()) {
-            Item item = cart.values().iterator().next();
-            currencySymbol = item.getPrice().substring(0, 1);
-        }
-        for (Item item : cart.values()) {
-            total += Double.valueOf(item.getPrice().substring(1));
-        }
-        return currencySymbol + String.valueOf(total);
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/assets/services/Total.java b/java/sca-contrib/tutorials/store/assets/services/Total.java
deleted file mode 100644
index b77cc1c7ac..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/Total.java
+++ /dev/null
@@ -1,29 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Total {
-    
-    String getTotal();
-
-}
diff --git a/java/sca-contrib/tutorials/store/assets/services/VegetablesCatalogImpl.java b/java/sca-contrib/tutorials/store/assets/services/VegetablesCatalogImpl.java
deleted file mode 100644
index 0e1155dfcb..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/VegetablesCatalogImpl.java
+++ /dev/null
@@ -1,42 +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 services;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Init;
-
-public class VegetablesCatalogImpl implements Catalog {
-    private List<Item> catalog = new ArrayList<Item>();
-
-    @Init
-    public void init() {
-        catalog.add(new Item("Broccoli", "$2.99"));
-        catalog.add(new Item("Asparagus", "$3.55"));
-        catalog.add(new Item("Cauliflower", "$1.55"));
-    }
-
-    public Item[] get() {
-        Item[] catalogArray = new Item[catalog.size()];
-        catalog.toArray(catalogArray);
-        return catalogArray;
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/assets/services/db/ShoppingCartTableImpl.java b/java/sca-contrib/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
deleted file mode 100644
index 1414889b81..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
+++ /dev/null
@@ -1,171 +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 services.db;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-
-import services.Cart;
-import services.Item;
-import services.Total;
-
-public class ShoppingCartTableImpl implements Cart, Total {
-    
-    @Property
-    public String database;
-    
-    private Connection connection;
-
-    @Init
-    public void init() throws Exception {
-        Class.forName("org.apache.derby.jdbc.EmbeddedDriver", true, Thread.currentThread().getContextClassLoader());
-        String baseDir = System.getProperty("basedir");
-        String url = "jdbc:derby:directory:" + (baseDir != null? baseDir + "/" + database : database);
-        System.out.println("Connecting to database: " + url);
-        connection = DriverManager.getConnection(url, "", "");
-    }
-    
-    @Destroy
-    public void shutdown() throws Exception {
-        if(connection != null) {
-            connection.close();
-            connection = null;
-        }
-    }
-
-    public Entry<String, Item>[] getAll() {
-        try {
-            Statement statement = connection.createStatement();
-            ResultSet results = statement.executeQuery("select * from Cart");
-            List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
-            while (results.next()) {
-                Item item = new Item(results.getString("name"), results.getString("price"));
-                entries.add(new Entry<String, Item>(results.getString("id"), item));
-            }
-            return entries.toArray(new Entry[entries.size()]);
-        } catch (SQLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public Item get(String key) throws NotFoundException {
-        try {
-            Statement statement = connection.createStatement();
-            ResultSet results = statement.executeQuery("select * from Cart where id = '" + key + "'");
-            if (results.next()) {
-                return new Item(results.getString("name"), results.getString("price"));
-            } else {
-                throw new NotFoundException(key);
-            }
-        } catch (SQLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public String post(String key, Item item) {
-        if (key == null) {
-            key = "cart-" + UUID.randomUUID().toString();
-        }
-        try {
-            Statement statement = connection.createStatement();
-            String query = "insert into Cart values ('" + key + "', '" + item.getName() + "', '" + item.getPrice() + "')";
-            System.out.println(query);
-            statement.executeUpdate(query);
-        } catch (SQLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-        return key;
-    }
-
-    public void put(String key, Item item) throws NotFoundException {
-        try {
-            Statement statement = connection.createStatement();
-            String query = "update into Cart set name = '" + item.getName() + "', price = '" + item.getPrice() + "' where id = '" + key + "'";
-            System.out.println(query);
-            int count = statement.executeUpdate(query);
-            if (count == 0)
-                throw new NotFoundException(key);
-        } catch (SQLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-    
-    public void delete(String key) throws NotFoundException {
-        try {
-            Statement statement = connection.createStatement();
-            if (key == null || key.equals("")) {
-                String query = "delete from Cart";
-                System.out.println(query);
-                statement.executeUpdate(query);
-            } else {
-                String query = "delete from Cart where id = '" + key + "'";
-                System.out.println(query);
-                int count = statement.executeUpdate(query);
-                if (count == 0)
-                    throw new NotFoundException(key);
-            }
-        } catch (SQLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public Entry<String, Item>[] query(String queryString) {
-        try {
-            Statement statement = connection.createStatement();
-            ResultSet results = statement.executeQuery("select * from Cart where " + queryString);
-            List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
-            while (results.next()) {
-                Item item = new Item(results.getString("name"), results.getString("price"));
-                entries.add(new Entry<String, Item>(results.getString("id"), item));
-            }
-            return entries.toArray(new Entry[entries.size()]);
-        } catch (SQLException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-    
-    public String getTotal() {
-        Entry<String, Item>[] entries = getAll(); 
-        double total = 0;
-        String currencySymbol = "";
-        if (entries.length > 0) {
-            Item item = entries[0].getData();
-            currencySymbol = item.getPrice().substring(0, 1);
-        }
-        for (Entry<String, Item> entry : entries) {
-            Item item = entry.getData();
-            total += Double.valueOf(item.getPrice().substring(1));
-        }
-        return currencySymbol + total;
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/assets/services/db/cart.sql b/java/sca-contrib/tutorials/store/assets/services/db/cart.sql
deleted file mode 100644
index 750e23ebde..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/db/cart.sql
+++ /dev/null
@@ -1,27 +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.
---
-
-DROP TABLE CART;
-
-CREATE TABLE CART(
-   id VARCHAR(50) NOT NULL,
-   name VARCHAR(50),
-   price VARCHAR(10),
-   primary key (id)
-);
diff --git a/java/sca-contrib/tutorials/store/assets/services/map/FruitsCatalogImpl.java b/java/sca-contrib/tutorials/store/assets/services/map/FruitsCatalogImpl.java
deleted file mode 100644
index 1acd30d719..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/map/FruitsCatalogImpl.java
+++ /dev/null
@@ -1,56 +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 services.map;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-import services.Catalog;
-import services.CurrencyConverter;
-import services.Item;
-
-public class FruitsCatalogImpl implements Catalog {
-    
-    @Property
-    public String currencyCode = "USD";
-    
-    @Reference
-    public CurrencyConverter currencyConverter;
-    
-    private List<Item> catalog = new ArrayList<Item>();
-
-    @Init
-    public void init() {
-        String currencySymbol = currencyConverter.getCurrencySymbol(currencyCode);
-        catalog.add(new Item("Apple",  currencySymbol + currencyConverter.getConversion("USD", currencyCode, 2.99), "34.425744,-119.711151"));
-        catalog.add(new Item("Orange", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 3.55), "25.811018,-80.130844"));
-        catalog.add(new Item("Pear", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 1.55), "36.596649,-121.8964"));
-    }
-
-    public Item[] get() {
-        Item[] catalogArray = new Item[catalog.size()];
-        catalog.toArray(catalogArray);
-        return catalogArray;
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/assets/services/market/MarketCatalogImpl.java b/java/sca-contrib/tutorials/store/assets/services/market/MarketCatalogImpl.java
deleted file mode 100644
index 8a7306c83c..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/market/MarketCatalogImpl.java
+++ /dev/null
@@ -1,66 +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 services.market;
-
-import java.util.Vector;
-
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-import services.Catalog;
-import services.CurrencyConverter;
-import services.Item;
-
-
-public class MarketCatalogImpl implements Catalog {
-
-    @Property
-    public String currencyCode = "USD";
-    
-    @Reference
-    public CurrencyConverter currencyConverter;
-    
-    @Reference(required=false)
-    protected Catalog[] goodsCatalog;
-
-    
-    public Item[] get() {
-
-        String currencySymbol = currencyConverter.getCurrencySymbol(currencyCode);
-        Vector<Item> catalog = new Vector<Item>();
-
-        for (int i = 0; i < goodsCatalog.length; i++) {
-            Item[] items = goodsCatalog[i].get();
-
-            for (Item item : items) {
-                double price = Double.valueOf(item.getPrice().substring(1));
-                price = currencyConverter.getConversion("USD", currencyCode, price);
-                catalog.addElement(new Item(item.getName(), currencySymbol + price));
-            }
-        }
-
-        Item[] catalogArray = new Item[catalog.size()];
-        catalog.copyInto(catalogArray);
-
-        return catalogArray;
-    }
-
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/assets/services/merger/MergedCatalogImpl.java b/java/sca-contrib/tutorials/store/assets/services/merger/MergedCatalogImpl.java
deleted file mode 100644
index 3f8cee085d..0000000000
--- a/java/sca-contrib/tutorials/store/assets/services/merger/MergedCatalogImpl.java
+++ /dev/null
@@ -1,66 +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 services.merger;
-
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-import services.Catalog;
-import services.CurrencyConverter;
-import services.Item;
-
-public class MergedCatalogImpl implements Catalog {
-
-    @Property
-    public String currencyCode = "USD";
-    
-    @Reference
-    public CurrencyConverter currencyConverter;
-    
-    @Reference
-    public Catalog fruitsCatalog;
-    
-    @Reference
-    public Catalog vegetablesCatalog;
-    
-    public Item[] get() {
-        String currencySymbol = currencyConverter.getCurrencySymbol(currencyCode);
-        
-        Item[] fruits = fruitsCatalog.get();
-        Item[] vegetables = vegetablesCatalog.get();
-        
-        Item[] catalog = new Item[fruits.length + vegetables.length];
-        int i =0;
-        for (Item item: fruits) {
-            double price = Double.valueOf(item.getPrice().substring(1));  
-            price = currencyConverter.getConversion("USD", currencyCode, price);
-            catalog[i++] = new Item(item.getName(), currencySymbol + price);
-        }
-        
-        for (Item item: vegetables) {
-            double price = Double.valueOf(item.getPrice().substring(1));  
-            price = currencyConverter.getConversion("USD", currencyCode, price);
-            catalog[i++] = new Item(item.getName(), currencySymbol + price);
-        }
-        
-        return catalog;
-    }
-
-}
diff --git a/java/sca-contrib/tutorials/store/assets/tutorial.html b/java/sca-contrib/tutorials/store/assets/tutorial.html
deleted file mode 100644
index 14f81e0c22..0000000000
--- a/java/sca-contrib/tutorials/store/assets/tutorial.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<html>
-<!--
- * 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.    
- -->
-<head>
-<title>Apache Tuscany - Online Store Tutorial</title>
-</head>
-
-<body>
-<h1>Apache Tuscany - Online Store Tutorial
-<h2><a href="http://localhost:9990/ui/home">Online Store - SCA Domain</a>
-<h2><a href="http://localhost:8100/ui/store.html">Online Store - Fruits</a>
-<h2><a href="http://localhost:8200/VegetablesCatalogWebService?wsdl">Vegetables Catalog Web Service</a>
-<h2><a href="http://localhost:8101/ui/store.html">Merger - Fruits and Vegetables</a>
-<h2><a href="http://localhost:8102/ui/store.html">Online Store - Cart Database</a>
-<h2><a href="http://localhost:8103/ui/store.html">Online Store - Supplier</a>
-<h2><a href="http://localhost:8105/ui/store.html">Online Store - Marketplace</a> 
-<h2><a href="http://localhost:8333/CatalogWebService?wsdl">Merged Catalog Web Service</a>
-<h2><a href="http://localhost:8104/ui/store-eu.html">EU Online Store</a>
-<h2><a href="http://localhost:8106/mashup/store-mash.html">Online Store Mashup</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/assets/uiservices/store.html b/java/sca-contrib/tutorials/store/assets/uiservices/store.html
deleted file mode 100644
index f2425b4885..0000000000
--- a/java/sca-contrib/tutorials/store/assets/uiservices/store.html
+++ /dev/null
@@ -1,159 +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.    
--->
-<html>
-<head>
-<title>Store</title>
-
-<script type="text/javascript" src="store.js"></script>
-
-<script language="JavaScript">
-
-	//@Reference
-	var catalog = new Reference("catalog");
-	
-	//@Reference
-	var shoppingCart = new Reference("shoppingCart");
-
-	//@Reference
-	var shoppingTotal = new Reference("shoppingTotal");
-	
-	var catalogItems;
-
-	function catalog_getResponse(items,exception) {
-		if(exception){
-			alert(exception.message);
-			return;
-		}
-		var catalog = "";
-		for (var i=0; i<items.length; i++) {
-			var item = items[i].name + ' - ' + items[i].price;
-			catalog += '<input name="items" type="checkbox" value="' + 
-						item + '">' + item + ' <br>';
-		}
-		document.getElementById('catalog').innerHTML=catalog;
-		catalogItems = items;
-	}
-	
-	function shoppingCart_getResponse(feed) {
-		if (feed != null) {
-			var entries = feed.getElementsByTagName("entry");              
-			var list = "";
-			for (var i=0; i<entries.length; i++) {
-				var content = entries[i].getElementsByTagName("content")[0];
-				var name = content.getElementsByTagName("name")[0].firstChild.nodeValue;
-				var price = content.getElementsByTagName("price")[0].firstChild.nodeValue;
-				list += name + ' - ' + price + ' <br>';
-			}
-			document.getElementById("shoppingCart").innerHTML = list;
-
-			if (entries.length != 0) {
-				try {
-					shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
-				}
-				catch(e) {
-					alert(e);
-				}
-			}
-		}
-	}
-	
-	function shoppingTotal_getTotalResponse(total,exception) {
-		if(exception){
-			alert(exception.message);
-			return;
-		}
-		document.getElementById('total').innerHTML = total;
-	}
-	
-	function shoppingCart_postResponse(entry) {
-		shoppingCart.get("", shoppingCart_getResponse);
-	}				
-
-	function addToCart() {
-		var items  = document.catalogForm.items;
-		var j = 0;
-		for (var i=0; i<items.length; i++)
-			if (items[i].checked) {
-				var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>item</title><content type="text/xml">' +
-                	'<Item xmlns="http://services/">' +
-                	'<name xmlns="">' + catalogItems[i].name + '</name>' + '<price xmlns="">' + catalogItems[i].price + '</price>' +
-                 	'</Item>' + '</content></entry>';
-				shoppingCart.post(entry, shoppingCart_postResponse);
-				items[i].checked = false;
-			}
-	}
-	function checkoutCart() {
-		document.getElementById('store').innerHTML='<h2>' +
-				'Thanks for Shopping With Us!</h2>'+
-				'<h2>Your Order</h2>'+
-				'<form name="orderForm">'+
-					document.getElementById('shoppingCart').innerHTML+
-					'<br>'+
-					document.getElementById('total').innerHTML+
-					'<br>'+
-					'<br>'+
-					'<input type="submit" value="Continue Shopping">'+ 
-				'</form>';
-		shoppingCart.del("", null);
-	}
-	function deleteCart() {
-		shoppingCart.del("", null);
-		document.getElementById('shoppingCart').innerHTML = "";
-		document.getElementById('total').innerHTML = "";	
-	}	
-
-	function init() {
-		try {
-			catalog.get(catalog_getResponse);
-			shoppingCart.get("", shoppingCart_getResponse);
-		}
-		catch(e) {
-			alert(e);
-		}
-	}
-	
-</script>
-
-</head>
-
-<body onload="init()">
-<h1>Store</h1>
-  <div id="store">
-   	<h2>Catalog</h2>
-   	<form name="catalogForm">
-		<div id="catalog" ></div>
-		<br>
-		<input type="button" onClick="addToCart()"  value="Add to Cart">
-   	</form>
- 
- 	<br>
-  
-   	<h2>Your Shopping Cart</h2>
-   	<form name="shoppingCartForm">
-		<div id="shoppingCart"></div>
-		<br>
-		<div id="total"></div>
-		<br>		
-		<input type="button" onClick="checkoutCart()" value="Checkout"> 
-		<input type="button" onClick="deleteCart()" value="Empty">     
-	   	<a href="../ShoppingCart/Cart/">(feed)</a>
-	</form>    
-  </div>
-</body>
-</html>
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/pom.xml b/java/sca-contrib/tutorials/store/catalog-ejb/pom.xml
deleted file mode 100644
index 8e8b17cecb..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/pom.xml
+++ /dev/null
@@ -1,107 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-tutorial-store</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>tutorial-catalog-ejb</artifactId>

-    <name>Apache Tuscany SCA Store Tutorial Catalog EJB</name>

-    <packaging>jar</packaging>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.geronimo.specs</groupId>

-            <artifactId>geronimo-ejb_3.0_spec</artifactId>

-            <version>1.0</version>

-            <scope>provided</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.geronimo.modules</groupId>

-            <artifactId>geronimo-openejb</artifactId>

-            <version>2.1.1</version>

-            <scope>test</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.geronimo.modules</groupId>

-                    <artifactId>geronimo-connector</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.apache.geronimo.modules</groupId>

-                    <artifactId>geronimo-persistence-jpa10</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.apache.openejb</groupId>

-                    <artifactId>openejb-ejbd</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.apache.openejb</groupId>

-                    <artifactId>openejb-server</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.apache.openejb</groupId>

-                    <artifactId>openejb-loader</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.apache.openejb</groupId>

-                    <artifactId>openejb-jee</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.apache.openejb</groupId>

-                    <artifactId>openejb-ejbd</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.apache.openejb</groupId>

-                    <artifactId>openejb-javaagent</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>com.sun.xml.bind</groupId>

-                    <artifactId>jaxb-impl</artifactId>

-                </exclusion>                

-            </exclusions>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-        <resources>

-            <resource>

-                <directory>${pom.basedir}/src/main/resources</directory>

-                <filtering>true</filtering>

-            </resource>

-        </resources>

-    </build>

-

-</project>

-

diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java b/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
deleted file mode 100644
index c7ad31b682..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
+++ /dev/null
@@ -1,28 +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 services.ejb;
-
-import javax.ejb.EJBHome;
-
-public interface CatalogEJBHome extends EJBHome {
-
-    CatalogEJBRemote create() throws javax.ejb.CreateException, java.rmi.RemoteException;
-    
-}
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java b/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
deleted file mode 100644
index 7e79fc8b9d..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
+++ /dev/null
@@ -1,28 +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 services.ejb;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBObject;
-
-public interface CatalogEJBRemote extends EJBObject {
-    Vegetable[] get() throws RemoteException;
-}
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java b/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java
deleted file mode 100644
index cf81539ba5..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java
+++ /dev/null
@@ -1,54 +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 services.ejb;

-

-import java.io.Serializable;

-

-public class Vegetable implements Serializable {

-    private static final long serialVersionUID = -5847326138627338217L;

-    

-    private String name;

-    private String price;

-    

-    public Vegetable() {

-    }

-    

-    public Vegetable(String name, String price) {

-        this.name = name;

-        this.price = price;

-    }

-    

-    public String getName() {

-        return name;

-    }

-    

-    public void setName(String name) {

-        this.name = name;

-    }

-    

-    public String getPrice() {

-        return price;

-    }

-    

-    public void setPrice(String price) {

-        this.price = price;

-    }

-

-}

diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java b/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
deleted file mode 100644
index ff2004fe1b..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
+++ /dev/null
@@ -1,62 +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 services.ejb;

-

-import java.rmi.RemoteException;

-import java.util.ArrayList;

-import java.util.List;

-

-import javax.ejb.CreateException;

-import javax.ejb.EJBException;

-import javax.ejb.SessionBean;

-import javax.ejb.SessionContext;

-

-public class VegetablesCatalogEJBSessionBean implements SessionBean {

-    private static final long serialVersionUID = -7421020241291271838L;

-    

-    private List<Vegetable> catalog = new ArrayList<Vegetable>();

- 

-    public VegetablesCatalogEJBSessionBean() {

-        catalog.add(new Vegetable("Broccoli", "$2.99"));

-        catalog.add(new Vegetable("Asparagus", "$3.55"));

-        catalog.add(new Vegetable("Cauliflower", "$1.55"));

-    }

-

-    public Vegetable[] get() {   

-        Vegetable[] catalogArray = new Vegetable[catalog.size()];

-        catalog.toArray(catalogArray);

-        return catalogArray;

-    }

-    

-    public void ejbCreate() throws CreateException {

-    }

-    

-    public void ejbActivate() throws EJBException, RemoteException {

-    }

-    

-    public void ejbPassivate() throws EJBException, RemoteException {

-    }

-    

-    public void ejbRemove() throws EJBException, RemoteException {

-    }

-    

-    public void setSessionContext(SessionContext arg0) throws EJBException, RemoteException {

-    }

-}

diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml b/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index a0a7adf6fa..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ /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.
--->
-<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-    http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
-    version="2.1">
-
-    <display-name>Apache Tuscany SCA Tutorial Catalog EJB</display-name>
-    <enterprise-beans>
-        <session id="VegetablesCatalogEJB">
-            <ejb-name>VegetablesCatalogEJB</ejb-name>
-            <home>services.ejb.CatalogEJBHome</home>
-            <remote>services.ejb.CatalogEJBRemote</remote>
-            <ejb-class>services.ejb.VegetablesCatalogEJBSessionBean</ejb-class>
-            <session-type>Stateless</session-type>
-            <transaction-type>Container</transaction-type>
-        </session>
-    </enterprise-beans>
-</ejb-jar>
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml b/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
deleted file mode 100644
index 04d77ee39e..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
+++ /dev/null
@@ -1,78 +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.

--->

-<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"

-    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">

-    <sys:environment>

-        <sys:moduleId>

-            <sys:groupId>${pom.groupId}</sys:groupId>

-            <sys:artifactId>${pom.artifactId}</sys:artifactId>

-            <sys:version>${version}</sys:version>

-            <sys:type>jar</sys:type>

-        </sys:moduleId>

-        <sys:dependencies>

-            <sys:dependency>

-                <sys:groupId>org.apache.geronimo.configs</sys:groupId>

-                <sys:artifactId>j2ee-corba-yoko</sys:artifactId>

-                <!-- 

-                <sys:version>2.0.2</sys:version>

-                 -->

-                <sys:type>car</sys:type>

-            </sys:dependency>

-        </sys:dependencies>

-        <sys:hidden-classes />

-        <sys:non-overridable-classes />

-    </sys:environment>

-

-    <enterprise-beans>

-        <session>

-            <ejb-name>VegetablesCatalogEJB</ejb-name>

-            <jndi-name>VegetablesCatalogEJB</jndi-name>

-            <tss-link>IdentityTokenNoSecurity</tss-link>

-        </session>

-    </enterprise-beans>

-

-    <!--

-        NOTE: for geronimo 2.0.2, please make sure the following system module is started

-        before the deployment of the EJB jar 

-        org.apache.geronimo.configs/openejb-corba-deployer/2.0.2/car   

-    -->

-    <gbean name="IdentityTokenNoSecurity" class="org.apache.geronimo.corba.TSSBean">

-        <attribute name="POAName">IdentityTokenNoSecurity</attribute>

-        <reference name="Server">

-            <name>UnprotectedServer</name>

-        </reference>

-        <xml-attribute name="tssConfig">

-            <tss:tss xmlns:tss="http://openejb.apache.org/xml/ns/corba-tss-config-2.1"

-                xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2">

-                <tss:compoundSecMechTypeList>

-                    <tss:compoundSecMech>

-                        <tss:sasMech>

-                            <tss:identityTokenTypes>

-                                <tss:ITTAnonymous />

-                                <tss:ITTPrincipalNameGSSUP

-                                    principal-class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" />

-                                <tss:ITTDistinguishedName />

-                                <tss:ITTX509CertChain />

-                            </tss:identityTokenTypes>

-                        </tss:sasMech>

-                    </tss:compoundSecMech>

-                </tss:compoundSecMechTypeList>

-            </tss:tss>

-        </xml-attribute>

-    </gbean>

-</openejb-jar>

diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 2e46b31047..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-   xmlns:c="http://catalog">
-   <export.java package="services.ejb"/>
-   <deployable composite="c:catalog-ejb"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType b/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
deleted file mode 100644
index bc57b35e79..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
+++ /dev/null
@@ -1,26 +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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
-    <service name="CatalogEJB">
-        <interface.java interface="services.ejb.CatalogEJBRemote"/>
-    </service> 
-
-</componentType>
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite b/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite
deleted file mode 100644
index f733524809..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.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"
-   targetNamespace="http://catalog"
-   name="catalog-ejb">
-
-    <component name="VegetablesCatalogEJB">
-        <implementation.ejb ejb-link="tutorial-catalog-ejb.jar#VegetablesCatalogEJB"/>
-        <service name="CatalogEJB">
-            <binding.ejb uri="/VegetablesCatalogEJB"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java b/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
deleted file mode 100644
index f9bd16f050..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
+++ /dev/null
@@ -1,67 +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 client;
-
-import javax.naming.InitialContext;
-import javax.rmi.PortableRemoteObject;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import services.ejb.CatalogEJBHome;
-import services.ejb.CatalogEJBRemote;
-import services.ejb.Vegetable;
-
-/**
- * A test client for the catalog EJB. 
- *
- * @version $Rev$ $Date$
- */
-public class CatalogEJBClientTestCase {
-
-    @Test
-    @Ignore // Ignore the test case for maven build, remove it if you want to run
-    public void testCatalogEJB() throws Exception {
-        InitialContext context = new InitialContext();
-
-        Object o = context.lookup("corbaname:iiop:1.2@localhost:1050#VegetablesCatalogEJB");
-
-        // The narrow(...) call requires generated EJB stubs. Tuscany binding.ejb doesn't the stubs
-        CatalogEJBHome home = (CatalogEJBHome)PortableRemoteObject.narrow(o, CatalogEJBHome.class);
-
-        // The following call will hang with SUN jdk1.6.0_05, please use SUN or IBM jdk 1.5.x instead
-        CatalogEJBRemote catalog = home.create();
-
-        Vegetable items[] = catalog.get();
-        for (Vegetable item : items) {
-            System.out.println(item.getName() + " " + item.getPrice());
-        }
-    }
-
-    public static void main(String args[]) throws Exception {
-        String javaVersion = System.getProperty("java.version");
-        String javaVendor = System.getProperty("java.vendor");
-
-        if (javaVendor.toUpperCase().contains("SUN") && javaVersion.startsWith("1.6.")) {
-            System.err.println("The EJB invocation may hang due to a bug in " + javaVendor + ":" + javaVersion);
-        }
-        new CatalogEJBClientTestCase().testCatalogEJB();
-    }
-
-}
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java b/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
deleted file mode 100644
index 6930093042..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
+++ /dev/null
@@ -1,223 +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.    
- */
-// Stub class generated by rmic, do not edit.
-// Contents subject to change without notice.
-
-package org.omg.stub.javax.ejb;
-
-import java.rmi.RemoteException;
-import java.rmi.UnexpectedException;
-
-import javax.ejb.EJBHome;
-import javax.ejb.EJBMetaData;
-import javax.ejb.Handle;
-import javax.ejb.HomeHandle;
-import javax.ejb.RemoveException;
-import javax.rmi.CORBA.Stub;
-import javax.rmi.CORBA.Util;
-
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.portable.ApplicationException;
-import org.omg.CORBA.portable.OutputStream;
-import org.omg.CORBA.portable.RemarshalException;
-import org.omg.CORBA.portable.ServantObject;
-import org.omg.CORBA_2_3.portable.InputStream;
-
-public class _EJBHome_Stub extends Stub implements EJBHome {
-    
-    private static final String[] _type_ids = {
-        "RMI:javax.ejb.EJBHome:0000000000000000"
-    };
-    
-    public String[] _ids() { 
-        return _type_ids;
-    }
-    
-    public EJBMetaData getEJBMetaData() throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("_get_EJBMetaData", true);
-                        in = (InputStream)_invoke(out);
-                        return (EJBMetaData) in.read_value(EJBMetaData.class);
-                    } catch (ApplicationException ex) {
-                        in = (InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("_get_EJBMetaData",javax.ejb.EJBHome.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    EJBMetaData result = ((javax.ejb.EJBHome)so.servant).getEJBMetaData();
-                    return (EJBMetaData)Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public HomeHandle getHomeHandle() throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("_get_homeHandle", true);
-                        in = (InputStream)_invoke(out);
-                        return (HomeHandle) in.read_abstract_interface(HomeHandle.class);
-                    } catch (ApplicationException ex) {
-                        in = (InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("_get_homeHandle",javax.ejb.EJBHome.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    HomeHandle result = ((javax.ejb.EJBHome)so.servant).getHomeHandle();
-                    return (HomeHandle)Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public void remove(Handle arg0) throws RemoteException, RemoveException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("remove__javax_ejb_Handle", true);
-                        Util.writeAbstractObject(out,arg0);
-                        _invoke(out);
-                        return;
-                    } catch (ApplicationException ex) {
-                        in = (InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        if (id.equals("IDL:javax/ejb/RemoveEx:1.0")) {
-                            throw (RemoveException) in.read_value(RemoveException.class);
-                        }
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("remove__javax_ejb_Handle",javax.ejb.EJBHome.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    Handle arg0Copy = (Handle) Util.copyObject(arg0,_orb());
-                    ((javax.ejb.EJBHome)so.servant).remove(arg0Copy);
-                    return;
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    if (exCopy instanceof RemoveException) {
-                        throw (RemoveException)exCopy;
-                    }
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public void remove(Object arg0) throws RemoteException, RemoveException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("remove__java_lang_Object", true);
-                        Util.writeAny(out,arg0);
-                        _invoke(out);
-                        return;
-                    } catch (ApplicationException ex) {
-                        in = (InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        if (id.equals("IDL:javax/ejb/RemoveEx:1.0")) {
-                            throw (RemoveException) in.read_value(RemoveException.class);
-                        }
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("remove__java_lang_Object",javax.ejb.EJBHome.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    Object arg0Copy = (Object) Util.copyObject(arg0,_orb());
-                    ((javax.ejb.EJBHome)so.servant).remove(arg0Copy);
-                    return;
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    if (exCopy instanceof RemoveException) {
-                        throw (RemoveException)exCopy;
-                    }
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java b/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
deleted file mode 100644
index 3482ebb9ec..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
+++ /dev/null
@@ -1,252 +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.    
- */
-// Stub class generated by rmic, do not edit.
-// Contents subject to change without notice.
-
-package org.omg.stub.javax.ejb;
-
-import java.rmi.RemoteException;
-import java.rmi.UnexpectedException;
-
-import javax.ejb.EJBHome;
-import javax.ejb.EJBObject;
-import javax.ejb.Handle;
-import javax.ejb.RemoveException;
-import javax.rmi.CORBA.Stub;
-import javax.rmi.CORBA.Util;
-
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.portable.ApplicationException;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-import org.omg.CORBA.portable.RemarshalException;
-import org.omg.CORBA.portable.ServantObject;
-
-public class _EJBObject_Stub extends Stub implements EJBObject {
-    
-    private static final String[] _type_ids = {
-        "RMI:javax.ejb.EJBObject:0000000000000000"
-    };
-    
-    public String[] _ids() { 
-        return _type_ids;
-    }
-    
-    public EJBHome getEJBHome() throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("_get_EJBHome", true);
-                        in = _invoke(out);
-                        return (EJBHome) in.read_Object(EJBHome.class);
-                    } catch (ApplicationException ex) {
-                        in = ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("_get_EJBHome",javax.ejb.EJBObject.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    EJBHome result = ((javax.ejb.EJBObject)so.servant).getEJBHome();
-                    return (EJBHome)Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public Handle getHandle() throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                org.omg.CORBA_2_3.portable.InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("_get_handle", true);
-                        in = (org.omg.CORBA_2_3.portable.InputStream)_invoke(out);
-                        return (Handle) in.read_abstract_interface(Handle.class);
-                    } catch (ApplicationException ex) {
-                        in = (org.omg.CORBA_2_3.portable.InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("_get_handle",javax.ejb.EJBObject.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    Handle result = ((javax.ejb.EJBObject)so.servant).getHandle();
-                    return (Handle)Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public Object getPrimaryKey() throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("_get_primaryKey", true);
-                        in = _invoke(out);
-                        return Util.readAny(in);
-                    } catch (ApplicationException ex) {
-                        in = ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("_get_primaryKey",javax.ejb.EJBObject.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    Object result = ((javax.ejb.EJBObject)so.servant).getPrimaryKey();
-                    return (Object)Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public boolean isIdentical(EJBObject arg0) throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("isIdentical", true);
-                        Util.writeRemoteObject(out,arg0);
-                        in = _invoke(out);
-                        return in.read_boolean();
-                    } catch (ApplicationException ex) {
-                        in = ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("isIdentical",javax.ejb.EJBObject.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    EJBObject arg0Copy = (EJBObject) Util.copyObject(arg0,_orb());
-                    return ((javax.ejb.EJBObject)so.servant).isIdentical(arg0Copy);
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public void remove() throws RemoteException, RemoveException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                org.omg.CORBA_2_3.portable.InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("remove", true);
-                        _invoke(out);
-                        return;
-                    } catch (ApplicationException ex) {
-                        in = (org.omg.CORBA_2_3.portable.InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        if (id.equals("IDL:javax/ejb/RemoveEx:1.0")) {
-                            throw (RemoveException) in.read_value(RemoveException.class);
-                        }
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("remove",javax.ejb.EJBObject.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    ((javax.ejb.EJBObject)so.servant).remove();
-                    return;
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    if (exCopy instanceof RemoveException) {
-                        throw (RemoveException)exCopy;
-                    }
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java b/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
deleted file mode 100644
index d848fbb280..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
+++ /dev/null
@@ -1,89 +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.    
- */
-// Stub class generated by rmic, do not edit.
-// Contents subject to change without notice.
-
-package org.omg.stub.javax.ejb;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.UnexpectedException;
-
-import javax.ejb.EJBObject;
-import javax.ejb.Handle;
-import javax.rmi.CORBA.Stub;
-import javax.rmi.CORBA.Util;
-
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.portable.ApplicationException;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-import org.omg.CORBA.portable.RemarshalException;
-import org.omg.CORBA.portable.ServantObject;
-
-public class _Handle_Stub extends Stub implements Handle,
-Remote {
-    
-    private static final String[] _type_ids = {
-        "RMI:javax.ejb.Handle:0000000000000000"
-    };
-    
-    public String[] _ids() { 
-        return _type_ids;
-    }
-    
-    public EJBObject getEJBObject() throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("_get_EJBObject", true);
-                        in = _invoke(out);
-                        return (EJBObject) in.read_Object(EJBObject.class);
-                    } catch (ApplicationException ex) {
-                        in = ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("_get_EJBObject",javax.ejb.Handle.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    EJBObject result = ((javax.ejb.Handle)so.servant).getEJBObject();
-                    return (EJBObject)Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java b/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
deleted file mode 100644
index 6efc86b608..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
+++ /dev/null
@@ -1,89 +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.    
- */
-// Stub class generated by rmic, do not edit.
-// Contents subject to change without notice.
-
-package org.omg.stub.javax.ejb;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.UnexpectedException;
-
-import javax.ejb.EJBHome;
-import javax.ejb.HomeHandle;
-import javax.rmi.CORBA.Stub;
-import javax.rmi.CORBA.Util;
-
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.portable.ApplicationException;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-import org.omg.CORBA.portable.RemarshalException;
-import org.omg.CORBA.portable.ServantObject;
-
-public class _HomeHandle_Stub extends Stub implements HomeHandle,
-Remote {
-    
-    private static final String[] _type_ids = {
-        "RMI:javax.ejb.HomeHandle:0000000000000000"
-    };
-    
-    public String[] _ids() { 
-        return _type_ids;
-    }
-    
-    public EJBHome getEJBHome() throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("_get_EJBHome", true);
-                        in = _invoke(out);
-                        return (EJBHome) in.read_Object(EJBHome.class);
-                    } catch (ApplicationException ex) {
-                        in = ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("_get_EJBHome",javax.ejb.HomeHandle.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    EJBHome result = ((javax.ejb.HomeHandle)so.servant).getEJBHome();
-                    return (EJBHome)Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java b/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
deleted file mode 100644
index bdc1a5cfd5..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
+++ /dev/null
@@ -1,269 +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.    
- */
-// Stub class generated by rmic, do not edit.
-// Contents subject to change without notice.
-
-package services.ejb;
-
-import java.rmi.RemoteException;
-import java.rmi.UnexpectedException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBMetaData;
-import javax.ejb.Handle;
-import javax.ejb.HomeHandle;
-import javax.ejb.RemoveException;
-import javax.rmi.CORBA.Stub;
-import javax.rmi.CORBA.Util;
-
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.portable.ApplicationException;
-import org.omg.CORBA.portable.OutputStream;
-import org.omg.CORBA.portable.RemarshalException;
-import org.omg.CORBA.portable.ServantObject;
-import org.omg.CORBA_2_3.portable.InputStream;
-
-public class _CatalogEJBHome_Stub extends Stub implements CatalogEJBHome {
-    
-    private static final String[] _type_ids = {
-        "RMI:services.ejb.CatalogEJBHome:0000000000000000", 
-        "RMI:javax.ejb.EJBHome:0000000000000000"
-    };
-    
-    public String[] _ids() { 
-        return _type_ids;
-    }
-    
-    public EJBMetaData getEJBMetaData() throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("_get_EJBMetaData", true);
-                        in = (InputStream)_invoke(out);
-                        return (EJBMetaData) in.read_value(EJBMetaData.class);
-                    } catch (ApplicationException ex) {
-                        in = (InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("_get_EJBMetaData",javax.ejb.EJBHome.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    EJBMetaData result = ((javax.ejb.EJBHome)so.servant).getEJBMetaData();
-                    return (EJBMetaData)Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public HomeHandle getHomeHandle() throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("_get_homeHandle", true);
-                        in = (InputStream)_invoke(out);
-                        return (HomeHandle) in.read_abstract_interface(HomeHandle.class);
-                    } catch (ApplicationException ex) {
-                        in = (InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("_get_homeHandle",javax.ejb.EJBHome.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    HomeHandle result = ((javax.ejb.EJBHome)so.servant).getHomeHandle();
-                    return (HomeHandle)Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public void remove(Handle arg0) throws RemoteException, RemoveException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("remove__javax_ejb_Handle", true);
-                        Util.writeAbstractObject(out,arg0);
-                        _invoke(out);
-                        return;
-                    } catch (ApplicationException ex) {
-                        in = (InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        if (id.equals("IDL:javax/ejb/RemoveEx:1.0")) {
-                            throw (RemoveException) in.read_value(RemoveException.class);
-                        }
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("remove__javax_ejb_Handle",javax.ejb.EJBHome.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    Handle arg0Copy = (Handle) Util.copyObject(arg0,_orb());
-                    ((javax.ejb.EJBHome)so.servant).remove(arg0Copy);
-                    return;
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    if (exCopy instanceof RemoveException) {
-                        throw (RemoveException)exCopy;
-                    }
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public void remove(Object arg0) throws RemoteException, RemoveException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("remove__java_lang_Object", true);
-                        Util.writeAny(out,arg0);
-                        _invoke(out);
-                        return;
-                    } catch (ApplicationException ex) {
-                        in = (InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        if (id.equals("IDL:javax/ejb/RemoveEx:1.0")) {
-                            throw (RemoveException) in.read_value(RemoveException.class);
-                        }
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("remove__java_lang_Object",javax.ejb.EJBHome.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    Object arg0Copy = (Object) Util.copyObject(arg0,_orb());
-                    ((javax.ejb.EJBHome)so.servant).remove(arg0Copy);
-                    return;
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    if (exCopy instanceof RemoveException) {
-                        throw (RemoveException)exCopy;
-                    }
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public CatalogEJBRemote create() throws CreateException, RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("create", true);
-                        in = (InputStream)_invoke(out);
-                        return (CatalogEJBRemote) in.read_Object(CatalogEJBRemote.class);
-                    } catch (ApplicationException ex) {
-                        in = (InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        if (id.equals("IDL:javax/ejb/CreateEx:1.0")) {
-                            throw (CreateException) in.read_value(CreateException.class);
-                        }
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("create",services.ejb.CatalogEJBHome.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    CatalogEJBRemote result = ((services.ejb.CatalogEJBHome)so.servant).create();
-                    return (CatalogEJBRemote)Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    if (exCopy instanceof CreateException) {
-                        throw (CreateException)exCopy;
-                    }
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java b/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
deleted file mode 100644
index a24108714e..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
+++ /dev/null
@@ -1,292 +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.    
- */
-// Stub class generated by rmic, do not edit.
-// Contents subject to change without notice.
-
-package services.ejb;
-
-import java.rmi.RemoteException;
-import java.rmi.UnexpectedException;
-
-import javax.ejb.EJBHome;
-import javax.ejb.EJBObject;
-import javax.ejb.Handle;
-import javax.ejb.RemoveException;
-import javax.rmi.CORBA.Stub;
-import javax.rmi.CORBA.Util;
-
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.portable.ApplicationException;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
-import org.omg.CORBA.portable.RemarshalException;
-import org.omg.CORBA.portable.ServantObject;
-
-public class _CatalogEJBRemote_Stub extends Stub implements CatalogEJBRemote {
-    
-    private static final String[] _type_ids = {
-        "RMI:services.ejb.CatalogEJBRemote:0000000000000000", 
-        "RMI:javax.ejb.EJBObject:0000000000000000"
-    };
-    
-    public String[] _ids() { 
-        return _type_ids;
-    }
-    
-    public EJBHome getEJBHome() throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("_get_EJBHome", true);
-                        in = _invoke(out);
-                        return (EJBHome) in.read_Object(EJBHome.class);
-                    } catch (ApplicationException ex) {
-                        in = ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("_get_EJBHome",javax.ejb.EJBObject.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    EJBHome result = ((javax.ejb.EJBObject)so.servant).getEJBHome();
-                    return (EJBHome)Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public Handle getHandle() throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                org.omg.CORBA_2_3.portable.InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("_get_handle", true);
-                        in = (org.omg.CORBA_2_3.portable.InputStream)_invoke(out);
-                        return (Handle) in.read_abstract_interface(Handle.class);
-                    } catch (ApplicationException ex) {
-                        in = (org.omg.CORBA_2_3.portable.InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("_get_handle",javax.ejb.EJBObject.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    Handle result = ((javax.ejb.EJBObject)so.servant).getHandle();
-                    return (Handle)Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public Object getPrimaryKey() throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("_get_primaryKey", true);
-                        in = _invoke(out);
-                        return Util.readAny(in);
-                    } catch (ApplicationException ex) {
-                        in = ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("_get_primaryKey",javax.ejb.EJBObject.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    Object result = ((javax.ejb.EJBObject)so.servant).getPrimaryKey();
-                    return (Object)Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public boolean isIdentical(EJBObject arg0) throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("isIdentical", true);
-                        Util.writeRemoteObject(out,arg0);
-                        in = _invoke(out);
-                        return in.read_boolean();
-                    } catch (ApplicationException ex) {
-                        in = ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("isIdentical",javax.ejb.EJBObject.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    EJBObject arg0Copy = (EJBObject) Util.copyObject(arg0,_orb());
-                    return ((javax.ejb.EJBObject)so.servant).isIdentical(arg0Copy);
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public void remove() throws RemoteException, RemoveException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                org.omg.CORBA_2_3.portable.InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("remove", true);
-                        _invoke(out);
-                        return;
-                    } catch (ApplicationException ex) {
-                        in = (org.omg.CORBA_2_3.portable.InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        if (id.equals("IDL:javax/ejb/RemoveEx:1.0")) {
-                            throw (RemoveException) in.read_value(RemoveException.class);
-                        }
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("remove",javax.ejb.EJBObject.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    ((javax.ejb.EJBObject)so.servant).remove();
-                    return;
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    if (exCopy instanceof RemoveException) {
-                        throw (RemoveException)exCopy;
-                    }
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-    
-    public Vegetable[] get() throws RemoteException {
-        while(true) {
-            if (!Util.isLocal(this)) {
-                org.omg.CORBA_2_3.portable.InputStream in = null;
-                try {
-                    try {
-                        OutputStream out = _request("get", true);
-                        in = (org.omg.CORBA_2_3.portable.InputStream)_invoke(out);
-                        return (Vegetable[]) in.read_value(Vegetable[].class);
-                    } catch (ApplicationException ex) {
-                        in = (org.omg.CORBA_2_3.portable.InputStream) ex.getInputStream();
-                        String id = in.read_string();
-                        throw new UnexpectedException(id);
-                    } catch (RemarshalException ex) {
-                        continue;
-                    }
-                } catch (SystemException ex) {
-                    throw Util.mapSystemException(ex);
-                } finally {
-                    _releaseReply(in);
-                }
-            } else {
-                ServantObject so = _servant_preinvoke("get",services.ejb.CatalogEJBRemote.class);
-                if (so == null) {
-                    continue;
-                }
-                try {
-                    Vegetable[] result = ((services.ejb.CatalogEJBRemote)so.servant).get();
-                    return (Vegetable[])Util.copyObject(result,_orb());
-                } catch (Throwable ex) {
-                    Throwable exCopy = (Throwable)Util.copyObject(ex,_orb());
-                    throw Util.wrapException(exCopy);
-                } finally {
-                    _servant_postinvoke(so);
-                }
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml
deleted file mode 100644
index 88950bf740..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml
+++ /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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-   xmlns:c="http://catalog">
-   <import.java package="services"/>
-   <import.java package="services.ejb"/>
-   <deployable composite="c:catalog-mediation"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/catalog-mediation/catalog-mediation.composite b/java/sca-contrib/tutorials/store/catalog-mediation/catalog-mediation.composite
deleted file mode 100644
index d832e88acc..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-mediation/catalog-mediation.composite
+++ /dev/null
@@ -1,34 +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://catalog"
-   name="catalog-mediation">
-
-    <component name="MediatedVegetablesCatalog">
-        <implementation.java class="services.mediation.VegetablesCatalogMediationImpl"/>
-        <service name="Catalog">
-            <binding.ws/>
-        </service>
-        <reference name="catalog" target="VegetablesCatalogEJB">
-            <binding.ejb/>
-        </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/catalog-mediation/pom.xml b/java/sca-contrib/tutorials/store/catalog-mediation/pom.xml
deleted file mode 100644
index 8c508f2224..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-mediation/pom.xml
+++ /dev/null
@@ -1,91 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-catalog-mediation</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Catalog Mediation</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tutorial-assets</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tutorial-catalog-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java b/java/sca-contrib/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
deleted file mode 100644
index 2271034dae..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
+++ /dev/null
@@ -1,51 +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 services.mediation;
-
-import java.rmi.RemoteException;
-
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-import services.Catalog;
-import services.Item;
-import services.ejb.CatalogEJBRemote;
-import services.ejb.Vegetable;
-
-public class VegetablesCatalogMediationImpl implements Catalog {
-
-    @Reference
-    public CatalogEJBRemote catalog;
-    
-    public Item[] get() {
-        Vegetable[] vegetables;
-        try {
-            vegetables = catalog.get();
-        } catch (RemoteException e) {
-            throw new ServiceRuntimeException(e);
-        }
-        Item[] items = new Item[vegetables.length];
-        for (int i = 0; i < vegetables.length; i++) {
-            items[i] = new Item(vegetables[i].getName(), vegetables[i].getPrice());
-        }
-        return items;
-    }
-    
-}
diff --git a/java/sca-contrib/tutorials/store/catalog-webapp/catalog-web.composite b/java/sca-contrib/tutorials/store/catalog-webapp/catalog-web.composite
deleted file mode 100644
index 3ba76da078..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-webapp/catalog-web.composite
+++ /dev/null
@@ -1,43 +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://catalog"
-    name="catalog-web">
-   
-    <component name="WebFruitsCatalog">
-        <implementation.java class="services.FruitsCatalogImpl"/>
-        <service name="Catalog">
-            <binding.ws/>
-        </service> 
-        <property name="currencyCode">USD</property>
-        <reference name="currencyConverter" target="CurrencyConverterWebService">
-        	<binding.ws/>
-        </reference>   
-    </component>     
-
-    <component name="LocalFruitsCatalog">
-        <implementation.java class="services.FruitsCatalogImpl"/>
-        <property name="currencyCode">USD</property>
-        <reference name="currencyConverter" target="CurrencyConverterWebService">
-        	<binding.ws/>
-        </reference>   
-    </component>     
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/catalog-webapp/pom.xml b/java/sca-contrib/tutorials/store/catalog-webapp/pom.xml
deleted file mode 100644
index a07d468892..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-webapp/pom.xml
+++ /dev/null
@@ -1,110 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-tutorial-store</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tutorial-catalog-webapp</artifactId>

-    <name>Apache Tuscany SCA Store Tutorial Catalog WAR Contribution</name>

-    <packaging>war</packaging>

-

-    <repositories>

-       <repository>

-          <id>apache.incubator</id>

-          <url>http://people.apache.org/repo/m2-incubating-repository</url>

-       </repository>

-    </repositories>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tutorial-assets</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-launcher</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-       <sourceDirectory>${basedir}</sourceDirectory>

-       <resources>

-          <resource>

-              <directory>${basedir}</directory>

-              <excludes>

-                  <exclude>**/*.java</exclude>

-                  <exclude>**/.*/**</exclude>

-                  <exclude>pom.xml</exclude>

-                  <exclude>build.xml</exclude>

-                  <exclude>target/**</exclude>

-                  <exclude>webapp/**</exclude>

-                  <exclude>target/**</exclude>

-              </excludes>

-          </resource>

-       </resources>

-       

-       <plugins>

-             <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-war-plugin</artifactId>

-                <configuration>

-                  <warSourceDirectory>webapp</warSourceDirectory>  

-                </configuration>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.tuscany.sca</groupId>

-                <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>2.0-SNAPSHOT</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-       </plugins>

-    </build>

-

-</project>

diff --git a/java/sca-contrib/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 7f06dc7ccb..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-   xmlns:c="http://catalog">

-   <import.java package="services"/>
-   <deployable composite="c:catalog-web"/>

-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml b/java/sca-contrib/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml
deleted file mode 100644
index e08d617dad..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<!--

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

--->

-

-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web

-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">

-<web-app>

-

-  <display-name>Fruit Catalog</display-name>

-  
-  <filter>
-    <filter-name>tuscany</filter-name> 
-    <filter-class>org.apache.tuscany.sca.node.launcher.NodeServletFilter</filter-class> 
-  </filter>
-
-  <filter-mapping>
-    <filter-name>tuscany</filter-name> 
-    <url-pattern>/*</url-pattern> 
-  </filter-mapping>
-
-  <welcome-file-list id="WelcomeFileList">

-    <welcome-file>catalog.jsp</welcome-file>

-  </welcome-file-list>

-

-</web-app>

diff --git a/java/sca-contrib/tutorials/store/catalog-webapp/webapp/catalog.jsp b/java/sca-contrib/tutorials/store/catalog-webapp/webapp/catalog.jsp
deleted file mode 100644
index dcee7c33f4..0000000000
--- a/java/sca-contrib/tutorials/store/catalog-webapp/webapp/catalog.jsp
+++ /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.
---%>

-

-<%@ page import="org.apache.tuscany.sca.node.SCAClient"%>
-<%@ page import="services.Catalog" %>
-<%@page import="services.Item"%>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-
-<%
-  
-  SCAClient client = (SCAClient) application.getAttribute("org.apache.tuscany.sca.node.SCAClient");
-   
-  Catalog catalog = (Catalog)client.getService(Catalog.class, "LocalFruitsCatalog");
-  Item[] items = catalog.get();
-  
-%>
-
-<html>
-<head><title>Catalog</title></head>
-
-<body>
-<h1>Catalog</h1>
-
-<table border="0">
-
-<% for (int i = 0, n = items.length; i < n; i++) { %>
-
-    <tr><td><%=items[i].getName() %></td><td><%=items[i].getPrice() %></td></tr>
-
-<% } %>
-
-</table>
-
-</body>
-</html>

diff --git a/java/sca-contrib/tutorials/store/domain/cloud.composite b/java/sca-contrib/tutorials/store/domain/cloud.composite
deleted file mode 100644
index 8f879c5261..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud.composite
+++ /dev/null
@@ -1,36 +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 name="cloud"
-  targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0/"
-  xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
-  <include name="ns2:CurrencyNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:CatalogsNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreMergerNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreClientNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreDBNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreSupplierNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreEUNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreMashupNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreMarketNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>   
-  <include name="ns2:CatalogWebAppNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:CatalogMediationNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:CatalogEJBNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/CatalogEJBNode.composite b/java/sca-contrib/tutorials/store/domain/cloud/CatalogEJBNode.composite
deleted file mode 100644
index 02e83d4c8d..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud/CatalogEJBNode.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"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://tuscany.apache.org/cloud"
-		xmlns:c="http://catalog"
-		name="CatalogEJBNode">
-
-	<component name="CatalogEJBNode">
-		<t:implementation.node uri="catalog-ejb" composite="c:catalog-ejb"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8080"/>
-			<!-- <binding.ejb uri="corbaname:iiop:1.2@localhost:2809/NameServiceServerRoot#"/> -->
-			<binding.ejb uri="corbaname:iiop:1.2@localhost:1050#"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/CatalogMediationNode.composite b/java/sca-contrib/tutorials/store/domain/cloud/CatalogMediationNode.composite
deleted file mode 100644
index bac96d9781..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud/CatalogMediationNode.composite
+++ /dev/null
@@ -1,33 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://tuscany.apache.org/cloud"
-		xmlns:c="http://catalog"
-		name="CatalogMediationNode">
-
-	<component name="CatalogMediationNode">
-		<t:implementation.node uri="catalog-mediation" composite="c:catalog-mediation"/>
-		<service name="Node">
-			<binding.ws uri="http://localhost:8105"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/CatalogWebAppNode.composite b/java/sca-contrib/tutorials/store/domain/cloud/CatalogWebAppNode.composite
deleted file mode 100644
index f3ed2dfdd5..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud/CatalogWebAppNode.composite
+++ /dev/null
@@ -1,36 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-	xmlns:c="http://catalog"
-	targetNamespace="http://tuscany.apache.org/cloud"
-	name="CatalogWebAppNode">
-
-	<component name="CatalogWebAppNode">
-		<t:implementation.node uri="catalog-webapp" composite="c:catalog-web" />
-		<service name="Node">
-			<binding.ws uri="http://localhost:8080/CatalogWebAppNode" />
-			<t:binding.http uri="http://localhost:8080/CatalogWebAppNode" />
-			<t:binding.jsonrpc uri="http://localhost:8080/CatalogWebAppNode" />
-			<t:binding.atom uri="http://localhost:8080/CatalogWebAppNode" />
-		</service>
-	</component>
-	
-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/CatalogsNode.composite b/java/sca-contrib/tutorials/store/domain/cloud/CatalogsNode.composite
deleted file mode 100644
index 3a5ec770cb..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud/CatalogsNode.composite
+++ /dev/null
@@ -1,33 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://tuscany.apache.org/cloud"
-		xmlns:c="http://services"
-		name="CatalogsNode">
-
-	<component name="CatalogsNode">
-		<t:implementation.node uri="web-services" composite="c:catalogs"/>
-		<service name="Node">
-			<binding.ws uri="http://localhost:8200"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/CurrencyNode.composite b/java/sca-contrib/tutorials/store/domain/cloud/CurrencyNode.composite
deleted file mode 100644
index ed80268f22..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud/CurrencyNode.composite
+++ /dev/null
@@ -1,33 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://tuscany.apache.org/cloud"
-		xmlns:c="http://services"
-		name="CurrencyNode">
-
-	<component name="CurrencyNode">
-		<t:implementation.node uri="web-services" composite="c:currency"/>
-		<service name="Node">
-			<binding.ws uri="http://localhost:8201"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreClientNode.composite b/java/sca-contrib/tutorials/store/domain/cloud/StoreClientNode.composite
deleted file mode 100644
index 91948b5476..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreClientNode.composite
+++ /dev/null
@@ -1,33 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://tuscany.apache.org/cloud"
-		xmlns:s="http://store"
-		name="StoreClientNode">
-
-	<component name="StoreClientNode">
-		<t:implementation.node uri="store-client" composite="s:store-client"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8107"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreDBNode.composite b/java/sca-contrib/tutorials/store/domain/cloud/StoreDBNode.composite
deleted file mode 100644
index 9b09bd7344..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreDBNode.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"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://tuscany.apache.org/cloud"
-		xmlns:s="http://store"
-		name="StoreDBNode">
-
-	<component name="StoreDBNode">
-		<t:implementation.node uri="store-db" composite="s:store-db"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8102"/>
-			<t:binding.jsonrpc uri="http://localhost:8102"/>
-			<t:binding.atom uri="http://localhost:8102"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreEUNode.composite b/java/sca-contrib/tutorials/store/domain/cloud/StoreEUNode.composite
deleted file mode 100644
index 6a50de56d5..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreEUNode.composite
+++ /dev/null
@@ -1,36 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://tuscany.apache.org/cloud"
-		xmlns:s="http://store"
-		name="StoreEUNode">
-
-	<component name="StoreEUNode">
-		<t:implementation.node uri="store-eu" composite="s:store-eu"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8104"/>
-			<t:binding.jsonrpc uri="http://localhost:8104"/>
-			<t:binding.atom uri="http://localhost:8104"/>
-			<binding.ws uri="http://localhost:8444"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreMarketNode.composite b/java/sca-contrib/tutorials/store/domain/cloud/StoreMarketNode.composite
deleted file mode 100644
index 1bdd994c2b..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreMarketNode.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"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://tuscany.apache.org/cloud"
-		xmlns:s="http://store"
-		name="StoreMarketNode">
-
-	<component name="StoreMarketNode">
-		<t:implementation.node uri="store-market" composite="s:store-market"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8107"/>
-			<t:binding.jsonrpc uri="http://localhost:8107"/>
-			<t:binding.atom uri="http://localhost:8107"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreMashupNode.composite b/java/sca-contrib/tutorials/store/domain/cloud/StoreMashupNode.composite
deleted file mode 100644
index 0db43df8c3..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreMashupNode.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"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://tuscany.apache.org/cloud"
-		xmlns:s="http://store"
-		name="StoreMashupNode">
-
-	<component name="StoreMashupNode">
-		<t:implementation.node uri="store-mashup" composite="s:store-mashup"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8106"/>
-			<t:binding.jsonrpc uri="http://localhost:8106"/>
-			<t:binding.atom uri="http://localhost:8106"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreMergerNode.composite b/java/sca-contrib/tutorials/store/domain/cloud/StoreMergerNode.composite
deleted file mode 100644
index 0ce6e6a231..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreMergerNode.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"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://tuscany.apache.org/cloud"
-		xmlns:s="http://store"
-		name="StoreMergerNode">
-
-	<component name="StoreMergerNode">
-		<t:implementation.node uri="store-merger" composite="s:store-merger"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8101"/>
-			<t:binding.jsonrpc uri="http://localhost:8101"/>
-			<t:binding.atom uri="http://localhost:8101"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreNode.composite b/java/sca-contrib/tutorials/store/domain/cloud/StoreNode.composite
deleted file mode 100644
index e2b61a98e1..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreNode.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"
-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://tuscany.apache.org/cloud"
-		xmlns:s="http://store"
-		name="StoreNode">
-
-	<component name="StoreNode">
-		<t:implementation.node uri="store" composite="s:store"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8100"/>
-			<t:binding.jsonrpc uri="http://localhost:8100"/>
-			<t:binding.atom uri="http://localhost:8100"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreSupplierNode.composite b/java/sca-contrib/tutorials/store/domain/cloud/StoreSupplierNode.composite
deleted file mode 100644
index df46bb8813..0000000000
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreSupplierNode.composite
+++ /dev/null
@@ -1,36 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://tuscany.apache.org/cloud"
-		xmlns:s="http://store"
-		name="StoreSupplierNode">
-
-	<component name="StoreSupplierNode">
-		<t:implementation.node uri="store-supplier" composite="s:store-supplier"/>
-		<service name="Node">
-			<t:binding.http uri="http://localhost:8103"/>
-			<t:binding.jsonrpc uri="http://localhost:8103"/>
-			<t:binding.atom uri="http://localhost:8103"/>
-			<binding.ws uri="http://localhost:8333"/>
-		</service>
-	</component> 
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/domain.composite b/java/sca-contrib/tutorials/store/domain/domain.composite
deleted file mode 100644
index 8d47697df8..0000000000
--- a/java/sca-contrib/tutorials/store/domain/domain.composite
+++ /dev/null
@@ -1,36 +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 name="domain"
-  targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-  xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
-  <include name="ns2:store" uri="store" xmlns:ns2="http://store"/>
-  <include name="ns2:store-merger" uri="store-merger" xmlns:ns2="http://store"/>
-  <include name="ns2:store-client" uri="store-client" xmlns:ns2="http://store"/>
-  <include name="ns2:store-db" uri="store-db" xmlns:ns2="http://store"/>
-  <include name="ns2:store-supplier" uri="store-supplier" xmlns:ns2="http://store"/>
-  <include name="ns2:store-market" uri="store-market" xmlns:ns2="http://store"/> 
-  <include name="ns2:store-eu" uri="store-eu" xmlns:ns2="http://store"/>
-  <include name="ns2:store-mashup" uri="store-mashup" xmlns:ns2="http://store"/>
-  <include name="ns2:catalogs" uri="web-services" xmlns:ns2="http://services"/>
-  <include name="ns2:currency" uri="web-services" xmlns:ns2="http://services"/>
-  <include name="ns2:catalog-web" uri="catalog-webapp" xmlns:ns2="http://catalog"/>
-  <include name="ns2:catalog-mediation" uri="catalog-mediation" xmlns:ns2="http://catalog"/>
-  <include name="ns2:catalog-ejb" uri="catalog-ejb" xmlns:ns2="http://catalog"/>
-</composite>
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchCatalogMediationNode.java b/java/sca-contrib/tutorials/store/domain/launch/LaunchCatalogMediationNode.java
deleted file mode 100644
index 4e0772d211..0000000000
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchCatalogMediationNode.java
+++ /dev/null
@@ -1,28 +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 launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchCatalogMediationNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/CatalogMediationNode"});
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchCatalogsNode.java b/java/sca-contrib/tutorials/store/domain/launch/LaunchCatalogsNode.java
deleted file mode 100644
index a0c04a2f34..0000000000
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchCatalogsNode.java
+++ /dev/null
@@ -1,28 +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 launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchCatalogsNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/CatalogsNode"});
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchCurrencyNode.java b/java/sca-contrib/tutorials/store/domain/launch/LaunchCurrencyNode.java
deleted file mode 100644
index d9110f5804..0000000000
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchCurrencyNode.java
+++ /dev/null
@@ -1,28 +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 launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchCurrencyNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/CurrencyNode"});
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreDBNode.java b/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreDBNode.java
deleted file mode 100644
index b83db75646..0000000000
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreDBNode.java
+++ /dev/null
@@ -1,28 +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 launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreDBNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/StoreDBNode"});
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreEUNode.java b/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreEUNode.java
deleted file mode 100644
index de0e421e2d..0000000000
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreEUNode.java
+++ /dev/null
@@ -1,28 +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 launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreEUNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/StoreEUNode"});
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMarketNode.java b/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMarketNode.java
deleted file mode 100644
index b95d2a8d74..0000000000
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMarketNode.java
+++ /dev/null
@@ -1,28 +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 launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreMarketNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/StoreMarketNode"});
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMashupNode.java b/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMashupNode.java
deleted file mode 100644
index aa7cbdc4ca..0000000000
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMashupNode.java
+++ /dev/null
@@ -1,28 +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 launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreMashupNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/StoreMashupNode"});
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMergerNode.java b/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMergerNode.java
deleted file mode 100644
index a29c9b7d61..0000000000
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMergerNode.java
+++ /dev/null
@@ -1,28 +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 launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreMergerNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/StoreMergerNode"});
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreNode.java b/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreNode.java
deleted file mode 100644
index 11f1b2ce86..0000000000
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreNode.java
+++ /dev/null
@@ -1,28 +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 launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/StoreNode"});
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreSupplierNode.java b/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreSupplierNode.java
deleted file mode 100644
index fce27d7d3b..0000000000
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreSupplierNode.java
+++ /dev/null
@@ -1,28 +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 launch;
-
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-public class LaunchStoreSupplierNode {
-    public static void main(String[] args) throws Exception {
-        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/StoreSupplierNode"});
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchTutorialDomainManager.java b/java/sca-contrib/tutorials/store/domain/launch/LaunchTutorialDomainManager.java
deleted file mode 100644
index 7408e99c63..0000000000
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchTutorialDomainManager.java
+++ /dev/null
@@ -1,33 +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 launch;
-
-/**
- * Launches the domain manager from this module.
- *
- * @version $Rev$ $Date$
- */
-public class LaunchTutorialDomainManager {
-    
-    public static void main(String[] args) throws Exception {
-        org.apache.tuscany.sca.node.launcher.DomainManagerLauncher.main(args);
-    }
-
-}
diff --git a/java/sca-contrib/tutorials/store/domain/pom.xml b/java/sca-contrib/tutorials/store/domain/pom.xml
deleted file mode 100644
index 808195c491..0000000000
--- a/java/sca-contrib/tutorials/store/domain/pom.xml
+++ /dev/null
@@ -1,172 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-domain</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Domain</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.3.1.4</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>launch.LaunchTutorialAdmin</mainClass>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/domain/workspace.xml b/java/sca-contrib/tutorials/store/domain/workspace.xml
deleted file mode 100644
index 9cdbe04ac7..0000000000
--- a/java/sca-contrib/tutorials/store/domain/workspace.xml
+++ /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.    
--->
-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
-  <contribution location="file:../assets/target/tutorial-assets.jar" uri="assets"/>
-  <contribution location="file:../store/target/tutorial-store.jar" uri="store"/>
-  <contribution location="file:../store-merger/target/tutorial-store-merger.jar" uri="store-merger"/>
-  <contribution location="file:../store-client/target/tutorial-store-client.jar" uri="store-client"/>
-  <contribution location="file:../store-db/target/tutorial-store-db.jar" uri="store-db"/>
-  <contribution location="file:../store-supplier/target/tutorial-store-supplier.jar" uri="store-supplier"/>
-  <contribution location="file:../store-market/target/tutorial-store-market.jar" uri="store-market"/> 
-  <contribution location="file:../store-eu/target/tutorial-store-eu.jar" uri="store-eu"/>
-  <contribution location="file:../store-mashup" uri="store-mashup"/>
-  <contribution location="file:../web-services/target/tutorial-web-services.jar" uri="web-services"/>
-  <contribution location="file:../catalog-webapp/target/tutorial-catalog-webapp.war" uri="catalog-webapp"/>
-  <contribution location="file:../catalog-mediation/target/tutorial-catalog-mediation.jar" uri="catalog-mediation"/>
-  <contribution location="file:../catalog-ejb/target/tutorial-catalog-ejb.jar" uri="catalog-ejb"/>
-  <contribution location="file:../domain/cloud" uri="http://tuscany.apache.org/cloud"/>
-</workspace>
diff --git a/java/sca-contrib/tutorials/store/pom.xml b/java/sca-contrib/tutorials/store/pom.xml
deleted file mode 100644
index 69db461cfc..0000000000
--- a/java/sca-contrib/tutorials/store/pom.xml
+++ /dev/null
@@ -1,59 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorials</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-tutorial-store</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Store Tutorial</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>domain</module>
-                <module>assets</module>
-                <module>store</module>
-                <module>store-merger</module>
-                <module>store-client</module>
-                <module>store-db</module>
-                <module>store-supplier</module>
-                <module>store-market</module>
-                <module>store-eu</module>
-                <module>store-mashup</module>
-                <module>web-services</module>
-                <module>catalog-webapp</module>
-                <module>catalog-ejb</module>
-                <module>catalog-mediation</module>
-                <module>store-test</module>
-            </modules>
-        </profile>
-
-    </profiles>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/store-client/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/store-client/META-INF/sca-contribution.xml
deleted file mode 100644
index 30ffa61ed2..0000000000
--- a/java/sca-contrib/tutorials/store/store-client/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:s="http://store">
-   <deployable composite="s:store-client"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/store-client/client/Shopper.java b/java/sca-contrib/tutorials/store/store-client/client/Shopper.java
deleted file mode 100644
index 4e2fa63493..0000000000
--- a/java/sca-contrib/tutorials/store/store-client/client/Shopper.java
+++ /dev/null
@@ -1,29 +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 client;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Shopper {
-    
-    String shop(String itemName, int quantity);
-
-}
diff --git a/java/sca-contrib/tutorials/store/store-client/client/ShopperImpl.java b/java/sca-contrib/tutorials/store/store-client/client/ShopperImpl.java
deleted file mode 100644
index eef92b71f1..0000000000
--- a/java/sca-contrib/tutorials/store/store-client/client/ShopperImpl.java
+++ /dev/null
@@ -1,63 +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 client;
-
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.oasisopen.sca.annotation.Reference;
-
-import services.Cart;
-import services.Catalog;
-import services.Item;
-import services.Total;
-
-public class ShopperImpl implements Shopper {
-    
-    @Reference
-    public Catalog catalog;
-    
-    @Reference
-    public Cart shoppingCart;
-    
-    @Reference
-    public Total shoppingTotal;
-
-    public String shop(String itemName, int quantity) {
-        
-        Item[] items = catalog.get();
-        for (Item item: items) {
-            if (item.getName().startsWith(itemName)) {
-                
-                try {
-                    shoppingCart.delete("");
-                } catch (NotFoundException e) {
-                }
-
-                for (int i = 0; i < quantity; i++) {
-                    shoppingCart.post("item" + i, item);
-                }
-                
-                return shoppingTotal.getTotal();
-            }
-        }
-        
-        return "";
-    }
-
-}
diff --git a/java/sca-contrib/tutorials/store/store-client/launch/LaunchStoreClientNode.java b/java/sca-contrib/tutorials/store/store-client/launch/LaunchStoreClientNode.java
deleted file mode 100644
index d1a9dfb36c..0000000000
--- a/java/sca-contrib/tutorials/store/store-client/launch/LaunchStoreClientNode.java
+++ /dev/null
@@ -1,43 +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 launch;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
-import client.Shopper;
-
-public class LaunchStoreClientNode {
-
-    public static void main(String[] args) throws Exception {
-        NodeLauncher nodeLauncher = NodeLauncher.newInstance();
-        SCANode storeClientNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreClientNode");
-        storeClientNode.start();
-        SCAClient client = (SCAClient)storeClientNode;
-        
-        Shopper shopper = client.getService(Shopper.class, "StoreClient");
-        
-        String total = shopper.shop("Orange", 5);
-        System.out.println("Total: " + total);
-        
-        storeClientNode.stop();
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/store-client/pom.xml b/java/sca-contrib/tutorials/store/store-client/pom.xml
deleted file mode 100644
index 24909223cb..0000000000
--- a/java/sca-contrib/tutorials/store/store-client/pom.xml
+++ /dev/null
@@ -1,123 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-client</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Online Store Client</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/store-client/services/Cart.java b/java/sca-contrib/tutorials/store/store-client/services/Cart.java
deleted file mode 100644
index 3fb5439bc3..0000000000
--- a/java/sca-contrib/tutorials/store/store-client/services/Cart.java
+++ /dev/null
@@ -1,28 +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 services;
-
-import org.apache.tuscany.sca.data.collection.Collection;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Cart extends Collection<String, Item> {
-
-}
diff --git a/java/sca-contrib/tutorials/store/store-client/services/Catalog.java b/java/sca-contrib/tutorials/store/store-client/services/Catalog.java
deleted file mode 100644
index b5e504fe11..0000000000
--- a/java/sca-contrib/tutorials/store/store-client/services/Catalog.java
+++ /dev/null
@@ -1,27 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Catalog {
-    Item[] get();
-}
diff --git a/java/sca-contrib/tutorials/store/store-client/services/Item.java b/java/sca-contrib/tutorials/store/store-client/services/Item.java
deleted file mode 100644
index 81cefcdbef..0000000000
--- a/java/sca-contrib/tutorials/store/store-client/services/Item.java
+++ /dev/null
@@ -1,66 +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 services;
-
-
-public class Item {
-    private String name;
-    private String price;
-    private String origin;
-    
-    public Item() {
-    }
-    
-    public Item(String name, String price, String origin) {
-        this.name = name;
-        this.price = price;
-        this.origin = origin;
-    }
-    
-    public Item(String name, String price) {
-        this.name = name;
-        this.price = price;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    public String getPrice() {
-        return price;
-    }
-    
-    public void setPrice(String price) {
-        this.price = price;
-    }
-
-    public String getOrigin() {
-        return origin;
-    }
-
-    public void setOrigin(String origin) {
-        this.origin = origin;
-    }
-
-}
diff --git a/java/sca-contrib/tutorials/store/store-client/services/Total.java b/java/sca-contrib/tutorials/store/store-client/services/Total.java
deleted file mode 100644
index b77cc1c7ac..0000000000
--- a/java/sca-contrib/tutorials/store/store-client/services/Total.java
+++ /dev/null
@@ -1,29 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Total {
-    
-    String getTotal();
-
-}
diff --git a/java/sca-contrib/tutorials/store/store-client/store-client.composite b/java/sca-contrib/tutorials/store/store-client/store-client.composite
deleted file mode 100644
index 3c5f1637ef..0000000000
--- a/java/sca-contrib/tutorials/store/store-client/store-client.composite
+++ /dev/null
@@ -1,38 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="store-client">
-		
-    <component name="StoreClient">
-        <implementation.java class="client.ShopperImpl"/>
-		<reference name="catalog" target="StoreSupplierCatalog">
-		 	<binding.ws/>
-		 </reference>
-		 <reference name="shoppingCart" target="StoreSupplierShoppingCart/Cart">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="shoppingTotal" target="StoreSupplierShoppingCart/Total">
-		 	<binding.ws/>
-		 </reference>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/tutorials/store/store-db/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/store-db/META-INF/sca-contribution.xml
deleted file mode 100644
index 7a5d5613be..0000000000
--- a/java/sca-contrib/tutorials/store/store-db/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,27 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:s="http://store">
-   <import.java package="services"/>
-   <import.java package="services.merger"/>
-   <import.java package="services.db"/>
-   <import.resource uri="uiservices/store.html"/>   
-   <deployable composite="s:store-db"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/store-db/pom.xml b/java/sca-contrib/tutorials/store/store-db/pom.xml
deleted file mode 100644
index 923c4004b8..0000000000
--- a/java/sca-contrib/tutorials/store/store-db/pom.xml
+++ /dev/null
@@ -1,125 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-db</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Online Store Using DB</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sql-maven-plugin</artifactId>
-                <version>1.3</version> 
-
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.derby</groupId>
-                        <artifactId>derby</artifactId>
-                        <version>10.3.1.4</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-db</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                            <url>jdbc:derby:${basedir}/target/cart-db;create=true</url>
-                            <autocommit>true</autocommit>
-                            <onError>continue</onError>
-                            <onConnectionError>skip</onConnectionError>
-                            <delimiter>;</delimiter>
-                            <srcFiles>
-                                <srcFile>${basedir}/../assets/services/db/cart.sql</srcFile>
-                            </srcFiles>
-                        </configuration>
-                    </execution>
-                    
-                    <!-- Shutdown DB in order to be able to run unit tests -->
-                    <execution>
-                    	<id>shutdown-database-sothat-test-can-run</id>
-                    	<phase>process-test-resources</phase>
-                    	<goals>
-                    		<goal>execute</goal>
-                    	</goals>
-                    	<configuration>
-                    	    <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                    		<url>jdbc:derby:${basedir}/target/cart-db;shutdown=true</url>
-                    		<skipOnConnectionError>true</skipOnConnectionError>
-                    	</configuration>
-                    </execution>
-                </executions>
-            </plugin>	
-        </plugins>	   
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/store-db/store-db.composite b/java/sca-contrib/tutorials/store/store-db/store-db.composite
deleted file mode 100644
index 03094be5ad..0000000000
--- a/java/sca-contrib/tutorials/store/store-db/store-db.composite
+++ /dev/null
@@ -1,75 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="store-db">
-		
-    <component name="StoreDB">
-        <t:implementation.widget location="uiservices/store.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/ui"/> 
-        </service>
-		<reference name="catalog" target="StoreDBCatalog">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-		 <reference name="shoppingCart" target="StoreDBShoppingCart/Cart">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="shoppingTotal" target="StoreDBShoppingCart/Total">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-    
-	<component name="StoreDBCatalog">
-		<implementation.java class="services.merger.MergedCatalogImpl"/> 
-		<property name="currencyCode">USD</property>
-		<service name="Catalog">
-			<t:binding.jsonrpc/>
-   		</service>
-		<reference name="fruitsCatalog" target="StoreDBFruitsCatalog"/>	
-		<reference name="vegetablesCatalog" target="VegetablesCatalogWebService">
-			<binding.ws/>
-		</reference>	
-		<reference name="currencyConverter" target="StoreDBCurrencyConverter"/>	
-	</component>
- 	
-	<component name="StoreDBFruitsCatalog">
-		<implementation.java class="services.FruitsCatalogImpl"/> 
-		<property name="currencyCode">USD</property>
-		<reference name="currencyConverter" target="StoreDBCurrencyConverter"/>	
-	</component> 
- 	
-	<component name="StoreDBShoppingCart">
-		<implementation.java class="services.db.ShoppingCartTableImpl"/>
-		<property name="database">../store-db/target/cart-db</property>
-		<service name="Cart">
-			<t:binding.atom uri="/ShoppingCart/Cart"/>
-		</service>    	
-		<service name="Total">
-			<t:binding.jsonrpc/>
-		</service>    	
-	</component>
-    
-	<component name="StoreDBCurrencyConverter">
-		<implementation.java class="services.CurrencyConverterImpl"/>
-	</component>     
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/store-eu/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/store-eu/META-INF/sca-contribution.xml
deleted file mode 100644
index 552932b0e7..0000000000
--- a/java/sca-contrib/tutorials/store/store-eu/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:s="http://store">
-   <import.java package="services"/>
-   <import.java package="services.merger"/>
-   <import.java package="services.db"/>
-   <deployable composite="s:store-eu"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/store-eu/pom.xml b/java/sca-contrib/tutorials/store/store-eu/pom.xml
deleted file mode 100644
index f9e9898695..0000000000
--- a/java/sca-contrib/tutorials/store/store-eu/pom.xml
+++ /dev/null
@@ -1,111 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-eu</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial EU Online Store</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-	        <plugin>
-	             <groupId>org.codehaus.mojo</groupId>
-	             <artifactId>sql-maven-plugin</artifactId>
-	             <version>1.3</version>
-	
-	             <dependencies>
-	                 <dependency>
-	                     <groupId>org.apache.derby</groupId>
-	                     <artifactId>derby</artifactId>
-	                     <version>10.3.1.4</version>
-	                 </dependency>
-	             </dependencies>
-	
-	             <executions>
-	                 <execution>
-	                     <id>create-db</id>
-	                     <phase>generate-resources</phase>
-	                     <goals>
-	                         <goal>execute</goal>
-	                     </goals>
-	                     <configuration>
-	                         <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-	                         <url>jdbc:derby:${basedir}/target/cart-eu-db;create=true</url>
-	                         <autocommit>true</autocommit>
-	                         <onError>continue</onError>
-	                         <delimiter>;</delimiter>
-	                         <srcFiles>
-	                             <srcFile>${basedir}/../assets/services/db/cart.sql</srcFile>
-	                         </srcFiles>
-	                     </configuration>
-	                 </execution>
-	             </executions>
-	         </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/store-eu/store-eu.composite b/java/sca-contrib/tutorials/store/store-eu/store-eu.composite
deleted file mode 100644
index a0b8b50975..0000000000
--- a/java/sca-contrib/tutorials/store/store-eu/store-eu.composite
+++ /dev/null
@@ -1,70 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="store-eu">
-		
-    <component name="StoreEU">
-        <t:implementation.widget location="uiservices/store-eu.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/ui"/> 
-        </service>
-		<reference name="catalog" target="StoreEUCatalog">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-		 <reference name="shoppingCart" target="StoreEUShoppingCart/Cart">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="shoppingTotal" target="StoreEUShoppingCart/Total">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-    
-	<component name="StoreEUCatalog">
-		<implementation.java class="services.merger.MergedCatalogImpl"/> 
-		<property name="currencyCode">EUR</property>
-		<service name="Catalog">
-			<t:binding.jsonrpc/>
-			<binding.ws uri="/CatalogWebService"/>
-   		</service>
-		<reference name="fruitsCatalog" target="FruitsCatalogWebService">
-			<binding.ws/>
-		</reference>	
-		<reference name="vegetablesCatalog" target="VegetablesCatalogWebService">
-			<binding.ws/>
-		</reference>	
-		<reference name="currencyConverter" target="CurrencyConverterWebService">
-			<binding.ws/>
-		</reference>	
-	</component>
- 	
-	<component name="StoreEUShoppingCart">
-		<implementation.java class="services.db.ShoppingCartTableImpl"/>
-		<property name="database">../store-eu/target/cart-eu-db</property>
-		<service name="Cart">
-			<t:binding.atom uri="/ShoppingCart/Cart"/>
-		</service>    	
-		<service name="Total">
-			<t:binding.jsonrpc/>
-		</service>    	
-	</component>
-    
-</composite>
diff --git a/java/sca-contrib/tutorials/store/store-eu/uiservices/store-eu.html b/java/sca-contrib/tutorials/store/store-eu/uiservices/store-eu.html
deleted file mode 100644
index 4569b76b3f..0000000000
--- a/java/sca-contrib/tutorials/store/store-eu/uiservices/store-eu.html
+++ /dev/null
@@ -1,162 +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.    
--->
-<html>
-<head>
-<title>EU Store</title>
-
-<script type="text/javascript" src="store-eu.js"></script>
-
-<script language="JavaScript">
-
-	//@Reference
-	var catalog = new Reference("catalog");
-	
-	//@Reference
-	var shoppingCart = new Reference("shoppingCart");
-
-	//@Reference
-	var shoppingTotal = new Reference("shoppingTotal");
-	
-	var catalogItems;
-
-	function catalog_getResponse(items, exception) {
-		if(exception){
-			alert(exception.message);
-			return;
-		}
-		var catalog = "";
-		for (var i=0; i<items.length; i++) {
-			var item = items[i].name + ' - ' + items[i].price;
-			catalog += '<input name="items" type="checkbox" value="' + 
-						item + '">' + item + ' <br>';
-		}
-		document.getElementById('catalog').innerHTML=catalog;
-		catalogItems = items;
-	}
-	
-	function shoppingCart_getResponse(feed) {
-		if (feed != null) {
-			var entries = feed.getElementsByTagName("entry");              
-			var list = "";
-			for (var i=0; i<entries.length; i++) {
-				var content = entries[i].getElementsByTagName("content")[0];
-				var name = content.getElementsByTagName("name")[0].firstChild.nodeValue;
-				var price = content.getElementsByTagName("price")[0].firstChild.nodeValue;
-				list += name + ' - ' + price + ' <br>';
-			}
-			document.getElementById("shoppingCart").innerHTML = list;
-
-			if (entries.length != 0) {	
-				try {
-					shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
-				}
-				carch(e) {
-					alert(e);
-				}
-					
-			}
-		}
-	}
-	
-	function shoppingTotal_getTotalResponse(total,exception) {
-		if(exception){
-			alert(exception.message);
-			return;
-		}
-		document.getElementById('total').innerHTML = total;
-	}
-	
-	function shoppingCart_postResponse(entry) {
-		shoppingCart.get("", shoppingCart_getResponse);
-	}				
-
-	function addToCart() {
-		var items  = document.catalogForm.items;
-		var j = 0;
-		for (var i=0; i<items.length; i++)
-			if (items[i].checked) {
-				var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>item</title><content type="text/xml">' +
-                	'<Item xmlns="http://services/">' +
-                	'<name xmlns="">' + catalogItems[i].name + '</name>' + '<price xmlns="">' + catalogItems[i].price + '</price>' +
-                 	'</Item>' + '</content></entry>';
-				shoppingCart.post(entry, shoppingCart_postResponse);
-				items[i].checked = false;
-			}
-	}
-	function checkoutCart() {
-		document.getElementById('store').innerHTML='<h2>' +
-				'Thanks for Shopping With Us!</h2>'+
-				'<h2>Your Order</h2>'+
-				'<form name="orderForm">'+
-					document.getElementById('shoppingCart').innerHTML+
-					'<br>'+
-					document.getElementById('total').innerHTML+
-					'<br>'+
-					'<br>'+
-					'<input type="submit" value="Continue Shopping">'+ 
-				'</form>';
-		shoppingCart.del("", null);
-	}
-	function deleteCart() {
-		shoppingCart.del("", null);
-		document.getElementById('shoppingCart').innerHTML = "";
-		document.getElementById('total').innerHTML = "";	
-	}	
-
-	function init() {
-		try	{
-			catalog.get(catalog_getResponse);
-			shoppingCart.get("", shoppingCart_getResponse);
-		}
-		catch(e) {
-			alert(e);
-		}
-			
-	}
-	
-</script>
-
-</head>
-
-<body onload="init()">
-<h1>Store</h1>
-  <p>Fruits and Vegetables - Fruits et Legumes - Obst und Gemuese   
-  <div id="store">
-   	<h2>Catalog</h2>
-   	<form name="catalogForm">
-		<div id="catalog" ></div>
-		<br>
-		<input type="button" onClick="addToCart()"  value="Add to Cart">
-   	</form>
- 
- 	<br>
-  
-   	<h2>Your Shopping Cart</h2>
-   	<form name="shoppingCartForm">
-		<div id="shoppingCart"></div>
-		<br>
-		<div id="total"></div>
-		<br>		
-		<input type="button" onClick="checkoutCart()" value="Checkout"> 
-		<input type="button" onClick="deleteCart()" value="Empty">     
-	   	<a href="../ShoppingCart/Cart/">(feed)</a>
-	</form>    
-  </div>
-</body>
-</html>
diff --git a/java/sca-contrib/tutorials/store/store-market/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/store-market/META-INF/sca-contribution.xml
deleted file mode 100644
index 491230c952..0000000000
--- a/java/sca-contrib/tutorials/store/store-market/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:s="http://store">
-	<import.java package="services" />
-	<import.java package="services.market" />
-    <import.resource uri="uiservices/store.html"/>   
-    <deployable composite="s:store-market" />
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/store-market/build.xml b/java/sca-contrib/tutorials/store/store-market/build.xml
deleted file mode 100644
index 94c8b2cad8..0000000000
--- a/java/sca-contrib/tutorials/store/store-market/build.xml
+++ /dev/null
@@ -1,54 +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.
--->
-
-<project name="tutorial-store-market" default="compile">
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="."/>
-            <classpath>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
-            </classpath>
-        </javac>
-        <copy todir="target/classes">
-            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, target"/>
-        </copy>
-        <jar destfile="target/tutorial-store-market.jar" basedir="target/classes">
-            <manifest>
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="package" depends="compile"/>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
-    <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-sca-api-2.0-SNAPSHOT.jar"/>
-    </fileset>
-    <fileset id="3rdparty.jars" dir="../../lib">
-    </fileset>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/store-market/pom.xml b/java/sca-contrib/tutorials/store/store-market/pom.xml
deleted file mode 100644
index 5b2aa91bda..0000000000
--- a/java/sca-contrib/tutorials/store/store-market/pom.xml
+++ /dev/null
@@ -1,77 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-market</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Marketplace Online Store</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/store-market/store-market.composite b/java/sca-contrib/tutorials/store/store-market/store-market.composite
deleted file mode 100644
index 1c225e6c07..0000000000
--- a/java/sca-contrib/tutorials/store/store-market/store-market.composite
+++ /dev/null
@@ -1,68 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="store-market">
-		
-    <component name="StoreMarket">
-        <t:implementation.widget location="uiservices/store.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/ui"/> 
-        </service>
-		<reference name="catalog" target="StoreMarketCatalog">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-		 <reference name="shoppingCart" target="StoreMarketShoppingCart/Cart">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="shoppingTotal" target="StoreMarketShoppingCart/Total">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-    
-	<component name="StoreMarketCatalog">
-		<implementation.java class="services.market.MarketCatalogImpl"/> 
-		<property name="currencyCode">USD</property>
-		<service name="Catalog">
-			<t:binding.jsonrpc/>
-   		</service>
-		<reference name="goodsCatalog" multiplicity="0..n" target="VegetablesCatalogWebService FruitsCatalogWebService" >
-			<binding.ws />
-		</reference>
-		<reference name="currencyConverter" target="StoreMarketCurrencyConverter"/>
-		
-	</component>
-	
- 	<component name="StoreMarketShoppingCart">
-		<implementation.java class="services.ShoppingCartImpl"/>
-		<service name="Cart">
-			<t:binding.atom uri="/ShoppingCart/Cart"/>
-		</service>    	
-		<service name="Total">
-			<t:binding.jsonrpc/>
-		</service>
-	</component>
-    
-	<component name="StoreMarketCurrencyConverter">
-		<implementation.java class="services.CurrencyConverterImpl"/>
-	</component>     
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/store-mashup/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/store-mashup/META-INF/sca-contribution.xml
deleted file mode 100644
index 4ec08403e5..0000000000
--- a/java/sca-contrib/tutorials/store/store-mashup/META-INF/sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:s="http://store">
-   <import.java package="services"/>
-   <import.java package="services.map"/>
-   <deployable composite="s:store-mashup"/>
-</contribution>
diff --git a/java/sca-contrib/tutorials/store/store-mashup/build-openajax.xml b/java/sca-contrib/tutorials/store/store-mashup/build-openajax.xml
deleted file mode 100644
index 4668dedc1d..0000000000
--- a/java/sca-contrib/tutorials/store/store-mashup/build-openajax.xml
+++ /dev/null
@@ -1,86 +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 name="OpenAjaxZipInstaller">
-
-    <property name="openajax.version" value="1.0_build117_v1.0"/>
-    <property name="unpack.location" value="${basedir}/openajax"/>
-	
-    <target name="check-openajax-installed">
-        <condition property="already.installed" >
-            <available file="${localRepository}/openajax/openajax/${openajax.version}/openajax-${openajax.version}.zip"/>
-        </condition>
-        <condition property="maven.suffix" value="">
-            <os family="unix"/>
-        </condition>
-        <condition property="maven.suffix" value=".bat">
-            <os family="windows"/>
-        </condition>
-    </target>
-	
-
-    <target name="check-openajax-unpacked">
-        <condition property="already.unpacked" >
-            <available file="${unpack.location}"/>
-        </condition>
-    </target>
-
-    <target name="install-openajax" depends="check-openajax-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/openajax-download/"/>
-        <get src="http://downloads.sourceforge.net/openajaxallianc/OpenAjaxHub${openajax.version}.zip"
-            dest="${basedir}/target/openajax-download/openajax-${openajax.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
-            <arg line="install:install-file -DgroupId=openajax  -DartifactId=openajax -Dversion=${openajax.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/openajax-download/openajax-${openajax.version}.zip"/>
-        </exec>
-    </target>
-
-    <target name="install-openajax-nomaven" depends="check-openajax-installed" unless="already.installed">
-        <mkdir dir="${basedir}/target/openajax-download/"/>
-        <get src="http://downloads.sourceforge.net/openajaxallianc/OpenAjaxHub${openajax.version}.zip"
-            dest="${basedir}/target/openajax-download/openajax-${openajax.version}.zip"
-            verbose="true"
-            usetimestamp="true"/>
-        <copy file="${basedir}/target/openajax-download/openajax-${openajax.version}.zip" 
-              tofile="${localRepository}/openajax/openajax/${openajax.version}/openajax-${openajax.version}.zip"/>
-    </target>
-	
-
-    <target name="unpack-openajax-files" depends="check-openajax-installed, check-openajax-unpacked" unless="already.unpacked">
-        <fail message="openajax zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
-        <mkdir dir="${basedir}/target/openajax-unpack-temp/"/>
-        <unzip src="${localRepository}/openajax/openajax/${openajax.version}/openajax-${openajax.version}.zip"
-               dest="${basedir}/target/openajax-unpack-temp/"
-               overwrite="false">
-            <patternset>
-                <include name="OpenAjaxHub${openajax.version}/release/**"/>
-            </patternset>
-        </unzip>
-        <move file="${basedir}/target/openajax-unpack-temp/OpenAjaxHub${openajax.version}/release"
-              tofile="${unpack.location}"
-              verbose="true"/>
-        <delete dir="${basedir}/target/openajax-unpack-temp/"/>
-    </target>
-	
-
-    <target name="clean-openajax-files">
-        <delete dir="${unpack.location}"/>
-    </target>
-</project>
diff --git a/java/sca-contrib/tutorials/store/store-mashup/gadget/map-gadget.html b/java/sca-contrib/tutorials/store/store-mashup/gadget/map-gadget.html
deleted file mode 100644
index d76bcad91b..0000000000
--- a/java/sca-contrib/tutorials/store/store-mashup/gadget/map-gadget.html
+++ /dev/null
@@ -1,50 +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.    
--->
-<html>
-<head>
-<title>Map</title>
-
-<script type="text/javascript" src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAzr2EBOXUKnm_jVnk0OJI7xSosDVG8KKPE1-m51RBrvYughuyMxQ-i1QfUnH94QxWIa6N4U6MouMmBA"></script>
-
-<script language="JavaScript">
-
-	function coordsChangedCallback(eventname, publisherData, subscriberData) {
-		var coords = publisherData.split(',');
-		if (coords.length >= 2) {
-        	subscriberData.setCenter(new GLatLng(coords[0], coords[1]));
-		}
-	}
-       
-	function init() {
-    	if (GBrowserIsCompatible()) {
-			var map = new GMap2(document.getElementById("map_canvas"));
-			map.setCenter(new GLatLng(37.4419, -122.1419), 13);
-
-			if (window.top.hub != null) {
-				window.top.hub.subscribe("geospatial.coords", coordsChangedCallback, null, map);
-			}
-		}
-	}
-</script>
-</head>
-
-<body onload="init()">
-	<div id="map_canvas" style="width: 100%; height: 100%"></div>
-</body>
-</html>
diff --git a/java/sca-contrib/tutorials/store/store-mashup/gadget/store-gadget.html b/java/sca-contrib/tutorials/store/store-mashup/gadget/store-gadget.html
deleted file mode 100644
index c09b9d28c8..0000000000
--- a/java/sca-contrib/tutorials/store/store-mashup/gadget/store-gadget.html
+++ /dev/null
@@ -1,166 +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.    
--->
-<html>
-<head>
-<title>Store</title>
-
-<script type="text/javascript" src="/gadget/store/store-gadget.js"></script>
-
-<script language="JavaScript">
-
-	//@Reference
-	var catalog = new Reference("catalog");
-	
-	//@Reference
-	var shoppingCart = new Reference("shoppingCart");
-
-	//@Reference
-	var shoppingTotal = new Reference("shoppingTotal");
-	
-	var catalogItems;
-
-	function catalog_getResponse(items,exception) {
-		if(exception){
-			alert(exception.message);
-			return;
-		}
-		var catalog = "";
-		for (var i=0; i<items.length; i++) {
-			var item = items[i].name + ' - ' + items[i].price;
-			catalog += '<input name="items" type="checkbox" onClick="selectItem(' + i + ')" value="' + 
-						item + '">' + item + ' <br>';
-		}
-		document.getElementById('catalog').innerHTML=catalog;
-		catalogItems = items;
-	}
-	
-	function shoppingCart_getResponse(feed) {
-		if (feed != null) {
-			var entries = feed.getElementsByTagName("entry");              
-			var list = "";
-			for (var i=0; i<entries.length; i++) {
-				var content = entries[i].getElementsByTagName("content")[0];
-				var name = content.getElementsByTagName("name")[0].firstChild.nodeValue;
-				var price = content.getElementsByTagName("price")[0].firstChild.nodeValue;
-				list += name + ' - ' + price + ' <br>';
-			}
-			document.getElementById("shoppingCart").innerHTML = list;
-
-			if (entries.length != 0) {
-				try {			
-					shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
-				}
-				carch(e) {
-					alert(e);
-				}
-			}
-		}
-	}
-	
-	function shoppingTotal_getTotalResponse(total,exception) {
-		if(exception){
-			alert(exception.message);
-			return;
-		}
-		document.getElementById('total').innerHTML = total;
-	}
-	
-	function shoppingCart_postResponse(entry) {
-		shoppingCart.get("", shoppingCart_getResponse);
-	}				
-
-	function addToCart() {
-		var items  = document.catalogForm.items;
-		var j = 0;
-		for (var i=0; i<items.length; i++)
-			if (items[i].checked) {
-				var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>item</title><content type="text/xml">' +
-                	'<Item xmlns="http://services/">' +
-                	'<name xmlns="">' + catalogItems[i].name + '</name>' + '<price xmlns="">' + catalogItems[i].price + '</price>' +
-                 	'</Item>' + '</content></entry>';
-				shoppingCart.post(entry, shoppingCart_postResponse);
-				items[i].checked = false;
-			}
-	}
-	function checkoutCart() {
-		document.getElementById('store').innerHTML='<h2>' +
-				'Thanks for Shopping With Us!</h2>'+
-				'<h2>Your Order</h2>'+
-				'<form name="orderForm" action="/gadget/store">'+
-					document.getElementById('shoppingCart').innerHTML+
-					'<br>'+
-					document.getElementById('total').innerHTML+
-					'<br>'+
-					'<br>'+
-					'<input type="submit" value="Continue Shopping">'+ 
-				'</form>';
-		shoppingCart.del("", null);
-	}
-	function deleteCart() {
-		shoppingCart.del("", null);
-		document.getElementById('shoppingCart').innerHTML = "";
-		document.getElementById('total').innerHTML = "";	
-	}	
-
-	function selectItem(i) {
-	    var item = catalogItems[i];
-		if (window.top.hub != null) {
-			window.top.hub.publish("geospatial.coords", item.origin);
-		}
-	}		
-
-	function init() {
-			try {		
-				catalog.get(catalog_getResponse);
-				shoppingCart.get("", shoppingCart_getResponse);
-			}
-			catch(e) {
-				alert(e);
-			}
-	}
-	
-</script>
-
-</head>
-
-<body onload="init()">
-<h1>Store</h1>
-  <div id="store">
-   	<h2>Catalog</h2>
-   	<form name="catalogForm">
-		<div id="catalog" ></div>
-		<br>
-		<input type="button" onClick="addToCart()"  value="Add to Cart">
-   	</form>
- 
- 	<br>
-  
-   	<h2>Your Shopping Cart</h2>
-   	<form name="shoppingCartForm">
-		<div id="shoppingCart"></div>
-		<br>
-		<div id="total"></div>
-		<br>		
-		<input type="button" onClick="checkoutCart()" value="Checkout"> 
-		<input type="button" onClick="deleteCart()" value="Empty">     
-	   	<a href="/ShoppingCart/Cart/" target="_top">(feed)</a>
-	</form>    
-  </div>
-</body>
-</html>
diff --git a/java/sca-contrib/tutorials/store/store-mashup/map-gadget.composite b/java/sca-contrib/tutorials/store/store-mashup/map-gadget.composite
deleted file mode 100644
index 77db2edbf2..0000000000
--- a/java/sca-contrib/tutorials/store/store-mashup/map-gadget.composite
+++ /dev/null
@@ -1,32 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="map-gadget">
-		
-    <component name="MapGadget">
-        <t:implementation.widget location="gadget/map-gadget.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/gadget/map"/>
-        </service>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/tutorials/store/store-mashup/mashup/store-mash.html b/java/sca-contrib/tutorials/store/store-mashup/mashup/store-mash.html
deleted file mode 100644
index aab14bc065..0000000000
--- a/java/sca-contrib/tutorials/store/store-mashup/mashup/store-mash.html
+++ /dev/null
@@ -1,70 +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.    
--->
-<html>

-<head>

-<title>Store Mashup</title>

-		

-<script type="text/javascript" src='/openajax/OpenAjax.js'></script>
-
-<script type="text/javascript" src="/mashup/store-mash.js"></script>
-
-<script language="JavaScript">
-
-	//@Reference
-	var storeGadget = new Reference("storeGadget");
-	
-	//@Reference
-	var mapGadget = new Reference("mapGadget");
-	
-	function storeGadget_getResponse(gadget) {
-		var gadget1 = document.getElementById('gadget1').contentDocument;
-		gadget1.open();
-		gadget1.write(gadget);
-		gadget1.close();
-	}
-	
-	function mapGadget_getResponse(gadget) {
-		var gadget2 = document.getElementById('gadget2').contentDocument;
-		gadget2.open();
-		gadget2.write(gadget);
-		gadget2.close();
-	}
-	
-	function init() {
-		window.top.hub = OpenAjax.hub;
-		
-		storeGadget.get('', storeGadget_getResponse);
-		mapGadget.get('', mapGadget_getResponse);
-	}
-	
-</script>
-</head>
-		

-<body onload="init()">
-<h1>Store Mashup</h1>

-<br>

-<table border="0" cellpadding="0" cellspacing="2">

-	<tr>

-    	<td><iframe id="gadget1" style='overflow:hidden;width:400px;height:500px;border:1px solid black;'></iframe></td>

-        <td><iframe id="gadget2" style='overflow:hidden;width:400px;height:500px;border:1px solid black;'></iframe></td>

-	</tr>

-</table>

-
-</body>         

-</html>
diff --git a/java/sca-contrib/tutorials/store/store-mashup/pom.xml b/java/sca-contrib/tutorials/store/store-mashup/pom.xml
deleted file mode 100644
index 1bfaff5087..0000000000
--- a/java/sca-contrib/tutorials/store/store-mashup/pom.xml
+++ /dev/null
@@ -1,136 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-mashup</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Online Store Mashup</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-                
-                    <executions>
-                        <execution> 
-                            <id>install-openajax</id>                       
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <tasks>
-                                    <ant antfile="./build-openajax.xml" target="install-openajax">
-                                        <property name="localRepository" value="${settings.localRepository}"/>
-                                    </ant>
-                                </tasks>
-                            </configuration>
-                        </execution>
-                        <execution> 
-                            <id>copy-openajax-files</id>                       
-                            <phase>generate-resources</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <tasks>
-                                    <ant antfile="./build-openajax.xml" target="unpack-openajax-files">
-                                        <property name="localRepository" value="${settings.localRepository}"/>
-                                        <property name="artifactId" value="${artifactId}"/>
-                                    </ant>
-                                </tasks>
-                            </configuration>
-                        </execution>
-                        <execution> 
-                            <id>clean-openajax-files</id>                       
-                            <phase>clean</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <tasks>
-                                    <ant antfile="./build-openajax.xml" target="clean-openajax-files">
-                                        <property name="localRepository" value="${settings.localRepository}"/>
-                                        <property name="artifactId" value="${artifactId}"/>
-                                    </ant>
-                                </tasks>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>            
-       </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/store-mashup/store-gadget.composite b/java/sca-contrib/tutorials/store/store-mashup/store-gadget.composite
deleted file mode 100644
index 7c10651e52..0000000000
--- a/java/sca-contrib/tutorials/store/store-mashup/store-gadget.composite
+++ /dev/null
@@ -1,64 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="store-gadget">
-		
-    <component name="StoreGadget">
-        <t:implementation.widget location="gadget/store-gadget.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/gadget/store"/>
-        </service>
-		<reference name="catalog" target="StoreGadgetCatalog">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-		 <reference name="shoppingCart" target="StoreGadgetShoppingCart/Cart">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="shoppingTotal" target="StoreGadgetShoppingCart/Total">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-    
-	<component name="StoreGadgetCatalog">
-		<implementation.java class="services.map.FruitsCatalogImpl"/> 
-		<property name="currencyCode">USD</property>
-		<service name="Catalog">
-			<t:binding.jsonrpc/>
-   		</service>
-		<reference name="currencyConverter" target="StoreGadgetCurrencyConverter"/>	
-	</component> 
- 	
-	<component name="StoreGadgetShoppingCart">
-		<implementation.java class="services.ShoppingCartImpl"/>
-		<service name="Cart">
-			<t:binding.atom uri="/ShoppingCart/Cart"/>
-		</service>    	
-		<service name="Total">
-			<t:binding.jsonrpc/>
-		</service>    	
-	</component>
-    
-	<component name="StoreGadgetCurrencyConverter">
-		<implementation.java class="services.CurrencyConverterImpl"/>
-	</component>     
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/store-mashup/store-mashup.composite b/java/sca-contrib/tutorials/store/store-mashup/store-mashup.composite
deleted file mode 100644
index 84e4933e63..0000000000
--- a/java/sca-contrib/tutorials/store/store-mashup/store-mashup.composite
+++ /dev/null
@@ -1,48 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		xmlns:s="http://store"
-		name="store-mashup">
-
-	<include name="s:store-gadget"/>
-	<include name="s:map-gadget"/>
-		
-    <component name="StoreMashup">
-        <t:implementation.widget location="mashup/store-mash.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/mashup"/>
-        </service>
-		<reference name="storeGadget" target="StoreGadget">
-		 	<t:binding.http/>
-		 </reference>
-		<reference name="mapGadget" target="MapGadget">
-		 	<t:binding.http/>
-		 </reference>
-    </component>
-    
-    <component name="openajax">
-        <t:implementation.resource location="openajax"/>
-        <service name="Resource">
-        	<t:binding.http uri="/openajax"/>
-        </service>
-    </component>
-</composite>
diff --git a/java/sca-contrib/tutorials/store/store-merger/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/store-merger/META-INF/sca-contribution.xml
deleted file mode 100644
index 700a84736c..0000000000
--- a/java/sca-contrib/tutorials/store/store-merger/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:s="http://store">
-	<import.java package="services" />
-	<import.java package="services.merger" />
-   <import.resource uri="uiservices/store.html"/>   
-   <deployable composite="s:store-merger" />
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/store-merger/pom.xml b/java/sca-contrib/tutorials/store/store-merger/pom.xml
deleted file mode 100644
index 224acad9a2..0000000000
--- a/java/sca-contrib/tutorials/store/store-merger/pom.xml
+++ /dev/null
@@ -1,77 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-merger</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Merger Online Store</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/store-merger/store-merger.composite b/java/sca-contrib/tutorials/store/store-merger/store-merger.composite
deleted file mode 100644
index 76d77dc693..0000000000
--- a/java/sca-contrib/tutorials/store/store-merger/store-merger.composite
+++ /dev/null
@@ -1,75 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="store-merger">
-		
-    <component name="StoreMerger">
-        <t:implementation.widget location="uiservices/store.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/ui"/> 
-        </service>
-		<reference name="catalog" target="StoreMergerCatalog">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-		 <reference name="shoppingCart" target="StoreMergerShoppingCart/Cart">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="shoppingTotal" target="StoreMergerShoppingCart/Total">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-    
-	<component name="StoreMergerCatalog">
-		<implementation.java class="services.merger.MergedCatalogImpl"/> 
-		<property name="currencyCode">USD</property>
-		<service name="Catalog">
-			<t:binding.jsonrpc/>
-   		</service>
-		<reference name="currencyConverter" target="StoreMergerCurrencyConverter"/>	
-		<reference name="fruitsCatalog" target="StoreMergerFruitsCatalog"/>
-		<!-- <reference name="vegetablesCatalog" target="MediatedVegetablesCatalog"> -->
-		<reference name="vegetablesCatalog" target="VegetablesCatalogWebService">
-			<binding.ws/>
-		</reference>
-	</component>
- 	
-	<component name="StoreMergerFruitsCatalog">
-		<implementation.java class="services.FruitsCatalogImpl"/> 
-		<property name="currencyCode">USD</property>
-		<reference name="currencyConverter" target="StoreMergerCurrencyConverter"/>	
-	</component> 
- 	
-	<component name="StoreMergerShoppingCart">
-		<implementation.java class="services.ShoppingCartImpl"/>
-		<service name="Cart">
-			<t:binding.atom uri="/ShoppingCart/Cart"/>
-		</service>    	
-		<service name="Total">
-			<t:binding.jsonrpc/>
-		</service>
-	</component>
-    
-	<component name="StoreMergerCurrencyConverter">
-		<implementation.java class="services.CurrencyConverterImpl"/>
-	</component>     
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/store-supplier/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/store-supplier/META-INF/sca-contribution.xml
deleted file mode 100644
index a75087aca1..0000000000
--- a/java/sca-contrib/tutorials/store/store-supplier/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,27 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:s="http://store">
-   <import.java package="services"/>
-   <import.java package="services.merger"/>
-   <import.java package="services.db"/>
-   <import.resource uri="uiservices/store.html"/>   
-   <deployable composite="s:store-supplier"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/store-supplier/pom.xml b/java/sca-contrib/tutorials/store/store-supplier/pom.xml
deleted file mode 100644
index 0aed45f30d..0000000000
--- a/java/sca-contrib/tutorials/store/store-supplier/pom.xml
+++ /dev/null
@@ -1,126 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-supplier</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Supplier Online Store</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sql-maven-plugin</artifactId>
-                <version>1.3</version> 
-
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.derby</groupId>
-                        <artifactId>derby</artifactId>
-                        <version>10.3.1.4</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-db</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                            <url>jdbc:derby:${basedir}/target/cart-db;create=true</url>
-                            <autocommit>true</autocommit>
-                            <onError>continue</onError>
-                            <onConnectionError>skip</onConnectionError>
-                            <delimiter>;</delimiter>
-                            <srcFiles>
-                                <srcFile>${basedir}/../assets/services/db/cart.sql</srcFile>
-                            </srcFiles>
-                        </configuration>
-                    </execution>
-                    
-                    <!-- Shutdown DB in order to be able to run unit tests -->
-                    <execution>
-                    	<id>shutdown-database-sothat-test-can-run</id>
-                    	<phase>process-test-resources</phase>
-                    	<goals>
-                    		<goal>execute</goal>
-                    	</goals>
-                    	<configuration>
-                    	    <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                    		<url>jdbc:derby:${basedir}/target/cart-db;shutdown=true</url>
-                    		<skipOnConnectionError>true</skipOnConnectionError>
-                    	</configuration>
-                    </execution>
-                </executions>
-            </plugin>	
-       </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/store-supplier/store-supplier.composite b/java/sca-contrib/tutorials/store/store-supplier/store-supplier.composite
deleted file mode 100644
index 525bc889cb..0000000000
--- a/java/sca-contrib/tutorials/store/store-supplier/store-supplier.composite
+++ /dev/null
@@ -1,77 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="store-supplier">
-		
-    <component name="StoreSupplier">
-        <t:implementation.widget location="uiservices/store.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/ui"/> 
-        </service>
-		<reference name="catalog" target="StoreSupplierCatalog">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-		 <reference name="shoppingCart" target="StoreSupplierShoppingCart/Cart">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="shoppingTotal" target="StoreSupplierShoppingCart/Total">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-    
-	<component name="StoreSupplierCatalog">
-		<implementation.java class="services.merger.MergedCatalogImpl"/> 
-		<property name="currencyCode">USD</property>
-		<service name="Catalog">
-			<t:binding.jsonrpc/>
-			<binding.ws uri="/CatalogWebService"/>
-   		</service>
-		<reference name="fruitsCatalog" target="StoreSupplierFruitsCatalog"/>	
-		<reference name="vegetablesCatalog" target="VegetablesCatalogWebService">
-			<binding.ws/>
-		</reference>	
-		<reference name="currencyConverter" target="StoreSupplierCurrencyConverter"/>	
-	</component>
- 	
-	<component name="StoreSupplierFruitsCatalog">
-		<implementation.java class="services.FruitsCatalogImpl"/> 
-		<property name="currencyCode">USD</property>
-		<reference name="currencyConverter" target="StoreSupplierCurrencyConverter"/>	
-	</component> 
- 	
-	<component name="StoreSupplierShoppingCart">
-		<implementation.java class="services.db.ShoppingCartTableImpl"/>
-		<property name="database">../store-supplier/target/cart-db</property>
-		<service name="Cart">
-			<t:binding.atom uri="/ShoppingCart/Cart"/>
-		</service>    	
-		<service name="Total">
-			<t:binding.jsonrpc/>
-			<binding.ws uri="/ShoppinCartTotalWebService"/>
-		</service>
-	</component>
-    
-	<component name="StoreSupplierCurrencyConverter">
-		<implementation.java class="services.CurrencyConverterImpl"/>
-	</component>     
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/store-test/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/store-test/META-INF/sca-contribution.xml
deleted file mode 100644
index a75087aca1..0000000000
--- a/java/sca-contrib/tutorials/store/store-test/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,27 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:s="http://store">
-   <import.java package="services"/>
-   <import.java package="services.merger"/>
-   <import.java package="services.db"/>
-   <import.resource uri="uiservices/store.html"/>   
-   <deployable composite="s:store-supplier"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/store-test/client/Shopper.java b/java/sca-contrib/tutorials/store/store-test/client/Shopper.java
deleted file mode 100644
index 4e2fa63493..0000000000
--- a/java/sca-contrib/tutorials/store/store-test/client/Shopper.java
+++ /dev/null
@@ -1,29 +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 client;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Shopper {
-    
-    String shop(String itemName, int quantity);
-
-}
diff --git a/java/sca-contrib/tutorials/store/store-test/pom.xml b/java/sca-contrib/tutorials/store/store-test/pom.xml
deleted file mode 100644
index 29f9b04550..0000000000
--- a/java/sca-contrib/tutorials/store/store-test/pom.xml
+++ /dev/null
@@ -1,201 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-test</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Integration Test</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.3.1.4</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tutorial-store-supplier</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <testSourceDirectory>${basedir}</testSourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>**/*.java</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/store-test/test/StoreSupplierTestCase.java b/java/sca-contrib/tutorials/store/store-test/test/StoreSupplierTestCase.java
deleted file mode 100644
index 5efec4ee2c..0000000000
--- a/java/sca-contrib/tutorials/store/store-test/test/StoreSupplierTestCase.java
+++ /dev/null
@@ -1,89 +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 test;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import client.Shopper;
-
-
-/**
- * Test the store-merger.
- *
- * @version $Rev$ $Date$
- */
-public class StoreSupplierTestCase {
-    
-    private SCANode domainManager;
-    private SCANode storeSupplierNode;
-    private SCANode storeCatalogsNode;
-    private SCANode storeClientNode;
-
-    @Before
-    public void setup() throws Exception {
-        String baseDir = System.getProperty("basedir");
-        String domainDir = baseDir != null? baseDir + "/" + "../domain" : "../domain";
-        
-        DomainManagerLauncher managerLauncher = DomainManagerLauncher.newInstance();
-        domainManager = managerLauncher.createDomainManager(domainDir);
-        domainManager.start();
-        
-        NodeLauncher nodeLauncher = NodeLauncher.newInstance();
-        storeSupplierNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreSupplierNode");
-        storeSupplierNode.start();
-        
-        storeCatalogsNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/CatalogsNode");
-        storeCatalogsNode.start();
-        
-        storeClientNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreClientNode");
-        storeClientNode.start();
-        
-    }
-    
-    @After
-    public void tearDown() throws Exception {
-        storeSupplierNode.stop();
-        storeCatalogsNode.stop();
-        storeClientNode.stop();
-        domainManager.stop();
-    }
-    
-    @Test
-    public void testShop() {
-        SCAClient client = (SCAClient)storeClientNode;
-        Shopper shopper = client.getService(Shopper.class, "StoreClient");
-        
-        String total = shopper.shop("Orange", 5);
-        System.out.println("Total: " + total);
-        
-        Assert.assertEquals("$17.75", total);
-        
-    }
-    
-}
diff --git a/java/sca-contrib/tutorials/store/store/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/store/META-INF/sca-contribution.xml
deleted file mode 100644
index 3ed6e4a4ef..0000000000
--- a/java/sca-contrib/tutorials/store/store/META-INF/sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:s="http://store">
-   <import.java package="services"/>
-   <import.resource uri="uiservices/store.html"/>   
-   <deployable composite="s:store"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/store/pom.xml b/java/sca-contrib/tutorials/store/store/pom.xml
deleted file mode 100644
index 2dcf64bba0..0000000000
--- a/java/sca-contrib/tutorials/store/store/pom.xml
+++ /dev/null
@@ -1,77 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Online Store</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/store/store.composite b/java/sca-contrib/tutorials/store/store/store.composite
deleted file mode 100644
index b3f3140c8c..0000000000
--- a/java/sca-contrib/tutorials/store/store/store.composite
+++ /dev/null
@@ -1,64 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://store"
-		name="store">
-		
-    <component name="Store">
-        <t:implementation.widget location="uiservices/store.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/ui"/>
-        </service>
-		<reference name="catalog" target="StoreCatalog">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-		 <reference name="shoppingCart" target="StoreShoppingCart/Cart">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="shoppingTotal" target="StoreShoppingCart/Total">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-    
-	<component name="StoreCatalog">

-		<implementation.java class="services.FruitsCatalogImpl"/> 

-		<property name="currencyCode">USD</property>
-		<service name="Catalog">

-			<t:binding.jsonrpc/>
-   		</service>

-		<reference name="currencyConverter" target="StoreCurrencyConverter"/>	

-	</component> 

- 	

-	<component name="StoreShoppingCart">

-		<implementation.java class="services.ShoppingCartImpl"/>

-		<service name="Cart">

-			<t:binding.atom uri="/ShoppingCart/Cart"/>

-		</service>    	

-		<service name="Total">
-			<t:binding.jsonrpc/>
-		</service>    	
-	</component>

-    

-	<component name="StoreCurrencyConverter">

-		<implementation.java class="services.CurrencyConverterImpl"/>

-	</component>     

-
-</composite>

diff --git a/java/sca-contrib/tutorials/store/web-services/META-INF/sca-contribution.xml b/java/sca-contrib/tutorials/store/web-services/META-INF/sca-contribution.xml
deleted file mode 100644
index 10fbe6c448..0000000000
--- a/java/sca-contrib/tutorials/store/web-services/META-INF/sca-contribution.xml
+++ /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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-   xmlns:c="http://services">

-   <import.java package="services"/>
-   <deployable composite="c:catalogs"/>

-   <deployable composite="c:currency"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/web-services/catalogs.composite b/java/sca-contrib/tutorials/store/web-services/catalogs.composite
deleted file mode 100644
index 154d475165..0000000000
--- a/java/sca-contrib/tutorials/store/web-services/catalogs.composite
+++ /dev/null
@@ -1,43 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://services"			
-		name="catalogs">
-		
-	<component name="FruitsCatalogWebService">
-		<implementation.java class="services.FruitsCatalogImpl"/>
-		<service name="Catalog">
-			<binding.ws/>
-		</service> 
-		<property name="currencyCode">USD</property>
-		<reference name="currencyConverter" target="CurrencyConverterWebService">
-			<binding.ws/>
-		</reference>
-	</component> 
- 	
-	<component name="VegetablesCatalogWebService">
-		<implementation.java class="services.VegetablesCatalogImpl"/>
-		<service name="Catalog">
-			<binding.ws/>
-		</service> 
-	</component>
- 	
-</composite>
diff --git a/java/sca-contrib/tutorials/store/web-services/currency.composite b/java/sca-contrib/tutorials/store/web-services/currency.composite
deleted file mode 100644
index 7a3f70e299..0000000000
--- a/java/sca-contrib/tutorials/store/web-services/currency.composite
+++ /dev/null
@@ -1,32 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://services"	
-		name="currency">
-		
-	<component name="CurrencyConverterWebService">
-		<implementation.java class="services.CurrencyConverterImpl"/>
-		<service name="CurrencyConverter">
-			<binding.ws/>
-		</service>
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/tutorials/store/web-services/pom.xml b/java/sca-contrib/tutorials/store/web-services/pom.xml
deleted file mode 100644
index 626fb920f9..0000000000
--- a/java/sca-contrib/tutorials/store/web-services/pom.xml
+++ /dev/null
@@ -1,77 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-web-services</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Web Services</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.java b/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.java
deleted file mode 100644
index e105fa3e9a..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.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 amazon.cart;
-
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.oasisopen.sca.annotation.Remotable;
-
-import com.cart.amazon.CartAdd;
-import com.cart.amazon.CartAddResponse;
-import com.cart.amazon.CartClear;
-import com.cart.amazon.CartClearResponse;
-import com.cart.amazon.CartCreate;
-import com.cart.amazon.CartCreateResponse;
-import com.cart.amazon.CartGet;
-import com.cart.amazon.CartGetResponse;
-
-@Remotable
-@DataBinding(value="commonj.sdo.DataObject", wrapped=true)
-public interface AmazonCart {
-
-    public CartCreateResponse CartCreate(CartCreate cartCreate);
-
-    public CartAddResponse CartAdd(CartAdd cartAdd);
-
-    public CartClearResponse CartClear(CartClear cartClear);
-
-    public CartGetResponse CartGet(CartGet cartGet);
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.wsdl b/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.wsdl
deleted file mode 100644
index 051c8ad906..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.wsdl
+++ /dev/null
@@ -1,451 +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.    
--->
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://amazon.cart.com/" targetNamespace="http://amazon.cart.com/">

-	<types>

-		<xs:schema targetNamespace="http://amazon.cart.com/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://amazon.cart.com/" elementFormDefault="qualified">

-			<xs:element name="CartGet">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>

-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>

-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>

-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>

-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>

-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>

-						<xs:element name="Shared" type="tns:CartGetRequest" minOccurs="0"/>

-						<xs:element name="Request" type="tns:CartGetRequest" minOccurs="0" maxOccurs="unbounded"/>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:complexType name="CartGetRequest">

-				<xs:sequence>

-					<xs:element name="CartId" type="xs:string" minOccurs="0"/>

-					<xs:element name="HMAC" type="xs:string" minOccurs="0"/>

-					<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>

-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>

-				</xs:sequence>

-			</xs:complexType>

-			<xs:element name="CartAdd">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>

-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>

-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>

-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>

-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>

-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>

-						<xs:element name="Shared" type="tns:CartAddRequest" minOccurs="0"/>

-						<xs:element name="Request" type="tns:CartAddRequest" minOccurs="0" maxOccurs="unbounded"/>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:complexType name="CartAddRequest">

-				<xs:sequence>

-					<xs:element name="CartId" type="xs:string" minOccurs="0"/>

-					<xs:element name="HMAC" type="xs:string" minOccurs="0"/>

-					<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>

-					<xs:element name="Items" minOccurs="0">

-						<xs:complexType>

-							<xs:sequence>

-								<xs:element name="Item" minOccurs="0" maxOccurs="unbounded">

-									<xs:complexType>

-										<xs:sequence>

-											<xs:element name="ASIN" type="xs:string" minOccurs="0"/>

-											<xs:element name="OfferListingId" type="xs:string" minOccurs="0"/>

-											<xs:element name="Quantity" type="xs:positiveInteger" minOccurs="0"/>

-											<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>

-											<xs:element name="ListItemId" type="xs:string" minOccurs="0"/>

-										</xs:sequence>

-									</xs:complexType>

-								</xs:element>

-							</xs:sequence>

-						</xs:complexType>

-					</xs:element>

-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>

-				</xs:sequence>

-			</xs:complexType>

-			<xs:element name="CartCreate">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>

-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>

-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>

-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>

-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>

-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>

-						<xs:element name="Shared" type="tns:CartCreateRequest" minOccurs="0"/>

-						<xs:element name="Request" type="tns:CartCreateRequest" minOccurs="0" maxOccurs="unbounded"/>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:complexType name="CartCreateRequest">

-				<xs:sequence>

-					<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>

-					<xs:element name="Items" minOccurs="0">

-						<xs:complexType>

-							<xs:sequence>

-								<xs:element name="Item" minOccurs="0" maxOccurs="unbounded">

-									<xs:complexType>

-										<xs:sequence>

-											<xs:element name="ASIN" type="xs:string" minOccurs="0"/>

-											<xs:element name="OfferListingId" type="xs:string" minOccurs="0"/>

-											<xs:element name="Quantity" type="xs:positiveInteger" minOccurs="0"/>

-											<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>

-											<xs:element name="ListItemId" type="xs:string" minOccurs="0"/>

-										</xs:sequence>

-									</xs:complexType>

-								</xs:element>

-							</xs:sequence>

-						</xs:complexType>

-					</xs:element>

-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>

-				</xs:sequence>

-			</xs:complexType>

-			<xs:element name="CartClear">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>

-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>

-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>

-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>

-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>

-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>

-						<xs:element name="Shared" type="tns:CartClearRequest" minOccurs="0"/>

-						<xs:element name="Request" type="tns:CartClearRequest" minOccurs="0" maxOccurs="unbounded"/>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:complexType name="CartClearRequest">

-				<xs:sequence>

-					<xs:element name="CartId" type="xs:string" minOccurs="0"/>

-					<xs:element name="HMAC" type="xs:string" minOccurs="0"/>

-					<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>

-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>

-				</xs:sequence>

-			</xs:complexType>

-			<xs:element name="CartGetResponse">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>

-						<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="CartAddResponse">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>

-						<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="CartCreateResponse">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>

-						<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="CartClearResponse">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>

-						<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="Cart">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element ref="tns:Request" minOccurs="0"/>

-						<xs:element name="CartId" type="xs:string"/>

-						<xs:element name="HMAC" type="xs:string"/>

-						<xs:element name="URLEncodedHMAC" type="xs:string"/>

-						<xs:element name="PurchaseURL" type="xs:string" minOccurs="0"/>

-						<xs:element name="SubTotal" type="tns:Price" minOccurs="0"/>

-						<xs:element ref="tns:CartItems" minOccurs="0"/>

-						<xs:element ref="tns:SavedForLaterItems" minOccurs="0"/>

-						<xs:element ref="tns:SimilarProducts" minOccurs="0"/>

-						<xs:element ref="tns:TopSellers" minOccurs="0"/>

-						<xs:element ref="tns:NewReleases" minOccurs="0"/>

-						<xs:element ref="tns:SimilarViewedProducts" minOccurs="0"/>

-						<xs:element ref="tns:OtherCategoriesSimilarProducts" minOccurs="0"/>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="SavedForLaterItems">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="SubTotal" type="tns:Price" minOccurs="0"/>

-						<xs:element name="SavedForLaterItem" type="tns:CartItem" maxOccurs="unbounded"/>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="SimilarProducts">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="SimilarProduct" maxOccurs="unbounded">

-							<xs:complexType>

-								<xs:sequence>

-									<xs:element name="ASIN" type="xs:string" minOccurs="0"/>

-									<xs:element name="Title" type="xs:string" minOccurs="0"/>

-								</xs:sequence>

-							</xs:complexType>

-						</xs:element>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="TopSellers">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="TopSeller" maxOccurs="unbounded">

-							<xs:complexType>

-								<xs:sequence>

-									<xs:element name="ASIN" type="xs:string" minOccurs="0"/>

-									<xs:element name="Title" type="xs:string" minOccurs="0"/>

-								</xs:sequence>

-							</xs:complexType>

-						</xs:element>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="NewReleases">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="NewRelease" maxOccurs="unbounded">

-							<xs:complexType>

-								<xs:sequence>

-									<xs:element name="ASIN" type="xs:string" minOccurs="0"/>

-									<xs:element name="Title" type="xs:string" minOccurs="0"/>

-								</xs:sequence>

-							</xs:complexType>

-						</xs:element>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="SimilarViewedProducts">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="SimilarViewedProduct" maxOccurs="unbounded">

-							<xs:complexType>

-								<xs:sequence>

-									<xs:element name="ASIN" type="xs:string" minOccurs="0"/>

-									<xs:element name="Title" type="xs:string" minOccurs="0"/>

-								</xs:sequence>

-							</xs:complexType>

-						</xs:element>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="OtherCategoriesSimilarProducts">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="OtherCategoriesSimilarProduct" maxOccurs="unbounded">

-							<xs:complexType>

-								<xs:sequence>

-									<xs:element name="ASIN" type="xs:string" minOccurs="0"/>

-									<xs:element name="Title" type="xs:string" minOccurs="0"/>

-								</xs:sequence>

-							</xs:complexType>

-						</xs:element>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="CartItems">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="SubTotal" type="tns:Price" minOccurs="0"/>

-						<xs:element name="CartItem" type="tns:CartItem" maxOccurs="unbounded"/>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="OperationRequest">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element ref="tns:HTTPHeaders" minOccurs="0"/>

-						<xs:element name="RequestId" type="xs:string" minOccurs="0"/>

-						<xs:element ref="tns:Arguments" minOccurs="0"/>

-						<xs:element ref="tns:Errors" minOccurs="0"/>

-						<xs:element name="RequestProcessingTime" type="xs:float" minOccurs="0" maxOccurs="1"/>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="Request">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="CartGetRequest" type="tns:CartGetRequest" minOccurs="0"/>

-						<xs:element name="CartAddRequest" type="tns:CartAddRequest" minOccurs="0"/>

-						<xs:element name="CartCreateRequest" type="tns:CartCreateRequest" minOccurs="0"/>

-						<xs:element name="CartClearRequest" type="tns:CartClearRequest" minOccurs="0"/>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="Arguments">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="Argument" maxOccurs="unbounded">

-							<xs:complexType>

-								<xs:attribute name="Name" type="xs:string" use="required"/>

-								<xs:attribute name="Value" type="xs:string"/>

-							</xs:complexType>

-						</xs:element>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="Errors">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="Error" maxOccurs="unbounded">

-							<xs:complexType>

-								<xs:sequence>

-									<xs:element name="Code" type="xs:string"/>

-									<xs:element name="Message" type="xs:string"/>

-								</xs:sequence>

-							</xs:complexType>

-						</xs:element>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:element name="HTTPHeaders">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element name="Header" minOccurs="0" maxOccurs="unbounded">

-							<xs:complexType>

-								<xs:attribute name="Name" type="xs:string" use="required"/>

-								<xs:attribute name="Value" type="xs:string" use="required"/>

-							</xs:complexType>

-						</xs:element>

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-			<xs:complexType name="CartItem">

-				<xs:sequence>

-					<xs:element name="CartItemId" type="xs:string"/>

-					<xs:element name="ASIN" type="xs:string" minOccurs="0"/>

-					<xs:element name="ExchangeId" type="xs:string" minOccurs="0"/>

-					<xs:element name="MerchantId" type="xs:string" minOccurs="0"/>

-					<xs:element name="SellerId" type="xs:string" minOccurs="0"/>

-					<xs:element name="SellerNickname" type="xs:string" minOccurs="0"/>

-					<xs:element name="Quantity" type="xs:string"/>

-					<xs:element name="Title" type="xs:string" minOccurs="0"/>

-					<xs:element name="ProductGroup" type="xs:string" minOccurs="0"/>

-					<xs:element name="ListOwner" type="xs:string" minOccurs="0"/>

-					<xs:element name="ListType" type="xs:string" minOccurs="0"/>

-					<xs:element name="Price" type="tns:Price" minOccurs="0"/>

-					<xs:element name="ItemTotal" type="tns:Price" minOccurs="0"/>

-				</xs:sequence>

-			</xs:complexType>

-			<xs:complexType name="Price">

-				<xs:sequence>

-					<xs:element name="Amount" type="xs:integer" minOccurs="0"/>

-					<xs:element name="CurrencyCode" type="xs:string" minOccurs="0"/>

-					<xs:element name="FormattedPrice" type="xs:string"/>

-				</xs:sequence>

-			</xs:complexType>

-		</xs:schema>

-	</types>

-	<message name="CartGetRequestMsg">

-		<part name="body" element="tns:CartGet"/>

-	</message>

-	<message name="CartGetResponseMsg">

-		<part name="body" element="tns:CartGetResponse"/>

-	</message>

-	<message name="CartAddRequestMsg">

-		<part name="body" element="tns:CartAdd"/>

-	</message>

-	<message name="CartAddResponseMsg">

-		<part name="body" element="tns:CartAddResponse"/>

-	</message>

-	<message name="CartCreateRequestMsg">

-		<part name="body" element="tns:CartCreate"/>

-	</message>

-	<message name="CartCreateResponseMsg">

-		<part name="body" element="tns:CartCreateResponse"/>

-	</message>

-	<message name="CartClearRequestMsg">

-		<part name="body" element="tns:CartClear"/>

-	</message>

-	<message name="CartClearResponseMsg">

-		<part name="body" element="tns:CartClearResponse"/>

-	</message>

-	<portType name="AmazonCartServicePortType">

-		<operation name="CartGet">

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

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

-		</operation>

-		<operation name="CartAdd">

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

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

-		</operation>

-		<operation name="CartCreate">

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

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

-		</operation>

-		<operation name="CartClear">

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

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

-		</operation>

-	</portType>

-	<binding name="AmazonCartServiceBinding" type="tns:AmazonCartServicePortType">

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

-		<operation name="CartGet">

-			<soap:operation soapAction="http://soap.amazon.cart.com"/>

-			<input>

-				<soap:body use="literal"/>

-			</input>

-			<output>

-				<soap:body use="literal"/>

-			</output>

-		</operation>

-		<operation name="CartCreate">

-			<soap:operation soapAction="http://soap.amazon.cart.com"/>

-			<input>

-				<soap:body use="literal"/>

-			</input>

-			<output>

-				<soap:body use="literal"/>

-			</output>

-		</operation>

-		<operation name="CartAdd">

-			<soap:operation soapAction="http://soap.amazon.cart.com"/>

-			<input>

-				<soap:body use="literal"/>

-			</input>

-			<output>

-				<soap:body use="literal"/>

-			</output>

-		</operation>

-		<operation name="CartClear">

-			<soap:operation soapAction="http://soap.amazon.cart.com"/>

-			<input>

-				<soap:body use="literal"/>

-			</input>

-			<output>

-				<soap:body use="literal"/>

-			</output>

-		</operation>

-	</binding>

-	<service name="AmazonCartService">

-		<port name="AmazonCartServicePort" binding="tns:AmazonCartServiceBinding">

-			<soap:address location="http://localhost:8080/AmazonCartServiceComponent"/>

-		</port>

-	</service>

-</definitions>

diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCartImpl.java b/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCartImpl.java
deleted file mode 100644
index 36c2ff83e4..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCartImpl.java
+++ /dev/null
@@ -1,120 +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 amazon.cart;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.oasisopen.sca.annotation.Service;
-
-import com.cart.amazon.AmazonFactory;
-import com.cart.amazon.Cart;
-import com.cart.amazon.CartAdd;
-import com.cart.amazon.CartAddRequest;
-import com.cart.amazon.CartAddResponse;
-import com.cart.amazon.CartClear;
-import com.cart.amazon.CartClearResponse;
-import com.cart.amazon.CartCreate;
-import com.cart.amazon.CartCreateResponse;
-import com.cart.amazon.CartGet;
-import com.cart.amazon.CartGetResponse;
-import com.cart.amazon.CartItem;
-import com.cart.amazon.CartItems;
-import com.cart.amazon.Item1;
-import com.cart.amazon.Items1;
-
-@Service(AmazonCart.class)
-public class AmazonCartImpl {
-
-    protected Map<String, Cart> cartsHash = new HashMap<String, Cart>();
-
-    public CartCreateResponse CartCreate(CartCreate cartCreate) {
-
-        System.out.println("CartServiceID: " + this.toString());
-        System.out.println("Entering cartCreate...");
-        String userId = cartCreate.getAWSAccessKeyId();
-
-        Cart cart = getCart(userId);
-        if (cart != null) {
-            System.out.println("User " + cartCreate.getAWSAccessKeyId()
-                + " has already created a cart with ID: "
-                + cart.getCartId());
-            return null;
-        }
-        cart = new Cart();
-        cart.setCartItems(new CartItems());
-        addCart(userId, cart);
-
-        CartCreateResponse response = AmazonFactory.INSTANCE.createCartCreateResponse();
-        System.out.println("Exiting cartCreate...");
-        return response;
-
-    }
-
-    public CartAddResponse CartAdd(CartAdd cartAdd) {
-
-        String userId = cartAdd.getAWSAccessKeyId();
-
-        Cart cart = getCart(userId);
-        if (cart == null) {
-            System.out.println("User has not associated Cart yet...");
-            return null;
-        }
-
-        List cartAddRequestList = cartAdd.getRequest();
-        CartAddRequest car = (CartAddRequest)cartAddRequestList.get(0);
-        Items1 carItems = car.getItems();
-        List itemList = carItems.getItem();
-        Item1 item = (Item1)itemList.get(0); //Take only the first one, no iteration for now
-        System.out.println("item.getASIN: " + item.getASIN());
-        System.out.println("item.getQuantity(): " + item.getQuantity());
-        CartItems cartItems = cart.getCartItems();
-        List<CartItem> cartItemList = cartItems.getCartItem();
-        cart.setCartItems(cartItems);
-        return null;
-    }
-
-    public CartClearResponse CartClear(CartClear cartClear) {
-        String userId = cartClear.getAWSAccessKeyId();
-
-        Cart cart = getCart(userId);
-        if (cart == null) {
-            System.out.println("User has not associated Cart yet...");
-            return null;
-        }
-
-        cart.setCartItems(new CartItems());
-        return null;
-    }
-
-    public CartGetResponse CartGet(CartGet cartGet) {
-        return null;
-    }
-
-    private Cart getCart(String userId) {
-        Cart cart = null;
-        cart = this.cartsHash.get(userId);
-        return cart;
-    }
-
-    private void addCart(String userId, Cart cart) {
-        this.cartsHash.put(userId, cart);
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazoncart.composite b/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazoncart.composite
deleted file mode 100644
index 6f8cc7b878..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazoncart.composite
+++ /dev/null
@@ -1,33 +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://amazonCart" 

-    xmlns:tns="http://amazonCart"

-    name="amazonCart">

-

-    <component name="AmazonCartServiceComponent">

-        <implementation.java class="amazon.cart.AmazonCartImpl" />

-        <service name="AmazonCart">

-            <interface.wsdl interface="http://amazon.cart.com/#wsdl.interface(AmazonCartServicePortType)" />

-            <binding.ws />

-        </service>

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/launch/LaunchAmazonCart.java b/java/sca-contrib/tutorials/store/www-services/cart-amazon/launch/LaunchAmazonCart.java
deleted file mode 100644
index 69dd06c2ef..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/launch/LaunchAmazonCart.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 launch;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.util.SCAContributionUtil;
-
-public class LaunchAmazonCart {
-
-	public static void main(String[] args) throws Exception {
-     
-	System.out.println("Starting ...");
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        SCANode node = nodeFactory.createSCANode(null, "http://localhost:9999");
-        
-        URL contribution = SCAContributionUtil.findContributionFromClass(LaunchAmazonCart.class);
-        node.addContribution("http://amazonCart", contribution);
-        
-        node.addToDomainLevelComposite(new QName("http://amazonCart", "amazonCart"));
-        node.start();
-
-        System.out.println("amazoncart.composite ready for big business !!!");
-        System.in.read();
-        
-        System.out.println("Stopping ...");
-        node.stop();
-        node.destroy();
-        System.out.println();
-    }
-	
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/pom.xml b/java/sca-contrib/tutorials/store/www-services/cart-amazon/pom.xml
deleted file mode 100644
index 7ba441c1f3..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/pom.xml
+++ /dev/null
@@ -1,215 +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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-tutorial-store</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tutorial-cart-amazon</artifactId>

-    <name>Apache Tuscany SCA Store Tutorial Amazon Cart</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sdo</groupId>

-            <artifactId>tuscany-sdo-lib</artifactId>

-            <version>1.1-incubating</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sdo</groupId>

-            <artifactId>tuscany-sdo-impl</artifactId>

-            <version>1.1-incubating</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-databinding</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-databinding-sdo</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>compile</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <sourceDirectory>${basedir}</sourceDirectory>

-        <testSourceDirectory>${basedir}/test</testSourceDirectory>

-        <resources>

-            <resource>

-                <directory>${basedir}</directory>

-                <excludes>

-                    <exclude>**/*.java</exclude>

-                    <exclude>pom.xml</exclude>

-                    <exclude>build.xml</exclude>

-                </excludes>

-            </resource>

-        </resources>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-test-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/sdo-source</source>

-                                <source>target/wsdl2java-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.tuscany.sdo</groupId>

-                <artifactId>tuscany-sdo-plugin</artifactId>

-                <version>1.1-incubating</version>

-                <executions>

-                    <execution>

-                        <configuration>

-                            <schemaFile>${basedir}/amazon/cart/AmazonCart.wsdl</schemaFile>

-                            <noNotification>true</noNotification>

-                            <noContainer>true</noContainer>

-                            <noInterfaces>true</noInterfaces>

-                            <noUnsettable>true</noUnsettable>

-                        </configuration>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-

-            <plugin>

-                <groupId>org.apache.tuscany.sca</groupId>

-                <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>2.0-SNAPSHOT</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.tuscany.sca</groupId>

-                <artifactId>tuscany-maven-wsdl2java</artifactId>

-                <version>2.0-SNAPSHOT</version>

-                <executions>

-                    <execution>

-                        <configuration>

-                            <wsdlFile>${basedir}/amazon/cart/AmazonCart.wsdl</wsdlFile>

-                            <javaPackage>amazon.cart.api</javaPackage>

-                        </configuration>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-

-            <plugin>

-                <groupId>org.apache.tuscany.sca</groupId>

-                <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>2.0-SNAPSHOT</version>

-                <executions>

-                    <execution>

-                        <configuration>

-                            <mainClass>launch.LaunchAmazonCart</mainClass>

-                        </configuration>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <dependencies>

-                    <dependency>

-                        <groupId>ant</groupId>

-                        <artifactId>ant-trax</artifactId>

-                        <version>1.6.5</version>

-                    </dependency>

-                </dependencies>

-            </plugin>

-        </plugins>

-    </build>

-

-

-</project>

diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/test/AmazonCartTestCase.java b/java/sca-contrib/tutorials/store/www-services/cart-amazon/test/AmazonCartTestCase.java
deleted file mode 100644
index ede97f7868..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/test/AmazonCartTestCase.java
+++ /dev/null
@@ -1,99 +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 test;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
-import launch.LaunchAmazonCart;
-
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.util.SCAContributionUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import amazon.cart.AmazonCart;
-
-import com.cart.amazon.AmazonFactory;
-import com.cart.amazon.CartCreate;
-import commonj.sdo.DataObject;
-
-/**
- * Test case for helloworld web service client
- */
-public class AmazonCartTestCase {
-
-    private SCANode node;
-    private AmazonCart amazonCart;
-
-    @Before
-    public void startClient() throws Exception {
-        try {
-
-            System.out.println("Starting ...");
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            node = nodeFactory.createSCANode(null, null);
-            
-            URL contribution = SCAContributionUtil.findContributionFromClass(LaunchAmazonCart.class);
-            node.addContribution("http://amazonCart", contribution);
-            
-            node.addToDomainLevelComposite(new QName("http://amazonCart", "amazonCart"));
-            node.start();
-
-            System.out.println("amazoncart.composite ready for big business !!!");
-            
-            amazonCart = node.getDomain().getService(AmazonCart.class, "AmazonCartServiceComponent");
-
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void testCartCreate() throws Exception {
-        System.out.println("Entering test...");
-        CartCreate create = AmazonFactory.INSTANCE.createCartCreate();
-        DataObject root = amazonCart.CartCreate(create);
-        // Assert.assertEquals("Hello Smith", msg);
-        System.out.println("Exiting test...");
-    }
-
-    /*
-     * @Test public void testEmbeddedReferenceClient() throws Exception { String
-     * msg = helloTuscanyService.getGreetings("Tuscany");
-     * Assert.assertEquals("Hello Tuscany", msg); }
-     */
-
-    @After
-    public void stopClient() throws Exception {
-        System.out.println("Stopping ...");
-        node.stop();
-        node.destroy();
-        System.out.println();
-    }
-
-    /*
-     * public void testCartCreate() throws Exception { DataObject root =
-     * amazonCart.cartCreate(null); //assertNotNull(root);
-     * //assertEquals("Luciano Resende", root.getString("CUSTOMER[1]/NAME")); }
-     */
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/README b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/README
deleted file mode 100644
index b5322f82c2..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/README
+++ /dev/null
@@ -1,77 +0,0 @@
-Shopping Store Web Service Sample
-=================================
-This sample creates an shopping store application using Amazon's WS API interface. This sample intents to provide
-the same services provided by Amazon but implementing them as SCA components. These services are provided through
-a web service interface. 
-
-If you just want to run it to see what happens you need to run the server first. So, open a command prompt, navigate 
-to the shoppingstore sample directory and do:
-
-1 - "ant" to compile it
-2 - "ant run" to get the server up and running
-3 - You should see the following output from the run target:
-	run:
-     	[java] log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAXUtils).
-     	[java] log4j:WARN Please initialize the log4j system properly.
-     	[java] ToyApp server started (press enter to shutdown)
-
-Once the server is running, it will be expecting requests from a client through its Web Service interface.
-
-The WSDL describing the WS interface can be obtained opening a web broeser pointing to 
-http://localhost:8080/ShoppingStoreServiceComponent?wsdl
-
-
-Sample Overview
----------------
-Currently, the sample provides two components:
-	1 - ShoppingStoreService: that is wired to a reference with a web service binding and plays the role of a proxy service which offers all the operations exposed through the WSDL API and forwards every invocation to the actual service that in fact implements the service invoked.
-	2 - CartService: currently, this is the only component offering an actual service through the Shopping Store. It provides the following operations: CartCreate, CartAdd, CartClear, CartGet.
-
-shoppingstore/
-  lib/
-    AWS2007_05_14.jar						- The jar file containing all the classes generated out of Amazon's WSDL using
-    								     	  the Axis2's wsdl2java utility (the databinding used was jaxb)
-  src/
-    main/
-      java/
-        shoppingstore/
-          server/
-            ShoppingStoreServer.java		- starts the SCA Runtime and deploys
-            								  the shoppingstore.composite.
-                                    		  In doing this, the SCA WSDL binding
-                                    		  acts to expose the ShoppingStoreService
-                                    		  over WS
-          services/
-            cart/
-              CartService.java				- Java interface description for 
-                                              CartServiceComponent
-              CartServiceImpl.java			- component implementation
-            proxy/
-              ShoppingStoreService.java		- Java interface description for 
-                                              ShoppingStoreServiceComponent
-              ShoppingStoreServiceImpl.java - component implementation
-      resources/
-        wsdl/
-          shoppingstore.wsdl                - the service description that the 
-                                              SCA reference uses to bind to. This 
-                                              wsdl file is very similar to Amazon's 
-                                              WSDL released on May 14th, 2007. Only
-                                              two modifications were done: 
-                                              1 - Non-implemented services had to be 
-                                              commented out from the WSDL
-                                              2 - Its location was modified in order 
-                                              for it to point to this sample's address
-        shoppingstore.composite      		- the SCA assembly for this sample
-    test/									- no test provided so far
-  shoppingstore.png             			- a pictorial representation of the 
-                                            current status of the sample, plus future enhancements
-  build.xml                               - the Ant build file
-
-
-Building And Running The Sample Using Ant
------------------------------------------
-Take a look at the beginning of this document.
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-No maven support has been implemented yet.
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/build.xml b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/build.xml
deleted file mode 100644
index 0a455f52b7..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/build.xml
+++ /dev/null
@@ -1,74 +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.    
--->
-<project name="sample-shoppingstore" default="compile">
-	<property name="server.class" value="shoppingstore.server.ShoppingStoreServer" />
-	<property name="server.jar" value="sample-shoppingstore.jar" />
-
-	<target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<pathelement location="./lib/AWS2007_05_14.jar"/>
-            </classpath>
-        </javac>
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${server.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${server.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>
-    
-    <target name="run-classes">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${server.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${server.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<pathelement location="./lib/AWS2007_05_14.jar"/>
-            </classpath>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/lib/AWS2007_05_14.jar b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/lib/AWS2007_05_14.jar
deleted file mode 100644
index 4b5232fd3b..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/lib/AWS2007_05_14.jar
+++ /dev/null
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/shoppingstore.png b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/shoppingstore.png
deleted file mode 100644
index e88abcbd58..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/shoppingstore.png
+++ /dev/null
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/server/ShoppingStoreServer.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/server/ShoppingStoreServer.java
deleted file mode 100644
index 486946b2fc..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/server/ShoppingStoreServer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package shoppingstore.server;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class ShoppingStoreServer {
-
-	public static void main(String[] args) {
-
-		SCADomain scaDomain = SCADomain.newInstance("shoppingstore.composite");
-
-		try {
-			System.out.println("ToyApp server started (press enter to shutdown)");
-			System.in.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		scaDomain.close();
-		System.out.println("ToyApp server stopped");
-	}
-	
-	
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartService.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartService.java
deleted file mode 100644
index 649f5b16a3..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package shoppingstore.services.cart;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartAdd;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartAddResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartClear;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartClearResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartCreate;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartCreateResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartGet;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartGetResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartModify;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartModifyResponse;
-
-@Remotable
-public interface CartService {
-	
-	public CartCreateResponse CartCreate(CartCreate cartCreate);
-	
-	public CartAddResponse CartAdd(CartAdd cartAdd);
-	
-	public CartModifyResponse CartModify(CartModify cartModify);
-	
-	public CartClearResponse CartClear(CartClear cartClear);
-
-	public CartGetResponse CartGet(CartGet cartGet);
-	
-	//@Init
-	//public void start();
-	
-	//@Destroy
-	//public void stop();
-
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartServiceImpl.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartServiceImpl.java
deleted file mode 100644
index 12fed3cac6..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartServiceImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package shoppingstore.services.cart;
-
-import java.util.HashMap;
-
-import org.oasisopen.sca.annotation.Scope;
-
-import com.amazon.webservices.awsecommerceservice._2007_05_14.Cart;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartAdd;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartAddRequest;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartAddResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartClear;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartClearResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartCreate;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartCreateResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartGet;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartGetResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartItem;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartItems;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartModify;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartModifyResponse;
-
-@Scope("COMPOSITE")
-public class CartServiceImpl implements CartService {
-	
-	private static long ID = 0;
-	
-	private HashMap<String, Cart> cartsHash = new HashMap<String, Cart>();
-	
-	public CartAddResponse CartAdd(CartAdd cartAdd) {
-		System.out.println("Entering cartAdd...");
-		System.out.println("CartServiceID: " + this.toString());
-		CartAddResponse cartAddResponse = new CartAddResponse();
-		
-		CartAddRequest cartAddRequest = cartAdd.getRequest().get(0);
-		
-		//Cart cart = getCart(cartAddRequest.getCartId());
-		Cart cart = getCart(cartAdd.getAWSAccessKeyId());
-		if(cart == null){
-			cartAddResponse.getCart().add(new Cart());
-			return cartAddResponse;
-		}
-		
-		CartItem cartItem = new CartItem();
-		cartItem.setASIN(cartAddRequest.getItems().getItem().get(0).getASIN());
-		cartItem.setQuantity(cartAddRequest.getItems().getItem().get(0).getQuantity().toString());
-		cart.getCartItems().getCartItem().add(cartItem);
-		cartAddResponse.getCart().add(cart);
-		System.out.println("Exiting cartAdd...");
-		return cartAddResponse;
-	}
-
-	public CartClearResponse CartClear(CartClear cartClear) {
-		System.out.println("CartServiceID: " + this.toString());
-		System.out.println("Entering cartClear...");
-		CartClearResponse cartClearResponse = new CartClearResponse();
-		
-		//CartClearRequest cartClearRequest = cartClear.getRequest().get(0);
-		
-		//Cart cart = getCart(cartClearRequest.getCartId());
-		Cart cart = getCart(cartClear.getAWSAccessKeyId());
-		if(cart == null) {
-			cartClearResponse.getCart().add(new Cart());
-			return cartClearResponse;
-		}
-		
-		cart.getCartItems().getCartItem().clear();
-				
-		cartClearResponse.getCart().add(cart);
-		System.out.println("Exiting cartClear...");
-		return cartClearResponse;
-	}
-
-	public CartCreateResponse CartCreate(CartCreate cartCreate) {
-		System.out.println("CartServiceID: " + this.toString());
-		System.out.println("Entering cartCreate...");
-		CartCreateResponse cartCreateResponse = new CartCreateResponse();
-		
-		Cart cart = getCart(cartCreate.getAWSAccessKeyId());
-		if(cart != null){
-			cartCreateResponse.getCart().add(cart);
-			System.out.println("User " + cartCreate.getAWSAccessKeyId() + " has already created a cart with ID: " + cart.getCartId());
-			return cartCreateResponse;
-		}
-
-		cart = new Cart();		
-		cart.setCartId(this.generateID());
-		cart.setCartItems(new CartItems());		
-		addCart(cartCreate.getAWSAccessKeyId(), cart);
-		
-		cartCreateResponse.getCart().add(cart);
-		System.out.println("Exiting cartCreate...");
-		return cartCreateResponse;
-	}
-
-	public CartGetResponse CartGet(CartGet cartGet) {
-		System.out.println("CartServiceID: " + this.toString());
-		System.out.println("Entering cartGet...");
-		CartGetResponse cartGetResponse = new CartGetResponse();
-		
-		//CartGetRequest cartGetRequest = cartGet.getRequest().get(0);
-		
-		//Cart cart = getCart(cartGetRequest.getCartId());
-		Cart cart = getCart(cartGet.getAWSAccessKeyId());
-		if(cart == null){
-			cartGetResponse.getCart().add(new Cart());
-			return cartGetResponse;
-		}
-		
-		cartGetResponse.getCart().add(cart);
-		System.out.println("Exiting cartGet...");
-		return cartGetResponse;
-	}
-
-	public CartModifyResponse CartModify(CartModify cartModify) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	private synchronized String generateID(){
-		ID++;
-		return String.valueOf(ID);
-	}
-	
-	
-	private Cart getCart(String cartId){
-		Cart cart = null;
-		System.out.println(this.cartsHash.toString());
-		cart = this.cartsHash.get(cartId);
-		return cart;
-	}
-	
-	private void addCart(String cartId, Cart cart){
-		this.cartsHash.put(cartId, cart);
-	}
-/*
-	public void start() {
-		System.out.println("Start CartService...");
-	}
-
-	public void stop() {
-		System.out.println("Stop CartService...");
-	}
-*/	
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreService.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreService.java
deleted file mode 100644
index 947b6fda04..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package shoppingstore.services.proxy;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartAdd;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartAddResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartClear;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartClearResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartCreate;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartCreateResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartGet;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartGetResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartModify;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartModifyResponse;
-
-
-@Remotable
-public interface ShoppingStoreService{
-
-	public CartCreateResponse CartCreate(CartCreate cartCreate);
-	
-	public CartAddResponse CartAdd(CartAdd cartAdd);
-	
-	public CartModifyResponse CartModify(CartModify cartModify);
-	
-	public CartClearResponse CartClear(CartClear cartClear);
-
-	public CartGetResponse CartGet(CartGet cartGet);
-	
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreServiceImpl.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreServiceImpl.java
deleted file mode 100644
index ce121f9d0a..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreServiceImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package shoppingstore.services.proxy;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-import shoppingstore.services.cart.CartService;
-
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartAddResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartClearResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartCreateResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartGetResponse;
-import com.amazon.webservices.awsecommerceservice._2007_05_14.CartModifyResponse;
-
-@Scope("COMPOSITE")
-public class ShoppingStoreServiceImpl implements ShoppingStoreService {
-
-	private CartService cartService;
-    
-    @Reference
-    public void setCartService(CartService cartService) {
-        this.cartService = cartService;
-    }
-
-	public CartAddResponse CartAdd(
-			com.amazon.webservices.awsecommerceservice._2007_05_14.CartAdd cartAdd) {
-		return cartService.CartAdd(cartAdd);
-	}
-
-	public CartClearResponse CartClear(
-			com.amazon.webservices.awsecommerceservice._2007_05_14.CartClear cartClear) {
-		return cartService.CartClear(cartClear);
-	}
-
-	public CartCreateResponse CartCreate(
-			com.amazon.webservices.awsecommerceservice._2007_05_14.CartCreate cartCreate) {
-		return cartService.CartCreate(cartCreate);
-	}
-
-	public CartGetResponse CartGet(
-			com.amazon.webservices.awsecommerceservice._2007_05_14.CartGet cartGet) {
-		return cartService.CartGet(cartGet);
-	}
-
-	public CartModifyResponse CartModify(
-			com.amazon.webservices.awsecommerceservice._2007_05_14.CartModify cartModify) {
-		return cartService.CartModify(cartModify);
-	}
-
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/shoppingstore.composite b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/shoppingstore.composite
deleted file mode 100644
index f03ce10d3b..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/shoppingstore.composite
+++ /dev/null
@@ -1,20 +0,0 @@
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-			targetNamespace="http://webservices.amazon.com/AWSECommerceService/2007-05-14"

-			xmlns:tns="http://webservices.amazon.com/AWSECommerceService/2007-05-14"

-			xmlns:db="http://tuscany.apache.org/xmlns/databinding/1.0"

-           name="ShoppingStore">

-    

-    <component name="ShoppingStoreServiceComponent">

-	    <service name="ShoppingStoreService" >

-	        <interface.wsdl interface="http://webservices.amazon.com/AWSECommerceService/2007-05-14#wsdl.interface(AWSECommerceServicePortType)" />

-	        <binding.ws />

-	        <db:databinding name="jaxb" />

-	    </service>

-    	<implementation.java class="shoppingstore.services.proxy.ShoppingStoreServiceImpl" />

-		<reference name="cartService" target="CartServiceComponent"></reference>

-    </component>

-

-	<component name="CartServiceComponent">

-        <implementation.java class="shoppingstore.services.cart.CartServiceImpl" />

-    </component>

-</composite>
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/wsdl/shoppingstore.wsdl b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/wsdl/shoppingstore.wsdl
deleted file mode 100644
index 22eba787c6..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/wsdl/shoppingstore.wsdl
+++ /dev/null
@@ -1,3023 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://webservices.amazon.com/AWSECommerceService/2007-05-14" targetNamespace="http://webservices.amazon.com/AWSECommerceService/2007-05-14">
-	<types>
-		<xs:schema targetNamespace="http://webservices.amazon.com/AWSECommerceService/2007-05-14" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://webservices.amazon.com/AWSECommerceService/2007-05-14" elementFormDefault="qualified">
-			<!-- xs:element name="Bin">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="BinName" type="xs:string"/>
-						<xs:element name="BinItemCount" type="xs:positiveInteger"/>
-						<xs:element name="BinParameter" minOccurs="0" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Name" type="xs:string"/>
-									<xs:element name="Value" type="xs:string"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SearchBinSet">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:Bin" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-					<xs:attribute name="NarrowBy" type="xs:string" use="required"/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SearchBinSets">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:SearchBinSet" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Help">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:HelpRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:HelpRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="HelpRequest">
-				<xs:sequence>
-					<xs:element name="About" type="xs:string" minOccurs="0" maxOccurs="1"/>
-					<xs:element name="HelpType" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="Operation"/>
-								<xs:enumeration value="ResponseGroup"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="ItemSearch">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:ItemSearchRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:ItemSearchRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="ItemSearchRequest">
-				<xs:sequence>
-					<xs:element name="Actor" type="xs:string" minOccurs="0"/>
-					<xs:element name="Artist" type="xs:string" minOccurs="0"/>
-					<xs:element name="Availability" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="Available"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element ref="tns:AudienceRating" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Author" type="xs:string" minOccurs="0"/>
-					<xs:element name="Brand" type="xs:string" minOccurs="0"/>
-					<xs:element name="BrowseNode" type="xs:string" minOccurs="0"/>
-					<xs:element name="City" type="xs:string" minOccurs="0"/>
-					<xs:element name="Composer" type="xs:string" minOccurs="0"/>
-					<xs:element ref="tns:Condition" minOccurs="0"/>
-					<xs:element name="Conductor" type="xs:string" minOccurs="0"/>
-					<xs:element name="Count" type="xs:positiveInteger" minOccurs="0">
-						<xs:annotation>
-							<xs:appinfo>
-								<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-									<aws-se:excludeFrom>public</aws-se:excludeFrom>
-									<aws-se:excludeFrom>partner</aws-se:excludeFrom>
-								</aws-se:restricted>
-							</xs:appinfo>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Cuisine" type="xs:string" minOccurs="0"/>
-					<xs:element ref="tns:DeliveryMethod" minOccurs="0"/>
-					<xs:element name="Director" type="xs:string" minOccurs="0"/>
-					<xs:element name="FutureLaunchDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="ISPUPostalCode" type="xs:string" minOccurs="0"/>
-					<xs:element name="ItemPage" type="xs:positiveInteger" minOccurs="0"/>
-					<xs:element name="Keywords" type="xs:string" minOccurs="0"/>
-					<xs:element name="Manufacturer" type="xs:string" minOccurs="0"/>
-					<xs:element name="MaximumPrice" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="MerchantId" type="xs:string" minOccurs="0"/>
-					<xs:element name="MinimumPrice" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="MusicLabel" type="xs:string" minOccurs="0"/>
-					<xs:element name="Neighborhood" type="xs:string" minOccurs="0"/>
-					<xs:element name="Orchestra" type="xs:string" minOccurs="0"/>
-					<xs:element name="PostalCode" type="xs:string" minOccurs="0"/>
-					<xs:element name="Power" type="xs:string" minOccurs="0"/>
-					<xs:element name="Publisher" type="xs:string" minOccurs="0"/>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="ReviewSort" type="xs:string" minOccurs="0"/>
-					<xs:element name="SearchIndex" type="xs:string" minOccurs="0"/>
-					<xs:element name="Sort" type="xs:string" minOccurs="0"/>
-					<xs:element name="State" type="xs:string" minOccurs="0"/>
-					<xs:element name="TextStream" type="xs:string" minOccurs="0"/>
-					<xs:element name="Title" type="xs:string" minOccurs="0"/>
-					<xs:element name="ReleaseDate" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="ItemLookup">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:ItemLookupRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:ItemLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="ItemLookupRequest">
-				<xs:sequence>
-					<xs:element ref="tns:Condition" minOccurs="0"/>
-					<xs:element ref="tns:DeliveryMethod" minOccurs="0"/>
-					<xs:element name="FutureLaunchDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="IdType" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="ASIN"/>
-								<xs:enumeration value="UPC"/>
-								<xs:enumeration value="SKU"/>
-								<xs:enumeration value="EAN"/>
-								<xs:enumeration value="ISBN"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="ISPUPostalCode" type="xs:string" minOccurs="0"/>
-					<xs:element name="MerchantId" type="xs:string" minOccurs="0"/>
-					<xs:element name="OfferPage" type="xs:positiveInteger" minOccurs="0"/>
-					<xs:element name="ItemId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="ReviewPage" type="xs:positiveInteger" minOccurs="0"/>
-					<xs:element name="ReviewSort" type="xs:string" minOccurs="0"/>
-					<xs:element name="SearchIndex" type="xs:string" minOccurs="0"/>
-					<xs:element name="SearchInsideKeywords" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:appinfo>
-								<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-									<aws-se:excludeFrom>public</aws-se:excludeFrom>
-									<aws-se:excludeFrom>partner</aws-se:excludeFrom>
-								</aws-se:restricted>
-							</xs:appinfo>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="VariationPage" type="tns:positiveIntegerOrAll" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="ListSearch">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:ListSearchRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:ListSearchRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="ListSearchRequest">
-				<xs:sequence>
-					<xs:element name="City" type="xs:string" minOccurs="0"/>
-					<xs:element name="Email" type="xs:string" minOccurs="0"/>
-					<xs:element name="FirstName" type="xs:string" minOccurs="0"/>
-					<xs:element name="LastName" type="xs:string" minOccurs="0"/>
-					<xs:element name="ListPage" type="xs:positiveInteger" minOccurs="0"/>
-					<xs:element name="ListType">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="WishList"/>
-								<xs:enumeration value="WeddingRegistry"/>
-								<xs:enumeration value="BabyRegistry"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="Name" type="xs:string" minOccurs="0"/>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="State" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="ListLookup">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:ListLookupRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:ListLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="ListLookupRequest">
-				<xs:sequence>
-					<xs:element ref="tns:Condition" minOccurs="0"/>
-					<xs:element ref="tns:DeliveryMethod" minOccurs="0"/>
-					<xs:element name="ISPUPostalCode" type="xs:string" minOccurs="0"/>
-					<xs:element name="ListId" type="xs:string" minOccurs="0"/>
-					<xs:element name="ListType" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="WishList"/>
-								<xs:enumeration value="Listmania"/>
-								<xs:enumeration value="WeddingRegistry"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="MerchantId" type="xs:string" minOccurs="0"/>
-					<xs:element name="ProductGroup" type="xs:string" minOccurs="0"/>
-					<xs:element name="ProductPage" type="xs:positiveInteger" minOccurs="0"/>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="ReviewSort" type="xs:string" minOccurs="0"/>
-					<xs:element name="Sort" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="CustomerContentSearch">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:CustomerContentSearchRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:CustomerContentSearchRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="CustomerContentSearchRequest">
-				<xs:sequence>
-					<xs:element name="CustomerPage" type="xs:positiveInteger" minOccurs="0"/>
-					<xs:element name="Email" type="xs:string" minOccurs="0"/>
-					<xs:element name="Name" type="xs:string" minOccurs="0"/>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="CustomerContentLookup">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:CustomerContentLookupRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:CustomerContentLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="CustomerContentLookupRequest">
-				<xs:sequence>
-					<xs:element name="CustomerId" type="xs:string" minOccurs="0"/>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="ReviewPage" type="xs:positiveInteger" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="SimilarityLookup">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:SimilarityLookupRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:SimilarityLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="SimilarityLookupRequest">
-				<xs:sequence>
-					<xs:element ref="tns:Condition" minOccurs="0"/>
-					<xs:element ref="tns:DeliveryMethod" minOccurs="0"/>
-					<xs:element name="ItemId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="ISPUPostalCode" type="xs:string" minOccurs="0"/>
-					<xs:element name="MerchantId" type="xs:string" minOccurs="0"/>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="ReviewSort" type="xs:string" minOccurs="0"/>
-					<xs:element name="SimilarityType" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="Intersection"/>
-								<xs:enumeration value="Random"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="SellerLookup">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:SellerLookupRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:SellerLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="SellerLookupRequest">
-				<xs:sequence>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="SellerId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="FeedbackPage" type="xs:positiveInteger" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType -->
-			<xs:element name="CartGet">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:CartGetRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:CartGetRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="CartGetRequest">
-				<xs:sequence>
-					<xs:element name="CartId" type="xs:string" minOccurs="0"/>
-					<xs:element name="HMAC" type="xs:string" minOccurs="0"/>
-					<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="CartAdd">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:CartAddRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:CartAddRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="CartAddRequest">
-				<xs:sequence>
-					<xs:element name="CartId" type="xs:string" minOccurs="0"/>
-					<xs:element name="HMAC" type="xs:string" minOccurs="0"/>
-					<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>
-					<xs:element name="Items" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Item" minOccurs="0" maxOccurs="unbounded">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-											<xs:element name="OfferListingId" type="xs:string" minOccurs="0"/>
-											<xs:element name="Quantity" type="xs:positiveInteger" minOccurs="0"/>
-											<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-											<xs:element name="ListItemId" type="xs:string" minOccurs="0"/>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="CartCreate">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:CartCreateRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:CartCreateRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="CartCreateRequest">
-				<xs:sequence>
-					<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>
-					<xs:element name="Items" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Item" minOccurs="0" maxOccurs="unbounded">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-											<xs:element name="OfferListingId" type="xs:string" minOccurs="0"/>
-											<xs:element name="Quantity" type="xs:positiveInteger" minOccurs="0"/>
-											<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-											<xs:element name="ListItemId" type="xs:string" minOccurs="0"/>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="CartModify">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:CartModifyRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:CartModifyRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="CartModifyRequest">
-				<xs:sequence>
-					<xs:element name="CartId" type="xs:string" minOccurs="0"/>
-					<xs:element name="HMAC" type="xs:string" minOccurs="0"/>
-					<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>
-					<xs:element name="Items" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Item" minOccurs="0" maxOccurs="unbounded">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="Action" minOccurs="0">
-												<xs:simpleType>
-													<xs:restriction base="xs:string">
-														<xs:enumeration value="MoveToCart"/>
-														<xs:enumeration value="SaveForLater"/>
-													</xs:restriction>
-												</xs:simpleType>
-											</xs:element>
-											<xs:element name="CartItemId" type="xs:string" minOccurs="0"/>
-											<xs:element name="Quantity" type="xs:nonNegativeInteger" minOccurs="0"/>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="CartClear">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:CartClearRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:CartClearRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="CartClearRequest">
-				<xs:sequence>
-					<xs:element name="CartId" type="xs:string" minOccurs="0"/>
-					<xs:element name="HMAC" type="xs:string" minOccurs="0"/>
-					<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-			<!-- xs:element name="TransactionLookup">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:TransactionLookupRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:TransactionLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="TransactionLookupRequest">
-				<xs:sequence>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="TransactionId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="SellerListingSearch">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:SellerListingSearchRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:SellerListingSearchRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="SellerListingSearchRequest">
-				<xs:sequence>
-					<xs:element name="Keywords" type="xs:string" minOccurs="0"/>
-					<xs:element name="ListingPage" type="xs:positiveInteger" minOccurs="0"/>
-					<xs:element name="OfferStatus" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="Open"/>
-								<xs:enumeration value="Closed"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="SellerId" type="xs:string" minOccurs="1"/>
-					<xs:element name="Sort" type="xs:string" minOccurs="0"/>
-					<xs:element name="Title" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="SellerListingLookup">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:SellerListingLookupRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:SellerListingLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="SellerListingLookupRequest">
-				<xs:sequence>
-					<xs:element name="Id" type="xs:string"/>
-					<xs:element name="SellerId" type="xs:string" minOccurs="0"/>
-					<xs:element name="IdType">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="Exchange"/>
-								<xs:enumeration value="Listing"/>
-								<xs:enumeration value="ASIN"/>
-								<xs:enumeration value="SKU"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="BrowseNodeLookup">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-						<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-						<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-						<xs:element name="Shared" type="tns:BrowseNodeLookupRequest" minOccurs="0"/>
-						<xs:element name="Request" type="tns:BrowseNodeLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="BrowseNodeLookupRequest">
-				<xs:sequence>
-					<xs:element name="BrowseNodeId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="Condition">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="All"/>
-						<xs:enumeration value="New"/>
-						<xs:enumeration value="Used"/>
-						<xs:enumeration value="Collectible"/>
-						<xs:enumeration value="Refurbished"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="DeliveryMethod">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="Ship"/>
-						<xs:enumeration value="ISPU"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="AudienceRating">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="G"/>
-						<xs:enumeration value="PG"/>
-						<xs:enumeration value="PG-13"/>
-						<xs:enumeration value="R"/>
-						<xs:enumeration value="NC-17"/>
-						<xs:enumeration value="NR"/>
-						<xs:enumeration value="Unrated"/>
-						<xs:enumeration value="6"/>
-						<xs:enumeration value="12"/>
-						<xs:enumeration value="16"/>
-						<xs:enumeration value="18"/>
-						<xs:enumeration value="FamilyViewing"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="MultiOperation">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:Help" minOccurs="0"/>
-						<xs:element ref="tns:ItemSearch" minOccurs="0"/>
-						<xs:element ref="tns:ItemLookup" minOccurs="0"/>
-						<xs:element ref="tns:ListSearch" minOccurs="0"/>
-						<xs:element ref="tns:ListLookup" minOccurs="0"/>
-						<xs:element ref="tns:CustomerContentSearch" minOccurs="0"/>
-						<xs:element ref="tns:CustomerContentLookup" minOccurs="0"/>
-						<xs:element ref="tns:SimilarityLookup" minOccurs="0"/>
-						<xs:element ref="tns:SellerLookup" minOccurs="0"/>
-						<xs:element ref="tns:CartGet" minOccurs="0"/>
-						<xs:element ref="tns:CartAdd" minOccurs="0"/>
-						<xs:element ref="tns:CartCreate" minOccurs="0"/>
-						<xs:element ref="tns:CartModify" minOccurs="0"/>
-						<xs:element ref="tns:CartClear" minOccurs="0"/>
-						<xs:element ref="tns:TransactionLookup" minOccurs="0"/>
-						<xs:element ref="tns:SellerListingSearch" minOccurs="0"/>
-						<xs:element ref="tns:SellerListingLookup" minOccurs="0"/>
-						<xs:element ref="tns:BrowseNodeLookup" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="HelpResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Information" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ItemSearchResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Items" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ItemLookupResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Items" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ListSearchResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Lists" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ListLookupResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Lists" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CustomerContentSearchResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Customers" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CustomerContentLookupResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Customers" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SimilarityLookupResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Items" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SellerLookupResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Sellers" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element -->
-			<xs:element name="CartGetResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CartAddResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CartCreateResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CartModifyResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CartClearResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!-- xs:element name="TransactionLookupResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:Transactions" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SellerListingSearchResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:SellerListings" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SellerListingLookupResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:SellerListings" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="BrowseNodeLookupResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:BrowseNodes" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="MultiOperationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-						<xs:element ref="tns:HelpResponse" minOccurs="0"/>
-						<xs:element ref="tns:ItemSearchResponse" minOccurs="0"/>
-						<xs:element ref="tns:ItemLookupResponse" minOccurs="0"/>
-						<xs:element ref="tns:ListSearchResponse" minOccurs="0"/>
-						<xs:element ref="tns:ListLookupResponse" minOccurs="0"/>
-						<xs:element ref="tns:CustomerContentSearchResponse" minOccurs="0"/>
-						<xs:element ref="tns:CustomerContentLookupResponse" minOccurs="0"/>
-						<xs:element ref="tns:SimilarityLookupResponse" minOccurs="0"/>
-						<xs:element ref="tns:SellerLookupResponse" minOccurs="0"/>
-						<xs:element ref="tns:CartGetResponse" minOccurs="0"/>
-						<xs:element ref="tns:CartAddResponse" minOccurs="0"/>
-						<xs:element ref="tns:CartCreateResponse" minOccurs="0"/>
-						<xs:element ref="tns:CartModifyResponse" minOccurs="0"/>
-						<xs:element ref="tns:CartClearResponse" minOccurs="0"/>
-						<xs:element ref="tns:TransactionLookupResponse" minOccurs="0"/>
-						<xs:element ref="tns:SellerListingSearchResponse" minOccurs="0"/>
-						<xs:element ref="tns:SellerListingLookupResponse" minOccurs="0"/>
-						<xs:element ref="tns:BrowseNodeLookupResponse" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="OperationRequest">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:HTTPHeaders" minOccurs="0"/>
-						<xs:element name="RequestId" type="xs:string" minOccurs="0"/>
-						<xs:element ref="tns:Arguments" minOccurs="0"/>
-						<xs:element ref="tns:Errors" minOccurs="0"/>
-						<xs:element name="RequestProcessingTime" type="xs:float" minOccurs="0" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Request">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="IsValid" type="xs:string" minOccurs="0"/>
-						<xs:element name="HelpRequest" type="tns:HelpRequest" minOccurs="0"/>
-						<xs:element name="BrowseNodeLookupRequest" type="tns:BrowseNodeLookupRequest" minOccurs="0"/>
-						<xs:element name="ItemSearchRequest" type="tns:ItemSearchRequest" minOccurs="0"/>
-						<xs:element name="ItemLookupRequest" type="tns:ItemLookupRequest" minOccurs="0"/>
-						<xs:element name="ListSearchRequest" type="tns:ListSearchRequest" minOccurs="0"/>
-						<xs:element name="ListLookupRequest" type="tns:ListLookupRequest" minOccurs="0"/>
-						<xs:element name="CustomerContentSearchRequest" type="tns:CustomerContentSearchRequest" minOccurs="0"/>
-						<xs:element name="CustomerContentLookupRequest" type="tns:CustomerContentLookupRequest" minOccurs="0"/>
-						<xs:element name="SimilarityLookupRequest" type="tns:SimilarityLookupRequest" minOccurs="0"/>
-						<xs:element name="CartGetRequest" type="tns:CartGetRequest" minOccurs="0"/>
-						<xs:element name="CartAddRequest" type="tns:CartAddRequest" minOccurs="0"/>
-						<xs:element name="CartCreateRequest" type="tns:CartCreateRequest" minOccurs="0"/>
-						<xs:element name="CartModifyRequest" type="tns:CartModifyRequest" minOccurs="0"/>
-						<xs:element name="CartClearRequest" type="tns:CartClearRequest" minOccurs="0"/>
-						<xs:element name="TransactionLookupRequest" type="tns:TransactionLookupRequest" minOccurs="0"/>
-						<xs:element name="SellerListingSearchRequest" type="tns:SellerListingSearchRequest" minOccurs="0"/>
-						<xs:element name="SellerListingLookupRequest" type="tns:SellerListingLookupRequest" minOccurs="0"/>
-						<xs:element name="SellerLookupRequest" type="tns:SellerLookupRequest" minOccurs="0"/>
-						<xs:element ref="tns:Errors" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Arguments">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Argument" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:attribute name="Name" type="xs:string" use="required"/>
-								<xs:attribute name="Value" type="xs:string"/>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="HTTPHeaders">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Header" minOccurs="0" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:attribute name="Name" type="xs:string" use="required"/>
-								<xs:attribute name="Value" type="xs:string" use="required"/>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Errors">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Error" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Code" type="xs:string"/>
-									<xs:element name="Message" type="xs:string"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Information">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:Request" minOccurs="0"/>
-						<xs:element ref="tns:OperationInformation" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element ref="tns:ResponseGroupInformation" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Items">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:Request" minOccurs="0"/>
-						<xs:element ref="tns:CorrectedQuery" minOccurs="0"/>
-						<xs:element name="Qid" type="xs:string" minOccurs="0"/>
-						<xs:element name="TotalResults" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element ref="tns:SearchResultsMap" minOccurs="0"/>
-						<xs:element ref="tns:Item" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element ref="tns:SearchBinSets" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CorrectedQuery">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Keywords" type="xs:string" minOccurs="0"/>
-						<xs:element name="Message" type="xs:string" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Lists">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:Request" minOccurs="0"/>
-						<xs:element name="TotalResults" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element ref="tns:List" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Customers">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:Request" minOccurs="0"/>
-						<xs:element name="TotalResults" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element ref="tns:Customer" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element -->
-			<xs:element name="Cart">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:Request" minOccurs="0"/>
-						<xs:element name="CartId" type="xs:string"/>
-						<xs:element name="HMAC" type="xs:string"/>
-						<xs:element name="URLEncodedHMAC" type="xs:string"/>
-						<xs:element name="PurchaseURL" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubTotal" type="tns:Price" minOccurs="0"/>
-						<xs:element ref="tns:CartItems" minOccurs="0"/>
-						<xs:element ref="tns:SavedForLaterItems" minOccurs="0"/>
-						<xs:element ref="tns:SimilarProducts" minOccurs="0"/>
-						<xs:element ref="tns:TopSellers" minOccurs="0"/>
-						<xs:element ref="tns:NewReleases" minOccurs="0"/>
-						<xs:element ref="tns:SimilarViewedProducts" minOccurs="0"/>
-						<xs:element ref="tns:OtherCategoriesSimilarProducts" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--  xs:element name="Transactions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:Request" minOccurs="0"/>
-						<xs:element name="TotalResults" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element ref="tns:Transaction" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Sellers">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:Request" minOccurs="0"/>
-						<xs:element name="TotalResults" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element ref="tns:Seller" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SellerListings">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:Request" minOccurs="0"/>
-						<xs:element name="TotalResults" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element ref="tns:SellerListing" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="OperationInformation">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Name" type="xs:string" minOccurs="0"/>
-						<xs:element name="Description" type="xs:string" minOccurs="0"/>
-						<xs:element name="RequiredParameters" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Parameter" type="xs:string" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="AvailableParameters" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Parameter" type="xs:string" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="DefaultResponseGroups" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="ResponseGroup" type="xs:string" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="AvailableResponseGroups" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="ResponseGroup" type="xs:string" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ResponseGroupInformation">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Name" type="xs:string" minOccurs="0"/>
-						<xs:element name="CreationDate" type="xs:string" minOccurs="0"/>
-						<xs:element name="ValidOperations" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Operation" type="xs:string" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="Elements" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Element" type="xs:string" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="List">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ListId" type="xs:string"/>
-						<xs:element name="ListURL" type="xs:string" minOccurs="0"/>
-						<xs:element name="RegistryNumber" type="xs:string" minOccurs="0"/>
-						<xs:element name="ListName" type="xs:string" minOccurs="0"/>
-						<xs:element name="ListType" minOccurs="0">
-							<xs:simpleType>
-								<xs:restriction base="xs:string">
-									<xs:enumeration value="WishList"/>
-									<xs:enumeration value="WeddingRegistry"/>
-									<xs:enumeration value="BabyRegistry"/>
-									<xs:enumeration value="Listmania"/>
-								</xs:restriction>
-							</xs:simpleType>
-						</xs:element>
-						<xs:element name="TotalItems" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="DateCreated" type="xs:string" minOccurs="0"/>
-						<xs:element name="OccasionDate" type="xs:string" minOccurs="0"/>
-						<xs:element name="CustomerName" type="xs:string" minOccurs="0"/>
-						<xs:element name="PartnerName" type="xs:string" minOccurs="0"/>
-						<xs:element name="AdditionalName" type="xs:string" minOccurs="0"/>
-						<xs:element name="Comment" type="xs:string" minOccurs="0"/>
-						<xs:element name="Image" type="tns:Image" minOccurs="0"/>
-						<xs:element name="AverageRating" type="xs:decimal" minOccurs="0"/>
-						<xs:element name="TotalVotes" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalTimesRead" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element ref="tns:ListItem" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ListItem">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ListItemId" type="xs:string" minOccurs="0"/>
-						<xs:element name="DateAdded" type="xs:string" minOccurs="0"/>
-						<xs:element name="Comment" type="xs:string" minOccurs="0"/>
-						<xs:element name="QuantityDesired" type="xs:string" minOccurs="0"/>
-						<xs:element name="QuantityReceived" type="xs:string" minOccurs="0"/>
-						<xs:element ref="tns:Item" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Customer">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CustomerId" type="xs:string"/>
-						<xs:element name="Nickname" type="xs:string" minOccurs="0"/>
-						<xs:element name="Birthday" type="xs:string" minOccurs="0"/>
-						<xs:element name="WishListId" type="xs:string" minOccurs="0"/>
-						<xs:element name="Location" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="UserDefinedLocation" type="xs:string" minOccurs="0"/>
-									<xs:element name="City" type="xs:string" minOccurs="0"/>
-									<xs:element name="State" type="xs:string" minOccurs="0"/>
-									<xs:element name="Country" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element ref="tns:CustomerReviews" maxOccurs="unbounded" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SearchResultsMap">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SearchIndex" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="IndexName" type="xs:string"/>
-									<xs:element name="Results" type="xs:nonNegativeInteger" minOccurs="0"/>
-									<xs:element name="Pages" type="xs:nonNegativeInteger" minOccurs="0"/>
-									<xs:element ref="tns:CorrectedQuery" minOccurs="0"/>
-									<xs:element name="RelevanceRank" type="xs:positiveInteger"/>
-									<xs:element name="ASIN" type="xs:string" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Item">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ASIN" type="xs:string"/>
-						<xs:element name="ParentASIN" type="xs:string" minOccurs="0"/>
-						<xs:element ref="tns:Errors" minOccurs="0"/>
-						<xs:element name="DetailPageURL" type="xs:string" minOccurs="0"/>
-						<xs:element name="SalesRank" type="xs:string" minOccurs="0"/>
-						<xs:element name="SmallImage" type="tns:Image" minOccurs="0"/>
-						<xs:element name="MediumImage" type="tns:Image" minOccurs="0"/>
-						<xs:element name="LargeImage" type="tns:Image" minOccurs="0"/>
-						<xs:element name="ImageSets" minOccurs="0" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="MerchantId" type="xs:string" minOccurs="0" maxOccurs="1"/>
-									<xs:element ref="tns:ImageSet" minOccurs="0" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element ref="tns:ItemAttributes" minOccurs="0"/>
-						<xs:element ref="tns:MerchantItemAttributes" minOccurs="0"/>
-						<xs:element ref="tns:Collections" minOccurs="0"/>
-						<xs:element name="Subjects" minOccurs="0" maxOccurs="1">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Subject" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element ref="tns:OfferSummary" minOccurs="0"/>
-						<xs:element ref="tns:Offers" minOccurs="0"/>
-						<xs:element ref="tns:VariationSummary" minOccurs="0"/>
-						<xs:element ref="tns:Variations" minOccurs="0"/>
-						<xs:element ref="tns:CustomerReviews" minOccurs="0"/>
-						<xs:element ref="tns:EditorialReviews" minOccurs="0"/>
-						<xs:element ref="tns:SimilarProducts" minOccurs="0"/>
-						<xs:element ref="tns:Accessories" minOccurs="0"/>
-						<xs:element ref="tns:Tracks" minOccurs="0"/>
-						<xs:element ref="tns:BrowseNodes" minOccurs="0"/>
-						<xs:element ref="tns:ListmaniaLists" minOccurs="0"/>
-						<xs:element ref="tns:SearchInside" minOccurs="0"/>
-						<xs:element name="AlternateVersions" minOccurs="0" maxOccurs="1">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="AlternateVersion" minOccurs="0" maxOccurs="unbounded">
-										<xs:complexType>
-											<xs:sequence>
-												<xs:element name="ASIN" type="xs:string"/>
-												<xs:element name="Title" type="xs:string" minOccurs="0"/>
-												<xs:element name="Binding" type="xs:string" minOccurs="0"/>
-											</xs:sequence>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="OfferSummary">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="LowestNewPrice" type="tns:Price" minOccurs="0"/>
-						<xs:element name="LowestUsedPrice" type="tns:Price" minOccurs="0"/>
-						<xs:element name="LowestCollectiblePrice" type="tns:Price" minOccurs="0"/>
-						<xs:element name="LowestRefurbishedPrice" type="tns:Price" minOccurs="0"/>
-						<xs:element name="TotalNew" type="xs:string" minOccurs="0"/>
-						<xs:element name="TotalUsed" type="xs:string" minOccurs="0"/>
-						<xs:element name="TotalCollectible" type="xs:string" minOccurs="0"/>
-						<xs:element name="TotalRefurbished" type="xs:string" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Offers">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="TotalOffers" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalOfferPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element ref="tns:Offer" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Offer">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:Merchant" minOccurs="0"/>
-						<xs:element ref="tns:Seller" minOccurs="0"/>
-						<xs:element ref="tns:OfferAttributes" minOccurs="0"/>
-						<xs:element ref="tns:OfferListing" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element ref="tns:LoyaltyPoints" minOccurs="0"/>
-						<xs:element ref="tns:Promotions" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="OfferAttributes">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Condition" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubCondition" type="xs:string" minOccurs="0"/>
-						<xs:element name="ConditionNote" type="xs:string" minOccurs="0"/>
-						<xs:element name="WillShipExpedited" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="WillShipInternational" type="xs:boolean" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Merchant">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MerchantId" type="xs:string"/>
-						<xs:element name="Name" type="xs:string" minOccurs="0"/>
-						<xs:element name="GlancePage" type="xs:string" minOccurs="0"/>
-						<xs:element name="AverageFeedbackRating" type="xs:decimal" minOccurs="0"/>
-						<xs:element name="TotalFeedback" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalFeedbackPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="OfferListing">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OfferListingId" type="xs:string" minOccurs="0"/>
-						<xs:element name="ExchangeId" type="xs:string" minOccurs="0"/>
-						<xs:element name="Price" type="tns:Price" minOccurs="0"/>
-						<xs:element name="SalePrice" type="tns:Price" minOccurs="0"/>
-						<xs:element name="AmountSaved" type="tns:Price" minOccurs="0"/>
-						<xs:element name="PercentageSaved" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="Availability" type="xs:string" minOccurs="0"/>
-						<xs:element name="AvailabilityAttributes" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="AvailabilityType" type="xs:string" minOccurs="0"/>
-									<xs:element name="IsPreorder" type="xs:boolean" minOccurs="0"/>
-									<xs:element name="MinimumHours" type="xs:integer" minOccurs="0"/>
-									<xs:element name="MaximumHours" type="xs:integer" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="Quantity" type="xs:integer" minOccurs="0"/>
-						<xs:element name="ISPUStoreAddress" type="tns:Address" minOccurs="0"/>
-						<xs:element name="ISPUStoreHours" type="xs:string" minOccurs="0"/>
-						<xs:element name="IsEligibleForSuperSaverShipping" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="SalesRestriction" type="xs:string" minOccurs="0"/>
-						<xs:element name="ShippingCharge" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:appinfo>
-									<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-										<aws-se:excludeFrom>public</aws-se:excludeFrom>
-										<aws-se:excludeFrom>partner</aws-se:excludeFrom>
-									</aws-se:restricted>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="ShippingType" type="xs:string"/>
-									<xs:element name="ShippingPrice" type="tns:Price"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="LoyaltyPoints">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Points" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TypicalRedemptionValue" type="tns:Price" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="VariationSummary">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="LowestPrice" type="tns:Price" minOccurs="0"/>
-						<xs:element name="HighestPrice" type="tns:Price" minOccurs="0"/>
-						<xs:element name="LowestSalePrice" type="tns:Price" minOccurs="0"/>
-						<xs:element name="HighestSalePrice" type="tns:Price" minOccurs="0"/>
-						<xs:element name="SingleMerchantId" type="xs:string" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Variations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="TotalVariations" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalVariationPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element ref="tns:VariationDimensions" minOccurs="0"/>
-						<xs:element ref="tns:Item" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="VariationDimensions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="VariationDimension" type="xs:string" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="EditorialReviews">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:EditorialReview" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Collections">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Collection" minOccurs="0" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="CollectionSummary" minOccurs="0" maxOccurs="1">
-										<xs:complexType>
-											<xs:sequence>
-												<xs:element name="LowestListPrice" type="tns:Price" minOccurs="0" maxOccurs="1"/>
-												<xs:element name="HighestListPrice" type="tns:Price" minOccurs="0" maxOccurs="1"/>
-												<xs:element name="LowestSalePrice" type="tns:Price" minOccurs="0" maxOccurs="1"/>
-												<xs:element name="HighestSalePrice" type="tns:Price" minOccurs="0" maxOccurs="1"/>
-											</xs:sequence>
-										</xs:complexType>
-									</xs:element>
-									<xs:element name="CollectionParent" minOccurs="0" maxOccurs="1">
-										<xs:complexType>
-											<xs:sequence>
-												<xs:element name="ASIN" type="xs:string" minOccurs="0" maxOccurs="1"/>
-												<xs:element name="Title" type="xs:string" minOccurs="0" maxOccurs="1"/>
-											</xs:sequence>
-										</xs:complexType>
-									</xs:element>
-									<xs:element name="CollectionItem" minOccurs="0" maxOccurs="unbounded">
-										<xs:complexType>
-											<xs:sequence>
-												<xs:element name="ASIN" type="xs:string" minOccurs="0" maxOccurs="1"/>
-												<xs:element name="Title" type="xs:string" minOccurs="0" maxOccurs="1"/>
-											</xs:sequence>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="EditorialReview">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Source" type="xs:string" minOccurs="0"/>
-						<xs:element name="Content" type="xs:string" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CustomerReviews">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="AverageRating" type="xs:decimal" minOccurs="0"/>
-						<xs:element name="TotalReviews" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalReviewPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element ref="tns:Review" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Review">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-						<xs:element name="Rating" type="xs:decimal" minOccurs="0"/>
-						<xs:element name="HelpfulVotes" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="CustomerId" type="xs:string" minOccurs="0"/>
-						<xs:element ref="tns:Reviewer" minOccurs="0"/>
-						<xs:element name="TotalVotes" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="Date" type="xs:string" minOccurs="0"/>
-						<xs:element name="Summary" type="xs:string" minOccurs="0"/>
-						<xs:element name="Content" type="xs:string" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Reviewer">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CustomerId" type="xs:string" minOccurs="0"/>
-						<xs:element name="Name" type="xs:string" minOccurs="0"/>
-						<xs:element name="Nickname" type="xs:string" minOccurs="0"/>
-						<xs:element name="Location" type="xs:string" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Tracks">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Disc" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Track" maxOccurs="unbounded">
-										<xs:complexType>
-											<xs:simpleContent>
-												<xs:extension base="xs:string">
-													<xs:attribute name="Number" type="xs:positiveInteger" use="required"/>
-												</xs:extension>
-											</xs:simpleContent>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-								<xs:attribute name="Number" type="xs:positiveInteger" use="required"/>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SimilarProducts">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SimilarProduct" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-									<xs:element name="Title" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="TopSellers">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="TopSeller" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-									<xs:element name="Title" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="NewReleases">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NewRelease" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-									<xs:element name="Title" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SimilarViewedProducts">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SimilarViewedProduct" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-									<xs:element name="Title" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="OtherCategoriesSimilarProducts">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OtherCategoriesSimilarProduct" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-									<xs:element name="Title" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Accessories">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Accessory" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-									<xs:element name="Title" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Promotions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:Promotion" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Promotion">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Summary" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="PromotionId" type="xs:string"/>
-									<xs:element name="Category" type="xs:string" minOccurs="0"/>
-									<xs:element name="StartDate" type="xs:string" minOccurs="0"/>
-									<xs:element name="EndDate" type="xs:string" minOccurs="0"/>
-									<xs:element name="EligibilityRequirementDescription" type="xs:string" minOccurs="0"/>
-									<xs:element name="BenefitDescription" type="xs:string" minOccurs="0"/>
-									<xs:element name="TermsAndConditions" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="Details" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="MerchantId" type="xs:string"/>
-									<xs:element name="OwningMerchantId" type="xs:string"/>
-									<xs:element name="PromotionId" type="xs:string"/>
-									<xs:element name="PromotionCategory" type="xs:string"/>
-									<xs:element name="MerchantPromotionId" type="xs:string" minOccurs="0"/>
-									<xs:element name="GroupClaimCode" type="xs:string" minOccurs="0"/>
-									<xs:element name="CouponCombinationType" type="xs:string" minOccurs="0"/>
-									<xs:element name="StartDate" type="xs:string" minOccurs="0"/>
-									<xs:element name="EndDate" type="xs:string" minOccurs="0"/>
-									<xs:element name="TermsAndConditions" type="xs:string" minOccurs="0"/>
-									<xs:element name="EligibilityRequirements" type="tns:PromotionEligibilityRequirements" minOccurs="0"/>
-									<xs:element name="Benefits" type="tns:PromotionBenefits" minOccurs="0"/>
-									<xs:element name="ItemApplicability" type="tns:PromotionItemApplicability" minOccurs="0"/>
-									<xs:element name="MerchandisingMessage" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="PromotionEligibilityRequirements">
-				<xs:sequence>
-					<xs:element name="EligibilityRequirement" type="tns:PromotionEligibilityRequirement" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="PromotionBenefits">
-				<xs:sequence>
-					<xs:element name="Benefit" type="tns:PromotionBenefit" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="PromotionBenefit">
-				<xs:sequence>
-					<xs:element name="BenefitType" type="xs:string"/>
-					<xs:element name="ComponentType" type="xs:string"/>
-					<xs:element name="Quantity" type="xs:int" minOccurs="0"/>
-					<xs:element name="PercentOff" type="xs:double" minOccurs="0"/>
-					<xs:element name="FixedAmount" type="tns:Price" minOccurs="0"/>
-					<xs:element name="Ceiling" type="tns:Price" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="PromotionEligibilityRequirement">
-				<xs:sequence>
-					<xs:element name="EligibilityRequirementType" type="xs:string"/>
-					<xs:element name="Quantity" type="xs:int" minOccurs="0"/>
-					<xs:element name="CurrencyAmount" type="tns:Price" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="PromotionItemApplicability">
-				<xs:sequence>
-					<xs:element name="ASIN" type="xs:string"/>
-					<xs:element name="IsInBenefitSet" type="xs:boolean"/>
-					<xs:element name="IsInEligibilityRequirementSet" type="xs:boolean"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="BrowseNodes">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element ref="tns:Request" minOccurs="0"/>
-						<xs:element ref="tns:BrowseNode" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="BrowseNode">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="BrowseNodeId" type="xs:string" minOccurs="0"/>
-						<xs:element name="Name" type="xs:string" minOccurs="0"/>
-						<xs:element name="IsCategoryRoot" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="Children" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element ref="tns:BrowseNode" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="Ancestors" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element ref="tns:BrowseNode" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element ref="tns:TopSellers" minOccurs="0"/>
-						<xs:element ref="tns:NewReleases" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ListmaniaLists">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ListmaniaList" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="ListId" type="xs:string"/>
-									<xs:element name="ListName" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SearchInside">
-				<xs:annotation>
-					<xs:appinfo>
-						<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-							<aws-se:excludeFrom>public</aws-se:excludeFrom>
-							<aws-se:excludeFrom>partner</aws-se:excludeFrom>
-						</aws-se:restricted>
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="TotalExcerpts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="Excerpt" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Checksum" type="xs:string" minOccurs="0"/>
-									<xs:element name="PageType" type="xs:string" minOccurs="0"/>
-									<xs:element name="PageNumber" type="xs:string" minOccurs="0"/>
-									<xs:element name="SequenceNumber" type="xs:string" minOccurs="0"/>
-									<xs:element name="Text" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element -->
-			<xs:element name="CartItems">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SubTotal" type="tns:Price" minOccurs="0"/>
-						<xs:element name="CartItem" type="tns:CartItem" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!-- xs:element name="SavedForLaterItems">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SubTotal" type="tns:Price" minOccurs="0"/>
-						<xs:element name="SavedForLaterItem" type="tns:CartItem" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element -->
-			<xs:complexType name="CartItem">
-				<xs:sequence>
-					<xs:element name="CartItemId" type="xs:string"/>
-					<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-					<xs:element name="ExchangeId" type="xs:string" minOccurs="0"/>
-					<xs:element name="MerchantId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SellerId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SellerNickname" type="xs:string" minOccurs="0"/>
-					<xs:element name="Quantity" type="xs:string"/>
-					<xs:element name="Title" type="xs:string" minOccurs="0"/>
-					<xs:element name="ProductGroup" type="xs:string" minOccurs="0"/>
-					<xs:element name="ListOwner" type="xs:string" minOccurs="0"/>
-					<xs:element name="ListType" type="xs:string" minOccurs="0"/>
-					<xs:element name="Price" type="tns:Price" minOccurs="0"/>
-					<xs:element name="ItemTotal" type="tns:Price" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-			<!-- xs:element name="Transaction">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="TransactionId" type="xs:string"/>
-						<xs:element name="SellerId" type="xs:string"/>
-						<xs:element name="Condition" type="xs:string"/>
-						<xs:element name="TransactionDate" type="xs:string"/>
-						<xs:element name="TransactionDateEpoch" type="xs:string"/>
-						<xs:element name="SellerName" type="xs:string" minOccurs="0"/>
-						<xs:element name="PayingCustomerId" type="xs:string" minOccurs="0">
-							<xs:annotation>
-								<xs:appinfo>
-									<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-										<aws-se:excludeFrom>public</aws-se:excludeFrom>
-										<aws-se:excludeFrom>partner</aws-se:excludeFrom>
-									</aws-se:restricted>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="OrderingCustomerId" type="xs:string" minOccurs="0">
-							<xs:annotation>
-								<xs:appinfo>
-									<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-										<aws-se:excludeFrom>public</aws-se:excludeFrom>
-										<aws-se:excludeFrom>partner</aws-se:excludeFrom>
-									</aws-se:restricted>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Totals" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Total" type="tns:Price"/>
-									<xs:element name="Subtotal" type="tns:Price"/>
-									<xs:element name="Tax" type="tns:Price"/>
-									<xs:element name="ShippingCharge" type="tns:Price"/>
-									<xs:element name="Promotion" type="tns:Price"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="TransactionItems" minOccurs="0">
-							<xs:annotation>
-								<xs:appinfo>
-									<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-										<aws-se:excludeFrom>public</aws-se:excludeFrom>
-									</aws-se:restricted>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element ref="tns:TransactionItem" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="Shipments" minOccurs="0">
-							<xs:annotation>
-								<xs:appinfo>
-									<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-										<aws-se:excludeFrom>public</aws-se:excludeFrom>
-									</aws-se:restricted>
-								</xs:appinfo>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Shipment" maxOccurs="unbounded">
-										<xs:complexType>
-											<xs:sequence>
-												<xs:element name="Condition" type="xs:string"/>
-												<xs:element name="DeliveryMethod" type="xs:string"/>
-												<xs:element name="ShipmentItems" minOccurs="0">
-													<xs:complexType>
-														<xs:sequence>
-															<xs:element name="TransactionItemId" type="xs:string" maxOccurs="unbounded"/>
-														</xs:sequence>
-													</xs:complexType>
-												</xs:element>
-												<xs:element name="Packages" minOccurs="0">
-													<xs:complexType>
-														<xs:sequence>
-															<xs:element name="Package" maxOccurs="unbounded">
-																<xs:complexType>
-																	<xs:sequence>
-																		<xs:element name="TrackingNumber" type="xs:string"/>
-																		<xs:element name="CarrierName" type="xs:string"/>
-																	</xs:sequence>
-																</xs:complexType>
-															</xs:element>
-														</xs:sequence>
-													</xs:complexType>
-												</xs:element>
-											</xs:sequence>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="TransactionItem">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="TransactionItemId" type="xs:string"/>
-						<xs:element name="Quantity" type="xs:string"/>
-						<xs:element name="UnitPrice" type="tns:Price"/>
-						<xs:element name="TotalPrice" type="tns:Price"/>
-						<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-						<xs:element name="ChildTransactionItems" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element ref="tns:TransactionItem" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Seller">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SellerId" type="xs:string"/>
-						<xs:element name="SellerName" type="xs:string" minOccurs="0"/>
-						<xs:element name="SellerLegalName" type="xs:string" minOccurs="0">
-							<xs:annotation>
-								<xs:appinfo>
-									<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-										<aws-se:excludeFrom>public</aws-se:excludeFrom>
-									</aws-se:restricted>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Nickname" type="xs:string" minOccurs="0"/>
-						<xs:element name="GlancePage" type="xs:string" minOccurs="0"/>
-						<xs:element name="About" type="xs:string" minOccurs="0"/>
-						<xs:element name="MoreAbout" type="xs:string" minOccurs="0"/>
-						<xs:element name="Location" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="UserDefinedLocation" type="xs:string" minOccurs="0"/>
-									<xs:element name="City" type="xs:string" minOccurs="0"/>
-									<xs:element name="State" type="xs:string" minOccurs="0"/>
-									<xs:element name="Country" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="AverageFeedbackRating" type="xs:decimal" minOccurs="0"/>
-						<xs:element name="TotalFeedback" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalFeedbackPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="SellerFeedbackSummary" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="FeedbackDateRange" minOccurs="0" maxOccurs="unbounded">
-										<xs:complexType>
-											<xs:sequence>
-												<xs:element name="SellerFeedbackRating" minOccurs="0" maxOccurs="unbounded">
-													<xs:complexType>
-														<xs:sequence>
-															<xs:element name="Count" type="xs:nonNegativeInteger" minOccurs="0"/>
-															<xs:element name="Percentage" type="xs:nonNegativeInteger" minOccurs="0"/>
-														</xs:sequence>
-														<xs:attribute name="Type" type="xs:string"/>
-													</xs:complexType>
-												</xs:element>
-											</xs:sequence>
-											<xs:attribute name="Period" type="xs:string"/>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element ref="tns:SellerFeedback" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SellerFeedback">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Feedback" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Rating" type="xs:nonNegativeInteger" minOccurs="0"/>
-									<xs:element name="Comment" type="xs:string" minOccurs="0"/>
-									<xs:element name="Date" type="xs:string" minOccurs="0"/>
-									<xs:element name="RatedBy" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="Address">
-				<xs:sequence>
-					<xs:element name="Name" type="xs:string" minOccurs="0"/>
-					<xs:element name="Address1" type="xs:string" minOccurs="0"/>
-					<xs:element name="Address2" type="xs:string" minOccurs="0"/>
-					<xs:element name="Address3" type="xs:string" minOccurs="0"/>
-					<xs:element name="City" type="xs:string" minOccurs="0"/>
-					<xs:element name="State" type="xs:string" minOccurs="0"/>
-					<xs:element name="PostalCode" type="xs:string" minOccurs="0"/>
-					<xs:element name="Country" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="SellerListing">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ExchangeId" type="xs:string" minOccurs="0"/>
-						<xs:element name="ListingId" type="xs:string" minOccurs="0"/>
-						<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-						<xs:element name="SKU" type="xs:string" minOccurs="0"/>
-						<xs:element name="UPC" type="xs:string" minOccurs="0"/>
-						<xs:element name="EAN" type="xs:string" minOccurs="0"/>
-						<xs:element name="WillShipExpedited" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="WillShipInternational" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="Title" type="xs:string" minOccurs="0"/>
-						<xs:element name="Price" type="tns:Price" minOccurs="0"/>
-						<xs:element name="StartDate" type="xs:string" minOccurs="0"/>
-						<xs:element name="EndDate" type="xs:string" minOccurs="0"/>
-						<xs:element name="Status" type="xs:string" minOccurs="0"/>
-						<xs:element name="Quantity" type="xs:string" minOccurs="0"/>
-						<xs:element name="Condition" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubCondition" type="xs:string" minOccurs="0"/>
-						<xs:element ref="tns:Seller" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="Price">
-				<xs:sequence>
-					<xs:element name="Amount" type="xs:integer" minOccurs="0"/>
-					<xs:element name="CurrencyCode" type="xs:string" minOccurs="0"/>
-					<xs:element name="FormattedPrice" type="xs:string"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="ImageSet">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SwatchImage" type="tns:Image" minOccurs="0"/>
-						<xs:element name="SmallImage" type="tns:Image" minOccurs="0"/>
-						<xs:element name="ThumbnailImage" type="tns:Image" minOccurs="0"/>
-						<xs:element name="TinyImage" type="tns:Image" minOccurs="0"/>
-						<xs:element name="MediumImage" type="tns:Image" minOccurs="0"/>
-						<xs:element name="LargeImage" type="tns:Image" minOccurs="0"/>
-					</xs:sequence>
-					<xs:attribute name="Category" type="xs:string"/>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="Image">
-				<xs:sequence>
-					<xs:element name="URL" type="xs:string"/>
-					<xs:element name="Height" type="tns:DecimalWithUnits"/>
-					<xs:element name="Width" type="tns:DecimalWithUnits"/>
-					<xs:element name="IsVerified" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="ItemAttributes">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Actor" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="Address" type="tns:Address" minOccurs="0"/>
-						<xs:element name="AmazonMaximumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="AmazonMinimumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="AnalogVideoFormat" type="xs:string" minOccurs="0"/>
-						<xs:element name="ApertureModes" type="xs:string" minOccurs="0"/>
-						<xs:element name="Artist" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="AspectRatio" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssemblyInstructions" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssemblyRequired" type="xs:string" minOccurs="0"/>
-						<xs:element name="AudienceRating" type="xs:string" minOccurs="0"/>
-						<xs:element name="AudioFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="Author" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="BackFinding" type="xs:string" minOccurs="0"/>
-						<xs:element name="BandMaterialType" type="xs:string" minOccurs="0"/>
-						<xs:element name="BatteriesIncluded" type="xs:string" minOccurs="0"/>
-						<xs:element name="BatteriesRequired" type="xs:string" minOccurs="0"/>
-						<xs:element name="Batteries" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="BatteryDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="BatteryType" type="xs:string" minOccurs="0"/>
-						<xs:element name="BezelMaterialType" type="xs:string" minOccurs="0"/>
-						<xs:element name="Binding" type="xs:string" minOccurs="0"/>
-						<xs:element name="Brand" type="xs:string" minOccurs="0"/>
-						<xs:element name="CalendarType" type="xs:string" minOccurs="0"/>
-						<xs:element name="CameraManualFeatures" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="CaseDiameter" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="CaseMaterialType" type="xs:string" minOccurs="0"/>
-						<xs:element name="CaseThickness" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="CaseType" type="xs:string" minOccurs="0"/>
-						<xs:element name="CatalogNumber" type="xs:string" minOccurs="0"/>
-						<xs:element name="CDRWDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="ChainType" type="xs:string" minOccurs="0"/>
-						<xs:element name="CEROAgeRating" type="xs:string" minOccurs="0"/>
-						<xs:element name="ClaspType" type="xs:string" minOccurs="0"/>
-						<xs:element name="ClothingSize" type="xs:string" minOccurs="0"/>
-						<xs:element name="ClubType" type="xs:string" minOccurs="0"/>
-						<xs:element name="Color" type="xs:string" minOccurs="0"/>
-						<xs:element name="Compatibility" type="xs:string" minOccurs="0"/>
-						<xs:element name="CompatibleDevices" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="ComputerHardwareType" type="xs:string" minOccurs="0"/>
-						<xs:element name="ComputerPlatform" type="xs:string" minOccurs="0"/>
-						<xs:element name="Connectivity" type="xs:string" minOccurs="0"/>
-						<xs:element name="ContinuousShootingSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="Country" type="xs:string" minOccurs="0"/>
-						<xs:element name="CPUManufacturer" type="xs:string" minOccurs="0"/>
-						<xs:element name="CPUSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="CPUType" type="xs:string" minOccurs="0"/>
-						<xs:element name="Creator" minOccurs="0" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:simpleContent>
-									<xs:extension base="xs:string">
-										<xs:attribute name="Role" type="xs:string" use="required"/>
-									</xs:extension>
-								</xs:simpleContent>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="Cuisine" type="xs:string" minOccurs="0"/>
-						<xs:element name="DataLinkProtocol" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="DeliveryOption" type="xs:string" minOccurs="0"/>
-						<xs:element name="DelayBetweenShots" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="Department" type="xs:string" minOccurs="0"/>
-						<xs:element name="DeweyDecimalNumber" type="xs:string" minOccurs="0"/>
-						<xs:element name="DialColor" type="xs:string" minOccurs="0"/>
-						<xs:element name="DialWindowMaterialType" type="xs:string" minOccurs="0"/>
-						<xs:element name="DigitalZoom" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="Director" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="DisplayColorSupport" type="xs:string" minOccurs="0"/>
-						<xs:element name="DisplaySize" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="DrumSetPieceQuantity" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="DVDLayers" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="DVDRWDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="DVDSides" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="DPCI" type="xs:string" minOccurs="0"/>
-						<xs:element name="EAN" type="xs:string" minOccurs="0"/>
-						<xs:element name="Edition" type="xs:string" minOccurs="0"/>
-						<xs:element name="ESRBAgeRating" type="xs:string" minOccurs="0"/>
-						<xs:element name="ExternalDisplaySupportDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="FabricType" type="xs:string" minOccurs="0"/>
-						<xs:element name="FaxNumber" type="xs:string" minOccurs="0"/>
-						<xs:element name="Feature" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="FilmColorType" type="xs:string" minOccurs="0"/>
-						<xs:element name="FirstIssueLeadTime" type="tns:StringWithUnits" minOccurs="0"/>
-						<xs:element name="FloppyDiskDriveDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="Format" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="FormFactor" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="GemType" type="xs:string" minOccurs="0"/>
-						<xs:element name="Genre" type="xs:string" minOccurs="0"/>
-						<xs:element name="GLProductGroup" type="xs:string" minOccurs="0"/>
-						<xs:element name="GraphicsCardInterface" type="xs:string" minOccurs="0"/>
-						<xs:element name="GraphicsDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="GraphicsMemorySize" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="GuitarAttribute" type="xs:string" minOccurs="0"/>
-						<xs:element name="GuitarBridgeSystem" type="xs:string" minOccurs="0"/>
-						<xs:element name="GuitarPickThickness" type="xs:string" minOccurs="0"/>
-						<xs:element name="GuitarPickupConfiguration" type="xs:string" minOccurs="0"/>
-						<xs:element name="HandOrientation" type="xs:string" minOccurs="0"/>
-						<xs:element name="HardDiskCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="HardDiskSize" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="HardDiskInterface" type="xs:string" minOccurs="0"/>
-						<xs:element name="HardwarePlatform" type="xs:string" minOccurs="0"/>
-						<xs:element name="HasAutoFocus" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasBurstMode" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasInCameraEditing" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasRedEyeReduction" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasSelfTimer" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasTripodMount" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasVideoOut" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasViewfinder" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HazardousMaterialType" type="xs:string" minOccurs="0"/>
-						<xs:element name="HoursOfOperation" type="xs:string" minOccurs="0"/>
-						<xs:element name="IncludedSoftware" type="xs:string" minOccurs="0"/>
-						<xs:element name="IncludesMp3Player" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="Ingredients" type="xs:string" minOccurs="0"/>
-						<xs:element name="InstrumentKey" type="xs:string" minOccurs="0"/>
-						<xs:element name="IsAdultProduct" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="IsAutographed" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="ISBN" type="xs:string" minOccurs="0"/>
-						<xs:element name="IsFragile" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="IsLabCreated" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="IsMemorabilia" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="ISOEquivalent" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="IsPreannounce" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="IssuesPerYear" type="xs:string" minOccurs="0"/>
-						<xs:element name="ItemDimensions" minOccurs="0" maxOccurs="1">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Height" type="tns:DecimalWithUnits" minOccurs="0"/>
-									<xs:element name="Length" type="tns:DecimalWithUnits" minOccurs="0"/>
-									<xs:element name="Weight" type="tns:DecimalWithUnits" minOccurs="0"/>
-									<xs:element name="Width" type="tns:DecimalWithUnits" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="KeyboardDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="Label" type="xs:string" minOccurs="0"/>
-						<xs:element name="Languages" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Language" minOccurs="0" maxOccurs="unbounded">
-										<xs:complexType>
-											<xs:sequence>
-												<xs:element name="Name" type="xs:string"/>
-												<xs:element name="Type" type="xs:string" minOccurs="0"/>
-												<xs:element name="AudioFormat" type="xs:string" minOccurs="0"/>
-											</xs:sequence>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="LegalDisclaimer" type="xs:string" minOccurs="0"/>
-						<xs:element name="LensType" type="xs:string" minOccurs="0"/>
-						<xs:element name="LineVoltage" type="xs:string" minOccurs="0"/>
-						<xs:element name="ListPrice" type="tns:Price" minOccurs="0"/>
-						<xs:element name="MacroFocusRange" type="xs:string" minOccurs="0"/>
-						<xs:element name="MagazineType" type="xs:string" minOccurs="0"/>
-						<xs:element name="MalletHardness" type="xs:string" minOccurs="0"/>
-						<xs:element name="Manufacturer" type="xs:string" minOccurs="0"/>
-						<xs:element name="ManufacturerLaborWarrantyDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="ManufacturerMaximumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="ManufacturerMinimumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="ManufacturerPartsWarrantyDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="MaterialType" type="xs:string" minOccurs="0"/>
-						<xs:element name="MaximumAperture" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumColorDepth" type="xs:string" minOccurs="0"/>
-						<xs:element name="MaximumFocalLength" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumHighResolutionImages" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumHorizontalResolution" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumLowResolutionImages" type="xs:string" minOccurs="0"/>
-						<xs:element name="MaximumResolution" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumShutterSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumVerticalResolution" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumWeightRecommendation" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MediaType" type="xs:string" minOccurs="0"/>
-						<xs:element name="MemorySlotsAvailable" type="xs:string" minOccurs="0"/>
-						<xs:element name="MetalStamp" type="xs:string" minOccurs="0"/>
-						<xs:element name="MetalType" type="xs:string" minOccurs="0"/>
-						<xs:element name="MiniMovieDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="MinimumFocalLength" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MinimumShutterSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="Model" type="xs:string" minOccurs="0"/>
-						<xs:element name="ModelYear" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="ModemDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="MonitorSize" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MonitorViewableDiagonalSize" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MouseDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="MPN" type="xs:string" minOccurs="0"/>
-						<xs:element name="MusicalStyle" type="xs:string" minOccurs="0"/>
-						<xs:element name="NativeResolution" type="xs:string" minOccurs="0"/>
-						<xs:element name="Neighborhood" type="xs:string" minOccurs="0"/>
-						<xs:element name="NetworkInterfaceDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="NotebookDisplayTechnology" type="xs:string" minOccurs="0"/>
-						<xs:element name="NotebookPointingDeviceDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="NumberOfDiscs" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfIssues" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfItems" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfKeys" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfPearls" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfRapidFireShots" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfStones" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfStrings" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfTracks" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="OperatingSystem" type="xs:string" minOccurs="0"/>
-						<xs:element name="OpticalSensorResolution" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="OpticalZoom" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="OriginalReleaseDate" type="xs:string" minOccurs="0"/>
-						<xs:element name="OutputWattage" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="PackageDimensions" minOccurs="0" maxOccurs="1">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Height" type="tns:DecimalWithUnits" minOccurs="0"/>
-									<xs:element name="Length" type="tns:DecimalWithUnits" minOccurs="0"/>
-									<xs:element name="Weight" type="tns:DecimalWithUnits" minOccurs="0"/>
-									<xs:element name="Width" type="tns:DecimalWithUnits" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="PackageQuantity" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="PearlLustre" type="xs:string" minOccurs="0"/>
-						<xs:element name="PearlMinimumColor" type="xs:string" minOccurs="0"/>
-						<xs:element name="PearlShape" type="xs:string" minOccurs="0"/>
-						<xs:element name="PearlStringingMethod" type="xs:string" minOccurs="0"/>
-						<xs:element name="PearlSurfaceBlemishes" type="xs:string" minOccurs="0"/>
-						<xs:element name="PearlType" type="xs:string" minOccurs="0"/>
-						<xs:element name="PearlUniformity" type="xs:string" minOccurs="0"/>
-						<xs:element name="PhoneNumber" type="xs:string" minOccurs="0"/>
-						<xs:element name="PhotoFlashType" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="PictureFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="Platform" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="PriceRating" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="ProcessorCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="ProductGroup" type="xs:string" minOccurs="0"/>
-						<xs:element name="ProductSiteLaunchDate" type="xs:string" minOccurs="0"/>
-						<xs:element name="ProductTypeName" type="xs:string" minOccurs="0"/>
-						<xs:element name="ProductTypeSubcategory" type="xs:string" minOccurs="0"/>
-						<xs:element name="PromotionalTag" type="xs:string" minOccurs="0">
-							<xs:annotation>
-								<xs:appinfo>
-									<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-										<aws-se:excludeFrom>public</aws-se:excludeFrom>
-										<aws-se:excludeFrom>partner</aws-se:excludeFrom>
-									</aws-se:restricted>
-								</xs:appinfo>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="PublicationDate" type="xs:string" minOccurs="0"/>
-						<xs:element name="Publisher" type="xs:string" minOccurs="0"/>
-						<xs:element name="POBoxShippingExcluded" type="xs:string" minOccurs="0"/>
-						<xs:element name="ReadingLevel" type="xs:string" minOccurs="0"/>
-						<xs:element name="ReturnMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="RecorderTrackCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="RegionCode" type="xs:string" minOccurs="0"/>
-						<xs:element name="RegionOfOrigin" type="xs:string" minOccurs="0"/>
-						<xs:element name="ReturnPolicy" type="xs:string" minOccurs="0"/>
-						<xs:element name="ReleaseDate" type="xs:string" minOccurs="0"/>
-						<xs:element name="RemovableMemory" type="xs:string" minOccurs="0"/>
-						<xs:element name="RemovableStorage" type="xs:string" minOccurs="0"/>
-						<xs:element name="RequiredVoltageRange" type="xs:string" minOccurs="0"/>
-						<xs:element name="ResolutionModes" type="xs:string" minOccurs="0"/>
-						<xs:element name="RingSize" type="xs:string" minOccurs="0"/>
-						<xs:element name="RunningTime" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="ScentName" type="xs:string" minOccurs="0"/>
-						<xs:element name="SecondaryCacheSize" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="SettingType" type="xs:string" minOccurs="0"/>
-						<xs:element name="ShaftMaterialType" type="xs:string" minOccurs="0"/>
-						<xs:element name="Size" type="xs:string" minOccurs="0"/>
-						<xs:element name="SizePerPearl" type="xs:string" minOccurs="0"/>
-						<xs:element name="SkillLevel" type="xs:string" minOccurs="0"/>
-						<xs:element name="SKU" type="xs:string" minOccurs="0"/>
-						<xs:element name="SoldInStores" type="xs:string" minOccurs="0"/>
-						<xs:element name="SoundCardDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="SpeakerCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="SpeakerDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="SpecialFeatures" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="StoneClarity" type="xs:string" minOccurs="0"/>
-						<xs:element name="StoneColor" type="xs:string" minOccurs="0"/>
-						<xs:element name="StoneCut" type="xs:string" minOccurs="0"/>
-						<xs:element name="StoneShape" type="xs:string" minOccurs="0"/>
-						<xs:element name="StoneWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="Studio" type="xs:string" minOccurs="0"/>
-						<xs:element name="Style" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionLength" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="SupportedImageType" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="SupportedMediaSize" type="xs:string" minOccurs="0"/>
-						<xs:element name="SystemBusSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="SystemMemorySizeMax" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="SystemMemorySize" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="SystemMemoryType" type="xs:string" minOccurs="0"/>
-						<xs:element name="TellingPageIndicator" type="xs:string" minOccurs="0"/>
-						<xs:element name="TheatricalReleaseDate" type="xs:string" minOccurs="0"/>
-						<xs:element name="Title" type="xs:string" minOccurs="0"/>
-						<xs:element name="TotalDiamondWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="TotalExternalBaysFree" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalFirewirePorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalGemWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="TotalInternalBaysFree" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalMetalWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="TotalNTSCPALPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalParallelPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalPCCardSlots" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalPCISlotsFree" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalSerialPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalSVideoOutPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalUSB2Ports" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalUSBPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalVGAOutPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="UPC" type="xs:string" minOccurs="0"/>
-						<xs:element name="VariationDenomination" type="xs:string" minOccurs="0"/>
-						<xs:element name="VariationDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="Warranty" type="xs:string" minOccurs="0"/>
-						<xs:element name="WatchMovementType" type="xs:string" minOccurs="0"/>
-						<xs:element name="WaterResistanceDepth" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="WEEETaxValue" type="tns:Price" minOccurs="0"/>
-						<xs:element name="WirelessMicrophoneFrequency" type="xs:nonNegativeInteger" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="MerchantItemAttributes">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Actor" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="Address" type="tns:Address" minOccurs="0"/>
-						<xs:element name="AmazonMaximumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="AmazonMinimumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="ApertureModes" type="xs:string" minOccurs="0"/>
-						<xs:element name="Artist" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="AspectRatio" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssemblyInstructions" type="xs:string" minOccurs="0"/>
-						<xs:element name="AssemblyRequired" type="xs:string" minOccurs="0"/>
-						<xs:element name="AudienceRating" type="xs:string" minOccurs="0"/>
-						<xs:element name="AudioFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="Author" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="BackFinding" type="xs:string" minOccurs="0"/>
-						<xs:element name="BandMaterialType" type="xs:string" minOccurs="0"/>
-						<xs:element name="BatteriesIncluded" type="xs:string" minOccurs="0"/>
-						<xs:element name="BatteriesRequired" type="xs:string" minOccurs="0"/>
-						<xs:element name="Batteries" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="BatteryDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="BatteryType" type="xs:string" minOccurs="0"/>
-						<xs:element name="BezelMaterialType" type="xs:string" minOccurs="0"/>
-						<xs:element name="Binding" type="xs:string" minOccurs="0"/>
-						<xs:element name="Brand" type="xs:string" minOccurs="0"/>
-						<xs:element name="CalendarType" type="xs:string" minOccurs="0"/>
-						<xs:element name="CameraManualFeatures" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="CaseDiameter" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="CaseMaterialType" type="xs:string" minOccurs="0"/>
-						<xs:element name="CaseThickness" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="CaseType" type="xs:string" minOccurs="0"/>
-						<xs:element name="CatalogNumber" type="xs:string" minOccurs="0"/>
-						<xs:element name="CDRWDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="ChainType" type="xs:string" minOccurs="0"/>
-						<xs:element name="ClaspType" type="xs:string" minOccurs="0"/>
-						<xs:element name="ClothingSize" type="xs:string" minOccurs="0"/>
-						<xs:element name="Color" type="xs:string" minOccurs="0"/>
-						<xs:element name="Compatibility" type="xs:string" minOccurs="0"/>
-						<xs:element name="ComputerHardwareType" type="xs:string" minOccurs="0"/>
-						<xs:element name="ComputerPlatform" type="xs:string" minOccurs="0"/>
-						<xs:element name="Connectivity" type="xs:string" minOccurs="0"/>
-						<xs:element name="ContinuousShootingSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="Country" type="xs:string" minOccurs="0"/>
-						<xs:element name="CountryOfOrigin" type="xs:string" minOccurs="0"/>
-						<xs:element name="CPUManufacturer" type="xs:string" minOccurs="0"/>
-						<xs:element name="CPUSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="CPUType" type="xs:string" minOccurs="0"/>
-						<xs:element name="Creator" minOccurs="0" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:simpleContent>
-									<xs:extension base="xs:string">
-										<xs:attribute name="Role" type="xs:string" use="required"/>
-									</xs:extension>
-								</xs:simpleContent>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="Cuisine" type="xs:string" minOccurs="0"/>
-						<xs:element name="Customizable" type="xs:string" minOccurs="0"/>
-						<xs:element name="DelayBetweenShots" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="DeliveryOption" type="xs:string" minOccurs="0"/>
-						<xs:element name="Department" type="xs:string" minOccurs="0"/>
-						<xs:element name="Description" type="xs:string" minOccurs="0"/>
-						<xs:element name="DeweyDecimalNumber" type="xs:string" minOccurs="0"/>
-						<xs:element name="DialColor" type="xs:string" minOccurs="0"/>
-						<xs:element name="DialWindowMaterialType" type="xs:string" minOccurs="0"/>
-						<xs:element name="DigitalZoom" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="Director" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="DisplaySize" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="DrumSetPieceQuantity" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="DVDLayers" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="DVDRWDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="DVDSides" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="DPCI" type="xs:string" minOccurs="0"/>
-						<xs:element name="EAN" type="xs:string" minOccurs="0"/>
-						<xs:element name="Edition" type="xs:string" minOccurs="0"/>
-						<xs:element name="ESRBAgeRating" type="xs:string" minOccurs="0"/>
-						<xs:element name="ExternalDisplaySupportDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="FabricType" type="xs:string" minOccurs="0"/>
-						<xs:element name="FaxNumber" type="xs:string" minOccurs="0"/>
-						<xs:element name="Feature" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="FirstIssueLeadTime" type="tns:StringWithUnits" minOccurs="0"/>
-						<xs:element name="FloppyDiskDriveDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="Format" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="FixedShippingCharge" type="tns:Price" minOccurs="0"/>
-						<xs:element name="GemType" type="xs:string" minOccurs="0"/>
-						<xs:element name="GraphicsCardInterface" type="xs:string" minOccurs="0"/>
-						<xs:element name="GraphicsDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="GraphicsMemorySize" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="GuitarAttribute" type="xs:string" minOccurs="0"/>
-						<xs:element name="GuitarBridgeSystem" type="xs:string" minOccurs="0"/>
-						<xs:element name="GuitarPickThickness" type="xs:string" minOccurs="0"/>
-						<xs:element name="GuitarPickupConfiguration" type="xs:string" minOccurs="0"/>
-						<xs:element name="HardDiskCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="HardDiskSize" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="HasAutoFocus" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasBurstMode" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasInCameraEditing" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasRedEyeReduction" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasSelfTimer" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasTripodMount" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasVideoOut" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HasViewfinder" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="HazardousMaterialType" type="xs:string" minOccurs="0"/>
-						<xs:element name="HoursOfOperation" type="xs:string" minOccurs="0"/>
-						<xs:element name="IncludedSoftware" type="xs:string" minOccurs="0"/>
-						<xs:element name="IncludesMp3Player" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="Indications" type="xs:string" minOccurs="0"/>
-						<xs:element name="Ingredients" type="xs:string" minOccurs="0"/>
-						<xs:element name="InstrumentKey" type="xs:string" minOccurs="0"/>
-						<xs:element name="IsAutographed" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="ISBN" type="xs:string" minOccurs="0"/>
-						<xs:element name="IsFragile" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="IsLabCreated" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="IsMemorabilia" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="ISOEquivalent" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="IssuesPerYear" type="xs:string" minOccurs="0"/>
-						<xs:element name="ItemDimensions" minOccurs="0" maxOccurs="1">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Height" type="tns:DecimalWithUnits" minOccurs="0"/>
-									<xs:element name="Length" type="tns:DecimalWithUnits" minOccurs="0"/>
-									<xs:element name="Weight" type="tns:DecimalWithUnits" minOccurs="0"/>
-									<xs:element name="Width" type="tns:DecimalWithUnits" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="KeyboardDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="Label" type="xs:string" minOccurs="0"/>
-						<xs:element name="Languages" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Language" minOccurs="0" maxOccurs="unbounded">
-										<xs:complexType>
-											<xs:sequence>
-												<xs:element name="Name" type="xs:string"/>
-												<xs:element name="Type" type="xs:string"/>
-												<xs:element name="AudioFormat" type="xs:string" minOccurs="0"/>
-											</xs:sequence>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="LegalDisclaimer" type="xs:string" minOccurs="0"/>
-						<xs:element name="LineVoltage" type="xs:string" minOccurs="0"/>
-						<xs:element name="ListPrice" type="tns:Price" minOccurs="0"/>
-						<xs:element name="MacroFocusRange" type="xs:string" minOccurs="0"/>
-						<xs:element name="MagazineType" type="xs:string" minOccurs="0"/>
-						<xs:element name="MalletHardness" type="xs:string" minOccurs="0"/>
-						<xs:element name="Manufacturer" type="xs:string" minOccurs="0"/>
-						<xs:element name="ManufacturerLaborWarrantyDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="ManufacturerMaximumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="ManufacturerMinimumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="ManufacturerPartsWarrantyDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="MaterialType" type="xs:string" minOccurs="0"/>
-						<xs:element name="MaximumAperture" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumColorDepth" type="xs:string" minOccurs="0"/>
-						<xs:element name="MaximumFocalLength" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumHighResolutionImages" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumHorizontalResolution" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumLowResolutionImages" type="xs:string" minOccurs="0"/>
-						<xs:element name="MaximumResolution" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumShutterSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumVerticalResolution" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="MaximumWeightRecommendation" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MemorySlotsAvailable" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="MetalStamp" type="xs:string" minOccurs="0"/>
-						<xs:element name="MetalType" type="xs:string" minOccurs="0"/>
-						<xs:element name="MiniMovieDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="MinimumFocalLength" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MinimumShutterSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="Model" type="xs:string" minOccurs="0"/>
-						<xs:element name="ModelYear" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="ModemDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="MonitorSize" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MonitorViewableDiagonalSize" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="MouseDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="MPN" type="xs:string" minOccurs="0"/>
-						<xs:element name="MusicalStyle" type="xs:string" minOccurs="0"/>
-						<xs:element name="NativeResolution" type="xs:string" minOccurs="0"/>
-						<xs:element name="Neighborhood" type="xs:string" minOccurs="0"/>
-						<xs:element name="NetworkInterfaceDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="NotebookDisplayTechnology" type="xs:string" minOccurs="0"/>
-						<xs:element name="NotebookPointingDeviceDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="NumberOfDiscs" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfIssues" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfItems" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfKeys" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfPearls" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfRapidFireShots" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfStones" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfStrings" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="NumberOfTracks" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="OpticalZoom" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="OriginalReleaseDate" type="xs:string" minOccurs="0"/>
-						<xs:element name="OutputWattage" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="PackageDimensions" minOccurs="0" maxOccurs="1">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Height" type="tns:DecimalWithUnits" minOccurs="0"/>
-									<xs:element name="Length" type="tns:DecimalWithUnits" minOccurs="0"/>
-									<xs:element name="Weight" type="tns:DecimalWithUnits" minOccurs="0"/>
-									<xs:element name="Width" type="tns:DecimalWithUnits" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="PearlLustre" type="xs:string" minOccurs="0"/>
-						<xs:element name="PearlMinimumColor" type="xs:string" minOccurs="0"/>
-						<xs:element name="PearlShape" type="xs:string" minOccurs="0"/>
-						<xs:element name="PearlStringingMethod" type="xs:string" minOccurs="0"/>
-						<xs:element name="PearlSurfaceBlemishes" type="xs:string" minOccurs="0"/>
-						<xs:element name="PearlType" type="xs:string" minOccurs="0"/>
-						<xs:element name="PearlUniformity" type="xs:string" minOccurs="0"/>
-						<xs:element name="PhoneNumber" type="xs:string" minOccurs="0"/>
-						<xs:element name="PhotoFlashType" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="PictureFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="Platform" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="PriceRating" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="ProcessorCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="ProductGroup" type="xs:string" minOccurs="0"/>
-						<xs:element name="PromotionalTag" type="xs:string" minOccurs="0"/>
-						<xs:element name="POBoxShippingExcluded" type="xs:string" minOccurs="0"/>
-						<xs:element name="PublicationDate" type="xs:string" minOccurs="0"/>
-						<xs:element name="Publisher" type="xs:string" minOccurs="0"/>
-						<xs:element name="PurchasingChannel" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="ReadingLevel" type="xs:string" minOccurs="0"/>
-						<xs:element name="RecorderTrackCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="RegionCode" type="xs:string" minOccurs="0"/>
-						<xs:element name="RegionOfOrigin" type="xs:string" minOccurs="0"/>
-						<xs:element name="ReleaseDate" type="xs:string" minOccurs="0"/>
-						<xs:element name="ReturnMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="RemovableMemory" type="xs:string" minOccurs="0"/>
-						<xs:element name="ResolutionModes" type="xs:string" minOccurs="0"/>
-						<xs:element name="ReturnPolicy" type="xs:string" minOccurs="0"/>
-						<xs:element name="RingSize" type="xs:string" minOccurs="0"/>
-						<xs:element name="SafetyWarning" type="xs:string" minOccurs="0"/>
-						<xs:element name="SalesRestriction" type="xs:string" minOccurs="0"/>
-						<xs:element name="SecondaryCacheSize" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="SettingType" type="xs:string" minOccurs="0"/>
-						<xs:element name="Size" type="xs:string" minOccurs="0"/>
-						<xs:element name="SKU" type="xs:string" minOccurs="0"/>
-						<xs:element name="SoldInStores" type="xs:string" minOccurs="0"/>
-						<xs:element name="SizePerPearl" type="xs:string" minOccurs="0"/>
-						<xs:element name="SkillLevel" type="xs:string" minOccurs="0"/>
-						<xs:element name="SoundCardDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="SpeakerCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="SpeakerDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="SpecialFeatures" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="StoneClarity" type="xs:string" minOccurs="0"/>
-						<xs:element name="StoneColor" type="xs:string" minOccurs="0"/>
-						<xs:element name="StoneCut" type="xs:string" minOccurs="0"/>
-						<xs:element name="StoneShape" type="xs:string" minOccurs="0"/>
-						<xs:element name="StoneWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="Studio" type="xs:string" minOccurs="0"/>
-						<xs:element name="SubscriptionLength" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-						<xs:element name="SupportedImageType" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						<xs:element name="SystemBusSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="SystemMemorySizeMax" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="SystemMemorySize" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="SystemMemoryType" type="xs:string" minOccurs="0"/>
-						<xs:element name="TellingPageIndicator" type="xs:string" minOccurs="0"/>
-						<xs:element name="TheatricalReleaseDate" type="xs:string" minOccurs="0"/>
-						<xs:element name="Title" type="xs:string" minOccurs="0"/>
-						<xs:element name="TotalDiamondWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="TotalExternalBaysFree" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalFirewirePorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalGemWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="TotalInternalBaysFree" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalMetalWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="TotalNTSCPALPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalParallelPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalPCCardSlots" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalPCISlotsFree" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalSerialPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalSVideoOutPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalUSB2Ports" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalUSBPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="TotalVGAOutPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<xs:element name="UPC" type="xs:string" minOccurs="0"/>
-						<xs:element name="VariationDenomination" type="xs:string" minOccurs="0"/>
-						<xs:element name="VariationDescription" type="xs:string" minOccurs="0"/>
-						<xs:element name="VendorRebate" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="Type" type="xs:string" minOccurs="0"/>
-									<xs:element name="StartDate" type="xs:string" minOccurs="0"/>
-									<xs:element name="EndDate" type="xs:string" minOccurs="0"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="Warranty" type="xs:string" minOccurs="0"/>
-						<xs:element name="WatchMovementType" type="xs:string" minOccurs="0"/>
-						<xs:element name="WebsiteBuyability" type="xs:string" minOccurs="0"/>
-						<xs:element name="WaterResistanceDepth" type="tns:DecimalWithUnits" minOccurs="0"/>
-						<xs:element name="WirelessMicrophoneFrequency" type="xs:nonNegativeInteger" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="NonNegativeIntegerWithUnits">
-				<xs:simpleContent>
-					<xs:extension base="xs:nonNegativeInteger">
-						<xs:attribute name="Units" type="xs:string" use="required"/>
-					</xs:extension>
-				</xs:simpleContent>
-			</xs:complexType>
-			<xs:complexType name="DecimalWithUnits">
-				<xs:simpleContent>
-					<xs:extension base="xs:decimal">
-						<xs:attribute name="Units" type="xs:string" use="required"/>
-					</xs:extension>
-				</xs:simpleContent>
-			</xs:complexType>
-			<xs:complexType name="StringWithUnits">
-				<xs:simpleContent>
-					<xs:extension base="xs:string">
-						<xs:attribute name="Units" type="xs:string" use="required"/>
-					</xs:extension>
-				</xs:simpleContent>
-			</xs:complexType>
-			<xs:simpleType name="positiveIntegerOrAll">
-				<xs:union>
-					<xs:simpleType>
-						<xs:restriction base="xs:positiveInteger"/>
-					</xs:simpleType>
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="All"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:union>
-			</xs:simpleType -->
-		</xs:schema>
-	</types>
-	<!-- message name="HelpRequestMsg">
-		<part name="body" element="tns:Help"/>
-	</message>
-	<message name="HelpResponseMsg">
-		<part name="body" element="tns:HelpResponse"/>
-	</message>
-	<message name="ItemSearchRequestMsg">
-		<part name="body" element="tns:ItemSearch"/>
-	</message>
-	<message name="ItemSearchResponseMsg">
-		<part name="body" element="tns:ItemSearchResponse"/>
-	</message>
-	<message name="ItemLookupRequestMsg">
-		<part name="body" element="tns:ItemLookup"/>
-	</message>
-	<message name="ItemLookupResponseMsg">
-		<part name="body" element="tns:ItemLookupResponse"/>
-	</message>
-	<message name="BrowseNodeLookupRequestMsg">
-		<part name="body" element="tns:BrowseNodeLookup"/>
-	</message>
-	<message name="BrowseNodeLookupResponseMsg">
-		<part name="body" element="tns:BrowseNodeLookupResponse"/>
-	</message>
-	<message name="ListSearchRequestMsg">
-		<part name="body" element="tns:ListSearch"/>
-	</message>
-	<message name="ListSearchResponseMsg">
-		<part name="body" element="tns:ListSearchResponse"/>
-	</message>
-	<message name="ListLookupRequestMsg">
-		<part name="body" element="tns:ListLookup"/>
-	</message>
-	<message name="ListLookupResponseMsg">
-		<part name="body" element="tns:ListLookupResponse"/>
-	</message>
-	<message name="CustomerContentSearchRequestMsg">
-		<part name="body" element="tns:CustomerContentSearch"/>
-	</message>
-	<message name="CustomerContentSearchResponseMsg">
-		<part name="body" element="tns:CustomerContentSearchResponse"/>
-	</message>
-	<message name="CustomerContentLookupRequestMsg">
-		<part name="body" element="tns:CustomerContentLookup"/>
-	</message>
-	<message name="CustomerContentLookupResponseMsg">
-		<part name="body" element="tns:CustomerContentLookupResponse"/>
-	</message>
-	<message name="SimilarityLookupRequestMsg">
-		<part name="body" element="tns:SimilarityLookup"/>
-	</message>
-	<message name="SimilarityLookupResponseMsg">
-		<part name="body" element="tns:SimilarityLookupResponse"/>
-	</message>
-	<message name="SellerLookupRequestMsg">
-		<part name="body" element="tns:SellerLookup"/>
-	</message>
-	<message name="SellerLookupResponseMsg">
-		<part name="body" element="tns:SellerLookupResponse"/>
-	</message -->
-	<message name="CartGetRequestMsg">
-		<part name="body" element="tns:CartGet"/>
-	</message>
-	<message name="CartGetResponseMsg">
-		<part name="body" element="tns:CartGetResponse"/>
-	</message>
-	<message name="CartAddRequestMsg">
-		<part name="body" element="tns:CartAdd"/>
-	</message>
-	<message name="CartAddResponseMsg">
-		<part name="body" element="tns:CartAddResponse"/>
-	</message>
-	<message name="CartCreateRequestMsg">
-		<part name="body" element="tns:CartCreate"/>
-	</message>
-	<message name="CartCreateResponseMsg">
-		<part name="body" element="tns:CartCreateResponse"/>
-	</message>
-	<message name="CartModifyRequestMsg">
-		<part name="body" element="tns:CartModify"/>
-	</message>
-	<message name="CartModifyResponseMsg">
-		<part name="body" element="tns:CartModifyResponse"/>
-	</message>
-	<message name="CartClearRequestMsg">
-		<part name="body" element="tns:CartClear"/>
-	</message>
-	<message name="CartClearResponseMsg">
-		<part name="body" element="tns:CartClearResponse"/>
-	</message>
-	<!-- message name="TransactionLookupRequestMsg">
-		<part name="body" element="tns:TransactionLookup"/>
-	</message>
-	<message name="TransactionLookupResponseMsg">
-		<part name="body" element="tns:TransactionLookupResponse"/>
-	</message>
-	<message name="SellerListingSearchRequestMsg">
-		<part name="body" element="tns:SellerListingSearch"/>
-	</message>
-	<message name="SellerListingSearchResponseMsg">
-		<part name="body" element="tns:SellerListingSearchResponse"/>
-	</message>
-	<message name="SellerListingLookupRequestMsg">
-		<part name="body" element="tns:SellerListingLookup"/>
-	</message>
-	<message name="SellerListingLookupResponseMsg">
-		<part name="body" element="tns:SellerListingLookupResponse"/>
-	</message>
-	<message name="MultiOperationRequestMsg">
-		<part name="body" element="tns:MultiOperation"/>
-	</message>
-	<message name="MultiOperationResponseMsg">
-		<part name="body" element="tns:MultiOperationResponse"/>
-	</message -->
-	<portType name="AWSECommerceServicePortType">
-		<!-- operation name="Help">
-			<input message="tns:HelpRequestMsg"/>
-			<output message="tns:HelpResponseMsg"/>
-		</operation>
-		<operation name="ItemSearch">
-			<input message="tns:ItemSearchRequestMsg"/>
-			<output message="tns:ItemSearchResponseMsg"/>
-		</operation>
-		<operation name="ItemLookup">
-			<input message="tns:ItemLookupRequestMsg"/>
-			<output message="tns:ItemLookupResponseMsg"/>
-		</operation>
-		<operation name="BrowseNodeLookup">
-			<input message="tns:BrowseNodeLookupRequestMsg"/>
-			<output message="tns:BrowseNodeLookupResponseMsg"/>
-		</operation>
-		<operation name="ListSearch">
-			<input message="tns:ListSearchRequestMsg"/>
-			<output message="tns:ListSearchResponseMsg"/>
-		</operation>
-		<operation name="ListLookup">
-			<input message="tns:ListLookupRequestMsg"/>
-			<output message="tns:ListLookupResponseMsg"/>
-		</operation>
-		<operation name="CustomerContentSearch">
-			<input message="tns:CustomerContentSearchRequestMsg"/>
-			<output message="tns:CustomerContentSearchResponseMsg"/>
-		</operation>
-		<operation name="CustomerContentLookup">
-			<input message="tns:CustomerContentLookupRequestMsg"/>
-			<output message="tns:CustomerContentLookupResponseMsg"/>
-		</operation>
-		<operation name="SimilarityLookup">
-			<input message="tns:SimilarityLookupRequestMsg"/>
-			<output message="tns:SimilarityLookupResponseMsg"/>
-		</operation>
-		<operation name="SellerLookup">
-			<input message="tns:SellerLookupRequestMsg"/>
-			<output message="tns:SellerLookupResponseMsg"/>
-		</operation -->
-		<operation name="CartGet">
-			<input message="tns:CartGetRequestMsg"/>
-			<output message="tns:CartGetResponseMsg"/>
-		</operation>
-		<operation name="CartAdd">
-			<input message="tns:CartAddRequestMsg"/>
-			<output message="tns:CartAddResponseMsg"/>
-		</operation>
-		<operation name="CartCreate">
-			<input message="tns:CartCreateRequestMsg"/>
-			<output message="tns:CartCreateResponseMsg"/>
-		</operation>
-		<operation name="CartModify">
-			<input message="tns:CartModifyRequestMsg"/>
-			<output message="tns:CartModifyResponseMsg"/>
-		</operation>
-		<operation name="CartClear">
-			<input message="tns:CartClearRequestMsg"/>
-			<output message="tns:CartClearResponseMsg"/>
-		</operation>
-		<!-- operation name="TransactionLookup">
-			<input message="tns:TransactionLookupRequestMsg"/>
-			<output message="tns:TransactionLookupResponseMsg"/>
-		</operation>
-		<operation name="SellerListingSearch">
-			<input message="tns:SellerListingSearchRequestMsg"/>
-			<output message="tns:SellerListingSearchResponseMsg"/>
-		</operation>
-		<operation name="SellerListingLookup">
-			<input message="tns:SellerListingLookupRequestMsg"/>
-			<output message="tns:SellerListingLookupResponseMsg"/>
-		</operation>
-		<operation name="MultiOperation">
-			<input message="tns:MultiOperationRequestMsg"/>
-			<output message="tns:MultiOperationResponseMsg"/>
-		</operation -->
-	</portType>
-	<binding name="AWSECommerceServiceBinding" type="tns:AWSECommerceServicePortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<!-- operation name="Help">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="ItemSearch">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="ItemLookup">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="BrowseNodeLookup">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="ListSearch">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="ListLookup">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="CustomerContentSearch">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="CustomerContentLookup">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="SimilarityLookup">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="SellerLookup">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation -->
-		<operation name="CartGet">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="CartCreate">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="CartAdd">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="CartModify">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="CartClear">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<!-- operation name="TransactionLookup">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="SellerListingSearch">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="SellerListingLookup">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation>
-		<operation name="MultiOperation">
-			<soap:operation soapAction="http://soap.amazon.com"/>
-			<input>
-				<soap:body use="literal"/>
-			</input>
-			<output>
-				<soap:body use="literal"/>
-			</output>
-		</operation -->
-	</binding>
-	<service name="ProxyService">
-		<port name="AWSECommerceServicePort" binding="tns:AWSECommerceServiceBinding">
-			<soap:address location="http://localhost:8080/ShoppingStoreServiceComponent"/>
-		</port>
-	</service>
-</definitions>
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/pom.xml b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/pom.xml
deleted file mode 100644
index 20896bc089..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/pom.xml
+++ /dev/null
@@ -1,95 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-catalog-amazon</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA Store Tutorial Amazon Catalog</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-saxon</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-    </build>
-
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogClient.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogClient.java
deleted file mode 100644
index de67e597ac..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogClient.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 catalog;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program to invoke the Mortgage LoanApproval service
- */
-public class CatalogClient {
-
-    public static void main(String[] args) throws Exception {
-        System.err.println("Please make sure you have the ids configured in catalog.composite");
-        SCADomain domain = SCADomain.newInstance("catalog.composite");
-        CatalogService ebay = domain.getService(CatalogService.class, "EBayCatalogService");
-        ebay.get();
-        CatalogService amazon = domain.getService(CatalogService.class, "AmazonCatalogService");
-        amazon.get();
-
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogService.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogService.java
deleted file mode 100644
index c5db53621c..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogService.java
+++ /dev/null
@@ -1,28 +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 catalog;
-
-
-/**
- * @version $Rev$ $Date$
- */
-public interface CatalogService {
-    String[] get();
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogService.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogService.java
deleted file mode 100644
index e557950b24..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogService.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 catalog.amazon;
-
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.oasisopen.sca.annotation.Remotable;
-import org.w3c.dom.Node;
-
-@Remotable
-@DataBinding(value="org.w3c.dom.Node", wrapped=true)
-public interface AmazonCatalogService {
-    Node ItemSearch(Node requestWrapper);
-
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogServiceImpl.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogServiceImpl.java
deleted file mode 100644
index 8b411644ce..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogServiceImpl.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 catalog.amazon;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import catalog.CatalogService;
-import catalog.util.XPathHelper;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(CatalogService.class)
-public class AmazonCatalogServiceImpl implements CatalogService {
-    private static final String AMAZON_TNS = "http://webservices.amazon.com/AWSECommerceService/2007-09-21";
-
-    @Reference(name = "amazonFindItems")
-    protected AmazonCatalogService itemSearch;
-    
-    @Property(name="AWSAccessKeyId", required=true)
-    protected String accessKeyId;
-
-    private Node amazonItemSearch(String keywords) throws Exception {
-        Document doc = DOMHelper.newDocument();
-        Element wrapper = doc.createElementNS(AMAZON_TNS, "ItemSearch");
-        doc.appendChild(wrapper);
-        Element key = doc.createElementNS(AMAZON_TNS, "AWSAccessKeyId");
-        key.appendChild(doc.createTextNode(accessKeyId));
-        wrapper.appendChild(key);
-
-        Element request = doc.createElementNS(AMAZON_TNS, "Request");
-        wrapper.appendChild(request);
-
-        Element keywordsElement = doc.createElementNS(AMAZON_TNS, "Keywords");
-        keywordsElement.appendChild(doc.createTextNode(keywords));
-        request.appendChild(keywordsElement);
-
-        Element searchIndex = doc.createElementNS(AMAZON_TNS, "SearchIndex");
-        searchIndex.appendChild(doc.createTextNode("All"));
-        request.appendChild(searchIndex);
-
-        // System.out.println(new Node2String().transform(doc, null));
-        Node result = itemSearch.ItemSearch(doc);
-        return result;
-    }
-
-    public String[] get() {
-        try {
-            Node list = amazonItemSearch("Fruit");
-            Map<String, String> map = new HashMap<String, String>();
-            map.put("a", AMAZON_TNS);
-            NodeList nodes =
-                XPathHelper.selectNodes("//a:Item/a:ItemAttributes[a:ProductGroup='Grocery']/a:Title", list, map);
-            String titles[] = new String[nodes.getLength()];
-            System.out.println("Amazon catalog:");
-            for (int i = 0; i < nodes.getLength(); i++) {
-                titles[i] = nodes.item(i).getTextContent();
-                System.out.println("[" + i + "]" + titles[i]);
-            }
-
-            return titles;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogService.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogService.java
deleted file mode 100644
index a6cd356d5a..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogService.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 catalog.ebay;
-
-import org.oasisopen.sca.annotation.Remotable;
-import org.w3c.dom.Node;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface EBayCatalogService {
-    Node FindItems(Node request);
-    Node GetUserProfile(Node request);
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogServiceImpl.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogServiceImpl.java
deleted file mode 100644
index d7fc263740..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogServiceImpl.java
+++ /dev/null
@@ -1,99 +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 catalog.ebay;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import catalog.CatalogService;
-import catalog.util.XPathHelper;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(CatalogService.class)
-public class EBayCatalogServiceImpl implements CatalogService {
-    private static final String EBAY_TNS = "urn:ebay:apis:eBLBaseComponents";
-
-    @Reference(name = "eBayFindItems")
-    protected EBayCatalogService findItems;
-
-    @Reference(name = "eBayGetUserProfile")
-    protected EBayCatalogService getUserProfile;
-
-    private Node eBayFindItems(String keywords, int maxEntries) throws Exception {
-        Document doc = DOMHelper.newDocument();
-        Element request = doc.createElementNS(EBAY_TNS, "FindItemsRequest");
-        doc.appendChild(request);
-        Element keywordsElement = doc.createElementNS(EBAY_TNS, "QueryKeywords");
-        keywordsElement.appendChild(doc.createTextNode(keywords));
-        Element maxEntriesElement = doc.createElementNS(EBAY_TNS, "MaxEntries");
-        maxEntriesElement.appendChild(doc.createTextNode(String.valueOf(maxEntries)));
-        Element messageIDElement = doc.createElementNS(EBAY_TNS, "MessageID");
-        messageIDElement.appendChild(doc.createTextNode("001"));
-        request.appendChild(maxEntriesElement);
-        request.appendChild(keywordsElement);
-        request.appendChild(messageIDElement);
-        // System.out.println(new Node2String().transform(doc, null));
-        Node result = findItems.FindItems(doc);
-        return result;
-    }
-
-    private Node eBayGetUserProfile(String userID) throws Exception {
-        Document doc = DOMHelper.newDocument();
-        Element req = doc.createElementNS(EBAY_TNS, "GetUserProfileRequest");
-        doc.appendChild(req);
-        Element user = doc.createElementNS(EBAY_TNS, "UserID");
-        user.appendChild(doc.createTextNode(userID));
-        Element msgID = doc.createElementNS(EBAY_TNS, "MessageID");
-        msgID.appendChild(doc.createTextNode("001"));
-        req.appendChild(user);
-        // System.out.println(new Node2String().transform(doc, null));
-        Node result = getUserProfile.GetUserProfile(doc);
-        return result;
-    }
-
-    public String[] get() {
-        try {
-            Node items = eBayFindItems("Fruit", 10);
-            Map<String, String> map = new HashMap<String, String>();
-            map.put("e", EBAY_TNS);
-            NodeList nodes = XPathHelper.selectNodes("//e:Item/e:Title", items, map);
-            String[] titles = new String[nodes.getLength()];
-            System.out.println("eBay catalog:");
-            for (int i = 0; i < nodes.getLength(); i++) {
-                titles[i] = nodes.item(i).getTextContent();
-                System.out.println("[" + i + "]" + titles[i]);
-            }
-            return titles;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/NamespaceContextImpl.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/NamespaceContextImpl.java
deleted file mode 100644
index dcd14f5530..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/NamespaceContextImpl.java
+++ /dev/null
@@ -1,126 +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 catalog.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.NamespaceContext;
-
-public class NamespaceContextImpl implements NamespaceContext {
-    private NamespaceContext parent;
-    private Map<String, String> map = new HashMap<String, String>();
-
-    /**
-     * @param parent
-     */
-    public NamespaceContextImpl(NamespaceContext parent, Map<String, String> map) {
-        super();
-        this.parent = parent;
-        if (parent == null) {
-            this.map.put("xml", "http://www.w3.org/XML/1998/namespace");
-            this.map.put("xmlns", "http://www.w3.org/2000/xmlns/");
-        }
-        if (map != null) {
-            this.map.putAll(map);
-        }
-    }
-
-    public String getNamespaceURI(String prefix) {
-        if (prefix == null) {
-            throw new IllegalArgumentException("Prefix is null");
-        }
-
-        String ns = (String)map.get(prefix);
-        if (ns != null) {
-            return ns;
-        }
-        if (parent != null) {
-            return parent.getNamespaceURI(prefix);
-        }
-        return null;
-    }
-
-    public String getPrefix(String nsURI) {
-        if (nsURI == null)
-            throw new IllegalArgumentException("Namespace is null");
-        for (Iterator<Map.Entry<String, String>> i = map.entrySet().iterator(); i.hasNext();) {
-            Map.Entry<String, String> entry = i.next();
-            if (entry.getValue().equals(nsURI)) {
-                return entry.getKey();
-            }
-        }
-        if (parent != null) {
-            return parent.getPrefix(nsURI);
-        }
-        return null;
-    }
-
-    public Iterator getPrefixes(String nsURI) {
-        List<String> prefixList = new ArrayList<String>();
-        for (Iterator<Map.Entry<String, String>> i = map.entrySet().iterator(); i.hasNext();) {
-            Map.Entry<String, String> entry = i.next();
-            if (entry.getValue().equals(nsURI)) {
-                prefixList.add(entry.getKey());
-            }
-        }
-        final Iterator currentIterator = prefixList.iterator();
-        final Iterator parentIterator = parent != null ? null : parent.getPrefixes(nsURI);
-        return new Iterator() {
-
-            public boolean hasNext() {
-                return currentIterator.hasNext() || (parentIterator != null && parentIterator.hasNext());
-            }
-
-            public Object next() {
-                if (!hasNext()) {
-                    throw new IllegalStateException("End of iterator has reached");
-                }
-                return currentIterator.hasNext() ? currentIterator.next() : parentIterator.next();
-            }
-
-            public void remove() {
-                throw new UnsupportedOperationException();
-            }
-
-        };
-
-    }
-
-    public void register(String prefix, String ns) {
-        map.put(prefix, ns);
-    }
-
-    public NamespaceContext getParent() {
-        return parent;
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer(map.toString());
-        if (parent != null) {
-            sb.append("\nParent: ");
-            sb.append(parent);
-        }
-        return sb.toString();
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/XPathHelper.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/XPathHelper.java
deleted file mode 100644
index 850ba7d8ae..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/XPathHelper.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 catalog.util;
-
-import java.util.Map;
-
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XPathHelper {
-
-    public static Node selectNode(String xpath, Node root, Map<String, String> namespaces)
-        throws XPathExpressionException {
-        XPath path = XPathFactory.newInstance().newXPath();
-        NamespaceContextImpl context = new NamespaceContextImpl(null, namespaces);
-        path.setNamespaceContext(context);
-        XPathExpression exp = path.compile(xpath);
-        return (Node)exp.evaluate(root, XPathConstants.NODE);
-    }
-
-    public static NodeList selectNodes(String xpath, Node root, Map<String, String> namespaces)
-        throws XPathExpressionException {
-        XPath path = XPathFactory.newInstance().newXPath();
-        NamespaceContextImpl context = new NamespaceContextImpl(null, namespaces);
-        path.setNamespaceContext(context);
-        XPathExpression exp = path.compile(xpath);
-        return (NodeList)exp.evaluate(root, XPathConstants.NODESET);
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/catalog.composite b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/catalog.composite
deleted file mode 100644
index d8105b7465..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/catalog.composite
+++ /dev/null
@@ -1,55 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://catalog" name="Shopping">

-

-	<component name="EBayCatalogService">

-		<implementation.java class="catalog.ebay.EBayCatalogServiceImpl" />

-	</component>

-

-    <component name="AmazonCatalogService">

-        <implementation.java class="catalog.amazon.AmazonCatalogServiceImpl" />

-        <property name="AWSAccessKeyId">[Your Amazon Web Service Access Key Id]</property>

-    </component>

-

-	<reference name="eBayFindItems"

-		promote="EBayCatalogService/eBayFindItems">

-		<binding.ws

-			wsdlElement="urn:ebay:apis:eBLBaseComponents#wsdl.binding(ShoppingBinding)"

-			uri="http://open.api.ebay.com/shopping?version=535&amp;appid=[Your eBay application id]&amp;callname=FindItems&amp;requestencoding=SOAP" />

-	</reference>

-

-	<reference name="eBayGetUserProfile"

-		promote="EBayCatalogService/eBayGetUserProfile">

-		<binding.ws

-			wsdlElement="urn:ebay:apis:eBLBaseComponents#wsdl.binding(ShoppingBinding)"

-			uri="http://open.api.ebay.com/shopping?version=535&amp;appid=[Your eBay application id]&amp;callname=GetUserProfile&amp;requestencoding=SOAP" />

-	</reference>

-

-	<reference name="amazonFindItems"

-		promote="AmazonCatalogService/amazonFindItems">

-		<binding.ws

-			wsdlElement="http://webservices.amazon.com/AWSECommerceService/2007-09-21#wsdl.binding(AWSECommerceServiceBinding)"

-			uri="http://soap.amazon.com/onca/soap?Service=AWSECommerceService&amp;Operation=ItemSearch" />

-	</reference>

-

-

-</composite>

diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/AWSECommerceService.wsdl b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/AWSECommerceService.wsdl
deleted file mode 100644
index 55514fff7a..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/AWSECommerceService.wsdl
+++ /dev/null
@@ -1,3244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://webservices.amazon.com/AWSECommerceService/2007-09-21" targetNamespace="http://webservices.amazon.com/AWSECommerceService/2007-09-21">
-    <types>
-		<xs:schema targetNamespace="http://webservices.amazon.com/AWSECommerceService/2007-09-21" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://webservices.amazon.com/AWSECommerceService/2007-09-21" elementFormDefault="qualified">
-	
-	        <xs:element name="Bin">
-	                <xs:complexType>
-	                        <xs:sequence>
-	                                <xs:element name="BinName" type="xs:string" />
-	                                <xs:element name="BinItemCount" type="xs:positiveInteger" />
-	                                <xs:element name="BinParameter" minOccurs="0" maxOccurs="unbounded">
-		                              <xs:complexType>
-	                                          <xs:sequence>
-	                                                 <xs:element name="Name" type="xs:string" />
-	                                                 <xs:element name="Value" type="xs:string" />
-	                                          </xs:sequence>
-	                                      </xs:complexType>
-	                                </xs:element>
-	                        </xs:sequence>
-	                </xs:complexType>
-	        </xs:element>
-	        <xs:element name="SearchBinSet">
-	                <xs:complexType>
-	                        <xs:sequence>
-	                               <xs:element ref="tns:Bin" minOccurs="0" maxOccurs="unbounded" />
-	                        </xs:sequence>
-	                        <xs:attribute name="NarrowBy" type="xs:string" use="required" />
-	                </xs:complexType>
-	        </xs:element>
-		<xs:element name="SearchBinSets">
-	                <xs:complexType>
-	                        <xs:sequence>
-	                                <xs:element ref="tns:SearchBinSet" minOccurs="0" maxOccurs="unbounded" />
-	                        </xs:sequence>
-	                </xs:complexType>
-	        </xs:element>
-		<xs:element name="Help">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            			<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/> 
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:HelpRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:HelpRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="HelpRequest">
-			<xs:sequence>
-				<xs:element name="About" type="xs:string" minOccurs="0" maxOccurs="1"/>
-				<xs:element name="HelpType" minOccurs="0">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="Operation"/>
-							<xs:enumeration value="ResponseGroup"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="ItemSearch">
-			<xs:complexType>
-				<xs:sequence>
-	            			<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/> 
-					<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-	            			<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:ItemSearchRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:ItemSearchRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="ItemSearchRequest">
-			<xs:sequence>
-				<xs:element name="Actor" type="xs:string" minOccurs="0"/>
-	      			<xs:element name="Artist" type="xs:string" minOccurs="0"/>
-				<xs:element name="Availability" minOccurs="0">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="Available"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element ref="tns:AudienceRating" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="Author" type="xs:string" minOccurs="0"/>
-				<xs:element name="Brand" type="xs:string" minOccurs="0"/>
-				<xs:element name="BrowseNode" type="xs:string" minOccurs="0"/>
-				<xs:element name="City" type="xs:string" minOccurs="0"/>
-				<xs:element name="Composer" type="xs:string" minOccurs="0"/>
-				<xs:element ref="tns:Condition" minOccurs="0"/>
-				<xs:element name="Conductor" type="xs:string" minOccurs="0"/>
-				<xs:element name="Count" type="xs:positiveInteger" minOccurs="0">
-					<xs:annotation>
-						<xs:appinfo>
-							<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-								<aws-se:excludeFrom>public</aws-se:excludeFrom>
-								<aws-se:excludeFrom>partner</aws-se:excludeFrom>
-							</aws-se:restricted>
-						</xs:appinfo>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="Cuisine" type="xs:string" minOccurs="0"/>
-				<xs:element ref="tns:DeliveryMethod" minOccurs="0"/>
-				<xs:element name="Director" type="xs:string" minOccurs="0"/>
-	                        <xs:element name="FutureLaunchDate" type="xs:string" minOccurs="0"/>
-	                        <xs:element name="ISPUPostalCode" type="xs:string" minOccurs="0"/>
-				<xs:element name="ItemPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="Keywords" type="xs:string" minOccurs="0"/>
-				<xs:element name="Manufacturer" type="xs:string" minOccurs="0"/>
-				<xs:element name="MaximumPrice" type="xs:nonNegativeInteger" minOccurs="0"/>
-				<xs:element name="MerchantId" type="xs:string" minOccurs="0"/>
-				<xs:element name="MinimumPrice" type="xs:nonNegativeInteger" minOccurs="0"/>
-				<xs:element name="MusicLabel" type="xs:string" minOccurs="0"/>
-				<xs:element name="Neighborhood" type="xs:string" minOccurs="0"/>
-				<xs:element name="Orchestra" type="xs:string" minOccurs="0"/>
-				<xs:element name="PostalCode" type="xs:string" minOccurs="0"/>
-				<xs:element name="Power" type="xs:string" minOccurs="0"/>
-				<xs:element name="Publisher" type="xs:string" minOccurs="0"/>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="ReviewSort" type="xs:string" minOccurs="0"/>
-				<xs:element name="SearchIndex" type="xs:string" minOccurs="0"/>
-				<xs:element name="Sort" type="xs:string" minOccurs="0"/>
-				<xs:element name="State" type="xs:string" minOccurs="0"/>
-				<xs:element name="TagPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="TagsPerPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="TagSort" type="xs:string" minOccurs="0"/>
-				<xs:element name="TextStream" type="xs:string" minOccurs="0"/>
-				<xs:element name="Title" type="xs:string" minOccurs="0"/>
-				<xs:element name="ReleaseDate" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="ItemLookup">
-			<xs:complexType>
-				<xs:sequence>
-	            			<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            			<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:ItemLookupRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:ItemLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="ItemLookupRequest">
-			<xs:sequence>
-				<xs:element ref="tns:Condition" minOccurs="0"/>
-				<xs:element ref="tns:DeliveryMethod" minOccurs="0"/>
-	                        <xs:element name="FutureLaunchDate" type="xs:string" minOccurs="0"/>
-	                        <xs:element name="IdType" minOccurs="0">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="ASIN"/>
-							<xs:enumeration value="UPC"/>
-							<xs:enumeration value="SKU"/>
-							<xs:enumeration value="EAN"/>
-							<xs:enumeration value="ISBN"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="ISPUPostalCode" type="xs:string" minOccurs="0"/>
-				<xs:element name="MerchantId" type="xs:string" minOccurs="0"/>
-				<xs:element name="OfferPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="ItemId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="ReviewPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="ReviewSort" type="xs:string" minOccurs="0"/>
-				<xs:element name="SearchIndex" type="xs:string" minOccurs="0"/>
-				<xs:element name="SearchInsideKeywords" type="xs:string" minOccurs="0">
-					<xs:annotation>
-						<xs:appinfo>
-							<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-								<aws-se:excludeFrom>public</aws-se:excludeFrom>
-								<aws-se:excludeFrom>partner</aws-se:excludeFrom>
-							</aws-se:restricted>
-						</xs:appinfo>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="TagPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="TagsPerPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="TagSort" type="xs:string" minOccurs="0"/>
-				<xs:element name="VariationPage" type="tns:positiveIntegerOrAll" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="ListSearch">
-			<xs:complexType>
-				<xs:sequence>
-	            			<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            			<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:ListSearchRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:ListSearchRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="ListSearchRequest">
-			<xs:sequence>
-				<xs:element name="City" type="xs:string" minOccurs="0"/>
-				<xs:element name="Email" type="xs:string" minOccurs="0"/>
-				<xs:element name="FirstName" type="xs:string" minOccurs="0"/>
-				<xs:element name="LastName" type="xs:string" minOccurs="0"/>
-				<xs:element name="ListPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="ListType">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="WishList"/>
-							<xs:enumeration value="WeddingRegistry"/>
-							<xs:enumeration value="BabyRegistry"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="Name" type="xs:string" minOccurs="0"/>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="State" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="ListLookup">
-			<xs:complexType>
-				<xs:sequence>
-	            			<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            			<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:ListLookupRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:ListLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="ListLookupRequest">
-			<xs:sequence>
-				<xs:element ref="tns:Condition" minOccurs="0"/>
-				<xs:element ref="tns:DeliveryMethod" minOccurs="0"/>
-				<xs:element name="ISPUPostalCode" type="xs:string" minOccurs="0"/>
-				<xs:element name="ListId" type="xs:string" minOccurs="0"/>
-				<xs:element name="ListType" minOccurs="0">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="WishList"/>
-							<xs:enumeration value="Listmania"/>
-							<xs:enumeration value="WeddingRegistry"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="MerchantId" type="xs:string" minOccurs="0"/>
-				<xs:element name="ProductGroup" type="xs:string" minOccurs="0"/>
-				<xs:element name="ProductPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="ReviewSort" type="xs:string" minOccurs="0"/>
-				<xs:element name="Sort" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="CustomerContentSearch">
-			<xs:complexType>
-				<xs:sequence>
-	            <xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            <xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:CustomerContentSearchRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:CustomerContentSearchRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="CustomerContentSearchRequest">
-			<xs:sequence>
-				<xs:element name="CustomerPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="Email" type="xs:string" minOccurs="0"/>
-				<xs:element name="Name" type="xs:string" minOccurs="0"/>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="CustomerContentLookup">
-			<xs:complexType>
-				<xs:sequence>
-	            <xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            <xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:CustomerContentLookupRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:CustomerContentLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="CustomerContentLookupRequest">
-			<xs:sequence>
-				<xs:element name="CustomerId" type="xs:string" minOccurs="0"/>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="ReviewPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="TagPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="TagsPerPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="TagSort" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="SimilarityLookup">
-			<xs:complexType>
-				<xs:sequence>
-	            <xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            <xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:SimilarityLookupRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:SimilarityLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="SimilarityLookupRequest">
-			<xs:sequence>
-				<xs:element ref="tns:Condition" minOccurs="0"/>
-				<xs:element ref="tns:DeliveryMethod" minOccurs="0"/>
-				<xs:element name="ItemId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="ISPUPostalCode" type="xs:string" minOccurs="0"/>
-				<xs:element name="MerchantId" type="xs:string" minOccurs="0"/>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="ReviewSort" type="xs:string" minOccurs="0"/>
-				<xs:element name="SimilarityType" minOccurs="0">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="Intersection"/>
-							<xs:enumeration value="Random"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="SellerLookup">
-			<xs:complexType>
-				<xs:sequence>
-	            <xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            <xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:SellerLookupRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:SellerLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="SellerLookupRequest">
-			<xs:sequence>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="SellerId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="FeedbackPage" type="xs:positiveInteger" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="CartGet">
-			<xs:complexType>
-				<xs:sequence>
-	            <xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            <xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:CartGetRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:CartGetRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="CartGetRequest">
-			<xs:sequence>
-				<xs:element name="CartId" type="xs:string" minOccurs="0"/>
-				<xs:element name="HMAC" type="xs:string" minOccurs="0"/>
-				<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="CartAdd">
-			<xs:complexType>
-				<xs:sequence>
-	            <xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            <xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/> 
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:CartAddRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:CartAddRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="CartAddRequest">
-			<xs:sequence>
-				<xs:element name="CartId" type="xs:string" minOccurs="0"/>
-				<xs:element name="HMAC" type="xs:string" minOccurs="0"/>
-				<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>
-				<xs:element name="Items" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="Item" minOccurs="0" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-										<xs:element name="OfferListingId" type="xs:string" minOccurs="0"/>
-										<xs:element name="Quantity" type="xs:positiveInteger" minOccurs="0"/>
-										<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-										<xs:element name="ListItemId" type="xs:string" minOccurs="0"/>
-										<xs:element name="MetaData" minOccurs="0" maxOccurs="unbounded">
-											<xs:complexType>
-												<xs:sequence>
-													<xs:element name="Key" type="xs:string" minOccurs="0"/>
-													<xs:element name="Value" type="xs:string" minOccurs="0"/>
-												</xs:sequence>
-											</xs:complexType>
-										</xs:element>
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="CartCreate">
-			<xs:complexType>
-				<xs:sequence>
-	            <xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            <xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:CartCreateRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:CartCreateRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="CartCreateRequest">
-			<xs:sequence>
-				<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>
-				<xs:element name="Items" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="Item" minOccurs="0" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-										<xs:element name="OfferListingId" type="xs:string" minOccurs="0"/>
-										<xs:element name="Quantity" type="xs:positiveInteger" minOccurs="0"/>
-										<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-										<xs:element name="ListItemId" type="xs:string" minOccurs="0"/>
-										<xs:element name="MetaData" minOccurs="0" maxOccurs="unbounded">
-											<xs:complexType>
-												<xs:sequence>
-													<xs:element name="Key" type="xs:string" minOccurs="0"/>
-													<xs:element name="Value" type="xs:string" minOccurs="0"/>
-												</xs:sequence>
-											</xs:complexType>
-										</xs:element>
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="CartModify">
-			<xs:complexType>
-				<xs:sequence>
-	            			<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            			<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:CartModifyRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:CartModifyRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="CartModifyRequest">
-			<xs:sequence>
-				<xs:element name="CartId" type="xs:string" minOccurs="0"/>
-				<xs:element name="HMAC" type="xs:string" minOccurs="0"/>
-				<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>
-				<xs:element name="Items" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="Item" minOccurs="0" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element name="Action" minOccurs="0">
-											<xs:simpleType>
-												<xs:restriction base="xs:string">
-													<xs:enumeration value="MoveToCart"/>
-													<xs:enumeration value="SaveForLater"/>
-												</xs:restriction>
-											</xs:simpleType>
-										</xs:element>
-										<xs:element name="CartItemId" type="xs:string" minOccurs="0"/>
-										<xs:element name="Quantity" type="xs:nonNegativeInteger" minOccurs="0"/>
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="CartClear">
-			<xs:complexType>
-				<xs:sequence>
-	            			<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            			<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:CartClearRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:CartClearRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="CartClearRequest">
-			<xs:sequence>
-				<xs:element name="CartId" type="xs:string" minOccurs="0"/>
-				<xs:element name="HMAC" type="xs:string" minOccurs="0"/>
-				<xs:element name="MergeCart" type="xs:string" minOccurs="0"/>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="TransactionLookup">
-			<xs:complexType>
-				<xs:sequence>
-	            			<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            			<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:TransactionLookupRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:TransactionLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="TransactionLookupRequest">
-			<xs:sequence>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="TransactionId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="SellerListingSearch">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-					<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:SellerListingSearchRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:SellerListingSearchRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="SellerListingSearchRequest">
-			<xs:sequence>
-				<xs:element name="Keywords" type="xs:string" minOccurs="0"/>
-				<xs:element name="ListingPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="OfferStatus" minOccurs="0">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="Open"/>
-							<xs:enumeration value="Closed"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="SellerId" type="xs:string" minOccurs="1"/>
-				<xs:element name="Sort" type="xs:string" minOccurs="0"/>
-				<xs:element name="Title" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="SellerListingLookup">
-			<xs:complexType>
-				<xs:sequence>
-	            			<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            			<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:SellerListingLookupRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:SellerListingLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="TagLookup">
-			<xs:complexType>
-				<xs:sequence>
-	            			<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-	            			<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:TagLookupRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:TagLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="SellerListingLookupRequest">
-			<xs:sequence>
-				<xs:element name="Id" type="xs:string"/>
-	                        <xs:element name="SellerId" type="xs:string" minOccurs="0"/>
-				<xs:element name="IdType">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="Exchange"/>
-							<xs:enumeration value="Listing"/>
-	                                                <xs:enumeration value="ASIN"/>
-	                                                <xs:enumeration value="SKU"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:complexType name="TagLookupRequest">
-			<xs:sequence>
-				<xs:element name="TagName" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="CustomerId" type="xs:string" minOccurs="0"/>
-				<xs:element name="TagPage" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="Count" type="xs:positiveInteger" minOccurs="0"/>
-				<xs:element name="TagSort" type="xs:string" minOccurs="0"/>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="BrowseNodeLookup">
-			<xs:complexType>
-				<xs:sequence>
-		        	    	<xs:element name="MarketplaceDomain" type="xs:string" minOccurs="0"/>
-					<xs:element name="AWSAccessKeyId" type="xs:string" minOccurs="0"/>  
-					<xs:element name="SubscriptionId" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssociateTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="Validate" type="xs:string" minOccurs="0"/>
-					<xs:element name="XMLEscaping" type="xs:string" minOccurs="0"/>
-					<xs:element name="Shared" type="tns:BrowseNodeLookupRequest" minOccurs="0"/>
-					<xs:element name="Request" type="tns:BrowseNodeLookupRequest" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="BrowseNodeLookupRequest">
-			<xs:sequence>
-				<xs:element name="BrowseNodeId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="ResponseGroup" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="Condition">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="All"/>
-					<xs:enumeration value="New"/>
-					<xs:enumeration value="Used"/>
-					<xs:enumeration value="Collectible"/>
-					<xs:enumeration value="Refurbished"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:element>
-		<xs:element name="DeliveryMethod">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="Ship"/>
-					<xs:enumeration value="ISPU"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:element>
-		<xs:element name="AudienceRating">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="G"/>
-					<xs:enumeration value="PG"/>
-					<xs:enumeration value="PG-13"/>
-					<xs:enumeration value="R"/>
-					<xs:enumeration value="NC-17"/>
-					<xs:enumeration value="NR"/>
-					<xs:enumeration value="Unrated"/>
-					<xs:enumeration value="6"/>
-					<xs:enumeration value="12"/>
-					<xs:enumeration value="16"/>
-					<xs:enumeration value="18"/>
-					<xs:enumeration value="FamilyViewing"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:element>
-		<xs:element name="MultiOperation">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Help" minOccurs="0"/>
-					<xs:element ref="tns:ItemSearch" minOccurs="0"/>
-					<xs:element ref="tns:ItemLookup" minOccurs="0"/>
-					<xs:element ref="tns:ListSearch" minOccurs="0"/>
-					<xs:element ref="tns:ListLookup" minOccurs="0"/>
-					<xs:element ref="tns:CustomerContentSearch" minOccurs="0"/>
-					<xs:element ref="tns:CustomerContentLookup" minOccurs="0"/>
-					<xs:element ref="tns:SimilarityLookup" minOccurs="0"/>
-					<xs:element ref="tns:SellerLookup" minOccurs="0"/>
-					<xs:element ref="tns:CartGet" minOccurs="0"/>
-					<xs:element ref="tns:CartAdd" minOccurs="0"/>
-					<xs:element ref="tns:CartCreate" minOccurs="0"/>
-					<xs:element ref="tns:CartModify" minOccurs="0"/>
-					<xs:element ref="tns:CartClear" minOccurs="0"/>
-					<xs:element ref="tns:TransactionLookup" minOccurs="0"/>
-					<xs:element ref="tns:SellerListingSearch" minOccurs="0"/>
-					<xs:element ref="tns:SellerListingLookup" minOccurs="0"/>
-					<xs:element ref="tns:TagLookup" minOccurs="0"/>
-					<xs:element ref="tns:BrowseNodeLookup" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="HelpResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Information" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="ItemSearchResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Items" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="ItemLookupResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Items" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="ListSearchResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Lists" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="ListLookupResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Lists" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="CustomerContentSearchResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Customers" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="CustomerContentLookupResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Customers" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="SimilarityLookupResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Items" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="SellerLookupResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Sellers" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="CartGetResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="CartAddResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="CartCreateResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="CartModifyResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="CartClearResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Cart" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="TransactionLookupResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Transactions" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="SellerListingSearchResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:SellerListings" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="SellerListingLookupResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:SellerListings" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="TagLookupResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:Tags" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="BrowseNodeLookupResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:BrowseNodes" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="MultiOperationResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:OperationRequest" minOccurs="0"/>
-					<xs:element ref="tns:HelpResponse" minOccurs="0"/>
-					<xs:element ref="tns:ItemSearchResponse" minOccurs="0"/>
-					<xs:element ref="tns:ItemLookupResponse" minOccurs="0"/>
-					<xs:element ref="tns:ListSearchResponse" minOccurs="0"/>
-					<xs:element ref="tns:ListLookupResponse" minOccurs="0"/>
-					<xs:element ref="tns:CustomerContentSearchResponse" minOccurs="0"/>
-					<xs:element ref="tns:CustomerContentLookupResponse" minOccurs="0"/>
-					<xs:element ref="tns:SimilarityLookupResponse" minOccurs="0"/>
-					<xs:element ref="tns:SellerLookupResponse" minOccurs="0"/>
-					<xs:element ref="tns:CartGetResponse" minOccurs="0"/>
-					<xs:element ref="tns:CartAddResponse" minOccurs="0"/>
-					<xs:element ref="tns:CartCreateResponse" minOccurs="0"/>
-					<xs:element ref="tns:CartModifyResponse" minOccurs="0"/>
-					<xs:element ref="tns:CartClearResponse" minOccurs="0"/>
-					<xs:element ref="tns:TransactionLookupResponse" minOccurs="0"/>
-					<xs:element ref="tns:SellerListingSearchResponse" minOccurs="0"/>
-					<xs:element ref="tns:SellerListingLookupResponse" minOccurs="0"/>
-					<xs:element ref="tns:TagLookupResponse" minOccurs="0"/>
-					<xs:element ref="tns:BrowseNodeLookupResponse" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="OperationRequest">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:HTTPHeaders" minOccurs="0"/>
-					<xs:element name="RequestId" type="xs:string" minOccurs="0"/>
-					<xs:element ref="tns:Arguments" minOccurs="0"/>
-					<xs:element ref="tns:Errors" minOccurs="0"/>
-					<xs:element name="RequestProcessingTime" type="xs:float" minOccurs="0" maxOccurs="1"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Request">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="IsValid" type="xs:string" minOccurs="0"/>
-					<xs:element name="HelpRequest" type="tns:HelpRequest" minOccurs="0"/>
-					<xs:element name="BrowseNodeLookupRequest" type="tns:BrowseNodeLookupRequest" minOccurs="0"/>
-					<xs:element name="ItemSearchRequest" type="tns:ItemSearchRequest" minOccurs="0"/>
-					<xs:element name="ItemLookupRequest" type="tns:ItemLookupRequest" minOccurs="0"/>
-					<xs:element name="ListSearchRequest" type="tns:ListSearchRequest" minOccurs="0"/>
-					<xs:element name="ListLookupRequest" type="tns:ListLookupRequest" minOccurs="0"/>
-					<xs:element name="CustomerContentSearchRequest" type="tns:CustomerContentSearchRequest" minOccurs="0"/>
-					<xs:element name="CustomerContentLookupRequest" type="tns:CustomerContentLookupRequest" minOccurs="0"/>
-					<xs:element name="SimilarityLookupRequest" type="tns:SimilarityLookupRequest" minOccurs="0"/>
-					<xs:element name="CartGetRequest" type="tns:CartGetRequest" minOccurs="0"/>
-					<xs:element name="CartAddRequest" type="tns:CartAddRequest" minOccurs="0"/>
-					<xs:element name="CartCreateRequest" type="tns:CartCreateRequest" minOccurs="0"/>
-					<xs:element name="CartModifyRequest" type="tns:CartModifyRequest" minOccurs="0"/>
-					<xs:element name="CartClearRequest" type="tns:CartClearRequest" minOccurs="0"/>
-					<xs:element name="TransactionLookupRequest" type="tns:TransactionLookupRequest" minOccurs="0"/>
-					<xs:element name="SellerListingSearchRequest" type="tns:SellerListingSearchRequest" minOccurs="0"/>
-					<xs:element name="SellerListingLookupRequest" type="tns:SellerListingLookupRequest" minOccurs="0"/>
-					<xs:element name="SellerLookupRequest" type="tns:SellerLookupRequest" minOccurs="0"/>
-					<xs:element name="TagLookupRequest" type="tns:TagLookupRequest" minOccurs="0"/>
-					<xs:element ref="tns:Errors" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Arguments">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Argument" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:attribute name="Name" type="xs:string" use="required"/>
-							<xs:attribute name="Value" type="xs:string"/>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="HTTPHeaders">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Header" minOccurs="0" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:attribute name="Name" type="xs:string" use="required"/>
-							<xs:attribute name="Value" type="xs:string" use="required"/>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Errors">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Error" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Code" type="xs:string"/>
-								<xs:element name="Message" type="xs:string"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Information">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Request" minOccurs="0"/>
-					<xs:element ref="tns:OperationInformation" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element ref="tns:ResponseGroupInformation" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Items">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Request" minOccurs="0"/>
-					<xs:element ref="tns:CorrectedQuery" minOccurs="0"/>
-					<xs:element name="Qid" type="xs:string" minOccurs="0"/>
-					<xs:element name="EngineQuery" type="xs:string" minOccurs="0"/>
-					<xs:element name="TotalResults" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element ref="tns:SearchResultsMap" minOccurs="0"/>
-					<xs:element ref="tns:Item" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element ref="tns:SearchBinSets" minOccurs="0" />
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-	        <xs:element name="CorrectedQuery">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Keywords" type="xs:string" minOccurs="0"/>
-					<xs:element name="Message" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Lists">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Request" minOccurs="0"/>
-					<xs:element name="TotalResults" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element ref="tns:List" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Customers">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Request" minOccurs="0"/>
-					<xs:element name="TotalResults" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element ref="tns:Customer" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Cart">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Request" minOccurs="0"/>
-					<xs:element name="CartId" type="xs:string"/>
-					<xs:element name="HMAC" type="xs:string"/>
-				        <xs:element name="URLEncodedHMAC" type="xs:string"/>
-					<xs:element name="PurchaseURL" type="xs:string" minOccurs="0"/>
-				        <xs:element name="SubTotal" type="tns:Price" minOccurs="0"/>
-					<xs:element ref="tns:CartItems" minOccurs="0"/>
-					<xs:element ref="tns:SavedForLaterItems" minOccurs="0"/>
-					<xs:element ref="tns:SimilarProducts" minOccurs="0"/>
-					<xs:element ref="tns:TopSellers" minOccurs="0"/>
-					<xs:element ref="tns:NewReleases" minOccurs="0"/>
-					<xs:element ref="tns:SimilarViewedProducts" minOccurs="0"/>
-					<xs:element ref="tns:OtherCategoriesSimilarProducts" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Transactions">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Request" minOccurs="0"/>
-					<xs:element name="TotalResults" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element ref="tns:Transaction" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Sellers">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Request" minOccurs="0"/>
-					<xs:element name="TotalResults" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element ref="tns:Seller" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="SellerListings">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Request" minOccurs="0"/>
-					<xs:element name="TotalResults" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element ref="tns:SellerListing" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="OperationInformation">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Name" type="xs:string" minOccurs="0"/>
-					<xs:element name="Description" type="xs:string" minOccurs="0"/>
-					<xs:element name="RequiredParameters" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Parameter" type="xs:string" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="AvailableParameters" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Parameter" type="xs:string" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="DefaultResponseGroups" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="ResponseGroup" type="xs:string" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="AvailableResponseGroups" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="ResponseGroup" type="xs:string" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="ResponseGroupInformation">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Name" type="xs:string" minOccurs="0"/>
-					<xs:element name="CreationDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="ValidOperations" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Operation" type="xs:string" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Elements" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Element" type="xs:string" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="List">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="ListId" type="xs:string"/>
-					<xs:element name="ListURL" type="xs:string" minOccurs="0"/>
-					<xs:element name="RegistryNumber" type="xs:string" minOccurs="0"/>
-					<xs:element name="ListName" type="xs:string" minOccurs="0"/>
-					<xs:element name="ListType" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="WishList"/>
-								<xs:enumeration value="WeddingRegistry"/>
-								<xs:enumeration value="BabyRegistry"/>
-								<xs:enumeration value="Listmania"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="TotalItems" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="DateCreated" type="xs:string" minOccurs="0"/>
-					<xs:element name="OccasionDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="CustomerName" type="xs:string" minOccurs="0"/>
-					<xs:element name="PartnerName" type="xs:string" minOccurs="0"/>
-					<xs:element name="AdditionalName" type="xs:string" minOccurs="0"/>
-					<xs:element name="Comment" type="xs:string" minOccurs="0"/>
-					<xs:element name="Image" type="tns:Image" minOccurs="0"/>
-					<xs:element name="AverageRating" type="xs:decimal" minOccurs="0"/>
-					<xs:element name="TotalVotes" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalTimesRead" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element ref="tns:Tags" minOccurs="0"/>
-					<xs:element ref="tns:ListItem" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="ListItem">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="ListItemId" type="xs:string" minOccurs="0"/>
-					<xs:element name="DateAdded" type="xs:string" minOccurs="0"/>
-					<xs:element name="Comment" type="xs:string" minOccurs="0"/>
-					<xs:element name="QuantityDesired" type="xs:string" minOccurs="0"/>
-					<xs:element name="QuantityReceived" type="xs:string" minOccurs="0"/>
-					<xs:element ref="tns:Item" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Customer">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="CustomerId" type="xs:string"/>
-					<xs:element name="Nickname" type="xs:string" minOccurs="0"/>
-					<xs:element name="Birthday" type="xs:string" minOccurs="0"/>
-					<xs:element name="WishListId" type="xs:string" minOccurs="0"/>
-					<xs:element name="Location" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="UserDefinedLocation" type="xs:string" minOccurs="0"/>
-								<xs:element name="City" type="xs:string" minOccurs="0"/>
-								<xs:element name="State" type="xs:string" minOccurs="0"/>
-								<xs:element name="Country" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element ref="tns:CustomerReviews" maxOccurs="unbounded" minOccurs="0"/>
-					<xs:element ref="tns:Tags" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="SearchResultsMap">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="SearchIndex" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="IndexName" type="xs:string"/>
-								<xs:element name="Results" type="xs:nonNegativeInteger" minOccurs="0"/>
-								<xs:element name="Pages" type="xs:nonNegativeInteger" minOccurs="0"/>
-								<xs:element ref="tns:CorrectedQuery" minOccurs="0"/>
-								<xs:element name="RelevanceRank" type="xs:positiveInteger"/>
-								<xs:element name="ASIN" type="xs:string" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Item">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="ASIN" type="xs:string"/>
-	                                <xs:element name="ParentASIN" type="xs:string" minOccurs="0"/>
-					<xs:element ref="tns:Errors" minOccurs="0"/>
-					<xs:element name="DetailPageURL" type="xs:string" minOccurs="0"/>
-					<xs:element name="SalesRank" type="xs:string" minOccurs="0"/>
-					<xs:element name="SmallImage" type="tns:Image" minOccurs="0"/>
-					<xs:element name="MediumImage" type="tns:Image" minOccurs="0"/>
-					<xs:element name="LargeImage" type="tns:Image" minOccurs="0"/>
-					<xs:element name="ImageSets" minOccurs="0" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="MerchantId" type="xs:string" minOccurs="0" maxOccurs="1"/>
-								<xs:element ref="tns:ImageSet" minOccurs="0" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element ref="tns:ItemAttributes" minOccurs="0"/>
-					<xs:element ref="tns:MerchantItemAttributes" minOccurs="0"/>
-					<xs:element ref="tns:Collections" minOccurs="0"/>
-					<xs:element name="Subjects" minOccurs="0" maxOccurs="1">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Subject" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element ref="tns:OfferSummary" minOccurs="0"/>
-					<xs:element ref="tns:Offers" minOccurs="0"/>
-					<xs:element ref="tns:VariationSummary" minOccurs="0"/>
-					<xs:element ref="tns:Variations" minOccurs="0"/>
-					<xs:element ref="tns:CustomerReviews" minOccurs="0"/>
-					<xs:element ref="tns:EditorialReviews" minOccurs="0"/>
-					<xs:element ref="tns:SimilarProducts" minOccurs="0"/>
-					<xs:element ref="tns:Accessories" minOccurs="0"/>
-					<xs:element ref="tns:Tracks" minOccurs="0"/>
-					<xs:element ref="tns:BrowseNodes" minOccurs="0"/>
-					<xs:element ref="tns:Tags" minOccurs="0"/>
-					<xs:element ref="tns:ListmaniaLists" minOccurs="0"/>
-					<xs:element ref="tns:SearchInside" minOccurs="0"/>
-					<xs:element name="AlternateVersions" minOccurs="0" maxOccurs="1">
-	                                  <xs:complexType>
-	                                    <xs:sequence>
-	                                      <xs:element name="AlternateVersion" minOccurs="0" maxOccurs="unbounded">
-	                                        <xs:complexType>
-	                                          <xs:sequence>
-	                                            <xs:element name="ASIN" type="xs:string"/>
-	                                            <xs:element name="Title" type="xs:string" minOccurs="0"/>
-	                                            <xs:element name="Binding" type="xs:string" minOccurs="0"/>
-	                                          </xs:sequence>
-	                                        </xs:complexType>
-	                                      </xs:element>
-	                                    </xs:sequence>
-	                                  </xs:complexType>
-	                                </xs:element>
-					</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Tags">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Request" minOccurs="0"/>
-					<xs:element name="DistinctTags" type="xs:string" minOccurs="0"/>
-					<xs:element name="DistinctItems" type="xs:string" minOccurs="0"/>
-					<xs:element name="DistinctUsers" type="xs:string" minOccurs="0"/>
-					<xs:element name="TotalUsages" type="xs:string" minOccurs="0"/>
-					<xs:element name="FirstTagging" type="tns:Tagging" minOccurs="0"/>
-					<xs:element name="LastTagging" type="tns:Tagging" minOccurs="0"/>
-					<xs:element ref="tns:Tag" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Tag">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Name" type="xs:string" minOccurs="0"/>
-					<xs:element name="TagType" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="Item"/>
-								<xs:enumeration value="ListmaniaList"/>
-								<xs:enumeration value="Guide"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="DistinctItems" type="xs:string" minOccurs="0"/>
-					<xs:element name="DistinctUsers" type="xs:string" minOccurs="0"/>
-					<xs:element name="TotalUsages" type="xs:string" minOccurs="0"/>
-					<xs:element name="FirstTagging" type="tns:Tagging" minOccurs="0"/>
-					<xs:element name="LastTagging" type="tns:Tagging" minOccurs="0"/>
-					<xs:element ref="tns:TaggedItems" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element ref="tns:TaggedListmaniaLists" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element ref="tns:TaggedGuides" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="TaggedItems">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Item" minOccurs="0"/>
-					<xs:element name="DistinctUsers" type="xs:string" minOccurs="0"/>
-					<xs:element name="TotalUsages" type="xs:string" minOccurs="0"/>
-					<xs:element name="FirstTagging" type="tns:Tagging" minOccurs="0"/>
-					<xs:element name="LastTagging" type="tns:Tagging" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="TaggedListmaniaLists">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:List" minOccurs="0"/>
-					<xs:element name="DistinctUsers" type="xs:string" minOccurs="0"/>
-					<xs:element name="TotalUsages" type="xs:string" minOccurs="0"/>
-					<xs:element name="FirstTagging" type="tns:Tagging" minOccurs="0"/>
-					<xs:element name="LastTagging" type="tns:Tagging" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="TaggedGuides">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Guide" minOccurs="0"/>
-					<xs:element name="DistinctUsers" type="xs:string" minOccurs="0"/>
-					<xs:element name="TotalUsages" type="xs:string" minOccurs="0"/>
-					<xs:element name="FirstTagging" type="tns:Tagging" minOccurs="0"/>
-					<xs:element name="LastTagging" type="tns:Tagging" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Guide">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="GuideId" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="Tagging">
-			<xs:sequence>
-				<xs:element name="Name" type="xs:string" minOccurs="0"/>
-				<xs:element name="EntityId" type="xs:string" minOccurs="0"/>
-				<xs:element name="UserId" type="xs:string" minOccurs="0"/>
-				<xs:element name="Time" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="OfferSummary">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="LowestNewPrice" type="tns:Price" minOccurs="0"/>
-					<xs:element name="LowestUsedPrice" type="tns:Price" minOccurs="0"/>
-					<xs:element name="LowestCollectiblePrice" type="tns:Price" minOccurs="0"/>
-					<xs:element name="LowestRefurbishedPrice" type="tns:Price" minOccurs="0"/>
-					<xs:element name="TotalNew" type="xs:string" minOccurs="0"/>
-					<xs:element name="TotalUsed" type="xs:string" minOccurs="0"/>
-					<xs:element name="TotalCollectible" type="xs:string" minOccurs="0"/>
-					<xs:element name="TotalRefurbished" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Offers">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="TotalOffers" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalOfferPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element ref="tns:Offer" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Offer">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Merchant" minOccurs="0"/>
-					<xs:element ref="tns:Seller" minOccurs="0"/>
-					<xs:element ref="tns:OfferAttributes" minOccurs="0"/>
-					<xs:element ref="tns:OfferListing" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element ref="tns:LoyaltyPoints" minOccurs="0"/>
-					<xs:element ref="tns:Promotions" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="OfferAttributes">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Condition" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubCondition" type="xs:string" minOccurs="0"/>
-					<xs:element name="ConditionNote" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="WillShipExpedited" type="xs:boolean" minOccurs="0"/>
-	                                <xs:element name="WillShipInternational" type="xs:boolean" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Merchant">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="MerchantId" type="xs:string"/>
-					<xs:element name="Name" type="xs:string" minOccurs="0"/>
-					<xs:element name="GlancePage" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="AverageFeedbackRating" type="xs:decimal" minOccurs="0"/>
-	                                <xs:element name="TotalFeedback" type="xs:nonNegativeInteger" minOccurs="0"/>
-	                                <xs:element name="TotalFeedbackPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="OfferListing">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="OfferListingId" type="xs:string" minOccurs="0"/>
-					<xs:element name="ExchangeId" type="xs:string" minOccurs="0"/>
-					<xs:element name="Price" type="tns:Price" minOccurs="0"/>
-					<xs:element name="SalePrice" type="tns:Price" minOccurs="0"/>
-					<xs:element name="AmountSaved" type="tns:Price" minOccurs="0"/>
-					<xs:element name="PercentageSaved" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="Availability" type="xs:string" minOccurs="0"/>
-					<xs:element name="AvailabilityAttributes" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="AvailabilityType" type="xs:string" minOccurs="0"/>
-								<xs:element name="IsPreorder" type="xs:boolean" minOccurs="0"/>
-								<xs:element name="MinimumHours" type="xs:integer" minOccurs="0"/>
-								<xs:element name="MaximumHours" type="xs:integer" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Quantity" type="xs:integer" minOccurs="0"/>
-					<xs:element name="ISPUStoreAddress" type="tns:Address" minOccurs="0"/>
-					<xs:element name="ISPUStoreHours" type="xs:string" minOccurs="0"/>
-					<xs:element name="IsEligibleForSuperSaverShipping" type="xs:boolean" minOccurs="0"/>
-	                                <xs:element name="SalesRestriction" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="ShippingCharge" minOccurs="0" maxOccurs="unbounded">
-	                                	<xs:annotation>
-	                        			<xs:appinfo>
-	                                			<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-	                            					<aws-se:excludeFrom>public</aws-se:excludeFrom>
-	                            					<aws-se:excludeFrom>partner</aws-se:excludeFrom>
-	                            				</aws-se:restricted>
-	                        		        </xs:appinfo>
-	                                        </xs:annotation>
-	                    			<xs:complexType>
-	                        			<xs:sequence>
-	                                			<xs:element name="ShippingType" type="xs:string"/>
-	                                                        <xs:element name="IsRateTaxInclusive" type="xs:boolean"/>
-	                                                        <xs:element name="ShippingPrice" type="tns:Price"/>
-	                        			</xs:sequence>
-	                                        </xs:complexType>
-	                                </xs:element>
-	 			</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="LoyaltyPoints">
-	                <xs:complexType>
-	                        <xs:sequence>
-	                                <xs:element name="Points" type="xs:nonNegativeInteger" minOccurs="0"/>
-	                                <xs:element name="TypicalRedemptionValue" type="tns:Price" minOccurs="0"/>
-	                           </xs:sequence>
-	                </xs:complexType>
-		</xs:element>
-		<xs:element name="VariationSummary">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="LowestPrice" type="tns:Price" minOccurs="0"/>
-					<xs:element name="HighestPrice" type="tns:Price" minOccurs="0"/>
-					<xs:element name="LowestSalePrice" type="tns:Price" minOccurs="0"/>
-					<xs:element name="HighestSalePrice" type="tns:Price" minOccurs="0"/>
-					<xs:element name="SingleMerchantId" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Variations">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="TotalVariations" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalVariationPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-	                                <xs:element ref="tns:VariationDimensions" minOccurs="0"/>
-					<xs:element ref="tns:Item" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-	        <xs:element name="VariationDimensions">
-	                <xs:complexType>
-	                        <xs:sequence>
-	                                <xs:element name="VariationDimension" type="xs:string" maxOccurs="unbounded"/>
-	                        </xs:sequence>
-	                </xs:complexType>
-	        </xs:element>
-		<xs:element name="EditorialReviews">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:EditorialReview" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Collections">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Collection" minOccurs="0" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="CollectionSummary" minOccurs="0" maxOccurs="1">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="LowestListPrice" type="tns:Price" minOccurs="0" maxOccurs="1"/>
-											<xs:element name="HighestListPrice" type="tns:Price" minOccurs="0" maxOccurs="1"/>
-											<xs:element name="LowestSalePrice" type="tns:Price" minOccurs="0" maxOccurs="1"/>
-											<xs:element name="HighestSalePrice" type="tns:Price" minOccurs="0" maxOccurs="1"/>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="CollectionParent" minOccurs="0" maxOccurs="1">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="ASIN" type="xs:string" minOccurs="0" maxOccurs="1"/>
-											<xs:element name="Title" type="xs:string" minOccurs="0" maxOccurs="1"/>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="CollectionItem" minOccurs="0" maxOccurs="unbounded">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="ASIN" type="xs:string" minOccurs="0" maxOccurs="1"/>
-											<xs:element name="Title" type="xs:string" minOccurs="0" maxOccurs="1"/>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="EditorialReview">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Source" type="xs:string" minOccurs="0"/>
-					<xs:element name="Content" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="IsLinkSuppressed" type="xs:boolean" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="CustomerReviews">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="AverageRating" type="xs:decimal" minOccurs="0"/>
-					<xs:element name="TotalReviews" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalReviewPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element ref="tns:Review" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Review">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-					<xs:element name="Rating" type="xs:decimal" minOccurs="0"/>
-					<xs:element name="HelpfulVotes" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="CustomerId" type="xs:string" minOccurs="0"/>
-					<xs:element ref="tns:Reviewer" minOccurs="0"/>
-					<xs:element name="TotalVotes" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="Date" type="xs:string" minOccurs="0"/>
-					<xs:element name="Summary" type="xs:string" minOccurs="0"/>
-					<xs:element name="Content" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Reviewer">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="CustomerId" type="xs:string" minOccurs="0"/>
-					<xs:element name="Name" type="xs:string" minOccurs="0"/>
-					<xs:element name="Nickname" type="xs:string" minOccurs="0"/>
-					<xs:element name="Location" type="xs:string" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Tracks">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Disc" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Track" maxOccurs="unbounded">
-									<xs:complexType>
-										<xs:simpleContent>
-											<xs:extension base="xs:string">
-												<xs:attribute name="Number" type="xs:positiveInteger" use="required"/>
-											</xs:extension>
-										</xs:simpleContent>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-							<xs:attribute name="Number" type="xs:positiveInteger" use="required"/>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="SimilarProducts">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="SimilarProduct" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-								<xs:element name="Title" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="TopSellers">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="TopSeller" maxOccurs="unbounded">
-					<xs:complexType>
-							<xs:sequence>
-								<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-								<xs:element name="Title" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="NewReleases">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="NewRelease" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-								<xs:element name="Title" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="SimilarViewedProducts">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="SimilarViewedProduct" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-								<xs:element name="Title" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="OtherCategoriesSimilarProducts">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="OtherCategoriesSimilarProduct" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-								<xs:element name="Title" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Accessories">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Accessory" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-								<xs:element name="Title" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Promotions">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Promotion" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Promotion">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Summary" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="PromotionId" type="xs:string"/>
-								<xs:element name="Category" type="xs:string" minOccurs="0"/>
-								<xs:element name="StartDate" type="xs:string" minOccurs="0"/>
-								<xs:element name="EndDate" type="xs:string" minOccurs="0"/>
-								<xs:element name="EligibilityRequirementDescription" type="xs:string" minOccurs="0"/>
-								<xs:element name="BenefitDescription" type="xs:string" minOccurs="0"/>
-								<xs:element name="TermsAndConditions" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Details" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="MerchantId" type="xs:string"/>
-								<xs:element name="OwningMerchantId" type="xs:string"/>
-								<xs:element name="PromotionId" type="xs:string"/>
-								<xs:element name="PromotionCategory" type="xs:string"/>
-								<xs:element name="MerchantPromotionId" type="xs:string" minOccurs="0"/>
-								<xs:element name="GroupClaimCode" type="xs:string" minOccurs="0"/>
-								<xs:element name="CouponCombinationType" type="xs:string" minOccurs="0"/>
-								<xs:element name="StartDate" type="xs:string" minOccurs="0"/>
-								<xs:element name="EndDate" type="xs:string" minOccurs="0"/>
-								<xs:element name="TermsAndConditions" type="xs:string" minOccurs="0"/>
-								<xs:element name="EligibilityRequirements" type="tns:PromotionEligibilityRequirements" minOccurs="0"/>
-								<xs:element name="Benefits" type="tns:PromotionBenefits" minOccurs="0"/>
-								<xs:element name="ItemApplicability" type="tns:PromotionItemApplicability" minOccurs="0"/>
-								<xs:element name="MerchandisingMessage" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="PromotionEligibilityRequirements">
-			<xs:sequence>
-				<xs:element name="EligibilityRequirement" type="tns:PromotionEligibilityRequirement" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:complexType name="PromotionBenefits">
-			<xs:sequence>
-				<xs:element name="Benefit" type="tns:PromotionBenefit" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:complexType name="PromotionBenefit">
-			<xs:sequence>
-				<xs:element name="BenefitType" type="xs:string"/>
-				<xs:element name="ComponentType" type="xs:string"/>
-				<xs:element name="Quantity" type="xs:int" minOccurs="0"/>
-				<xs:element name="PercentOff" type="xs:double" minOccurs="0"/>
-				<xs:element name="FixedAmount" type="tns:Price" minOccurs="0"/>
-				<xs:element name="Ceiling" type="tns:Price" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:complexType name="PromotionEligibilityRequirement">
-			<xs:sequence>
-				<xs:element name="EligibilityRequirementType" type="xs:string"/>
-				<xs:element name="Quantity" type="xs:int" minOccurs="0"/>
-				<xs:element name="CurrencyAmount" type="tns:Price" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:complexType name="PromotionItemApplicability">
-			<xs:sequence>
-				<xs:element name="ASIN" type="xs:string"/>
-				<xs:element name="IsInBenefitSet" type="xs:boolean"/>
-				<xs:element name="IsInEligibilityRequirementSet" type="xs:boolean"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="BrowseNodes">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element ref="tns:Request" minOccurs="0"/>
-					<xs:element ref="tns:BrowseNode" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-	        <xs:element name="Property">
-	                <xs:complexType>
-	                        <xs:sequence>
-	                                <xs:element name="Name" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="Value" type="xs:string" minOccurs="0"/>
-	                        </xs:sequence>
-	                </xs:complexType>
-	        </xs:element>
-		<xs:element name="BrowseNode">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="BrowseNodeId" type="xs:string" minOccurs="0"/>
-					<xs:element name="Name" type="xs:string" minOccurs="0"/>
-					<xs:element name="IsCategoryRoot" type="xs:boolean" minOccurs="0"/>
-	                                <xs:element name="Properties" minOccurs="0">
-	                                        <xs:complexType>
-	                                                <xs:sequence>
-	                                                        <xs:element ref="tns:Property" maxOccurs="unbounded"/>
-	                                                </xs:sequence>
-	                                        </xs:complexType>
-	                                </xs:element>
-					<xs:element name="Children" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element ref="tns:BrowseNode" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Ancestors" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element ref="tns:BrowseNode" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-			                <xs:element ref="tns:TopSellers" minOccurs="0"/>
-	        			<xs:element ref="tns:NewReleases" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="ListmaniaLists">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="ListmaniaList" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="ListId" type="xs:string"/>
-								<xs:element name="ListName" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="SearchInside">
-			<xs:annotation>
-				<xs:appinfo>
-					<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-						<aws-se:excludeFrom>public</aws-se:excludeFrom>
-						<aws-se:excludeFrom>partner</aws-se:excludeFrom>
-					</aws-se:restricted>
-				</xs:appinfo>
-			</xs:annotation>
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="TotalExcerpts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="Excerpt" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Checksum" type="xs:string" minOccurs="0"/>
-								<xs:element name="PageType" type="xs:string" minOccurs="0"/>
-								<xs:element name="PageNumber" type="xs:string" minOccurs="0"/>
-								<xs:element name="SequenceNumber" type="xs:string" minOccurs="0"/>
-								<xs:element name="Text" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="CartItems">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="SubTotal" type="tns:Price" minOccurs="0"/>
-					<xs:element name="CartItem" type="tns:CartItem" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="SavedForLaterItems">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="SubTotal" type="tns:Price" minOccurs="0"/>
-					<xs:element name="SavedForLaterItem" type="tns:CartItem" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="CartItem">
-			<xs:sequence>
-				<xs:element name="CartItemId" type="xs:string"/>
-				<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-				<xs:element name="ExchangeId" type="xs:string" minOccurs="0"/>
-				<xs:element name="MerchantId" type="xs:string" minOccurs="0"/>
-				<xs:element name="SellerId" type="xs:string" minOccurs="0"/>
-				<xs:element name="SellerNickname" type="xs:string" minOccurs="0"/>
-				<xs:element name="Quantity" type="xs:string"/>
-				<xs:element name="Title" type="xs:string" minOccurs="0"/>
-				<xs:element name="ProductGroup" type="xs:string" minOccurs="0"/>
-				<xs:element name="ListOwner" type="xs:string" minOccurs="0"/>
-				<xs:element name="ListType" type="xs:string" minOccurs="0"/>
-	                        <xs:element name="MetaData" minOccurs="0">
-	                                <xs:complexType>
-	                                        <xs:sequence>
-	                                                <xs:element name="KeyValuePair" minOccurs="0" maxOccurs="unbounded">
-	                                                        <xs:complexType>
-	                                                                <xs:sequence>
-	                                                                        <xs:element name="Key" type="xs:string"/>
-	                                                                        <xs:element name="Value" type="xs:string"/>
-	                                                                </xs:sequence>
-	                                                        </xs:complexType>
-	                                                </xs:element>
-	                                        </xs:sequence>
-	                                </xs:complexType>
-	                        </xs:element>
-				<xs:element name="Price" type="tns:Price" minOccurs="0"/>
-	                        <xs:element name="ItemTotal" type="tns:Price" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="Transaction">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="TransactionId" type="xs:string"/>
-					<xs:element name="SellerId" type="xs:string"/>
-					<xs:element name="Condition" type="xs:string"/>
-					<xs:element name="TransactionDate" type="xs:string"/>
-					<xs:element name="TransactionDateEpoch" type="xs:string"/>
-					<xs:element name="SellerName" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="PayingCustomerId" type="xs:string" minOccurs="0">
-	                                    <xs:annotation>
-						        <xs:appinfo>
-							        <aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-								        <aws-se:excludeFrom>public</aws-se:excludeFrom>
-								        <aws-se:excludeFrom>partner</aws-se:excludeFrom>
-							        </aws-se:restricted>
-						        </xs:appinfo>
-					        </xs:annotation>
-	                                </xs:element>	    
-	                                <xs:element name="OrderingCustomerId" type="xs:string" minOccurs="0">
-					        <xs:annotation>
-						        <xs:appinfo>
-							        <aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-								        <aws-se:excludeFrom>public</aws-se:excludeFrom>
-								        <aws-se:excludeFrom>partner</aws-se:excludeFrom>
-							        </aws-se:restricted>
-						        </xs:appinfo>
-					        </xs:annotation>
-	                                </xs:element>
-					<xs:element name="Totals" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Total" type="tns:Price"/>
-								<xs:element name="Subtotal" type="tns:Price"/>
-								<xs:element name="Tax" type="tns:Price"/>
-								<xs:element name="ShippingCharge" type="tns:Price"/>
-								<xs:element name="Promotion" type="tns:Price"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="TransactionItems" minOccurs="0">
-						<xs:annotation>
-							<xs:appinfo>
-								<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-									<aws-se:excludeFrom>public</aws-se:excludeFrom>
-								</aws-se:restricted>
-							</xs:appinfo>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element ref="tns:TransactionItem" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Shipments" minOccurs="0">
-						<xs:annotation>
-							<xs:appinfo>
-								<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-									<aws-se:excludeFrom>public</aws-se:excludeFrom>
-								</aws-se:restricted>
-							</xs:appinfo>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Shipment" maxOccurs="unbounded">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="Condition" type="xs:string"/>
-											<xs:element name="DeliveryMethod" type="xs:string"/>
-											<xs:element name="ShipmentItems" minOccurs="0">
-												<xs:complexType>
-													<xs:sequence>
-														<xs:element name="TransactionItemId" type="xs:string" maxOccurs="unbounded"/>
-													</xs:sequence>
-												</xs:complexType>
-											</xs:element>
-											<xs:element name="Packages" minOccurs="0">
-												<xs:complexType>
-													<xs:sequence>
-														<xs:element name="Package" maxOccurs="unbounded">
-															<xs:complexType>
-																<xs:sequence>
-																	<xs:element name="TrackingNumber" type="xs:string"/>
-																	<xs:element name="CarrierName" type="xs:string"/>
-																</xs:sequence>
-															</xs:complexType>
-														</xs:element>
-													</xs:sequence>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="TransactionItem">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="TransactionItemId" type="xs:string"/>
-					<xs:element name="Quantity" type="xs:string"/>
-					<xs:element name="UnitPrice" type="tns:Price"/>
-					<xs:element name="TotalPrice" type="tns:Price"/>
-					<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-					<xs:element name="ChildTransactionItems" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element ref="tns:TransactionItem" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="Seller">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="SellerId" type="xs:string"/>
-					<xs:element name="SellerName" type="xs:string" minOccurs="0"/>
-				        <xs:element name="SellerLegalName" type="xs:string" minOccurs="0">
-	               				<xs:annotation>
-	                  				<xs:appinfo>
-	                     					<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-	                     						<aws-se:excludeFrom>public</aws-se:excludeFrom>
-	                     					</aws-se:restricted>
-	                  				</xs:appinfo>
-	               				</xs:annotation>
-	            			</xs:element>			
-	            			<xs:element name="Nickname" type="xs:string" minOccurs="0"/>
-					<xs:element name="GlancePage" type="xs:string" minOccurs="0"/>
-					<xs:element name="About" type="xs:string" minOccurs="0"/>
-					<xs:element name="MoreAbout" type="xs:string" minOccurs="0"/>
-					<xs:element name="Location" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="UserDefinedLocation" type="xs:string" minOccurs="0"/>
-								<xs:element name="City" type="xs:string" minOccurs="0"/>
-								<xs:element name="State" type="xs:string" minOccurs="0"/>
-								<xs:element name="Country" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="AverageFeedbackRating" type="xs:decimal" minOccurs="0"/>
-					<xs:element name="TotalFeedback" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalFeedbackPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="SellerFeedbackSummary" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="FeedbackDateRange" minOccurs="0" maxOccurs="unbounded">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="SellerFeedbackRating" minOccurs="0" maxOccurs="unbounded">	
-												<xs:complexType>
-													<xs:sequence>
-														<xs:element name="Count" type="xs:nonNegativeInteger" minOccurs="0"/>
-														<xs:element name="Percentage" type="xs:nonNegativeInteger" minOccurs="0"/>
-													</xs:sequence>
-												<xs:attribute name="Type" type="xs:string"/>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-										<xs:attribute name="Period" type="xs:string"/>
-									</xs:complexType>
-								</xs:element>      	
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element ref="tns:SellerFeedback" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="SellerFeedback">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Feedback" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Rating" type="xs:nonNegativeInteger" minOccurs="0"/>
-								<xs:element name="Comment" type="xs:string" minOccurs="0"/>
-								<xs:element name="Date" type="xs:string" minOccurs="0"/>
-								<xs:element name="RatedBy" type="xs:string" minOccurs="0"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="Address">
-			<xs:sequence>
-				<xs:element name="Name" type="xs:string" minOccurs="0"/>
-				<xs:element name="Address1" type="xs:string" minOccurs="0"/>
-				<xs:element name="Address2" type="xs:string" minOccurs="0"/>
-				<xs:element name="Address3" type="xs:string" minOccurs="0"/>
-				<xs:element name="City" type="xs:string" minOccurs="0"/>
-				<xs:element name="State" type="xs:string" minOccurs="0"/>
-				<xs:element name="PostalCode" type="xs:string" minOccurs="0"/>
-				<xs:element name="Country" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="SellerListing">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="ExchangeId" type="xs:string" minOccurs="0"/>
-					<xs:element name="ListingId" type="xs:string" minOccurs="0"/>
-					<xs:element name="ASIN" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="SKU" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="UPC" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="EAN" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="WillShipExpedited" type="xs:boolean" minOccurs="0"/>
-	                                <xs:element name="WillShipInternational" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="Title" type="xs:string" minOccurs="0"/>
-					<xs:element name="Price" type="tns:Price" minOccurs="0"/>
-					<xs:element name="StartDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="EndDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="Status" type="xs:string" minOccurs="0"/>
-					<xs:element name="Quantity" type="xs:string" minOccurs="0"/>
-					<xs:element name="Condition" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubCondition" type="xs:string" minOccurs="0"/>
-					<xs:element ref="tns:Seller" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="Price">
-			<xs:sequence>
-				<xs:element name="Amount" type="xs:integer" minOccurs="0"/>
-				<xs:element name="CurrencyCode" type="xs:string" minOccurs="0"/>
-				<xs:element name="FormattedPrice" type="xs:string"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="ImageSet">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="SwatchImage" type="tns:Image" minOccurs="0"/>
-					<xs:element name="SmallImage" type="tns:Image" minOccurs="0"/>
-	                                <xs:element name="ThumbnailImage" type="tns:Image" minOccurs="0"/>
-	                                <xs:element name="TinyImage" type="tns:Image" minOccurs="0"/>
-					<xs:element name="MediumImage" type="tns:Image" minOccurs="0"/>
-					<xs:element name="LargeImage" type="tns:Image" minOccurs="0"/>
-				</xs:sequence>
-				<xs:attribute name="Category" type="xs:string"/>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="Image">
-			<xs:sequence>
-				<xs:element name="URL" type="xs:string"/>
-				<xs:element name="Height" type="tns:DecimalWithUnits"/>
-				<xs:element name="Width" type="tns:DecimalWithUnits"/>
-				<xs:element name="IsVerified" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-		<xs:element name="ItemAttributes">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Actor" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Address" type="tns:Address" minOccurs="0"/>
-					<xs:element name="Age" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="AmazonMaximumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="AmazonMinimumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="AnalogVideoFormat" type="xs:string" minOccurs="0"/>
-					<xs:element name="ApertureModes" type="xs:string" minOccurs="0"/>
-					<xs:element name="Artist" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="AspectRatio" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssemblyInstructions" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssemblyRequired" type="xs:string" minOccurs="0"/>
-					<xs:element name="AudienceRating" type="xs:string" minOccurs="0"/>
-					<xs:element name="AudioFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Author" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="BackFinding" type="xs:string" minOccurs="0"/>
-					<xs:element name="BandMaterialType" type="xs:string" minOccurs="0"/>
-					<xs:element name="BatteriesIncluded" type="xs:string" minOccurs="0"/>
-					<xs:element name="BatteriesRequired" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="Batteries" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="BatteryDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="BatteryType" type="xs:string" minOccurs="0"/>
-					<xs:element name="BezelMaterialType" type="xs:string" minOccurs="0"/>
-					<xs:element name="Binding" type="xs:string" minOccurs="0"/>
-					<xs:element name="Brand" type="xs:string" minOccurs="0"/>
-					<xs:element name="CalendarType" type="xs:string" minOccurs="0"/>
-					<xs:element name="CameraManualFeatures" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="CaseDiameter" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="CaseMaterialType" type="xs:string" minOccurs="0"/>
-					<xs:element name="CaseThickness" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="CaseType" type="xs:string" minOccurs="0"/>
-					<xs:element name="CatalogNumber" type="xs:string" minOccurs="0"/>
-					<xs:element name="Category" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="CategoryBin" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="CDRWDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="ChainType" type="xs:string" minOccurs="0"/>
-					<xs:element name="Character" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="CEROAgeRating" type="xs:string" minOccurs="0"/>
-					<xs:element name="ClaspType" type="xs:string" minOccurs="0"/>
-					<xs:element name="ClothingSize" type="xs:string" minOccurs="0"/>
-					<xs:element name="ClubType" type="xs:string" minOccurs="0"/>
-					<xs:element name="Color" type="xs:string" minOccurs="0"/>
-					<xs:element name="Compatibility" type="xs:string" minOccurs="0"/>
-					<xs:element name="CompatibleDevices" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="ComputerHardwareType" type="xs:string" minOccurs="0"/>
-					<xs:element name="ComputerPlatform" type="xs:string" minOccurs="0"/>
-					<xs:element name="Connectivity" type="xs:string" minOccurs="0"/>
-					<xs:element name="ContinuousShootingSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="Country" type="xs:string" minOccurs="0"/>
-					<xs:element name="CPUManufacturer" type="xs:string" minOccurs="0"/>
-					<xs:element name="CPUSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="CPUType" type="xs:string" minOccurs="0"/>
-					<xs:element name="Creator" minOccurs="0" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:string">
-									<xs:attribute name="Role" type="xs:string" use="required"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Cuisine" type="xs:string" minOccurs="0"/>
-					<xs:element name="DataLinkProtocol" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="DeliveryOption" type="xs:string" minOccurs="0"/>
-					<xs:element name="DelayBetweenShots" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="Department" type="xs:string" minOccurs="0"/>
-					<xs:element name="DeweyDecimalNumber" type="xs:string" minOccurs="0"/>
-					<xs:element name="DialColor" type="xs:string" minOccurs="0"/>
-					<xs:element name="DialWindowMaterialType" type="xs:string" minOccurs="0"/>
-					<xs:element name="DigitalZoom" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="Director" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="DisplayColorSupport" type="xs:string" minOccurs="0"/>
-					<xs:element name="DisplaySize" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="DrumSetPieceQuantity" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="DVDLayers" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="DVDRWDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="DVDSides" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="DPCI" type="xs:string" minOccurs="0"/>
-					<xs:element name="EAN" type="xs:string" minOccurs="0"/>
-					<xs:element name="Edition" type="xs:string" minOccurs="0"/>
-					<xs:element name="EducationalFocus" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Ethnicity" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="ESRBAgeRating" type="xs:string" minOccurs="0"/>
-					<xs:element name="ExternalDisplaySupportDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="FabricType" type="xs:string" minOccurs="0"/>
-					<xs:element name="FaxNumber" type="xs:string" minOccurs="0"/>
-					<xs:element name="Feature" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="FilmColorType" type="xs:string" minOccurs="0"/>
-					<xs:element name="FirstIssueLeadTime" type="tns:StringWithUnits" minOccurs="0"/>
-	                                <xs:element name="FlavorName" type="xs:string" minOccurs="0"/>
-					<xs:element name="FloppyDiskDriveDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="Format" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="FormFactor" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="GemType" type="xs:string" minOccurs="0"/>
-	                <xs:element name="GemTypeSetElement" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Gender" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Genre" type="xs:string" minOccurs="0"/>
-					<xs:element name="GLProductGroup" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="GolfClubFlex" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="GolfClubLoft" type="xs:string" minOccurs="0"/>
-					<xs:element name="GraphicsCardInterface" type="xs:string" minOccurs="0"/>
-					<xs:element name="GraphicsDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="GraphicsMemorySize" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="GuitarAttribute" type="xs:string" minOccurs="0"/>
-					<xs:element name="GuitarBridgeSystem" type="xs:string" minOccurs="0"/>
-					<xs:element name="GuitarPickThickness" type="xs:string" minOccurs="0"/>
-					<xs:element name="GuitarPickupConfiguration" type="xs:string" minOccurs="0"/>
-					<xs:element name="HandOrientation" type="xs:string" minOccurs="0"/>
-					<xs:element name="HardDiskCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="HardDiskSize" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="HardDiskInterface" type="xs:string" minOccurs="0"/>	
-					<xs:element name="HardwarePlatform" type="xs:string" minOccurs="0"/>	
-					<xs:element name="HasAutoFocus" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasBurstMode" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasInCameraEditing" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasRedEyeReduction" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasSelfTimer" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasTripodMount" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasVideoOut" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasViewfinder" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HazardousMaterialType" type="xs:string" minOccurs="0"/>
-	            <xs:element name="HoursOfOperation" type="xs:string" minOccurs="0"/>
-					<xs:element name="IncludedSoftware" type="xs:string" minOccurs="0"/>
-					<xs:element name="IncludesMp3Player" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="Ingredients" type="xs:string" minOccurs="0"/>
-	                <xs:element name="IngredientsSetElement" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="InstrumentKey" type="xs:string" minOccurs="0"/>
-					<xs:element name="Interest" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-	                                <xs:element name="IsAdultProduct" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="IsAutographed" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="ISBN" type="xs:string" minOccurs="0"/>
-					<xs:element name="IsFragile" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="IsLabCreated" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="IsMemorabilia" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="ISOEquivalent" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="IsPreannounce" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="IssuesPerYear" type="xs:string" minOccurs="0"/>
-					<xs:element name="ItemDimensions" minOccurs="0" maxOccurs="1">
-							<xs:complexType>
-	       							<xs:sequence>
-	       								<xs:element name="Height" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       								<xs:element name="Length" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       								<xs:element name="Weight" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       								<xs:element name="Width" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       							</xs:sequence>
-	       						</xs:complexType>
-	       					</xs:element>
-					<xs:element name="KeyboardDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="Label" type="xs:string" minOccurs="0"/>
-					<xs:element name="LanguageName" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Languages" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Language" minOccurs="0" maxOccurs="unbounded">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="Name" type="xs:string"/>
-											<xs:element name="Type" type="xs:string" minOccurs="0"/>
-											<xs:element name="AudioFormat" type="xs:string" minOccurs="0"/>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="LegalDisclaimer" type="xs:string" minOccurs="0"/>
-					<xs:element name="LensType" type="xs:string" minOccurs="0"/>
-					<xs:element name="LineVoltage" type="xs:string" minOccurs="0"/>
-					<xs:element name="ListPrice" type="tns:Price" minOccurs="0"/>
-					<xs:element name="MacroFocusRange" type="xs:string" minOccurs="0"/>
-					<xs:element name="MagazineType" type="xs:string" minOccurs="0"/>
-					<xs:element name="MalletHardness" type="xs:string" minOccurs="0"/>
-					<xs:element name="Manufacturer" type="xs:string" minOccurs="0"/>
-					<xs:element name="ManufacturerLaborWarrantyDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="ManufacturerMaximumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="ManufacturerMinimumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="ManufacturerPartsWarrantyDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="MaterialType" type="xs:string" minOccurs="0"/>
-					<xs:element name="MaterialTypeSetElement" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="MaximumAperture" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumColorDepth" type="xs:string" minOccurs="0"/>
-					<xs:element name="MaximumFocalLength" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumHighResolutionImages" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumHorizontalResolution" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumLowResolutionImages" type="xs:string" minOccurs="0"/>
-					<xs:element name="MaximumResolution" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumShutterSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumVerticalResolution" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumWeightRecommendation" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MediaType" type="xs:string" minOccurs="0"/>
-					<xs:element name="MemorySlotsAvailable" type="xs:string" minOccurs="0"/>
-					<xs:element name="MetalStamp" type="xs:string" minOccurs="0"/>
-					<xs:element name="MetalType" type="xs:string" minOccurs="0"/>
-					<xs:element name="MiniMovieDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="MinimumFocalLength" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MinimumShutterSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="Model" type="xs:string" minOccurs="0"/>
-					<xs:element name="ModelYear" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="ModemDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="MonitorSize" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MonitorViewableDiagonalSize" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MouseDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="MPN" type="xs:string" minOccurs="0"/>
-					<xs:element name="MusicalStyle" type="xs:string" minOccurs="0"/>
-					<xs:element name="NativeResolution" type="xs:string" minOccurs="0"/>
-					<xs:element name="Neighborhood" type="xs:string" minOccurs="0"/>
-					<xs:element name="NetworkInterfaceDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="NotebookDisplayTechnology" type="xs:string" minOccurs="0"/>
-					<xs:element name="NotebookPointingDeviceDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="NumberOfDiscs" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfIssues" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfItems" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfKeys" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfPearls" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfRapidFireShots" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfStones" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfStrings" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfTracks" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="OperatingSystem" type="xs:string" minOccurs="0"/>
-					<xs:element name="OpticalSensorResolution" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="OpticalZoom" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="OriginalReleaseDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="OutputWattage" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="PackageDimensions" minOccurs="0" maxOccurs="1">
-							<xs:complexType>
-	       							<xs:sequence>
-	       								<xs:element name="Height" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       								<xs:element name="Length" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       								<xs:element name="Weight" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       								<xs:element name="Width" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       							</xs:sequence>
-	       						</xs:complexType>
-	       				</xs:element>
-					<xs:element name="PackageQuantity" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="PantLength" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="PantSize" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="PearlLustre" type="xs:string" minOccurs="0"/>
-					<xs:element name="PearlMinimumColor" type="xs:string" minOccurs="0"/>
-					<xs:element name="PearlShape" type="xs:string" minOccurs="0"/>
-					<xs:element name="PearlStringingMethod" type="xs:string" minOccurs="0"/>
-					<xs:element name="PearlSurfaceBlemishes" type="xs:string" minOccurs="0"/>
-					<xs:element name="PearlType" type="xs:string" minOccurs="0"/>
-					<xs:element name="PearlUniformity" type="xs:string" minOccurs="0"/>
-					<xs:element name="PhoneNumber" type="xs:string" minOccurs="0"/>
-					<xs:element name="PhotoFlashType" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="PictureFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Platform" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="PriceRating" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="PrimaryColor" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="ProcessorCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="ProductGroup" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="ProductSiteLaunchDate" type="xs:string" minOccurs="0"/>
-	       				<xs:element name="ProductTypeName" type="xs:string" minOccurs="0"/>
-					<xs:element name="ProductTypeSubcategory" type="xs:string" minOccurs="0"/>
-					<xs:element name="PromotionalTag" type="xs:string" minOccurs="0">
-						<xs:annotation>
-							<xs:appinfo>
-								<aws-se:restricted xmlns:aws-se="http://webservices.amazon.com/AWS-SchemaExtensions">
-									<aws-se:excludeFrom>public</aws-se:excludeFrom>
-									<aws-se:excludeFrom>partner</aws-se:excludeFrom>
-								</aws-se:restricted>
-							</xs:appinfo>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="PublicationDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="Publisher" type="xs:string" minOccurs="0"/>
-					<xs:element name="POBoxShippingExcluded" type="xs:string" minOccurs="0"/>
-					<xs:element name="ReadingLevel" type="xs:string" minOccurs="0"/>
-					<xs:element name="ReturnMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="RecorderTrackCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="RegionCode" type="xs:string" minOccurs="0"/>
-					<xs:element name="RegionOfOrigin" type="xs:string" minOccurs="0"/>
-					<xs:element name="ReturnPolicy" type="xs:string" minOccurs="0"/>
-					<xs:element name="ReleaseDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="RemovableMemory" type="xs:string" minOccurs="0"/>
-					<xs:element name="RemovableStorage" type="xs:string" minOccurs="0"/>
-					<xs:element name="RequiredVoltageRange" type="xs:string" minOccurs="0"/>
-					<xs:element name="ResolutionModes" type="xs:string" minOccurs="0"/>
-					<xs:element name="RingSize" type="xs:string" minOccurs="0"/>
-					<xs:element name="RunningTime" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="ScentName" type="xs:string" minOccurs="0"/>
-					<xs:element name="SecondaryCacheSize" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="SettingType" type="xs:string" minOccurs="0"/>
-					<xs:element name="ShaftMaterialType" type="xs:string" minOccurs="0"/>
-					<xs:element name="ShoeSize" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Size" type="xs:string" minOccurs="0"/>
-					<xs:element name="SizePerPearl" type="xs:string" minOccurs="0"/>
-					<xs:element name="SkillLevel" type="xs:string" minOccurs="0"/>
-					<xs:element name="SKU" type="xs:string" minOccurs="0"/>
-					<xs:element name="SoldInStores" type="xs:string" minOccurs="0"/>
-					<xs:element name="SoundCardDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="SpeakerCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="SpeakerDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="SpecialFeatures" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="StoneClarity" type="xs:string" minOccurs="0"/>
-					<xs:element name="StoneColor" type="xs:string" minOccurs="0"/>
-					<xs:element name="StoneCut" type="xs:string" minOccurs="0"/>
-					<xs:element name="StoneShape" type="xs:string" minOccurs="0"/>
-					<xs:element name="StoneWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="Studio" type="xs:string" minOccurs="0"/>
-					<xs:element name="Style" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionLength" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="SupportedImageType" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="SupportedMediaSize" type="xs:string" minOccurs="0"/>
-					<xs:element name="SystemBusSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="SystemMemorySizeMax" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="SystemMemorySize" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="SystemMemoryType" type="xs:string" minOccurs="0"/>
-					<xs:element name="TargetBrand" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="TellingPageIndicator" type="xs:string" minOccurs="0"/>
-					<xs:element name="TheatricalReleaseDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="Title" type="xs:string" minOccurs="0"/>
-					<xs:element name="TotalDiamondWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="TotalExternalBaysFree" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalFirewirePorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalGemWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="TotalInternalBaysFree" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalMetalWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="TotalNTSCPALPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalParallelPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalPCCardSlots" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalPCISlotsFree" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalSerialPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalSVideoOutPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalUSB2Ports" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalUSBPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalVGAOutPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="UPC" type="xs:string" minOccurs="0"/>
-					<xs:element name="VariationDenomination" type="xs:string" minOccurs="0"/>
-					<xs:element name="VariationDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="Warranty" type="xs:string" minOccurs="0"/>
-					<xs:element name="WatchMovementType" type="xs:string" minOccurs="0"/>
-					<xs:element name="WaterResistanceDepth" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="WEEETaxValue" type="tns:Price" minOccurs="0"/>
-					<xs:element name="WirelessMicrophoneFrequency" type="xs:nonNegativeInteger" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="MerchantItemAttributes">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="Actor" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Address" type="tns:Address" minOccurs="0"/>
-					<xs:element name="AmazonMaximumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="AmazonMinimumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="ApertureModes" type="xs:string" minOccurs="0"/>
-					<xs:element name="Artist" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="AspectRatio" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssemblyInstructions" type="xs:string" minOccurs="0"/>
-					<xs:element name="AssemblyRequired" type="xs:string" minOccurs="0"/>
-					<xs:element name="AudienceRating" type="xs:string" minOccurs="0"/>
-					<xs:element name="AudioFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Author" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="BackFinding" type="xs:string" minOccurs="0"/>
-					<xs:element name="BandMaterialType" type="xs:string" minOccurs="0"/>
-					<xs:element name="BatteriesIncluded" type="xs:string" minOccurs="0"/>
-					<xs:element name="BatteriesRequired" type="xs:string" minOccurs="0"/>
-	                                <xs:element name="Batteries" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="BatteryDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="BatteryType" type="xs:string" minOccurs="0"/>
-					<xs:element name="BezelMaterialType" type="xs:string" minOccurs="0"/>
-					<xs:element name="Binding" type="xs:string" minOccurs="0"/>
-					<xs:element name="Brand" type="xs:string" minOccurs="0"/>
-					<xs:element name="CalendarType" type="xs:string" minOccurs="0"/>
-					<xs:element name="CameraManualFeatures" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="CaseDiameter" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="CaseMaterialType" type="xs:string" minOccurs="0"/>
-					<xs:element name="CaseThickness" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="CaseType" type="xs:string" minOccurs="0"/>
-					<xs:element name="CatalogNumber" type="xs:string" minOccurs="0"/>
-					<xs:element name="CDRWDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="ChainType" type="xs:string" minOccurs="0"/>
-					<xs:element name="ClaspType" type="xs:string" minOccurs="0"/>
-					<xs:element name="ClothingSize" type="xs:string" minOccurs="0"/>
-					<xs:element name="Color" type="xs:string" minOccurs="0"/>
-					<xs:element name="Compatibility" type="xs:string" minOccurs="0"/>
-					<xs:element name="ComputerHardwareType" type="xs:string" minOccurs="0"/>
-					<xs:element name="ComputerPlatform" type="xs:string" minOccurs="0"/>
-					<xs:element name="Connectivity" type="xs:string" minOccurs="0"/>
-					<xs:element name="ContinuousShootingSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="Country" type="xs:string" minOccurs="0"/>
-					<xs:element name="CountryOfOrigin" type="xs:string" minOccurs="0"/>
-					<xs:element name="CPUManufacturer" type="xs:string" minOccurs="0"/>
-					<xs:element name="CPUSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="CPUType" type="xs:string" minOccurs="0"/>
-					<xs:element name="Creator" minOccurs="0" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:string">
-									<xs:attribute name="Role" type="xs:string" use="required"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Cuisine" type="xs:string" minOccurs="0"/>
-					<xs:element name="Customizable" type="xs:string" minOccurs="0"/>
-					<xs:element name="DelayBetweenShots" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="DeliveryOption" type="xs:string" minOccurs="0"/>
-					<xs:element name="Department" type="xs:string" minOccurs="0"/>
-					<xs:element name="Description" type="xs:string" minOccurs="0"/>
-					<xs:element name="DeweyDecimalNumber" type="xs:string" minOccurs="0"/>
-					<xs:element name="DialColor" type="xs:string" minOccurs="0"/>
-					<xs:element name="DialWindowMaterialType" type="xs:string" minOccurs="0"/>
-					<xs:element name="DigitalZoom" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="Director" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="DisplaySize" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="DrumSetPieceQuantity" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="DVDLayers" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="DVDRWDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="DVDSides" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="DPCI" type="xs:string" minOccurs="0"/>
-					<xs:element name="EAN" type="xs:string" minOccurs="0"/>
-					<xs:element name="Edition" type="xs:string" minOccurs="0"/>
-					<xs:element name="ESRBAgeRating" type="xs:string" minOccurs="0"/>
-					<xs:element name="ExternalDisplaySupportDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="FabricType" type="xs:string" minOccurs="0"/>
-					<xs:element name="FaxNumber" type="xs:string" minOccurs="0"/>
-					<xs:element name="Feature" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="FirstIssueLeadTime" type="tns:StringWithUnits" minOccurs="0"/>
-					<xs:element name="FloppyDiskDriveDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="Format" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="FixedShippingCharge" type="tns:Price" minOccurs="0"/>
-					<xs:element name="GemType" type="xs:string" minOccurs="0"/>
-					<xs:element name="GraphicsCardInterface" type="xs:string" minOccurs="0"/>
-					<xs:element name="GraphicsDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="GraphicsMemorySize" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="GuitarAttribute" type="xs:string" minOccurs="0"/>
-					<xs:element name="GuitarBridgeSystem" type="xs:string" minOccurs="0"/>
-					<xs:element name="GuitarPickThickness" type="xs:string" minOccurs="0"/>
-					<xs:element name="GuitarPickupConfiguration" type="xs:string" minOccurs="0"/>
-					<xs:element name="HardDiskCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="HardDiskSize" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="HasAutoFocus" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasBurstMode" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasInCameraEditing" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasRedEyeReduction" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasSelfTimer" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasTripodMount" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasVideoOut" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HasViewfinder" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="HazardousMaterialType" type="xs:string" minOccurs="0"/>
-			                <xs:element name="HoursOfOperation" type="xs:string" minOccurs="0"/>
-					<xs:element name="IncludedSoftware" type="xs:string" minOccurs="0"/>
-					<xs:element name="IncludesMp3Player" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="Indications" type="xs:string" minOccurs="0"/>
-					<xs:element name="Ingredients" type="xs:string" minOccurs="0"/>
-					<xs:element name="InstrumentKey" type="xs:string" minOccurs="0"/>
-					<xs:element name="IsAutographed" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="ISBN" type="xs:string" minOccurs="0"/>
-					<xs:element name="IsFragile" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="IsLabCreated" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="IsMemorabilia" type="xs:boolean" minOccurs="0"/>
-					<xs:element name="ISOEquivalent" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="IssuesPerYear" type="xs:string" minOccurs="0"/>
-					<xs:element name="ItemDimensions" minOccurs="0" maxOccurs="1">
-							<xs:complexType>
-	       							<xs:sequence>
-	       								<xs:element name="Height" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       								<xs:element name="Length" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       								<xs:element name="Weight" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       								<xs:element name="Width" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       							</xs:sequence>
-	       						</xs:complexType>
-	       					</xs:element>
-					<xs:element name="KeyboardDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="Label" type="xs:string" minOccurs="0"/>
-					<xs:element name="Languages" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="Language" minOccurs="0" maxOccurs="unbounded">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="Name" type="xs:string"/>
-											<xs:element name="Type" type="xs:string"/>
-											<xs:element name="AudioFormat" type="xs:string" minOccurs="0"/>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="LegalDisclaimer" type="xs:string" minOccurs="0"/>
-					<xs:element name="LineVoltage" type="xs:string" minOccurs="0"/>
-					<xs:element name="ListPrice" type="tns:Price" minOccurs="0"/>
-					<xs:element name="MacroFocusRange" type="xs:string" minOccurs="0"/>
-					<xs:element name="MagazineType" type="xs:string" minOccurs="0"/>
-					<xs:element name="MalletHardness" type="xs:string" minOccurs="0"/>
-					<xs:element name="Manufacturer" type="xs:string" minOccurs="0"/>
-					<xs:element name="ManufacturerLaborWarrantyDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="ManufacturerMaximumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="ManufacturerMinimumAge" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="ManufacturerPartsWarrantyDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="MaterialType" type="xs:string" minOccurs="0"/>
-					<xs:element name="MaximumAperture" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumColorDepth" type="xs:string" minOccurs="0"/>
-					<xs:element name="MaximumFocalLength" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumHighResolutionImages" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumHorizontalResolution" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumLowResolutionImages" type="xs:string" minOccurs="0"/>
-					<xs:element name="MaximumResolution" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumShutterSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumVerticalResolution" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="MaximumWeightRecommendation" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MemorySlotsAvailable" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="MetalStamp" type="xs:string" minOccurs="0"/>
-					<xs:element name="MetalType" type="xs:string" minOccurs="0"/>
-					<xs:element name="MiniMovieDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="MinimumFocalLength" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MinimumShutterSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="Model" type="xs:string" minOccurs="0"/>
-					<xs:element name="ModelYear" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="ModemDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="MonitorSize" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MonitorViewableDiagonalSize" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="MouseDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="MPN" type="xs:string" minOccurs="0"/>
-					<xs:element name="MusicalStyle" type="xs:string" minOccurs="0"/>
-					<xs:element name="NativeResolution" type="xs:string" minOccurs="0"/>
-					<xs:element name="Neighborhood" type="xs:string" minOccurs="0"/>
-					<xs:element name="NetworkInterfaceDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="NotebookDisplayTechnology" type="xs:string" minOccurs="0"/>
-					<xs:element name="NotebookPointingDeviceDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="NumberOfDiscs" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfIssues" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfItems" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfKeys" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfPages" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfPearls" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfRapidFireShots" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfStones" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfStrings" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="NumberOfTracks" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="OpticalZoom" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="OriginalReleaseDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="OutputWattage" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="PackageDimensions" minOccurs="0" maxOccurs="1">
-							<xs:complexType>
-	       							<xs:sequence>
-	       								<xs:element name="Height" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       								<xs:element name="Length" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       								<xs:element name="Weight" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       								<xs:element name="Width" type="tns:DecimalWithUnits" minOccurs="0"/>
-	       							</xs:sequence>
-	       						</xs:complexType>
-	       				</xs:element>
-					<xs:element name="PearlLustre" type="xs:string" minOccurs="0"/>
-					<xs:element name="PearlMinimumColor" type="xs:string" minOccurs="0"/>
-					<xs:element name="PearlShape" type="xs:string" minOccurs="0"/>
-					<xs:element name="PearlStringingMethod" type="xs:string" minOccurs="0"/>
-					<xs:element name="PearlSurfaceBlemishes" type="xs:string" minOccurs="0"/>
-					<xs:element name="PearlType" type="xs:string" minOccurs="0"/>
-					<xs:element name="PearlUniformity" type="xs:string" minOccurs="0"/>
-					<xs:element name="PhoneNumber" type="xs:string" minOccurs="0"/>
-					<xs:element name="PhotoFlashType" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="PictureFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Platform" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="PriceRating" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="ProcessorCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="ProductGroup" type="xs:string" minOccurs="0"/>
-					<xs:element name="PromotionalTag" type="xs:string" minOccurs="0"/>
-					<xs:element name="POBoxShippingExcluded" type="xs:string" minOccurs="0"/>
-					<xs:element name="PublicationDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="Publisher" type="xs:string" minOccurs="0"/>
-					<xs:element name="PurchasingChannel" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="ReadingLevel" type="xs:string" minOccurs="0"/>
-					<xs:element name="RecorderTrackCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="RegionCode" type="xs:string" minOccurs="0"/>
-					<xs:element name="RegionOfOrigin" type="xs:string" minOccurs="0"/>
-					<xs:element name="ReleaseDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="ReturnMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="RemovableMemory" type="xs:string" minOccurs="0"/>
-					<xs:element name="ResolutionModes" type="xs:string" minOccurs="0"/>
-					<xs:element name="ReturnPolicy" type="xs:string" minOccurs="0"/>
-					<xs:element name="RingSize" type="xs:string" minOccurs="0"/>
-					<xs:element name="SafetyWarning" type="xs:string" minOccurs="0"/>
-					<xs:element name="SalesRestriction" type="xs:string" minOccurs="0"/>
-					<xs:element name="SecondaryCacheSize" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="SettingType" type="xs:string" minOccurs="0"/>
-					<xs:element name="Size" type="xs:string" minOccurs="0"/>
-					<xs:element name="SKU" type="xs:string" minOccurs="0"/>
-					<xs:element name="SoldInStores" type="xs:string" minOccurs="0"/>
-					<xs:element name="SizePerPearl" type="xs:string" minOccurs="0"/>
-					<xs:element name="SkillLevel" type="xs:string" minOccurs="0"/>
-					<xs:element name="SoundCardDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="SpeakerCount" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="SpeakerDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="SpecialFeatures" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="StoneClarity" type="xs:string" minOccurs="0"/>
-					<xs:element name="StoneColor" type="xs:string" minOccurs="0"/>
-					<xs:element name="StoneCut" type="xs:string" minOccurs="0"/>
-					<xs:element name="StoneShape" type="xs:string" minOccurs="0"/>
-					<xs:element name="StoneWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="Studio" type="xs:string" minOccurs="0"/>
-					<xs:element name="SubscriptionLength" type="tns:NonNegativeIntegerWithUnits" minOccurs="0"/>
-					<xs:element name="SupportedImageType" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="SystemBusSpeed" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="SystemMemorySizeMax" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="SystemMemorySize" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="SystemMemoryType" type="xs:string" minOccurs="0"/>
-					<xs:element name="TellingPageIndicator" type="xs:string" minOccurs="0"/>
-					<xs:element name="TheatricalReleaseDate" type="xs:string" minOccurs="0"/>
-					<xs:element name="Title" type="xs:string" minOccurs="0"/>
-					<xs:element name="TotalDiamondWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="TotalExternalBaysFree" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalFirewirePorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalGemWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="TotalInternalBaysFree" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalMetalWeight" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="TotalNTSCPALPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalParallelPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalPCCardSlots" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalPCISlotsFree" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalSerialPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalSVideoOutPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalUSB2Ports" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalUSBPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="TotalVGAOutPorts" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="UPC" type="xs:string" minOccurs="0"/>
-					<xs:element name="VariationDenomination" type="xs:string" minOccurs="0"/>
-					<xs:element name="VariationDescription" type="xs:string" minOccurs="0"/>
-					<xs:element name="VendorRebate" minOccurs="0">
-	                	<xs:complexType>
-	                    	<xs:sequence>
-	                        	<xs:element name="Type" type="xs:string" minOccurs="0"/>
-	                            <xs:element name="StartDate" type="xs:string" minOccurs="0"/>
-	                            <xs:element name="EndDate" type="xs:string" minOccurs="0"/>
-	                        </xs:sequence>
-	                    </xs:complexType>
-	                </xs:element>
-					<xs:element name="Warranty" type="xs:string" minOccurs="0"/>
-					<xs:element name="WatchMovementType" type="xs:string" minOccurs="0"/>
-					<xs:element name="WebsiteBuyability" type="xs:string" minOccurs="0"/>
-					<xs:element name="WaterResistanceDepth" type="tns:DecimalWithUnits" minOccurs="0"/>
-					<xs:element name="WirelessMicrophoneFrequency" type="xs:nonNegativeInteger" minOccurs="0"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:complexType name="NonNegativeIntegerWithUnits">
-			<xs:simpleContent>
-				<xs:extension base="xs:nonNegativeInteger">
-					<xs:attribute name="Units" type="xs:string" use="required"/>
-				</xs:extension>
-			</xs:simpleContent>
-		</xs:complexType>
-		<xs:complexType name="DecimalWithUnits">
-			<xs:simpleContent>
-				<xs:extension base="xs:decimal">
-					<xs:attribute name="Units" type="xs:string" use="required"/>
-				</xs:extension>
-			</xs:simpleContent>
-		</xs:complexType>
-		<xs:complexType name="StringWithUnits">
-			<xs:simpleContent>
-				<xs:extension base="xs:string">
-					<xs:attribute name="Units" type="xs:string" use="required"/>
-				</xs:extension>
-			</xs:simpleContent>
-		</xs:complexType>
-	        <xs:simpleType name="positiveIntegerOrAll">
-	                <xs:union>
-	                        <xs:simpleType>
-	                                <xs:restriction base="xs:positiveInteger"/>
-	                        </xs:simpleType>
-	                        <xs:simpleType>
-	                                <xs:restriction base="xs:string">
-	                                <xs:enumeration value="All"/>
-	                                </xs:restriction>
-	                        </xs:simpleType>
-	                </xs:union>
-	       </xs:simpleType>
-	</xs:schema>
-    </types>
-    <message name="HelpRequestMsg">
-	<part name="body" element="tns:Help"/>
-    </message>
-    <message name="HelpResponseMsg">
-	<part name="body" element="tns:HelpResponse"/>
-    </message>
-    <message name="ItemSearchRequestMsg">
-	<part name="body" element="tns:ItemSearch"/>
-    </message>
-    <message name="ItemSearchResponseMsg">
-	<part name="body" element="tns:ItemSearchResponse"/>
-    </message>
-    <message name="ItemLookupRequestMsg">
-	<part name="body" element="tns:ItemLookup"/>
-    </message>
-    <message name="ItemLookupResponseMsg">
-	<part name="body" element="tns:ItemLookupResponse"/>
-    </message>
-    <message name="BrowseNodeLookupRequestMsg">
-	<part name="body" element="tns:BrowseNodeLookup"/>
-    </message>
-    <message name="BrowseNodeLookupResponseMsg">
-	<part name="body" element="tns:BrowseNodeLookupResponse"/>
-    </message>
-    <message name="ListSearchRequestMsg">
-	<part name="body" element="tns:ListSearch"/>
-    </message>
-    <message name="ListSearchResponseMsg">
-	<part name="body" element="tns:ListSearchResponse"/>
-    </message>
-    <message name="ListLookupRequestMsg">
-	<part name="body" element="tns:ListLookup"/>
-    </message>
-    <message name="ListLookupResponseMsg">
-	<part name="body" element="tns:ListLookupResponse"/>
-    </message>
-    <message name="CustomerContentSearchRequestMsg">
-	<part name="body" element="tns:CustomerContentSearch"/>
-    </message>
-    <message name="CustomerContentSearchResponseMsg">
-	<part name="body" element="tns:CustomerContentSearchResponse"/>
-    </message>
-    <message name="CustomerContentLookupRequestMsg">
-	<part name="body" element="tns:CustomerContentLookup"/>
-    </message>
-    <message name="CustomerContentLookupResponseMsg">
-	<part name="body" element="tns:CustomerContentLookupResponse"/>
-    </message>
-    <message name="SimilarityLookupRequestMsg">
-	<part name="body" element="tns:SimilarityLookup"/>
-    </message>
-    <message name="SimilarityLookupResponseMsg">
-	<part name="body" element="tns:SimilarityLookupResponse"/>
-    </message>
-    <message name="SellerLookupRequestMsg">
-	<part name="body" element="tns:SellerLookup"/>
-    </message>
-    <message name="SellerLookupResponseMsg">
-	<part name="body" element="tns:SellerLookupResponse"/>
-    </message>
-    <message name="CartGetRequestMsg">
-	<part name="body" element="tns:CartGet"/>
-    </message>
-    <message name="CartGetResponseMsg">
-	<part name="body" element="tns:CartGetResponse"/>
-    </message>
-    <message name="CartAddRequestMsg">
-	<part name="body" element="tns:CartAdd"/>
-    </message>
-    <message name="CartAddResponseMsg">
-	<part name="body" element="tns:CartAddResponse"/>
-    </message>
-    <message name="CartCreateRequestMsg">
-	<part name="body" element="tns:CartCreate"/>
-    </message>
-    <message name="CartCreateResponseMsg">
-	<part name="body" element="tns:CartCreateResponse"/>
-    </message>
-    <message name="CartModifyRequestMsg">
-	<part name="body" element="tns:CartModify"/>
-    </message>
-    <message name="CartModifyResponseMsg">
-	<part name="body" element="tns:CartModifyResponse"/>
-    </message>
-    <message name="CartClearRequestMsg">
-	<part name="body" element="tns:CartClear"/>
-    </message>
-    <message name="CartClearResponseMsg">
-	<part name="body" element="tns:CartClearResponse"/>
-    </message>
-    <message name="TransactionLookupRequestMsg">
-	<part name="body" element="tns:TransactionLookup"/>
-    </message>
-    <message name="TransactionLookupResponseMsg">
-	<part name="body" element="tns:TransactionLookupResponse"/>
-    </message>
-    <message name="SellerListingSearchRequestMsg">
-	<part name="body" element="tns:SellerListingSearch"/>
-    </message>
-    <message name="SellerListingSearchResponseMsg">
-	<part name="body" element="tns:SellerListingSearchResponse"/>
-    </message>
-    <message name="SellerListingLookupRequestMsg">
-	<part name="body" element="tns:SellerListingLookup"/>
-    </message>
-    <message name="TagLookupRequestMsg">
-	<part name="body" element="tns:TagLookup"/>
-    </message>
-    <message name="TagLookupResponseMsg">
-	<part name="body" element="tns:TagLookupResponse"/>
-    </message>
-    <message name="SellerListingLookupResponseMsg">
-	<part name="body" element="tns:SellerListingLookupResponse"/>
-    </message>
-    <message name="MultiOperationRequestMsg">
-	<part name="body" element="tns:MultiOperation"/>
-    </message>
-    <message name="MultiOperationResponseMsg">
-	<part name="body" element="tns:MultiOperationResponse"/>
-    </message>
-    <portType name="AWSECommerceServicePortType">
-	<operation name="Help">
-	    <input message="tns:HelpRequestMsg"/>
-	    <output message="tns:HelpResponseMsg"/>
-	</operation>
-	<operation name="ItemSearch">
-	    <input message="tns:ItemSearchRequestMsg"/>
-	    <output message="tns:ItemSearchResponseMsg"/>
-	</operation>
-	<operation name="ItemLookup">
-	    <input message="tns:ItemLookupRequestMsg"/>
-	    <output message="tns:ItemLookupResponseMsg"/>
-	</operation>
-	<operation name="BrowseNodeLookup">
-	    <input message="tns:BrowseNodeLookupRequestMsg"/>
-	    <output message="tns:BrowseNodeLookupResponseMsg"/>
-	</operation>
-	<operation name="ListSearch">
-	    <input message="tns:ListSearchRequestMsg"/>
-	    <output message="tns:ListSearchResponseMsg"/>
-	</operation>
-	<operation name="ListLookup">
-	    <input message="tns:ListLookupRequestMsg"/>
-	    <output message="tns:ListLookupResponseMsg"/>
-	</operation>
-	<operation name="CustomerContentSearch">
-	    <input message="tns:CustomerContentSearchRequestMsg"/>
-	    <output message="tns:CustomerContentSearchResponseMsg"/>
-	</operation>
-	<operation name="CustomerContentLookup">
-	    <input message="tns:CustomerContentLookupRequestMsg"/>
-	    <output message="tns:CustomerContentLookupResponseMsg"/>
-	</operation>
-	<operation name="SimilarityLookup">
-	    <input message="tns:SimilarityLookupRequestMsg"/>
-	    <output message="tns:SimilarityLookupResponseMsg"/>
-	</operation>
-	<operation name="SellerLookup">
-	    <input message="tns:SellerLookupRequestMsg"/>
-	    <output message="tns:SellerLookupResponseMsg"/>
-	</operation>
-	<operation name="CartGet">
-	    <input message="tns:CartGetRequestMsg"/>
-	    <output message="tns:CartGetResponseMsg"/>
-	</operation>
-	<operation name="CartAdd">
-	    <input message="tns:CartAddRequestMsg"/>
-	    <output message="tns:CartAddResponseMsg"/>
-	</operation>
-	<operation name="CartCreate">
-	    <input message="tns:CartCreateRequestMsg"/>
-	    <output message="tns:CartCreateResponseMsg"/>
-	</operation>
-	<operation name="CartModify">
-	    <input message="tns:CartModifyRequestMsg"/>
-	    <output message="tns:CartModifyResponseMsg"/>
-	</operation>
-	<operation name="CartClear">
-	    <input message="tns:CartClearRequestMsg"/>
-	    <output message="tns:CartClearResponseMsg"/>
-	</operation>
-	<operation name="TransactionLookup">
-	    <input message="tns:TransactionLookupRequestMsg"/>
-	    <output message="tns:TransactionLookupResponseMsg"/>
-	</operation>
-	<operation name="SellerListingSearch">
-	    <input message="tns:SellerListingSearchRequestMsg"/>
-	    <output message="tns:SellerListingSearchResponseMsg"/>
-	</operation>
-	<operation name="SellerListingLookup">
-	    <input message="tns:SellerListingLookupRequestMsg"/>
-	    <output message="tns:SellerListingLookupResponseMsg"/>
-	</operation>
-	<operation name="TagLookup">
-	    <input message="tns:TagLookupRequestMsg"/>
-	    <output message="tns:TagLookupResponseMsg"/>
-	</operation>
-	<operation name="MultiOperation">
-	    <input message="tns:MultiOperationRequestMsg"/>
-	    <output message="tns:MultiOperationResponseMsg"/>
-	</operation>
-    </portType>
-    <binding name="AWSECommerceServiceBinding" type="tns:AWSECommerceServicePortType">
-	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-	<operation name="Help">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="ItemSearch">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="ItemLookup">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="BrowseNodeLookup">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="ListSearch">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="ListLookup">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="CustomerContentSearch">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="CustomerContentLookup">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="SimilarityLookup">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="SellerLookup">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="CartGet">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="CartCreate">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="CartAdd">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="CartModify">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="CartClear">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="TransactionLookup">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="SellerListingSearch">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="SellerListingLookup">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="TagLookup">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-	<operation name="MultiOperation">
-	    <soap:operation soapAction="http://soap.amazon.com"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-    </binding>
-    <service name="AWSECommerceService">
-	<port name="AWSECommerceServicePort" binding="tns:AWSECommerceServiceBinding">
-	    <soap:address location="http://soap.amazon.com/onca/soap?Service=AWSECommerceService"/>
-	</port>
-    </service>
-</definitions>
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/ShoppingService.wsdl b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/ShoppingService.wsdl
deleted file mode 100644
index 0a4871ca88..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/ShoppingService.wsdl
+++ /dev/null
@@ -1,12607 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Version 535 -->

-<!-- Copyright (c) 2003-2007 eBay Inc. All Rights Reserved. -->

-<wsdl:definitions 

-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

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

-    xmlns:xmime="http://www.w3.org/2005/05/xmlmime"

-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 

-    xmlns:ns="urn:ebay:apis:eBLBaseComponents" 

-    xmlns="urn:ebay:apis:eBLBaseComponents"

-    targetNamespace="urn:ebay:apis:eBLBaseComponents">

-    <wsdl:types>

-        <xs:schema targetNamespace="urn:ebay:apis:eBLBaseComponents"  

-        xmlns:ns="urn:ebay:apis:eBLBaseComponents" 

-        xmlns="urn:ebay:apis:eBLBaseComponents"

-        xmlns:xmime="http://www.w3.org/2005/05/xmlmime"

-        xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">

-

-

-    <!-- ##### SHARED_TYPES ##### -->

-    <!--  

-##### from file ./../Shared/xsd/AbstractRequestType.xsd #####

-

--->

-    <xs:complexType name="AbstractRequestType" abstract="true">

-        <xs:annotation>

-            <xs:documentation>

-                Base type definition of the request payload, which can carry any type

-                of payload content plus optional versioning information and detail level requirements.

-                All concrete request types are derived from the abstract request type.

-                The naming convention we use for the concrete type names is the name of the service

-                (the verb or call name) followed by "RequestType": VerbNameRequestType

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="MessageID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        If you pass a value in MessageID in a request,

-                        we'll return the same value in CorrelationID in the response.

-                        If you're making a lot of calls, you can use this for tracking that a

-                        response is returned for every request and to match

-                        particular responses to particular requests. (In this case, specify

-                        a different value for each request.) You can specify any value

-                        that is useful to you.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <MaxLength/>

-                        <CallInfo>

-                            <AllCalls/>

-                            <RequiredInput>No</RequiredInput>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-##### from file ./../Shared/xsd/AbstractResponseType.xsd #####

-

--->

-    <xs:complexType name="AbstractResponseType" abstract="true">

-        <xs:annotation>

-            <xs:documentation>

-                Base type definition of a response payload that can carry any

-                type of payload content with following optional elements:&lt;br&gt;

-                - timestamp of response message&lt;br&gt;

-                - application-level acknowledgement&lt;br&gt;

-                - application-level (business-level) errors and warnings

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="Timestamp" type="xs:dateTime" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        This value represents the date and time when eBay processed the

-                        request. The time zone of this value is &lt;a href="types/simpleTypes.html#dateTime"&gt;GMT&lt;/a&gt;

-                        and the format is the

-                        ISO 8601 date and time format (YYYY-MM-DDTHH:MM:SS.SSSZ).

-                        See the "dateTime" type for information about this

-                        time format and converting to and from the GMT time zone.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Ack" type="ns:AckCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Indiates whether the call was successfully processed by eBay.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Always</Returned>

-                            <AllValuesExcept>PartialFailure</AllValuesExcept>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Errors" type="ns:ErrorType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        A list of application-level errors or warnings (if any) that were raised

-                        when eBay processed the request. &lt;br&gt;

-                        &lt;br&gt;

-                        Application-level errors occur due to

-                        problems with business-level data on the client side or on the eBay

-                        server side. For example, an error would occur if the request contains

-                        an invalid combination of fields, or it is missing a required field,

-                        or the value of the field is not recognized. An error could also occur

-                        if eBay encountered a problem in our internal business logic while

-                        processing the request.&lt;br&gt;

-                        &lt;br&gt;

-                        Only returned if there were warnings or errors.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Build" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        This refers to the particular software build that eBay used when

-                        processing the request and generating the response. This includes the

-                        version number plus additional information. eBay Developer Support may

-                        request the build information when helping you resolve technical issues.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Version" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The release version that eBay used to process the request.

-                        &lt;br&gt;

-                        &lt;br&gt;

-                        &lt;span class="tablenote"&gt;&lt;b&gt;Note:&lt;/b&gt;

-                        This is usually the latest release version, as specified in the

-                        release notes. (eBay releases the API to international sites

-                        about a week after we release it to the US site.) &lt;/span&gt;&lt;br&gt;

-                        &lt;br&gt;

-                        If a field in the response returns the token "CustomCode", it usually

-                        means that the field is a code type (a token or enumeration),

-                        and that in your request URL (or HTTP header) you specified a

-                        version that is older than the version in which the token was added

-                        to the call.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <SeeLink>

-                            <Title>eBay Versioning Strategy</Title>

-                            <URL>http://developer.ebay.com/DevZone/XML/docs/HowTo/eBayWS/eBaySchemaVersioning.html</URL>

-                        </SeeLink>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CorrelationID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        If you pass a value in MessageID in a request, we will return the same

-                        value in CorrelationID in the response. You can use this for tracking

-                        that a response is returned for every request and to match particular

-                        responses to particular requests. Only returned if MessageID was used.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-##### from file ./../Shared/xsd/AckCodeList.xsd #####

-

--->

-    <xs:simpleType name="AckCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                AckCodeType - Type declaration to be used by other schema. This code identifies

-                the acknowledgement code types that eBay could use to communicate the status of

-                processing a (request) message to an application. This code would be used as part

-                of a response message that contains an application-level acknowledgement element.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="Success">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Request processing succeeded

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Failure">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Request processing failed

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Warning">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Request processing completed with warning information

-                        being included in the response message

-                     </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="PartialFailure">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Request processing completed with some failures.

-                        See the Errors data to determine which portions of the request failed.

-                     </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for internal or future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-##### from file ./../Shared/xsd/ErrorClassificationCodeList.xsd #####

-

--->

-    <xs:simpleType name="ErrorClassificationCodeType">

-        <xs:annotation>

-            <xs:documentation>

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="RequestError">

-                <xs:annotation>

-                    <xs:documentation>

-                    An error has occurred either as a result of a problem in the sending application or because 

-                    the application's end-user has attempted to submit invalid data (or missing data). 

-                    In these cases, do not retry the request. The problem must be corrected before the request 

-                    can be made again. If the problem is due to something in the application (such as a missing 

-                    required field), the application must be changed. If the problem is a result of end-user data, 

-                    the application must alert the end-user to the problem and provide the means for the end-user 

-                    to correct the data. Once the problem in the application or data is resolved, resend the request to eBay

-                    with the corrected data. 

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="SystemError">

-                <xs:annotation>

-                    <xs:documentation>

-                    Indicates that an error has occurred on the eBay system side, such as a database or server down. 

-                    An application can retry the request as-is a reasonable number of times (eBay recommends twice). 

-                    If the error persists, contact Developer Technical Support. Once the problem has been resolved, 

-                    the request may be resent in its original form. 

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for internal or future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-##### from file ./../Shared/xsd/ErrorParameterType.xsd #####

-

--->

-    <xs:complexType name="ErrorParameterType">

-        <xs:annotation>

-            <xs:documentation>

-                A variable that contains specific information about the context of this error.

-                For example, if you pass in an attribute set ID that does not match

-                the specified category, the attribute set ID might be returned as an error parameter.

-                Use error parameters to flag fields that users need to correct.

-                Also use error parameters to distinguish between errors when multiple

-                errors are returned.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="Value" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The value of the variable.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-        <xs:attribute name="ParamID" type="xs:string">

-            <xs:annotation>

-                <xs:documentation>

-                The index of the parameter in the error.

-                </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-            </xs:annotation>

-        </xs:attribute>

-    </xs:complexType>

-<!--  

-##### from file ./../Shared/xsd/ErrorType.xsd #####

-

--->

-    <xs:complexType name="ErrorType">

-        <xs:annotation>

-            <xs:documentation>

-                These are request errors (as opposed to system errors) that occur due to problems

-                with business-level data (e.g., an invalid combination of arguments) that

-                the application passed in.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="ShortMessage" type="xs:string"  minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A brief description of the condition that raised the error.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <SeeLink>

-                            <Title>Errors by Number</Title>

-                            <URL>Errors/ErrorMessages.html</URL>

-                        </SeeLink>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="LongMessage" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A more detailed description of the condition that raised the error.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <SeeLink>

-                            <Title>Errors by Number</Title>

-                            <URL>Errors/ErrorMessages.html</URL>

-                        </SeeLink>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ErrorCode" type="xs:token" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A unique code that identifies the particular error condition that occurred.

-                        Your application can use error codes as identifiers

-                        in your customized error-handling algorithms.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <SeeLink>

-                            <Title>Errors by Number</Title>

-                            <URL>Errors/ErrorMessages.html</URL>

-                        </SeeLink>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="UserDisplayHint" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        This field is not currently in use for eBay Shopping Web Services.

-                        Indicates whether the error message text is intended to be displayed to

-                        an end user or intended only to be parsed by the application.

-                        If true or not present (the default), the message text is intended for the end user. If false, the message text is intended for

-                        the application, and the application should translate the error into a more appropriate message.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <NoCalls/>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="SeverityCode" type="ns:SeverityCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Indicates whether the error caused the request to fail.&lt;br&gt;

-                        &lt;br&gt;

-                        If the request fails and the source of the problem is within the

-                        application (such as a missing required element), please change the

-                        application before you  retry the request. If the problem is due to

-                        end-user input data, please alert the end-user to the problem and

-                        provide the means for them to correct the data. Once the problem in the

-                        application or data is resolved, you can attempt to re-send the request

-                        to eBay.&lt;br&gt;

-                        &lt;br&gt;

-                        If the source of the problem is on eBay's side, you can retry the

-                        request as-is a reasonable number of times (eBay recommends twice).

-                        If the error persists, contact Developer Technical Support. Once the

-                        problem has been resolved, the request may be resent in its original

-                        form.&lt;br&gt;

-                        &lt;br&gt;

-                        When a warning occurs, the error is returned in addition to the business

-                        data. In this case, you do not need to retry the request (as the

-                        original request was successful). However, depending on the cause or

-                        nature of the warning, you might need to contact either the end user or

-                        eBay to effect a long term solution to the problem to prevent it from

-                        reoccurring in the future.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <SeeLink>

-                            <Title>Errors by Number</Title>

-                            <URL>Errors/ErrorMessages.html</URL>

-                        </SeeLink>

-                        <SeeLink>

-                            <Title>Requirements for Error Handling

-</Title>

-                            <URL>http://developer.ebay.com/DevZone/XML/docs/WebHelp/index.htm?context=eBay_XML_API&amp;topic=ErrorHandlingGuidelines</URL>

-                            <For>more information (in the eBay Trading Web Services guide)</For>

-                        </SeeLink>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ErrorParameters" type="ns:ErrorParameterType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Some warning and error messages return one or more variables that

-                        contain contextual information about the error. This is often the

-                        field or value that triggered the error.

-                        You can usually predict where these will

-                        occur by looking at the "replaceable_value" indicators in our

-                        Errors by Number page.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <SeeLink>

-                            <Title>Errors by Number</Title>

-                            <URL>Errors/ErrorMessages.html</URL>

-                        </SeeLink>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ErrorClassification" type="ns:ErrorClassificationCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        API errors are divided between two classes: system errors and request errors.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <AllCalls/>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <SeeLink>

-                            <Title>Errors by Number</Title>

-                            <URL>Errors/ErrorMessages.html</URL>

-                        </SeeLink>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-##### from file ./../Shared/xsd/SeverityCodeList.xsd #####

-

--->

-    <xs:simpleType name="SeverityCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                SeverityCodeType - Type declaration to be used by other schema. This code

-                identifies the severity of an API error. A code indicates whether there is an API-

-                level error or warning that needs to be communicated to the client.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="Warning">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) The request was processed successfully, but something occurred

-                        that may affect your application or the user. For example, eBay may have

-                        changed a value the user sent in. In this case, eBay returns a normal,

-                        successful response and also returns the warning.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Error">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) The request that triggered the error was not processed

-                        successfully. When a serious application-level error occurs, the error

-                        is returned instead of the business data.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for internal or future use

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-

-

-    <!-- ##### XSD_TYPES ##### -->

-<!--  

-

-##### from file ../Shopping/xsd/AmountType.xsd #####

-

--->

-    <xs:complexType name="AmountType">

-    <xs:annotation>

-        <xs:documentation>

-            Basic type for specifying monetary amounts. A double value (e.g.,

-            1.00 or 1.0) is meaningful as a monetary amount when accompanied by a

-            specification of the currency, in which case the value specifies

-            the amount in that currency. An AmountType expresses both the value

-            (a double) and the currency. Details such as prices, fees, costs,

-            and payments are specified as amount types.

-        </xs:documentation>

-    </xs:annotation>

-    <xs:simpleContent>

-        <xs:extension base="xs:double">

-            <xs:attribute name="currencyID" type="ns:CurrencyCodeType" use="required">

-                <xs:annotation>

-                    <xs:documentation>

-                        Currency in which the monetary amount is specified.

-                        See CurrencyCodeType for applicable values.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <AllValuesExcept>INR, CAD, HKD, AUD, CHF, MYR, EUR, PHP, PLN, USD, SGD, SEK, GBP</AllValuesExcept>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <RequiredInput>No</RequiredInput>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:attribute>

-        </xs:extension>

-    </xs:simpleContent>

-</xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/AverageRatingDetailsType.xsd #####

-

--->

-    <xs:complexType name="AverageRatingDetailsType">

-        <xs:annotation>

-            <xs:documentation> 

-                    Applicable to sites that support the Detailed Seller Ratings feature.

-                    The AverageRatingDetailsType contains the average detailed seller ratings in an area. When buyers leave an overall Feedback rating (positive, neutral, or negative) for a seller, they also can leave ratings in four areas: item as described, communication, shipping time, and charges for shipping and handling. Users retrieve detailed ratings as averages of the ratings left by buyers. 

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="RatingDetail" type="ns:FeedbackRatingDetailCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The area of a specific average detailed seller rating.

-                        Users retrieve detailed ratings as averages of the ratings left by buyers.

-                        When buyers leave an overall Feedback rating (positive, neutral, or negative)

-                        for a seller, they also can leave ratings in four areas:

-                        item as described, communication, shipping time, and charges for shipping and handling. 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Rating" type="xs:double" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation> 

-                        An average detailed seller rating applying to the area in the corresponding RatingDetail field. 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="RatingCount" type="xs:long" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation> 

-                        The number of detailed seller ratings in the area

-                        in the corresponding RatingDetail field. 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/BuyerPaymentMethodCodeList.xsd #####

-

--->

-    <xs:simpleType name="BuyerPaymentMethodCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Identifies payment methods used by a buyer to pay a

-                seller. On item listings, identifies one of the payment methods

-                seller will accept for the item. Available payment methods can

-                differ by site and item. Payment methods are not applicable to eBay

-                Real Estate ad format listings.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="None">

-                <xs:annotation>

-                    <xs:documentation>

-                        No payment method specified.

-                        For example, no payment methods would be specified for Ad format listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="MOCC">

-                <xs:annotation>

-                    <xs:documentation>

-                        Money order/cashiers check.

-                        Not applicable to US/CA eBay Motors listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="AmEx">

-                <xs:annotation>

-                    <xs:documentation>

-                        American Express.

-                        Not applicable to US/CA eBay Motors listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="PaymentSeeDescription">

-                <xs:annotation>

-                    <xs:documentation>

-                        Payment instructions are contained in the item's description.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CCAccepted">

-                <xs:annotation>

-                    <xs:documentation>

-                        Credit card.

-                        Not applicable to Real Estate or US/CA eBay Motors listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="PersonalCheck">

-                <xs:annotation>

-                    <xs:documentation>

-                        Personal check.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="COD">

-                <xs:annotation>

-                    <xs:documentation>

-                        Cash on delivery.

-                        Only applicable to the following eBay sites: AT (16), BEFR (24),

-                        BENL (123), CH (193), DE (77), ES (186), FR (71), HK (201), IN (203),

-                        IT (101), PL (212), and SG (216).

-                        Not applicable to Real Estate listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="VisaMC">

-                <xs:annotation>

-                    <xs:documentation>

-                        Visa/Mastercard. These qualify as safe payment methods.

-                        Not applicable to US/CA eBay Motors listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="PaisaPayAccepted">

-                <xs:annotation>

-                    <xs:documentation>

-                        PaisaPay (for India site only). This qualifies as a safe payment method.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Other">

-                <xs:annotation>

-                    <xs:documentation>

-                        Other forms of payment.

-                        Not applicable to US/CA eBay Motors listings

-                        (see PaymentSeeDescription instead).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="PayPal">

-                <xs:annotation>

-                    <xs:documentation>

-                        PayPal is accepted as a payment method. This qualifies as a safe payment method. &lt;br&gt;

-                        &lt;br&gt;

-                        If PayPal is specified for US/CA eBay Motors vehicles, it is for

-                        the vehicle deposit (not for purchasing the vehicle).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Discover">

-                <xs:annotation>

-                    <xs:documentation>

-                        Discover card.

-                        Not applicable to US/CA eBay Motors listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CashOnPickup">

-                <xs:annotation>

-                    <xs:documentation>

-                        Payment on delivery.

-                        Not applicable to Real Estate or US/CA eBay Motors listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="MoneyXferAccepted">

-                <xs:annotation>

-                    <xs:documentation>

-                        Direct transfer of money.

-                        Not applicable to US/CA eBay Motors listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="MoneyXferAcceptedInCheckout">

-                <xs:annotation>

-                    <xs:documentation>

-                        If the seller has bank account information on file, and

-                        MoneyXferAcceptedInCheckout = true, then the bank account

-                        information will be displayed in Checkout.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="OtherOnlinePayments">

-                <xs:annotation>

-                    <xs:documentation>

-                        All other online payments.

-                        Not applicable to US/CA eBay Motors listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Escrow">

-                <xs:annotation>

-                    <xs:documentation>

-                        Deprecated.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="PrePayDelivery">

-                <xs:annotation>

-                    <xs:documentation>

-                        Deprecated.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CODPrePayDelivery">

-                <xs:annotation>

-                    <xs:documentation>

-                        Deprecated.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="PostalTransfer">

-                <xs:annotation>

-                    <xs:documentation>

-                        Deprecated.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        Placeholder value. See

-                        &lt;a href="types/simpleTypes.html#token"&gt;token&lt;/a&gt;.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="LoanCheck">

-                <xs:annotation>

-                    <xs:documentation>

-                        Loan check option (applicable only to the US eBay Motors site,

-                        except in the Parts and Accessories category, and the eBay Canada site for motors).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CashInPerson">

-                <xs:annotation>

-                    <xs:documentation>

-                        Cash-in-person option. Applicable only to US and Canada eBay Motors vehicles,

-                        (not the Parts and Accessories category).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="ELV">

-                <xs:annotation>

-                    <xs:documentation>

-                        Elektronisches Lastschriftverfahren (direct debit).

-                        Only applicable to Express Germany.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/BuyingGuideDetailsType.xsd #####

-

--->

-    <xs:complexType name="BuyingGuideDetailsType">

-        <xs:annotation>

-            <xs:documentation>

-                Information about zero or more buying guides and the site's buying guide hub.

-                Buying guides contain content about particular product areas, categories, or subjects

-                to help buyers decide which type of item to purchase based on their particular interests.

-                Multiple buying guides can be returned. See the eBay Web Services Guide for additional information.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="BuyingGuide" type="ns:BuyingGuideType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Information that identifies a buying guide. A buying guide contains content about particular

-                        product areas, categories, or subjects to help buyers decide which type of item

-                        to purchase based on their particular interests.

-                        Buying guides are useful to buyers who do not have a specific product in mind.

-                        For example, a digital camera buying guide could help a buyer determine what kind of

-                        digital camera is right for them.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="BuyingGuideHub" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        URL of the buying guide home page for the site being searched.

-                        Your application can present this URL as a link. Optionally,

-                        you can use a value like "See all buying guides" as the link's

-                        display name. 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/BuyingGuideType.xsd #####

-

--->

-    <xs:complexType name="BuyingGuideType">

-        <xs:annotation>

-            <xs:documentation>

-                Information that identifies a buying guide. A buying guide provides content about particular

-                product areas, categories, or subjects to help buyers decide which type of item

-                to purchase based on their particular interests.

-                Buying guides are useful to buyers who do not have a specific product in mind.

-                For example, a digital camera buying guide could help a buyer determine what kind of

-                digital camera is right for them.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="Name" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                    Display name of the buying guide. &lt;br&gt;

-                    &lt;br&gt;

-                    FindReviewsAndGuides only returns 20 characters, followed by "..." if the name is

-                    longer than 20 characters. For the full title, see BuyingGuide.Title

-                    instead.

-                </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="URL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                    URL for the buying guide. Your application can

-                    present this as a link. Use the value of Name or Title as the link's display name.

-                </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CategoryID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                    Identifies the category (if any) that is associated

-                    with the buying guide. For FindReviewsAndGuides, this can be a category that is higher or lower in the hierarchy

-                    than the category specified in the request. For a matching categories search,

-                    you can use this information to determine the order that the buying guides are

-                    returned in when multiple guides are found.

-                    Optionally, you can use this information to determine where to present

-                    the buying guide link in your application.

-                </xs:documentation>

-                    <xs:appinfo>

-                        <MaxLength>10</MaxLength>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Title" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The title of the buying guide.

-                   </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <MaxLength>55</MaxLength>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Text" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The text of the guide. If the guide is longer than

-                        2000 characters, the text is cut off and it ends with "...".

-                        See BuyingGuide.URL for a link to the full text of the review.

-                   </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <MaxLength>2000</MaxLength>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CreationTime" type="xs:dateTime" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The time and date when the guide was posted.

-                   </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="UserID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The author's eBay user ID.

-                   </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/CatalogProductType.xsd #####

-

--->

-    <xs:complexType name="CatalogProductType">

-        <xs:annotation>

-            <xs:documentation>

-            Information about an eBay catalog product.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="DomainName" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The name of the domain in which the product was found.

-                        If the product is mapped to multiple domains, eBay returns

-                        the most applicable domain (as determined by eBay).

-                        Always returned when Product is returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="DetailsURL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Fully qualified URL for optional information about the product,

-                        such as a movie's description or film credits. This information

-                        is hosted through the eBay Web site and it cannot be edited.

-                        Portions of the content are protected by copyright.

-                        Applications can include this URL as a link in product search results

-                        so that end users can view additional descriptive details about

-                        the product. This is usually always returned when Product is returned,

-                        but it may be safest to check for the existence of this field.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="DisplayStockPhotos" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        If true, your application can attempt to display stock photos that

-                        are returned. If false, your application should not attempt to display

-                        any stock photos that are returned. This recommendation is useful for

-                        catalog data related to products like coins, where stock photos are not

-                        necessarily applicable or available. An application with a graphical

-                        user interface can use this flag to determine

-                        when to hide customized stock photo widgets.

-                        Always returned when Product is returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ProductID" type="ns:ProductIDType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        The eBay or external IDs associated with the product. Use the Reference

-                        value as input to search for the same product in the future, or

-                        use the ISBN, EAN, or UPC value (if returned).

-                        The ISBN, EAN, and UPC values can also be useful as keys

-                        if your application is comparing products across different sites.

-                        Always returned when Product is returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ItemCount" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                    Total number of listings on the requested eBay site that use

-                    stock information from this catalog product. This value can be greater

-                    than the number of listings returned in ItemArray. To retrieve more

-                    listings, use FindItemsAdvanced.

-                    Only returned when you search by ProductID (and you pass

-                    Items or Details in IncludeSelector).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <Min>0</Min>

-                        <Max/>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ItemSpecifics" type="ns:NameValueListArrayType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A list of name/value pairs that are included in the product's

-                        pre-filled Item Specifics. These indicate common aspects or

-                        characteristics of the product, such as Publisher (for a book).

-                        Also see ProductID for ISBN, UPC, or EAN values, if applicable.

-                        This is usually returned. (We are not aware of any cases in which this

-                        node is not be returned. However, it may be safest to check for the

-                        existence of this node.)

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ReviewCount" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The total number of reviews that are available for this product

-                        on the eBay Web site. This can be greater than the number of

-                        reviews returned by FindProducts. In a future release, we will provide

-                        the capability to retrieve details about reviews.

-                        Always returned when Product is returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram, Details</Details>

-                            <Min>0</Min>

-                            <Max/>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="StockPhotoURL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Fully qualified URL for a stock image (if any) that is associated

-                        with the eBay catalog product. The URL is for the image eBay

-                        usually displays in product search results (usually 70px tall).

-                        It may be helpful to calculate the dimensions of the photo

-                        programmatically before displaying it.

-                        Only returned if a URL is available for the product.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Title" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The title of the product, as specified in the catalog.

-                        Always returned when Product is returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/CategoryArrayType.xsd #####

-

--->

-    <xs:complexType name="CategoryArrayType">

-        <xs:annotation>

-            <xs:documentation>

-                Container for a list of categories.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="Category" type="ns:CategoryType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Contains details about a category.

-                    </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <Details>IncludeSelector: CategoryHistogram</Details>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                                <CallInfo>

-                                    <CallName>GetCategoryInfo</CallName>

-                                    <Details>IncludeSelector: ChildCategories</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/CategoryType.xsd #####

-

--->

-    <xs:complexType name="CategoryType">

-        <xs:annotation>

-            <xs:documentation>

-                Contains details about a category.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="CategoryID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The numeric ID of a category on eBay.

-                        &lt;br&gt;

-                        &lt;br&gt;

-                        Use an ID of -1 to retrieve the root category and the top-level (level 1) meta categories. You can determine other CategoryIDs from the response from this call, or from a specific item (retrieved from another call like FindItemsAdvanced or GetSingleItem), or from the eBay website.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Details>IncludeSelector: CategoryHistogram</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetCategoryInfo</CallName>

-                            <Details>IncludeSelector: None, ChildCategories</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CategoryLevel" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The level where the category fits in the site's category hierarchy.

-                        For example, if this field has a value of 2, then the category is 2

-                        levels below the root category.

-                        &lt;br&gt;

-                        &lt;br&gt;

-                        Note that the value of CategoryLevel will always be 1 level below the level

-                        of the requested category. To retrieve a category's children, pass its CategoryID back into the request.

-                        &lt;br&gt;

-                        &lt;br&gt;

-                        In the FindItemsAdvanced response, ItemCount indicates the total

-                        quantity of matching items in the category.

-                        &lt;br&gt;

-                        &lt;br&gt;

-                        In the FindItemsAdvanced response, sibling categories

-                        (i.e., matching categories at the same level) are sorted by ItemCount,

-                        descending order.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Details>IncludeSelector: CategoryHistogram</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetCategoryInfo</CallName>

-                            <Details>IncludeSelector: None, ChildCategories</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CategoryName" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Display name of the category as it would appear on

-                        the eBay Web site.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Details>IncludeSelector: CategoryHistogram</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetCategoryInfo</CallName>

-                            <Details>IncludeSelector: None, ChildCategories</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CategoryParentID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Category ID identifying a category that is an ancestor of

-                        the category indicated in CategoryID.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Details>IncludeSelector: CategoryHistogram</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetCategoryInfo</CallName>

-                            <Details>IncludeSelector: None, ChildCategories</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CategoryParentName" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Display name of the category indicated in CategoryParentID.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Details>IncludeSelector: CategoryHistogram</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetCategoryInfo</CallName>

-                            <Details>IncludeSelector: None, ChildCategories</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ItemCount" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The total quantity of matching items in the category.

-                        In the FindItemsAdvanced response, matching categories at the same level

-                        (i.e., sibling categories) are sorted by ItemCount. That is, if the request

-                        specifies that fewer categories or subcategories should be returned,

-                        the ones with the most matching items are returned first.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Details>IncludeSelector: CategoryHistogram</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CategoryNamePath" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The fully qualified category display name as it would appear on the

-                        eBay site (e.g., Home &amp; Garden:Kitchen:Tools &amp; Gadgets).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetCategoryInfo</CallName>

-                            <Details>IncludeSelector: None, ChildCategories</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CategoryIDPath" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The fully qualified category ID (e.g., 11700:20625:20635 for Home &amp; Garden:Kitchen:Tools &amp; Gadgets).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetCategoryInfo</CallName>

-                            <Details>IncludeSelector: None, ChildCategories</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="LeafCategory" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        If true, indicates that the category indicated in CategoryID is a leaf category, in which items may be listed (if the category is not also

-                        expired or virtual).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetCategoryInfo</CallName>

-                            <Details>IncludeSelector: None, ChildCategories</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/CharityStatusCodeList.xsd #####

-

--->

-    <xs:simpleType name="CharityStatusCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                CharityStatusCodeType - Type declaration to be used by other schema.

-                Indicates the nonprofit status of the nonprofit charity organization registered with the dedicated eBay Giving Works provider.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="Valid">

-                <xs:annotation>

-                    <xs:documentation>

-                      (out) The specified nonprofit charity organization is a valid nonprofit charity organization according to the requirements of the dedicated eBay Giving Works provider.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="NoLongerValid">

-                <xs:annotation>

-                    <xs:documentation>

-                      (out) The specified nonprofit charity organization is no longer a valid nonprofit charity organization according to the requirements of the dedicated eBay Giving Works provider.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for internal or future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/CharityType.xsd #####

-

--->

-    <xs:complexType name="CharityType">

-        <xs:annotation>

-            <xs:documentation>

-                Identifies a Giving Works listing and benefiting nonprofit charity organization.

-                Currently supported through the US and eBay Motors sites only. The Ad Format and

-                Mature Audiences categories are not supported.

-                Not applicable for US eBay Motors, international, Real Estate, and Tickets.

-            </xs:documentation>

-            <xs:appinfo>

-                <CallInfo>

-                    <CallName>GetSingleItem</CallName>

-                    <Returned>Conditionally</Returned>

-                    <Details>IncludeSelector: Details</Details>

-                </CallInfo>

-            </xs:appinfo>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="CharityID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A unique identification number assigned by eBay to

-                        registered nonprofit charity organizations.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CharityName" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The name of the benefiting nonprofit charity organization selected by the

-                        charity seller.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CharityNumber" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A unique identification number assigned to a nonprofit

-                        charity organization by the dedicated provider of

-                        eBay Giving Works. Being superseded by CharityID. Max 10

-                        digits.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="DonationPercent" type="xs:float" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The percentage of the purchase price that the

-                        seller chooses to donate to the selected nonprofit

-                        organization. This percentage is displayed in the Giving

-                        Works item listing. Possible values: 10.0 to 100.0.

-                        Percentages must increment by 5.0. Minimum donation

-                        percentages may be required for Giving Works listings, see

-                        http://pages.ebay.com/help/sell/selling-nonprofit.html for

-                        details. DonationPercent is required input when listing

-                        Giving Works items.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Mission" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The stated mission of the nonprofit charity

-                        organization. This mission is displayed in the Giving Works

-                        item listing.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="LogoURL" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The URL of the nonprofit charity organization. This

-                        URL is displayed in the Giving Works item listing.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CharityListing" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        If true, indicates that the seller has chosen to use

-                        eBay Giving Works to donate a percentage of the item's

-                        purchase price to a selected nonprofit organization.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Status" type="ns:CharityStatusCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The status of the nonprofit charity organization.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/CommentTypeCodeList.xsd #####

-

--->

-    <xs:simpleType name="CommentTypeCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                CommentTypeCodeType - Type declaration to be used by other schema.

-                These are the possible codes to specify the types of feedback/comment.

-                Additional information about feedback is available in the online Help of the eBay site.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="Positive">

-                <xs:annotation>

-                    <xs:documentation>

-                                (in/out) Positive feedback. Increases total feedback score.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Neutral">

-                <xs:annotation>

-                    <xs:documentation>

-                                (in/out) Neutral feedback. No effect on total feedback score.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Negative">

-                <xs:annotation>

-                    <xs:documentation>

-                                (in/out) Negative feedback. Decreases total feedback score.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Withdrawn">

-                <xs:annotation>

-                    <xs:documentation>

-                                (out) Withdrawn feedback. Removes the effect of the original

-                                feedback on total feedback score. Comments from withdrawn feedback

-                                are still visible.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="IndependentlyWithdrawn">

-                <xs:annotation>

-                    <xs:documentation>

-                                (out) Applies to the eBay Motors site only. Feedback is withdrawn based on

-                                the decision of a third party.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                                (out) Reserved for internal or future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/CountryCodeList.xsd #####

-

--->

-    <xs:simpleType name="CountryCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Defines the standard 2-letter ISO 3166 country code set, plus

-                some additional country codes that eBay uses.

-                (The additional codes appear at the end of this code list and

-                are noted as non-ISO.)

-                For English names that correspond to each code (e.g., KY="Cayman Islands"),

-                see the ISO site:

-                http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="AF"/>

-            <xs:enumeration value="AL"/>

-            <xs:enumeration value="DZ"/>

-            <xs:enumeration value="AS"/>

-            <xs:enumeration value="AD"/>

-            <xs:enumeration value="AO"/>

-            <xs:enumeration value="AI"/>

-            <xs:enumeration value="AQ"/>

-            <xs:enumeration value="AG"/>

-            <xs:enumeration value="AR"/>

-            <xs:enumeration value="AM"/>

-            <xs:enumeration value="AW"/>

-            <xs:enumeration value="AU"/>

-            <xs:enumeration value="AT"/>

-            <xs:enumeration value="AZ"/>

-            <xs:enumeration value="BS"/>

-            <xs:enumeration value="BH"/>

-            <xs:enumeration value="BD"/>

-            <xs:enumeration value="BB"/>

-            <xs:enumeration value="BY"/>

-            <xs:enumeration value="BE"/>

-            <xs:enumeration value="BZ"/>

-            <xs:enumeration value="BJ"/>

-            <xs:enumeration value="BM"/>

-            <xs:enumeration value="BT"/>

-            <xs:enumeration value="BO"/>

-            <xs:enumeration value="BA"/>

-            <xs:enumeration value="BW"/>

-            <xs:enumeration value="BV"/>

-            <xs:enumeration value="BR"/>

-            <xs:enumeration value="IO"/>

-            <xs:enumeration value="BN"/>

-            <xs:enumeration value="BG"/>

-            <xs:enumeration value="BF"/>

-            <xs:enumeration value="BI"/>

-            <xs:enumeration value="KH"/>

-            <xs:enumeration value="CM"/>

-            <xs:enumeration value="CA"/>

-            <xs:enumeration value="CV"/>

-            <xs:enumeration value="KY"/>

-            <xs:enumeration value="CF"/>

-            <xs:enumeration value="TD"/>

-            <xs:enumeration value="CL"/>

-            <xs:enumeration value="CN"/>

-            <xs:enumeration value="CX"/>

-            <xs:enumeration value="CC"/>

-            <xs:enumeration value="CO"/>

-            <xs:enumeration value="KM"/>

-            <xs:enumeration value="CG"/>

-            <xs:enumeration value="CD"/>

-            <xs:enumeration value="CK"/>

-            <xs:enumeration value="CR"/>

-            <xs:enumeration value="CI"/>

-            <xs:enumeration value="HR"/>

-            <xs:enumeration value="CU"/>

-            <xs:enumeration value="CY"/>

-            <xs:enumeration value="CZ"/>

-            <xs:enumeration value="DK"/>

-            <xs:enumeration value="DJ"/>

-            <xs:enumeration value="DM"/>

-            <xs:enumeration value="DO"/>

-            <xs:enumeration value="TP"/>

-            <xs:enumeration value="EC"/>

-            <xs:enumeration value="EG"/>

-            <xs:enumeration value="SV"/>

-            <xs:enumeration value="GQ"/>

-            <xs:enumeration value="ER"/>

-            <xs:enumeration value="EE"/>

-            <xs:enumeration value="ET"/>

-            <xs:enumeration value="FK"/>

-            <xs:enumeration value="FO"/>

-            <xs:enumeration value="FJ"/>

-            <xs:enumeration value="FI"/>

-            <xs:enumeration value="FR"/>

-            <xs:enumeration value="GF"/>

-            <xs:enumeration value="PF">

-                <xs:annotation>

-                    <xs:documentation>

-                        French Polynesia. Includes Tahiti.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="TF"/>

-            <xs:enumeration value="GA"/>

-            <xs:enumeration value="GM"/>

-            <xs:enumeration value="GE"/>

-            <xs:enumeration value="DE"/>

-            <xs:enumeration value="GH"/>

-            <xs:enumeration value="GI"/>

-            <xs:enumeration value="GR"/>

-            <xs:enumeration value="GL"/>

-            <xs:enumeration value="GD"/>

-            <xs:enumeration value="GP"/>

-            <xs:enumeration value="GU"/>

-            <xs:enumeration value="GT"/>

-            <xs:enumeration value="GN"/>

-            <xs:enumeration value="GW"/>

-            <xs:enumeration value="GY"/>

-            <xs:enumeration value="HT"/>

-            <xs:enumeration value="HM"/>

-            <xs:enumeration value="VA"/>

-            <xs:enumeration value="HN"/>

-            <xs:enumeration value="HK"/>

-            <xs:enumeration value="HU"/>

-            <xs:enumeration value="IS"/>

-            <xs:enumeration value="IN"/>

-            <xs:enumeration value="ID"/>

-            <xs:enumeration value="IR"/>

-            <xs:enumeration value="IQ"/>

-            <xs:enumeration value="IE"/>

-            <xs:enumeration value="IL"/>

-            <xs:enumeration value="IT"/>

-            <xs:enumeration value="JM"/>

-            <xs:enumeration value="JP"/>

-            <xs:enumeration value="JO"/>

-            <xs:enumeration value="KZ"/>

-            <xs:enumeration value="KE"/>

-            <xs:enumeration value="KI"/>

-            <xs:enumeration value="KP"/>

-            <xs:enumeration value="KR"/>

-            <xs:enumeration value="KW"/>

-            <xs:enumeration value="KG"/>

-            <xs:enumeration value="LA"/>

-            <xs:enumeration value="LV"/>

-            <xs:enumeration value="LB"/>

-            <xs:enumeration value="LS"/>

-            <xs:enumeration value="LR"/>

-            <xs:enumeration value="LY"/>

-            <xs:enumeration value="LI"/>

-            <xs:enumeration value="LT"/>

-            <xs:enumeration value="LU"/>

-            <xs:enumeration value="MO"/>

-            <xs:enumeration value="MK"/>

-            <xs:enumeration value="MG"/>

-            <xs:enumeration value="MW"/>

-            <xs:enumeration value="MY"/>

-            <xs:enumeration value="MV"/>

-            <xs:enumeration value="ML"/>

-            <xs:enumeration value="MT"/>

-            <xs:enumeration value="MH"/>

-            <xs:enumeration value="MQ"/>

-            <xs:enumeration value="MR"/>

-            <xs:enumeration value="MU"/>

-            <xs:enumeration value="YT"/>

-            <xs:enumeration value="MX"/>

-            <xs:enumeration value="FM"/>

-            <xs:enumeration value="MD"/>

-            <xs:enumeration value="MC"/>

-            <xs:enumeration value="MN"/>

-            <xs:enumeration value="MS"/>

-            <xs:enumeration value="MA"/>

-            <xs:enumeration value="MZ"/>

-            <xs:enumeration value="MM"/>

-            <xs:enumeration value="NA"/>

-            <xs:enumeration value="NR"/>

-            <xs:enumeration value="NP"/>

-            <xs:enumeration value="NL"/>

-            <xs:enumeration value="AN"/>

-            <xs:enumeration value="NC"/>

-            <xs:enumeration value="NZ"/>

-            <xs:enumeration value="NI"/>

-            <xs:enumeration value="NE"/>

-            <xs:enumeration value="NG"/>

-            <xs:enumeration value="NU"/>

-            <xs:enumeration value="NF"/>

-            <xs:enumeration value="MP"/>

-            <xs:enumeration value="NO"/>

-            <xs:enumeration value="OM"/>

-            <xs:enumeration value="PK"/>

-            <xs:enumeration value="PW"/>

-            <xs:enumeration value="PS"/>

-            <xs:enumeration value="PA"/>

-            <xs:enumeration value="PG"/>

-            <xs:enumeration value="PY"/>

-            <xs:enumeration value="PE"/>

-            <xs:enumeration value="PH"/>

-            <xs:enumeration value="PN"/>

-            <xs:enumeration value="PL"/>

-            <xs:enumeration value="PT"/>

-            <xs:enumeration value="PR"/>

-            <xs:enumeration value="QA"/>

-            <xs:enumeration value="RE"/>

-            <xs:enumeration value="RO"/>

-            <xs:enumeration value="RU"/>

-            <xs:enumeration value="RW"/>

-            <xs:enumeration value="SH"/>

-            <xs:enumeration value="KN"/>

-            <xs:enumeration value="LC"/>

-            <xs:enumeration value="PM"/>

-            <xs:enumeration value="VC"/>

-            <xs:enumeration value="WS"/>

-            <xs:enumeration value="SM"/>

-            <xs:enumeration value="ST"/>

-            <xs:enumeration value="SA"/>

-            <xs:enumeration value="SN"/>

-            <xs:enumeration value="SC"/>

-            <xs:enumeration value="SL"/>

-            <xs:enumeration value="SG"/>

-            <xs:enumeration value="SK"/>

-            <xs:enumeration value="SI"/>

-            <xs:enumeration value="SB"/>

-            <xs:enumeration value="SO"/>

-            <xs:enumeration value="ZA"/>

-            <xs:enumeration value="GS"/>

-            <xs:enumeration value="ES"/>

-            <xs:enumeration value="LK"/>

-            <xs:enumeration value="SD"/>

-            <xs:enumeration value="SR"/>

-            <xs:enumeration value="SJ"/>

-            <xs:enumeration value="SZ"/>

-            <xs:enumeration value="SE"/>

-            <xs:enumeration value="CH"/>

-            <xs:enumeration value="SY"/>

-            <xs:enumeration value="TW"/>

-            <xs:enumeration value="TJ"/>

-            <xs:enumeration value="TZ"/>

-            <xs:enumeration value="TH"/>

-            <xs:enumeration value="TG"/>

-            <xs:enumeration value="TK"/>

-            <xs:enumeration value="TO"/>

-            <xs:enumeration value="TT"/>

-            <xs:enumeration value="TN"/>

-            <xs:enumeration value="TR"/>

-            <xs:enumeration value="TM"/>

-            <xs:enumeration value="TC"/>

-            <xs:enumeration value="TV"/>

-            <xs:enumeration value="UG"/>

-            <xs:enumeration value="UA"/>

-            <xs:enumeration value="AE"/>

-            <xs:enumeration value="GB"/>

-            <xs:enumeration value="US"/>

-            <xs:enumeration value="UM"/>

-            <xs:enumeration value="UY"/>

-            <xs:enumeration value="UZ"/>

-            <xs:enumeration value="VU"/>

-            <xs:enumeration value="VE"/>

-            <xs:enumeration value="VN"/>

-            <xs:enumeration value="VG"/>

-            <xs:enumeration value="VI"/>

-            <xs:enumeration value="WF"/>

-            <xs:enumeration value="EH"/>

-            <xs:enumeration value="YE"/>

-            <xs:enumeration value="YU"/>

-            <xs:enumeration value="ZM"/>

-            <xs:enumeration value="ZW"/>

-            <xs:enumeration value="AA">

-                <xs:annotation>

-                    <xs:documentation>

-                                        NOTE: APO/FPO was defined in eBay list previously

-                                        but they are not defined in ISO 3166. This country

-                                        will remain on eBay country code list for backward

-                                        compatibility.

-                                 </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="QM">

-                <xs:annotation>

-                    <xs:documentation>

-                                        NOTE: Guernsey was defined in eBay list previously

-                                        but they are not defined in ISO 3166. This country

-                                        will remain on eBay country list for backward

-                                        compatibility.

-                                 </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="QN">

-                <xs:annotation>

-                    <xs:documentation>

-                                         NOTE: Jan Mayen was defined in eBay list previously

-                                         but they are not defined in ISO 3166. This country

-                                         will remain on eBay country list for backward

-                                         compatibility.

-                                 </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="QO">

-                <xs:annotation>

-                    <xs:documentation>

-                                         NOTE: Jersey was defined in eBay list previously

-                                         but they are not defined in ISO 3166. This country

-                                         will remain on eBay country list for backward

-                                         compatibility.

-                                 </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="QP">

-                <xs:annotation>

-                    <xs:documentation>

-                                         NOTE: Tahiti was defined in eBay list previously

-                                         but they are not defined in ISO 3166. This country

-                                         will remain on eBay country list for backward

-                                         compatibility. This Code is currently deprecated

-                                 </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        Placeholder value. See

-                        &lt;a href="types/simpleTypes.html#token"&gt;token&lt;/a&gt;.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/CurrencyCodeList.xsd #####

-

--->

-    <xs:simpleType name="CurrencyCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Defines the standard 3-letter ISO 4217 currency code set.

-                However, only certain currency codes are currently valid for use on eBay.

-                The valid codes are documented below with the notation "(in/out)".

-                Other codes in this list are for future use.

-                The documentation below specifies English names for each currency.

-                A reference: http://www.xe.com/iso4217.htm

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="AFA"/>

-            <xs:enumeration value="ALL"/>

-            <xs:enumeration value="DZD"/>

-            <xs:enumeration value="ADP"/>

-            <xs:enumeration value="AOA"/>

-            <xs:enumeration value="ARS"/>

-            <xs:enumeration value="AMD"/>

-            <xs:enumeration value="AWG"/>

-            <xs:enumeration value="AZM"/>

-            <xs:enumeration value="BSD"/>

-            <xs:enumeration value="BHD"/>

-            <xs:enumeration value="BDT"/>

-            <xs:enumeration value="BBD"/>

-            <xs:enumeration value="BYR"/>

-            <xs:enumeration value="BZD"/>

-            <xs:enumeration value="BMD"/>

-            <xs:enumeration value="BTN"/>

-            <xs:enumeration value="INR">

-                <xs:annotation>

-                    <xs:documentation>

-                    Indian Rupee.

-                    Applicable to listings on the India site (site ID 203).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="BOV"/>

-            <xs:enumeration value="BOB"/>

-            <xs:enumeration value="BAM"/>

-            <xs:enumeration value="BWP"/>

-            <xs:enumeration value="BRL"/>

-            <xs:enumeration value="BND"/>

-            <xs:enumeration value="BGL"/>

-            <xs:enumeration value="BGN"/>

-            <xs:enumeration value="BIF"/>

-            <xs:enumeration value="KHR"/>

-            <xs:enumeration value="CAD">

-                <xs:annotation>

-                    <xs:documentation>

-                        Canadian Dollar.

-                        Applicable to listings on the Canada site (site ID 2)

-                        (Items listed on the Canada site can also specify USD.)

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CVE"/>

-            <xs:enumeration value="KYD"/>

-            <xs:enumeration value="XAF"/>

-            <xs:enumeration value="CLF"/>

-            <xs:enumeration value="CLP"/>

-            <xs:enumeration value="CNY">

-                <xs:annotation>

-                    <xs:documentation>

-                        Chinese Yuan Renminbi.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="COP"/>

-            <xs:enumeration value="KMF"/>

-            <xs:enumeration value="CDF"/>

-            <xs:enumeration value="CRC"/>

-            <xs:enumeration value="HRK"/>

-            <xs:enumeration value="CUP"/>

-            <xs:enumeration value="CYP"/>

-            <xs:enumeration value="CZK"/>

-            <xs:enumeration value="DKK"/>

-            <xs:enumeration value="DJF"/>

-            <xs:enumeration value="DOP"/>

-            <xs:enumeration value="TPE"/>

-            <xs:enumeration value="ECV"/>

-            <xs:enumeration value="ECS"/>

-            <xs:enumeration value="EGP"/>

-            <xs:enumeration value="SVC"/>

-            <xs:enumeration value="ERN"/>

-            <xs:enumeration value="EEK"/>

-            <xs:enumeration value="ETB"/>

-            <xs:enumeration value="FKP"/>

-            <xs:enumeration value="FJD"/>

-            <xs:enumeration value="GMD"/>

-            <xs:enumeration value="GEL"/>

-            <xs:enumeration value="GHC"/>

-            <xs:enumeration value="GIP"/>

-            <xs:enumeration value="GTQ"/>

-            <xs:enumeration value="GNF"/>

-            <xs:enumeration value="GWP"/>

-            <xs:enumeration value="GYD"/>

-            <xs:enumeration value="HTG"/>

-            <xs:enumeration value="HNL"/>

-            <xs:enumeration value="HKD">

-                <xs:annotation>

-                    <xs:documentation>

-                        Hong Kong Dollar.

-                        Applicable to listings on the Hong Kong site (site ID 201).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="HUF"/>

-            <xs:enumeration value="ISK"/>

-            <xs:enumeration value="IDR"/>

-            <xs:enumeration value="IRR"/>

-            <xs:enumeration value="IQD"/>

-            <xs:enumeration value="ILS"/>

-            <xs:enumeration value="JMD"/>

-            <xs:enumeration value="JPY"/>

-            <xs:enumeration value="JOD"/>

-            <xs:enumeration value="KZT"/>

-            <xs:enumeration value="KES"/>

-            <xs:enumeration value="AUD">

-                <xs:annotation>

-                    <xs:documentation>

-                        Australian Dollar.

-                        Applicable to listings on the Australia site (site ID 15).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="KPW"/>

-            <xs:enumeration value="KRW"/>

-            <xs:enumeration value="KWD"/>

-            <xs:enumeration value="KGS"/>

-            <xs:enumeration value="LAK"/>

-            <xs:enumeration value="LVL"/>

-            <xs:enumeration value="LBP"/>

-            <xs:enumeration value="LSL"/>

-            <xs:enumeration value="LRD"/>

-            <xs:enumeration value="LYD"/>

-            <xs:enumeration value="CHF">

-                <xs:annotation>

-                    <xs:documentation>

-                        Swiss Franc.

-                        Applicable to listings on the Switzerland site (site ID 193).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="LTL"/>

-            <xs:enumeration value="MOP"/>

-            <xs:enumeration value="MKD"/>

-            <xs:enumeration value="MGF"/>

-            <xs:enumeration value="MWK"/>

-            <xs:enumeration value="MYR">

-                <xs:annotation>

-                    <xs:documentation>

-                        Malaysian Ringgit.

-                        Applicable to listings on the Malaysia site (site ID 207).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="MVR"/>

-            <xs:enumeration value="MTL"/>

-            <xs:enumeration value="EUR">

-                <xs:annotation>

-                    <xs:documentation>

-                        Euro.

-                        Applicable to listings on these site:

-                        Austria (site 16), Belgium_French (site 23),

-                        France (site 71), Germany (site 77), Italy (site 101), Belgium_Dutch (site 123),

-                        Netherlands (site 146), Spain (site 186), Ireland (site 205).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="MRO"/>

-            <xs:enumeration value="MUR"/>

-            <xs:enumeration value="MXN"/>

-            <xs:enumeration value="MXV"/>

-            <xs:enumeration value="MDL"/>

-            <xs:enumeration value="MNT"/>

-            <xs:enumeration value="XCD"/>

-            <xs:enumeration value="MZM"/>

-            <xs:enumeration value="MMK"/>

-            <xs:enumeration value="ZAR"/>

-            <xs:enumeration value="NAD"/>

-            <xs:enumeration value="NPR"/>

-            <xs:enumeration value="ANG"/>

-            <xs:enumeration value="XPF"/>

-            <xs:enumeration value="NZD"/>

-            <xs:enumeration value="NIO"/>

-            <xs:enumeration value="NGN"/>

-            <xs:enumeration value="NOK"/>

-            <xs:enumeration value="OMR"/>

-            <xs:enumeration value="PKR"/>

-            <xs:enumeration value="PAB"/>

-            <xs:enumeration value="PGK"/>

-            <xs:enumeration value="PYG"/>

-            <xs:enumeration value="PEN"/>

-            <xs:enumeration value="PHP">

-                <xs:annotation>

-                    <xs:documentation>

-                        Philippines Peso.

-                        Applicable to listings on the Philippines site (site ID 211).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="PLN">

-                <xs:annotation>

-                    <xs:documentation>

-                        Poland, Zloty.

-                        Applicable to listings on the Poland site (site ID 212).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="USD">

-                <xs:annotation>

-                    <xs:documentation>

-                        US Dollar.

-                        Applicable to listings on the US (site ID 0), eBayMotors (site 100), and Canada (site 2) sites.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="QAR"/>

-            <xs:enumeration value="ROL"/>

-            <xs:enumeration value="RUB"/>

-            <xs:enumeration value="RUR"/>

-            <xs:enumeration value="RWF"/>

-            <xs:enumeration value="SHP"/>

-            <xs:enumeration value="WST"/>

-            <xs:enumeration value="STD"/>

-            <xs:enumeration value="SAR"/>

-            <xs:enumeration value="SCR"/>

-            <xs:enumeration value="SLL"/>

-            <xs:enumeration value="SGD">

-                <xs:annotation>

-                    <xs:documentation>

-                        Singapore Dollar.

-                        Applicable to listings on the Singapore site (site 216).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="SKK"/>

-            <xs:enumeration value="SIT"/>

-            <xs:enumeration value="SBD"/>

-            <xs:enumeration value="SOS"/>

-            <xs:enumeration value="LKR"/>

-            <xs:enumeration value="SDD"/>

-            <xs:enumeration value="SRG"/>

-            <xs:enumeration value="SZL"/>

-            <xs:enumeration value="SEK">

-                <xs:annotation>

-                    <xs:documentation>

-                         Swedish Krona.

-                         Applicable to listings on the Sweden site (site 218).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="SYP"/>

-            <xs:enumeration value="TWD">

-                <xs:annotation>

-                    <xs:documentation>

-                        New Taiwan Dollar.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="TJS"/>

-            <xs:enumeration value="TZS"/>

-            <xs:enumeration value="THB"/>

-            <xs:enumeration value="XOF"/>

-            <xs:enumeration value="TOP"/>

-            <xs:enumeration value="TTD"/>

-            <xs:enumeration value="TND"/>

-            <xs:enumeration value="TRL"/>

-            <xs:enumeration value="TMM"/>

-            <xs:enumeration value="UGX"/>

-            <xs:enumeration value="UAH"/>

-            <xs:enumeration value="AED"/>

-            <xs:enumeration value="GBP">

-                <xs:annotation>

-                    <xs:documentation>

-                        Pound Sterling.

-                        Applicable to listings on the UK site (site ID 3).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="USS"/>

-            <xs:enumeration value="USN"/>

-            <xs:enumeration value="UYU"/>

-            <xs:enumeration value="UZS"/>

-            <xs:enumeration value="VUV"/>

-            <xs:enumeration value="VEB"/>

-            <xs:enumeration value="VND"/>

-            <xs:enumeration value="MAD"/>

-            <xs:enumeration value="YER"/>

-            <xs:enumeration value="YUM"/>

-            <xs:enumeration value="ZMK"/>

-            <xs:enumeration value="ZWD"/>

-            <xs:enumeration value="ATS"/>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        Placeholder value. See

-                        &lt;a href="types/simpleTypes.html#token"&gt;token&lt;/a&gt;.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/DigitalDeliveryMethodCodeList.xsd #####

-

--->

-    <xs:simpleType name="DigitalDeliveryMethodCodeType">

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="None">

-                <xs:annotation>

-                    <xs:documentation>

-                    The item cannot be downloaded.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="DownloadURL">

-                <xs:annotation>

-                    <xs:documentation>

-                    The item can be downloaded by using a URL.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="AlternateDeliveryInstructions">

-                <xs:annotation>

-                    <xs:documentation>

-                    The item can be downloaded according to instructions specified by the seller.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode"/>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/DistanceType.xsd #####

-

--->

-    <xs:complexType name="DistanceType">

-        <xs:annotation>

-            <xs:documentation>

-                Distance, used for a proximity search.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:simpleContent>

-            <xs:extension base="xs:double">

-                <xs:attribute name="unit" type="xs:string"/>

-            </xs:extension>

-        </xs:simpleContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/DomainHistogramType.xsd #####

-

--->

-    <xs:complexType name="DomainHistogramType">

-        <xs:annotation>

-            <xs:documentation>

-                A generic type used for histograms.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="Domain" type="ns:HistogramEntryType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Each histogram entry shows how many matching products

-                        were found in each matching domain. A domain is like a high-level

-                        category, or a group of categories whose items share the same basic

-                        product characteristics.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: DomainHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: DomainHistogram</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/ExternalProductCodeList.xsd #####

-

--->

-    <xs:simpleType name="ExternalProductCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Indicates the type of external product ID being used to identify a

-                stock product.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="ISBN">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in/out) ExternalProductID.Value contains an ISBN value.

-                        Required when you pass an ISBN as the external product ID.

-                        (This value is also applicable to Half.com listings.)

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="UPC">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in/out) ExternalProductID.Value contains a UPC value.

-                        Required when you pass a UPC as the external product ID.

-                        (This value is also applicable to Half.com listings.)

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="ProductID">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) ExternalProductID.Value contains an eBay catalog product ID.

-                        Required when you pass an eBay product ID

-                        as the external product ID.

-                        Not applicable with FindItemsAdvanced, FindItemsAdvancedExpress, or

-                        FindProducts.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="EAN">

-                <xs:annotation>

-                    <xs:documentation>

-                        ExternalProductID.Value contains an EAN value.

-                        Required when you pass an EAN as the external product ID.

-                        Not applicable with FindItemsAdvancedExpress.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Keywords">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) ExternalProductID.Value contains a set of keywords that uniquely identify the product.

-                        Only applicable when listing event ticket.

-                        See the eBay Web Services guide for information about valid

-                        ticket keywords for an external product ID.

-                        Required when you pass a set of keywords as the external product ID.

-                        Not applicable with FindItemsAdvanced, FindItemsAdvancedExpress, or

-                        FindProducts. With FindItemsAdvanced, use TicketFinder instead.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="MPN">

-                <xs:annotation>

-                    <xs:documentation>

-                        Reserved for future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for internal or future use

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/ExternalProductIDType.xsd #####

-

--->

-    <xs:complexType name="ExternalProductIDType">

-        <xs:annotation>

-            <xs:documentation>

-                Contains an ISBN value, EAN value, UPC value, ticket keywords, or eBay

-                catalog product ID, plus other meta-data. For event tickets, this type

-                can contain a set of keywords that uniquely identify the product. Only

-                applicable to certain categories that support Pre-filled Item

-                Information.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="Value" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        An industry-standard value that uniquely identifies the product. The

-                        valid values are dictated by the Type property.

-                        Required if Type is specified.

-                        Max length 13 for ISBN (as of February 2007), 13 for EAN,

-                        12 for UPC, and 4000 for ProductID. No max length for ticket keywords

-                        (but passing too much data can result in "no match found"

-                        errors).&lt;br&gt;

-                        &lt;br&gt;

-                        &lt;b&gt;For AddItem and related calls:&lt;/b&gt;

-                        If the primary and secondary categories are both catalog-enabled,

-                        the value must apply to the primary category.

-                        Event tickets listings support a set of keywords

-                        that uniquely identify the listing. The ticket keywords specify the

-                        event name (the title shown on the ticket), venue name, and event

-                        date and time. See the eBay Web Services guide for more information

-                        and validation rules. For convenience, you can pass an eBay product ID

-                        as input (not limited to media categories).&lt;br&gt;

-                        &lt;br&gt;

-                        Required for Half.com listing use cases, and this can only be an

-                        ISBN, UPC, or EAN value.&lt;br&gt;

-                        &lt;br&gt;

-                        &lt;b&gt;For FindItemsAdvanced and FindProducts input only:&lt;/b&gt;

-                        Only ISBN, EAN, and UPC values are currently supported as

-                        input.&lt;br&gt;

-                        &lt;br&gt;

-                        &lt;b&gt;For FindItemsAdvancedExpress input only:&lt;/b&gt;

-                        To pass an external product ID in the request, use

-                        ExternalProductIDValue and ExternalProductIDType instead.&lt;br&gt;

-                        &lt;br&gt;

-                        &lt;b&gt;For FindItemsAdvancedExpress, FindProducts, and GetSellerPayments

-                        output only:&lt;/b&gt; Also see AlternateValue, which is

-                        returned if the catalog defines multiple ISBN values (e.g., one for

-                        ISBN-13 and one for ISBN-10). Please note that some catalogs return ISBN

-                        values that are not 10 or 13 characters, and some values contain

-                        non-alphanumeric symbols (e.g., $).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <MaxLength>See description</MaxLength>

-                        <CallInfo>

-                            <CallName>AddItem</CallName>

-                            <CallName>GetItemRecommendations</CallName>

-                            <CallName>VerifyAddItem</CallName>

-                            <Context>Item.ExternalProductID</Context>

-                            <RequiredInput>Conditionally</RequiredInput>

-                            <!-- N/A to ReviseItem and RelistItem -->

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <RequiredInput>Conditionally</RequiredInput>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <RequiredInput>Conditionally</RequiredInput>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSellerPayments</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvancedExpress</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ReturnSearchResultOnDuplicates" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Applicable for listing use cases only (not buy-side searching).

-                        Indicates what eBay should do if more than one product matches

-                        the value passed in Value. Only takes effect when more than one

-                        match is found. If true, the response should include an error

-                        and all matching product IDs. If false, the response should include

-                        an error but should not return the matching product IDs.

-                        This field is also applicable when listing Half.com items.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>AddItem</CallName>

-                            <CallName>GetItemRecommendations</CallName>

-                            <CallName>VerifyAddItem</CallName>

-                            <RequiredInput>No</RequiredInput>

-                            <Context>Item.ExternalProductID</Context>

-                            <!-- N/A to ReviseItem and RelistItem -->

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Type" type="ns:ExternalProductCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The kind of identifier being used. The choices are listed

-                        For requests, required if Value is specified.

-                        For Half.com listing use cases, only ISBN, UPC, and EAN are supported.&lt;br&gt;

-                        &lt;br&gt;

-                        FindItemsAdvancedExpress returns this value in ProductArray.Product.ExternalProductID.Type.

-                        To pass an external product ID in the request, use ExternalProductIDType and ExternalProductIDValue instead. &lt;br&gt;

-                        &lt;br&gt;

-                        FindProducts supports ISBN, UPC, and EAN.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>AddItem</CallName>

-                            <CallName>GetItemRecommendations</CallName>

-                            <CallName>VerifyAddItem</CallName>

-                            <Context>Item.ExternalProductID</Context>

-                            <AllValuesExcept>MPN</AllValuesExcept>

-                            <RequiredInput>Conditionally</RequiredInput>

-                            <!-- N/A to ReviseItem and RelistItem -->

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <OnlyTheseValues>ISBN, UPC, EAN</OnlyTheseValues>

-                            <RequiredInput>Conditionally</RequiredInput>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <OnlyTheseValues>ISBN, UPC, EAN</OnlyTheseValues>

-                            <RequiredInput>Conditionally</RequiredInput>

-                            <!-- N/A to ReviseItem and RelistItem -->

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSellerPayments</CallName>

-                            <!-- Half.com only supports BMMG categories.

-                            So, only ISBN, UPC, and EAN can

-                            be supported in Half.com use cases. -->

-                            <OnlyTheseValues>ISBN, UPC, EAN</OnlyTheseValues>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvancedExpress</CallName>

-                            <OnlyTheseValues>ISBN, UPC</OnlyTheseValues>

-                            <Returned>Conditionally</Returned>

-                            <SeeLink>

-                                <Title>(FindItemsAdvancedExpress) ExternalProductIDType</Title>

-                                <URL>io_FindItemsAdvancedExpress.html#Request.ExternalProductIDType</URL>

-                            </SeeLink>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="AlternateValue" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        An industry-standard value that provides an alternate identification for

-                        the product, if any. Currently, this only returns an alternate ISBN

-                        value. If the catalog defines both an ISBN-13 and ISBN-10,

-                        then the ISBN-13 is returned in Value and the ISBN-10 is returned in

-                        AlternateValue. (That is, the ISBN-13 is considered to be the preferred

-                        identifier.) If the catalog only defines one ISBN, it is returned in

-                        Value (and AlternateValue is not returned). Please note that some

-                        catalogs return ISBN values that are not 10 or 13 characters,

-                        and some values contain non-alphanumeric symbols (e.g., $).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <MaxLength>4000</MaxLength>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <CallName>FindItemsAdvancedExpress</CallName>

-                            <CallName>GetSellerPayments</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FeedbackDetailType.xsd #####

-

--->

-    <xs:complexType name="FeedbackDetailType">

-        <xs:annotation>

-            <xs:documentation>

-                Detailed feedback information for a user. Conveys the score for the

-                feedback, the textual comment, and other information.

-          </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="CommentingUser" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        eBay user ID for the user who left the feedback.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CommentingUserScore" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Feedback score of the user in CommentingUser.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CommentText" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Text message left by the user in CommentingUser. Used to provide a more

-                        in-depth description of the user's opinion of the transaction.

-                        Returned as text in the language that the

-                        comment was originally left in.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CommentTime" type="xs:dateTime" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Date and time (in GMT) that the feedback was submitted to eBay.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CommentType" type="ns:CommentTypeCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Type of feedback. Can be Positive, Neutral, Negative, or Withdrawn (see the

-                        CommentTypeCodeType code list). Positive feedbacks add to the user's total

-                        feedback score, negative feedbacks lower the score, and neutral feedbacks do

-                        not affect the score (but do affect the overall picture of the user's online

-                        reputation).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="FeedbackResponse" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Textual comment that the user targeted by feedback may leave

-                        in response or rebuttal to the feedback.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="FollowUp" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Explanation a user can give to a response.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ItemID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The ID that uniquely identifies the item listing.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Role" type="ns:TradingRoleCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Indicates whether the user who was the feedback recipient was a Buyer or the

-                        Seller for that transaction.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ItemTitle" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Name of the listing for which feedback was provided.

-                        Returned as CDATA.

-                        Not returned if a listing ended more than 90 days ago.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ItemPrice" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The final price for the item, associated with

-                        the currency identified by the currencyId attribute of the AmountType.

-                        Not returned if a listing ended more than 90 days ago.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="FeedbackID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Unique identifier for the feedback entry.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="TransactionID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Unique identifier for the transaction about which

-                        this feedback entry was left.

-                        This field is not returned in the case of TransactionIDs from Chinese auction listings,

-                        because a value of zero is used for TransactionIDs in such cases.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CommentReplaced" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Indicates whether eBay replaced the comment with a message

-                        that the comment was removed.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ResponseReplaced" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Indicates whether eBay replaced the response with a message

-                        that the response was removed.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="FollowUpReplaced" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Indicates whether eBay replaced the follow-up with a message

-                        that the follow-up was removed.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Countable" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Specifies if a user's feedback score is or is not countable. This field is

-                        returned only when a user's feedback score is not countable (value is false).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackDetails</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FeedbackHistoryType.xsd #####

-

--->

-    <xs:complexType name="FeedbackHistoryType">

-        <xs:annotation>

-            <xs:documentation>

-                Specifies all feedback summary information (except Score). Contains

-                objects that each convey feedback counts for

-                positive, negative, neutral, and total feedback counts - for various

-                time periods each. Also conveys counts of bid retractions for the

-                predefined time periods.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="BidRetractionFeedbackPeriods" type="ns:FeedbackPeriodType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Bid retractions count, for multiple predefined time periods preceding

-                        the call. 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="NegativeFeedbackPeriods" type="ns:FeedbackPeriodType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Negative feedback entries count, for multiple predefined time periods preceding

-                        the call. 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="NeutralFeedbackPeriods" type="ns:FeedbackPeriodType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Neutral feedback entries count, for multiple predefined time periods preceding

-                        the call. 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="PositiveFeedbackPeriods" type="ns:FeedbackPeriodType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Positive feedback entries count, for multiple predefined time periods

-                        preceding the call. 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="TotalFeedbackPeriods" type="ns:FeedbackPeriodType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Total feedback score, for multiple predefined time periods preceding the

-                        call. 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="UniqueNegativeFeedbackCount" type="xs:long" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Number of unique negative comments. 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="UniquePositiveFeedbackCount" type="xs:long" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Number of unique positive comments. 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="AverageRatingDetails" type="ns:AverageRatingDetailsType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Container for information about detailed seller ratings (DSRs)

-                        that buyers have left for a seller.

-                        Sellers have access to the number of ratings they've received, as well as

-                        to the averages of DSRs they've received in each

-                        DSR area (i.e., to the average of ratings in the item-description area, etc.).  

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="NeutralCommentCountFromSuspendedUsers" type="xs:long" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Number of neutral comments received from suspended users.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FeedbackPeriodType.xsd #####

-

--->

-    <xs:complexType name="FeedbackPeriodType">

-        <xs:annotation>

-            <xs:documentation>

-                    Contains the data for one type of feedback for one predefined time

-                    period. Parent FeedbackPeriodArrayType object indicates the type of

-                    feedback counted: positive, neutral, negative, or total. 

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="PeriodInDays" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Indicates the time period for the feedback count. Returns a value indicating

-                        the number of days prior to the call for which feedbacks of the particular

-                        type are counted.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Count" type="xs:long" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Count of the feedbacks received by the user for the time period prior to the

-                        call indicated in PeriodInDays.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FeedbackRatingDetailCodeList.xsd #####

-

--->

-    <xs:simpleType name="FeedbackRatingDetailCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Applicable to sites that support the Detailed Seller Ratings feature.

-                The FeedbackRatingDetailCodeType is the list of areas for detailed seller ratings. When buyers leave an overall Feedback rating (positive, neutral, or negative) for a seller, they also can leave ratings in four areas: item as described, communication, shipping time, and charges for shipping and handling. Users retrieve detailed ratings as averages of the ratings left by buyers. 

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="ItemAsDescribed">

-                <xs:annotation>

-                    <xs:documentation>

-                        Detailed seller rating in the area of "item as described."

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Communication">

-                <xs:annotation>

-                    <xs:documentation>

-                        Detailed seller rating in the area of "communication."

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="ShippingTime">

-                <xs:annotation>

-                    <xs:documentation>

-                        Detailed seller rating in the area of "shipping time." Inapplicable to 

-                        motor vehicle items.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="ShippingAndHandlingCharges">

-                <xs:annotation>

-                    <xs:documentation>

-                        Detailed seller rating in the area of "charges for shipping and handling."

-                        Inapplicable to motor vehicle items. 

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for internal or future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/FeedbackRatingStarCodeList.xsd #####

-

--->

-    <xs:simpleType name="FeedbackRatingStarCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                     FeedbackRatingStarCodeType - Type declaration to be used by other

-                     schema. The color of a feedback score star visually denotes the

-                     range in which the member's summary feedback score falls. The score

-                     is the net positive feedback minus the net negative feedback left

-                     for the member.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="None">

-                <xs:annotation>

-                    <xs:documentation>

-                                No graphic displayed, feedback score 0-9.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Yellow">

-                <xs:annotation>

-                    <xs:documentation>

-                                Yellow Star, feedback score 10-49.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Blue">

-                <xs:annotation>

-                    <xs:documentation>

-                                Blue Star, feedback score 50-99.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Turquoise">

-                <xs:annotation>

-                    <xs:documentation>

-                                Turquoise Star, feedback score 100-499.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Purple">

-                <xs:annotation>

-                    <xs:documentation>

-                                Purple Star, feedback score 500-999.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Red">

-                <xs:annotation>

-                    <xs:documentation>

-                                Red Star, feedback score 1,000-4,999

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Green">

-                <xs:annotation>

-                    <xs:documentation>

-                                Green Star, feedback score 5,000-9,999.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="YellowShooting">

-                <xs:annotation>

-                    <xs:documentation>

-                                Yellow Shooting Star, feedback score 10,000-24,999.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="TurquoiseShooting">

-                <xs:annotation>

-                    <xs:documentation>

-                                Turquoise Shooting Star, feedback score 25,000-49,999.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="PurpleShooting">

-                <xs:annotation>

-                    <xs:documentation>

-                                Purple Shooting Star, feedback score 50,000-99,999.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="RedShooting">

-                <xs:annotation>

-                    <xs:documentation>

-                                Red Shooting Star, feedback score 100,000 and above.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        Placeholder value. See

-                        &lt;a href="types/simpleTypes.html#token"&gt;token&lt;/a&gt;.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/FindHalfProductsRequest.xsd #####

-

--->

-        <xs:element name="FindHalfProductsRequest" type="ns:FindHalfProductsRequestType"/>

-<xs:complexType name="FindHalfProductsRequestType">

-        <xs:annotation>

-            <xs:documentation>

-                Searches Half.com for stock product information (stock description

-                and Item Specifics), such as information about a particular

-                kind of DVD or book. Also, retrieves up to 30 Half.com listings associated

-                with a product.

-            </xs:documentation>

-            <xs:appinfo>

-                <Summary>

-                    Searches Half.com for stock product information (stock description

-                    and Item Specifics), such as information about a particular

-                    kind of DVD or book. Also, retrieves up to 30 Half.com listings associated

-                    with a product.

-                </Summary>

-                <TempInfo>IncludeSelector</TempInfo>

-            </xs:appinfo>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractRequestType">

-                <xs:sequence>

-                    <xs:element name="IncludeSelector" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Defines standard subsets of fields to return within the

-                                response.&lt;br&gt;

-                                &lt;br&gt;

-                                If you don't specify this field, the call returns a default

-                                set of fields, focusing on product details only

-                                (see the "Detail Controls" link below). If you specify this

-                                field, the additional fields you retrieve can affect the call's

-                                response time (performance).&lt;br&gt;

-                                &lt;br&gt;

-                                &lt;b&gt;Applicable values&lt;/b&gt;:

-                                &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; Items&lt;/p&gt;

-                                    &lt;p class="edef"&gt;Include a brief set of item fields

-                                    in the response.

-                                    Only applicable when you are searching by ProductID.

-                                    Not applicable with QueryKeywords.&lt;/p&gt;

-                                &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; DomainHistogram&lt;/p&gt;

-                                    &lt;p class="edef"&gt;Include the DomainHistogram in

-                                    the response. The histogram lists the number of matching

-                                    products found and the domains in which they were found.

-                                    (A domain is like a high-level category.)

-                                    When many matching products are found, you may see

-                                    significantly slower response times when you include

-                                    the histogram.&lt;/p&gt;

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                Use a comma to specify multiple values. (In this case,

-                                the results are cumulative.) See "FindHalfProducts Samples"

-                                for an example of how to use this field.&lt;br&gt;

-                                &lt;br&gt;

-                                See "Detail Controls" for a complete list of

-                                fields that can be returned for each selector.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <MaxLength/>

-                                <PresentDetails>Yes</PresentDetails>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="AvailableItemsOnly" type="xs:boolean" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                If true, only retrieve data for products that have been used to

-                                pre-fill active listings on the Half.com site.

-                                If false, retrieve all products that match the query.

-                                This is useful when you use QueryKeywords and you only want to

-                                find products that have associated items (that is, where ItemArray

-                                would not be empty).&lt;br&gt;

-                                &lt;br&gt;

-                                This does not retrieve ItemArray; this only controls which

-                                products are returned (or counted). To retrieve ItemArray,

-                                pass Items in IncludeSelector.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Default>false</Default>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="DomainName" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                A domain to search in. This is like searching a section of

-                                a catalog. If not specified, the product search is conducted

-                                across all domains. To determine valid domain names,

-                                first use this call with QueryKeywords. Domain names are returned

-                                for each product (and summarized in the domain histogram, if you

-                                specify DomainHistogram in IncludeSelector).&lt;br&gt;

-                                &lt;br&gt;

-                                A domain is a named grouping of categories whose items share

-                                common product characteristics. For example, all bound books

-                                have a binding or format (e.g., Hardcover), but audiobooks don't.

-                                So audiobooks would have their own domain.

-                                To limit your search to audiobooks, you would specify Audiobooks

-                                as the domain.&lt;br&gt;

-                                &lt;br&gt;

-                                Only useful when QueryKeywords is specified. If you use this with

-                                ProductID, AND logic is applied. In this case, if you specify an

-                                ID that doesn't match the domain (as Half.com has defined it),

-                                no matching product will be found. Therefore, we recommend that you only use DomainName with QueryKeywords.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ProductID" type="ns:ProductIDType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Use this to retrieve product details for one specific product.

-                                Specify the ID as a string, and use the type attribute to

-                                indicate the nature of the ID you are specifying.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                You can request up to 10 IDs of the same type by separating them with commas, such as 

-                                014633155310,014633145496.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                The request requires either QueryKeywords or

-                                ProductID, but these fields cannot be used together.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <MaxLength>4000</MaxLength>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <RequiredInput>Conditionally</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="QueryKeywords" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                One or more keywords to search for. When you use a keyword search,

-                                Half.com searches the product catalogs  for matching words in the

-                                product title, description, and/or Item Specifics, and it returns

-                                a list of matching products, with no items. To retrieve

-                                items, use ProductID instead. (If you don't already have a

-                                product ID, you can get product IDs from the

-                                response after conducting a keyword search.)&lt;br&gt;

-                                &lt;br&gt;

-                                If specified, you must pass in at least 3 alphanumeric characters.&lt;br&gt;

-                                &lt;br&gt;

-                                The words "and" and "or" are treated like any other word.

-                                Only use "and", "or", or "the" if you are searching for products

-                                containing these words.

-                                To use AND or OR logic, use Half.com's standard search string

-                                modifiers. Wildcards (+, -, or *) are also supported.

-                                Be careful when using spaces before or after modifiers and

-                                wildcards.&lt;br&gt;

-                                &lt;br&gt;

-                                Some keyword queries can result in response times of 30 seconds or

-                                longer. If more than 2000 matches are found, the call fails with

-                                an error. If this kind of error occurs, refine the search by

-                                passing in more keywords and/or by using DomainName to restrict

-                                the search to certain domains (such as DVDs).

-                                If you are searching for a particular book, DVD, CD, or video game

-                                and you already know its ISBN or EAN (for a book) or UPC,

-                                consider using ProductID instead to retrieve more

-                                precise results. &lt;br&gt;

-                                &lt;br&gt;

-                                The request requires either QueryKeywords or

-                                ProductID, but these fields cannot be used together.

-                                </xs:documentation>

-                            <xs:appinfo>

-                                <MaxLength>350</MaxLength>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <RequiredInput>Conditionally</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="SellerID" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The ID of a specific seller.

-                                Specify this value in combination with ProductID 

-                                if you want search results to be filtered so that the items returned 

-                                are only items in a specific product, sold by a specific seller.  

-                                To specify SellerID, use SellerID and ProductID together.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ProductSort" type="ns:ProductSortCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Sorts the list of products returned. This is mostly only useful

-                                with QueryKeywords. (When you use ExternalProductID or

-                                ProductReferenceID, Half.com usually only returns one product.)

-                            </xs:documentation>

-                            <xs:appinfo>

-                            <Default>Popularity</Default>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="SortOrder" type="ns:SortOrderCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Sorts the list of products returned. 

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Default>Descending</Default>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="MaxEntries" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specifies the maximum number of products to return per page

-                                in a single call. This is mostly only useful

-                                with QueryKeywords. (When you use ProductID, Half.com usually only

-                                returns one product, and up to 30 items for that product.)

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Min>1</Min>

-                                <Max>20</Max>

-                                <Default>1</Default>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PageNumber" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specifies which page of data to return in the current call.

-                                Specify a positive value equal to or lower than the number of

-                                pages available (which you determine by examining the results of

-                                your initial request).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Min>1</Min>

-                                <Max>2000</Max>

-                                <Default>1</Default>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FindHalfProductsResponse.xsd #####

-

--->

-        <xs:element name="FindHalfProductsResponse" type="ns:FindHalfProductsResponseType"/>

-<xs:complexType name="FindHalfProductsResponseType">

-        <xs:annotation>

-            <xs:documentation>

-            Returns stock product information in Half.com catalogs, such as

-            information about a particular DVD or book. Optionally,

-            also returns items that match the product.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractResponseType">

-                <xs:sequence>

-                    <xs:element name="DomainHistogram" type="ns:DomainHistogramType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                A histogram that lists the number of matching products found

-                                and the domains in which they were found.

-                                A &lt;i&gt;domain&lt;/i&gt; is essentially

-                                a set of categories that share certain common features

-                                (as determined by Half.com). Each domain has its own name and ID.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <Details>IncludeSelector: DomainHistogram</Details>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PageNumber" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The number of the page of data returned. If many products

-                                are found and multiple pages of results are available, use

-                                this in combination with ApproximatePages and HasMore to decide

-                                which page to retrieve next. As FindHalfProducts only returns

-                                up to 2000 products, the maximum possible value is theoretically

-                                2000 (if you were to set EntriesPerPage to 1 in the request).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Min>1</Min>

-                                <Max>2000</Max>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ApproximatePages" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The total number of pages that can be returned, given the same

-                                query and filters in the request. As FindHalfProducts only returns

-                                up to 2000 products, the maximum possible value is theoretically

-                                2000 (if you were to set MaxEntries to 1 in the request).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Min>1</Min>

-                                <Max>2000</Max>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="MoreResults" type="xs:boolean" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                If true, more pages of results are available.

-                                That is, PageNumber is less than ApproximatePages.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="TotalProducts" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The total number of matching products found.

-                                (If more than 2000 products are found, the call fails

-                                with an error.)

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Min>0</Min>

-                                <Max>2000</Max>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="Products" type="ns:HalfProductsType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                An set of Half.com catalog products. This contains stock information about a

-                                particular DVD, book, or other product.

-                                When you use QueryKeywords in the request, FindHalfProducts returns a

-                                maximum of 20 products per page.

-                                When you use ProductID in the request, FindHalfProducts usually only

-                                returns 1 product.

-                                (If more than one product matches the same ProductID,

-                                FindHalfProducts will return all of those products. As of the time

-                                of this writing, we expect this to be a rare case.)

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <MaxOccurs>20</MaxOccurs>

-                                <CallInfo>

-                                    <CallName>FindHalfProducts</CallName>

-                                    <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FindItemsAdvancedRequest.xsd #####

-

--->

-        <xs:element name="FindItemsAdvancedRequest" type="ns:FindItemsAdvancedRequestType"/>

-<xs:complexType name="FindItemsAdvancedRequestType">

-        <xs:annotation>

-            <xs:documentation>

-                Searches for items based on a variety of input fields.

-                Enables you to specify what item data is returned.

-                Returns detailed information about items. 

-            </xs:documentation>

-            <xs:appinfo>

-                <SeeLink>

-                    <Title>Searching for Items by Using a Query

-</Title>

-                    <URL>http://developer.ebay.com/DevZone/XML/docs/WebHelp/index.htm?context=eBay_XML_API&amp;topic=SearchingItemsWithQuery</URL>

-                    <For>related information (applies primarily to the eBay Trading API)</For>

-                </SeeLink>

-                <SeeLink>

-                    <Title>Searching for Matching Categories

-</Title>

-                    <URL>http://developer.ebay.com/DevZone/XML/docs/WebHelp/index.htm?context=eBay_XML_API&amp;topic=SearchingForMatchingCategories</URL>

-                    <For>information about finding listings in categories (applies primarily to the eBay Trading API)</For>

-                </SeeLink>

-                <Summary>

-                    Searches for items based on many possible input fields. Detailed information is returned about items.

-                </Summary>

-                <RelatedCalls>FindItems, GetSingleItem</RelatedCalls>

-                <TempInfo>IncludeSelector</TempInfo>

-            </xs:appinfo>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractRequestType">

-                <xs:sequence>

-                    <xs:element name="IncludeSelector" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Defines standard subsets of fields to return within the

-                                response.&lt;br&gt;

-                                &lt;br&gt;

-                                If you don't specify this field, a default

-                                set of fields  is returned. Click "Detail Controls" below

-                                and see "none" for the default fields.

-                                If you specify this field, then the set of fields returned

-                                includes the default fields.

-                                If you specify this field, the additional

-                                fields returned can affect the call's response time

-                                (performance), including in the case of feedback data.&lt;br&gt;

-                                &lt;br&gt;

-                                &lt;b&gt;Applicable values&lt;/b&gt;:

-                                &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; Details&lt;/p&gt;

-                                    &lt;p class="edef"&gt;Include most available fields in the

-                                    response (except fields that significantly affect the call's

-                                    performance).&lt;/p&gt;

-                                &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; SearchDetails&lt;/p&gt;

-                                    &lt;p class="edef"&gt;Include additional item information in the

-                                    response. (This can affect the call's performance.)&lt;/p&gt;

-                                &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; SellerInfo&lt;/p&gt;

-                                    &lt;p class="edef"&gt;Include information about the seller in the

-                                    response. &lt;/p&gt;

-                                &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; ItemSpecifics&lt;/p&gt;

-                                    &lt;p class="edef"&gt;Include ItemSpecifics in the

-                                    response.&lt;/p&gt;

-                                &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; ExpansionItemCount&lt;/p&gt;

-                                    &lt;p class="edef"&gt;Include the counts of items that would be returned with expansions.&lt;/p&gt;

-                                &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; CategoryHistogram&lt;/p&gt;

-                                    &lt;p class="edef"&gt;Include a CategoryHistogram container with 

-                                    information about categories that match your search (up to 2 levels).&lt;/p&gt;

-                                &lt;br&gt;

-                                Use a comma to specify multiple values. (In this case,

-                                the results are cumulative.) See "FindItemAdvanced Samples"

-                                for an example of how to use this field.&lt;br&gt;

-                                &lt;br&gt;

-                                See "Detail Controls" for a complete list of

-                                fields that can be returned for each selector.

-                            </xs:documentation>

-                                <xs:appinfo>

-                                    <PresentDetails>Yes</PresentDetails>

-                                    <SeeLink>

-                                        <Title>Detail Controls</Title>

-                                        <URL>#detailControls</URL>

-                                    </SeeLink>

-                                    <SeeLink>

-                                        <Title>FindItemsAdvanced Samples</Title>

-                                        <URL>#samples</URL>

-                                    </SeeLink>

-                                    <CallInfo>

-                                        <CallName>FindItemsAdvanced</CallName>

-                                        <RequiredInput>No</RequiredInput>

-                                    </CallInfo>

-                                </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="BidCountMax" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation> 

-                              Limits the results to items with a maximum number of bids.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="BidCountMin" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation> 

-                                Limits the results to items with a minimum number of bids. 

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="CategoryHistogramMaxParents" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation> 

-                                Maximum number of matching categories to return at the

-                                highest level (root level) of the category hierarchy (level 1). 

-                                If you specify this field along with a category ID, then the response 

-                                will contain child categories of the category ID you specify

-                                and subcategories for each child category.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Max>10</Max>

-                                <Default>3</Default>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="CategoryHistogramMaxChildren" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation> 

-                                Maximum number of matching subcategories to return at each

-                                level of the category hierarchy below the root level. 

-                                If you specify this field along with a category ID, then the response 

-                                will contain child categories of the category ID you specify

-                                and subcategories for each child category.                              

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Max>10</Max>

-                                <Default>3</Default>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="QueryKeywords" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                    A query that specifies a string for searching titles of items on eBay.

-                                    If you are using a URL, then to search for multiple words,

-                                    use "%20". For example, use Harry%20Potter to search for items

-                                    containing those words in any order.

-                                    You can incorporate wildcards into a multi-word search, as in the following: ap*%20ip*.

-                                    The words "and" and "or" are treated like any other word. Only use "and",

-                                    "or", or "the" if you are searching for listings containing these words.

-                                    FindItemsAdvanced requires that you specify

-                                    at least one of the following:

-                                    QueryKeywords, CategoryID, ProductID, or SellerID.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Min>3</Min>

-                                <MaxLength>350 (characters)</MaxLength>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>Conditionally</RequiredInput>

-                                </CallInfo>

-                                <SeeLink>

-                                    <Title>Searching by Keywords

-</Title>

-                                    <URL>http://developer.ebay.com/DevZone/XML/docs/WebHelp/index.htm?context=eBay_XML_API&amp;topic=SearchingByKeywords</URL>

-                                    <For>related information (applies primarily to the eBay Trading API)</For>

-                                </SeeLink>

-                                <SeeLink>

-                                    <Title>string</Title>

-                                    <URL>types/simpleTypes.html#string</URL>

-                                </SeeLink>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="CategoryID" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specify CategoryID to restrict your query to a

-                                specific category. CategoryID cannot be used with

-                                the following input fields: EndTimeFrom, EndTimeTo, 

-                                PriceMin, or PriceMax.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                If the specified category ID doesn't match an existing category

-                                for the site, an invalid-category error message is returned.

-                                To determine valid categories:&lt;br&gt;

-                                Use the CategoryHistogram value in the IncludeSelector field 

-                                to retrieve matching categories. Then make another

-                                FindItemsAdvanced call with the ID of a matching category.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                FindItemsAdvanced requires that you specify

-                                at least one of the following:

-                                QueryKeywords, CategoryID, ProductID, or SellerID.

-                                CategoryID can be used in combination with QueryKeywords.

-                                If you pass CategoryID without QueryKeywords, CategoryID must be 

-                                a leaf category ID. That is, it cannot be a

-                                root-level ID.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <MaxLength>10</MaxLength>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>Conditionally</RequiredInput>

-                                </CallInfo>

-                                <SeeLink>

-                                    <Title>Searching by Category ID

-</Title>

-                                    <URL>http://developer.ebay.com/DevZone/XML/docs/WebHelp/index.htm?context=eBay_XML_API&amp;topic=SearchingByCategoryID</URL>

-                                    <For>related information (applies primarily to the eBay Trading API)</For>

-                                </SeeLink>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ItemSort" type="ns:SimpleItemSortCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                    Sorts search results based on the value you specify.

-                                    See the SortOrder field for values for specifying 

-                                    that results are returned in ascending or

-                                    descending order. (By default, results are returned in descending order.)

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <Default>EndTime</Default>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="SortOrder" type="ns:SortOrderCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                    Sorts search results in ascending or descending order, in conjunction with the value you specify in ItemSort. The default is descending order. For example, if you specify an ItemSort value of BestMatch,

-                                    the most relevant items will be returned first, because the default SortOrder value is Descending.

-                                    If you specify an ItemSort value of EndTime (to sort items by end time), and

-                                    a SortOrder value of Ascending, then items ending in less time (from the time of the call) are returned before items ending in more time. 

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <Default>Descending</Default>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="GroupMaxEntries" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                GroupMaxEntries is used when you specify that BestMatch search results are

-                                grouped by category (by using BestMatchCategoryGroup in the ItemSort

-                                field.) In GroupMaxEntries, you specify the maximum number of entries per

-                                group that you want in the search results. There is not a direct

-                                correlation between the number of items returned in a regular sort (or in

-                                a BestMatch sort) and the number of items that are returned when you

-                                specify BestMatchCategoryGroup in the ItemSort field. When you specify

-                                BestMatchCategoryGroup in the ItemSort field, not more than 2 pages of

-                                results are returned. When you specify GroupMaxEntries, specify GroupsMax.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="GroupsMax" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                GroupsMax is used when you specify that BestMatch search results are

-                                grouped by category (by using BestMatchCategoryGroup in the ItemSort

-                                field.) In GroupsMax, you specify the maximum number of groups that you

-                                want in the search results. There is not a direct correlation between the

-                                number of items returned in a regular sort (or in a BestMatch sort) and

-                                the number of items that are returned when you specify

-                                BestMatchCategoryGroup in the ItemSort field. When you specify

-                                BestMatchCategoryGroup in the ItemSort field, not more than 2 pages of

-                                results are returned. When you specify GroupsMax, specify GroupMaxEntries.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="EndTimeFrom" type="xs:dateTime" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Limits the results to items ending within a time range. EndTimeFrom

-                                specifies the beginning of the time range. Specify a time in the future.

-                                If you specify a time in the past, the current time is used. If specified,

-                                EndTimeTo must also be specified (with a value equal to or later than

-                                EndTimeFrom). Specify the time in GMT. Cannot be used with the ModTimeFrom

-                                filter.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>Conditionally</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="EndTimeTo" type="xs:dateTime" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Limits the results to items ending within a time range. EndTimeTo specifies

-                                the end of the time range. If specified, EndTimeFrom must also be specified

-                                (with a value equal to or earlier than EndTimeTo). Specify the time in GMT.

-                                Cannot be used with the ModTimeFrom filter.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>Conditionally</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ModTimeFrom" type="xs:dateTime" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Limits the results to active items whose status has changed

-                                since the specified time. Specify a time in the past.

-                                Time must be in GMT. Cannot be used with the EndTime filters.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="SellerID" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The ID of a specific seller.

-                                Specify this value if you want search results to be filtered so that

-                                the items returned are only items sold by a specific seller or by specific sellers.  

-                                SellerID is an unbounded field.

-                                If you are using a URL, and you want to specify multiple values,

-                                use a comma.

-                                For example, to specify FavSellerBlue and FavSellerGreen,

-                                specify SellerID=FavSellerBlue,FavSellerGreen.

-                                FindItemsAdvanced requires that you specify

-                                at least one of the following: QueryKeywords, CategoryID, ProductID, or SellerID.

-                                If you want Store Inventory format (StoresFixedPrice) items to be returned, you must also specify the AllItemTypes value in the ItemType field.

-                                The value you specify in SellerID is ignored if it is invalid.

-                                You can specify a maximum of 100 sellers.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="SellerIDExclude" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specify this value if you want search results to be filtered so that

-                                the items returned do not include items sold by a specific seller or by specific sellers.

-                                The SellerIDExclude input field need not be used if you specified the SellerID input field.

-                                SellerIDExclude is an unbounded field.

-                                If you are using a URL, and you want to specify multiple values,

-                                use a comma. 

-                                For example, if you want to specify FavSellerBlue and FavSellerGreen,

-                                specify SellerIDExclude=FavSellerBlue,FavSellerGreen.

-                                You can specify a maximum of 100 sellers.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ItemType" type="ns:ItemTypeCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Filters items based on criteria related to the listing type of items.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="MaxDistance" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                    The maximum distance from the item-location value you specify in PostalCode.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PostalCode" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                    The postal code where an item is located.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ProductID" type="ns:ProductIDType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                You can use this input field to search by ISBN, UPC, 

-                                EAN, or eBay Product Reference ID, as in the following examples. 

-                                To search using an ISBN, specify

-                                ProductID.Type=ISBN and set

-                                ProductID.Value to an ISBN value. 

-                                To search using an eBay Product Reference ID, specify

-                                ProductID.Type=Reference and set

-                                ProductID.Value to an eBay Product Reference ID value. 

-                                If you do not know the eBay Product Reference ID

-                                of a product, use FindProducts

-                                to retrieve the desired eBay Product Reference ID. 

-                                FindItemsAdvanced requires that you specify

-                                at least one of the following:

-                                QueryKeywords, CategoryID, ProductID, or SellerID.

-                                If you use the ProductID field, do not use

-                                QueryKeywords, CategoryID, or SellerID.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="MaxEntries" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specifies the maximum number of entries to return in a single call. If

-                                the number of available items is less than the value you specify, the

-                                lower number is returned. If you want the response to contain only the

-                                total number of items matching the query, specify a MaxEntries value of

-                                0.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Default>20</Default>

-                                <Max>100</Max>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PageNumber" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specifies the number of the page of data to return in the current call.

-                                Specify a   positive value equal to or lower than the number of pages available

-                                (which you determine by examining the results of your initial request).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <Default>1</Default>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PriceMax" type="ns:AmountType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation> 

-                                Specifies the maximum current price an item can have to be included in

-                                the response.

-                                Specified as in the following URL snippet: PriceMax.Value=500.

-                                Optionally, you can also specify a currency ID, e.g., as part of a URL, PriceMax.currencyID=EUR.

-                                Use PriceMax to specify a maximum price or use 

-                                PriceMax with PriceMin to specify a price range.                                

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PriceMin" type="ns:AmountType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation> 

-                                Specifies the minimum current price an item listing can have to be included in

-                                the searches result set. Use alone to specify a minimum price or with MaxPrice

-                                to define a range the items' prices must be.

-                                Specified as in the following URL snippet: PriceMin.Value=400.

-                                Optionally, you can also specify a currency ID, e.g., as part of a URL, PriceMin.currencyID=EUR.

-                            </xs:documentation>

-                                <xs:appinfo>

-                                    <CallInfo>

-                                        <CallName>FindItemsAdvanced</CallName>

-                                        <RequiredInput>No</RequiredInput>

-                                    </CallInfo>

-                                </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="Condition" type="ns:ItemConditionCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Limits the results to new or used items, plus items that have no

-                                condition specified.&lt;br&gt;

-                                &lt;br&gt;

-                                Matches the new or used condition that the seller specified

-                                in the Item Specifics section of the listing.

-                                (That is, this won't specifically match on items where the seller

-                                only put the word "New" in the listing's title.)&lt;br&gt;

-                                &lt;br&gt;

-                                Only applicable to the following sites: 

-                                United Kingdom (UK, site ID 3), Australia (AU, site ID 15),

-                                Germany (DE, site ID 77), and India (IN, site ID 203).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="CharityID" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Limits results to items that support the specified

-                                nonprofit charity organization.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="SearchFlag" type="ns:SearchFlagCodeType" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Search for charity listings, items with free shipping, and other features.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PaymentMethod" type="ns:PaymentMethodSearchCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Limits results to items that accept a specific payment method or methods.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="StoreName" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation> 

-                                The name of the eBay Store in which the item is listed (case sensitive).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="StoreSearch" type="ns:StoreSearchCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation> 

-                                Specifies the type of store search used for filtering results.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="SellerBusinessType" type="ns:SellerBusinessCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Limits the results to those of a particular seller business type such as

-                                commercial or private.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="Quantity" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                              Limits the results to listings that offer a certain number of items

-                                matching the query. The Quantity field is used with QuantityOperator to

-                                specify that you are seeking listings with quantities greater than, equal

-                                to, or less than the value you specify in Quantity.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="QuantityOperator" type="ns:QuantityOperatorCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                              Limits the results to listings with quantities greater than, equal to, or

-                                less than the value you specify in Quantity. 

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="Currency" type="ns:CurrencyCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Limits the result set to just those items with a specified currency.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ItemsAvailableTo" type="ns:CountryCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation> 

-                                Limits the result set to just those items available to the specified country.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ItemsLocatedIn" type="ns:CountryCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation> 

-                                Limits the result set to just those items located in the specified country.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PreferredLocation" type="ns:PreferredLocationCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specifies the criteria for filtering search results by site, where site is 

-                                determined by the site ID in the request. 

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FindItemsAdvancedResponse.xsd #####

-

--->

-        <xs:element name="FindItemsAdvancedResponse" type="ns:FindItemsAdvancedResponseType"/>

-<xs:complexType name="FindItemsAdvancedResponseType">

-        <xs:annotation>

-            <xs:documentation>

-                Contains the item listings matching your search criteria. 

-            </xs:documentation>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractResponseType">

-                <xs:sequence>

-                    <xs:element name="SearchResult" type="ns:SearchResultType" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Contains the returned item listings, if any. The data for each listing is

-                                returned in an Item container.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <Details>IncludeSelector: none, Details, SearchDetails, ItemSpecifics, SellerInfo, ExpansionItemCount, CategoryHistogram</Details>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PageNumber" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Indicates the page of data returned by the current call. For instance,

-                                for the first set of items can be returned, this field has a value of

-                                1.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <Details>IncludeSelector: none, Details, SearchDetails, ItemSpecifics, SellerInfo, ExpansionItemCount, CategoryHistogram</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="TotalPages" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Indicates the total number of pages of data

-                                that could be returned by repeated requests. Returned with a

-                                value of 0 if no pages are available.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <Details>IncludeSelector: none, Details, SearchDetails, ItemSpecifics, SellerInfo, ExpansionItemCount, CategoryHistogram</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="TotalItems" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Indicates the total number of items that

-                                could be returned by repeated requests. Returned with a

-                                value of 0 if no items match your search request.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <Details>IncludeSelector: none, Details, SearchDetails, ItemSpecifics, SellerInfo, ExpansionItemCount, CategoryHistogram</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="CategoryHistogram" type="ns:CategoryArrayType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Statistical (histogram) information about categories that contain items that match

-                                the query, if any. For categories

-                                associated with specific items, see items returned in each search

-                                result. Shows the distribution of items across each category.

-                                Not returned if there is no match. 

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <Details>IncludeSelector: CategoryHistogram</Details>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="TotalStoresExpansionItems" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation> 

-                                Total item count for a store expansion of the search.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <Details>IncludeSelector: ExpansionItemCount</Details>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="TotalInternationalExpansionItems" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation> 

-                                Total item count for an international expansion of the search.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <Details>IncludeSelector: ExpansionItemCount</Details>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ItemSearchURL" type="xs:anyURI" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                A URL for search results that corresponds to your search request.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItemsAdvanced</CallName>

-                                    <Details>IncludeSelector: none, Details, SearchDetails, ItemSpecifics, SellerInfo, ExpansionItemCount, CategoryHistogram</Details>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FindItemsRequest.xsd #####

-

--->

-        <xs:element name="FindItemsRequest" type="ns:FindItemsRequestType"/>

-<xs:complexType name="FindItemsRequestType">

-        <xs:annotation>

-            <xs:documentation>

-                Searches for items based a query or seller ID.

-                If you use keywords, this call returns items that contain the keywords in the title.

-                A maximum of 50 items is returned.

-            </xs:documentation>

-            <xs:appinfo>

-                <Summary>

-                    Searches for items based a query or seller ID.

-                    If you use keywords, this call returns items that contain the keywords in the title.

-                    A maximum of 50 items is returned.

-                </Summary>

-                <RelatedCalls>FindItemsAdvanced, GetSingleItem, GetItemStatus, GetShippingCosts</RelatedCalls>

-            </xs:appinfo>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractRequestType">

-                <xs:sequence>

-                    <xs:element name="QueryKeywords" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                A query that specifies a string for searching titles of items on eBay.

-                                If you are using a URL, then to search for multiple words,

-                                use "%20". For example, use Harry%20Potter to search for items

-                                containing those words in any order.

-                                You can incorporate wildcards into a multi-word search, as in the following: ap*%20ip*.

-                                The words "and" and "or" are treated like any other word. Only use "and",

-                                "or", or "the" if you are searching for listings containing these words.

-                                FindItems requires that you specify either QueryKeywords, SellerID, or both.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <MaxLength>350 (characters)</MaxLength>

-                                <CallInfo>

-                                    <CallName>FindItems</CallName>

-                                    <RequiredInput>Conditionally</RequiredInput>

-                                </CallInfo>

-                                <SeeLink>

-                                    <Title>string</Title>

-                                    <URL>types/simpleTypes.html#string</URL>

-                                </SeeLink>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ItemSort" type="ns:SimpleItemSortCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Sorts search results based on the value you specify.

-                                See the SortOrder field for values for specifying 

-                                that results are returned in ascending or

-                                descending order. (By default, results are returned in descending order.)

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <Default>EndTime</Default>

-                                    <CallName>FindItems</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="SortOrder" type="ns:SortOrderCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Sorts search results in ascending or descending order, in conjunction with the value you specify in ItemSort. The default is descending order. For example, if you specify an ItemSort value of BestMatch,

-                                the most relevant items will be returned first, because the default SortOrder value is Descending.

-                                If you specify an ItemSort value of EndTime (to sort items by end time), and

-                                a SortOrder value of Ascending, then items ending in less time (from the time of the call) are returned before items ending in more time. 

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <Default>Descending</Default>

-                                    <CallName>FindItems</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="MaxEntries" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specifies the maximum number of entries to return in a single call. If the number of entries that can be returned is less than the value you specify, the lower number is returned. 

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Max>50</Max>

-                                <CallInfo>

-                                    <Default>3</Default>

-                                    <CallName>FindItems</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PostalCode" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specifies the postal code where the buyer is located.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItems</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="SellerID" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The ID of a specific seller.

-                                Specify this value if you want search results to be filtered so that

-                                the items returned are only items sold by a specific seller or by specific sellers.  

-                                SellerID is an unbounded field.

-                                If you are using a URL, and you want to specify multiple values,

-                                use a comma.

-                                For example, to specify FavSellerBlue and FavSellerGreen,

-                                specify SellerID=FavSellerBlue,FavSellerGreen.

-                                The value you specify in SellerID is ignored if it is invalid.

-                                You can specify a maximum of 100 sellers.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItems</CallName>

-                                    <RequiredInput>Conditionally</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="SellerIDExclude" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specify this value if you want search results to be filtered so that

-                                the items returned do not include items sold by a specific seller or by specific sellers.

-                                The SellerIDExclude input field need not be used if you specified the SellerID input field.

-                                SellerIDExclude is an unbounded field.

-                                If you are using a URL, and you want to specify multiple values,

-                                use a comma. 

-                                For example, if you want to specify FavSellerBlue and FavSellerGreen,

-                                specify SellerIDExclude=FavSellerBlue,FavSellerGreen. 

-                                You can specify a maximum of 100 sellers.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindItems</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FindItemsResponse.xsd #####

-

--->

-        <xs:element name="FindItemsResponse" type="ns:FindItemsResponseType"/>

-<xs:complexType name="FindItemsResponseType">

-        <xs:complexContent>

-                <xs:extension base="ns:AbstractResponseType">

-                    <xs:sequence>

-                        <xs:element name="Item" type="ns:SimpleItemType" minOccurs="0" maxOccurs="unbounded">

-                            <xs:annotation>

-                                <xs:documentation>

-                                    Contains summary data for an item listing.

-                                </xs:documentation>

-                                <xs:appinfo>

-                                    <CallInfo>

-                                        <CallName>FindItems</CallName>

-                                        <Returned>Conditionally</Returned>

-                                    </CallInfo>

-                                </xs:appinfo>

-                            </xs:annotation>

-                        </xs:element>

-                        <xs:element name="TotalItems" type="xs:int" minOccurs="0">

-                            <xs:annotation>

-                                <xs:documentation>

-                                    Indicates the total number of items on eBay that match the query.

-                                </xs:documentation>

-                                <xs:appinfo>

-                                    <CallInfo>

-                                        <CallName>FindItems</CallName>

-                                        <Returned>Always</Returned>

-                                    </CallInfo>

-                                </xs:appinfo>

-                            </xs:annotation>

-                        </xs:element>

-                        <xs:element name="ItemSearchURL" type="xs:anyURI" minOccurs="0">

-                            <xs:annotation>

-                                <xs:documentation>

-                                    A URL equivalent to your FindItems search query.

-                                    FindItems returns a maximum of 50 items, so you can use the value in ItemSearchURL 

-                                    to provide users with a link for viewing more items.

-                                </xs:documentation>

-                                <xs:appinfo>

-                                    <CallInfo>

-                                        <CallName>FindItems</CallName>

-                                        <Returned>Conditionally</Returned>

-                                    </CallInfo>

-                                </xs:appinfo>

-                            </xs:annotation>

-                        </xs:element>

-                    </xs:sequence>

-                </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FindPopularItemsRequest.xsd #####

-

--->

-        <xs:element name="FindPopularItemsRequest" type="ns:FindPopularItemsRequestType"/>

-<xs:complexType name="FindPopularItemsRequestType">

-        <xs:annotation>

-            <xs:documentation>

-                Find popular items

-            </xs:documentation>

-            <xs:appinfo>

-                <Summary>

-                    Searches for popular items based on a category or keyword.  

-                    Returns WatchCount in addition to item information.

-                </Summary>

-                <RelatedCalls>

-                    FindPopularSearches

-                </RelatedCalls>

-            </xs:appinfo>           

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractRequestType">

-                <xs:sequence>

-                    <xs:element name="CategoryID" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specify CategoryID to restrict your query to a specific category.

-                                Up to 10 categories may be specified.

-                                If you are using a URL, and you want to specify

-                                more than one CategoryID, separate the values with a comma.

-                                For example, to specify Fiction Books and 

-                                Children's Books, specify CategoryID=377,279.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                If the specified category ID doesn't match an existing category

-                                for the site, an invalid-category error message is returned.

-                                To determine valid categories:&lt;br&gt;

-                                Use the FindItemsAdvanced CategoryHistogram value in the IncludeSelector field 

-                                to retrieve matching categories. Then make another

-                                FindItemsAdvanced call with the ID of a matching category.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                CategoryID can be used in combination with QueryKeywords and CategoryIDExclude.

-                                To retrieve the most popular items across all categorys, do not submit a CategoryID.

-                                </xs:documentation>

-                            <xs:appinfo>

-                                <MaxLength>10</MaxLength>

-                                <CallInfo>

-                                    <CallName>FindPopularItems</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="QueryKeywords" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                A query that specifies a string for searching titles of items on eBay.

-                                If you are using a URL, then to search for multiple words,

-                                use "%20". For example, use Harry%20Potter to search for items

-                                containing those words in any order.

-                                You can incorporate wildcards into a multi-word search, as in the following: ap*%20ip*.

-                                The words "and" and "or" are treated like any other word. Only use "and",

-                                "or", or "the" if you are searching for listings containing these words.

-                                QueryKeywords can be used in combination with CategoryID and CategoryIDExclude.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Min>3</Min>

-                                <MaxLength>350 (characters)</MaxLength>

-                                <CallInfo>

-                                    <CallName>FindPopularItems</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                                <SeeLink>

-                                    <Title>Searching by Keywords

-</Title>

-                                    <URL>http://developer.ebay.com/DevZone/XML/docs/WebHelp/index.htm?context=eBay_XML_API&amp;topic=SearchingByKeywords</URL>

-                                </SeeLink>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="CategoryIDExclude" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specify this value if you want search results to be filtered so that the popular 

-                                items returned do not include items that belong to a specific category. 

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                CategoryIDExclude is an unbounded field.

-                                If you are using a URL, you can separate multiple values with a comma.

-                                For example, if you want to specify 

-                                Records and SuperAudio CDs, specify 

-                                CategoryIDExclude=306,46354.  

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                CategoryIDExclude can be used in combination with QueryKeywords and CategoryID.

-                                The CategoryIDExclude input field need not be used if you specified the 

-                                CategoryID input field.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindPopularItems</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FindPopularItemsResponse.xsd #####

-

--->

-        <xs:element name="FindPopularItemsResponse" type="ns:FindPopularItemsResponseType"/>

-<xs:complexType name="FindPopularItemsResponseType">

-        <xs:annotation>

-            <xs:documentation>

-                Popular items, detail level is default for simple item type. addition with WatchCount.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractResponseType">

-                <xs:sequence>

-                    <xs:element name="ItemArray" type="ns:SimpleItemArrayType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                A list of active items that were listed with the requested product.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindPopularItems</CallName>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FindPopularSearchesRequest.xsd #####

-

--->

-        <xs:element name="FindPopularSearchesRequest" type="ns:FindPopularSearchesRequestType"/>

-<xs:complexType name="FindPopularSearchesRequestType">

-        <xs:annotation>

-            <xs:documentation>

-                Retrieves the words more frequently used by eBay users when searching for listings. 

-                These keywords are generated weekly by eBay. Thus, calls retrieve static data. 

-                FindPopularSearches is not available for the following sites: FR, HK, MY, PH, PL, SG, SE.

-            </xs:documentation>

-            <xs:appinfo>

-                <Summary>

-                    Finds the words more frequently used by eBay users when searching for listings.  

-                    If you use keywords, this call returns available alternative keywords in addition to

-                    popular related keywords.

-                </Summary>

-                <RelatedCalls>

-                    FindPopularItems

-                </RelatedCalls>

-            </xs:appinfo>           

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractRequestType">

-                <xs:sequence>

-                    <xs:element name="CategoryID" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specify CategoryID to restrict your query to a specific category.

-                                Up to 10 categories may be specified

-                                If you are using a URL, and you want to specify

-                                multiple values, use a comma.

-                                For example, if you want to specify Fiction Books and 

-                                Children's Books, specify CategoryID=377,279.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                If the specified category ID doesn't match an existing category

-                                for the site, an invalid-category error message is returned.

-                                To determine valid categories:&lt;br&gt;

-                                Use the FindItemsAdvanced CategoryHistogram value in the IncludeSelector field 

-                                to retrieve matching categories. Then make another

-                                FindItemsAdvanced call with the ID of a matching category.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                CategoryID can be used in combination with QueryKeywords and IncludeChildCategories.

-                                When IncludeChildCategories is true and used in conjunction with CategoryID, 

-                                one and only one CategoryID is allowed. Otherwise, up

-                                to 10 CategoryIDs are allowed.

-                                To retrieve the most popular keywords for a root category, set one of

-                                the CategoryIDs to -1 or do not include CategoryID in the Request.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <MaxLength>10</MaxLength>

-                                <CallInfo>

-                                    <CallName>FindPopularSearches</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="QueryKeywords" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                A query that specifies a string for searching titles of items on eBay.

-                                If you are using a URL, then to search for multiple words,

-                                use "%20". For example, use Harry%20Potter to search for items

-                                containing those words in any order.

-                                You can incorporate wildcards into a multi-word search, as in the following: ap*%20ip*.

-                                The words "and" and "or" are treated like any other word. Only use "and",

-                                "or", or "the" if you are searching for listings containing these words.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                QueryKeywords can be used in combination with CategoryID and IncludeChildCategories.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindPopularSearches</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="MaxKeywords" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The maximum number of keywords to be retrieved per category

-                                for this call.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindPopularSearches</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                                <Min>1</Min>

-                                <Max>1000</Max>

-                                <Default>20</Default>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="MaxResultsPerPage" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specifies the maximum number of PopularSearchResults per page in 

-                                the returned list. If not specified, the default returns 20 results per page. 

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindPopularSearches</CallName>

-                                    <Default>20</Default>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PageNumber" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specifies the number of the page of data to return in the current call. 

-                                Specify a positive value equal to or lower than the number of pages 

-                                available (which you determine by examining the results of your initial request).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindPopularSearches</CallName>

-                                    <Default>1</Default>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="IncludeChildCategories" type="xs:boolean" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                If true, only one CategoryID can be specified, and keywords

-                                are returned for that category and its subcategories.

-                                When IncludeChildCategories is true and used in conjunction with 

-                                CategoryID, one and only one CategoryID is allowed.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                If false, keywords are returned only for the categories

-                                identified by CategoryID. The default is false.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindPopularSearches</CallName>

-                                    <Default>false</Default>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FindPopularSearchesResponse.xsd #####

-

--->

-        <xs:element name="FindPopularSearchesResponse" type="ns:FindPopularSearchesResponseType"/>

-<xs:complexType name="FindPopularSearchesResponseType">

-        <xs:annotation>

-            <xs:documentation>

-                Contains the keyword data for the requested categories. A category's data are contained in a CategoryArrayType object if there is no error (one or more CategoryType objects). Each CategoryType contains its ID, parent ID and keyword list.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractResponseType">

-                <xs:sequence>

-                    <xs:element name="PopularSearchResult" type="ns:PopularSearchesType" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Organization of keywords by category. For each

-                                category, its ID and its parent's ID and keywords

-                                are listed.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindPopularSearches</CallName>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PageNumber" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Indicates the page of data returned by the current call. For instance,

-                                for the first set of items can be returned, this field has a value of

-                                one.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindPopularSearches</CallName>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="TotalPages" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Indicates the total number of pages of data

-                                that could be returned by repeated requests. Returned with a

-                                value of 0 if no pages are available.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindPopularSearches</CallName>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FindProductsRequest.xsd #####

-

--->

-        <xs:element name="FindProductsRequest" type="ns:FindProductsRequestType"/>

-<xs:complexType name="FindProductsRequestType">

-        <xs:annotation>

-            <xs:documentation>

-

-            </xs:documentation>

-            <xs:appinfo>

-                <Summary>

-                    Searches for stock product information (stock description

-                    and Item Specifics), such as information about a particular

-                    kind of DVD or camera. Also, retrieves up to 200 eBay listings associated

-                    with a product.

-                </Summary>

-                <RelatedCalls>

-                    FindItemsAdvanced

-                </RelatedCalls>

-                <TempInfo>IncludeSelector</TempInfo>

-            </xs:appinfo>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractRequestType">

-                <xs:sequence>

-                    <xs:element name="IncludeSelector" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                    Defines standard subsets of fields to return within the

-                                    response.&lt;br&gt;

-                                    &lt;br&gt;

-                                    If you don't specify this field, the call returns a default

-                                    set of fields, focusing on product details only

-                                    (see the "Detail Controls" link below). If you specify this

-                                    field, the additional fields you retrieve can affect the call's

-                                    response time (performance).&lt;br&gt;

-                                    &lt;br&gt;

-                                    &lt;b&gt;Applicable values&lt;/b&gt;:

-                                    &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; Details&lt;/p&gt;

-                                        &lt;p class="edef"&gt;Include all available item fields

-                                        in the response. Only applicable when you are searching by

-                                        ProductID. Not applicable with QueryKeywords.&lt;/p&gt;

-                                    &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; DomainHistogram&lt;/p&gt;

-                                        &lt;p class="edef"&gt;Include the DomainHistogram in

-                                        the response. The histogram lists the number of matching

-                                        products found and the domains in which they were found.

-                                        (A domain is like a high-level category.)

-                                        When many matching products are found, you may see

-                                        significantly slower response times when you include

-                                        the histogram.&lt;/p&gt;

-                                    &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; Items&lt;/p&gt;

-                                        &lt;p class="edef"&gt;Include a brief set of item fields

-                                        in the response.

-                                        Only applicable when you are searching by ProductID.

-                                        Not applicable with QueryKeywords.&lt;/p&gt;

-                                    &lt;br&gt;

-                                    &lt;br&gt;

-                                    Use a comma to specify multiple values. (In this case,

-                                    the results are cumulative.) See "FindProducts Samples"

-                                    for an example of how to use this field.&lt;br&gt;

-                                    &lt;br&gt;

-                                    See "Detail Controls" for a complete list of

-                                    fields that can be returned for each selector.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <MaxLength/>

-                                <PresentDetails>Yes</PresentDetails>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="AvailableItemsOnly" type="xs:boolean" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                If true, only retrieve data for products that have been used to

-                                pre-fill active listings on the specified eBay site.

-                                If false, retrieve all products that match the query.

-                                This is useful when you use QueryKeywords and you only want to

-                                find products that have associated items (that is, where ItemArray

-                                would not beempty).&lt;br&gt;

-                                &lt;br&gt;

-                                This does not retrieve ItemArray; this only controls which

-                                products are returned (or counted). To retrieve ItemArray,

-                                pass Items in IncludeSelector.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Default>false</Default>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="DomainName" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                A domain to search in. This is like searching a section of

-                                a catalog. If not specified, the product search is conducted

-                                across all domains. To determine valid domain names,

-                                first use this call with QueryKeywords. Domain names are returned

-                                for each product (and summarized in the domain histogram, if you

-                                specify DomainHistogram in IncludeSelector).&lt;br&gt;

-                                &lt;br&gt;

-                                A domain is a named grouping of categories whose items share

-                                common product characteristics. For example, all bound books

-                                have a binding or format (e.g., Hardcover), but audiobooks don't.

-                                So audiobooks would have their own domain.

-                                To limit your search to audiobooks, you would specify Audiobooks

-                                as the domain.&lt;br&gt;

-                                &lt;br&gt;

-                                Only useful when QueryKeywords is specified. If you use this with

-                                ProductID, AND logic is applied. In this case, if you specify an

-                                ID that doesn't match the domain (as eBay has defined it),

-                                no matching product will be found. Therefore, we recommend that you only use DomainName with QueryKeywords.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ProductID" type="ns:ProductIDType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Use this to retrieve product details for one specific product.

-                                Specify the ID as a string, and use the type attribute to

-                                indicate the nature of the ID you are specifying.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                The request requires either QueryKeywords or

-                                ProductID, but these fields cannot be used together.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <MaxLength>4000</MaxLength>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <RequiredInput>Conditionally</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="QueryKeywords" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                One or more keywords to search for. When you use a keyword search,

-                                eBay searches the product catalogs  for matching words in the

-                                product title, description, and/or Item Specifics, and it returns

-                                a list of matching products, with no items. To retrieve

-                                items, use ProductID instead. (If you don't already have a

-                                product ID, you can get product IDs from the

-                                response after conducting a keyword search.)&lt;br&gt;

-                                &lt;br&gt;

-                                If specified, you must pass in at least 3 alphanumeric characters.&lt;br&gt;

-                                &lt;br&gt;

-                                The words "and" and "or" are treated like any other word.

-                                Only use "and", "or", or "the" if you are searching for products

-                                containing these words.

-                                To use AND or OR logic, use eBay's standard search string

-                                modifiers. Wildcards (+, -, or *) are also supported.

-                                Be careful when using spaces before or after modifiers and

-                                wildcards.&lt;br&gt;

-                                &lt;br&gt;

-                                Some keyword queries can result in response times of 30 seconds or

-                                longer. If more than 2000 matches are found, the call fails with

-                                an error. If this kind of error occurs, refine the search by

-                                passing in more keywords and/or by using DomainName to restrict

-                                the search to certain domains (such as DVDs).

-                                If you are searching for a particular book, DVD, CD, or video game

-                                and you already know its ISBN or EAN (for a book) or UPC,

-                                consider using ProductID instead to retrieve more

-                                precise results. &lt;br&gt;

-                                &lt;br&gt;

-                                The request requires either QueryKeywords or

-                                ProductID, but these fields cannot be used together.

-                                </xs:documentation>

-                            <xs:appinfo>

-                                <MaxLength>350</MaxLength>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <RequiredInput>Conditionally</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ProductSort" type="ns:ProductSortCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Sorts the list of products returned. This is mostly only useful

-                                with QueryKeywords. (When you use ProductID, eBay usually only

-                                returns one product.)

-                                Also see SortOrder. If PorductSort and SortOrder are not

-                                specified, products are sorted by popularity in descending order.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Default>Popularity</Default>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="SortOrder" type="ns:SortOrderCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Sorts search results in ascending or descending order.

-                                Only applicable with ProductSort. If you specify ProductSort

-                                without SortOrder, the order defaults to Descending for

-                                all criteria except Title (which defaults to Ascending).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Default>Descending</Default>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="MaxEntries" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specifies the maximum number of products to return per page

-                                in a single call. This is mostly only useful

-                                with QueryKeywords. (When you use ProductID, eBay usually only

-                                returns one product, and up to 200 items for that product.)

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Min>1</Min>

-                                <Max>20</Max>

-                                <Default>1</Default>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PageNumber" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specifies which page of data to return in the current call.

-                                Specify a positive value equal to or lower than the number of

-                                pages available (which you determine by examining the results of

-                                your initial request).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Min>1</Min>

-                                <Max>2000</Max>

-                                <Default>1</Default>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FindProductsResponse.xsd #####

-

--->

-        <xs:element name="FindProductsResponse" type="ns:FindProductsResponseType"/>

-<xs:complexType name="FindProductsResponseType">

-        <xs:annotation>

-            <xs:documentation>

-            Returns stock product information in eBay catalogs, such as

-            information about a particular DVD or camera. Optionally,

-            also returns items that match the product.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractResponseType">

-                <xs:sequence>

-                    <xs:element name="ApproximatePages" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The total number of pages that can be returned, given the same

-                                query and filters in the request. As FindProducts only returns

-                                up to 2000 products, the maximum possible value is theoretically

-                                2000 (if you were to set MaxEntries to 1 in the request).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Min>1</Min>

-                                <Max>2000</Max>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <Returned>Always</Returned>

-                                    <Details>IncludeSelector: none, DomainHistogram, Items, Details</Details>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="MoreResults" type="xs:boolean" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                If true, more pages of results are available.

-                                That is, PageNumber is less than ApproximatePages.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <Returned>Always</Returned>

-                                    <Details>IncludeSelector: none, DomainHistogram, Items, Details</Details>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="DomainHistogram" type="ns:DomainHistogramType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                A histogram that lists the number of matching products found

-                                and the domains in which they were found.

-                                A &lt;i&gt;domain&lt;/i&gt; describes a set of categories that

-                                share certain common characteristics (as determined by eBay).

-                                Each domain has its own name and ID.

-                                Only returned when you specify DomainHistogram in IncludeSelector.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <Returned>Conditionally</Returned>

-                                    <Details>IncludeSelector: DomainHistogram</Details>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ItemArray" type="ns:SimpleItemArrayType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                A list of active items that were listed with the requested

-                                product. Only returned when you specify Items in IncludeSelector,

-                                and the product has matching items that are currently active on

-                                eBay.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <Returned>Conditionally</Returned>

-                                    <Details>IncludeSelector: Items, Details</Details>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PageNumber" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The number of the page of data returned. If many products

-                                are found and multiple pages of results are available, use

-                                this in combination with ApproximatePages and MoreResults

-                                to decide which page to retrieve next. As FindProducts only

-                                returns up to 2000 products, the maximum possible value is

-                                theoretically 2000 (if you were to set MaxEntries to 1 in the

-                                request).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Min>1</Min>

-                                <Max>2000</Max>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <Returned>Always</Returned>

-                                    <Details>IncludeSelector: none, DomainHistogram, Items, Details</Details>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="Product" type="ns:CatalogProductType" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                An eBay catalog product. This contains stock information about a

-                                particular DVD, camera, set of golf clubs, or other product.

-                                When you use QueryKeywords in the request, FindProducts returns a

-                                maximum of 20 products per page.

-                                When you use ProductID in the request, FindProducts usually only

-                                returns 1 product.

-                                (If more than one product matches the same ProductID,

-                                FindProducts will return all of those products. As of the time

-                                of this writing, we expect this to be a rare case.)

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <MaxOccurs>20</MaxOccurs>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <Returned>Always</Returned>

-                                    <Details>IncludeSelector: none, DomainHistogram, Items, Details</Details>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="TotalProducts" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The total number of matching products found.

-                                (If more than 2000 products are found, the call fails

-                                with an error.)

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Min>0</Min>

-                                <Max>2000</Max>

-                                <CallInfo>

-                                    <CallName>FindProducts</CallName>

-                                    <Returned>Always</Returned>

-                                    <Details>IncludeSelector: none, DomainHistogram, Items, Details</Details>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FindReviewsAndGuidesRequest.xsd #####

-

--->

-        <xs:element name="FindReviewsAndGuidesRequest" type="ns:FindReviewsAndGuidesRequestType"/>

-<xs:complexType name="FindReviewsAndGuidesRequestType">

-        <xs:annotation>

-            <xs:documentation>

-                Splitting include reviews and guides from GetProducts.

-            </xs:documentation>

-            <xs:appinfo>

-                <Summary>

-                    Searches reviews and guides based on product, category, or user.  The response provides information about

-                    each user or product's reviews and guides.

-                </Summary>

-                <RelatedCalls>

-                    FindItemsAdvanced, FindProducts, GetCategoryInfo

-                </RelatedCalls>

-            </xs:appinfo>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractRequestType">

-                <xs:sequence>

-                    <xs:element name="ProductID" type="ns:ProductIDType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Use this to retrieve reviews (not guides) for one specific product.

-                                Specify the ID as a string, and use the type attribute 

-                                to indicate the nature of the ID you are specifying. 

-                                Same as FindProducts, supports Reference, ISBN, UPC, EAN.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                ProductID can be used in combination with UserID to return Reviews and Guides.

-                                ProductID and CategoryID cannot be used together.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="UserID" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Retrieves reviews and guides written by the specified user.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                UserID can be combined with either ProductID or CategoryID but not both (as

-                                ProductID and CategoryID cannot be used together).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="CategoryID" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specify a single CategoryID to restrict your query to a specific Guide category.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                If the specified category ID doesn't match an existing category

-                                for the site, an invalid-category error message is returned.

-                                To determine valid categories:&lt;br&gt;

-                                Use the FindItemsAdvanced CategoryHistogram value in the IncludeSelector field 

-                                to retrieve matching categories. Then make another

-                                FindReviewsAndGuides call with the ID of a matching category.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                CategoryID can be used in combination with UserID to return Reviews and Guides.

-                                ProductID and CategoryID cannot be used together.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="MaxResultsPerPage" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specifies the maximum number of reviews per page (not guides) in the returned list. If not 

-                                specified, the default returns 5 results per page.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <Default>5</Default>

-                                    <Max>20</Max>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PageNumber" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Specifies the number of the page of data to return in the current call. 

-                                Specify a positive value equal to or lower than the number of pages 

-                                available (which you determine by examining the results of your initial request).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/FindReviewsAndGuidesResponse.xsd #####

-

--->

-        <xs:element name="FindReviewsAndGuidesResponse" type="ns:FindReviewsAndGuidesResponseType"/>

-<xs:complexType name="FindReviewsAndGuidesResponseType">

-        <xs:annotation>

-            <xs:documentation>

-            Find reviews and guides response type.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractResponseType">

-                <xs:sequence>

-                    <xs:element name="ReviewCount" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Number of returned reviews.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="BuyingGuideCount" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Number of returned buying guides.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ReviewerRank" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Rank of reviewer if using user search.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="TotalHelpfulnessVotes" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Number of helpfulness votes if using user search.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ProductID" type="ns:ProductIDType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The eBay or external IDs associated with the product. 

-                                Use the Reference value as input to search for the same product 

-                                in the future, or use the ISBN, EAN, or UPC value (if returned).

-                                The ISBN, EAN, and UPC values can also be useful as keys if your

-                                application is comparing products across different sites. Always

-                                returned when Product is returned. 

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ReviewsAndGuidesURL" type="xs:anyURI" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                URL to the reviews and guides page.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PageNumber" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The number of the page of data returned. If many products

-                                are found and multiple pages of results are available, use

-                                this in combination with TotalPages to decide

-                                which page to retrieve next. As FindProducts only returns

-                                up to 2000 products, the maximum possible value is theoretically

-                                2000 (if you were to set MaxResultsPerPage to 1 in the request).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Min>1</Min>

-                                <Max>2000</Max>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="TotalPages" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Indicates the total number of pages of data

-                                that could be returned by repeated requests. Returned with a

-                                value of 0 if no pages are available.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="BuyingGuideDetails" type="ns:BuyingGuideDetailsType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Contains information for up to 5 buying guides that match the

-                                query. Buying guides provide useful information about shopping

-                                in a particular domain, like Digital Cameras.

-                                For example, a digital camera buying guide

-                                could help a buyer determine what kind of digital camera

-                                is right for them.

-                                If no buying guides are associated with the product, this only

-                                returns a link to the buying guide hub (the main Guides page).

-                                Count limited by MaxResultsPerPage in request.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ReviewDetails" type="ns:ReviewDetailsType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Contains information about review details. Count limited by MaxResultsPerPage in request.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="PositiveHelpfulnessVotes" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Number of helpfulness votes if using user search.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>FindReviewsAndGuides</CallName>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GetCategoryInfoRequest.xsd #####

-

--->

-        <xs:element name="GetCategoryInfoRequest" type="ns:GetCategoryInfoRequestType"/>

-<xs:complexType name="GetCategoryInfoRequestType">

-        <xs:annotation>

-            <xs:documentation>

-                    This call will give you the ability to retrieve high level

-                    Category information, relevant for a buy-side application.

-            </xs:documentation>

-            <xs:appinfo>

-                <Summary>

-                    This call will give you the ability to retrieve high level

-                    Category information, relevant for a buy-side application.

-                </Summary>

-                <RelatedCalls>FindItemsAdvanced</RelatedCalls>

-                <TempInfo>IncludeSelector</TempInfo>

-            </xs:appinfo>

-        </xs:annotation>

-        <xs:complexContent>

-                <xs:extension base="ns:AbstractRequestType">

-                    <xs:sequence>

-                        <xs:element name="CategoryID" type="xs:string" minOccurs="0">

-                            <xs:annotation>

-                                <xs:documentation>

-                                    Use an ID of -1 to retrieve the root category and the top-level (level 1) meta categories. You can determine other CategoryIDs from the response from this call, or from a specific item (retrieved from another call like FindItemsAdvanced or GetSingleItem), or from the eBay website.

-                                </xs:documentation>

-                                <xs:appinfo>

-                                    <MaxLength>19 (Note: The eBay database specifies 38. Currently, Category ID's are usually 9 to 12 digits)</MaxLength>

-                                    <CallInfo>

-                                        <CallName>GetCategoryInfo</CallName>

-                                        <RequiredInput>Yes</RequiredInput>

-                                    </CallInfo>

-                                </xs:appinfo>

-                            </xs:annotation>

-                        </xs:element>

-                        <xs:element name="IncludeSelector" type="xs:string" minOccurs="0">

-                            <xs:annotation>

-                                <xs:documentation>

-                                    Defines standard subsets of fields to return within the

-                                    response. If you don't specify this field, the call returns

-                                    a default set of fields. If you specify this field, the 

-                                    additional fields (child categories) you retrieve can affect 

-                                    the call's response time (decrease performance).

-                                </xs:documentation>

-                                <xs:appinfo>

-                                    <MaxLength/>

-                                    <PresentDetails>Yes</PresentDetails>

-                                    <SeeLink>

-                                        <Title>Detail Controls</Title>

-                                        <URL>#detailControls</URL>

-                                    </SeeLink>

-                                    <SeeLink>

-                                        <Title>GetCategoryInfo Samples</Title>

-                                        <URL>#samples</URL>

-                                    </SeeLink>

-                                    <CallInfo>

-                                        <CallName>GetCategoryInfo</CallName>

-                                        <RequiredInput>No</RequiredInput>

-                                    </CallInfo>

-                                </xs:appinfo>

-                            </xs:annotation>

-                        </xs:element>

-                    </xs:sequence>

-                </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GetCategoryInfoResponse.xsd #####

-

--->

-        <xs:element name="GetCategoryInfoResponse" type="ns:GetCategoryInfoResponseType"/>

-<xs:complexType name="GetCategoryInfoResponseType">

-        <xs:annotation>

-            <xs:documentation>

-                Contains the category data for the eBay site specified as input. The category

-                data is returned as a CategoryArrayType object, that contains zero, one, or

-                multiple CategoryType objects. Each CategoryType object contains the detail data

-                for one category. Other fields indicate how many categories are returned in a call, when the category hierarchy was last updated, and the version of the category hierarchy (all three of which can differ from one eBay site to the next).

-            </xs:documentation>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractResponseType">

-                <xs:sequence>

-                    <xs:element name="CategoryArray" type="ns:CategoryArrayType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                List of the returned categories. The category array contains one CategoryType

-                                object for each returned category. Returns empty if no detail level is specified.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>GetCategoryInfo</CallName>

-                                    <Details>IncludeSelector: None, ChildCategories</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="CategoryCount" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Indicates the number of categories returned (i.e., the number of CategoryType

-                                objects in CategoryArray).

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>GetCategoryInfo</CallName>

-                                    <Details>IncludeSelector: None, ChildCategories</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="UpdateTime" type="xs:dateTime" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Indicates the last date and time that eBay modified the category hierarchy for the

-                                specified eBay site.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>GetCategoryInfo</CallName>

-                                    <Details>IncludeSelector: None, ChildCategories</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="CategoryVersion" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Indicates the version of the category hierarchy on the

-                                specified eBay site.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>GetCategoryInfo</CallName>

-                                    <Details>IncludeSelector: None, ChildCategories</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GetItemStatusRequest.xsd #####

-

--->

-        <xs:element name="GetItemStatusRequest" type="ns:GetItemStatusRequestType"/>

-<xs:complexType name="GetItemStatusRequestType">

-        <xs:annotation>

-            <xs:documentation>

-                Contains a single ItemID or an array of ItemIDs.

-            </xs:documentation>

-            <xs:appinfo>

-                <Summary>

-                    Allows you to get the status for a group of items. Returns status information such

-                    as ListingStatus and End Time for all items that are listed in the request.

-                </Summary>

-            </xs:appinfo>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractRequestType">

-                <xs:sequence>

-                    <xs:element name="ItemID" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Contains the item ID and description of a listing.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <MaxLength>19 (Note: The eBay database specifies 38. However, Item IDs are usually 9 to 12 digits)</MaxLength>

-                                <CallInfo>

-                                    <CallName>GetItemStatus</CallName>

-                                    <RequiredInput>Yes</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GetItemStatusResponse.xsd #####

-

--->

-        <xs:element name="GetItemStatusResponse" type="ns:GetItemStatusResponseType"/>

-<xs:complexType name="GetItemStatusResponseType">

-        <xs:annotation>

-            <xs:documentation>

-               Returns status information for all items in a list. Some of the Item information 

-                 is returned in an SimpleItemArrayType object, that can include zero, one, or multiple ItemType objects.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractResponseType">

-                <xs:sequence>

-                    <xs:element name="Item" type="ns:SimpleItemType" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Collection of Item status objects in an SimpleItemArrayType object, that can include zero, one, or multiple ItemType objects.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>GetItemStatus</CallName>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GetMultipleItemsRequest.xsd #####

-

--->

-        <xs:element name="GetMultipleItemsRequest" type="ns:GetMultipleItemsRequestType"/>

-<xs:complexType name="GetMultipleItemsRequestType">

-        <xs:annotation>

-            <xs:documentation>

-                Retrieves publicly available data for one or more listings. Use this call to retrieve

-                much of the information that is visible on a listing's View Item page on the eBay Web

-                site, such as title, prices, and basic shipping costs. Provide ItemID for every item for

-                which you want information. This call returns the same minimal information that is

-                returned by GetSingleItem for each item with no IncludeSelector specified. (Use

-                GetShippingCosts to retrieve more detailed shipping cost information for a given item.)

-            </xs:documentation>

-            <xs:appinfo>

-                <Summary>

-                    Retrieves publicly available data for one or more listings.

-                </Summary>

-                <RelatedCalls>GetSingleItem</RelatedCalls>

-            </xs:appinfo>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractRequestType">

-                <xs:sequence>

-                    <xs:element name="ItemID" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The item ID that uniquely identifies the item listing

-                                for which to retrieve the data.

-                                You can provide a maximum of 10 ItemIDs.

-                                &lt;br&gt;

-                                &lt;br&gt;

-                                You can determine an item's ID by calling FindItems or from the eBay Web

-                                site. Provide ItemID for every item for which you want information.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <MaxLength>19 (Note: The eBay database specifies 38. Currently, Item IDs are usually 9 to 12 digits)</MaxLength>

-                                <SeeLink>

-                                    <Title>(FindItems) Item.ItemID</Title>

-                                    <URL>FindItems.html#Response.Item.ItemID</URL>

-                                </SeeLink>

-                                <CallInfo>

-                                    <CallName>GetMultipleItems</CallName>

-                                    <RequiredInput>Yes</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GetMultipleItemsResponse.xsd #####

-

--->

-        <xs:element name="GetMultipleItemsResponse" type="ns:GetMultipleItemsResponseType"/>

-<xs:complexType name="GetMultipleItemsResponseType">

-        <xs:annotation>

-            <xs:documentation>

-                Response to request of GetMultipleItems.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractResponseType">

-                <xs:sequence>

-                    <xs:element name="Item" type="ns:SimpleItemType" minOccurs="0" maxOccurs="unbounded">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Contains details for a listing whose ID was specified in the request.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>GetMultipleItems</CallName>

-                                    <Returned>Always</Returned>

-                                    <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GetShippingCostsRequest.xsd #####

-

--->

-        <xs:element name="GetShippingCostsRequest" type="ns:GetShippingCostsRequestType"/>

-<xs:complexType name="GetShippingCostsRequestType">

-        <xs:annotation>

-            <xs:documentation>

-                Gets shipping costs for an item. This is one of the ways a buyer or seller

-                can obtain shipping cost information for an existing item (for which the caller is

-                either the buyer or seller) at any point in the life of of the listing, before or

-                after a buyer has committed to purchasing the item(s). This call works for

-                both flat rate shipping and calculated shipping. Flat rate shipping costs are

-                established by the seller before bidding occurs. Calculated shipping costs

-                are calculated by eBay with its shipping partners based on postal code, but note

-                that insurance cost can only be determined once the final item price is known

-                when the listing ends. To determine whether a listing has ended, use GetSingleItem.

-                It is best to call GetShippingCosts only after determining via GetSingleItem 

-                or FindItems that the item actually has shipping cost information.

-            </xs:documentation>

-            <xs:appinfo>

-                <Summary>

-                    Gets shipping costs for an item.

-                </Summary>

-                <RelatedCalls>GetSingleItem</RelatedCalls>

-            </xs:appinfo>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractRequestType">

-                <xs:sequence>

-                    <xs:element name="ItemID" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                The item ID that uniquely identifies the item listing for which to retrieve the data.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <MaxLength>19 (Note: The eBay database specifies 38. Currently, Item IDs are usually 9 to 12 digits)</MaxLength>

-                                <CallInfo>

-                                    <CallName>GetShippingCosts</CallName>

-                                    <RequiredInput>Yes</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="QuantitySold" type="xs:int" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Number of items sold to a single buyer and to be shipped together.

-                            </xs:documentation>

-                            <xs:appinfo>

-                              <Default>1</Default>

-                                <CallInfo>

-                                    <CallName>GetShippingCosts</CallName>

-                                    <RequiredInput>No</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="DestinationPostalCode" type="xs:string" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Destination country postal code (or zipcode, for US). Ignored if no

-                                country code is provided. Optional tag for some countries. More likely to

-                                be required for large countries. Ignored for flat rate shipping.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>GetShippingCosts</CallName>

-                                    <RequiredInput>Conditionally</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="DestinationCountryCode" type="ns:CountryCodeType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Destination country code. If DestinationCountryCode is US,

-                                postal code is required and represents US zip code.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Default>US</Default>

-                                <CallInfo>

-                                    <CallName>GetShippingCosts</CallName>

-                                    <RequiredInput>Conditionally</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="IncludeDetails" type="xs:boolean" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Indicates whether to return the ShippingDetails container in the response.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <Default>false</Default>

-                                <CallInfo>

-                                    <CallName>GetShippingCosts</CallName>

-                                    <RequiredInput>Conditionally</RequiredInput>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GetShippingCostsResponse.xsd #####

-

--->

-        <xs:element name="GetShippingCostsResponse" type="ns:GetShippingCostsResponseType"/>

-<xs:complexType name="GetShippingCostsResponseType">

-        <xs:annotation>

-            <xs:documentation>

-                Response to call of GetShippingCosts.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractResponseType">

-                <xs:sequence>

-                    <xs:element name="ShippingDetails" type="ns:ShippingDetailsType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Shipping-related details for the specified item. This container is only

-                                returned if IncludeDetails is true on input. Any error about shipping services

-                                (returned by a vendor of eBay's who calculates shipping costs) is returned in

-                                ShippingRateErrorMessage. Errors from a shipping service are likely to be related to

-                                issues with shipping specifications, such as package size and the selected shipping

-                                method not supported by a particular shipping service.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>GetShippingCosts</CallName>

-                                    <Returned>Conditionally</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                    <xs:element name="ShippingCostSummary" type="ns:ShippingCostSummaryType" minOccurs="0">

-                        <xs:annotation>

-                            <xs:documentation>

-                                Shipping-related details for the specified item. Any error about shipping services

-                                (returned by a vendor of eBay's who calculates shipping costs) is returned in

-                                ShippingRateErrorMessage. Errors from a shipping service are likely to be related to

-                                issues with shipping specifications, such as package size and the selected shipping

-                                method not supported by a particular shipping service.

-                            </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>GetShippingCosts</CallName>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                        </xs:annotation>

-                    </xs:element>

-                </xs:sequence>

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GetSingleItemRequest.xsd #####

-

--->

-        <xs:element name="GetSingleItemRequest" type="ns:GetSingleItemRequestType"/>

-<xs:complexType name="GetSingleItemRequestType">

-        <xs:annotation>

-            <xs:documentation>

-                    Retrieves publicly available data for a single listing.

-                    Use this call to retrieve most of the information that is visible

-                    on a listing's View Item page on the eBay Web site,

-                    such as title, description, prices, basic seller and bidder information,

-                    and other details about the listing.Also returns basic

-                    shipping costs. For more shipping details, use GetShippingCosts.

-            </xs:documentation>

-            <xs:appinfo>

-                <Summary>

-                    Gets publicly visible details about one listing. This gives you most of the

-                    data that eBay shows on the View Item page (title, description,

-                    price, and other details).

-                </Summary>

-                <RelatedCalls>FindItems, GetItemStatus, GetShippingCosts, GetSingleItem</RelatedCalls>

-                <TempInfo>IncludeSelector</TempInfo>

-            </xs:appinfo>

-        </xs:annotation>

-        <xs:complexContent>

-                <xs:extension base="ns:AbstractRequestType">

-                    <xs:sequence>

-                        <xs:element name="ItemID" type="xs:string" minOccurs="0">

-                            <xs:annotation>

-                                <xs:documentation>

-                                    The item ID that uniquely identifies the item listing

-                                    for which to retrieve the data.&lt;br&gt;

-                                    &lt;br&gt;

-                                    You can determine an item's ID by calling FindItems or

-                                    from the eBay Web site.

-                                </xs:documentation>

-                                <xs:appinfo>

-                                    <MaxLength>19 (Note: The eBay database specifies 38. Currently, Item IDs are usually 9 to 12 digits)</MaxLength>

-                                    <SeeLink>

-                                        <Title>(FindItems) Item.ItemID</Title>

-                                        <URL>FindItems.html#Response.Item.ItemID</URL>

-                                    </SeeLink>

-                                    <CallInfo>

-                                        <CallName>GetSingleItem</CallName>

-                                        <RequiredInput>Yes</RequiredInput>

-                                    </CallInfo>

-                                </xs:appinfo>

-                            </xs:annotation>

-                        </xs:element>

-                        <xs:element name="IncludeSelector" type="xs:string" minOccurs="0">

-                            <xs:annotation>

-                                <xs:documentation>

-                                    Defines standard subsets of fields to return within the

-                                    response.&lt;br&gt;

-                                    &lt;br&gt;

-                                    If you don't specify this field, the call returns a default

-                                    set of fields (see the "Detail Controls" link below). If you specify this field, the additional

-                                    fields you retrieve can affect the call's response time

-                                    (performance).&lt;br&gt;

-                                    &lt;br&gt;

-                                    &lt;b&gt;Applicable values&lt;/b&gt;:

-                                    &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; Details&lt;/p&gt;

-                                      &lt;p class="edef"&gt;Include most available fields in the

-                                      response (except fields that significantly affect the call's

-                                      performance).&lt;/p&gt;

-                                    &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; Description&lt;/p&gt;

-                                      &lt;p class="edef"&gt;Include the Description field in the response. (This can affect the call's performance.)&lt;/p&gt;

-                                    &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; ShippingCosts&lt;/p&gt;

-                                      &lt;p class="edef"&gt;Include basic shipping costs in the

-                                      response. (Use GetShippingCosts to retrieve more

-                                      details.)&lt;/p&gt;

-                                    &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; ItemSpecifics&lt;/p&gt;

-                                        &lt;p class="edef"&gt;Include ItemSpecifics in the response.&lt;/p&gt;

-                                    &lt;br&gt;

-                                    &lt;br&gt;

-                                    Use a comma to specify multiple values. (In this case,

-                                    the results are cumulative.) See "GetSingleItem Samples"

-                                    for an example of how to use this field.&lt;br&gt;

-                                    &lt;br&gt;

-                                    See "Detail Controls" for a complete list of

-                                    fields that can be returned for each selector.

-                                </xs:documentation>

-                                <xs:appinfo>

-                                    <MaxLength/>

-                                    <PresentDetails>Yes</PresentDetails>

-                                    <SeeLink>

-                                        <Title>Detail Controls</Title>

-                                        <URL>#detailControls</URL>

-                                    </SeeLink>

-                                    <SeeLink>

-                                        <Title>GetSingleItem Samples</Title>

-                                        <URL>#samples</URL>

-                                    </SeeLink>

-                                    <CallInfo>

-                                        <CallName>GetSingleItem</CallName>

-                                        <RequiredInput>No</RequiredInput>

-                                    </CallInfo>

-                                </xs:appinfo>

-                            </xs:annotation>

-                        </xs:element>

-                    </xs:sequence>

-                </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GetSingleItemResponse.xsd #####

-

--->

-        <xs:element name="GetSingleItemResponse" type="ns:GetSingleItemResponseType"/>

-<xs:complexType name="GetSingleItemResponseType">

-        <xs:complexContent>

-                <xs:extension base="ns:AbstractResponseType">

-                    <xs:sequence>

-                        <xs:element name="Item" type="ns:SimpleItemType" minOccurs="0">

-                            <xs:annotation>

-                                <xs:documentation>

-                                    Contains details about the listing whose ID was specified in

-                                    the request.

-                                </xs:documentation>

-                                <xs:appinfo>

-                                    <CallInfo>

-                                        <CallName>GetSingleItem</CallName>

-                                        <Returned>Always</Returned>

-                                        <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                                    </CallInfo>

-                                </xs:appinfo>

-                            </xs:annotation>

-                        </xs:element>

-                    </xs:sequence>

-                </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GetUserProfileRequest.xsd #####

-

--->

-        <xs:element name="GetUserProfileRequest" type="ns:GetUserProfileRequestType"/>

-<xs:complexType name="GetUserProfileRequestType">

-        <xs:annotation>

-            <xs:documentation>

-                    Retrieves user information based on the user ID you specify. The response contains detailed information about a user. You can specify the types of user information you want in the response. 

-            </xs:documentation>

-            <xs:appinfo>

-                <Summary>

-                    Retrieves user information based on the user ID you specify. The response contains detailed information about a user. You can specify the types of user information you want in the response.

-                </Summary>

-                <RelatedCalls>FindItems</RelatedCalls>

-                <TempInfo>IncludeSelector</TempInfo>

-            </xs:appinfo>

-        </xs:annotation>

-        <xs:complexContent>

-                <xs:extension base="ns:AbstractRequestType">

-                    <xs:sequence>

-                        <xs:element name="UserID" type="xs:string" minOccurs="0">

-                            <xs:annotation>

-                                <xs:documentation> 

-                                        Specifies the user whose data will returned by the call.

-                                </xs:documentation>

-                                <xs:appinfo>

-                                    <CallInfo>

-                                        <CallName>GetUserProfile</CallName>

-                                        <RequiredInput>Yes</RequiredInput>

-                                    </CallInfo>

-                                </xs:appinfo>

-                            </xs:annotation>

-                        </xs:element>

-                        <xs:element name="IncludeSelector" type="xs:string" minOccurs="0">

-                            <xs:annotation>

-                                <xs:documentation>

-                                    Defines standard subsets of fields to return within the

-                                    response.&lt;br&gt;

-                                    &lt;br&gt;

-                                    If you don't specify this field, a default

-                                    set of fields  is returned. Click "Detail Controls" below

-                                    and see "none" for the default fields.

-                                    If you specify this field, then the set of fields returned

-                                    includes the default fields.

-                                    If you specify this field, the additional

-                                    fields returned can affect the call's response time

-                                    (performance), including in the case of feedback data.&lt;br&gt;

-                                    &lt;br&gt;

-                                    &lt;b&gt;Applicable values&lt;/b&gt;:

-                                    &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; Details&lt;/p&gt;

-                                        &lt;p class="edef"&gt;Include most available fields (such as StoreURL) in the

-                                        response (except fields that can affect the call's response time).&lt;/p&gt;

-                                    &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; FeedbackDetails&lt;/p&gt;

-                                        &lt;p class="edef"&gt;Include a container for information about one feedback entry.

-                                        &lt;/p&gt;

-                                    &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; FeedbackHistory&lt;/p&gt;

-                                        &lt;p class="edef"&gt;Include a container for summary feedback data for a user.

-                                        &lt;/p&gt;

-                                        &lt;br&gt;

-                                    Use a comma to specify multiple values. (In this case,

-                                    the results are cumulative.) See "GetUserProfile Samples"

-                                    for an example of how to use this field.&lt;br&gt;

-                                    &lt;br&gt;

-                                    See "Detail Controls" for a complete list of

-                                    fields that can be returned for each selector.

-                                </xs:documentation>

-                                    <xs:appinfo>

-                                        <PresentDetails>Yes</PresentDetails>

-                                        <SeeLink>

-                                            <Title>Detail Controls</Title>

-                                            <URL>#detailControls</URL>

-                                        </SeeLink>

-                                        <SeeLink>

-                                            <Title>GetUserProfile Samples</Title>

-                                            <URL>#samples</URL>

-                                        </SeeLink>

-                                        <CallInfo>

-                                            <CallName>GetUserProfile</CallName>

-                                            <RequiredInput>No</RequiredInput>

-                                        </CallInfo>

-                                    </xs:appinfo>

-                            </xs:annotation>

-                        </xs:element>

-                    </xs:sequence>

-                </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GetUserProfileResponse.xsd #####

-

--->

-        <xs:element name="GetUserProfileResponse" type="ns:GetUserProfileResponseType"/>

-<xs:complexType name="GetUserProfileResponseType">

-        <xs:complexContent>

-                <xs:extension base="ns:AbstractResponseType">

-                    <xs:sequence>

-                        <xs:element name="User" type="ns:SimpleUserType" minOccurs="0">

-                            <xs:annotation>

-                                <xs:documentation>

-                                    Contains the returned user data for the specified eBay user.

-                                </xs:documentation>

-                            <xs:appinfo>

-                                <CallInfo>

-                                    <CallName>GetUserProfile</CallName>

-                                    <Details>IncludeSelector: none, Details, FeedbackDetails, FeedbackHistory</Details>

-                                    <Returned>Always</Returned>

-                                </CallInfo>

-                            </xs:appinfo>

-                            </xs:annotation>

-                        </xs:element>

-                        <xs:element name="FeedbackHistory" type="ns:FeedbackHistoryType" minOccurs="0">

-                            <xs:annotation>

-                                <xs:documentation>

-                                    Summary feedback data for a user. Contains counts of positive, neutral,

-                                    and negative feedback for predefined time periods.

-                                </xs:documentation>

-                                <xs:appinfo>

-                                    <CallInfo>

-                                        <CallName>GetUserProfile</CallName>

-                                        <Details>IncludeSelector: FeedbackHistory</Details>                                     

-                                        <Returned>Always</Returned>

-                                    </CallInfo>

-                                </xs:appinfo>

-                            </xs:annotation>

-                        </xs:element>

-                        <xs:element name="FeedbackDetails" type="ns:FeedbackDetailType" minOccurs="0" maxOccurs="unbounded">

-                            <xs:annotation>

-                                <xs:documentation>

-                                    The FeedbackDetails container has fields (ItemID, etc.) with information about one feedback entry.

-                                    When you call GetUserProfile, the 5 (maximum) most recent feedback records are returned in 

-                                    FeedbackDetails containers. 

-                                </xs:documentation>

-                                <xs:appinfo>

-                                    <CallInfo>

-                                        <CallName>GetUserProfile</CallName>

-                                        <Details>IncludeSelector: FeedbackDetails</Details>                                     

-                                        <Returned>Always</Returned>

-                                    </CallInfo>

-                                </xs:appinfo>

-                            </xs:annotation>

-                        </xs:element>

-                    </xs:sequence>

-                </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GeteBayTimeRequest.xsd #####

-

--->

-        <xs:element name="GeteBayTimeRequest" type="ns:GeteBayTimeRequestType"/>

-<xs:complexType name="GeteBayTimeRequestType">

-        <xs:annotation>

-            <xs:documentation>

-                Gets the official eBay system time in GMT.

-            </xs:documentation>

-            <xs:appinfo>

-                <Summary>

-                    Gets the official eBay system time in GMT.

-                </Summary>

-            </xs:appinfo>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractRequestType">

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/GeteBayTimeResponse.xsd #####

-

--->

-        <xs:element name="GeteBayTimeResponse" type="ns:GeteBayTimeResponseType"/>

-<xs:complexType name="GeteBayTimeResponseType">

-        <xs:annotation>

-            <xs:documentation>

-                The Timestamp field indicates the official eBay system time in GMT.

-                The value returned represents the date and time when eBay processed the request.

-                The value is in the ISO 8601 date-time format (YYYY-MM-DDTHH:MM:SS.SSSZ). 

-            </xs:documentation>

-        </xs:annotation>

-        <xs:complexContent>

-            <xs:extension base="ns:AbstractResponseType">

-            </xs:extension>

-        </xs:complexContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/HalfCatalogProductType.xsd #####

-

--->

-    <xs:complexType name="HalfCatalogProductType">

-        <xs:annotation>

-            <xs:documentation>

-            Information about an Half.com catalog product.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="Title" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The title of the product, as specified in the catalog.

-                        Always returned when Product is returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="DetailsURL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Fully qualified URL for optional information about the product,

-                        such as a movie's description or film credits. This information

-                        is hosted through the Half.com Web site and it cannot be edited.

-                        Portions of the content are protected by copyright.

-                        Applications can include this URL as a link in product search results

-                        so that end users can view additional descriptive details about

-                        the product. This is usually always returned when Product is returned,

-                        but it may be safest to check for the existence of this field.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="StockPhotoURL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Fully qualified URL for a stock image (if any) that is associated

-                        with the Half.com catalog product. The URL is for the image Half.com

-                        usually displays in product search results (usually 70px tall).

-                        It may be helpful to calculate the dimensions of the photo

-                        programmatically before displaying it.

-                        Only returned if a URL is available for the product.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingCostSummary" type="ns:ShippingCostSummaryType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Contains basic shipping-related costs for the item. If Item.Quantity is greater

-                        than 1, this is the shipping cost for one item. If the seller offers a choice of

-                        more than one shipping service (such as USPS Ground or Expediated), this is the

-                        cost of the "first" shipping option (usually the lowest cost option).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Details>IncludeSelector: Items</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="DisplayStockPhotos" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        If true, your application can attempt to display stock photos that

-                        are returned. If false, your application should not attempt to display

-                        any stock photos that are returned. This recommendation is useful for

-                        catalog data related to products like coins, where stock photos are not

-                        necessarily applicable or available. An application with a graphical

-                        user interface can use this flag to determine

-                        when to hide customized stock photo widgets.

-                        Always returned when Product is returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ItemCount" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Total number of listings on the Half.com site that use

-                        stock information from this catalog product. This value can be greater

-                        than the number of listings returned in ItemArray.

-                        Only returned when you search by ProductID (and you pass

-                        Items or Details in IncludeSelector).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <Min>0</Min>

-                        <Max/>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Details>IncludeSelector: Items</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ProductID" type="ns:ProductIDType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        The Half.com or external IDs associated with the product. Use the Reference

-                        value as input to search for the same product in the future, or

-                        use the ISBN, EAN, or UPC value (if returned).

-                        The ISBN, EAN, and UPC values can also be useful as keys

-                        if your application is comparing products across different sites.

-                        Always returned when Product is returned.

-                        <!--

-                        Example of Product with 10 and 13 digit isbn, and catalogid

-                        <ProductID type="ISBN"> 1234567890</ProductID>

-                        <ProductID type="ISBN"> 1234567890123 </ProductID>

-                        <ProductID type="Catalog"> 5467823</ProductID>

-                        -->

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="DomainName" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The name of the domain in which the product was found.

-                        If the product is mapped to multiple domains, Half.com returns

-                        the most applicable domain (as determined by Half.com).

-                        Always returned when Product is returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ItemSpecifics" type="ns:NameValueListArrayType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A list of name/value pairs that are included in the product's

-                        pre-filled Item Specifics. These indicate common aspects or

-                        characteristics of the product, such as Publisher (for a book).

-                        Also see ProductID for ISBN, UPC, or EAN values, if applicable.

-                        This is usually returned. (We are not aware of any cases in which this

-                        node is not be returned. However, it may be safest to check for the

-                        existence of this node.)

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ItemArray" type="ns:SimpleItemArrayType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A list of active items that were listed with the requested product.

-                        Results are sorted by current price (lowest first),

-                        then by recent positive feedback (highest first).

-                        &lt;br&gt;

-                        &lt;br&gt;

-                        Only returned when you specify Items in IncludeSelector, and the

-                        product has matching items that are currently active on Half.com.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Details>IncludeSelector: Items</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ReviewCount" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The total number of reviews that are available for this product

-                        on the Half.com Web site. This can be greater than the number of

-                        reviews returned by FindProducts. In a future release, we will provide

-                        the capability to retrieve details about reviews.

-                        Always returned when Product is returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Min>0</Min>

-                            <Max/>

-                            <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/HalfItemConditionCodeType.xsd #####

-

--->

-    <xs:simpleType name="HalfItemConditionCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Controls values for item condition, especially for Books catalog.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="BrandNew">

-                <xs:annotation>

-                    <xs:documentation>

-                        New, unread, unused and in perfect condition.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="LikeNew">

-                <xs:annotation>

-                    <xs:documentation>

-                        Item still in original packaging, no wear and tear, all 

-                        facets of the product are intact.  (Could easily be mistaken 

-                        for brand new.)

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="VeryGood">

-                <xs:annotation>

-                    <xs:documentation>

-                        Doesn't look brand new but has no easily noticeable damage 

-                        and very minimal wear and tear.  (You would give it to a 

-                        good friend as a gift)

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Good">

-                <xs:annotation>

-                    <xs:documentation>

-                        Very minimal damage to the item and still includes all accessories 

-                        such as dust jackets, liner notes, and cases.

-                        (You would use it yourself, but wouldn't necessarily give it as a gift)

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Acceptable">

-                <xs:annotation>

-                    <xs:documentation>

-                        Some damage to the item but integrity still intact.  May be missing an

-                        accessory. (Item beaten up a bit but it works)

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Used">

-                <xs:annotation>

-                    <xs:documentation>

-                        Some damage to the item and visibly used.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for internal or future use

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/HalfProductsType.xsd #####

-

--->

-    <xs:complexType name="HalfProductsType">

-        <xs:annotation>

-            <xs:documentation>

-            Information about an eBay catalog product.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="Product" type="ns:HalfCatalogProductType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        An set of Half.com catalog products. This contains stock information about a

-                        particular DVD, book, or other product.

-                        When you use QueryKeywords in the request, FindHalfProducts returns a

-                        maximum of 20 products per page.

-                        When you use ProductID in the request, FindHalfProducts usually only

-                        returns 1 product.

-                        (If more than one product matches the same ProductID,

-                        FindProducts will return all of those products. As of the time

-                        of this writing, we expect this to be a rare case.)                 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Details>IncludeSelector: none, DomainHistogram, Items</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/HistogramEntryType.xsd #####

-

--->

-    <xs:complexType name="HistogramEntryType">

-        <xs:annotation>

-            <xs:documentation>

-                A generic histogram entry type.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="Name" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        This is the domain name.&lt;br&gt;

-                        &lt;br&gt;

-                        A product can be mapped to more than one domain.

-                        This means that even if a name appears in this histogram and the

-                        Count is greater than 1, you won't necessarily see the

-                        same name returned for each returned product (in the Product node

-                        of the response). That is, Product.DomainName only

-                        returns the most applicable domain name (as determined by eBay).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: DomainHistogram</Details>

-                        </CallInfo>                 

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: DomainHistogram</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Count" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        This is the number of products found in the domain.

-                        If a product is mapped to more than one domain, it is counted separately

-                        for each domain. (For example, if the same product name appears in both

-                        Children's Books and Fiction Books, the count for both of these

-                        domains will include that product.) This means you cannot sum the

-                        product counts to determine the total number of matching products

-                        across all domains. The histogram is only intended to show the number

-                        of matching products in each individual domain.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: DomainHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: DomainHistogram</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/InsuranceOptionCodeList.xsd #####

-

--->

-    <xs:simpleType name="InsuranceOptionCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                The seller's requirements regarding whether the buyer pays

-                for shipping insurance.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="Optional">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in/out) The seller offers the buyer the choice of paying

-                        for shipping insurance or not.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Required">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in/out) The seller requires that the buyer pay for

-                        shipping insurance.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="NotOffered">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in/out) The seller does not offer shipping insurance to the buyer.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="IncludedInShippingHandling">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in/out) The seller is not charging separately for shipping

-                        insurance costs; any insurance is already included in the

-                        base shipping cost.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="NotOfferedOnSite">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in/out) Shipping insurance is not offered as a separate option on the site

-                        where the item is listed. (Some shipping services, such as

-                        DE_InsuredExpressOrCourier, include insurance as part of the service.) If

-                        another insurance option is specified in the listing request and the site does

-                        not support shipping insurance as a separate option, eBay will reset the

-                        insurance option to this value. At the time of this writing, this option is

-                        only meaningful for the eBay Germany, Austria, and Switzerland sites.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        Placeholder value. See

-                        &lt;a href="types/simpleTypes.html#token"&gt;token&lt;/a&gt;.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/InternationalShippingServiceOptionType.xsd #####

-

--->

-    <xs:complexType name="InternationalShippingServiceOptionType">

-        <xs:annotation>

-            <xs:documentation>

-                Shipping costs and options related to an international shipping service. When used

-                as input, if one is provided, at least one domestic ShippingService must be

-                provided. This type does not exist before compatibility level 383.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="ShippingInsuranceCost" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The insurance cost associated with shipping a single item with this shipping

-                        service. If the buyer bought more than one of this item, this proportional to

-                        QuantitySold. If the item has not yet been sold, insurance information cannot

-                        be calculated and the value is 0.00. For calculated shipping only.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingServiceName" type="xs:token" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        An international shipping service offered for shipping the item (for

-                        example, UPS Ground). For flat and calculated shipping.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingServiceAdditionalCost" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Cost of shipping each additional item beyond the first item. Zero for single-

-                        item listings. For flat shipping only.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingServiceCost" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The basic shipping cost of the item. If multiple items were purchased, this

-                        includes the ShippingServiceAdditionalCost.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingServicePriority" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Seller-preferred presentation order relative to other service options. Valid

-                        values are: 1, 2 and 3 (first, second and third choices). For flat and

-                        calculated shipping.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShipsTo" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        An international location or region to which the item may be shipped via this

-                        particular shipping service. Associated with the shipping service by the

-                        seller. This is basically the same as SimpleItemType.ShipToLocations except

-                        that this is spelled out and the other is abbreviated.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/ItemConditionCodeList.xsd #####

-

--->

-    <xs:simpleType name="ItemConditionCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Specifies a predefined subset of item conditions. The predefined set of fields

-                can vary for different calls.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="New">

-                <xs:annotation>

-                    <xs:documentation>

-                        The seller specified the Item Condition as New, or

-                        did not specify a condition.

-                        (Excludes items that the seller listed as Used.)

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Used">

-                <xs:annotation>

-                    <xs:documentation>

-                        The seller specified the Item Condition as Used, or

-                        did not specify a condition.

-                        (Excludes items that the seller listed as New.)

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                                (out) Reserved for internal or future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/ItemTypeCodeList.xsd #####

-

--->

-    <xs:simpleType name="ItemTypeCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Identifies listing-type-related filters.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="AuctionItemsOnly">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Only retrieve listings eligible for competitive bidding at auction.

-                        That is, only retrieve listings for which ListingType is Chinese, Dutch, or Live

-                        (regardless of the BuyItNowEnabled value).

-                        If a listing has a listing type of any of the following,

-                        it is not retrieved: StoresFixedPrice, FixedPriceItem, and AdType.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="FixedPricedItem">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Only retrieves listings that can be purchased at a fixed price.

-                        That is, only retrieves listings for which listing type is StoresFixedPrice or FixedPriceItem.

-                        Whether StoresFixedPrice items are retrieved depends on the site default.

-                        If StoresFixedPrice items are retrieved, they are returned after the other retrieved items.

-                        Also retrieves Chinese and Dutch auction listings for which BuyItNowEnabled is true.

-                        Does not retrieve listings for which listing type is AdType or Live,

-                        and does not retrieve auction listings for which BuyItNowEnabled is false.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="AllItems">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Returns all listing types (the default for FindItemsAdvanced).

-                        It is recommended that you use AllItemTypes instead of AllItems.

-                        Whether StoresFixedPrice items are retrieved depends on the site default.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="StoreInventoryOnly">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Only retrieves listings for which the listing type is StoresFixedPrice.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="FixedPriceExcludeStoreInventory">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Excludes listings that have listing type set to StoresFixedPrice.

-                        Excludes listings that have listing type set to AdType or Live.

-                        Excludes auction listings in which BuyItNowEnabled is false.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="ExcludeStoreInventory">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Excludes listings that have listing type set to StoresFixedPrice.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="AllItemTypes">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Retrieves listings whether or not listing type is set to StoresFixedPrice; include auction items.

-                        In searches for items, you must specify the AllItemTypes value if you want Store Inventory format (StoresFixedPrice) items to be returned. 

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="AllFixedPriceItemTypes">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Retrieves fixed-price items.

-                        Whether StoresFixedPrice items are retrieved does not depend on the site default.

-                        The StoresFixedPrice items are retrieved after the basic fixed price items.

-                        Items are retrieved whether or not listing type is set to StoresFixedPrice.

-                        Does not retrieve items for which listing type is AdType or Live.

-                        Does not retrieve auction items for which BuyItNowEnabled is false.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for internal or future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="ClassifiedItemsOnly">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Only retrieves Classified Ad format listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="AdFormat">

-                <xs:annotation>

-                    <xs:documentation>

-                        Restricts listings to return only items that have the Ad Format feature.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/ListingStatusCodeList.xsd #####

-

--->

-    <xs:simpleType name="ListingStatusCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Specifies an active or ended listing's status in eBay's processing

-                workflow. If a listing ends with a sale (or sales), eBay needs to

-                update the sale details (e.g., total price and buyer/high bidder)

-                and the final value fee. This processing can take several minutes.

-                If you retrieve a sold item and no details about the buyer/high

-                bidder are returned, use this

-                listing status information to determine whether eBay has finished

-                processing the listing.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="Active">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) The listing is still live, or it has recently ended

-                        but eBay has not completed processing

-                        the listing (e.g., we're still determining the high bidder).

-                        A multi-item listing is considered active until all items

-                        have winning bids or purchases or the listing's end time

-                        has passed. (That is, if the listing has a Quantity of 10,

-                        the sale of 1 of those items doesn't end the listing.)

-                        If the listing has ended but this Active

-                        status is returned, please allow several minutes for eBay to

-                        finish processing the listing.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Ended">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) The listing has ended and eBay has completed processing

-                        of the sale (if any), such as determining the high bidder.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Completed">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) The listing has ended and eBay has completed processing

-                        of the sale (if any), such as determining the high bidder.

-                        You can think of Completed and Ended as essentially equivalent.

-                        (The difference is only meaningful to the seller of the item,

-                        as Completed indicates whether eBay has finished calculating

-                        certain selling fees.)

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Placeholder value. See

-                        &lt;a href="types/simpleTypes.html#token"&gt;token&lt;/a&gt;.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/ListingTypeCodeList.xsd #####

-

--->

-    <xs:simpleType name="ListingTypeCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Specifies the selling format used for a listing.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="Unknown">

-                <xs:annotation>

-                    <xs:documentation>

-                        Unknown auction type. (This is not normally used.)

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Chinese">

-                <xs:annotation>

-                    <xs:documentation>

-                        Single-quantity online auction format.

-                        A Chinese auction has a Quantity of 1. Buyers engage in competitive bidding,

-                        although Buy It Now may be offered as long as no bids have been placed.

-                        Online auctions are listed on eBay.com, and they are also listed in

-                        the seller's eBay Store if the seller is a Store owner.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Dutch">

-                <xs:annotation>

-                    <xs:documentation>

-                        Multiple-quantity online auction format.

-                        A Dutch auction has a Quantity greater than 1. Buyers engage in

-                        competitive bidding. Some sites also offer Buy It Now for Dutch auctions.

-                        Online auctions are listed on eBay.com, and they are also listed in

-                        the seller's eBay Store if the seller is a Store owner.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Live">

-                <xs:annotation>

-                    <xs:documentation>

-                        Live auction, on-site auction that can include non-eBay bidders.

-                        Live auctions are listed on the eBay Live Auctions site, in live auction categories.

-                        They can also appear on eBay if the seller lists the lot in a secondary category

-                        that is an eBay category.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Auction">

-                <xs:annotation>

-                    <xs:documentation>

-                        Reserved for future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="AdType">

-                <xs:annotation>

-                    <xs:documentation>

-                        Advertisement to solicit inquiries on listings such as real estate.

-                        Permits no bidding on that item, service, or property. To express interest,

-                        a buyer fills out a contact form that eBay forwards to the the seller as a lead.

-                        This format does not enable buyers and sellers to transact online through eBay,

-                        and eBay Feedback is not available for ad format listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="StoresFixedPrice">

-                <xs:annotation>

-                    <xs:documentation>

-                        A fixed-price format for eBay Store sellers.

-                        Store Inventory listings appear after other listings in regular browse and search

-                        item lists on eBay. They have a lower Insertion Fee and longer listing durations.

-                        Only specified by sellers who have an eBay Store.

-                        Store Inventory listings are listed on eBay.com, and they are also listed in

-                        the seller's eBay Store.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="PersonalOffer">

-                <xs:annotation>

-                    <xs:documentation>

-                        Second chance offer made to a non-winning bidder on an ended listing.

-                        A seller can make an offer to a non-winning bidder when either the winning bidder

-                        has failed to pay for an item or the seller has a duplicate of the item.

-                        Second-chance offer items are on eBay, but they do not appear when browsing or searching listings. You need to already know the item ID

-                        in order to retrieve a second-chance offer.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="FixedPriceItem">

-                <xs:annotation>

-                    <xs:documentation>

-                        A basic fixed-price listing with a Quantity of 1 or more. Allows no auction-style bidding.

-                        Also known as Buy It Now Only on some sites (not to be confused with the BuyItNow option that

-                        is available for Chinese auctions).

-                        Fixed-price listings appear on eBay.com, and they are also listed in

-                        the seller's eBay Store if the seller is a Store owner.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Half">

-                <xs:annotation>

-                    <xs:documentation>

-                    Half.com listing (item is listed on Half.com, not on eBay).

-                    Reserved for future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="LeadGeneration">

-                <xs:annotation>

-                    <xs:documentation>

-                        Lead Generation format (advertisement-style listing to solicit

-                        inquiries or offers, no bidding or fixed price, listed on eBay).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Express">

-                <xs:annotation>

-                    <xs:documentation>

-                        For Germany only:

-                        eBay Express-only format (item is listed only on eBay Express

-                        Germany, not on eBay).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        Placeholder value. See

-                        &lt;a href="types/simpleTypes.html#token"&gt;token&lt;/a&gt;.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/NameValueListArrayType.xsd #####

-

--->

-    <xs:complexType name="NameValueListArrayType">

-        <xs:annotation>

-            <xs:documentation>

-                A list of one or more valid names and corresponding values.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="NameValueList" type="ns:NameValueListType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        One Item Specific that the seller has specified in the Item Specifics

-                        section of the listing, if any.&lt;br&gt;

-                        &lt;br&gt;

-                        For FindProducts, this can also be an Item Specific that is defined for

-                        a product. That is, Item Specifics can be returned both for

-                        items and products in FindProducts.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: ItemSpecifics</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: ItemSpecifics</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/NameValueListType.xsd #####

-

--->

-    <xs:complexType name="NameValueListType">

-        <xs:annotation>

-            <xs:documentation>

-                A name and corresponding value (a name/value pair).

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="Name" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The name of the item specific. This field is always returned for each

-                        item specific that is returned (if any). However if the seller didn't select a value for the item specific, we suggest you don't

-                        show the name (to avoid confusing users).&lt;br&gt;

-                        &lt;br&gt;

-                        For the item condition, this usually includes the

-                        word "Condition" for eBay US, UK, Australia, and India listings;

-                        and "Artikelzustand" for eBay Germany, Austria, and Switzerland

-                        listings.&lt;br&gt;

-                        &lt;br&gt;

-                        The Name fields in return policy item specifics (if any) usually include

-                        the word "return", "refund", and/or "warranty" for eBay US, Canada,

-                        UK, Australia, and India listings;

-                        and "Rucknahme", "return", and/or "refund" for eBay Germany, Austria,

-                        and Switzerland listings.&lt;br&gt;

-                        &lt;br&gt;

-                        &lt;span class="tablenote"&gt;&lt;b&gt;Note:&lt;/b&gt;

-                        Ignore item specifics with SIFFTAS in the name. These are for internal use by eBay and aren't meaningful to users.&lt;/span&gt;

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: ItemSpecifics</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: ItemSpecifics</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Value" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        A value for the item specific. In GetSingleItem, this field is always

-                        returned for each item specific that is returned (if any). However,

-                        if the seller didn't select a value for the item specific,

-                        this field may return empty, or it may return a value like "-",

-                        "Not Selected", or "Unspecified" (or the equivalent in the language

-                        of the site).&lt;br&gt;

-                        &lt;br&gt;

-                        For the item condition, this usually includes the

-                        word "New" or "Used" for eBay US, UK, Australia, and India listings;

-                        and "Neu" or "Gebraucht" for eBay Germany, Austria, and Switzerland

-                        listings.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: ItemSpecifics</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: ItemSpecifics</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Items, DomainHistogram, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/PaymentMethodSearchCodeType.xsd #####

-

--->

-    <xs:simpleType name="PaymentMethodSearchCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Used for specifying items for which a specific payment method or methods are accepted. 

-        </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="PayPal">

-                <xs:annotation>

-                    <xs:documentation>

-                      PayPal payment method.

-                  </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="PaisaPay">

-                <xs:annotation>

-                    <xs:documentation> 

-                      PaisaPay payment method. The PaisaPay payment method is only for the India site (site ID 203).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="PayPalOrPaisaPay">

-                <xs:annotation>

-                    <xs:documentation>

-                      Either the PayPal or the PaisaPay payment method. The PaisaPay payment method is only for the India site (site ID 203).

-                     </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for internal or future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/PopularSearchesType.xsd #####

-

--->

-    <xs:complexType name="PopularSearchesType">

-        <xs:annotation>

-            <xs:documentation>

-                Contains CategoryID/QueryKeywords, AlternateKeywords, RelatedKeywords.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="CategoryID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Numeric ID of a category on eBay.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindPopularSearches</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CategoryParentID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Category ID identifying a category that is an ancestor

-                        of the category indicated in CategoryID.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                              <CallName>FindPopularSearches</CallName>

-                              <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="QueryKeywords" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Specifies which query keywords corresponds to this PopularSearchResult.  

-                        Query Keywords are returned in the output to clarify which result set corresponds to which

-                        Query Keyword inputs (as there can be more than one set of keywords in the input).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                          <CallName>FindPopularSearches</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="AlternativeSearches" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Alternative search keywords for the query keywords, separated by semicolons.

-                        You can use this to find other search terms buyers and sellers may be interested in.  

-                        For example, if a seller lists an item with "wedding" in the title, they may also be 

-                        interested in adding "bridal" to the title because bridal is an alternative search 

-                        keyword which buyers have used.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindPopularSearches</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="RelatedSearches" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Keywords related to the query keywords, separated by semicolons.

-                        You can use this to find more detailed related keywords.  For example,

-                        the query keyword "wedding" is related to searches for 

-                        "wedding decorations;wedding favors;wedding supplies;wedding dresses..." which helps

-                        the seller and buyer specify their query with more detail and precision.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindPopularSearches</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/PreferredLocationCodeList.xsd #####

-

--->

-    <xs:simpleType name="PreferredLocationCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Specifies the criteria for filtering search results by site, where site is determined by the site ID in the request.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="ListedInCurrencyImplied">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Items listed in the currency implied by the site specified in the

-                        request.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="LocatedInCountryImplied">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Items located in the country implied by the site specified in the

-                        request.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="AvailableInCountryImplied">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Items available to the country implied by the site specified in the

-                        request. For the US site, this implies listings from ALL English-language

-                        countries that are available to the US.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="SiteImplied">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Items listed on the site specified in the request, regardless of listing

-                        currency.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="BelgiumListing">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Items located in Belgium or listed on one of the two Belgian sites.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for internal or future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/ProductIDCodeList.xsd #####

-

--->

-    <xs:simpleType name="ProductIDCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                ProductID type for product searches.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="ISBN">

-                <xs:annotation>

-                    <xs:documentation>

-                        ISBN-10 or ISBN-13 value for books. (The string length of ProductID

-                        indicates whether the ID is 10 or 13 characters.)

-                        If you know a book's ISBN, you can use this instead of the

-                        eBay CatalogItem or Reference ID to search for that book.

-                        Max length of corresponding value: 13

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="EAN">

-                <xs:annotation>

-                    <xs:documentation>

-                        EAN value for books. (This is used more commonly in

-                        European countries.)

-                        If you know a book's EAN, you can use this instead of the

-                        eBay CatalogItem or Reference ID to search for that book.

-                        Max length of corresponding value: 13

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="UPC">

-                <xs:annotation>

-                    <xs:documentation>

-                        UPC value for products in Music (e.g., CDs), DVDs &amp; Movies,

-                        and Video Games categories (or domains).

-                        If you know a product's UPC, you can use this instead of the

-                        eBay CatalogItem or Reference ID to search for that product.

-                        Max length of corresponding value: 12

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="MPN">

-                <xs:annotation>

-                    <xs:documentation>

-                        Reserved for future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Keywords">

-                <xs:annotation>

-                    <xs:documentation>

-                        Reserved for future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CatalogItem">

-                <xs:annotation>

-                    <xs:documentation>

-                        An eBay catalog product ID. This is an ID that was used to list

-                        a particular item. The CatalogItem ID represents a particular version

-                        of a catalog product. (A given version could have an older or newer

-                        description, set of Item Specifics, or other details.)

-                        So the same product could have different CatalogItem IDs at different

-                        times. Use this for searching when you you have obtained the product ID

-                        from a listed item (using the eBay Web site UI or another source),

-                        and you don't know the reference ID yet.

-                        Max length of corresponding value: 4000

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Reference">

-                <xs:annotation>

-                    <xs:documentation>

-                        The global reference ID for an eBay catalog product.

-                        A reference ID is a fixed reference to a product

-                        (regardless of version). Use this instead of CatalogItem when you

-                        know a product's reference ID (because older CatalogItem IDs are

-                        more likely to become obsolete over time.)

-                        One reference ID can be associated with multiple CatalogItem IDs.

-                        To determine valid reference IDs for products, first call

-                        FindProducts with QueryKeywords (or ProductID).

-                        Each product in the response includes a reference ID.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for internal or future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/ProductIDType.xsd #####

-

--->

-    <xs:complexType name="ProductIDType">

-        <xs:annotation>

-            <xs:documentation>

-                Product ID has an attribute of ProductIDCodeType and a string value.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:simpleContent>

-            <xs:extension base="xs:string">

-                <xs:attribute name="type" type="ns:ProductIDCodeType">

-                    <xs:annotation>

-                        <xs:documentation>

-                            The nature of identifier being used. For FindHalfProducts, FindProducts, 

-                            FindItemsAdvanced, and FindReviewsAndGuides, only Reference, ISBN, UPC, 

-                            and EAN are supported.

-                            Required when ProductID is specified.

-                        </xs:documentation>

-                        <xs:appinfo>

-                            <CallInfo>

-                                <CallName>FindReviewsAndGuides</CallName>

-                                <CallName>FindHalfProducts</CallName>

-                                <CallName>FindProducts</CallName>

-                                <CallName>FindItemsAdvanced</CallName>

-                                <AllValuesExcept>CatalogItem,MPN, Keywords</AllValuesExcept>

-                                <RequiredInput>Conditionally</RequiredInput>

-                            </CallInfo>

-                            <CallInfo>

-                                <CallName>FindReviewsAndGuides</CallName>

-                                <Returned>Conditionally</Returned>

-                            </CallInfo>

-                        </xs:appinfo>

-                    </xs:annotation>

-                </xs:attribute>

-            </xs:extension>

-        </xs:simpleContent>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/ProductSortCodeList.xsd #####

-

--->

-    <xs:simpleType name="ProductSortCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Controls the order of product (not item) searches.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="Popularity">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sort by product popularity (as determined by eBay).

-                        (This is the default sort order.)

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Rating">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sort by average rating.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="ReviewCount">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sort by the number of reviews on eBay.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="ItemCount">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sort by the number of active items listed with this product.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Title">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sort by the product title.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        Reserved for values that are not available in the version of the schema

-                        you are using. If eBay adds a new value to this code type as of a

-                        newer version, we return CustomCode instead when you specify a

-                        lower request version.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/QuantityOperatorCodeList.xsd #####

-

--->

-    <xs:simpleType name="QuantityOperatorCodeType">

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="LessThan">

-                <xs:annotation>

-                    <xs:documentation>

-                        Used by QuantityOperator to specify that you are seeking quantities less than Quantity.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="LessThanOrEqual">

-                <xs:annotation>

-                    <xs:documentation>

-                        Specifies quantities less than or equal to Quantity.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Equal">

-                <xs:annotation>

-                    <xs:documentation>

-                        Specifies quantities equal to Quantity.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="GreaterThan">

-                <xs:annotation>

-                    <xs:documentation>

-                        Specifies quantities greater than Quantity.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="GreaterThanOrEqual">

-                <xs:annotation>

-                    <xs:documentation>

-                        Specifies quantities greater than or equal to Quantity.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        Reserved for internal or future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/ReturnPolicyType.xsd #####

-

--->

-    <xs:complexType name="ReturnPolicyType">

-        <xs:annotation>

-            <xs:documentation>

-                Type for the return policy details of an item.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="Refund" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Specifies how a refund will be made, e.g. as an exchange.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ReturnsWithin" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Specifies the length of time in which the item must be returned

-                        under the return policy.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ReturnsAccepted" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Information about returns accepted.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Description" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A description of the return policy for the item.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="WarrantyOffered" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Information about the warranty offered.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="WarrantyType" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The type of warranty offered.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="WarrantyDuration" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The length of the warranty offered.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="EAN" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Contains the EAN.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingCostPaidBy" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The party who pays the cost of shipping for a returned item.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/ReviewDetailsType.xsd #####

-

--->

-    <xs:complexType name="ReviewDetailsType">

-        <xs:annotation>

-            <xs:documentation>

-                Contains product reviews written by eBay members.

-             </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="AverageRating" type="xs:float" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The product's average rating (out of 5) based on all reviews.

-                        For example, a value like 4.5 would mean the average rating

-                        is 4.5 out of 5. (See ReviewCount for the total number of reviews.)

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <Min>0</Min>

-                        <Max>5</Max>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Review" type="ns:ReviewType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        An eBay member's review of the product.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <MaxOccurs>20</MaxOccurs>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/ReviewType.xsd #####

-

--->

-    <xs:complexType name="ReviewType">

-        <xs:annotation>

-            <xs:documentation>

-                A product review written by an eBay member.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="URL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A link to the full review on the eBay Web site.

-                        This URL optimized for natural search: "_W0QQ" is like "?"

-                        (question mark), "QQ" is like "&amp;" (ampersand),

-                        and "Z" is like "=" (equals sign).&lt;br&gt;

-                        &lt;br&gt;

-                        &lt;span class="tablenote"&gt;&lt;b&gt;Note:&lt;/b&gt;

-                        For a link to all reviews for the product, remove the upvr parameter

-                        from this URL. See the eBay Web Services guide for an example.

-                        &lt;/span&gt;

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Title" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The title of the review.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <MaxLength>55</MaxLength>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Rating" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The eBay member's rating of the product.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <Min>0</Min>

-                        <Max>5</Max>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Text" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The text of the review. If the review is longer than

-                        2000 characters, the text is cut off and it ends with "...".

-                        See Review.URL for a link to the full text of the review.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <MaxLength>2000</MaxLength>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="UserID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The reviewer's eBay user ID.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CreationTime" type="xs:dateTime" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The time and date when the reviewer posted the review.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindReviewsAndGuides</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/SalesTaxType.xsd #####

-

--->

-    <xs:complexType name="SalesTaxType">

-        <xs:annotation>

-            <xs:documentation>

-                Type for expressing sales tax data.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="SalesTaxPercent" type="xs:float" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Percent of an item's price to be charged as the sales

-                        tax for the transaction. The value passed in is stored with a

-                        precision of 3 digits after the decimal point (##.###).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="SalesTaxState" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        State or jurisdiction for which the sales tax is being collected.

-                        Only returned if the seller specified a value.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingIncludedInTax" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        (US only) Whether shipping costs were part of the base amount

-                        that was taxed. Flat or calculated shipping.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="SalesTaxAmount" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        (US only) The amount of sales tax, calculated for a

-                        transaction based on the SalesTaxPercent and pricing information.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/SearchFlagCodeList.xsd #####

-

--->

-    <xs:simpleType name="SearchFlagCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                SearchFlagCodeType - Search flags for FindItemsAdvanced.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="Charity">

-                <xs:annotation>

-                    <xs:documentation>

-                        Return only charity item listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Gift">

-                <xs:annotation>

-                    <xs:documentation>

-                        Return only gift items.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="NowAndNew">

-                <xs:annotation>

-                    <xs:documentation>

-                        Return only items that have been listed with Now and New. Applicable for

-                        certain sites only.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="LocalSearch">

-                <xs:annotation>

-                    <xs:documentation>

-                        Perform a local search.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="FreeShipping">

-                <xs:annotation>

-                    <xs:documentation>

-                        If specified, only items with free shipping for the user's location are

-                        returned. The user's location is determined from the site ID specified

-                        in the request. If false, no filtering is done via this attribute. A

-                        listing is not considered a free shipping listing if it requires

-                        insurance or requires pick up or requires a shipping surcharge.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Gallery">

-                <xs:annotation>

-                    <xs:documentation>

-                        Return Gallery items only.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Picture">

-                <xs:annotation>

-                    <xs:documentation>

-                        Picture.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="GetItFast">

-                <xs:annotation>

-                    <xs:documentation>

-                        Limits the results to Get It Fast listings.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Lot">

-                <xs:annotation>

-                    <xs:documentation>

-                        Limits the results to only those listings for which lot size is 2 or greater.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="GermanMotorsSearchable">

-                <xs:annotation>

-                    <xs:documentation>

-                        Limits the results based on each item's eligibility to appear on the

-                        mobile.de site. If

-                        specified, queries for eligible items only. If not specified, the search

-                        results are not affected. Only applicable for items listed on the eBay

-                        Germany site (site ID 77) in subcategories of mobile.de search-enabled

-                        categories.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="DigitalDelivery">

-                <xs:annotation>

-                    <xs:documentation>

-                        If specified, limits the results to digitally delivered good only.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for internal or future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/SearchResultType.xsd #####

-

--->

-    <xs:complexType name="SearchResultType">

-        <xs:annotation>

-            <xs:documentation>

-                Container for items. Can contain zero, one, or multiple

-                SimpleItemType objects, each of which has data for an item listing.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="CategoryGroupNamePath" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Category name breadcrumb.

-                        Used in building a category-browsing path, i.e. a path of "breadcrumbs" (e.g., Computers &amp; Networking > Technology Books > Certification). 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CategoryGroupIDPath" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Category ID breadcrumb.

-                        Used in building a category-browsing path, i.e. a path of "breadcrumbs" (e.g., Computers &amp; Networking > Technology Books > Certification). 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CategoryGroupItemCount" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Item count of the category.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ItemArray" type="ns:SimpleItemArrayType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Array of simple items.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/SellerBusinessCodeTypeList.xsd #####

-

--->

-    <xs:simpleType name="SellerBusinessCodeType">

-            <xs:annotation>

-                <xs:documentation>

-                    Type of seller account. This value can be returned if the German site (site ID

-                    77) or eBay Motors site (site ID 100) is specified.

-                </xs:documentation>

-            </xs:annotation>

-            <xs:restriction base="xs:token">

-                <xs:enumeration value="Undefined">

-                    <xs:annotation>

-                        <xs:documentation>

-                            Type of seller account not defined.

-                        </xs:documentation>

-                    </xs:annotation>

-                </xs:enumeration>

-                <xs:enumeration value="Private">

-                    <xs:annotation>

-                        <xs:documentation>

-                            Private seller account.

-                        </xs:documentation>

-                    </xs:annotation>

-                </xs:enumeration>

-                <xs:enumeration value="Commercial">

-                    <xs:annotation>

-                        <xs:documentation>

-                            Commercial seller account.

-                        </xs:documentation>

-                    </xs:annotation>

-                </xs:enumeration>

-                <xs:enumeration value="CustomCode">

-                    <xs:annotation>

-                        <xs:documentation>

-                            (out) Reserved for internal or future use.

-                        </xs:documentation>

-                    </xs:annotation>

-                </xs:enumeration>

-            </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/ShippingCostSummaryType.xsd #####

-

--->

-    <xs:complexType name="ShippingCostSummaryType">

-        <xs:annotation>

-            <xs:documentation>

-                Type for the shipping-related details for an item or transaction.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="ShippingServiceName" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The name of a shipping service.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingServiceCost" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The basic shipping cost of the item. If multiple items were purchased, this

-                        includes the ShippingServiceAdditionalCost.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: ShippingCosts</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>                     

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="InsuranceCost" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The cost of insurance. For flat rate shipping, this is the value set by the

-                        seller, if any. For calculated shipping, this is the value calculated by eBay

-                        with the shipping carrier for the particular item and can only be determined

-                        once the final item price is known when the listing ends. To determine whether

-                        a listing has ended, see EndTime or ListingStatus in GetSingleItem.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: ShippingCosts</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingType" type="ns:ShippingTypeCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        How the seller stated that cost of shipping is to be determined, such as flat rate

-                        or calculated or free.&lt;br&gt;

-                        &lt;br&gt;

-                        In GetSingleItem, this is always returned when ShippingCostSummary is

-                        returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <AllValuesExcept>Freight, Free</AllValuesExcept>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <AllValuesExcept>Freight, Free</AllValuesExcept>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: ShippingCosts</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="InsuranceOption" type="ns:InsuranceOptionCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Whether the seller offers shipping insurance and, if

-                        so, whether the insurance is optional or required. Flat and

-                        calculated shipping.

-                        This field is ignored when Item.ListingType equals Express.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/ShippingDetailsType.xsd #####

-

--->

-    <xs:complexType name="ShippingDetailsType">

-        <xs:annotation>

-            <xs:documentation>

-                Type for the shipping-related details for an item or transaction.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="GetItFast" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Indicates whether the seller has opted the listing into the Get

-                        It Fast feature. If GetItFast is true and if at least one of

-                        the domestic shipping services offered by the seller is an

-                        expedited shipping service, every shipping service offered by

-                        the seller is considered a Get It Fast service, and the seller

-                        commits to delivering the item to the buyer-selected shipping

-                        service within one day.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <SeeLink>

-                            <Title>Enabling Get It Fast

-</Title>

-                            <URL>http://developer.ebay.com/DevZone/XML/docs/WebHelp/index.htm?context=eBay_XML_API&amp;topic=GetItFast</URL>

-                        </SeeLink>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="InsuranceCost" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The cost of insurance. For flat rate shipping, this is the value set by the

-                        seller, if any. For calculated shipping, this is the value calculated by eBay

-                        with the shipping carrier for the particular item and can only be determined

-                        once the final item price is known when the listing ends. To determine whether

-                        a listing has ended, use GetSingleItem. Not applicable to eBay Motors vehicle listings.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <Default>0.00</Default>

-                        <Min/>

-                        <Max/>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="InsuranceOption" type="ns:InsuranceOptionCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Whether the seller offers shipping insurance and, if

-                        so, whether the insurance is optional or required. Flat and

-                        calculated shipping.

-                        This field is ignored when Item.ListingType equals Express.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="InternationalShippingServiceOption" type="ns:InternationalShippingServiceOptionType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Shipping costs and options related to an international shipping service.

-                        &lt;br&gt;

-                        Not applicable to Half.com or eBay Motors vehicle listings.

-                        This field is ignored when Item.ListingType=Express.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>DetailLevel: none, ItemReturnDescription,

-                            ItemReturnAttributes, ReturnAll</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="SalesTax" type="ns:SalesTaxType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sales tax details. US site only. Flat and calculated shipping.

-                        If your application normally calculates sales tax without using eBay's tax

-                        tables, you should understand how purchases via eBay Express will affect

-                        the way you process payments.

-                        For general information about listings on eBay Express,

-                        see the eBay Web Services Guide links below.

-                        Not applicable to eBay Motors vehicle listings.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <SeeLink>

-                            <Title>Specify Sales Tax for Express and eBay

-</Title>

-                            <URL>http://developer.ebay.com/DevZone/XML/docs/WebHelp/index.htm?context=eBay_XML_API&amp;topic=ExpressTax</URL>

-                        </SeeLink>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingRateErrorMessage" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        For most applicable calls, returns the words No Error or returns an error

-                        message related to an attempt to calculate shipping rates. For calculated

-                        shipping only.

-                        Not applicable to Half.com or eBay Motors vehicle listings.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingServiceOption" type="ns:ShippingServiceOptionType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Shipping costs and options related to domestic shipping services offered by

-                        the seller. Flat and calculated shipping.&lt;br&gt;

-                        Not applicable to Half.com or eBay Motors vehicle listings.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="TaxTable" type="ns:TaxTableType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Tax details for a jurisdiction such as a state or province.

-                        Returned empty in if no tax table was used.

-                        Not applicable to Half.com.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="InternationalInsuranceCost" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The cost of insurance for items shipped internationally. For flat rate

-                        shipping, this is the value set by the seller, if any. For calculated

-                        shipping, this is the value calculated by eBay with the shipping carrier for

-                        the particular item and can only be determined once the final item price is

-                        known when the listing ends. To determine whether a listing has ended, use

-                        GetSingleItem. Not applicable to eBay Motors vehicle listings.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <Default>0.00</Default>

-                        <Min/>

-                        <Max/>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="InternationalInsuranceOption" type="ns:InsuranceOptionCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Whether the seller offers shipping insurance for items shipped internationally

-                        and, if so, whether the insurance is optional or required. Flat and calculated

-                        shipping. This field is ignored when Item.ListingType equals Express.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/ShippingServiceOptionType.xsd #####

-

--->

-    <xs:complexType name="ShippingServiceOptionType">

-        <xs:annotation>

-            <xs:documentation>

-                Shipping costs and options related to a domestic shipping service.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="ShippingInsuranceCost" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The insurance cost associated with shipping a single item with this shipping

-                        service. If the buyer bought more than one of this item, this proportional to

-                        QuantitySold.  If the item has not yet been sold, insurance information cannot

-                        be calculated and the value is 0.00. For calculated shipping only.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingServiceName" type="xs:token" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A domestic shipping service offered for shipping the item (for example, UPS

-                        Ground). For flat and calculated shipping.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingServiceCost" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The meaning of this element depends on the call and on whether flat or

-                        calculated shipping has been selected. (For example, it could be the

-                        cost to ship a single item, the cost to ship all items, or the cost to ship

-                        just the first of many items, with ShippingServiceAdditionalCost accounting

-                        for the rest.) For flat and calculated shipping.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingServiceAdditionalCost" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The cost of shipping each additional item beyond the first item. For input,

-                        this is required if the listing is for multiple items and should be zero for

-                        single-item listings. Default value is 0.00. For flat shipping only.

-                        Not applicable to Half.com.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingServicePriority" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Seller-preferred presentation order relative to other

-                        service options. Valid values: 1 (1st choice), 2 (2nd choice),

-                        3 (3rd choice). For flat and calculated shipping.

-                        Not applicable to Half.com.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ExpeditedService" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Indicates whether the service is an expedited shipping service. See Enabling Get It Fast.

-                        Not applicable to Half.com.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingTimeMin" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The minimum guaranteed number of days in which the shipping carrier

-                        can ship an item (not including the time it takes the seller to

-                        deliver the item to the shipping carrier). See Enabling Get It Fast.

-                        Not applicable to Half.com.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingTimeMax" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The maximum guaranteed number of days the shipping carrier will

-                        take to ship an item (not including the time it takes the seller to

-                        deliver the item to the shipping carrier). See Enabling Get It Fast.

-                        Not applicable to Half.com.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingSurcharge" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        An additional fee to charge US buyers who ship via UPS to Alaska, Hawaii

-                        or Puerto Rico. Can only be assigned a value for Parts and Accessories

-                        items on the eBay US and Motors sites. Only returned if set.

-                        If some transactions in an order have a surcharge, surcharge is added

-                        only for those transactions.

-                        Flat rate shipping only.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShipsTo" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        An international location or region to which the item may be shipped via this

-                        particular shipping service. Associated with the shipping service by the

-                        seller. Use GeteBayDetails to determine which locations are valid per site.

-                        These values are string equivalents of values found in ShippingRegionCodeType

-                        and CountryCodeType.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <SeeLink>

-                            <Title>ShipToLocation

-</Title>

-                            <URL>http://developer.ebay.com/DevZone/XML/docs/WebHelp/index.htm?context=eBay_XML_API&amp;topic=ShipToLocation</URL>

-                        </SeeLink>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/ShippingTypeCodeList.xsd #####

-

--->

-    <xs:simpleType name="ShippingTypeCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                The shipping cost model offered by the seller.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="Flat">

-                <xs:annotation>

-                    <xs:documentation>

-                        The flat rate shipping model: the seller establishes the cost of shipping and cost of

-                        shipping insurance, regardless of what any buyer-selected shipping service

-                        might charge the seller.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Calculated">

-                <xs:annotation>

-                    <xs:documentation>

-                        The calculated shipping model: the posted cost of shipping is based on the

-                        seller-offered and buyer-selected shipping service, where the shipping costs

-                        are calculated by eBay and the shipping carrier based on the buyer's address,

-                        and any packaging/handling costs established by the seller are automatically

-                        rolled into the total.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Freight">

-                <xs:annotation>

-                    <xs:documentation>

-                        The freight shipping model: the cost of shipping is determined by a third

-                        party, FreightQuote.com, based on the item location (zip code). Currently,

-                        Freight can only be specified on input via eBay Web site, not via API.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Free">

-                <xs:annotation>

-                    <xs:documentation>

-                        Free is used when the seller is declaring that shipping is free for the buyer.

-                        Since Free cannot be selected via API, the seller has two options for

-                        signifying that shipping is free when listing an item:

-                        &lt;br&gt;

-                        - omit shipping details, mention in the item description that shipping is

-                        free, and set ShippingTermsInDescription to true

-                        &lt;br&gt;

-                        - select an arbitrary shipping service and set its shipping cost to 0, mention

-                        in the item description that shipping is free, and set

-                        ShippingTermsInDescription to true

-                        &lt;br&gt;

-                        The latter is a better way to communicate "free shipping" because eBay picks

-                        up the "0" cost and can more accurately identify shipping costs in search

-                        results.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="NotSpecified">

-                <xs:annotation>

-                    <xs:documentation>

-                        The seller did not specify the shipping type.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="FlatDomesticCalculatedInternational">

-                <xs:annotation>

-                    <xs:documentation>

-                        The seller specified one or more flat domestic shipping services

-                        and one or more calculated international shipping services.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CalculatedDomesticFlatInternational">

-                <xs:annotation>

-                    <xs:documentation>

-                        The seller specified one or more calculated domestic shipping services

-                        and one or more flat international shipping services.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        Placeholder value. See

-                        &lt;a href="types/simpleTypes.html#token"&gt;token&lt;/a&gt;.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/SimpleItemArrayType.xsd #####

-

--->

-    <xs:complexType name="SimpleItemArrayType">

-        <xs:annotation>

-            <xs:documentation>

-                Container for a list of items. Can contain zero, one, or multiple

-                SimpleItemType objects, each of which conveys the data for one item listing.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="Item" type="ns:SimpleItemType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Contains data for an item listing.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/SimpleItemSortCodeList.xsd #####

-

--->

-    <xs:simpleType name="SimpleItemSortCodeType">

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="BestMatch">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sorts items by Best Match, and no sort order applies. If specified, 

-                        then Best Match sort also applies to CategoryHistogram.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        Placeholder value. See

-                        &lt;a href="types/simpleTypes.html#token"&gt;token&lt;/a&gt;.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="EndTime">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sorts items by end time in ascending or descending order.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="BidCount">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sort by number of bids on the item in ascending or descending order.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Country">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sort by country; no sort order can be specified.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CurrentBid">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sort by current bid in ascending or descending order.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Distance">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sort by distance, ascending order only.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="StartDate">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sort by start date, recently-listed first.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="BestMatchCategoryGroup">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Sort by BestMatchCategoryGroup so results are grouped by Best Match within a category.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="PricePlusShipping">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) This value is part of the Price Plus Shipping Sort feature, to be enabled

-                        by the end of Sept. 2007 for the following sites:

-                        US (site ID 0), Germany (77), Canada (2), and Australia (15).

-                        The Price Plus Shipping Sort feature causes item sorting to consider shipping costs.

-                        Specify PricePlusShippingAsc to sort items by lowest cost first, as follows:

-                        Lowest-total-cost (for items where shipping was properly specified), 

-                        then freight-shipping items, then items for which shipping was not specified (sorted by price).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/SimpleItemType.xsd #####

-

--->

-    <xs:complexType name="SimpleItemType">

-        <xs:sequence>

-            <xs:element name="BestOfferEnabled" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Whether the seller will accept a best offer for this item.

-                        This feature enables a buyer to make a lower-priced binding offer on a

-                        fixed price item. Buyers can't see how many offers have been made

-                        (only the seller can see this information). To make a best offer on a

-                        listing, use the eBay Web site.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <SeeLink>

-                            <Title>(eBay Help) Making a Best Offer (for Buyers)</Title>

-                            <URL>http://pages.ebay.com/help/buy/best-offer.html</URL>

-                        </SeeLink>

-                        <SeeLink>

-                            <Title>(eBay DE Hilfe) Preis vorschlagen</Title>

-                            <URL>http://pages.ebay.de/help/buy/best-offer.html</URL>

-                        </SeeLink>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="BuyItNowPrice" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The Buy It Now Price of the item (if any), in the currency

-                        of the site on which the item was listed.&lt;br&gt;

-                        &lt;br&gt;

-                        For Chinese auctions (Quantity=1, competitive bidding online auctions),

-                        Buy It Now lets a user purchase the item at a fixed price and

-                        end the auction immediately. On most sites, after a Chinese auction has

-                        bids, the listing is no longer eligible for Buy It Now.

-                        However, calls can still return the Buy It Now Price that

-                        the seller set for the listing. Use the Item.BidCount field to

-                        determine whether an auction with Buy It Now has bids or not.&lt;br&gt;

-                        &lt;br&gt;

-                        Some eBay sites also support Buy It Now for Dutch auctions

-                        (multi-quantity, competitive bidding), where you can buy multiple

-                        items from the same listing at a fixed price, instead of bidding.

-                        On some sites, the Buy It Now option remains available for Dutch

-                        auctions even after there are bids. See Item.BuyItNowAvailable.&lt;br&gt;

-                        &lt;br&gt;

-                        For fixed-price (FixedPriceItem) and Store Inventory listings

-                        (StoresFixedPrice), see CurrentPrice or ConvertedCurrentPrice

-                        instead.&lt;br&gt;

-                        &lt;br&gt;

-                        Only returned if an item was listed with Buy It Now.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <SeeLink>

-                            <Title>(GetSingleItem) Item.ListingType</Title>

-                            <URL>GetSingleItem.html#Response.Item.ListingType</URL>

-                        </SeeLink>

-                        <SeeLink>

-                            <Title>Item.BuyItNowAvailable</Title>

-                            <URL>#Response.Item.BuyItNowAvailable</URL>

-                            <!-- Intentionally starts with # -->

-                        </SeeLink>

-                        <SeeLink>

-                            <Title>Item.ConvertedBuyItNowPrice</Title>

-                            <URL>#Response.Item.ConvertedBuyItNowPrice</URL>

-                            <!-- Intentionally starts with # -->

-                        </SeeLink>

-                        <SeeLink>

-                            <Title>Item.ConvertedCurrentPrice</Title>

-                            <URL>#Response.Item.ConvertedCurrentPrice</URL>

-                            <!-- Intentionally starts with # -->

-                        </SeeLink>

-                        <SeeLink>

-                            <Title>(eBay Help) Buying with Buy It Now</Title>

-                            <URL>http://pages.ebay.com/help/buy/how-buy-bin.html</URL>

-                        </SeeLink>

-                        <SeeLink>

-                            <Title>(eBay DE Hilfe) Kaufen mit Sofort-Kaufen</Title>

-                            <URL>http://pages.ebay.de/help/buy/how-buy-bin.html</URL>

-                        </SeeLink>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Description" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The seller's description of the item, if any. This can include

-                        HTML markup and JavaScript. See

-                        &lt;a href="types/simpleTypes.html#string"&gt;string&lt;/a&gt;

-                        in Simple Schema Types. &lt;br&gt;

-                        &lt;br&gt;

-                        Some sellers don't specify their own listing description.

-                        Instead, they use a stock description from a catalog available

-                        through eBay. (GetSingleItem doesn't return this stock information.)

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <MaxLength>500000 (some sites may allow more, but the exact number may vary)</MaxLength>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Description</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ItemID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The ID that uniquely identifies the item listing. eBay generates this ID

-                        when an item is listed. This ID is unique across all eBay sites.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <MaxLength>19 (Note: The eBay database specifies 38. Currently, Item IDs are usually 9 to 12 digits)</MaxLength>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetItemStatus</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="BuyItNowAvailable" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        For Dutch auctions (not Chinese auctions) this indicates whether there

-                        is a Buy It Now option. (On some sites, the Buy It Now option remains

-                        available for Dutch auctions even after there are bids.)

-                        Applicable to the Germany site (site ID 77) only.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetItemStatus</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ConvertedBuyItNowPrice" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The listing's Buy It Now Price (if any), converted into the currency

-                        of the site to which you sent this request. &lt;br&gt;

-                        &lt;br&gt;

-                        Price fields are returned as doubles, not necessarily in the traditional

-                        monetary format of the site's country.

-                        For example, a US Dollar value might be returned as

-                        3.880001 instead of 3.88.&lt;br&gt;

-                        &lt;br&gt;

-                        For Chinese auctions (Quantity=1, competitive bidding online auctions),

-                        Buy It Now lets a user purchase the item at a fixed price and

-                        end the auction immediately. On most sites, after a Chinese

-                        auction has bids, the listing is no longer eligible for Buy It Now.

-                        However, calls like FindItems still return the Buy It Now Price that

-                        the seller set for the listing. Use the Item.BidCount field to

-                        determine whether an auction with Buy It Now has bids or not

-                        (and therefore whether it is still eligible to be purchased with

-                        Buy It Now).&lt;br&gt;

-                        &lt;br&gt;

-                        Some eBay sites also support Buy It Now for Dutch auctions

-                        (multi-quantity, competitive bidding), where you can buy multiple

-                        items from the same listing at a fixed price, instead of bidding.

-                        On some sites, the Buy It Now option remains available for Dutch

-                        auctions even after there are bids. See Item.BuyItNowAvailable.&lt;br&gt;

-                        &lt;br&gt;

-                        For fixed-price (FixedPriceItem) and Store Inventory listings

-                        (StoresFixedPrice), see CurrentPrice or ConvertedCurrentPrice

-                        instead.&lt;br&gt;

-                        &lt;br&gt;

-                        Only returned if an item was listed with Buy It Now.&lt;br&gt;

-                        &lt;br&gt;

-                        For active items, refresh this value every 24 hours to

-                        pick up the current conversion rates (if this value has been converted).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <SeeLink>

-                            <Title>(GetSingleItem) Item.ListingType</Title>

-                            <URL>GetSingleItem.html#Response.Item.ListingType</URL>

-                        </SeeLink>

-                        <SeeLink>

-                            <Title>Item.BuyItNowAvailable</Title>

-                            <URL>#Response.Item.BuyItNowAvailable</URL>

-                            <!-- Intentionally starts with # -->

-                        </SeeLink>

-                        <SeeLink>

-                            <Title>Item.BuyItNowPrice</Title>

-                            <URL>#Response.Item.BuyItNowPrice</URL>

-                            <!-- Intentionally starts with # -->

-                        </SeeLink>

-                        <SeeLink>

-                            <Title>Item.ConvertedCurrentPrice</Title>

-                            <URL>#Response.Item.ConvertedCurrentPrice</URL>

-                            <!-- Intentionally starts with # -->

-                        </SeeLink>

-                        <SeeLink>

-                            <Title>(eBay Help) Buying with Buy It Now</Title>

-                            <URL>http://pages.ebay.com/help/buy/how-buy-bin.html</URL>

-                        </SeeLink>

-                        <SeeLink>

-                            <Title>(eBay DE Hilfe) Kaufen mit Sofort-Kaufen</Title>

-                            <URL>http://pages.ebay.de/help/buy/how-buy-bin.html</URL>

-                        </SeeLink>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="EndTime" type="xs:dateTime" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Time stamp (in &lt;a href="types/simpleTypes.html#dateTime"&gt;GMT&lt;/a&gt;) when the listing is scheduled to end

-                        or the actual end time if the item has ended.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetItemStatus</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="StartTime" type="xs:dateTime" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Time stamp (in &lt;a href="types/simpleTypes.html#dateTime"&gt;GMT&lt;/a&gt;) that

-                        eBay recorded as the moment that the listing was made available.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ViewItemURLForNaturalSearch" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The URL to view this listing on eBay.

-                        This URL is optimized to support natural search.

-                        That is, this URL is designed to make items on eBay easier to find via

-                        popular Internet search engines.

-                        For example, this URL specifies the item title, and it is

-                        optimized for natural search: "_W0QQ" is like "?" (question mark),

-                        "QQ" is like "&amp;" (ampersand),

-                        and "Z" is like "=" (equals sign).

-                        You shouldn't modify the query syntax in your application. For example,

-                        eBay won't recognize the URL if you change QQ to ?.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ListingType" type="ns:ListingTypeCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The format of the listing, such as online auction, fixed price,

-                        or advertisement format.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                            <AllValuesExcept>Auction, Half</AllValuesExcept>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                            <AllValuesExcept>Auction, Half</AllValuesExcept>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                            <AllValuesExcept>Auction, Half</AllValuesExcept>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                            <AllValuesExcept>Auction, Half</AllValuesExcept>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Location" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Physical location of the item, as specified by the seller.

-                        (This gives a general indication of where the item will be

-                        shipped or delivered from.)

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="PaymentMethods" type="ns:BuyerPaymentMethodCodeType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Identifies the payment method (such as PayPal) the seller

-                        will accept when the buyer pays for the item. &lt;br&gt;

-                        &lt;br&gt;

-                        &lt;span class="tablenote"&gt;&lt;b&gt;Note:&lt;/b&gt;

-                        If the seller only accepts PayPal, the buyer can still pay

-                        with a credit card. PayPal supports major credit cards.&lt;/span&gt; &lt;br&gt;

-                        &lt;br&gt;

-                        Payment methods are not applicable to eBay Real Estate advertisement

-                        listings, or other Classified Ad format listings.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <AllValuesExcept>Escrow, PrePayDelivery, CODPrePayDelivery, PostalTransfer</AllValuesExcept>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <AllValuesExcept>Escrow, PrePayDelivery, CODPrePayDelivery, PostalTransfer</AllValuesExcept>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="GalleryURL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        URL for a picture used as the Gallery thumbnail, if any.

-                        The image uses one of the following graphics formats:

-                        JPEG, BMP, TIF, or GIF.

-                        Only returned if the seller chose to show a gallery image.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="PictureURL" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Contains the URL for an image associated with the item, if any.

-                        Only returned if the seller chose to include at least one picture

-                        in the listing. (This doesn't return URLs of pictures that the

-                        seller specified via HTML IMG tags in Description.)&lt;br&gt;

-                        &lt;br&gt;

-                        Items listed the main eBay site can have a maximum of 12 picture URLs

-                        hosted by eBay Picture Services or a maximum of 6 picture URLs hosted by

-                        a third party (such as the seller or a photo site).

-                        On the US eBay Motors site (for all vehicle listings), and on the

-                        eBay Canada Motors site, a listing can have up to 24 picture URLs.&lt;br&gt;

-                        &lt;br&gt;

-                        eBay uses the seller's first picture at the top of the listing's

-                        View Item page.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <MaxLength>150</MaxLength>

-                        <MaxOccurs>24</MaxOccurs>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="PostalCode" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Postal code indicating the physical location of the item,

-                        as specified by the seller. (This gives a general indication of where

-                        the item will be shipped or delivered from.)

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="PrimaryCategoryID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Numeric ID of the first (or only) category in which the item is listed.

-                        (Listings can appear in more than one category.)&lt;br&gt;

-                        &lt;br&gt;

-                        &lt;span class="tablenote"&gt;&lt;b&gt;Note:&lt;/b&gt;

-                        Currently, GetSingleItem does not return a listing's

-                        secondary category, if any.&lt;/span&gt;

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="PrimaryCategoryName" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Display name of the first (or only) category in which the item is

-                        listed. This is a fully qualified category breadcrumb

-                        (e.g., Computers &amp; Networking:Laptops, Notebooks).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Quantity" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The number of items the seller is offering in the listing.

-                        (Subtract Item.QuantitySold from this value to calculate the number of

-                        items currently available for sale.)&lt;br&gt;

-                        &lt;br&gt;

-                        If an online auction (with competitive bidding) has a Quantity of 1,

-                        it's a &lt;i&gt;Chinese auction&lt;/i&gt;.

-                        If Quantity is greater than 1,it's a &lt;i&gt;Dutch auction&lt;/i&gt;.&lt;br&gt;

-                        &lt;br&gt;

-                        Basic fixed-price and Store Inventory listings can have a

-                        Quantity of 1 or more.&lt;br&gt;

-                        &lt;br&gt;

-                        The listing's current or Buy It Now price is the price of

-                        1 item in the listing.&lt;br&gt;

-                        &lt;br&gt;

-                        &lt;span class="tablenote"&gt;&lt;b&gt;Note:&lt;/b&gt;

-                        A seller can also offer multiple items for sale with a single

-                        price for all the items. For example, instead of listing 10 lightbulbs

-                        for US 2.00 each, they might list 10 lightbulbs for USD 20.00 (where

-                        you have to buy all 10). This is called a "lot".

-                        If the listing includes a lot (or multiple lots), Quantity does not

-                        specify the lot size; it only reflects how many lots are being sold.

-                        For example, if the listing includes 5 lots of 10 lightbulbs each,

-                        Quantity would be 5. (GetSingleItem does not return information about

-                        lot sizes.)&lt;/span&gt;

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <SeeLink>

-                            <Title>Item.ListingType</Title>

-                            <URL>#Response.Item.ListingType</URL>

-                        </SeeLink>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Seller" type="ns:SimpleUserType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Container for information about this listing's seller.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SellerInfo</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="BidCount" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The number of bids that have been placed on the item.&lt;br&gt;

-                        &lt;br&gt;

-                        On most sites, once a Chinese auction has bids, the listing is no longer

-                        eligible for Buy It Now. (This is not necessarily true

-                        for Dutch auctions. See Item.BuyItNowAvailable for Dutch auctions.)

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetItemStatus</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ConvertedCurrentPrice" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The listing's current price, converted to the currency

-                        of the site specified in the request.

-                        If the item is a multi-quantity listing, this is the price of one

-                        item.&lt;br&gt;

-                        &lt;br&gt;

-                        Price fields are returned

-                        as doubles, not necessarily in the usual monetary amount format of the

-                        site. For example, a US Dollar value might be returned as

-                        3.879938 instead of 3.88.&lt;br&gt;

-                        &lt;br&gt;

-                        For competitive-bidding listings (Chinese and Dutch auctions),

-                        this is the current minimum bid price (if the listing has no bids) or

-                        the current high bid (if the listing has bids).

-                        (Compare to BuyItNowPrice).&lt;br&gt;

-                        &lt;br&gt;

-                        For Basic Fixed-Price (FixedPriceItem), Store Inventory

-                        (StoresFixedPrice), and Ad format (AdType) listings, this is the

-                        current fixed price.&lt;br&gt;

-                        &lt;br&gt;

-                        For active items, refresh this value every 24 hours to

-                        pick up the current conversion rates (if this value has been converted).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <CallName>GetItemStatus</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Conditionally</Returned>

-                            <SeeLink>

-                                <Title>(GetSingleItem) Item.CurrentPrice</Title>

-                                <URL>GetSingleItem.html#Response.Item.CurrentPrice</URL>

-                            </SeeLink>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                            <SeeLink>

-                                <Title>(GetSingleItem) Item.CurrentPrice</Title>

-                                <URL>GetSingleItem.html#Response.Item.CurrentPrice</URL>

-                            </SeeLink>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetItemStatus</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="CurrentPrice" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The current price of the item, in the currency of the site on which

-                        the item was listed. That is, CurrentPrice is in the original listing 

-                        currency. If the item is a multi-quantity listing,

-                        this is the price of one item.&lt;br&gt;

-                        &lt;br&gt;

-                        For competitive-bidding listings (Chinese and Dutch auctions),

-                        this is the current minimum bid price (if the listing has no bids) or

-                        the current high bid (if the listing has bids).

-                        (Compare to BuyItNowPrice).&lt;br&gt;

-                        &lt;br&gt;

-                        For Basic Fixed-Price (FixedPriceItem), Store Inventory

-                        (StoresFixedPrice), and Ad format (AdType) listings, this is the

-                        current fixed price.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                            <SeeLink>

-                                <Title>(GetSingleItem) Item.ConvertedCurrentPrice</Title>

-                                <URL>GetSingleItem.html#Response.Item.ConvertedCurrentPrice</URL>

-                            </SeeLink>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="HighBidder" type="ns:SimpleUserType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        For single-item (Quantity = 1) auction listings (Chinese type) that have

-                        ended and have a winning bidder, indicates the user who is the current

-                        high bidder.&lt;br&gt;

-                        &lt;br&gt;

-                        For single-item basic fixed price (FixedPriceItem) or Store Inventory

-                        (StoresFixedPrice) listings that have ended, indicates the user who

-                        purchased the item. &lt;br&gt;

-                        &lt;br&gt;

-                        Not returned for auctions that have received no bids; fixed price and

-                        Store Inventory listings that are still active; or any multi-item

-                        (Quantity &gt; 1) listings (Dutch, FixedPriceItem, StoresFixedPrice).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <SeeLink>

-                            <Title>Item.Quantity</Title>

-                            <URL>#Response.Item.Quantity</URL>

-                        </SeeLink>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetItemStatus</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ListingStatus" type="ns:ListingStatusCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Specifies a listing's status in eBay's processing workflow.

-                        If an item's EndTime is in the past, but no details about the

-                        buyer or high bidder are shown (and the user is not anonymous),

-                        use this listing status information to determine whether eBay has

-                        finished processing the listing.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetItemStatus</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="QuantitySold" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Number of items purchased so far from this listing.

-                        (Subtract this value from Item.Quantity to calculate the number of

-                        items currently available for sale.)

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ReserveMet" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Indicates whether any bids on this item are greater than the seller's

-                        reserve price for the listing (if any).&lt;br&gt;

-                        &lt;br&gt;

-                        A reserve is the lowest price at which the seller is willing to sell

-                        the item. The reserve price is higher than the listing's opening bid

-                        (minimum bid) and lower than the Buy It Now price, if any.

-                        (The reserve price is only known to the seller.)

-                        Some sellers don't set a reserve at all. If a listing does have

-                        a reserve price, the highest bidder will only win

-                        the item if their bid is also above that price.&lt;br&gt;

-                        &lt;br&gt;

-                        Only returned for online auctions that have

-                        a reserve price. (Fixed price, Store Inventory, and classified ad

-                        listings don't have reserve prices.)

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetItemStatus</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShipToLocations" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        An international location or region to which the seller is willing

-                        to ship this item. &lt;br&gt;

-                        &lt;br&gt;

-                        &lt;b&gt;Applicable values&lt;/b&gt;:

-                            &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; Americas&lt;/p&gt;

-                                &lt;p class="edef"&gt;(North, South, or Latin America)&lt;/p&gt;

-                            &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; Asia&lt;/p&gt;

-                            &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; Caribbean&lt;/p&gt;

-                            &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; Europe&lt;/p&gt;

-                            &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; EuropeanUnion&lt;/p&gt;

-                            &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; LatinAmerica&lt;/p&gt;

-                            &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; MiddleEast&lt;/p&gt;

-                            &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; NorthAmerica&lt;/p&gt;

-                            &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; Oceania&lt;/p&gt;

-                                &lt;p class="edef"&gt;(Pacific region other than Asia)&lt;/p&gt;

-                            &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; SouthAmerica&lt;/p&gt;

-                            &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; WillNotShip&lt;/p&gt;

-                                &lt;p class="edef"&gt;(No shipping, buyer must pick up the item)&lt;/p&gt;

-                            &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; Worldwide&lt;/p&gt;

-                                &lt;p class="edef"&gt;(Seller will ship worldwide)&lt;/p&gt;

-                            &lt;p class="ename"&gt;&amp;bull;&amp;nbsp;&amp;nbsp; 2-letter country identifier&lt;/p&gt;

-                                &lt;p class="edef"&gt;(See CountryCodeType for values)&lt;/p&gt;

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <SeeLink>

-                            <Title>CountryCodeType</Title>

-                            <URL>types/CountryCodeType.html</URL>

-                        </SeeLink>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Site" type="ns:SiteCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The name of the eBay site on which the item was originally listed.

-                        For example, if the item is listed on the eBay US site,

-                        the value would be US. If it's listed on the eBay Germany site,

-                        the value would be Germany. &lt;br&gt;

-                        &lt;br&gt;

-                        The listing's original site can affect the values of converted

-                        (localized) prices (when your request specifies a site

-                        that is different from the listing's site).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="TimeLeft" type="xs:duration" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Time left before the listing ends.

-                        The duration is represented in the ISO 8601 duration format (PnYnMnDTnHnMnS).

-                        For ended listings, the time left is PT0S (zero seconds).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetItemStatus</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Title" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Name of the item as it appears in the listing or in search and

-                        browse results.&lt;br&gt;

-                        &lt;br&gt;

-                        For US eBay Motors cars, trucks, and motorcycles, this value shows the

-                        vehicle Make and Model instead of the seller's own title.

-                        (For the seller's title, look for Subtitle in

-                        Item.ItemSpecifics.NameValueList.Name in

-                        GetSingleItem, and then use the corresponding value in

-                        Item.ItemSpecifics.NameValueList.Value.)

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetMultipleItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: none, Description, ItemSpecifics, ShippingCosts, Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingCostSummary" type="ns:ShippingCostSummaryType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Contains basic shipping-related costs for the item. If Item.Quantity

-                        is greater than 1, this is the shipping cost for one item.

-                        If the seller offers a choice of more than one shipping service

-                        (such as UPS Ground and USPS Media mail), this is the cost of the

-                        "first" shipping option (usually the lowest cost option).&lt;br&gt;

-                        &lt;br&gt;

-                        If a listing has shipping costs, use GetShippingCosts if you want to get

-                        more details about the services and costs that the seller is offering.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <SeeLink>

-                            <Title>GetShippingCosts</Title>

-                            <URL>GetShippingCosts.html</URL>

-                        </SeeLink>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: ShippingCosts</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItems</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: none, Details, SearchDetails, SellerInfo, ItemSpecifics, ExpansionItemCount, CategoryHistogram</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items, Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ItemSpecifics" type="ns:NameValueListArrayType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Category-specific fields that the seller added to describe

-                        the listing. The names of these fields are different for items

-                        in different categories, so they're returned in a generic

-                        name/value structure. The field names are usually very well known

-                        within the category.&lt;br&gt;

-                        &lt;br&gt;

-                        For example, a book's item specifics might include a field like

-                        Publication Year=2007 (where Publication Year is returned in Name,

-                        and 2007 is returned in Value), and a field like Format=Hardcover.

-                        But a car's item specifics would be different from a book's, with

-                        fields like Make=Toyota and Model=Prius.

-                        And a ticket's item specifics would be different from those of

-                        books and cars, with fields like EventType=Concerts and

-                        Venue=The Fillmore. &lt;br&gt;

-                        &lt;br&gt;

-                        Some of the most common uses for item specifics are the item condition

-                        and return policy. The return policy can include multiple

-                        name/value fields (to explain how soon the item must be returned, how soon the refund will be given, and so forth).&lt;br&gt;

-                        &lt;br&gt;

-                        Only contains data if the listing includes Item Specifics.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: ItemSpecifics</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: ItemSpecifics</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="HitCount" type="xs:long" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The number of times the listing's View Item page has been viewed (as

-                        determined by eBay). Only returned if the seller has chosen

-                        to include a hit counter in the listing, and if the seller has

-                        also chosen to make the listing's hit count publicly visible.

-                        This field is retrieved asynchronously. If you believe the item has a

-                        publicly visible hit count, but this field is not returned,

-                        retry the call.&lt;br&gt;

-                        &lt;br&gt;

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Subtitle" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Subtitle of the item. Only returned if the seller included a

-                        subtitle for the listing.&lt;br&gt;

-                        &lt;br&gt;

-                        For US eBay Motors passenger vehicle, motorcycle, and "other vehicle"

-                        categories or listings in CA eBay Motors passenger vehicle and

-                        motorcycle categories, see the ItemSpecifics node for the subtitle

-                        instead.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="PrimaryCategoryIDPath" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The fully qualified ID breadcrumb (path) of the first category.

-                        For example, if the primary category ID is 45678, and its parent

-                        category's ID is 123, the breadcrumb (path) would be 123:45678.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="SecondaryCategoryID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        ID of the second category in which the item is listed.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="SecondaryCategoryName" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Name of the second category in which the item is listed.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="SecondaryCategoryIDPath" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The fully qualified ID breadcrumb (path) of the second category.

-                        For example, if the secondary category ID is 45678, and its parent

-                        category's ID is 123, the breadcrumb (path) would be 123:45678.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Charity" type="ns:CharityType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Identifier for a Giving Works listing and the benefiting nonprofit charity organization.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SearchDetails</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="DigitalDeliveryRequirements" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        For a digitally delivered item, the requirements for using the item.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SearchDetails</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="DigitalDeliveryMethod" type="ns:DigitalDeliveryMethodCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        For a digitally delivered item, the digital-download method.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SearchDetails</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="GermanMotorsSearchable" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The item is featured in eBay search results on the mobile.de partner site. Applicable to eBay Germany.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SearchDetails</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="GetItFast" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A Get It Fast listing.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SearchDetails</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Gift" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        If true, a generic gift icon displays next the listing's title in search and browse pages.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SearchDetails</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="PictureExists" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Whether the item has a picture.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SearchDetails</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="RecentListing" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Whether the item is no more than one day old.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SearchDetails</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Storefront" type="ns:StorefrontType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Whether the item is a storefront listing.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SellerInfo</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="DistanceFromBuyer" type="ns:DistanceType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The distance of the item from the buyer.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SearchDetails</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Country" type="ns:CountryCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Two-letter ISO 3166 country code. Used with the Location field to indicate

-                        the city and country where the item is located.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="WatchCount" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Watch count for the item.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindPopularItems</CallName>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="HalfItemCondition" type="ns:HalfItemConditionCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Half condition codes like brand new etc

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="SellerComments" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Seller notes while listing items.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ReturnPolicy" type="ns:ReturnPolicyType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        If a seller specified return policy details, then this container has fields

-                        with those details.

-                        The fields that can be returned in this container vary by site. 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="MinimumToBid" type="ns:AmountType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Smallest amount the next bid on the item can be. Returns same value as 

-                        Item.StartPrice (if no bids have yet been placed) or CurrentPrice plus

-                        BidIncrement (if at least one bid has been placed). Only applicable to 

-                        Chinese and Dutch auction listings. Returns null for basic Fixed Price

-                        (FixedPriceItem),Store Inventory (StoresFixedPrice), and Ad type listings.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <MaxLength>4000</MaxLength>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ProductID" type="ns:ProductIDType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A prototype description of a well-known type of item, such as a popular book. 

-                        &lt;br&gt;

-                        &lt;br&gt;

-                        When returned for GetSingleItem, is always of type Reference, and serves as a global reference ID for an eBay catalog product.

-                        &lt;br&gt;

-                        &lt;br&gt;

-                        When used as input, retrieves product details for one specific product.

-                        Specify the ID as a string, and use the type attribute to

-                        indicate the nature of the ID you are specifying.

-                        &lt;br&gt;

-                        &lt;br&gt;

-                        The request requires either QueryKeywords or

-                        ProductID, but these fields cannot be used together.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <MaxLength>4000</MaxLength>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>     

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/SimpleUserType.xsd #####

-

--->

-    <xs:complexType name="SimpleUserType">

-        <xs:annotation>

-            <xs:documentation>

-                Type to contain the data for one eBay user. Depending on the context, the user

-                might be the seller or the buyer in a transaction, or the bidder or winning bidder

-                in a listing. An object of this type is returned by a number of calls, including

-                the GetUser call.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="UserID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The user's eBay user ID. A unique value.

-                        If a bidder's user information is made

-                        anonymous, the real ID value will be

-                        replaced with the value "Bidder X" where X is a number

-                        indicating the order of that user's first bid. For example,

-                        if the user was the third bidder, UserID = Bidder 3.

-                        &lt;br&gt;&lt;br&gt;

-                        Note that the anonymous bidder ID stays the same for a given

-                        auction, but is different for different auctions.

-                        For example, a bidder who is the third and then the seventh

-                        bidder in an auction will be listed for both bids as "Bidder

-                        3". However, if that same bidder is the first bidder on a

-                        different auction, the bidder will be listed for that

-                        auction as "Bidder 1", not "Bidder 3".

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: none, Details, FeedbackDetails, FeedbackHistory</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SellerInfo</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="FeedbackPrivate" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Indicates whether the user has chosen to make their feedback score and

-                        feedback details private (hidden from other users). Note that the percentage

-                        of positive feedback can still be returned, even if other feedback details are

-                        private. If a bidder's user information is made

-                        anonymous, the value -99 is returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: none, Details, FeedbackDetails, FeedbackHistory</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="FeedbackRatingStar" type="ns:FeedbackRatingStarCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Visual indicator of user's feedback score.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Always</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: none, Details, FeedbackDetails, FeedbackHistory</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SellerInfo</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="FeedbackScore" type="xs:int" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The aggregate feedback score of a user. A user's feedback score is the net

-                        positive feedback minus the net negative feedback left for the user. Feedback

-                        scores are a quantitative expression of the desirability of dealing with a

-                        user as a buyer or a seller in transactions. Each transaction can result in

-                        one feedback entry for a given user. (The buyer can leave feedback for the

-                        seller, and the seller can leave feedback for the buyer.) That one feedback

-                        can be positive, negative, or neutral.

-                        The aggregate feedback score of a user represents that user's overall

-                        feedback score (referred to as a

-                        "feedback rating" on the eBay site). If the user has chosen to make their

-                        feedback private, then FeedbackScore is not returned and FeedbackPrivate is

-                        returned with a value of true.&lt;br&gt;

-                        &lt;br&gt;

-                        If a bidder's user information is made

-                        anonymous, the value -99 is returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: none, Details, FeedbackDetails, FeedbackHistory</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="UserAnonymized" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Indicates whether eBay has made this user's information anonymous.

-                        This occurs when the listing prices (reserve, current, or Buy It Now)

-                        reach or exceed a certain amount (such as $200 USD at the time of this

-                        writing).

-                        &lt;br&gt;

-                        &lt;br&gt;

-                        If true, certain other fields about this user are not returned, or their

-                        values include no identifying characteristics. (The rules are explained

-                        in the description of each field.)

-                        If false, all user-specific fields contain the user's actual data.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Context>HighBidder</Context>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>GetItemStatus</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Context>HighBidder</Context>

-                            <Details>IncludeSelector: Details</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="NewUser" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        If true, identifies a new user who has been a registered eBay user for 30 days

-                        or less. Always false after the user has been registered for more than 30

-                        days. Does not indicate an ID change.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: none, Details, FeedbackDetails, FeedbackHistory</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="RegistrationDate" type="xs:dateTime" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The date the specified user originally registered with eBay.

-                        If a bidder's user information is made

-                        anonymous, the value -99 is returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: none, Details, FeedbackDetails, FeedbackHistory</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="RegistrationSite" type="ns:SiteCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The eBay site with which the user is registered.

-                        If a bidder's user information is made

-                        anonymous, the value -99 is returned.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: none, Details, FeedbackDetails, FeedbackHistory</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="Status" type="ns:UserStatusCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The registration-related status of the user.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: none, Details, FeedbackDetails, FeedbackHistory</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="SellerBusinessType" type="ns:SellerBusinessCodeType" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Type of seller account.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: none, Details, FeedbackDetails, FeedbackHistory</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="StoreURL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The URL of the seller's eBay Store page.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: Details</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="StoreName" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The name of the seller's eBay Store.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: Details</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="SellerItemsURL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        URL for seller's other items.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: none, Details, FeedbackDetails, FeedbackHistory</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="AboutMeURL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A link to the user's AboutMe page.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: none, Details, FeedbackDetails, FeedbackHistory</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="MyWorldURL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        A link to the URL of the user's MyWorld page.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: Details</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="MyWorldSmallImage" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Location of a user's image on the MyWorld page (small version).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: Details</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="MyWorldLargeImage" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Location of a user's image on the MyWorld page (large version).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: Details</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ReviewsAndGuidesURL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The URL of reviews and guides.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: Details</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="FeedbackDetailsURL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The URL of feedback details.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetUserProfile</CallName>

-                            <Details>IncludeSelector: none, Details, FeedbackDetails, FeedbackHistory</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="PositiveFeedbackPercent" type="xs:float" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The percentage value of a user's positive feedback. 

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetSingleItem</CallName>

-                            <Context>Seller</Context>

-                            <Details>IncludeSelector: Details</Details>

-                            <Returned>Always</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/SiteCodeList.xsd #####

-

--->

-    <xs:simpleType name="SiteCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                eBay sites (by the country in which each resides) on

-which a user is registered and on which items can be listed.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="US">

-                <xs:annotation>

-                    <xs:documentation>

-                        USA, site ID 0, abbreviation US, currency USD.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Canada">

-                <xs:annotation>

-                    <xs:documentation>

-                        Canada, site ID 2, abbreviation CA, currencies CAD and USD.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="UK">

-                <xs:annotation>

-                    <xs:documentation>

-                        United Kingdom, site ID 3, abbreviation UK, currency GBP.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Australia">

-                <xs:annotation>

-                    <xs:documentation>

-                        Australia, site ID 15, abbreviation AU, currency AUD.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Austria">

-                <xs:annotation>

-                    <xs:documentation>

-                        Austria, site ID 16, abbreviation AT, currency EUR.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Belgium_French">

-                <xs:annotation>

-                    <xs:documentation>

-                        Belgium (French), site ID 23, abbreviation BEFR, currency EUR.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="France">

-                <xs:annotation>

-                    <xs:documentation>

-                        France, site ID 71, abbreviation FR, currency EUR.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Germany">

-                <xs:annotation>

-                    <xs:documentation>

-                        Germany, site ID 77, abbreviation DE, currency EUR.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Italy">

-                <xs:annotation>

-                    <xs:documentation>

-                        Italy, site ID 101, abbreviation IT, currency EUR.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Belgium_Dutch">

-                <xs:annotation>

-                    <xs:documentation>

-                        Belgium (Dutch), site ID 123, abbreviation BENL, currency EUR.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Netherlands">

-                <xs:annotation>

-                    <xs:documentation>

-                        Netherlands, site ID 146, abbreviation NL, currency EUR.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Spain">

-                <xs:annotation>

-                    <xs:documentation>

-                        Spain, site ID 186, abbreviation ES, currency EUR.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Switzerland">

-                <xs:annotation>

-                    <xs:documentation>

-                        Switzerland, site ID 193, abbreviation CH, currency CHF.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Taiwan">

-                <xs:annotation>

-                    <xs:documentation>

-                        Taiwan, site ID 196, abbreviation TW, currency TWD.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="eBayMotors">

-                <xs:annotation>

-                    <xs:documentation>

-                        eBay Motors, site ID 100, currency USD.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="HongKong">

-                <xs:annotation>

-                    <xs:documentation>

-                        Hong Kong, site ID 201, abbreviation HK, currency HKD.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Singapore">

-                <xs:annotation>

-                    <xs:documentation>

-                        Singapore, site ID 216, abbreviation SG, currency SGD.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="India">

-                <xs:annotation>

-                    <xs:documentation>

-                        India, site ID 203, abbreviation IN, currency INR.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="China">

-                <xs:annotation>

-                    <xs:documentation>

-                        China, site ID 223, abbreviation CN, currency CNY.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Ireland">

-                <xs:annotation>

-                    <xs:documentation>

-                        Ireland, site ID 205, abbreviation IE, currency EUR.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Malaysia">

-                <xs:annotation>

-                    <xs:documentation>

-                        Malaysia, site ID 207, abbreviation MY, currency MYR.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Philippines">

-                <xs:annotation>

-                    <xs:documentation>

-                        Philippines, site ID 211, abbreviation PH, currency PHP.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Poland">

-                <xs:annotation>

-                    <xs:documentation>

-                        Poland, site ID 212, abbreviation PL, currency PLN.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Sweden">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sweden, site ID 218, abbreviation SE, currency SEK.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        Placeholder value. See

-                        &lt;a href="types/simpleTypes.html#token"&gt;token&lt;/a&gt;.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CanadaFrench">

-                <xs:annotation>

-                    <xs:documentation>

-                        CanadaFrench, site ID 210, abbreviation CAFR, currencies CAD and USD.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/SortOrderCodeList.xsd #####

-

--->

-    <xs:simpleType name="SortOrderCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Indicates the order of sorting.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="Ascending">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sorts results in ascending (low to high) order.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Descending">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sorts results in descending (high to low) order.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        Placeholder value. See

-                        &lt;a href="types/simpleTypes.html#token"&gt;token&lt;/a&gt;.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/StoreSearchCodeList.xsd #####

-

--->

-    <xs:simpleType name="StoreSearchCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                Identifies the StoreSearch codes (e.g., for FindItemsAdvanced requests).

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="AllItemsInTheStore">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Within a single store for all items (specify a store in

-                        the appropriate input field).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="AuctionItemsInTheStore">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Within a single store for auction items (specify a store in

-                        the appropriate input field).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="BuyItNowItemsInTheStore">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Within a single store for basic fixed price items, Store Inventory format items,

-                        and auction items with Buy It Now (specify a store in the appropriate input field).

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="BuyItNowItemsInAllStores">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in) Across all stores for basic fixed price items, Store Inventory format items,

-                        and auction items with Buy It Now.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for internal or future use.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/StorefrontType.xsd #####

-

--->

-    <xs:complexType name="StorefrontType">

-        <xs:annotation>

-            <xs:documentation>

-                Contains information related to the item in the context of

-                a seller's eBay Store. Applicable for auction format, Basic Fixed Price,

-                and Store Inventory format items listed by eBay Stores sellers.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="StoreURL" type="xs:anyURI" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The URL of the seller's eBay Store page. FindProducts only returned

-                         a default URL at the time of this writing.  FindHalfProducts returns the URL 

-                         of the seller's Half.com Shop page.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SellerInfo</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="StoreName" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The name of the seller's eBay Store. FindProducts returns an empty

-                        value for all items at the time of this writing.  FindHalfProducts returns the

-                        name of seller's Half.com Shop, which is the SellerID.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <MaxLength>200</MaxLength>

-                        <CallInfo>

-                            <CallName>FindItemsAdvanced</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: SellerInfo</Details>

-                        </CallInfo>

-                        <CallInfo>

-                            <CallName>FindHalfProducts</CallName>

-                            <Returned>Conditionally</Returned>

-                            <Details>IncludeSelector: Items</Details>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/TaxJurisdictionType.xsd #####

-

--->

-    <xs:complexType name="TaxJurisdictionType">

-        <xs:annotation>

-            <xs:documentation>

-                Tax-related details for a region or jurisdiction.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="JurisdictionID" type="xs:string" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Representative identifier for the jurisdiction. Typically an

-                        abbreviation (e.g. CA for California).

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="SalesTaxPercent" type="xs:float" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        The tax percent to apply for a listing shipped to this

-                        jurisdiction. The value passed in is stored with a precision of

-                        3 digits after the decimal point (##.###).

-                        GetTaxTable: this tag has no value if the user's tax table has not been set.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:element name="ShippingIncludedInTax" type="xs:boolean" minOccurs="0">

-                <xs:annotation>

-                    <xs:documentation>

-                        Whether shipping costs are to be part of the base amount that is taxed.

-                        GetTaxTable: This tag is empty if the user did not previously provide information.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/TaxTableType.xsd #####

-

--->

-    <xs:complexType name="TaxTableType">

-        <xs:annotation>

-            <xs:documentation>

-                Sales tax details for zero or more jurisdictions (states,

-                provinces, etc).

-            </xs:documentation>

-        </xs:annotation>

-        <xs:sequence>

-            <xs:element name="TaxJurisdiction" type="ns:TaxJurisdictionType" minOccurs="0" maxOccurs="unbounded">

-                <xs:annotation>

-                    <xs:documentation>

-                        Sales tax details for zero or more jurisdictions (states, provinces, etc).

-                        Information is only returned for the jurisdictions for which the user provided

-                        tax information. ShippingIncludedInTax and SalesTaxPercent are returned but

-                        are empty.

-                    </xs:documentation>

-                    <xs:appinfo>

-                        <CallInfo>

-                            <CallName>GetShippingCosts</CallName>

-                            <Returned>Conditionally</Returned>

-                        </CallInfo>

-                    </xs:appinfo>

-                </xs:annotation>

-            </xs:element>

-        </xs:sequence>

-    </xs:complexType>

-<!--  

-

-##### from file ../Shopping/xsd/TradingRoleCodeList.xsd #####

-

--->

-    <xs:simpleType name="TradingRoleCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                A means for identifying a person's role in doing business on eBay.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="Buyer">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in/out) Acting as buyer.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Seller">

-                <xs:annotation>

-                    <xs:documentation>

-                        (in/out) Acting as seller.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Reserved for future use

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/UserIDType.xsd #####

-

--->

-    <xs:simpleType name="UserIDType">

-        <xs:annotation>

-            <xs:documentation>

-                An eBay ID that uniquely identifies a user. For GetAllBidders,

-                if the user chose to be anonymized, a generic ID is returned.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:string"/>

-    </xs:simpleType>

-<!--  

-

-##### from file ../Shopping/xsd/UserStatusCodeList.xsd #####

-

--->

-    <xs:simpleType name="UserStatusCodeType">

-        <xs:annotation>

-            <xs:documentation>

-                These codes indicate the current state or status of a an eBay

-                user account.

-            </xs:documentation>

-        </xs:annotation>

-        <xs:restriction base="xs:token">

-            <xs:enumeration value="Unknown">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) User properties have never been set; this value should

-                        seldom, if ever, be returned and typically represents a

-                        problem

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Suspended">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) User has been suspended from selling and buying, such as

-                        for violations of eBay terms or agreement

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Confirmed">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) User has completed online registration and has properly

-                        responded to confirmation email; most users should fall

-                        in this category

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Unconfirmed">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) User has completed online registration, but has either

-                        not responded to confirmation email or has not yet been

-                        sent the confirmation email

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Ghost">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Registered users of AuctionWeb (pre-eBay) who never

-                        re-registered on eBay

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="InMaintenance">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Temporary user record state indicating the record is in

-                        the process of being changed by eBay; query user

-                        information again to get new status

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Deleted">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Records for the specified user have been deleted

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CreditCardVerify">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) User has completed registration and confirmation, but is

-                        pending a verification of credit card information

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="AccountOnHold">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) User's account is on hold, such as for non-payment of

-                        amounts due eBay; user cannot sell or buy items

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="Merged">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) User record has been merged with another account record

-                        for the same user

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="RegistrationCodeMailOut">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) User has completed online registration and has been sent

-                        the confirmation email, but has not yet responded to the

-                        confirmation email

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="TermPending">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) User has been scheduled for account closure (typically

-                        when a user has requested to have their account closed)

-                        A user in this state should not be considered an active

-                        user

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="UnconfirmedHalfOptIn">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) User has completed the registration for Half.com and opted

-                        to automatically also be registered with eBay, but the

-                        registration confirmation is still pending

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CreditCardVerifyHalfOptIn">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) User has completed the registration for Half.com and opted

-                        to automatically also be registered with eBay, but the

-                        verification of credit card information is still pending

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="UnconfirmedExpress">

-                <xs:annotation>

-                    <xs:documentation>

-                        (out) Half.com User; user has completed the registration for Half.com

-                        and opted to automatically also be registered with eBay, but the

-                        registration confirmation is still pending

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-            <xs:enumeration value="CustomCode">

-                <xs:annotation>

-                    <xs:documentation>

-                          (out) Reserved for internal or future use

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:enumeration>

-        </xs:restriction>

-    </xs:simpleType>

-

-

-        </xs:schema>

-    </wsdl:types>

-    

-    <wsdl:message name="FindHalfProductsResponse">

-        <wsdl:part name="FindHalfProductsResponse" element="ns:FindHalfProductsResponse"/>

-    </wsdl:message>

-    <wsdl:message name="FindHalfProductsRequest">

-        <wsdl:part name="FindHalfProductsRequest" element="ns:FindHalfProductsRequest"/>

-    </wsdl:message>

-    <wsdl:message name="FindItemsResponse">

-        <wsdl:part name="FindItemsResponse" element="ns:FindItemsResponse"/>

-    </wsdl:message>

-    <wsdl:message name="FindItemsRequest">

-        <wsdl:part name="FindItemsRequest" element="ns:FindItemsRequest"/>

-    </wsdl:message>

-    <wsdl:message name="FindItemsAdvancedResponse">

-        <wsdl:part name="FindItemsAdvancedResponse" element="ns:FindItemsAdvancedResponse"/>

-    </wsdl:message>

-    <wsdl:message name="FindItemsAdvancedRequest">

-        <wsdl:part name="FindItemsAdvancedRequest" element="ns:FindItemsAdvancedRequest"/>

-    </wsdl:message>

-    <wsdl:message name="FindPopularItemsResponse">

-        <wsdl:part name="FindPopularItemsResponse" element="ns:FindPopularItemsResponse"/>

-    </wsdl:message>

-    <wsdl:message name="FindPopularItemsRequest">

-        <wsdl:part name="FindPopularItemsRequest" element="ns:FindPopularItemsRequest"/>

-    </wsdl:message>

-    <wsdl:message name="FindPopularSearchesResponse">

-        <wsdl:part name="FindPopularSearchesResponse" element="ns:FindPopularSearchesResponse"/>

-    </wsdl:message>

-    <wsdl:message name="FindPopularSearchesRequest">

-        <wsdl:part name="FindPopularSearchesRequest" element="ns:FindPopularSearchesRequest"/>

-    </wsdl:message>

-    <wsdl:message name="FindProductsResponse">

-        <wsdl:part name="FindProductsResponse" element="ns:FindProductsResponse"/>

-    </wsdl:message>

-    <wsdl:message name="FindProductsRequest">

-        <wsdl:part name="FindProductsRequest" element="ns:FindProductsRequest"/>

-    </wsdl:message>

-    <wsdl:message name="FindReviewsAndGuidesResponse">

-        <wsdl:part name="FindReviewsAndGuidesResponse" element="ns:FindReviewsAndGuidesResponse"/>

-    </wsdl:message>

-    <wsdl:message name="FindReviewsAndGuidesRequest">

-        <wsdl:part name="FindReviewsAndGuidesRequest" element="ns:FindReviewsAndGuidesRequest"/>

-    </wsdl:message>

-    <wsdl:message name="GetCategoryInfoResponse">

-        <wsdl:part name="GetCategoryInfoResponse" element="ns:GetCategoryInfoResponse"/>

-    </wsdl:message>

-    <wsdl:message name="GetCategoryInfoRequest">

-        <wsdl:part name="GetCategoryInfoRequest" element="ns:GetCategoryInfoRequest"/>

-    </wsdl:message>

-    <wsdl:message name="GetItemStatusResponse">

-        <wsdl:part name="GetItemStatusResponse" element="ns:GetItemStatusResponse"/>

-    </wsdl:message>

-    <wsdl:message name="GetItemStatusRequest">

-        <wsdl:part name="GetItemStatusRequest" element="ns:GetItemStatusRequest"/>

-    </wsdl:message>

-    <wsdl:message name="GetMultipleItemsResponse">

-        <wsdl:part name="GetMultipleItemsResponse" element="ns:GetMultipleItemsResponse"/>

-    </wsdl:message>

-    <wsdl:message name="GetMultipleItemsRequest">

-        <wsdl:part name="GetMultipleItemsRequest" element="ns:GetMultipleItemsRequest"/>

-    </wsdl:message>

-    <wsdl:message name="GetShippingCostsResponse">

-        <wsdl:part name="GetShippingCostsResponse" element="ns:GetShippingCostsResponse"/>

-    </wsdl:message>

-    <wsdl:message name="GetShippingCostsRequest">

-        <wsdl:part name="GetShippingCostsRequest" element="ns:GetShippingCostsRequest"/>

-    </wsdl:message>

-    <wsdl:message name="GetSingleItemResponse">

-        <wsdl:part name="GetSingleItemResponse" element="ns:GetSingleItemResponse"/>

-    </wsdl:message>

-    <wsdl:message name="GetSingleItemRequest">

-        <wsdl:part name="GetSingleItemRequest" element="ns:GetSingleItemRequest"/>

-    </wsdl:message>

-    <wsdl:message name="GetUserProfileResponse">

-        <wsdl:part name="GetUserProfileResponse" element="ns:GetUserProfileResponse"/>

-    </wsdl:message>

-    <wsdl:message name="GetUserProfileRequest">

-        <wsdl:part name="GetUserProfileRequest" element="ns:GetUserProfileRequest"/>

-    </wsdl:message>

-    <wsdl:message name="GeteBayTimeResponse">

-        <wsdl:part name="GeteBayTimeResponse" element="ns:GeteBayTimeResponse"/>

-    </wsdl:message>

-    <wsdl:message name="GeteBayTimeRequest">

-        <wsdl:part name="GeteBayTimeRequest" element="ns:GeteBayTimeRequest"/>

-    </wsdl:message>

-    <wsdl:portType name="ShoppingInterface">

-            

-        <wsdl:operation name="FindHalfProducts">

-            <wsdl:input message="ns:FindHalfProductsRequest"/>

-            <wsdl:output message="ns:FindHalfProductsResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="FindItems">

-            <wsdl:input message="ns:FindItemsRequest"/>

-            <wsdl:output message="ns:FindItemsResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="FindItemsAdvanced">

-            <wsdl:input message="ns:FindItemsAdvancedRequest"/>

-            <wsdl:output message="ns:FindItemsAdvancedResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="FindPopularItems">

-            <wsdl:input message="ns:FindPopularItemsRequest"/>

-            <wsdl:output message="ns:FindPopularItemsResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="FindPopularSearches">

-            <wsdl:input message="ns:FindPopularSearchesRequest"/>

-            <wsdl:output message="ns:FindPopularSearchesResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="FindProducts">

-            <wsdl:input message="ns:FindProductsRequest"/>

-            <wsdl:output message="ns:FindProductsResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="FindReviewsAndGuides">

-            <wsdl:input message="ns:FindReviewsAndGuidesRequest"/>

-            <wsdl:output message="ns:FindReviewsAndGuidesResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="GetCategoryInfo">

-            <wsdl:input message="ns:GetCategoryInfoRequest"/>

-            <wsdl:output message="ns:GetCategoryInfoResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="GetItemStatus">

-            <wsdl:input message="ns:GetItemStatusRequest"/>

-            <wsdl:output message="ns:GetItemStatusResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="GetMultipleItems">

-            <wsdl:input message="ns:GetMultipleItemsRequest"/>

-            <wsdl:output message="ns:GetMultipleItemsResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="GetShippingCosts">

-            <wsdl:input message="ns:GetShippingCostsRequest"/>

-            <wsdl:output message="ns:GetShippingCostsResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="GetSingleItem">

-            <wsdl:input message="ns:GetSingleItemRequest"/>

-            <wsdl:output message="ns:GetSingleItemResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="GetUserProfile">

-            <wsdl:input message="ns:GetUserProfileRequest"/>

-            <wsdl:output message="ns:GetUserProfileResponse"/>

-        </wsdl:operation>

-        <wsdl:operation name="GeteBayTime">

-            <wsdl:input message="ns:GeteBayTimeRequest"/>

-            <wsdl:output message="ns:GeteBayTimeResponse"/>

-        </wsdl:operation>

-    </wsdl:portType>

-    

-    <wsdl:binding name="ShoppingBinding" type="ns:ShoppingInterface">   

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

-            

-        <wsdl:operation name="FindHalfProducts">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="FindItems">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="FindItemsAdvanced">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="FindPopularItems">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="FindPopularSearches">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="FindProducts">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="FindReviewsAndGuides">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="GetCategoryInfo">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="GetItemStatus">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="GetMultipleItems">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="GetShippingCosts">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="GetSingleItem">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="GetUserProfile">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-        <wsdl:operation name="GeteBayTime">

-            <wsdlsoap:operation soapAction=""/>

-            <wsdl:input>

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

-            </wsdl:input>

-            <wsdl:output>

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

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    

-    <wsdl:service name="Shopping">

-            <wsdl:documentation>

-                <Version>535</Version>

-            </wsdl:documentation>

-        <wsdl:port binding="ns:ShoppingBinding" name="Shopping">

-            <wsdlsoap:address location="http://open.api.ebay.com/shopping"/>

-        </wsdl:port>

-    </wsdl:service>

-</wsdl:definitions>

-    
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/pom.xml b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/pom.xml
deleted file mode 100644
index 5e30575949..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/pom.xml
+++ /dev/null
@@ -1,149 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-db</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Catalog Database</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tutorial-assets</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.3.1.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>launch.LaunchCatalog</mainClass>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
-           <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sql-maven-plugin</artifactId>
-                <version>1.3</version>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.derby</groupId>
-                        <artifactId>derby</artifactId>
-                        <version>10.3.1.4</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-db</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                            <url>jdbc:derby:target/store_db;create=true</url>
-                            <autocommit>true</autocommit>
-                            <onError>continue</onError>
-                            <delimiter>;</delimiter>
-                            <srcFiles>
-                                <srcFile>${pom.basedir}/store.sql</srcFile>
-                            </srcFiles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/launch/LaunchCatalog.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/launch/LaunchCatalog.java
deleted file mode 100644
index c46845722c..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/launch/LaunchCatalog.java
+++ /dev/null
@@ -1,34 +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 launch;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class LaunchCatalog {
-    public static void main(String[] args) throws Exception {
-        System.out.println("Starting ...");
-        SCADomain scaDomain = SCADomain.newInstance("store-catalog-database.composite");
-        System.out.println("store-catalog-database.composite ready for big business !!!");
-        System.in.read();
-        System.out.println("Stopping ...");
-        scaDomain.close();
-        System.out.println();
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/Catalog.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/Catalog.java
deleted file mode 100644
index b45e5efccb..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/Catalog.java
+++ /dev/null
@@ -1,27 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Catalog {
-    String[] get();
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CatalogImpl.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CatalogImpl.java
deleted file mode 100644
index f8149bbe8d..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CatalogImpl.java
+++ /dev/null
@@ -1,120 +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 services;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-
-public class CatalogImpl implements Catalog {
-    @Property
-    public String currencyCode = "USD";
-    
-    @Reference
-    public CurrencyConverter currencyConverter;
-    
-    private String currencySymbol;
-    
-    public String[] get() {
-        
-        String[] catalogArray = null;
-        
-        String itemName;
-        float itemPrice;
-        String itemCurrencyCode;
-        
-        Connection conn = null;
-        PreparedStatement pstmt = null;
-        ResultSet rs = null;
-        
-        currencySymbol = currencyConverter.getCurrencySymbol(currencyCode);
-        
-        try {
-            //initialize driver and register it with DriverManager
-            Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
-            
-            conn = DriverManager.getConnection(
-                    "jdbc:derby:target/store_db",
-                    "",
-                    "");
-            
-            pstmt = conn.prepareStatement("select * from \"Catalog\"",
-                    ResultSet.TYPE_SCROLL_INSENSITIVE,
-                    ResultSet.CONCUR_READ_ONLY);
-            
-            rs = pstmt.executeQuery();
-            rs.last();
-            
-            catalogArray = new String[rs.getRow()];
-            
-            do {
-                itemName = rs.getString(2);
-                itemPrice = rs.getFloat(4);
-                itemCurrencyCode = rs.getString(3);
-                
-                catalogArray[rs.getRow()-1] = new String(itemName+" - "+
-                        currencySymbol+" "+
-                        currencyConverter.getConversion(itemCurrencyCode, currencyCode, itemPrice));
-                
-            } while(rs.previous());
-            
-        } catch (SQLException ex) {         
-            ex.printStackTrace();
-        }catch (ClassNotFoundException ex) {
-            ex.printStackTrace();
-        } finally {
-            cleanup(conn,pstmt,rs);
-        }
-        
-        return catalogArray;
-    }
-    
-    private void cleanup(Connection conn, PreparedStatement pstmt, ResultSet rs) {
-        
-        if (rs!=null) {
-            try {
-                rs.close();
-            } catch (SQLException ex) {
-                ex.printStackTrace();
-            }
-        }
-        
-        if (pstmt!=null) {
-            try {
-                pstmt.close();
-            } catch (SQLException ex) {
-                ex.printStackTrace();
-            }
-        }
-        
-        if (conn!=null) {
-            try {
-                conn.close();
-            } catch (SQLException ex) {
-                ex.printStackTrace();
-            }
-        }
-    }
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CurrencyConverter.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CurrencyConverter.java
deleted file mode 100644
index c4b1800a3d..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CurrencyConverter.java
+++ /dev/null
@@ -1,29 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CurrencyConverter {
-    public float getConversion(String fromCurrenycCode, String toCurrencyCode, float amount);
-
-    public String getCurrencySymbol(String currencyCode);
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/util/CreateDB.java b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/util/CreateDB.java
deleted file mode 100644
index a4dc2e67e6..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/util/CreateDB.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package util;
-
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-public class CreateDB {
-
-    public static void main(String[] args) {
-        System.out.println("Creating database ...");
-        
-        Connection connection = null;
-        PreparedStatement preparedStatement = null;
-        
-        try {
-            //initialize driver and register it with DriverManager
-            Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
-            
-            //connect and create the db if not present
-            connection = DriverManager.getConnection(
-                    "jdbc:derby:target/store_db;create=true",
-                    "",
-                    "");
-            
-            
-            try {
-                preparedStatement = connection.prepareStatement("DROP TABLE CATALOG");
-                preparedStatement.execute();
-            }catch(Exception e) {
-                //ignore to avoid erros when db is being created from scratch
-            }
-            
-            
-            preparedStatement = connection.prepareStatement("CREATE TABLE CATALOG("
-                                                            + "id             NUMERIC(5 , 0) NOT NULL,"
-                                                            + "product_name   VARCHAR(30),"
-                                                            + "currency_code  CHAR(3),"
-                                                            + "price          REAL,"
-                                                            + "primary key (id)"
-                                                            + ")");
-            preparedStatement.execute();
-
-            preparedStatement = connection.prepareStatement("INSERT INTO CATALOG VALUES(0,'Apple', 'USD', 2.99)");
-            preparedStatement.execute();
-
-            preparedStatement = connection.prepareStatement("INSERT INTO CATALOG VALUES(1,'Orange', 'USD', 3.55)");
-            preparedStatement.execute();
-
-            preparedStatement = connection.prepareStatement("INSERT INTO CATALOG VALUES(2,'Pear', 'USD', 1.55)");
-            preparedStatement.execute();
-
-            System.out.println("Done !");
-            
-        } catch (SQLException ex) {         
-            ex.printStackTrace();
-        }catch (ClassNotFoundException ex) {
-            ex.printStackTrace();
-        } finally {
-            if (preparedStatement!=null) {
-                try {
-                    preparedStatement.close();
-                } catch (SQLException ex) {
-                    ex.printStackTrace();
-                }
-            }
-            
-            if (connection!=null) {
-                try {
-                    connection.close();
-                } catch (SQLException ex) {
-                    ex.printStackTrace();
-                }
-            }
-        }
-    }
-
-}
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/resources/store-catalog-database.composite b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/resources/store-catalog-database.composite
deleted file mode 100644
index aea8a6972c..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/resources/store-catalog-database.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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://store"			
-		name="store-catalog-database">
-		
-	<component name="Catalog">
-		<implementation.java class="services.CatalogImpl"/> 
-		<property name="currencyCode">USD</property>
-		<reference name="currencyConverter" target="CurrencyConverter"/>
-	</component> 
- 	
-</composite>
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/store.sql b/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/store.sql
deleted file mode 100644
index 904fab3ce3..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/store.sql
+++ /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.
---
-
-DROP TABLE CATALOG;
-
-CREATE TABLE CATALOG(
-   id             NUMERIC(5 , 0) NOT NULL,
-   product_name   VARCHAR(30),
-   currency_code  CHAR(3),
-   price          REAL,
-   primary key (id)
-);
-
-
-
-INSERT INTO CATALOG
- VALUES(0,'Apple', 'USD', 2.99);
-INSERT INTO CATALOG
- VALUES(1,'Orange', 'USD', 3.55);
-INSERT INTO CATALOG
- VALUES(2,'Pear', 'USD', 1.55);
\ No newline at end of file
diff --git a/java/sca-contrib/tutorials/store/www-services/pom.xml b/java/sca-contrib/tutorials/store/www-services/pom.xml
deleted file mode 100644
index fd02e3b29b..0000000000
--- a/java/sca-contrib/tutorials/store/www-services/pom.xml
+++ /dev/null
@@ -1,46 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial-store</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-www-services</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Store Tutorial External Web Services</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>cart-amazon</module>
-                <module>catalog-amazon</module>
-            </modules>
-        </profile>
-
-    </profiles>
-
-</project>
diff --git a/java/sca-contrib/vtest/assembly/component/pom.xml b/java/sca-contrib/vtest/assembly/component/pom.xml
deleted file mode 100644
index b2eac429c1..0000000000
--- a/java/sca-contrib/vtest/assembly/component/pom.xml
+++ /dev/null
@@ -1,49 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-assembly</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-assembly-component</artifactId>
-
-    <name>Apache Tuscany SCA Assembly Verification Tests - Component</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-
-
-</project>
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java b/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
deleted file mode 100644
index 592020c180..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.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.vtest.assembly.component;
-
-/**
- * Simple Remotable Service
- */
-public interface AService {
-
-    public String getState();
-    public String getBProperty();
-    public String getB2Property();
-
-    
-}
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java b/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
deleted file mode 100644
index 0d95c8e4b8..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
+++ /dev/null
@@ -1,29 +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.vtest.assembly.component;
-
-/**
- * Simple Service
- */
-public interface BService {
-
-    public String getState();
-    public String getSomeProperty();
-    
-}
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java b/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
deleted file mode 100644
index c979c57f31..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
+++ /dev/null
@@ -1,28 +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.vtest.assembly.component;
-
-/**
- * 
- */
-public interface CService {
-
-    public String getState();
-    
-}
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java b/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
deleted file mode 100644
index ff17a71a3d..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.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 org.apache.tuscany.sca.vtest.assembly.component.impl;
-
-import org.apache.tuscany.sca.vtest.assembly.component.AService;
-import org.apache.tuscany.sca.vtest.assembly.component.BService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    @Reference
-    protected BService b;
-    
-    @Reference
-    protected BService b2;
-
-    public String getState() {
-        return b.getState();
-    }
-    
-    public String getBProperty() {
-        return b.getSomeProperty();
-    }
-
-    public String getB2Property() {
-        return b2.getSomeProperty();
-    }
-
-}
-
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java b/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
deleted file mode 100644
index e57ed2f951..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
+++ /dev/null
@@ -1,40 +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.vtest.assembly.component.impl;
-
-import org.apache.tuscany.sca.vtest.assembly.component.BService;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-    
-    @Property  
-    protected String someProperty;
-
-    public String getState() {
-        return "SomeStateFromB";
-    }
-    
-    public String getSomeProperty() {
-        return someProperty;
-    }
-
-} 
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java b/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
deleted file mode 100644
index b2b420ed6a..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.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.vtest.assembly.component.impl;
-
-public class CServiceImpl {
-
-    private String state = "Some State";
-    
-    public String getState() {
-        return state;
-    }
-    
-}
-
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/component.composite b/java/sca-contrib/vtest/assembly/component/src/main/resources/component.composite
deleted file mode 100644
index bb452feac9..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/component.composite
+++ /dev/null
@@ -1,41 +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"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component--Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.AServiceImpl"/>
-	    <reference name="b" target="BComponent"/>
-	    <reference name="b2" target="B2Component"/>
-     </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-        <property name="someProperty">some b component value</property>
-    </component>
-    
-    <component name="B2Component">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-        <property name="someProperty">some b2 component value</property>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/nonuniquename.composite b/java/sca-contrib/vtest/assembly/component/src/main/resources/nonuniquename.composite
deleted file mode 100644
index 3019542091..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/nonuniquename.composite
+++ /dev/null
@@ -1,33 +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"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-non-unique-name--Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.AServiceImpl"/>
-     </component>
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/serviceelement.composite b/java/sca-contrib/vtest/assembly/component/src/main/resources/serviceelement.composite
deleted file mode 100644
index 9460f5a2e1..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/serviceelement.composite
+++ /dev/null
@@ -1,42 +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"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component--Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.AServiceImpl"/>
-	    <reference name="b" target="BComponent"/>
-	    <reference name="b2" target="B2Component"/>
-     </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-        <property name="someProperty">some b component value</property>
-        <service name="BService"/>
-    </component>
-    
-    <component name="B2Component">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-        <property name="someProperty">some b2 component value</property>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/servicewithbinding.composite b/java/sca-contrib/vtest/assembly/component/src/main/resources/servicewithbinding.composite
deleted file mode 100644
index 085d84f40e..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/servicewithbinding.composite
+++ /dev/null
@@ -1,33 +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"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-servicewithbinding-Composite">
-
-    <component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.CServiceImpl"/>
-        <service name="CServiceImpl">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.CService"/>
-           <binding.sca/>
-        </service>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/servicewithinterface.composite b/java/sca-contrib/vtest/assembly/component/src/main/resources/servicewithinterface.composite
deleted file mode 100644
index cc915fbde5..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/servicewithinterface.composite
+++ /dev/null
@@ -1,32 +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"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-servicewithinterface-Composite">
-
-    <component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.CServiceImpl"/>
-        <service name="CServiceImpl">
-           <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.CService"/>
-        </service>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/zerocomponents.composite b/java/sca-contrib/vtest/assembly/component/src/main/resources/zerocomponents.composite
deleted file mode 100644
index 6f02d7e941..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/zerocomponents.composite
+++ /dev/null
@@ -1,26 +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"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-zero-components-Composite">
-
-    
-</composite>
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/zeroimplelements.composite b/java/sca-contrib/vtest/assembly/component/src/main/resources/zeroimplelements.composite
deleted file mode 100644
index 8629f3817a..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/zeroimplelements.composite
+++ /dev/null
@@ -1,38 +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"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-zeroimplelements-Composite">
-
-    <component name="AComponent">
-    </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-        <property name="someProperty">some b component value</property>
-    </component>
-    
-    <component name="B2Component">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.impl.BServiceImpl"/>
-        <property name="someProperty">some b2 component value</property>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java b/java/sca-contrib/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
deleted file mode 100644
index 0938708b91..0000000000
--- a/java/sca-contrib/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
+++ /dev/null
@@ -1,150 +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.vtest.assembly.component;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- *
- */
-public class ComponentTestCase {
-
-    private void initDomain(String compositePath) {
-        System.out.println("Setting up");
-        ServiceFinder.init(compositePath);
-    }
-
-    private void cleanupDomain() {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-
-    /**
-     * Lines 92-96:
-     * <p>
-     * Components are configured instances of implementations. Components
-     * provide and consume services. More than one component can use and
-     * configure the same implementation, where each component configures the
-     * implementation differently.
-     */
-    @Test
-    public void components1() throws Exception {
-        initDomain("component.composite");
-        AService service = ServiceFinder.getService(AService.class, "AComponent/AService");
-        Assert.assertEquals("some b component value", service.getBProperty());
-        Assert.assertEquals("some b2 component value", service.getB2Property());
-        cleanupDomain();
-    }
-
-    /**
-     * Lines 96-97:
-     * <p>
-     * There can be zero or more component elements within a composite.
-     */
-    @Test
-    public void components2() throws Exception {
-        initDomain("zerocomponents.composite");
-        cleanupDomain();
-    }
-
-    /**
-     * Lines 142-143:
-     * <p>
-     * name (required) – the name of the component. The name must be unique
-     * across all the components in the composite.
-     */
-    @Test(expected = ServiceRuntimeException.class)
-    //@Ignore("TUSCANY-2455")
-    public void components3() throws Exception {
-        initDomain("nonuniquename.composite");
-        cleanupDomain();
-    }
-
-    /**
-     * Lines 154-158:
-     * <p>
-     * A component element has zero or one implementation element as its child,
-     * which points to the implementation used by the component. A component
-     * with no implementation element is not runnable, but components of this
-     * kind may be useful during a "top-down" development process as a means of
-     * defining the characteristics required of the implementation before the
-     * implementation is written.
-     */
-    @Test
-    public void components4() throws Exception {
-        initDomain("zeroimplelements.composite");
-        cleanupDomain();
-    }
-
-    /**
-     * Lines 159-160:
-     * <p>
-     * The component element can have zero or more service elements as children
-     * which are used to configure the services of the component.
-     */
-    @Test
-    public void components5() throws Exception {
-        initDomain("serviceelement.composite");
-        cleanupDomain();
-    }
-
-    /**
-     * Lines 174-179:
-     * <p>
-     * A service has zero or one interface, which describes the operations
-     * provided by the service. The interface is described by an interface
-     * element which is a child element of the service element. If no interface
-     * is specified, then the interface specified for the service by the
-     * implementation is in effect. If an interface is specified it must provide
-     * a compatible subset of the interface provided by the implementation, i.e.
-     * provide a subset of the operations defined by the implementation for the
-     * service.
-     */
-    @Test
-    public void components6() throws Exception {
-        initDomain("servicewithinterface.composite");
-        CService service = ServiceFinder.getService(CService.class, "CComponent");
-        Assert.assertEquals("Some State", service.getState());
-        cleanupDomain();
-    }
-
-    /**
-     * Lines 180-182:
-     * <p>
-     * A service element has one or more binding elements as children. If no
-     * bindings are specified, then the bindings specified for the service by
-     * the implementation are in effect. If bindings are specified, then those
-     * bindings override the bindings specified by the implementation.
-     */
-    @Test
-    public void components7() throws Exception {
-        initDomain("servicewithbinding.composite");
-        CService service = ServiceFinder.getService(CService.class, "CComponent");
-        Assert.assertEquals("Some State", service.getState());
-        cleanupDomain();
-    }
-    
-    
-}
diff --git a/java/sca-contrib/vtest/assembly/composite/pom.xml b/java/sca-contrib/vtest/assembly/composite/pom.xml
deleted file mode 100644
index f9922f4cac..0000000000
--- a/java/sca-contrib/vtest/assembly/composite/pom.xml
+++ /dev/null
@@ -1,49 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-assembly</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-assembly-composite</artifactId>
-
-    <name>Apache Tuscany SCA Assembly Verification Tests - Composite</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-
-
-</project>
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java b/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
deleted file mode 100644
index a5cff3972b..0000000000
--- a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.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.vtest.assembly.composite;
-
-/**
- * Simple Remotable Service
- */
-public interface AService {
-
-    public String getState();
-    public String getBProperty();
-    public String getB2Property();
-
-    
-}
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java b/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
deleted file mode 100644
index 39d879e745..0000000000
--- a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
+++ /dev/null
@@ -1,29 +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.vtest.assembly.composite;
-
-/**
- * Simple Service
- */
-public interface BService {
-
-    public String getState();
-    public String getSomeProperty();
-    
-}
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java b/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
deleted file mode 100644
index dd80c4dc6a..0000000000
--- a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
+++ /dev/null
@@ -1,28 +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.vtest.assembly.composite;
-
-/**
- * 
- */
-public interface CService {
-
-    public String getState();
-    
-}
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java b/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
deleted file mode 100644
index 4a4aa965ce..0000000000
--- a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.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 org.apache.tuscany.sca.vtest.assembly.composite.impl;
-
-import org.apache.tuscany.sca.vtest.assembly.composite.AService;
-import org.apache.tuscany.sca.vtest.assembly.composite.BService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    @Reference
-    protected BService b;
-    
-    @Reference
-    protected BService b2;
-
-    public String getState() {
-        return b.getState();
-    }
-    
-    public String getBProperty() {
-        return b.getSomeProperty();
-    }
-
-    public String getB2Property() {
-        return b2.getSomeProperty();
-    }
-
-}
-
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java b/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
deleted file mode 100644
index c71e2bcc16..0000000000
--- a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
+++ /dev/null
@@ -1,40 +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.vtest.assembly.composite.impl;
-
-import org.apache.tuscany.sca.vtest.assembly.composite.BService;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-    
-    @Property  
-    protected String someProperty;
-
-    public String getState() {
-        return "SomeStateFromB";
-    }
-    
-    public String getSomeProperty() {
-        return someProperty;
-    }
-
-} 
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java b/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
deleted file mode 100644
index 2f091a8ef2..0000000000
--- a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.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.vtest.assembly.composite.impl;
-
-public class CServiceImpl {
-
-    private String state = "Some State";
-    
-    public String getState() {
-        return state;
-    }
-    
-}
-
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/resources/composite.composite b/java/sca-contrib/vtest/assembly/composite/src/main/resources/composite.composite
deleted file mode 100644
index d533cb8dcf..0000000000
--- a/java/sca-contrib/vtest/assembly/composite/src/main/resources/composite.composite
+++ /dev/null
@@ -1,41 +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"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component--Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.AServiceImpl"/>
-	    <reference name="b" target="BComponent"/>
-	    <reference name="b2" target="B2Component"/>
-     </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
-        <property name="someProperty">some b component value</property>
-    </component>
-    
-    <component name="B2Component">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
-        <property name="someProperty">some b2 component value</property>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java b/java/sca-contrib/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
deleted file mode 100644
index 03f44e449c..0000000000
--- a/java/sca-contrib/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
+++ /dev/null
@@ -1,56 +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.vtest.assembly.composite;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- *
- */
-public class CompositeTestCase {
-
-    private void initDomain(String compositePath) {
-        System.out.println("Setting up");
-        ServiceFinder.init(compositePath);
-    }
-
-    private void cleanupDomain() {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }    
-    
-    
-    /**
-     * Lines nn-n:
-     * <p>
-     * spec
-     */
-    @Test
-    public void composite1() throws Exception {
-        initDomain("composite.composite");
-
-        cleanupDomain();
-    }
-}
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/pom.xml b/java/sca-contrib/vtest/assembly/ctypefile/pom.xml
deleted file mode 100644
index 1eac774ff3..0000000000
--- a/java/sca-contrib/vtest/assembly/ctypefile/pom.xml
+++ /dev/null
@@ -1,49 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-assembly</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-assembly-ctypefile</artifactId>
-
-    <name>Apache Tuscany SCA Assembly Verification Tests - Component Type File</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-
-
-</project>
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java b/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
deleted file mode 100644
index d1df390ace..0000000000
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
+++ /dev/null
@@ -1,30 +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.vtest.assembly.ctypefile;
-
-/**
- * Simple Remotable Service
- */
-public interface AService {
-
-    public String getState();
-    public String getState2();
-    public String getBProperty();
-    
-}
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java b/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
deleted file mode 100644
index 8ee18b242f..0000000000
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
+++ /dev/null
@@ -1,29 +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.vtest.assembly.ctypefile;
-
-/**
- * Simple Service
- */
-public interface BService {
-
-    public String getState();
-    public String getSomeProperty();
-    
-}
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java b/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
deleted file mode 100644
index 919e5c2953..0000000000
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
+++ /dev/null
@@ -1,53 +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.vtest.assembly.ctypefile.impl;
-
-import org.apache.tuscany.sca.vtest.assembly.ctypefile.AService;
-import org.apache.tuscany.sca.vtest.assembly.ctypefile.BService;
-import org.oasisopen.sca.annotation.Reference;
-
-public class AServiceImpl implements AService {
-
-    private BService bService;
-    private BService b2Service;
-   
-    public void setBService(BService b) {
-        this.bService = b;
-    }
-    
-    @Reference
-    public void setB2Service(BService b) {
-        this.b2Service = b;
-    }
-
-    public String getState() {
-        return bService.getState();
-    }
-    
-    public String getState2() {
-        return b2Service.getState();
-    }
-
-    public String getBProperty() {
-        return bService.getSomeProperty();
-    }
-
-}
-
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java b/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
deleted file mode 100644
index fd32cb1f9b..0000000000
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.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.vtest.assembly.ctypefile.impl;
-
-import org.apache.tuscany.sca.vtest.assembly.ctypefile.BService;
-
-public class BServiceImpl implements BService {
-    
-    //@Property
-    protected String someProperty;
-
-    public String getState() {
-        return "SomeStateFromB";
-    }
-    
-    public String getSomeProperty() {
-        return someProperty;
-    }
-
-} 
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType b/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
deleted file mode 100644
index 173203ae21..0000000000
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
-  <service name="AService">
-     <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.AService"/> 
-  </service>
-
- <reference name="bService">
-    <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.BService"/>
- </reference>
-
-</componentType>              
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType b/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
deleted file mode 100644
index c6a0f274c4..0000000000
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
+++ /dev/null
@@ -1,28 +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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="BService">
-     <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.BService"/> 
-  </service>
-   
-  <property name="someProperty" type="xsd:string">componentTypeValue</property>
-  
-</componentType>              
-       
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/typefile.composite
deleted file mode 100644
index 889bb846ba..0000000000
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/typefile.composite
+++ /dev/null
@@ -1,40 +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"
-	targetNamespace="http://assembly-tests"
-	name="Assemby-component-typefile-Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.AServiceImpl"/>
-	    <reference name="bService" target="BComponent/BService"/>
-	    <reference name="b2Service" target="BComponent/BService"/>
-     </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.BServiceImpl"/>
-        <property name="someProperty">compositeValue</property>
-    </component>
-
-    <!-- component name="BComponent2">
-        <implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.BServiceImpl"/>
-    </component-->
-    
-</composite>
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/java/sca-contrib/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
deleted file mode 100644
index f8f7e45f61..0000000000
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
+++ /dev/null
@@ -1,111 +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.vtest.assembly.ctypefile;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- *
- */
-public class CompomnentTypeFileTestCase {
-
-    protected static String compositeName = "typefile.composite";
-    protected static AService aService = null;
-    protected static BService bService2 = null;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            aService = ServiceFinder.getService(AService.class, "AComponent/AService");
-            bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-
-    }
-
-    /**
-     * Lines 435-439:
-     * <p>
-     * Step two covers the cases where introspection of the implementation is
-     * not possible or where it does not provide complete information and it
-     * involves looking for an SCA component type file. Component type
-     * information found in the component type file must be compatible with the
-     * equivalent information found from inspection of the implementation.
-     * <p>
-     * Lines 441-444:
-     * <p>
-     * In the ideal case, the component type information is determined by
-     * inspecting the implementation, for example as code annotations. The
-     * component type file provides a mechanism for the provision of component
-     * type information for implementation types where the information cannot be
-     * determined by inspecting the implementation.
-     */
-    @Test
-    public void typeFile1() throws Exception {
-        Assert.assertSame("SomeStateFromB", aService.getState());
-    }
-
-    /**
-     * Lines 439-449:
-     * <p>
-     * The component type file can specify partial information, with the
-     * remainder being derived from the implementation.
-     * <p>
-     * The first test makes use of the reference to b which is provided by the
-     * type file. The second test makes use of the reference to b2 which is
-     * provided via annotation
-     */
-    @Test
-    public void typeFile2() throws Exception {
-        Assert.assertSame("SomeStateFromB", aService.getState());
-        Assert.assertSame("SomeStateFromB", aService.getState2());
-    }
-
-    /**
-     * Lines 450-451:
-     * <p>
-     * The componentType element can contain Service elements, Reference
-     * elements and Property elements.
-     */
-    @Test
-    public void typeFile3() throws Exception {
-        Assert.assertEquals("compositeValue", aService.getBProperty());
-    }
-
-    public void typeFile31() throws Exception {
-        Assert.assertEquals("componentTypeValue", bService2.getSomeProperty());
-    }
-
-}
diff --git a/java/sca-contrib/vtest/assembly/pom.xml b/java/sca-contrib/vtest/assembly/pom.xml
deleted file mode 100644
index 49e33352b4..0000000000
--- a/java/sca-contrib/vtest/assembly/pom.xml
+++ /dev/null
@@ -1,70 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-vtest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-assembly</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Assembly Verification Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>vtest-utilities</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>ctypefile</module>
-                <module>component</module>
-                <module>composite</module>
-           </modules>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/pom.xml b/java/sca-contrib/vtest/java-api/annotations/conversational/pom.xml
deleted file mode 100644
index b9fa0ff9b9..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/pom.xml
+++ /dev/null
@@ -1,46 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-annotations-conversation</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Annotations - @Conversation</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java b/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
deleted file mode 100644
index bc7212f70c..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
+++ /dev/null
@@ -1,30 +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.vtest.javaapi.annotations.conversational;
-
-/**
- * Simple Remotable Service
- */
-public interface AService {
-
-    public String setThenGetB1State(String someState);
-    
-    public String setThenGetB2State(String someState);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java b/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
deleted file mode 100644
index 76c857126a..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
+++ /dev/null
@@ -1,29 +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.vtest.javaapi.annotations.conversational;
-
-/**
- * Simple Local Service
- */
-public interface B1Service {
-
-    public void setState(String someState);
-    public String getState();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java b/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
deleted file mode 100644
index 23791f2ca9..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.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 org.apache.tuscany.sca.vtest.javaapi.annotations.conversational;
-
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Local Service
- */
-@Conversational
-public interface B2Service {
-
-    public void setState(String someState);
-    public String getState();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
deleted file mode 100644
index b8e346681c..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
+++ /dev/null
@@ -1,47 +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.vtest.javaapi.annotations.conversational.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.B1Service;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.B2Service;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    @Reference
-    protected B1Service b1;
-
-    @Reference
-    protected B2Service b2;
-
-    public String setThenGetB1State(String someState) {
-        b1.setState(someState);
-        return b1.getState();
-    }
-
-    public String setThenGetB2State(String someState) {
-        b2.setState(someState);
-        return b2.getState();
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
deleted file mode 100644
index 75bac4bf18..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
+++ /dev/null
@@ -1,38 +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.vtest.javaapi.annotations.conversational.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.B1Service;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(B1Service.class)
-public class B1ServiceImpl implements B1Service {
-
-    String someState;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
deleted file mode 100644
index 860d60b0de..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
+++ /dev/null
@@ -1,40 +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.vtest.javaapi.annotations.conversational.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.B2Service;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(B2Service.class)
-@Scope("COMPOSITE")
-public class B2ServiceImpl implements B2Service {
-
-    String someState;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite b/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
deleted file mode 100644
index 4c2de35d52..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
+++ /dev/null
@@ -1,40 +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://java-api-tests" name="Converstion-Composite">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.impl.AServiceImpl" />
-		<reference name="b1" target="B1Component" />
-		<reference name="b2" target="B2Component" />
-	</component>
-
-	<component name="B1Component">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.impl.B1ServiceImpl" />
-	</component>
-
-	<component name="B2Component">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.impl.B2ServiceImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java b/java/sca-contrib/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
deleted file mode 100644
index c00d5f1c10..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
+++ /dev/null
@@ -1,91 +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.vtest.javaapi.annotations.conversational;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This test class tests the Service annotation described in section 1.2.1 and
- * 1.8.17
- */
-public class ConversationAnnotationTestCase {
-
-    protected static String compositeName = "conversation.composite";
-    protected static AService aService = null;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            aService = ServiceFinder.getService(AService.class, "AComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-
-    }
-
-    /**
-     * Line 328:<br>
-     * <p>
-     * When "@Conversational" is not specified on a service interface, the
-     * service contract is stateless.<br>
-     * <p>
-     * Line 394, 395: <br>
-     * A service may be declared as conversational by marking its Java interface
-     * with "@Conversational". If a service interface is not marked with
-     * "@Conversational", it is stateless. <br>
-     * <p>
-     * BService has no "@Conversation" annotation so communication from A-> is
-     * stateless
-     */
-    @Test
-    public void atConversation1() throws Exception {
-        String thisState = "This State";
-        Assert.assertNotSame(thisState, aService.setThenGetB1State(thisState));
-    }
-
-    /**
-     * Line 325-327:<br>
-     * <p>
-     * Java service interfaces may be annotated to specify whether their
-     * contract is conversational as described in the Assembly Specification
-     * by using the "@Conversational" annotation. A conversational service
-     * indicates that requests to the service are correlated in some way
-     */
-    @Test
-    public void atConversation2() throws Exception {
-        String thisState = "This State";
-        Assert.assertSame(thisState, aService.setThenGetB2State(thisState));
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/pom.xml b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/pom.xml
deleted file mode 100644
index 0c0236b440..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/pom.xml
+++ /dev/null
@@ -1,53 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-annotations-conversationattributes</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Annotations - @ConversationAttributes</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
deleted file mode 100644
index a3f1f11826..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
+++ /dev/null
@@ -1,30 +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.vtest.javaapi.annotations.conversationattributes;
-
-/**
- * Simple Service
- */
-public interface AService {
-
-    public void testMaxAge() throws InterruptedException;
-    public void testMaxIdle() throws InterruptedException;
-    public void testSinglePrincipal();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
deleted file mode 100644
index 7290c31f1a..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.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 org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes;
-
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Service
- */
-@Conversational
-public interface B2Service {
-
-    public void setState(String someState);
-    public String getState();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
deleted file mode 100644
index d38ca0276c..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.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 org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes;
-
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Service
- */
-@Conversational
-public interface BService {
-
-    public void setState(String someState);
-    public String getState();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
deleted file mode 100644
index 5db8768398..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
+++ /dev/null
@@ -1,30 +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.vtest.javaapi.annotations.conversationattributes;
-
-import org.oasisopen.sca.ServiceReference;
-
-/**
- * Simple Service
- */
-public interface CService {
-
-    public void testSinglePricipal(ServiceReference<BService> bReference);
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
deleted file mode 100644
index a0a654920d..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
+++ /dev/null
@@ -1,80 +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.vtest.javaapi.annotations.conversationattributes.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.B2Service;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.BService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.CService;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    @Reference
-    protected BService b;
-    
-    @Reference
-    protected B2Service b2;
-
-    @Reference
-    protected CService c;
-    
-    @Context 
-    protected ComponentContext context;
-    
-    private void delayForSeconds(int numSeconds) {
-        try {
-            Thread.sleep(numSeconds * 1000);// millisecs
-        } catch (InterruptedException ex) {
-            throw new Error(ex);
-        }
-    }
-
-    public void testMaxAge() {
-
-        String someState = "someState";
-        b.setState(someState);
-        delayForSeconds(2);
-        b.setState(someState);
-
-    }
-    
-    public void testMaxIdle() {
-
-        String someState = "someState";
-        b2.setState(someState);
-        delayForSeconds(2);
-        b2.setState(someState);
-
-    }
-
-    public void testSinglePrincipal() {
-        
-        b.setState("Some state");
-        System.out.println("Calling c and passing reference to b");
-        c.testSinglePricipal(context.getServiceReference(BService.class, "b"));
-        
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
deleted file mode 100644
index 2f711be74d..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
+++ /dev/null
@@ -1,42 +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.vtest.javaapi.annotations.conversationattributes.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.BService;
-import org.oasisopen.sca.annotation.ConversationAttributes;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxIdleTime="1 seconds")
-public class B2ServiceImpl implements BService {
-
-    String someState;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
deleted file mode 100644
index f9aa1de8bd..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
+++ /dev/null
@@ -1,42 +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.vtest.javaapi.annotations.conversationattributes.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.BService;
-import org.oasisopen.sca.annotation.ConversationAttributes;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="1 seconds", singlePrincipal=true)
-public class BServiceImpl implements BService {
-
-    String someState;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
deleted file mode 100644
index cc1c0d18fd..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.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.vtest.javaapi.annotations.conversationattributes.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.BService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.CService;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl implements CService {
-
-    public void testSinglePricipal(ServiceReference<BService> bReference) {
-        
-        System.out.println("In C calling set state on passed reference to B");
-        bReference.getService().setState("someState");
-
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
deleted file mode 100644
index 3820240ee2..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
+++ /dev/null
@@ -1,50 +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.vtest.javaapi.annotations.conversationattributes.security;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ACallbackHandler implements CallbackHandler {
-
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-        for (int i = 0; i < callbacks.length; i++) {
-            if (callbacks[i] instanceof NameCallback) {
-                NameCallback nc = (NameCallback)callbacks[i];
-                nc.setName("AUser");
-            } else if (callbacks[i] instanceof PasswordCallback) {
-                PasswordCallback pc = (PasswordCallback)callbacks[i];
-                pc.setPassword("AUserPasswd".toCharArray());
-            } else {
-                throw new UnsupportedCallbackException
-                 (callbacks[i], "Unsupported Callback!");
-            }
-          }
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
deleted file mode 100644
index 75573b838d..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
+++ /dev/null
@@ -1,179 +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.vtest.javaapi.annotations.conversationattributes.security;
-
-import java.security.Principal;
-import java.util.Map;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.spi.LoginModule;
-
-
-/**
- * @version $Rev$ $Date$
- */
-public class JaasLoginModule implements LoginModule {
-
-    private CallbackHandler callbackHandler;
-    private Subject subject;
-    private Principal userPrincipal;
-    private String userId;
-    private String password;
-    private boolean succeeded;
-    private boolean commitSucceeded;
-
-    public void initialize(Subject subject,
-                           CallbackHandler callbackHandler,
-                           Map<String, ?> sharedState,
-                           Map<String, ?> options) {
-        this.callbackHandler = callbackHandler;
-        this.subject = subject;
-    }
-
-    public boolean login() throws LoginException {
-        Callback[] callbacks = new Callback[2];
-        callbacks[0] = new NameCallback("UserId:");
-        callbacks[1] = new PasswordCallback("Password:", false);
-
-        try {
-            callbackHandler.handle(callbacks);
-            userId = ((NameCallback)callbacks[0]).getName();
-            password = new String(((PasswordCallback)callbacks[1]).getPassword());
-
-            if (userId.equals("CalculatorUser") && password.equals("CalculatorUserPasswd")) {
-                System.out.println("Successfully AUTHENTICATED!!");
-                succeeded = true;
-                return true;
-            } else {
-                System.out.println("Incorrect userId / password! AUTHENTICATION FAILED!!");
-                return false;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    /**
-     * <p> This method is called if the LoginContext's
-     * overall authentication succeeded
-     * (the relevant REQUIRED, REQUISITE, SUFFICIENT and OPTIONAL LoginModules
-     * succeeded).
-     *
-     * <p> If this LoginModule's own authentication attempt
-     * succeeded (checked by retrieving the private state saved by the
-     * <code>login</code> method), then this method associates a
-     * <code>UserPrincipal</code>
-     * with the <code>Subject</code> located in the
-     * <code>LoginModule</code>.  If this LoginModule's own
-     * authentication attempted failed, then this method removes
-     * any state that was originally saved.
-     *
-     * <p>
-     *
-     * @exception LoginException if the commit fails.
-     *
-     * @return true if this LoginModule's own login and commit
-     *          attempts succeeded, or false otherwise.
-     */
-    public boolean commit() throws LoginException {
-        if (succeeded == false) {
-            return false;
-        } else {
-            // add a Principal (authenticated identity) to the Subject
-
-            // assume the user we authenticated is the UserPrincipal
-            userPrincipal = new UserPrincipal(userId);
-            if (!subject.getPrincipals().contains(userPrincipal))
-                subject.getPrincipals().add(userPrincipal);
-
-            // in any case, clean out state
-            userId = null;
-            password = null;
-            commitSucceeded = true;
-            return true;
-        }
-    }
-
-    /**
-     * <p> This method is called if the LoginContext's
-     * overall authentication failed.
-     * (the relevant REQUIRED, REQUISITE, SUFFICIENT and OPTIONAL LoginModules
-     * did not succeed).
-     *
-     * <p> If this LoginModule's own authentication attempt
-     * succeeded (checked by retrieving the private state saved by the
-     * <code>login</code> and <code>commit</code> methods),
-     * then this method cleans up any state that was originally saved.
-     *
-     * <p>
-     *
-     * @exception LoginException if the abort fails.
-     *
-     * @return false if this LoginModule's own login and/or commit attempts
-     *          failed, and true otherwise.
-     */
-    public boolean abort() throws LoginException {
-        if (succeeded == false) {
-            return false;
-        } else if (succeeded == true && commitSucceeded == false) {
-            // login succeeded but overall authentication failed
-            succeeded = false;
-            userId = null;
-            password = null;
-            userPrincipal = null;
-        } else {
-            // overall authentication succeeded and commit succeeded,
-            // but someone else's commit failed
-            logout();
-        }
-        return true;
-    }
-
-    /**
-     * Logout the user.
-     *
-     * <p> This method removes the <code>SimplePrincipal</code>
-     * that was added by the <code>commit</code> method.
-     *
-     * <p>
-     *
-     * @exception LoginException if the logout fails.
-     *
-     * @return true in all cases since this <code>LoginModule</code>
-     *          should not be ignored.
-     */
-    public boolean logout() throws LoginException {
-        subject.getPrincipals().remove(userPrincipal);
-        succeeded = false;
-        succeeded = commitSucceeded;
-        userId = null;
-        if (password != null)
-            password = null;
-        userPrincipal = null;
-        return true;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
deleted file mode 100644
index 8349e775c5..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
+++ /dev/null
@@ -1,66 +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.vtest.javaapi.annotations.conversationattributes.security;
-
-import java.security.Principal;
-
-/**
- * @version $Rev$ $Date$
- */
-public class UserPrincipal implements Principal {
-
-    private final String name;
-
-    public UserPrincipal(String name) {
-        if (name == null)
-            throw new IllegalArgumentException("name cannot be null");
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String toString() {
-        return name;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        final UserPrincipal other = (UserPrincipal)obj;
-        if (name == null) {
-            if (other.name != null)
-                return false;
-        } else if (!name.equals(other.name))
-            return false;
-        return true;
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
deleted file mode 100644
index 9d5aec8ed5..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
+++ /dev/null
@@ -1,3 +0,0 @@
-AService {

-  org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.security.JaasLoginModule required debug=true;

-};

diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
deleted file mode 100644
index 49391b3353..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
+++ /dev/null
@@ -1,46 +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://java-api-tests" name="Converstion-Composite">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-		<reference name="b2" target="B2Component" />
-		<reference name="c" target="CComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.impl.BServiceImpl" />
-	</component>
-
-    <component name="B2Component">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.impl.B2ServiceImpl" />
-	</component>
-
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.impl.CServiceImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
deleted file mode 100644
index d3573176a3..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:convatt="http://convatt">
-
-    <!-- PolicySets -->
-    <policySet name="JaasPolicy" provides="tuscany:jaasAuthentication" appliesTo="sca:implementation.java"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0">
-        <tuscany:jaasAuthentication>
-            <tuscany:configurationName>AService</tuscany:configurationName>
-            <tuscany:callbackHandler>org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.security.ACallbackHandler</tuscany:callbackHandler>
-        </tuscany:jaasAuthentication>
-    </policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
deleted file mode 100644
index c10369c9bd..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
+++ /dev/null
@@ -1,38 +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://java-api-tests" 
-	xmlns:sample="http://java-api-tests" 
-	name="SinglePrincipal"
-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.impl.AServiceImpl"
-			requires = "tuscany:jaasAuthentication" />
-		<reference name="c" target="CComponent" />
-	</component>
-
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.impl.CServiceImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesTestCase.java b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesTestCase.java
deleted file mode 100644
index 952194430e..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesTestCase.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.vtest.javaapi.annotations.conversationattributes;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.oasisopen.sca.ConversationEndedException;
-
-/**
- * This test class tests the Service annotation described in section 1.2.1 and
- * 1.8.17
- */
-public class ConversationAttributesTestCase {
-
-    protected static String compositeName = "conversation.composite";
-    protected static AService aService = null;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            aService = ServiceFinder.getService(AService.class, "AComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-
-    }
-
-    /**
-     * Line 1665, 1666
-     * <p>
-     * maxIdleTime (optional) - The maximum time that can pass between
-     * operations within a single conversation. If more time than this passes,
-     * then the container may end the conversation.
-     */
-    @Test(expected = ConversationEndedException.class)
-    public void maxIdle() throws Exception {
-        aService.testMaxIdle();
-    }
-
-    /**
-     * Line 1667, 1668
-     * <p>
-     * maxAge (optional) - The maximum time that the entire conversation can
-     * remain active. If more time than this passes, then the container may end
-     * the conversation.
-     */
-    @Test(expected = ConversationEndedException.class)
-    public void maxAge() throws Exception {
-        aService.testMaxAge();
-    }
-
-    /**
-     * Line 1669, 1670
-     * <p>
-     * singlePrincipal (optional) – If true, only the principal (the user) that
-     * started the conversation has authority to continue the conversation.
-     * The default value is false.
-     */
-    @Ignore("TUSCANY-2608")
-    @Test(expected = Exception.class)
-    public void singlePrincipal() throws Exception {
-        aService.testSinglePrincipal();
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java b/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
deleted file mode 100644
index 4ebd667a00..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
+++ /dev/null
@@ -1,70 +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.vtest.javaapi.annotations.conversationattributes;
-
-import javax.security.auth.login.Configuration;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * 
- */
-public class SinglePricipalTestCase {
-
-    protected static String compositeName = "singleprincipal.composite";
-    protected static AService aService = null;
-
-    @Before
-    public void init() throws Exception {
-        try {
-            Configuration.getConfiguration();
-        } catch (java.lang.SecurityException e) {
-            System.out.println("Caught SecurityException");
-            System.setProperty("java.security.auth.login.config", this.getClass().getClassLoader()
-                .getResource("AJass.config").toString());
-        }
-        System.out.println("Setting up");
-        ServiceFinder.init(compositeName);
-        aService = ServiceFinder.getService(AService.class, "AComponent");
-    }
-
-    @After
-    public void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-
-    }
-
-    /**
-     * Line 1669, 1670
-     * <p>
-     * singlePrincipal (optional) – If true, only the principal (the user) that
-     * started the conversation has authority to continue the conversation. The
-     * default value is false.
-     */
-    @Test(expected = Exception.class)
-    public void singlePrincipal() throws Exception {
-        aService.testSinglePrincipal();
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/pom.xml b/java/sca-contrib/vtest/java-api/annotations/destroy/pom.xml
deleted file mode 100644
index d0e306867f..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/pom.xml
+++ /dev/null
@@ -1,45 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-annotations-destroy</artifactId>
-
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Annotations - @Destroy</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java b/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
deleted file mode 100644
index 636e7fd8fc..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
+++ /dev/null
@@ -1,29 +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.vtest.javaapi.annotations.destroy;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for AService
- */
-@Remotable
-public interface AService {
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java b/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
deleted file mode 100644
index e790c9e6d2..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
+++ /dev/null
@@ -1,39 +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.vtest.javaapi.annotations.destroy.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService. The implementation has an error since it annotates a protected
- * method with "@Destroy".
- */
-@Service(AService.class)
-public class AServiceErr1Impl implements AService {
-
-    @Destroy
-    protected void destroy() {
-    }
-    
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java b/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
deleted file mode 100644
index 1d874007b2..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
+++ /dev/null
@@ -1,39 +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.vtest.javaapi.annotations.destroy.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService. The implementation has an error since it annotates a private
- * method with "@Destroy".
- */
-@Service(AService.class)
-public class AServiceErr2Impl implements AService {
-
-    @Destroy
-    private void destroy() {
-    }
-    
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java b/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
deleted file mode 100644
index bf4b0736ca..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
+++ /dev/null
@@ -1,40 +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.vtest.javaapi.annotations.destroy.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService. The implementation has an error since it annotates a
- * method with non-void return type with "@Destroy".
- */
-@Service(AService.class)
-public class AServiceErr3Impl implements AService {
-
-    @Destroy
-    public String destroy() {
-        return null;
-    }
-    
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java b/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
deleted file mode 100644
index a320e6b3ff..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
+++ /dev/null
@@ -1,39 +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.vtest.javaapi.annotations.destroy.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService. The implementation has an error since it annotates a
- * method with arguments with "@Destroy".
- */
-@Service(AService.class)
-public class AServiceErr4Impl implements AService {
-
-    @Destroy
-    public void destroy(int x) {
-    }
-    
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
deleted file mode 100644
index 4c77104866..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
+++ /dev/null
@@ -1,38 +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.vtest.javaapi.annotations.destroy.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    @Destroy
-    public void destroy() {
-    }
-    
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite b/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
deleted file mode 100644
index b03a0defe5..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
+++ /dev/null
@@ -1,28 +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://vtest"
-           xmlns:vtest="http://vtest"
-           name="AServiceErr1">
-
-    <component name="AComponent">
-		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceErr1Impl"/>
-    </component>
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite b/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
deleted file mode 100644
index 93aafdd971..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
+++ /dev/null
@@ -1,28 +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://vtest"
-           xmlns:vtest="http://vtest"
-           name="AServiceErr2">
-
-    <component name="AComponent">
-		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceErr2Impl"/>
-    </component>
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite b/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
deleted file mode 100644
index eb8f6e59ca..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
+++ /dev/null
@@ -1,28 +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://vtest"
-           xmlns:vtest="http://vtest"
-           name="AServiceErr3">
-
-    <component name="AComponent">
-		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceErr3Impl"/>
-    </component>
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite b/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
deleted file mode 100644
index 296a386876..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
+++ /dev/null
@@ -1,28 +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://vtest"
-           xmlns:vtest="http://vtest"
-           name="AServiceErr4">
-
-    <component name="AComponent">
-		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceErr4Impl"/>
-    </component>
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite b/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
deleted file mode 100644
index 4373bc2558..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
+++ /dev/null
@@ -1,28 +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://vtest"
-           xmlns:vtest="http://vtest"
-           name="AService">
-
-    <component name="AComponent">
-		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceImpl"/>
-    </component>
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java b/java/sca-contrib/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
deleted file mode 100644
index 72834a6803..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
+++ /dev/null
@@ -1,159 +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.vtest.javaapi.annotations.destroy;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * This test class tests the "@Destroy" annotation described in section 1.8.8.
- */
-public class DestroyAnnotationTestCase {
-
-    /**
-     * Lines 1225, 1226, 1227<br>
-     * The "@Destroy" annotation type is used to annotate a Java class method
-     * that will be called when the scope defined for the local service
-     * implemented by the class ends. The method must have a void return value
-     * and no arguments. The annotated method must be public.
-     * <p>
-     * This method tests a proper destroy method. i.e., public, no arguments and
-     * with void return type.
-     */
-    @Test
-    public void atDestroyProper() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        SCANode node = nodeFactory.createSCANode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
-                new SCAContribution("TestContribution", 
-                                    new File("src/main/resources/proper").toURL().toString()));
-        node.start();
-        AService aService = ((SCAClient)node).getService(AService.class, "AComponent");
-        Assert.assertEquals("Hello Pandu", aService.getGreetings("Pandu"));
-        node.stop();
-    }
-
-    /**
-     * Lines 1225, 1226, 1227<br>
-     * The "@Destroy" annotation type is used to annotate a Java class method
-     * that will be called when the scope defined for the local service
-     * implemented by the class ends. The method must have a void return value
-     * and no arguments. The annotated method must be public.
-     * <p>
-     * This method tests that an exception is thrown when a protected method is
-     * annotated with "@Destroy".
-     */
-    @Test
-    public void atDestroyProtectedMethod() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        try {
-            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
-                    new SCAContribution("TestContribution", 
-                                        new File("src/main/resources/err1").toURL().toString()));
-            Assert.fail();
-            node.stop();
-        } catch(ServiceRuntimeException e) {
-            //expected
-            Assert.assertNotSame(-1, e.getMessage().indexOf("Destructor must be a public method."));
-        }
-    }
-
-    /**
-     * Lines 1225, 1226, 1227<br>
-     * The "@Destroy" annotation type is used to annotate a Java class method
-     * that will be called when the scope defined for the local service
-     * implemented by the class ends. The method must have a void return value
-     * and no arguments. The annotated method must be public.
-     * <p>
-     * This method tests that an exception is thrown when a private method is
-     * annotated with "@Destroy".
-     */
-    @Test
-    public void atDestroyPrivateMethod() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        try {
-            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
-                    new SCAContribution("TestContribution", 
-                                        new File("src/main/resources/err2").toURL().toString()));
-            Assert.fail();
-            node.stop();
-        } catch(ServiceRuntimeException e) {
-            //expected
-            Assert.assertNotSame(-1, e.getMessage().indexOf("Destructor must be a public method."));
-        }
-    }
-
-    /**
-     * Lines 1225, 1226, 1227<br>
-     * The "@Destroy" annotation type is used to annotate a Java class method
-     * that will be called when the scope defined for the local service
-     * implemented by the class ends. The method must have a void return value
-     * and no arguments. The annotated method must be public.
-     * <p>
-     * This method tests that an exception is thrown when a method with non-void
-     * return type is annotated with "@Destroy".
-     */
-    @Test
-    public void atDestroyNonVoidReturnType() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        try {
-            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err3/AServiceErr3.composite").toURL().toString(),
-                    new SCAContribution("TestContribution", 
-                                        new File("src/main/resources/err3").toURL().toString()));
-            Assert.fail();
-            node.stop();
-        } catch(ServiceRuntimeException e) {
-            //expected
-            Assert.assertNotSame(-1, e.getMessage().indexOf("Destructor must return void."));
-        }
-    }
-
-    /**
-     * Lines 1225, 1226, 1227<br>
-     * The "@Destroy" annotation type is used to annotate a Java class method
-     * that will be called when the scope defined for the local service
-     * implemented by the class ends. The method must have a void return value
-     * and no arguments. The annotated method must be public.
-     * <p>
-     * This method tests that an exception is thrown when a method with arguments is
-     * annotated with "@Destroy".
-     */
-    @Test
-    public void atDestroyMethodWithArgs() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        try {
-            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err4/AServiceErr4.composite").toURL().toString(),
-                    new SCAContribution("TestContribution", 
-                                        new File("src/main/resources/err4").toURL().toString()));
-            Assert.fail();
-            node.stop();
-        } catch(ServiceRuntimeException e) {
-            //expected
-            Assert.assertNotSame(-1, e.getMessage().indexOf("Destructor must not have argments"));
-        }
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/pom.xml b/java/sca-contrib/vtest/java-api/annotations/endsconversation/pom.xml
deleted file mode 100644
index 9c763a1111..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/pom.xml
+++ /dev/null
@@ -1,46 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-annotations-endsconversation</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Annotations - @EndsConversation</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java b/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
deleted file mode 100644
index 13bcb1fd51..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.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 org.apache.tuscany.sca.vtest.javaapi.annotations.endsconversation;
-
-/**
- * Simple Remotable Service
- */
-public interface AService {
-
-    public void testAtEndsConversation();
-
-    public void testSREndConversation();
-
-    public void testTimedEnd();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java b/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
deleted file mode 100644
index 01d3ef051e..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.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.vtest.javaapi.annotations.endsconversation;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.EndsConversation;
-
-/**
- * Simple Local Service
- */
-@Conversational
-public interface BService {
-
-    public void setState(String someState);
-    
-    public String getConversationId();
-    
-    @EndsConversation
-    public void endConversation();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
deleted file mode 100644
index 606020cf85..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
+++ /dev/null
@@ -1,70 +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.vtest.javaapi.annotations.endsconversation.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.endsconversation.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.endsconversation.BService;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.junit.Assert;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    @Reference
-    protected BService b;
-    
-    @Reference
-    protected ServiceReference<BService> b2;
-    
-    private void delayForSeconds(int numSeconds) {
-        try {
-            Thread.sleep(numSeconds * 1000);// millisecs
-        } catch (InterruptedException ex) {
-            throw new Error(ex);
-        }
-    }
-
-    public void testAtEndsConversation() {
-        String firstId;
-        b.setState("SomeState");
-        firstId = b.getConversationId();
-        b.endConversation();
-        b.setState("SomeState");// This should start a new conversation
-        Assert.assertNotSame(b.getConversationId(), firstId); 
-    }
-
-    public void testSREndConversation() {
-        String firstId;
-        b2.getService().setState("SomeState");
-        firstId = b2.getService().getConversationId();
-        b2.getConversation().end();
-        b2.getService().setState("SomeState");// This should start a new conversation
-        Assert.assertNotSame(b2.getService().getConversationId(), firstId); 
-    }
-
-    public void testTimedEnd() {
-       b.setState("someState");
-       delayForSeconds(2);
-       b.setState("someState"); // should fail w/ timeout   
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
deleted file mode 100644
index 56644c6967..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.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 org.apache.tuscany.sca.vtest.javaapi.annotations.endsconversation.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.endsconversation.BService;
-import org.oasisopen.sca.annotation.ConversationAttributes;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxIdleTime="1 seconds")
-public class BServiceImpl implements BService {
-
-    String someState;
-    
-    protected String conversationId;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    @ConversationID
-    public void setConversationID (String id){
-       this.conversationId = id;
-       System.out.println("BService conversation ID =>" + conversationId);
-    }
-    
-    public String getState() {
-        return someState;
-    }
-    
-    public String getConversationId() {
-        return conversationId;
-    }
-
-    public void endConversation() {
-        System.out.println("Conversation ended");
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite b/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
deleted file mode 100644
index cbc13e380c..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.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://java-api-tests" name="Converstion-Composite">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.endsconversation.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-		<reference name="b2" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.endsconversation.impl.BServiceImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java b/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
deleted file mode 100644
index 61d7e25187..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
+++ /dev/null
@@ -1,112 +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.vtest.javaapi.annotations.endsconversation;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.oasisopen.sca.ConversationEndedException;
-
-/**
- * This test class tests the Service annotation described in section 1.2.1 and
- * 1.8.17
- */
-public class EndsConversationTestCase {
-
-    protected static String compositeName = "endsconversation.composite";
-    protected static AService aService = null;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            aService = ServiceFinder.getService(AService.class, "AComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-
-    /**
-     * Lines 410,411,412,413:
-     * <p>
-     * A method of a conversational interface may be marked with an
-     * "@EndsConversation" annotation. Once a method marked with
-     * "@EndsConversation" has been called, the conversation between client and
-     * service provider is at an end, which implies no further methods may be
-     * called on that service within the *same* conversation.
-     */
-    @Test
-    public void atEndsConversation1() throws Exception {
-        aService.testAtEndsConversation();
-    }
-
-    /**
-     * Lines 417,418,419,420:
-     * <p>
-     * From the errata: <br>
-     * Solution: Replace lines 417-420 at the end of section 1.6.2.2 with the
-     * following: "If a conversation is ended with an explicit outbound call to
-     * an "@EndsConversation" method or a call to
-     * ServiceReference.endConversation(), then any subsequent call to an
-     * operation on the service reference will start a new conversation. If the
-     * conversation ends for any other reason (e.g. a timeout occurred), then
-     * until ServiceReference.getConversation().end() is called, the
-     * ConversationEndedException will be thrown by any conversational
-     * operation."
-     * <p>
-     * This tests the first section of the errata. Up to "start a new
-     * conversation"
-     */
-    @Test
-    public void atEndsConversation2() throws Exception {
-        aService.testSREndConversation();
-    }
-
-    /**
-     * Lines 417,418,419,420:
-     * <p>
-     * From the errata: <br>
-     * Solution: Replace lines 417-420 at the end of section 1.6.2.2 with the
-     * following: "If a conversation is ended with an explicit outbound call to
-     * an "@EndsConversation" method or a call to
-     * ServiceReference.endConversation(), then any subsequent call to an
-     * operation on the service reference will start a new conversation. If the
-     * conversation ends for any other reason (e.g. a timeout occurred), then
-     * until ServiceReference.getConversation().end() is called, the
-     * ConversationEndedException will be thrown by any conversational
-     * operation."
-     * <p>
-     * This tests the second section of the errata. Starting with .. "If the
-     * conversation ends for any other reason ..."
-     */
-    @Test(expected = ConversationEndedException.class)
-    public void atEndsConversation3() throws Exception {
-        aService.testTimedEnd();
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/pom.xml b/java/sca-contrib/vtest/java-api/annotations/init/pom.xml
deleted file mode 100644
index 9700b6870c..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/init/pom.xml
+++ /dev/null
@@ -1,45 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-annotations-init</artifactId>
-
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Annotations - @Init</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java b/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
deleted file mode 100644
index 9f6b9bcffd..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
+++ /dev/null
@@ -1,30 +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.vtest.javaapi.annotations.init;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for AService
- */
-@Remotable
-public interface AService {
-    public String getGreetings(String name);
-    public boolean isInitProper();
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java b/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
deleted file mode 100644
index c48b2e2070..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
+++ /dev/null
@@ -1,43 +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.vtest.javaapi.annotations.init.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.init.AService;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService. The implementation has an error since it annotates a protected
- * method with "@Init".
- */
-@Service(AService.class)
-public class AServiceErr1Impl implements AService {
-
-    @Init
-    protected void init() {
-    }
-    
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-    
-    public boolean isInitProper() {
-        return false;
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java b/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
deleted file mode 100644
index 532b1d16eb..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
+++ /dev/null
@@ -1,43 +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.vtest.javaapi.annotations.init.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.init.AService;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService. The implementation has an error since it annotates a private
- * method with "@Init".
- */
-@Service(AService.class)
-public class AServiceErr2Impl implements AService {
-
-    @Init
-    private void init() {
-    }
-    
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-    
-    public boolean isInitProper() {
-        return false;
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java b/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
deleted file mode 100644
index b69a2541b0..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.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 org.apache.tuscany.sca.vtest.javaapi.annotations.init.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.init.AService;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService. The implementation has an error since it annotates a
- * method with non-void return type with "@Init".
- */
-@Service(AService.class)
-public class AServiceErr3Impl implements AService {
-
-    @Init
-    public String init() {
-        return null;
-    }
-    
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-    
-    public boolean isInitProper() {
-        return false;
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java b/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
deleted file mode 100644
index 76f905cff0..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
+++ /dev/null
@@ -1,43 +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.vtest.javaapi.annotations.init.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.init.AService;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService. The implementation has an error since it annotates a
- * method with arguments with "@Init".
- */
-@Service(AService.class)
-public class AServiceErr4Impl implements AService {
-
-    @Init
-    public void init(int x) {
-    }
-    
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-    
-    public boolean isInitProper() {
-        return false;
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
deleted file mode 100644
index 14c0e9c2da..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
+++ /dev/null
@@ -1,53 +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.vtest.javaapi.annotations.init.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.init.AService;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    private boolean initProper;
-    
-    @Property
-    public String someProperty;
-    
-    @Reference
-    public AService someReference;
-
-    @Init
-    public void init() {
-        initProper = someProperty != null && someReference != null;
-    }
-    
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-    
-    public boolean isInitProper() {
-        return initProper;
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite b/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
deleted file mode 100644
index 01b8e101e0..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
+++ /dev/null
@@ -1,28 +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://vtest"
-           xmlns:vtest="http://vtest"
-           name="AServiceErr1">
-
-    <component name="AServiceComponent">
-		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.init.impl.AServiceErr1Impl"/>
-    </component>
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite b/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
deleted file mode 100644
index 4ae38d44b6..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
+++ /dev/null
@@ -1,28 +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://vtest"
-           xmlns:vtest="http://vtest"
-           name="AServiceErr2">
-
-    <component name="AComponent">
-		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.init.impl.AServiceErr2Impl"/>
-    </component>
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite b/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
deleted file mode 100644
index 6bc3d8e7fc..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
+++ /dev/null
@@ -1,28 +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://vtest"
-           xmlns:vtest="http://vtest"
-           name="AServiceErr3">
-
-    <component name="AComponent">
-		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.init.impl.AServiceErr3Impl"/>
-    </component>
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite b/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
deleted file mode 100644
index 7ade16e6d3..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
+++ /dev/null
@@ -1,28 +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://vtest"
-           xmlns:vtest="http://vtest"
-           name="AServiceErr4">
-
-    <component name="AComponent">
-		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.init.impl.AServiceErr4Impl"/>
-    </component>
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite b/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
deleted file mode 100644
index 35f13a2ae6..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
+++ /dev/null
@@ -1,33 +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://vtest"
-           xmlns:vtest="http://vtest"
-           name="AService">
-
-    <component name="AComponent">
-		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.init.impl.AServiceImpl"/>
-		<property name="someProperty">hello</property>
-		<reference name="someReference" target="AnotherAComponent"/>
-    </component>
-    <component name="AnotherAComponent">
-		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.init.impl.AServiceImpl"/>
-    </component>
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java b/java/sca-contrib/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
deleted file mode 100644
index 6ee7b8de89..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
+++ /dev/null
@@ -1,167 +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.vtest.javaapi.annotations.init;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * This test class tests the "@Init" annotation described in section 1.8.11.
- */
-public class InitAnnotationTestCase {
-
-    /**
-     * Lines 1290, 1291, 1292, 1293 <br>
-     * The "@Init" annotation type is used to annotate a Java class method that
-     * is called when the scope defined for the local service implemented by the
-     * class starts. The method must have a void return value and no arguments.
-     * The annotated method must be public. The annotated method is called after
-     * all property and reference injection is complete.
-     * <p>
-     * This method tests a proper init method i.e., public, no arguments and with
-     * void return type.<br>
-     * Expected result: Method must be called. Method must be called after all property
-     * and reference injection is complete.
-     */
-    @Test
-    public void atInitProper() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        SCANode node = nodeFactory.createSCANode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
-                new SCAContribution("TestContribution", 
-                                    new File("src/main/resources/proper").toURL().toString()));
-        node.start();
-        AService aService = ((SCAClient)node).getService(AService.class, "AComponent");
-        Assert.assertTrue(aService.isInitProper());
-        Assert.assertEquals("Hello Pandu", aService.getGreetings("Pandu"));
-        node.stop();
-    }
-
-    /**
-     * Lines 1290, 1291, 1292, 1293 <br>
-     * The "@Init" annotation type is used to annotate a Java class method that
-     * is called when the scope defined for the local service implemented by the
-     * class starts. The method must have a void return value and no arguments.
-     * The annotated method must be public. The annotated method is called after
-     * all property and reference injection is complete.
-     * <p>
-     * This method tests that an exception is thrown when a protected method is
-     * annotated with "@Init".
-     */
-    @Test
-    public void atInitProtectedMethod() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        try {
-            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
-                    new SCAContribution("TestContribution", 
-                                        new File("src/main/resources/err1").toURL().toString()));
-            Assert.fail();
-            node.stop();
-        } catch(ServiceRuntimeException e) {
-            //expected
-            Assert.assertNotSame(-1, e.getMessage().indexOf("Initializer must be a public method."));
-        }
-    }
-
-    /**
-     * Lines 1290, 1291, 1292, 1293 <br>
-     * The "@Init" annotation type is used to annotate a Java class method that
-     * is called when the scope defined for the local service implemented by the
-     * class starts. The method must have a void return value and no arguments.
-     * The annotated method must be public. The annotated method is called after
-     * all property and reference injection is complete.
-     * <p>
-     * This method tests that an exception is thrown when a private method is
-     * annotated with "@Init".
-     */
-    @Test
-    public void atInitPrivateMethod() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        try {
-            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
-                    new SCAContribution("TestContribution", 
-                                        new File("src/main/resources/err2").toURL().toString()));
-            Assert.fail();
-            node.stop();
-        } catch(ServiceRuntimeException e) {
-            //expected
-            Assert.assertNotSame(-1, e.getMessage().indexOf("Initializer must be a public method."));
-        }
-    }
-
-    /**
-     * Lines 1290, 1291, 1292, 1293 <br>
-     * The "@Init" annotation type is used to annotate a Java class method that
-     * is called when the scope defined for the local service implemented by the
-     * class starts. The method must have a void return value and no arguments.
-     * The annotated method must be public. The annotated method is called after
-     * all property and reference injection is complete.
-     * <p>
-     * This method tests that an exception is thrown when a method with non-void
-     * return type is annotated with "@Init".
-     */
-    @Test
-    public void atInitNonVoidReturnType() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        try {
-            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err3/HelloWorldErr3.composite").toURL().toString(),
-                    new SCAContribution("TestContribution", 
-                                        new File("src/main/resources/err3").toURL().toString()));
-            Assert.fail();
-            node.stop();
-        } catch(ServiceRuntimeException e) {
-            //expected
-            Assert.assertNotSame(-1, e.getMessage().indexOf("Initializer must return void."));
-        }
-    }
-
-    /**
-     * Lines 1290, 1291, 1292, 1293 <br>
-     * The "@Init" annotation type is used to annotate a Java class method that
-     * is called when the scope defined for the local service implemented by the
-     * class starts. The method must have a void return value and no arguments.
-     * The annotated method must be public. The annotated method is called after
-     * all property and reference injection is complete.
-     * <p>
-     * This method tests that an exception is thrown when a method with arguments is
-     * annotated with "@Init".
-     */
-    @Test
-    public void atInitMethodWithArgs() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        try {
-            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err4/HelloWorldErr4.composite").toURL().toString(),
-                    new SCAContribution("TestContribution", 
-                                        new File("src/main/resources/err4").toURL().toString()));
-            Assert.fail();
-            node.stop();
-        } catch(ServiceRuntimeException e) {
-            //expected
-            Assert.assertNotSame(-1, e.getMessage().indexOf("Initializer must not have argments"));
-        }
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/pom.xml b/java/sca-contrib/vtest/java-api/annotations/oneway/pom.xml
deleted file mode 100644
index 99f1420712..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/pom.xml
+++ /dev/null
@@ -1,46 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-annotations-oneway</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Annotations - @OneWay</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java b/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
deleted file mode 100644
index b68cd53167..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.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.vtest.javaapi.annotations.oneway;
-
-import org.oasisopen.sca.annotation.OneWay;
-
-/**
- * Simple Remotable Service
- */
-public interface AService {
-
-    @OneWay
-    public void setNameOneWay(String name);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java b/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
deleted file mode 100644
index 1cb4f3adf5..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
+++ /dev/null
@@ -1,28 +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.vtest.javaapi.annotations.oneway;
-
-/**
- * Simple Local Service
- */
-public interface BService {
-
-    public void setNameOneWay(String name);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
deleted file mode 100644
index d95ea22456..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.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.vtest.javaapi.annotations.oneway.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.oneway.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.oneway.BService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    @Reference
-    protected BService b;
-
-    public void setNameOneWay(String name) {
-        b.setNameOneWay(name);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
deleted file mode 100644
index 4f63a23429..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
+++ /dev/null
@@ -1,43 +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.vtest.javaapi.annotations.oneway.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.oneway.BService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-    String name;
-
-    private void delay2Seconds() {
-        try {
-            Thread.sleep(2000);// millisecs
-        } catch (InterruptedException ex) {
-            throw new Error(ex);
-        }
-    }
-
-    public void setNameOneWay(String name) {
-        delay2Seconds();
-        this.name = name;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite b/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
deleted file mode 100644
index 47a7a98c7d..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/resources/oneway.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://java-api-tests" name="OneWay-Composite">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.oneway.impl.AServiceImpl" />
-        <reference name="b" target="BComponent"/>		
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.oneway.impl.BServiceImpl" />
-	</component>
-
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java b/java/sca-contrib/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
deleted file mode 100644
index f2fb8d0dc8..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
+++ /dev/null
@@ -1,78 +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.vtest.javaapi.annotations.oneway;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This test class tests the Service annotation described in section 1.2.1 and
- * 1.8.17
- */
-public class OneWayAnnotationTestCase {
-
-    protected static String compositeName = "oneway.composite";
-    protected static AService aService = null;
-    protected static BService bService = null;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            aService = ServiceFinder.getService(AService.class, "AComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-
-    /**
-     * Line 384,385,386:<br>
-     * <p>
-     * Any method that returns "void" and has no declared exceptions may be
-     * marked with an "@OneWay" annotation. This means that the method is
-     * non-blocking and communication with the service provider may use a
-     * binding that buffers the requests and sends it at some later time.
-     * <p>
-     * Line 1319, 1320:<br>
-     * <p>
-     * The "@OneWay" annotation type is used to annotate a Java interface method
-     * to indicate that invocations will be dispatched in a non-blocking fashion
-     * as described in the section on Asynchronous Programming.<br>
-     * <p>
-     * The serviceMethod on A is annotated with "@OneWay". The A implementation
-     * delegates to b's method which includes a 2 seconds delay. So, this will
-     * fail if the call to A is blocking.
-     */
-    @Test(timeout = 500)
-    public void atOneWay1() throws Exception {
-        aService.setNameOneWay("Some Name");
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/pom.xml b/java/sca-contrib/vtest/java-api/annotations/pom.xml
deleted file mode 100644
index 402ea03f7a..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/pom.xml
+++ /dev/null
@@ -1,69 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-java-api</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>java-api-annotations</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Annotations</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>reference</module>
-                <module>service</module>
-                <module>property</module>
-                <module>scope</module>
-                <module>init</module>
-                <module>destroy</module>
-                <module>oneway</module>
-                <module>conversational</module>
-                <module>conversationattributes</module>
-                <module>endsconversation</module>
-           </modules>
-        </profile>
-    </profiles>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/pom.xml b/java/sca-contrib/vtest/java-api/annotations/property/pom.xml
deleted file mode 100644
index 0c36e98879..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/pom.xml
+++ /dev/null
@@ -1,46 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-annotations-property</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Annotations - @Property</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
deleted file mode 100644
index 5cfea1b099..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
+++ /dev/null
@@ -1,82 +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.vtest.javaapi.annotations.property;
-
-/**
- * Simple Service
- */
-public interface AService {
-
-    public String getName();
-    
-    public String getP1();
-
-    public String getP2();
-
-    public String getP3();
-
-    public String getP4();
-
-    public String getP5();
-
-    public String getP6();
-
-    public String getP7AString();
-    
-    public int getP7BInt();
-    
-    public String getP8AString();
-    
-    public int getP8BInt();
-    
-    public String getP9AString();
-    
-    public int getP9BInt();
-    
-    public String getP10AString();
-    
-    public int getP10BInt();
-    
-    public String getP11AString();
-    
-    public int getP11BInt();
-    
-    public String getP12AString();
-    
-    public int getP12BInt();
-    
-    public String getP15();
-
-    public String getP16();
-    
-    public String getP17();
-    
-    public String getP18();
-    
-	public int getP19Size();
-
-	public String getP20(int i);
-
-	public int getP20Size();
-
-	public int getP21(int i);
-
-	public int getP21Size();
-	
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
deleted file mode 100644
index 5ddc59f8b6..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
+++ /dev/null
@@ -1,48 +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.vtest.javaapi.annotations.property;
-
-/**
- * Simple Service
- */
-public interface AnotherAService {
-
-    public String getName();
-    
-    public String getP13();
-
-    public String getP14();
-    
-	public String getP22();
-
-	public String getP23();
-
-	public String getP24();
-
-	public String getP25();
-
-    public boolean getP14SetterIsCalled();
-    
-    public boolean getP23SetterIsCalled();
-    
-    public boolean getP24SetterIsCalled();
-    
-    public boolean getP25SetterIsCalled();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
deleted file mode 100644
index c39d4e2504..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.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 org.apache.tuscany.sca.vtest.javaapi.annotations.property;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService {
-
-    String getName();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
deleted file mode 100644
index 5de3b5fcff..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
+++ /dev/null
@@ -1,38 +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.vtest.javaapi.annotations.property;
-
-
-/**
- * Simple Service used by another service
- */
-public interface CService {
-
-    String getName();
-
-	public String getB1Name();
-	
-	public String getP2();
-
-	public int getP3();
-
-	public String getP4();
-
-	public String getConstructor();
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
deleted file mode 100644
index f30c4c69fc..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
+++ /dev/null
@@ -1,35 +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.vtest.javaapi.annotations.property.impl;
-
-/**
- * A simple object to hold a string
- */
-public class AObject {
-
-    public String aString;
-    public int bInt;
-
-    public AObject() {
-        this.aString = null;
-        this.bInt = 0;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
deleted file mode 100644
index 6dd91b598d..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
+++ /dev/null
@@ -1,240 +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.vtest.javaapi.annotations.property.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.AService;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Property;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-	@Property
-	protected String p1;			// simple Java type injected via field
-	
-	@Property
-	public String p2;				// simple Java type injected via field
-
-	protected String p3;			// simple Java type injected via setter
-	
-	public String p4;				// simple Java type injected via setter
-
-	protected String p5;			// simple Java type injected via constructor parameter
-	
-	public String p6;				// simple Java type injected via constructor parameter
-
-	@Property(required=true)
-	protected AObject p7;			// complex Java type injected via field
-	
-	@Property
-	public AObject p8;				// complex Java type injected via field
-
-	protected AObject p9;			// complex Java type injected via setter
-	
-	public AObject p10;				// complex Java type injected via setter
-
-	protected AObject p11;			// complex Java type injected via constructor parameter
-	
-	public AObject p12;				// complex Java type injected via constructor parameter
-
-	@Property(name="pFifteen")
-	protected String p15;			// injected via field with different name
-
-	protected String p16;			// injected via setter with different name
-
-	@Property(name="p17", required=false)
-	public String p17;				// injected via field but not defined in composite
-
-	public String p18;				// injected via setter but not defined in composite
-
-	@Property(name="p19", required=true)
-	public List<String> p19;		// a List and injected via field with no element
-
-	public List<String> p20;		// a List and injected via setter
-
-	@Property(required=false)
-	public Integer[] p21;			// an array and injected via field
-	
-    public String getName() {
-        return "AService";
-    }
-    
-    public AServiceImpl(
-    		@Property(name = "p5") String p5, 
-    		@Property(name = "p6") String p6,
-    		@Property(name = "p11") AObject p11,
-    		@Property(name = "p12") AObject p12
-    		) {
-    	super();
-    	this.p5 = p5;
-    	this.p6 = p6;
-    	this.p11 = p11;
-    	this.p12 = p12;
-    }
-
-    @Property
-    public void setP3(String p3) {
-		this.p3 = p3;
-	}
-
-    @Property(required=true)
-    public void setP4(String p4) {
-		this.p4 = p4;
-	}
-
-    @Property
-    public void setP9(AObject p9) {
-		this.p9 = p9;
-	}
-
-    @Property
-    public void setP10(AObject p10) {
-		this.p10 = p10;
-	}
-    
-    @Property(name="pSixteen")
-    public void setP16(String p16) {
-		this.p16 = p16;
-	}
-    
-	@Property(name="p18", required=false)
-    public void setP18(String p18) {
-		this.p18 = p18;
-	}
-    
-	@Property(name="p20", required=true)
-	public void setP20(List<String> p20) {
-		this.p20 = p20;
-	}
-
-	public String getP1() {
-		return p1;
-	}
-
-	public String getP2() {
-		return p2;
-	}
-
-	public String getP3() {
-		return p3;
-	}
-
-	public String getP4() {
-		return p4;
-	}
-
-	public String getP5() {
-		return p5;
-	}
-
-	public String getP6() {
-		return p6;
-	}
-
-	public String getP7AString() {
-		return p7.aString;
-	}
-
-	public int getP7BInt() {
-		return p7.bInt;
-	}
-	
-	public String getP8AString() {
-		return p8.aString;
-	}
-
-	public int getP8BInt() {
-		return p8.bInt;
-	}
-	
-	public String getP9AString() {
-		return p9.aString;
-	}
-
-	public int getP9BInt() {
-		return p9.bInt;
-	}
-	
-	public String getP10AString() {
-		return p10.aString;
-	}
-
-	public int getP10BInt() {
-		return p10.bInt;
-	}
-
-	public String getP11AString() {
-		return p11.aString;
-	}
-
-	public int getP11BInt() {
-		return p11.bInt;
-	}
-
-	public String getP12AString() {
-		return p12.aString;
-	}
-
-	public int getP12BInt() {
-		return p12.bInt;
-	}
-
-	public String getP15() {
-		return p15;
-	}
-
-	public String getP16() {
-		return p16;
-	}
-
-	public String getP17() {
-		return p17;
-	}
-
-	public String getP18() {
-		return p18;
-	}
-
-	public int getP19Size() {
-		return p19.size();
-	}
-
-	public String getP20(int i) {
-		return p20.get(i);
-	}
-
-	public int getP20Size() {
-		return p20.size();
-	}
-
-	public int getP21(int i) {
-		return p21[i].intValue();
-	}
-
-	public int getP21Size() {
-		return p21.length;
-	}
-
-}
-
-
-
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
deleted file mode 100644
index b6d51ef253..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
+++ /dev/null
@@ -1,116 +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.vtest.javaapi.annotations.property.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.AnotherAService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AnotherAService.class)
-public class AnotherAServiceImpl implements AnotherAService {
-
-    public String p13;              // injected via field and un-annotated
-    
-    public String p14;              // injected via setter and un-annotated
-    
-    protected String p22;           // unannotated protected field should not be injected
-
-    protected String p23;			// un-annotated protected and has protected setter 
-
-    protected String p24;			// un-annotated protected field and has public setter
-
-    private String p25;				// un-annotated private field and has public setter
-    
-    public boolean p14SetterIsCalled = false;
-    
-    public boolean p23SetterIsCalled = false;
-    
-    public boolean p24SetterIsCalled = false;
-    
-    public boolean p25SetterIsCalled = false;
-    
-    
-    public String getName() {
-        return "AService";
-    }
-    
-    public void setP14(String p14) {
-        p14SetterIsCalled = true;
-        this.p14 = p14;
-    }
-
-    protected void setP23(String p23) {
-        p23SetterIsCalled = true;
-        this.p23 = p23;
-    }
-
-    public void setP24(String p24) {
-        p24SetterIsCalled = true;
-        this.p24 = p24;
-    }
-
-    public void setP25(String p25) {
-        p25SetterIsCalled = true;
-        this.p25 = p25;
-    }
-
-    public String getP13() {
-        return p13;
-    }
-    
-    public String getP14() {
-        return p14;
-    }
-    
-    public String getP22() {
-        return p22;
-    }
-
-    public String getP23() {
-        return p23;
-    }
-
-    public String getP24() {
-        return p24;
-    }
-
-    public String getP25() {
-        return p25;
-    }
-
-    public boolean getP14SetterIsCalled() {
-        return p14SetterIsCalled;
-    }
-    
-
-    public boolean getP23SetterIsCalled() {
-        return p23SetterIsCalled;
-    }
-    
-
-    public boolean getP24SetterIsCalled() {
-        return p24SetterIsCalled;
-    }
-    
-
-    public boolean getP25SetterIsCalled() {
-        return p25SetterIsCalled;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
deleted file mode 100644
index d6a36f54a9..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.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 org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-    public String getName() {
-        return "BService";
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
deleted file mode 100644
index ace9da2904..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
+++ /dev/null
@@ -1,87 +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.vtest.javaapi.annotations.property.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.CService;
-import org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl1 implements CService {
-
-	public BService b1;
-
-	public String p2;
-	
-	public int p3;
-
-	public String p4;
-	
-	public String constructor; 
-		
-	@Constructor
-	public CServiceImpl1() {
-		constructor = "NoArgument";
-	}
-	
-	public CServiceImpl1(@Reference(name = "bOne") BService b1, @Property(name = "pTwo") String p2, @Property(name = "pThree") int p3, @Property(name = "pFour") String p4) {
-		this.b1 = b1;
-		this.p2 = p2;
-		this.p3 = p3;
-		this.p4 = p4;
-		constructor = "AllArguments";
-	}
-
-	public CServiceImpl1(BService bOne, String pTwo, int pThree) {
-		this.b1 = bOne;
-		this.p2 = pTwo;
-		this.p3 = pThree;
-		constructor = "LessArguments";
-	}
-
-    public String getName() {
-        return "BService";
-    }
-
-	public String getB1Name() {
-		if (b1 == null)
-			return null;
-		return b1.getName();
-	}
-
-	public String getP2() {
-		return p2;
-	}
-
-	public int getP3() {
-		return p3;
-	}
-
-	public String getConstructor() {
-		return constructor;
-	}
-
-	public String getP4() {
-		return p4;
-	}
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
deleted file mode 100644
index 4396b6ce32..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
+++ /dev/null
@@ -1,87 +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.vtest.javaapi.annotations.property.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.CService;
-import org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl2 implements CService {
-
-	public BService b1;
-
-	public String p2;
-	
-	public int p3;
-
-	public String p4;
-	
-	public String constructor; 
-		
-	public CServiceImpl2() {
-		constructor = "NoArgument";
-	}
-	
-	@Constructor()
-	public CServiceImpl2(@Reference(name = "bOne") BService b1, @Property(name = "pTwo") String p2, @Property(name = "pThree") int p3, @Property(name = "pFour") String p4) {
-		this.b1 = b1;
-		this.p2 = p2;
-		this.p3 = p3;
-		this.p4 = p4;
-		constructor = "AllArguments";
-	}
-
-	public CServiceImpl2(BService bOne, String pTwo, int pThree) {
-		this.b1 = bOne;
-		this.p2 = pTwo;
-		this.p3 = pThree;
-		constructor = "LessArguments";
-	}
-
-    public String getName() {
-        return "BService";
-    }
-
-	public String getB1Name() {
-		if (b1 == null)
-			return null;
-		return b1.getName();
-	}
-
-	public String getP2() {
-		return p2;
-	}
-
-	public int getP3() {
-		return p3;
-	}
-
-	public String getConstructor() {
-		return constructor;
-	}
-
-	public String getP4() {
-		return p4;
-	}
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
deleted file mode 100644
index cd459f2dd1..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
+++ /dev/null
@@ -1,87 +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.vtest.javaapi.annotations.property.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.CService;
-import org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl3 implements CService {
-
-	public BService b1;
-
-	public String p2;
-	
-	public int p3;
-
-	public String p4;
-	
-	public String constructor; 
-		
-	public CServiceImpl3() {
-		constructor = "NoArgument";
-	}
-	
-	@Constructor({"bOne", "pTwo", "pThree", "pFour"})
-	public CServiceImpl3(@Reference(name = "bOne") BService b1, @Property(name = "pTwo") String p2, @Property(name = "pThree") int p3, @Property(name = "pFour") String p4) {
-		this.b1 = b1;
-		this.p2 = p2;
-		this.p3 = p3;
-		this.p4 = p4;
-		constructor = "AllArguments";
-	}
-
-	public CServiceImpl3(BService bOne, String pTwo, int pThree) {
-		this.b1 = bOne;
-		this.p2 = pTwo;
-		this.p3 = pThree;
-		constructor = "LessArguments";
-	}
-
-    public String getName() {
-        return "BService";
-    }
-
-	public String getB1Name() {
-		if (b1 == null)
-			return null;
-		return b1.getName();
-	}
-
-	public String getP2() {
-		return p2;
-	}
-
-	public int getP3() {
-		return p3;
-	}
-
-	public String getConstructor() {
-		return constructor;
-	}
-
-	public String getP4() {
-		return p4;
-	}
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
deleted file mode 100644
index c22ee08f95..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
+++ /dev/null
@@ -1,88 +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.vtest.javaapi.annotations.property.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.CService;
-import org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl4 implements CService {
-
-	public BService b1;
-
-	public String p2;
-	
-	public int p3;
-
-	public String p4;
-	
-	public String constructor; 
-		
-	public CServiceImpl4() {
-		constructor = "NoArgument";
-	}
-	
-	public CServiceImpl4(@Reference(name = "bOne") BService b1, @Property(name = "pTwo") String p2, @Property(name = "pThree") int p3, @Property(name = "pFour") String p4, int extra) {
-		this.b1 = b1;
-		this.p2 = p2;
-		this.p3 = p3;
-		this.p4 = p4;
-		constructor = "ExtraArguments";
-	}
-
-	@Constructor({"bOne", "pTwo", "pThree", "pFour"})
-	public CServiceImpl4(BService bOne, String pTwo, int pThree, String pFour) {
-		this.b1 = bOne;
-		this.p2 = pTwo;
-		this.p3 = pThree;
-		this.p4 = pFour;
-		constructor = "AllArguments";
-	}
-
-    public String getName() {
-        return "BService";
-    }
-
-	public String getB1Name() {
-		if (b1 == null)
-			return null;
-		return b1.getName();
-	}
-
-	public String getP2() {
-		return p2;
-	}
-
-	public int getP3() {
-		return p3;
-	}
-
-	public String getConstructor() {
-		return constructor;
-	}
-
-	public String getP4() {
-		return p4;
-	}
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
deleted file mode 100644
index 02892ca7f3..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
+++ /dev/null
@@ -1,88 +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.vtest.javaapi.annotations.property.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.CService;
-import org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl5 implements CService {
-
-	public BService b1;
-
-	public String p2;
-	
-	public int p3;
-
-	public String p4;
-	
-	public String constructor; 
-		
-	public CServiceImpl5() {
-		constructor = "NoArgument";
-	}
-	
-	public CServiceImpl5(@Reference(name = "bOne") BService b1, @Property(name = "pTwo") String p2, @Property(name = "pThree") int p3, @Property(name = "pFour") String p4, int extra) {
-		this.b1 = b1;
-		this.p2 = p2;
-		this.p3 = p3;
-		this.p4 = p4;
-		constructor = "ExtraArguments";
-	}
-
-	@Constructor({"bOne", "pFour", "pThree", "pTwo"})
-	public CServiceImpl5(BService bOne, String pTwo, int pThree, String pFour) {
-		this.b1 = bOne;
-		this.p2 = pTwo;
-		this.p3 = pThree;
-		this.p4 = pFour;
-		constructor = "SwitchedValues";
-	}
-
-    public String getName() {
-        return "BService";
-    }
-
-	public String getB1Name() {
-		if (b1 == null)
-			return null;
-		return b1.getName();
-	}
-
-	public String getP2() {
-		return p2;
-	}
-
-	public int getP3() {
-		return p3;
-	}
-
-	public String getConstructor() {
-		return constructor;
-	}
-
-	public String getP4() {
-		return p4;
-	}
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java b/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
deleted file mode 100644
index ed2c3dc365..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
+++ /dev/null
@@ -1,88 +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.vtest.javaapi.annotations.property.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.property.CService;
-import org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl6 implements CService {
-
-	public BService b1;
-
-	public String p2;
-	
-	public int p3;
-
-	public String p4;
-	
-	public String constructor; 
-		
-	public CServiceImpl6() {
-		constructor = "NoArgument";
-	}
-	
-	public CServiceImpl6(@Reference(name = "bOne") BService b1, @Property(name = "pTwo") String p2, @Property(name = "pThree") int p3, @Property(name = "pFour") String p4, int extra) {
-		this.b1 = b1;
-		this.p2 = p2;
-		this.p3 = p3;
-		this.p4 = p4;
-		constructor = "ExtraArguments";
-	}
-
-	@Constructor({"bOne", "pTwo", "pThree", "pWrong"})
-	public CServiceImpl6(BService bOne, String pTwo, int pThree, String pFour) {
-		this.b1 = bOne;
-		this.p2 = pTwo;
-		this.p3 = pThree;
-		this.p4 = pFour;
-		constructor = "WrongValues";
-	}
-
-    public String getName() {
-        return "BService";
-    }
-
-	public String getB1Name() {
-		if (b1 == null)
-			return null;
-		return b1.getName();
-	}
-
-	public String getP2() {
-		return p2;
-	}
-
-	public int getP3() {
-		return p3;
-	}
-
-	public String getConstructor() {
-		return constructor;
-	}
-
-	public String getP4() {
-		return p4;
-	}
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/resources/property.composite b/java/sca-contrib/vtest/java-api/annotations/property/src/main/resources/property.composite
deleted file mode 100644
index f7af170f33..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/resources/property.composite
+++ /dev/null
@@ -1,143 +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://java-api-tests" name="Property-Composite">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.AServiceImpl" />
-			<property name="p1">p1</property>
-			<property name="p2">p2</property>
-			<property name="p3">p3</property>
-			<property name="p4">p4</property>
-			<property name="p5">p5</property>
-			<property name="p6">p6</property>
-			<property name="p7" type="AObject">
-				<AObject xmlns="">
-					<aString>p7.aString</aString>
-					<bInt>7</bInt>
-				</AObject>
-			</property>
-			<property name="p8" type="AObject">
-				<AObject xmlns="">
-					<aString>p8.aString</aString>
-					<bInt>8</bInt>
-				</AObject>
-			</property>
-			<property name="p9" type="AObject">
-				<AObject xmlns="">
-					<aString>p9.aString</aString>
-					<bInt>9</bInt>
-				</AObject>
-			</property>
-			<property name="p10" type="AObject">
-				<AObject xmlns="">
-					<aString>p10.aString</aString>
-					<bInt>10</bInt>
-				</AObject>
-			</property>
-			<property name="p11" type="AObject">
-				<AObject xmlns="">
-					<aString>p11.aString</aString>
-					<bInt>11</bInt>
-				</AObject>
-			</property>
-			<property name="p12" type="AObject">
-				<AObject xmlns="">
-					<aString>p12.aString</aString>
-					<bInt>12</bInt>
-				</AObject>
-			</property>
-			<property name="pFifteen">p15</property>
-			<property name="pSixteen">p16</property>
-			<property name="p19" many="true"></property>
-			<property name="p20" many="true">"p20"</property>
-			<property name="p21" many="true">2 1 21</property>
-	</component>
-
-	<component name="CComponent1">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.CServiceImpl1" />
-			<reference name="bOne" target="BComponent"/>
-			<property name="pTwo">p2</property>
-			<property name="pThree">3</property>
-			<property name="pFour">p4</property>
-	</component>
-
-	<component name="CComponent2">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.CServiceImpl2" />
-			<reference name="bOne" target="BComponent"/>
-			<property name="pTwo">p2</property>
-			<property name="pThree">3</property>
-			<property name="pFour">p4</property>
-	</component>
-
-	<component name="CComponent3">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.CServiceImpl3" />
-			<reference name="bOne" target="BComponent"/>
-			<property name="pTwo">p2</property>
-			<property name="pThree">3</property>
-			<property name="pFour">p4</property>
-	</component>
-
-	<component name="CComponent4">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.CServiceImpl4" />
-			<reference name="bOne" target="BComponent"/>
-			<property name="pTwo">p2</property>
-			<property name="pThree">3</property>
-			<property name="pFour">p4</property>
-	</component>
-
-	<component name="CComponent5">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.CServiceImpl5" />
-			<reference name="bOne" target="BComponent"/>
-			<property name="pTwo">p2</property>
-			<property name="pThree">3</property>
-			<property name="pFour">p4</property>
-	</component>
-	
-	<component name="CComponent6">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.CServiceImpl6" />
-			<reference name="bOne" target="BComponent"/>
-			<property name="pTwo">p2</property>
-			<property name="pThree">3</property>
-			<property name="pFour">p4</property>
-	</component>
-	
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.BServiceImpl"/>
-    </component>    
-    
-    <component name="AnotherAComponent">
-        <implementation.java
-            class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.AnotherAServiceImpl" />
-            <property name="p13">p13</property>
-            <property name="p14">p14</property>
-            <property name="p22">p22</property>
-            <property name="p23">p23</property>
-            <property name="p24">p24</property>
-            <property name="p25">p25</property>
-    </component>
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java b/java/sca-contrib/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
deleted file mode 100644
index d5fbc568f7..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
+++ /dev/null
@@ -1,299 +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.vtest.javaapi.annotations.property;
-
-import static org.junit.Assert.fail;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * This test class tests the Property annotation described in section 1.2.3
- * including 1.8.5 and 1.8.13
- */
-public class PropertyAnnotationTestCase {
-
-    protected static String compositeName = "property.composite";
-    protected static AService aService = null;
-    protected static CService cService1 = null;
-    protected static CService cService2 = null;
-    protected static CService cService3 = null;
-    protected static CService cService4 = null;
-    protected static CService cService5 = null;
-    protected static CService cService6 = null;
-    protected static AnotherAService anotherAService = null;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            aService = ServiceFinder.getService(AService.class, "AComponent");
-            cService1 = ServiceFinder.getService(CService.class, "CComponent1");
-            cService2 = ServiceFinder.getService(CService.class, "CComponent2");
-            cService3 = ServiceFinder.getService(CService.class, "CComponent3");
-            cService4 = ServiceFinder.getService(CService.class, "CComponent4");
-            cService5 = ServiceFinder.getService(CService.class, "CComponent5");
-            cService6 = ServiceFinder.getService(CService.class, "CComponent6");
-            anotherAService = ServiceFinder.getService(AnotherAService.class, "AnotherAComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-
-    }
-
-    /**
-     * Lines 1343 to 1348:<br>
-     * The "@Property" annotation type is used to annotate a Java class field or
-     * a setter method that is used to inject an SCA property value. The type of
-     * the property injected, which can be a simple Java type or a complex Java
-     * type, is defined by the type of the Java class field or the type of the
-     * setter method input argument.<br>
-     * The "@Property" annotation may be used on protected or public fields and
-     * on setter methods or on a constructor method.<br>
-     * <p>
-     * p1 - simple Java type injected via field<br>
-     * p2 - simple Java type injected via field<br>
-     * p3 - simple Java type injected via setter<br>
-     * p4 - simple Java type injected via setter and required=true<br>
-     * p5 - simple Java type injected via constructor parameter<br>
-     * p6 - simple Java type injected via constructor parameter<br>
-     * p7 - complex Java type injected via field and required=true<br>
-     * p8 - complex Java type injected via field<br>
-     * p9 - complex Java type injected via setter<br>
-     * p10 - complex Java type injected via setter<br>
-     * p11 - complex Java type injected via constructor parameter<br>
-     * p12 - complex Java type injected via constructor parameter<br>
-     */
-    @Test
-    public void atProperty1() throws Exception {
-        Assert.assertEquals("p1", aService.getP1());
-        Assert.assertEquals("p2", aService.getP2());
-        Assert.assertEquals("p3", aService.getP3());
-        Assert.assertEquals("p4", aService.getP4());
-        Assert.assertEquals("p5", aService.getP5());
-        Assert.assertEquals("p6", aService.getP6());
-        Assert.assertEquals("p7.aString", aService.getP7AString());
-        Assert.assertEquals(7, aService.getP7BInt());
-        Assert.assertEquals("p8.aString", aService.getP8AString());
-        Assert.assertEquals(8, aService.getP8BInt());
-        Assert.assertEquals("p9.aString", aService.getP9AString());
-        Assert.assertEquals(9, aService.getP9BInt());
-        Assert.assertEquals("p10.aString", aService.getP10AString());
-        Assert.assertEquals(10, aService.getP10BInt());
-        Assert.assertEquals("p11.aString", aService.getP11AString());
-        Assert.assertEquals(11, aService.getP11BInt());
-        Assert.assertEquals("p12.aString", aService.getP12AString());
-        Assert.assertEquals(12, aService.getP12BInt());
-    }
-
-    /**
-     * Lines 1349 to 1352:<br>
-     * Properties may also be injected via public setter methods even when the
-     * "@Property" annotation is not present. However, the
-     * 
-     * @Property annotation must be used in order to inject a property onto a
-     *           non-public field. In the case where there is no "@Property"
-     *           annotation, the name of the property is the same as the name of
-     *           the field or setter.<br>
-     *           <p>
-     *           p13 is an un-annotated public field which should be injected
-     *           via field<br>
-     */
-    @Test
-    public void atProperty2() throws Exception {
-        Assert.assertEquals("p13", anotherAService.getP13());
-    }
-
-    /**
-     * Line 1353:<br>
-     * Where there is both a setter method and a field for a property, the
-     * setter method is used.<br>
-     * <p>
-     * p14 is an un-annotated public field, it should be injected via public
-     * setter<br>
-     */
-    @Test
-    public void atProperty3() throws Exception {
-        Assert.assertEquals("p14", anotherAService.getP14());
-        Assert.assertTrue(anotherAService.getP14SetterIsCalled());
-    }
-
-    /**
-     * Lines 1355 to 1357:<br>
-     * The "@Property" annotation has the following attributes:<br>
-     * <li>name (optional) – the name of the property, defaults to the name of
-     * the field of the Java class</li>
-     * <li>required (optional) – specifies whether injection is required,
-     * defaults to false</li>
-     * <p>
-     * p15 - injected via field with different name "pFifteen"<br>
-     * p16 - injected via setter with different name "pSixteen"<br>
-     * p17 - injected via field but not defined in composite<br>
-     * p18 - injected via setter but not defined in composite<br>
-     * 
-     * @TODO - Need to test required=true but not defined in composite (The
-     *       specification does not describe the proper behaviour in this
-     *       situation.)
-     */
-    @Test
-    public void atProperty4() throws Exception {
-        Assert.assertEquals("p15", aService.getP15());
-        Assert.assertEquals("p16", aService.getP16());
-        Assert.assertNull(aService.getP17());
-        Assert.assertNull(aService.getP18());
-    }
-
-    /**
-     * Lines 1369 to 1370:<br>
-     * If the property is defined as an array or as a java.util.Collection, then
-     * the implied component type has a property with a many attribute set to
-     * true.<br>
-     * <p>
-     * p19 - a List and injected via field with no element<br>
-     * p20 - a List and injected via setter<br>
-     * p21 - an array and injected via field<br>
-     */
-    @Test
-    public void atProperty5() throws Exception {
-        Assert.assertEquals(0, aService.getP19Size());
-        Assert.assertEquals(1, aService.getP20Size());
-        Assert.assertEquals("p20", aService.getP20(0));
-        Assert.assertEquals(3, aService.getP21Size());
-        Assert.assertEquals(2, aService.getP21(0));
-        Assert.assertEquals(1, aService.getP21(1));
-        Assert.assertEquals(21, aService.getP21(2));
-    }
-
-    /**
-     * Lines 1141 to 1162:<br>
-     * 1.8.5. "@Constructor"<br>
-     * ...<br>
-     * The "@Constructor" annotation is used to mark a particular constructor to
-     * use when instantiating a Java component implementation.<br>
-     * The "@Constructor" annotation has the following attribute:<br>
-     * <li>value (optional) – identifies the property/reference names that
-     * correspond to each of the constructor arguments. The position in the
-     * array determines which of the arguments are being named.</li>
-     * <p>
-     * cService1 - "@Constructor" without value and constructor arguments<br>
-     * cService2 - "@Constructor" without value but with constructor arguments<br>
-     * cService3 - "@Constructor" with values and constructor arguments<br>
-     * cService4 - "@Constructor" with values and constructor arguments where
-     * value, property and parameter names are same<br>
-     * cService5 - "@Constructor" with switched values and constructor arguments<br>
-     * cService6 - "@Constructor" with wrong values<br>
-     */
-    @Test
-    public void atProperty6() throws Exception {
-        Assert.assertNull(cService1.getB1Name());
-        Assert.assertNull(cService1.getP2());
-        Assert.assertEquals(0, cService1.getP3());
-        Assert.assertNull(cService1.getP4());
-        Assert.assertEquals("NoArgument", cService1.getConstructor());
-
-        Assert.assertEquals("BService", cService2.getB1Name());
-        Assert.assertEquals("p2", cService2.getP2());
-        Assert.assertEquals(3, cService2.getP3());
-        Assert.assertEquals("p4", cService2.getP4());
-        Assert.assertEquals("AllArguments", cService2.getConstructor());
-
-        Assert.assertEquals("BService", cService3.getB1Name());
-        Assert.assertEquals("p2", cService3.getP2());
-        Assert.assertEquals(3, cService3.getP3());
-        Assert.assertEquals("p4", cService3.getP4());
-        Assert.assertEquals("AllArguments", cService3.getConstructor());
-
-        Assert.assertEquals("BService", cService4.getB1Name());
-        Assert.assertEquals("p2", cService4.getP2());
-        Assert.assertEquals(3, cService4.getP3());
-        Assert.assertEquals("p4", cService4.getP4());
-        Assert.assertEquals("AllArguments", cService4.getConstructor());
-
-        Assert.assertEquals("BService", cService5.getB1Name());
-        Assert.assertEquals("p4", cService5.getP2());
-        Assert.assertEquals(3, cService5.getP3());
-        Assert.assertEquals("p2", cService5.getP4());
-        Assert.assertEquals("SwitchedValues", cService5.getConstructor());
-
-        try {
-            System.out.println(cService6.getB1Name());
-            fail("Should have failed to call this service");
-        } catch (Throwable t) {
-        }
-
-    }
-
-    /**
-     * Lines 1349 to 1352:<br>
-     * 1.8.13. "@Property"<br>
-     * ...<br>
-     * Properties may also be injected via public setter methods even when the
-     * "@Property" annotation is not present. However, the "@Property"
-     * annotation must be used in order to inject a property onto a non-public
-     * field. In the case where there is no "@Property" annotation, the name of
-     * the property is the same as the name of the field or setter.
-     * <p>
-     * p22 is unannotated protected field which should not be injected p23 is
-     * un-annotated protected which should not be injected via protected setter<br>
-     */
-    @Test
-    @Ignore("JIRA-2289 - p23 failed")
-    public void atProperty7() throws Exception {
-        Assert.assertNull(anotherAService.getP22());
-        Assert.assertNull(anotherAService.getP23());
-        Assert.assertFalse(anotherAService.getP23SetterIsCalled());
-    }
-
-    /**
-     * Lines 1349 to 1352:<br>
-     * 1.8.13. "@Property"<br>
-     * ...<br>
-     * Properties may also be injected via public setter methods even when the
-     * "@Property" annotation is not present. However, the "@Property"
-     * annotation must be used in order to inject a property onto a non-public
-     * field. In the case where there is no "@Property" annotation, the name of
-     * the property is the same as the name of the field or setter.
-     * <p>
-     * p24 is un-annotated protected field which should be injected via public
-     * setter<br>
-     * p25 is un-annotated private field which should be injected via public
-     * setter<br>
-     */
-    @Test
-    public void atProperty8() throws Exception {
-        Assert.assertEquals("p24", anotherAService.getP24());
-        Assert.assertTrue(anotherAService.getP24SetterIsCalled());
-        Assert.assertEquals("p25", anotherAService.getP25());
-        Assert.assertTrue(anotherAService.getP25SetterIsCalled());
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/pom.xml b/java/sca-contrib/vtest/java-api/annotations/reference/pom.xml
deleted file mode 100644
index 5e88742f3e..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/reference/pom.xml
+++ /dev/null
@@ -1,46 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-annotations-reference</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Annotations - @Reference</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java b/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
deleted file mode 100644
index b28704a3b4..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.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 org.apache.tuscany.sca.vtest.javaapi.annotations.reference;
-
-
-/**
- * Simple Service that uses another Service
- */
-public interface AService {
-
-    public String getName();
-    public String getB1Name();
-    public String getB2Name();
-    public String getB3Name();
-    public String getB4Name();
-    public String getB5Name();
-    public String getB6Name();
-    public String getB7Name();
-    public String getB8Name();
-    public String getB9Name();
-    public String getB10Name();
-    public String getB11Name();
-    public String getB12Name();
-    public String getB13Name(int i);
-    public String getB14Name(int i);
-    public String getB15Name(int i);
-    
-    public int getB13Size();
-    public int getB14Size();
-    public int getB15Size();
-    
-    public boolean isB7SetterCalled();
-    public boolean isB16Null();
-    public boolean isB17Null();
-    
-    public boolean isB4Null(); 
-    public boolean isB5Null();
-    public boolean isB6Null();
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java b/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
deleted file mode 100644
index 04c0bc377e..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.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.vtest.javaapi.annotations.reference;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService {
-
-    String getName();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
deleted file mode 100644
index 60e2b2408c..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
+++ /dev/null
@@ -1,215 +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.vtest.javaapi.annotations.reference.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.BService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    @Reference
-    protected BService b1; // field injection
-
-    protected BService b2; // injected via constructor parameter
-
-    protected BService b3; // setter injection
-
-    public BService b4; // field injection (public, un-annotated)
-
-    protected BService b5; // field injection (non-public, un-annotated)
-
-    public BService b6; // setter injection (public, un-annotated)
-
-    @Reference
-    protected BService b7; // setter injection (field and setter annotated)
-
-    @Reference(name="b8", required=false)
-    protected BService bEight; // field injection (different reference and field name)
-
-    protected BService bNine; // setter injection (different reference and field name)
-
-    @Reference(required=false)
-    protected BService b10; // multiplicity="0..1" and required=false
-
-    @Reference(required=false)
-    protected BService b11; // multiplicity="1..1" and required=false
-
-    protected BService b12; // multiplicity="1..1" and required=true at setter
-
-    @Reference(required=false)
-    protected List<BService> b13; // multiplicity="0..n" and required=false
-
-    protected List<BService> b14; // multiplicity="1..n" and required=false at setter
-
-    @Reference(name="b15", required=true)
-    protected BService[] b15s; // multiplicity="1..n" and required=true
-
-	@Reference(required=false)
-    protected BService b16;
-
-	@Reference(required=false)
-    public BService b17;
-	
-    protected boolean b7SetterCalled;
-
-    public AServiceImpl(@Reference(name = "b2")
-    BService b2) {
-        super();
-        this.b2 = b2;
-        b7SetterCalled = false;
-    }
-
-    @Reference
-    public void setB3(BService b3) {
-        this.b3 = b3;
-    }
-
-    public void setB6(BService b6) {
-        this.b6 = b6;
-    }
-
-    @Reference
-    public void setB7(BService b7) {
-        b7SetterCalled = true;
-        this.b7 = b7;
-    }
-
-    @Reference(name="b9", required=false)
-    public void setB9(BService bNine) {
-        this.bNine = bNine;
-    }
-    
-    @Reference(required=true)
-    public void setB12(BService b12) {
-        this.b12 = b12;
-    }
-    
-    @Reference(required=true)
-    public void setB14(List<BService> b14) {
-        this.b14 = b14;
-    }
-    
-    public String getName() {
-        return "AService";
-    }
-
-    public String getB1Name() {
-        return b1.getName();
-    }
-
-    public String getB2Name() {
-        return b2.getName();
-    }
-
-    public String getB3Name() {
-        return b3.getName();
-    }
-
-    public String getB4Name() {
-        return b4.getName();
-    }
-
-    public String getB5Name() {
-        return b5.getName();
-    }
-
-    public String getB6Name() {
-        return b6.getName();
-    }
-
-    public String getB7Name() {
-        return b7.getName();
-    }
-
-    public String getB8Name() {
-        return bEight.getName();
-    }
-    
-    public String getB9Name() {
-        return bNine.getName();
-    }
-    
-    public String getB10Name() {
-        return b10.getName();
-    }
-
-    public String getB11Name() {
-        return b11.getName();
-    }
-    
-    public String getB12Name() {
-        return b12.getName();
-    }
-    
-    public String getB13Name(int i) {
-    	BService b = (BService) b13.get(i);
-        return b.getName();
-    }
-    
-    public String getB14Name(int i) {
-    	BService b = (BService) b14.get(i);
-        return b.getName();
-    }
-    
-    public String getB15Name(int i) {
-        return b15s[i].getName();
-    }
-    
-    public int getB13Size() {
-    	return b13.size();
-    }
-    
-    public int getB14Size() {
-    	return b14.size();
-    }
-    
-    public int getB15Size() {
-    	return b15s.length;
-    }
-    
-    public boolean isB7SetterCalled() {
-        return b7SetterCalled;
-    }
-    
-    public boolean isB16Null() {
-        return b16 == null;
-    }
-
-    public boolean isB17Null() {
-        return b17 == null;
-    }
-
-    public boolean isB4Null() {
-        return b4 == null;
-    }
-    
-    public boolean isB5Null() {
-        return b5 == null;
-    }
-    
-    public boolean isB6Null() {
-        return b6 == null;
-    }    
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
deleted file mode 100644
index 20fccf807f..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
+++ /dev/null
@@ -1,141 +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.vtest.javaapi.annotations.reference.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.BService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-public class AUnannotatedServiceImpl implements AService {
-
-    public BService b4; // field injection (public, un-annotated)
-
-    protected BService b5; // field injection (non-public, un-annotated)
-    
-    public BService b6; // setter injection (public, un-annotated)
-
-    public AUnannotatedServiceImpl() {
-    }
-
-    public String getName() {
-        return "AService";
-    }
-
-    public String getB4Name() {
-        return b4.getName();
-    }
-
-    public String getB5Name() {
-        return b5.getName();
-    }
-
-    public void setB6(BService b6) {
-        this.b6 = b6;
-    }
-
-    public String getB6Name() {
-        return b6.getName();
-    }
-
-    public String getB1Name() {
-        return null;
-    }
-
-    public String getB2Name() {
-        return null;
-    }
-
-    public String getB3Name() {
-        return null;
-    }
-
-    public String getB7Name() {
-        return null;
-    }
-
-    public String getB8Name() {
-        return null;
-    }
-
-    public String getB9Name() {
-        return null;
-    }
-
-    public boolean isB7SetterCalled() {
-        return false;
-    }
-
-    public String getB10Name() {
-        return null;
-    }
-
-    public String getB11Name() {
-        return null;
-    }
-
-    public String getB12Name() {
-        return null;
-    }
-
-    public String getB13Name(int i) {
-        return null;
-    }
-
-    public int getB13Size() {
-        return 0;
-    }
-
-    public String getB14Name(int i) {
-        return null;
-    }
-
-    public int getB14Size() {
-        return 0;
-    }
-
-    public String getB15Name(int i) {
-        return null;
-    }
-
-    public int getB15Size() {
-        return 0;
-    }
-    
-    public boolean isB16Null() {
-        return true;
-    }
-
-    public boolean isB17Null() {
-        return true;
-    }
-    
-    public boolean isB4Null() {
-        return b4 == null;
-    }
-    
-    public boolean isB5Null() {
-        return b5 == null;
-    }
-    
-    public boolean isB6Null() {
-        return b6 == null;
-    }     
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
deleted file mode 100644
index c7fc91e65f..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.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 org.apache.tuscany.sca.vtest.javaapi.annotations.reference.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.BService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-    public String getName() {
-        return "BService";
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/resources/ab.composite b/java/sca-contrib/vtest/java-api/annotations/reference/src/main/resources/ab.composite
deleted file mode 100644
index b4ad1e77d5..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/resources/ab.composite
+++ /dev/null
@@ -1,51 +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://java-api-tests"
-	name="AB-Composite">
- 	      
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.reference.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent"/>		
-        <reference name="b2" target="BComponent"/>		
-        <reference name="b3" target="BComponent"/>
-        <reference name="b7" target="BComponent"/>
-        <reference name="b8" target="BComponent"/>
-        <reference name="b9" target="BComponent"/>
-        <reference name="b10" multiplicity="0..1" target="BComponent"/>
-        <reference name="b11" multiplicity="1..1" target="BComponent"/>
-        <reference name="b12" multiplicity="1..1" target="BComponent"/>
-        <reference name="b13" multiplicity="0..n" target=""/>
-        <reference name="b14" multiplicity="1..n" target="BComponent"/>
-        <reference name="b15" multiplicity="1..n" target="BComponent BComponent"/>
-    </component>   
-    
-    <component name="AUnannotatedComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.reference.impl.AUnannotatedServiceImpl"/>
-        <reference name="b4" target="BComponent"/>
-        <reference name="b5" target="BComponent"/>
-        <reference name="b6" target="BComponent"/>
-     </component>   
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.reference.impl.BServiceImpl"/>
-    </component>     
-    
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java b/java/sca-contrib/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
deleted file mode 100644
index 1fe50b4ea7..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
+++ /dev/null
@@ -1,229 +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.vtest.javaapi.annotations.reference;
-
-import static org.junit.Assert.fail;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * This test class tests the "@Reference" annotation described in section 1.8.14
- */
-public class ReferenceAnnotationTestCase {
-
-    protected static String compositeName = "ab.composite";
-    protected static AService a;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            a = ServiceFinder.getService(AService.class, "AComponent");
-
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-
-    /**
-     * Temporary test unrelated to spec test effort. Remove after resolution of
-     */
-    @Test
-    @Ignore
-    // JIRA T-2145
-    public void bogusComponentName() throws Exception {
-        ServiceFinder.init(compositeName);
-        try {
-            AService a = ServiceFinder.getService(AService.class, "AReallyBogusComponentName");
-            if (a == null)
-                fail("Should have thrown an exception rather than return null");
-            else
-                fail("Should have thrown an exception rather than return a proxy");
-        } finally {
-            ServiceFinder.cleanup();
-        }
-
-    }
-
-    /**
-     * Lines 1404, 1405, 1406 <br>
-     * The "@Reference" annotation type is used to annotate a Java class field
-     * or a setter method that is used to inject a service that resolves the
-     * reference. The interface of the service injected is defined by the type
-     * of the Java class field or the type of the setter method input argument.
-     * <p>
-     * This tests the use of the three usages of the "@Reference" annotation<br>
-     * B1 is injected via field injection <br>
-     * B2 is injected via constructor parameter <br>
-     * B3 is injected via setter method
-     */
-    @Test
-    public void atReference1() throws Exception {
-
-        Assert.assertEquals("BService", a.getB1Name());
-        Assert.assertEquals("BService", a.getB2Name());
-        Assert.assertEquals("BService", a.getB3Name());
-
-    }
-
-    /**
-     * Lines 1407, 1408, 1409, 1410 <br>
-     * References may also be injected via public setter methods even when the
-     * "@Reference" annotation is not present. However, the "@Reference"
-     * annotation must be used in order to inject a reference onto a non public
-     * field. In the case where there is no "@Reference" annotation, the name of
-     * the reference is the same as the name of the field or setter.
-     * <p>
-     * B4 is injected via field injection. Public, Non-annotated <br>
-     * B5 is expected to fail field injection. Non-Public, Non-Annotated <br>
-     * B6 is injected via setter injection. Public, Non-Annotated
-     */
-    @Test
-    public void atReference2() throws Exception {
-        AService anotherA = ServiceFinder.getService(AService.class, "AUnannotatedComponent");
-        
-        Assert.assertFalse(anotherA.isB4Null());
-        Assert.assertTrue(anotherA.isB5Null());
-        Assert.assertFalse(anotherA.isB6Null());
-        
-        Assert.assertEquals("BService", anotherA.getB4Name());
-        try {
-            anotherA.getB5Name();
-            fail("getB5Name expected to fail with NPE");
-        } catch (NullPointerException e) {
-        }
-        Assert.assertEquals("BService", anotherA.getB6Name());
-
-    }
-
-    /**
-     * Lines 1411 <br>
-     * Where there is both a setter method and a field for a reference, the
-     * setter method is used.
-     * <p>
-     * B7 has both field and setter annotated. The setter must be called
-     */
-    @Test
-    public void atReference3() throws Exception {
-        Assert.assertTrue(a.isB7SetterCalled());
-    }
-
-    /**
-     * Lines 1413, 1414, 1415 <br>
-     * The "@Reference" annotation has the following attributes: <br> • name
-     * (optional) – the name of the reference, defaults to the name of the field
-     * of the Java class <br>
-     * required (optional) – whether injection of service or services is
-     * required. Defaults to true.
-     * <p>
-     * Reference and field have different names<br>
-     * B8 is field injected<br>
-     * B9 is setter injected
-     */
-    @Test
-    public void atReference4() throws Exception {
-        Assert.assertEquals("BService", a.getB8Name());
-        Assert.assertEquals("BService", a.getB9Name());
-    }
-
-    /**
-     * Lines 1457 to 1459<br>
-     * If the reference is not an array or collection, then the implied
-     * component type has a reference with a multiplicity of either 0..1 or 1..1
-     * depending on the value of the
-     * 
-     * @Reference required attribute – 1..1 applies if required=true.<br>
-     *            <p>
-     *            B10 is field injected, required=false, and multiplicity="0..1"<br>
-     *            B11 is field injected, required=false, and multiplicity="1..1"<br>
-     *            B12 is setter injected, required=true, and multiplicity="1..1"
-     */
-    @Test
-    public void atReference5() throws Exception {
-        Assert.assertEquals("BService", a.getB10Name());
-        Assert.assertEquals("BService", a.getB11Name());
-        Assert.assertEquals("BService", a.getB12Name());
-    }
-
-    /**
-     * Lines 1461 to 1463<br>
-     * If the reference is defined as an array or as a java.util.Collection,
-     * then the implied component type has a reference with a multiplicity of
-     * either 1..n or 0..n, depending on whether the required attribute of the
-     * "@Reference" annotation is set to true or false – 1..n applies if
-     * required=true.<br>
-     * <p>
-     * B13 is a java.util.List, field injected, required=false,
-     * multiplicity="0..n", and no target<br>
-     * B14 is a java.util.List, setter injected, required=true,
-     * multiplicity="1..n", and one target<br>
-     * B15 is an array, field injected, required=true, multiplicity="1..n", and
-     * two targets
-     */
-    @Test
-    public void atReference6() throws Exception {
-        Assert.assertEquals(0, a.getB13Size());
-        Assert.assertEquals("BService", a.getB14Name(0));
-        Assert.assertEquals(1, a.getB14Size());
-        Assert.assertEquals("BService", a.getB15Name(0));
-        Assert.assertEquals("BService", a.getB15Name(1));
-        Assert.assertEquals(2, a.getB15Size());
-    }
-
-    /**
-     * Lines 1415 <br>
-     * required (optional) - whether injection of service or services is
-     * required. Defaults to true.
-     * <p>
-     * b16 and b17 is defined as "@Reference(required=false)" and AComponent
-     * does not define reference for them
-     */
-    @Test
-    public void atReference7() throws Exception {
-        Assert.assertTrue(a.isB16Null());
-        Assert.assertTrue(a.isB17Null());
-    }
-    
-    /**
-     * Java Component Implementation Spec
-     * Section 1.2.7
-     * Line 361 when @Property and @Reference annotations are present
-     * then unannotated fields are ignored
-     */
-    @Test
-    public void atReference8() throws Exception {
-        Assert.assertTrue(a.isB4Null());
-        Assert.assertTrue(a.isB5Null());
-        Assert.assertTrue(a.isB6Null());
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/pom.xml b/java/sca-contrib/vtest/java-api/annotations/scope/pom.xml
deleted file mode 100644
index 8a905a7ebc..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/pom.xml
+++ /dev/null
@@ -1,46 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-annotations-scope</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Annotations - @Scope</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
deleted file mode 100644
index b7cf3fba71..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
+++ /dev/null
@@ -1,29 +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.vtest.javaapi.annotations.scope;
-
-
-/**
- * Simple Service
- */
-public interface AService {
-
-    public String getName();
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
deleted file mode 100644
index 7da9d29424..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
+++ /dev/null
@@ -1,40 +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.vtest.javaapi.annotations.scope;
-
-/**
- * Simple Service
- */
-public interface BService {
-
-    public String getName();
-    
-    public boolean isInitReady();
-    
-    public String getCurrentState();
-    
-    public String setCurrentState(String currentState);
-    
-	public int getDestroyCalledCounter();
-
-	public int getInitCalledCounter();
-
-	public int getInstanceCounter();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
deleted file mode 100644
index 208c6a78b0..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
+++ /dev/null
@@ -1,40 +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.vtest.javaapi.annotations.scope;
-
-/**
- * Simple Service
- */
-public interface CService {
-
-    public String getName();
-    
-    public boolean isInitReady();
-    
-    public String getCurrentState();
-    
-    public String setCurrentState(String currentState);
-    
-	public int getDestroyCalledCounter();
-
-	public int getInitCalledCounter();
-
-	public int getInstanceCounter();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
deleted file mode 100644
index f9b87ad251..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
+++ /dev/null
@@ -1,43 +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.vtest.javaapi.annotations.scope;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface DService {
-
-    public String getName();
-    
-    public boolean isInitReady();
-    
-    public String getCurrentState();
-    
-    public String setCurrentState(String currentState);
-    
-	public int getDestroyCalledCounter();
-
-	public int getInitCalledCounter();
-
-	public int getInstanceCounter();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
deleted file mode 100644
index 0e4ed9c18d..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
+++ /dev/null
@@ -1,43 +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.vtest.javaapi.annotations.scope;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface FService {
-
-    public String getName();
-    
-    public boolean isInitReady();
-    
-    public String getCurrentState();
-    
-    public String setCurrentState(String currentState);
-    
-	public int getDestroyCalledCounter();
-
-	public int getInitCalledCounter();
-
-	public int getInstanceCounter();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
deleted file mode 100644
index 566dc93e6d..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
+++ /dev/null
@@ -1,35 +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.vtest.javaapi.annotations.scope;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface GService {
-
-    public String getName();
-    
-	public int getInitCalledCounter();
-
-	public int getDestroyCalledCounter();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
deleted file mode 100644
index 714b3ce8f4..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.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 org.apache.tuscany.sca.vtest.javaapi.annotations.scope;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-/**
- * Simple Service
- */
-@Remotable
-public interface HService {
-
-    public String getName();
-    
-    public String test();
-    
-    public String testCounters(int n);
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
deleted file mode 100644
index 88cf95b593..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
+++ /dev/null
@@ -1,48 +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.vtest.javaapi.annotations.scope;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.EndsConversation;
-
-/**
- * Simple Service
- */
-@Conversational
-public interface IService {
-
-    public String getName();
-    
-    public boolean isInitReady();
-    
-    public String getCurrentState();
-    
-    public String getConversationId();
-    
-    public String setCurrentState(String currentState);
-    
-	public int getDestroyCalledCounter();
-
-	public int getInitCalledCounter();
-
-	public int getInstanceCounter();
-
-	@EndsConversation
-    public void endConversation();
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
deleted file mode 100644
index ea974100ab..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.annotations.scope;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface JService {
-
-    public String getName();
-
-    public String getFailedReason();
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
deleted file mode 100644
index 454009da12..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.annotations.scope;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface KService {
-
-    public String getName();
-
-    public String callL1();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
deleted file mode 100644
index 2910b1c81c..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
+++ /dev/null
@@ -1,41 +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.vtest.javaapi.annotations.scope;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface LService {
-
-    public String getName();
-    
-    public String getCurrentState();
-    
-    public String setCurrentState(String currentState);
-    
-	public int getDestroyCalledCounter();
-
-	public int getInitCalledCounter();
-
-	public int getInstanceCounter();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
deleted file mode 100644
index 81d0692d7a..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.annotations.scope;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface MService {
-
-    public String getName();
-
-    public String getFailedReason();
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
deleted file mode 100644
index 3493a88206..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.annotations.scope;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface NService {
-
-    public String getName();
-
-    public String callO1(int nthTime);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
deleted file mode 100644
index 982568b236..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
+++ /dev/null
@@ -1,41 +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.vtest.javaapi.annotations.scope;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface OService {
-
-    public String getName();
-    
-    public String getCurrentState();
-    
-    public String setCurrentState(String currentState);
-    
-	public int getDestroyCalledCounter();
-
-	public int getInitCalledCounter();
-
-	public int getInstanceCounter();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
deleted file mode 100644
index f7a57941dc..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.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 org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-	public String getName() {
-        return "AService";
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
deleted file mode 100644
index 29d6284c43..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
+++ /dev/null
@@ -1,112 +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.vtest.javaapi.annotations.scope.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.BService;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Destroy;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-	private static int instanceCounter = 0;
-
-	private static int initCalledCounter = 0;
-
-	private static int destroyCalledCounter = 0;
-
-	public AService a1;
-	
-	public String p1;
-	
-	private int currentInstanceId = 0;
-	
-	public String currentState = null;
-	
-	private boolean isInitReady = false;
-		
-	public BServiceImpl() {
-		currentInstanceId = ++instanceCounter;
-		isInitReady = false;
-	}
-
-	@Reference
-	public void setA1(AService a1) {
-		this.a1 = a1;
-	}
-
-	@Property
-	public void setP1(String p1) {
-		this.p1 = p1;
-	}
-
-	@Init
-    public void initBService() throws Exception {
-    	initCalledCounter++;
-    	if (p1.equals("p1") && a1.getName().equals("AService"))
-    		isInitReady = true;
-    }
-
-    @Destroy
-    public void destroyBService() {
-    	destroyCalledCounter++;
-    }
-    
-    public String getName() {
-        return "BService" + currentInstanceId;
-    }
-    
-    public AService getA1() {
-		return a1;
-	}
-
-    public String getP1() {
-		return p1;
-	}
-
-    public String getCurrentState() {
-		return currentState;
-	}
-
-	public String setCurrentState(String currentState) {
-		this.currentState = currentState;
-		return this.currentState;
-	}
-
-	public boolean isInitReady() {
-		return isInitReady;
-	}
-
-	public int getDestroyCalledCounter() {
-		return destroyCalledCounter;
-	}
-
-	public int getInitCalledCounter() {
-		return initCalledCounter;
-	}
-
-	public int getInstanceCounter() {
-		return instanceCounter;
-	}
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
deleted file mode 100644
index 037d900176..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
+++ /dev/null
@@ -1,114 +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.vtest.javaapi.annotations.scope.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.CService;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Scope;
-
-@Service(CService.class)
-@Scope("STATELESS")
-public class CServiceImpl implements CService {
-
-	public static int instanceCounter = 0;
-
-	public static int initCalledCounter = 0;
-
-	public static int destroyCalledCounter = 0;
-
-	public AService a1;
-	
-	public String p1;
-	
-	public int currentInstanceId = 0;
-	
-	public String currentState = null;
-	
-	public boolean isInitReady = false;
-		
-	public CServiceImpl() {
-		currentInstanceId = ++instanceCounter;
-		isInitReady = false;
-	}
-
-	@Reference
-	public void setA1(AService a1) {
-		this.a1 = a1;
-	}
-
-	@Property
-	public void setP1(String p1) {
-		this.p1 = p1;
-	}
-
-	@Init
-    public void initCService() throws Exception {
-    	initCalledCounter++;
-    	if (p1.equals("p1") && a1.getName().equals("AService"))
-    		isInitReady = true;
-    }
-
-    @Destroy
-    public void destroyCService() {
-    	destroyCalledCounter++;
-    }
-    
-    public String getName() {
-        return "CService" + currentInstanceId;
-    }
-    
-    public AService getA1() {
-		return a1;
-	}
-
-    public String getP1() {
-		return p1;
-	}
-
-    public String getCurrentState() {
-		return currentState;
-	}
-
-	public String setCurrentState(String currentState) {
-		this.currentState = currentState;
-		return this.currentState;
-	}
-
-	public boolean isInitReady() {
-		return isInitReady;
-	}
-
-	public int getDestroyCalledCounter() {
-		return destroyCalledCounter;
-	}
-
-	public int getInitCalledCounter() {
-		return initCalledCounter;
-	}
-
-	public int getInstanceCounter() {
-		return instanceCounter;
-	}
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
deleted file mode 100644
index d5f1326086..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
+++ /dev/null
@@ -1,116 +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.vtest.javaapi.annotations.scope.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.DService;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Scope;
-
-@Service(DService.class)
-@Scope("REQUEST")
-public class DServiceImpl implements DService {
-
-	public static int instanceCounter = 0;
-
-	public static int initCalledCounter = 0;
-
-	public static int destroyCalledCounter = 0;
-
-	public AService a1;
-	
-	public String p1;
-	
-	public int currentInstanceId = 0;
-	
-	public String currentState = null;
-	
-	public boolean isInitReady = false;
-	
-	public DServiceImpl() {
-		currentInstanceId = ++instanceCounter;
-		isInitReady = false;
-	}
-
-	@Reference
-	public void setA1(AService a1) {
-		this.a1 = a1;
-	}
-
-	@Property
-	public void setP1(String p1) {
-		this.p1 = p1;
-	}
-
-	@Init
-    public void initDService() throws Exception {
-    	initCalledCounter++;
-    	if (p1.equals("p1") && a1.getName().equals("AService"))
-    		isInitReady = true;
-    	System.out.println("DService" + currentInstanceId + "->initDService");
-    }
-
-    @Destroy
-    public void destroyDService() {
-    	destroyCalledCounter++;
-    	System.out.println("DService" + currentInstanceId + "->destroyDService");
-    }
-    
-    public String getName() {
-        return "DService" + currentInstanceId;
-    }
-    
-    public AService getA1() {
-		return a1;
-	}
-
-    public String getP1() {
-		return p1;
-	}
-
-    public String getCurrentState() {
-		return currentState;
-	}
-
-	public String setCurrentState(String currentState) {
-		this.currentState = "DService" + currentInstanceId + "-" + currentState;
-		return this.currentState;
-	}
-
-	public boolean isInitReady() {
-		return isInitReady;
-	}
-
-	public int getDestroyCalledCounter() {
-		return destroyCalledCounter;
-	}
-
-	public int getInitCalledCounter() {
-		return initCalledCounter;
-	}
-
-	public int getInstanceCounter() {
-		return instanceCounter;
-	}
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
deleted file mode 100644
index e2bfa3c45a..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
+++ /dev/null
@@ -1,116 +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.vtest.javaapi.annotations.scope.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.FService;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Scope;
-
-@Service(FService.class)
-@Scope("COMPOSITE")
-public class FServiceImpl implements FService {
-
-	public static int instanceCounter = 0;
-
-	public static int initCalledCounter = 0;
-
-	public static int destroyCalledCounter = 0;
-
-	public AService a1;
-	
-	public String p1;
-	
-	public int currentInstanceId = 0;
-	
-	public String currentState = null;
-	
-	public boolean isInitReady = false;
-	
-	public FServiceImpl() {
-		currentInstanceId = ++instanceCounter;
-		isInitReady = false;
-	}
-
-	@Reference
-	public void setA1(AService a1) {
-		this.a1 = a1;
-	}
-
-	@Property
-	public void setP1(String p1) {
-		this.p1 = p1;
-	}
-	
-	@Init
-    public void initFService() throws Exception {
-    	initCalledCounter++;
-    	if (p1.equals("p1") && a1.getName().equals("AService"))
-    		isInitReady = true;
-    	System.out.println("FService" + currentInstanceId + "->initFService");
-    }
-
-    @Destroy
-    public void destroyFService() {
-    	destroyCalledCounter++;
-    	System.out.println("FService" + currentInstanceId + "->destroyFService");
-    }
-    
-    public String getName() {
-        return "FService" + currentInstanceId;
-    }
-    
-    public AService getA1() {
-		return a1;
-	}
-
-    public String getP1() {
-		return p1;
-	}
-
-    public String getCurrentState() {
-		return currentState;
-	}
-
-	public String setCurrentState(String currentState) {
-		this.currentState = "FService" + currentInstanceId + "-" + currentState;
-		return this.currentState;
-	}
-
-	public boolean isInitReady() {
-		return isInitReady;
-	}
-
-	public int getDestroyCalledCounter() {
-		return destroyCalledCounter;
-	}
-
-	public int getInitCalledCounter() {
-		return initCalledCounter;
-	}
-
-	public int getInstanceCounter() {
-		return instanceCounter;
-	}
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
deleted file mode 100644
index 28b8bd84b9..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.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.vtest.javaapi.annotations.scope.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.GService;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.EagerInit;
-
-@Scope("COMPOSITE")
-@EagerInit
-public class GServiceImpl implements GService {
-
-	public static int initCalledCounter = 0;
-
-	public static int destroyCalledCounter = 0;
-	
-	public AService a1;
-	
-	public String p1;
-	
-	@Init
-    public void initGService() throws Exception {
-    	initCalledCounter++;
-    	System.out.println("GService->initGService");
-    }
-
-    @Destroy
-    public void destroyGService() {
-    	destroyCalledCounter++;
-    	System.out.println("GService->destroyGService");
-    }
-    
-	@Reference
-	public void setA1(AService a1) {
-		this.a1 = a1;
-	}
-
-	@Property
-	public void setP1(String p1) {
-		this.p1 = p1;
-	}
-	
-    public String getName() {
-        return "GService";
-    }
-    
-	public int getInitCalledCounter() {
-		return initCalledCounter;
-	}
-
-	public int getDestroyCalledCounter() {
-		return destroyCalledCounter;
-	}
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
deleted file mode 100644
index 404f329201..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
+++ /dev/null
@@ -1,86 +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.vtest.javaapi.annotations.scope.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.IService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.HService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(HService.class)
-public class HServiceImpl implements HService {
-
-	@Reference
-	public IService i1;
-	
-	public String getName() {
-        return "HService";
-    }
-
-	public String test() {
-
-		String serviceName = i1.getName();
-		String conversationIdBefore = i1.getConversationId();
-			
-		for (int i = 0; i < 10; i++) {
-			String newState = "state-" + i;
-			i1.setCurrentState(newState);
-			String currentState = i1.getCurrentState();
-			if (currentState == null || !currentState.equals(serviceName + "-" + newState)) {
-				i1.endConversation();
-				return "CurrentStateLost - " + currentState;
-			}
-		}
-
-		boolean isInitReady = i1.isInitReady();
-
-		String conversationIdAfter = i1.getConversationId();
-
-		i1.endConversation();
-
-		if (!isInitReady)
-			return "InitNotReady";
-
-		if (!conversationIdBefore.equals(conversationIdAfter))
-			return "DifferentConversationId";
-		
-		return "None";
-	}
-
-	public String testCounters(int n) {
-		int instanceCounter = i1.getInstanceCounter();
-		int initCalledCounter = i1.getInitCalledCounter();
-		int destroyCalledCounter = i1.getDestroyCalledCounter();
-		
-        System.out.println("instanceCounter=" + instanceCounter);
-        System.out.println("initCalledCounter=" + initCalledCounter);
-        System.out.println("destroyCalledCounter=" + destroyCalledCounter);
-
-		if (instanceCounter != n + 1) 
-			return "IncorrectInstanceCounter";
-		if (initCalledCounter != n + 1)
-			return "IncorrectInitCalledCounter";
-		if (destroyCalledCounter != n)
-			return "IncorrectDestroyCalledCounter";
-		
-		return "None";
-	}
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
deleted file mode 100644
index 66d14c2e96..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
+++ /dev/null
@@ -1,131 +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.vtest.javaapi.annotations.scope.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.IService;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Scope;
-
-@Service(IService.class)
-@Scope("CONVERSATION")
-public class IServiceImpl implements IService {
-
-	public static int instanceCounter = 0;
-
-	public static int initCalledCounter = 0;
-
-	public static int destroyCalledCounter = 0;
-
-    @ConversationID
-    protected String conversationId;
-    
-	public int currentInstanceId = 0;
-    
-	public AService a1;
-	
-	public String p1;
-	
-	public String currentState = null;
-	
-	public boolean isInitReady = false;
-	
-	public IServiceImpl() {
-		synchronized (IServiceImpl.class) {
-			currentInstanceId = ++instanceCounter;
-		}
-		isInitReady = false;
-	}
-
-	@Reference
-	public void setA1(AService a1) {
-		this.a1 = a1;
-	}
-
-	@Property
-	public void setP1(String p1) {
-		this.p1 = p1;
-	}
-
-	@Init
-    public void initIService() throws Exception {
-    	initCalledCounter++;
-    	if (p1.equals("p1") && a1.getName().equals("AService"))
-    		isInitReady = true;
-    	System.out.println("IService" + currentInstanceId + "->initIService");
-    }
-
-    @Destroy
-    public void destroyIService() {
-    	destroyCalledCounter++;
-    	System.out.println("IService" + currentInstanceId + "->destroyIService");
-    }
-    
-    public void endConversation() {
-    	System.out.println("IService" + currentInstanceId + "->endConversation");
-    }
-    
-    public String getName() {
-        return "IService" + currentInstanceId;
-    }
-    
-    public AService getA1() {
-		return a1;
-	}
-
-    public String getP1() {
-		return p1;
-	}
-
-    public String getCurrentState() {
-		return currentState;
-	}
-
-	public String getConversationId() {
-		return conversationId;
-	}
-
-	public String setCurrentState(String currentState) {
-		this.currentState = "IService" + currentInstanceId + "-" + currentState;
-		return this.currentState;
-	}
-
-	public boolean isInitReady() {
-		return isInitReady;
-	}
-
-	public int getDestroyCalledCounter() {
-		return destroyCalledCounter;
-	}
-
-	public int getInitCalledCounter() {
-		return initCalledCounter;
-	}
-
-	public int getInstanceCounter() {
-		return instanceCounter;
-	}
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
deleted file mode 100644
index 80546f677c..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
+++ /dev/null
@@ -1,78 +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.vtest.javaapi.annotations.scope.impl;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.KService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.JService;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Scope;
-
-@Service(JService.class)
-@Scope("COMPOSITE")
-public class JServiceImpl implements JService {
-
-	@Reference
-	public KService k1;
-	
-	public static String failedReason = "";
-	
-	public static Timer aTimer = null;
-
-	@Init
-    public void initJService() throws Exception {
-    	aTimer = new Timer();
-    	aTimer.schedule(new JTimerTask(), 1000);
-    	System.out.println("JService->initJService");
-    }
-
-    @Destroy
-    public void destroyJService() {
-    	aTimer.cancel();
-    	System.out.println("JService->destroyJService");
-    }
-    
-    public String getName() {
-        return "JService";
-    }
-    
-    public String getFailedReason() {
-        return failedReason;
-    }
-    
-	private class JTimerTask extends TimerTask {
-
-		public boolean cancel() {
-			return true;
-		}
-		
-		public void run() {
-			String result = k1.callL1();
-			if (!result.equals("None"))
-				failedReason = failedReason + ";" + result;
-		}
-		
-	}
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
deleted file mode 100644
index 022a9d11f6..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
+++ /dev/null
@@ -1,80 +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.vtest.javaapi.annotations.scope.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.KService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.LService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Scope;
-
-@Service(KService.class)
-@Scope("STATELESS")
-public class KServiceImpl implements KService {
-
-	public static int instanceCounter = 0;
-
-	public String previousL1Name = null;
-
-	public int currentInstanceId = 0;
-
-	@Reference
-	public LService l1;
-	
-	public KServiceImpl() {
-		currentInstanceId = ++instanceCounter;
-	}
-
-	
-    public String getName() {
-        return "KService"+currentInstanceId;
-    }
-    
-    public String callL1() {
-
-    	for (int i = 1; i < 11; i++) {
-    		System.out.println(getName() + " calls LService " + i + (i == 1 ? "st time:" : (i == 2 ? "nd time:" : (i == 3 ? "rd time:" : "th time"))));
-
-    		String serviceName = l1.getName();
-    		for (int j = 0; j < 10; j++) {
-    			String newState = "state-" + j;
-    			l1.setCurrentState(newState);
-    			String currentState = l1.getCurrentState();
-    			if (!currentState.equals(serviceName + "-" + newState)) {
-    				return "CurrentStateLost - " + currentState;
-    			}
-        	}
-
-    		System.out.print("    Name=" + serviceName);
-    		System.out.print(", #Instance=" + l1.getInstanceCounter());
-    		System.out.print(", #InitCalled=" + l1.getInitCalledCounter());
-    		System.out.println(", #DestroyCalled=" + l1.getDestroyCalledCounter());
-
-        	if (previousL1Name == null) {
-        		previousL1Name = serviceName;
-        	} else {
-        		if (!previousL1Name.equals(serviceName))
-        			return "DifferentLServiceInstance";
-        	}
-        }
-		return "None";
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
deleted file mode 100644
index 196cd6f39a..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
+++ /dev/null
@@ -1,83 +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.vtest.javaapi.annotations.scope.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.LService;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Scope;
-
-@Service(LService.class)
-@Scope("REQUEST")
-public class LServiceImpl implements LService {
-
-	public static int instanceCounter = 0;
-
-	public static int initCalledCounter = 0;
-
-	public static int destroyCalledCounter = 0;
-
-	public int currentInstanceId = 0;
-	
-	public String currentState = null;
-	
-	public LServiceImpl() {
-		currentInstanceId = ++instanceCounter;
-	}
-
-	@Init
-    public void initLService() throws Exception {
-    	initCalledCounter++;
-    	System.out.println("LService" + currentInstanceId + "->initLService");
-    }
-
-    @Destroy
-    public void destroyLService() {
-    	destroyCalledCounter++;
-    	System.out.println("LService" + currentInstanceId + "->destroyLService");
-    }
-    
-    public String getName() {
-        return "LService" + currentInstanceId;
-    }
-    
-    public String getCurrentState() {
-		return currentState;
-	}
-
-	public String setCurrentState(String currentState) {
-		this.currentState = "LService" + currentInstanceId + "-" + currentState;
-		return this.currentState;
-	}
-
-	public int getDestroyCalledCounter() {
-		return destroyCalledCounter;
-	}
-
-	public int getInitCalledCounter() {
-		return initCalledCounter;
-	}
-
-	public int getInstanceCounter() {
-		return instanceCounter;
-	}
-	
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
deleted file mode 100644
index acc7d8ca9e..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
+++ /dev/null
@@ -1,81 +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.vtest.javaapi.annotations.scope.impl;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.MService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.NService;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Scope;
-
-@Service(MService.class)
-@Scope("COMPOSITE")
-public class MServiceImpl implements MService {
-
-	@Reference
-	public NService n1;
-	
-	public static String failedReason = "";
-	
-	public static Timer aTimer = null;
-
-	public static int counter = 0;
-
-	@Init
-    public void initMService() throws Exception {
-    	aTimer = new Timer();
-    	aTimer.schedule(new MTimerTask(), 1000, 1000);
-    	System.out.println("MService->initMService");
-    }
-
-    @Destroy
-    public void destroyMService() {
-    	aTimer.cancel();
-    	System.out.println("MService->destroyMService");
-    }
-    
-    public String getName() {
-        return "MService";
-    }
-    
-    public String getFailedReason() {
-        return failedReason;
-    }
-    
-	private class MTimerTask extends TimerTask {
-
-		public boolean cancel() {
-			return true;
-		}
-		
-		public void run() {
-			counter++;
-			String result = n1.callO1(counter);
-			if (!result.equals("None"))
-				failedReason = failedReason + ";" + result;
-		}
-		
-	}
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
deleted file mode 100644
index b9d799331f..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
+++ /dev/null
@@ -1,85 +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.vtest.javaapi.annotations.scope.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.NService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.OService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Scope;
-
-@Service(NService.class)
-@Scope("STATELESS")
-public class NServiceImpl implements NService {
-
-	public static int instanceCounter = 0;
-
-	public String previousL1Name = null;
-
-	public int currentInstanceId = 0;
-
-	@Reference
-	public OService o1;
-	
-	public NServiceImpl() {
-		currentInstanceId = ++instanceCounter;
-	}
-
-	
-    public String getName() {
-        return "NService"+currentInstanceId;
-    }
-    
-    public String callO1(int nthTime) {
-
-    	for (int i = 1; i < 11; i++) {
-    		System.out.println(getName() + " calls OService " + i + (i == 1 ? "st time:" : (i == 2 ? "nd time:" : (i == 3 ? "rd time:" : "th time"))));
-
-    		String serviceName = o1.getName();
-    		for (int j = 0; j < 10; j++) {
-    			String newState = "state-" + j;
-    			o1.setCurrentState(newState);
-    			String currentState = o1.getCurrentState();
-    			if (!currentState.equals(serviceName + "-" + newState)) {
-    				return "CurrentStateLost - " + currentState;
-    			}
-        	}
-
-    		System.out.print("    Name=" + serviceName);
-    		System.out.print(", #Instance=" + o1.getInstanceCounter());
-    		System.out.print(", #InitCalled=" + o1.getInitCalledCounter());
-    		System.out.println(", #DestroyCalled=" + o1.getDestroyCalledCounter());
-
-        	if (previousL1Name == null) {
-        		previousL1Name = serviceName;
-        	} else {
-        		if (!previousL1Name.equals(serviceName))
-        			return "DifferentOServiceInstance";
-        	}
-        	
-        }
-    	
-    	if (o1.getInstanceCounter() < nthTime) {
-    		return "SharedSameInstance";
-    	}
-
-    	return "None";
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
deleted file mode 100644
index 60178ba2a3..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
+++ /dev/null
@@ -1,83 +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.vtest.javaapi.annotations.scope.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.OService;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Scope;
-
-@Service(OService.class)
-@Scope("REQUEST")
-public class OServiceImpl implements OService {
-
-	public static int instanceCounter = 0;
-
-	public static int initCalledCounter = 0;
-
-	public static int destroyCalledCounter = 0;
-
-	public int currentInstanceId = 0;
-	
-	public String currentState = null;
-	
-	public OServiceImpl() {
-		currentInstanceId = ++instanceCounter;
-	}
-
-	@Init
-    public void initOService() throws Exception {
-    	initCalledCounter++;
-    	System.out.println("OService" + currentInstanceId + "->initOService");
-    }
-
-    @Destroy
-    public void destroyOService() {
-    	destroyCalledCounter++;
-    	System.out.println("OService" + currentInstanceId + "->destroyOService");
-    }
-    
-    public String getName() {
-        return "OService" + currentInstanceId;
-    }
-    
-    public String getCurrentState() {
-		return currentState;
-	}
-
-	public String setCurrentState(String currentState) {
-		this.currentState = "OService" + currentInstanceId + "-" + currentState;
-		return this.currentState;
-	}
-
-	public int getDestroyCalledCounter() {
-		return destroyCalledCounter;
-	}
-
-	public int getInitCalledCounter() {
-		return initCalledCounter;
-	}
-
-	public int getInstanceCounter() {
-		return instanceCounter;
-	}
-	
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/resources/scope.composite b/java/sca-contrib/vtest/java-api/annotations/scope/src/main/resources/scope.composite
deleted file mode 100644
index 7c195b2b5d..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/resources/scope.composite
+++ /dev/null
@@ -1,110 +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://java-api-tests" name="Scope-Composite">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.AServiceImpl" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.BServiceImpl" />
-		<reference name="a1" target="AComponent"/>
-		<property name="p1">p1</property>	
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.CServiceImpl" />
-		<reference name="a1" target="AComponent"/>
-		<property name="p1">p1</property>	
-	</component>
-	
-	<component name="DComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.DServiceImpl" />
-		<reference name="a1" target="AComponent"/>
-		<property name="p1">p1</property>	
-	</component>
-	
-	<component name="FComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.FServiceImpl" />
-		<reference name="a1" target="AComponent"/>
-		<property name="p1">p1</property>	
-	</component>
-	
-	<component name="GComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.GServiceImpl" />
-		<reference name="a1" target="AComponent"/>
-		<property name="p1">p1</property>	
-	</component>
-	
-	<component name="HComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.HServiceImpl" />
-		<reference name="i1" target="IComponent"/>
-	</component>
-
-	<component name="IComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.IServiceImpl" />
-		<reference name="a1" target="AComponent"/>
-		<property name="p1">p1</property>	
-	</component>
-	
-	<component name="JComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.JServiceImpl" />
-		<reference name="k1" target="KComponent"/>
-	</component>
-	
-	<component name="KComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.KServiceImpl" />
-		<reference name="l1" target="LComponent"/>
-	</component>
-	
-	<component name="LComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.LServiceImpl" />
-	</component>
-
-	<component name="MComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.MServiceImpl" />
-		<reference name="n1" target="NComponent"/>
-	</component>
-
-	<component name="NComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.NServiceImpl" />
-		<reference name="o1" target="OComponent"/>
-	</component>
-	
-	<component name="OComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.OServiceImpl" />
-	</component>
-	
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java b/java/sca-contrib/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
deleted file mode 100644
index 6d65416ce8..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
+++ /dev/null
@@ -1,476 +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.vtest.javaapi.annotations.scope;
-
-import java.util.ArrayList;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * This test class tests the Scope annotation described in section 1.2.4
- * including 1.8.7, 1.8.8, 1.8.9, 1.8.10, 1.8.11, and 1.8.16<br>
- * <p>
- * Check following:<br>
- * <li>Number of service instances be created</li>
- * <li>Init method be called and where all property and reference injection is
- *     complete.</li>
- * <li>Destroy method be called</li>
- * <li>State be preserved in request and conversation scopes but not others</li>
- */
-public class ScopeAnnotationTestCase {
-
-    protected static String compositeName = "scope.composite";
-
-    protected static int numDThread = 5;
-    protected static int numFThread = 5;
-    protected static int numHThread = 5;
-	
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-    
-    /**
-     * Line 259:<br>
-     * <li>STATELESS</li>
-     * <p>
-     * Line 284:<br>
-     * For stateless components, there is no implied correlation between
-     * service requests.<br>
-     * <p>
-     * Line 1589 to 1591:<br>
-     * The default value is 'STATELESS'. For 'STATELESS' implementations,
-     * a different implementation instance may be used to service each request.
-     * Implementation instances may be newly created or be drawn from a pool
-     * of instances.<br>
-     * <p>
-     * BComponent is not defined '@Scope'<br>
-     * CComponent is defined '@Scope("STATELESS")'<br>
-     * <p>
-     */
-    @Test
-    public void atScope1() throws Exception {
-        System.out.println("atScope1");
-        BThread b1 = new BThread("ThreadB1");
-        BThread b2 = new BThread("ThreadB2");
-        CThread c1 = new CThread("ThreadC1");
-        CThread c2 = new CThread("ThreadC2");
-        
-        b1.start();
-        b2.start();
-        c1.start();
-        c2.start();
-        b1.join();
-        b2.join();
-        c1.join();
-        c2.join();
-        
-        System.out.println("");
-
-        Assert.assertEquals("None", b1.failedReason);
-        Assert.assertEquals("None", b2.failedReason);
-        Assert.assertEquals("None", c1.failedReason);
-        Assert.assertEquals("None", c2.failedReason);
-    }
-    
-    /**
-     * Line 260:<br>
-     * <li>REQUEST</li>
-     * <p>
-     * Lines 286 to 289:<br>
-     * The lifecycle of request scope extends from the point a request on a
-     * remotable interface enters the SCA runtime and a thread processes that
-     * request until the thread completes synchronously processing the request.
-     * During that time, all service requests will be delegated to the same
-     * implementation instance of a request-scoped component.<br>
-     * <p>
-     */
-    @Test
-    public void atScope2() throws Exception {
-        System.out.println("atScope2");
-        ArrayList<DThread> d = new ArrayList<DThread>();
-        for (int i = 0; i < numDThread; i++)
-        	d.add(new DThread("ThreadD"+i));
-        for (int i = 0; i < numDThread; i++)
-        	d.get(i).start();
-        for (int i = 0; i < numDThread; i++)
-        	d.get(i).join();
-        System.out.println("");
-        for (int i = 0; i < numDThread; i++)
-        	Assert.assertEquals("None", d.get(i).failedReason);
-    }
-    
-    /**
-     * Line 262:<br>
-     * <li>COMPOSITE</li>
-     * <p>
-     * Lines 296 to 298:<br>
-     * All service requests are dispatched to the same implementation instance
-     * for the lifetime of the containing composite. The lifetime of the
-     * containing composite is defined as the time it becomes active in the
-     * runtime to the time it is deactivated, either normally or abnormally.<br>
-     * <p>
-     * Following lines should be found at System out<br>
-     * atScope3 - Cleaning up<br>
-     * FService1->destroyFService
-     */
-    @Test
-    public void atScope3() throws Exception {
-        System.out.println("atScope3");
-        FService fService = ServiceFinder.getService(FService.class, "FComponent");
-        String serviceName = fService.getName();
-        boolean isInitReady   = fService.isInitReady();
-
-        ArrayList<FThread> f = new ArrayList<FThread>();
-        for (int i = 0; i < numFThread; i++)
-        	f.add(new FThread("ThreadF"+i));
-        for (int i = 0; i < numFThread; i++)
-        	f.get(i).start();
-        for (int i = 0; i < numFThread; i++)
-        	f.get(i).join();
-        for (int i = 0; i < numFThread; i++) {
-        	Assert.assertEquals(serviceName, f.get(i).serviceName);
-        }
-        
-        int instanceCounter   = fService.getInstanceCounter();
-        int initCalledCounter = fService.getInitCalledCounter();
-        int destroyCalledCounter = fService.getDestroyCalledCounter();
-        System.out.println("");
-        
-        Assert.assertTrue(isInitReady);
-        Assert.assertEquals(1, instanceCounter);
-        Assert.assertEquals(1, initCalledCounter);
-        Assert.assertEquals(0, destroyCalledCounter);
-    }
-    
-    /**
-     * Lines 299 to 302:<br>
-     * A composite scoped implementation may also specify eager initialization
-     * using the "@EagerInit" annotation. When marked for eager initialization,
-     * the composite scoped instance will be created when its containing
-     * component is started. If a method is marked with the "@Init" annotation,
-     * it will be called when the instance is created.<p>
-     * Section 1.8.9 "@EagerInit"<br>
-     * <p>
-     * GService is defined as eager initialization. It will be initialized
-     * when calls SCADomain.newInstance(compositeName), so the 
-     * initCalledCounter is 1.
-     */
-    @Test
-    public void atScope4() throws Exception {
-        System.out.println("atScope4");
-
-        GService gService = ServiceFinder.getService(GService.class, "GComponent");
-        int initCalledCounter    = gService.getInitCalledCounter();
-        int destroyCalledCounter = gService.getDestroyCalledCounter();
-        
-        System.out.println("initCalledCounter="+ initCalledCounter);
-        System.out.println("destroyCalledCounter="+ destroyCalledCounter);
-        System.out.println("");
-
-        Assert.assertEquals(1, initCalledCounter);
-        Assert.assertEquals(0, destroyCalledCounter);
-    }
-    
-    /**
-     * Line 261:<br>
-     * <li>CONVERSATION</li>
-     * <p>
-     * Lines 305 to 310:<br>
-     * A conversation is defined as a series of correlated interactions between
-     * a client and a target service. A conversational scope starts when the
-     * first service request is dispatched to an implementation instance
-     * offering a conversational service. A conversational scope completes
-     * after an end operation defined by the service contract is called and
-     * completes processing or the conversation expires. A conversation may be
-     * long-running and the SCA runtime may choose to passivate implementation
-     * instances. If this occurs, the runtime must guarantee implementation
-     * instance state is preserved.
-     */
-    @Test
-    public void atScope5() throws Exception {
-        System.out.println("atScope5");
-
-        ArrayList<HThread> g = new ArrayList<HThread>();
-        for (int i = 0; i < numHThread; i++)
-        	g.add(new HThread("ThreadH"+i));
-        for (int i = 0; i < numHThread; i++)
-        	g.get(i).start();
-        for (int i = 0; i < numHThread; i++)
-        	g.get(i).join();
-        
-        HService hService = ServiceFinder.getService(HService.class, "HComponent");
-        String failedReason = hService.testCounters(numHThread);
-        System.out.println("");
-
-        for (int i = 0; i < numHThread; i++)
-        	Assert.assertEquals("None", g.get(i).failedReason);
-        Assert.assertEquals("None", failedReason);
-    }
-
-    /** Lines 290 to 293:<br>
-    * There are times when a local request scoped service is called without
-    * there being a remotable service earlier in the call stack, such as when
-    * a local service is called from a non-SCA entity. In these cases, a
-    * remote request is always considered to be present, but the lifetime of
-    * the request is implementation dependent. For example, a timer event
-    * could be treated as a remote request..<br>
-    * <p>
-    * When the composite runs, composite scope service JService kicks off a
-    * timer by the @Init method.  When the timer expires, JService invokes a
-    * method that calls an operation on the reference to a stateless scope
-    * sevice KService. KService calls a request scope service LService
-    * multiple times. The results of the calls to LService should be set up to
-    * differ depending on whether the same instance is called each time -
-    * without the interface being declared Conversational.<br>
-    * <p>
-    */
-    @Test
-    public void atScope6() throws Exception {
-        System.out.println("atScope6");
-
-        JService jService = ServiceFinder.getService(JService.class, "JComponent");
-		jService.getName();
-		Thread.sleep(2000);
-		String failedReason = jService.getFailedReason();
-        System.out.println("");
-
-        Assert.assertEquals("", failedReason);
-    }
-    
-    /**
-     * Same as atScope6 but the timer triggers KService multiple times.<br>
-     */
-    @Test
-    @Ignore("TUSCANY-2256")
-    public void atScope7() throws Exception {
-        System.out.println("atScope7");
-
-        MService mService = ServiceFinder.getService(MService.class, "MComponent");
-        mService.getName();
-		Thread.sleep(6000);
-		String failedReason = mService.getFailedReason();
-        System.out.println("");
-
-        Assert.assertEquals("", failedReason);
-    }
-    
-    private  class BThread extends Thread {
-    	private String name = null;
-    	public String failedReason = "Unknown";
-    	
-    	public BThread(String name) {
-    		super();
-    		this.name = name;
-    		failedReason = "Unknown";
-    	}
-    	
-    	@Override
-    	public void run() {
-    		BService bService = ServiceFinder.getService(BService.class, "BComponent");
-    		bService.setCurrentState(name + "-state-1");
-    		System.out.println(name + "->" + bService.getName());
-    		if (!bService.isInitReady()) {
-    			failedReason = "InitNotReady";
-    			return;
-    		}
-    		if (bService.getCurrentState() != null) {
-    			failedReason = "CurrentStateNotNull";
-    			return;
-    		}
-    		int counter = bService.getInstanceCounter();
-    		if (counter < 2) {
-    			failedReason = "OnlyOneInstance - " + counter;
-    			return;
-    		}
-    		counter = bService.getInitCalledCounter();
-    		if (counter < 2) {
-    			failedReason = "InitBeCalledOnce - " + counter;
-    			return;
-    		}
-    		counter = bService.getDestroyCalledCounter();
-    		if (counter < 2) {
-    			failedReason = "DestroyBeCalledOnce - " + counter;
-    			return;
-    		}
-    		failedReason = "None";
-        }
-      }
-
-    private  class CThread extends Thread {
-    	private String name = null;
-    	public String failedReason = "Unknown";
-    	
-    	public CThread(String name) {
-    		super();
-    		this.name = name;
-    		failedReason = "Unknown";
-    	}
-    	
-    	@Override
-    	public void run() {
-    		CService cService = ServiceFinder.getService(CService.class, "CComponent");
-    		cService.setCurrentState(name + "-state-1");
-    		System.out.println(name + "->" + cService.getName());
-    		if (!cService.isInitReady()) {
-    			failedReason = "InitNotReady";
-    			return;
-    		}
-    		if (cService.getCurrentState() != null) {
-    			failedReason = "CurrentStateNotNull";
-    			return;
-    		}
-    		int counter = cService.getInstanceCounter();
-    		if (counter < 2) {
-    			failedReason = "OnlyOneInstance - " + counter;
-    			return;
-    		}
-    		counter = cService.getInitCalledCounter();
-    		if (counter < 2) {
-    			failedReason = "InitBeCalledOnce - " + counter;
-    			return;
-    		}
-    		counter = cService.getDestroyCalledCounter();
-    		if (counter < 2) {
-    			failedReason = "DestroyBeCalledOnce - " + counter;
-    			return;
-    		}
-    		failedReason = "None";
-        }
-    }
-    
-    private  class DThread extends Thread {
-    	
-    	private String name = null;
-    	public String failedReason = "Unknown";
-    	
-    	public DThread(String name) {
-    		super();
-    		this.name = name;
-    		failedReason = "Unknown";
-    	}
-    	
-    	@Override
-    	public void run() {
-    		DService dService = ServiceFinder.getService(DService.class, "DComponent");
-    		String serviceName = dService.getName();
-    		System.out.println(name + "->" + serviceName);
-    		
-    		for (int i = 0; i < 10; i++) {
-    			String newState = name + "-state-" + i;
-    			dService.setCurrentState(newState);
-    			String currentState = dService.getCurrentState();
-    			if (!currentState.equals(serviceName + "-" + newState)) {
-    				failedReason = "CurrentStateLost - " + currentState;
-    				return;
-    			}
-    		}
-    		
-    		if (!dService.isInitReady()) {
-    			failedReason = "InitNotReady";
-    			return;
-    		}
-
-    		int counter = dService.getInstanceCounter();
-    		if (counter > numDThread) {
-    			failedReason = "TooMuchInstance - " + counter;
-    			return;
-    		}
-    		
-    		counter = dService.getInitCalledCounter();
-    		if (counter > numDThread) {
-    			failedReason = "InitBeCalledTooMuch - " + counter;
-    			return;
-    		}
-    		
-    		// JIRA T-2215
-    		/* Don't know when destroy method be called
-    		counter = dService.getDestroyCalledCounter();
-    		if (counter > numDThreads) {
-    			failedReason = "DestroyBeCalledTooMuch - " + counter;
-    			return;
-    		}
-    		*/
-    		failedReason = "None";
-        }
-    }
-    
-    private  class FThread extends Thread {
-    	
-    	private String name = null;
-
-    	public String serviceName = null;
-    	
-    	public FThread(String name) {
-    		super();
-    		this.name = name;
-    	}
-    	
-    	@Override
-    	public void run() {
-    		FService fService = ServiceFinder.getService(FService.class, "FComponent");
-    		serviceName = fService.getName();
-    		System.out.println(name + "->" + serviceName);
-
-    		for (int i = 0; i < 10; i++) {
-    			String newState = name + "-state-" + i;
-    			fService.setCurrentState(newState);
-    			fService.getCurrentState();
-    		}
-        }
-    }
-    
-    private  class HThread extends Thread {
-    	
-    	public String failedReason = "Unknown";
-    	
-    	public HThread(String name) {
-    		super();
-    		failedReason = "Unknown";
-    	}
-    	
-    	@Override
-    	public void run() {
-    		HService hService = ServiceFinder.getService(HService.class, "HComponent");
-    		failedReason = hService.test();
-        }
-    }
-
-}
-
-
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/pom.xml b/java/sca-contrib/vtest/java-api/annotations/service/pom.xml
deleted file mode 100644
index 4c018607d1..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/pom.xml
+++ /dev/null
@@ -1,46 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-annotations-service</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Annotations - @Service</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
deleted file mode 100644
index 7b89b31d7f..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
+++ /dev/null
@@ -1,34 +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.vtest.javaapi.annotations.service;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AObject;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-public interface AService {
-
-    public String getName();
-
-    public String setAObject(AObject a);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
deleted file mode 100644
index 26bcf3b9db..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.annotations.service;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AObject;
-
-/**
- * Simple Local Service
- */
-public interface BService {
-
-    public String getName();
-
-    public String setAObject(AObject a);
-
-    public String testServices();
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
deleted file mode 100644
index 4f4f1e80c7..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.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.vtest.javaapi.annotations.service;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AObject;
-
-/**
- * Simple Local Service without defining "@Service" at the implementation class
- */
-public interface CService {
-
-    public String getName();
-
-    public String setAObject(AObject a);
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
deleted file mode 100644
index ffabb3619c..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
+++ /dev/null
@@ -1,28 +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.vtest.javaapi.annotations.service;
-
-/**
- * Simple Local Service
- */
-public interface DService1 {
-
-    public String getName1();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
deleted file mode 100644
index 83d7980dbc..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
+++ /dev/null
@@ -1,28 +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.vtest.javaapi.annotations.service;
-
-/**
- * Simple Local Service
- */
-public interface DService2 {
-
-    public String getName2();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
deleted file mode 100644
index a416e33de7..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
+++ /dev/null
@@ -1,28 +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.vtest.javaapi.annotations.service;
-
-/**
- * Simple Local Service
- */
-public interface DService3 {
-
-    public String getName3();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
deleted file mode 100644
index ad44d2b93a..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
+++ /dev/null
@@ -1,30 +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.vtest.javaapi.annotations.service;
-
-/**
- * Simple Local Service which implementation class defines
- * 
- * @Service() with no attributes
- */
-public interface EService {
-
-    public String getName();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
deleted file mode 100644
index 52886131a1..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
+++ /dev/null
@@ -1,30 +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.vtest.javaapi.annotations.service;
-
-/**
- * Simple Local Service which implementation class defines
- * 
- * @Service with full package name
- */
-public interface FService {
-
-    public String getName();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
deleted file mode 100644
index bd1a3a5fe6..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
+++ /dev/null
@@ -1,30 +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.vtest.javaapi.annotations.service;
-
-/**
- * Simple Local Service
- */
-public interface GService1 {
-
-    public String getName();
-
-    public String getServiceName();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
deleted file mode 100644
index 0f8c7dabcb..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
+++ /dev/null
@@ -1,26 +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.vtest.javaapi.annotations.service;
-
-/**
- * Simple Local Service
- */
-public interface GService2 extends GService1 {
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
deleted file mode 100644
index 6a80e3023e..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
+++ /dev/null
@@ -1,50 +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.vtest.javaapi.annotations.service;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AObject;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-public interface HService {
-
-    public String getName();
-
-    public String setAObject1(AObject a);
-
-    public String setAObject2(AObject a);
-
-    public String getComponentName();
-    
-    public String getAObject1String();
-
-    public String getAObject2String();
-
-    public String getAObject3String();
-
-    public AObject getAObject3();
-    
-    public String getServiceName1();
-    
-    public String getServiceName2();
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
deleted file mode 100644
index cdeb43c4f4..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
+++ /dev/null
@@ -1,54 +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.vtest.javaapi.annotations.service;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AObject;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-public interface IService {
-
-    public String getName();
-
-    public String setAObject1(AObject a);
-
-    public String setAObject2(AObject a);
-
-    public void setComponentName1(String componentName1);
-    
-    public String getComponentName1();
-    
-    public String getComponentName2();
-    
-    public String getAObject1String();
-
-    public String getAObject2String();
-
-    public String getAObject3String();
-    
-    public AObject getAObject3();
-    
-    public String getServiceName1();
-    
-    public String getServiceName2();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
deleted file mode 100644
index 0ab2e29194..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.annotations.service.impl;
-
-/**
- * A simple object to hold a string
- */
-public class AObject {
-
-    public String aString;
-
-    public AObject() {
-        this.aString = null;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
deleted file mode 100644
index b9617e5780..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.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.vtest.javaapi.annotations.service.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.AService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    public String getName() {
-        return "AService";
-    }
-
-    public String setAObject(AObject a) {
-        a.aString = "AService";
-        return "AService";
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
deleted file mode 100644
index 474ca084d6..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
+++ /dev/null
@@ -1,111 +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.vtest.javaapi.annotations.service.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.BService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.CService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.HService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.IService;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.Reference;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-	@Reference(required=false)
-	public AService aService = null;
-	
-	@Reference(required=false)
-	public CService cService = null;
-
-	@Reference(required=false)
-	public HService hService = null;
-
-	@Reference(required=false)
-	public IService iService = null;
-
-    public String getName() {
-        return "BService";
-    }
-
-    public String setAObject(AObject a) {
-        a.aString = "BService";
-        return "BService";
-    }
-    
-    public String testServices() {
-    	
-    	AObject a = new AObject();
-    	aService.setAObject(a);
-    	if (a.aString != null)
-    		return "AServiceNotPassByValue";
-    	
-    	AObject c = new AObject();
-    	cService.setAObject(c);
-    	if (c.aString == null || !c.aString.equals("CService"))
-    		return "CServiceNotPassByReference";
-    	
-
-    	AObject h1 = new AObject();
-    	hService.setAObject1(h1);
-    	if (h1.aString == null || !h1.aString.equals("HService"))
-    		return "HServiceSetAObject1NotPassByReference";
-    	h1.aString = "testServices";
-    	if (!hService.getAObject1String().equals("testServices"))
-    		return "HServiceGetAObject1NotPassByReference";
-    	
-    	AObject h2 = new AObject();
-    	hService.setAObject2(h2);
-    	if (h2.aString != null)
-    		return "HServiceSetAObject2NotPassByValue";
-    	h2.aString = "testServices";
-    	if (!hService.getAObject2String().equals("HService"))
-    		return "HServiceGetAObject1NotPassByValue";
-    	
-    	AObject h3 = hService.getAObject3();
-        h3.aString = "testServices";
-    	if (!hService.getAObject3String().equals("HService"))
-    		return "HServiceGetAObject3NotPassByValue";
-        
-    	AObject i1 = new AObject();
-    	iService.setAObject1(i1);
-    	if (i1.aString == null || !i1.aString.equals("IService"))
-    		return "IServiceSetAObject1NotPassByReference";
-    	i1.aString = "testServices";
-    	if (!iService.getAObject1String().equals("testServices"))
-    		return "IServiceGetAObject1NotPassByReference";
-
-    	AObject i2 = new AObject();
-    	iService.setAObject2(i2);
-    	if (i2.aString == null || !i2.aString.equals("IService"))
-    		return "IServiceSetAObject2NotPassByReference";
-    	i2.aString = "testServices";
-    	if (!iService.getAObject2String().equals("testServices"))
-    		return "IServiceGetAObject2NotPassByReference";
-
-        AObject i3 = iService.getAObject3();
-        i3.aString = "testServices";
-    	if (!iService.getAObject3String().equals("testServices"))
-    		return "IServiceGetAObject3NotPassByReference";
-
-    	return "None";
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
deleted file mode 100644
index 3fc23d2f68..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
+++ /dev/null
@@ -1,34 +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.vtest.javaapi.annotations.service.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.CService;
-
-public class CServiceImpl implements CService {
-
-    public String getName() {
-        return "CService";
-    }
-
-    public String setAObject(AObject a) {
-        a.aString = "CService";
-        return "CService";
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
deleted file mode 100644
index 5b3c73ddd8..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
+++ /dev/null
@@ -1,41 +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.vtest.javaapi.annotations.service.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.DService1;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.DService2;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.DService3;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(interfaces = {DService1.class, DService2.class})
-public class DServiceImpl implements DService1, DService2, DService3 {
-
-    public String getName1() {
-        return "DService1";
-    }
-
-    public String getName2() {
-        return "DService2";
-    }
-
-    public String getName3() {
-        return "DService3";
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
deleted file mode 100644
index 321d019932..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.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 org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.EService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service()
-public class EServiceImpl implements EService {
-
-    public String getName() {
-        return "EService";
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
deleted file mode 100644
index f28fa0c3a7..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.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.vtest.javaapi.annotations.service.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.FService;
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(org.apache.tuscany.sca.vtest.javaapi.annotations.service.FService.class)
-public class FServiceImpl implements FService {
-
-    @Context
-    public RequestContext requestContext;
-    
-    public String getName() {
-        return requestContext.getServiceName();
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
deleted file mode 100644
index 79051eea8f..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
+++ /dev/null
@@ -1,26 +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.vtest.javaapi.annotations.service.impl;
-
-import org.oasisopen.sca.annotation.Service;
-
-@Service(FServiceImpl2.class)
-public class FServiceImpl2 extends FServiceImpl  {
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
deleted file mode 100644
index 161cbaa620..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
+++ /dev/null
@@ -1,42 +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.vtest.javaapi.annotations.service.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.GService1;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.GService2;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.RequestContext;
-
-@Service(interfaces = {GService1.class, GService2.class})
-public class GServiceImpl implements GService1 {
-
-    @Context
-    public RequestContext requestContext;
-
-    public String getName() {
-        return "GService";
-    }
-
-    public String getServiceName() {
-        return requestContext.getServiceName();
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
deleted file mode 100644
index 02e67b645b..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
+++ /dev/null
@@ -1,105 +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.vtest.javaapi.annotations.service.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.HService;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.annotation.ComponentName;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-
-@Service(HService.class)
-@Scope("REQUEST")
-public class HServiceImpl implements HService {
-
-	@ComponentName
-	protected String componentName; 
-	
-	private AObject aObject1 = null;
-
-	private AObject aObject2 = null;
-
-	private AObject aObject3 = null;
-	
-    public RequestContext requestContext;
-    
-    public ComponentContext componentContext;
-    
-    public String getName() {
-        return "HService";
-    }
-
-    @AllowsPassByReference
-    public String setAObject1(AObject a) {
-        a.aString = "HService";
-        aObject1 = a;
-        return "HService";
-    }
-
-    public String setAObject2(AObject a) {
-        a.aString = "HService";
-        aObject2 = a;
-        return "HService";
-    }
-
-    @Context
-	public void setComponentContext(ComponentContext componentContext) {
-		this.componentContext = componentContext;
-	}
-
-    @Context
-	public void setRequestContext(RequestContext requestContext) {
-		this.requestContext = requestContext;
-	}
-
-	public String getComponentName() {
-		return componentName;
-	}
-
-    public String getAObject1String() {
-        return aObject1.aString;
-    }
-    
-    public String getAObject2String() {
-        return aObject2.aString;
-    }
-
-    public String getAObject3String() {
-        return aObject3.aString;
-    }
-
-    public AObject getAObject3() {
-    	aObject3 = new AObject();
-    	aObject3.aString = "HService";
-        return aObject3;
-    }
-    
-    public String getServiceName1() {
-        return requestContext.getServiceName();
-    }
-    
-    public String getServiceName2() {
-        return componentContext.getRequestContext().getServiceName();
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java b/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
deleted file mode 100644
index ea08149eaf..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
+++ /dev/null
@@ -1,107 +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.vtest.javaapi.annotations.service.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.IService;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.ComponentName;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(IService.class)
-@Scope("REQUEST")
-@AllowsPassByReference
-public class IServiceImpl implements IService {
-
-	@ComponentName
-	public String componentName1; 
-
-	public String componentName2; 
-
-	private AObject aObject1 = null;
-
-	private AObject aObject2 = null;
-
-	private AObject aObject3 = null;
-
-    @Context
-    public RequestContext requestContext;
-    
-    @Context
-    public ComponentContext componentContext;
-    
-    public String getName() {
-        return "IService";
-    }
-
-    public String setAObject1(AObject a) {
-        a.aString = "IService";
-        aObject1 = a;
-        return "IService";
-    }
-
-    public String setAObject2(AObject a) {
-        a.aString = "IService";
-        aObject2 = a;
-        return "IService";
-    }
-
-	@ComponentName
-	public void setComponentName1(String componentName1) {
-		this.componentName2 = componentName1;
-	}
-
-    public String getAObject1String() {
-        return aObject1.aString;
-    }
-
-    public String getAObject2String() {
-        return aObject2.aString;
-    }
-
-    public String getAObject3String() {
-        return aObject3.aString;
-    }
-
-    public AObject getAObject3() {
-    	aObject3 = new AObject();
-    	aObject3.aString = "IService";
-        return aObject3;
-    }
-
-	public String getComponentName1() {
-		return componentName1;
-	}
-
-	public String getComponentName2() {
-		return componentName2;
-	}
-
-    public String getServiceName1() {
-        return requestContext.getServiceName();
-    }
-    
-    public String getServiceName2() {
-        return componentContext.getRequestContext().getServiceName();
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/resources/service.composite b/java/sca-contrib/vtest/java-api/annotations/service/src/main/resources/service.composite
deleted file mode 100644
index 0731986df2..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/resources/service.composite
+++ /dev/null
@@ -1,82 +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://java-api-tests" name="Service-Composite">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AServiceImpl" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.BServiceImpl" />
-	</component>
-
-	<component name="BComponent1">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.BServiceImpl" />
-		<reference name="aService" target="AComponent"/>	
-		<reference name="cService" target="CComponent"/>	
-		<reference name="hService" target="HComponent"/>	
-		<reference name="iService" target="IComponent"/>	
-	</component>
-
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.CServiceImpl" />
-	</component>
-
-	<component name="DComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.DServiceImpl" />
-	</component>
-
-	<component name="EComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.EServiceImpl" />
-	</component>
-
-	<component name="FComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.FServiceImpl" />
-	</component>
-
-	<component name="FComponent2">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.FServiceImpl2" />
-	</component>
-
-	<component name="GComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.GServiceImpl" />
-	</component>
-	
-	<component name="HComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.HServiceImpl" />
-	</component>
-	
-	<component name="IComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.IServiceImpl" />
-	</component>
-	
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java b/java/sca-contrib/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
deleted file mode 100644
index 52f7821ebb..0000000000
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
+++ /dev/null
@@ -1,335 +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.vtest.javaapi.annotations.service;
-
-import static org.junit.Assert.fail;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AObject;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.FServiceImpl2;
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This test class tests the Service annotation described in section 1.2.1
- * including 1.3.1, 1.8.1, 1.8.3, 1.8.6, 1.8.15 and 1.8.17<br>
- * but not..<br>
- * <li>Lines 1531 to 1534</li>
- */
-public class ServiceAnnotationTestCase {
-
-    protected static String compositeName = "service.composite";
-    protected static AService aService = null;
-    protected static BService bService = null;
-    protected static BService bService1 = null;
-    protected static HService hService = null;
-    protected static IService iService = null;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            aService = ServiceFinder.getService(AService.class, "AComponent");
-            bService = ServiceFinder.getService(BService.class, "BComponent");
-            bService1 = ServiceFinder.getService(BService.class, "BComponent1");
-            hService = ServiceFinder.getService(HService.class, "HComponent");
-            iService = ServiceFinder.getService(IService.class, "IComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-
-    }
-
-    /**
-     * Line 215:<br>
-     * <li>As a Java interface</li>
-     * <p>
-     * Line 1622 to 1623:<br>
-     * The
-     * 
-     * @Service annotation type is used on a component implementation class to
-     *          specify the SCA services offered by the implementation.<br>
-     */
-    @Test
-    public void atService1() throws Exception {
-        Assert.assertEquals("AService", aService.getName());
-    }
-
-    /**
-     * Line 216:<br>
-     * <li>As a Java class</li>
-     * <p>
-     * Line 1631:<br>
-     * <li>value – A shortcut for the case when the class provides only a
-     * single service interface.</li>
-     */
-    @Test
-    public void atService2() throws Exception {
-        Assert.assertEquals("BService", bService.getName());
-    }
-
-    /**
-     * Lines 222 to 224:<br>
-     * A remotable service is defined using the "@Remotable" annotation on the
-     * Java interface that defines the service. Remotable services are intended
-     * to be used for coarse grained services, and the parameters are passed
-     * by-value.<br>
-     * <p>
-     * Lines 321 to 323:<br>
-     * The "@Remotable" annotation on a Java interface indicates that the
-     * interface is designed to be used for remote communication. Remotable
-     * interfaces are intended to be used for coarse grained services.
-     * Operations parameters and return values are passed by-value.<br>
-     */
-    @Test
-    public void atService3() throws Exception {
-        AObject o = new AObject();
-        Assert.assertEquals("AService", aService.setAObject(o));
-        Assert.assertNull(o.aString);
-    }
-
-    /**
-     * Lines 227 to 242:<br>
-     * A local service can only be called by clients that are deployed within
-     * the same address space as the component implementing the local service.<br>
-     * ...<br>
-     * The data exchange semantic for calls to local services is by-reference.<br>
-     * ...<br>
-     * Lines 996 to 1028:<br>
-     * 1.8.1 "@AllowsPassByReference"<br>
-     * ...<br>
-     * Lines 1535 to 1540:<br>
-     * Independent of whether the remotable service is called from outside of
-     * the composite that contains it or from another component in the same
-     * composite, the data exchange semantics are by-value.<br>
-     * Implementations of remotable services may modify input data during or
-     * after an invocation and may modify return data after the invocation. If a
-     * remotable service is called locally or remotely, the SCA container is
-     * responsible for making sure that no modification of input data or
-     * post-invocation modifications to return data are seen by the caller.<br>
-     * <p>
-     * Test under Non-SCA <-> SCA
-     * <li>BService is local service to test by reference</li>
-     * <li>HService is remotable service to test "@AllowsPassByReference" at
-     * method level</li>
-     * <li>IService is remotable service to test "@AllowsPassByReference" at
-     * class level</li>
-     */
-    @Test
-    public void atService4() throws Exception {
-        AObject b = new AObject();
-        Assert.assertEquals("BService", bService.setAObject(b));
-        Assert.assertEquals("BService", b.aString);
-
-        AObject h1 = new AObject();
-        Assert.assertEquals("HService", hService.setAObject1(h1));
-        Assert.assertEquals("HService", h1.aString);
-        h1.aString = "atService4";
-        Assert.assertEquals("atService4", hService.getAObject1String());
-
-        AObject h2 = new AObject();
-        Assert.assertEquals("HService", hService.setAObject2(h2));
-        Assert.assertNull(h2.aString);
-        h2.aString = "atService4";
-        Assert.assertEquals("HService", hService.getAObject2String());
-
-        AObject h3 = hService.getAObject3();
-        h3.aString = "atService4";
-        Assert.assertEquals("HService", hService.getAObject3String());
-
-        AObject i1 = new AObject();
-        Assert.assertEquals("IService", iService.setAObject1(i1));
-        Assert.assertEquals("IService", i1.aString);
-        i1.aString = "atService4";
-        Assert.assertEquals("atService4", iService.getAObject1String());
-
-        AObject i2 = new AObject();
-        Assert.assertEquals("IService", iService.setAObject2(i2));
-        Assert.assertEquals("IService", i2.aString);
-        i2.aString = "atService4";
-        Assert.assertEquals("atService4", iService.getAObject2String());
-
-        AObject i3 = iService.getAObject3();
-        i3.aString = "atService4";
-        Assert.assertEquals("atService4", iService.getAObject3String());
-    }
-
-    /**
-     * Line 1624 to 1627:<br>
-     * A class used as the implementation of a service is not required to have
-     * an "@Service" annotation. If a class has no "@Service" annotation, then
-     * the rules determining which services are offered and what interfaces
-     * those services have are determined by the specific implementation type.
-     * <br>
-     */
-    @Test
-    public void atService5() throws Exception {
-        CService cService = ServiceFinder.getService(CService.class, "CComponent");
-        Assert.assertEquals("CService", cService.getName());
-    }
-
-    /**
-     * Line 1623 to 1624:<br>
-     * The class need not be declared as implementing all of the interfaces
-     * implied by the services, but all methods of the service interfaces must
-     * be present.<br>
-     * <p>
-     * Line 1629 to 1630:<br>
-     * <li>interfaces – The value is an array of interface or class objects
-     * that should be exposed as services by this component.</li>
-     */
-    @Test
-    public void atService6() throws Exception {
-        DService1 dService1 = ServiceFinder.getService(DService1.class, "DComponent/DService1");
-        Assert.assertEquals("DService1", dService1.getName1());
-        DService2 dService2 = ServiceFinder.getService(DService2.class, "DComponent/DService2");
-        Assert.assertEquals("DService2", dService2.getName2());
-        try {
-            ServiceFinder.getService(DService3.class, "DComponent/DService3");
-            fail("Should have failed to get this service");
-        } catch (Exception e) {
-            // Expect an exception
-        }
-    }
-
-    /**
-     * Line 1635 to 1636:<br>
-     * A "@Service" annotation with no attributes is meaningless, it is the same
-     * as not having the annotation there at all.<br>
-     */
-    @Test
-    public void atService7() throws Exception {
-        EService eService = ServiceFinder.getService(EService.class, "EComponent");
-        Assert.assertEquals("EService", eService.getName());
-    }
-
-    /**
-     * Line 1637 to 1638:<br>
-     * The service names of the defined services default to the names of the
-     * interfaces or class, without the package name.<br>
-     */
-    @Test
-    public void atService8() throws Exception {
-        FService fService = ServiceFinder.getService(FService.class, "FComponent");
-        Assert.assertEquals("FService", fService.getName());
-        FServiceImpl2 fServiceImpl2 = ServiceFinder.getService(FServiceImpl2.class, "FComponent2");
-        Assert.assertEquals("FServiceImpl2", fServiceImpl2.getName());
-        fService = ServiceFinder.getService(FService.class, "FComponent2");
-        Assert.assertEquals("FServiceImpl2", fService.getName());
-    }
-
-    /**
-     * Line 1639 to 1641:<br>
-     * If a Java implementation needs to realize two services with the same
-     * interface, then this is achieved through subclassing of the interface.
-     * The subinterface must not add any methods. Both interfaces are listed in
-     * the "@Service" annotation of the Java implementation class. <br>
-     */
-    @Test
-    public void atService9() throws Exception {
-        GService1 gService1 = ServiceFinder.getService(GService1.class, "GComponent/GService1");
-        GService2 gService2 = ServiceFinder.getService(GService2.class, "GComponent/GService2");
-        Assert.assertEquals("GService", gService1.getName());
-        Assert.assertEquals("GService1", gService1.getServiceName());
-        Assert.assertEquals("GService", gService2.getName());
-        Assert.assertEquals("GService2", gService2.getServiceName());
-    }
-
-    /**
-     * Lines 227 to 242:<br>
-     * A local service can only be called by clients that are deployed within
-     * the same address space as the component implementing the local service.<br>
-     * ...<br>
-     * The data exchange semantic for calls to local services is by-reference.<br>
-     * ...<br>
-     * Lines 996 to 1028:<br>
-     * 1.8.1 "@AllowsPassByReference"<br>
-     * ...<br>
-     * Lines 1535 to 1540:<br>
-     * Independent of whether the remotable service is called from outside of
-     * the composite that contains it or from another component in the same
-     * composite, the data exchange semantics are by-value.<br>
-     * Implementations of remotable services may modify input data during or
-     * after an invocation and may modify return data after the invocation. If a
-     * remotable service is called locally or remotely, the SCA container is
-     * responsible for making sure that no modification of input data or
-     * post-invocation modifications to return data are seen by the caller.<br>
-     * <p>
-     * Test under SCA <-> SCA<br>
-     * <li>AService is remotable service to test by value</li>
-     * <li>CService is local service to test by-reference</li>
-     * <li>HService is remotable service to test "@AllowsPassByReference" at
-     * method level</li>
-     * <li>IService is remotable service to test "@AllowsPassByReference" at
-     * class level</li>
-     */
-    @Test
-    public void atService10() throws Exception {
-        Assert.assertEquals("None", bService1.testServices());
-    }
-
-    /**
-     * Lines 1095 to 1124:<br>
-     * 1.8.3. "@ComponentName"<br>
-     * ...<br>
-     * The "@ComponentName" annotation type is used to annotate a Java class
-     * field or setter method that is used to inject the component name.<br>
-     * ...<br>
-     */
-    @Test
-    public void atService11() throws Exception {
-        Assert.assertEquals("HComponent", hService.getComponentName());
-        Assert.assertNull(iService.getComponentName1());
-        Assert.assertEquals("IComponent", iService.getComponentName2());
-    }
-
-    /**
-     * Lines 1164 to 1187:<br>
-     * 1.8.6. "@Context"<br>
-     * ...<br>
-     * The "@Context" annotation type is used to annotate a Java class field or
-     * a setter method that is used to inject a composite context for the
-     * component. The type of context to be injected is defined by the type of
-     * the Java class field or type of the setter method input argument, the
-     * type is either ComponentContext or RequestContext.<br>
-     * ...<br>
-     * <p>
-     * HService - "@Context" is used to annotate setter methods<br>
-     * IService - "@Context" is used to annotate class fields<br>
-     * <br>
-     */
-    @Test
-    public void atService12() throws Exception {
-        Assert.assertEquals("HService", hService.getServiceName1());
-        Assert.assertEquals("HService", hService.getServiceName2());
-        Assert.assertEquals("IService", iService.getServiceName1());
-        Assert.assertEquals("IService", iService.getServiceName2());
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/pom.xml b/java/sca-contrib/vtest/java-api/apis/callablereference/pom.xml
deleted file mode 100644
index fff1689569..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/pom.xml
+++ /dev/null
@@ -1,45 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-apis</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-apis-callablereference</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - APIs - CallableReference</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java b/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
deleted file mode 100644
index a7040f944e..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
+++ /dev/null
@@ -1,38 +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.vtest.javaapi.apis.callablereference;
-
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Service A.
- */
-@Conversational
-public interface AComponent {
-
-    public String getName();
-
-    public String getServiceName();
-    public String getBusinessInterfaceName();
-    public boolean isConversational();
-    public void testConversationID();
-    public String getCallbackResult();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java b/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
deleted file mode 100644
index 707568e507..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
+++ /dev/null
@@ -1,26 +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.vtest.javaapi.apis.callablereference;
-
-public interface BCallback {
-
-    public void processResults(String result);        
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java b/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
deleted file mode 100644
index 18fcaee6ee..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
+++ /dev/null
@@ -1,38 +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.vtest.javaapi.apis.callablereference;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Service B.
- */
-@Conversational
-@Callback(BCallback.class)
-public interface BComponent {
-
-    public String getName();
-    
-    public void testCallback();
-    public void testConversationID();
-    public void testNonNullConversation();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
deleted file mode 100644
index 70a257d19f..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
+++ /dev/null
@@ -1,104 +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.vtest.javaapi.apis.callablereference.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.AComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.BCallback;
-import org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.BComponent;
-import org.junit.Assert;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AComponent.class)
-@Scope("CONVERSATION")
-public class AComponentImpl implements AComponent, BCallback {
-
-    private static Object monitor = new Object();
-    private static String returnMessage = null;
-
-    protected ComponentContext componentContext;
-    
-    @Reference
-    protected CallableReference<BComponent> bReference;
-
-    @ConversationID
-    protected String cid;
-
-    public String getName() {
-        return "ComponentA";
-    }
-
-    @Context
-    public void setComponentContext(ComponentContext context) {
-        this.componentContext = context;
-    }
-
-    public String getServiceName() {
-        return bReference.getService().getName();
-    }
-
-    public String getBusinessInterfaceName() {
-        return bReference.getBusinessInterface().getSimpleName();
-    }
-
-    public boolean isConversational() {
-        return bReference.isConversational();
-    }
-
-    public void testConversationID() {
-        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
-        bSR.setConversationID("AConversationID");
-        bSR.getService().testConversationID();
-
-        Assert.assertEquals("AConversationID", bSR.getConversation().getConversationID());
-    }
-
-    public String getCallbackResult() {
-        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
-        String cbID = "ComponentACallBack";
-        bSR.setCallbackID(cbID);
-        bSR.getService().testCallback();
-
-        // Wait for 30s max.
-        int count = 0;
-        synchronized(monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        return returnMessage;
-    }
-
-    public void processResults(String result) {
-        returnMessage = result;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
deleted file mode 100644
index ea4c71d27a..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
+++ /dev/null
@@ -1,70 +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.vtest.javaapi.apis.callablereference.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.BCallback;
-import org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.BComponent;
-import org.junit.Assert;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BComponent.class)
-@Scope("CONVERSATION")
-public class BComponentImpl implements BComponent {
-
-    protected ComponentContext componentContext;
-    
-    @Callback
-    protected BCallback callback;
-
-    @ConversationID
-    protected String cid;
-
-    @Context
-    public void setComponentContext(ComponentContext context) {
-        this.componentContext = context;
-    }
-
-    public String getName() {
-        return "ComponentB";
-    }
-
-    public void testCallback() {
-        callback = componentContext.getRequestContext().getCallback();
-        callback.processResults("CallBackFromB");
-
-        CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
-        Assert.assertEquals("ComponentACallBack", bCR.getCallbackID());
-    }
-
-    public void testConversationID() {
-        Assert.assertEquals("AConversationID", cid);
-    }
-
-    public void testNonNullConversation() {
-        Assert.assertNotNull(componentContext.getRequestContext().getServiceReference().getConversation());
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite b/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
deleted file mode 100644
index f997d78bb5..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
+++ /dev/null
@@ -1,34 +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"
-	targetNamespace="http://java-api-tests"
-	name="CallableReference-Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.impl.AComponentImpl"/>
-	    <reference name="bReference" target="BComponent"/>
-     </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.impl.BComponentImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java b/java/sca-contrib/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
deleted file mode 100644
index 4d0d8338ba..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
+++ /dev/null
@@ -1,118 +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.vtest.javaapi.apis.callablereference;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This test class tests the CallableReference interface described in 1.7.3 of
- * the SCA Java Annotations & APIs Specification 1.0.
- */
-public class CallableReferenceTestCase {
-
-    protected static String compositeName = "callablereference.composite";
-    protected static AComponent a;
-    protected static BComponent b;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            a = ServiceFinder.getService(AComponent.class, "AComponent");
-            b = ServiceFinder.getService(BComponent.class, "BComponent");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-
-    /**
-     * Lines 884 <br>
-     * getService() - Returns a type-safe reference to the target of this
-     * reference. The instance returned is guaranteed to implement the business
-     * interface for this reference. The value returned is a proxy to the target
-     * that implements the business interface associated with this reference.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testGetService() throws Exception {
-        Assert.assertEquals("ComponentB", a.getServiceName());
-    }
-
-    /**
-     * Lines 885 <br>
-     * getBusinessInterface() – Returns the Java class for the business
-     * interface associated with this reference.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testGetBusinessInterface() throws Exception {
-        Assert.assertEquals("BComponent", a.getBusinessInterfaceName());
-    }
-
-    /**
-     * Lines 886 <br>
-     * isConversational() – Returns true if this reference is conversational.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testIsConversational() throws Exception {
-        Assert.assertEquals(true, a.isConversational());
-    }
-
-    /**
-     * Lines 887 <br>
-     * getConversation() – Returns the conversation associated with this
-     * reference. Returns null if no conversation is currently active.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testGetConversation() throws Exception {
-        a.testConversationID();
-        b.testNonNullConversation();
-    }
-
-    /**
-     * Lines 888 <br>
-     * getCallbackID() – Returns the callback ID.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testGetCallbackID() throws Exception {
-        // Actual test is in BComponentImpl. Below is an extra test.
-        Assert.assertEquals("CallBackFromB", a.getCallbackResult());
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/pom.xml b/java/sca-contrib/vtest/java-api/apis/componentcontext/pom.xml
deleted file mode 100644
index 0a2d12a41e..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/pom.xml
+++ /dev/null
@@ -1,45 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-apis</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-apis-componentcontext</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - APIs - ComponentContext</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java b/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
deleted file mode 100644
index b2c8c07866..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
+++ /dev/null
@@ -1,42 +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.vtest.javaapi.apis.componentcontext;
-
-/**
- * Simple Service A.
- */
-public interface AComponent {
-
-    public String getName();
-
-    public String getContextURI();
-    public String getServiceBName();
-    public String getServiceReferenceBName();
-    public String getSelfReferenceName();
-    public String getProperty();
-    public String getRequestContextServiceName();
-    public String getCastCallableReferenceServiceName();
-    public String getCastServiceReferenceServiceName();
-    public void illegalCast();
-
-    public String testServiceLookup();
-    public String getRequestContextContent();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java b/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
deleted file mode 100644
index 7e425c740f..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
+++ /dev/null
@@ -1,29 +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.vtest.javaapi.apis.componentcontext;
-
-/**
- * Simple Service B.
- */
-public interface BComponent {
-
-    String getName();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java b/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
deleted file mode 100644
index d7799bb3aa..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
+++ /dev/null
@@ -1,34 +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.vtest.javaapi.apis.componentcontext;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service B.
- */
-@Remotable
-public interface BService {
-
-    String getBName();
-
-    String getSelfReferenceWithServiceName();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java b/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
deleted file mode 100644
index d0da012f6f..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
+++ /dev/null
@@ -1,29 +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.vtest.javaapi.apis.componentcontext;
-
-/**
- * Simple Service C.
- */
-public interface CService {
-
-    String getCName();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java b/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
deleted file mode 100644
index 079d859f74..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
+++ /dev/null
@@ -1,29 +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.vtest.javaapi.apis.componentcontext;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface DComponent {
-
-    public String getName();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
deleted file mode 100644
index 06a71c29ac..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
+++ /dev/null
@@ -1,124 +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.vtest.javaapi.apis.componentcontext.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.AComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.BService;
-import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.DComponent;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AComponent.class)
-@Scope("COMPOSITE")
-@EagerInit
-public class AComponentImpl implements AComponent {
-
-    public static String rcContent = null;
-
-    protected ComponentContext componentContext;
-    
-    @Reference
-    protected BService bReference;
-    
-    @Reference
-    protected DComponent dReference;    
-
-    @Property(name="aProperty", required=true)
-    protected String aProperty;
-
-    public String getName() {
-        return "ComponentA";
-    }
-
-    @Context
-    public void setComponentContext(ComponentContext context) {
-        this.componentContext = context;
-    }
-
-    @Init
-    public void init() {
-        RequestContext rc = componentContext.getRequestContext();
-        if (rc != null) {
-            rcContent = "NotNull";
-        } else {
-            rcContent = "Null";
-        }
-    }
-
-    public String getContextURI() {
-        return componentContext.getURI();
-    }
-
-    public String getServiceBName() {
-        return componentContext.getService(BService.class, "bReference").getBName();
-    }
-
-    public String getServiceReferenceBName() {
-        ServiceReference<BService> bSR = componentContext.getServiceReference(BService.class, "bReference");
-        return bSR.getService().getBName();
-    }
-
-    public String getSelfReferenceName() {
-        ServiceReference<AComponent> aSR = componentContext.createSelfReference(AComponent.class);
-        return aSR.getService().getName();
-    }
-
-    public String getProperty() {
-        return componentContext.getProperty(String.class, "aProperty");
-    }
-
-    public String getRequestContextServiceName() {
-        return componentContext.getRequestContext().getServiceName();
-    }
-
-    public String getCastCallableReferenceServiceName() {
-        BService b = componentContext.getService(BService.class, "bReference");
-        CallableReference<BService> bCR = componentContext.cast(b);
-        return bCR.getService().getBName();
-    }
-
-    public String getCastServiceReferenceServiceName() {
-        BService b = componentContext.getService(BService.class, "bReference");
-        ServiceReference<BService> bSR = componentContext.cast(b);
-        return bSR.getService().getBName();
-    }
-
-    public void illegalCast() {
-        componentContext.cast("");
-    }
-
-    public String testServiceLookup() {
-        return componentContext.getService(DComponent.class, "dReference").getName();
-    }
-
-    public String getRequestContextContent() {
-        return rcContent;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
deleted file mode 100644
index e508687965..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
+++ /dev/null
@@ -1,121 +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.vtest.javaapi.apis.componentcontext.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.AComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.BService;
-import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.DComponent;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AComponent.class)
-@Scope("COMPOSITE")
-@EagerInit
-public class AUnannotatedComponentImpl implements AComponent {
-
-    public static String rcContent = null;
-
-    protected ComponentContext componentContext;
-    
-    protected BService bReference;
-    
-    protected DComponent dReference;    
-
-    protected String aProperty;
-
-    public String getName() {
-        return "ComponentA";
-    }
-
-    @Context
-    public void setComponentContext(ComponentContext context) {
-        this.componentContext = context;
-    }
-
-    @Init
-    public void init() {
-        RequestContext rc = componentContext.getRequestContext();
-        if (rc != null) {
-            rcContent = "NotNull";
-        } else {
-            rcContent = "Null";
-        }
-    }
-
-    public String getContextURI() {
-        return componentContext.getURI();
-    }
-
-    public String getServiceBName() {
-        return componentContext.getService(BService.class, "bReference").getBName();
-    }
-
-    public String getServiceReferenceBName() {
-        ServiceReference<BService> bSR = componentContext.getServiceReference(BService.class, "bReference");
-        return bSR.getService().getBName();
-    }
-
-    public String getSelfReferenceName() {
-        ServiceReference<AComponent> aSR = componentContext.createSelfReference(AComponent.class);
-        return aSR.getService().getName();
-    }
-
-    public String getProperty() {
-        return componentContext.getProperty(String.class, "aProperty");
-    }
-
-    public String getRequestContextServiceName() {
-        return componentContext.getRequestContext().getServiceName();
-    }
-
-    public String getCastCallableReferenceServiceName() {
-        BService b = componentContext.getService(BService.class, "bReference");
-        CallableReference<BService> bCR = componentContext.cast(b);
-        return bCR.getService().getBName();
-    }
-
-    public String getCastServiceReferenceServiceName() {
-        BService b = componentContext.getService(BService.class, "bReference");
-        ServiceReference<BService> bSR = componentContext.cast(b);
-        return bSR.getService().getBName();
-    }
-
-    public void illegalCast() {
-        componentContext.cast("");
-    }
-
-    public String testServiceLookup() {
-        return componentContext.getService(DComponent.class, "dReference").getName();
-    }
-
-    public String getRequestContextContent() {
-        return rcContent;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
deleted file mode 100644
index 157864fd27..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.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 org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.BService;
-import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.CService;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(interfaces={BService.class, CService.class})
-public class BComponentImpl implements BService, CService {
-
-    protected ComponentContext componentContext;
-
-    @Context
-    public void setComponentContext(ComponentContext context) {
-        this.componentContext = context;
-    }
-
-    public String getBName() {
-        return "ServiceB";
-    }
-
-    public String getCName() {
-        return "ServiceC";
-    }
-
-    public String getSelfReferenceWithServiceName() {
-        ServiceReference<CService> cSR = componentContext.createSelfReference(CService.class, "CService");
-        return cSR.getService().getCName();
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
deleted file mode 100644
index 9432c70ff3..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.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 org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.DComponent;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(DComponent.class)
-public class DComponentImpl implements DComponent {
-
-    public String getName() {
-        return "ComponentD";
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite b/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
deleted file mode 100644
index 19f110d5dc..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
+++ /dev/null
@@ -1,47 +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"
-	targetNamespace="http://java-api-tests"
-	name="AB-Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.impl.AComponentImpl"/>
-	    <reference name="bReference" target="BComponent/BService"/>
-	    <reference name="dReference" target="DComponent"/>
-	    <property name="aProperty" type="xsd:string">PropertyA</property>
-     </component>
-     
-    <component name="AUnannotatedComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.impl.AUnannotatedComponentImpl"/>
-        <reference name="bReference" target="BComponent/BService"/>
-        <reference name="dReference" target="DComponent"/>
-        <property name="aProperty" type="xsd:string">PropertyA</property>
-     </component>     
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.impl.BComponentImpl"/>
-    </component>
-
-    <component name="DComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.impl.DComponentImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java b/java/sca-contrib/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
deleted file mode 100644
index e9352a5c06..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
+++ /dev/null
@@ -1,191 +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.vtest.javaapi.apis.componentcontext;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * This test class tests the ComponentContext interface described in 1.7.1 of
- * the SCA Java Annotations & APIs Specification 1.0. Relevant sections of 1.4
- * will also be covered here.
- */
-public class ComponentContextTestCase {
-
-    protected static String compositeName = "ab.composite";
-    protected static AComponent a;
-    protected static AComponent aUnannotated;
-    protected static BService b;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            a = ServiceFinder.getService(AComponent.class, "AComponent");
-            aUnannotated = ServiceFinder.getService(AComponent.class, "AUnannotatedComponent");
-            b = ServiceFinder.getService(BService.class, "BComponent/BService");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-
-    /**
-     * Lines 776 <br>
-     * getURI() - Returns the absolute URI of the component within the SCA
-     * domain.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testGetURI() throws Exception {
-        Assert.assertEquals("AComponent", a.getContextURI());
-        Assert.assertEquals("AUnannotatedComponent", aUnannotated.getContextURI());
-    }
-
-    /**
-     * Lines 778 <br>
-     * getService(Class&lt;B&gt; businessInterface, String referenceName) ?
-     * Returns a proxy for the reference defined by the current component.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testGetService() throws Exception {
-        Assert.assertEquals(a.getServiceBName(), "ServiceB");
-    }
-
-    /**
-     * Lines 780 <br>
-     * getServiceReference(Class&lt;B&gt; businessInterface, String
-     * referenceName) ? Returns a ServiceReference defined by the current
-     * component.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testGetServiceReference() throws Exception {
-        Assert.assertEquals(a.getServiceReferenceBName(), "ServiceB");
-    }
-
-    /**
-     * Lines 783 <br>
-     * createSelfReference(Class&lt;B&gt; businessInterface) ? Returns a
-     * ServiceReference that can be used to invoke this component over the
-     * designated service.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testCreateSelfReference() throws Exception {
-        Assert.assertEquals(a.getSelfReferenceName(), "ComponentA");
-    }
-
-    /**
-     * Lines 785 <br>
-     * getSelfReference(Class&lt;B&gt; businessInterface, String serviceName) -
-     * Returns a ServiceReference that can be used to invoke this component over
-     * the designated service. Service name explicitly declares the service name
-     * to invoke.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testCreateSelfReferenceWithServiceName() throws Exception {
-        Assert.assertEquals("ServiceC", b.getSelfReferenceWithServiceName());
-    }
-
-    /**
-     * Lines 788 <br>
-     * getProperty (Class&lt;B&gt; type, String propertyName) - Returns the
-     * value of an SCA property defined by this component.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testGetProperty() throws Exception {
-        Assert.assertEquals("PropertyA", a.getProperty());
-    }
-
-    /**
-     * Lines 793 <br>
-     * getRequestContext() - Returns the context for the current SCA service
-     * request, or null if there is no current request or if the context is
-     * unavailable.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testGetRequestContext() throws Exception {
-        Assert.assertEquals("AComponent", a.getRequestContextServiceName());
-        Assert.assertEquals("NotNull", a.getRequestContextContent());
-    }
-
-    /**
-     * Lines 790,794 <br>
-     * cast(B target) - Casts a type-safe reference to a CallableReference.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testCast() throws Exception {
-        Assert.assertEquals("ServiceB", a.getCastCallableReferenceServiceName());
-        Assert.assertEquals("ServiceB", a.getCastServiceReferenceServiceName());
-
-        String check = "";
-        try {
-            a.illegalCast();
-        } catch (IllegalArgumentException iae) {
-            check = "IllegalCast";
-        } catch (ServiceRuntimeException sre) {
-            if (sre.getCause() instanceof IllegalArgumentException) { 
-                check = "IllegalCast";
-            }
-        }
-        Assert.assertEquals("IllegalCast", check);
-    }
-
-    /**
-     * Lines 342-344 <br>
-     * When a component implementation needs access to a service where the
-     * reference to the service is not known at compile time, the reference can
-     * be located using the component?s ComponentContext.
-     * 
-     * @throws Exception
-     */
-    @Test
-    @Ignore("TUSCANY-2609")
-    public void testServiceLookup() throws Exception {
-        Assert.assertEquals("ComponentD", a.testServiceLookup());
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/pom.xml b/java/sca-contrib/vtest/java-api/apis/conversation/pom.xml
deleted file mode 100644
index e026dcc800..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/conversation/pom.xml
+++ /dev/null
@@ -1,45 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-apis</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-apis-conversation</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - APIs - Conversation</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java b/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
deleted file mode 100644
index 845c10303e..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
+++ /dev/null
@@ -1,34 +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.vtest.javaapi.apis.conversation;
-
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Service A.
- */
-@Conversational
-public interface AComponent {
-
-    public String getName();
-
-    public void testConversation();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java b/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
deleted file mode 100644
index a3148aa0d7..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
+++ /dev/null
@@ -1,39 +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.vtest.javaapi.apis.conversation;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.EndsConversation;
-
-/**
- * Simple Service B.
- */
-@Conversational
-public interface BComponent {
-
-    public String getName();
-    
-    public void testCustomConversationID();
-    public void testGeneratedConversationID(Object id);
-
-    @EndsConversation
-    public void endsConversation();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
deleted file mode 100644
index 7160121388..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
+++ /dev/null
@@ -1,73 +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.vtest.javaapi.apis.conversation.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.conversation.AComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.conversation.BComponent;
-import org.junit.Assert;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.Conversation;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AComponent.class)
-@Scope("CONVERSATION")
-public class AComponentImpl implements AComponent {
-
-    protected ComponentContext componentContext;
-    
-    @Reference
-    protected CallableReference<BComponent> bReference;
-
-    @ConversationID
-    protected String cid;
-
-    public String getName() {
-        return "ComponentA";
-    }
-
-    @Context
-    public void setComponentContext(ComponentContext context) {
-        this.componentContext = context;
-    }
-
-    public void testConversation() {
-        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
-        bSR.setConversationID("AConversationID");
-        bSR.getService().testCustomConversationID();
-
-        Conversation bc = bSR.getConversation();
-        Assert.assertEquals("AConversationID", bc.getConversationID());
-        bc.end();
-
-        Assert.assertEquals("ComponentB", bReference.getService().getName());
-        bReference.getService().testGeneratedConversationID(bReference.getConversation().getConversationID());
-        bReference.getConversation().end();
-
-        Assert.assertEquals(1, BComponentImpl.customInitCount);
-        Assert.assertEquals(1, BComponentImpl.customDestroyCount);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
deleted file mode 100644
index c487559ca1..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
+++ /dev/null
@@ -1,78 +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.vtest.javaapi.apis.conversation.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.conversation.BComponent;
-import org.junit.Assert;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BComponent.class)
-@Scope("CONVERSATION")
-public class BComponentImpl implements BComponent {
-
-    public static int customInitCount = 0;
-    public static int customDestroyCount = 0;
-
-    protected ComponentContext componentContext;
-
-    @ConversationID
-    protected String cid;
-
-    @Context
-    public void setComponentContext(ComponentContext context) {
-        this.componentContext = context;
-    }
-
-    public String getName() {
-        return "ComponentB";
-    }
-
-    public void testCustomConversationID() {
-        Assert.assertEquals("AConversationID", cid);
-    }
-
-    public void testGeneratedConversationID(Object id) {
-        Assert.assertEquals(id.toString(), cid);
-    }
-    
-    public void endsConversation() {
-    }
-
-    @Init
-    public void initB() {
-        if (cid.equals("AConversationID")) {
-            customInitCount++;
-        }
-    }
-
-    @Destroy
-    public void destroyB() {
-        if (cid.equals("AConversationID")) {
-            customDestroyCount++;
-        }
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/resources/conversation.composite b/java/sca-contrib/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
deleted file mode 100644
index 87cab2f479..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
+++ /dev/null
@@ -1,34 +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"
-	targetNamespace="http://java-api-tests"
-	name="Conversation-Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.conversation.impl.AComponentImpl"/>
-	    <reference name="bReference" target="BComponent"/>
-     </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.conversation.impl.BComponentImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java b/java/sca-contrib/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
deleted file mode 100644
index 9b46ac5e08..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
+++ /dev/null
@@ -1,70 +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.vtest.javaapi.apis.conversation;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This test class tests the Conversation interface described in 1.7.5 of the
- * SCA Java Annotations & APIs Specification 1.0.
- */
-public class ConversationTestCase {
-
-    protected static String compositeName = "conversation.composite";
-    protected static AComponent a;
-    protected static BComponent b;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            a = ServiceFinder.getService(AComponent.class, "AComponent");
-            b = ServiceFinder.getService(BComponent.class, "BComponent");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-
-    /**
-     * Lines 941, 942 <br>
-     * getConversationID() – Returns the identifier for this conversation. If a
-     * user-defined identity had been supplied for this reference then its value
-     * will be returned; otherwise the identity generated by the system when the
-     * conversation was initiated will be returned. <br>
-     * end() – Ends this conversation.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testConversation() throws Exception {
-        a.testConversation();
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/pom.xml b/java/sca-contrib/vtest/java-api/apis/exception/pom.xml
deleted file mode 100644
index ef6e5182ee..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/exception/pom.xml
+++ /dev/null
@@ -1,45 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-apis</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-apis-exception</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - APIs - Exception</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java b/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
deleted file mode 100644
index 90582e88a2..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
+++ /dev/null
@@ -1,40 +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.vtest.javaapi.apis.exception;
-
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Service A.
- */
-@Conversational
-public interface AComponent {
-
-    public String getName();
-
-    public void testConversation();
-    public void testCallBack();
-
-    public boolean testServiceRuntimeException();
-    public boolean testServiceUnavailableException();
-
-    public boolean testCheckedException();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java b/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
deleted file mode 100644
index c1c1c6544c..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
+++ /dev/null
@@ -1,26 +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.vtest.javaapi.apis.exception;
-
-public interface BCallback {
-
-    public void processResults(String result);        
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java b/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
deleted file mode 100644
index 11886277ad..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
+++ /dev/null
@@ -1,35 +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.vtest.javaapi.apis.exception;
-
-import org.oasisopen.sca.annotation.Callback;
-
-/**
- * Simple Service B.
- */
-@Callback(BCallback.class)
-public interface BComponent {
-
-    public String getName();
-    
-    public void testCallback();
-    public void testRedirectedCallback();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java b/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
deleted file mode 100644
index 466a32731a..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
+++ /dev/null
@@ -1,34 +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.vtest.javaapi.apis.exception;
-
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Service C.
- */
-@Conversational
-public interface CComponent {
-
-    public String getName();
-
-    public void testConversation();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java b/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
deleted file mode 100644
index c0aed7a707..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.apis.exception;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remote Service D.
- */
-@Remotable
-public interface DComponent {
-
-    public String getName();
-    public void testException() throws DException;
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java b/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
deleted file mode 100644
index 82873ed96d..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
+++ /dev/null
@@ -1,30 +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.vtest.javaapi.apis.exception;
-
-public class DException extends Exception {
-
-    private static final long serialVersionUID = -3819913841563109423L;
-
-    public DException(String message) {
-        super(message);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
deleted file mode 100644
index 1190e6900f..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
+++ /dev/null
@@ -1,128 +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.vtest.javaapi.apis.exception.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.AComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.BComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.CComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.DComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.DException;
-import org.junit.Assert;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ConversationEndedException;
-import org.oasisopen.sca.NoRegisteredCallbackException;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AComponent.class)
-@Scope("CONVERSATION")
-public class AComponentImpl implements AComponent {
-
-    protected ComponentContext componentContext;
-    
-    @Reference
-    protected CallableReference<BComponent> bReference;
-
-    @Reference
-    protected ServiceReference<CComponent> cReference;
-
-    @Reference
-    protected ServiceReference<DComponent> dReference;
-
-    @ConversationID
-    protected String cid;
-
-    public String getName() {
-        return "ComponentA";
-    }
-
-    @Context
-    public void setComponentContext(ComponentContext context) {
-        this.componentContext = context;
-    }
-
-    public void testConversation() {
-        ServiceReference<CComponent> cSR = componentContext.getServiceReference(CComponent.class, "cReference");
-        cSR.setConversationID("AConversationID");
-        Assert.assertEquals("ComponentC", cSR.getService().getName());
-
-        try {
-            Thread.sleep(1100);
-            cSR.getService().testConversation();
-
-            Assert.fail();
-        } catch (InterruptedException ie) {
-            ie.printStackTrace();
-        } catch (ConversationEndedException cee) {
-            // Expected
-        }
-    }
-
-    public void testCallBack() {
-        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
-        bSR.setCallbackID("ComponentACallBack");
-
-        try {
-            bSR.getService().testCallback();
-            Assert.fail();
-        } catch (NoRegisteredCallbackException e) {
-            // Expected
-        }
-    }
-
-    public boolean testServiceRuntimeException() {
-        try {
-            componentContext.getServiceReference(BComponent.class, "dummyBReference").getService().getName();
-        } catch (ServiceRuntimeException sre) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public boolean testServiceUnavailableException() {
-        return false;
-    }
-
-    public boolean testCheckedException() {
-        try {
-            dReference.getService().testException();
-        } catch (DException e) {
-            if (e.getMessage().equals("ADException")) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Destroy
-    public void destroy() {
-        System.out.println("This is a Destroy of AComponent ..");
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
deleted file mode 100644
index eca4b54109..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
+++ /dev/null
@@ -1,64 +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.vtest.javaapi.apis.exception.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.BCallback;
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.BComponent;
-import org.junit.Assert;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BComponent.class)
-public class BComponentImpl implements BComponent {
-
-    protected ComponentContext componentContext;
-    
-    @Callback
-    protected BCallback callback;
-
-    @Context
-    public void setComponentContext(ComponentContext context) {
-        this.componentContext = context;
-    }
-
-    public String getName() {
-        return "ComponentB";
-    }
-
-    public void testCallback() {
-        callback = componentContext.getRequestContext().getCallback();
-        callback.processResults("CallBackFromB");
-
-        CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
-        Assert.assertEquals("ComponentACallBack", bCR.getCallbackID());
-    }
-
-    public void testRedirectedCallback() {
-        callback = componentContext.getRequestContext().getCallback();
-        callback.processResults("RedirectedCallBackFromB");
-
-        CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
-        Assert.assertEquals("RedirectedCallBack", bCR.getCallbackID());
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
deleted file mode 100644
index 57a34716e6..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
+++ /dev/null
@@ -1,50 +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.vtest.javaapi.apis.exception.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.CComponent;
-import org.junit.Assert;
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.ConversationAttributes;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CComponent.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxIdleTime="1 seconds")
-public class CComponentImpl implements CComponent {
-
-    @Context
-    protected RequestContext requestContext;
-
-    @ConversationID
-    protected String cid;
-
-    public String getName() {
-        return "ComponentC";
-    }
-
-    public void testConversation() {
-        Assert.assertEquals("AConversationID", cid);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
deleted file mode 100644
index c1f5a56a9a..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.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.vtest.javaapi.apis.exception.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.DComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.exception.DException;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(DComponent.class)
-public class DComponentImpl implements DComponent {
-
-    public String getName() {
-        return "ComponentD";
-    }
-
-    public void testException() throws DException {
-        throw new DException("ADException");
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/resources/exception.composite b/java/sca-contrib/vtest/java-api/apis/exception/src/main/resources/exception.composite
deleted file mode 100644
index 5bd933ce96..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/resources/exception.composite
+++ /dev/null
@@ -1,44 +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"
-    targetNamespace="http://java-api-tests"
-    name="Exception-Composite">
-
-    <component name="AComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.exception.impl.AComponentImpl"/>
-        <reference name="bReference" target="BComponent"/>
-        <reference name="cReference" target="CComponent"/>
-        <reference name="dReference" target="DComponent"/>
-    </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.exception.impl.BComponentImpl"/>
-    </component>
-
-    <component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.exception.impl.CComponentImpl"/>
-    </component>
-
-    <component name="DComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.exception.impl.DComponentImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java b/java/sca-contrib/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
deleted file mode 100644
index da7b1da0fa..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
+++ /dev/null
@@ -1,132 +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.vtest.javaapi.apis.exception;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * This test class tests the Exceptions described in 1.7.6, 1.7.7, 1.7.8, and 1.7.9 of the SCA Java Annotations & APIs Specification 1.0.
- * This also covers 1.5 of the specification. 
- */
-public class ExceptionTestCase {
-
-    protected static SCADomain domain;
-    protected static String compositeName = "exception.composite";
-    protected static AComponent a;
-    protected static BComponent b;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            domain = SCADomain.newInstance(compositeName);
-            a = domain.getService(AComponent.class, "AComponent");
-            b = domain.getService(BComponent.class, "BComponent");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    /**
-     * Lines 951 <br>
-     * NoRegisteredCallbackException.
-     *  
-     * @throws Exception
-     */
-    @Test
-    public void testNoRegisteredCallbackException() throws Exception {
-        a.testCallBack();
-    }
-
-    /**
-     * Lines 960 <br>
-     * ServiceRuntimeException - This exception signals problems in the management of SCA component execution.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testServiceRuntimeException() throws Exception {
-        Assert.assertTrue(a.testServiceRuntimeException());        
-    }
-
-    /**
-     * Lines 970 <br>
-     * ServiceUnavailableException – This exception signals problems in the interaction with remote services.
-     * 
-     * @throws Exception
-     */
-    @Test
-    //@Ignore
-    public void testServiceUnavailableException() throws Exception {
-        domain.getComponentManager().stopComponent("AComponent");
-
-        try {
-            a.getName();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        try {
-            AComponent ac = domain.getService(AComponent.class, "AComponent");
-            ac.getName();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        domain.getComponentManager().startComponent("AComponent");
-    }
-
-    /**
-     * Lines 983 <br>
-     * ConversationEndedException.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testConversationEndedException() throws Exception {
-        a.testConversation();
-    }
-
-    /**
-     * Lines 360-361 <br>
-     * Business exceptions are thrown by the implementation of the called service method,
-     * and are defined as checked exceptions on the interface that types the service.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testCheckedException() throws Exception {
-        Assert.assertTrue(a.testCheckedException());
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/pom.xml b/java/sca-contrib/vtest/java-api/apis/pom.xml
deleted file mode 100644
index 164c67ebbb..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/pom.xml
+++ /dev/null
@@ -1,64 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-java-api</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>java-api-apis</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - APIs</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>componentcontext</module>
-                <module>requestcontext</module>
-                <module>callablereference</module>
-                <module>servicereference</module>
-                <module>conversation</module>
-                <module>exception</module>
-          </modules>
-        </profile>
-    </profiles>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/pom.xml b/java/sca-contrib/vtest/java-api/apis/requestcontext/pom.xml
deleted file mode 100644
index d849fad4fe..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/pom.xml
+++ /dev/null
@@ -1,45 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-apis</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-apis-requestcontext</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - APIs - RequestContext</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java b/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
deleted file mode 100644
index 6fec5cada3..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
+++ /dev/null
@@ -1,35 +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.vtest.javaapi.apis.requestcontext;
-
-/**
- * Simple Service A.
- */
-public interface AComponent {
-
-    public String getName();
-
-    public boolean isJAASSubject();
-    public String getServiceName();
-    public String getCallbackResult();
-    public String getServiceReferenceName();
-    public String getCallbackServiceReferenceName();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java b/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
deleted file mode 100644
index 4dd2088f90..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
+++ /dev/null
@@ -1,27 +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.vtest.javaapi.apis.requestcontext;
-
-public interface BCallback {
-
-    public String getCallbackName();
-    public void processResults(String result);        
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java b/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
deleted file mode 100644
index d913e95a53..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
+++ /dev/null
@@ -1,35 +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.vtest.javaapi.apis.requestcontext;
-
-import org.oasisopen.sca.annotation.Callback;
-
-/**
- * Simple Service B.
- */
-@Callback(BCallback.class)
-public interface BComponent {
-
-    public String getName();
-    
-    public void testCallback();
-    public String getServiceReferenceName();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
deleted file mode 100644
index 5d3cbf6e3d..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
+++ /dev/null
@@ -1,102 +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.vtest.javaapi.apis.requestcontext.impl;
-
-import javax.security.auth.Subject;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.AComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BCallback;
-import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BComponent;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AComponent.class)
-public class AComponentImpl implements AComponent, BCallback {
-
-    private static Object monitor = new Object();
-    private static String returnMessage = null;
-    private static CallableReference<BCallback> cbCR;
-
-    protected ComponentContext componentContext;
-
-    @Reference
-    protected BComponent bReference;
-
-    public String getName() {
-        return "ComponentA";
-    }
-
-    @Context
-    public void setComponentContext(ComponentContext context) {
-        this.componentContext = context;
-    }
-
-    public boolean isJAASSubject() {
-        return componentContext.getRequestContext().getSecuritySubject() instanceof Subject;
-    }
-
-    public String getServiceName() {
-        return componentContext.getRequestContext().getServiceName();
-    }
-
-    public String getCallbackResult() {
-        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
-        String cbID = "ComponentACallBack";
-        bSR.setCallbackID(cbID);
-        bSR.getService().testCallback();
-
-        // Wait for 30s max.
-        int count = 0;
-        synchronized(monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        return returnMessage;
-    }
-
-    public void processResults(String result) {
-        returnMessage = result;
-        cbCR = componentContext.getRequestContext().getServiceReference();
-    }
-
-    public String getServiceReferenceName() {
-        CallableReference<AComponent> aCR = componentContext.getRequestContext().getServiceReference();
-        return aCR.getService().getName();
-    }
-
-    public String getCallbackServiceReferenceName() {
-        return cbCR.getService().getCallbackName();
-    }
-
-    public String getCallbackName() {
-        return "CallBackB";
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
deleted file mode 100644
index d358736daa..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
+++ /dev/null
@@ -1,61 +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.vtest.javaapi.apis.requestcontext.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BCallback;
-import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BComponent;
-import org.junit.Assert;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BComponent.class)
-public class BComponentImpl implements BComponent {
-
-    protected ComponentContext componentContext;
-    
-    @Callback
-    protected BCallback callback;
-
-    @Context
-    public void setComponentContext(ComponentContext context) {
-        this.componentContext = context;
-    }
-
-    public String getName() {
-        return "ComponentB";
-    }
-
-    public void testCallback() {
-        callback = componentContext.getRequestContext().getCallback();
-        callback.processResults("CallBackFromB");
-
-        CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
-        Assert.assertEquals("ComponentACallBack", bCR.getCallbackID());
-    }
-
-    public String getServiceReferenceName() {
-        CallableReference<BComponent> bCR = componentContext.getRequestContext().getServiceReference();
-        return bCR.getService().getName();
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite b/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
deleted file mode 100644
index 4aa5eeb25a..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
+++ /dev/null
@@ -1,34 +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"
-	targetNamespace="http://java-api-tests"
-	name="RequestContext-Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.impl.AComponentImpl"/>
-	    <reference name="bReference" target="BComponent"/>
-     </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.impl.BComponentImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java b/java/sca-contrib/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
deleted file mode 100644
index e3b761bd37..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
+++ /dev/null
@@ -1,109 +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.vtest.javaapi.apis.requestcontext;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * This test class tests the RequestContext interface described in 1.7.2 of the
- * SCA Java Annotations & APIs Specification 1.0.
- */
-public class RequestContextTestCase {
-
-    protected static String compositeName = "requestcontext.composite";
-    protected static AComponent a;
-    protected static BComponent b;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            a = ServiceFinder.getService(AComponent.class, "AComponent");
-            b = ServiceFinder.getService(BComponent.class, "BComponent");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-
-    /**
-     * Lines 858 <br>
-     * getSecuritySubject() – Returns the JAAS Subject of the current request.
-     * 
-     * @throws Exception
-     */
-    @Ignore("TUSCANY-2608")
-    public void testGetSecuritySubject() throws Exception {
-        Assert.assertTrue(a.isJAASSubject());
-    }
-
-    /**
-     * Lines 860 <br>
-     * getServiceName() – Returns the name of the service on the Java
-     * implementation the request came in on.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testGetServiceName() throws Exception {
-        Assert.assertEquals("AComponent", a.getServiceName());
-    }
-
-    /**
-     * Lines 861, 862 <br>
-     * getCallbackReference() – Returns a callable reference to the callback as
-     * specified by the caller. getCallback() – Returns a proxy for the callback
-     * as specified by the caller.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testGetCallback() throws Exception {
-        Assert.assertEquals("CallBackFromB", a.getCallbackResult());
-    }
-
-    /**
-     * Lines 863 <br>
-     * getServiceReference() – When invoked during the execution of a service
-     * operation, this API MUST return a CallableReference that represents the
-     * service. When invoked during the execution of a callback operation, this
-     * API MUST return a CallableReference that represents the callback service.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testGetServiceReference() throws Exception {
-        Assert.assertEquals("ComponentA", a.getServiceReferenceName());
-        Assert.assertEquals("ComponentB", b.getServiceReferenceName());
-        Assert.assertEquals("CallBackB", a.getCallbackServiceReferenceName());
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/pom.xml b/java/sca-contrib/vtest/java-api/apis/servicereference/pom.xml
deleted file mode 100644
index 1ad6a9c2ec..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/pom.xml
+++ /dev/null
@@ -1,45 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-apis</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-apis-servicereference</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - APIs - ServiceReference</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java b/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
deleted file mode 100644
index 6de5d6810e..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.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.vtest.javaapi.apis.servicereference;
-
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Service A.
- */
-@Conversational
-public interface AComponent {
-
-    public String getName();
-
-    public void testConversationID();
-    public String getCallbackResult();
-    public void redirectCallback();
-    public void testGetCallback();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java b/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
deleted file mode 100644
index f8c5c1272f..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
+++ /dev/null
@@ -1,26 +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.vtest.javaapi.apis.servicereference;
-
-public interface BCallback {
-
-    public void processResults(String result);        
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java b/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
deleted file mode 100644
index 65a444d100..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
+++ /dev/null
@@ -1,38 +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.vtest.javaapi.apis.servicereference;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Service B.
- */
-@Conversational
-@Callback(BCallback.class)
-public interface BComponent {
-
-    public String getName();
-    
-    public void testCallback();
-    public void testConversationID();
-    public void testRedirectedCallback();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java b/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
deleted file mode 100644
index 28c90e2071..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
+++ /dev/null
@@ -1,27 +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.vtest.javaapi.apis.servicereference;
-
-/**
- * Simple Service C.
- */
-public interface CComponent extends BCallback {
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
deleted file mode 100644
index 86dc80a4e1..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.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.vtest.javaapi.apis.servicereference.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.AComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.BCallback;
-import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.BComponent;
-import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.CComponent;
-import org.junit.Assert;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AComponent.class)
-@Scope("CONVERSATION")
-public class AComponentImpl implements AComponent, BCallback {
-
-    private static Object monitor = new Object();
-    private static String returnMessage = null;
-
-    protected ComponentContext componentContext;
-    
-    @Reference
-    protected CallableReference<BComponent> bReference;
-
-    @Reference
-    protected ServiceReference<CComponent> cReference;
-
-    @ConversationID
-    protected String cid;
-
-    public String getName() {
-        return "ComponentA";
-    }
-
-    @Context
-    public void setComponentContext(ComponentContext context) {
-        this.componentContext = context;
-    }
-
-    public void testConversationID() {
-        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
-        bSR.setConversationID("AConversationID");
-        bSR.getService().testConversationID();
-
-        Assert.assertEquals("AConversationID", bSR.getConversation().getConversationID());
-    }
-
-    public String getCallbackResult() {
-        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
-        String cbID = "ComponentACallBack";
-        bSR.setCallbackID(cbID);
-        bSR.getService().testCallback();
-
-        // Wait for 30s max.
-        int count = 0;
-        synchronized(monitor) {
-            while (returnMessage == null && count++ < 30) {
-                try {
-                    monitor.wait(1000L);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        return returnMessage;
-    }
-
-    public void processResults(String result) {
-        returnMessage = result;
-    }
-
-    public void redirectCallback() {
-        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
-        bSR.setCallbackID("RedirectedCallBack");
-        bSR.setCallback(cReference);
-        bSR.getService().testRedirectedCallback();
-    }
-
-    public void testGetCallback() {
-        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
-        bSR.setCallback(cReference);
-        Assert.assertEquals(cReference, bSR.getCallback());
-
-        TestObject aCallback = new TestObject();
-        bSR.setCallback(aCallback);
-        Assert.assertEquals(aCallback, bSR.getCallback());
-        Assert.assertEquals(1, ((TestObject) bSR.getCallback()).getId());
-
-        TestObject bCallback = new TestObject();
-        bSR.setCallback(bCallback);
-        Assert.assertEquals(bCallback, bSR.getCallback());
-        Assert.assertEquals(2, ((TestObject) bSR.getCallback()).getId());
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
deleted file mode 100644
index c5af80291e..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
+++ /dev/null
@@ -1,74 +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.vtest.javaapi.apis.servicereference.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.BCallback;
-import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.BComponent;
-import org.junit.Assert;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BComponent.class)
-@Scope("CONVERSATION")
-public class BComponentImpl implements BComponent {
-
-    protected ComponentContext componentContext;
-    
-    @Callback
-    protected BCallback callback;
-
-    @ConversationID
-    protected String cid;
-
-    @Context
-    public void setComponentContext(ComponentContext context) {
-        this.componentContext = context;
-    }
-
-    public String getName() {
-        return "ComponentB";
-    }
-
-    public void testCallback() {
-        callback = componentContext.getRequestContext().getCallback();
-        callback.processResults("CallBackFromB");
-
-        CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
-        Assert.assertEquals("ComponentACallBack", bCR.getCallbackID());
-    }
-
-    public void testConversationID() {
-        Assert.assertEquals("AConversationID", cid);
-    }
-
-    public void testRedirectedCallback() {
-        callback = componentContext.getRequestContext().getCallback();
-        callback.processResults("RedirectedCallBackFromB");
-
-        CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
-        Assert.assertEquals("RedirectedCallBack", bCR.getCallbackID());
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java b/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
deleted file mode 100644
index 563d3ceab6..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
+++ /dev/null
@@ -1,38 +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.vtest.javaapi.apis.servicereference.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.CComponent;
-import org.junit.Assert;
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CComponent.class)
-public class CComponentImpl implements CComponent {
-
-    @Context
-    protected RequestContext requestContext;
-
-    public void processResults(String result) {
-        Assert.assertEquals("RedirectedCallBackFromB", result);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java b/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
deleted file mode 100644
index ba3edf13ae..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.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.vtest.javaapi.apis.servicereference.impl;
-
-public class TestObject {
-
-    public static int count = 0;
-
-    private int id;
-
-    public TestObject() {
-        count++;
-        id = count;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite b/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
deleted file mode 100644
index 9bded61947..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
+++ /dev/null
@@ -1,39 +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"
-	targetNamespace="http://java-api-tests"
-	name="ServiceReference-Composite">
-
-    <component name="AComponent">
-	    <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.impl.AComponentImpl"/>
-	    <reference name="bReference" target="BComponent"/>
-	    <reference name="cReference" target="CComponent"/>
-     </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.impl.BComponentImpl"/>
-    </component>
-
-    <component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.impl.CComponentImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java b/java/sca-contrib/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
deleted file mode 100644
index fda917d60a..0000000000
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
+++ /dev/null
@@ -1,106 +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.vtest.javaapi.apis.servicereference;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This test class tests the ServiceReference interface described in 1.7.4 of
- * the SCA Java Annotations & APIs Specification 1.0.
- */
-public class ServiceReferenceTestCase {
-
-    protected static String compositeName = "servicereference.composite";
-    protected static AComponent a;
-    protected static BComponent b;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            a = ServiceFinder.getService(AComponent.class, "AComponent");
-            b = ServiceFinder.getService(BComponent.class, "BComponent");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-
-    /**
-     * Lines 915-916 <br>
-     * getConversationID() - Returns the id supplied by the user that will be
-     * associated with conversations initiated through this reference. <br>
-     * setConversationID(Object conversationId) – Set the id to associate with
-     * any conversation started through this reference. If the value supplied is
-     * null then the id will be generated by the implementation. Throws an
-     * IllegalStateException if a conversation is currently associated with this
-     * reference.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testConversationID() throws Exception {
-        a.testConversationID();
-    }
-
-    /**
-     * Lines 917 <br>
-     * setCallbackID(Object callbackID) – Sets the callback ID.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testSetCallbackID() throws Exception {
-        Assert.assertEquals("CallBackFromB", a.getCallbackResult());
-    }
-
-    /**
-     * Lines 918 <br>
-     * getCallback() – Returns the callback object.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testGetCallback() throws Exception {
-        a.testGetCallback();
-    }
-
-    /**
-     * Lines 919 <br>
-     * setCallback(Object callback) – Sets the callback object.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testSetCallback() throws Exception {
-        a.redirectCallback();
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/pom.xml b/java/sca-contrib/vtest/java-api/conversation/callback/pom.xml
deleted file mode 100644
index 656ee9c3cd..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/pom.xml
+++ /dev/null
@@ -1,46 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-conversation-callback</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Conversation - Callback</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
deleted file mode 100644
index e78736d4df..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
+++ /dev/null
@@ -1,30 +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.vtest.javaapi.conversation.callback;
-
-/**
- * Simple Service
- */
-public interface AService {
-
-    public void testCallback();
-
-    public void testCallback2();
- 
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
deleted file mode 100644
index f4271d0d92..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.conversation.callback;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
deleted file mode 100644
index d7ecbb7427..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
+++ /dev/null
@@ -1,40 +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.vtest.javaapi.conversation.callback;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
-    public void setState(String someState);
-    
-    public String getState();
-
-    public void testCallBack(String string);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
deleted file mode 100644
index be7ea97eac..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.conversation.callback;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface BServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
deleted file mode 100644
index 19a8b86f28..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
+++ /dev/null
@@ -1,39 +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.vtest.javaapi.conversation.callback;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(BServiceCallback.class)
-public interface CService {
-
-    public void setState(String someState);
-
-    public String getState();
-
-    public void testCallBack(String string);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
deleted file mode 100644
index 15672f9ee0..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.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 org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-public class Utilities {
-    
-    public static void delayQuarterSecond() {
-        try {
-            Thread.sleep(250);// millisecs
-        } catch (InterruptedException ex) {
-            throw new Error(ex);
-        }
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
deleted file mode 100644
index 31479f1848..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.conversation.callback.accessing;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
deleted file mode 100644
index b6359f348b..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
+++ /dev/null
@@ -1,41 +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.vtest.javaapi.conversation.callback.accessing;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
-    public void setState(String someState);
-    
-    public String getState();
-
-    public void testCallBack(String string);
-
-    public void testCallBack2(String string);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
deleted file mode 100644
index 9e8b64e3b9..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
+++ /dev/null
@@ -1,67 +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.vtest.javaapi.conversation.callback.accessing.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.BService;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService, AServiceCallback {
-
-    @Reference
-    protected ServiceReference<BService> b;
-
-    private String someState;
-
-    public void callBack(String someState) {
-        System.out.println("A-callback called with this state => " + someState);
-        this.someState = someState;
-    }
-
-    public void testCallback() {
-        b.getService().testCallBack("Some string");
-        int count = 4;
-        while (someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (someState == null)
-            Assert.fail("Callback not received by this instance");
-    }
-
-    public void testCallback2() {
-        b.getService().testCallBack2("Some string");
-        int count = 4;
-        while (someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (someState == null)
-            Assert.fail("Callback not received by this instance");
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
deleted file mode 100644
index acf262512e..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
+++ /dev/null
@@ -1,60 +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.vtest.javaapi.conversation.callback.accessing.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.BService;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService {
-
-    String someState;
-
-    @Callback
-    protected CallableReference<AServiceCallback> callback;
-    
-    @Context
-    protected ComponentContext componentContext;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void testCallBack(String someState) {
-        callback.getService().callBack(someState);
-    }
-
-    public void testCallBack2(String someState) {
-        AServiceCallback callback = componentContext.getRequestContext().getCallback();
-        callback.callBack(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
deleted file mode 100644
index b1439770da..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.conversation.callback.custom;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
deleted file mode 100644
index dae4152333..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
+++ /dev/null
@@ -1,38 +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.vtest.javaapi.conversation.callback.custom;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
-    public void setState(String someState);
-    
-    public String getState();
-
-    public void testCallBack(String string);
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
deleted file mode 100644
index d1a30fd305..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
+++ /dev/null
@@ -1,35 +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.vtest.javaapi.conversation.callback.custom;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-public interface CustomCallback {
-
-    public void someMethod();
-
-    public void callBack(String someState);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
deleted file mode 100644
index 7732b3865f..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
+++ /dev/null
@@ -1,61 +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.vtest.javaapi.conversation.callback.custom.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.CustomCallback;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService {
-
-    @Reference
-    protected ServiceReference<BService> b;
-
-    @Reference
-    protected CustomCallback customCallback;
-
-    protected static String someState;
-
-    public void testCallback() {
-        b.setCallback(customCallback);
-        b.getService().testCallBack("Some string");
-        int count = 4;
-        while (someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (someState == null)
-            Assert.fail("Callback not received by this instance");
-    }
-
-    public void testCallback2() {
-        Assert.fail("Should never get here");
-        
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
deleted file mode 100644
index 9bda00413b..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.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 org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.BService;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService {
-
-    String someState;
-
-    @Callback
-    protected AServiceCallback callback;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void testCallBack(String someState) {
-        callback.callBack(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
deleted file mode 100644
index 1bbc1fa4eb..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
+++ /dev/null
@@ -1,38 +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.vtest.javaapi.conversation.callback.custom.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.CustomCallback;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("CONVERSATION")
-public class CustomCallbackImpl implements CustomCallback, AServiceCallback {
-
-    public void someMethod() {
-        System.out.println("Custom-callback some method called");
-    }
-    
-    public void callBack(String someState) {
-        System.out.println("Custom-callback called with this state => " + someState);
-        AServiceImpl.someState = someState;
-   }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
deleted file mode 100644
index 6a66e73569..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.conversation.callback.id;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
deleted file mode 100644
index 24dbad3d4a..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
+++ /dev/null
@@ -1,41 +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.vtest.javaapi.conversation.callback.id;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
-    public void setState(String someState);
-    
-    public String getState();
-
-    public void testCallBack(String string);
-
-    public void testCallBack2(String string);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
deleted file mode 100644
index b9785fa657..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
+++ /dev/null
@@ -1,73 +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.vtest.javaapi.conversation.callback.id.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.BService;
-import org.junit.Assert;
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService, AServiceCallback {
-
-    @Reference
-    protected ServiceReference<BService> b;
-    
-    @Context
-    protected RequestContext requestContext;
-    
-    private String someState;
-
-    public void callBack(String someState) {
-        System.out.println("A-callback called with this state => " + someState);
-        Assert.assertNotNull(requestContext.getServiceReference().getCallbackID());
-        this.someState = someState;
-    }
-
-    public void testCallback() {
-        b.getService().testCallBack("Some string");
-        int count = 4;
-        while (someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (someState == null)
-            Assert.fail("Callback not received by this instance");
-    }
-
-    public void testCallback2() {
-        b.getService().testCallBack2("Some string");
-        int count = 4;
-        while (someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (someState == null)
-            Assert.fail("Callback not received by this instance");
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
deleted file mode 100644
index dc546a81a0..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
+++ /dev/null
@@ -1,60 +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.vtest.javaapi.conversation.callback.id.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.BService;
-import org.oasisopen.sca.CallableReference;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService {
-
-    String someState;
-
-    @Callback
-    protected CallableReference<AServiceCallback> callback;
-    
-    @Context
-    protected ComponentContext componentContext;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void testCallBack(String someState) {
-        callback.getService().callBack(someState);
-    }
-
-    public void testCallBack2(String someState) {
-        AServiceCallback callback = componentContext.getRequestContext().getCallback();
-        callback.callBack(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
deleted file mode 100644
index 01260c67f1..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
+++ /dev/null
@@ -1,61 +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.vtest.javaapi.conversation.callback.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService, AServiceCallback {
-
-    @Reference
-    protected ServiceReference<BService> b;
-
-    private String someState;
-
-    public void callBack(String someState) {
-        System.out.println("A-callback called with this state => " + someState);
-        this.someState = someState;
-    }
-
-    public void testCallback() {
-        b.getService().testCallBack("Some string");
-        int count = 4;
-        while (someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (someState == null)
-            Assert.fail("Callback not received by this instance");
-    }
-
-    public void testCallback2() {
-       Assert.fail("Should not be called");
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
deleted file mode 100644
index 78dfe7221f..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
+++ /dev/null
@@ -1,73 +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.vtest.javaapi.conversation.callback.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService, BServiceCallback {
-
-    String someState;
-
-    @Callback
-    protected AServiceCallback callback;
-
-    @Reference
-    protected ServiceReference<CService> c;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void callBack(String someState) {
-        System.out.println("B-callback called with this state => " + someState);
-        this.someState = someState;
-    }
-
-    public void testCallBack(String someState) {
-
-        c.getService().testCallBack(someState);
-        int count = 4;
-        while (this.someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (this.someState == null)
-            Assert.fail("Callback not received by this instance");
-
-        callback.callBack(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
deleted file mode 100644
index 6120b815d5..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.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 org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.CService;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
-    String someState;
-
-    @Callback
-    protected BServiceCallback callback;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void testCallBack(String someState) {
-        callback.callBack(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
deleted file mode 100644
index 50feee41d6..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.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.vtest.javaapi.conversation.callback.local;
-
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- *
- */
-@Conversational
-public interface AServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
deleted file mode 100644
index 67dd77ce7b..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.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.vtest.javaapi.conversation.callback.local;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Local Service
- */
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
-    public void setState(String someState);
-    
-    public String getState();
-
-    public void testCallBack(String string);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
deleted file mode 100644
index fd19c8d7b1..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.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.vtest.javaapi.conversation.callback.local;
-
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Service
- */
-@Conversational
-public interface BServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
deleted file mode 100644
index c3b2e04ff2..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.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.vtest.javaapi.conversation.callback.local;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Service
- */
-@Conversational
-@Callback(BServiceCallback.class)
-public interface CService {
-
-    public void setState(String someState);
-
-    public String getState();
-
-    public void testCallBack(String string);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
deleted file mode 100644
index 0298b39825..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
+++ /dev/null
@@ -1,61 +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.vtest.javaapi.conversation.callback.local.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.BService;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService, AServiceCallback {
-
-    @Reference
-    protected ServiceReference<BService> b;
-
-    private String someState;
-
-    public void callBack(String someState) {
-        System.out.println("A-callback called with this state => " + someState);
-        this.someState = someState;
-    }
-
-    public void testCallback() {
-        b.getService().testCallBack("Some local string");
-        int count = 4;
-        while (someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (someState == null)
-            Assert.fail("Callback not received by this instance");
-    }
-    
-    public void testCallback2() {
-        Assert.fail("Not implemented");
-     }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
deleted file mode 100644
index 4374306609..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
+++ /dev/null
@@ -1,73 +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.vtest.javaapi.conversation.callback.local.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.CService;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService, BServiceCallback {
-
-    String someState;
-
-    @Callback
-    protected AServiceCallback callback;
-
-    @Reference
-    protected ServiceReference<CService> c;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void callBack(String someState) {
-        System.out.println("B-callback called with this state => " + someState);
-        this.someState = someState;
-    }
-
-    public void testCallBack(String someState) {
-
-        c.getService().testCallBack(someState);
-        int count = 4;
-        while (this.someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (this.someState == null)
-            Assert.fail("Callback not received by this instance");
-
-        callback.callBack(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
deleted file mode 100644
index d487c94fd3..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.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 org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.CService;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
-    String someState;
-
-    @Callback
-    protected BServiceCallback callback;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void testCallBack(String someState) {
-        callback.callBack(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
deleted file mode 100644
index 164397bf6b..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
+++ /dev/null
@@ -1,38 +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.vtest.javaapi.conversation.callback.mixed;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BServiceCallback;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-
-/**
- * Simple Service
- */
-@Conversational
-@Callback(BServiceCallback.class)
-public interface CService {
-
-    public void setState(String someState);
-
-    public String getState();
-
-    public void testCallBack(String string);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
deleted file mode 100644
index d71c89d565..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
+++ /dev/null
@@ -1,73 +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.vtest.javaapi.conversation.callback.mixed.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService, BServiceCallback {
-
-    String someState;
-
-    @Callback
-    protected AServiceCallback callback;
-
-    @Reference
-    protected ServiceReference<CService> c;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void callBack(String someState) {
-        System.out.println("B-callback called with this state => " + someState);
-        this.someState = someState;
-    }
-
-    public void testCallBack(String someState) {
-
-        c.getService().testCallBack(someState);
-        int count = 4;
-        while (this.someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (this.someState == null)
-            Assert.fail("Callback not received by this instance");
-
-        callback.callBack(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
deleted file mode 100644
index 5dcaf9c06f..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.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 org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed.CService;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
-    String someState;
-
-    @Callback
-    protected BServiceCallback callback;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void testCallBack(String someState) {
-        callback.callBack(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
deleted file mode 100644
index 4b2ee3a838..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.conversation.callback.multi;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
deleted file mode 100644
index 88059ccb45..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
+++ /dev/null
@@ -1,33 +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.vtest.javaapi.conversation.callback.multi;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback2 {
-
-    public void callBack2(String someState);
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
deleted file mode 100644
index 691dc80632..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
+++ /dev/null
@@ -1,39 +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.vtest.javaapi.conversation.callback.multi;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
-    public void setState(String someState);
-    
-    public String getState();
-
-    public void testCallBack(String string);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
deleted file mode 100644
index 7c691efa8d..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
+++ /dev/null
@@ -1,39 +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.vtest.javaapi.conversation.callback.multi;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback2.class)
-public interface BService2 {
-
-    public void setState(String someState);
-    
-    public String getState();
-
-    public void testCallBack2(String string);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
deleted file mode 100644
index 272484a6f0..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
+++ /dev/null
@@ -1,79 +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.vtest.javaapi.conversation.callback.multi.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.AServiceCallback2;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.BService2;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService, AServiceCallback , AServiceCallback2 {
-
-    @Reference
-    protected ServiceReference<BService> b;
-    
-    @Reference
-    protected ServiceReference<BService2> b2;
-
-
-    private String someState;
-    private String someState2;
-
-    public void callBack(String someState) {
-        System.out.println("A-callback called with this state => " + someState);
-        this.someState = someState;
-    }
-
-    public void callBack2(String someState) {
-        System.out.println("A-callback2 called with this state => " + someState);
-        this.someState2 = someState;    
-    }
-    
-    public void testCallback() {
-        b.getService().testCallBack("Some string");
-        int count = 4;
-        while (someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (someState == null)
-            Assert.fail("Callback not received by this instance");
-    }
-
-    public void testCallback2() {
-        b2.getService().testCallBack2("Some string");
-        int count = 4;
-        while (someState2 == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (someState2 == null)
-            Assert.fail("Callback not received by this instance");
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
deleted file mode 100644
index d9c4866466..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
+++ /dev/null
@@ -1,64 +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.vtest.javaapi.conversation.callback.multi.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.AServiceCallback2;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.BService2;
-import org.junit.Assert;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(interfaces= {BService.class,BService2.class})
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService, BService2 {
-
-    String someState;
-
-    @Callback
-    protected AServiceCallback callback;
-
-    @Callback
-    protected AServiceCallback2 callback2;
-    
-    @Callback
-    protected AServiceCallback2 callback3;
-
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void testCallBack(String someState) {
-        callback.callBack(someState);
-    }
-
-    public void testCallBack2(String someState) {
-        Assert.assertNotNull(callback3); //Spec lines 670,671
-        callback2.callBack2(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
deleted file mode 100644
index 1c2d20ff94..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.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.vtest.javaapi.conversation.callback.stateless;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface BServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
deleted file mode 100644
index 5dd429077d..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
+++ /dev/null
@@ -1,39 +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.vtest.javaapi.conversation.callback.stateless;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(BServiceCallback.class)
-public interface CService {
-
-    public void setState(String someState);
-
-    public String getState();
-
-    public void testCallBack(String string);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
deleted file mode 100644
index b263eb869b..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
+++ /dev/null
@@ -1,73 +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.vtest.javaapi.conversation.callback.stateless.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService, BServiceCallback {
-
-    String someState;
-
-    @Callback
-    protected AServiceCallback callback;
-
-    @Reference
-    protected ServiceReference<CService> c;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void callBack(String someState) {
-        System.out.println("B-callback called with this state => " + someState);
-        this.someState = someState;
-    }
-
-    public void testCallBack(String someState) {
-
-        c.getService().testCallBack(someState);
-        int count = 4;
-        while (this.someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (this.someState != null)
-            Assert.fail("Callback should NOT have been received by this instance");
-
-        callback.callBack(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
deleted file mode 100644
index 4f08ac7a1b..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
+++ /dev/null
@@ -1,81 +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.vtest.javaapi.conversation.callback.stateless.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.junit.Assert;
-import org.oasisopen.sca.RequestContext;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl2 implements BService, BServiceCallback {
-
-    String someState;
-    
-    @Context
-    protected RequestContext rc;
-
-    @Callback
-    protected AServiceCallback callback;
-
-    @Reference
-    protected ServiceReference<CService> c;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void callBack(String someState) {
-        System.out.println("B-callback called with this state => " + someState);
-        this.someState = someState;
-        Assert.assertSame("1234", rc.getServiceReference().getCallbackID());
-    }
-
-    public void testCallBack(String someState) {
-
-        c.setCallbackID("1234");
-
-        c.getService().testCallBack(someState);
-        int count = 4;
-        while (this.someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (this.someState != null)
-            Assert.fail("Callback should NOT have been received by this instance");
-
-        callback.callBack(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
deleted file mode 100644
index 11c896a06d..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
+++ /dev/null
@@ -1,74 +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.vtest.javaapi.conversation.callback.stateless.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl3 implements BService, BServiceCallback {
-
-    String someState;
-
-    @Callback
-    protected AServiceCallback callback;
-
-    @Reference
-    protected ServiceReference<CService> c;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void callBack(String someState) {
-        System.out.println("B-callback called with this state => " + someState);
-        this.someState = someState;
-        Assert.assertSame(null, callback);
-    }
-
-    public void testCallBack(String someState) {
-
-        c.getService().testCallBack(someState);
-        int count = 4;
-        while (this.someState == null && count > 0) {
-            Utilities.delayQuarterSecond();
-            count--;
-        }
-        if (this.someState != null)
-            Assert.fail("Callback should NOT have been received by this instance");
-
-        callback.callBack(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
deleted file mode 100644
index 00984ae565..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.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 org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.CService;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
-    String someState;
-
-    @Callback
-    protected BServiceCallback callback;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void testCallBack(String someState) {
-        callback.callBack(someState);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
deleted file mode 100644
index 802c9c30db..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
+++ /dev/null
@@ -1,34 +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://java-api-tests" name="Conversation-callback-multi">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.impl.BServiceImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
deleted file mode 100644
index e66ea5d537..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
+++ /dev/null
@@ -1,40 +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://java-api-tests" name="Conversation-callback-custom">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-		<reference name="customCallback" target="CComponent/CustomCallback" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.impl.BServiceImpl" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.impl.CustomCallbackImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
deleted file mode 100644
index 4d93d2279d..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
+++ /dev/null
@@ -1,34 +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://java-api-tests" name="Conversation-callback-id">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.impl.BServiceImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
deleted file mode 100644
index cd8c589a59..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
+++ /dev/null
@@ -1,40 +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://java-api-tests" name="Conversation-Callback-local">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.impl.BServiceImpl" />
-		<reference name="c" target="CComponent" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.impl.CServiceImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
deleted file mode 100644
index d2d9956103..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
+++ /dev/null
@@ -1,40 +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://java-api-tests" name="Conversation-callback-mixed">
-<!-- TODO: TUSCANY-2291 
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed.impl.BServiceImpl" />
-		<reference name="c" target="CComponent" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed.impl.CServiceImpl" />
-	</component>
--->
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
deleted file mode 100644
index 6c69330ce5..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-multi.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://java-api-tests" name="Conversation-callback-multi">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.impl.AServiceImpl" />
-		<reference name="b" target="BComponent/BService" />
-		<reference name="b2" target="BComponent/BService2" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.impl.BServiceImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
deleted file mode 100644
index 72c08e8344..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
+++ /dev/null
@@ -1,40 +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://java-api-tests" name="Conversation-callback-stateless">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.BServiceImpl3" />
-		<reference name="c" target="CComponent" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.CServiceImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
deleted file mode 100644
index 144f7f3d00..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
+++ /dev/null
@@ -1,40 +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://java-api-tests" name="Conversation-callback-stateless">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.BServiceImpl2" />
-		<reference name="c" target="CComponent" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.CServiceImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
deleted file mode 100644
index ace06b245c..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
+++ /dev/null
@@ -1,41 +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://java-api-tests" name="Conversation-callback-stateless">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.BServiceImpl" />
-		<reference name="c" target="CComponent" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.CServiceImpl" />
-	</component>
-
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback.composite b/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback.composite
deleted file mode 100644
index 4623f17ca2..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback.composite
+++ /dev/null
@@ -1,40 +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://java-api-tests" name="Conversation-callback">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.BServiceImpl" />
-		<reference name="c" target="CComponent" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.CServiceImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java b/java/sca-contrib/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
deleted file mode 100644
index 2680370c5b..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
+++ /dev/null
@@ -1,377 +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.vtest.javaapi.conversation.callback;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * 
- */
-public class CallbackTestCase {
-
-    protected static AService aService = null;
-
-    @Before
-    public void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @After
-    public void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-
-    /**
-     * Lines 529-610
-     * <p>
-     * A callback service is a service that is used for asynchronous
-     * communication from a service provider back to its client in contrast to
-     * the communication through return values from synchronous operations.
-     * Callbacks are used by bidirectional services, which are services that
-     * have two interfaces: • an interface for the provided service • a callback
-     * interface that must be provided by the client
-     * <p>
-     * Callbacks may be used for both remotable and local services. Either both
-     * interfaces of a bidirectional service must be remotable, or both must be
-     * local. It is illegal to mix the two. There are two basic forms of
-     * callbacks: stateless callbacks and stateful callbacks. A callback
-     * interface is declared by using the "@Callback" annotation on a remotable
-     * service interface, which takes the Java Class object of the interface as
-     * a parameter. The annotation may also be applied to a method or to a field
-     * of an implementation, which is used in order to have a callback injected,
-     * as explained in the next section.
-     * <p>
-     * 1.6.7.1. Stateful Callbacks A stateful callback represents a specific
-     * implementation instance of the component that is the client of the
-     * service. The interface of a stateful callback should be marked as
-     * conversational. The following example interfaces define an interaction
-     * over stateful callback.
-     * <p>
-     * An implementation of the service in this example could use the
-     * "@Callback" annotation to request that a stateful callback be injected.
-     * The following is a fragment of an implementation of the example service.
-     * In this example, the request is passed on to some other component, so
-     * that the example service acts essentially as an intermediary. Because the
-     * service is conversation scoped, the callback will still be available when
-     * the backend service sends back its asynchronous response.
-     * <p>
-     * This fragment must come from an implementation that offers two services,
-     * one that it offers to it clients (MyService) and one that is used for
-     * receiving callbacks from the back end (MyServiceCallback). The client of
-     * this service would also implement the methods defined in
-     * MyServiceCallback.
-     * <p>
-     * Stateful callbacks support some of the same use cases as are supported by
-     * the ability to pass service references as parameters. The primary
-     * difference is that stateful callbacks do not require any additional
-     * parameters be passed with service operations. This can be a great
-     * convenience. If the service has many operations and any of those
-     * operations could be the first operation of the conversation, it would be
-     * unwieldy to have to take a callback parameter as part of every operation,
-     * just in case it is the first operation of the conversation. It is also
-     * more natural than requiring the application developers to invoke an
-     * explicit operation whose only purpose is to pass the callback object that
-     * should be used.
-     * <p>
-     * This tests the *remote* bidirectional interfaces option
-     */
-    @Test
-    public void statefulCallback() throws Exception {
-        System.out.println("Setting up for callback tests");
-        ServiceFinder.init("callback.composite");
-        aService = ServiceFinder.getService(AService.class, "AComponent");
-        aService.testCallback();
-    }
-
-    /**
-     * Lines 529-610
-     * <p>
-     * A callback service is a service that is used for asynchronous
-     * communication from a service provider back to its client in contrast to
-     * the communication through return values from synchronous operations.
-     * Callbacks are used by bidirectional services, which are services that
-     * have two interfaces: • an interface for the provided service • a callback
-     * interface that must be provided by the client
-     * <p>
-     * Callbacks may be used for both remotable and local services. Either both
-     * interfaces of a bidirectional service must be remotable, or both must be
-     * local. It is illegal to mix the two. There are two basic forms of
-     * callbacks: stateless callbacks and stateful callbacks. A callback
-     * interface is declared by using the "@Callback" annotation on a remotable
-     * service interface, which takes the Java Class object of the interface as
-     * a parameter. The annotation may also be applied to a method or to a field
-     * of an implementation, which is used in order to have a callback injected,
-     * as explained in the next section.
-     * <p>
-     * 1.6.7.1. Stateful Callbacks A stateful callback represents a specific
-     * implementation instance of the component that is the client of the
-     * service. The interface of a stateful callback should be marked as
-     * conversational. The following example interfaces define an interaction
-     * over stateful callback.
-     * <p>
-     * An implementation of the service in this example could use the
-     * "@Callback" annotation to request that a stateful callback be injected.
-     * The following is a fragment of an implementation of the example service.
-     * In this example, the request is passed on to some other component, so
-     * that the example service acts essentially as an intermediary. Because the
-     * service is conversation scoped, the callback will still be available when
-     * the backend service sends back its asynchronous response.
-     * <p>
-     * This fragment must come from an implementation that offers two services,
-     * one that it offers to it clients (MyService) and one that is used for
-     * receiving callbacks from the back end (MyServiceCallback). The client of
-     * this service would also implement the methods defined in
-     * MyServiceCallback.
-     * <p>
-     * Stateful callbacks support some of the same use cases as are supported by
-     * the ability to pass service references as parameters. The primary
-     * difference is that stateful callbacks do not require any additional
-     * parameters be passed with service operations. This can be a great
-     * convenience. If the service has many operations and any of those
-     * operations could be the first operation of the conversation, it would be
-     * unwieldy to have to take a callback parameter as part of every operation,
-     * just in case it is the first operation of the conversation. It is also
-     * more natural than requiring the application developers to invoke an
-     * explicit operation whose only purpose is to pass the callback object that
-     * should be used.
-     * <p>
-     * This tests the *local* bidirectional interfaces option
-     */
-    @Test
-    public void localstatefulCallback() throws Exception {
-        System.out.println("Setting up for local callback tests");
-        ServiceFinder.init("callback-local.composite");
-        aService = ServiceFinder.getService(AService.class, "AComponent");
-        aService.testCallback();
-    }
-
-    /**
-     * Lines 534, 535
-     * <p>
-     * Callbacks may be used for both remotable and local services. Either both
-     * interfaces of a bidirectional service must be remotable, or both must be
-     * local. It is illegal to mix the two.
-     * <p>
-     * In this test configuration BServiceCallback is remotable and CService is
-     * not
-     */
-    @Test(expected = ServiceRuntimeException.class)
-    @Ignore("TUSCANY-2291")
-    public void statefulMixedCallback() throws Exception {
-        System.out.println("Setting up for mixed local/remote callback tests");
-        ServiceFinder.init("callback-mixed.composite");
-        aService = ServiceFinder.getService(AService.class, "AComponent");
-        aService.testCallback();
-    }
-
-    /**
-     * Lines 613-615
-     * <p>
-     * A stateless callback interface is a callback whose interface is not
-     * marked as conversational. Unlike stateless services, the client of that
-     * uses stateless callbacks will not have callback methods routed to an
-     * instance of the client that contains any state that is relevant to the
-     * conversation.
-     * <p>
-     * This test is identical in structure to the stateful test except that
-     * BServiceCallback is not conversational and we test that the callback is
-     * NOT routed to the same instance.
-     */
-    @Test
-    public void statelessCallback() throws Exception {
-        System.out.println("Setting up for stateless callback tests");
-        ServiceFinder.init("callback-stateless.composite");
-        aService = ServiceFinder.getService(AService.class, "AComponent");
-        aService.testCallback();
-    }
-
-    /**
-     * Lines 616-621
-     * <p>
-     * The only information that the client has to work with (other than the
-     * parameters of the callback method) is a callback ID object that is passed
-     * with requests to the service and is guaranteed to be returned with any
-     * callback.
-     * <p>
-     * The following is a repeat of the client code fragment above, but with the
-     * assumption that in this case the MyServiceCallback is stateless. The
-     * client in this case needs to set the callback ID before invoking the
-     * service and then needs to get the callback ID when the response is
-     * received.
-     * <p>
-     * Lines 747-755
-     * <p>
-     * The identity that is used to identify a callback request is, by default,
-     * generated by the system. However, it is possible to provide an
-     * application specified identity that should be used to identify the
-     * callback by calling the ServiceReference.setCallbackID() method. This can
-     * be used even either stateful or stateless callbacks. The identity will be
-     * sent to the service provider, and the binding must guarantee that the
-     * service provider will send the ID back when any callback method is
-     * invoked. The callback identity has the same restrictions as the
-     * conversation ID. It should either be a string or an object that can be
-     * serialized into XML. Bindings determine the particular mechanisms to use
-     * for transmission of the identity and these may lead to further
-     * restrictions when using a given binding.
-     * <p>
-     * TODO - Need to add explicit test back to stateful for 747-755
-     */
-    @Test
-    public void statelessCallback2() throws Exception {
-        System.out.println("Setting up for stateless callback id tests");
-        ServiceFinder.init("callback-stateless-callbackid.composite");
-        aService = ServiceFinder.getService(AService.class, "AComponent");
-        aService.testCallback();
-
-    }
-
-    /**
-     * Lines 650-654
-     * <p>
-     * The difference for stateless services is that the callback field would
-     * not be available if the component is servicing a request for anything
-     * other than the original client. So, the technique used in the previous
-     * section, where there was a response from the backend Service which was
-     * forwarded as a callback from MyService would not work because the
-     * callback field would be null when the message from the backend system was
-     * received.
-     * <p>
-     */
-    @Test
-    public void statelessCallback3() throws Exception {
-        System.out.println("Setting up for stateless callback ref null tests");
-        ServiceFinder.init("callback-stateless-callbackfieldnull.composite");
-        aService = ServiceFinder.getService(AService.class, "AComponent");
-        aService.testCallback();
-
-    }
-
-    /**
-     * Lines 658-669
-     * <p>
-     * Since it is possible for a single implementation class to implement
-     * multiple services, it is also possible for callbacks to be defined for
-     * each of the services that it implements. The service implementation can
-     * include an injected field for each of its callbacks. The runtime injects
-     * the callback onto the appropriate field based on the type of the
-     * callback. The following shows the declaration of two fields, each of
-     * which corresponds to a particular service offered by the implementation.
-     * <p>
-     * Lines 670,671
-     * <p>
-     * If a single callback has a type that is compatible with multiple declared
-     * callback fields, then all of them will be set.
-     */
-    @Test
-    public void statefulMultiBidirectional() throws Exception {
-        System.out.println("Setting up for multi-bidirectional interfaces tests");
-        ServiceFinder.init("callback-multi.composite");
-        aService = ServiceFinder.getService(AService.class, "AComponent");
-        aService.testCallback();
-        aService.testCallback2(); // Includes test for 670,671
-
-    }
-
-    /**
-     * Lines 675-706
-     * <p>
-     * In addition to injecting a reference to a callback service, it is also
-     * possible to obtain a reference to a Callback instance by annotating a
-     * field or method with the "@Callback" annotation. A reference implementing
-     * the callback service interface may be obtained using
-     * CallableReference.getService(). The following fragments come from a
-     * service implementation that uses the callback API:
-     * <p>
-     * Alternatively a callback may be retrieved programmatically using the
-     * RequestContext API. The snippet below show how to retrieve a callback in
-     * a method programmatically:
-     * <p>
-     * Lines 695, 696
-     * <p>
-     * Alternatively a callback may be retrieved programmatically using the
-     * RequestContext API. The snippet below show how to retrieve a callback in
-     * a method programmatically:
-     */
-    @Test
-    public void accessingCallbacks() throws Exception {
-        System.out.println("Setting up for callback accessing tests");
-        ServiceFinder.init("callback-accessing.composite");
-        aService = ServiceFinder.getService(AService.class, "AComponent");
-        aService.testCallback();
-        aService.testCallback2(); // Lines 695-696
-
-    }
-
-    /**
-     * Lines 708-724
-     * <p>
-     * On the client side, the service that implements the callback can access
-     * the callback ID (i.e. reference parameters) that was returned with the
-     * callback operation also by accessing the request context, as follows:
-     * <p>
-     * On the client side, the object returned by the getServiceReference()
-     * method represents the service reference that was used to send the
-     * original request. The object returned by getCallbackID() represents the
-     * identity associated with the callback, which may be a single String or
-     * may be an object (as described below in “Customizing the Callback
-     * Identity”).
-     */
-    @Test
-    public void callbackId() throws Exception {
-        System.out.println("Setting up for callback id tests");
-        ServiceFinder.init("callback-id.composite");
-        aService = ServiceFinder.getService(AService.class, "AComponent");
-        aService.testCallback();
-
-    }
-
-    /**
-     * Lines 728-732
-     * <p>
-     * By default, the client component of a service is assumed to be the
-     * callback service for the bidirectional service. However, it is possible
-     * to change the callback by using the ServiceReference.setCallback()
-     * method. The object passed as the callback should implement the interface
-     * defined for the callback, including any additional SCA semantics on that
-     * interface such as its scope and whether or not it is remotable.
-     * <p>
-     * TODO - Need to complete testing of 1.6.7.5 after resolution of t-2312
-     */
-    @Test
-    public void customCallback() throws Exception {
-        System.out.println("Setting up for custom callback tests; create domain instance");
-        ServiceFinder.init("callback-custom.composite");
-        System.out.println("Setting up for custom callback tests; get AService handle");
-        aService = ServiceFinder.getService(AService.class, "AComponent");
-        aService.testCallback();
-
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/pom.xml b/java/sca-contrib/vtest/java-api/conversation/id/pom.xml
deleted file mode 100644
index 68bfdc7fe1..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/id/pom.xml
+++ /dev/null
@@ -1,46 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-conversation-id</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Conversation - ID</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java b/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
deleted file mode 100644
index 39719539ba..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
+++ /dev/null
@@ -1,39 +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.vtest.javaapi.conversation.id;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-public interface AService {
-
-    public void testAnnotation();
-
-    public void testAnnotation2();
-
-    public void testAnnotation3();
-
-    public void testAnnotation4();
-
-    public void testAnnotation5();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java b/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
deleted file mode 100644
index b5911101b8..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
+++ /dev/null
@@ -1,41 +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.vtest.javaapi.conversation.id;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-public interface BService {
-
-    public void setState(String someState);
-    
-    public String getState();
-
-    public void testAnnotation();
-
-    public void testAnnotation2();
-
-    public void testAnnotation3();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java b/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
deleted file mode 100644
index 1730f863b5..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.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.vtest.javaapi.conversation.id;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-public interface CService {
-
-    public void setState(String someState);
-    
-    public String getState();
-
-    public void testAnnotation();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java b/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
deleted file mode 100644
index ac40c56ee6..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
+++ /dev/null
@@ -1,54 +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.vtest.javaapi.conversation.id;
-
-
-public class CustomConversationId {
-    
-    int id;
-    String name;
-
-    public CustomConversationId(int id, String name) {
-        super();
-        this.id = id;
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getNumber() {
-        return id;
-    }
-
-    public void setName(String someName) {
-        name = someName;
-    }
-
-    public void setNumber(int someInt) {
-        id = someInt;
-    }
-
-    public String toString() {
-        return "id->" + id + " name->" + name;
-    }
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
deleted file mode 100644
index bac842dfca..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
+++ /dev/null
@@ -1,69 +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.vtest.javaapi.conversation.id.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.CustomConversationId;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService {
-
-    @Reference
-    protected ServiceReference<BService> b;
-    
-    @Reference
-    protected ServiceReference<CService> c;
-
-    public void testAnnotation() {
-        b.getService().testAnnotation();  
-    }
-
-    public void testAnnotation2() {
-        b.getService().testAnnotation2();     
-    }
-
-    public void testAnnotation3() {
-        b.getService().testAnnotation3();        
-    }
-
-    public void testAnnotation4() {
-        CustomConversationId id = new CustomConversationId (1, "One");
-        c.setConversationID(id);
-        c.getService().testAnnotation();        
-    }
-
-    public void testAnnotation5() {
-        b.getService().getState();
-        Assert.assertNotNull(b.getConversation().getConversationID());
-//        Assert.assertNotNull(b.getConversationID());  
-        
-        CustomConversationId id = new CustomConversationId (1, "One");
-        c.setConversationID(id);
-        Assert.assertSame(id, c.getConversationID());
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
deleted file mode 100644
index 3c4eea4bc9..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
+++ /dev/null
@@ -1,65 +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.vtest.javaapi.conversation.id.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.BService;
-import org.junit.Assert;
-import org.oasisopen.sca.annotation.ConversationAttributes;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge = "1 seconds")
-public class BServiceImpl implements BService {
-
-    String someState;
-
-    @ConversationID
-    protected String conversationID;
-
-    @ConversationID
-    protected Object conversationID2;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void testAnnotation() {
-        Assert.assertNotNull(conversationID);
-        System.out.println(conversationID);
-    }
-
-    public void testAnnotation2() {
-        Assert.assertNotNull(conversationID2);
-        System.out.println(conversationID);
-    }
-
-    public void testAnnotation3() {
-        Assert.assertTrue(conversationID2 instanceof String);
-        System.out.println(conversationID);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
deleted file mode 100644
index 1e5a459954..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
+++ /dev/null
@@ -1,56 +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.vtest.javaapi.conversation.id.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.CustomConversationId;
-import org.junit.Assert;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
-    String someState;
-
-    @ConversationID
-    protected Object conversationID;
-
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void testAnnotation() {
-        Assert.assertNotNull(conversationID);
-        Assert.assertTrue(conversationID instanceof CustomConversationId);
-        
-        Assert.assertSame(1, ((CustomConversationId)conversationID).getNumber());
-        Assert.assertSame("One", ((CustomConversationId)conversationID).getName());
-        System.out.println(conversationID);
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite b/java/sca-contrib/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
deleted file mode 100644
index 25e7154fca..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
+++ /dev/null
@@ -1,40 +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://java-api-tests" name="Converstion-ID">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.id.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-		<reference name="c" target="CComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.id.impl.BServiceImpl" />
-	</component>
-
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.id.impl.CServiceImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java b/java/sca-contrib/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
deleted file mode 100644
index d3cb107a61..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
+++ /dev/null
@@ -1,118 +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.vtest.javaapi.conversation.id;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * 
- */
-public class ConversationIDTestCase {
-
-    protected static String compositeName = "conversation-id.composite";
-    protected static AService aService = null;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            aService = ServiceFinder.getService(AService.class, "AComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-
-    }
-
-    /**
-     * Lines 504, 505
-     * <p>
-     * If a protected or public field or setter method is annotated with
-     * "@ConversationID", then the conversation ID for the conversation is
-     * injected onto the field
-     */
-    @Test
-    public void idAnnotation() throws Exception {
-        aService.testAnnotation();
-    }
-
-    /**
-     * Lines 505
-     * <p>
-     * The type of the field is not necessarily String
-     */
-    @Test
-    public void idAnnotation2() throws Exception {
-        aService.testAnnotation2();
-    }
-
-    /**
-     * Lines 505, 506
-     * <p>
-     * System generated conversation IDs are always strings
-     */
-    @Test
-    public void idAnnotation3() throws Exception {
-        aService.testAnnotation3();
-    }
-
-    /**
-     * Lines 506, 507
-     * <p>
-     * ... but application generated conversation IDs may be other complex
-     * types.
-     * <p>
-     * Lines 513, 514
-     * <p>
-     * ... To do this, the client would not use reference injection, but would
-     * use the of ServiceReference.setConversationID() API.
-     */
-    @Test
-    public void idAnnotation4() throws Exception {
-        aService.testAnnotation4();
-    }
-
-    /**
-     * Lines 522, 523
-     * <p>
-     * Whether the conversation ID is chosen by the client or is generated by
-     * the system, the client may access the conversation ID by calling
-     * ServiceReference.getConversationID().
-     * <p>
-     * This test is following updates to this section of the specification per
-     * the OASIS TC under issue JAVA-31. The updated text reads: "...by calling
-     * getConversationID() on the current conversation object".
-     */
-    @Test
-    public void idAnnotation5() throws Exception {
-        aService.testAnnotation5();
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/pom.xml b/java/sca-contrib/vtest/java-api/conversation/lifetime/pom.xml
deleted file mode 100644
index 1d4a2d3c4e..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/pom.xml
+++ /dev/null
@@ -1,46 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-conversation-lifetime</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Conversation - Lifetime</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java b/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
deleted file mode 100644
index f5249b3a5b..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
+++ /dev/null
@@ -1,56 +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.vtest.javaapi.conversation.lifetime;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-public interface AService {
-
-    public void testConversationStarted();
-
-    public void testConversationStarted2();
-
-    public void testConversationContinue();
-
-    public void testConversationContinue2();
-
-    public void testConversationContinue3();
-
-    public void testConversationEnd();
-
-    public void testConversationEnd2();
-
-    public void testConversationEnd3();
-
-    public void testConversationEnd4();
-
-    public void testConversationEnd5();
-
-    public void testConversationEnd6();
-
-    public void testConversationEnd7();
-
-    public void testConversationEnd8();
-    
-    public void testConversationEnd9();    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java b/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
deleted file mode 100644
index 635e6e74d4..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
+++ /dev/null
@@ -1,35 +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.vtest.javaapi.conversation.lifetime;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.EndsConversation;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
-    @EndsConversation
-    public void endConversation();
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java b/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
deleted file mode 100644
index b28a31da38..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
+++ /dev/null
@@ -1,47 +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.vtest.javaapi.conversation.lifetime;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.EndsConversation;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
-    public void setState(String someState);
-    
-    public String getState();
-    
-    @EndsConversation
-    public void endConversation();
-    
-    public void endConversationViaCallback();
-
-    public void throwNonBusinessException();
-    
-    public void throwBusinessException() throws BServiceBusinessException;
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java b/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
deleted file mode 100644
index ab186ee7eb..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
+++ /dev/null
@@ -1,53 +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.vtest.javaapi.conversation.lifetime;
-
-
-/**
- * Denotes an error starting the runtime
- *
- * @version $Rev$ $Date$
- */
-public class BServiceBusinessException extends Exception {
-
-    static final long serialVersionUID = 2096658015909178325L;
-    
-    private String message;    
-    
-    public BServiceBusinessException() {
-    }    
-    
-    public BServiceBusinessException(String message) {
-        super(message);
-        setMessage(message);
-    }
-
-    public BServiceBusinessException(Throwable cause) {
-        super(cause);
-        setMessage(cause.getMessage());
-    }
-    
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }     
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java b/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
deleted file mode 100644
index 020d18b862..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
+++ /dev/null
@@ -1,34 +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.vtest.javaapi.conversation.lifetime;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-public interface CService {
-
-    public void setState(String someState);
-    public String getState();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java b/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
deleted file mode 100644
index c339ebd6ea..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
+++ /dev/null
@@ -1,38 +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.vtest.javaapi.conversation.lifetime;
-
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-public interface DService {
-
-    public void setState(String someState);
-    public String getState();
-    
-    public void continueConversation(ServiceReference<BService> b, Object convId);
-    public void continueConversation2(String filename, Object id, String serializedState);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
deleted file mode 100644
index 18d592f9d0..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
+++ /dev/null
@@ -1,197 +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.vtest.javaapi.conversation.lifetime.impl;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.BServiceBusinessException;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.DService;
-import org.junit.Assert;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.ConversationEndedException;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService, AServiceCallback {
-
-    @Context
-    public ComponentContext context;
-
-    @Reference
-    protected ServiceReference<BService> b;
-
-    @Reference
-    protected DService d;
-
-    public void testConversationStarted() {
-        b.getService().setState("Some state");
-        Assert.assertNotNull(b.getConversation().getConversationID());
-    }
-
-    public void testConversationStarted2() {
-        ServiceReference<BService> ref = context.getServiceReference(BService.class, "b");
-        ref.getService().setState("Some state");
-        Assert.assertNotNull(ref.getConversation().getConversationID());
-    }
-
-    public void testConversationContinue() {
-
-        b.getService().setState("Some state");
-        Object id = b.getConversation().getConversationID();
-        b.getService().setState("Some more state");
-        Assert.assertEquals(id, b.getConversation().getConversationID());
-    }
-
-    public void testConversationContinue2() {
-
-        b.getService().setState("Some state");
-        d.continueConversation(b, b.getConversation().getConversationID());
-
-    }
-
-    public void testConversationContinue3() {
-
-        String serializedState = "Serialized State";
-
-        String filename = "target/Serialized-Reference.txt";
-        b.getService().setState(serializedState);
-        Object id = b.getConversation().getConversationID();
-        writeReference(b, filename);
-        d.continueConversation2(filename, id, serializedState);
-
-    }
-
-    // Utilities
-
-    private void delayForSeconds(int numSeconds) {
-        try {
-            Thread.sleep(numSeconds * 1000);// millisecs
-        } catch (InterruptedException ex) {
-            throw new Error(ex);
-        }
-    }
-
-    private void writeReference(ServiceReference<BService> ref, String filename) {
-
-        FileOutputStream fos = null;
-        ObjectOutputStream out = null;
-        try {
-            fos = new FileOutputStream(filename);
-            out = new ObjectOutputStream(fos);
-            out.writeObject(ref);
-            out.close();
-        } catch (IOException ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    public void testConversationEnd() {
-        String someState = "Some state";
-        b.getService().setState(someState);
-        b.getService().endConversation();
-        Assert.assertNotSame(someState, b.getService().getState());
-    }
-
-    public void testConversationEnd2() {
-        String someState = "Some state";
-        b.getService().setState(someState);
-        b.getService().endConversationViaCallback();
-        Assert.assertNotSame(someState, b.getService().getState());
-    }
-
-    public void endConversation() {
-        System.out.println("A-callback to end conversation");
-    }
-
-    public void testConversationEnd3() {
-        String someState = "Some state";
-        b.getService().setState(someState);
-        delayForSeconds(2);
-        try {
-            b.getService().getState();
-        } catch (ConversationEndedException e) {
-            b.getConversation().end();// need to clean up to avoid exception
-        }
-        Assert.assertNotSame(someState, b.getService().getState());
-    }
-
-    public void testConversationEnd4() {
-        String someState = "Some state";
-        b.getService().setState(someState);
-        b.getConversation().end();
-        Assert.assertNotSame(someState, b.getService().getState());
-    }
-
-    public void testConversationEnd5() {
-        String someState = "Some state";
-        b.getService().setState(someState);
-        try {
-            b.getService().throwNonBusinessException();
-        } catch (Error e) {
-            // Expected
-        }
-        Assert.assertNotSame(someState, b.getService().getState());
-    }
-
-    public void testConversationEnd6() {
-        String someState = "Some state";
-        b.getService().setState(someState);
-        Object id = b.getConversation().getConversationID();
-        b.getService().endConversation();
-        Assert.assertNotSame(someState, b.getService().getState());
-        Assert.assertNotSame(id, b.getConversation().getConversationID());
-    }
-
-    public void testConversationEnd7() {
-        b.getService().setState("Some state");
-        b.getService().endConversation();
-        Assert.assertNull(b.getConversationID());
-    }
-
-    public void testConversationEnd8() {
-        String someState = "Some state";
-        b.getService().setState(someState);
-        delayForSeconds(2);
-        b.getService().getState();
-    }
-    
-    public void testConversationEnd9() {
-        String someState = "Some state";
-        b.getService().setState(someState);
-        try {
-            b.getService().throwBusinessException();
-        } catch (BServiceBusinessException e) {
-            // Expected
-        }
-        Assert.assertSame(someState, b.getService().getState());
-    }    
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
deleted file mode 100644
index 71e09c38b3..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
+++ /dev/null
@@ -1,64 +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.vtest.javaapi.conversation.lifetime.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.BServiceBusinessException;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.ConversationAttributes;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="1 seconds")
-public class BServiceImpl implements BService {
-
-    String someState;
-
-    @Callback
-    protected AServiceCallback callback;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void endConversation() {
-        System.out.println("Someone called Bservice.endsConversation()");
-    }
-
-    public void endConversationViaCallback() {
-        callback.endConversation();
-    }
-
-    public void throwNonBusinessException() {
-        throw new Error();
-    }
-    
-    public void throwBusinessException() throws BServiceBusinessException {
-        throw new BServiceBusinessException("Business Exception");
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
deleted file mode 100644
index e182613932..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
+++ /dev/null
@@ -1,40 +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.vtest.javaapi.conversation.lifetime.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.CService;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
-    String someState;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
deleted file mode 100644
index 15a4ab3b76..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
+++ /dev/null
@@ -1,78 +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.vtest.javaapi.conversation.lifetime.impl;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.DService;
-import org.junit.Assert;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(DService.class)
-@Scope("CONVERSATION")
-public class DServiceImpl implements DService {
-
-    String someState;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public void continueConversation(ServiceReference<BService> b, Object convId) {
-
-        b.getService().setState("Some more state");
-        Assert.assertEquals(convId, b.getConversation().getConversationID());
-    }
-
-    public void continueConversation2(String filename, Object convId, String serializedState) {
-        ServiceReference<BService> b = readReference(filename);
-        Assert.assertEquals(serializedState, b.getService().getState());
-        Assert.assertEquals(convId, b.getConversation().getConversationID());
-    }
-
-    // Utilities
-    @SuppressWarnings("unchecked")
-    private ServiceReference<BService> readReference(String filename) {
-        ServiceReference<BService> b = null;
-        FileInputStream fis = null;
-        ObjectInputStream in = null;
-        try {
-            fis = new FileInputStream(filename);
-            in = new ObjectInputStream(fis);
-            ServiceReference<BService> readObject = (ServiceReference<BService>)in.readObject();
-            b = readObject;
-            in.close();
-        } catch (IOException ex) {
-            ex.printStackTrace();
-        } catch (ClassNotFoundException ex) {
-            ex.printStackTrace();
-        }
-        return b;
-    }
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite b/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
deleted file mode 100644
index 21ee8acac1..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
+++ /dev/null
@@ -1,45 +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://java-api-tests" name="Converstion-Lifetime">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-		<reference name="d" target="DComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl.BServiceImpl" />
-	</component>
-
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl.CServiceImpl" />
-	</component>
-
-	<component name="DComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl.DServiceImpl" />
-	</component>
-	
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java b/java/sca-contrib/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
deleted file mode 100644
index 52c11b881c..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
+++ /dev/null
@@ -1,216 +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.vtest.javaapi.conversation.lifetime;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.oasisopen.sca.ConversationEndedException;
-
-/**
- * 
- */
-public class LifetimeTestCase {
-
-    protected static String compositeName = "lifetime.composite";
-    protected static AService aService = null;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            aService = ServiceFinder.getService(AService.class, "AComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-
-    }
-
-    /**
-     * Lines 475, 476
-     * <p>
-     * Conversations start on the client side when one of the following occur: A
-     * "@Reference" to a conversational service is injected, ... and then a
-     * method of the service is called
-     */
-    @Test
-    public void lifetime1() throws Exception {
-        aService.testConversationStarted();
-    }
-
-    /**
-     * Lines 477, 478, 479
-     * <p>
-     * Conversations start on the client side when one of the following occur
-     * ... A call is made to CompositeContext.getServiceReference and then a
-     * method of the service is called.
-     */
-    @Test
-    //@Ignore("TUSCANY-2243")
-    public void lifetime2() throws Exception {
-        aService.testConversationStarted2();
-    }
-
-    /**
-     * Line 481, 482
-     * <p>
-     * The client can continue an existing conversation, by: Holding the service
-     * reference that was created when the conversation started
-     */
-    @Test
-    public void lifetime3() throws Exception {
-        aService.testConversationContinue();
-    }
-
-    /**
-     * Line 481, 483
-     * <p>
-     * The client can continue an existing conversation, by: ... • Getting the
-     * service reference object passed as a parameter from another service, even
-     * remotely
-     */
-    @Test
-    public void lifetime4() throws Exception {
-        // aService.testConversationContinue2();
-    }
-
-    /**
-     * Line 481, 484
-     * <p>
-     * The client can continue an existing conversation, by:<br> • Loading a
-     * service reference that had been written to some form of persistent
-     * storage
-     */
-    @Test
-    public void lifetime6() throws Exception {
-        aService.testConversationContinue3();
-    }
-
-    /**
-     * Line 487, 488
-     * <p>
-     * A conversation ends, and any state associated with the conversation is
-     * freed up, when: <br>
-     * ...A server operation that has been annotated "@EndConveration" has been
-     * called
-     */
-    @Test
-    public void lifetime7() throws Exception {
-        aService.testConversationEnd();
-    }
-
-    /**
-     * Line 487, 489
-     * <p>
-     * A conversation ends, and any state associated with the conversation is
-     * freed up, when: <br>
-     * ...The server calls an "@EndsConversation" method on the "@Callback"
-     * reference <br>
-     */
-    @Test
-    public void lifetime8() throws Exception {
-        aService.testConversationEnd2();
-    }
-
-    /**
-     * Line 487, 490
-     * <p>
-     * 487 A conversation ends, and any state associated with the conversation
-     * is freed up, when: <br>
-     * ... The server's conversation lifetime timeout occurs
-     */
-    @Test
-    public void lifetime9() throws Exception {
-        aService.testConversationEnd3();
-    }
-
-    /**
-     * Line 487, 491
-     * <p>
-     * A conversation ends, and any state associated with the conversation is
-     * freed up, when: <br>
-     * ...The client calls Conversation.end()
-     */
-    @Test
-    public void lifetime10() throws Exception {
-        aService.testConversationEnd4();
-    }
-
-    /**
-     * Line 487, 492
-     * <p>
-     * A conversation ends, and any state associated with the conversation is
-     * freed up, when: <br>
-     * ...Any non-business exception is thrown by a conversational operation
-     */
-    @Test
-    //@Ignore("TUSCANY-2283")
-    public void lifetime11() throws Exception {
-        aService.testConversationEnd5();
-        aService.testConversationEnd9();
-    }
-
-    /**
-     * Line 494, 495
-     * <p>
-     * If a method is invoked on a service reference after an
-     * "@EndsConversation" method has been called then a new conversation will
-     * automatically be started.
-     */
-    @Test
-    public void lifetime12() throws Exception {
-        aService.testConversationEnd6();
-    }
-
-    /**
-     * Line 495, 496, 497
-     * <p>
-     * If ServiceReference.getConversationID() is called after the
-     * "@EndsConversation" method: is called, but before the next conversation
-     * has been started, it will return null.
-     */
-    @Test
-    public void lifetime13() throws Exception {
-        aService.testConversationEnd7();
-    }
-
-    /**
-     * Line 498, 499
-     * <p>
-     * If a service reference is used after the service provider's conversation
-     * timeout has caused the conversation to be ended, then
-     * ConversationEndedException will be thrown.
-     */
-    @Test(expected = ConversationEndedException.class)
-    public void lifetime14() throws Exception {
-        aService.testConversationEnd8();
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/pom.xml b/java/sca-contrib/vtest/java-api/conversation/parameters/pom.xml
deleted file mode 100644
index dba54f0f4c..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/pom.xml
+++ /dev/null
@@ -1,46 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>java-api-annotations</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-conversation-parameters</artifactId>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Conversation - Parameters</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java b/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
deleted file mode 100644
index bd19b504d9..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
+++ /dev/null
@@ -1,28 +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.vtest.javaapi.conversation.parameters;
-
-/**
- * Simple Remotable Service
- */
-public interface AService {
-
-    public void setBStateThenGetCState();
-    
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java b/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
deleted file mode 100644
index c404b91673..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
+++ /dev/null
@@ -1,34 +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.vtest.javaapi.conversation.parameters;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-public interface BService {
-
-    public void setState(String someState);
-    public String getState();
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java b/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
deleted file mode 100644
index d9f32dcfea..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.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 org.apache.tuscany.sca.vtest.javaapi.conversation.parameters;
-
-import org.oasisopen.sca.ServiceReference;
-
-/**
- * Simple Local Service
- */
-public interface CService {
-
-    public void setState(String someState);
-    public String getState();
-    public Object continueConversation(ServiceReference<BService> bref);
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
deleted file mode 100644
index 920d1294b3..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
+++ /dev/null
@@ -1,47 +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.vtest.javaapi.conversation.parameters.impl;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.CService;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    @Reference
-    protected ServiceReference<BService> b;
-
-    @Reference
-    protected CService c;
-
-    public void setBStateThenGetCState() {
-        String someState = "set by A";
-        b.getService().setState(someState);
-        Assert.assertEquals(someState, c.continueConversation(b));
-    }
-
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
deleted file mode 100644
index 98cf59c084..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
+++ /dev/null
@@ -1,40 +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.vtest.javaapi.conversation.parameters.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.BService;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService {
-
-    String someState;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java b/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
deleted file mode 100644
index 5f223dfcf0..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.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 org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.CService;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl implements CService {
-
-    String someState;
-
-    public void setState(String someState) {
-        this.someState = someState;
-    }
-
-    public String getState() {
-        return someState;
-    }
-
-    public String continueConversation(ServiceReference<BService> bref) {
-        return bref.getService().getState();
-   }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite b/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
deleted file mode 100644
index a8500dfb09..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
+++ /dev/null
@@ -1,40 +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://java-api-tests" name="Converstion-Composite">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-		<reference name="c" target="CComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.impl.BServiceImpl" />
-	</component>
-
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.impl.CServiceImpl" />
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java b/java/sca-contrib/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
deleted file mode 100644
index 929fe06115..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
+++ /dev/null
@@ -1,69 +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.vtest.javaapi.conversation.parameters;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This test class tests the Service annotation described in section 1.2.1 and
- * 1.8.17
- */
-public class ConversationParametersTestCase {
-
-    protected static ServiceFinder serviceFinder;
-    protected static String compositeName = "parameters.composite";
-    protected static AService aService = null;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            aService = ServiceFinder.getService(AService.class, "AComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-
-    }
-
-    /**
-     * Line 423, 424, 425:<br>
-     * <p>
-     * The service reference which represents a single conversation can be
-     * passed as a parameter to another service, even if that other service is
-     * remote. This may be used in order to allow one component to continue a
-     * conversation that had been started by another.
-     */
-    @Test
-    public void passParameter1() throws Exception {
-        aService.setBStateThenGetCState();
-    }
-
-}
diff --git a/java/sca-contrib/vtest/java-api/conversation/pom.xml b/java/sca-contrib/vtest/java-api/conversation/pom.xml
deleted file mode 100644
index 08fa85c79d..0000000000
--- a/java/sca-contrib/vtest/java-api/conversation/pom.xml
+++ /dev/null
@@ -1,63 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-java-api</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api-conversation</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Conversation</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>parameters</module>
-                <module>lifetime</module>
-                <module>id</module>
-                <module>callback</module>
-           </modules>
-        </profile>
-    </profiles>
-</project>
diff --git a/java/sca-contrib/vtest/java-api/pom.xml b/java/sca-contrib/vtest/java-api/pom.xml
deleted file mode 100644
index 9b5e957b6e..0000000000
--- a/java/sca-contrib/vtest/java-api/pom.xml
+++ /dev/null
@@ -1,70 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-vtest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-java-api</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>vtest-utilities</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>annotations</module>
-                <module>apis</module>
-                <module>conversation</module>
-           </modules>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/java/sca-contrib/vtest/pom.xml b/java/sca-contrib/vtest/pom.xml
deleted file mode 100644
index a49648244b..0000000000
--- a/java/sca-contrib/vtest/pom.xml
+++ /dev/null
@@ -1,56 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-vtest</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Specification Verification Tests</name>
-    
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>java-api</module>
-                <module>wsbinding</module>
-                <module>utilities</module>
-                <module>assembly</module>
-           </modules>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/java/sca-contrib/vtest/processcomments.rb b/java/sca-contrib/vtest/processcomments.rb
deleted file mode 100644
index b7a7fc1cc3..0000000000
--- a/java/sca-contrib/vtest/processcomments.rb
+++ /dev/null
@@ -1,198 +0,0 @@
-=begin

-

-/*

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

- */

-

-Scans java test source files, recursively from the current directory,

-and produces a list of test metods sorted by specification line number.

-

-The implementation makes heavy use of my scant knowledge of regex.  I'll

-comeback and clean this up as time allows.

-

-Assumes a test comment convention like this:

-

-    /**

-     * Lines 410,411,412,413:

-     * <p>

-     * A method of a conversational interface may be marked with an

-     * "@EndsConversation" annotation. Once a method marked with

-     * "@EndsConversation" has been called, the conversation between client and

-     * service provider is at an end, which implies no further methods may be

-     * called on that service within the *same* conversation.

-     */

-    @Test

-    public void atEndsConversation1() throws Exception {

-

-Example command line usage

->ruby processcomments.rb > comment_scan.txt

-

-Current output is formatted for a cwiki page and can be directly pasted to a blank page

-

-Some TODO's:

-  Add logic to process number ranges such as "Lines 523-556" or "Lines 523 to 556"

-=end

-class TestMethod

-  

-  attr_accessor :lines_tested, :first_line_tested

-  

-  def initialize(text, parent)

-    @text = text

-    @parent = parent

-    @lines_tested = init_lines_tested

-    @first_line_tested = @lines_tested.first

-  end  

-  

-  #Define sort criteria

-  def <=>(test_method)  

-    @first_line_tested.<=>(test_method.first_line_tested)  

-  end  

-  

-  def name

-    regex = /void\s*\S*\(\) /

-    str = @text[regex]

-    str.sub(/void\s*/, '')

-  end

-  

-  def init_lines_tested

-    lines_regex = /Line.*?$/

-    lines_array = @text.scan(lines_regex)

-    nums_regex = /\d{1,4}/

-    line_numbers = Array.new

-    lines_array.each do |line_text|

-      number_strings =line_text.scan(nums_regex)

-      number_strings.each {|num_string| line_numbers<<num_string.to_i}

-    end

-    line_numbers

-  end

-  

-  def lines_tested_string

-    lts = String.new

-    lines_tested.each {|n| lts = lts +"," + n.to_s }

-    lts[1..lts.length]

-  end

-  

-  def ignore_line

-    @text[/^\s*@Ignore.*/]

-  end

-  

-  def jira

-    result = ignore_line

-    result = result[/\d{4,5}/] 

-    result ?  "T-" + result : "x"

-  end

-  

-  def ignore_string

-    ignore_line ?  jira : ""

-  end

-  

-  def package_name

-    @parent.package_name

-  end

-  

-  def testcase_name

-    @parent.testcase_name

-  end

-  

-  def long_name

-    self.package_name + "." + testcase_name + "." + self.name

-  end

-  

-  def to_s

-    long_name  + "\n" + "Lines tested: " + lines_tested_string + "\n\n"

-  end

-  

-  def to_cwiki_s

-    "|" + lines_tested_string + "|" + long_name + "|" + ignore_string + "|\n"

-  end

-end

-

-class TestCase

-  attr_accessor :text, :test_methods

-  

-  def initialize(text)

-    @text = text

-    @test_methods = Array.new

-    create_test_methods

-  end  

-  

-  def create_test_methods

-    regex = /\/\*\*\W*?$\W*?Line.*?\{/m

-    test_method_text_array = text.scan(regex)

-    test_method_text_array.each do |t| 

-      @test_methods<<TestMethod.new(t, self)

-      $num_test_methods +=1

-    end

-  end

-  

-  def package_name

-    line = @text[/pack.*$/]

-    line.sub!(/package /, '')

-    line.sub(/;/, '')

-  end

-  

-  def testcase_name

-    text[/\S*TestCase/]

-  end

-end

-  

-def process_file(fn)

-  text = String.new

-  File.open(fn) { |f|  text = f.read } 

-  $testcases << TestCase.new(text)

-end

-

-def spec_tested (dir_pwd)

-  subfolder_name = dir_pwd[/\/[^\/\\]*$/]

-  subfolder_name = subfolder_name[1..subfolder_name.length-1]

-  result = case subfolder_name

-    when "java-api" : "SCA Java Common Annotations and APIs V1.00"

-    when "wsbinding" : "SCA Web Services Binding V1.00"

-    else "Unknown!"

-    end

-end

-

-$num_files_processed = $num_test_methods = 0

-$testcases = Array.new

-svn_info = `svn info`

-svn_revision = svn_info[/Revision: \d*/]

-

-Dir["**/*TestCase.java"].each do |filename|

-  process_file(filename)

-   $num_files_processed += 1

-end

-

-all_test_methods = Array.new

-$testcases.each do |tc| 

-  tc.test_methods.each {|m| all_test_methods<<m}

-end

-

-#confluence wiki output

-puts "Content generated by /vtest/processcomments.rb"

-puts "h1. " + spec_tested(Dir.pwd) + " - Test map"

-puts "h3. Test case files scanned " + Date.today.to_s + " (svn:" + svn_revision + ")"

-puts "* Total files processed = #{$num_files_processed}"

-puts "* Number of test cases = #{$testcases.length}"

-puts "* Number of test methods = #{$num_test_methods}"

-

-puts "||Specification Line Numbers|| package/testcase/method ||ignored||"

-all_test_methods.sort.each {|tm| puts tm.to_cwiki_s}

-

-

-

-

diff --git a/java/sca-contrib/vtest/utilities/pom.xml b/java/sca-contrib/vtest/utilities/pom.xml
deleted file mode 100644
index c4647ef2c0..0000000000
--- a/java/sca-contrib/vtest/utilities/pom.xml
+++ /dev/null
@@ -1,48 +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>
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-vtest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-utilities</artifactId>
-    <name>Apache Tuscany SCA Verification Tests - Utilities</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-         <dependency>
-             <groupId>wsdl4j</groupId>
-             <artifactId>wsdl4j</artifactId>
-             <version>1.6.2</version>
-         </dependency>
-         
-    </dependencies>
-
-</project>
diff --git a/java/sca-contrib/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java b/java/sca-contrib/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
deleted file mode 100644
index 9b6792e51b..0000000000
--- a/java/sca-contrib/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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.vtest.utilities;
-
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * 
- * 
- */
-public class ServiceFinder {
-
-    private static SCADomain domain;
-
-    protected ServiceFinder() {
-        super();
-    }
-
-    public static void init(String compositeFileName) {
-        if (domain != null)
-            System.out.println("VTEST WARNING: domain already exists and is will be overwritten!");
-        domain = SCADomain.newInstance(compositeFileName);
-    } 
-    
-    
-    public static <B> B getService(Class<B> businessInterface, String serviceName) {
-        return domain.getService(businessInterface, serviceName);
-    }
-
-    public static void cleanup() {
-        domain.close();
-        domain = null;
-    }
-
-    private static String getUri(String component, String service, String binding) {
-        
-    	List<ComponentService> csList = domain.getComponentManager().getComponent(component).getServices();
-    	
-    	for (int i = 0; i < csList.size(); i++) {
-    		ComponentService cs = csList.get(i);
-    		if (service.equals(cs.getName())) {
-        		List<Binding> bList = cs.getBindings();
-        		for (int j = 0; j < bList.size(); j++) {
-        			String bName = bList.get(j).getName();
-        			if (bName.equals(binding)) {
-            			String bUri  = bList.get(j).getURI();
-            			System.out.println(component + "/" + service + "-> binding name: " + bName + ", uri: " + bUri);
-            			return bUri;
-        			}
-        		}
-    		}
-    	}
-    	return null;
-    }
-    
-    public static Definition getWSDLDefinition(String component, String service) {
-    	return getWSDLDefinition(component, service, service);
-    }
-    	
-    public static Definition getWSDLDefinition(String component, String service, String binding) {
-
-    	String uri = getUri(component, service, binding);
-
-        if (uri == null)
-    		return null;
-    	
-    	try {
-    		WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
-            wsdlReader.setFeature("javax.wsdl.verbose",false);
-            wsdlReader.setFeature("javax.wsdl.importDocuments",true);
-            return wsdlReader.readWSDL(uri + "?wsdl");
-    	} catch (WSDLException e) {
-    		e.printStackTrace(System.out);
-    	}
-    	return null;
-    }
-
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/pom.xml b/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
deleted file mode 100644
index 93281db150..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
+++ /dev/null
@@ -1,58 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-wsbinding-nowsdl</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-wsbinding-nowsdl-defaultbinding</artifactId>
-    <name>Apache Tuscany SCA Web Service Binding Verification Tests - No WSDL Default Binding</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
deleted file mode 100644
index b99ced1e17..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.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.vtest.wsbinding.nowsdl.defaultbinding;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for AService.
- */
-@Remotable
-public interface AService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-	
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
deleted file mode 100644
index 77c7bd4071..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
+++ /dev/null
@@ -1,35 +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.vtest.wsbinding.nowsdl.defaultbinding;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
deleted file mode 100644
index b1979b99d9..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.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.vtest.wsbinding.nowsdl.defaultbinding;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface CService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public Integer getInteger(Integer i);
-
-	public float getFloat(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
deleted file mode 100644
index 9a99700550..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.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.    
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for DService.
- */
-@Remotable
-public interface DService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-
-	public String getC1String(String aString);
-
-	public String getC1String2(String aString, String bString);
-
-	public Integer getC1Integer(Integer i);
-	
-	public float getC1Float(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
deleted file mode 100644
index 862dd78735..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
+++ /dev/null
@@ -1,51 +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.vtest.wsbinding.nowsdl.defaultbinding.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.BService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-	@Reference
-	public BService b1;
-	
-    public String getName() {
-        return "AService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
deleted file mode 100644
index 225476ada0..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.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 org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.BService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-    public String getName() {
-        return "BService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
deleted file mode 100644
index 9c5908f34e..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
+++ /dev/null
@@ -1,48 +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.vtest.wsbinding.nowsdl.defaultbinding.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.CService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl implements CService {
-
-    public String getName() {
-        return "CService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public Integer getInteger(Integer i) {
-    	return i;
-    }
-    
-    public float getFloat(float f) {
-        return f;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
deleted file mode 100644
index 9bda9468f5..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
+++ /dev/null
@@ -1,70 +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.vtest.wsbinding.nowsdl.defaultbinding.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.BService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.CService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.DService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(DService.class)
-public class DServiceImpl implements DService {
-
-	@Reference
-	public BService b1;
-	
-	@Reference
-	public CService c1;
-	
-    public String getName() {
-        return "DService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-	public String getC1String(String aString) {
-		return c1.getString(aString);
-	}
-
-	public String getC1String2(String aString, String bString) {
-		return c1.getString2(aString, bString);
-	}
-
-	public Integer getC1Integer(Integer i) {
-		return c1.getInteger(i);
-	}
-	
-	public float getC1Float(float f) {
-		return c1.getFloat(f);
-	}
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite b/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
deleted file mode 100644
index 39d66fa365..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.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"
-	targetNamespace="http://vtest.wsbinding.nowsdl.defaultbinding"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-	name="nowsdl.defaultbinding">
-
-	<component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.impl.BServiceImpl"/>
-		<service name="BService">
-       		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.BService"/>
-			<binding.ws uri="http://localhost:8085/BComponent"/>
-		</service>
-    </component>
-
-	<component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.impl.CServiceImpl"/>
-		<service name="CService">
-       		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.CService"/>
-			<binding.ws uri="http://localhost:8085/CComponent"/>
-		</service>
-    </component>
-
-    <component name="AComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent/BService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.BService"/>
-			<binding.ws uri="http://localhost:8085/BComponent"/>
-        </reference>
-    </component>
-
-    <component name="DComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.impl.DServiceImpl"/>
-        <reference name="b1" target="BComponent/BService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.BService"/>
-			<binding.ws uri="http://localhost:8085/BComponent"/>
-        </reference>
-        <reference name="c1" target="CComponent/CService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.CService"/>
-			<binding.ws uri="http://localhost:8085/CComponent"/>
-        </reference>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java b/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
deleted file mode 100644
index b50774cfa9..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
+++ /dev/null
@@ -1,112 +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.vtest.wsbinding.nowsdl.defaultbinding;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.DService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the simplest form of the binding element without WSDL document
- * described in section section 2.2.2 of SCA Web Services Binding V1.00
- * 
- * @TODO - will add following tests<br>
- * <li>promoted service</li>
- * <li>with complex type object</li>
- */
-public class NoWsdlDefaultBindingTestCase {
-
-	protected static ServiceFinder serviceFinder;
-    protected static String compositeName = "nowsdl.composite";
-    protected static AService a;
-    protected static DService d;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            a = ServiceFinder.getService(AService.class, "AComponent");
-            d = ServiceFinder.getService(DService.class, "DComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 169-181:<br>
-     * 2.2.2 Examples Without a WSDL Document<br>
-     * The next example shows the simplest form of the binding element without
-     * WSDL document,<br>
-     * ...<br>
-     * which itself uses all the defaults.<br>
-     */
-    @Test
-    public void testNoWsdl1() throws Exception {
-    	String aName = a.getName();
-    	String b1Str1 = a.getB1String("string1");
-    	String b1Str2 = a.getB1String2("string2", "string3");
-    	int b1Int = a.getB1Int(4000);
-    	
-        System.out.println(aName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(4000, b1Int);
-    }
-
-    /**
-     * Lines 169-181:<br>
-     * Test two references using binding.ws but without WSDL documents.<br> 
-     */
-    @Test
-    public void testNoWsdl2() throws Exception {
-    	String dName = d.getName();
-    	String b1Str1 = d.getB1String("string1");
-    	String b1Str2 = d.getB1String2("string2", "string3");
-    	String c1Str1 = d.getC1String("string5");
-    	String c1Str2 = d.getC1String2("string6", "string7");
-    	
-    	int b1Int = d.getB1Int(4000);
-    	float c1Float = d.getC1Float((float) 8.8);
-
-    	Integer c1Integer = d.getC1Integer(new Integer(9000));
-
-        System.out.println(dName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int + ", " + c1Str1 + ", " + c1Str2 + ", " + c1Float + ", " + c1Integer);
-        Assert.assertEquals("DService", dName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(4000, b1Int);
-        Assert.assertEquals("string5", c1Str1);
-        Assert.assertEquals("string6string7", c1Str2);
-        Assert.assertEquals((float) 8.8, c1Float);
-        Assert.assertEquals(new Integer(9000), c1Integer);
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml b/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
deleted file mode 100644
index 56356ce487..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
+++ /dev/null
@@ -1,58 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-wsbinding-nowsdl</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-wsbinding-nowsdl-multisoapbindings</artifactId>
-    <name>Apache Tuscany SCA Web Service Binding Verification Tests - No WSDL Multi Soap Bindings</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
deleted file mode 100644
index 1edeea95a3..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.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.vtest.wsbinding.nowsdl.multisoapbindings;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for AService.
- */
-@Remotable
-public interface AService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-	
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
deleted file mode 100644
index 007ff62f17..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
+++ /dev/null
@@ -1,35 +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.vtest.wsbinding.nowsdl.multisoapbindings;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
deleted file mode 100644
index 63049ac3df..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.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.vtest.wsbinding.nowsdl.multisoapbindings;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface CService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public Integer getInteger(Integer i);
-
-	public float getFloat(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
deleted file mode 100644
index 1a8d4671aa..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.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.    
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for DService.
- */
-@Remotable
-public interface DService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-
-	public String getC1String(String aString);
-
-	public String getC1String2(String aString, String bString);
-
-	public Integer getC1Integer(Integer i);
-	
-	public float getC1Float(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
deleted file mode 100644
index abed24390e..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
+++ /dev/null
@@ -1,51 +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.vtest.wsbinding.nowsdl.multisoapbindings.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-	@Reference
-	public BService b1;
-	
-    public String getName() {
-        return "AService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
deleted file mode 100644
index aba7748bb0..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.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 org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-    public String getName() {
-        return "BService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
deleted file mode 100644
index c7bf86e5eb..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
+++ /dev/null
@@ -1,48 +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.vtest.wsbinding.nowsdl.multisoapbindings.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl implements CService {
-
-    public String getName() {
-        return "CService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public Integer getInteger(Integer i) {
-    	return i;
-    }
-    
-    public float getFloat(float f) {
-        return f;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
deleted file mode 100644
index 9f6ff73355..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
+++ /dev/null
@@ -1,70 +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.vtest.wsbinding.nowsdl.multisoapbindings.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.DService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(DService.class)
-public class DServiceImpl implements DService {
-
-	@Reference
-	public BService b1;
-	
-	@Reference
-	public CService c1;
-	
-    public String getName() {
-        return "DService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-	public String getC1String(String aString) {
-		return c1.getString(aString);
-	}
-
-	public String getC1String2(String aString, String bString) {
-		return c1.getString2(aString, bString);
-	}
-
-	public Integer getC1Integer(Integer i) {
-		return c1.getInteger(i);
-	}
-	
-	public float getC1Float(float f) {
-		return c1.getFloat(f);
-	}
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite b/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
deleted file mode 100644
index 8cd599354a..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
+++ /dev/null
@@ -1,135 +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://vtest.wsbinding.nowsdl"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-	name="nowsdl">
-
-	<component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.BServiceImpl"/>
-		<service name="BService">
-       		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-			<binding.ws name="BServiceSOAP11" requires="SOAP.1_1" uri="http://localhost:8085/BService/soap11"/>
-			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BService/soap12"/>
-		</service>
-    </component>
-
-	<component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.CServiceImpl"/>
-		<service name="CService">
-       		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/>
-			<binding.ws name="CServiceSOAP12" requires="SOAP.1_2" uri="http://localhost:8085/CService/soap12"/>
-			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/CService/soap11"/>
-		</service>
-    </component>
-    
-    <component name="AComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent/BService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-			<binding.ws/>
-        </reference>
-    </component>
-
-    <component name="AComponent2">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent/BService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-			<binding.ws requires="SOAP"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent3">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent/BService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-			<binding.ws requires="SOAP.1_1"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent4">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent/BService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-			<binding.ws requires="SOAP.1_2"/>
-        </reference>
-    </component>
-    
-    <component name="DComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.DServiceImpl"/>
-        <reference name="b1" target="BComponent/BService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-			<binding.ws requires="SOAP.1_1"/>
-        </reference>
-        <reference name="c1" target="CComponent/CService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/>
-			<binding.ws requires="SOAP.1_2"/>
-        </reference>
-    </component>
-
-    <component name="DComponent2">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.DServiceImpl"/>
-        <reference name="b1" target="BComponent/BService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-			<binding.ws requires="SOAP.1_2"/>
-        </reference>
-        <reference name="c1" target="CComponent/CService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/>
-			<binding.ws requires="SOAP.1_1"/>
-        </reference>
-    </component>
-
-	<service name="BServicePromoted" promote="BComponentPromoted">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-		<binding.ws name="BServicePromotedSOAP11" requires="SOAP.1_1" uri="http://localhost:8085/BServicePromoted/soap11"/>
-		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BServicePromoted/soap12"/>
-	</service>
-
-	<service name="CServicePromoted" promote="CComponentPromoted">
-   		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/>
-		<binding.ws name="CServicePromotedSOAP12" requires="SOAP.1_2" uri="http://localhost:8085/CServicePromoted/soap12"/>
-		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/CServicePromoted/soap11"/>
-	</service>
-
-	<component name="BComponentPromoted">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.BServiceImpl"/>
-    </component>
-
-	<component name="CComponentPromoted">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.CServiceImpl"/>
-    </component>
-
-    <reference name="DComponent3B1" promote="DComponent3/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BServicePromoted/soap12"/>
-    </reference>
-    
-    <reference name="DComponent3C1" promote="DComponent3/c1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/>
-		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/CServicePromoted/soap11"/>
-    </reference>
-    
-    <component name="DComponent3">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.DServiceImpl"/>
-        <reference name="b1"/>
-        <reference name="c1"/>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java b/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
deleted file mode 100644
index ae058cf6c9..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
+++ /dev/null
@@ -1,162 +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.vtest.wsbinding.nowsdl.multisoapbindings;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.http.HTTPBinding;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.wsdl.extensions.soap12.SOAP12Binding;
-
-import junit.framework.Assert;
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests the simplest form of the binding element without WSDL document
- * described in section 2.3.2 of SCA Web Services Binding V1.00
- */
-public class GeneratedWSDLTestCase {
-
-    protected static String compositeName = "nowsdlmultisoapbindings.composite";
-    protected static Definition cWSDL = null;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-       		cWSDL = ServiceFinder.getWSDLDefinition("CComponent", "CService");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    private Map getPorts(Definition wsdl, String service) {
-    	String targetNamespace = wsdl.getTargetNamespace();
-    	HashMap sMap = (HashMap) wsdl.getServices();
-    	for (Iterator i = sMap.keySet().iterator(); i.hasNext();) {
-    		Object k1 = i.next();
-    		Service s = (Service) sMap.get(k1);
-    		String qName = "{" + targetNamespace + "}" + service;
-    		if (s.getQName().toString().equals(qName)) {
-    			return s.getPorts();
-    		}
-    		// Don't why implmentation changed to add Service at the end of qname
-    		if (s.getQName().toString().equals(qName + "Service")) {
-    			return s.getPorts();
-    		}
-    	}
-    	return null;
-    }
-    
-    /**
-     * Lines 262-264:<br>
-     * The WSDL service has one or more ports for each web service binding on
-     * the SCA service that has a SOAP requirement, or that refers to an 
-     * existing WSDL binding, depending on the requirements of the web service
-     * binding. Each of those ports has a single binding.<p>
-     * Each service has following bindings:<br>
-     * <li>SoapBinding - PortType and SOAP11</li>
-     * <li>SOAP12Binding - SOAP12</li>
-     * <li>HTTPBinding - Http</li>
-     * <br>and following ports:<br>
-     * <li>SoapAddress</li>
-     * <li>SOAP12Address</li>
-     * <li>HTTPAddress</li>
-     */
-    @Test
-    @Ignore
-    // Only generate SOAP port and binding
-    public void testMultiSoapBindings4() throws Exception {
-
-    	Map pMap = getPorts(cWSDL, "CService");
-    	int numSoapPort   = 0;
-    	int numSoap12Port = 0;
-    	int numHttpPort   = 0;
-   		for (Iterator iter = pMap.keySet().iterator(); iter.hasNext();) {
-    		Object k2 = iter.next();
-    		Port p = (Port) pMap.get(k2);
-    		List eeList = p.getExtensibilityElements();
-    		for (int i = 0; i < eeList.size(); i++) {
-    			Object address = eeList.get(i);
-    			if (address instanceof SOAPAddress) {
-    				numSoapPort++;
-				} else if (address instanceof SOAP12Address) {
-    				numSoap12Port++;
-				} else if (address instanceof HTTPAddress) {
-    				numHttpPort++;
-				};
-    		}
-    	}
-
-   		Map cMap = cWSDL.getBindings();
-    	int numSoapBinding   = 0;
-    	int numSoap12Binding = 0;
-    	int numHttpBinding   = 0;
-   		for (Iterator iter = cMap.keySet().iterator(); iter.hasNext();) {
-   			Object k1 = iter.next();
-   			Binding b = (Binding) cMap.get(k1);
-   			List eeList = b.getExtensibilityElements();
-    		for (int i = 0; i < eeList.size(); i++) {
-    			Object binding = eeList.get(i);
-    			if (binding instanceof SOAPBinding) {
-    				numSoapBinding++;
-    			} else if (binding instanceof SOAP12Binding) {
-    				numSoap12Binding++;
-    			} else if (binding instanceof HTTPBinding) {
-    				numHttpBinding++;
-    			}
-    		}
-   		}
-
-   		System.out.println("testMultiSoapBindings4");
-   		System.out.println("  # of SOAPPort:      " + numSoapPort);
-   		System.out.println("  # of SOAP12Port:    " + numSoap12Port);
-   		System.out.println("  # of HTTPPort:      " + numHttpPort);
-   		System.out.println("  # of SOAPBinding:   " + numSoapBinding);
-   		System.out.println("  # of SOAP12Binding: " + numSoap12Binding);
-   		System.out.println("  # of HTTPBinding:   " + numHttpBinding);
-   		
-   		Assert.assertEquals(numSoapPort, 1);
-   		Assert.assertTrue(numSoap12Port > 0);
-   		Assert.assertTrue(numSoapBinding > 0);
-   		Assert.assertEquals(numSoap12Binding, 1);
-   		// Skipped to test HTTP
-   	}
-    
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java b/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
deleted file mode 100644
index 5dbb696bf5..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
+++ /dev/null
@@ -1,213 +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.vtest.wsbinding.nowsdl.multisoapbindings;
-
-import junit.framework.Assert;
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.DService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the simplest form of the binding element without WSDL document
- * described in section section 2.2.2 and 2.3.2 of SCA Web Services
- * Binding V1.00
- */
-public class NoWsdlMultiSoapBindingsTestCase {
-
-    protected static String compositeName = "nowsdlmultisoapbindings.composite";
-    protected static AService a1;
-    protected static AService a2;
-    protected static AService a3;
-    protected static AService a4;
-    protected static DService d1;
-    protected static DService d2;
-    protected static DService d3;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            a1 = ServiceFinder.getService(AService.class, "AComponent1");
-            a2 = ServiceFinder.getService(AService.class, "AComponent2");
-            a3 = ServiceFinder.getService(AService.class, "AComponent3");
-            a4 = ServiceFinder.getService(AService.class, "AComponent4");
-            d1 = ServiceFinder.getService(DService.class, "DComponent1");
-            d2 = ServiceFinder.getService(DService.class, "DComponent2");
-            d3 = ServiceFinder.getService(DService.class, "DComponent3");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 201-225:<br>
-     * The next example shows the use of the binding element without a WSDL
-     * document, with multiple SOAP bindings with non-default values. The SOAP 
-     * 1.2 binding name defaults to the service name, the SOAP 1.1 binding is 
-     * given an explicit name. The reference has a web service binding which 
-     * uses SOAP 1.2, but otherwise uses all the defaults for SOAP binding. 
-     * The reference binding name defaults to the reference name.<p>
-     * Line 253:<br>
-     * <li>soap</li>
-     * ...<br>
-     * version, including multiple versions.<br>
-     * <p>
-     * AComponent1 - no requires<br>
-     * AComponent2 - requires = soap<br>
-     * AComponent3 - requires = soap.1_1<br>
-     * AComponent4 - requires = soap.1_2<br>
-     */
-    @Test
-    public void testMultiSoapBindings1() throws Exception {
-
-    	String aName = a1.getName();
-    	String b1Str1 = a1.getB1String("string1");
-    	String b1Str2 = a1.getB1String2("string2", "string3");
-    	int b1Int = a1.getB1Int(1000);
-    	
-    	System.out.println("AComponent1: " + aName + ", " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(1000, b1Int);
-
-    	aName = a2.getName();
-    	b1Str1 = a2.getB1String("string1");
-    	b1Str2 = a2.getB1String2("string2", "string3");
-    	b1Int = a2.getB1Int(2000);
-
-    	System.out.println("AComponent2: " + aName + ", " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(2000, b1Int);
-
-    	aName = a3.getName();
-    	b1Str1 = a3.getB1String("string1");
-    	b1Str2 = a3.getB1String2("string2", "string3");
-    	b1Int = a3.getB1Int(3000);
-
-    	System.out.println("AComponent3: " + aName + ", " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(3000, b1Int);
-
-    	aName = a4.getName();
-    	b1Str1 = a4.getB1String("string1");
-    	b1Str2 = a4.getB1String2("string2", "string3");
-    	b1Int = a4.getB1Int(4000);
-
-    	System.out.println("AComponent4: " + aName + ", " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(4000, b1Int);
-
-    }
-
-    /**
-     * Lines 201-225, 262-264:<br>
-     * The WSDL service has one or more ports for each web service binding on
-     * the SCA service that has a SOAP requirement, or that refers to an
-     * existing WSDL binding, depending on the requirements of the web service
-     * binding. Each of those ports has a single binding.<br>
-     * <p>
-     * Test multiple SOAP bindings with two references which use different versions.<br>
-     */
-    @Test
-    public void testMultiSoapBindings2() throws Exception {
-    	
-    	String dName = d1.getName();
-    	String b1Str1 = d1.getB1String("string1");
-    	String b1Str2 = d1.getB1String2("string2", "string3");
-    	String c1Str1 = d1.getC1String("string5");
-    	String c1Str2 = d1.getC1String2("string6", "string7");
-    	int b1Int = d1.getB1Int(4000);
-    	float c1Float = d1.getC1Float((float) 8.8);
-    	Integer c1Integer = d1.getC1Integer(new Integer(9001));
-
-        System.out.println(dName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int + ", " + c1Str1 + ", " + c1Str2 + ", " + c1Float + ", " + c1Integer);
-        Assert.assertEquals("DService", dName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(4000, b1Int);
-        Assert.assertEquals("string5", c1Str1);
-        Assert.assertEquals("string6string7", c1Str2);
-        Assert.assertEquals((float) 8.8, c1Float);
-        Assert.assertEquals(new Integer(9001), c1Integer);
-        
-    	dName     = d2.getName();
-    	b1Str1    = d2.getB1String("string1");
-    	b1Str2    = d2.getB1String2("string2", "string3");
-    	c1Str1    = d2.getC1String("string5");
-    	c1Str2    = d2.getC1String2("string6", "string7");
-    	b1Int     = d2.getB1Int(4000);
-    	c1Float   = d2.getC1Float((float) 8.8);
-    	c1Integer = d2.getC1Integer(new Integer(9002));
-
-        System.out.println(dName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int + ", " + c1Str1 + ", " + c1Str2 + ", " + c1Float + ", " + c1Integer);
-        Assert.assertEquals("DService", dName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(4000, b1Int);
-        Assert.assertEquals("string5", c1Str1);
-        Assert.assertEquals("string6string7", c1Str2);
-        Assert.assertEquals((float) 8.8, c1Float);
-        Assert.assertEquals(new Integer(9002), c1Integer);
-    }
-
-    /**
-     * Lines 201-225, 262-264:<br>
-     * Test multiple SOAP bindings with promoted services and references.<br>
-     */
-    @Test
-    public void testMultiSoapBindings3() throws Exception {
-    	
-    	String dName = d3.getName();
-    	String b1Str1 = d3.getB1String("string1");
-    	String b1Str2 = d3.getB1String2("string2", "string3");
-    	String c1Str1 = d3.getC1String("string5");
-    	String c1Str2 = d3.getC1String2("string6", "string7");
-    	int b1Int = d3.getB1Int(4000);
-    	float c1Float = d3.getC1Float((float) 8.8);
-    	Integer c1Integer = d3.getC1Integer(new Integer(9003));
-
-        System.out.println(dName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int + ", " + c1Str1 + ", " + c1Str2 + ", " + c1Float + ", " + c1Integer);
-        Assert.assertEquals("DService", dName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(4000, b1Int);
-        Assert.assertEquals("string5", c1Str1);
-        Assert.assertEquals("string6string7", c1Str2);
-        Assert.assertEquals((float) 8.8, c1Float);
-        Assert.assertEquals(new Integer(9003), c1Integer);
-        
-    }
-    
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/pom.xml b/java/sca-contrib/vtest/wsbinding/nowsdl/pom.xml
deleted file mode 100644
index e40a4270c7..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/pom.xml
+++ /dev/null
@@ -1,69 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-wsbinding</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-wsbinding-nowsdl</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Apache Tuscany SCA Web Service Binding Verification Tests - No WSDL</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>vtest-utilities</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>defaultbinding</module>
-                <module>soapversion</module>
-                <module>multisoapbindings</module>
-                <module>promoted</module>
-           </modules>
-        </profile>
-    </profiles>
-</project>
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/pom.xml b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/pom.xml
deleted file mode 100644
index 63dc9ad5f6..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/pom.xml
+++ /dev/null
@@ -1,58 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-wsbinding-nowsdl</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-wsbinding-nowsdl-promoted</artifactId>
-    <name>Apache Tuscany SCA Web Service Binding Verification Tests - No WSDL Promoted Service and Reference</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
deleted file mode 100644
index d786f36db1..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.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.vtest.wsbinding.nowsdl.promoted;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for AService.
- */
-@Remotable
-public interface AService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-	
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
deleted file mode 100644
index d4ebfcfe37..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
+++ /dev/null
@@ -1,35 +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.vtest.wsbinding.nowsdl.promoted;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
deleted file mode 100644
index 7289714ed2..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
+++ /dev/null
@@ -1,35 +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.vtest.wsbinding.nowsdl.promoted;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BServiceSOAP {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
deleted file mode 100644
index e0c58088da..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
+++ /dev/null
@@ -1,35 +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.vtest.wsbinding.nowsdl.promoted;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BServiceSOAP11 {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
deleted file mode 100644
index e279b1d55d..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
+++ /dev/null
@@ -1,35 +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.vtest.wsbinding.nowsdl.promoted;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BServiceSOAP12 {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
deleted file mode 100644
index 9aaba29629..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.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.vtest.wsbinding.nowsdl.promoted;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface CService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public Integer getInteger(Integer i);
-
-	public float getFloat(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
deleted file mode 100644
index 35291dc402..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.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.    
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for DService.
- */
-@Remotable
-public interface DService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-
-	public String getC1String(String aString);
-
-	public String getC1String2(String aString, String bString);
-
-	public Integer getC1Integer(Integer i);
-	
-	public float getC1Float(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
deleted file mode 100644
index 0bc776b06d..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
+++ /dev/null
@@ -1,51 +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.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-	@Reference
-	public BService b1;
-	
-    public String getName() {
-        return "AService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
deleted file mode 100644
index 8ebf27bdb1..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.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 org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-    public String getName() {
-        return "BService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
deleted file mode 100644
index 22247f8372..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.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 org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BServiceSOAP11.class)
-public class BServiceSOAP11Impl implements BServiceSOAP11 {
-
-    public String getName() {
-        return "BServiceSOAP11";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
deleted file mode 100644
index 4fbc82227c..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.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 org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BServiceSOAP12.class)
-public class BServiceSOAP12Impl implements BServiceSOAP12 {
-
-    public String getName() {
-        return "BServiceSOAP12";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
deleted file mode 100644
index 83f6746a5f..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.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 org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BServiceSOAP.class)
-public class BServiceSOAPImpl implements BServiceSOAP {
-
-    public String getName() {
-        return "BServiceSOAP";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
deleted file mode 100644
index ec6611fae4..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
+++ /dev/null
@@ -1,48 +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.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.CService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl implements CService {
-
-    public String getName() {
-        return "CService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public Integer getInteger(Integer i) {
-    	return i;
-    }
-    
-    public float getFloat(float f) {
-        return f;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
deleted file mode 100644
index 4b488c376e..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
+++ /dev/null
@@ -1,70 +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.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.CService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.DService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(DService.class)
-public class DServiceImpl implements DService {
-
-	@Reference
-	public BService b1;
-	
-	@Reference
-	public CService c1;
-	
-    public String getName() {
-        return "DService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-	public String getC1String(String aString) {
-		return c1.getString(aString);
-	}
-
-	public String getC1String2(String aString, String bString) {
-		return c1.getString2(aString, bString);
-	}
-
-	public Integer getC1Integer(Integer i) {
-		return c1.getInteger(i);
-	}
-	
-	public float getC1Float(float f) {
-		return c1.getFloat(f);
-	}
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
deleted file mode 100644
index f79df5bf8f..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
+++ /dev/null
@@ -1,246 +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://vtest.wsbinding.nowsdl.promoted"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-	name="nowsdl.promoted">
-
-	<service name="BService"  promote="BComponent">
-   		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/>
-		<binding.ws uri="http://localhost:8085/BService"/>
-	</service>
-
-	<service name="BServiceSOAP" promote="BComponentSOAP">
-   		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
-		<binding.ws requires="SOAP" uri="http://localhost:8085/BServiceSOAP"/>
-	</service>
-
-	<service name="BServiceSOAP11" promote="BComponentSOAP11">
-   		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
-		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BServiceSOAP11"/>
-	</service>
-
-	<service name="BServiceSOAP12" promote="BComponentSOAP12">
-   		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
-		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BServiceSOAP12"/>
-	</service>
-
-	<service name="CService" promote="CComponent">
-   		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.CService"/>
-		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/CService"/>
-	</service>
-
-	<component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.BServiceImpl"/>
-    </component>
-
-	<component name="BComponentSOAP">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.BServiceSOAPImpl"/>
-    </component>
-    
-    <component name="BComponentSOAP11">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.BServiceSOAP11Impl"/>
-    </component>
-    
-   	<component name="BComponentSOAP12">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.BServiceSOAP12Impl"/>
-    </component>
-    
-	<component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.CServiceImpl"/>
-    </component>
-
-    <reference name="AComponent1B1" promote="AComponent1/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/>
-		<binding.ws uri="http://localhost:8085/BService"/>
-    </reference>
-
-    <reference name="AComponent2B1" promote="AComponent2/b1">
-      	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/>
-		<binding.ws requires="SOAP" uri="http://localhost:8085/BService"/>
-    </reference>
-
-    <reference name="AComponent3B1" promote="AComponent3/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/>
-		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BService"/>
-    </reference>
-
-    <reference name="AComponent4B1" promote="AComponent4/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/>
-		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BService"/>
-    </reference>
-
-    <reference name="AComponent5B1" promote="AComponent5/b1">
-      	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
-		<binding.ws uri="http://localhost:8085/BServiceSOAP"/>
-    </reference>
-
-    <reference name="AComponent6B1" promote="AComponent6/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
-		<binding.ws requires="SOAP" uri="http://localhost:8085/BServiceSOAP"/>
-    </reference>
-
-    <reference name="AComponent7B1" promote="AComponent7/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
-		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BServiceSOAP"/>
-    </reference>
-
-    <reference name="AComponent8B1" promote="AComponent8/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
-		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BServiceSOAP"/>
-    </reference>
-
-    <reference name="AComponent9B1" promote="AComponent9/b1">
-        <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
-        <binding.ws uri="http://localhost:8085/BServiceSOAP11"/>
-    </reference>
-
-    <reference name="AComponent10B1" promote="AComponent10/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
-		<binding.ws requires="SOAP" uri="http://localhost:8085/BServiceSOAP11"/>
-    </reference>
-
-    <reference name="AComponent11B1" promote="AComponent11/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
-		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BServiceSOAP11"/>
-    </reference>
-
-    <reference name="AComponent12B1" promote="AComponent12/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
-		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BServiceSOAP11"/>
-    </reference>
-
-    <reference name="AComponent13B1" promote="AComponent13/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
-		<binding.ws uri="http://localhost:8085/BServiceSOAP12"/>
-    </reference>
-
-    <reference name="AComponent14B1" promote="AComponent14/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
-		<binding.ws requires="SOAP" uri="http://localhost:8085/BServiceSOAP12"/>
-    </reference>
-
-    <reference name="AComponent15B1" promote="AComponent15/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
-		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BServiceSOAP12"/>
-    </reference>
-
-    <reference name="AComponent16B1" promote="AComponent16/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
-		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BServiceSOAP12"/>
-    </reference>
-
-    <reference name="DComponentB1" promote="DComponent/b1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
-		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BServiceSOAP11"/>
-    </reference>
-    
-    <reference name="DComponentC1" promote="DComponent/c1">
-       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.CService"/>
-		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/CService"/>
-    </reference>
-
-    <component name="AComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-
-    <component name="AComponent2">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-    
-    <component name="AComponent3">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-    
-    <component name="AComponent4">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-    
-    <component name="AComponent5">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-
-    <component name="AComponent6">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-    
-    <component name="AComponent7">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-    
-    <component name="AComponent8">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-
-    <component name="AComponent9">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-
-    <component name="AComponent10">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-    
-    <component name="AComponent11">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-    
-    <component name="AComponent12">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-    
-    <component name="AComponent13">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-
-    <component name="AComponent14">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-    
-    <component name="AComponent15">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-    
-    <component name="AComponent16">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
-        <reference name="b1"/>
-    </component>
-    
-    <component name="DComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.DServiceImpl"/>
-        <reference name="b1"/>
-        <reference name="c1"/>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
deleted file mode 100644
index ae7dafa46e..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
+++ /dev/null
@@ -1,85 +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.vtest.wsbinding.nowsdl.promoted;
-
-import junit.framework.Assert;
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.AService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the simplest form of the binding element without WSDL document
- * described in section section 2.3.1 and 2.3.3.1 of SCA Web Services Binding
- * V1.00
- */
-public class NoWsdlPromoted1TestCase {
-
-	protected static ServiceFinder serviceFinder;
-    protected static String compositeName = "nowsdlpromoted.composite";
-    
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 251-253, 287-291:<br>
-     * <li>soap</li>
-     * This indicates that a SOAP binding is required. The SOAP binding may be
-     * of any SOAP version, including multiple versions.<br>
-     * <br>
-     * 2.3.3.1 SOAP versions<br>
-     * Where a web service binding requires a specific SOAP version, then a
-     * single WSDL port and SOAP binding of the appropriate version is
-     * generated. Where no specific SOAP version is required, then one or more
-     * WSDL ports with associated SOAP bindings may be generated, depending on
-     * the level(s) supported in the target runtime.<br>
-     * <p>
-     * Tests promoted services and references<br>
-     */
-    @Test
-    public void testSoapVersion1() throws Exception {
-    	
-    	for (int i = 0; i < 8; i++) {
-    		AService a = ServiceFinder.getService(AService.class, "AComponent" + (i+1));
-        	String aName = a.getName();
-        	String b1Str1 = a.getB1String("string1");
-        	String b1Str2 = a.getB1String2("string2", "string3");
-        	int b1Int = a.getB1Int(i * 1000 + 1000);
-            System.out.println(i + " - " + aName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-            Assert.assertEquals("AService", aName);
-            Assert.assertEquals("string1", b1Str1);
-            Assert.assertEquals("string2string3", b1Str2);
-            Assert.assertEquals(i * 1000 + 1000, b1Int);
-    	}
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java b/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
deleted file mode 100644
index a4744b9007..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
+++ /dev/null
@@ -1,118 +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.vtest.wsbinding.nowsdl.promoted;
-
-import junit.framework.Assert;
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.DService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the simplest form of the binding element without WSDL document
- * described in section section 2.3.1 and 2.3.3.1 of SCA Web Services Binding
- * V1.00
- */
-public class NoWsdlPromoted2TestCase {
-
-	protected static ServiceFinder serviceFinder;
-    protected static String compositeName = "nowsdlpromoted.composite";
-    protected static DService d;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            d = ServiceFinder.getService(DService.class, "DComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 254-257, 287-291:<br>
-     * <li>soap.1_1</li><br>
-     * A SOAP 1.1 binding only is required.<br>
-     * <li>soap.1_2</li><br>
-     * A SOAP 1.2 binding only is required.<br>
-     * <br>
-     * 2.3.3.1 SOAP versions<br>
-     * Where a web service binding requires a specific SOAP version, then a
-     * single WSDL port and SOAP binding of the appropriate version is
-     * generated. Where no specific SOAP version is required, then one or more
-     * WSDL ports with associated SOAP bindings may be generated, depending on
-     * the level(s) supported in the target runtime.<br>
-     * <p>
-     * Tests promoted services and references<br>
-     */
-    @Test
-    public void testSoapVersion2() throws Exception {
-    	
-    	for (int i = 8; i < 16; i++) {
-    		AService a = ServiceFinder.getService(AService.class, "AComponent" + (i+1));
-        	String aName = a.getName();
-        	String b1Str1 = a.getB1String("string1");
-        	String b1Str2 = a.getB1String2("string2", "string3");
-        	int b1Int = a.getB1Int(i * 1000 + 1000);
-            System.out.println(i + " - " + aName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-            Assert.assertEquals("AService", aName);
-            Assert.assertEquals("string1", b1Str1);
-            Assert.assertEquals("string2string3", b1Str2);
-            Assert.assertEquals(i * 1000 + 1000, b1Int);
-    	}
-    }
-
-    /**
-     * Lines 254-257, 287-291:<br>
-     * Test two references using binding.ws with 2 different SOAP versions
-     * and without WSDL document.<br> 
-     */
-    @Test
-    public void testSoapVersion3() throws Exception {
-    	String dName = d.getName();
-    	String b1Str1 = d.getB1String("string1");
-    	String b1Str2 = d.getB1String2("string2", "string3");
-    	String c1Str1 = d.getC1String("string5");
-    	String c1Str2 = d.getC1String2("string6", "string7");
-    	
-    	int b1Int = d.getB1Int(4000);
-    	float c1Float = d.getC1Float((float) 8.8);
-
-    	Integer c1Integer = d.getC1Integer(new Integer(9000));
-
-        System.out.println(dName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int + ", " + c1Str1 + ", " + c1Str2 + ", " + c1Float + ", " + c1Integer);
-        Assert.assertEquals("DService", dName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(4000, b1Int);
-        Assert.assertEquals("string5", c1Str1);
-        Assert.assertEquals("string6string7", c1Str2);
-        Assert.assertEquals((float) 8.8, c1Float);
-        Assert.assertEquals(new Integer(9000), c1Integer);
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/pom.xml b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/pom.xml
deleted file mode 100644
index 1334e35880..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/pom.xml
+++ /dev/null
@@ -1,58 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-wsbinding-nowsdl</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-wsbinding-nowsdl-soapversion</artifactId>
-    <name>Apache Tuscany SCA Web Service Binding Verification Tests - No WSDL SOAP Version</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
deleted file mode 100644
index e78c977ef0..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.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.vtest.wsbinding.nowsdl.soapversion;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for AService.
- */
-@Remotable
-public interface AService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-	
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
deleted file mode 100644
index 1d95f089c9..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
+++ /dev/null
@@ -1,35 +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.vtest.wsbinding.nowsdl.soapversion;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
deleted file mode 100644
index 45d10bbd45..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
+++ /dev/null
@@ -1,35 +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.vtest.wsbinding.nowsdl.soapversion;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BServiceSOAP {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
deleted file mode 100644
index f55e23012f..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
+++ /dev/null
@@ -1,35 +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.vtest.wsbinding.nowsdl.soapversion;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BServiceSOAP11 {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
deleted file mode 100644
index 91c9860b98..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
+++ /dev/null
@@ -1,35 +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.vtest.wsbinding.nowsdl.soapversion;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BServiceSOAP12 {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
deleted file mode 100644
index 99d4f7b09f..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.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.vtest.wsbinding.nowsdl.soapversion;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface CService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public Integer getInteger(Integer i);
-
-	public float getFloat(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
deleted file mode 100644
index e95fae6877..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.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.    
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for DService.
- */
-@Remotable
-public interface DService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-
-	public String getC1String(String aString);
-
-	public String getC1String2(String aString, String bString);
-
-	public Integer getC1Integer(Integer i);
-	
-	public float getC1Float(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
deleted file mode 100644
index a313b769e5..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
+++ /dev/null
@@ -1,51 +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.vtest.wsbinding.nowsdl.soapversion.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-	@Reference
-	public BService b1;
-	
-    public String getName() {
-        return "AService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
deleted file mode 100644
index 3baf691d88..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.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 org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-    public String getName() {
-        return "BService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
deleted file mode 100644
index 965e195ae3..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.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 org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BServiceSOAP11.class)
-public class BServiceSOAP11Impl implements BServiceSOAP11 {
-
-    public String getName() {
-        return "BServiceSOAP11";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
deleted file mode 100644
index 69e7edcc68..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.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 org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BServiceSOAP12.class)
-public class BServiceSOAP12Impl implements BServiceSOAP12 {
-
-    public String getName() {
-        return "BServiceSOAP12";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
deleted file mode 100644
index 7e8294f778..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.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 org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BServiceSOAP.class)
-public class BServiceSOAPImpl implements BServiceSOAP {
-
-    public String getName() {
-        return "BServiceSOAP";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
deleted file mode 100644
index 7909edeb39..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
+++ /dev/null
@@ -1,48 +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.vtest.wsbinding.nowsdl.soapversion.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.CService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl implements CService {
-
-    public String getName() {
-        return "CService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public Integer getInteger(Integer i) {
-    	return i;
-    }
-    
-    public float getFloat(float f) {
-        return f;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
deleted file mode 100644
index 2f34bf08f9..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
+++ /dev/null
@@ -1,70 +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.vtest.wsbinding.nowsdl.soapversion.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.CService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.DService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(DService.class)
-public class DServiceImpl implements DService {
-
-	@Reference
-	public BService b1;
-	
-	@Reference
-	public CService c1;
-	
-    public String getName() {
-        return "DService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-	public String getC1String(String aString) {
-		return c1.getString(aString);
-	}
-
-	public String getC1String2(String aString, String bString) {
-		return c1.getString2(aString, bString);
-	}
-
-	public Integer getC1Integer(Integer i) {
-		return c1.getInteger(i);
-	}
-	
-	public float getC1Float(float f) {
-		return c1.getFloat(f);
-	}
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
deleted file mode 100644
index 61a658ab55..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
+++ /dev/null
@@ -1,205 +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://vtest.wsbinding.nowsdl.soapversion"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-	name="nowsdl.soapversion">
-
-	<component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.BServiceImpl"/>
-		<service name="BService">
-       		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService"/>
-			<binding.ws uri="http://localhost:8085/BComponent"/>
-		</service>
-    </component>
-
-	<component name="BComponentSOAP">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.BServiceSOAPImpl"/>
-		<service name="BServiceSOAP">
-       		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/>
-			<binding.ws requires="SOAP" uri="http://localhost:8085/BComponentSOAP"/>
-		</service>
-    </component>
-    
-    <component name="BComponentSOAP11">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.BServiceSOAP11Impl"/>
-		<service name="BServiceSOAP11">
-       		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/>
-			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BComponentSOAP11"/>
-		</service>
-    </component>
-    
-   	<component name="BComponentSOAP12">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.BServiceSOAP12Impl"/>
-		<service name="BServiceSOAP12">
-       		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/>
-			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BComponentSOAP12"/>
-		</service>
-    </component>
-    
-	<component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.CServiceImpl"/>
-		<service name="CService">
-       		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.CService"/>
-			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/CComponent"/>
-		</service>
-    </component>
-
-    <component name="AComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent/BService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService"/>
-			<binding.ws uri="http://localhost:8085/BComponent"/>
-        </reference>
-    </component>
-
-    <component name="AComponent2">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent/BService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService"/>
-			<binding.ws requires="SOAP" uri="http://localhost:8085/BComponent"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent3">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent/BService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService"/>
-			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BComponent"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent4">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent/BService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService"/>
-			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BComponent"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent5">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponentSOAP/BServiceSOAP">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/>
-			<binding.ws uri="http://localhost:8085/BComponentSOAP"/>
-        </reference>
-    </component>
-
-    <component name="AComponent6">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponentSOAP/BServiceSOAP">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/>
-			<binding.ws requires="SOAP" uri="http://localhost:8085/BComponentSOAP"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent7">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponentSOAP/BServiceSOAP">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/>
-			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BComponentSOAP"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent8">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponentSOAP/BServiceSOAP">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/>
-			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BComponentSOAP"/>
-        </reference>
-    </component>
-
-    <component name="AComponent9">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponentSOAP11/BServiceSOAP11">
-            <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/>
-            <binding.ws uri="http://localhost:8085/BComponentSOAP11"/>
-        </reference>
-    </component>
-
-    <component name="AComponent10">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponentSOAP11/BServiceSOAP11">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/>
-			<binding.ws requires="SOAP" uri="http://localhost:8085/BComponentSOAP11"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent11">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponentSOAP11/BServiceSOAP11">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/>
-			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BComponentSOAP11"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent12">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponentSOAP11/BServiceSOAP11">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/>
-			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BComponentSOAP11"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent13">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponentSOAP12/BServiceSOAP12">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/>
-			<binding.ws uri="http://localhost:8085/BComponentSOAP12"/>
-        </reference>
-    </component>
-
-    <component name="AComponent14">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponentSOAP12/BServiceSOAP12">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/>
-			<binding.ws requires="SOAP" uri="http://localhost:8085/BComponentSOAP12"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent15">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponentSOAP12/BServiceSOAP12">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/>
-			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BComponentSOAP12"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent16">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponentSOAP12/BServiceSOAP12">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/>
-			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BComponentSOAP12"/>
-        </reference>
-    </component>
-    
-    <component name="DComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.DServiceImpl"/>
-        <reference name="b1" target="BComponentSOAP11/BServiceSOAP11">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/>
-			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BComponentSOAP11"/>
-        </reference>
-        <reference name="c1" target="CComponent/CService">
-        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.CService"/>
-			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/CComponent"/>
-        </reference>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
deleted file mode 100644
index edd0d91072..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
+++ /dev/null
@@ -1,438 +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.vtest.wsbinding.nowsdl.soapversion;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Operation;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.http.HTTPBinding;
-import javax.wsdl.extensions.http.HTTPOperation;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.wsdl.extensions.soap12.SOAP12Binding;
-import javax.wsdl.extensions.soap12.SOAP12Body;
-import javax.wsdl.extensions.soap12.SOAP12Header;
-import javax.wsdl.extensions.soap12.SOAP12HeaderFault;
-import javax.wsdl.extensions.soap12.SOAP12Operation;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.CService;
-
-
-/**
- * Tests the simplest form of the binding element without WSDL document
- * described in section section 2.3.2, 2.3.3, 2.3.3.1, and 2.3.4 of SCA
- * Web Services Binding V1.00
- */
-public class GeneratedWSDLTestCase {
-
-	protected static ServiceFinder serviceFinder;
-    protected static String compositeName = "nowsdlsoapversion.composite";
-    protected static Definition bWSDL = null;
-    protected static Definition cWSDL = null;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-       		bWSDL = ServiceFinder.getWSDLDefinition("BComponent", "BService");
-       		cWSDL = ServiceFinder.getWSDLDefinition("CComponent", "CService");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 260-262:<br>
-     * A separate WSDL document is generated for each SCA service. Each has
-     * its own unique target namespace. This is to ensure that bindings on
-     * different services of the same component do not clash.<br>
-     */
-    @Test
-    @Ignore("TUSCANY-2607")
-    // Don't know why target namespaces are same
-    public void testSoapVersion4() throws Exception {
-    	String cTargetNamespace = cWSDL.getTargetNamespace();
-    	String bTargetNamespace = bWSDL.getTargetNamespace();
-        Assert.assertFalse(bTargetNamespace.equals(cTargetNamespace));
-    }
-    
-    /**
-     * Lines 271-273:<br>
-     * The target namespace of the WSDL document, and of the service, ports and
-     * generated binding elements is:<br>
-     * Base System URI for HTTP / Component Name / Service Name<br>
-     */
-    @Test
-    @Ignore("TUSCANY-2607")
-    //  The target namespace does not follow the convention
-    public void testSoapVersion5() throws Exception {
-    	String bTargetNamespace = bWSDL.getTargetNamespace();
-    	String cTargetNamespace = cWSDL.getTargetNamespace();
-    	Assert.assertTrue(bTargetNamespace.endsWith("BComponent/BService"));
-    	Assert.assertTrue(cTargetNamespace.endsWith("CComponent/CService"));
-    }
-    
-    private Map getPorts(Definition wsdl, String service) {
-    	String targetNamespace = wsdl.getTargetNamespace();
-    	HashMap sMap = (HashMap) wsdl.getServices();
-    	for (Iterator i = sMap.keySet().iterator(); i.hasNext();) {
-    		Object k1 = i.next();
-    		Service s = (Service) sMap.get(k1);
-    		String qName = "{" + targetNamespace + "}" + service;
-    		if (s.getQName().toString().equals(qName)) {
-    			return s.getPorts();
-    		}
-    		// Don't why implmentation changed to add Service at the end of qname
-    		if (s.getQName().toString().equals(qName + "Service")) {
-    			return s.getPorts();
-    		}
-    	}
-    	return null;
-    }
-    
-    /**
-     * Lines 262-264, 290-291:<br>
-     * The WSDL service has one or more ports for each web service binding on
-     * the SCA service that has a SOAP requirement, or that refers to an 
-     * existing WSDL binding, depending on the requirements of the web service
-     * binding. Each of those ports has a single binding.<br>
-     * <p>
-     * 2.3.3.1 SOAP versions<br>
-     * Where no specific SOAP version is required, then one or more WSDL ports
-     * with associated SOAP bindings may be generated, depending on the level(s)
-     * supported in the target runtime.<br>
-     * <p>
-     * BComponent/BService is not specified a SOAP version.
-     * It should have following bindings:<br>
-     * <li>SoapBinding - PortType and SOAP11</li>
-     * <li>SOAP12Binding - SOAP12</li>
-     * <li>HTTPBinding - Http</li>
-     * <br>and following ports:<br>
-     * <li>SoapAddress</li>
-     * <li>SOAP12Address</li>
-     * <li>HTTPAddress</li>
-
-     */
-    @Test
-    public void testSoapVersion6() throws Exception {
-
-    	Map pMap = getPorts(bWSDL, "BService");
-    	int numSoapPort   = 0;
-    	int numSoap12Port = 0;
-    	int numHttpPort   = 0;
-   		for (Iterator iter = pMap.keySet().iterator(); iter.hasNext();) {
-    		Object k2 = iter.next();
-    		Port p = (Port) pMap.get(k2);
-    		List eeList = p.getExtensibilityElements();
-    		for (int i = 0; i < eeList.size(); i++) {
-    			Object address = eeList.get(i);
-    			if (address instanceof SOAPAddress) {
-    				numSoapPort++;
-				} else if (address instanceof SOAP12Address) {
-    				numSoap12Port++;
-				} else if (address instanceof HTTPAddress) {
-    				numHttpPort++;
-				} else {
-					System.out.println("address:" + address.getClass());
-				}
-    		}
-    	}
-
-   		Map bMap = bWSDL.getBindings();
-    	int numSoapBinding   = 0;
-    	int numSoap12Binding = 0;
-    	int numHttpBinding   = 0;
-   		for (Iterator iter = bMap.keySet().iterator(); iter.hasNext();) {
-   			Object k1 = iter.next();
-   			Binding b = (Binding) bMap.get(k1);
-   			List eeList = b.getExtensibilityElements();
-    		for (int i = 0; i < eeList.size(); i++) {
-    			Object binding = eeList.get(i);
-    			if (binding instanceof SOAPBinding) {
-    				numSoapBinding++;
-    			} else if (binding instanceof SOAP12Binding) {
-    				numSoap12Binding++;
-    			} else if (binding instanceof HTTPBinding) {
-    				numHttpBinding++;
-    			}
-    		}
-   		}
-
-   		System.out.println("testSoapVersion6");
-   		System.out.println("  # of SOAPPort:      " + numSoapPort);
-   		System.out.println("  # of SOAP12Port:    " + numSoap12Port);
-   		System.out.println("  # of HTTPPort:      " + numHttpPort);
-   		System.out.println("  # of SOAPBinding:   " + numSoapBinding);
-   		System.out.println("  # of SOAP12Binding: " + numSoap12Binding);
-   		System.out.println("  # of HTTPBinding:   " + numHttpBinding);
-   		
-   		Assert.assertEquals(numSoapPort, 1);
-   		Assert.assertEquals(numSoap12Port, 0);
-   		Assert.assertTrue(numSoapBinding > 0);
-   		Assert.assertEquals(numSoap12Binding, 0);
-   		// Skipped to test HTTP
-
-   	}
-    
-    /**
-     * Lines 275-284:<br>
-     * 2.3.3 WSDL Bindings<br>
-     * The binding elements in the generated WSDL document are either defined
-     * within the document, derived from the requirements of the binding, or
-     * are imported from existing WSDL documents.<br>
-     * Generated bindings have the following fixed assumptions:<br>
-     * <li>use="literal" for input and output messages</li>
-     * <li>style="document" for the binding</li>
-     * <li>All faults map to soap:faults</li>
-     * <li>No header or headerFault elements are generated</li>
-     * <li>The transport is "http://schemas.xmlsoap.org/soap/http", unless the
-     * system provides intents for alternative transports<br>
-     * <p>
-     */
-    @Test
-    public void testSoapVersion7() throws Exception {
-    	Map bMap = bWSDL.getBindings();
-   		for (Iterator iter = bMap.keySet().iterator(); iter.hasNext();) {
-   			Object k1 = iter.next();
-   			Binding b = (Binding) bMap.get(k1);
-   			List eeList = b.getExtensibilityElements();
-    		for (int i = 0; i < eeList.size(); i++) {
-    			Object binding = eeList.get(i);
-    			if (binding instanceof SOAPBinding) {
-    				SOAPBinding sb = (SOAPBinding) binding;
-    				Assert.assertEquals(sb.getStyle(), "document");
-    				Assert.assertEquals(sb.getTransportURI(), "http://schemas.xmlsoap.org/soap/http");
-    			} else if (binding instanceof SOAP12Binding) {
-    				SOAP12Binding sb = (SOAP12Binding) binding;
-    				Assert.assertEquals(sb.getStyle(), "document");
-    				Assert.assertEquals(sb.getTransportURI(), "http://schemas.xmlsoap.org/soap/http");
-    			} else if (binding instanceof HTTPBinding) {
-    			}
-    		}
-    		List operations = b.getBindingOperations();
-    		for (int i = 0; i < eeList.size(); i++) {
-    			BindingOperation bop = (BindingOperation) operations.get(i);
-
-    			List oeeList = bop.getExtensibilityElements();
-    			for (int j = 0; j < eeList.size(); j++) {
-    				Object op = oeeList.get(j);
-        			if (op instanceof SOAPOperation) {
-        				SOAPOperation sop = (SOAPOperation) op;
-        				if (sop.getStyle() != null)
-        					Assert.assertEquals(sop.getStyle(), "document");
-        			} else if (op instanceof SOAP12Operation) {
-        				SOAP12Operation sop = (SOAP12Operation) op;
-        				Assert.assertEquals(sop.getStyle(), "document");
-        			} else if (op instanceof HTTPOperation) {
-        				// HTTPOperation hop = (HTTPOperation) op;
-        			}
-    			}
-
-    			BindingInput bInput = (BindingInput) bop.getBindingInput();
-    			List bInputList = bInput.getExtensibilityElements();
-    			for (int j = 0; j < eeList.size(); j++) {
-    				Object body = bInputList.get(j);
-    				if (body instanceof SOAPBody) {
-    					SOAPBody sBody = (SOAPBody) body;
-    					Assert.assertEquals(sBody.getUse(), "literal");
-    				} else if (body instanceof SOAP12Body) {
-    					SOAP12Body sBody = (SOAP12Body) body;
-    					Assert.assertEquals(sBody.getUse(), "literal");
-    				} else {
-    					Assert.assertFalse(body instanceof SOAPHeader);
-    					Assert.assertFalse(body instanceof SOAP12Header);
-    					Assert.assertFalse(body instanceof SOAPHeaderFault);
-    					Assert.assertFalse(body instanceof SOAP12HeaderFault);
-    				}
-    			}
-    			
-    			BindingOutput bOutput = (BindingOutput) bop.getBindingOutput();
-    			List bOutputList = bOutput.getExtensibilityElements();
-    			for (int j = 0; j < eeList.size(); j++) {
-    				Object body = bOutputList.get(j);
-    				if (body instanceof SOAPBody) {
-    					SOAPBody sBody = (SOAPBody) body;
-    					Assert.assertEquals(sBody.getUse(), "literal");
-    				} else if (body instanceof SOAP12Body) {
-    					SOAP12Body sBody = (SOAP12Body) body;
-    					Assert.assertEquals(sBody.getUse(), "literal");
-    				} else {
-    					Assert.assertFalse(body instanceof SOAPHeader);
-    					Assert.assertFalse(body instanceof SOAP12Header);
-    					Assert.assertFalse(body instanceof SOAPHeaderFault);
-    					Assert.assertFalse(body instanceof SOAP12HeaderFault);
-    				}
-    			}
-    		
-    			Map bFaults = bop.getBindingFaults();
-    			if (bFaults.size() > 0)
-    				System.out.println("WARNING: Skipped to test binding faults");
-    			
-    		}
-   		}
-   	}
- 
-    /**
-     * Lines 288-289:<br>
-     * 2.3.3.1 SOAP versions<br>
-     * Where a web service binding requires a specific SOAP version, then a
-     * single WSDL port and SOAP binding of the appropriate version is
-     * generated.
-     */
-    @Test
-    public void testSoapVersion8() throws Exception {
-    	
-    	Map pMap = getPorts(cWSDL, "CService");
-    	int numSoapPort   = 0;
-    	int numSoap12Port = 0;
-    	int numHttpPort   = 0;
-   		for (Iterator iter = pMap.keySet().iterator(); iter.hasNext();) {
-    		Object k2 = iter.next();
-    		Port p = (Port) pMap.get(k2);
-    		List eeList = p.getExtensibilityElements();
-    		for (int i = 0; i < eeList.size(); i++) {
-    			Object address = eeList.get(i);
-    			if (address instanceof SOAPAddress) {
-    				numSoapPort++;
-				} else if (address instanceof SOAP12Address) {
-    				numSoap12Port++;
-				} else if (address instanceof HTTPAddress) {
-    				numHttpPort++;
-				};
-    		}
-    	}
-
-   		Map cMap = cWSDL.getBindings();
-    	int numSoapBinding   = 0;
-    	int numSoap12Binding = 0;
-    	int numHttpBinding   = 0;
-   		for (Iterator iter = cMap.keySet().iterator(); iter.hasNext();) {
-   			Object k1 = iter.next();
-   			Binding b = (Binding) cMap.get(k1);
-   			List eeList = b.getExtensibilityElements();
-    		for (int i = 0; i < eeList.size(); i++) {
-    			Object binding = eeList.get(i);
-    			if (binding instanceof SOAPBinding) {
-    				numSoapBinding++;
-    			} else if (binding instanceof SOAP12Binding) {
-    				numSoap12Binding++;
-    			} else if (binding instanceof HTTPBinding) {
-    				numHttpBinding++;
-    			}
-    		}
-   		}
-
-   		System.out.println("testSoapVersion8");
-   		System.out.println("  # of SOAPPort:      " + numSoapPort);
-   		System.out.println("  # of SOAP12Port:    " + numSoap12Port);
-   		System.out.println("  # of HTTPPort:      " + numHttpPort);
-   		System.out.println("  # of SOAPBinding:   " + numSoapBinding);
-   		System.out.println("  # of SOAP12Binding: " + numSoap12Binding);
-   		System.out.println("  # of HTTPBinding:   " + numHttpBinding);
-   		
-   		Assert.assertTrue(numSoap12Port > 0);
-   		Assert.assertTrue(numSoap12Binding > 0);
-   		Assert.assertEquals(numSoapPort, 0);
-   		Assert.assertEquals(numSoapBinding, 0);
-   		// Skipped to test HTTP
-    }
-
-    private boolean testOperation(Operation op, Method m[]) {
-    	for (int i = 0; i < m.length; i++) {
-    		if(m[i].getName().equals(op.getName())) {
-    	    	Assert.assertNotNull(op.getInput());
-    			Assert.assertNotNull(op.getOutput());
-    			return true;
-    		}
-    	}
-    	return false;
-    }
-    
-    /**
-     * Lines 293-296:<br>
-     * 2.3.4 WSDL PortType<br>
-     * An SCA service has a single interface. This interface is always imported
-     * into the generated WSDL document. This may be done directly for
-     * WSDL-defined interfaces, or indirectly via a WSDL generated from the 
-     * interface type for the service.<br>
-     */
-    @Test
-    public void testSoapVersion9() throws Exception {
-    	Method bMethod[] = BService.class.getMethods();
-    	Map bPTMap = bWSDL.getPortTypes();
-    	Assert.assertEquals(bPTMap.size(), 1);
-    	for (Iterator iter = bPTMap.keySet().iterator(); iter.hasNext();) {
-    		PortType pt = (PortType) bPTMap.get(iter.next());
-    		List opList = pt.getOperations();
-    		Assert.assertEquals(bMethod.length, opList.size());
-    		for (int i = 0; i < opList.size(); i++) {
-    			Operation op = (Operation) opList.get(i);
-    			Assert.assertTrue(testOperation(op, bMethod));
-    		}
-    	}
-    	
-    	Method cMethod[] = CService.class.getMethods();
-    	Map cPTMap = cWSDL.getPortTypes();
-    	Assert.assertEquals(cPTMap.size(), 1);
-    	for (Iterator iter = cPTMap.keySet().iterator(); iter.hasNext();) {
-    		PortType pt = (PortType) cPTMap.get(iter.next());
-    		List opList = pt.getOperations();
-    		Assert.assertEquals(cMethod.length, opList.size());
-    		for (int i = 0; i < opList.size(); i++) {
-    			Operation op = (Operation) opList.get(i);
-    			Assert.assertTrue(testOperation(op, cMethod));
-    		}
-    	}
-    }
-
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java
deleted file mode 100644
index 896b5a3d89..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.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.vtest.wsbinding.nowsdl.soapversion;
-
-import junit.framework.Assert;
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.AService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the simplest form of the binding element without WSDL document
- * described in section section 2.3.1 and 2.3.3.1 of SCA Web Services Binding
- * V1.00
- */
-public class NoWsdlNoSoapVersionTestCase {
-
-	protected static ServiceFinder serviceFinder;
-    protected static String compositeName = "nowsdlsoapversion.composite";
-    
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 251-253, 287-291:<br>
-     * <li>soap</li>
-     * This indicates that a SOAP binding is required. The SOAP binding may be
-     * of any SOAP version, including multiple versions.<br>
-     * <br>
-     * 2.3.3.1 SOAP versions<br>
-     * Where a web service binding requires a specific SOAP version, then a
-     * single WSDL port and SOAP binding of the appropriate version is
-     * generated. Where no specific SOAP version is required, then one or more
-     * WSDL ports with associated SOAP bindings may be generated, depending on
-     * the level(s) supported in the target runtime.<br>
-     * <p>
-     */
-    @Test
-    public void testSoapVersion1() throws Exception {
-    	
-    	for (int i = 0; i < 8; i++) {
-    		AService a = ServiceFinder.getService(AService.class, "AComponent" + (i+1));
-        	String aName = a.getName();
-        	String b1Str1 = a.getB1String("string1");
-        	String b1Str2 = a.getB1String2("string2", "string3");
-        	int b1Int = a.getB1Int(i * 1000 + 1000);
-            System.out.println(i + " - " + aName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-            Assert.assertEquals("AService", aName);
-            Assert.assertEquals("string1", b1Str1);
-            Assert.assertEquals("string2string3", b1Str2);
-            Assert.assertEquals(i * 1000 + 1000, b1Int);
-    	}
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java b/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
deleted file mode 100644
index c65f7e8e52..0000000000
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
+++ /dev/null
@@ -1,121 +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.vtest.wsbinding.nowsdl.soapversion;
-
-import junit.framework.Assert;
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.DService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the simplest form of the binding element without WSDL document
- * described in section section 2.3.1, 2.3.2 and 2.3.3.1 of SCA Web Services
- * Binding V1.00
- */
-public class NoWsdlSoapVersionTestCase {
-
-	protected static ServiceFinder serviceFinder;
-    protected static String compositeName = "nowsdlsoapversion.composite";
-    protected static DService d;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            d = ServiceFinder.getService(DService.class, "DComponent");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 254-257:<br>
-     * <li>soap.1_1</li><br>
-     * A SOAP 1.1 binding only is required.<br>
-     * <li>soap.1_2</li><br>
-     * A SOAP 1.2 binding only is required.<br>
-     * <br>
-     * 2.3.3.1 SOAP versions<br>
-     * Where a web service binding requires a specific SOAP version, then a
-     * single WSDL port and SOAP binding of the appropriate version is
-     * generated. Where no specific SOAP version is required, then one or more
-     * WSDL ports with associated SOAP bindings may be generated, depending on
-     * the level(s) supported in the target runtime.<br>
-     * <p>
-     */
-    @Test
-    public void testSoapVersion2() throws Exception {
-    	
-    	for (int i = 8; i < 16; i++) {
-    		AService a = ServiceFinder.getService(AService.class, "AComponent" + (i+1));
-        	String aName = a.getName();
-        	String b1Str1 = a.getB1String("string1");
-        	String b1Str2 = a.getB1String2("string2", "string3");
-        	int b1Int = a.getB1Int(i * 1000 + 1000);
-            System.out.println(i + " - " + aName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-            Assert.assertEquals("AService", aName);
-            Assert.assertEquals("string1", b1Str1);
-            Assert.assertEquals("string2string3", b1Str2);
-            Assert.assertEquals(i * 1000 + 1000, b1Int);
-    	}
-    }
-
-    /**
-     * Lines 254-257, 287-291, 260-262:<br>
-     * A separate WSDL document is generated for each SCA service. Each has
-     * its own unique target namespace. This is to ensure that bindings on
-     * different services of the same component do not clash.<br>
-     * <p>
-     * Test two references using binding.ws with 2 different SOAP versions
-     * and without WSDL document.<br> 
-     */
-    @Test
-    public void testSoapVersion3() throws Exception {
-    	String dName = d.getName();
-    	String b1Str1 = d.getB1String("string1");
-    	String b1Str2 = d.getB1String2("string2", "string3");
-    	String c1Str1 = d.getC1String("string5");
-    	String c1Str2 = d.getC1String2("string6", "string7");
-    	
-    	int b1Int = d.getB1Int(4000);
-    	float c1Float = d.getC1Float((float) 8.8);
-
-    	Integer c1Integer = d.getC1Integer(new Integer(9000));
-
-        System.out.println(dName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int + ", " + c1Str1 + ", " + c1Str2 + ", " + c1Float + ", " + c1Integer);
-        Assert.assertEquals("DService", dName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(4000, b1Int);
-        Assert.assertEquals("string5", c1Str1);
-        Assert.assertEquals("string6string7", c1Str2);
-        Assert.assertEquals((float) 8.8, c1Float);
-        Assert.assertEquals(new Integer(9000), c1Integer);
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/pom.xml b/java/sca-contrib/vtest/wsbinding/pom.xml
deleted file mode 100644
index 786fc89731..0000000000
--- a/java/sca-contrib/vtest/wsbinding/pom.xml
+++ /dev/null
@@ -1,68 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-vtest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-wsbinding</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Web Service Binding Verification Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>vtest-utilities</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>service</module>
-                <module>nowsdl</module>
-                <module>wsdlelement</module>
-           </modules>
-        </profile>
-    </profiles>
-</project>
diff --git a/java/sca-contrib/vtest/wsbinding/service/pom.xml b/java/sca-contrib/vtest/wsbinding/service/pom.xml
deleted file mode 100644
index 4fb8d98b57..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/pom.xml
+++ /dev/null
@@ -1,58 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-wsbinding</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-wsbinding-service</artifactId>
-    <name>Apache Tuscany SCA Web Service Binding Verification Tests - Service</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java b/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
deleted file mode 100644
index bdb5aa3821..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
+++ /dev/null
@@ -1,29 +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.vtest.wsbinding;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for AClientService.
- */
-@Remotable
-public interface AClientService {
-    public String getGreetingsForward(String name);
-}
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java b/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
deleted file mode 100644
index 2dc7afce0c..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
+++ /dev/null
@@ -1,29 +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.vtest.wsbinding;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for AService.
- */
-@Remotable
-public interface AService {
-    public String getGreetings(String name);
-}
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java b/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
deleted file mode 100644
index 93cd716abe..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
+++ /dev/null
@@ -1,38 +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.vtest.wsbinding.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.AClientService;
-import org.apache.tuscany.sca.vtest.wsbinding.AService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AClientService.class)
-public class AClientServiceImpl implements AClientService {
-
-    @Reference
-    protected AService aService;
-    
-    public String getGreetingsForward(String name) {
-        return aService.getGreetings(name);
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java b/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
deleted file mode 100644
index 6ab7668c8b..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
+++ /dev/null
@@ -1,33 +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.vtest.wsbinding.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.AService;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/aservice.wsdl b/java/sca-contrib/vtest/wsbinding/service/src/main/resources/aservice.wsdl
deleted file mode 100644
index e7953eb2b4..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/aservice.wsdl
+++ /dev/null
@@ -1,139 +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://wsbinding.vtest.sca.tuscany.apache.org"
-                  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-                  xmlns:ns0="http://wsbinding.vtest.sca.tuscany.apache.org"
-                  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-                  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-                  xmlns:ns1="http://org.apache.axis2/xsd"
-                  xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://wsbinding.vtest.sca.tuscany.apache.org" xmlns:ns="http://wsbinding.vtest.sca.tuscany.apache.org">
-      <xs:element name="getGreetings">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="param0" nillable="true" type="xs:string"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="getGreetingsResponse">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-    </xs:schema>
-  </wsdl:types>
-
-  <wsdl:message name="getGreetingsRequest">
-    <wsdl:part name="parameters" element="ns0:getGreetings"/>
-  </wsdl:message>
-
-  <wsdl:message name="getGreetingsResponse">
-    <wsdl:part name="parameters" element="ns0:getGreetingsResponse"/>
-  </wsdl:message>
-
-  <wsdl:portType name="AServicePortType">
-    <wsdl:operation name="getGreetings">
-      <wsdl:input message="ns0:getGreetingsRequest" wsaw:Action="urn:getGreetings"/>
-      <wsdl:output message="ns0:getGreetingsResponse" wsaw:Action="urn:getGreetingsResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-
-  <wsdl:binding name="AServiceSOAP12Binding" type="ns0:AServicePortType">
-    <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="getGreetings">
-      <soap12:operation soapAction="urn:getGreetings" style="document"/>
-      <wsdl:input>
-        <soap12:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-
-  <wsdl:binding name="AServicePortTypeBinding" type="ns0:AServicePortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="getGreetings">
-      <soap:operation soapAction=""/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-
-  <wsdl:binding name="AServiceHttpBinding" type="ns0:AServicePortType">
-    <http:binding verb="POST"/>
-    <wsdl:operation name="getGreetings">
-      <http:operation location="AService/getGreetings"/>
-      <wsdl:input>
-        <mime:content part="getGreetings" type="text/xml"/>
-      </wsdl:input>
-      <wsdl:output>
-        <mime:content part="getGreetings" type="text/xml"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-
-  <wsdl:binding name="AServiceSOAP11Binding" type="ns0:AServicePortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="getGreetings">
-      <soap:operation soapAction="urn:getGreetings" style="document"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-
-  <wsdl:service name="AServicePortTypeService">
-    <wsdl:port name="AServicePortTypePort" binding="ns0:AServicePortTypeBinding">
-      <soap:address location="http://localhost:8085/AService"/>
-    </wsdl:port>
-  </wsdl:service>
-
-  <wsdl:service name="AService">
-    <wsdl:port name="AServiceHttpport" binding="ns0:AServiceHttpBinding">
-      <http:address location="http://localhost:8085/AService/httpport"/>
-    </wsdl:port>
-    <wsdl:port name="AServiceSOAP12port_http" binding="ns0:AServiceSOAP12Binding">
-      <soap12:address location="http://localhost:8085/AService/soap12port"/>
-    </wsdl:port>
-    <wsdl:port name="AServiceSOAP11port_http" binding="ns0:AServiceSOAP11Binding">
-      <soap:address location="http://localhost:8085/AService/soap11port"/>
-    </wsdl:port>
-    <wsdl:port name="AServiceSOAP12port_http_null" binding="ns0:AServiceSOAP12Binding">
-      <soap12:address location=""/>
-    </wsdl:port>
-    <wsdl:port name="AServiceSOAP12port_http_wsdl" binding="ns0:AServiceSOAP12Binding">
-      <soap12:address location="inWsdl"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite b/java/sca-contrib/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
deleted file mode 100644
index 0d92174442..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
+++ /dev/null
@@ -1,103 +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://vtest"

-	name="endpoint-uri-resolution">

- 	      

-    <component name="AComponent">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AServiceImpl"/>

-		<service name="AService">

-		    <binding.ws name="bnd1" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.port(AService/AServiceSOAP12port_http)"

-		                uri="http://localhost:8085/AService/soap12portxxx"/>

-		    <binding.ws name="bnd2" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP11Binding)"

-		                uri="http://localhost:8085/AService/endpointrefxxx">

-                <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">

-                  <wsa:Address>http://localhost:8085/AService/endpointref</wsa:Address>

-                </wsa:EndpointReference>

-            </binding.ws>

-		    <binding.ws name="bnd3" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.port(AService/AServiceSOAP12port_http_null)"

-		                uri="http://localhost:8085/AService/uriInBinding"/>

-		    <!-- binding.ws name="bnd4" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.port(AService/AServiceSOAP12port_http_null)"/-->

-		    <binding.ws name="bnd5" uri="http://localhost:8085/AService/noWsdlElement"/>

-		    <binding.ws name="bnd6" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.port(AService/AServiceSOAP12port_http_wsdl)"

-		                uri="http://localhost:8085/AService/endpointref6"/>

-		    <binding.ws name="bnd7" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP11Binding)"

-		                uri="http://localhost:8085/AService/endpointref7">

-                <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">

-                  <wsa:Address>inAddress</wsa:Address>

-                </wsa:EndpointReference>

-            </binding.ws>

-		    <binding.ws name="bnd8" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP12Binding)"

-		                uri="http://localhost:8085/AService/endpointref8">

-                <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">

-                  <wsa:Address></wsa:Address>

-                </wsa:EndpointReference>

-            </binding.ws>

-		</service>

-    </component>

-    <component name="AClientComponent1">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/soap12port"/>

-        </reference>

-    </component> 

-    <component name="AClientComponent2">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/endpointref"/>

-        </reference>

-    </component> 

-    <component name="AClientComponent3">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/uriInBinding"/>

-        </reference>

-    </component> 

-    <component name="AClientComponent4">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AComponent"/>

-        </reference>

-    </component> 

-    <component name="AClientComponent5">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/noWsdlElement"/>

-        </reference>

-    </component> 

-    <component name="AClientComponent6">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/endpointref6/inWsdl"/>

-        </reference>

-    </component> 

-    <component name="AClientComponent7">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/endpointref7/inAddress"/>

-        </reference>

-    </component> 

-    <component name="AClientComponent8">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/endpointref8"/>

-        </reference>

-    </component> 

-</composite>

diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/endpointreference.composite b/java/sca-contrib/vtest/wsbinding/service/src/main/resources/endpointreference.composite
deleted file mode 100644
index 3ba152b7b8..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/endpointreference.composite
+++ /dev/null
@@ -1,40 +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://vtest"

-	name="endpointreference">

- 	      

-    <component name="AComponent">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AServiceImpl"/>

-		<service name="AService">

-		    <binding.ws wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP11Binding)">

-                <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">

-                  <wsa:Address>http://localhost:8085/AService/endpointref</wsa:Address>

-                </wsa:EndpointReference>

-            </binding.ws>

-		</service>

-    </component>

-    <component name="AClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/endpointref"/>

-        </reference>

-    </component> 

-</composite>

diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite b/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
deleted file mode 100644
index 85c604070a..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
+++ /dev/null
@@ -1,45 +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://vtest"

-	name="wsdlbinding">

- 	      

-    <component name="AComponent">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AServiceImpl"/>

-		<service name="AService">

-		    <binding.ws name="bnd11" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP11Binding)"

-		        uri="http://localhost:8085/AService/bnd11"/>

-		    <binding.ws name="bnd12" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP12Binding)"

-		        uri="http://localhost:8085/AService/bnd12"/>

-		</service>

-    </component>

-    <component name="AClientBnd11Component">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/bnd11"/>

-        </reference>

-    </component> 

-    <component name="AClientBnd12Component">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/bnd12"/>

-        </reference>

-    </component> 

-</composite>

diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite b/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
deleted file mode 100644
index 0c11c79efe..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
+++ /dev/null
@@ -1,37 +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://vtest"

-	name="wsdlendpoint">

- 	      

-    <component name="AComponent">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AServiceImpl"/>

-		<service name="AService">

-		    <binding.ws wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.endpoint(AService/AServiceEndPoint)"

-                        uri="http://localhost:8085/AService/endpoint"/>

-		</service>

-    </component>

-    <component name="AClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/endpoint"/>

-        </reference>

-    </component> 

-</composite>

diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlport.composite b/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlport.composite
deleted file mode 100644
index 859b93bec4..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlport.composite
+++ /dev/null
@@ -1,43 +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://vtest"

-	name="wsdlport">

- 	      

-    <component name="AComponent">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AServiceImpl"/>

-		<service name="AService">

-		    <binding.ws name="p11" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.port(AService/AServiceSOAP11port_http)"/>

-		    <binding.ws name="p12" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.port(AService/AServiceSOAP12port_http)"/>

-		</service>

-    </component>

-    <component name="AClientP11Component">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/soap11port"/>

-        </reference>

-    </component> 

-    <component name="AClientP12Component">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/soap12port"/>

-        </reference>

-    </component> 

-</composite>

diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlservice.composite b/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
deleted file mode 100644
index fa96e650de..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
+++ /dev/null
@@ -1,43 +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://vtest"

-	name="wsdlservice">

- 	      

-    <component name="AComponent">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AServiceImpl"/>

-		<service name="AService">

-		    <binding.ws wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.service(AService)"

-                        uri="http://localhost:8085/AComponent"/>

-		</service>

-    </component>

-    <component name="AClientS11Component">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/soap11port"/>

-        </reference>

-    </component> 

-    <component name="AClientS12Component">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8085/AService/soap12port"/>

-        </reference>

-    </component> 

-</composite>

diff --git a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java b/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
deleted file mode 100644
index d858daaf78..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
+++ /dev/null
@@ -1,67 +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.vtest.wsbinding;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests EndpointReference element specified in service binding.ws as per Web
- * Services Binding Specification v1.00 - Sec 2.1 - Lines 61 to 65.
- */
-public class EndpointReferenceTestCase {
-
-    protected static String compositeName = "endpointreference.composite";
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 61-65
-     * <p>
-     * /binding.ws/wsa:EndpointReference – optional WS-Addressing [6]
-     * EndpointReference that specifies the endpoint for the service or
-     * reference. When this element is present along with the wsdlElement
-     * attribute on the parent element, the wsdlElement attribute value MUST be
-     * of the ‘Binding’ form as specified above, i.e. <WSDL-namespace-
-     * URI>#wsdl.binding(<binding-name>).
-     */
-    @Test
-    public void testWsdlBinding() throws Exception {
-        AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent");
-        Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java b/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
deleted file mode 100644
index 49f9db248f..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
+++ /dev/null
@@ -1,209 +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.vtest.wsbinding;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests "Endpoint URI resolution" for service binding.ws as per Web Services
- * Binding Specification v1.00 - Sec 2.1.1 - Lines 70 to 85.
- */
-public class EndpointUriResolutionTestCase {
-
-    protected static String compositeName = "endpoint-uri-resolution.composite";
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 71-78
-     * <p>
-     * The rules for resolving the URI at which an SCA service is hosted, or SCA
-     * reference targets, when used with binding.ws (in precedence order) are:
-     * 1. The URIs in the endpoint(s) of the referenced WSDL or The URI
-     * specified by the wsa:Address element of the wsa:EndpointReference, 2. The
-     * explicitly stated URI in the "uri" attribute of the binding.ws element,
-     * which may be relative, 3. The implicit URI as defined by the Assembly
-     * specification
-     * <p>
-     * This method tests that URI in the endpoint takes precedence.
-     */
-    @Test
-    public void testUriInEndpoint() throws Exception {
-        AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent1");
-        Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
-    }
-
-    /**
-     * Lines 71-78
-     * <p>
-     * The rules for resolving the URI at which an SCA service is hosted, or SCA
-     * reference targets, when used with binding.ws (in precedence order) are:
-     * 1. The URIs in the endpoint(s) of the referenced WSDL or The URI
-     * specified by the wsa:Address element of the wsa:EndpointReference, 2. The
-     * explicitly stated URI in the "uri" attribute of the binding.ws element,
-     * which may be relative, 3. The implicit URI as defined by the Assembly
-     * specification
-     * <p>
-     * This method tests that URI in the EndpointReference takes precedence.
-     */
-    @Test
-    public void testUriInEndpointReference() throws Exception {
-        AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent2");
-        Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
-    }
-
-    /**
-     * Lines 71-78
-     * <p>
-     * The rules for resolving the URI at which an SCA service is hosted, or SCA
-     * reference targets, when used with binding.ws (in precedence order) are:
-     * 1. The URIs in the endpoint(s) of the referenced WSDL or The URI
-     * specified by the wsa:Address element of the wsa:EndpointReference, 2. The
-     * explicitly stated URI in the "uri" attribute of the binding.ws element,
-     * which may be relative, 3. The implicit URI as defined by the Assembly
-     * specification
-     * <p>
-     * This method tests that explicitly stated URI in the "uri" attribute of
-     * binding.ws takes precedence.
-     */
-    @Test
-    public void testUriInBindingWs() throws Exception {
-        AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent3");
-        Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
-    }
-
-    /**
-     * Lines 71-78
-     * <p>
-     * The rules for resolving the URI at which an SCA service is hosted, or SCA
-     * reference targets, when used with binding.ws (in precedence order) are:
-     * 1. The URIs in the endpoint(s) of the referenced WSDL or The URI
-     * specified by the wsa:Address element of the wsa:EndpointReference, 2. The
-     * explicitly stated URI in the "uri" attribute of the binding.ws element,
-     * which may be relative, 3. The implicit URI as defined by the Assembly
-     * specification
-     * <p>
-     * This method tests that implicit URI is used.
-     */
-    @Ignore("TUSCANY-2523 - Port 8080 conflicts with Continuum") 
-    @Test
-    public void testImplicitUri() throws Exception {
-        AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent4");
-        Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
-    }
-
-    /**
-     * Lines 71-78
-     * <p>
-     * The rules for resolving the URI at which an SCA service is hosted, or SCA
-     * reference targets, when used with binding.ws (in precedence order) are:
-     * 1. The URIs in the endpoint(s) of the referenced WSDL or The URI
-     * specified by the wsa:Address element of the wsa:EndpointReference, 2. The
-     * explicitly stated URI in the "uri" attribute of the binding.ws element,
-     * which may be relative, 3. The implicit URI as defined by the Assembly
-     * specification
-     * <p>
-     * This method tests that explicitly stated URI in the "uri" attribute of
-     * the binding.ws is used in the absence of a wsdlElement.
-     */
-    @Test
-    public void testNoWsdlElement() throws Exception {
-        AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent5");
-        Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
-    }
-
-    /**
-     * Lines 79-83
-     * <p>
-     * The URI in the WSDL endpoint or in the wsa:Address of an EPR may be a
-     * relative URI, in which case it is relative to the URI defined in (2) or
-     * (3). The wsa:Address element can be the empty relative URI, in which case
-     * it uses the URI defined in (2) or (3) directly. This allows the EPR
-     * writer to specify reference parameters, metadata and other EPR contents
-     * while allowing the URI to be chosen by the deployer.
-     * <p>
-     * This method tests that the relative URI specified in WSDL endpoint is
-     * used along with the explicit URI specified in the "uri" attribute of
-     * binding.ws element.
-     */
-    @Test
-    public void testRelativeUriInWsdl() throws Exception {
-        AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent6");
-        Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
-    }
-
-    /**
-     * Lines 79-83
-     * <p>
-     * The URI in the WSDL endpoint or in the wsa:Address of an EPR may be a
-     * relative URI, in which case it is relative to the URI defined in (2) or
-     * (3). The wsa:Address element can be the empty relative URI, in which case
-     * it uses the URI defined in (2) or (3) directly. This allows the EPR
-     * writer to specify reference parameters, metadata and other EPR contents
-     * while allowing the URI to be chosen by the deployer.
-     * <p>
-     * This method tests that the relative URI specified in wsa:Address is used
-     * along with the explicit URI specified in the "uri" attribute of
-     * binding.ws element.
-     */
-    @Test
-    public void testRelativeUriInAddress() throws Exception {
-        AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent7");
-        Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
-    }
-
-    /**
-     * Lines 79-83
-     * <p>
-     * The URI in the WSDL endpoint or in the wsa:Address of an EPR may be a
-     * relative URI, in which case it is relative to the URI defined in (2) or
-     * (3). The wsa:Address element can be the empty relative URI, in which case
-     * it uses the URI defined in (2) or (3) directly. This allows the EPR
-     * writer to specify reference parameters, metadata and other EPR contents
-     * while allowing the URI to be chosen by the deployer.
-     * <p>
-     * This method tests that when wsa:Address is empty, the explicit URI
-     * specified in the "uri" attribute of binding.ws element is used.
-     */
-    @Test
-    public void testEmptyAddressElement() throws Exception {
-        AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent8");
-        Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java b/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
deleted file mode 100644
index 292de8b654..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.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 org.apache.tuscany.sca.vtest.wsbinding;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests wsdlElement specified on service binding.ws as per Web Services Binding Specification v1.00 - Sec 2.1
- * - Lines 35 to 54.
- */
-public class WsdlBindingTestCase {
-
-    protected static String compositeName = "wsdlbinding.composite";
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 50-54
-     * <p>
-     * Binding:
-     * <WSDL-namespace-URI>#wsdl.binding(<binding-name>)
-     * In this case, the identified WSDL binding must have an equivalent PortType with the SCA
-     * service or reference. In this case the endpoint address URI for the SCA service or
-     * reference must be provided via the URI attribute on the binding.
-     */
-    @Test
-    public void testWsdlBinding() throws Exception {
-        AClientService aClientBnd11 = ServiceFinder.getService(AClientService.class, "AClientBnd11Component");
-        Assert.assertEquals("Hello Pandu", aClientBnd11.getGreetingsForward("Pandu"));
-        AClientService aClientBnd12 = ServiceFinder.getService(AClientService.class, "AClientBnd12Component");
-        Assert.assertEquals("Hello Pandu", aClientBnd12.getGreetingsForward("Pandu"));
-    }
-    
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java b/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
deleted file mode 100644
index 842da87bd4..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
+++ /dev/null
@@ -1,66 +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.vtest.wsbinding;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests wsdlElement specified on service binding.ws as per Web Services Binding
- * Specification v1.00 - Sec 2.1 - Lines 35 to 54.
- */
-public class WsdlEndpointTestCase {
-
-    protected static String compositeName = "wsdlendpoint.composite";
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 46-49
-     * <p>
-     * Endpoint (WSDL 2.0): <WSDL-namespace-URI>#wsdl.endpoint(<service-name>/<endpoint-name>)
-     * In this case, the identified endpoint in the WSDL 2.0 Service must have
-     * an equivalent PortType with the SCA service or reference.
-     */
-    @Test
-    @Ignore("WSDL2.0 Support")
-    public void testWsdlEndpoint() throws Exception {
-        AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent");
-        Assert.assertEquals("Hello Pandu", aClient.getGreetingsForward("Pandu"));
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java b/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
deleted file mode 100644
index 0545cef776..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
+++ /dev/null
@@ -1,66 +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.vtest.wsbinding;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests wsdlElement specified on service binding.ws as per Web Services Binding
- * Specification v1.00 - Sec 2.1 - Lines 35 to 54.
- */
-public class WsdlPortTestCase {
-
-    protected static String compositeName = "wsdlport.composite";
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 42-45
-     * <p>
-     * Port (WSDL 1.1): <WSDL-namespace-URI>#wsdl.port(<service-name>/<port-name>)
-     * In this case, the identified port in the WSDL 1.1 Service must have an
-     * equivalent PortType with the SCA service or reference.
-     */
-    @Test
-    public void testWsdlPort() throws Exception {
-        AClientService aClientP11 = ServiceFinder.getService(AClientService.class, "AClientP11Component");
-        Assert.assertEquals("Hello Pandu", aClientP11.getGreetingsForward("Pandu"));
-        AClientService aClientP12 = ServiceFinder.getService(AClientService.class, "AClientP12Component");
-        Assert.assertEquals("Hello Pandu", aClientP12.getGreetingsForward("Pandu"));
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java b/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
deleted file mode 100644
index aa2b2fac7a..0000000000
--- a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
+++ /dev/null
@@ -1,69 +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.vtest.wsbinding;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests wsdlElement specified on service binding.ws as per Web Services Binding
- * Specification v1.00 - Sec 2.1 - Lines 35 to 54.
- */
-public class WsdlServiceTestCase {
-
-    protected static String compositeName = "wsdlservice.composite";
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 38-41
-     * <p>
-     * Service: <WSDL-namespace-URI>#wsdl.service(<service-name>) In this case,
-     * all the endpoints in the WSDL Service that have equivalent PortTypes with
-     * the SCA service or reference must be available to the SCA service or
-     * reference.
-     */
-    @Test
-    @Ignore("TUSCANY-2298")
-    public void testWsdlService() throws Exception {
-        AClientService aClientS11 = ServiceFinder.getService(AClientService.class, "AClientS11Component");
-        Assert.assertEquals("Hello Pandu", aClientS11.getGreetingsForward("Pandu"));
-        AClientService aClientS12 = ServiceFinder.getService(AClientService.class, "AClientS12Component");
-        Assert.assertEquals("Hello Pandu", aClientS12.getGreetingsForward("Pandu"));
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/pom.xml b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/pom.xml
deleted file mode 100644
index 648aa920e8..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/pom.xml
+++ /dev/null
@@ -1,58 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-wsbinding-wsdlelement</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-wsbinding-wsdlelement-binding</artifactId>
-    <name>Apache Tuscany SCA Web Service Binding Verification Tests - WSDL wsdlElement wsdl.binding</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
deleted file mode 100644
index 2f6db92318..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
+++ /dev/null
@@ -1,40 +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.vtest.wsbinding.wsdlelement.binding;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for AService.
- */
-@Remotable
-public interface AService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-	
-	public String getB2String(String aString);
-
-	public int getB2Int(int i);
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
deleted file mode 100644
index a040adb113..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
+++ /dev/null
@@ -1,35 +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.vtest.wsbinding.wsdlelement.binding;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
deleted file mode 100644
index 3195263584..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
+++ /dev/null
@@ -1,33 +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.vtest.wsbinding.wsdlelement.binding;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService2 {
-
-	public String getString(String aString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java
deleted file mode 100644
index aed5abebf4..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.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.vtest.wsbinding.wsdlelement.binding;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface CService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public Integer getInteger(Integer i);
-
-	public float getFloat(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java
deleted file mode 100644
index 3386ea709f..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.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.    
- */
-package org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for DService.
- */
-@Remotable
-public interface DService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-
-	public String getC1String(String aString);
-
-	public String getC1String2(String aString, String bString);
-
-	public Integer getC1Integer(Integer i);
-	
-	public float getC1Float(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
deleted file mode 100644
index 853cc74d4e..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
+++ /dev/null
@@ -1,63 +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.vtest.wsbinding.wsdlelement.binding.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService2;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-	@Reference(required=false)
-	public BService b1;
-
-	@Reference(required=false)
-	public BService2 b2;
-
-    public String getName() {
-        return "AService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-	public String getB2String(String aString) {
-		return b2.getString(aString);
-	}
-
-	public int getB2Int(int i) {
-		return b2.getInt(i);
-	}
-
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
deleted file mode 100644
index 43051d6f10..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
+++ /dev/null
@@ -1,40 +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.vtest.wsbinding.wsdlelement.binding.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService2;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService2.class)
-public class BService2Impl implements BService2 {
-
-    public String getName() {
-        return "BService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java
deleted file mode 100644
index 5496362e34..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.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 org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-    public String getName() {
-        return "BService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
deleted file mode 100644
index 63753d4ba7..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
+++ /dev/null
@@ -1,48 +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.vtest.wsbinding.wsdlelement.binding.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.CService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl implements CService {
-
-    public String getName() {
-        return "CService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public Integer getInteger(Integer i) {
-    	return i;
-    }
-    
-    public float getFloat(float f) {
-        return f;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
deleted file mode 100644
index 0a268ff447..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
+++ /dev/null
@@ -1,70 +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.vtest.wsbinding.wsdlelement.binding.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.CService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.DService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements DService.
- */
-@Service(DService.class)
-public class DServiceImpl implements DService {
-
-	@Reference
-	public BService b1;
-	
-	@Reference
-	public CService c1;
-	
-    public String getName() {
-        return "DService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-	public String getC1String(String aString) {
-		return c1.getString(aString);
-	}
-
-	public String getC1String2(String aString, String bString) {
-		return c1.getString2(aString, bString);
-	}
-
-	public Integer getC1Integer(Integer i) {
-		return c1.getInteger(i);
-	}
-	
-	public float getC1Float(float f) {
-		return c1.getFloat(f);
-	}
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
deleted file mode 100644
index 8ce0fbaeb8..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
+++ /dev/null
@@ -1,228 +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 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://vtest.wsbinding.wsdlelement.binding.bservice" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="wsdlelement" targetNamespace="http://vtest.wsbinding.wsdlelement.binding.bservice" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/">

-  <wsdl:types>

-    <xsd:schema targetNamespace="http://vtest.wsbinding.wsdlelement.binding.bservice" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-      <xsd:element name="getString">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="in" type="xsd:string"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="getStringResponse">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="out" type="xsd:string"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="getString2">

-      	<xsd:complexType>

-      		<xsd:sequence>

      			<xsd:element name="in1" type="xsd:string"></xsd:element>
-      			<xsd:element name="in2" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getString2Response">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getInt">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="in" type="xsd:int"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getIntResponse">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:int"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-    </xsd:schema>

-  </wsdl:types>

-  <wsdl:message name="getStringRequest">

-    <wsdl:part element="tns:getString" name="parameters"/>

-  </wsdl:message>

-  <wsdl:message name="getStringResponse">

-    <wsdl:part element="tns:getStringResponse" name="parameters"/>

-  </wsdl:message>

-  <wsdl:message name="getString2Request">

-  	<wsdl:part name="parameters" element="tns:getString2"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Response">
-  	<wsdl:part name="parameters" element="tns:getString2Response"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntRequest">
-  	<wsdl:part name="parameters" element="tns:getInt"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntResponse">
-  	<wsdl:part name="parameters" element="tns:getIntResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getStringRequest">
-  	<wsdl:part name="parameters" element="tns:getString"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getStringResponse">
-  	<wsdl:part name="parameters" element="tns:getStringResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntRequest">
-  	<wsdl:part name="parameters" element="tns:getInt"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntResponse">
-  	<wsdl:part name="parameters" element="tns:getIntResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:portType name="BService1PortType">

-    <wsdl:operation name="getString">

-      <wsdl:input message="tns:getStringRequest"/>

-      <wsdl:output message="tns:getStringResponse"/>

-    </wsdl:operation>

-    <wsdl:operation name="getString2">

-    	<wsdl:input message="tns:getString2Request"></wsdl:input>
-    	<wsdl:output message="tns:getString2Response"></wsdl:output>

-    </wsdl:operation>
-    <wsdl:operation name="getInt">
-    	<wsdl:input message="tns:getIntRequest"></wsdl:input>
-    	<wsdl:output message="tns:getIntResponse"></wsdl:output>

-    </wsdl:operation>
-  </wsdl:portType>

-  <wsdl:portType name="BService2PortType">

-  	<wsdl:operation name="getString">

-  		<wsdl:input message="tns:getStringRequest"></wsdl:input>
-  		<wsdl:output message="tns:getStringResponse"></wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getInt">

-  		<wsdl:input message="tns:getIntRequest"></wsdl:input>
-  		<wsdl:output message="tns:getIntResponse"></wsdl:output>

-  	</wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="BService1SOAPBinding"

-  	type="tns:BService1PortType">




  	<soap:binding style="document"

-  		transport="http://schemas.xmlsoap.org/soap/http" />
  	<wsdl:operation name="getString">




  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.binding.bservice/getString" />
  		<wsdl:input>

  			<soap:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

  			<soap:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getString2">

-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.binding.bservice/getString2" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  	<wsdl:operation name="getInt">
-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.binding.bservice/getInt" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  </wsdl:binding>

-  <wsdl:binding name="BService2SOAPBinding"

-  	type="tns:BService2PortType">

-  	<soap:binding style="document"

-  		transport="http://schemas.xmlsoap.org/soap/http" />
-  	<wsdl:operation name="getString">
-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.binding.bservice/getString" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getInt">

-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.binding.bservice/getInt" />
-  		<wsdl:input>
-  			<soap:body use="literal" />

-  		</wsdl:input>
-  		<wsdl:output>
-  			<soap:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="BService3SOAP12Binding"

-  	type="tns:BService1PortType">

-  	<soap12:binding style="document"

-  		transport="http://schemas.xmlsoap.org/soap/http" />

-  	<wsdl:operation name="getString">

-  		<soap12:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.binding.bservice/getString" />

-  		<wsdl:input>

-  			<soap12:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

-  			<soap12:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getString2">

-  		<soap12:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.binding.bservice/getString2" />

-  		<wsdl:input>

-  			<soap12:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

-  			<soap12:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getInt">

-  		<soap12:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.binding.bservice/getInt" />

-  		<wsdl:input>

-  			<soap12:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

-  			<soap12:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  </wsdl:binding>

-  <wsdl:service name="BService">

-    <wsdl:port binding="tns:BService1SOAPBinding" name="BService1SOAP">

-      <soap:address location=""/>

-    </wsdl:port>

-    <wsdl:port name="BService2SOAP"

-    	binding="tns:BService2SOAPBinding">

-    	<soap:address location="" />

-    </wsdl:port>

-    <wsdl:port name="BService3SOAP12"

-    	binding="tns:BService3SOAP12Binding">

-    	<soap12:address location=""></soap12:address>

-    </wsdl:port>

-  </wsdl:service>

-  <wsdl:service name="BService2">

-  	<wsdl:port name="BService2Port" binding="tns:BService2SOAPBinding">

-  		<soap:address location="" />

-  	</wsdl:port>

-  </wsdl:service>
-</wsdl:definitions>

diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
deleted file mode 100644
index ff151faa7a..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
+++ /dev/null
@@ -1,173 +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 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://vtest.wsbinding.wsdlelement.binding.cservice" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="CService" targetNamespace="http://vtest.wsbinding.wsdlelement.binding.cservice">

-  <wsdl:types>

-    <xsd:schema targetNamespace="http://vtest.wsbinding.wsdlelement.binding.cservice" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-      <xsd:element name="getFloat">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="in" type="xsd:float"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="getFloatResponse">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="out" type="xsd:float"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="getInteger">

-      	<xsd:complexType>

-      		<xsd:sequence>

      			<xsd:element name="in" type="xsd:integer"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getIntegerResponse">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:integer"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getString2">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="in1" type="xsd:string"></xsd:element>
-      			<xsd:element name="in2" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getString2Response">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getString">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="in" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getStringResponse">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-    </xsd:schema>

-  </wsdl:types>

-  <wsdl:message name="getFloatRequest">

-    <wsdl:part element="tns:getFloat" name="parameters"/>

-  </wsdl:message>

-  <wsdl:message name="getFloatResponse">

-    <wsdl:part element="tns:getFloatResponse" name="parameters"/>

-  </wsdl:message>

-  <wsdl:message name="getIntegerRequest">

-  	<wsdl:part name="parameters" element="tns:getInteger"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntegerResponse">
-  	<wsdl:part name="parameters" element="tns:getIntegerResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Request">
-  	<wsdl:part name="parameters" element="tns:getString2"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Response">
-  	<wsdl:part name="parameters" element="tns:getString2Response"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getStringRequest">
-  	<wsdl:part name="parameters" element="tns:getString"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getStringResponse">
-  	<wsdl:part name="parameters" element="tns:getStringResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Request">
-  	<wsdl:part name="parameters" element="tns:getString2"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Response">
-  	<wsdl:part name="parameters" element="tns:getString2Response"></wsdl:part>

-  </wsdl:message>
-  <wsdl:portType name="CServicePortType">

-    <wsdl:operation name="getFloat">

-      <wsdl:input message="tns:getFloatRequest"/>

-      <wsdl:output message="tns:getFloatResponse"/>

-    </wsdl:operation>

-    <wsdl:operation name="getInteger">

-    	<wsdl:input message="tns:getIntegerRequest"></wsdl:input>
-    	<wsdl:output message="tns:getIntegerResponse"></wsdl:output>

-    </wsdl:operation>
-    <wsdl:operation name="getString">
-    	<wsdl:input message="tns:getStringRequest"></wsdl:input>
-    	<wsdl:output message="tns:getStringResponse"></wsdl:output>

-    </wsdl:operation>
-    <wsdl:operation name="getString2">
-    	<wsdl:input message="tns:getString2Request"></wsdl:input>
-    	<wsdl:output message="tns:getString2Response"></wsdl:output>

-    </wsdl:operation>
-  </wsdl:portType>

-  <wsdl:binding name="CServiceSOAPBinding"

-  	type="tns:CServicePortType">





  	<soap:binding style="document"

-  		transport="http://schemas.xmlsoap.org/soap/http" />
  	<wsdl:operation name="getFloat">





  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.binding.cservice/getFloat" />
  		<wsdl:input>

  			<soap:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

  			<soap:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getInteger">

-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.binding.cservice/getInteger" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  	<wsdl:operation name="getString">
-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.binding.cservice/getString" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  	<wsdl:operation name="getString2">
-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.binding.cservice/getString2" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  </wsdl:binding>

-  <wsdl:service name="CService">

-    <wsdl:port binding="tns:CServiceSOAPBinding" name="CServiceSOAP">

-      <soap:address location=""/>

-    </wsdl:port>

-  </wsdl:service>

-</wsdl:definitions>

diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
deleted file mode 100644
index 6b97b5e602..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
+++ /dev/null
@@ -1,114 +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://vtest.wsbinding.wsdlelement.binding"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-	name="wsdlelement.binding">
-
-	<component name="BComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.BServiceImpl"/>
-		<service name="BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService1SOAPBinding)"
-                        uri="http://localhost:8085/BComponent1"/>
-		</service>
-    </component>
-
-	<component name="BComponent2">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.BServiceImpl"/>
-		<service name="BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService2SOAPBinding)"
-                        uri="http://localhost:8085/BComponent2"/>
-		</service>
-    </component>
-
-	<component name="BComponent3">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.BService2Impl"/>
-		<service name="BService2">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService2"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService2SOAPBinding)"
-                        uri="http://localhost:8085/BComponent3"/>
-		</service>
-    </component>
-    
-    <component name="BComponent4">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.BServiceImpl"/>
-		<service name="BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService3SOAP12Binding)"
-                        uri="http://localhost:8085/BComponent4"/>
-		</service>
-    </component>
-    
-	<component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.CServiceImpl"/>
-		<service name="CService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.CService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.cservice#wsdl.binding(CServiceSOAPBinding)"
-                        uri="http://localhost:8085/CComponent"/>
-		</service>
-    </component>
-
-    <component name="AComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent1/BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService1SOAPBinding)" uri="http://localhost:8085/BComponent1"/>
-        </reference>
-    </component>
-
-    <component name="AComponent2">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent2/BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService2SOAPBinding)" uri="http://localhost:8085/BComponent2"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent3">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.AServiceImpl"/>
-        <reference name="b2" target="BComponent3/BService2">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService2"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService2SOAPBinding)" uri="http://localhost:8085/BComponent3"/>
-        </reference>
-    </component>
-
-    <component name="AComponent4">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent4/BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService3SOAP12Binding)" uri="http://localhost:8085/BComponent4"/>
-        </reference>
-    </component>
-        
-    <component name="DComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.DServiceImpl"/>
-        <reference name="b1" target="BComponent1/BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService1SOAPBinding)" uri="http://localhost:8085/BComponent1"/>
-        </reference>
-        <reference name="c1" target="CComponent/CService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.CService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.cservice#wsdl.binding(CServiceSOAPBinding)" uri="http://localhost:8085/CComponent"/>
-        </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
deleted file mode 100644
index f30cf38654..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
+++ /dev/null
@@ -1,190 +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.vtest.wsbinding.wsdlelement.binding;
-
-import static org.junit.Assert.fail;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.DService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the simplest form of the binding element wsdl.binding with WSDL 
- * document described in section section 2.1 of SCA Web Services Binding
- * V1.00<br>
- */
-public class WsdlElementBindingTestCase {
-
-	protected static ServiceFinder serviceFinder;
-    protected static String compositeName = "wsdlelement.binding.composite";
-    protected static AService a1;
-    protected static AService a2;
-    protected static AService a3;
-    protected static AService a4;
-    protected static DService d;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            a1 = ServiceFinder.getService(AService.class, "AComponent1");
-            a2 = ServiceFinder.getService(AService.class, "AComponent2");
-            a3 = ServiceFinder.getService(AService.class, "AComponent3");
-            a4 = ServiceFinder.getService(AService.class, "AComponent4");
-            d = ServiceFinder.getService(DService.class, "DComponent1");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 50-54:<br>
-     * Binding:<br>
-     * <WSDL-namespace-URI>#wsdl.binding(<binding-name>)<br>
-     * In this case, the identified WSDL binding must have an equivalent
-     * PortType with the SCA service or reference. In this case the endpoint 
-     * address URI for the SCA service or reference must be provided via the
-     * URI attribute on the binding.<br>
-     * <br>
-     * Tests wsdl.binding(BService1SOAPBinding)<br>
-     */
-    @Test
-    public void testWsdlElementBinding1() throws Exception {
-    	String aName = a1.getName();
-    	String b1Str1 = a1.getB1String("string1");
-    	String b1Str2 = a1.getB1String2("string2", "string3");
-    	int b1Int = a1.getB1Int(1000);
-    	
-        System.out.println(aName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(1000, b1Int);
-    }
-
-    /**
-     * Lines 50-54:<br>
-     * Binding:<br>
-     * <br>
-     * Tests wsdl.binding(BService2SOAPBinding) with BService where the binding
-     * does not define getString2, so exceptions are expected.<br>
-     */
-    @Test
-    public void testWsdlElementBinding2() throws Exception {
-        String aName = a2.getName();
-        System.out.println(aName + ": ");
-    	try {
-        	a2.getB1String("string1");
-    		fail("Should not be able to call getString");
-    	} catch (Exception e) {
-            System.out.println("  Exception is expected: " + e.toString());
-    	}
-    	try {
-    		a2.getB1String2("string2", "string3");
-    		fail("Should not be able to call getString2");
-    	} catch (Exception e) {
-    		System.out.println("  Exception is expected: " + e.toString());
-    	}
-    	try {
-        	a2.getB1Int(2000);
-    		fail("Should not be able to call getInt");
-    	} catch (Exception e) {
-    		System.out.println("  Exception is expected: " + e.toString());
-    	}
-    }
-
-    /**
-     * Lines 50-54:<br>
-     * Binding:<br>
-     * <br>
-     * Tests wsdl.binding(BService2SOAPBinding) with BService2<br>
-     */
-    @Test
-    public void testWsdlElementBinding3() throws Exception {
-    	String aName = a3.getName();
-    	String b2Str1 = a3.getB2String("string1");
-    	int b2Int = a3.getB2Int(3000);
-    	
-        System.out.println(aName + ": " + b2Str1 + ", " + b2Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b2Str1);
-        Assert.assertEquals(3000, b2Int);
-    }
-
-    /**
-     * Lines 50-54:<br>
-     * Binding:<br>
-     * <br>
-     * Tests two references using wsdl.binding.<br> 
-     */
-    @Test
-    public void testWsdlElementBinding4() throws Exception {
-    	String dName = d.getName();
-    	String b1Str1 = d.getB1String("string1");
-    	String b1Str2 = d.getB1String2("string2", "string3");
-    	String c1Str1 = d.getC1String("string5");
-    	String c1Str2 = d.getC1String2("string6", "string7");
-    	
-    	int b1Int = d.getB1Int(4000);
-    	float c1Float = d.getC1Float((float) 8.8);
-
-    	Integer c1Integer = d.getC1Integer(new Integer(9000));
-
-        System.out.println(dName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int + ", " + c1Str1 + ", " + c1Str2 + ", " + c1Float + ", " + c1Integer);
-        Assert.assertEquals("DService", dName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(4000, b1Int);
-        Assert.assertEquals("string5", c1Str1);
-        Assert.assertEquals("string6string7", c1Str2);
-        Assert.assertEquals((float) 8.8, c1Float);
-        Assert.assertEquals(new Integer(9000), c1Integer);
-    }
-
-    /**
-     * Lines 50-54:<br>
-     * Binding:<br>
-     * <br>
-     * Tests wsdl.binding(BService3SOAP12Binding) which uses SOAP 1.2<br> 
-     */
-    @Test
-    public void testWsdlElementBinding5() throws Exception {
-    	String aName = a4.getName();
-    	String b1Str1 = a4.getB1String("string1");
-    	String b1Str2 = a4.getB1String2("string2", "string3");
-    	int b1Int = a4.getB1Int(5000);
-    	
-        System.out.println(aName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(5000, b1Int);
-    }
-    
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/pom.xml b/java/sca-contrib/vtest/wsbinding/wsdlelement/pom.xml
deleted file mode 100644
index 13b0f4ea8c..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/pom.xml
+++ /dev/null
@@ -1,68 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-wsbinding</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-wsbinding-wsdlelement</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Web Service Binding Verification Tests - wsdlElement</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>vtest-utilities</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>service</module>
-                <module>port</module>
-                <module>binding</module>
-           </modules>
-        </profile>
-    </profiles>
-</project>
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/pom.xml b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/pom.xml
deleted file mode 100644
index e47ca9c9da..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/pom.xml
+++ /dev/null
@@ -1,58 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-wsbinding-wsdlelement</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-wsbinding-wsdlelement-port</artifactId>
-    <name>Apache Tuscany SCA Web Service Binding Verification Tests - WSDL wsdlElement wsdl.port</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
deleted file mode 100644
index 6fa9906d45..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
+++ /dev/null
@@ -1,40 +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.vtest.wsbinding.wsdlelement.port;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for AService.
- */
-@Remotable
-public interface AService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-
-	public String getB2String(String aString);
-
-	public int getB2Int(int i);
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
deleted file mode 100644
index 978d515f92..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
+++ /dev/null
@@ -1,35 +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.vtest.wsbinding.wsdlelement.port;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
deleted file mode 100644
index 766139ee92..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
+++ /dev/null
@@ -1,33 +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.vtest.wsbinding.wsdlelement.port;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService2 {
-
-	public String getString(String aString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java
deleted file mode 100644
index ee9ca25a4b..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.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.vtest.wsbinding.wsdlelement.port;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface CService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public Integer getInteger(Integer i);
-
-	public float getFloat(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java
deleted file mode 100644
index 80d998d1a6..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.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.    
- */
-package org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for DService.
- */
-@Remotable
-public interface DService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-
-	public String getC1String(String aString);
-
-	public String getC1String2(String aString, String bString);
-
-	public Integer getC1Integer(Integer i);
-	
-	public float getC1Float(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
deleted file mode 100644
index bec82776bf..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
+++ /dev/null
@@ -1,62 +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.vtest.wsbinding.wsdlelement.port.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService2;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-	@Reference(required=false)
-	public BService b1;
-
-	@Reference(required=false)
-	public BService2 b2;
-	
-    public String getName() {
-        return "AService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-	public String getB2String(String aString) {
-		return b2.getString(aString);
-	}
-
-	public int getB2Int(int i) {
-		return b2.getInt(i);
-	}
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
deleted file mode 100644
index b379a2e3ef..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
+++ /dev/null
@@ -1,40 +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.vtest.wsbinding.wsdlelement.port.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService2;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService2.class)
-public class BService2Impl implements BService2 {
-
-    public String getName() {
-        return "BService2";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java
deleted file mode 100644
index 069308a520..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.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 org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-    public String getName() {
-        return "BService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
deleted file mode 100644
index 7ad9e3066c..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
+++ /dev/null
@@ -1,48 +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.vtest.wsbinding.wsdlelement.port.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.CService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl implements CService {
-
-    public String getName() {
-        return "CService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public Integer getInteger(Integer i) {
-    	return i;
-    }
-    
-    public float getFloat(float f) {
-        return f;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
deleted file mode 100644
index 58ae1e9577..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
+++ /dev/null
@@ -1,70 +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.vtest.wsbinding.wsdlelement.port.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.CService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.DService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements DService.
- */
-@Service(DService.class)
-public class DServiceImpl implements DService {
-
-	@Reference
-	public BService b1;
-	
-	@Reference
-	public CService c1;
-	
-    public String getName() {
-        return "DService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-	public String getC1String(String aString) {
-		return c1.getString(aString);
-	}
-
-	public String getC1String2(String aString, String bString) {
-		return c1.getString2(aString, bString);
-	}
-
-	public Integer getC1Integer(Integer i) {
-		return c1.getInteger(i);
-	}
-	
-	public float getC1Float(float f) {
-		return c1.getFloat(f);
-	}
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
deleted file mode 100644
index d5c8d72dc1..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
+++ /dev/null
@@ -1,238 +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 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://vtest.wsbinding.wsdlelement.port.bservice" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="wsdlelement" targetNamespace="http://vtest.wsbinding.wsdlelement.port.bservice" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/">

-  <wsdl:types>

-    <xsd:schema targetNamespace="http://vtest.wsbinding.wsdlelement.port.bservice" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-      <xsd:element name="getString">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="in" type="xsd:string"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="getStringResponse">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="out" type="xsd:string"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="getString2">

-      	<xsd:complexType>

-      		<xsd:sequence>

      			<xsd:element name="in1" type="xsd:string"></xsd:element>
-      			<xsd:element name="in2" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getString2Response">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getInt">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="in" type="xsd:int"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getIntResponse">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-    </xsd:schema>

-  </wsdl:types>

-  <wsdl:message name="getStringRequest">

-    <wsdl:part element="tns:getString" name="parameters"/>

-  </wsdl:message>

-  <wsdl:message name="getStringResponse">

-    <wsdl:part element="tns:getStringResponse" name="parameters"/>

-  </wsdl:message>

-  <wsdl:message name="getString2Request">

-  	<wsdl:part name="parameters" element="tns:getString2"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Response">
-  	<wsdl:part name="parameters" element="tns:getString2Response"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntRequest">
-  	<wsdl:part name="parameters" element="tns:getInt"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntResponse">
-  	<wsdl:part name="parameters" element="tns:getIntResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getStringRequest">
-  	<wsdl:part name="parameters" element="tns:getString"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getStringResponse">
-  	<wsdl:part name="parameters" element="tns:getStringResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntRequest">
-  	<wsdl:part name="parameters" element="tns:getInt"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntResponse">
-  	<wsdl:part name="parameters" element="tns:getIntResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:portType name="BService1PortType">

-    <wsdl:operation name="getString">

-      <wsdl:input message="tns:getStringRequest"/>

-      <wsdl:output message="tns:getStringResponse"/>

-    </wsdl:operation>

-    <wsdl:operation name="getString2">

-    	<wsdl:input message="tns:getString2Request"></wsdl:input>
-    	<wsdl:output message="tns:getString2Response"></wsdl:output>

-    </wsdl:operation>
-    <wsdl:operation name="getInt">
-    	<wsdl:input message="tns:getIntRequest"></wsdl:input>
-    	<wsdl:output message="tns:getIntResponse"></wsdl:output>

-    </wsdl:operation>
-  </wsdl:portType>

-  <wsdl:portType name="BService2PortType">

-  	<wsdl:operation name="getString">

-  		<wsdl:input message="tns:getStringRequest"></wsdl:input>
-  		<wsdl:output message="tns:getStringResponse"></wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getInt">

-  		<wsdl:input message="tns:getIntRequest"></wsdl:input>
-  		<wsdl:output message="tns:getIntResponse"></wsdl:output>

-  	</wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="BService1SOAPBinding"

-  	type="tns:BService1PortType">






  	<soap:binding style="document"

-  		transport="http://schemas.xmlsoap.org/soap/http" />
  	<wsdl:operation name="getString">






  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.port.bservice/getString" />
  		<wsdl:input>

  			<soap:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

  			<soap:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getString2">

-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.port.bservice/getString2" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  	<wsdl:operation name="getInt">
-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.port.bservice/getInt" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  </wsdl:binding>

-  <wsdl:binding name="BService2SOAPBinding"

-  	type="tns:BService2PortType">

-  	<soap:binding style="document"

-  		transport="http://schemas.xmlsoap.org/soap/http" />
-  	<wsdl:operation name="getString">
-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.port.bservice/getString" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getInt">

-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.port.bservice/getInt" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="BService3SOAP12Binding"

-  	type="tns:BService1PortType">

-

-  	<soap12:binding style="document"

-  		transport="http://schemas.xmlsoap.org/soap/http" />

-  	<wsdl:operation name="getString">

-

-  		<soap12:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.port.bservice/getString" />

-  		<wsdl:input>

-

-  			<soap12:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

-

-  			<soap12:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getString2">

-

-  		<soap12:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.port.bservice/getString2" />

-  		<wsdl:input>

-

-  			<soap12:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

-

-  			<soap12:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getInt">

-

-  		<soap12:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.port.bservice/getInt" />

-  		<wsdl:input>

-

-  			<soap12:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

-

-  			<soap12:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  </wsdl:binding>

-  <wsdl:service name="BService">

-    <wsdl:port binding="tns:BService1SOAPBinding" name="BService1SOAP">

-      <soap:address location=""/>

-    </wsdl:port>

-    <wsdl:port name="BService2SOAP"

-    	binding="tns:BService2SOAPBinding">

-    	<soap:address location="" />

-    </wsdl:port>

-    <wsdl:port name="BService3SOAP12"

-    	binding="tns:BService3SOAP12Binding">

-    	<soap12:address location=""></soap12:address>

-    </wsdl:port>

-  </wsdl:service>

-  <wsdl:service name="BService2">

-  	<wsdl:port name="BService2Port" binding="tns:BService2SOAPBinding">

-  		<soap:address location="" />

-  	</wsdl:port>

-  </wsdl:service>
-</wsdl:definitions>

diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
deleted file mode 100644
index 8a715a2081..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
+++ /dev/null
@@ -1,173 +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 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://vtest.wsbinding.wsdlelement.port.cservice" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="CService" targetNamespace="http://vtest.wsbinding.wsdlelement.port.cservice">

-  <wsdl:types>

-    <xsd:schema targetNamespace="http://vtest.wsbinding.wsdlelement.port.cservice" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-      <xsd:element name="getFloat">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="in" type="xsd:float"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="getFloatResponse">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="out" type="xsd:float"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="getInteger">

-      	<xsd:complexType>

-      		<xsd:sequence>

      			<xsd:element name="in" type="xsd:integer"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getIntegerResponse">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:integer"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getString2">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="in1" type="xsd:string"></xsd:element>
-      			<xsd:element name="in2" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getString2Response">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getString">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="in" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getStringResponse">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-    </xsd:schema>

-  </wsdl:types>

-  <wsdl:message name="getFloatRequest">

-    <wsdl:part element="tns:getFloat" name="parameters"/>

-  </wsdl:message>

-  <wsdl:message name="getFloatResponse">

-    <wsdl:part element="tns:getFloatResponse" name="parameters"/>

-  </wsdl:message>

-  <wsdl:message name="getIntegerRequest">

-  	<wsdl:part name="parameters" element="tns:getInteger"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntegerResponse">
-  	<wsdl:part name="parameters" element="tns:getIntegerResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Request">
-  	<wsdl:part name="parameters" element="tns:getString2"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Response">
-  	<wsdl:part name="parameters" element="tns:getString2Response"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getStringRequest">
-  	<wsdl:part name="parameters" element="tns:getString"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getStringResponse">
-  	<wsdl:part name="parameters" element="tns:getStringResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Request">
-  	<wsdl:part name="parameters" element="tns:getString2"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Response">
-  	<wsdl:part name="parameters" element="tns:getString2Response"></wsdl:part>

-  </wsdl:message>
-  <wsdl:portType name="CServicePortType">

-    <wsdl:operation name="getFloat">

-      <wsdl:input message="tns:getFloatRequest"/>

-      <wsdl:output message="tns:getFloatResponse"/>

-    </wsdl:operation>

-    <wsdl:operation name="getInteger">

-    	<wsdl:input message="tns:getIntegerRequest"></wsdl:input>
-    	<wsdl:output message="tns:getIntegerResponse"></wsdl:output>

-    </wsdl:operation>
-    <wsdl:operation name="getString">
-    	<wsdl:input message="tns:getStringRequest"></wsdl:input>
-    	<wsdl:output message="tns:getStringResponse"></wsdl:output>

-    </wsdl:operation>
-    <wsdl:operation name="getString2">
-    	<wsdl:input message="tns:getString2Request"></wsdl:input>
-    	<wsdl:output message="tns:getString2Response"></wsdl:output>

-    </wsdl:operation>
-  </wsdl:portType>

-  <wsdl:binding name="CServiceSOAPBinding"

-  	type="tns:CServicePortType">





  	<soap:binding style="document"

-  		transport="http://schemas.xmlsoap.org/soap/http" />
  	<wsdl:operation name="getFloat">





  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.port.cservice/getFloat" />
  		<wsdl:input>

  			<soap:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

  			<soap:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getInteger">

-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.port.cservice/getInteger" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  	<wsdl:operation name="getString">
-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.port.cservice/getString" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  	<wsdl:operation name="getString2">
-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.port.cservice/getString2" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  </wsdl:binding>

-  <wsdl:service name="CService">

-    <wsdl:port binding="tns:CServiceSOAPBinding" name="CServiceSOAP">

-      <soap:address location=""/>

-    </wsdl:port>

-  </wsdl:service>

-</wsdl:definitions>

diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
deleted file mode 100644
index 5b9b77683e..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
+++ /dev/null
@@ -1,115 +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://vtest.wsbinding.wsdlelement.port"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-	name="wsdlelement.port">
-
-   
-    <component name="BComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.BServiceImpl"/>
-		<service name="BService">
-            <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService1SOAP)"
-                        uri="http://localhost:8085/BComponent1"/>
-		</service>
-    </component>
-
-    <component name="BComponent2">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.BServiceImpl"/>
-		<service name="BService">
-            <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService2SOAP)"
-                        uri="http://localhost:8085/BComponent2"/>
-		</service>
-    </component>
-    
-    <component name="BComponent3">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.BService2Impl"/>
-		<service name="BService2">
-            <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService2"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService2/BService2Port)"
-                        uri="http://localhost:8085/BComponent3"/>
-		</service>
-    </component>
-    
-    <component name="BComponent4">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.BServiceImpl"/>
-		<service name="BService">
-            <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService3SOAP12)"
-                        uri="http://localhost:8085/BComponent4"/>
-		</service>
-    </component>
-    
-	<component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.CServiceImpl"/>
-		<service name="CService">
-            <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.CService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.cservice#wsdl.port(CService/CServiceSOAP)"
-                        uri="http://localhost:8085/CComponent"/>
-		</service>
-    </component>
-
-    <component name="AComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent1/BService">
-            <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService1SOAP)" uri="http://localhost:8085/BComponent1"/>
-        </reference>
-    </component>
-
-    <component name="AComponent2">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent2/BService">
-            <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService2SOAP)" uri="http://localhost:8085/BComponent2"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent3">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.AServiceImpl"/>
-        <reference name="b2" target="BComponent3/BService2">
-            <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService2"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService2/BService2Port)" uri="http://localhost:8085/BComponent3"/>
-        </reference>
-    </component>
-
-    <component name="AComponent4">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent4/BService">
-            <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService3SOAP12)" uri="http://localhost:8085/BComponent4"/>
-        </reference>
-    </component>
-    
-    <component name="DComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.DServiceImpl"/>
-        <reference name="b1" target="BComponent1/BService">
-            <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService1SOAP)" uri="http://localhost:8085/BComponent1"/>
-        </reference>
-        <reference name="c1" target="CComponent/CService">
-            <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.CService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.cservice#wsdl.port(CService/CServiceSOAP)" uri="http://localhost:8085/CComponent"/>
-        </reference>
-    </component>
-    
-</composite>
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
deleted file mode 100644
index 0db579002b..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
+++ /dev/null
@@ -1,188 +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.vtest.wsbinding.wsdlelement.port;
-
-import static org.junit.Assert.fail;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.DService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the simplest form of the binding element wsdl.port with WSDL 
- * document described in section section 2.1 of SCA Web Services Binding
- * V1.00<br>
- */
-public class WsdlElementPortTestCase {
-
-	protected static ServiceFinder serviceFinder;
-    protected static String compositeName = "wsdlelement.port.composite";
-    protected static AService a1;
-    protected static AService a2;
-    protected static AService a3;
-    protected static AService a4;
-    protected static DService d;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            a1 = ServiceFinder.getService(AService.class, "AComponent1");
-            a2 = ServiceFinder.getService(AService.class, "AComponent2");
-            a3 = ServiceFinder.getService(AService.class, "AComponent3");
-            a4 = ServiceFinder.getService(AService.class, "AComponent4");
-            d = ServiceFinder.getService(DService.class, "DComponent1");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 42-45:<br>
-     * Port (WSDL 1.1):<br>
-     * <WSDL-namespace-URI>#wsdl.port(<service-name>/<port-name>)
-     * In this case, the identified port in the WSDL 1.1 Service must have an
-     * equivalent PortType with the SCA service or reference.<br>
-     * <br>
-     * Test wsdl.port(BService/BService1SOAP)<br>
-     */
-    @Test
-    public void testWsdlElementPort1() throws Exception {
-    	String aName = a1.getName();
-    	String b1Str1 = a1.getB1String("string1");
-    	String b1Str2 = a1.getB1String2("string2", "string3");
-    	int b1Int = a1.getB1Int(1000);
-    	
-        System.out.println(aName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(1000, b1Int);
-    }
-
-    /**
-     * Lines 42-45:<br>
-     * Port (WSDL 1.1):<br>
-     * <br>
-     * Tests wsdl.port(BService/BService2SOAP) with BService where the port
-     * does not define getString2, so exceptions are expected.<br>
-     */
-    @Test
-    public void testWsdlElementPort2() throws Exception {
-        String aName = a2.getName();
-        System.out.println(aName + ": ");
-    	try {
-        	a2.getB1String("string1");
-    		fail("Should not be able to call getString");
-    	} catch (Exception e) {
-            System.out.println("  Exception is expected: " + e.toString());
-    	}
-    	try {
-    		a2.getB1String2("string2", "string3");
-    		fail("Should not be able to call getString2");
-    	} catch (Exception e) {
-    		System.out.println("  Exception is expected: " + e.toString());
-    	}
-    	try {
-        	a2.getB1Int(2000);
-    		fail("Should not be able to call getInt");
-    	} catch (Exception e) {
-    		System.out.println("  Exception is expected: " + e.toString());
-    	}
-    }
-
-    /**
-     * Lines 42-45:<br>
-     * Port (WSDL 1.1):<br>
-     * <br>
-     * Tests wsdl.port(BService/BService2SOAP) with BService2<br>
-     */
-    @Test
-    public void testWsdlElementPort3() throws Exception {
-    	String aName = a3.getName();
-    	String b2Str1 = a3.getB2String("string1");
-    	int b2Int = a3.getB2Int(1000);
-    	
-        System.out.println(aName + ": " + b2Str1 + ", " + b2Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b2Str1);
-        Assert.assertEquals(1000, b2Int);
-    }
-
-    /**
-     * Lines 42-45:<br>
-     * Port (WSDL 1.1):<br>
-     * <br>
-=     * Tests two references using wsdl.port.<br> 
-     */
-    @Test
-    public void testWsdlElementPort4() throws Exception {
-    	String dName = d.getName();
-    	String b1Str1 = d.getB1String("string1");
-    	String b1Str2 = d.getB1String2("string2", "string3");
-    	String c1Str1 = d.getC1String("string5");
-    	String c1Str2 = d.getC1String2("string6", "string7");
-    	
-    	int b1Int = d.getB1Int(4000);
-    	float c1Float = d.getC1Float((float) 8.8);
-
-    	Integer c1Integer = d.getC1Integer(new Integer(9000));
-
-        System.out.println(dName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int + ", " + c1Str1 + ", " + c1Str2 + ", " + c1Float + ", " + c1Integer);
-        Assert.assertEquals("DService", dName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(4000, b1Int);
-        Assert.assertEquals("string5", c1Str1);
-        Assert.assertEquals("string6string7", c1Str2);
-        Assert.assertEquals((float) 8.8, c1Float);
-        Assert.assertEquals(new Integer(9000), c1Integer);
-    }
-
-    /**
-     * Lines 42-45:<br>
-     * Port (WSDL 1.1):<br>
-     * <br>
-=     * Tests wsdl.port(BService/BService3SOAP12) which uses SOAP 1.2<br> 
-     */
-    @Test
-    public void testWsdlElementPort5() throws Exception {
-    	String aName = a4.getName();
-    	String b1Str1 = a4.getB1String("string1");
-    	String b1Str2 = a4.getB1String2("string2", "string3");
-    	int b1Int = a4.getB1Int(5000);
-    	
-        System.out.println(aName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(5000, b1Int);
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/pom.xml b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/pom.xml
deleted file mode 100644
index 39f2c45921..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/pom.xml
+++ /dev/null
@@ -1,58 +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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>vtest-wsbinding-wsdlelement</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>vtest-wsbinding-wsdlelement-service</artifactId>
-    <name>Apache Tuscany SCA Web Service Binding Verification Tests - WSDL wsdlElement wsdl.service</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
deleted file mode 100644
index 464a834570..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
+++ /dev/null
@@ -1,50 +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.vtest.wsbinding.wsdlelement.service;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for AService.
- */
-@Remotable
-public interface AService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-	
-	public String getB2String(String aString);
-
-	public int getB2Int(int i);
-
-	public String getB3String(String aString);
-
-	public int getB3Int(int i);
-	
-	public String getB4String(String aString);
-
-	public String getB4String2(String aString, String bString);
-
-	public int getB4Int(int i);
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
deleted file mode 100644
index 37ccee6cd4..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
+++ /dev/null
@@ -1,35 +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.vtest.wsbinding.wsdlelement.service;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
deleted file mode 100644
index c8355f8f1b..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
+++ /dev/null
@@ -1,33 +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.vtest.wsbinding.wsdlelement.service;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService2 {
-
-	public String getString(String aString);
-
-	public int getInt(int i);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java
deleted file mode 100644
index d3f5ab1c47..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.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.vtest.wsbinding.wsdlelement.service;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface CService {
-
-	public String getString(String aString);
-
-	public String getString2(String aString, String bString);
-
-	public Integer getInteger(Integer i);
-
-	public float getFloat(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java
deleted file mode 100644
index 1a64706a29..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.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.    
- */
-package org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for DService.
- */
-@Remotable
-public interface DService {
-	
-    public String getName();
-    
-	public String getB1String(String aString);
-
-	public String getB1String2(String aString, String bString);
-
-	public int getB1Int(int i);
-
-	public String getC1String(String aString);
-
-	public String getC1String2(String aString, String bString);
-
-	public Integer getC1Integer(Integer i);
-	
-	public float getC1Float(float f);
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
deleted file mode 100644
index 986027c08a..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
+++ /dev/null
@@ -1,88 +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.vtest.wsbinding.wsdlelement.service.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService2;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-	@Reference(required=false)
-	public BService b1;
-
-	@Reference(required=false)
-	public BService2 b2;
-
-	@Reference(required=false)
-	public BService2 b3;
-	
-	@Reference(required=false)
-	public BService b4;
-	
-    public String getName() {
-        return "AService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-	public String getB2String(String aString) {
-		return b2.getString(aString);
-	}
-
-	public int getB2Int(int i) {
-		return b2.getInt(i);
-	}
-
-	public String getB3String(String aString) {
-		return b3.getString(aString);
-	}
-
-	public int getB3Int(int i) {
-		return b3.getInt(i);
-	}
-	
-	public String getB4String(String aString) {
-		return b4.getString(aString);
-	}
-
-	public String getB4String2(String aString, String bString) {
-		return b4.getString2(aString, bString);
-	}
-
-	public int getB4Int(int i) {
-		return b4.getInt(i);
-	}
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
deleted file mode 100644
index a58297de69..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
+++ /dev/null
@@ -1,40 +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.vtest.wsbinding.wsdlelement.service.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService2;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService2.class)
-public class BService2Impl implements BService2 {
-
-    public String getName() {
-        return "BService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java
deleted file mode 100644
index 3ecbc95901..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.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 org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-    public String getName() {
-        return "BService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public int getInt(int i) {
-        return i;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
deleted file mode 100644
index 05af362a25..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
+++ /dev/null
@@ -1,48 +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.vtest.wsbinding.wsdlelement.service.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.CService;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CService.class)
-public class CServiceImpl implements CService {
-
-    public String getName() {
-        return "CService";
-    }
-
-    public String getString(String aString) {
-        return aString;
-    }
-
-    public String getString2(String aString, String bString) {
-        return aString + bString;
-    }
-
-    public Integer getInteger(Integer i) {
-    	return i;
-    }
-    
-    public float getFloat(float f) {
-        return f;
-    }
-
-}
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
deleted file mode 100644
index dadbb63873..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
+++ /dev/null
@@ -1,70 +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.vtest.wsbinding.wsdlelement.service.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.CService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.DService;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements DService.
- */
-@Service(DService.class)
-public class DServiceImpl implements DService {
-
-	@Reference
-	public BService b1;
-	
-	@Reference
-	public CService c1;
-	
-    public String getName() {
-        return "DService";
-    }
-
-	public String getB1String(String aString) {
-		return b1.getString(aString);
-	}
-
-	public String getB1String2(String aString, String bString) {
-		return b1.getString2(aString, bString);
-	}
-
-	public int getB1Int(int i) {
-		return b1.getInt(i);
-	}
-
-	public String getC1String(String aString) {
-		return c1.getString(aString);
-	}
-
-	public String getC1String2(String aString, String bString) {
-		return c1.getString2(aString, bString);
-	}
-
-	public Integer getC1Integer(Integer i) {
-		return c1.getInteger(i);
-	}
-	
-	public float getC1Float(float f) {
-		return c1.getFloat(f);
-	}
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
deleted file mode 100644
index 521f077c46..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
+++ /dev/null
@@ -1,225 +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 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://vtest.wsbinding.wsdlelement.service.bservice" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="wsdlelement" targetNamespace="http://vtest.wsbinding.wsdlelement.service.bservice" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/">

-  <wsdl:types>

-    <xsd:schema targetNamespace="http://vtest.wsbinding.wsdlelement.service.bservice" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-      <xsd:element name="getString">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="in" type="xsd:string"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="getStringResponse">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="out" type="xsd:string"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="getString2">

-      	<xsd:complexType>

-      		<xsd:sequence>

      			<xsd:element name="in1" type="xsd:string"></xsd:element>
-      			<xsd:element name="in2" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getString2Response">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getInt">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="in" type="xsd:int"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getIntResponse">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:int"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-    </xsd:schema>

-  </wsdl:types>

-  <wsdl:message name="getStringRequest">

-    <wsdl:part element="tns:getString" name="parameters"/>

-  </wsdl:message>

-  <wsdl:message name="getStringResponse">

-    <wsdl:part element="tns:getStringResponse" name="parameters"/>

-  </wsdl:message>

-  <wsdl:message name="getString2Request">

-  	<wsdl:part name="parameters" element="tns:getString2"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Response">
-  	<wsdl:part name="parameters" element="tns:getString2Response"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntRequest">
-  	<wsdl:part name="parameters" element="tns:getInt"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntResponse">
-  	<wsdl:part name="parameters" element="tns:getIntResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getStringRequest">
-  	<wsdl:part name="parameters" element="tns:getString"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getStringResponse">
-  	<wsdl:part name="parameters" element="tns:getStringResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntRequest">
-  	<wsdl:part name="parameters" element="tns:getInt"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntResponse">
-  	<wsdl:part name="parameters" element="tns:getIntResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:portType name="BService1PortType">

-    <wsdl:operation name="getString">

-      <wsdl:input message="tns:getStringRequest"/>

-      <wsdl:output message="tns:getStringResponse"/>

-    </wsdl:operation>

-    <wsdl:operation name="getString2">

-    	<wsdl:input message="tns:getString2Request"></wsdl:input>
-    	<wsdl:output message="tns:getString2Response"></wsdl:output>

-    </wsdl:operation>
-    <wsdl:operation name="getInt">
-    	<wsdl:input message="tns:getIntRequest"></wsdl:input>
-    	<wsdl:output message="tns:getIntResponse"></wsdl:output>

-    </wsdl:operation>
-  </wsdl:portType>

-  <wsdl:portType name="BService2PortType">

-  	<wsdl:operation name="getString">

-  		<wsdl:input message="tns:getStringRequest"></wsdl:input>
-  		<wsdl:output message="tns:getStringResponse"></wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getInt">

-  		<wsdl:input message="tns:getIntRequest"></wsdl:input>
-  		<wsdl:output message="tns:getIntResponse"></wsdl:output>

-  	</wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="BService1SOAPBinding"

-  	type="tns:BService1PortType">




  	<soap:binding style="document"

-  		transport="http://schemas.xmlsoap.org/soap/http" />
  	<wsdl:operation name="getString">




  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.service.bservice/getString" />
  		<wsdl:input>

  			<soap:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

  			<soap:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getString2">

-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.service.bservice/getString2" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  	<wsdl:operation name="getInt">
-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.service.bservice/getInt" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  </wsdl:binding>

-  <wsdl:binding name="BService2SOAPBinding"

-  	type="tns:BService2PortType">

-  	<soap:binding style="document"

-  		transport="http://schemas.xmlsoap.org/soap/http" />
-  	<wsdl:operation name="getString">
-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.service.bservice/getString" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getInt">

-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.service.bservice/getInt" />
-  		<wsdl:input>
-  			<soap:body use="literal" />

-  		</wsdl:input>
-  		<wsdl:output>
-  			<soap:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="BService3SOAP12Binding"

-  	type="tns:BService1PortType">

-  	<soap12:binding style="document"

-  		transport="http://schemas.xmlsoap.org/soap/http" />

-  	<wsdl:operation name="getString">

-  		<soap12:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.service.bservice/getString" />

-  		<wsdl:input>

-  			<soap12:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

-  			<soap12:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getString2">

-  		<soap12:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.service.bservice/getString2" />

-  		<wsdl:input>

-  			<soap12:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

-  			<soap12:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getInt">

-  		<soap12:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.service.bservice/getInt" />

-  		<wsdl:input>

-  			<soap12:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

-  			<soap12:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  </wsdl:binding>

-  <wsdl:service name="BService">

-    <wsdl:port binding="tns:BService1SOAPBinding" name="BService1SOAP">

-      <soap:address location=""/>

-    </wsdl:port>

-  </wsdl:service>

-  <wsdl:service name="BService2">

-  	<wsdl:port name="BService2Port" binding="tns:BService2SOAPBinding">

-  		<soap:address location="" />

-  	</wsdl:port>

-  </wsdl:service>

-  <wsdl:service name="BService3">

-  	<wsdl:port name="BService3SOAP12" binding="tns:BService3SOAP12Binding">


-            <soap12:address location=""></soap12:address>
-        </wsdl:port>

-  </wsdl:service>

-</wsdl:definitions>

diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
deleted file mode 100644
index bdf294b473..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
+++ /dev/null
@@ -1,173 +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 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://vtest.wsbinding.wsdlelement.service.cservice" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="CService" targetNamespace="http://vtest.wsbinding.wsdlelement.service.cservice">

-  <wsdl:types>

-    <xsd:schema targetNamespace="http://vtest.wsbinding.wsdlelement.service.cservice" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-      <xsd:element name="getFloat">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="in" type="xsd:float"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="getFloatResponse">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="out" type="xsd:float"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="getInteger">

-      	<xsd:complexType>

-      		<xsd:sequence>

      			<xsd:element name="in" type="xsd:integer"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getIntegerResponse">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:integer"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getString2">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="in1" type="xsd:string"></xsd:element>
-      			<xsd:element name="in2" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getString2Response">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getString">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="in" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-      <xsd:element name="getStringResponse">
-      	<xsd:complexType>
-      		<xsd:sequence>

-      			<xsd:element name="out" type="xsd:string"></xsd:element>
-      		</xsd:sequence>

-      	</xsd:complexType>

-      </xsd:element>
-    </xsd:schema>

-  </wsdl:types>

-  <wsdl:message name="getFloatRequest">

-    <wsdl:part element="tns:getFloat" name="parameters"/>

-  </wsdl:message>

-  <wsdl:message name="getFloatResponse">

-    <wsdl:part element="tns:getFloatResponse" name="parameters"/>

-  </wsdl:message>

-  <wsdl:message name="getIntegerRequest">

-  	<wsdl:part name="parameters" element="tns:getInteger"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getIntegerResponse">
-  	<wsdl:part name="parameters" element="tns:getIntegerResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Request">
-  	<wsdl:part name="parameters" element="tns:getString2"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Response">
-  	<wsdl:part name="parameters" element="tns:getString2Response"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getStringRequest">
-  	<wsdl:part name="parameters" element="tns:getString"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getStringResponse">
-  	<wsdl:part name="parameters" element="tns:getStringResponse"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Request">
-  	<wsdl:part name="parameters" element="tns:getString2"></wsdl:part>

-  </wsdl:message>
-  <wsdl:message name="getString2Response">
-  	<wsdl:part name="parameters" element="tns:getString2Response"></wsdl:part>

-  </wsdl:message>
-  <wsdl:portType name="CServicePortType">

-    <wsdl:operation name="getFloat">

-      <wsdl:input message="tns:getFloatRequest"/>

-      <wsdl:output message="tns:getFloatResponse"/>

-    </wsdl:operation>

-    <wsdl:operation name="getInteger">

-    	<wsdl:input message="tns:getIntegerRequest"></wsdl:input>
-    	<wsdl:output message="tns:getIntegerResponse"></wsdl:output>

-    </wsdl:operation>
-    <wsdl:operation name="getString">
-    	<wsdl:input message="tns:getStringRequest"></wsdl:input>
-    	<wsdl:output message="tns:getStringResponse"></wsdl:output>

-    </wsdl:operation>
-    <wsdl:operation name="getString2">
-    	<wsdl:input message="tns:getString2Request"></wsdl:input>
-    	<wsdl:output message="tns:getString2Response"></wsdl:output>

-    </wsdl:operation>
-  </wsdl:portType>

-  <wsdl:binding name="CServiceSOAPBinding"

-  	type="tns:CServicePortType">





  	<soap:binding style="document"

-  		transport="http://schemas.xmlsoap.org/soap/http" />
  	<wsdl:operation name="getFloat">





  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.service.cservice/getFloat" />
  		<wsdl:input>

  			<soap:body use="literal" />

-  		</wsdl:input>

-  		<wsdl:output>

  			<soap:body use="literal" />

-  		</wsdl:output>

-  	</wsdl:operation>

-  	<wsdl:operation name="getInteger">

-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.service.cservice/getInteger" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  	<wsdl:operation name="getString">
-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.service.cservice/getString" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  	<wsdl:operation name="getString2">
-  		<soap:operation

-  			soapAction="http://vtest.wsbinding.wsdlelement.service.cservice/getString2" />
-  		<wsdl:input>

-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>

-  			<soap:body use="literal" />
-  		</wsdl:output>

-  	</wsdl:operation>
-  </wsdl:binding>

-  <wsdl:service name="CService">

-    <wsdl:port binding="tns:CServiceSOAPBinding" name="CServiceSOAP">

-      <soap:address location=""/>

-    </wsdl:port>

-  </wsdl:service>

-</wsdl:definitions>

diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
deleted file mode 100644
index 9801ecd037..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
+++ /dev/null
@@ -1,145 +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://vtest.wsbinding.wsdlelement.service"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-	name="wsdlelement.service">
-
-	<component name="BComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.BServiceImpl"/>
-		<service name="BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService)" uri="http://localhost:8085/BComponent1"/>
-		</service>
-    </component>
-
-	<component name="BComponent2">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.BServiceImpl"/>
-		<service name="BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)" uri="http://localhost:8085/BComponent2"/>
-		</service>
-    </component>
-
-	<component name="BComponent3">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.BService2Impl"/>
-		<service name="BService2">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService2"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)" uri="http://localhost:8085/BComponent3"/>
-		</service>
-    </component>
-
-    <component name="BComponent4">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.BServiceImpl"/>
-		<service name="BService">
-            <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.port(BService/BService1SOAP)" uri="http://localhost:8085/BComponent4"/>
-		</service>
-    </component>
-
-	<component name="BComponent5">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.BService2Impl"/>
-		<service name="BService2">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService2"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.binding(BService2SOAPBinding)" uri="http://localhost:8085/BComponent5"/>
-		</service>
-    </component>
-            
-	<component name="BComponent6">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.BServiceImpl"/>
-		<service name="BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService3)" uri="http://localhost:8085/BComponent6"/>
-		</service>
-    </component>
-                
-	<component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.CServiceImpl"/>
-		<service name="CService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.CService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.cservice#wsdl.service(CService)" uri="http://localhost:8085/CComponent"/>
-		</service>
-    </component>
-
-    <component name="AComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent1/BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService)" uri="http://localhost:8085/BComponent1"/>
-        </reference>
-    </component>
-
-    <component name="AComponent2">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent2/BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)" uri="http://localhost:8085/BComponent2"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent3">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.AServiceImpl"/>
-        <reference name="b2" target="BComponent3/BService2">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService2"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)" uri="http://localhost:8085/BComponent3"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent4">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent4/BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.port(BService/BService1SOAP)" uri="http://localhost:8085/BComponent4"/>
-        </reference>
-        <reference name="b2" target="BComponent3/BService2">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService2"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)" uri="http://localhost:8085/BComponent3"/>
-        </reference>
-        <reference name="b3" target="BComponent5/BService2">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService2"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.binding(BService2SOAPBinding)" uri="http://localhost:8085/BComponent5"/>
-        </reference>
-        <reference name="b4" target="BComponent6/BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService3)" uri="http://localhost:8085/BComponent6"/>
-        </reference>
-    </component>
-    
-    <component name="AComponent5">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.AServiceImpl"/>
-        <reference name="b1" target="BComponent6/BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService3)" uri="http://localhost:8085/BComponent6"/>
-        </reference>
-    </component>
-    
-    <component name="DComponent1">
-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.DServiceImpl"/>
-        <reference name="b1" target="BComponent1/BService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService)" uri="http://localhost:8085/BComponent1"/>
-        </reference>
-        <reference name="c1" target="CComponent/CService">
-			<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.CService"/>
-			<binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.cservice#wsdl.service(CService)" uri="http://localhost:8085/CComponent"/>
-        </reference>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java b/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java
deleted file mode 100644
index 22d2a80244..0000000000
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java
+++ /dev/null
@@ -1,235 +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.vtest.wsbinding.wsdlelement.service;
-
-import static org.junit.Assert.fail;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.DService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the simplest form of the binding element wsdl.service with WSDL 
- * document described in section section 2.1 of SCA Web Services Binding
- * V1.00<br>
- */
-public class WsdlElementServiceTestCase {
-
-	protected static ServiceFinder serviceFinder;
-    protected static String compositeName = "wsdlelement.service.composite";
-    protected static AService a1;
-    protected static AService a2;
-    protected static AService a3;
-    protected static AService a4;
-    protected static AService a5;
-    protected static DService d;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            System.out.println("Setting up");
-            ServiceFinder.init(compositeName);
-            a1 = ServiceFinder.getService(AService.class, "AComponent1");
-            a2 = ServiceFinder.getService(AService.class, "AComponent2");
-            a3 = ServiceFinder.getService(AService.class, "AComponent3");
-            a4 = ServiceFinder.getService(AService.class, "AComponent4");
-            a5 = ServiceFinder.getService(AService.class, "AComponent5");
-            d = ServiceFinder.getService(DService.class, "DComponent1");
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Lines 38-41:<br>
-     * Service:<br>
-     * <WSDL-namespace-URI>#wsdl.service(<service-name>)<br>
-     * In this case, all the endpoints in the WSDL Service that have equivalent
-     * PortTypes with the SCA service or reference must be available to the SCA
-     * service or reference.<br>
-     * <br>
-     * Tests wsdl.service(BService)<br>
-     */
-    @Test
-    public void testWsdlElementService1() throws Exception {
-    	String aName = a1.getName();
-    	String b1Str1 = a1.getB1String("string1");
-    	String b1Str2 = a1.getB1String2("string2", "string3");
-    	int b1Int = a1.getB1Int(1000);
-    	
-        System.out.println(aName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(1000, b1Int);
-    }
-
-    /**
-     * Lines 38-41:<br>
-     * Service:<br>
-     * <br>
-     * Tests wsdl.service(BService2) with with BService where the service
-     * does not define getString2, so exceptions are expected.<br>
-     */
-    @Test
-    public void testWsdlElementService2() throws Exception {
-        String aName = a2.getName();
-        System.out.println(aName + ": ");
-    	try {
-        	a2.getB1String("string1");
-    		fail("Should not be able to call getString");
-    	} catch (Exception e) {
-            System.out.println("  Exception is expected: " + e.toString());
-    	}
-    	try {
-    		a2.getB1String2("string2", "string3");
-    		fail("Should not be able to call getString2");
-    	} catch (Exception e) {
-    		System.out.println("  Exception is expected: " + e.toString());
-    	}
-    	try {
-        	a2.getB1Int(2000);
-    		fail("Should not be able to call getInt");
-    	} catch (Exception e) {
-    		System.out.println("  Exception is expected: " + e.toString());
-    	}
-    }
-
-    /**
-     * Lines 38-41:<br>
-     * Service:<br>
-     * <br>
-     * Tests wsdl.service(BService2) with BService2<br>
-     */
-    @Test
-    public void testWsdlElementService3() throws Exception {
-    	String aName = a3.getName();
-    	String b2Str1 = a3.getB2String("string1");
-    	int b2Int = a3.getB2Int(1000);
-    	
-        System.out.println(aName + ": " + b2Str1 + ", " + b2Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b2Str1);
-        Assert.assertEquals(1000, b2Int);
-    }
-
-    /**
-     * Lines 38-41:<br>
-     * Service:<br>
-     * <br>
-     * Tests two references using wsdl.service.<br> 
-     */
-    @Test
-    public void testWsdlElementService4() throws Exception {
-    	String dName = d.getName();
-    	String b1Str1 = d.getB1String("string1");
-    	String b1Str2 = d.getB1String2("string2", "string3");
-    	String c1Str1 = d.getC1String("string5");
-    	String c1Str2 = d.getC1String2("string6", "string7");
-    	
-    	int b1Int = d.getB1Int(4000);
-    	float c1Float = d.getC1Float((float) 8.8);
-
-    	Integer c1Integer = d.getC1Integer(new Integer(9000));
-
-        System.out.println(dName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int + ", " + c1Str1 + ", " + c1Str2 + ", " + c1Float + ", " + c1Integer);
-        Assert.assertEquals("DService", dName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(4000, b1Int);
-        Assert.assertEquals("string5", c1Str1);
-        Assert.assertEquals("string6string7", c1Str2);
-        Assert.assertEquals((float) 8.8, c1Float);
-        Assert.assertEquals(new Integer(9000), c1Integer);
-    }
-
-    /**
-     * Lines 38-41:<br>
-     * Service:<br>
-     * <br>
-     * Tests mixed bindings of using wsdl.port, wsdl.service, wsdl.binding,
-     * and soap 1.2
-     * <br> 
-     */
-    @Test
-    public void testWsdlElementService5() throws Exception {
-    	String aName = a4.getName();
-    	String b1Str1 = a4.getB1String("port");
-    	String b1Str2 = a4.getB1String2("string1", "string2");
-    	int b1Int = a4.getB1Int(1000);
-        System.out.println(aName);
-        System.out.println("  b1: " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("port", b1Str1);
-        Assert.assertEquals("string1string2", b1Str2);
-        Assert.assertEquals(1000, b1Int);
-
-    	String b2Str1 = a4.getB2String("service");
-    	int b2Int = a4.getB2Int(2000);
-        System.out.println("  b2: " + b2Str1 + ", " + b2Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("service", b2Str1);
-        Assert.assertEquals(2000, b2Int);
-
-    	String b3Str1 = a4.getB3String("binding");
-    	int b3Int = a4.getB3Int(3000);
-        System.out.println("  b3: " + b3Str1 + ", " + b3Int);
-        Assert.assertEquals("binding", b3Str1);
-        Assert.assertEquals(3000, b3Int);
-        
-    	String b4Str1 = a4.getB4String("soap12");
-    	String b4Str2 = a4.getB4String2("string3", "string4");
-    	int b4Int = a4.getB4Int(4000);
-        System.out.println("  b4: " + b4Str1 + ", " + b4Str2 + ", " + b4Int);
-        Assert.assertEquals("soap12", b4Str1);
-        Assert.assertEquals("string3string4", b4Str2);
-        Assert.assertEquals(4000, b4Int);
-
-    }
-
-    /**
-     * Lines 38-41:<br>
-     * Service:<br>
-     * <br>
-     * Tests wsdl.service(BService3) which uses SOAP 1.2<br>
-     */
-    @Test
-    public void testWsdlElementService6() throws Exception {
-    	String aName = a5.getName();
-    	String b1Str1 = a5.getB1String("string1");
-    	String b1Str2 = a5.getB1String2("string2", "string3");
-    	int b1Int = a5.getB1Int(6000);
-    	
-        System.out.println(aName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
-        Assert.assertEquals("AService", aName);
-        Assert.assertEquals("string1", b1Str1);
-        Assert.assertEquals("string2string3", b1Str2);
-        Assert.assertEquals(6000, b1Int);
-    }
-    
-    @AfterClass
-    public static void destroy() throws Exception {
-        System.out.println("Cleaning up");
-        ServiceFinder.cleanup();
-    }
-}